Changeset 8652612


Ignore:
Timestamp:
Feb 15, 2009, 11:23:09 PM (16 years ago)
Author:
Jim Gifford <clfs@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
61a83e8
Parents:
104131a
Message:

Updated Ncurses Branch Update Patch to -8

Files:
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • BOOK/introduction/common/changelog.xml

    r104131a r8652612  
    3636    </listitem>
    3737-->
     38
     39    <listitem>
     40      <para>February 16, 2009</para>
     41      <itemizedlist>
     42        <listitem>
     43          <para>[Jim] - Updated Ncurses Branch Update Patch to -8.</para>
     44        </listitem>
     45      </itemizedlist>
     46    </listitem>
    3847
    3948    <listitem>
  • BOOK/patches.ent

    r104131a r8652612  
    9393<!ENTITY ncurses-bashfix-patch-size "4 KB">
    9494
    95 <!ENTITY ncurses-branch_update-patch "ncurses-&ncurses-version;-branch_update-7.patch">
    96 <!ENTITY ncurses-branch_update-patch-md5 "ad86e7cca9d10083ac343d4e5f1fc5e9">
    97 <!ENTITY ncurses-branch_update-patch-size "596 KB">
     95<!ENTITY ncurses-branch_update-patch "ncurses-&ncurses-version;-branch_update-8.patch">
     96<!ENTITY ncurses-branch_update-patch-md5 "761a9009211e0c17b388618127b213e8">
     97<!ENTITY ncurses-branch_update-patch-size "716 KB">
    9898
    9999<!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
  • patches/ncurses-5.7-branch_update-8.patch

    r104131a r8652612  
    11Submitted By: Jim Gifford (jim at cross-lfs dot org)
    2 Date: 02-07-2009
     2Date: 02-15-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-20090207.
     7             rechecked periodically. This patch covers up to 5.7-20090214.
    88
    99diff -Naur ncurses-5.7.orig/aclocal.m4 ncurses-5.7/aclocal.m4
    1010--- ncurses-5.7.orig/aclocal.m4 2008-10-25 15:15:32.000000000 -0700
    11 +++ ncurses-5.7/aclocal.m4      2009-02-07 22:08:38.015428971 -0800
     11+++ ncurses-5.7/aclocal.m4      2009-02-15 23:21:19.692164827 -0800
    1212@@ -1,5 +1,5 @@
    1313 dnl***************************************************************************
     
    886886diff -Naur ncurses-5.7.orig/Ada95/gen/adacurses-config.in ncurses-5.7/Ada95/gen/adacurses-config.in
    887887--- ncurses-5.7.orig/Ada95/gen/adacurses-config.in      2007-04-07 14:06:50.000000000 -0700
    888 +++ ncurses-5.7/Ada95/gen/adacurses-config.in   2009-02-07 22:08:33.741616148 -0800
     888+++ ncurses-5.7/Ada95/gen/adacurses-config.in   2009-02-15 23:21:14.347823438 -0800
    889889@@ -1,18 +1,47 @@
    890890 #! /bin/sh
     
    960960diff -Naur ncurses-5.7.orig/Ada95/gen/Makefile.in ncurses-5.7/Ada95/gen/Makefile.in
    961961--- ncurses-5.7.orig/Ada95/gen/Makefile.in      2008-10-04 15:58:31.000000000 -0700
    962 +++ ncurses-5.7/Ada95/gen/Makefile.in   2009-02-07 22:08:33.741616148 -0800
     962+++ ncurses-5.7/Ada95/gen/Makefile.in   2009-02-15 23:21:14.347823438 -0800
    963963@@ -1,5 +1,5 @@
    964964 ##############################################################################
     
    10161016diff -Naur ncurses-5.7.orig/Ada95/samples/Makefile.in ncurses-5.7/Ada95/samples/Makefile.in
    10171017--- ncurses-5.7.orig/Ada95/samples/Makefile.in  2006-12-17 08:45:02.000000000 -0800
    1018 +++ ncurses-5.7/Ada95/samples/Makefile.in       2009-02-07 22:08:33.741616148 -0800
     1018+++ ncurses-5.7/Ada95/samples/Makefile.in       2009-02-15 23:21:14.347823438 -0800
    10191019@@ -1,5 +1,5 @@
    10201020 ##############################################################################
     
    10551055diff -Naur ncurses-5.7.orig/Ada95/src/Makefile.in ncurses-5.7/Ada95/src/Makefile.in
    10561056--- ncurses-5.7.orig/Ada95/src/Makefile.in      2007-09-15 11:22:24.000000000 -0700
    1057 +++ ncurses-5.7/Ada95/src/Makefile.in   2009-02-07 22:08:33.741616148 -0800
     1057+++ ncurses-5.7/Ada95/src/Makefile.in   2009-02-15 23:21:14.347823438 -0800
    10581058@@ -1,5 +1,5 @@
    10591059 ##############################################################################
     
    11471147diff -Naur ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb
    11481148--- ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb      2008-07-26 11:51:11.000000000 -0700
    1149 +++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb   2009-02-07 22:08:17.954755972 -0800
     1149+++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb   2009-02-15 23:21:00.210918563 -0800
    11501150@@ -35,8 +35,8 @@
    11511151 ------------------------------------------------------------------------------
     
    11701170diff -Naur ncurses-5.7.orig/c++/cursesw.cc ncurses-5.7/c++/cursesw.cc
    11711171--- ncurses-5.7.orig/c++/cursesw.cc     2007-12-15 15:01:57.000000000 -0800
    1172 +++ ncurses-5.7/c++/cursesw.cc  2009-02-07 22:08:17.958857941 -0800
     1172+++ ncurses-5.7/c++/cursesw.cc  2009-02-15 23:21:00.214919122 -0800
    11731173@@ -1,6 +1,6 @@
    11741174 // * this is for making emacs happy: -*-Mode: C++;-*-
     
    12071207diff -Naur ncurses-5.7.orig/c++/Makefile.in ncurses-5.7/c++/Makefile.in
    12081208--- ncurses-5.7.orig/c++/Makefile.in    2007-04-28 08:29:12.000000000 -0700
    1209 +++ ncurses-5.7/c++/Makefile.in 2009-02-07 22:08:29.717995810 -0800
     1209+++ ncurses-5.7/c++/Makefile.in 2009-02-15 23:21:09.899537365 -0800
    12101210@@ -1,6 +1,6 @@
    12111211-# $Id: Makefile.in,v 1.84 2007/04/28 15:29:12 tom Exp $
     
    12411241diff -Naur ncurses-5.7.orig/config.guess ncurses-5.7/config.guess
    12421242--- ncurses-5.7.orig/config.guess       2008-08-30 13:25:07.000000000 -0700
    1243 +++ ncurses-5.7/config.guess    2009-02-07 22:08:29.717995810 -0800
     1243+++ ncurses-5.7/config.guess    2009-02-15 23:21:09.899537365 -0800
    12441244@@ -4,7 +4,7 @@
    12451245 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
     
    13111311diff -Naur ncurses-5.7.orig/config.sub ncurses-5.7/config.sub
    13121312--- ncurses-5.7.orig/config.sub 2008-08-30 13:25:02.000000000 -0700
    1313 +++ ncurses-5.7/config.sub      2009-02-07 22:08:29.722097500 -0800
     1313+++ ncurses-5.7/config.sub      2009-02-15 23:21:09.903537644 -0800
    13141314@@ -4,7 +4,7 @@
    13151315 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
     
    13951395diff -Naur ncurses-5.7.orig/configure ncurses-5.7/configure
    13961396--- ncurses-5.7.orig/configure  2008-10-25 17:04:38.000000000 -0700
    1397 +++ ncurses-5.7/configure       2009-02-07 22:08:38.019530661 -0800
     1397+++ ncurses-5.7/configure       2009-02-15 23:21:24.616480793 -0800
    13981398@@ -1,7 +1,7 @@
    13991399 #! /bin/sh
    14001400-# From configure.in Revision: 1.454 .
    1401 +# From configure.in Revision: 1.465 .
     1401+# From configure.in Revision: 1.466 .
    14021402 # Guess values for system-dependent variables and create Makefiles.
    14031403-# Generated by Autoconf 2.52.20080325.
     
    14181418   --with-install-prefix   prefixes actual install-location ($DESTDIR)
    14191419 Build-Tools Needed to Compile Temporary Applications for Cross-compiling:
    1420 @@ -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 @@
    14211429 running configure, to aid debugging if configure makes a mistake.
    14221430 
     
    14271435   $ $0 $@
    14281436 
    1429 @@ -994,7 +997,7 @@
     1437@@ -994,7 +998,7 @@
    14301438 fi
    14311439 for ac_site_file in $CONFIG_SITE; do
    14321440   if test -r "$ac_site_file"; then
    14331441-    { echo "$as_me:997: loading site script $ac_site_file" >&5
    1434 +    { echo "$as_me:1000: loading site script $ac_site_file" >&5
     1442+    { echo "$as_me:1001: loading site script $ac_site_file" >&5
    14351443 echo "$as_me: loading site script $ac_site_file" >&6;}
    14361444     cat "$ac_site_file" >&5
    14371445     . "$ac_site_file"
    1438 @@ -1005,7 +1008,7 @@
     1446@@ -1005,7 +1009,7 @@
    14391447   # Some versions of bash will fail to source /dev/null (special
    14401448   # files actually), so we avoid doing that.
    14411449   if test -f "$cache_file"; then
    14421450-    { echo "$as_me:1008: loading cache $cache_file" >&5
    1443 +    { echo "$as_me:1011: loading cache $cache_file" >&5
     1451+    { echo "$as_me:1012: loading cache $cache_file" >&5
    14441452 echo "$as_me: loading cache $cache_file" >&6;}
    14451453     case $cache_file in
    14461454       [\\/]* | ?:[\\/]* ) . $cache_file;;
    1447 @@ -1013,7 +1016,7 @@
     1455@@ -1013,7 +1017,7 @@
    14481456     esac
    14491457   fi
    14501458 else
    14511459-  { echo "$as_me:1016: creating cache $cache_file" >&5
    1452 +  { echo "$as_me:1019: creating cache $cache_file" >&5
     1460+  { echo "$as_me:1020: creating cache $cache_file" >&5
    14531461 echo "$as_me: creating cache $cache_file" >&6;}
    14541462   >$cache_file
    14551463 fi
    1456 @@ -1029,21 +1032,21 @@
     1464@@ -1029,21 +1033,21 @@
    14571465   eval ac_new_val="\$ac_env_${ac_var}_value"
    14581466   case $ac_old_set,$ac_new_set in
    14591467     set,)
    14601468-      { echo "$as_me:1032: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
    1461 +      { 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
    14621470 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
    14631471       ac_cache_corrupted=: ;;
    14641472     ,set)
    14651473-      { echo "$as_me:1036: error: \`$ac_var' was not set in the previous run" >&5
    1466 +      { 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
    14671475 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
    14681476       ac_cache_corrupted=: ;;
     
    14711479       if test "x$ac_old_val" != "x$ac_new_val"; then
    14721480-        { echo "$as_me:1042: error: \`$ac_var' has changed since the previous run:" >&5
    1473 +        { 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
    14741482 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
    14751483-        { echo "$as_me:1044:   former value:  $ac_old_val" >&5
    1476 +        { echo "$as_me:1047:   former value:  $ac_old_val" >&5
     1484+        { echo "$as_me:1048:   former value:  $ac_old_val" >&5
    14771485 echo "$as_me:   former value:  $ac_old_val" >&2;}
    14781486-        { echo "$as_me:1046:   current value: $ac_new_val" >&5
    1479 +        { echo "$as_me:1049:   current value: $ac_new_val" >&5
     1487+        { echo "$as_me:1050:   current value: $ac_new_val" >&5
    14801488 echo "$as_me:   current value: $ac_new_val" >&2;}
    14811489         ac_cache_corrupted=:
    14821490       fi;;
    1483 @@ -1062,9 +1065,9 @@
     1491@@ -1062,9 +1066,9 @@
    14841492   fi
    14851493 done
    14861494 if $ac_cache_corrupted; then
    14871495-  { echo "$as_me:1065: error: changes in the environment can compromise the build" >&5
    1488 +  { 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
    14891497 echo "$as_me: error: changes in the environment can compromise the build" >&2;}
    14901498-  { { echo "$as_me:1067: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
    1491 +  { { 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
    14921500 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    14931501    { (exit 1); exit 1; }; }
    14941502 fi
    1495 @@ -1085,10 +1088,10 @@
     1503@@ -1085,10 +1089,10 @@
    14961504 echo "#! $SHELL" >conftest.sh
    14971505 echo  "exit 0"   >>conftest.sh
    14981506 chmod +x conftest.sh
    14991507-if { (echo "$as_me:1088: PATH=\".;.\"; conftest.sh") >&5
    1500 +if { (echo "$as_me:1091: PATH=\".;.\"; conftest.sh") >&5
     1508+if { (echo "$as_me:1092: PATH=\".;.\"; conftest.sh") >&5
    15011509   (PATH=".;."; conftest.sh) 2>&5
    15021510   ac_status=$?
    15031511-  echo "$as_me:1091: \$? = $ac_status" >&5
    1504 +  echo "$as_me:1094: \$? = $ac_status" >&5
     1512+  echo "$as_me:1095: \$? = $ac_status" >&5
    15051513   (exit $ac_status); }; then
    15061514   ac_path_separator=';'
    15071515 else
    1508 @@ -1101,7 +1104,7 @@
     1516@@ -1101,7 +1105,7 @@
    15091517 
    15101518 top_builddir=`pwd`
    15111519 
    15121520-echo "$as_me:1104: checking for egrep" >&5
    1513 +echo "$as_me:1107: checking for egrep" >&5
     1521+echo "$as_me:1108: checking for egrep" >&5
    15141522 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
    15151523 if test "${ac_cv_prog_egrep+set}" = set; then
    15161524   echo $ECHO_N "(cached) $ECHO_C" >&6
    1517 @@ -1111,11 +1114,11 @@
     1525@@ -1111,11 +1115,11 @@
    15181526     else ac_cv_prog_egrep='egrep'
    15191527     fi
    15201528 fi
    15211529-echo "$as_me:1114: result: $ac_cv_prog_egrep" >&5
    1522 +echo "$as_me:1117: result: $ac_cv_prog_egrep" >&5
     1530+echo "$as_me:1118: result: $ac_cv_prog_egrep" >&5
    15231531 echo "${ECHO_T}$ac_cv_prog_egrep" >&6
    15241532  EGREP=$ac_cv_prog_egrep
    15251533 
    15261534-test -z "$EGREP" && { { echo "$as_me:1118: error: No egrep program found" >&5
    1527 +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
    15281536 echo "$as_me: error: No egrep program found" >&2;}
    15291537    { (exit 1); exit 1; }; }
    15301538 
    1531 @@ -1125,7 +1128,7 @@
     1539@@ -1125,7 +1129,7 @@
    15321540 cf_cv_abi_version=${NCURSES_MAJOR}
    15331541 cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
    15341542 cf_cv_timestamp=`date`
    15351543-echo "$as_me:1128: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
    1536 +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
    15371545 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
    15381546 
    15391547 test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
    1540 @@ -1133,7 +1136,7 @@
     1548@@ -1133,7 +1137,7 @@
    15411549 # Check whether --with-rel-version or --without-rel-version was given.
    15421550 if test "${with_rel_version+set}" = set; then
    15431551   withval="$with_rel_version"
    15441552-  { echo "$as_me:1136: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
    1545 +  { 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
    15461554 echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;}
    15471555  cf_cv_rel_version=$withval
    15481556 fi;
    1549 @@ -1146,13 +1149,13 @@
     1557@@ -1146,13 +1150,13 @@
    15501558   [0-9]*) #(vi
    15511559        ;;
    15521560   *)
    15531561-       { { echo "$as_me:1149: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
    1554 +       { { 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
    15551563 echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;}
    15561564    { (exit 1); exit 1; }; }
     
    15591567 else
    15601568-  { { echo "$as_me:1155: error: Release major-version value is empty" >&5
    1561 +  { { 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
    15621570 echo "$as_me: error: Release major-version value is empty" >&2;}
    15631571    { (exit 1); exit 1; }; }
    15641572 fi
    1565 @@ -1162,13 +1165,13 @@
     1573@@ -1162,13 +1166,13 @@
    15661574   [0-9]*) #(vi
    15671575        ;;
    15681576   *)
    15691577-       { { echo "$as_me:1165: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
    1570 +       { { 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
    15711579 echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;}
    15721580    { (exit 1); exit 1; }; }
     
    15751583 else
    15761584-  { { echo "$as_me:1171: error: Release minor-version value is empty" >&5
    1577 +  { { 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
    15781586 echo "$as_me: error: Release minor-version value is empty" >&2;}
    15791587    { (exit 1); exit 1; }; }
    15801588 fi
    1581 @@ -1178,7 +1181,7 @@
     1589@@ -1178,7 +1182,7 @@
    15821590 # Check whether --with-abi-version or --without-abi-version was given.
    15831591 if test "${with_abi_version+set}" = set; then
    15841592   withval="$with_abi_version"
    15851593-  { echo "$as_me:1181: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
    1586 +  { 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
    15871595 echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;}
    15881596  cf_cv_abi_version=$withval
    15891597 fi;
    1590 @@ -1188,13 +1191,13 @@
     1598@@ -1188,13 +1192,13 @@
    15911599   [0-9]*) #(vi
    15921600        ;;
    15931601   *)
    15941602-       { { echo "$as_me:1191: error: ABI version is not a number: $cf_cv_abi_version" >&5
    1595 +       { { 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
    15961604 echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;}
    15971605    { (exit 1); exit 1; }; }
     
    16001608 else
    16011609-  { { echo "$as_me:1197: error: ABI version value is empty" >&5
    1602 +  { { echo "$as_me:1200: error: ABI version value is empty" >&5
     1610+  { { echo "$as_me:1201: error: ABI version value is empty" >&5
    16031611 echo "$as_me: error: ABI version value is empty" >&2;}
    16041612    { (exit 1); exit 1; }; }
    16051613 fi
    1606 @@ -1216,7 +1219,7 @@
     1614@@ -1216,7 +1220,7 @@
    16071615   fi
    16081616 done
    16091617 if test -z "$ac_aux_dir"; then
    16101618-  { { echo "$as_me:1219: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
    1611 +  { { 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
    16121620 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    16131621    { (exit 1); exit 1; }; }
    16141622 fi
    1615 @@ -1226,11 +1229,11 @@
     1623@@ -1226,11 +1230,11 @@
    16161624 
    16171625 # Make sure we can run config.sub.
    16181626 $ac_config_sub sun4 >/dev/null 2>&1 ||
    16191627-  { { echo "$as_me:1229: error: cannot run $ac_config_sub" >&5
    1620 +  { { echo "$as_me:1232: error: cannot run $ac_config_sub" >&5
     1628+  { { echo "$as_me:1233: error: cannot run $ac_config_sub" >&5
    16211629 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    16221630    { (exit 1); exit 1; }; }
    16231631 
    16241632-echo "$as_me:1233: checking build system type" >&5
    1625 +echo "$as_me:1236: checking build system type" >&5
     1633+echo "$as_me:1237: checking build system type" >&5
    16261634 echo $ECHO_N "checking build system type... $ECHO_C" >&6
    16271635 if test "${ac_cv_build+set}" = set; then
    16281636   echo $ECHO_N "(cached) $ECHO_C" >&6
    1629 @@ -1239,23 +1242,23 @@
     1637@@ -1239,23 +1243,23 @@
    16301638 test -z "$ac_cv_build_alias" &&
    16311639   ac_cv_build_alias=`$ac_config_guess`
    16321640 test -z "$ac_cv_build_alias" &&
    16331641-  { { echo "$as_me:1242: error: cannot guess build type; you must specify one" >&5
    1634 +  { { 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
    16351643 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    16361644    { (exit 1); exit 1; }; }
    16371645 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
    16381646-  { { echo "$as_me:1246: error: $ac_config_sub $ac_cv_build_alias failed." >&5
    1639 +  { { 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
    16401648 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
    16411649    { (exit 1); exit 1; }; }
     
    16431651 fi
    16441652-echo "$as_me:1251: result: $ac_cv_build" >&5
    1645 +echo "$as_me:1254: result: $ac_cv_build" >&5
     1653+echo "$as_me:1255: result: $ac_cv_build" >&5
    16461654 echo "${ECHO_T}$ac_cv_build" >&6
    16471655 build=$ac_cv_build
     
    16511659 
    16521660-echo "$as_me:1258: checking host system type" >&5
    1653 +echo "$as_me:1261: checking host system type" >&5
     1661+echo "$as_me:1262: checking host system type" >&5
    16541662 echo $ECHO_N "checking host system type... $ECHO_C" >&6
    16551663 if test "${ac_cv_host+set}" = set; then
    16561664   echo $ECHO_N "(cached) $ECHO_C" >&6
    1657 @@ -1264,12 +1267,12 @@
     1665@@ -1264,12 +1268,12 @@
    16581666 test -z "$ac_cv_host_alias" &&
    16591667   ac_cv_host_alias=$ac_cv_build_alias
    16601668 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
    16611669-  { { echo "$as_me:1267: error: $ac_config_sub $ac_cv_host_alias failed" >&5
    1662 +  { { 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
    16631671 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    16641672    { (exit 1); exit 1; }; }
     
    16661674 fi
    16671675-echo "$as_me:1272: result: $ac_cv_host" >&5
    1668 +echo "$as_me:1275: result: $ac_cv_host" >&5
     1676+echo "$as_me:1276: result: $ac_cv_host" >&5
    16691677 echo "${ECHO_T}$ac_cv_host" >&6
    16701678 host=$ac_cv_host
    16711679 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
    1672 @@ -1277,7 +1280,7 @@
     1680@@ -1277,7 +1281,7 @@
    16731681 host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
    16741682 
    16751683 if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
    16761684-       echo "$as_me:1280: checking target system type" >&5
    1677 +       echo "$as_me:1283: checking target system type" >&5
     1685+       echo "$as_me:1284: checking target system type" >&5
    16781686 echo $ECHO_N "checking target system type... $ECHO_C" >&6
    16791687 if test "${ac_cv_target+set}" = set; then
    16801688   echo $ECHO_N "(cached) $ECHO_C" >&6
    1681 @@ -1286,12 +1289,12 @@
     1689@@ -1286,12 +1290,12 @@
    16821690 test "x$ac_cv_target_alias" = "x" &&
    16831691   ac_cv_target_alias=$ac_cv_host_alias
    16841692 ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
    16851693-  { { echo "$as_me:1289: error: $ac_config_sub $ac_cv_target_alias failed" >&5
    1686 +  { { 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
    16871695 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
    16881696    { (exit 1); exit 1; }; }
     
    16901698 fi
    16911699-echo "$as_me:1294: result: $ac_cv_target" >&5
    1692 +echo "$as_me:1297: result: $ac_cv_target" >&5
     1700+echo "$as_me:1298: result: $ac_cv_target" >&5
    16931701 echo "${ECHO_T}$ac_cv_target" >&6
    16941702 target=$ac_cv_target
    16951703 target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
    1696 @@ -1322,13 +1325,13 @@
     1704@@ -1322,13 +1326,13 @@
    16971705 fi
    16981706 
    16991707 test -z "$system_name" && system_name="$cf_cv_system_name"
    17001708-test -n "$cf_cv_system_name" && echo "$as_me:1325: result: Configuring for $cf_cv_system_name" >&5
    1701 +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
    17021710 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
    17031711 
    17041712 if test ".$system_name" != ".$cf_cv_system_name" ; then
    17051713-       echo "$as_me:1329: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
    1706 +       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
    17071715 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
    17081716-       { { echo "$as_me:1331: error: \"Please remove config.cache and try again.\"" >&5
    1709 +       { { 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
    17101718 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
    17111719    { (exit 1); exit 1; }; }
    17121720 fi
    1713 @@ -1336,7 +1339,7 @@
     1721@@ -1336,7 +1340,7 @@
    17141722 # Check whether --with-system-type or --without-system-type was given.
    17151723 if test "${with_system_type+set}" = set; then
    17161724   withval="$with_system_type"
    17171725-  { echo "$as_me:1339: WARNING: overriding system type to $withval" >&5
    1718 +  { echo "$as_me:1342: WARNING: overriding system type to $withval" >&5
     1726+  { echo "$as_me:1343: WARNING: overriding system type to $withval" >&5
    17191727 echo "$as_me: WARNING: overriding system type to $withval" >&2;}
    17201728  cf_cv_system_name=$withval
    17211729 fi;
    1722 @@ -1346,7 +1349,7 @@
     1730@@ -1346,7 +1350,7 @@
    17231731 
    17241732 ###    Default install-location
    17251733 
    17261734-echo "$as_me:1349: checking for prefix" >&5
    1727 +echo "$as_me:1352: checking for prefix" >&5
     1735+echo "$as_me:1353: checking for prefix" >&5
    17281736 echo $ECHO_N "checking for prefix... $ECHO_C" >&6
    17291737 if test "x$prefix" = "xNONE" ; then
    17301738        case "$cf_cv_system_name" in
    1731 @@ -1358,11 +1361,11 @@
     1739@@ -1358,11 +1362,11 @@
    17321740                ;;
    17331741        esac
    17341742 fi
    17351743-echo "$as_me:1361: result: $prefix" >&5
    1736 +echo "$as_me:1364: result: $prefix" >&5
     1744+echo "$as_me:1365: result: $prefix" >&5
    17371745 echo "${ECHO_T}$prefix" >&6
    17381746 
    17391747 if test "x$prefix" = "xNONE" ; then
    17401748-echo "$as_me:1365: checking for default include-directory" >&5
    1741 +echo "$as_me:1368: checking for default include-directory" >&5
     1749+echo "$as_me:1369: checking for default include-directory" >&5
    17421750 echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
    17431751 test -n "$verbose" && echo 1>&6
    17441752 for cf_symbol in \
    1745 @@ -1385,7 +1388,7 @@
     1753@@ -1385,7 +1389,7 @@
    17461754        fi
    17471755        test -n "$verbose"  && echo "   tested $cf_dir" 1>&6
    17481756 done
    17491757-echo "$as_me:1388: result: $includedir" >&5
    1750 +echo "$as_me:1391: result: $includedir" >&5
     1758+echo "$as_me:1392: result: $includedir" >&5
    17511759 echo "${ECHO_T}$includedir" >&6
    17521760 fi
    17531761 
    1754 @@ -1399,7 +1402,7 @@
     1762@@ -1399,7 +1403,7 @@
    17551763 if test -n "$ac_tool_prefix"; then
    17561764   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
    17571765 set dummy ${ac_tool_prefix}gcc; ac_word=$2
    17581766-echo "$as_me:1402: checking for $ac_word" >&5
    1759 +echo "$as_me:1405: checking for $ac_word" >&5
     1767+echo "$as_me:1406: checking for $ac_word" >&5
    17601768 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    17611769 if test "${ac_cv_prog_CC+set}" = set; then
    17621770   echo $ECHO_N "(cached) $ECHO_C" >&6
    1763 @@ -1414,7 +1417,7 @@
     1771@@ -1414,7 +1418,7 @@
    17641772   test -z "$ac_dir" && ac_dir=.
    17651773   $as_executable_p "$ac_dir/$ac_word" || continue
    17661774 ac_cv_prog_CC="${ac_tool_prefix}gcc"
    17671775-echo "$as_me:1417: found $ac_dir/$ac_word" >&5
    1768 +echo "$as_me:1420: found $ac_dir/$ac_word" >&5
     1776+echo "$as_me:1421: found $ac_dir/$ac_word" >&5
    17691777 break
    17701778 done
    17711779 
    1772 @@ -1422,10 +1425,10 @@
     1780@@ -1422,10 +1426,10 @@
    17731781 fi
    17741782 CC=$ac_cv_prog_CC
    17751783 if test -n "$CC"; then
    17761784-  echo "$as_me:1425: result: $CC" >&5
    1777 +  echo "$as_me:1428: result: $CC" >&5
     1785+  echo "$as_me:1429: result: $CC" >&5
    17781786 echo "${ECHO_T}$CC" >&6
    17791787 else
    17801788-  echo "$as_me:1428: result: no" >&5
    1781 +  echo "$as_me:1431: result: no" >&5
     1789+  echo "$as_me:1432: result: no" >&5
    17821790 echo "${ECHO_T}no" >&6
    17831791 fi
    17841792 
    1785 @@ -1434,7 +1437,7 @@
     1793@@ -1434,7 +1438,7 @@
    17861794   ac_ct_CC=$CC
    17871795   # Extract the first word of "gcc", so it can be a program name with args.
    17881796 set dummy gcc; ac_word=$2
    17891797-echo "$as_me:1437: checking for $ac_word" >&5
    1790 +echo "$as_me:1440: checking for $ac_word" >&5
     1798+echo "$as_me:1441: checking for $ac_word" >&5
    17911799 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    17921800 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    17931801   echo $ECHO_N "(cached) $ECHO_C" >&6
    1794 @@ -1449,7 +1452,7 @@
     1802@@ -1449,7 +1453,7 @@
    17951803   test -z "$ac_dir" && ac_dir=.
    17961804   $as_executable_p "$ac_dir/$ac_word" || continue
    17971805 ac_cv_prog_ac_ct_CC="gcc"
    17981806-echo "$as_me:1452: found $ac_dir/$ac_word" >&5
    1799 +echo "$as_me:1455: found $ac_dir/$ac_word" >&5
     1807+echo "$as_me:1456: found $ac_dir/$ac_word" >&5
    18001808 break
    18011809 done
    18021810 
    1803 @@ -1457,10 +1460,10 @@
     1811@@ -1457,10 +1461,10 @@
    18041812 fi
    18051813 ac_ct_CC=$ac_cv_prog_ac_ct_CC
    18061814 if test -n "$ac_ct_CC"; then
    18071815-  echo "$as_me:1460: result: $ac_ct_CC" >&5
    1808 +  echo "$as_me:1463: result: $ac_ct_CC" >&5
     1816+  echo "$as_me:1464: result: $ac_ct_CC" >&5
    18091817 echo "${ECHO_T}$ac_ct_CC" >&6
    18101818 else
    18111819-  echo "$as_me:1463: result: no" >&5
    1812 +  echo "$as_me:1466: result: no" >&5
     1820+  echo "$as_me:1467: result: no" >&5
    18131821 echo "${ECHO_T}no" >&6
    18141822 fi
    18151823 
    1816 @@ -1473,7 +1476,7 @@
     1824@@ -1473,7 +1477,7 @@
    18171825   if test -n "$ac_tool_prefix"; then
    18181826   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
    18191827 set dummy ${ac_tool_prefix}cc; ac_word=$2
    18201828-echo "$as_me:1476: checking for $ac_word" >&5
    1821 +echo "$as_me:1479: checking for $ac_word" >&5
     1829+echo "$as_me:1480: checking for $ac_word" >&5
    18221830 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    18231831 if test "${ac_cv_prog_CC+set}" = set; then
    18241832   echo $ECHO_N "(cached) $ECHO_C" >&6
    1825 @@ -1488,7 +1491,7 @@
     1833@@ -1488,7 +1492,7 @@
    18261834   test -z "$ac_dir" && ac_dir=.
    18271835   $as_executable_p "$ac_dir/$ac_word" || continue
    18281836 ac_cv_prog_CC="${ac_tool_prefix}cc"
    18291837-echo "$as_me:1491: found $ac_dir/$ac_word" >&5
    1830 +echo "$as_me:1494: found $ac_dir/$ac_word" >&5
     1838+echo "$as_me:1495: found $ac_dir/$ac_word" >&5
    18311839 break
    18321840 done
    18331841 
    1834 @@ -1496,10 +1499,10 @@
     1842@@ -1496,10 +1500,10 @@
    18351843 fi
    18361844 CC=$ac_cv_prog_CC
    18371845 if test -n "$CC"; then
    18381846-  echo "$as_me:1499: result: $CC" >&5
    1839 +  echo "$as_me:1502: result: $CC" >&5
     1847+  echo "$as_me:1503: result: $CC" >&5
    18401848 echo "${ECHO_T}$CC" >&6
    18411849 else
    18421850-  echo "$as_me:1502: result: no" >&5
    1843 +  echo "$as_me:1505: result: no" >&5
     1851+  echo "$as_me:1506: result: no" >&5
    18441852 echo "${ECHO_T}no" >&6
    18451853 fi
    18461854 
    1847 @@ -1508,7 +1511,7 @@
     1855@@ -1508,7 +1512,7 @@
    18481856   ac_ct_CC=$CC
    18491857   # Extract the first word of "cc", so it can be a program name with args.
    18501858 set dummy cc; ac_word=$2
    18511859-echo "$as_me:1511: checking for $ac_word" >&5
    1852 +echo "$as_me:1514: checking for $ac_word" >&5
     1860+echo "$as_me:1515: checking for $ac_word" >&5
    18531861 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    18541862 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    18551863   echo $ECHO_N "(cached) $ECHO_C" >&6
    1856 @@ -1523,7 +1526,7 @@
     1864@@ -1523,7 +1527,7 @@
    18571865   test -z "$ac_dir" && ac_dir=.
    18581866   $as_executable_p "$ac_dir/$ac_word" || continue
    18591867 ac_cv_prog_ac_ct_CC="cc"
    18601868-echo "$as_me:1526: found $ac_dir/$ac_word" >&5
    1861 +echo "$as_me:1529: found $ac_dir/$ac_word" >&5
     1869+echo "$as_me:1530: found $ac_dir/$ac_word" >&5
    18621870 break
    18631871 done
    18641872 
    1865 @@ -1531,10 +1534,10 @@
     1873@@ -1531,10 +1535,10 @@
    18661874 fi
    18671875 ac_ct_CC=$ac_cv_prog_ac_ct_CC
    18681876 if test -n "$ac_ct_CC"; then
    18691877-  echo "$as_me:1534: result: $ac_ct_CC" >&5
    1870 +  echo "$as_me:1537: result: $ac_ct_CC" >&5
     1878+  echo "$as_me:1538: result: $ac_ct_CC" >&5
    18711879 echo "${ECHO_T}$ac_ct_CC" >&6
    18721880 else
    18731881-  echo "$as_me:1537: result: no" >&5
    1874 +  echo "$as_me:1540: result: no" >&5
     1882+  echo "$as_me:1541: result: no" >&5
    18751883 echo "${ECHO_T}no" >&6
    18761884 fi
    18771885 
    1878 @@ -1547,7 +1550,7 @@
     1886@@ -1547,7 +1551,7 @@
    18791887 if test -z "$CC"; then
    18801888   # Extract the first word of "cc", so it can be a program name with args.
    18811889 set dummy cc; ac_word=$2
    18821890-echo "$as_me:1550: checking for $ac_word" >&5
    1883 +echo "$as_me:1553: checking for $ac_word" >&5
     1891+echo "$as_me:1554: checking for $ac_word" >&5
    18841892 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    18851893 if test "${ac_cv_prog_CC+set}" = set; then
    18861894   echo $ECHO_N "(cached) $ECHO_C" >&6
    1887 @@ -1567,7 +1570,7 @@
     1895@@ -1567,7 +1571,7 @@
    18881896   continue
    18891897 fi
    18901898 ac_cv_prog_CC="cc"
    18911899-echo "$as_me:1570: found $ac_dir/$ac_word" >&5
    1892 +echo "$as_me:1573: found $ac_dir/$ac_word" >&5
     1900+echo "$as_me:1574: found $ac_dir/$ac_word" >&5
    18931901 break
    18941902 done
    18951903 
    1896 @@ -1589,10 +1592,10 @@
     1904@@ -1589,10 +1593,10 @@
    18971905 fi
    18981906 CC=$ac_cv_prog_CC
    18991907 if test -n "$CC"; then
    19001908-  echo "$as_me:1592: result: $CC" >&5
    1901 +  echo "$as_me:1595: result: $CC" >&5
     1909+  echo "$as_me:1596: result: $CC" >&5
    19021910 echo "${ECHO_T}$CC" >&6
    19031911 else
    19041912-  echo "$as_me:1595: result: no" >&5
    1905 +  echo "$as_me:1598: result: no" >&5
     1913+  echo "$as_me:1599: result: no" >&5
    19061914 echo "${ECHO_T}no" >&6
    19071915 fi
    19081916 
    1909 @@ -1603,7 +1606,7 @@
     1917@@ -1603,7 +1607,7 @@
    19101918   do
    19111919     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
    19121920 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
    19131921-echo "$as_me:1606: checking for $ac_word" >&5
    1914 +echo "$as_me:1609: checking for $ac_word" >&5
     1922+echo "$as_me:1610: checking for $ac_word" >&5
    19151923 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    19161924 if test "${ac_cv_prog_CC+set}" = set; then
    19171925   echo $ECHO_N "(cached) $ECHO_C" >&6
    1918 @@ -1618,7 +1621,7 @@
     1926@@ -1618,7 +1622,7 @@
    19191927   test -z "$ac_dir" && ac_dir=.
    19201928   $as_executable_p "$ac_dir/$ac_word" || continue
    19211929 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
    19221930-echo "$as_me:1621: found $ac_dir/$ac_word" >&5
    1923 +echo "$as_me:1624: found $ac_dir/$ac_word" >&5
     1931+echo "$as_me:1625: found $ac_dir/$ac_word" >&5
    19241932 break
    19251933 done
    19261934 
    1927 @@ -1626,10 +1629,10 @@
     1935@@ -1626,10 +1630,10 @@
    19281936 fi
    19291937 CC=$ac_cv_prog_CC
    19301938 if test -n "$CC"; then
    19311939-  echo "$as_me:1629: result: $CC" >&5
    1932 +  echo "$as_me:1632: result: $CC" >&5
     1940+  echo "$as_me:1633: result: $CC" >&5
    19331941 echo "${ECHO_T}$CC" >&6
    19341942 else
    19351943-  echo "$as_me:1632: result: no" >&5
    1936 +  echo "$as_me:1635: result: no" >&5
     1944+  echo "$as_me:1636: result: no" >&5
    19371945 echo "${ECHO_T}no" >&6
    19381946 fi
    19391947 
    1940 @@ -1642,7 +1645,7 @@
     1948@@ -1642,7 +1646,7 @@
    19411949 do
    19421950   # Extract the first word of "$ac_prog", so it can be a program name with args.
    19431951 set dummy $ac_prog; ac_word=$2
    19441952-echo "$as_me:1645: checking for $ac_word" >&5
    1945 +echo "$as_me:1648: checking for $ac_word" >&5
     1953+echo "$as_me:1649: checking for $ac_word" >&5
    19461954 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    19471955 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    19481956   echo $ECHO_N "(cached) $ECHO_C" >&6
    1949 @@ -1657,7 +1660,7 @@
     1957@@ -1657,7 +1661,7 @@
    19501958   test -z "$ac_dir" && ac_dir=.
    19511959   $as_executable_p "$ac_dir/$ac_word" || continue
    19521960 ac_cv_prog_ac_ct_CC="$ac_prog"
    19531961-echo "$as_me:1660: found $ac_dir/$ac_word" >&5
    1954 +echo "$as_me:1663: found $ac_dir/$ac_word" >&5
     1962+echo "$as_me:1664: found $ac_dir/$ac_word" >&5
    19551963 break
    19561964 done
    19571965 
    1958 @@ -1665,10 +1668,10 @@
     1966@@ -1665,10 +1669,10 @@
    19591967 fi
    19601968 ac_ct_CC=$ac_cv_prog_ac_ct_CC
    19611969 if test -n "$ac_ct_CC"; then
    19621970-  echo "$as_me:1668: result: $ac_ct_CC" >&5
    1963 +  echo "$as_me:1671: result: $ac_ct_CC" >&5
     1971+  echo "$as_me:1672: result: $ac_ct_CC" >&5
    19641972 echo "${ECHO_T}$ac_ct_CC" >&6
    19651973 else
    19661974-  echo "$as_me:1671: result: no" >&5
    1967 +  echo "$as_me:1674: result: no" >&5
     1975+  echo "$as_me:1675: result: no" >&5
    19681976 echo "${ECHO_T}no" >&6
    19691977 fi
    19701978 
    1971 @@ -1680,32 +1683,32 @@
     1979@@ -1680,32 +1684,32 @@
    19721980 
    19731981 fi
    19741982 
    19751983-test -z "$CC" && { { echo "$as_me:1683: error: no acceptable cc found in \$PATH" >&5
    1976 +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
    19771985 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    19781986    { (exit 1); exit 1; }; }
     
    19801988 # Provide some information about the compiler.
    19811989-echo "$as_me:1688:" \
    1982 +echo "$as_me:1691:" \
     1990+echo "$as_me:1692:" \
    19831991      "checking for C compiler version" >&5
    19841992 ac_compiler=`set X $ac_compile; echo $2`
    19851993-{ (eval echo "$as_me:1691: \"$ac_compiler --version </dev/null >&5\"") >&5
    1986 +{ (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
    19871995   (eval $ac_compiler --version </dev/null >&5) 2>&5
    19881996   ac_status=$?
    19891997-  echo "$as_me:1694: \$? = $ac_status" >&5
    1990 +  echo "$as_me:1697: \$? = $ac_status" >&5
     1998+  echo "$as_me:1698: \$? = $ac_status" >&5
    19911999   (exit $ac_status); }
    19922000-{ (eval echo "$as_me:1696: \"$ac_compiler -v </dev/null >&5\"") >&5
    1993 +{ (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
    19942002   (eval $ac_compiler -v </dev/null >&5) 2>&5
    19952003   ac_status=$?
    19962004-  echo "$as_me:1699: \$? = $ac_status" >&5
    1997 +  echo "$as_me:1702: \$? = $ac_status" >&5
     2005+  echo "$as_me:1703: \$? = $ac_status" >&5
    19982006   (exit $ac_status); }
    19992007-{ (eval echo "$as_me:1701: \"$ac_compiler -V </dev/null >&5\"") >&5
    2000 +{ (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
    20012009   (eval $ac_compiler -V </dev/null >&5) 2>&5
    20022010   ac_status=$?
    20032011-  echo "$as_me:1704: \$? = $ac_status" >&5
    2004 +  echo "$as_me:1707: \$? = $ac_status" >&5
     2012+  echo "$as_me:1708: \$? = $ac_status" >&5
    20052013   (exit $ac_status); }
    20062014 
    20072015 cat >conftest.$ac_ext <<_ACEOF
    20082016-#line 1708 "configure"
    2009 +#line 1711 "configure"
     2017+#line 1712 "configure"
    20102018 #include "confdefs.h"
    20112019 
    20122020 int
    2013 @@ -1721,13 +1724,13 @@
     2021@@ -1721,13 +1725,13 @@
    20142022 # Try to create an executable without -o first, disregard a.out.
    20152023 # It will help us diagnose broken compilers, and finding out an intuition
    20162024 # of exeext.
    20172025-echo "$as_me:1724: checking for C compiler default output" >&5
    2018 +echo "$as_me:1727: checking for C compiler default output" >&5
     2026+echo "$as_me:1728: checking for C compiler default output" >&5
    20192027 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
    20202028 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
    20212029-if { (eval echo "$as_me:1727: \"$ac_link_default\"") >&5
    2022 +if { (eval echo "$as_me:1730: \"$ac_link_default\"") >&5
     2030+if { (eval echo "$as_me:1731: \"$ac_link_default\"") >&5
    20232031   (eval $ac_link_default) 2>&5
    20242032   ac_status=$?
    20252033-  echo "$as_me:1730: \$? = $ac_status" >&5
    2026 +  echo "$as_me:1733: \$? = $ac_status" >&5
     2034+  echo "$as_me:1734: \$? = $ac_status" >&5
    20272035   (exit $ac_status); }; then
    20282036   # Find the output, starting from the most likely.  This scheme is
    20292037 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
    2030 @@ -1736,7 +1739,7 @@
     2038@@ -1736,7 +1740,7 @@
    20312039                 ls a.out conftest 2>/dev/null;
    20322040                 ls a.* conftest.* 2>/dev/null`; do
     
    20372045             # certainly right.
    20382046             break;;
    2039 @@ -1750,34 +1753,34 @@
     2047@@ -1750,34 +1754,34 @@
    20402048 else
    20412049   echo "$as_me: failed program was:" >&5
    20422050 cat conftest.$ac_ext >&5
    20432051-{ { echo "$as_me:1753: error: C compiler cannot create executables" >&5
    2044 +{ { echo "$as_me:1756: error: C compiler cannot create executables" >&5
     2052+{ { echo "$as_me:1757: error: C compiler cannot create executables" >&5
    20452053 echo "$as_me: error: C compiler cannot create executables" >&2;}
    20462054    { (exit 77); exit 77; }; }
     
    20492057 ac_exeext=$ac_cv_exeext
    20502058-echo "$as_me:1759: result: $ac_file" >&5
    2051 +echo "$as_me:1762: result: $ac_file" >&5
     2059+echo "$as_me:1763: result: $ac_file" >&5
    20522060 echo "${ECHO_T}$ac_file" >&6
    20532061 
     
    20552063 # the compiler is broken, or we cross compile.
    20562064-echo "$as_me:1764: checking whether the C compiler works" >&5
    2057 +echo "$as_me:1767: checking whether the C compiler works" >&5
     2065+echo "$as_me:1768: checking whether the C compiler works" >&5
    20582066 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
    20592067 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
     
    20622070   if { ac_try='./$ac_file'
    20632071-  { (eval echo "$as_me:1770: \"$ac_try\"") >&5
    2064 +  { (eval echo "$as_me:1773: \"$ac_try\"") >&5
     2072+  { (eval echo "$as_me:1774: \"$ac_try\"") >&5
    20652073   (eval $ac_try) 2>&5
    20662074   ac_status=$?
    20672075-  echo "$as_me:1773: \$? = $ac_status" >&5
    2068 +  echo "$as_me:1776: \$? = $ac_status" >&5
     2076+  echo "$as_me:1777: \$? = $ac_status" >&5
    20692077   (exit $ac_status); }; }; then
    20702078     cross_compiling=no
     
    20742082     else
    20752083-       { { echo "$as_me:1780: error: cannot run C compiled programs.
    2076 +       { { echo "$as_me:1783: error: cannot run C compiled programs.
     2084+       { { echo "$as_me:1784: error: cannot run C compiled programs.
    20772085 If you meant to cross compile, use \`--host'." >&5
    20782086 echo "$as_me: error: cannot run C compiled programs.
    20792087 If you meant to cross compile, use \`--host'." >&2;}
    2080 @@ -1785,24 +1788,24 @@
     2088@@ -1785,24 +1789,24 @@
    20812089     fi
    20822090   fi
    20832091 fi
    20842092-echo "$as_me:1788: result: yes" >&5
    2085 +echo "$as_me:1791: result: yes" >&5
     2093+echo "$as_me:1792: result: yes" >&5
    20862094 echo "${ECHO_T}yes" >&6
    20872095 
     
    20912099 # the compiler is broken, or we cross compile.
    20922100-echo "$as_me:1795: checking whether we are cross compiling" >&5
    2093 +echo "$as_me:1798: checking whether we are cross compiling" >&5
     2101+echo "$as_me:1799: checking whether we are cross compiling" >&5
    20942102 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
    20952103-echo "$as_me:1797: result: $cross_compiling" >&5
    2096 +echo "$as_me:1800: result: $cross_compiling" >&5
     2104+echo "$as_me:1801: result: $cross_compiling" >&5
    20972105 echo "${ECHO_T}$cross_compiling" >&6
    20982106 
    20992107-echo "$as_me:1800: checking for executable suffix" >&5
    2100 +echo "$as_me:1803: checking for executable suffix" >&5
     2108+echo "$as_me:1804: checking for executable suffix" >&5
    21012109 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
    21022110-if { (eval echo "$as_me:1802: \"$ac_link\"") >&5
    2103 +if { (eval echo "$as_me:1805: \"$ac_link\"") >&5
     2111+if { (eval echo "$as_me:1806: \"$ac_link\"") >&5
    21042112   (eval $ac_link) 2>&5
    21052113   ac_status=$?
    21062114-  echo "$as_me:1805: \$? = $ac_status" >&5
    2107 +  echo "$as_me:1808: \$? = $ac_status" >&5
     2115+  echo "$as_me:1809: \$? = $ac_status" >&5
    21082116   (exit $ac_status); }; then
    21092117   # If both `conftest.exe' and `conftest' are `present' (well, observable)
    21102118 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
    2111 @@ -1810,7 +1813,7 @@
     2119@@ -1810,7 +1814,7 @@
    21122120 # `rm'.
    21132121 for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
     
    21182126           export ac_cv_exeext
    21192127           break;;
    2120 @@ -1818,25 +1821,25 @@
     2128@@ -1818,25 +1822,25 @@
    21212129   esac
    21222130 done
    21232131 else
    21242132-  { { echo "$as_me:1821: error: cannot compute EXEEXT: cannot compile and link" >&5
    2125 +  { { 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
    21262134 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    21272135    { (exit 1); exit 1; }; }
     
    21302138 rm -f conftest$ac_cv_exeext
    21312139-echo "$as_me:1827: result: $ac_cv_exeext" >&5
    2132 +echo "$as_me:1830: result: $ac_cv_exeext" >&5
     2140+echo "$as_me:1831: result: $ac_cv_exeext" >&5
    21332141 echo "${ECHO_T}$ac_cv_exeext" >&6
    21342142 
     
    21372145 ac_exeext=$EXEEXT
    21382146-echo "$as_me:1833: checking for object suffix" >&5
    2139 +echo "$as_me:1836: checking for object suffix" >&5
     2147+echo "$as_me:1837: checking for object suffix" >&5
    21402148 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
    21412149 if test "${ac_cv_objext+set}" = set; then
     
    21442152   cat >conftest.$ac_ext <<_ACEOF
    21452153-#line 1839 "configure"
    2146 +#line 1842 "configure"
     2154+#line 1843 "configure"
    21472155 #include "confdefs.h"
    21482156 
    21492157 int
    2150 @@ -1848,14 +1851,14 @@
     2158@@ -1848,14 +1852,14 @@
    21512159 }
    21522160 _ACEOF
    21532161 rm -f conftest.o conftest.obj
    21542162-if { (eval echo "$as_me:1851: \"$ac_compile\"") >&5
    2155 +if { (eval echo "$as_me:1854: \"$ac_compile\"") >&5
     2163+if { (eval echo "$as_me:1855: \"$ac_compile\"") >&5
    21562164   (eval $ac_compile) 2>&5
    21572165   ac_status=$?
    21582166-  echo "$as_me:1854: \$? = $ac_status" >&5
    2159 +  echo "$as_me:1857: \$? = $ac_status" >&5
     2167+  echo "$as_me:1858: \$? = $ac_status" >&5
    21602168   (exit $ac_status); }; then
    21612169   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
     
    21662174        break;;
    21672175   esac
    2168 @@ -1863,24 +1866,24 @@
     2176@@ -1863,24 +1867,24 @@
    21692177 else
    21702178   echo "$as_me: failed program was:" >&5
    21712179 cat conftest.$ac_ext >&5
    21722180-{ { echo "$as_me:1866: error: cannot compute OBJEXT: cannot compile" >&5
    2173 +{ { echo "$as_me:1869: error: cannot compute OBJEXT: cannot compile" >&5
     2181+{ { echo "$as_me:1870: error: cannot compute OBJEXT: cannot compile" >&5
    21742182 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    21752183    { (exit 1); exit 1; }; }
     
    21792187 fi
    21802188-echo "$as_me:1873: result: $ac_cv_objext" >&5
    2181 +echo "$as_me:1876: result: $ac_cv_objext" >&5
     2189+echo "$as_me:1877: result: $ac_cv_objext" >&5
    21822190 echo "${ECHO_T}$ac_cv_objext" >&6
    21832191 OBJEXT=$ac_cv_objext
    21842192 ac_objext=$OBJEXT
    21852193-echo "$as_me:1877: checking whether we are using the GNU C compiler" >&5
    2186 +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
    21872195 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
    21882196 if test "${ac_cv_c_compiler_gnu+set}" = set; then
     
    21912199   cat >conftest.$ac_ext <<_ACEOF
    21922200-#line 1883 "configure"
    2193 +#line 1886 "configure"
     2201+#line 1887 "configure"
    21942202 #include "confdefs.h"
    21952203 
    21962204 int
    2197 @@ -1895,16 +1898,16 @@
     2205@@ -1895,16 +1899,16 @@
    21982206 }
    21992207 _ACEOF
    22002208 rm -f conftest.$ac_objext
    22012209-if { (eval echo "$as_me:1898: \"$ac_compile\"") >&5
    2202 +if { (eval echo "$as_me:1901: \"$ac_compile\"") >&5
     2210+if { (eval echo "$as_me:1902: \"$ac_compile\"") >&5
    22032211   (eval $ac_compile) 2>&5
    22042212   ac_status=$?
    22052213-  echo "$as_me:1901: \$? = $ac_status" >&5
    2206 +  echo "$as_me:1904: \$? = $ac_status" >&5
     2214+  echo "$as_me:1905: \$? = $ac_status" >&5
    22072215   (exit $ac_status); } &&
    22082216          { ac_try='test -s conftest.$ac_objext'
    22092217-  { (eval echo "$as_me:1904: \"$ac_try\"") >&5
    2210 +  { (eval echo "$as_me:1907: \"$ac_try\"") >&5
     2218+  { (eval echo "$as_me:1908: \"$ac_try\"") >&5
    22112219   (eval $ac_try) 2>&5
    22122220   ac_status=$?
    22132221-  echo "$as_me:1907: \$? = $ac_status" >&5
    2214 +  echo "$as_me:1910: \$? = $ac_status" >&5
     2222+  echo "$as_me:1911: \$? = $ac_status" >&5
    22152223   (exit $ac_status); }; }; then
    22162224   ac_compiler_gnu=yes
    22172225 else
    2218 @@ -1916,19 +1919,19 @@
     2226@@ -1916,19 +1920,19 @@
    22192227 ac_cv_c_compiler_gnu=$ac_compiler_gnu
    22202228 
    22212229 fi
    22222230-echo "$as_me:1919: result: $ac_cv_c_compiler_gnu" >&5
    2223 +echo "$as_me:1922: result: $ac_cv_c_compiler_gnu" >&5
     2231+echo "$as_me:1923: result: $ac_cv_c_compiler_gnu" >&5
    22242232 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
    22252233 GCC=`test $ac_compiler_gnu = yes && echo yes`
     
    22282236 CFLAGS="-g"
    22292237-echo "$as_me:1925: checking whether $CC accepts -g" >&5
    2230 +echo "$as_me:1928: checking whether $CC accepts -g" >&5
     2238+echo "$as_me:1929: checking whether $CC accepts -g" >&5
    22312239 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
    22322240 if test "${ac_cv_prog_cc_g+set}" = set; then
     
    22352243   cat >conftest.$ac_ext <<_ACEOF
    22362244-#line 1931 "configure"
    2237 +#line 1934 "configure"
     2245+#line 1935 "configure"
    22382246 #include "confdefs.h"
    22392247 
    22402248 int
    2241 @@ -1940,16 +1943,16 @@
     2249@@ -1940,16 +1944,16 @@
    22422250 }
    22432251 _ACEOF
    22442252 rm -f conftest.$ac_objext
    22452253-if { (eval echo "$as_me:1943: \"$ac_compile\"") >&5
    2246 +if { (eval echo "$as_me:1946: \"$ac_compile\"") >&5
     2254+if { (eval echo "$as_me:1947: \"$ac_compile\"") >&5
    22472255   (eval $ac_compile) 2>&5
    22482256   ac_status=$?
    22492257-  echo "$as_me:1946: \$? = $ac_status" >&5
    2250 +  echo "$as_me:1949: \$? = $ac_status" >&5
     2258+  echo "$as_me:1950: \$? = $ac_status" >&5
    22512259   (exit $ac_status); } &&
    22522260          { ac_try='test -s conftest.$ac_objext'
    22532261-  { (eval echo "$as_me:1949: \"$ac_try\"") >&5
    2254 +  { (eval echo "$as_me:1952: \"$ac_try\"") >&5
     2262+  { (eval echo "$as_me:1953: \"$ac_try\"") >&5
    22552263   (eval $ac_try) 2>&5
    22562264   ac_status=$?
    22572265-  echo "$as_me:1952: \$? = $ac_status" >&5
    2258 +  echo "$as_me:1955: \$? = $ac_status" >&5
     2266+  echo "$as_me:1956: \$? = $ac_status" >&5
    22592267   (exit $ac_status); }; }; then
    22602268   ac_cv_prog_cc_g=yes
    22612269 else
    2262 @@ -1959,7 +1962,7 @@
     2270@@ -1959,7 +1963,7 @@
    22632271 fi
    22642272 rm -f conftest.$ac_objext conftest.$ac_ext
    22652273 fi
    22662274-echo "$as_me:1962: result: $ac_cv_prog_cc_g" >&5
    2267 +echo "$as_me:1965: result: $ac_cv_prog_cc_g" >&5
     2275+echo "$as_me:1966: result: $ac_cv_prog_cc_g" >&5
    22682276 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
    22692277 if test "$ac_test_CFLAGS" = set; then
    22702278   CFLAGS=$ac_save_CFLAGS
    2271 @@ -1986,16 +1989,16 @@
     2279@@ -1986,16 +1990,16 @@
    22722280 #endif
    22732281 _ACEOF
    22742282 rm -f conftest.$ac_objext
    22752283-if { (eval echo "$as_me:1989: \"$ac_compile\"") >&5
    2276 +if { (eval echo "$as_me:1992: \"$ac_compile\"") >&5
     2284+if { (eval echo "$as_me:1993: \"$ac_compile\"") >&5
    22772285   (eval $ac_compile) 2>&5
    22782286   ac_status=$?
    22792287-  echo "$as_me:1992: \$? = $ac_status" >&5
    2280 +  echo "$as_me:1995: \$? = $ac_status" >&5
     2288+  echo "$as_me:1996: \$? = $ac_status" >&5
    22812289   (exit $ac_status); } &&
    22822290          { ac_try='test -s conftest.$ac_objext'
    22832291-  { (eval echo "$as_me:1995: \"$ac_try\"") >&5
    2284 +  { (eval echo "$as_me:1998: \"$ac_try\"") >&5
     2292+  { (eval echo "$as_me:1999: \"$ac_try\"") >&5
    22852293   (eval $ac_try) 2>&5
    22862294   ac_status=$?
    22872295-  echo "$as_me:1998: \$? = $ac_status" >&5
    2288 +  echo "$as_me:2001: \$? = $ac_status" >&5
     2296+  echo "$as_me:2002: \$? = $ac_status" >&5
    22892297   (exit $ac_status); }; }; then
    22902298   for ac_declaration in \
    22912299    ''\
    2292 @@ -2007,7 +2010,7 @@
     2300@@ -2007,7 +2011,7 @@
    22932301    'void exit (int);'
    22942302 do
    22952303   cat >conftest.$ac_ext <<_ACEOF
    22962304-#line 2010 "configure"
    2297 +#line 2013 "configure"
     2305+#line 2014 "configure"
    22982306 #include "confdefs.h"
    22992307 #include <stdlib.h>
    23002308 $ac_declaration
    2301 @@ -2020,16 +2023,16 @@
     2309@@ -2020,16 +2024,16 @@
    23022310 }
    23032311 _ACEOF
    23042312 rm -f conftest.$ac_objext
    23052313-if { (eval echo "$as_me:2023: \"$ac_compile\"") >&5
    2306 +if { (eval echo "$as_me:2026: \"$ac_compile\"") >&5
     2314+if { (eval echo "$as_me:2027: \"$ac_compile\"") >&5
    23072315   (eval $ac_compile) 2>&5
    23082316   ac_status=$?
    23092317-  echo "$as_me:2026: \$? = $ac_status" >&5
    2310 +  echo "$as_me:2029: \$? = $ac_status" >&5
     2318+  echo "$as_me:2030: \$? = $ac_status" >&5
    23112319   (exit $ac_status); } &&
    23122320          { ac_try='test -s conftest.$ac_objext'
    23132321-  { (eval echo "$as_me:2029: \"$ac_try\"") >&5
    2314 +  { (eval echo "$as_me:2032: \"$ac_try\"") >&5
     2322+  { (eval echo "$as_me:2033: \"$ac_try\"") >&5
    23152323   (eval $ac_try) 2>&5
    23162324   ac_status=$?
    23172325-  echo "$as_me:2032: \$? = $ac_status" >&5
    2318 +  echo "$as_me:2035: \$? = $ac_status" >&5
     2326+  echo "$as_me:2036: \$? = $ac_status" >&5
    23192327   (exit $ac_status); }; }; then
    23202328   :
    23212329 else
    2322 @@ -2039,7 +2042,7 @@
     2330@@ -2039,7 +2043,7 @@
    23232331 fi
    23242332 rm -f conftest.$ac_objext conftest.$ac_ext
    23252333   cat >conftest.$ac_ext <<_ACEOF
    23262334-#line 2042 "configure"
    2327 +#line 2045 "configure"
     2335+#line 2046 "configure"
    23282336 #include "confdefs.h"
    23292337 $ac_declaration
    23302338 int
    2331 @@ -2051,16 +2054,16 @@
     2339@@ -2051,16 +2055,16 @@
    23322340 }
    23332341 _ACEOF
    23342342 rm -f conftest.$ac_objext
    23352343-if { (eval echo "$as_me:2054: \"$ac_compile\"") >&5
    2336 +if { (eval echo "$as_me:2057: \"$ac_compile\"") >&5
     2344+if { (eval echo "$as_me:2058: \"$ac_compile\"") >&5
    23372345   (eval $ac_compile) 2>&5
    23382346   ac_status=$?
    23392347-  echo "$as_me:2057: \$? = $ac_status" >&5
    2340 +  echo "$as_me:2060: \$? = $ac_status" >&5
     2348+  echo "$as_me:2061: \$? = $ac_status" >&5
    23412349   (exit $ac_status); } &&
    23422350          { ac_try='test -s conftest.$ac_objext'
    23432351-  { (eval echo "$as_me:2060: \"$ac_try\"") >&5
    2344 +  { (eval echo "$as_me:2063: \"$ac_try\"") >&5
     2352+  { (eval echo "$as_me:2064: \"$ac_try\"") >&5
    23452353   (eval $ac_try) 2>&5
    23462354   ac_status=$?
    23472355-  echo "$as_me:2063: \$? = $ac_status" >&5
    2348 +  echo "$as_me:2066: \$? = $ac_status" >&5
     2356+  echo "$as_me:2067: \$? = $ac_status" >&5
    23492357   (exit $ac_status); }; }; then
    23502358   break
    23512359 else
    2352 @@ -2090,11 +2093,11 @@
     2360@@ -2090,11 +2094,11 @@
    23532361 
    23542362 GCC_VERSION=none
    23552363 if test "$GCC" = yes ; then
    23562364-       echo "$as_me:2093: checking version of $CC" >&5
    2357 +       echo "$as_me:2096: checking version of $CC" >&5
     2365+       echo "$as_me:2097: checking version of $CC" >&5
    23582366 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
    23592367        GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
    23602368        test -z "$GCC_VERSION" && GCC_VERSION=unknown
    23612369-       echo "$as_me:2097: result: $GCC_VERSION" >&5
    2362 +       echo "$as_me:2100: result: $GCC_VERSION" >&5
     2370+       echo "$as_me:2101: result: $GCC_VERSION" >&5
    23632371 echo "${ECHO_T}$GCC_VERSION" >&6
    23642372 fi
    23652373 
    2366 @@ -2104,7 +2107,7 @@
     2374@@ -2104,7 +2108,7 @@
    23672375 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    23682376 ac_compiler_gnu=$ac_cv_c_compiler_gnu
    23692377 ac_main_return=return
    23702378-echo "$as_me:2107: checking how to run the C preprocessor" >&5
    2371 +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
    23722380 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
    23732381 # On Suns, sometimes $CPP names a directory.
    23742382 if test -n "$CPP" && test -d "$CPP"; then
    2375 @@ -2125,18 +2128,18 @@
     2383@@ -2125,18 +2129,18 @@
    23762384   # On the NeXT, cc -E runs the code through the compiler's parser,
    23772385   # not just through cpp. "Syntax error" is here to catch this case.
    23782386   cat >conftest.$ac_ext <<_ACEOF
    23792387-#line 2128 "configure"
    2380 +#line 2131 "configure"
     2388+#line 2132 "configure"
    23812389 #include "confdefs.h"
    23822390 #include <assert.h>
     
    23842392 _ACEOF
    23852393-if { (eval echo "$as_me:2133: \"$ac_cpp conftest.$ac_ext\"") >&5
    2386 +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
    23872395   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    23882396   ac_status=$?
     
    23912399   cat conftest.err >&5
    23922400-  echo "$as_me:2139: \$? = $ac_status" >&5
    2393 +  echo "$as_me:2142: \$? = $ac_status" >&5
     2401+  echo "$as_me:2143: \$? = $ac_status" >&5
    23942402   (exit $ac_status); } >/dev/null; then
    23952403   if test -s conftest.err; then
    23962404     ac_cpp_err=$ac_c_preproc_warn_flag
    2397 @@ -2159,17 +2162,17 @@
     2405@@ -2159,17 +2163,17 @@
    23982406   # OK, works on sane cases.  Now check whether non-existent headers
    23992407   # can be detected and how.
    24002408   cat >conftest.$ac_ext <<_ACEOF
    24012409-#line 2162 "configure"
    2402 +#line 2165 "configure"
     2410+#line 2166 "configure"
    24032411 #include "confdefs.h"
    24042412 #include <ac_nonexistent.h>
    24052413 _ACEOF
    24062414-if { (eval echo "$as_me:2166: \"$ac_cpp conftest.$ac_ext\"") >&5
    2407 +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
    24082416   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    24092417   ac_status=$?
     
    24122420   cat conftest.err >&5
    24132421-  echo "$as_me:2172: \$? = $ac_status" >&5
    2414 +  echo "$as_me:2175: \$? = $ac_status" >&5
     2422+  echo "$as_me:2176: \$? = $ac_status" >&5
    24152423   (exit $ac_status); } >/dev/null; then
    24162424   if test -s conftest.err; then
    24172425     ac_cpp_err=$ac_c_preproc_warn_flag
    2418 @@ -2206,7 +2209,7 @@
     2426@@ -2206,7 +2210,7 @@
    24192427 else
    24202428   ac_cv_prog_CPP=$CPP
    24212429 fi
    24222430-echo "$as_me:2209: result: $CPP" >&5
    2423 +echo "$as_me:2212: result: $CPP" >&5
     2431+echo "$as_me:2213: result: $CPP" >&5
    24242432 echo "${ECHO_T}$CPP" >&6
    24252433 ac_preproc_ok=false
    24262434 for ac_c_preproc_warn_flag in '' yes
    2427 @@ -2216,18 +2219,18 @@
     2435@@ -2216,18 +2220,18 @@
    24282436   # On the NeXT, cc -E runs the code through the compiler's parser,
    24292437   # not just through cpp. "Syntax error" is here to catch this case.
    24302438   cat >conftest.$ac_ext <<_ACEOF
    24312439-#line 2219 "configure"
    2432 +#line 2222 "configure"
     2440+#line 2223 "configure"
    24332441 #include "confdefs.h"
    24342442 #include <assert.h>
     
    24362444 _ACEOF
    24372445-if { (eval echo "$as_me:2224: \"$ac_cpp conftest.$ac_ext\"") >&5
    2438 +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
    24392447   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    24402448   ac_status=$?
     
    24432451   cat conftest.err >&5
    24442452-  echo "$as_me:2230: \$? = $ac_status" >&5
    2445 +  echo "$as_me:2233: \$? = $ac_status" >&5
     2453+  echo "$as_me:2234: \$? = $ac_status" >&5
    24462454   (exit $ac_status); } >/dev/null; then
    24472455   if test -s conftest.err; then
    24482456     ac_cpp_err=$ac_c_preproc_warn_flag
    2449 @@ -2250,17 +2253,17 @@
     2457@@ -2250,17 +2254,17 @@
    24502458   # OK, works on sane cases.  Now check whether non-existent headers
    24512459   # can be detected and how.
    24522460   cat >conftest.$ac_ext <<_ACEOF
    24532461-#line 2253 "configure"
    2454 +#line 2256 "configure"
     2462+#line 2257 "configure"
    24552463 #include "confdefs.h"
    24562464 #include <ac_nonexistent.h>
    24572465 _ACEOF
    24582466-if { (eval echo "$as_me:2257: \"$ac_cpp conftest.$ac_ext\"") >&5
    2459 +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
    24602468   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    24612469   ac_status=$?
     
    24642472   cat conftest.err >&5
    24652473-  echo "$as_me:2263: \$? = $ac_status" >&5
    2466 +  echo "$as_me:2266: \$? = $ac_status" >&5
     2474+  echo "$as_me:2267: \$? = $ac_status" >&5
    24672475   (exit $ac_status); } >/dev/null; then
    24682476   if test -s conftest.err; then
    24692477     ac_cpp_err=$ac_c_preproc_warn_flag
    2470 @@ -2288,7 +2291,7 @@
     2478@@ -2288,7 +2292,7 @@
    24712479 if $ac_preproc_ok; then
    24722480   :
    24732481 else
    24742482-  { { echo "$as_me:2291: error: C preprocessor \"$CPP\" fails sanity check" >&5
    2475 +  { { 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
    24762484 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    24772485    { (exit 1); exit 1; }; }
    24782486 fi
    2479 @@ -2301,14 +2304,14 @@
     2487@@ -2301,14 +2305,14 @@
    24802488 ac_main_return=return
    24812489 
    24822490 if test $ac_cv_c_compiler_gnu = yes; then
    24832491-    echo "$as_me:2304: checking whether $CC needs -traditional" >&5
    2484 +    echo "$as_me:2307: checking whether $CC needs -traditional" >&5
     2492+    echo "$as_me:2308: checking whether $CC needs -traditional" >&5
    24852493 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
    24862494 if test "${ac_cv_prog_gcc_traditional+set}" = set; then
     
    24902498   cat >conftest.$ac_ext <<_ACEOF
    24912499-#line 2311 "configure"
    2492 +#line 2314 "configure"
     2500+#line 2315 "configure"
    24932501 #include "confdefs.h"
    24942502 #include <sgtty.h>
    24952503 int Autoconf = TIOCGETP;
    2496 @@ -2323,7 +2326,7 @@
     2504@@ -2323,7 +2327,7 @@
    24972505 
    24982506   if test $ac_cv_prog_gcc_traditional = no; then
    24992507     cat >conftest.$ac_ext <<_ACEOF
    25002508-#line 2326 "configure"
    2501 +#line 2329 "configure"
     2509+#line 2330 "configure"
    25022510 #include "confdefs.h"
    25032511 #include <termio.h>
    25042512 int Autoconf = TCGETA;
    2505 @@ -2336,14 +2339,14 @@
     2513@@ -2336,14 +2340,14 @@
    25062514 
    25072515   fi
    25082516 fi
    25092517-echo "$as_me:2339: result: $ac_cv_prog_gcc_traditional" >&5
    2510 +echo "$as_me:2342: result: $ac_cv_prog_gcc_traditional" >&5
     2518+echo "$as_me:2343: result: $ac_cv_prog_gcc_traditional" >&5
    25112519 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
    25122520   if test $ac_cv_prog_gcc_traditional = yes; then
     
    25162524 
    25172525-echo "$as_me:2346: checking whether $CC understands -c and -o together" >&5
    2518 +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
    25192527 echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6
    25202528 if test "${cf_cv_prog_CC_c_o+set}" = set; then
    25212529   echo $ECHO_N "(cached) $ECHO_C" >&6
    2522 @@ -2359,15 +2362,15 @@
     2530@@ -2359,15 +2363,15 @@
    25232531 # We do the test twice because some compilers refuse to overwrite an
    25242532 # existing .o file with -o, though they will create one.
    25252533 ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
    25262534-if { (eval echo "$as_me:2362: \"$ac_try\"") >&5
    2527 +if { (eval echo "$as_me:2365: \"$ac_try\"") >&5
     2535+if { (eval echo "$as_me:2366: \"$ac_try\"") >&5
    25282536   (eval $ac_try) 2>&5
    25292537   ac_status=$?
    25302538-  echo "$as_me:2365: \$? = $ac_status" >&5
    2531 +  echo "$as_me:2368: \$? = $ac_status" >&5
     2539+  echo "$as_me:2369: \$? = $ac_status" >&5
    25322540   (exit $ac_status); } &&
    25332541-  test -f conftest2.$ac_objext && { (eval echo "$as_me:2367: \"$ac_try\"") >&5
    2534 +  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
    25352543   (eval $ac_try) 2>&5
    25362544   ac_status=$?
    25372545-  echo "$as_me:2370: \$? = $ac_status" >&5
    2538 +  echo "$as_me:2373: \$? = $ac_status" >&5
     2546+  echo "$as_me:2374: \$? = $ac_status" >&5
    25392547   (exit $ac_status); };
    25402548 then
    25412549   eval cf_cv_prog_CC_c_o=yes
    2542 @@ -2378,19 +2381,19 @@
     2550@@ -2378,19 +2382,19 @@
    25432551 
    25442552 fi
    25452553 if test $cf_cv_prog_CC_c_o = yes; then
    25462554-  echo "$as_me:2381: result: yes" >&5
    2547 +  echo "$as_me:2384: result: yes" >&5
     2555+  echo "$as_me:2385: result: yes" >&5
    25482556 echo "${ECHO_T}yes" >&6
    25492557 else
    25502558-  echo "$as_me:2384: result: no" >&5
    2551 +  echo "$as_me:2387: result: no" >&5
     2559+  echo "$as_me:2388: result: no" >&5
    25522560 echo "${ECHO_T}no" >&6
    25532561 fi
    25542562 
    25552563-echo "$as_me:2388: checking for POSIXized ISC" >&5
    2556 +echo "$as_me:2391: checking for POSIXized ISC" >&5
     2564+echo "$as_me:2392: checking for POSIXized ISC" >&5
    25572565 echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
    25582566 if test -d /etc/conf/kconfig.d &&
     
    25602568 then
    25612569-  echo "$as_me:2393: result: yes" >&5
    2562 +  echo "$as_me:2396: result: yes" >&5
     2570+  echo "$as_me:2397: result: yes" >&5
    25632571 echo "${ECHO_T}yes" >&6
    25642572   ISC=yes # If later tests want to check for ISC.
    25652573 
    2566 @@ -2404,12 +2407,12 @@
     2574@@ -2404,12 +2408,12 @@
    25672575     CC="$CC -Xp"
    25682576   fi
    25692577 else
    25702578-  echo "$as_me:2407: result: no" >&5
    2571 +  echo "$as_me:2410: result: no" >&5
     2579+  echo "$as_me:2411: result: no" >&5
    25722580 echo "${ECHO_T}no" >&6
    25732581   ISC=
     
    25752583 
    25762584-echo "$as_me:2412: checking for ${CC-cc} option to accept ANSI C" >&5
    2577 +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
    25782586 echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
    25792587 if test "${cf_cv_ansi_cc+set}" = set; then
    25802588   echo $ECHO_N "(cached) $ECHO_C" >&6
    2581 @@ -2494,7 +2497,7 @@
     2589@@ -2494,7 +2498,7 @@
    25822590 
    25832591 if test -n "$cf_new_cppflags" ; then
     
    25882596 
    25892597 if test -n "$cf_new_extra_cppflags" ; then
    2590 @@ -2503,7 +2506,7 @@
     2598@@ -2503,7 +2507,7 @@
    25912599 fi
    25922600 
    25932601        cat >conftest.$ac_ext <<_ACEOF
    25942602-#line 2506 "configure"
    2595 +#line 2509 "configure"
     2603+#line 2510 "configure"
    25962604 #include "confdefs.h"
    25972605 
    25982606 #ifndef CC_HAS_PROTOS
    2599 @@ -2524,16 +2527,16 @@
     2607@@ -2524,16 +2528,16 @@
    26002608 }
    26012609 _ACEOF
    26022610 rm -f conftest.$ac_objext
    26032611-if { (eval echo "$as_me:2527: \"$ac_compile\"") >&5
    2604 +if { (eval echo "$as_me:2530: \"$ac_compile\"") >&5
     2612+if { (eval echo "$as_me:2531: \"$ac_compile\"") >&5
    26052613   (eval $ac_compile) 2>&5
    26062614   ac_status=$?
    26072615-  echo "$as_me:2530: \$? = $ac_status" >&5
    2608 +  echo "$as_me:2533: \$? = $ac_status" >&5
     2616+  echo "$as_me:2534: \$? = $ac_status" >&5
    26092617   (exit $ac_status); } &&
    26102618          { ac_try='test -s conftest.$ac_objext'
    26112619-  { (eval echo "$as_me:2533: \"$ac_try\"") >&5
    2612 +  { (eval echo "$as_me:2536: \"$ac_try\"") >&5
     2620+  { (eval echo "$as_me:2537: \"$ac_try\"") >&5
    26132621   (eval $ac_try) 2>&5
    26142622   ac_status=$?
    26152623-  echo "$as_me:2536: \$? = $ac_status" >&5
    2616 +  echo "$as_me:2539: \$? = $ac_status" >&5
     2624+  echo "$as_me:2540: \$? = $ac_status" >&5
    26172625   (exit $ac_status); }; }; then
    26182626   cf_cv_ansi_cc="$cf_arg"; break
    26192627 else
    2620 @@ -2546,7 +2549,7 @@
     2628@@ -2546,7 +2550,7 @@
    26212629 CPPFLAGS="$cf_save_CPPFLAGS"
    26222630 
    26232631 fi
    26242632-echo "$as_me:2549: result: $cf_cv_ansi_cc" >&5
    2625 +echo "$as_me:2552: result: $cf_cv_ansi_cc" >&5
     2633+echo "$as_me:2553: result: $cf_cv_ansi_cc" >&5
    26262634 echo "${ECHO_T}$cf_cv_ansi_cc" >&6
    26272635 
    26282636 if test "$cf_cv_ansi_cc" != "no"; then
    2629 @@ -2612,7 +2615,7 @@
     2637@@ -2612,7 +2616,7 @@
    26302638 
    26312639 if test -n "$cf_new_cppflags" ; then
     
    26362644 
    26372645 if test -n "$cf_new_extra_cppflags" ; then
    2638 @@ -2629,7 +2632,7 @@
     2646@@ -2629,7 +2633,7 @@
    26392647 fi
    26402648 
    26412649 if test "$cf_cv_ansi_cc" = "no"; then
    26422650-       { { echo "$as_me:2632: error: Your compiler does not appear to recognize prototypes.
    2643 +       { { 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.
    26442652 You have the following choices:
    26452653        a. adjust your compiler options
    26462654        b. get an up-to-date compiler
    2647 @@ -2663,13 +2666,13 @@
     2655@@ -2663,13 +2667,13 @@
    26482656   LDCONFIG=:
    26492657 else
     
    26572665 set dummy ldconfig; ac_word=$2
    26582666-echo "$as_me:2672: checking for $ac_word" >&5
    2659 +echo "$as_me:2675: checking for $ac_word" >&5
     2667+echo "$as_me:2676: checking for $ac_word" >&5
    26602668 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    26612669 if test "${ac_cv_path_LDCONFIG+set}" = set; then
    26622670   echo $ECHO_N "(cached) $ECHO_C" >&6
    2663 @@ -2686,7 +2689,7 @@
     2671@@ -2686,7 +2690,7 @@
    26642672   test -z "$ac_dir" && ac_dir=.
    26652673   if $as_executable_p "$ac_dir/$ac_word"; then
    26662674    ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
    26672675-   echo "$as_me:2689: found $ac_dir/$ac_word" >&5
    2668 +   echo "$as_me:2692: found $ac_dir/$ac_word" >&5
     2676+   echo "$as_me:2693: found $ac_dir/$ac_word" >&5
    26692677    break
    26702678 fi
    26712679 done
    2672 @@ -2697,10 +2700,10 @@
     2680@@ -2697,10 +2701,10 @@
    26732681 LDCONFIG=$ac_cv_path_LDCONFIG
    26742682 
    26752683 if test -n "$LDCONFIG"; then
    26762684-  echo "$as_me:2700: result: $LDCONFIG" >&5
    2677 +  echo "$as_me:2703: result: $LDCONFIG" >&5
     2685+  echo "$as_me:2704: result: $LDCONFIG" >&5
    26782686 echo "${ECHO_T}$LDCONFIG" >&6
    26792687 else
    26802688-  echo "$as_me:2703: result: no" >&5
    2681 +  echo "$as_me:2706: result: no" >&5
     2689+  echo "$as_me:2707: result: no" >&5
    26822690 echo "${ECHO_T}no" >&6
    26832691 fi
    26842692 
    2685 @@ -2708,7 +2711,7 @@
     2693@@ -2708,7 +2712,7 @@
    26862694 esac
    26872695 fi
    26882696 
    26892697-echo "$as_me:2711: checking if you want to ensure bool is consistent with C++" >&5
    2690 +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
    26912699 echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6
    26922700 
    26932701 # Check whether --with-cxx or --without-cxx was given.
    2694 @@ -2718,7 +2721,7 @@
     2702@@ -2718,7 +2722,7 @@
    26952703 else
    26962704   cf_with_cxx=yes
    26972705 fi;
    26982706-echo "$as_me:2721: result: $cf_with_cxx" >&5
    2699 +echo "$as_me:2724: result: $cf_with_cxx" >&5
     2707+echo "$as_me:2725: result: $cf_with_cxx" >&5
    27002708 echo "${ECHO_T}$cf_with_cxx" >&6
    27012709 if test "X$cf_with_cxx" = Xno ; then
    27022710        CXX=""
    2703 @@ -2736,7 +2739,7 @@
     2711@@ -2736,7 +2740,7 @@
    27042712   do
    27052713     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
    27062714 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
    27072715-echo "$as_me:2739: checking for $ac_word" >&5
    2708 +echo "$as_me:2742: checking for $ac_word" >&5
     2716+echo "$as_me:2743: checking for $ac_word" >&5
    27092717 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    27102718 if test "${ac_cv_prog_CXX+set}" = set; then
    27112719   echo $ECHO_N "(cached) $ECHO_C" >&6
    2712 @@ -2751,7 +2754,7 @@
     2720@@ -2751,7 +2755,7 @@
    27132721   test -z "$ac_dir" && ac_dir=.
    27142722   $as_executable_p "$ac_dir/$ac_word" || continue
    27152723 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
    27162724-echo "$as_me:2754: found $ac_dir/$ac_word" >&5
    2717 +echo "$as_me:2757: found $ac_dir/$ac_word" >&5
     2725+echo "$as_me:2758: found $ac_dir/$ac_word" >&5
    27182726 break
    27192727 done
    27202728 
    2721 @@ -2759,10 +2762,10 @@
     2729@@ -2759,10 +2763,10 @@
    27222730 fi
    27232731 CXX=$ac_cv_prog_CXX
    27242732 if test -n "$CXX"; then
    27252733-  echo "$as_me:2762: result: $CXX" >&5
    2726 +  echo "$as_me:2765: result: $CXX" >&5
     2734+  echo "$as_me:2766: result: $CXX" >&5
    27272735 echo "${ECHO_T}$CXX" >&6
    27282736 else
    27292737-  echo "$as_me:2765: result: no" >&5
    2730 +  echo "$as_me:2768: result: no" >&5
     2738+  echo "$as_me:2769: result: no" >&5
    27312739 echo "${ECHO_T}no" >&6
    27322740 fi
    27332741 
    2734 @@ -2775,7 +2778,7 @@
     2742@@ -2775,7 +2779,7 @@
    27352743 do
    27362744   # Extract the first word of "$ac_prog", so it can be a program name with args.
    27372745 set dummy $ac_prog; ac_word=$2
    27382746-echo "$as_me:2778: checking for $ac_word" >&5
    2739 +echo "$as_me:2781: checking for $ac_word" >&5
     2747+echo "$as_me:2782: checking for $ac_word" >&5
    27402748 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    27412749 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
    27422750   echo $ECHO_N "(cached) $ECHO_C" >&6
    2743 @@ -2790,7 +2793,7 @@
     2751@@ -2790,7 +2794,7 @@
    27442752   test -z "$ac_dir" && ac_dir=.
    27452753   $as_executable_p "$ac_dir/$ac_word" || continue
    27462754 ac_cv_prog_ac_ct_CXX="$ac_prog"
    27472755-echo "$as_me:2793: found $ac_dir/$ac_word" >&5
    2748 +echo "$as_me:2796: found $ac_dir/$ac_word" >&5
     2756+echo "$as_me:2797: found $ac_dir/$ac_word" >&5
    27492757 break
    27502758 done
    27512759 
    2752 @@ -2798,10 +2801,10 @@
     2760@@ -2798,10 +2802,10 @@
    27532761 fi
    27542762 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
    27552763 if test -n "$ac_ct_CXX"; then
    27562764-  echo "$as_me:2801: result: $ac_ct_CXX" >&5
    2757 +  echo "$as_me:2804: result: $ac_ct_CXX" >&5
     2765+  echo "$as_me:2805: result: $ac_ct_CXX" >&5
    27582766 echo "${ECHO_T}$ac_ct_CXX" >&6
    27592767 else
    27602768-  echo "$as_me:2804: result: no" >&5
    2761 +  echo "$as_me:2807: result: no" >&5
     2769+  echo "$as_me:2808: result: no" >&5
    27622770 echo "${ECHO_T}no" >&6
    27632771 fi
    27642772 
    2765 @@ -2813,32 +2816,32 @@
     2773@@ -2813,32 +2817,32 @@
    27662774 fi
    27672775 
    27682776 # Provide some information about the compiler.
    27692777-echo "$as_me:2816:" \
    2770 +echo "$as_me:2819:" \
     2778+echo "$as_me:2820:" \
    27712779      "checking for C++ compiler version" >&5
    27722780 ac_compiler=`set X $ac_compile; echo $2`
    27732781-{ (eval echo "$as_me:2819: \"$ac_compiler --version </dev/null >&5\"") >&5
    2774 +{ (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
    27752783   (eval $ac_compiler --version </dev/null >&5) 2>&5
    27762784   ac_status=$?
    27772785-  echo "$as_me:2822: \$? = $ac_status" >&5
    2778 +  echo "$as_me:2825: \$? = $ac_status" >&5
     2786+  echo "$as_me:2826: \$? = $ac_status" >&5
    27792787   (exit $ac_status); }
    27802788-{ (eval echo "$as_me:2824: \"$ac_compiler -v </dev/null >&5\"") >&5
    2781 +{ (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
    27822790   (eval $ac_compiler -v </dev/null >&5) 2>&5
    27832791   ac_status=$?
    27842792-  echo "$as_me:2827: \$? = $ac_status" >&5
    2785 +  echo "$as_me:2830: \$? = $ac_status" >&5
     2793+  echo "$as_me:2831: \$? = $ac_status" >&5
    27862794   (exit $ac_status); }
    27872795-{ (eval echo "$as_me:2829: \"$ac_compiler -V </dev/null >&5\"") >&5
    2788 +{ (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
    27892797   (eval $ac_compiler -V </dev/null >&5) 2>&5
    27902798   ac_status=$?
    27912799-  echo "$as_me:2832: \$? = $ac_status" >&5
    2792 +  echo "$as_me:2835: \$? = $ac_status" >&5
     2800+  echo "$as_me:2836: \$? = $ac_status" >&5
    27932801   (exit $ac_status); }
    27942802 
    27952803-echo "$as_me:2835: checking whether we are using the GNU C++ compiler" >&5
    2796 +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
    27972805 echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
    27982806 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
     
    28012809   cat >conftest.$ac_ext <<_ACEOF
    28022810-#line 2841 "configure"
    2803 +#line 2844 "configure"
     2811+#line 2845 "configure"
    28042812 #include "confdefs.h"
    28052813 
    28062814 int
    2807 @@ -2853,16 +2856,16 @@
     2815@@ -2853,16 +2857,16 @@
    28082816 }
    28092817 _ACEOF
    28102818 rm -f conftest.$ac_objext
    28112819-if { (eval echo "$as_me:2856: \"$ac_compile\"") >&5
    2812 +if { (eval echo "$as_me:2859: \"$ac_compile\"") >&5
     2820+if { (eval echo "$as_me:2860: \"$ac_compile\"") >&5
    28132821   (eval $ac_compile) 2>&5
    28142822   ac_status=$?
    28152823-  echo "$as_me:2859: \$? = $ac_status" >&5
    2816 +  echo "$as_me:2862: \$? = $ac_status" >&5
     2824+  echo "$as_me:2863: \$? = $ac_status" >&5
    28172825   (exit $ac_status); } &&
    28182826          { ac_try='test -s conftest.$ac_objext'
    28192827-  { (eval echo "$as_me:2862: \"$ac_try\"") >&5
    2820 +  { (eval echo "$as_me:2865: \"$ac_try\"") >&5
     2828+  { (eval echo "$as_me:2866: \"$ac_try\"") >&5
    28212829   (eval $ac_try) 2>&5
    28222830   ac_status=$?
    28232831-  echo "$as_me:2865: \$? = $ac_status" >&5
    2824 +  echo "$as_me:2868: \$? = $ac_status" >&5
     2832+  echo "$as_me:2869: \$? = $ac_status" >&5
    28252833   (exit $ac_status); }; }; then
    28262834   ac_compiler_gnu=yes
    28272835 else
    2828 @@ -2874,19 +2877,19 @@
     2836@@ -2874,19 +2878,19 @@
    28292837 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
    28302838 
    28312839 fi
    28322840-echo "$as_me:2877: result: $ac_cv_cxx_compiler_gnu" >&5
    2833 +echo "$as_me:2880: result: $ac_cv_cxx_compiler_gnu" >&5
     2841+echo "$as_me:2881: result: $ac_cv_cxx_compiler_gnu" >&5
    28342842 echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
    28352843 GXX=`test $ac_compiler_gnu = yes && echo yes`
     
    28382846 CXXFLAGS="-g"
    28392847-echo "$as_me:2883: checking whether $CXX accepts -g" >&5
    2840 +echo "$as_me:2886: checking whether $CXX accepts -g" >&5
     2848+echo "$as_me:2887: checking whether $CXX accepts -g" >&5
    28412849 echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
    28422850 if test "${ac_cv_prog_cxx_g+set}" = set; then
     
    28452853   cat >conftest.$ac_ext <<_ACEOF
    28462854-#line 2889 "configure"
    2847 +#line 2892 "configure"
     2855+#line 2893 "configure"
    28482856 #include "confdefs.h"
    28492857 
    28502858 int
    2851 @@ -2898,16 +2901,16 @@
     2859@@ -2898,16 +2902,16 @@
    28522860 }
    28532861 _ACEOF
    28542862 rm -f conftest.$ac_objext
    28552863-if { (eval echo "$as_me:2901: \"$ac_compile\"") >&5
    2856 +if { (eval echo "$as_me:2904: \"$ac_compile\"") >&5
     2864+if { (eval echo "$as_me:2905: \"$ac_compile\"") >&5
    28572865   (eval $ac_compile) 2>&5
    28582866   ac_status=$?
    28592867-  echo "$as_me:2904: \$? = $ac_status" >&5
    2860 +  echo "$as_me:2907: \$? = $ac_status" >&5
     2868+  echo "$as_me:2908: \$? = $ac_status" >&5
    28612869   (exit $ac_status); } &&
    28622870          { ac_try='test -s conftest.$ac_objext'
    28632871-  { (eval echo "$as_me:2907: \"$ac_try\"") >&5
    2864 +  { (eval echo "$as_me:2910: \"$ac_try\"") >&5
     2872+  { (eval echo "$as_me:2911: \"$ac_try\"") >&5
    28652873   (eval $ac_try) 2>&5
    28662874   ac_status=$?
    28672875-  echo "$as_me:2910: \$? = $ac_status" >&5
    2868 +  echo "$as_me:2913: \$? = $ac_status" >&5
     2876+  echo "$as_me:2914: \$? = $ac_status" >&5
    28692877   (exit $ac_status); }; }; then
    28702878   ac_cv_prog_cxx_g=yes
    28712879 else
    2872 @@ -2917,7 +2920,7 @@
     2880@@ -2917,7 +2921,7 @@
    28732881 fi
    28742882 rm -f conftest.$ac_objext conftest.$ac_ext
    28752883 fi
    28762884-echo "$as_me:2920: result: $ac_cv_prog_cxx_g" >&5
    2877 +echo "$as_me:2923: result: $ac_cv_prog_cxx_g" >&5
     2885+echo "$as_me:2924: result: $ac_cv_prog_cxx_g" >&5
    28782886 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
    28792887 if test "$ac_test_CXXFLAGS" = set; then
    28802888   CXXFLAGS=$ac_save_CXXFLAGS
    2881 @@ -2944,7 +2947,7 @@
     2889@@ -2944,7 +2948,7 @@
    28822890    'void exit (int);'
    28832891 do
    28842892   cat >conftest.$ac_ext <<_ACEOF
    28852893-#line 2947 "configure"
    2886 +#line 2950 "configure"
     2894+#line 2951 "configure"
    28872895 #include "confdefs.h"
    28882896 #include <stdlib.h>
    28892897 $ac_declaration
    2890 @@ -2957,16 +2960,16 @@
     2898@@ -2957,16 +2961,16 @@
    28912899 }
    28922900 _ACEOF
    28932901 rm -f conftest.$ac_objext
    28942902-if { (eval echo "$as_me:2960: \"$ac_compile\"") >&5
    2895 +if { (eval echo "$as_me:2963: \"$ac_compile\"") >&5
     2903+if { (eval echo "$as_me:2964: \"$ac_compile\"") >&5
    28962904   (eval $ac_compile) 2>&5
    28972905   ac_status=$?
    28982906-  echo "$as_me:2963: \$? = $ac_status" >&5
    2899 +  echo "$as_me:2966: \$? = $ac_status" >&5
     2907+  echo "$as_me:2967: \$? = $ac_status" >&5
    29002908   (exit $ac_status); } &&
    29012909          { ac_try='test -s conftest.$ac_objext'
    29022910-  { (eval echo "$as_me:2966: \"$ac_try\"") >&5
    2903 +  { (eval echo "$as_me:2969: \"$ac_try\"") >&5
     2911+  { (eval echo "$as_me:2970: \"$ac_try\"") >&5
    29042912   (eval $ac_try) 2>&5
    29052913   ac_status=$?
    29062914-  echo "$as_me:2969: \$? = $ac_status" >&5
    2907 +  echo "$as_me:2972: \$? = $ac_status" >&5
     2915+  echo "$as_me:2973: \$? = $ac_status" >&5
    29082916   (exit $ac_status); }; }; then
    29092917   :
    29102918 else
    2911 @@ -2976,7 +2979,7 @@
     2919@@ -2976,7 +2980,7 @@
    29122920 fi
    29132921 rm -f conftest.$ac_objext conftest.$ac_ext
    29142922   cat >conftest.$ac_ext <<_ACEOF
    29152923-#line 2979 "configure"
    2916 +#line 2982 "configure"
     2924+#line 2983 "configure"
    29172925 #include "confdefs.h"
    29182926 $ac_declaration
    29192927 int
    2920 @@ -2988,16 +2991,16 @@
     2928@@ -2988,16 +2992,16 @@
    29212929 }
    29222930 _ACEOF
    29232931 rm -f conftest.$ac_objext
    29242932-if { (eval echo "$as_me:2991: \"$ac_compile\"") >&5
    2925 +if { (eval echo "$as_me:2994: \"$ac_compile\"") >&5
     2933+if { (eval echo "$as_me:2995: \"$ac_compile\"") >&5
    29262934   (eval $ac_compile) 2>&5
    29272935   ac_status=$?
    29282936-  echo "$as_me:2994: \$? = $ac_status" >&5
    2929 +  echo "$as_me:2997: \$? = $ac_status" >&5
     2937+  echo "$as_me:2998: \$? = $ac_status" >&5
    29302938   (exit $ac_status); } &&
    29312939          { ac_try='test -s conftest.$ac_objext'
    29322940-  { (eval echo "$as_me:2997: \"$ac_try\"") >&5
    2933 +  { (eval echo "$as_me:3000: \"$ac_try\"") >&5
     2941+  { (eval echo "$as_me:3001: \"$ac_try\"") >&5
    29342942   (eval $ac_try) 2>&5
    29352943   ac_status=$?
    29362944-  echo "$as_me:3000: \$? = $ac_status" >&5
    2937 +  echo "$as_me:3003: \$? = $ac_status" >&5
     2945+  echo "$as_me:3004: \$? = $ac_status" >&5
    29382946   (exit $ac_status); }; }; then
    29392947   break
    29402948 else
    2941 @@ -3024,7 +3027,7 @@
     2949@@ -3024,7 +3028,7 @@
    29422950        if test "$CXX" = "g++" ; then
    29432951                # Extract the first word of "g++", so it can be a program name with args.
    29442952 set dummy g++; ac_word=$2
    29452953-echo "$as_me:3027: checking for $ac_word" >&5
    2946 +echo "$as_me:3030: checking for $ac_word" >&5
     2954+echo "$as_me:3031: checking for $ac_word" >&5
    29472955 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    29482956 if test "${ac_cv_path_CXX+set}" = set; then
    29492957   echo $ECHO_N "(cached) $ECHO_C" >&6
    2950 @@ -3041,7 +3044,7 @@
     2958@@ -3041,7 +3045,7 @@
    29512959   test -z "$ac_dir" && ac_dir=.
    29522960   if $as_executable_p "$ac_dir/$ac_word"; then
    29532961    ac_cv_path_CXX="$ac_dir/$ac_word"
    29542962-   echo "$as_me:3044: found $ac_dir/$ac_word" >&5
    2955 +   echo "$as_me:3047: found $ac_dir/$ac_word" >&5
     2963+   echo "$as_me:3048: found $ac_dir/$ac_word" >&5
    29562964    break
    29572965 fi
    29582966 done
    2959 @@ -3052,16 +3055,16 @@
     2967@@ -3052,16 +3056,16 @@
    29602968 CXX=$ac_cv_path_CXX
    29612969 
    29622970 if test -n "$CXX"; then
    29632971-  echo "$as_me:3055: result: $CXX" >&5
    2964 +  echo "$as_me:3058: result: $CXX" >&5
     2972+  echo "$as_me:3059: result: $CXX" >&5
    29652973 echo "${ECHO_T}$CXX" >&6
    29662974 else
    29672975-  echo "$as_me:3058: result: no" >&5
    2968 +  echo "$as_me:3061: result: no" >&5
     2976+  echo "$as_me:3062: result: no" >&5
    29692977 echo "${ECHO_T}no" >&6
    29702978 fi
     
    29732981        if test "$CXX" = "g++" ; then
    29742982-               { echo "$as_me:3064: WARNING: ignoring hardcoded g++" >&5
    2975 +               { echo "$as_me:3067: WARNING: ignoring hardcoded g++" >&5
     2983+               { echo "$as_me:3068: WARNING: ignoring hardcoded g++" >&5
    29762984 echo "$as_me: WARNING: ignoring hardcoded g++" >&2;}
    29772985                cf_with_cxx=no; CXX=""; GXX="";
    29782986        fi
    2979 @@ -3069,11 +3072,11 @@
     2987@@ -3069,11 +3073,11 @@
    29802988 
    29812989 GXX_VERSION=none
    29822990 if test "$GXX" = yes; then
    29832991-       echo "$as_me:3072: checking version of g++" >&5
    2984 +       echo "$as_me:3075: checking version of g++" >&5
     2992+       echo "$as_me:3076: checking version of g++" >&5
    29852993 echo $ECHO_N "checking version of g++... $ECHO_C" >&6
    29862994        GXX_VERSION="`${CXX-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
    29872995        test -z "$GXX_VERSION" && GXX_VERSION=unknown
    29882996-       echo "$as_me:3076: result: $GXX_VERSION" >&5
    2989 +       echo "$as_me:3079: result: $GXX_VERSION" >&5
     2997+       echo "$as_me:3080: result: $GXX_VERSION" >&5
    29902998 echo "${ECHO_T}$GXX_VERSION" >&6
    29912999 fi
    29923000 
    2993 @@ -3081,12 +3084,12 @@
     3001@@ -3081,12 +3085,12 @@
    29943002 1*|2.[0-6]*)
    29953003        # GXX=""; CXX=""; ac_cv_prog_gxx=no
    29963004        # cf_cxx_library=no
    29973005-       { echo "$as_me:3084: WARNING: templates do not work" >&5
    2998 +       { echo "$as_me:3087: WARNING: templates do not work" >&5
     3006+       { echo "$as_me:3088: WARNING: templates do not work" >&5
    29993007 echo "$as_me: WARNING: templates do not work" >&2;}
    30003008        ;;
     
    30023010 
    30033011-echo "$as_me:3089: checking if you want to build C++ binding and demo" >&5
    3004 +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
    30053013 echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6
    30063014 
    30073015 # Check whether --with-cxx-binding or --without-cxx-binding was given.
    3008 @@ -3096,10 +3099,10 @@
     3016@@ -3096,10 +3100,10 @@
    30093017 else
    30103018   cf_with_cxx_binding=$cf_with_cxx
    30113019 fi;
    30123020-echo "$as_me:3099: result: $cf_with_cxx_binding" >&5
    3013 +echo "$as_me:3102: result: $cf_with_cxx_binding" >&5
     3021+echo "$as_me:3103: result: $cf_with_cxx_binding" >&5
    30143022 echo "${ECHO_T}$cf_with_cxx_binding" >&6
    30153023 
    30163024-echo "$as_me:3102: checking if you want to build with Ada95" >&5
    3017 +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
    30183026 echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6
    30193027 
    30203028 # Check whether --with-ada or --without-ada was given.
    3021 @@ -3109,10 +3112,23 @@
     3029@@ -3109,10 +3113,23 @@
    30223030 else
    30233031   cf_with_ada=yes
    30243032 fi;
    30253033-echo "$as_me:3112: result: $cf_with_ada" >&5
    3026 +echo "$as_me:3115: result: $cf_with_ada" >&5
     3034+echo "$as_me:3116: result: $cf_with_ada" >&5
    30273035 echo "${ECHO_T}$cf_with_ada" >&6
    30283036 
    30293037-echo "$as_me:3115: checking if you want to build programs such as tic" >&5
    3030 +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
    30313039+echo $ECHO_N "checking if you want to install manpages... $ECHO_C" >&6
    30323040+
     
    30383046+  cf_with_manpages=yes
    30393047+fi;
    3040 +echo "$as_me:3128: result: $cf_with_manpages" >&5
     3048+echo "$as_me:3129: result: $cf_with_manpages" >&5
    30413049+echo "${ECHO_T}$cf_with_manpages" >&6
    30423050+
    3043 +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
    30443052 echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6
    30453053 
    30463054 # Check whether --with-progs or --without-progs was given.
    3047 @@ -3122,10 +3138,10 @@
     3055@@ -3122,10 +3139,10 @@
    30483056 else
    30493057   cf_with_progs=yes
    30503058 fi;
    30513059-echo "$as_me:3125: result: $cf_with_progs" >&5
    3052 +echo "$as_me:3141: result: $cf_with_progs" >&5
     3060+echo "$as_me:3142: result: $cf_with_progs" >&5
    30533061 echo "${ECHO_T}$cf_with_progs" >&6
    30543062 
    30553063-echo "$as_me:3128: checking if you wish to install curses.h" >&5
    3056 +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
    30573065 echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6
    30583066 
    30593067 # Check whether --with-curses-h or --without-curses-h was given.
    3060 @@ -3135,7 +3151,7 @@
     3068@@ -3135,7 +3152,7 @@
    30613069 else
    30623070   with_curses_h=yes
    30633071 fi;
    30643072-echo "$as_me:3138: result: $with_curses_h" >&5
    3065 +echo "$as_me:3154: result: $with_curses_h" >&5
     3073+echo "$as_me:3155: result: $with_curses_h" >&5
    30663074 echo "${ECHO_T}$with_curses_h" >&6
    30673075 
    30683076 modules_to_build="ncurses"
    3069 @@ -3161,7 +3177,7 @@
     3077@@ -3161,7 +3178,7 @@
    30703078 do
    30713079   # Extract the first word of "$ac_prog", so it can be a program name with args.
    30723080 set dummy $ac_prog; ac_word=$2
    30733081-echo "$as_me:3164: checking for $ac_word" >&5
    3074 +echo "$as_me:3180: checking for $ac_word" >&5
     3082+echo "$as_me:3181: checking for $ac_word" >&5
    30753083 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    30763084 if test "${ac_cv_prog_AWK+set}" = set; then
    30773085   echo $ECHO_N "(cached) $ECHO_C" >&6
    3078 @@ -3176,7 +3192,7 @@
     3086@@ -3176,7 +3193,7 @@
    30793087   test -z "$ac_dir" && ac_dir=.
    30803088   $as_executable_p "$ac_dir/$ac_word" || continue
    30813089 ac_cv_prog_AWK="$ac_prog"
    30823090-echo "$as_me:3179: found $ac_dir/$ac_word" >&5
    3083 +echo "$as_me:3195: found $ac_dir/$ac_word" >&5
     3091+echo "$as_me:3196: found $ac_dir/$ac_word" >&5
    30843092 break
    30853093 done
    30863094 
    3087 @@ -3184,21 +3200,21 @@
     3095@@ -3184,21 +3201,21 @@
    30883096 fi
    30893097 AWK=$ac_cv_prog_AWK
    30903098 if test -n "$AWK"; then
    30913099-  echo "$as_me:3187: result: $AWK" >&5
    3092 +  echo "$as_me:3203: result: $AWK" >&5
     3100+  echo "$as_me:3204: result: $AWK" >&5
    30933101 echo "${ECHO_T}$AWK" >&6
    30943102 else
    30953103-  echo "$as_me:3190: result: no" >&5
    3096 +  echo "$as_me:3206: result: no" >&5
     3104+  echo "$as_me:3207: result: no" >&5
    30973105 echo "${ECHO_T}no" >&6
    30983106 fi
     
    31023110 
    31033111-test -z "$AWK" && { { echo "$as_me:3197: error: No awk program found" >&5
    3104 +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
    31053113 echo "$as_me: error: No awk program found" >&2;}
    31063114    { (exit 1); exit 1; }; }
    31073115 
    31083116-echo "$as_me:3201: checking for egrep" >&5
    3109 +echo "$as_me:3217: checking for egrep" >&5
     3117+echo "$as_me:3218: checking for egrep" >&5
    31103118 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
    31113119 if test "${ac_cv_prog_egrep+set}" = set; then
    31123120   echo $ECHO_N "(cached) $ECHO_C" >&6
    3113 @@ -3208,11 +3224,11 @@
     3121@@ -3208,11 +3225,11 @@
    31143122     else ac_cv_prog_egrep='egrep'
    31153123     fi
    31163124 fi
    31173125-echo "$as_me:3211: result: $ac_cv_prog_egrep" >&5
    3118 +echo "$as_me:3227: result: $ac_cv_prog_egrep" >&5
     3126+echo "$as_me:3228: result: $ac_cv_prog_egrep" >&5
    31193127 echo "${ECHO_T}$ac_cv_prog_egrep" >&6
    31203128  EGREP=$ac_cv_prog_egrep
    31213129 
    31223130-test -z "$EGREP" && { { echo "$as_me:3215: error: No egrep program found" >&5
    3123 +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
    31243132 echo "$as_me: error: No egrep program found" >&2;}
    31253133    { (exit 1); exit 1; }; }
    31263134 
    3127 @@ -3228,7 +3244,7 @@
     3135@@ -3228,7 +3245,7 @@
    31283136 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
    31293137 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
    31303138 # ./install, which can be erroneously created by make from ./install.sh.
    31313139-echo "$as_me:3231: checking for a BSD compatible install" >&5
    3132 +echo "$as_me:3247: checking for a BSD compatible install" >&5
     3140+echo "$as_me:3248: checking for a BSD compatible install" >&5
    31333141 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
    31343142 if test -z "$INSTALL"; then
    31353143 if test "${ac_cv_path_install+set}" = set; then
    3136 @@ -3277,7 +3293,7 @@
     3144@@ -3277,7 +3294,7 @@
    31373145     INSTALL=$ac_install_sh
    31383146   fi
    31393147 fi
    31403148-echo "$as_me:3280: result: $INSTALL" >&5
    3141 +echo "$as_me:3296: result: $INSTALL" >&5
     3149+echo "$as_me:3297: result: $INSTALL" >&5
    31423150 echo "${ECHO_T}$INSTALL" >&6
    31433151 
    31443152 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
    3145 @@ -3302,7 +3318,7 @@
     3153@@ -3302,7 +3319,7 @@
    31463154 do
    31473155   # Extract the first word of "$ac_prog", so it can be a program name with args.
    31483156 set dummy $ac_prog; ac_word=$2
    31493157-echo "$as_me:3305: checking for $ac_word" >&5
    3150 +echo "$as_me:3321: checking for $ac_word" >&5
     3158+echo "$as_me:3322: checking for $ac_word" >&5
    31513159 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    31523160 if test "${ac_cv_prog_LINT+set}" = set; then
    31533161   echo $ECHO_N "(cached) $ECHO_C" >&6
    3154 @@ -3317,7 +3333,7 @@
     3162@@ -3317,7 +3334,7 @@
    31553163   test -z "$ac_dir" && ac_dir=.
    31563164   $as_executable_p "$ac_dir/$ac_word" || continue
    31573165 ac_cv_prog_LINT="$ac_prog"
    31583166-echo "$as_me:3320: found $ac_dir/$ac_word" >&5
    3159 +echo "$as_me:3336: found $ac_dir/$ac_word" >&5
     3167+echo "$as_me:3337: found $ac_dir/$ac_word" >&5
    31603168 break
    31613169 done
    31623170 
    3163 @@ -3325,28 +3341,28 @@
     3171@@ -3325,28 +3342,28 @@
    31643172 fi
    31653173 LINT=$ac_cv_prog_LINT
    31663174 if test -n "$LINT"; then
    31673175-  echo "$as_me:3328: result: $LINT" >&5
    3168 +  echo "$as_me:3344: result: $LINT" >&5
     3176+  echo "$as_me:3345: result: $LINT" >&5
    31693177 echo "${ECHO_T}$LINT" >&6
    31703178 else
    31713179-  echo "$as_me:3331: result: no" >&5
    3172 +  echo "$as_me:3347: result: no" >&5
     3180+  echo "$as_me:3348: result: no" >&5
    31733181 echo "${ECHO_T}no" >&6
    31743182 fi
     
    31783186 
    31793187-echo "$as_me:3338: checking whether ln -s works" >&5
    3180 +echo "$as_me:3354: checking whether ln -s works" >&5
     3188+echo "$as_me:3355: checking whether ln -s works" >&5
    31813189 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
    31823190 LN_S=$as_ln_s
    31833191 if test "$LN_S" = "ln -s"; then
    31843192-  echo "$as_me:3342: result: yes" >&5
    3185 +  echo "$as_me:3358: result: yes" >&5
     3193+  echo "$as_me:3359: result: yes" >&5
    31863194 echo "${ECHO_T}yes" >&6
    31873195 else
    31883196-  echo "$as_me:3345: result: no, using $LN_S" >&5
    3189 +  echo "$as_me:3361: result: no, using $LN_S" >&5
     3197+  echo "$as_me:3362: result: no, using $LN_S" >&5
    31903198 echo "${ECHO_T}no, using $LN_S" >&6
    31913199 fi
    31923200 
    31933201-echo "$as_me:3349: checking for long file names" >&5
    3194 +echo "$as_me:3365: checking for long file names" >&5
     3202+echo "$as_me:3366: checking for long file names" >&5
    31953203 echo $ECHO_N "checking for long file names... $ECHO_C" >&6
    31963204 if test "${ac_cv_sys_long_file_names+set}" = set; then
    31973205   echo $ECHO_N "(cached) $ECHO_C" >&6
    3198 @@ -3385,7 +3401,7 @@
     3206@@ -3385,7 +3402,7 @@
    31993207   rm -rf $ac_xdir 2>/dev/null
    32003208 done
    32013209 fi
    32023210-echo "$as_me:3388: result: $ac_cv_sys_long_file_names" >&5
    3203 +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
    32043212 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
    32053213 if test $ac_cv_sys_long_file_names = yes; then
    32063214 
    3207 @@ -3395,7 +3411,136 @@
     3215@@ -3395,7 +3412,136 @@
    32083216 
    32093217 fi
     
    32123220+# if we find pkg-config, check if we should install the ".pc" files.
    32133221+
    3214 +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
    32153223+echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
    32163224+
     
    32223230+  cf_pkg_config=yes
    32233231+fi;
    3224 +echo "$as_me:3426: result: $cf_pkg_config" >&5
     3232+echo "$as_me:3427: result: $cf_pkg_config" >&5
    32253233+echo "${ECHO_T}$cf_pkg_config" >&6
    32263234+
     
    32323240+       # Extract the first word of "pkg-config", so it can be a program name with args.
    32333241+set dummy pkg-config; ac_word=$2
    3234 +echo "$as_me:3436: checking for $ac_word" >&5
     3242+echo "$as_me:3437: checking for $ac_word" >&5
    32353243+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    32363244+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
     
    32493257+  if $as_executable_p "$ac_dir/$ac_word"; then
    32503258+   ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
    3251 +   echo "$as_me:3453: found $ac_dir/$ac_word" >&5
     3259+   echo "$as_me:3454: found $ac_dir/$ac_word" >&5
    32523260+   break
    32533261+fi
     
    32613269+
    32623270+if test -n "$PKG_CONFIG"; then
    3263 +  echo "$as_me:3465: result: $PKG_CONFIG" >&5
     3271+  echo "$as_me:3466: result: $PKG_CONFIG" >&5
    32643272+echo "${ECHO_T}$PKG_CONFIG" >&6
    32653273+else
    3266 +  echo "$as_me:3468: result: no" >&5
     3274+  echo "$as_me:3469: result: no" >&5
    32673275+echo "${ECHO_T}no" >&6
    32683276+fi
     
    33023310+  ;;
    33033311+*)
    3304 +  { { 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
    33053313+echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
    33063314+   { (exit 1); exit 1; }; }
     
    33113319+
    33123320+if test "$PKG_CONFIG" != no ; then
    3313 +       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
    33143322+echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6
    33153323+
     
    33283336+  enable_pc_files=no
    33293337+fi;
    3330 +               echo "$as_me:3532: result: $enable_pc_files" >&5
     3338+               echo "$as_me:3533: result: $enable_pc_files" >&5
    33313339+echo "${ECHO_T}$enable_pc_files" >&6
    33323340+       else
    3333 +               echo "$as_me:3535: result: no" >&5
     3341+               echo "$as_me:3536: result: no" >&5
    33343342+echo "${ECHO_T}no" >&6
    3335 +               { 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
    33363344+echo "$as_me: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&2;}
    33373345+               enable_pc_files=no
     
    33393347+fi
    33403348+
    3341 +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
    33423350 echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
    33433351 
    33443352 # Check whether --enable-mixed-case or --disable-mixed-case was given.
    3345 @@ -3405,11 +3550,11 @@
     3353@@ -3405,11 +3551,11 @@
    33463354 else
    33473355   enable_mixedcase=auto
    33483356 fi;
    33493357-echo "$as_me:3408: result: $enable_mixedcase" >&5
    3350 +echo "$as_me:3553: result: $enable_mixedcase" >&5
     3358+echo "$as_me:3554: result: $enable_mixedcase" >&5
    33513359 echo "${ECHO_T}$enable_mixedcase" >&6
    33523360 if test "$enable_mixedcase" = "auto" ; then
    33533361 
    33543362-echo "$as_me:3412: checking if filesystem supports mixed-case filenames" >&5
    3355 +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
    33563364 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
    33573365 if test "${cf_cv_mixedcase+set}" = set; then
    33583366   echo $ECHO_N "(cached) $ECHO_C" >&6
    3359 @@ -3436,7 +3581,7 @@
     3367@@ -3436,7 +3582,7 @@
    33603368 fi
    33613369 
    33623370 fi
    33633371-echo "$as_me:3439: result: $cf_cv_mixedcase" >&5
    3364 +echo "$as_me:3584: result: $cf_cv_mixedcase" >&5
     3372+echo "$as_me:3585: result: $cf_cv_mixedcase" >&5
    33653373 echo "${ECHO_T}$cf_cv_mixedcase" >&6
    33663374 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF
    33673375 #define MIXEDCASE_FILENAMES 1
    3368 @@ -3453,7 +3598,7 @@
     3376@@ -3453,7 +3599,7 @@
    33693377 fi
    33703378 
    33713379 # do this after mixed-case option (tags/TAGS is not as important as tic).
    33723380-echo "$as_me:3456: checking whether ${MAKE-make} sets \${MAKE}" >&5
    3373 +echo "$as_me:3601: checking whether ${MAKE-make} sets \${MAKE}" >&5
     3381+echo "$as_me:3602: checking whether ${MAKE-make} sets \${MAKE}" >&5
    33743382 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
    33753383 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
    33763384 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
    3377 @@ -3473,18 +3618,18 @@
     3385@@ -3473,18 +3619,18 @@
    33783386 rm -f conftest.make
    33793387 fi
    33803388 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
    33813389-  echo "$as_me:3476: result: yes" >&5
    3382 +  echo "$as_me:3621: result: yes" >&5
     3390+  echo "$as_me:3622: result: yes" >&5
    33833391 echo "${ECHO_T}yes" >&6
    33843392   SET_MAKE=
    33853393 else
    33863394-  echo "$as_me:3480: result: no" >&5
    3387 +  echo "$as_me:3625: result: no" >&5
     3395+  echo "$as_me:3626: result: no" >&5
    33883396 echo "${ECHO_T}no" >&6
    33893397   SET_MAKE="MAKE=${MAKE-make}"
     
    33933401 set dummy ctags; ac_word=$2
    33943402-echo "$as_me:3487: checking for $ac_word" >&5
    3395 +echo "$as_me:3632: checking for $ac_word" >&5
     3403+echo "$as_me:3633: checking for $ac_word" >&5
    33963404 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    33973405 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
    33983406   echo $ECHO_N "(cached) $ECHO_C" >&6
    3399 @@ -3499,7 +3644,7 @@
     3407@@ -3499,7 +3645,7 @@
    34003408   test -z "$ac_dir" && ac_dir=.
    34013409   $as_executable_p "$ac_dir/$ac_word" || continue
    34023410 ac_cv_prog_MAKE_LOWER_TAGS="yes"
    34033411-echo "$as_me:3502: found $ac_dir/$ac_word" >&5
    3404 +echo "$as_me:3647: found $ac_dir/$ac_word" >&5
     3412+echo "$as_me:3648: found $ac_dir/$ac_word" >&5
    34053413 break
    34063414 done
    34073415 
    3408 @@ -3508,17 +3653,17 @@
     3416@@ -3508,17 +3654,17 @@
    34093417 fi
    34103418 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
    34113419 if test -n "$MAKE_LOWER_TAGS"; then
    34123420-  echo "$as_me:3511: result: $MAKE_LOWER_TAGS" >&5
    3413 +  echo "$as_me:3656: result: $MAKE_LOWER_TAGS" >&5
     3421+  echo "$as_me:3657: result: $MAKE_LOWER_TAGS" >&5
    34143422 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
    34153423 else
    34163424-  echo "$as_me:3514: result: no" >&5
    3417 +  echo "$as_me:3659: result: no" >&5
     3425+  echo "$as_me:3660: result: no" >&5
    34183426 echo "${ECHO_T}no" >&6
    34193427 fi
     
    34233431 set dummy etags; ac_word=$2
    34243432-echo "$as_me:3521: checking for $ac_word" >&5
    3425 +echo "$as_me:3666: checking for $ac_word" >&5
     3433+echo "$as_me:3667: checking for $ac_word" >&5
    34263434 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    34273435 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
    34283436   echo $ECHO_N "(cached) $ECHO_C" >&6
    3429 @@ -3533,7 +3678,7 @@
     3437@@ -3533,7 +3679,7 @@
    34303438   test -z "$ac_dir" && ac_dir=.
    34313439   $as_executable_p "$ac_dir/$ac_word" || continue
    34323440 ac_cv_prog_MAKE_UPPER_TAGS="yes"
    34333441-echo "$as_me:3536: found $ac_dir/$ac_word" >&5
    3434 +echo "$as_me:3681: found $ac_dir/$ac_word" >&5
     3442+echo "$as_me:3682: found $ac_dir/$ac_word" >&5
    34353443 break
    34363444 done
    34373445 
    3438 @@ -3542,10 +3687,10 @@
     3446@@ -3542,10 +3688,10 @@
    34393447 fi
    34403448 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
    34413449 if test -n "$MAKE_UPPER_TAGS"; then
    34423450-  echo "$as_me:3545: result: $MAKE_UPPER_TAGS" >&5
    3443 +  echo "$as_me:3690: result: $MAKE_UPPER_TAGS" >&5
     3451+  echo "$as_me:3691: result: $MAKE_UPPER_TAGS" >&5
    34443452 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
    34453453 else
    34463454-  echo "$as_me:3548: result: no" >&5
    3447 +  echo "$as_me:3693: result: no" >&5
     3455+  echo "$as_me:3694: result: no" >&5
    34483456 echo "${ECHO_T}no" >&6
    34493457 fi
    34503458 
    3451 @@ -3565,7 +3710,7 @@
     3459@@ -3565,7 +3711,7 @@
    34523460        MAKE_LOWER_TAGS="#"
    34533461 fi
    34543462 
    34553463-echo "$as_me:3568: checking for makeflags variable" >&5
    3456 +echo "$as_me:3713: checking for makeflags variable" >&5
     3464+echo "$as_me:3714: checking for makeflags variable" >&5
    34573465 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
    34583466 if test "${cf_cv_makeflags+set}" = set; then
    34593467   echo $ECHO_N "(cached) $ECHO_C" >&6
    3460 @@ -3599,13 +3744,13 @@
     3468@@ -3599,13 +3745,13 @@
    34613469        rm -f cf_makeflags.tmp
    34623470 
    34633471 fi
    34643472-echo "$as_me:3602: result: $cf_cv_makeflags" >&5
    3465 +echo "$as_me:3747: result: $cf_cv_makeflags" >&5
     3473+echo "$as_me:3748: result: $cf_cv_makeflags" >&5
    34663474 echo "${ECHO_T}$cf_cv_makeflags" >&6
    34673475 
     
    34703478 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
    34713479-echo "$as_me:3608: checking for $ac_word" >&5
    3472 +echo "$as_me:3753: checking for $ac_word" >&5
     3480+echo "$as_me:3754: checking for $ac_word" >&5
    34733481 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    34743482 if test "${ac_cv_prog_RANLIB+set}" = set; then
    34753483   echo $ECHO_N "(cached) $ECHO_C" >&6
    3476 @@ -3620,7 +3765,7 @@
     3484@@ -3620,7 +3766,7 @@
    34773485   test -z "$ac_dir" && ac_dir=.
    34783486   $as_executable_p "$ac_dir/$ac_word" || continue
    34793487 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
    34803488-echo "$as_me:3623: found $ac_dir/$ac_word" >&5
    3481 +echo "$as_me:3768: found $ac_dir/$ac_word" >&5
     3489+echo "$as_me:3769: found $ac_dir/$ac_word" >&5
    34823490 break
    34833491 done
    34843492 
    3485 @@ -3628,10 +3773,10 @@
     3493@@ -3628,10 +3774,10 @@
    34863494 fi
    34873495 RANLIB=$ac_cv_prog_RANLIB
    34883496 if test -n "$RANLIB"; then
    34893497-  echo "$as_me:3631: result: $RANLIB" >&5
    3490 +  echo "$as_me:3776: result: $RANLIB" >&5
     3498+  echo "$as_me:3777: result: $RANLIB" >&5
    34913499 echo "${ECHO_T}$RANLIB" >&6
    34923500 else
    34933501-  echo "$as_me:3634: result: no" >&5
    3494 +  echo "$as_me:3779: result: no" >&5
     3502+  echo "$as_me:3780: result: no" >&5
    34953503 echo "${ECHO_T}no" >&6
    34963504 fi
    34973505 
    3498 @@ -3640,7 +3785,7 @@
     3506@@ -3640,7 +3786,7 @@
    34993507   ac_ct_RANLIB=$RANLIB
    35003508   # Extract the first word of "ranlib", so it can be a program name with args.
    35013509 set dummy ranlib; ac_word=$2
    35023510-echo "$as_me:3643: checking for $ac_word" >&5
    3503 +echo "$as_me:3788: checking for $ac_word" >&5
     3511+echo "$as_me:3789: checking for $ac_word" >&5
    35043512 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    35053513 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    35063514   echo $ECHO_N "(cached) $ECHO_C" >&6
    3507 @@ -3655,7 +3800,7 @@
     3515@@ -3655,7 +3801,7 @@
    35083516   test -z "$ac_dir" && ac_dir=.
    35093517   $as_executable_p "$ac_dir/$ac_word" || continue
    35103518 ac_cv_prog_ac_ct_RANLIB="ranlib"
    35113519-echo "$as_me:3658: found $ac_dir/$ac_word" >&5
    3512 +echo "$as_me:3803: found $ac_dir/$ac_word" >&5
     3520+echo "$as_me:3804: found $ac_dir/$ac_word" >&5
    35133521 break
    35143522 done
    35153523 
    3516 @@ -3664,10 +3809,10 @@
     3524@@ -3664,10 +3810,10 @@
    35173525 fi
    35183526 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
    35193527 if test -n "$ac_ct_RANLIB"; then
    35203528-  echo "$as_me:3667: result: $ac_ct_RANLIB" >&5
    3521 +  echo "$as_me:3812: result: $ac_ct_RANLIB" >&5
     3529+  echo "$as_me:3813: result: $ac_ct_RANLIB" >&5
    35223530 echo "${ECHO_T}$ac_ct_RANLIB" >&6
    35233531 else
    35243532-  echo "$as_me:3670: result: no" >&5
    3525 +  echo "$as_me:3815: result: no" >&5
     3533+  echo "$as_me:3816: result: no" >&5
    35263534 echo "${ECHO_T}no" >&6
    35273535 fi
    35283536 
    3529 @@ -3679,7 +3824,7 @@
     3537@@ -3679,7 +3825,7 @@
    35303538 if test -n "$ac_tool_prefix"; then
    35313539   # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
    35323540 set dummy ${ac_tool_prefix}ld; ac_word=$2
    35333541-echo "$as_me:3682: checking for $ac_word" >&5
    3534 +echo "$as_me:3827: checking for $ac_word" >&5
     3542+echo "$as_me:3828: checking for $ac_word" >&5
    35353543 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    35363544 if test "${ac_cv_prog_LD+set}" = set; then
    35373545   echo $ECHO_N "(cached) $ECHO_C" >&6
    3538 @@ -3694,7 +3839,7 @@
     3546@@ -3694,7 +3840,7 @@
    35393547   test -z "$ac_dir" && ac_dir=.
    35403548   $as_executable_p "$ac_dir/$ac_word" || continue
    35413549 ac_cv_prog_LD="${ac_tool_prefix}ld"
    35423550-echo "$as_me:3697: found $ac_dir/$ac_word" >&5
    3543 +echo "$as_me:3842: found $ac_dir/$ac_word" >&5
     3551+echo "$as_me:3843: found $ac_dir/$ac_word" >&5
    35443552 break
    35453553 done
    35463554 
    3547 @@ -3702,10 +3847,10 @@
     3555@@ -3702,10 +3848,10 @@
    35483556 fi
    35493557 LD=$ac_cv_prog_LD
    35503558 if test -n "$LD"; then
    35513559-  echo "$as_me:3705: result: $LD" >&5
    3552 +  echo "$as_me:3850: result: $LD" >&5
     3560+  echo "$as_me:3851: result: $LD" >&5
    35533561 echo "${ECHO_T}$LD" >&6
    35543562 else
    35553563-  echo "$as_me:3708: result: no" >&5
    3556 +  echo "$as_me:3853: result: no" >&5
     3564+  echo "$as_me:3854: result: no" >&5
    35573565 echo "${ECHO_T}no" >&6
    35583566 fi
    35593567 
    3560 @@ -3714,7 +3859,7 @@
     3568@@ -3714,7 +3860,7 @@
    35613569   ac_ct_LD=$LD
    35623570   # Extract the first word of "ld", so it can be a program name with args.
    35633571 set dummy ld; ac_word=$2
    35643572-echo "$as_me:3717: checking for $ac_word" >&5
    3565 +echo "$as_me:3862: checking for $ac_word" >&5
     3573+echo "$as_me:3863: checking for $ac_word" >&5
    35663574 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    35673575 if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
    35683576   echo $ECHO_N "(cached) $ECHO_C" >&6
    3569 @@ -3729,7 +3874,7 @@
     3577@@ -3729,7 +3875,7 @@
    35703578   test -z "$ac_dir" && ac_dir=.
    35713579   $as_executable_p "$ac_dir/$ac_word" || continue
    35723580 ac_cv_prog_ac_ct_LD="ld"
    35733581-echo "$as_me:3732: found $ac_dir/$ac_word" >&5
    3574 +echo "$as_me:3877: found $ac_dir/$ac_word" >&5
     3582+echo "$as_me:3878: found $ac_dir/$ac_word" >&5
    35753583 break
    35763584 done
    35773585 
    3578 @@ -3738,10 +3883,10 @@
     3586@@ -3738,10 +3884,10 @@
    35793587 fi
    35803588 ac_ct_LD=$ac_cv_prog_ac_ct_LD
    35813589 if test -n "$ac_ct_LD"; then
    35823590-  echo "$as_me:3741: result: $ac_ct_LD" >&5
    3583 +  echo "$as_me:3886: result: $ac_ct_LD" >&5
     3591+  echo "$as_me:3887: result: $ac_ct_LD" >&5
    35843592 echo "${ECHO_T}$ac_ct_LD" >&6
    35853593 else
    35863594-  echo "$as_me:3744: result: no" >&5
    3587 +  echo "$as_me:3889: result: no" >&5
     3595+  echo "$as_me:3890: result: no" >&5
    35883596 echo "${ECHO_T}no" >&6
    35893597 fi
    35903598 
    3591 @@ -3753,7 +3898,7 @@
     3599@@ -3753,7 +3899,7 @@
    35923600 if test -n "$ac_tool_prefix"; then
    35933601   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
    35943602 set dummy ${ac_tool_prefix}ar; ac_word=$2
    35953603-echo "$as_me:3756: checking for $ac_word" >&5
    3596 +echo "$as_me:3901: checking for $ac_word" >&5
     3604+echo "$as_me:3902: checking for $ac_word" >&5
    35973605 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    35983606 if test "${ac_cv_prog_AR+set}" = set; then
    35993607   echo $ECHO_N "(cached) $ECHO_C" >&6
    3600 @@ -3768,7 +3913,7 @@
     3608@@ -3768,7 +3914,7 @@
    36013609   test -z "$ac_dir" && ac_dir=.
    36023610   $as_executable_p "$ac_dir/$ac_word" || continue
    36033611 ac_cv_prog_AR="${ac_tool_prefix}ar"
    36043612-echo "$as_me:3771: found $ac_dir/$ac_word" >&5
    3605 +echo "$as_me:3916: found $ac_dir/$ac_word" >&5
     3613+echo "$as_me:3917: found $ac_dir/$ac_word" >&5
    36063614 break
    36073615 done
    36083616 
    3609 @@ -3776,10 +3921,10 @@
     3617@@ -3776,10 +3922,10 @@
    36103618 fi
    36113619 AR=$ac_cv_prog_AR
    36123620 if test -n "$AR"; then
    36133621-  echo "$as_me:3779: result: $AR" >&5
    3614 +  echo "$as_me:3924: result: $AR" >&5
     3622+  echo "$as_me:3925: result: $AR" >&5
    36153623 echo "${ECHO_T}$AR" >&6
    36163624 else
    36173625-  echo "$as_me:3782: result: no" >&5
    3618 +  echo "$as_me:3927: result: no" >&5
     3626+  echo "$as_me:3928: result: no" >&5
    36193627 echo "${ECHO_T}no" >&6
    36203628 fi
    36213629 
    3622 @@ -3788,7 +3933,7 @@
     3630@@ -3788,7 +3934,7 @@
    36233631   ac_ct_AR=$AR
    36243632   # Extract the first word of "ar", so it can be a program name with args.
    36253633 set dummy ar; ac_word=$2
    36263634-echo "$as_me:3791: checking for $ac_word" >&5
    3627 +echo "$as_me:3936: checking for $ac_word" >&5
     3635+echo "$as_me:3937: checking for $ac_word" >&5
    36283636 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    36293637 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
    36303638   echo $ECHO_N "(cached) $ECHO_C" >&6
    3631 @@ -3803,7 +3948,7 @@
     3639@@ -3803,7 +3949,7 @@
    36323640   test -z "$ac_dir" && ac_dir=.
    36333641   $as_executable_p "$ac_dir/$ac_word" || continue
    36343642 ac_cv_prog_ac_ct_AR="ar"
    36353643-echo "$as_me:3806: found $ac_dir/$ac_word" >&5
    3636 +echo "$as_me:3951: found $ac_dir/$ac_word" >&5
     3644+echo "$as_me:3952: found $ac_dir/$ac_word" >&5
    36373645 break
    36383646 done
    36393647 
    3640 @@ -3812,10 +3957,10 @@
     3648@@ -3812,10 +3958,10 @@
    36413649 fi
    36423650 ac_ct_AR=$ac_cv_prog_ac_ct_AR
    36433651 if test -n "$ac_ct_AR"; then
    36443652-  echo "$as_me:3815: result: $ac_ct_AR" >&5
    3645 +  echo "$as_me:3960: result: $ac_ct_AR" >&5
     3653+  echo "$as_me:3961: result: $ac_ct_AR" >&5
    36463654 echo "${ECHO_T}$ac_ct_AR" >&6
    36473655 else
    36483656-  echo "$as_me:3818: result: no" >&5
    3649 +  echo "$as_me:3963: result: no" >&5
     3657+  echo "$as_me:3964: result: no" >&5
    36503658 echo "${ECHO_T}no" >&6
    36513659 fi
    36523660 
    3653 @@ -3824,25 +3969,123 @@
     3661@@ -3824,25 +3970,123 @@
    36543662   AR="$ac_cv_prog_AR"
    36553663 fi
     
    36593667+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
    36603668+set dummy ${ac_tool_prefix}ar; ac_word=$2
    3661 +echo "$as_me:3975: checking for $ac_word" >&5
     3669+echo "$as_me:3976: checking for $ac_word" >&5
    36623670+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    36633671+if test "${ac_cv_prog_AR+set}" = set; then
     
    36743682+  $as_executable_p "$ac_dir/$ac_word" || continue
    36753683+ac_cv_prog_AR="${ac_tool_prefix}ar"
    3676 +echo "$as_me:3990: found $ac_dir/$ac_word" >&5
     3684+echo "$as_me:3991: found $ac_dir/$ac_word" >&5
    36773685+break
    36783686+done
    3679 +
     3687 
     3688-echo "$as_me:3831: checking for archiver options (symbol AR_OPTS)" >&5
     3689-echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6
    36803690+fi
    36813691+fi
    36823692+AR=$ac_cv_prog_AR
    36833693+if test -n "$AR"; then
    3684 +  echo "$as_me:3998: result: $AR" >&5
     3694+  echo "$as_me:3999: result: $AR" >&5
    36853695+echo "${ECHO_T}$AR" >&6
    36863696+else
    3687 +  echo "$as_me:4001: result: no" >&5
     3697+  echo "$as_me:4002: result: no" >&5
    36883698+echo "${ECHO_T}no" >&6
    36893699+fi
    36903700 
    3691 -echo "$as_me:3831: checking for archiver options (symbol AR_OPTS)" >&5
    3692 -echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6
     3701-if test -z "$AR_OPTS" ; then
     3702-       AR_OPTS=rv
    36933703+fi
    36943704+if test -z "$ac_cv_prog_AR"; then
     
    36963706+  # Extract the first word of "ar", so it can be a program name with args.
    36973707+set dummy ar; ac_word=$2
    3698 +echo "$as_me:4010: checking for $ac_word" >&5
     3708+echo "$as_me:4011: checking for $ac_word" >&5
    36993709+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    37003710+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
     
    37113721+  $as_executable_p "$ac_dir/$ac_word" || continue
    37123722+ac_cv_prog_ac_ct_AR="ar"
    3713 +echo "$as_me:4025: found $ac_dir/$ac_word" >&5
     3723+echo "$as_me:4026: found $ac_dir/$ac_word" >&5
    37143724+break
    37153725+done
    37163726 
    3717 -if test -z "$AR_OPTS" ; then
    3718 -       AR_OPTS=rv
    37193727+  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="ar"
    37203728+fi
    3721 +fi
     3729 fi
    37223730+ac_ct_AR=$ac_cv_prog_ac_ct_AR
    37233731+if test -n "$ac_ct_AR"; then
    3724 +  echo "$as_me:4034: result: $ac_ct_AR" >&5
     3732+  echo "$as_me:4035: result: $ac_ct_AR" >&5
    37253733+echo "${ECHO_T}$ac_ct_AR" >&6
    37263734+else
    3727 +  echo "$as_me:4037: result: no" >&5
     3735+  echo "$as_me:4038: result: no" >&5
    37283736+echo "${ECHO_T}no" >&6
    37293737+fi
    3730  
     3738+
    37313739+  AR=$ac_ct_AR
    37323740+else
    37333741+  AR="$ac_cv_prog_AR"
    3734  fi
    3735  
    3736 -cf_cv_subst_AR_OPTS=$AR_OPTS
    3737 -echo "$as_me:3840: result: $AR_OPTS" >&5
    3738 -echo "${ECHO_T}$AR_OPTS" >&6
    3739 +echo "$as_me:4046: checking for options to update archives" >&5
     3742+fi
     3743+
     3744+echo "$as_me:4047: checking for options to update archives" >&5
    37403745+echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
    37413746+if test "${cf_cv_ar_flags+set}" = set; then
    37423747+  echo $ECHO_N "(cached) $ECHO_C" >&6
    37433748+else
    3744 +
     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
    37453753+       cf_cv_ar_flags=unknown
    37463754+       for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
     
    37503758+
    37513759+               cat >conftest.$ac_ext <<EOF
    3752 +#line 4059 "configure"
     3760+#line 4060 "configure"
    37533761+int    testdata[3] = { 123, 456, 789 };
    37543762+EOF
    3755 +               if { (eval echo "$as_me:4062: \"$ac_compile\"") >&5
     3763+               if { (eval echo "$as_me:4063: \"$ac_compile\"") >&5
    37563764+  (eval $ac_compile) 2>&5
    37573765+  ac_status=$?
    3758 +  echo "$as_me:4065: \$? = $ac_status" >&5
     3766+  echo "$as_me:4066: \$? = $ac_status" >&5
    37593767+  (exit $ac_status); } ; then
    37603768+                       $AR $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null
     
    37663774+                       test -n "$verbose" && echo "    cannot compile test-program" 1>&6
    37673775+
    3768 +echo "${as_me-configure}:4075: testing cannot compile test-program ..." 1>&5
     3776+echo "${as_me-configure}:4076: testing cannot compile test-program ..." 1>&5
    37693777+
    37703778+                       break
     
    37743782 
    37753783 fi
    3776 +echo "$as_me:4083: result: $cf_cv_ar_flags" >&5
     3784+echo "$as_me:4084: result: $cf_cv_ar_flags" >&5
    37773785+echo "${ECHO_T}$cf_cv_ar_flags" >&6
    37783786+test -z "$ARFLAGS" && ARFLAGS=$cf_cv_ar_flags
     
    37803788 
    37813789-echo "$as_me:3845: checking if you have specified an install-prefix" >&5
    3782 +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
    37833791 echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
    37843792 
    37853793 # Check whether --with-install-prefix or --without-install-prefix was given.
    3786 @@ -3855,7 +4098,7 @@
     3794@@ -3855,7 +4099,7 @@
    37873795                ;;
    37883796        esac
    37893797 fi;
    37903798-echo "$as_me:3858: result: $DESTDIR" >&5
    3791 +echo "$as_me:4101: result: $DESTDIR" >&5
     3799+echo "$as_me:4102: result: $DESTDIR" >&5
    37923800 echo "${ECHO_T}$DESTDIR" >&6
    37933801 
    37943802 ###############################################################################
    3795 @@ -3883,7 +4126,7 @@
     3803@@ -3883,7 +4127,7 @@
    37963804 do
    37973805   # Extract the first word of "$ac_prog", so it can be a program name with args.
    37983806 set dummy $ac_prog; ac_word=$2
    37993807-echo "$as_me:3886: checking for $ac_word" >&5
    3800 +echo "$as_me:4129: checking for $ac_word" >&5
     3808+echo "$as_me:4130: checking for $ac_word" >&5
    38013809 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    38023810 if test "${ac_cv_prog_BUILD_CC+set}" = set; then
    38033811   echo $ECHO_N "(cached) $ECHO_C" >&6
    3804 @@ -3898,7 +4141,7 @@
     3812@@ -3898,7 +4142,7 @@
    38053813   test -z "$ac_dir" && ac_dir=.
    38063814   $as_executable_p "$ac_dir/$ac_word" || continue
    38073815 ac_cv_prog_BUILD_CC="$ac_prog"
    38083816-echo "$as_me:3901: found $ac_dir/$ac_word" >&5
    3809 +echo "$as_me:4144: found $ac_dir/$ac_word" >&5
     3817+echo "$as_me:4145: found $ac_dir/$ac_word" >&5
    38103818 break
    38113819 done
    38123820 
    3813 @@ -3906,10 +4149,10 @@
     3821@@ -3906,10 +4150,10 @@
    38143822 fi
    38153823 BUILD_CC=$ac_cv_prog_BUILD_CC
    38163824 if test -n "$BUILD_CC"; then
    38173825-  echo "$as_me:3909: result: $BUILD_CC" >&5
    3818 +  echo "$as_me:4152: result: $BUILD_CC" >&5
     3826+  echo "$as_me:4153: result: $BUILD_CC" >&5
    38193827 echo "${ECHO_T}$BUILD_CC" >&6
    38203828 else
    38213829-  echo "$as_me:3912: result: no" >&5
    3822 +  echo "$as_me:4155: result: no" >&5
     3830+  echo "$as_me:4156: result: no" >&5
    38233831 echo "${ECHO_T}no" >&6
    38243832 fi
    38253833 
    3826 @@ -3917,12 +4160,12 @@
     3834@@ -3917,12 +4161,12 @@
    38273835 done
    38283836 
    38293837 fi;
    38303838-       echo "$as_me:3920: checking for native build C compiler" >&5
    3831 +       echo "$as_me:4163: checking for native build C compiler" >&5
     3839+       echo "$as_me:4164: checking for native build C compiler" >&5
    38323840 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
    38333841-       echo "$as_me:3922: result: $BUILD_CC" >&5
    3834 +       echo "$as_me:4165: result: $BUILD_CC" >&5
     3842+       echo "$as_me:4166: result: $BUILD_CC" >&5
    38353843 echo "${ECHO_T}$BUILD_CC" >&6
    38363844 
    38373845-       echo "$as_me:3925: checking for native build C preprocessor" >&5
    3838 +       echo "$as_me:4168: checking for native build C preprocessor" >&5
     3846+       echo "$as_me:4169: checking for native build C preprocessor" >&5
    38393847 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
    38403848 
    38413849 # Check whether --with-build-cpp or --without-build-cpp was given.
    3842 @@ -3932,10 +4175,10 @@
     3850@@ -3932,10 +4176,10 @@
    38433851 else
    38443852   BUILD_CPP='${BUILD_CC} -E'
    38453853 fi;
    38463854-       echo "$as_me:3935: result: $BUILD_CPP" >&5
    3847 +       echo "$as_me:4178: result: $BUILD_CPP" >&5
     3855+       echo "$as_me:4179: result: $BUILD_CPP" >&5
    38483856 echo "${ECHO_T}$BUILD_CPP" >&6
    38493857 
    38503858-       echo "$as_me:3938: checking for native build C flags" >&5
    3851 +       echo "$as_me:4181: checking for native build C flags" >&5
     3859+       echo "$as_me:4182: checking for native build C flags" >&5
    38523860 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
    38533861 
    38543862 # Check whether --with-build-cflags or --without-build-cflags was given.
    3855 @@ -3943,10 +4186,10 @@
     3863@@ -3943,10 +4187,10 @@
    38563864   withval="$with_build_cflags"
    38573865   BUILD_CFLAGS="$withval"
    38583866 fi;
    38593867-       echo "$as_me:3946: result: $BUILD_CFLAGS" >&5
    3860 +       echo "$as_me:4189: result: $BUILD_CFLAGS" >&5
     3868+       echo "$as_me:4190: result: $BUILD_CFLAGS" >&5
    38613869 echo "${ECHO_T}$BUILD_CFLAGS" >&6
    38623870 
    38633871-       echo "$as_me:3949: checking for native build C preprocessor-flags" >&5
    3864 +       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
    38653873 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
    38663874 
    38673875 # Check whether --with-build-cppflags or --without-build-cppflags was given.
    3868 @@ -3954,10 +4197,10 @@
     3876@@ -3954,10 +4198,10 @@
    38693877   withval="$with_build_cppflags"
    38703878   BUILD_CPPFLAGS="$withval"
    38713879 fi;
    38723880-       echo "$as_me:3957: result: $BUILD_CPPFLAGS" >&5
    3873 +       echo "$as_me:4200: result: $BUILD_CPPFLAGS" >&5
     3881+       echo "$as_me:4201: result: $BUILD_CPPFLAGS" >&5
    38743882 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
    38753883 
    38763884-       echo "$as_me:3960: checking for native build linker-flags" >&5
    3877 +       echo "$as_me:4203: checking for native build linker-flags" >&5
     3885+       echo "$as_me:4204: checking for native build linker-flags" >&5
    38783886 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
    38793887 
    38803888 # Check whether --with-build-ldflags or --without-build-ldflags was given.
    3881 @@ -3965,10 +4208,10 @@
     3889@@ -3965,10 +4209,10 @@
    38823890   withval="$with_build_ldflags"
    38833891   BUILD_LDFLAGS="$withval"
    38843892 fi;
    38853893-       echo "$as_me:3968: result: $BUILD_LDFLAGS" >&5
    3886 +       echo "$as_me:4211: result: $BUILD_LDFLAGS" >&5
     3894+       echo "$as_me:4212: result: $BUILD_LDFLAGS" >&5
    38873895 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
    38883896 
    38893897-       echo "$as_me:3971: checking for native build linker-libraries" >&5
    3890 +       echo "$as_me:4214: checking for native build linker-libraries" >&5
     3898+       echo "$as_me:4215: checking for native build linker-libraries" >&5
    38913899 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
    38923900 
    38933901 # Check whether --with-build-libs or --without-build-libs was given.
    3894 @@ -3976,7 +4219,7 @@
     3902@@ -3976,7 +4220,7 @@
    38953903   withval="$with_build_libs"
    38963904   BUILD_LIBS="$withval"
    38973905 fi;
    38983906-       echo "$as_me:3979: result: $BUILD_LIBS" >&5
    3899 +       echo "$as_me:4222: result: $BUILD_LIBS" >&5
     3907+       echo "$as_me:4223: result: $BUILD_LIBS" >&5
    39003908 echo "${ECHO_T}$BUILD_LIBS" >&6
    39013909 
    39023910        # this assumes we're on Unix.
    3903 @@ -3986,7 +4229,7 @@
     3911@@ -3986,7 +4230,7 @@
    39043912        : ${BUILD_CC:='${CC}'}
    39053913 
    39063914        if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
    39073915-               { { echo "$as_me:3989: error: Cross-build requires two compilers.
    3908 +               { { echo "$as_me:4232: error: Cross-build requires two compilers.
     3916+               { { echo "$as_me:4233: error: Cross-build requires two compilers.
    39093917 Use --with-build-cc to specify the native compiler." >&5
    39103918 echo "$as_me: error: Cross-build requires two compilers.
    39113919 Use --with-build-cc to specify the native compiler." >&2;}
    3912 @@ -4027,7 +4270,7 @@
     3920@@ -4027,7 +4271,7 @@
    39133921 LIB_INSTALL=
    39143922 LIB_UNINSTALL=
    39153923 
    39163924-echo "$as_me:4030: checking if you want to build libraries with libtool" >&5
    3917 +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
    39183926 echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6
    39193927 
    39203928 # Check whether --with-libtool or --without-libtool was given.
    3921 @@ -4037,11 +4280,11 @@
     3929@@ -4037,11 +4281,11 @@
    39223930 else
    39233931   with_libtool=no
    39243932 fi;
    39253933-echo "$as_me:4040: result: $with_libtool" >&5
    3926 +echo "$as_me:4283: result: $with_libtool" >&5
     3934+echo "$as_me:4284: result: $with_libtool" >&5
    39273935 echo "${ECHO_T}$with_libtool" >&6
    39283936 if test "$with_libtool" != "no"; then
     
    39333941 if test "x$prefix" != xNONE; then
    39343942   cf_path_syntax="$prefix"
    3935 @@ -4068,7 +4311,7 @@
     3943@@ -4068,7 +4312,7 @@
    39363944   with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
    39373945   ;;
    39383946 *)
    39393947-  { { echo "$as_me:4071: error: expected a pathname, not \"$with_libtool\"" >&5
    3940 +  { { 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
    39413949 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
    39423950    { (exit 1); exit 1; }; }
    39433951   ;;
    3944 @@ -4076,9 +4319,9 @@
     3952@@ -4076,9 +4320,9 @@
    39453953 
    39463954                LIBTOOL=$with_libtool
     
    39503958 set dummy libtool; ac_word=$2
    39513959-echo "$as_me:4081: checking for $ac_word" >&5
    3952 +echo "$as_me:4324: checking for $ac_word" >&5
     3960+echo "$as_me:4325: checking for $ac_word" >&5
    39533961 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    39543962 if test "${ac_cv_path_LIBTOOL+set}" = set; then
    39553963   echo $ECHO_N "(cached) $ECHO_C" >&6
    3956 @@ -4095,7 +4338,7 @@
     3964@@ -4095,7 +4339,7 @@
    39573965   test -z "$ac_dir" && ac_dir=.
    39583966   if $as_executable_p "$ac_dir/$ac_word"; then
    39593967    ac_cv_path_LIBTOOL="$ac_dir/$ac_word"
    39603968-   echo "$as_me:4098: found $ac_dir/$ac_word" >&5
    3961 +   echo "$as_me:4341: found $ac_dir/$ac_word" >&5
     3969+   echo "$as_me:4342: found $ac_dir/$ac_word" >&5
    39623970    break
    39633971 fi
    39643972 done
    3965 @@ -4106,19 +4349,19 @@
     3973@@ -4106,19 +4350,19 @@
    39663974 LIBTOOL=$ac_cv_path_LIBTOOL
    39673975 
    39683976 if test -n "$LIBTOOL"; then
    39693977-  echo "$as_me:4109: result: $LIBTOOL" >&5
    3970 +  echo "$as_me:4352: result: $LIBTOOL" >&5
     3978+  echo "$as_me:4353: result: $LIBTOOL" >&5
    39713979 echo "${ECHO_T}$LIBTOOL" >&6
    39723980 else
    39733981-  echo "$as_me:4112: result: no" >&5
    3974 +  echo "$as_me:4355: result: no" >&5
     3982+  echo "$as_me:4356: result: no" >&5
    39753983 echo "${ECHO_T}no" >&6
    39763984 fi
     
    39813989+       fi
    39823990+       if test -z "$LIBTOOL" ; then
    3983 +               { { echo "$as_me:4361: error: Cannot find libtool" >&5
     3991+               { { echo "$as_me:4362: error: Cannot find libtool" >&5
    39843992 echo "$as_me: error: Cannot find libtool" >&2;}
    39853993    { (exit 1); exit 1; }; }
     
    39893997        LIB_OBJECT='${OBJECTS:.o=.lo}'
    39903998        LIB_SUFFIX=.la
    3991 @@ -4130,17 +4373,17 @@
     3999@@ -4130,17 +4374,17 @@
    39924000        LIB_PREP=:
    39934001 
    39944002        # Show the version of libtool
    39954003-       echo "$as_me:4133: checking version of libtool" >&5
    3996 +       echo "$as_me:4376: checking version of libtool" >&5
     4004+       echo "$as_me:4377: checking version of libtool" >&5
    39974005 echo $ECHO_N "checking version of libtool... $ECHO_C" >&6
    39984006 
     
    40024010        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.].*//'`
    40034011-       echo "$as_me:4140: result: $cf_cv_libtool_version" >&5
    4004 +       echo "$as_me:4383: result: $cf_cv_libtool_version" >&5
     4012+       echo "$as_me:4384: result: $cf_cv_libtool_version" >&5
    40054013 echo "${ECHO_T}$cf_cv_libtool_version" >&6
    40064014        if test -z "$cf_cv_libtool_version" ; then
    40074015-               { { echo "$as_me:4143: error: This is not GNU libtool" >&5
    4008 +               { { echo "$as_me:4386: error: This is not GNU libtool" >&5
     4016+               { { echo "$as_me:4387: error: This is not GNU libtool" >&5
    40094017 echo "$as_me: error: This is not GNU libtool" >&2;}
    40104018    { (exit 1); exit 1; }; }
    40114019        fi
    4012 @@ -4168,7 +4411,7 @@
     4020@@ -4168,7 +4412,7 @@
    40134021 
    40144022 else
    40154023 
    40164024-echo "$as_me:4171: checking if you want to build shared libraries" >&5
    4017 +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
    40184026 echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6
    40194027 
    40204028 # Check whether --with-shared or --without-shared was given.
    4021 @@ -4178,11 +4421,11 @@
     4029@@ -4178,11 +4422,11 @@
    40224030 else
    40234031   with_shared=no
    40244032 fi;
    40254033-echo "$as_me:4181: result: $with_shared" >&5
    4026 +echo "$as_me:4424: result: $with_shared" >&5
     4034+echo "$as_me:4425: result: $with_shared" >&5
    40274035 echo "${ECHO_T}$with_shared" >&6
    40284036 test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
    40294037 
    40304038-echo "$as_me:4185: checking if you want to build static libraries" >&5
    4031 +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
    40324040 echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6
    40334041 
    40344042 # Check whether --with-normal or --without-normal was given.
    4035 @@ -4192,11 +4435,11 @@
     4043@@ -4192,11 +4436,11 @@
    40364044 else
    40374045   with_normal=yes
    40384046 fi;
    40394047-echo "$as_me:4195: result: $with_normal" >&5
    4040 +echo "$as_me:4438: result: $with_normal" >&5
     4048+echo "$as_me:4439: result: $with_normal" >&5
    40414049 echo "${ECHO_T}$with_normal" >&6
    40424050 test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal"
    40434051 
    40444052-echo "$as_me:4199: checking if you want to build debug libraries" >&5
    4045 +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
    40464054 echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6
    40474055 
    40484056 # Check whether --with-debug or --without-debug was given.
    4049 @@ -4206,11 +4449,11 @@
     4057@@ -4206,11 +4450,11 @@
    40504058 else
    40514059   with_debug=yes
    40524060 fi;
    40534061-echo "$as_me:4209: result: $with_debug" >&5
    4054 +echo "$as_me:4452: result: $with_debug" >&5
     4062+echo "$as_me:4453: result: $with_debug" >&5
    40554063 echo "${ECHO_T}$with_debug" >&6
    40564064 test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug"
    40574065 
    40584066-echo "$as_me:4213: checking if you want to build profiling libraries" >&5
    4059 +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
    40604068 echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6
    40614069 
    40624070 # Check whether --with-profile or --without-profile was given.
    4063 @@ -4220,7 +4463,7 @@
     4071@@ -4220,7 +4464,7 @@
    40644072 else
    40654073   with_profile=no
    40664074 fi;
    40674075-echo "$as_me:4223: result: $with_profile" >&5
    4068 +echo "$as_me:4466: result: $with_profile" >&5
     4076+echo "$as_me:4467: result: $with_profile" >&5
    40694077 echo "${ECHO_T}$with_profile" >&6
    40704078 test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile"
    40714079 
    4072 @@ -4228,19 +4471,19 @@
     4080@@ -4228,19 +4472,19 @@
    40734081 
    40744082 ###############################################################################
    40754083 
    40764084-echo "$as_me:4231: checking for specified models" >&5
    4077 +echo "$as_me:4474: checking for specified models" >&5
     4085+echo "$as_me:4475: checking for specified models" >&5
    40784086 echo $ECHO_N "checking for specified models... $ECHO_C" >&6
    40794087 test -z "$cf_list_models" && cf_list_models=normal
    40804088 test "$with_libtool" != "no" && cf_list_models=libtool
    40814089-echo "$as_me:4235: result: $cf_list_models" >&5
    4082 +echo "$as_me:4478: result: $cf_list_models" >&5
     4090+echo "$as_me:4479: result: $cf_list_models" >&5
    40834091 echo "${ECHO_T}$cf_list_models" >&6
    40844092 
     
    40864094 ### up test-applications.
    40874095-echo "$as_me:4240: checking for default model" >&5
    4088 +echo "$as_me:4483: checking for default model" >&5
     4096+echo "$as_me:4484: checking for default model" >&5
    40894097 echo $ECHO_N "checking for default model... $ECHO_C" >&6
    40904098 DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'`
    40914099-echo "$as_me:4243: result: $DFT_LWR_MODEL" >&5
    4092 +echo "$as_me:4486: result: $DFT_LWR_MODEL" >&5
     4100+echo "$as_me:4487: result: $DFT_LWR_MODEL" >&5
    40934101 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
    40944102 
    40954103 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
    4096 @@ -4269,7 +4512,7 @@
     4104@@ -4269,7 +4513,7 @@
    40974105 
    40984106 ###############################################################################
    40994107 
    41004108-echo "$as_me:4272: checking if you want to build a separate terminfo library" >&5
    4101 +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
    41024110 echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6
    41034111 
    41044112 # Check whether --with-termlib or --without-termlib was given.
    4105 @@ -4279,10 +4522,10 @@
     4113@@ -4279,10 +4523,10 @@
    41064114 else
    41074115   with_termlib=no
    41084116 fi;
    41094117-echo "$as_me:4282: result: $with_termlib" >&5
    4110 +echo "$as_me:4525: result: $with_termlib" >&5
     4118+echo "$as_me:4526: result: $with_termlib" >&5
    41114119 echo "${ECHO_T}$with_termlib" >&6
    41124120 
    41134121-echo "$as_me:4285: checking if you want to build a separate tic library" >&5
    4114 +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
    41154123 echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6
    41164124 
    41174125 # Check whether --with-ticlib or --without-ticlib was given.
    4118 @@ -4292,13 +4535,13 @@
     4126@@ -4292,13 +4536,13 @@
    41194127 else
    41204128   with_ticlib=no
    41214129 fi;
    41224130-echo "$as_me:4295: result: $with_ticlib" >&5
    4123 +echo "$as_me:4538: result: $with_ticlib" >&5
     4131+echo "$as_me:4539: result: $with_ticlib" >&5
    41244132 echo "${ECHO_T}$with_ticlib" >&6
    41254133 
     
    41284136 
    41294137-echo "$as_me:4301: checking if you want to link with the GPM mouse library" >&5
    4130 +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
    41314139 echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6
    41324140 
    41334141 # Check whether --with-gpm or --without-gpm was given.
    4134 @@ -4308,27 +4551,27 @@
     4142@@ -4308,27 +4552,27 @@
    41354143 else
    41364144   with_gpm=maybe
    41374145 fi;
    41384146-echo "$as_me:4311: result: $with_gpm" >&5
    4139 +echo "$as_me:4554: result: $with_gpm" >&5
     4147+echo "$as_me:4555: result: $with_gpm" >&5
    41404148 echo "${ECHO_T}$with_gpm" >&6
    41414149 
    41424150 if test "$with_gpm" != no ; then
    41434151-       echo "$as_me:4315: checking for gpm.h" >&5
    4144 +       echo "$as_me:4558: checking for gpm.h" >&5
     4152+       echo "$as_me:4559: checking for gpm.h" >&5
    41454153 echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6
    41464154 if test "${ac_cv_header_gpm_h+set}" = set; then
     
    41494157   cat >conftest.$ac_ext <<_ACEOF
    41504158-#line 4321 "configure"
    4151 +#line 4564 "configure"
     4159+#line 4565 "configure"
    41524160 #include "confdefs.h"
    41534161 #include <gpm.h>
    41544162 _ACEOF
    41554163-if { (eval echo "$as_me:4325: \"$ac_cpp conftest.$ac_ext\"") >&5
    4156 +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
    41574165   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    41584166   ac_status=$?
     
    41614169   cat conftest.err >&5
    41624170-  echo "$as_me:4331: \$? = $ac_status" >&5
    4163 +  echo "$as_me:4574: \$? = $ac_status" >&5
     4171+  echo "$as_me:4575: \$? = $ac_status" >&5
    41644172   (exit $ac_status); } >/dev/null; then
    41654173   if test -s conftest.err; then
    41664174     ac_cpp_err=$ac_c_preproc_warn_flag
    4167 @@ -4347,7 +4590,7 @@
     4175@@ -4347,7 +4591,7 @@
    41684176 fi
    41694177 rm -f conftest.err conftest.$ac_ext
    41704178 fi
    41714179-echo "$as_me:4350: result: $ac_cv_header_gpm_h" >&5
    4172 +echo "$as_me:4593: result: $ac_cv_header_gpm_h" >&5
     4180+echo "$as_me:4594: result: $ac_cv_header_gpm_h" >&5
    41734181 echo "${ECHO_T}$ac_cv_header_gpm_h" >&6
    41744182 if test $ac_cv_header_gpm_h = yes; then
    41754183 
    4176 @@ -4358,14 +4601,14 @@
     4184@@ -4358,14 +4602,14 @@
    41774185                if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then
    41784186                        test -n "$verbose" && echo "    assuming we really have GPM library" 1>&6
    41794187 
    41804188-echo "${as_me-configure}:4361: testing assuming we really have GPM library ..." 1>&5
    4181 +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
    41824190 
    41834191                        cat >>confdefs.h <<\EOF
     
    41874195                else
    41884196-                       echo "$as_me:4368: checking for Gpm_Open in -lgpm" >&5
    4189 +                       echo "$as_me:4611: checking for Gpm_Open in -lgpm" >&5
     4197+                       echo "$as_me:4612: checking for Gpm_Open in -lgpm" >&5
    41904198 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
    41914199 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
    41924200   echo $ECHO_N "(cached) $ECHO_C" >&6
    4193 @@ -4373,7 +4616,7 @@
     4201@@ -4373,7 +4617,7 @@
    41944202   ac_check_lib_save_LIBS=$LIBS
    41954203 LIBS="-lgpm  $LIBS"
    41964204 cat >conftest.$ac_ext <<_ACEOF
    41974205-#line 4376 "configure"
    4198 +#line 4619 "configure"
     4206+#line 4620 "configure"
    41994207 #include "confdefs.h"
    42004208 
    42014209 /* Override any gcc2 internal prototype to avoid an error.  */
    4202 @@ -4392,16 +4635,16 @@
     4210@@ -4392,16 +4636,16 @@
    42034211 }
    42044212 _ACEOF
    42054213 rm -f conftest.$ac_objext conftest$ac_exeext
    42064214-if { (eval echo "$as_me:4395: \"$ac_link\"") >&5
    4207 +if { (eval echo "$as_me:4638: \"$ac_link\"") >&5
     4215+if { (eval echo "$as_me:4639: \"$ac_link\"") >&5
    42084216   (eval $ac_link) 2>&5
    42094217   ac_status=$?
    42104218-  echo "$as_me:4398: \$? = $ac_status" >&5
    4211 +  echo "$as_me:4641: \$? = $ac_status" >&5
     4219+  echo "$as_me:4642: \$? = $ac_status" >&5
    42124220   (exit $ac_status); } &&
    42134221          { ac_try='test -s conftest$ac_exeext'
    42144222-  { (eval echo "$as_me:4401: \"$ac_try\"") >&5
    4215 +  { (eval echo "$as_me:4644: \"$ac_try\"") >&5
     4223+  { (eval echo "$as_me:4645: \"$ac_try\"") >&5
    42164224   (eval $ac_try) 2>&5
    42174225   ac_status=$?
    42184226-  echo "$as_me:4404: \$? = $ac_status" >&5
    4219 +  echo "$as_me:4647: \$? = $ac_status" >&5
     4227+  echo "$as_me:4648: \$? = $ac_status" >&5
    42204228   (exit $ac_status); }; }; then
    42214229   ac_cv_lib_gpm_Gpm_Open=yes
    42224230 else
    4223 @@ -4412,13 +4655,13 @@
     4231@@ -4412,13 +4656,13 @@
    42244232 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    42254233 LIBS=$ac_check_lib_save_LIBS
    42264234 fi
    42274235-echo "$as_me:4415: result: $ac_cv_lib_gpm_Gpm_Open" >&5
    4228 +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
    42294237 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
    42304238 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
     
    42334241 
    42344242-                               { { echo "$as_me:4421: error: Cannot link with GPM library" >&5
    4235 +                               { { echo "$as_me:4664: error: Cannot link with GPM library" >&5
     4243+                               { { echo "$as_me:4665: error: Cannot link with GPM library" >&5
    42364244 echo "$as_me: error: Cannot link with GPM library" >&2;}
    42374245    { (exit 1); exit 1; }; }
    42384246                fi
    4239 @@ -4428,7 +4671,7 @@
     4247@@ -4428,7 +4672,7 @@
    42404248 
    42414249 else
    42424250 
    42434251-               test "$with_gpm" != maybe && { echo "$as_me:4431: WARNING: Cannot find GPM header" >&5
    4244 +               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
    42454253 echo "$as_me: WARNING: Cannot find GPM header" >&2;}
    42464254                with_gpm=no
    42474255 
    4248 @@ -4437,7 +4680,7 @@
     4256@@ -4437,7 +4681,7 @@
    42494257 fi
    42504258 
    42514259 if test "$with_gpm" != no ; then
    42524260-       echo "$as_me:4440: checking if you want to load GPM dynamically" >&5
    4253 +       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
    42544262 echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6
    42554263 
    42564264 # Check whether --with-dlsym or --without-dlsym was given.
    4257 @@ -4447,18 +4690,18 @@
     4265@@ -4447,18 +4691,18 @@
    42584266 else
    42594267   with_dlsym=yes
    42604268 fi;
    42614269-       echo "$as_me:4450: result: $with_dlsym" >&5
    4262 +       echo "$as_me:4693: result: $with_dlsym" >&5
     4270+       echo "$as_me:4694: result: $with_dlsym" >&5
    42634271 echo "${ECHO_T}$with_dlsym" >&6
    42644272        if test "$with_dlsym" = yes ; then
     
    42664274 cf_have_dlsym=no
    42674275-echo "$as_me:4455: checking for dlsym" >&5
    4268 +echo "$as_me:4698: checking for dlsym" >&5
     4276+echo "$as_me:4699: checking for dlsym" >&5
    42694277 echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
    42704278 if test "${ac_cv_func_dlsym+set}" = set; then
     
    42734281   cat >conftest.$ac_ext <<_ACEOF
    42744282-#line 4461 "configure"
    4275 +#line 4704 "configure"
     4283+#line 4705 "configure"
    42764284 #include "confdefs.h"
    42774285 /* System header to define __stub macros and hopefully few prototypes,
    42784286     which can conflict with char dlsym (); below.  */
    4279 @@ -4489,16 +4732,16 @@
     4287@@ -4489,16 +4733,16 @@
    42804288 }
    42814289 _ACEOF
    42824290 rm -f conftest.$ac_objext conftest$ac_exeext
    42834291-if { (eval echo "$as_me:4492: \"$ac_link\"") >&5
    4284 +if { (eval echo "$as_me:4735: \"$ac_link\"") >&5
     4292+if { (eval echo "$as_me:4736: \"$ac_link\"") >&5
    42854293   (eval $ac_link) 2>&5
    42864294   ac_status=$?
    42874295-  echo "$as_me:4495: \$? = $ac_status" >&5
    4288 +  echo "$as_me:4738: \$? = $ac_status" >&5
     4296+  echo "$as_me:4739: \$? = $ac_status" >&5
    42894297   (exit $ac_status); } &&
    42904298          { ac_try='test -s conftest$ac_exeext'
    42914299-  { (eval echo "$as_me:4498: \"$ac_try\"") >&5
    4292 +  { (eval echo "$as_me:4741: \"$ac_try\"") >&5
     4300+  { (eval echo "$as_me:4742: \"$ac_try\"") >&5
    42934301   (eval $ac_try) 2>&5
    42944302   ac_status=$?
    42954303-  echo "$as_me:4501: \$? = $ac_status" >&5
    4296 +  echo "$as_me:4744: \$? = $ac_status" >&5
     4304+  echo "$as_me:4745: \$? = $ac_status" >&5
    42974305   (exit $ac_status); }; }; then
    42984306   ac_cv_func_dlsym=yes
    42994307 else
    4300 @@ -4508,14 +4751,14 @@
     4308@@ -4508,14 +4752,14 @@
    43014309 fi
    43024310 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    43034311 fi
    43044312-echo "$as_me:4511: result: $ac_cv_func_dlsym" >&5
    4305 +echo "$as_me:4754: result: $ac_cv_func_dlsym" >&5
     4313+echo "$as_me:4755: result: $ac_cv_func_dlsym" >&5
    43064314 echo "${ECHO_T}$ac_cv_func_dlsym" >&6
    43074315 if test $ac_cv_func_dlsym = yes; then
     
    43114319 cf_have_libdl=no
    43124320-echo "$as_me:4518: checking for dlsym in -ldl" >&5
    4313 +echo "$as_me:4761: checking for dlsym in -ldl" >&5
     4321+echo "$as_me:4762: checking for dlsym in -ldl" >&5
    43144322 echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
    43154323 if test "${ac_cv_lib_dl_dlsym+set}" = set; then
    43164324   echo $ECHO_N "(cached) $ECHO_C" >&6
    4317 @@ -4523,7 +4766,7 @@
     4325@@ -4523,7 +4767,7 @@
    43184326   ac_check_lib_save_LIBS=$LIBS
    43194327 LIBS="-ldl  $LIBS"
    43204328 cat >conftest.$ac_ext <<_ACEOF
    43214329-#line 4526 "configure"
    4322 +#line 4769 "configure"
     4330+#line 4770 "configure"
    43234331 #include "confdefs.h"
    43244332 
    43254333 /* Override any gcc2 internal prototype to avoid an error.  */
    4326 @@ -4542,16 +4785,16 @@
     4334@@ -4542,16 +4786,16 @@
    43274335 }
    43284336 _ACEOF
    43294337 rm -f conftest.$ac_objext conftest$ac_exeext
    43304338-if { (eval echo "$as_me:4545: \"$ac_link\"") >&5
    4331 +if { (eval echo "$as_me:4788: \"$ac_link\"") >&5
     4339+if { (eval echo "$as_me:4789: \"$ac_link\"") >&5
    43324340   (eval $ac_link) 2>&5
    43334341   ac_status=$?
    43344342-  echo "$as_me:4548: \$? = $ac_status" >&5
    4335 +  echo "$as_me:4791: \$? = $ac_status" >&5
     4343+  echo "$as_me:4792: \$? = $ac_status" >&5
    43364344   (exit $ac_status); } &&
    43374345          { ac_try='test -s conftest$ac_exeext'
    43384346-  { (eval echo "$as_me:4551: \"$ac_try\"") >&5
    4339 +  { (eval echo "$as_me:4794: \"$ac_try\"") >&5
     4347+  { (eval echo "$as_me:4795: \"$ac_try\"") >&5
    43404348   (eval $ac_try) 2>&5
    43414349   ac_status=$?
    43424350-  echo "$as_me:4554: \$? = $ac_status" >&5
    4343 +  echo "$as_me:4797: \$? = $ac_status" >&5
     4351+  echo "$as_me:4798: \$? = $ac_status" >&5
    43444352   (exit $ac_status); }; }; then
    43454353   ac_cv_lib_dl_dlsym=yes
    43464354 else
    4347 @@ -4562,7 +4805,7 @@
     4355@@ -4562,7 +4806,7 @@
    43484356 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    43494357 LIBS=$ac_check_lib_save_LIBS
    43504358 fi
    43514359-echo "$as_me:4565: result: $ac_cv_lib_dl_dlsym" >&5
    4352 +echo "$as_me:4808: result: $ac_cv_lib_dl_dlsym" >&5
     4360+echo "$as_me:4809: result: $ac_cv_lib_dl_dlsym" >&5
    43534361 echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
    43544362 if test $ac_cv_lib_dl_dlsym = yes; then
    43554363 
    4356 @@ -4575,10 +4818,10 @@
     4364@@ -4575,10 +4819,10 @@
    43574365 if test "$cf_have_dlsym" = yes ; then
    43584366        test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS"
    43594367 
    43604368-       echo "$as_me:4578: checking whether able to link to dl*() functions" >&5
    4361 +       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
    43624370 echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
    43634371        cat >conftest.$ac_ext <<_ACEOF
    43644372-#line 4581 "configure"
    4365 +#line 4824 "configure"
     4373+#line 4825 "configure"
    43664374 #include "confdefs.h"
    43674375 #include <dlfcn.h>
    43684376 int
    4369 @@ -4596,16 +4839,16 @@
     4377@@ -4596,16 +4840,16 @@
    43704378 }
    43714379 _ACEOF
    43724380 rm -f conftest.$ac_objext conftest$ac_exeext
    43734381-if { (eval echo "$as_me:4599: \"$ac_link\"") >&5
    4374 +if { (eval echo "$as_me:4842: \"$ac_link\"") >&5
     4382+if { (eval echo "$as_me:4843: \"$ac_link\"") >&5
    43754383   (eval $ac_link) 2>&5
    43764384   ac_status=$?
    43774385-  echo "$as_me:4602: \$? = $ac_status" >&5
    4378 +  echo "$as_me:4845: \$? = $ac_status" >&5
     4386+  echo "$as_me:4846: \$? = $ac_status" >&5
    43794387   (exit $ac_status); } &&
    43804388          { ac_try='test -s conftest$ac_exeext'
    43814389-  { (eval echo "$as_me:4605: \"$ac_try\"") >&5
    4382 +  { (eval echo "$as_me:4848: \"$ac_try\"") >&5
     4390+  { (eval echo "$as_me:4849: \"$ac_try\"") >&5
    43834391   (eval $ac_try) 2>&5
    43844392   ac_status=$?
    43854393-  echo "$as_me:4608: \$? = $ac_status" >&5
    4386 +  echo "$as_me:4851: \$? = $ac_status" >&5
     4394+  echo "$as_me:4852: \$? = $ac_status" >&5
    43874395   (exit $ac_status); }; }; then
    43884396 
    43894397                cat >>confdefs.h <<\EOF
    4390 @@ -4616,15 +4859,15 @@
     4398@@ -4616,15 +4860,15 @@
    43914399   echo "$as_me: failed program was:" >&5
    43924400 cat conftest.$ac_ext >&5
    43934401 
    43944402-               { { echo "$as_me:4619: error: Cannot link test program for libdl" >&5
    4395 +               { { 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
    43964404 echo "$as_me: error: Cannot link test program for libdl" >&2;}
    43974405    { (exit 1); exit 1; }; }
     
    43994407 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    44004408-       echo "$as_me:4624: result: ok" >&5
    4401 +       echo "$as_me:4867: result: ok" >&5
     4409+       echo "$as_me:4868: result: ok" >&5
    44024410 echo "${ECHO_T}ok" >&6
    44034411 else
    44044412-       { { echo "$as_me:4627: error: Cannot find dlsym function" >&5
    4405 +       { { echo "$as_me:4870: error: Cannot find dlsym function" >&5
     4413+       { { echo "$as_me:4871: error: Cannot find dlsym function" >&5
    44064414 echo "$as_me: error: Cannot find dlsym function" >&2;}
    44074415    { (exit 1); exit 1; }; }
    44084416 fi
    4409 @@ -4632,12 +4875,12 @@
     4417@@ -4632,12 +4876,12 @@
    44104418                if test "$with_gpm" != yes ; then
    44114419                        test -n "$verbose" && echo "    assuming soname for gpm is $with_gpm" 1>&6
    44124420 
    44134421-echo "${as_me-configure}:4635: testing assuming soname for gpm is $with_gpm ..." 1>&5
    4414 +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
    44154423 
    44164424                        cf_cv_gpm_soname="$with_gpm"
     
    44184426 
    44194427-echo "$as_me:4640: checking for soname of gpm library" >&5
    4420 +echo "$as_me:4883: checking for soname of gpm library" >&5
     4428+echo "$as_me:4884: checking for soname of gpm library" >&5
    44214429 echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6
    44224430 if test "${cf_cv_gpm_soname+set}" = set; then
    44234431   echo $ECHO_N "(cached) $ECHO_C" >&6
    4424 @@ -4655,15 +4898,15 @@
     4432@@ -4655,15 +4899,15 @@
    44254433 CF_EOF
    44264434 cf_save_LIBS="$LIBS"
    44274435        LIBS="-lgpm $LIBS"
    44284436-       if { (eval echo "$as_me:4658: \"$ac_compile\"") >&5
    4429 +       if { (eval echo "$as_me:4901: \"$ac_compile\"") >&5
     4437+       if { (eval echo "$as_me:4902: \"$ac_compile\"") >&5
    44304438   (eval $ac_compile) 2>&5
    44314439   ac_status=$?
    44324440-  echo "$as_me:4661: \$? = $ac_status" >&5
    4433 +  echo "$as_me:4904: \$? = $ac_status" >&5
     4441+  echo "$as_me:4905: \$? = $ac_status" >&5
    44344442   (exit $ac_status); } ; then
    44354443-               if { (eval echo "$as_me:4663: \"$ac_link\"") >&5
    4436 +               if { (eval echo "$as_me:4906: \"$ac_link\"") >&5
     4444+               if { (eval echo "$as_me:4907: \"$ac_link\"") >&5
    44374445   (eval $ac_link) 2>&5
    44384446   ac_status=$?
    44394447-  echo "$as_me:4666: \$? = $ac_status" >&5
    4440 +  echo "$as_me:4909: \$? = $ac_status" >&5
     4448+  echo "$as_me:4910: \$? = $ac_status" >&5
    44414449   (exit $ac_status); } ; then
    44424450                        cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
    44434451                        test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
    4444 @@ -4674,7 +4917,7 @@
     4452@@ -4674,7 +4918,7 @@
    44454453 fi
    44464454 
    44474455 fi
    44484456-echo "$as_me:4677: result: $cf_cv_gpm_soname" >&5
    4449 +echo "$as_me:4920: result: $cf_cv_gpm_soname" >&5
     4457+echo "$as_me:4921: result: $cf_cv_gpm_soname" >&5
    44504458 echo "${ECHO_T}$cf_cv_gpm_soname" >&6
    44514459 
    44524460                fi
    4453 @@ -4690,7 +4933,7 @@
     4461@@ -4690,7 +4934,7 @@
    44544462 #define HAVE_LIBGPM 1
    44554463 EOF
    44564464 
    44574465-echo "$as_me:4693: checking for Gpm_Wgetch in -lgpm" >&5
    4458 +echo "$as_me:4936: checking for Gpm_Wgetch in -lgpm" >&5
     4466+echo "$as_me:4937: checking for Gpm_Wgetch in -lgpm" >&5
    44594467 echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6
    44604468 if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then
    44614469   echo $ECHO_N "(cached) $ECHO_C" >&6
    4462 @@ -4698,7 +4941,7 @@
     4470@@ -4698,7 +4942,7 @@
    44634471   ac_check_lib_save_LIBS=$LIBS
    44644472 LIBS="-lgpm  $LIBS"
    44654473 cat >conftest.$ac_ext <<_ACEOF
    44664474-#line 4701 "configure"
    4467 +#line 4944 "configure"
     4475+#line 4945 "configure"
    44684476 #include "confdefs.h"
    44694477 
    44704478 /* Override any gcc2 internal prototype to avoid an error.  */
    4471 @@ -4717,16 +4960,16 @@
     4479@@ -4717,16 +4961,16 @@
    44724480 }
    44734481 _ACEOF
    44744482 rm -f conftest.$ac_objext conftest$ac_exeext
    44754483-if { (eval echo "$as_me:4720: \"$ac_link\"") >&5
    4476 +if { (eval echo "$as_me:4963: \"$ac_link\"") >&5
     4484+if { (eval echo "$as_me:4964: \"$ac_link\"") >&5
    44774485   (eval $ac_link) 2>&5
    44784486   ac_status=$?
    44794487-  echo "$as_me:4723: \$? = $ac_status" >&5
    4480 +  echo "$as_me:4966: \$? = $ac_status" >&5
     4488+  echo "$as_me:4967: \$? = $ac_status" >&5
    44814489   (exit $ac_status); } &&
    44824490          { ac_try='test -s conftest$ac_exeext'
    44834491-  { (eval echo "$as_me:4726: \"$ac_try\"") >&5
    4484 +  { (eval echo "$as_me:4969: \"$ac_try\"") >&5
     4492+  { (eval echo "$as_me:4970: \"$ac_try\"") >&5
    44854493   (eval $ac_try) 2>&5
    44864494   ac_status=$?
    44874495-  echo "$as_me:4729: \$? = $ac_status" >&5
    4488 +  echo "$as_me:4972: \$? = $ac_status" >&5
     4496+  echo "$as_me:4973: \$? = $ac_status" >&5
    44894497   (exit $ac_status); }; }; then
    44904498   ac_cv_lib_gpm_Gpm_Wgetch=yes
    44914499 else
    4492 @@ -4737,11 +4980,11 @@
     4500@@ -4737,11 +4981,11 @@
    44934501 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    44944502 LIBS=$ac_check_lib_save_LIBS
    44954503 fi
    44964504-echo "$as_me:4740: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
    4497 +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
    44984506 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6
    44994507 if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then
    45004508 
    45014509-echo "$as_me:4744: checking if GPM is weakly bound to curses library" >&5
    4502 +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
    45034511 echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6
    45044512 if test "${cf_cv_check_gpm_wgetch+set}" = set; then
    45054513   echo $ECHO_N "(cached) $ECHO_C" >&6
    4506 @@ -4765,15 +5008,15 @@
     4514@@ -4765,15 +5009,15 @@
    45074515        # to rely on the static library, noting that some packagers may not
    45084516        # include it.
    45094517        LIBS="-static -lgpm -dynamic $LIBS"
    45104518-       if { (eval echo "$as_me:4768: \"$ac_compile\"") >&5
    4511 +       if { (eval echo "$as_me:5011: \"$ac_compile\"") >&5
     4519+       if { (eval echo "$as_me:5012: \"$ac_compile\"") >&5
    45124520   (eval $ac_compile) 2>&5
    45134521   ac_status=$?
    45144522-  echo "$as_me:4771: \$? = $ac_status" >&5
    4515 +  echo "$as_me:5014: \$? = $ac_status" >&5
     4523+  echo "$as_me:5015: \$? = $ac_status" >&5
    45164524   (exit $ac_status); } ; then
    45174525-               if { (eval echo "$as_me:4773: \"$ac_link\"") >&5
    4518 +               if { (eval echo "$as_me:5016: \"$ac_link\"") >&5
     4526+               if { (eval echo "$as_me:5017: \"$ac_link\"") >&5
    45194527   (eval $ac_link) 2>&5
    45204528   ac_status=$?
    45214529-  echo "$as_me:4776: \$? = $ac_status" >&5
    4522 +  echo "$as_me:5019: \$? = $ac_status" >&5
     4530+  echo "$as_me:5020: \$? = $ac_status" >&5
    45234531   (exit $ac_status); } ; then
    45244532                        cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'`
    45254533                        test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
    4526 @@ -4785,11 +5028,11 @@
     4534@@ -4785,11 +5029,11 @@
    45274535 fi
    45284536 
    45294537 fi
    45304538-echo "$as_me:4788: result: $cf_cv_check_gpm_wgetch" >&5
    4531 +echo "$as_me:5031: result: $cf_cv_check_gpm_wgetch" >&5
     4539+echo "$as_me:5032: result: $cf_cv_check_gpm_wgetch" >&5
    45324540 echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6
    45334541 
    45344542 if test "$cf_cv_check_gpm_wgetch" != yes ; then
    45354543-       { echo "$as_me:4792: WARNING: GPM library is already linked with curses - read the FAQ" >&5
    4536 +       { 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
    45374545 echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;}
    45384546 fi
    45394547 
    4540 @@ -4799,7 +5042,7 @@
     4548@@ -4799,7 +5043,7 @@
    45414549 
    45424550 # not everyone has "test -c"
    45434551 if test -c /dev/sysmouse 2>/dev/null ; then
    45444552-echo "$as_me:4802: checking if you want to use sysmouse" >&5
    4545 +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
    45464554 echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6
    45474555 
    45484556 # Check whether --with-sysmouse or --without-sysmouse was given.
    4549 @@ -4811,7 +5054,7 @@
     4557@@ -4811,7 +5055,7 @@
    45504558 fi;
    45514559        if test "$cf_with_sysmouse" != no ; then
    45524560        cat >conftest.$ac_ext <<_ACEOF
    45534561-#line 4814 "configure"
    4554 +#line 5057 "configure"
     4562+#line 5058 "configure"
    45554563 #include "confdefs.h"
    45564564 
    45574565 #include <osreldate.h>
    4558 @@ -4834,16 +5077,16 @@
     4566@@ -4834,16 +5078,16 @@
    45594567 }
    45604568 _ACEOF
    45614569 rm -f conftest.$ac_objext
    45624570-if { (eval echo "$as_me:4837: \"$ac_compile\"") >&5
    4563 +if { (eval echo "$as_me:5080: \"$ac_compile\"") >&5
     4571+if { (eval echo "$as_me:5081: \"$ac_compile\"") >&5
    45644572   (eval $ac_compile) 2>&5
    45654573   ac_status=$?
    45664574-  echo "$as_me:4840: \$? = $ac_status" >&5
    4567 +  echo "$as_me:5083: \$? = $ac_status" >&5
     4575+  echo "$as_me:5084: \$? = $ac_status" >&5
    45684576   (exit $ac_status); } &&
    45694577          { ac_try='test -s conftest.$ac_objext'
    45704578-  { (eval echo "$as_me:4843: \"$ac_try\"") >&5
    4571 +  { (eval echo "$as_me:5086: \"$ac_try\"") >&5
     4579+  { (eval echo "$as_me:5087: \"$ac_try\"") >&5
    45724580   (eval $ac_try) 2>&5
    45734581   ac_status=$?
    45744582-  echo "$as_me:4846: \$? = $ac_status" >&5
    4575 +  echo "$as_me:5089: \$? = $ac_status" >&5
     4583+  echo "$as_me:5090: \$? = $ac_status" >&5
    45764584   (exit $ac_status); }; }; then
    45774585   cf_with_sysmouse=yes
    45784586 else
    4579 @@ -4853,7 +5096,7 @@
     4587@@ -4853,7 +5097,7 @@
    45804588 fi
    45814589 rm -f conftest.$ac_objext conftest.$ac_ext
    45824590        fi
    45834591-echo "$as_me:4856: result: $cf_with_sysmouse" >&5
    4584 +echo "$as_me:5099: result: $cf_with_sysmouse" >&5
     4592+echo "$as_me:5100: result: $cf_with_sysmouse" >&5
    45854593 echo "${ECHO_T}$cf_with_sysmouse" >&6
    45864594 test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF
    45874595 #define USE_SYSMOUSE 1
    4588 @@ -4871,7 +5114,7 @@
     4596@@ -4871,7 +5115,7 @@
    45894597        test -n "$GXX" && test "${ac_cv_prog_cxx_g}" != yes && CXX_G_OPT=''
    45904598 fi
    45914599 
    45924600-echo "$as_me:4874: checking for default loader flags" >&5
    4593 +echo "$as_me:5117: checking for default loader flags" >&5
     4601+echo "$as_me:5118: checking for default loader flags" >&5
    45944602 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
    45954603 case $DFT_LWR_MODEL in
    45964604 libtool) LD_MODEL=''   ;;
    4597 @@ -4880,13 +5123,13 @@
     4605@@ -4880,13 +5124,13 @@
    45984606 profile) LD_MODEL='-pg';;
    45994607 shared)  LD_MODEL=''   ;;
    46004608 esac
    46014609-echo "$as_me:4883: result: $LD_MODEL" >&5
    4602 +echo "$as_me:5126: result: $LD_MODEL" >&5
     4610+echo "$as_me:5127: result: $LD_MODEL" >&5
    46034611 echo "${ECHO_T}$LD_MODEL" >&6
    46044612 
     
    46074615 
    46084616-echo "$as_me:4889: checking if rpath option should be used" >&5
    4609 +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
    46104618 echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
    46114619 
    46124620 # Check whether --enable-rpath or --disable-rpath was given.
    4613 @@ -4896,10 +5139,10 @@
     4621@@ -4896,10 +5140,10 @@
    46144622 else
    46154623   cf_cv_ld_rpath=no
    46164624 fi;
    46174625-echo "$as_me:4899: result: $cf_cv_ld_rpath" >&5
    4618 +echo "$as_me:5142: result: $cf_cv_ld_rpath" >&5
     4626+echo "$as_me:5143: result: $cf_cv_ld_rpath" >&5
    46194627 echo "${ECHO_T}$cf_cv_ld_rpath" >&6
    46204628 
    46214629-echo "$as_me:4902: checking if shared libraries should be relinked during install" >&5
    4622 +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
    46234631 echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6
    46244632 
    46254633 # Check whether --enable-relink or --disable-relink was given.
    4626 @@ -4909,19 +5152,20 @@
     4634@@ -4909,19 +5153,20 @@
    46274635 else
    46284636   cf_cv_do_relink=yes
    46294637 fi;
    46304638-echo "$as_me:4912: result: $cf_cv_do_relink" >&5
    4631 +echo "$as_me:5155: result: $cf_cv_do_relink" >&5
     4639+echo "$as_me:5156: result: $cf_cv_do_relink" >&5
    46324640 echo "${ECHO_T}$cf_cv_do_relink" >&6
    46334641        ;;
     
    46434651 
    46444652-       echo "$as_me:4924: checking if release/abi version should be used for shared libs" >&5
    4645 +       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
    46464654 echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
    46474655 
    46484656 # Check whether --with-shlib-version or --without-shlib-version was given.
    4649 @@ -4936,7 +5180,7 @@
     4657@@ -4936,7 +5181,7 @@
    46504658                cf_cv_shlib_version=$withval
    46514659                ;;
    46524660        *)
    46534661-               { { echo "$as_me:4939: error: option value must be one of: rel, abi, auto or no" >&5
    4654 +               { { 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
    46554663 echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;}
    46564664    { (exit 1); exit 1; }; }
    46574665                ;;
    4658 @@ -4945,7 +5189,7 @@
     4666@@ -4945,7 +5190,7 @@
    46594667 else
    46604668   cf_cv_shlib_version=auto
    46614669 fi;
    46624670-       echo "$as_me:4948: result: $cf_cv_shlib_version" >&5
    4663 +       echo "$as_me:5192: result: $cf_cv_shlib_version" >&5
     4671+       echo "$as_me:5193: result: $cf_cv_shlib_version" >&5
    46644672 echo "${ECHO_T}$cf_cv_shlib_version" >&6
    46654673 
    46664674        cf_cv_rm_so_locs=no
    4667 @@ -4954,14 +5198,14 @@
     4675@@ -4954,14 +5199,14 @@
    46684676        CC_SHARED_OPTS=
    46694677        if test "$GCC" = yes
    46704678        then
    46714679-               echo "$as_me:4957: checking which $CC option to use" >&5
    4672 +               echo "$as_me:5201: checking which $CC option to use" >&5
     4680+               echo "$as_me:5202: checking which $CC option to use" >&5
    46734681 echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
    46744682                cf_save_CFLAGS="$CFLAGS"
     
    46784686                        cat >conftest.$ac_ext <<_ACEOF
    46794687-#line 4964 "configure"
    4680 +#line 5208 "configure"
     4688+#line 5209 "configure"
    46814689 #include "confdefs.h"
    46824690 #include <stdio.h>
    46834691 int
    4684 @@ -4973,16 +5217,16 @@
     4692@@ -4973,16 +5218,16 @@
    46854693 }
    46864694 _ACEOF
    46874695 rm -f conftest.$ac_objext
    46884696-if { (eval echo "$as_me:4976: \"$ac_compile\"") >&5
    4689 +if { (eval echo "$as_me:5220: \"$ac_compile\"") >&5
     4697+if { (eval echo "$as_me:5221: \"$ac_compile\"") >&5
    46904698   (eval $ac_compile) 2>&5
    46914699   ac_status=$?
    46924700-  echo "$as_me:4979: \$? = $ac_status" >&5
    4693 +  echo "$as_me:5223: \$? = $ac_status" >&5
     4701+  echo "$as_me:5224: \$? = $ac_status" >&5
    46944702   (exit $ac_status); } &&
    46954703          { ac_try='test -s conftest.$ac_objext'
    46964704-  { (eval echo "$as_me:4982: \"$ac_try\"") >&5
    4697 +  { (eval echo "$as_me:5226: \"$ac_try\"") >&5
     4705+  { (eval echo "$as_me:5227: \"$ac_try\"") >&5
    46984706   (eval $ac_try) 2>&5
    46994707   ac_status=$?
    47004708-  echo "$as_me:4985: \$? = $ac_status" >&5
    4701 +  echo "$as_me:5229: \$? = $ac_status" >&5
     4709+  echo "$as_me:5230: \$? = $ac_status" >&5
    47024710   (exit $ac_status); }; }; then
    47034711   break
    47044712 else
    4705 @@ -4991,7 +5235,7 @@
     4713@@ -4991,7 +5236,7 @@
    47064714 fi
    47074715 rm -f conftest.$ac_objext conftest.$ac_ext
    47084716                done
    47094717-               echo "$as_me:4994: result: $CC_SHARED_OPTS" >&5
    4710 +               echo "$as_me:5238: result: $CC_SHARED_OPTS" >&5
     4718+               echo "$as_me:5239: result: $CC_SHARED_OPTS" >&5
    47114719 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
    47124720                CFLAGS="$cf_save_CFLAGS"
    47134721        fi
    4714 @@ -4999,6 +5243,12 @@
     4722@@ -4999,6 +5244,12 @@
    47154723        cf_cv_shlib_version_infix=no
    47164724 
     
    47254733                MK_SHARED_LIB='${CC} ${CFLAGS} -o $@ -Xlinker -soname=`basename $@` -nostart -e 0'
    47264734                ;;
    4727 @@ -5027,7 +5277,7 @@
     4735@@ -5027,7 +5278,7 @@
    47284736                MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
    47294737                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
    47304738                cf_cv_shlib_version_infix=yes
    47314739-               echo "$as_me:5030: checking if ld -search_paths_first works" >&5
    4732 +               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
    47334741 echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
    47344742 if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
    47354743   echo $ECHO_N "(cached) $ECHO_C" >&6
    4736 @@ -5036,7 +5286,7 @@
     4744@@ -5036,7 +5287,7 @@
    47374745                        cf_save_LDFLAGS=$LDFLAGS
    47384746                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
    47394747                        cat >conftest.$ac_ext <<_ACEOF
    47404748-#line 5039 "configure"
    4741 +#line 5289 "configure"
     4749+#line 5290 "configure"
    47424750 #include "confdefs.h"
    47434751 
    47444752 int
    4745 @@ -5048,16 +5298,16 @@
     4753@@ -5048,16 +5299,16 @@
    47464754 }
    47474755 _ACEOF
    47484756 rm -f conftest.$ac_objext conftest$ac_exeext
    47494757-if { (eval echo "$as_me:5051: \"$ac_link\"") >&5
    4750 +if { (eval echo "$as_me:5301: \"$ac_link\"") >&5
     4758+if { (eval echo "$as_me:5302: \"$ac_link\"") >&5
    47514759   (eval $ac_link) 2>&5
    47524760   ac_status=$?
    47534761-  echo "$as_me:5054: \$? = $ac_status" >&5
    4754 +  echo "$as_me:5304: \$? = $ac_status" >&5
     4762+  echo "$as_me:5305: \$? = $ac_status" >&5
    47554763   (exit $ac_status); } &&
    47564764          { ac_try='test -s conftest$ac_exeext'
    47574765-  { (eval echo "$as_me:5057: \"$ac_try\"") >&5
    4758 +  { (eval echo "$as_me:5307: \"$ac_try\"") >&5
     4766+  { (eval echo "$as_me:5308: \"$ac_try\"") >&5
    47594767   (eval $ac_try) 2>&5
    47604768   ac_status=$?
    47614769-  echo "$as_me:5060: \$? = $ac_status" >&5
    4762 +  echo "$as_me:5310: \$? = $ac_status" >&5
     4770+  echo "$as_me:5311: \$? = $ac_status" >&5
    47634771   (exit $ac_status); }; }; then
    47644772   cf_cv_ldflags_search_paths_first=yes
    47654773 else
    4766 @@ -5068,7 +5318,7 @@
     4774@@ -5068,7 +5319,7 @@
    47674775 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    47684776                                LDFLAGS=$cf_save_LDFLAGS
    47694777 fi
    47704778-echo "$as_me:5071: result: $cf_cv_ldflags_search_paths_first" >&5
    4771 +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
    47724780 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
    47734781                if test $cf_cv_ldflags_search_paths_first = yes; then
    47744782                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
    4775 @@ -5090,10 +5340,10 @@
     4783@@ -5090,10 +5341,10 @@
    47764784        irix*)
    47774785                if test "$cf_cv_ld_rpath" = yes ; then
     
    47864794                        fi
    47874795                fi
    4788 @@ -5112,7 +5362,7 @@
     4796@@ -5112,7 +5363,7 @@
    47894797                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    47904798                fi
     
    47954803                fi
    47964804 
    4797 @@ -5131,7 +5381,7 @@
     4805@@ -5131,7 +5382,7 @@
    47984806                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    47994807                fi
     
    48044812                fi
    48054813                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
    4806 @@ -5143,7 +5393,7 @@
     4814@@ -5143,7 +5394,7 @@
    48074815                cf_cv_shared_soname='`basename $@`'
    48084816        fi
     
    48134821        nto-qnx*|openbsd*|freebsd[12].*)
    48144822                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
    4815 @@ -5155,7 +5405,7 @@
     4823@@ -5155,7 +5406,7 @@
    48164824                if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
    48174825                        LOCAL_LDFLAGS="-rpath \$(LOCAL_LIBDIR)"
     
    48224830                fi
    48234831 
    4824 @@ -5166,11 +5416,11 @@
     4832@@ -5166,11 +5417,11 @@
    48254833                cf_cv_shared_soname='`basename $@`'
    48264834        fi
     
    48364844                        LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
    48374845                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    4838 @@ -5192,7 +5442,7 @@
     4846@@ -5192,7 +5443,7 @@
    48394847 
    48404848                        MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@'
     
    48454853                ;;
    48464854        osf*|mls+*)
    4847 @@ -5211,7 +5461,7 @@
     4855@@ -5211,7 +5462,7 @@
    48484856                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    48494857                fi
     
    48544862                fi
    48554863                cf_cv_rm_so_locs=yes
    4856 @@ -5246,7 +5496,7 @@
     4864@@ -5246,7 +5497,7 @@
    48574865                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    48584866                fi
     
    48634871                fi
    48644872 
    4865 @@ -5258,7 +5508,43 @@
     4873@@ -5258,7 +5509,43 @@
    48664874        fi
    48674875 
     
    48734881+                               CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
    48744882+                               cat >conftest.$ac_ext <<_ACEOF
    4875 +#line 5516 "configure"
     4883+#line 5517 "configure"
    48764884+#include "confdefs.h"
    48774885+#include <stdio.h>
     
    48854893+_ACEOF
    48864894+rm -f conftest.$ac_objext
    4887 +if { (eval echo "$as_me:5528: \"$ac_compile\"") >&5
     4895+if { (eval echo "$as_me:5529: \"$ac_compile\"") >&5
    48884896+  (eval $ac_compile) 2>&5
    48894897+  ac_status=$?
    4890 +  echo "$as_me:5531: \$? = $ac_status" >&5
     4898+  echo "$as_me:5532: \$? = $ac_status" >&5
    48914899+  (exit $ac_status); } &&
    48924900+         { ac_try='test -s conftest.$ac_objext'
    4893 +  { (eval echo "$as_me:5534: \"$ac_try\"") >&5
     4901+  { (eval echo "$as_me:5535: \"$ac_try\"") >&5
    48944902+  (eval $ac_try) 2>&5
    48954903+  ac_status=$?
    4896 +  echo "$as_me:5537: \$? = $ac_status" >&5
     4904+  echo "$as_me:5538: \$? = $ac_status" >&5
    48974905+  (exit $ac_status); }; }; then
    48984906+  break
     
    49084916                else
    49094917                        MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $@'
    4910 @@ -5285,20 +5571,20 @@
     4918@@ -5285,20 +5572,20 @@
    49114919                        test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
    49124920                        ;;
    49134921                *)
    49144922-                       { echo "$as_me:5288: WARNING: ignored --with-shlib-version" >&5
    4915 +                       { echo "$as_me:5574: WARNING: ignored --with-shlib-version" >&5
     4923+                       { echo "$as_me:5575: WARNING: ignored --with-shlib-version" >&5
    49164924 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
    49174925                        ;;
     
    49234931-               echo "$as_me:5296: checking if we need a space after rpath option" >&5
    49244932+       if test -n "$LD_RPATH_OPT" ; then
    4925 +               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
    49264934 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
    49274935                cf_save_LIBS="$LIBS"
     
    49304938                cat >conftest.$ac_ext <<_ACEOF
    49314939-#line 5301 "configure"
    4932 +#line 5587 "configure"
     4940+#line 5588 "configure"
    49334941 #include "confdefs.h"
    49344942 
    49354943 int
    4936 @@ -5310,16 +5596,16 @@
     4944@@ -5310,16 +5597,16 @@
    49374945 }
    49384946 _ACEOF
    49394947 rm -f conftest.$ac_objext conftest$ac_exeext
    49404948-if { (eval echo "$as_me:5313: \"$ac_link\"") >&5
    4941 +if { (eval echo "$as_me:5599: \"$ac_link\"") >&5
     4949+if { (eval echo "$as_me:5600: \"$ac_link\"") >&5
    49424950   (eval $ac_link) 2>&5
    49434951   ac_status=$?
    49444952-  echo "$as_me:5316: \$? = $ac_status" >&5
    4945 +  echo "$as_me:5602: \$? = $ac_status" >&5
     4953+  echo "$as_me:5603: \$? = $ac_status" >&5
    49464954   (exit $ac_status); } &&
    49474955          { ac_try='test -s conftest$ac_exeext'
    49484956-  { (eval echo "$as_me:5319: \"$ac_try\"") >&5
    4949 +  { (eval echo "$as_me:5605: \"$ac_try\"") >&5
     4957+  { (eval echo "$as_me:5606: \"$ac_try\"") >&5
    49504958   (eval $ac_try) 2>&5
    49514959   ac_status=$?
    49524960-  echo "$as_me:5322: \$? = $ac_status" >&5
    4953 +  echo "$as_me:5608: \$? = $ac_status" >&5
     4961+  echo "$as_me:5609: \$? = $ac_status" >&5
    49544962   (exit $ac_status); }; }; then
    49554963   cf_rpath_space=no
    49564964 else
    4957 @@ -5329,16 +5615,16 @@
     4965@@ -5329,16 +5616,16 @@
    49584966 fi
    49594967 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    49604968                LIBS="$cf_save_LIBS"
    49614969-               echo "$as_me:5332: result: $cf_rpath_space" >&5
    4962 +               echo "$as_me:5618: result: $cf_rpath_space" >&5
     4970+               echo "$as_me:5619: result: $cf_rpath_space" >&5
    49634971 echo "${ECHO_T}$cf_rpath_space" >&6
    49644972-               test "$cf_rpath_space" = yes && cf_ld_rpath_opt="$cf_ld_rpath_opt "
     
    49724980                if test "$model" = "shared"; then
    49734981-                       { { echo "$as_me:5341: error: Shared libraries are not supported in this version" >&5
    4974 +                       { { 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
    49754983 echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
    49764984    { (exit 1); exit 1; }; }
    49774985                fi
    4978 @@ -5348,7 +5634,7 @@
     4986@@ -5348,7 +5635,7 @@
    49794987 ###############################################################################
    49804988 
    49814989 ###    use option --disable-overwrite to leave out the link to -lcurses
    49824990-echo "$as_me:5351: checking if you wish to install ncurses overwriting curses" >&5
    4983 +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
    49844992 echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
    49854993 
    49864994 # Check whether --enable-overwrite or --disable-overwrite was given.
    4987 @@ -5358,10 +5644,10 @@
     4995@@ -5358,10 +5645,10 @@
    49884996 else
    49894997   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
    49904998 fi;
    49914999-echo "$as_me:5361: result: $with_overwrite" >&5
    4992 +echo "$as_me:5647: result: $with_overwrite" >&5
     5000+echo "$as_me:5648: result: $with_overwrite" >&5
    49935001 echo "${ECHO_T}$with_overwrite" >&6
    49945002 
    49955003-echo "$as_me:5364: checking if external terminfo-database is used" >&5
    4996 +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
    49975005 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
    49985006 
    49995007 # Check whether --enable-database or --disable-database was given.
    5000 @@ -5371,7 +5657,7 @@
     5008@@ -5371,7 +5658,7 @@
    50015009 else
    50025010   use_database=yes
    50035011 fi;
    50045012-echo "$as_me:5374: result: $use_database" >&5
    5005 +echo "$as_me:5660: result: $use_database" >&5
     5013+echo "$as_me:5661: result: $use_database" >&5
    50065014 echo "${ECHO_T}$use_database" >&6
    50075015 
    50085016 case $host_os in #(vi
    5009 @@ -5384,8 +5670,8 @@
     5017@@ -5384,8 +5671,8 @@
    50105018 esac
    50115019 
     
    50185026 
    50195027 if test "$use_database" != no ; then
    5020 @@ -5393,7 +5679,7 @@
     5028@@ -5393,7 +5680,7 @@
    50215029 #define USE_DATABASE 1
    50225030 EOF
    50235031 
    50245032-       echo "$as_me:5396: checking which terminfo source-file will be installed" >&5
    5025 +       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
    50265034 echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
    50275035 
    50285036 # Check whether --enable-database or --disable-database was given.
    5029 @@ -5401,10 +5687,10 @@
     5037@@ -5401,10 +5688,10 @@
    50305038   enableval="$enable_database"
    50315039   TERMINFO_SRC=$withval
    50325040 fi;
    50335041-       echo "$as_me:5404: result: $TERMINFO_SRC" >&5
    5034 +       echo "$as_me:5690: result: $TERMINFO_SRC" >&5
     5042+       echo "$as_me:5691: result: $TERMINFO_SRC" >&5
    50355043 echo "${ECHO_T}$TERMINFO_SRC" >&6
    50365044 
    50375045-       echo "$as_me:5407: checking whether to use hashed database instead of directory/tree" >&5
    5038 +       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
    50395047 echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
    50405048 
    50415049 # Check whether --with-hashed-db or --without-hashed-db was given.
    5042 @@ -5414,13 +5700,13 @@
     5050@@ -5414,13 +5701,13 @@
    50435051 else
    50445052   with_hashed_db=no
    50455053 fi;
    50465054-       echo "$as_me:5417: result: $with_hashed_db" >&5
    5047 +       echo "$as_me:5703: result: $with_hashed_db" >&5
     5055+       echo "$as_me:5704: result: $with_hashed_db" >&5
    50485056 echo "${ECHO_T}$with_hashed_db" >&6
    50495057 else
     
    50525060 
    50535061-echo "$as_me:5423: checking for list of fallback descriptions" >&5
    5054 +echo "$as_me:5709: checking for list of fallback descriptions" >&5
     5062+echo "$as_me:5710: checking for list of fallback descriptions" >&5
    50555063 echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
    50565064 
    50575065 # Check whether --with-fallbacks or --without-fallbacks was given.
    5058 @@ -5430,11 +5716,11 @@
     5066@@ -5430,11 +5717,11 @@
    50595067 else
    50605068   with_fallback=
    50615069 fi;
    50625070-echo "$as_me:5433: result: $with_fallback" >&5
    5063 +echo "$as_me:5719: result: $with_fallback" >&5
     5071+echo "$as_me:5720: result: $with_fallback" >&5
    50645072 echo "${ECHO_T}$with_fallback" >&6
    50655073 FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
    50665074 
    50675075-echo "$as_me:5437: checking if you want modern xterm or antique" >&5
    5068 +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
    50695077 echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
    50705078 
    50715079 # Check whether --with-xterm-new or --without-xterm-new was given.
    5072 @@ -5448,7 +5734,7 @@
     5080@@ -5448,7 +5735,7 @@
    50735081 no)    with_xterm_new=xterm-old;;
    50745082 *)     with_xterm_new=xterm-new;;
    50755083 esac
    50765084-echo "$as_me:5451: result: $with_xterm_new" >&5
    5077 +echo "$as_me:5737: result: $with_xterm_new" >&5
     5085+echo "$as_me:5738: result: $with_xterm_new" >&5
    50785086 echo "${ECHO_T}$with_xterm_new" >&6
    50795087 WHICH_XTERM=$with_xterm_new
    50805088 
    5081 @@ -5458,7 +5744,7 @@
     5089@@ -5458,7 +5745,7 @@
    50825090        MAKE_TERMINFO="#"
    50835091 else
    50845092 
    50855093-echo "$as_me:5461: checking for list of terminfo directories" >&5
    5086 +echo "$as_me:5747: checking for list of terminfo directories" >&5
     5094+echo "$as_me:5748: checking for list of terminfo directories" >&5
    50875095 echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
    50885096 
    50895097 # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
    5090 @@ -5468,7 +5754,7 @@
     5098@@ -5468,7 +5755,7 @@
    50915099 else
    50925100   withval=${TERMINFO_DIRS-${datadir}/terminfo}
     
    50975105 for cf_src_path in $withval
    50985106 do
    5099 @@ -5498,7 +5784,7 @@
     5107@@ -5498,7 +5785,7 @@
    51005108   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
    51015109   ;;
    51025110 *)
    51035111-  { { echo "$as_me:5501: error: expected a pathname, not \"$cf_src_path\"" >&5
    5104 +  { { 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
    51055113 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
    51065114    { (exit 1); exit 1; }; }
    51075115   ;;
    5108 @@ -5511,13 +5797,13 @@
     5116@@ -5511,13 +5798,13 @@
    51095117 
    51105118 eval 'TERMINFO_DIRS="$cf_dst_path"'
    51115119 
    51125120-echo "$as_me:5514: result: $TERMINFO_DIRS" >&5
    5113 +echo "$as_me:5800: result: $TERMINFO_DIRS" >&5
     5121+echo "$as_me:5801: result: $TERMINFO_DIRS" >&5
    51145122 echo "${ECHO_T}$TERMINFO_DIRS" >&6
    51155123 test -n "$TERMINFO_DIRS" && cat >>confdefs.h <<EOF
     
    51185126 
    51195127-echo "$as_me:5520: checking for default terminfo directory" >&5
    5120 +echo "$as_me:5806: checking for default terminfo directory" >&5
     5128+echo "$as_me:5807: checking for default terminfo directory" >&5
    51215129 echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
    51225130 
    51235131 # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
    5124 @@ -5553,7 +5839,7 @@
     5132@@ -5553,7 +5840,7 @@
    51255133   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    51265134   ;;
    51275135 *)
    51285136-  { { echo "$as_me:5556: error: expected a pathname, not \"$withval\"" >&5
    5129 +  { { echo "$as_me:5842: error: expected a pathname, not \"$withval\"" >&5
     5137+  { { echo "$as_me:5843: error: expected a pathname, not \"$withval\"" >&5
    51305138 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    51315139    { (exit 1); exit 1; }; }
    51325140   ;;
    5133 @@ -5562,7 +5848,7 @@
     5141@@ -5562,7 +5849,7 @@
    51345142 fi
    51355143 TERMINFO="$withval"
    51365144 
    51375145-echo "$as_me:5565: result: $TERMINFO" >&5
    5138 +echo "$as_me:5851: result: $TERMINFO" >&5
     5146+echo "$as_me:5852: result: $TERMINFO" >&5
    51395147 echo "${ECHO_T}$TERMINFO" >&6
    51405148 cat >>confdefs.h <<EOF
    51415149 #define TERMINFO "$TERMINFO"
    5142 @@ -5572,7 +5858,7 @@
     5150@@ -5572,7 +5859,7 @@
    51435151 
    51445152 ###    use option --disable-big-core to make tic run on small machines
    51455153 ###    We need 4Mb, check if we can allocate 50% more than that.
    51465154-echo "$as_me:5575: checking if big-core option selected" >&5
    5147 +echo "$as_me:5861: checking if big-core option selected" >&5
     5155+echo "$as_me:5862: checking if big-core option selected" >&5
    51485156 echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
    51495157 
    51505158 # Check whether --enable-big-core or --disable-big-core was given.
    5151 @@ -5584,7 +5870,7 @@
     5159@@ -5584,7 +5871,7 @@
    51525160   with_big_core=no
    51535161 else
    51545162   cat >conftest.$ac_ext <<_ACEOF
    51555163-#line 5587 "configure"
    5156 +#line 5873 "configure"
     5164+#line 5874 "configure"
    51575165 #include "confdefs.h"
    51585166 
    51595167 #include <stdlib.h>
    5160 @@ -5598,15 +5884,15 @@
     5168@@ -5598,15 +5885,15 @@
    51615169 }
    51625170 _ACEOF
    51635171 rm -f conftest$ac_exeext
    51645172-if { (eval echo "$as_me:5601: \"$ac_link\"") >&5
    5165 +if { (eval echo "$as_me:5887: \"$ac_link\"") >&5
     5173+if { (eval echo "$as_me:5888: \"$ac_link\"") >&5
    51665174   (eval $ac_link) 2>&5
    51675175   ac_status=$?
    51685176-  echo "$as_me:5604: \$? = $ac_status" >&5
    5169 +  echo "$as_me:5890: \$? = $ac_status" >&5
     5177+  echo "$as_me:5891: \$? = $ac_status" >&5
    51705178   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    51715179-  { (eval echo "$as_me:5606: \"$ac_try\"") >&5
    5172 +  { (eval echo "$as_me:5892: \"$ac_try\"") >&5
     5180+  { (eval echo "$as_me:5893: \"$ac_try\"") >&5
    51735181   (eval $ac_try) 2>&5
    51745182   ac_status=$?
    51755183-  echo "$as_me:5609: \$? = $ac_status" >&5
    5176 +  echo "$as_me:5895: \$? = $ac_status" >&5
     5184+  echo "$as_me:5896: \$? = $ac_status" >&5
    51775185   (exit $ac_status); }; }; then
    51785186   with_big_core=yes
    51795187 else
    5180 @@ -5618,7 +5904,7 @@
     5188@@ -5618,7 +5905,7 @@
    51815189 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
    51825190 fi
    51835191 fi;
    51845192-echo "$as_me:5621: result: $with_big_core" >&5
    5185 +echo "$as_me:5907: result: $with_big_core" >&5
     5193+echo "$as_me:5908: result: $with_big_core" >&5
    51865194 echo "${ECHO_T}$with_big_core" >&6
    51875195 test "$with_big_core" = "yes" && cat >>confdefs.h <<\EOF
    51885196 #define HAVE_BIG_CORE 1
    5189 @@ -5627,7 +5913,7 @@
     5197@@ -5627,7 +5914,7 @@
    51905198 ### ISO C only guarantees 512-char strings, we have tables which load faster
    51915199 ### when constructed using "big" strings.  More than the C compiler, the awk
    51925200 ### program is a limit on most vendor UNIX systems.  Check that we can build.
    51935201-echo "$as_me:5630: checking if big-strings option selected" >&5
    5194 +echo "$as_me:5916: checking if big-strings option selected" >&5
     5202+echo "$as_me:5917: checking if big-strings option selected" >&5
    51955203 echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
    51965204 
    51975205 # Check whether --enable-big-strings or --disable-big-strings was given.
    5198 @@ -5636,29 +5922,29 @@
     5206@@ -5636,29 +5923,29 @@
    51995207   with_big_strings=$enableval
    52005208 else
     
    52295237 fi;
    52305238-echo "$as_me:5654: result: $with_big_strings" >&5
    5231 +echo "$as_me:5940: result: $with_big_strings" >&5
     5239+echo "$as_me:5941: result: $with_big_strings" >&5
    52325240 echo "${ECHO_T}$with_big_strings" >&6
    52335241 
     
    52375245 ###    use option --enable-termcap to compile in the termcap fallback support
    52385246-echo "$as_me:5661: checking if you want termcap-fallback support" >&5
    5239 +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
    52405248 echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
    52415249 
    52425250 # Check whether --enable-termcap or --disable-termcap was given.
    5243 @@ -5668,13 +5954,13 @@
     5251@@ -5668,13 +5955,13 @@
    52445252 else
    52455253   with_termcap=no
    52465254 fi;
    52475255-echo "$as_me:5671: result: $with_termcap" >&5
    5248 +echo "$as_me:5957: result: $with_termcap" >&5
     5256+echo "$as_me:5958: result: $with_termcap" >&5
    52495257 echo "${ECHO_T}$with_termcap" >&6
    52505258 
     
    52535261                if test -z "$with_fallback" ; then
    52545262-                       { { echo "$as_me:5677: error: You have disabled the database w/o specifying fallbacks" >&5
    5255 +                       { { 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
    52565264 echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
    52575265    { (exit 1); exit 1; }; }
    52585266                fi
    5259 @@ -5686,7 +5972,7 @@
     5267@@ -5686,7 +5973,7 @@
    52605268 else
    52615269 
    52625270 if test "$with_ticlib" != no ; then
    52635271-       { { echo "$as_me:5689: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
    5264 +       { { 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
    52655273 echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
    52665274    { (exit 1); exit 1; }; }
    52675275 fi
    5268 @@ -5695,7 +5981,7 @@
     5276@@ -5695,7 +5982,7 @@
    52695277 #define USE_TERMCAP 1
    52705278 EOF
    52715279 
    52725280-echo "$as_me:5698: checking for list of termcap files" >&5
    5273 +echo "$as_me:5984: checking for list of termcap files" >&5
     5281+echo "$as_me:5985: checking for list of termcap files" >&5
    52745282 echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
    52755283 
    52765284 # Check whether --with-termpath or --without-termpath was given.
    5277 @@ -5705,7 +5991,7 @@
     5285@@ -5705,7 +5992,7 @@
    52785286 else
    52795287   withval=${TERMPATH-/etc/termcap:/usr/share/misc/termcap}
     
    52845292 for cf_src_path in $withval
    52855293 do
    5286 @@ -5735,7 +6021,7 @@
     5294@@ -5735,7 +6022,7 @@
    52875295   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
    52885296   ;;
    52895297 *)
    52905298-  { { echo "$as_me:5738: error: expected a pathname, not \"$cf_src_path\"" >&5
    5291 +  { { 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
    52925300 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
    52935301    { (exit 1); exit 1; }; }
    52945302   ;;
    5295 @@ -5748,14 +6034,14 @@
     5303@@ -5748,14 +6035,14 @@
    52965304 
    52975305 eval 'TERMPATH="$cf_dst_path"'
    52985306 
    52995307-echo "$as_me:5751: result: $TERMPATH" >&5
    5300 +echo "$as_me:6037: result: $TERMPATH" >&5
     5308+echo "$as_me:6038: result: $TERMPATH" >&5
    53015309 echo "${ECHO_T}$TERMPATH" >&6
    53025310 test -n "$TERMPATH" && cat >>confdefs.h <<EOF
     
    53065314 ###    use option --enable-getcap to use a hacked getcap for reading termcaps
    53075315-echo "$as_me:5758: checking if fast termcap-loader is needed" >&5
    5308 +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
    53095317 echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
    53105318 
    53115319 # Check whether --enable-getcap or --disable-getcap was given.
    5312 @@ -5765,13 +6051,13 @@
     5320@@ -5765,13 +6052,13 @@
    53135321 else
    53145322   with_getcap=no
    53155323 fi;
    53165324-echo "$as_me:5768: result: $with_getcap" >&5
    5317 +echo "$as_me:6054: result: $with_getcap" >&5
     5325+echo "$as_me:6055: result: $with_getcap" >&5
    53185326 echo "${ECHO_T}$with_getcap" >&6
    53195327 test "$with_getcap" = "yes" && cat >>confdefs.h <<\EOF
     
    53225330 
    53235331-echo "$as_me:5774: checking if translated termcaps will be cached in ~/.terminfo" >&5
    5324 +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
    53255333 echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
    53265334 
    53275335 # Check whether --enable-getcap-cache or --disable-getcap-cache was given.
    5328 @@ -5781,7 +6067,7 @@
     5336@@ -5781,7 +6068,7 @@
    53295337 else
    53305338   with_getcap_cache=no
    53315339 fi;
    53325340-echo "$as_me:5784: result: $with_getcap_cache" >&5
    5333 +echo "$as_me:6070: result: $with_getcap_cache" >&5
     5341+echo "$as_me:6071: result: $with_getcap_cache" >&5
    53345342 echo "${ECHO_T}$with_getcap_cache" >&6
    53355343 test "$with_getcap_cache" = "yes" && cat >>confdefs.h <<\EOF
    53365344 #define USE_GETCAP_CACHE 1
    5337 @@ -5790,7 +6076,7 @@
     5345@@ -5790,7 +6077,7 @@
    53385346 fi
    53395347 
    53405348 ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
    53415349-echo "$as_me:5793: checking if ~/.terminfo is wanted" >&5
    5342 +echo "$as_me:6079: checking if ~/.terminfo is wanted" >&5
     5350+echo "$as_me:6080: checking if ~/.terminfo is wanted" >&5
    53435351 echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
    53445352 
    53455353 # Check whether --enable-home-terminfo or --disable-home-terminfo was given.
    5346 @@ -5800,13 +6086,13 @@
     5354@@ -5800,13 +6087,13 @@
    53475355 else
    53485356   with_home_terminfo=yes
    53495357 fi;
    53505358-echo "$as_me:5803: result: $with_home_terminfo" >&5
    5351 +echo "$as_me:6089: result: $with_home_terminfo" >&5
     5359+echo "$as_me:6090: result: $with_home_terminfo" >&5
    53525360 echo "${ECHO_T}$with_home_terminfo" >&6
    53535361 test "$with_home_terminfo" = "yes" && cat >>confdefs.h <<\EOF
     
    53565364 
    53575365-echo "$as_me:5809: checking if you want to use restricted environment when running as root" >&5
    5358 +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
    53595367 echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
    53605368 
    53615369 # Check whether --enable-root-environ or --disable-root-environ was given.
    5362 @@ -5816,7 +6102,7 @@
     5370@@ -5816,7 +6103,7 @@
    53635371 else
    53645372   with_root_environ=yes
    53655373 fi;
    53665374-echo "$as_me:5819: result: $with_root_environ" >&5
    5367 +echo "$as_me:6105: result: $with_root_environ" >&5
     5375+echo "$as_me:6106: result: $with_root_environ" >&5
    53685376 echo "${ECHO_T}$with_root_environ" >&6
    53695377 test "$with_root_environ" = yes && cat >>confdefs.h <<\EOF
    53705378 #define USE_ROOT_ENVIRON 1
    5371 @@ -5830,13 +6116,13 @@
     5379@@ -5830,13 +6117,13 @@
    53725380        unlink
    53735381 do
    53745382 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
    53755383-echo "$as_me:5833: checking for $ac_func" >&5
    5376 +echo "$as_me:6119: checking for $ac_func" >&5
     5384+echo "$as_me:6120: checking for $ac_func" >&5
    53775385 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
    53785386 if eval "test \"\${$as_ac_var+set}\" = set"; then
     
    53815389   cat >conftest.$ac_ext <<_ACEOF
    53825390-#line 5839 "configure"
    5383 +#line 6125 "configure"
     5391+#line 6126 "configure"
    53845392 #include "confdefs.h"
    53855393 /* System header to define __stub macros and hopefully few prototypes,
    53865394     which can conflict with char $ac_func (); below.  */
    5387 @@ -5867,16 +6153,16 @@
     5395@@ -5867,16 +6154,16 @@
    53885396 }
    53895397 _ACEOF
    53905398 rm -f conftest.$ac_objext conftest$ac_exeext
    53915399-if { (eval echo "$as_me:5870: \"$ac_link\"") >&5
    5392 +if { (eval echo "$as_me:6156: \"$ac_link\"") >&5
     5400+if { (eval echo "$as_me:6157: \"$ac_link\"") >&5
    53935401   (eval $ac_link) 2>&5
    53945402   ac_status=$?
    53955403-  echo "$as_me:5873: \$? = $ac_status" >&5
    5396 +  echo "$as_me:6159: \$? = $ac_status" >&5
     5404+  echo "$as_me:6160: \$? = $ac_status" >&5
    53975405   (exit $ac_status); } &&
    53985406          { ac_try='test -s conftest$ac_exeext'
    53995407-  { (eval echo "$as_me:5876: \"$ac_try\"") >&5
    5400 +  { (eval echo "$as_me:6162: \"$ac_try\"") >&5
     5408+  { (eval echo "$as_me:6163: \"$ac_try\"") >&5
    54015409   (eval $ac_try) 2>&5
    54025410   ac_status=$?
    54035411-  echo "$as_me:5879: \$? = $ac_status" >&5
    5404 +  echo "$as_me:6165: \$? = $ac_status" >&5
     5412+  echo "$as_me:6166: \$? = $ac_status" >&5
    54055413   (exit $ac_status); }; }; then
    54065414   eval "$as_ac_var=yes"
    54075415 else
    5408 @@ -5886,7 +6172,7 @@
     5416@@ -5886,7 +6173,7 @@
    54095417 fi
    54105418 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    54115419 fi
    54125420-echo "$as_me:5889: result: `eval echo '${'$as_ac_var'}'`" >&5
    5413 +echo "$as_me:6175: result: `eval echo '${'$as_ac_var'}'`" >&5
     5421+echo "$as_me:6176: result: `eval echo '${'$as_ac_var'}'`" >&5
    54145422 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
    54155423 if test `eval echo '${'$as_ac_var'}'` = yes; then
    54165424   cat >>confdefs.h <<EOF
    5417 @@ -5903,13 +6189,13 @@
     5425@@ -5903,13 +6190,13 @@
    54185426                symlink
    54195427 do
    54205428 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
    54215429-echo "$as_me:5906: checking for $ac_func" >&5
    5422 +echo "$as_me:6192: checking for $ac_func" >&5
     5430+echo "$as_me:6193: checking for $ac_func" >&5
    54235431 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
    54245432 if eval "test \"\${$as_ac_var+set}\" = set"; then
     
    54275435   cat >conftest.$ac_ext <<_ACEOF
    54285436-#line 5912 "configure"
    5429 +#line 6198 "configure"
     5437+#line 6199 "configure"
    54305438 #include "confdefs.h"
    54315439 /* System header to define __stub macros and hopefully few prototypes,
    54325440     which can conflict with char $ac_func (); below.  */
    5433 @@ -5940,16 +6226,16 @@
     5441@@ -5940,16 +6227,16 @@
    54345442 }
    54355443 _ACEOF
    54365444 rm -f conftest.$ac_objext conftest$ac_exeext
    54375445-if { (eval echo "$as_me:5943: \"$ac_link\"") >&5
    5438 +if { (eval echo "$as_me:6229: \"$ac_link\"") >&5
     5446+if { (eval echo "$as_me:6230: \"$ac_link\"") >&5
    54395447   (eval $ac_link) 2>&5
    54405448   ac_status=$?
    54415449-  echo "$as_me:5946: \$? = $ac_status" >&5
    5442 +  echo "$as_me:6232: \$? = $ac_status" >&5
     5450+  echo "$as_me:6233: \$? = $ac_status" >&5
    54435451   (exit $ac_status); } &&
    54445452          { ac_try='test -s conftest$ac_exeext'
    54455453-  { (eval echo "$as_me:5949: \"$ac_try\"") >&5
    5446 +  { (eval echo "$as_me:6235: \"$ac_try\"") >&5
     5454+  { (eval echo "$as_me:6236: \"$ac_try\"") >&5
    54475455   (eval $ac_try) 2>&5
    54485456   ac_status=$?
    54495457-  echo "$as_me:5952: \$? = $ac_status" >&5
    5450 +  echo "$as_me:6238: \$? = $ac_status" >&5
     5458+  echo "$as_me:6239: \$? = $ac_status" >&5
    54515459   (exit $ac_status); }; }; then
    54525460   eval "$as_ac_var=yes"
    54535461 else
    5454 @@ -5959,7 +6245,7 @@
     5462@@ -5959,7 +6246,7 @@
    54555463 fi
    54565464 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    54575465 fi
    54585466-echo "$as_me:5962: result: `eval echo '${'$as_ac_var'}'`" >&5
    5459 +echo "$as_me:6248: result: `eval echo '${'$as_ac_var'}'`" >&5
     5467+echo "$as_me:6249: result: `eval echo '${'$as_ac_var'}'`" >&5
    54605468 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
    54615469 if test `eval echo '${'$as_ac_var'}'` = yes; then
    54625470   cat >>confdefs.h <<EOF
    5463 @@ -5970,7 +6256,7 @@
     5471@@ -5970,7 +6257,7 @@
    54645472 done
    54655473 
    54665474 else
    54675475-       echo "$as_me:5973: checking if link/symlink functions work" >&5
    5468 +       echo "$as_me:6259: checking if link/symlink functions work" >&5
     5476+       echo "$as_me:6260: checking if link/symlink functions work" >&5
    54695477 echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
    54705478 if test "${cf_cv_link_funcs+set}" = set; then
    54715479   echo $ECHO_N "(cached) $ECHO_C" >&6
    5472 @@ -5983,7 +6269,7 @@
     5480@@ -5983,7 +6270,7 @@
    54735481                        eval 'ac_cv_func_'$cf_func'=error'
    54745482 else
    54755483   cat >conftest.$ac_ext <<_ACEOF
    54765484-#line 5986 "configure"
    5477 +#line 6272 "configure"
     5485+#line 6273 "configure"
    54785486 #include "confdefs.h"
    54795487 
    54805488 #include <sys/types.h>
    5481 @@ -6013,15 +6299,15 @@
     5489@@ -6013,15 +6300,15 @@
    54825490 
    54835491 _ACEOF
    54845492 rm -f conftest$ac_exeext
    54855493-if { (eval echo "$as_me:6016: \"$ac_link\"") >&5
    5486 +if { (eval echo "$as_me:6302: \"$ac_link\"") >&5
     5494+if { (eval echo "$as_me:6303: \"$ac_link\"") >&5
    54875495   (eval $ac_link) 2>&5
    54885496   ac_status=$?
    54895497-  echo "$as_me:6019: \$? = $ac_status" >&5
    5490 +  echo "$as_me:6305: \$? = $ac_status" >&5
     5498+  echo "$as_me:6306: \$? = $ac_status" >&5
    54915499   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    54925500-  { (eval echo "$as_me:6021: \"$ac_try\"") >&5
    5493 +  { (eval echo "$as_me:6307: \"$ac_try\"") >&5
     5501+  { (eval echo "$as_me:6308: \"$ac_try\"") >&5
    54945502   (eval $ac_try) 2>&5
    54955503   ac_status=$?
    54965504-  echo "$as_me:6024: \$? = $ac_status" >&5
    5497 +  echo "$as_me:6310: \$? = $ac_status" >&5
     5505+  echo "$as_me:6311: \$? = $ac_status" >&5
    54985506   (exit $ac_status); }; }; then
    54995507 
    55005508                        cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
    5501 @@ -6039,7 +6325,7 @@
     5509@@ -6039,7 +6326,7 @@
    55025510                test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
    55035511 
    55045512 fi
    55055513-echo "$as_me:6042: result: $cf_cv_link_funcs" >&5
    5506 +echo "$as_me:6328: result: $cf_cv_link_funcs" >&5
     5514+echo "$as_me:6329: result: $cf_cv_link_funcs" >&5
    55075515 echo "${ECHO_T}$cf_cv_link_funcs" >&6
    55085516        test "$ac_cv_func_link"    = yes && cat >>confdefs.h <<\EOF
    55095517 #define HAVE_LINK 1
    5510 @@ -6057,7 +6343,7 @@
     5518@@ -6057,7 +6344,7 @@
    55115519 # soft links (symbolic links) are useful for some systems where hard links do
    55125520 # not work, or to make it simpler to copy terminfo trees around.
    55135521 if test "$ac_cv_func_symlink" = yes ; then
    55145522-    echo "$as_me:6060: checking if tic should use symbolic links" >&5
    5515 +    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
    55165524 echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
    55175525 
    55185526 # Check whether --enable-symlinks or --disable-symlinks was given.
    5519 @@ -6067,21 +6353,21 @@
     5527@@ -6067,21 +6354,21 @@
    55205528 else
    55215529   with_symlinks=no
    55225530 fi;
    55235531-    echo "$as_me:6070: result: $with_symlinks" >&5
    5524 +    echo "$as_me:6356: result: $with_symlinks" >&5
     5532+    echo "$as_me:6357: result: $with_symlinks" >&5
    55255533 echo "${ECHO_T}$with_symlinks" >&6
    55265534 fi
     
    55305538 if test "$with_symlinks" = no ; then
    55315539-    echo "$as_me:6077: checking if tic should use hard links" >&5
    5532 +    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
    55335541 echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
    55345542     if test "$ac_cv_func_link" = yes ; then
     
    55385546     fi
    55395547-    echo "$as_me:6084: result: $with_links" >&5
    5540 +    echo "$as_me:6370: result: $with_links" >&5
     5548+    echo "$as_me:6371: result: $with_links" >&5
    55415549 echo "${ECHO_T}$with_links" >&6
    55425550 fi
    55435551 
    5544 @@ -6094,7 +6380,7 @@
     5552@@ -6094,7 +6381,7 @@
    55455553 EOF
    55465554 
    55475555 ###   use option --enable-broken-linker to force on use of broken-linker support
    55485556-echo "$as_me:6097: checking if you want broken-linker support code" >&5
    5549 +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
    55505558 echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
    55515559 
    55525560 # Check whether --enable-broken_linker or --disable-broken_linker was given.
    5553 @@ -6104,7 +6390,7 @@
     5561@@ -6104,7 +6391,7 @@
    55545562 else
    55555563   with_broken_linker=${BROKEN_LINKER-no}
    55565564 fi;
    55575565-echo "$as_me:6107: result: $with_broken_linker" >&5
    5558 +echo "$as_me:6393: result: $with_broken_linker" >&5
     5566+echo "$as_me:6394: result: $with_broken_linker" >&5
    55595567 echo "${ECHO_T}$with_broken_linker" >&6
    55605568 
    55615569 BROKEN_LINKER=0
    5562 @@ -6124,14 +6410,14 @@
     5570@@ -6124,14 +6411,14 @@
    55635571                BROKEN_LINKER=1
    55645572                test -n "$verbose" && echo "    cygwin linker is broken anyway" 1>&6
    55655573 
    55665574-echo "${as_me-configure}:6127: testing cygwin linker is broken anyway ..." 1>&5
    5567 +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
    55685576 
    55695577                ;;
     
    55735581 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
    55745582-echo "$as_me:6134: checking if tputs should process BSD-style prefix padding" >&5
    5575 +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
    55765584 echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
    55775585 
    55785586 # Check whether --enable-bsdpad or --disable-bsdpad was given.
    5579 @@ -6141,7 +6427,7 @@
     5587@@ -6141,7 +6428,7 @@
    55805588 else
    55815589   with_bsdpad=no
    55825590 fi;
    55835591-echo "$as_me:6144: result: $with_bsdpad" >&5
    5584 +echo "$as_me:6430: result: $with_bsdpad" >&5
     5592+echo "$as_me:6431: result: $with_bsdpad" >&5
    55855593 echo "${ECHO_T}$with_bsdpad" >&6
    55865594 test "$with_bsdpad" = yes && cat >>confdefs.h <<\EOF
    55875595 #define BSD_TPUTS 1
    5588 @@ -6158,7 +6444,7 @@
     5596@@ -6158,7 +6445,7 @@
    55895597 
    55905598 # Check to define _XOPEN_SOURCE "automatically"
    55915599 
    55925600-echo "$as_me:6161: checking if $CC -U and -D options work together" >&5
    5593 +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
    55945602 echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6
    55955603 if test "${cf_cv_cc_u_d_options+set}" = set; then
    55965604   echo $ECHO_N "(cached) $ECHO_C" >&6
    5597 @@ -6167,7 +6453,7 @@
     5605@@ -6167,7 +6454,7 @@
    55985606        cf_save_CPPFLAGS="$CPPFLAGS"
    55995607        CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
    56005608        cat >conftest.$ac_ext <<_ACEOF
    56015609-#line 6170 "configure"
    5602 +#line 6456 "configure"
     5610+#line 6457 "configure"
    56035611 #include "confdefs.h"
    56045612 
    56055613 int
    5606 @@ -6186,16 +6472,16 @@
     5614@@ -6186,16 +6473,16 @@
    56075615 }
    56085616 _ACEOF
    56095617 rm -f conftest.$ac_objext
    56105618-if { (eval echo "$as_me:6189: \"$ac_compile\"") >&5
    5611 +if { (eval echo "$as_me:6475: \"$ac_compile\"") >&5
     5619+if { (eval echo "$as_me:6476: \"$ac_compile\"") >&5
    56125620   (eval $ac_compile) 2>&5
    56135621   ac_status=$?
    56145622-  echo "$as_me:6192: \$? = $ac_status" >&5
    5615 +  echo "$as_me:6478: \$? = $ac_status" >&5
     5623+  echo "$as_me:6479: \$? = $ac_status" >&5
    56165624   (exit $ac_status); } &&
    56175625          { ac_try='test -s conftest.$ac_objext'
    56185626-  { (eval echo "$as_me:6195: \"$ac_try\"") >&5
    5619 +  { (eval echo "$as_me:6481: \"$ac_try\"") >&5
     5627+  { (eval echo "$as_me:6482: \"$ac_try\"") >&5
    56205628   (eval $ac_try) 2>&5
    56215629   ac_status=$?
    56225630-  echo "$as_me:6198: \$? = $ac_status" >&5
    5623 +  echo "$as_me:6484: \$? = $ac_status" >&5
     5631+  echo "$as_me:6485: \$? = $ac_status" >&5
    56245632   (exit $ac_status); }; }; then
    56255633 
    56265634        cf_cv_cc_u_d_options=yes
    5627 @@ -6209,14 +6495,14 @@
     5635@@ -6209,14 +6496,14 @@
    56285636        CPPFLAGS="$cf_save_CPPFLAGS"
    56295637 
    56305638 fi
    56315639-echo "$as_me:6212: result: $cf_cv_cc_u_d_options" >&5
    5632 +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
    56335641 echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6
    56345642 
     
    56425650        ;;
    56435651 freebsd*|dragonfly*) #(vi
    5644 @@ -6233,16 +6519,16 @@
     5652@@ -6233,16 +6520,16 @@
    56455653 irix[56].*) #(vi
    56465654        CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
     
    56505658 
    56515659-echo "$as_me:6238: checking if we must define _GNU_SOURCE" >&5
    5652 +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
    56535661 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
    56545662 if test "${cf_cv_gnu_source+set}" = set; then
     
    56585666 cat >conftest.$ac_ext <<_ACEOF
    56595667-#line 6245 "configure"
    5660 +#line 6531 "configure"
     5668+#line 6532 "configure"
    56615669 #include "confdefs.h"
    56625670 #include <sys/types.h>
    56635671 int
    5664 @@ -6257,16 +6543,16 @@
     5672@@ -6257,16 +6544,16 @@
    56655673 }
    56665674 _ACEOF
    56675675 rm -f conftest.$ac_objext
    56685676-if { (eval echo "$as_me:6260: \"$ac_compile\"") >&5
    5669 +if { (eval echo "$as_me:6546: \"$ac_compile\"") >&5
     5677+if { (eval echo "$as_me:6547: \"$ac_compile\"") >&5
    56705678   (eval $ac_compile) 2>&5
    56715679   ac_status=$?
    56725680-  echo "$as_me:6263: \$? = $ac_status" >&5
    5673 +  echo "$as_me:6549: \$? = $ac_status" >&5
     5681+  echo "$as_me:6550: \$? = $ac_status" >&5
    56745682   (exit $ac_status); } &&
    56755683          { ac_try='test -s conftest.$ac_objext'
    56765684-  { (eval echo "$as_me:6266: \"$ac_try\"") >&5
    5677 +  { (eval echo "$as_me:6552: \"$ac_try\"") >&5
     5685+  { (eval echo "$as_me:6553: \"$ac_try\"") >&5
    56785686   (eval $ac_try) 2>&5
    56795687   ac_status=$?
    56805688-  echo "$as_me:6269: \$? = $ac_status" >&5
    5681 +  echo "$as_me:6555: \$? = $ac_status" >&5
     5689+  echo "$as_me:6556: \$? = $ac_status" >&5
    56825690   (exit $ac_status); }; }; then
    56835691   cf_cv_gnu_source=no
    56845692 else
    5685 @@ -6275,7 +6561,7 @@
     5693@@ -6275,7 +6562,7 @@
    56865694 cf_save="$CPPFLAGS"
    56875695         CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
    56885696         cat >conftest.$ac_ext <<_ACEOF
    56895697-#line 6278 "configure"
    5690 +#line 6564 "configure"
     5698+#line 6565 "configure"
    56915699 #include "confdefs.h"
    56925700 #include <sys/types.h>
    56935701 int
    5694 @@ -6290,16 +6576,16 @@
     5702@@ -6290,16 +6577,16 @@
    56955703 }
    56965704 _ACEOF
    56975705 rm -f conftest.$ac_objext
    56985706-if { (eval echo "$as_me:6293: \"$ac_compile\"") >&5
    5699 +if { (eval echo "$as_me:6579: \"$ac_compile\"") >&5
     5707+if { (eval echo "$as_me:6580: \"$ac_compile\"") >&5
    57005708   (eval $ac_compile) 2>&5
    57015709   ac_status=$?
    57025710-  echo "$as_me:6296: \$? = $ac_status" >&5
    5703 +  echo "$as_me:6582: \$? = $ac_status" >&5
     5711+  echo "$as_me:6583: \$? = $ac_status" >&5
    57045712   (exit $ac_status); } &&
    57055713          { ac_try='test -s conftest.$ac_objext'
    57065714-  { (eval echo "$as_me:6299: \"$ac_try\"") >&5
    5707 +  { (eval echo "$as_me:6585: \"$ac_try\"") >&5
     5715+  { (eval echo "$as_me:6586: \"$ac_try\"") >&5
    57085716   (eval $ac_try) 2>&5
    57095717   ac_status=$?
    57105718-  echo "$as_me:6302: \$? = $ac_status" >&5
    5711 +  echo "$as_me:6588: \$? = $ac_status" >&5
     5719+  echo "$as_me:6589: \$? = $ac_status" >&5
    57125720   (exit $ac_status); }; }; then
    57135721   cf_cv_gnu_source=no
    57145722 else
    5715 @@ -6314,7 +6600,7 @@
     5723@@ -6314,7 +6601,7 @@
    57165724 rm -f conftest.$ac_objext conftest.$ac_ext
    57175725 
    57185726 fi
    57195727-echo "$as_me:6317: result: $cf_cv_gnu_source" >&5
    5720 +echo "$as_me:6603: result: $cf_cv_gnu_source" >&5
     5728+echo "$as_me:6604: result: $cf_cv_gnu_source" >&5
    57215729 echo "${ECHO_T}$cf_cv_gnu_source" >&6
    57225730 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
    57235731 
    5724 @@ -6341,14 +6627,14 @@
     5732@@ -6341,14 +6628,14 @@
    57255733        CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
    57265734        ;;
    57275735 *)
    57285736-       echo "$as_me:6344: checking if we should define _XOPEN_SOURCE" >&5
    5729 +       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
    57305738 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
    57315739 if test "${cf_cv_xopen_source+set}" = set; then
     
    57355743        cat >conftest.$ac_ext <<_ACEOF
    57365744-#line 6351 "configure"
    5737 +#line 6637 "configure"
     5745+#line 6638 "configure"
    57385746 #include "confdefs.h"
    57395747 #include <sys/types.h>
    57405748 int
    5741 @@ -6363,16 +6649,16 @@
     5749@@ -6363,16 +6650,16 @@
    57425750 }
    57435751 _ACEOF
    57445752 rm -f conftest.$ac_objext
    57455753-if { (eval echo "$as_me:6366: \"$ac_compile\"") >&5
    5746 +if { (eval echo "$as_me:6652: \"$ac_compile\"") >&5
     5754+if { (eval echo "$as_me:6653: \"$ac_compile\"") >&5
    57475755   (eval $ac_compile) 2>&5
    57485756   ac_status=$?
    57495757-  echo "$as_me:6369: \$? = $ac_status" >&5
    5750 +  echo "$as_me:6655: \$? = $ac_status" >&5
     5758+  echo "$as_me:6656: \$? = $ac_status" >&5
    57515759   (exit $ac_status); } &&
    57525760          { ac_try='test -s conftest.$ac_objext'
    57535761-  { (eval echo "$as_me:6372: \"$ac_try\"") >&5
    5754 +  { (eval echo "$as_me:6658: \"$ac_try\"") >&5
     5762+  { (eval echo "$as_me:6659: \"$ac_try\"") >&5
    57555763   (eval $ac_try) 2>&5
    57565764   ac_status=$?
    57575765-  echo "$as_me:6375: \$? = $ac_status" >&5
    5758 +  echo "$as_me:6661: \$? = $ac_status" >&5
     5766+  echo "$as_me:6662: \$? = $ac_status" >&5
    57595767   (exit $ac_status); }; }; then
    57605768   cf_cv_xopen_source=no
    57615769 else
    5762 @@ -6381,7 +6667,7 @@
     5770@@ -6381,7 +6668,7 @@
    57635771 cf_save="$CPPFLAGS"
    57645772         CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
    57655773         cat >conftest.$ac_ext <<_ACEOF
    57665774-#line 6384 "configure"
    5767 +#line 6670 "configure"
     5775+#line 6671 "configure"
    57685776 #include "confdefs.h"
    57695777 #include <sys/types.h>
    57705778 int
    5771 @@ -6396,16 +6682,16 @@
     5779@@ -6396,16 +6683,16 @@
    57725780 }
    57735781 _ACEOF
    57745782 rm -f conftest.$ac_objext
    57755783-if { (eval echo "$as_me:6399: \"$ac_compile\"") >&5
    5776 +if { (eval echo "$as_me:6685: \"$ac_compile\"") >&5
     5784+if { (eval echo "$as_me:6686: \"$ac_compile\"") >&5
    57775785   (eval $ac_compile) 2>&5
    57785786   ac_status=$?
    57795787-  echo "$as_me:6402: \$? = $ac_status" >&5
    5780 +  echo "$as_me:6688: \$? = $ac_status" >&5
     5788+  echo "$as_me:6689: \$? = $ac_status" >&5
    57815789   (exit $ac_status); } &&
    57825790          { ac_try='test -s conftest.$ac_objext'
    57835791-  { (eval echo "$as_me:6405: \"$ac_try\"") >&5
    5784 +  { (eval echo "$as_me:6691: \"$ac_try\"") >&5
     5792+  { (eval echo "$as_me:6692: \"$ac_try\"") >&5
    57855793   (eval $ac_try) 2>&5
    57865794   ac_status=$?
    57875795-  echo "$as_me:6408: \$? = $ac_status" >&5
    5788 +  echo "$as_me:6694: \$? = $ac_status" >&5
     5796+  echo "$as_me:6695: \$? = $ac_status" >&5
    57895797   (exit $ac_status); }; }; then
    57905798   cf_cv_xopen_source=no
    57915799 else
    5792 @@ -6420,7 +6706,7 @@
     5800@@ -6420,7 +6707,7 @@
    57935801 rm -f conftest.$ac_objext conftest.$ac_ext
    57945802 
    57955803 fi
    57965804-echo "$as_me:6423: result: $cf_cv_xopen_source" >&5
    5797 +echo "$as_me:6709: result: $cf_cv_xopen_source" >&5
     5805+echo "$as_me:6710: result: $cf_cv_xopen_source" >&5
    57985806 echo "${ECHO_T}$cf_cv_xopen_source" >&6
    57995807        if test "$cf_cv_xopen_source" != no ; then
    58005808 
    5801 @@ -6454,16 +6740,16 @@
     5809@@ -6454,16 +6741,16 @@
    58025810        sed     -e 's/-[UD]_POSIX_C_SOURCE\(=[^         ]*\)\?[         ]/ /g' \
    58035811                -e 's/-[UD]_POSIX_C_SOURCE\(=[^         ]*\)\?$//g'`
    58045812 
    58055813-echo "$as_me:6457: checking if we should define _POSIX_C_SOURCE" >&5
    5806 +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
    58075815 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
    58085816 if test "${cf_cv_posix_c_source+set}" = set; then
     
    58115819 
    58125820-echo "${as_me-configure}:6463: testing if the symbol is already defined go no further ..." 1>&5
    5813 +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
    58145822 
    58155823        cat >conftest.$ac_ext <<_ACEOF
    58165824-#line 6466 "configure"
    5817 +#line 6752 "configure"
     5825+#line 6753 "configure"
    58185826 #include "confdefs.h"
    58195827 #include <sys/types.h>
    58205828 int
    5821 @@ -6478,16 +6764,16 @@
     5829@@ -6478,16 +6765,16 @@
    58225830 }
    58235831 _ACEOF
    58245832 rm -f conftest.$ac_objext
    58255833-if { (eval echo "$as_me:6481: \"$ac_compile\"") >&5
    5826 +if { (eval echo "$as_me:6767: \"$ac_compile\"") >&5
     5834+if { (eval echo "$as_me:6768: \"$ac_compile\"") >&5
    58275835   (eval $ac_compile) 2>&5
    58285836   ac_status=$?
    58295837-  echo "$as_me:6484: \$? = $ac_status" >&5
    5830 +  echo "$as_me:6770: \$? = $ac_status" >&5
     5838+  echo "$as_me:6771: \$? = $ac_status" >&5
    58315839   (exit $ac_status); } &&
    58325840          { ac_try='test -s conftest.$ac_objext'
    58335841-  { (eval echo "$as_me:6487: \"$ac_try\"") >&5
    5834 +  { (eval echo "$as_me:6773: \"$ac_try\"") >&5
     5842+  { (eval echo "$as_me:6774: \"$ac_try\"") >&5
    58355843   (eval $ac_try) 2>&5
    58365844   ac_status=$?
    58375845-  echo "$as_me:6490: \$? = $ac_status" >&5
    5838 +  echo "$as_me:6776: \$? = $ac_status" >&5
     5846+  echo "$as_me:6777: \$? = $ac_status" >&5
    58395847   (exit $ac_status); }; }; then
    58405848   cf_cv_posix_c_source=no
    58415849 else
    5842 @@ -6508,7 +6794,7 @@
     5850@@ -6508,7 +6795,7 @@
    58435851         esac
    58445852         if test "$cf_want_posix_source" = yes ; then
    58455853                cat >conftest.$ac_ext <<_ACEOF
    58465854-#line 6511 "configure"
    5847 +#line 6797 "configure"
     5855+#line 6798 "configure"
    58485856 #include "confdefs.h"
    58495857 #include <sys/types.h>
    58505858 int
    5851 @@ -6523,16 +6809,16 @@
     5859@@ -6523,16 +6810,16 @@
    58525860 }
    58535861 _ACEOF
    58545862 rm -f conftest.$ac_objext
    58555863-if { (eval echo "$as_me:6526: \"$ac_compile\"") >&5
    5856 +if { (eval echo "$as_me:6812: \"$ac_compile\"") >&5
     5864+if { (eval echo "$as_me:6813: \"$ac_compile\"") >&5
    58575865   (eval $ac_compile) 2>&5
    58585866   ac_status=$?
    58595867-  echo "$as_me:6529: \$? = $ac_status" >&5
    5860 +  echo "$as_me:6815: \$? = $ac_status" >&5
     5868+  echo "$as_me:6816: \$? = $ac_status" >&5
    58615869   (exit $ac_status); } &&
    58625870          { ac_try='test -s conftest.$ac_objext'
    58635871-  { (eval echo "$as_me:6532: \"$ac_try\"") >&5
    5864 +  { (eval echo "$as_me:6818: \"$ac_try\"") >&5
     5872+  { (eval echo "$as_me:6819: \"$ac_try\"") >&5
    58655873   (eval $ac_try) 2>&5
    58665874   ac_status=$?
    58675875-  echo "$as_me:6535: \$? = $ac_status" >&5
    5868 +  echo "$as_me:6821: \$? = $ac_status" >&5
     5876+  echo "$as_me:6822: \$? = $ac_status" >&5
    58695877   (exit $ac_status); }; }; then
    58705878   :
    58715879 else
    5872 @@ -6543,15 +6829,15 @@
     5880@@ -6543,15 +6830,15 @@
    58735881 rm -f conftest.$ac_objext conftest.$ac_ext
    58745882         fi
    58755883 
    58765884-echo "${as_me-configure}:6546: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
    5877 +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
    58785886 
    58795887         CFLAGS="$cf_trim_CFLAGS"
     
    58815889 
    58825890-echo "${as_me-configure}:6551: testing if the second compile does not leave our definition intact error ..." 1>&5
    5883 +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
    58845892 
    58855893         cat >conftest.$ac_ext <<_ACEOF
    58865894-#line 6554 "configure"
    5887 +#line 6840 "configure"
     5895+#line 6841 "configure"
    58885896 #include "confdefs.h"
    58895897 #include <sys/types.h>
    58905898 int
    5891 @@ -6566,16 +6852,16 @@
     5899@@ -6566,16 +6853,16 @@
    58925900 }
    58935901 _ACEOF
    58945902 rm -f conftest.$ac_objext
    58955903-if { (eval echo "$as_me:6569: \"$ac_compile\"") >&5
    5896 +if { (eval echo "$as_me:6855: \"$ac_compile\"") >&5
     5904+if { (eval echo "$as_me:6856: \"$ac_compile\"") >&5
    58975905   (eval $ac_compile) 2>&5
    58985906   ac_status=$?
    58995907-  echo "$as_me:6572: \$? = $ac_status" >&5
    5900 +  echo "$as_me:6858: \$? = $ac_status" >&5
     5908+  echo "$as_me:6859: \$? = $ac_status" >&5
    59015909   (exit $ac_status); } &&
    59025910          { ac_try='test -s conftest.$ac_objext'
    59035911-  { (eval echo "$as_me:6575: \"$ac_try\"") >&5
    5904 +  { (eval echo "$as_me:6861: \"$ac_try\"") >&5
     5912+  { (eval echo "$as_me:6862: \"$ac_try\"") >&5
    59055913   (eval $ac_try) 2>&5
    59065914   ac_status=$?
    59075915-  echo "$as_me:6578: \$? = $ac_status" >&5
    5908 +  echo "$as_me:6864: \$? = $ac_status" >&5
     5916+  echo "$as_me:6865: \$? = $ac_status" >&5
    59095917   (exit $ac_status); }; }; then
    59105918   :
    59115919 else
    5912 @@ -6591,7 +6877,7 @@
     5920@@ -6591,7 +6878,7 @@
    59135921 rm -f conftest.$ac_objext conftest.$ac_ext
    59145922 
    59155923 fi
    59165924-echo "$as_me:6594: result: $cf_cv_posix_c_source" >&5
    5917 +echo "$as_me:6880: result: $cf_cv_posix_c_source" >&5
     5925+echo "$as_me:6881: result: $cf_cv_posix_c_source" >&5
    59185926 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
    59195927 
    59205928 if test "$cf_cv_posix_c_source" != no ; then
    5921 @@ -6610,14 +6896,14 @@
     5929@@ -6610,14 +6897,14 @@
    59225930 
    59235931 # Work around breakage on OS X
    59245932 
    59255933-echo "$as_me:6613: checking if SIGWINCH is defined" >&5
    5926 +echo "$as_me:6899: checking if SIGWINCH is defined" >&5
     5934+echo "$as_me:6900: checking if SIGWINCH is defined" >&5
    59275935 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
    59285936 if test "${cf_cv_define_sigwinch+set}" = set; then
     
    59325940        cat >conftest.$ac_ext <<_ACEOF
    59335941-#line 6620 "configure"
    5934 +#line 6906 "configure"
     5942+#line 6907 "configure"
    59355943 #include "confdefs.h"
    59365944 
    59375945 #include <sys/types.h>
    5938 @@ -6632,23 +6918,23 @@
     5946@@ -6632,23 +6919,23 @@
    59395947 }
    59405948 _ACEOF
    59415949 rm -f conftest.$ac_objext
    59425950-if { (eval echo "$as_me:6635: \"$ac_compile\"") >&5
    5943 +if { (eval echo "$as_me:6921: \"$ac_compile\"") >&5
     5951+if { (eval echo "$as_me:6922: \"$ac_compile\"") >&5
    59445952   (eval $ac_compile) 2>&5
    59455953   ac_status=$?
    59465954-  echo "$as_me:6638: \$? = $ac_status" >&5
    5947 +  echo "$as_me:6924: \$? = $ac_status" >&5
     5955+  echo "$as_me:6925: \$? = $ac_status" >&5
    59485956   (exit $ac_status); } &&
    59495957          { ac_try='test -s conftest.$ac_objext'
    59505958-  { (eval echo "$as_me:6641: \"$ac_try\"") >&5
    5951 +  { (eval echo "$as_me:6927: \"$ac_try\"") >&5
     5959+  { (eval echo "$as_me:6928: \"$ac_try\"") >&5
    59525960   (eval $ac_try) 2>&5
    59535961   ac_status=$?
    59545962-  echo "$as_me:6644: \$? = $ac_status" >&5
    5955 +  echo "$as_me:6930: \$? = $ac_status" >&5
     5963+  echo "$as_me:6931: \$? = $ac_status" >&5
    59565964   (exit $ac_status); }; }; then
    59575965   cf_cv_define_sigwinch=yes
     
    59615969 cat >conftest.$ac_ext <<_ACEOF
    59625970-#line 6651 "configure"
    5963 +#line 6937 "configure"
     5971+#line 6938 "configure"
    59645972 #include "confdefs.h"
    59655973 
    59665974 #undef _XOPEN_SOURCE
    5967 @@ -6666,16 +6952,16 @@
     5975@@ -6666,16 +6953,16 @@
    59685976 }
    59695977 _ACEOF
    59705978 rm -f conftest.$ac_objext
    59715979-if { (eval echo "$as_me:6669: \"$ac_compile\"") >&5
    5972 +if { (eval echo "$as_me:6955: \"$ac_compile\"") >&5
     5980+if { (eval echo "$as_me:6956: \"$ac_compile\"") >&5
    59735981   (eval $ac_compile) 2>&5
    59745982   ac_status=$?
    59755983-  echo "$as_me:6672: \$? = $ac_status" >&5
    5976 +  echo "$as_me:6958: \$? = $ac_status" >&5
     5984+  echo "$as_me:6959: \$? = $ac_status" >&5
    59775985   (exit $ac_status); } &&
    59785986          { ac_try='test -s conftest.$ac_objext'
    59795987-  { (eval echo "$as_me:6675: \"$ac_try\"") >&5
    5980 +  { (eval echo "$as_me:6961: \"$ac_try\"") >&5
     5988+  { (eval echo "$as_me:6962: \"$ac_try\"") >&5
    59815989   (eval $ac_try) 2>&5
    59825990   ac_status=$?
    59835991-  echo "$as_me:6678: \$? = $ac_status" >&5
    5984 +  echo "$as_me:6964: \$? = $ac_status" >&5
     5992+  echo "$as_me:6965: \$? = $ac_status" >&5
    59855993   (exit $ac_status); }; }; then
    59865994   cf_cv_define_sigwinch=maybe
    59875995 else
    5988 @@ -6689,11 +6975,11 @@
     5996@@ -6689,11 +6976,11 @@
    59895997 rm -f conftest.$ac_objext conftest.$ac_ext
    59905998 
    59915999 fi
    59926000-echo "$as_me:6692: result: $cf_cv_define_sigwinch" >&5
    5993 +echo "$as_me:6978: result: $cf_cv_define_sigwinch" >&5
     6001+echo "$as_me:6979: result: $cf_cv_define_sigwinch" >&5
    59946002 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
    59956003 
    59966004 if test "$cf_cv_define_sigwinch" = maybe ; then
    59976005-echo "$as_me:6696: checking for actual SIGWINCH definition" >&5
    5998 +echo "$as_me:6982: checking for actual SIGWINCH definition" >&5
     6006+echo "$as_me:6983: checking for actual SIGWINCH definition" >&5
    59996007 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
    60006008 if test "${cf_cv_fixup_sigwinch+set}" = set; then
    60016009   echo $ECHO_N "(cached) $ECHO_C" >&6
    6002 @@ -6704,7 +6990,7 @@
     6010@@ -6704,7 +6991,7 @@
    60036011 while test $cf_sigwinch != 1
    60046012 do
    60056013        cat >conftest.$ac_ext <<_ACEOF
    60066014-#line 6707 "configure"
    6007 +#line 6993 "configure"
     6015+#line 6994 "configure"
    60086016 #include "confdefs.h"
    60096017 
    60106018 #undef _XOPEN_SOURCE
    6011 @@ -6726,16 +7012,16 @@
     6019@@ -6726,16 +7013,16 @@
    60126020 }
    60136021 _ACEOF
    60146022 rm -f conftest.$ac_objext
    60156023-if { (eval echo "$as_me:6729: \"$ac_compile\"") >&5
    6016 +if { (eval echo "$as_me:7015: \"$ac_compile\"") >&5
     6024+if { (eval echo "$as_me:7016: \"$ac_compile\"") >&5
    60176025   (eval $ac_compile) 2>&5
    60186026   ac_status=$?
    60196027-  echo "$as_me:6732: \$? = $ac_status" >&5
    6020 +  echo "$as_me:7018: \$? = $ac_status" >&5
     6028+  echo "$as_me:7019: \$? = $ac_status" >&5
    60216029   (exit $ac_status); } &&
    60226030          { ac_try='test -s conftest.$ac_objext'
    60236031-  { (eval echo "$as_me:6735: \"$ac_try\"") >&5
    6024 +  { (eval echo "$as_me:7021: \"$ac_try\"") >&5
     6032+  { (eval echo "$as_me:7022: \"$ac_try\"") >&5
    60256033   (eval $ac_try) 2>&5
    60266034   ac_status=$?
    60276035-  echo "$as_me:6738: \$? = $ac_status" >&5
    6028 +  echo "$as_me:7024: \$? = $ac_status" >&5
     6036+  echo "$as_me:7025: \$? = $ac_status" >&5
    60296037   (exit $ac_status); }; }; then
    60306038   cf_cv_fixup_sigwinch=$cf_sigwinch
    60316039         break
    6032 @@ -6749,7 +7035,7 @@
     6040@@ -6749,7 +7036,7 @@
    60336041 done
    60346042 
    60356043 fi
    60366044-echo "$as_me:6752: result: $cf_cv_fixup_sigwinch" >&5
    6037 +echo "$as_me:7038: result: $cf_cv_fixup_sigwinch" >&5
     6045+echo "$as_me:7039: result: $cf_cv_fixup_sigwinch" >&5
    60386046 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
    60396047 
    60406048        if test "$cf_cv_fixup_sigwinch" != unknown ; then
    6041 @@ -6759,13 +7045,13 @@
     6049@@ -6759,13 +7046,13 @@
    60426050 
    60436051 # Checks for CODESET support.
    60446052 
    60456053-  echo "$as_me:6762: checking for nl_langinfo and CODESET" >&5
    6046 +  echo "$as_me:7048: checking for nl_langinfo and CODESET" >&5
     6054+  echo "$as_me:7049: checking for nl_langinfo and CODESET" >&5
    60476055 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
    60486056 if test "${am_cv_langinfo_codeset+set}" = set; then
     
    60516059   cat >conftest.$ac_ext <<_ACEOF
    60526060-#line 6768 "configure"
    6053 +#line 7054 "configure"
     6061+#line 7055 "configure"
    60546062 #include "confdefs.h"
    60556063 #include <langinfo.h>
    60566064 int
    6057 @@ -6777,16 +7063,16 @@
     6065@@ -6777,16 +7064,16 @@
    60586066 }
    60596067 _ACEOF
    60606068 rm -f conftest.$ac_objext conftest$ac_exeext
    60616069-if { (eval echo "$as_me:6780: \"$ac_link\"") >&5
    6062 +if { (eval echo "$as_me:7066: \"$ac_link\"") >&5
     6070+if { (eval echo "$as_me:7067: \"$ac_link\"") >&5
    60636071   (eval $ac_link) 2>&5
    60646072   ac_status=$?
    60656073-  echo "$as_me:6783: \$? = $ac_status" >&5
    6066 +  echo "$as_me:7069: \$? = $ac_status" >&5
     6074+  echo "$as_me:7070: \$? = $ac_status" >&5
    60676075   (exit $ac_status); } &&
    60686076          { ac_try='test -s conftest$ac_exeext'
    60696077-  { (eval echo "$as_me:6786: \"$ac_try\"") >&5
    6070 +  { (eval echo "$as_me:7072: \"$ac_try\"") >&5
     6078+  { (eval echo "$as_me:7073: \"$ac_try\"") >&5
    60716079   (eval $ac_try) 2>&5
    60726080   ac_status=$?
    60736081-  echo "$as_me:6789: \$? = $ac_status" >&5
    6074 +  echo "$as_me:7075: \$? = $ac_status" >&5
     6082+  echo "$as_me:7076: \$? = $ac_status" >&5
    60756083   (exit $ac_status); }; }; then
    60766084   am_cv_langinfo_codeset=yes
    60776085 else
    6078 @@ -6797,7 +7083,7 @@
     6086@@ -6797,7 +7084,7 @@
    60796087 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    60806088 
    60816089 fi
    60826090-echo "$as_me:6800: result: $am_cv_langinfo_codeset" >&5
    6083 +echo "$as_me:7086: result: $am_cv_langinfo_codeset" >&5
     6091+echo "$as_me:7087: result: $am_cv_langinfo_codeset" >&5
    60846092 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
    60856093   if test $am_cv_langinfo_codeset = yes; then
    60866094 
    6087 @@ -6811,7 +7097,7 @@
     6095@@ -6811,7 +7098,7 @@
    60886096 NCURSES_OK_WCHAR_T=
    60896097 NCURSES_OK_WINT_T=
    60906098 
    60916099-echo "$as_me:6814: checking if you want wide-character code" >&5
    6092 +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
    60936101 echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
    60946102 
    60956103 # Check whether --enable-widec or --disable-widec was given.
    6096 @@ -6821,7 +7107,7 @@
     6104@@ -6821,7 +7108,7 @@
    60976105 else
    60986106   with_widec=no
    60996107 fi;
    61006108-echo "$as_me:6824: result: $with_widec" >&5
    6101 +echo "$as_me:7110: result: $with_widec" >&5
     6109+echo "$as_me:7111: result: $with_widec" >&5
    61026110 echo "${ECHO_T}$with_widec" >&6
    61036111 if test "$with_widec" = yes ; then
    61046112        LIB_SUFFIX="w${LIB_SUFFIX}"
    6105 @@ -6829,10 +7115,10 @@
     6113@@ -6829,10 +7116,10 @@
    61066114 #define USE_WIDEC_SUPPORT 1
    61076115 EOF
    61086116 
    61096117-echo "$as_me:6832: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
    6110 +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
    61116119 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
    61126120 cat >conftest.$ac_ext <<_ACEOF
    61136121-#line 6835 "configure"
    6114 +#line 7121 "configure"
     6122+#line 7122 "configure"
    61156123 #include "confdefs.h"
    61166124 #include <sys/types.h>
    61176125 
    6118 @@ -6848,16 +7134,16 @@
     6126@@ -6848,16 +7135,16 @@
    61196127 }
    61206128 _ACEOF
    61216129 rm -f conftest.$ac_objext
    61226130-if { (eval echo "$as_me:6851: \"$ac_compile\"") >&5
    6123 +if { (eval echo "$as_me:7137: \"$ac_compile\"") >&5
     6131+if { (eval echo "$as_me:7138: \"$ac_compile\"") >&5
    61246132   (eval $ac_compile) 2>&5
    61256133   ac_status=$?
    61266134-  echo "$as_me:6854: \$? = $ac_status" >&5
    6127 +  echo "$as_me:7140: \$? = $ac_status" >&5
     6135+  echo "$as_me:7141: \$? = $ac_status" >&5
    61286136   (exit $ac_status); } &&
    61296137          { ac_try='test -s conftest.$ac_objext'
    61306138-  { (eval echo "$as_me:6857: \"$ac_try\"") >&5
    6131 +  { (eval echo "$as_me:7143: \"$ac_try\"") >&5
     6139+  { (eval echo "$as_me:7144: \"$ac_try\"") >&5
    61326140   (eval $ac_try) 2>&5
    61336141   ac_status=$?
    61346142-  echo "$as_me:6860: \$? = $ac_status" >&5
    6135 +  echo "$as_me:7146: \$? = $ac_status" >&5
     6143+  echo "$as_me:7147: \$? = $ac_status" >&5
    61366144   (exit $ac_status); }; }; then
    61376145   cf_result=no
    61386146 else
    6139 @@ -6866,16 +7152,16 @@
     6147@@ -6866,16 +7153,16 @@
    61406148 cf_result=yes
    61416149 fi
    61426150 rm -f conftest.$ac_objext conftest.$ac_ext
    61436151-echo "$as_me:6869: result: $cf_result" >&5
    6144 +echo "$as_me:7155: result: $cf_result" >&5
     6152+echo "$as_me:7156: result: $cf_result" >&5
    61456153 echo "${ECHO_T}$cf_result" >&6
    61466154 
     
    61496157 elif test "x" != "x" ; then
    61506158-       echo "$as_me:6875: checking checking for compatible value versus " >&5
    6151 +       echo "$as_me:7161: checking checking for compatible value versus " >&5
     6159+       echo "$as_me:7162: checking checking for compatible value versus " >&5
    61526160 echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
    61536161        cat >conftest.$ac_ext <<_ACEOF
    61546162-#line 6878 "configure"
    6155 +#line 7164 "configure"
     6163+#line 7165 "configure"
    61566164 #include "confdefs.h"
    61576165 #include <sys/types.h>
    61586166 
    6159 @@ -6891,16 +7177,16 @@
     6167@@ -6891,16 +7178,16 @@
    61606168 }
    61616169 _ACEOF
    61626170 rm -f conftest.$ac_objext
    61636171-if { (eval echo "$as_me:6894: \"$ac_compile\"") >&5
    6164 +if { (eval echo "$as_me:7180: \"$ac_compile\"") >&5
     6172+if { (eval echo "$as_me:7181: \"$ac_compile\"") >&5
    61656173   (eval $ac_compile) 2>&5
    61666174   ac_status=$?
    61676175-  echo "$as_me:6897: \$? = $ac_status" >&5
    6168 +  echo "$as_me:7183: \$? = $ac_status" >&5
     6176+  echo "$as_me:7184: \$? = $ac_status" >&5
    61696177   (exit $ac_status); } &&
    61706178          { ac_try='test -s conftest.$ac_objext'
    61716179-  { (eval echo "$as_me:6900: \"$ac_try\"") >&5
    6172 +  { (eval echo "$as_me:7186: \"$ac_try\"") >&5
     6180+  { (eval echo "$as_me:7187: \"$ac_try\"") >&5
    61736181   (eval $ac_try) 2>&5
    61746182   ac_status=$?
    61756183-  echo "$as_me:6903: \$? = $ac_status" >&5
    6176 +  echo "$as_me:7189: \$? = $ac_status" >&5
     6184+  echo "$as_me:7190: \$? = $ac_status" >&5
    61776185   (exit $ac_status); }; }; then
    61786186   cf_result=yes
    61796187 else
    6180 @@ -6909,7 +7195,7 @@
     6188@@ -6909,7 +7196,7 @@
    61816189 cf_result=no
    61826190 fi
    61836191 rm -f conftest.$ac_objext conftest.$ac_ext
    61846192-       echo "$as_me:6912: result: $cf_result" >&5
    6185 +       echo "$as_me:7198: result: $cf_result" >&5
     6193+       echo "$as_me:7199: result: $cf_result" >&5
    61866194 echo "${ECHO_T}$cf_result" >&6
    61876195        if test "$cf_result" = no ; then
    61886196                # perhaps we can override it - try...
    6189 @@ -6923,13 +7209,13 @@
     6197@@ -6923,13 +7210,13 @@
    61906198 for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs
    61916199 do
    61926200 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
    61936201-echo "$as_me:6926: checking for $ac_func" >&5
    6194 +echo "$as_me:7212: checking for $ac_func" >&5
     6202+echo "$as_me:7213: checking for $ac_func" >&5
    61956203 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
    61966204 if eval "test \"\${$as_ac_var+set}\" = set"; then
     
    61996207   cat >conftest.$ac_ext <<_ACEOF
    62006208-#line 6932 "configure"
    6201 +#line 7218 "configure"
     6209+#line 7219 "configure"
    62026210 #include "confdefs.h"
    62036211 /* System header to define __stub macros and hopefully few prototypes,
    62046212     which can conflict with char $ac_func (); below.  */
    6205 @@ -6960,16 +7246,16 @@
     6213@@ -6960,16 +7247,16 @@
    62066214 }
    62076215 _ACEOF
    62086216 rm -f conftest.$ac_objext conftest$ac_exeext
    62096217-if { (eval echo "$as_me:6963: \"$ac_link\"") >&5
    6210 +if { (eval echo "$as_me:7249: \"$ac_link\"") >&5
     6218+if { (eval echo "$as_me:7250: \"$ac_link\"") >&5
    62116219   (eval $ac_link) 2>&5
    62126220   ac_status=$?
    62136221-  echo "$as_me:6966: \$? = $ac_status" >&5
    6214 +  echo "$as_me:7252: \$? = $ac_status" >&5
     6222+  echo "$as_me:7253: \$? = $ac_status" >&5
    62156223   (exit $ac_status); } &&
    62166224          { ac_try='test -s conftest$ac_exeext'
    62176225-  { (eval echo "$as_me:6969: \"$ac_try\"") >&5
    6218 +  { (eval echo "$as_me:7255: \"$ac_try\"") >&5
     6226+  { (eval echo "$as_me:7256: \"$ac_try\"") >&5
    62196227   (eval $ac_try) 2>&5
    62206228   ac_status=$?
    62216229-  echo "$as_me:6972: \$? = $ac_status" >&5
    6222 +  echo "$as_me:7258: \$? = $ac_status" >&5
     6230+  echo "$as_me:7259: \$? = $ac_status" >&5
    62236231   (exit $ac_status); }; }; then
    62246232   eval "$as_ac_var=yes"
    62256233 else
    6226 @@ -6979,7 +7265,7 @@
     6234@@ -6979,7 +7266,7 @@
    62276235 fi
    62286236 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    62296237 fi
    62306238-echo "$as_me:6982: result: `eval echo '${'$as_ac_var'}'`" >&5
    6231 +echo "$as_me:7268: result: `eval echo '${'$as_ac_var'}'`" >&5
     6239+echo "$as_me:7269: result: `eval echo '${'$as_ac_var'}'`" >&5
    62326240 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
    62336241 if test `eval echo '${'$as_ac_var'}'` = yes; then
    62346242   cat >>confdefs.h <<EOF
    6235 @@ -6991,7 +7277,7 @@
     6243@@ -6991,7 +7278,7 @@
    62366244 
    62376245        if test "$ac_cv_func_putwc" != yes ; then
    62386246 
    62396247-echo "$as_me:6994: checking for multibyte character support" >&5
    6240 +echo "$as_me:7280: checking for multibyte character support" >&5
     6248+echo "$as_me:7281: checking for multibyte character support" >&5
    62416249 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
    62426250 if test "${cf_cv_utf8_lib+set}" = set; then
    62436251   echo $ECHO_N "(cached) $ECHO_C" >&6
    6244 @@ -6999,7 +7285,7 @@
     6252@@ -6999,7 +7286,7 @@
    62456253 
    62466254        cf_save_LIBS="$LIBS"
    62476255        cat >conftest.$ac_ext <<_ACEOF
    62486256-#line 7002 "configure"
    6249 +#line 7288 "configure"
     6257+#line 7289 "configure"
    62506258 #include "confdefs.h"
    62516259 
    62526260 #include <stdlib.h>
    6253 @@ -7012,16 +7298,16 @@
     6261@@ -7012,16 +7299,16 @@
    62546262 }
    62556263 _ACEOF
    62566264 rm -f conftest.$ac_objext conftest$ac_exeext
    62576265-if { (eval echo "$as_me:7015: \"$ac_link\"") >&5
    6258 +if { (eval echo "$as_me:7301: \"$ac_link\"") >&5
     6266+if { (eval echo "$as_me:7302: \"$ac_link\"") >&5
    62596267   (eval $ac_link) 2>&5
    62606268   ac_status=$?
    62616269-  echo "$as_me:7018: \$? = $ac_status" >&5
    6262 +  echo "$as_me:7304: \$? = $ac_status" >&5
     6270+  echo "$as_me:7305: \$? = $ac_status" >&5
    62636271   (exit $ac_status); } &&
    62646272          { ac_try='test -s conftest$ac_exeext'
    62656273-  { (eval echo "$as_me:7021: \"$ac_try\"") >&5
    6266 +  { (eval echo "$as_me:7307: \"$ac_try\"") >&5
     6274+  { (eval echo "$as_me:7308: \"$ac_try\"") >&5
    62676275   (eval $ac_try) 2>&5
    62686276   ac_status=$?
    62696277-  echo "$as_me:7024: \$? = $ac_status" >&5
    6270 +  echo "$as_me:7310: \$? = $ac_status" >&5
     6278+  echo "$as_me:7311: \$? = $ac_status" >&5
    62716279   (exit $ac_status); }; }; then
    62726280   cf_cv_utf8_lib=yes
    62736281 else
    6274 @@ -7033,10 +7319,10 @@
     6282@@ -7033,10 +7320,10 @@
    62756283 cf_cv_header_path_utf8=
    62766284 cf_cv_library_path_utf8=
    62776285 
    62786286-echo "${as_me-configure}:7036: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
    6279 +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
    62806288 
    62816289 cat >conftest.$ac_ext <<_ACEOF
    62826290-#line 7039 "configure"
    6283 +#line 7325 "configure"
     6291+#line 7326 "configure"
    62846292 #include "confdefs.h"
    62856293 
    62866294 #include <libutf8.h>
    6287 @@ -7049,16 +7335,16 @@
     6295@@ -7049,16 +7336,16 @@
    62886296 }
    62896297 _ACEOF
    62906298 rm -f conftest.$ac_objext conftest$ac_exeext
    62916299-if { (eval echo "$as_me:7052: \"$ac_link\"") >&5
    6292 +if { (eval echo "$as_me:7338: \"$ac_link\"") >&5
     6300+if { (eval echo "$as_me:7339: \"$ac_link\"") >&5
    62936301   (eval $ac_link) 2>&5
    62946302   ac_status=$?
    62956303-  echo "$as_me:7055: \$? = $ac_status" >&5
    6296 +  echo "$as_me:7341: \$? = $ac_status" >&5
     6304+  echo "$as_me:7342: \$? = $ac_status" >&5
    62976305   (exit $ac_status); } &&
    62986306          { ac_try='test -s conftest$ac_exeext'
    62996307-  { (eval echo "$as_me:7058: \"$ac_try\"") >&5
    6300 +  { (eval echo "$as_me:7344: \"$ac_try\"") >&5
     6308+  { (eval echo "$as_me:7345: \"$ac_try\"") >&5
    63016309   (eval $ac_try) 2>&5
    63026310   ac_status=$?
    63036311-  echo "$as_me:7061: \$? = $ac_status" >&5
    6304 +  echo "$as_me:7347: \$? = $ac_status" >&5
     6312+  echo "$as_me:7348: \$? = $ac_status" >&5
    63056313   (exit $ac_status); }; }; then
    63066314   cf_cv_find_linkage_utf8=yes
    63076315 else
    6308 @@ -7067,12 +7353,41 @@
     6316@@ -7067,12 +7354,41 @@
    63096317 
    63106318     cf_cv_find_linkage_utf8=no
     
    63136321+    test -n "$verbose" && echo "       find linkage for utf8 library" 1>&6
    63146322+
    6315 +echo "${as_me-configure}:7358: testing find linkage for utf8 library ..." 1>&5
    6316 +
    6317 +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
    63186326 
    63196327     cf_save_CPPFLAGS="$CPPFLAGS"
     
    63506358 test "/usr" != "$prefix" && \
    63516359 test -d "/usr" && \
    6352 @@ -7143,16 +7458,18 @@
     6360@@ -7143,16 +7459,18 @@
    63536361        test -d $oldincludedir/utf8 && cf_search="$cf_search $oldincludedir/utf8"
    63546362 }
     
    63626370 
    63636371-echo "${as_me-configure}:7151: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
    6364 +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
    63656373 
    63666374         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
    63676375         cat >conftest.$ac_ext <<_ACEOF
    63686376-#line 7155 "configure"
    6369 +#line 7472 "configure"
     6377+#line 7473 "configure"
    63706378 #include "confdefs.h"
    63716379 
    63726380 #include <libutf8.h>
    6373 @@ -7165,21 +7482,21 @@
     6381@@ -7165,21 +7483,21 @@
    63746382 }
    63756383 _ACEOF
    63766384 rm -f conftest.$ac_objext
    63776385-if { (eval echo "$as_me:7168: \"$ac_compile\"") >&5
    6378 +if { (eval echo "$as_me:7485: \"$ac_compile\"") >&5
     6386+if { (eval echo "$as_me:7486: \"$ac_compile\"") >&5
    63796387   (eval $ac_compile) 2>&5
    63806388   ac_status=$?
    63816389-  echo "$as_me:7171: \$? = $ac_status" >&5
    6382 +  echo "$as_me:7488: \$? = $ac_status" >&5
     6390+  echo "$as_me:7489: \$? = $ac_status" >&5
    63836391   (exit $ac_status); } &&
    63846392          { ac_try='test -s conftest.$ac_objext'
    63856393-  { (eval echo "$as_me:7174: \"$ac_try\"") >&5
    6386 +  { (eval echo "$as_me:7491: \"$ac_try\"") >&5
     6394+  { (eval echo "$as_me:7492: \"$ac_try\"") >&5
    63876395   (eval $ac_try) 2>&5
    63886396   ac_status=$?
    63896397-  echo "$as_me:7177: \$? = $ac_status" >&5
    6390 +  echo "$as_me:7494: \$? = $ac_status" >&5
     6398+  echo "$as_me:7495: \$? = $ac_status" >&5
    63916399   (exit $ac_status); }; }; then
    63926400 
     
    63946402 
    63956403-echo "${as_me-configure}:7182: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
    6396 +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
    63976405 
    63986406             cf_cv_find_linkage_utf8=maybe
    63996407             cf_test_CPPFLAGS="$CPPFLAGS"
    6400 @@ -7197,13 +7514,39 @@
     6408@@ -7197,13 +7515,39 @@
    64016409 
    64026410     if test "$cf_cv_find_linkage_utf8" = maybe ; then
    64036411 
    64046412-echo "${as_me-configure}:7200: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
    6405 +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
    64066414 
    64076415       cf_save_LIBS="$LIBS"
     
    64406448 test "/usr" != "$prefix" && \
    64416449 test -d "/usr" && \
    6442 @@ -7260,18 +7603,20 @@
     6450@@ -7260,18 +7604,20 @@
    64436451        test -d $HOME/utf8/lib/utf8 &&    cf_search="$cf_search $HOME/utf8/lib/utf8"
    64446452 }
     
    64526460 
    64536461-echo "${as_me-configure}:7268: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
    6454 +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
    64556463 
    64566464             CPPFLAGS="$cf_test_CPPFLAGS"
     
    64596467             cat >conftest.$ac_ext <<_ACEOF
    64606468-#line 7274 "configure"
    6461 +#line 7619 "configure"
     6469+#line 7620 "configure"
    64626470 #include "confdefs.h"
    64636471 
    64646472 #include <libutf8.h>
    6465 @@ -7284,21 +7629,21 @@
     6473@@ -7284,21 +7630,21 @@
    64666474 }
    64676475 _ACEOF
    64686476 rm -f conftest.$ac_objext conftest$ac_exeext
    64696477-if { (eval echo "$as_me:7287: \"$ac_link\"") >&5
    6470 +if { (eval echo "$as_me:7632: \"$ac_link\"") >&5
     6478+if { (eval echo "$as_me:7633: \"$ac_link\"") >&5
    64716479   (eval $ac_link) 2>&5
    64726480   ac_status=$?
    64736481-  echo "$as_me:7290: \$? = $ac_status" >&5
    6474 +  echo "$as_me:7635: \$? = $ac_status" >&5
     6482+  echo "$as_me:7636: \$? = $ac_status" >&5
    64756483   (exit $ac_status); } &&
    64766484          { ac_try='test -s conftest$ac_exeext'
    64776485-  { (eval echo "$as_me:7293: \"$ac_try\"") >&5
    6478 +  { (eval echo "$as_me:7638: \"$ac_try\"") >&5
     6486+  { (eval echo "$as_me:7639: \"$ac_try\"") >&5
    64796487   (eval $ac_try) 2>&5
    64806488   ac_status=$?
    64816489-  echo "$as_me:7296: \$? = $ac_status" >&5
    6482 +  echo "$as_me:7641: \$? = $ac_status" >&5
     6490+  echo "$as_me:7642: \$? = $ac_status" >&5
    64836491   (exit $ac_status); }; }; then
    64846492 
     
    64866494 
    64876495-echo "${as_me-configure}:7301: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
    6488 +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
    64896497 
    64906498                 cf_cv_find_linkage_utf8=yes
    64916499                 cf_cv_library_file_utf8="-lutf8"
    6492 @@ -7336,7 +7681,7 @@
     6500@@ -7336,7 +7682,7 @@
    64936501 fi
    64946502 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    64956503 fi
    64966504-echo "$as_me:7339: result: $cf_cv_utf8_lib" >&5
    6497 +echo "$as_me:7684: result: $cf_cv_utf8_lib" >&5
     6505+echo "$as_me:7685: result: $cf_cv_utf8_lib" >&5
    64986506 echo "${ECHO_T}$cf_cv_utf8_lib" >&6
    64996507 
    65006508 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
    6501 @@ -7364,13 +7709,13 @@
     6509@@ -7364,13 +7710,13 @@
    65026510                fi
    65036511 
     
    65116519                          cat >conftest.$ac_ext <<_ACEOF
    65126520-#line 7373 "configure"
    6513 +#line 7718 "configure"
     6521+#line 7719 "configure"
    65146522 #include "confdefs.h"
    65156523 #include <stdio.h>
    65166524 int
    6517 @@ -7382,16 +7727,16 @@
     6525@@ -7382,16 +7728,16 @@
    65186526 }
    65196527 _ACEOF
    65206528 rm -f conftest.$ac_objext
    65216529-if { (eval echo "$as_me:7385: \"$ac_compile\"") >&5
    6522 +if { (eval echo "$as_me:7730: \"$ac_compile\"") >&5
     6530+if { (eval echo "$as_me:7731: \"$ac_compile\"") >&5
    65236531   (eval $ac_compile) 2>&5
    65246532   ac_status=$?
    65256533-  echo "$as_me:7388: \$? = $ac_status" >&5
    6526 +  echo "$as_me:7733: \$? = $ac_status" >&5
     6534+  echo "$as_me:7734: \$? = $ac_status" >&5
    65276535   (exit $ac_status); } &&
    65286536          { ac_try='test -s conftest.$ac_objext'
    65296537-  { (eval echo "$as_me:7391: \"$ac_try\"") >&5
    6530 +  { (eval echo "$as_me:7736: \"$ac_try\"") >&5
     6538+  { (eval echo "$as_me:7737: \"$ac_try\"") >&5
    65316539   (eval $ac_try) 2>&5
    65326540   ac_status=$?
    65336541-  echo "$as_me:7394: \$? = $ac_status" >&5
    6534 +  echo "$as_me:7739: \$? = $ac_status" >&5
     6542+  echo "$as_me:7740: \$? = $ac_status" >&5
    65356543   (exit $ac_status); }; }; then
    65366544   :
    65376545 else
    6538 @@ -7408,13 +7753,13 @@
     6546@@ -7408,13 +7754,13 @@
    65396547                if test "$cf_have_incdir" = no ; then
    65406548                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
    65416549 
    65426550-echo "${as_me-configure}:7411: testing adding $cf_add_incdir to include-path ..." 1>&5
    6543 +echo "${as_me-configure}:7756: testing adding $cf_add_incdir to include-path ..." 1>&5
     6551+echo "${as_me-configure}:7757: testing adding $cf_add_incdir to include-path ..." 1>&5
    65446552 
    65456553-                 CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
     
    65556563                  break
    65566564                fi
    6557 @@ -7442,7 +7787,7 @@
     6565@@ -7442,7 +7788,7 @@
    65586566       if test "$cf_have_libdir" = no ; then
    65596567         test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
    65606568 
    65616569-echo "${as_me-configure}:7445: testing adding $cf_add_libdir to library-path ..." 1>&5
    6562 +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
    65636571 
    65646572         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
    65656573       fi
    6566 @@ -7459,14 +7804,14 @@
     6574@@ -7459,14 +7805,14 @@
    65676575        fi
    65686576 
    65696577 # This is needed on Tru64 5.0 to declare mbstate_t
    65706578-echo "$as_me:7462: checking if we must include wchar.h to declare mbstate_t" >&5
    6571 +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
    65726580 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
    65736581 if test "${cf_cv_mbstate_t+set}" = set; then
     
    65776585 cat >conftest.$ac_ext <<_ACEOF
    65786586-#line 7469 "configure"
    6579 +#line 7814 "configure"
     6587+#line 7815 "configure"
    65806588 #include "confdefs.h"
    65816589 
    65826590 #include <stdlib.h>
    6583 @@ -7484,23 +7829,23 @@
     6591@@ -7484,23 +7830,23 @@
    65846592 }
    65856593 _ACEOF
    65866594 rm -f conftest.$ac_objext
    65876595-if { (eval echo "$as_me:7487: \"$ac_compile\"") >&5
    6588 +if { (eval echo "$as_me:7832: \"$ac_compile\"") >&5
     6596+if { (eval echo "$as_me:7833: \"$ac_compile\"") >&5
    65896597   (eval $ac_compile) 2>&5
    65906598   ac_status=$?
    65916599-  echo "$as_me:7490: \$? = $ac_status" >&5
    6592 +  echo "$as_me:7835: \$? = $ac_status" >&5
     6600+  echo "$as_me:7836: \$? = $ac_status" >&5
    65936601   (exit $ac_status); } &&
    65946602          { ac_try='test -s conftest.$ac_objext'
    65956603-  { (eval echo "$as_me:7493: \"$ac_try\"") >&5
    6596 +  { (eval echo "$as_me:7838: \"$ac_try\"") >&5
     6604+  { (eval echo "$as_me:7839: \"$ac_try\"") >&5
    65976605   (eval $ac_try) 2>&5
    65986606   ac_status=$?
    65996607-  echo "$as_me:7496: \$? = $ac_status" >&5
    6600 +  echo "$as_me:7841: \$? = $ac_status" >&5
     6608+  echo "$as_me:7842: \$? = $ac_status" >&5
    66016609   (exit $ac_status); }; }; then
    66026610   cf_cv_mbstate_t=no
     
    66066614 cat >conftest.$ac_ext <<_ACEOF
    66076615-#line 7503 "configure"
    6608 +#line 7848 "configure"
     6616+#line 7849 "configure"
    66096617 #include "confdefs.h"
    66106618 
    66116619 #include <stdlib.h>
    6612 @@ -7519,16 +7864,16 @@
     6620@@ -7519,16 +7865,16 @@
    66136621 }
    66146622 _ACEOF
    66156623 rm -f conftest.$ac_objext
    66166624-if { (eval echo "$as_me:7522: \"$ac_compile\"") >&5
    6617 +if { (eval echo "$as_me:7867: \"$ac_compile\"") >&5
     6625+if { (eval echo "$as_me:7868: \"$ac_compile\"") >&5
    66186626   (eval $ac_compile) 2>&5
    66196627   ac_status=$?
    66206628-  echo "$as_me:7525: \$? = $ac_status" >&5
    6621 +  echo "$as_me:7870: \$? = $ac_status" >&5
     6629+  echo "$as_me:7871: \$? = $ac_status" >&5
    66226630   (exit $ac_status); } &&
    66236631          { ac_try='test -s conftest.$ac_objext'
    66246632-  { (eval echo "$as_me:7528: \"$ac_try\"") >&5
    6625 +  { (eval echo "$as_me:7873: \"$ac_try\"") >&5
     6633+  { (eval echo "$as_me:7874: \"$ac_try\"") >&5
    66266634   (eval $ac_try) 2>&5
    66276635   ac_status=$?
    66286636-  echo "$as_me:7531: \$? = $ac_status" >&5
    6629 +  echo "$as_me:7876: \$? = $ac_status" >&5
     6637+  echo "$as_me:7877: \$? = $ac_status" >&5
    66306638   (exit $ac_status); }; }; then
    66316639   cf_cv_mbstate_t=yes
    66326640 else
    6633 @@ -7540,7 +7885,7 @@
     6641@@ -7540,7 +7886,7 @@
    66346642 fi
    66356643 rm -f conftest.$ac_objext conftest.$ac_ext
    66366644 fi
    66376645-echo "$as_me:7543: result: $cf_cv_mbstate_t" >&5
    6638 +echo "$as_me:7888: result: $cf_cv_mbstate_t" >&5
     6646+echo "$as_me:7889: result: $cf_cv_mbstate_t" >&5
    66396647 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
    66406648 
    66416649 if test "$cf_cv_mbstate_t" = yes ; then
    6642 @@ -7557,14 +7902,14 @@
     6650@@ -7557,14 +7903,14 @@
    66436651 fi
    66446652 
    66456653 # This is needed on Tru64 5.0 to declare wchar_t
    66466654-echo "$as_me:7560: checking if we must include wchar.h to declare wchar_t" >&5
    6647 +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
    66486656 echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
    66496657 if test "${cf_cv_wchar_t+set}" = set; then
     
    66536661 cat >conftest.$ac_ext <<_ACEOF
    66546662-#line 7567 "configure"
    6655 +#line 7912 "configure"
     6663+#line 7913 "configure"
    66566664 #include "confdefs.h"
    66576665 
    66586666 #include <stdlib.h>
    6659 @@ -7582,23 +7927,23 @@
     6667@@ -7582,23 +7928,23 @@
    66606668 }
    66616669 _ACEOF
    66626670 rm -f conftest.$ac_objext
    66636671-if { (eval echo "$as_me:7585: \"$ac_compile\"") >&5
    6664 +if { (eval echo "$as_me:7930: \"$ac_compile\"") >&5
     6672+if { (eval echo "$as_me:7931: \"$ac_compile\"") >&5
    66656673   (eval $ac_compile) 2>&5
    66666674   ac_status=$?
    66676675-  echo "$as_me:7588: \$? = $ac_status" >&5
    6668 +  echo "$as_me:7933: \$? = $ac_status" >&5
     6676+  echo "$as_me:7934: \$? = $ac_status" >&5
    66696677   (exit $ac_status); } &&
    66706678          { ac_try='test -s conftest.$ac_objext'
    66716679-  { (eval echo "$as_me:7591: \"$ac_try\"") >&5
    6672 +  { (eval echo "$as_me:7936: \"$ac_try\"") >&5
     6680+  { (eval echo "$as_me:7937: \"$ac_try\"") >&5
    66736681   (eval $ac_try) 2>&5
    66746682   ac_status=$?
    66756683-  echo "$as_me:7594: \$? = $ac_status" >&5
    6676 +  echo "$as_me:7939: \$? = $ac_status" >&5
     6684+  echo "$as_me:7940: \$? = $ac_status" >&5
    66776685   (exit $ac_status); }; }; then
    66786686   cf_cv_wchar_t=no
     
    66826690 cat >conftest.$ac_ext <<_ACEOF
    66836691-#line 7601 "configure"
    6684 +#line 7946 "configure"
     6692+#line 7947 "configure"
    66856693 #include "confdefs.h"
    66866694 
    66876695 #include <stdlib.h>
    6688 @@ -7617,16 +7962,16 @@
     6696@@ -7617,16 +7963,16 @@
    66896697 }
    66906698 _ACEOF
    66916699 rm -f conftest.$ac_objext
    66926700-if { (eval echo "$as_me:7620: \"$ac_compile\"") >&5
    6693 +if { (eval echo "$as_me:7965: \"$ac_compile\"") >&5
     6701+if { (eval echo "$as_me:7966: \"$ac_compile\"") >&5
    66946702   (eval $ac_compile) 2>&5
    66956703   ac_status=$?
    66966704-  echo "$as_me:7623: \$? = $ac_status" >&5
    6697 +  echo "$as_me:7968: \$? = $ac_status" >&5
     6705+  echo "$as_me:7969: \$? = $ac_status" >&5
    66986706   (exit $ac_status); } &&
    66996707          { ac_try='test -s conftest.$ac_objext'
    67006708-  { (eval echo "$as_me:7626: \"$ac_try\"") >&5
    6701 +  { (eval echo "$as_me:7971: \"$ac_try\"") >&5
     6709+  { (eval echo "$as_me:7972: \"$ac_try\"") >&5
    67026710   (eval $ac_try) 2>&5
    67036711   ac_status=$?
    67046712-  echo "$as_me:7629: \$? = $ac_status" >&5
    6705 +  echo "$as_me:7974: \$? = $ac_status" >&5
     6713+  echo "$as_me:7975: \$? = $ac_status" >&5
    67066714   (exit $ac_status); }; }; then
    67076715   cf_cv_wchar_t=yes
    67086716 else
    6709 @@ -7638,7 +7983,7 @@
     6717@@ -7638,7 +7984,7 @@
    67106718 fi
    67116719 rm -f conftest.$ac_objext conftest.$ac_ext
    67126720 fi
    67136721-echo "$as_me:7641: result: $cf_cv_wchar_t" >&5
    6714 +echo "$as_me:7986: result: $cf_cv_wchar_t" >&5
     6722+echo "$as_me:7987: result: $cf_cv_wchar_t" >&5
    67156723 echo "${ECHO_T}$cf_cv_wchar_t" >&6
    67166724 
    67176725 if test "$cf_cv_wchar_t" = yes ; then
    6718 @@ -7660,14 +8005,14 @@
     6726@@ -7660,14 +8006,14 @@
    67196727 fi
    67206728 
    67216729 # This is needed on Tru64 5.0 to declare wint_t
    67226730-echo "$as_me:7663: checking if we must include wchar.h to declare wint_t" >&5
    6723 +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
    67246732 echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
    67256733 if test "${cf_cv_wint_t+set}" = set; then
     
    67296737 cat >conftest.$ac_ext <<_ACEOF
    67306738-#line 7670 "configure"
    6731 +#line 8015 "configure"
     6739+#line 8016 "configure"
    67326740 #include "confdefs.h"
    67336741 
    67346742 #include <stdlib.h>
    6735 @@ -7685,23 +8030,23 @@
     6743@@ -7685,23 +8031,23 @@
    67366744 }
    67376745 _ACEOF
    67386746 rm -f conftest.$ac_objext
    67396747-if { (eval echo "$as_me:7688: \"$ac_compile\"") >&5
    6740 +if { (eval echo "$as_me:8033: \"$ac_compile\"") >&5
     6748+if { (eval echo "$as_me:8034: \"$ac_compile\"") >&5
    67416749   (eval $ac_compile) 2>&5
    67426750   ac_status=$?
    67436751-  echo "$as_me:7691: \$? = $ac_status" >&5
    6744 +  echo "$as_me:8036: \$? = $ac_status" >&5
     6752+  echo "$as_me:8037: \$? = $ac_status" >&5
    67456753   (exit $ac_status); } &&
    67466754          { ac_try='test -s conftest.$ac_objext'
    67476755-  { (eval echo "$as_me:7694: \"$ac_try\"") >&5
    6748 +  { (eval echo "$as_me:8039: \"$ac_try\"") >&5
     6756+  { (eval echo "$as_me:8040: \"$ac_try\"") >&5
    67496757   (eval $ac_try) 2>&5
    67506758   ac_status=$?
    67516759-  echo "$as_me:7697: \$? = $ac_status" >&5
    6752 +  echo "$as_me:8042: \$? = $ac_status" >&5
     6760+  echo "$as_me:8043: \$? = $ac_status" >&5
    67536761   (exit $ac_status); }; }; then
    67546762   cf_cv_wint_t=no
     
    67586766 cat >conftest.$ac_ext <<_ACEOF
    67596767-#line 7704 "configure"
    6760 +#line 8049 "configure"
     6768+#line 8050 "configure"
    67616769 #include "confdefs.h"
    67626770 
    67636771 #include <stdlib.h>
    6764 @@ -7720,16 +8065,16 @@
     6772@@ -7720,16 +8066,16 @@
    67656773 }
    67666774 _ACEOF
    67676775 rm -f conftest.$ac_objext
    67686776-if { (eval echo "$as_me:7723: \"$ac_compile\"") >&5
    6769 +if { (eval echo "$as_me:8068: \"$ac_compile\"") >&5
     6777+if { (eval echo "$as_me:8069: \"$ac_compile\"") >&5
    67706778   (eval $ac_compile) 2>&5
    67716779   ac_status=$?
    67726780-  echo "$as_me:7726: \$? = $ac_status" >&5
    6773 +  echo "$as_me:8071: \$? = $ac_status" >&5
     6781+  echo "$as_me:8072: \$? = $ac_status" >&5
    67746782   (exit $ac_status); } &&
    67756783          { ac_try='test -s conftest.$ac_objext'
    67766784-  { (eval echo "$as_me:7729: \"$ac_try\"") >&5
    6777 +  { (eval echo "$as_me:8074: \"$ac_try\"") >&5
     6785+  { (eval echo "$as_me:8075: \"$ac_try\"") >&5
    67786786   (eval $ac_try) 2>&5
    67796787   ac_status=$?
    67806788-  echo "$as_me:7732: \$? = $ac_status" >&5
    6781 +  echo "$as_me:8077: \$? = $ac_status" >&5
     6789+  echo "$as_me:8078: \$? = $ac_status" >&5
    67826790   (exit $ac_status); }; }; then
    67836791   cf_cv_wint_t=yes
    67846792 else
    6785 @@ -7741,7 +8086,7 @@
     6793@@ -7741,7 +8087,7 @@
    67866794 fi
    67876795 rm -f conftest.$ac_objext conftest.$ac_ext
    67886796 fi
    67896797-echo "$as_me:7744: result: $cf_cv_wint_t" >&5
    6790 +echo "$as_me:8089: result: $cf_cv_wint_t" >&5
     6798+echo "$as_me:8090: result: $cf_cv_wint_t" >&5
    67916799 echo "${ECHO_T}$cf_cv_wint_t" >&6
    67926800 
    67936801 if test "$cf_cv_wint_t" = yes ; then
    6794 @@ -7780,7 +8125,7 @@
     6802@@ -7780,7 +8126,7 @@
    67956803        ;;
    67966804 esac
    67976805 
    67986806-echo "$as_me:7783: checking whether to enable _LP64 definition in curses.h" >&5
    6799 +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
    68006808 echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
    68016809 
    68026810 # Check whether --enable-lp64 or --disable-lp64 was given.
    6803 @@ -7790,7 +8135,7 @@
     6811@@ -7790,7 +8136,7 @@
    68046812 else
    68056813   with_lp64=$default_with_lp64
    68066814 fi;
    68076815-echo "$as_me:7793: result: $with_lp64" >&5
    6808 +echo "$as_me:8138: result: $with_lp64" >&5
     6816+echo "$as_me:8139: result: $with_lp64" >&5
    68096817 echo "${ECHO_T}$with_lp64" >&6
    68106818 
    68116819 if test "$with_lp64" = yes ; then
    6812 @@ -7806,7 +8151,7 @@
     6820@@ -7806,7 +8152,7 @@
    68136821 fi;
    68146822 if test "$enable_largefile" != no; then
    68156823 
    68166824-  echo "$as_me:7809: checking for special C compiler options needed for large files" >&5
    6817 +  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
    68186826 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
    68196827 if test "${ac_cv_sys_largefile_CC+set}" = set; then
    68206828   echo $ECHO_N "(cached) $ECHO_C" >&6
    6821 @@ -7818,7 +8163,7 @@
     6829@@ -7818,7 +8164,7 @@
    68226830         # IRIX 6.2 and later do not support large files by default,
    68236831         # so use the C compiler's -n32 option if that helps.
    68246832          cat >conftest.$ac_ext <<_ACEOF
    68256833-#line 7821 "configure"
    6826 +#line 8166 "configure"
     6834+#line 8167 "configure"
    68276835 #include "confdefs.h"
    68286836 #include <sys/types.h>
    68296837  /* Check that off_t can represent 2**63 - 1 correctly.
    6830 @@ -7838,16 +8183,16 @@
     6838@@ -7838,16 +8184,16 @@
    68316839 }
    68326840 _ACEOF
    68336841         rm -f conftest.$ac_objext
    68346842-if { (eval echo "$as_me:7841: \"$ac_compile\"") >&5
    6835 +if { (eval echo "$as_me:8186: \"$ac_compile\"") >&5
     6843+if { (eval echo "$as_me:8187: \"$ac_compile\"") >&5
    68366844   (eval $ac_compile) 2>&5
    68376845   ac_status=$?
    68386846-  echo "$as_me:7844: \$? = $ac_status" >&5
    6839 +  echo "$as_me:8189: \$? = $ac_status" >&5
     6847+  echo "$as_me:8190: \$? = $ac_status" >&5
    68406848   (exit $ac_status); } &&
    68416849          { ac_try='test -s conftest.$ac_objext'
    68426850-  { (eval echo "$as_me:7847: \"$ac_try\"") >&5
    6843 +  { (eval echo "$as_me:8192: \"$ac_try\"") >&5
     6851+  { (eval echo "$as_me:8193: \"$ac_try\"") >&5
    68446852   (eval $ac_try) 2>&5
    68456853   ac_status=$?
    68466854-  echo "$as_me:7850: \$? = $ac_status" >&5
    6847 +  echo "$as_me:8195: \$? = $ac_status" >&5
     6855+  echo "$as_me:8196: \$? = $ac_status" >&5
    68486856   (exit $ac_status); }; }; then
    68496857   break
    68506858 else
    6851 @@ -7857,16 +8202,16 @@
     6859@@ -7857,16 +8203,16 @@
    68526860 rm -f conftest.$ac_objext
    68536861         CC="$CC -n32"
    68546862         rm -f conftest.$ac_objext
    68556863-if { (eval echo "$as_me:7860: \"$ac_compile\"") >&5
    6856 +if { (eval echo "$as_me:8205: \"$ac_compile\"") >&5
     6864+if { (eval echo "$as_me:8206: \"$ac_compile\"") >&5
    68576865   (eval $ac_compile) 2>&5
    68586866   ac_status=$?
    68596867-  echo "$as_me:7863: \$? = $ac_status" >&5
    6860 +  echo "$as_me:8208: \$? = $ac_status" >&5
     6868+  echo "$as_me:8209: \$? = $ac_status" >&5
    68616869   (exit $ac_status); } &&
    68626870          { ac_try='test -s conftest.$ac_objext'
    68636871-  { (eval echo "$as_me:7866: \"$ac_try\"") >&5
    6864 +  { (eval echo "$as_me:8211: \"$ac_try\"") >&5
     6872+  { (eval echo "$as_me:8212: \"$ac_try\"") >&5
    68656873   (eval $ac_try) 2>&5
    68666874   ac_status=$?
    68676875-  echo "$as_me:7869: \$? = $ac_status" >&5
    6868 +  echo "$as_me:8214: \$? = $ac_status" >&5
     6876+  echo "$as_me:8215: \$? = $ac_status" >&5
    68696877   (exit $ac_status); }; }; then
    68706878   ac_cv_sys_largefile_CC=' -n32'; break
    68716879 else
    6872 @@ -7880,13 +8225,13 @@
     6880@@ -7880,13 +8226,13 @@
    68736881        rm -f conftest.$ac_ext
    68746882     fi
    68756883 fi
    68766884-echo "$as_me:7883: result: $ac_cv_sys_largefile_CC" >&5
    6877 +echo "$as_me:8228: result: $ac_cv_sys_largefile_CC" >&5
     6885+echo "$as_me:8229: result: $ac_cv_sys_largefile_CC" >&5
    68786886 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
    68796887   if test "$ac_cv_sys_largefile_CC" != no; then
     
    68826890 
    68836891-  echo "$as_me:7889: checking for _FILE_OFFSET_BITS value needed for large files" >&5
    6884 +  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
    68856893 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
    68866894 if test "${ac_cv_sys_file_offset_bits+set}" = set; then
    68876895   echo $ECHO_N "(cached) $ECHO_C" >&6
    6888 @@ -7894,7 +8239,7 @@
     6896@@ -7894,7 +8240,7 @@
    68896897   while :; do
    68906898   ac_cv_sys_file_offset_bits=no
    68916899   cat >conftest.$ac_ext <<_ACEOF
    68926900-#line 7897 "configure"
    6893 +#line 8242 "configure"
     6901+#line 8243 "configure"
    68946902 #include "confdefs.h"
    68956903 #include <sys/types.h>
    68966904  /* Check that off_t can represent 2**63 - 1 correctly.
    6897 @@ -7914,16 +8259,16 @@
     6905@@ -7914,16 +8260,16 @@
    68986906 }
    68996907 _ACEOF
    69006908 rm -f conftest.$ac_objext
    69016909-if { (eval echo "$as_me:7917: \"$ac_compile\"") >&5
    6902 +if { (eval echo "$as_me:8262: \"$ac_compile\"") >&5
     6910+if { (eval echo "$as_me:8263: \"$ac_compile\"") >&5
    69036911   (eval $ac_compile) 2>&5
    69046912   ac_status=$?
    69056913-  echo "$as_me:7920: \$? = $ac_status" >&5
    6906 +  echo "$as_me:8265: \$? = $ac_status" >&5
     6914+  echo "$as_me:8266: \$? = $ac_status" >&5
    69076915   (exit $ac_status); } &&
    69086916          { ac_try='test -s conftest.$ac_objext'
    69096917-  { (eval echo "$as_me:7923: \"$ac_try\"") >&5
    6910 +  { (eval echo "$as_me:8268: \"$ac_try\"") >&5
     6918+  { (eval echo "$as_me:8269: \"$ac_try\"") >&5
    69116919   (eval $ac_try) 2>&5
    69126920   ac_status=$?
    69136921-  echo "$as_me:7926: \$? = $ac_status" >&5
    6914 +  echo "$as_me:8271: \$? = $ac_status" >&5
     6922+  echo "$as_me:8272: \$? = $ac_status" >&5
    69156923   (exit $ac_status); }; }; then
    69166924   break
    69176925 else
    6918 @@ -7932,7 +8277,7 @@
     6926@@ -7932,7 +8278,7 @@
    69196927 fi
    69206928 rm -f conftest.$ac_objext conftest.$ac_ext
    69216929   cat >conftest.$ac_ext <<_ACEOF
    69226930-#line 7935 "configure"
    6923 +#line 8280 "configure"
     6931+#line 8281 "configure"
    69246932 #include "confdefs.h"
    69256933 #define _FILE_OFFSET_BITS 64
    69266934 #include <sys/types.h>
    6927 @@ -7953,16 +8298,16 @@
     6935@@ -7953,16 +8299,16 @@
    69286936 }
    69296937 _ACEOF
    69306938 rm -f conftest.$ac_objext
    69316939-if { (eval echo "$as_me:7956: \"$ac_compile\"") >&5
    6932 +if { (eval echo "$as_me:8301: \"$ac_compile\"") >&5
     6940+if { (eval echo "$as_me:8302: \"$ac_compile\"") >&5
    69336941   (eval $ac_compile) 2>&5
    69346942   ac_status=$?
    69356943-  echo "$as_me:7959: \$? = $ac_status" >&5
    6936 +  echo "$as_me:8304: \$? = $ac_status" >&5
     6944+  echo "$as_me:8305: \$? = $ac_status" >&5
    69376945   (exit $ac_status); } &&
    69386946          { ac_try='test -s conftest.$ac_objext'
    69396947-  { (eval echo "$as_me:7962: \"$ac_try\"") >&5
    6940 +  { (eval echo "$as_me:8307: \"$ac_try\"") >&5
     6948+  { (eval echo "$as_me:8308: \"$ac_try\"") >&5
    69416949   (eval $ac_try) 2>&5
    69426950   ac_status=$?
    69436951-  echo "$as_me:7965: \$? = $ac_status" >&5
    6944 +  echo "$as_me:8310: \$? = $ac_status" >&5
     6952+  echo "$as_me:8311: \$? = $ac_status" >&5
    69456953   (exit $ac_status); }; }; then
    69466954   ac_cv_sys_file_offset_bits=64; break
    69476955 else
    6948 @@ -7973,7 +8318,7 @@
     6956@@ -7973,7 +8319,7 @@
    69496957   break
    69506958 done
    69516959 fi
    69526960-echo "$as_me:7976: result: $ac_cv_sys_file_offset_bits" >&5
    6953 +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
    69546962 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
    69556963 if test "$ac_cv_sys_file_offset_bits" != no; then
    69566964 
    6957 @@ -7983,7 +8328,7 @@
     6965@@ -7983,7 +8329,7 @@
    69586966 
    69596967 fi
    69606968 rm -f conftest*
    69616969-  echo "$as_me:7986: checking for _LARGE_FILES value needed for large files" >&5
    6962 +  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
    69636971 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
    69646972 if test "${ac_cv_sys_large_files+set}" = set; then
    69656973   echo $ECHO_N "(cached) $ECHO_C" >&6
    6966 @@ -7991,7 +8336,7 @@
     6974@@ -7991,7 +8337,7 @@
    69676975   while :; do
    69686976   ac_cv_sys_large_files=no
    69696977   cat >conftest.$ac_ext <<_ACEOF
    69706978-#line 7994 "configure"
    6971 +#line 8339 "configure"
     6979+#line 8340 "configure"
    69726980 #include "confdefs.h"
    69736981 #include <sys/types.h>
    69746982  /* Check that off_t can represent 2**63 - 1 correctly.
    6975 @@ -8011,16 +8356,16 @@
     6983@@ -8011,16 +8357,16 @@
    69766984 }
    69776985 _ACEOF
    69786986 rm -f conftest.$ac_objext
    69796987-if { (eval echo "$as_me:8014: \"$ac_compile\"") >&5
    6980 +if { (eval echo "$as_me:8359: \"$ac_compile\"") >&5
     6988+if { (eval echo "$as_me:8360: \"$ac_compile\"") >&5
    69816989   (eval $ac_compile) 2>&5
    69826990   ac_status=$?
    69836991-  echo "$as_me:8017: \$? = $ac_status" >&5
    6984 +  echo "$as_me:8362: \$? = $ac_status" >&5
     6992+  echo "$as_me:8363: \$? = $ac_status" >&5
    69856993   (exit $ac_status); } &&
    69866994          { ac_try='test -s conftest.$ac_objext'
    69876995-  { (eval echo "$as_me:8020: \"$ac_try\"") >&5
    6988 +  { (eval echo "$as_me:8365: \"$ac_try\"") >&5
     6996+  { (eval echo "$as_me:8366: \"$ac_try\"") >&5
    69896997   (eval $ac_try) 2>&5
    69906998   ac_status=$?
    69916999-  echo "$as_me:8023: \$? = $ac_status" >&5
    6992 +  echo "$as_me:8368: \$? = $ac_status" >&5
     7000+  echo "$as_me:8369: \$? = $ac_status" >&5
    69937001   (exit $ac_status); }; }; then
    69947002   break
    69957003 else
    6996 @@ -8029,7 +8374,7 @@
     7004@@ -8029,7 +8375,7 @@
    69977005 fi
    69987006 rm -f conftest.$ac_objext conftest.$ac_ext
    69997007   cat >conftest.$ac_ext <<_ACEOF
    70007008-#line 8032 "configure"
    7001 +#line 8377 "configure"
     7009+#line 8378 "configure"
    70027010 #include "confdefs.h"
    70037011 #define _LARGE_FILES 1
    70047012 #include <sys/types.h>
    7005 @@ -8050,16 +8395,16 @@
     7013@@ -8050,16 +8396,16 @@
    70067014 }
    70077015 _ACEOF
    70087016 rm -f conftest.$ac_objext
    70097017-if { (eval echo "$as_me:8053: \"$ac_compile\"") >&5
    7010 +if { (eval echo "$as_me:8398: \"$ac_compile\"") >&5
     7018+if { (eval echo "$as_me:8399: \"$ac_compile\"") >&5
    70117019   (eval $ac_compile) 2>&5
    70127020   ac_status=$?
    70137021-  echo "$as_me:8056: \$? = $ac_status" >&5
    7014 +  echo "$as_me:8401: \$? = $ac_status" >&5
     7022+  echo "$as_me:8402: \$? = $ac_status" >&5
    70157023   (exit $ac_status); } &&
    70167024          { ac_try='test -s conftest.$ac_objext'
    70177025-  { (eval echo "$as_me:8059: \"$ac_try\"") >&5
    7018 +  { (eval echo "$as_me:8404: \"$ac_try\"") >&5
     7026+  { (eval echo "$as_me:8405: \"$ac_try\"") >&5
    70197027   (eval $ac_try) 2>&5
    70207028   ac_status=$?
    70217029-  echo "$as_me:8062: \$? = $ac_status" >&5
    7022 +  echo "$as_me:8407: \$? = $ac_status" >&5
     7030+  echo "$as_me:8408: \$? = $ac_status" >&5
    70237031   (exit $ac_status); }; }; then
    70247032   ac_cv_sys_large_files=1; break
    70257033 else
    7026 @@ -8070,7 +8415,7 @@
     7034@@ -8070,7 +8416,7 @@
    70277035   break
    70287036 done
    70297037 fi
    70307038-echo "$as_me:8073: result: $ac_cv_sys_large_files" >&5
    7031 +echo "$as_me:8418: result: $ac_cv_sys_large_files" >&5
     7039+echo "$as_me:8419: result: $ac_cv_sys_large_files" >&5
    70327040 echo "${ECHO_T}$ac_cv_sys_large_files" >&6
    70337041 if test "$ac_cv_sys_large_files" != no; then
    70347042 
    7035 @@ -8083,7 +8428,7 @@
     7043@@ -8083,7 +8429,7 @@
    70367044 fi
    70377045 
    70387046     if test "$enable_largefile" != no ; then
    70397047-       echo "$as_me:8086: checking for _LARGEFILE_SOURCE value needed for large files" >&5
    7040 +       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
    70417049 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
    70427050 if test "${ac_cv_sys_largefile_source+set}" = set; then
    70437051   echo $ECHO_N "(cached) $ECHO_C" >&6
    7044 @@ -8091,7 +8436,7 @@
     7052@@ -8091,7 +8437,7 @@
    70457053   while :; do
    70467054   ac_cv_sys_largefile_source=no
    70477055   cat >conftest.$ac_ext <<_ACEOF
    70487056-#line 8094 "configure"
    7049 +#line 8439 "configure"
     7057+#line 8440 "configure"
    70507058 #include "confdefs.h"
    70517059 #include <stdio.h>
    70527060 int
    7053 @@ -8103,16 +8448,16 @@
     7061@@ -8103,16 +8449,16 @@
    70547062 }
    70557063 _ACEOF
    70567064 rm -f conftest.$ac_objext
    70577065-if { (eval echo "$as_me:8106: \"$ac_compile\"") >&5
    7058 +if { (eval echo "$as_me:8451: \"$ac_compile\"") >&5
     7066+if { (eval echo "$as_me:8452: \"$ac_compile\"") >&5
    70597067   (eval $ac_compile) 2>&5
    70607068   ac_status=$?
    70617069-  echo "$as_me:8109: \$? = $ac_status" >&5
    7062 +  echo "$as_me:8454: \$? = $ac_status" >&5
     7070+  echo "$as_me:8455: \$? = $ac_status" >&5
    70637071   (exit $ac_status); } &&
    70647072          { ac_try='test -s conftest.$ac_objext'
    70657073-  { (eval echo "$as_me:8112: \"$ac_try\"") >&5
    7066 +  { (eval echo "$as_me:8457: \"$ac_try\"") >&5
     7074+  { (eval echo "$as_me:8458: \"$ac_try\"") >&5
    70677075   (eval $ac_try) 2>&5
    70687076   ac_status=$?
    70697077-  echo "$as_me:8115: \$? = $ac_status" >&5
    7070 +  echo "$as_me:8460: \$? = $ac_status" >&5
     7078+  echo "$as_me:8461: \$? = $ac_status" >&5
    70717079   (exit $ac_status); }; }; then
    70727080   break
    70737081 else
    7074 @@ -8121,7 +8466,7 @@
     7082@@ -8121,7 +8467,7 @@
    70757083 fi
    70767084 rm -f conftest.$ac_objext conftest.$ac_ext
    70777085   cat >conftest.$ac_ext <<_ACEOF
    70787086-#line 8124 "configure"
    7079 +#line 8469 "configure"
     7087+#line 8470 "configure"
    70807088 #include "confdefs.h"
    70817089 #define _LARGEFILE_SOURCE 1
    70827090 #include <stdio.h>
    7083 @@ -8134,16 +8479,16 @@
     7091@@ -8134,16 +8480,16 @@
    70847092 }
    70857093 _ACEOF
    70867094 rm -f conftest.$ac_objext
    70877095-if { (eval echo "$as_me:8137: \"$ac_compile\"") >&5
    7088 +if { (eval echo "$as_me:8482: \"$ac_compile\"") >&5
     7096+if { (eval echo "$as_me:8483: \"$ac_compile\"") >&5
    70897097   (eval $ac_compile) 2>&5
    70907098   ac_status=$?
    70917099-  echo "$as_me:8140: \$? = $ac_status" >&5
    7092 +  echo "$as_me:8485: \$? = $ac_status" >&5
     7100+  echo "$as_me:8486: \$? = $ac_status" >&5
    70937101   (exit $ac_status); } &&
    70947102          { ac_try='test -s conftest.$ac_objext'
    70957103-  { (eval echo "$as_me:8143: \"$ac_try\"") >&5
    7096 +  { (eval echo "$as_me:8488: \"$ac_try\"") >&5
     7104+  { (eval echo "$as_me:8489: \"$ac_try\"") >&5
    70977105   (eval $ac_try) 2>&5
    70987106   ac_status=$?
    70997107-  echo "$as_me:8146: \$? = $ac_status" >&5
    7100 +  echo "$as_me:8491: \$? = $ac_status" >&5
     7108+  echo "$as_me:8492: \$? = $ac_status" >&5
    71017109   (exit $ac_status); }; }; then
    71027110   ac_cv_sys_largefile_source=1; break
    71037111 else
    7104 @@ -8154,7 +8499,7 @@
     7112@@ -8154,7 +8500,7 @@
    71057113   break
    71067114 done
    71077115 fi
    71087116-echo "$as_me:8157: result: $ac_cv_sys_largefile_source" >&5
    7109 +echo "$as_me:8502: result: $ac_cv_sys_largefile_source" >&5
     7117+echo "$as_me:8503: result: $ac_cv_sys_largefile_source" >&5
    71107118 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
    71117119 if test "$ac_cv_sys_largefile_source" != no; then
    71127120 
    7113 @@ -8168,13 +8513,13 @@
     7121@@ -8168,13 +8514,13 @@
    71147122 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
    71157123 # in glibc 2.1.3, but that breaks too many other things.
    71167124 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
    71177125-echo "$as_me:8171: checking for fseeko" >&5
    7118 +echo "$as_me:8516: checking for fseeko" >&5
     7126+echo "$as_me:8517: checking for fseeko" >&5
    71197127 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
    71207128 if test "${ac_cv_func_fseeko+set}" = set; then
     
    71237131   cat >conftest.$ac_ext <<_ACEOF
    71247132-#line 8177 "configure"
    7125 +#line 8522 "configure"
     7133+#line 8523 "configure"
    71267134 #include "confdefs.h"
    71277135 #include <stdio.h>
    71287136 int
    7129 @@ -8186,16 +8531,16 @@
     7137@@ -8186,16 +8532,16 @@
    71307138 }
    71317139 _ACEOF
    71327140 rm -f conftest.$ac_objext conftest$ac_exeext
    71337141-if { (eval echo "$as_me:8189: \"$ac_link\"") >&5
    7134 +if { (eval echo "$as_me:8534: \"$ac_link\"") >&5
     7142+if { (eval echo "$as_me:8535: \"$ac_link\"") >&5
    71357143   (eval $ac_link) 2>&5
    71367144   ac_status=$?
    71377145-  echo "$as_me:8192: \$? = $ac_status" >&5
    7138 +  echo "$as_me:8537: \$? = $ac_status" >&5
     7146+  echo "$as_me:8538: \$? = $ac_status" >&5
    71397147   (exit $ac_status); } &&
    71407148          { ac_try='test -s conftest$ac_exeext'
    71417149-  { (eval echo "$as_me:8195: \"$ac_try\"") >&5
    7142 +  { (eval echo "$as_me:8540: \"$ac_try\"") >&5
     7150+  { (eval echo "$as_me:8541: \"$ac_try\"") >&5
    71437151   (eval $ac_try) 2>&5
    71447152   ac_status=$?
    71457153-  echo "$as_me:8198: \$? = $ac_status" >&5
    7146 +  echo "$as_me:8543: \$? = $ac_status" >&5
     7154+  echo "$as_me:8544: \$? = $ac_status" >&5
    71477155   (exit $ac_status); }; }; then
    71487156   ac_cv_func_fseeko=yes
    71497157 else
    7150 @@ -8205,7 +8550,7 @@
     7158@@ -8205,7 +8551,7 @@
    71517159 fi
    71527160 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    71537161 fi
    71547162-echo "$as_me:8208: result: $ac_cv_func_fseeko" >&5
    7155 +echo "$as_me:8553: result: $ac_cv_func_fseeko" >&5
     7163+echo "$as_me:8554: result: $ac_cv_func_fseeko" >&5
    71567164 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
    71577165 if test $ac_cv_func_fseeko = yes; then
    71587166 
    7159 @@ -8226,14 +8571,14 @@
     7167@@ -8226,14 +8572,14 @@
    71607168        test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
    71617169        test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
    71627170 
    71637171-       echo "$as_me:8229: checking whether to use struct dirent64" >&5
    7164 +       echo "$as_me:8574: checking whether to use struct dirent64" >&5
     7172+       echo "$as_me:8575: checking whether to use struct dirent64" >&5
    71657173 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
    71667174 if test "${cf_cv_struct_dirent64+set}" = set; then
     
    71707178                cat >conftest.$ac_ext <<_ACEOF
    71717179-#line 8236 "configure"
    7172 +#line 8581 "configure"
     7180+#line 8582 "configure"
    71737181 #include "confdefs.h"
    71747182 
    71757183 #include <sys/types.h>
    7176 @@ -8254,16 +8599,16 @@
     7184@@ -8254,16 +8600,16 @@
    71777185 }
    71787186 _ACEOF
    71797187 rm -f conftest.$ac_objext
    71807188-if { (eval echo "$as_me:8257: \"$ac_compile\"") >&5
    7181 +if { (eval echo "$as_me:8602: \"$ac_compile\"") >&5
     7189+if { (eval echo "$as_me:8603: \"$ac_compile\"") >&5
    71827190   (eval $ac_compile) 2>&5
    71837191   ac_status=$?
    71847192-  echo "$as_me:8260: \$? = $ac_status" >&5
    7185 +  echo "$as_me:8605: \$? = $ac_status" >&5
     7193+  echo "$as_me:8606: \$? = $ac_status" >&5
    71867194   (exit $ac_status); } &&
    71877195          { ac_try='test -s conftest.$ac_objext'
    71887196-  { (eval echo "$as_me:8263: \"$ac_try\"") >&5
    7189 +  { (eval echo "$as_me:8608: \"$ac_try\"") >&5
     7197+  { (eval echo "$as_me:8609: \"$ac_try\"") >&5
    71907198   (eval $ac_try) 2>&5
    71917199   ac_status=$?
    71927200-  echo "$as_me:8266: \$? = $ac_status" >&5
    7193 +  echo "$as_me:8611: \$? = $ac_status" >&5
     7201+  echo "$as_me:8612: \$? = $ac_status" >&5
    71947202   (exit $ac_status); }; }; then
    71957203   cf_cv_struct_dirent64=yes
    71967204 else
    7197 @@ -8274,7 +8619,7 @@
     7205@@ -8274,7 +8620,7 @@
    71987206 rm -f conftest.$ac_objext conftest.$ac_ext
    71997207 
    72007208 fi
    72017209-echo "$as_me:8277: result: $cf_cv_struct_dirent64" >&5
    7202 +echo "$as_me:8622: result: $cf_cv_struct_dirent64" >&5
     7210+echo "$as_me:8623: result: $cf_cv_struct_dirent64" >&5
    72037211 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
    72047212        test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF
    72057213 #define HAVE_STRUCT_DIRENT64 1
    7206 @@ -8283,7 +8628,7 @@
     7214@@ -8283,7 +8629,7 @@
    72077215     fi
    72087216 
    72097217 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
    72107218-echo "$as_me:8286: checking if you want tparm not to use X/Open fixed-parameter list" >&5
    7211 +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
    72127220 echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6
    72137221 
    72147222 # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given.
    7215 @@ -8293,14 +8638,14 @@
     7223@@ -8293,14 +8639,14 @@
    72167224 else
    72177225   with_tparm_varargs=yes
    72187226 fi;
    72197227-echo "$as_me:8296: result: $with_tparm_varargs" >&5
    7220 +echo "$as_me:8641: result: $with_tparm_varargs" >&5
     7228+echo "$as_me:8642: result: $with_tparm_varargs" >&5
    72217229 echo "${ECHO_T}$with_tparm_varargs" >&6
    72227230 NCURSES_TPARM_VARARGS=0
     
    72267234 if test "$with_ticlib" != no ; then
    72277235-echo "$as_me:8303: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
    7228 +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
    72297237 echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6
    72307238 
    72317239 # Check whether --enable-tic-depends or --disable-tic-depends was given.
    7232 @@ -8310,14 +8655,14 @@
     7240@@ -8310,14 +8656,14 @@
    72337241 else
    72347242   with_tic_depends=yes
    72357243 fi;
    72367244-echo "$as_me:8313: result: $with_tic_depends" >&5
    7237 +echo "$as_me:8658: result: $with_tic_depends" >&5
     7245+echo "$as_me:8659: result: $with_tic_depends" >&5
    72387246 echo "${ECHO_T}$with_tic_depends" >&6
    72397247 else
     
    72437251 ###   use option --with-bool to override bool's type
    72447252-echo "$as_me:8320: checking for type of bool" >&5
    7245 +echo "$as_me:8665: checking for type of bool" >&5
     7253+echo "$as_me:8666: checking for type of bool" >&5
    72467254 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
    72477255 
    72487256 # Check whether --with-bool or --without-bool was given.
    7249 @@ -8327,10 +8672,10 @@
     7257@@ -8327,10 +8673,10 @@
    72507258 else
    72517259   NCURSES_BOOL=auto
    72527260 fi;
    72537261-echo "$as_me:8330: result: $NCURSES_BOOL" >&5
    7254 +echo "$as_me:8675: result: $NCURSES_BOOL" >&5
     7262+echo "$as_me:8676: result: $NCURSES_BOOL" >&5
    72557263 echo "${ECHO_T}$NCURSES_BOOL" >&6
    72567264 
    72577265-echo "$as_me:8333: checking for alternate terminal capabilities file" >&5
    7258 +echo "$as_me:8678: checking for alternate terminal capabilities file" >&5
     7266+echo "$as_me:8679: checking for alternate terminal capabilities file" >&5
    72597267 echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
    72607268 
    72617269 # Check whether --with-caps or --without-caps was given.
    7262 @@ -8341,11 +8686,11 @@
     7270@@ -8341,11 +8687,11 @@
    72637271   TERMINFO_CAPS=Caps
    72647272 fi;
    72657273 test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
    72667274-echo "$as_me:8344: result: $TERMINFO_CAPS" >&5
    7267 +echo "$as_me:8689: result: $TERMINFO_CAPS" >&5
     7275+echo "$as_me:8690: result: $TERMINFO_CAPS" >&5
    72687276 echo "${ECHO_T}$TERMINFO_CAPS" >&6
    72697277 
    72707278 ###   use option --with-chtype to override chtype's type
    72717279-echo "$as_me:8348: checking for type of chtype" >&5
    7272 +echo "$as_me:8693: checking for type of chtype" >&5
     7280+echo "$as_me:8694: checking for type of chtype" >&5
    72737281 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
    72747282 
    72757283 # Check whether --with-chtype or --without-chtype was given.
    7276 @@ -8355,11 +8700,11 @@
     7284@@ -8355,11 +8701,11 @@
    72777285 else
    72787286   NCURSES_CHTYPE=auto
    72797287 fi;
    72807288-echo "$as_me:8358: result: $NCURSES_CHTYPE" >&5
    7281 +echo "$as_me:8703: result: $NCURSES_CHTYPE" >&5
     7289+echo "$as_me:8704: result: $NCURSES_CHTYPE" >&5
    72827290 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
    72837291 
    72847292 ###   use option --with-ospeed to override ospeed's type
    72857293-echo "$as_me:8362: checking for type of ospeed" >&5
    7286 +echo "$as_me:8707: checking for type of ospeed" >&5
     7294+echo "$as_me:8708: checking for type of ospeed" >&5
    72877295 echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
    72887296 
    72897297 # Check whether --with-ospeed or --without-ospeed was given.
    7290 @@ -8369,11 +8714,11 @@
     7298@@ -8369,11 +8715,11 @@
    72917299 else
    72927300   NCURSES_OSPEED=short
    72937301 fi;
    72947302-echo "$as_me:8372: result: $NCURSES_OSPEED" >&5
    7295 +echo "$as_me:8717: result: $NCURSES_OSPEED" >&5
     7303+echo "$as_me:8718: result: $NCURSES_OSPEED" >&5
    72967304 echo "${ECHO_T}$NCURSES_OSPEED" >&6
    72977305 
    72987306 ###   use option --with-mmask-t to override mmask_t's type
    72997307-echo "$as_me:8376: checking for type of mmask_t" >&5
    7300 +echo "$as_me:8721: checking for type of mmask_t" >&5
     7308+echo "$as_me:8722: checking for type of mmask_t" >&5
    73017309 echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
    73027310 
    73037311 # Check whether --with-mmask-t or --without-mmask-t was given.
    7304 @@ -8383,11 +8728,11 @@
     7312@@ -8383,11 +8729,11 @@
    73057313 else
    73067314   NCURSES_MMASK_T=auto
    73077315 fi;
    73087316-echo "$as_me:8386: result: $NCURSES_MMASK_T" >&5
    7309 +echo "$as_me:8731: result: $NCURSES_MMASK_T" >&5
     7317+echo "$as_me:8732: result: $NCURSES_MMASK_T" >&5
    73107318 echo "${ECHO_T}$NCURSES_MMASK_T" >&6
    73117319 
    73127320 ### Enable compiling-in rcs id's
    73137321-echo "$as_me:8390: checking if RCS identifiers should be compiled-in" >&5
    7314 +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
    73157323 echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
    73167324 
    73177325 # Check whether --with-rcs-ids or --without-rcs-ids was given.
    7318 @@ -8397,7 +8742,7 @@
     7326@@ -8397,7 +8743,7 @@
    73197327 else
    73207328   with_rcs_ids=no
    73217329 fi;
    73227330-echo "$as_me:8400: result: $with_rcs_ids" >&5
    7323 +echo "$as_me:8745: result: $with_rcs_ids" >&5
     7331+echo "$as_me:8746: result: $with_rcs_ids" >&5
    73247332 echo "${ECHO_T}$with_rcs_ids" >&6
    73257333 test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF
    73267334 #define USE_RCS_IDS 1
    7327 @@ -8405,7 +8750,7 @@
     7335@@ -8405,7 +8751,7 @@
    73287336 
    73297337 ###############################################################################
    73307338 
    73317339-echo "$as_me:8408: checking format of man-pages" >&5
    7332 +echo "$as_me:8753: checking format of man-pages" >&5
     7340+echo "$as_me:8754: checking format of man-pages" >&5
    73337341 echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
    73347342 
    73357343 # Check whether --with-manpage-format or --without-manpage-format was given.
    7336 @@ -8433,7 +8778,7 @@
     7344@@ -8433,7 +8779,7 @@
    73377345   cf_catonly=yes
    73387346   cf_example=date
     
    73437351     test -z "$cf_dir" && cf_dir=/usr/man
    73447352     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
    7345 @@ -8494,14 +8839,14 @@
     7353@@ -8494,14 +8840,14 @@
    73467354   ;;
    73477355 esac
    73487356 
    73497357-echo "$as_me:8497: result: $MANPAGE_FORMAT" >&5
    7350 +echo "$as_me:8842: result: $MANPAGE_FORMAT" >&5
     7358+echo "$as_me:8843: result: $MANPAGE_FORMAT" >&5
    73517359 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
    73527360 if test -n "$cf_unknown" ; then
    73537361-  { echo "$as_me:8500: WARNING: Unexpected manpage-format $cf_unknown" >&5
    7354 +  { echo "$as_me:8845: WARNING: Unexpected manpage-format $cf_unknown" >&5
     7362+  { echo "$as_me:8846: WARNING: Unexpected manpage-format $cf_unknown" >&5
    73557363 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
    73567364 fi
    73577365 
    73587366-echo "$as_me:8504: checking for manpage renaming" >&5
    7359 +echo "$as_me:8849: checking for manpage renaming" >&5
     7367+echo "$as_me:8850: checking for manpage renaming" >&5
    73607368 echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
    73617369 
    73627370 # Check whether --with-manpage-renames or --without-manpage-renames was given.
    7363 @@ -8529,7 +8874,7 @@
     7371@@ -8529,7 +8875,7 @@
    73647372   if test -f $srcdir/man/$MANPAGE_RENAMES ; then
    73657373     MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
    73667374   elif test ! -f $MANPAGE_RENAMES ; then
    73677375-    { { echo "$as_me:8532: error: not a filename: $MANPAGE_RENAMES" >&5
    7368 +    { { echo "$as_me:8877: error: not a filename: $MANPAGE_RENAMES" >&5
     7376+    { { echo "$as_me:8878: error: not a filename: $MANPAGE_RENAMES" >&5
    73697377 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
    73707378    { (exit 1); exit 1; }; }
    73717379   fi
    7372 @@ -8543,10 +8888,10 @@
     7380@@ -8543,10 +8889,10 @@
    73737381   fi
    73747382 fi
    73757383 
    73767384-echo "$as_me:8546: result: $MANPAGE_RENAMES" >&5
    7377 +echo "$as_me:8891: result: $MANPAGE_RENAMES" >&5
     7385+echo "$as_me:8892: result: $MANPAGE_RENAMES" >&5
    73787386 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
    73797387 
    73807388-echo "$as_me:8549: checking if manpage aliases will be installed" >&5
    7381 +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
    73827390 echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
    73837391 
    73847392 # Check whether --with-manpage-aliases or --without-manpage-aliases was given.
    7385 @@ -8557,7 +8902,7 @@
     7393@@ -8557,7 +8903,7 @@
    73867394   MANPAGE_ALIASES=yes
    73877395 fi;
    73887396 
    73897397-echo "$as_me:8560: result: $MANPAGE_ALIASES" >&5
    7390 +echo "$as_me:8905: result: $MANPAGE_ALIASES" >&5
     7398+echo "$as_me:8906: result: $MANPAGE_ALIASES" >&5
    73917399 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
    73927400 
    73937401 if test "$LN_S" = "ln -s"; then
    7394 @@ -8568,7 +8913,7 @@
     7402@@ -8568,7 +8914,7 @@
    73957403 
    73967404 MANPAGE_SYMLINKS=no
    73977405 if test "$MANPAGE_ALIASES" = yes ; then
    73987406-echo "$as_me:8571: checking if manpage symlinks should be used" >&5
    7399 +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
    74007408 echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
    74017409 
    74027410 # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
    7403 @@ -8581,17 +8926,17 @@
     7411@@ -8581,17 +8927,17 @@
    74047412 
    74057413 if test "$$cf_use_symlinks" = no; then
    74067414 if test "$MANPAGE_SYMLINKS" = yes ; then
    74077415-       { echo "$as_me:8584: WARNING: cannot make symlinks" >&5
    7408 +       { echo "$as_me:8929: WARNING: cannot make symlinks" >&5
     7416+       { echo "$as_me:8930: WARNING: cannot make symlinks" >&5
    74097417 echo "$as_me: WARNING: cannot make symlinks" >&2;}
    74107418        MANPAGE_SYMLINKS=no
     
    74137421 
    74147422-echo "$as_me:8590: result: $MANPAGE_SYMLINKS" >&5
    7415 +echo "$as_me:8935: result: $MANPAGE_SYMLINKS" >&5
     7423+echo "$as_me:8936: result: $MANPAGE_SYMLINKS" >&5
    74167424 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
    74177425 fi
    74187426 
    74197427-echo "$as_me:8594: checking for manpage tbl" >&5
    7420 +echo "$as_me:8939: checking for manpage tbl" >&5
     7428+echo "$as_me:8940: checking for manpage tbl" >&5
    74217429 echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
    74227430 
    74237431 # Check whether --with-manpage-tbl or --without-manpage-tbl was given.
    7424 @@ -8602,7 +8947,7 @@
     7432@@ -8602,7 +8948,7 @@
    74257433   MANPAGE_TBL=no
    74267434 fi;
    74277435 
    74287436-echo "$as_me:8605: result: $MANPAGE_TBL" >&5
    7429 +echo "$as_me:8950: result: $MANPAGE_TBL" >&5
     7437+echo "$as_me:8951: result: $MANPAGE_TBL" >&5
    74307438 echo "${ECHO_T}$MANPAGE_TBL" >&6
    74317439 
    74327440   if test "$prefix" = "NONE" ; then
    7433 @@ -8718,7 +9063,7 @@
     7441@@ -8718,7 +9064,7 @@
    74347442                s,@NCURSES_OSPEED@,\$NCURSES_OSPEED,g
    74357443 CF_EOF
     
    74407448                cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
    74417449                cf_name=`echo $cf_name|sed "$program_transform_name"`
    7442 @@ -8913,7 +9258,7 @@
     7450@@ -8913,7 +9259,7 @@
    74437451 ###############################################################################
    74447452 
    74457453 ### Note that some functions (such as const) are normally disabled anyway.
    74467454-echo "$as_me:8916: checking if you want to build with function extensions" >&5
    7447 +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
    74487456 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
    74497457 
    74507458 # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
    7451 @@ -8923,7 +9268,7 @@
     7459@@ -8923,7 +9269,7 @@
    74527460 else
    74537461   with_ext_funcs=yes
    74547462 fi;
    74557463-echo "$as_me:8926: result: $with_ext_funcs" >&5
    7456 +echo "$as_me:9271: result: $with_ext_funcs" >&5
     7464+echo "$as_me:9272: result: $with_ext_funcs" >&5
    74577465 echo "${ECHO_T}$with_ext_funcs" >&6
    74587466 if test "$with_ext_funcs" = yes ; then
    74597467        NCURSES_EXT_FUNCS=1
    7460 @@ -8955,12 +9300,14 @@
     7468@@ -8955,12 +9301,38 @@
    74617469 #define NCURSES_EXT_FUNCS 1
    74627470 EOF
     
    74667474        NCURSES_EXT_FUNCS=0
    74677475+       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=
    74687500 fi
    74697501 
    74707502 ###   use option --enable-const to turn on use of const beyond that in XSI.
    74717503-echo "$as_me:8963: checking for extended use of const keyword" >&5
    7472 +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
    74737505 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
    74747506 
    74757507 # Check whether --enable-const or --disable-const was given.
    7476 @@ -8970,7 +9317,7 @@
     7508@@ -8970,7 +9342,7 @@
    74777509 else
    74787510   with_ext_const=no
    74797511 fi;
    74807512-echo "$as_me:8973: result: $with_ext_const" >&5
    7481 +echo "$as_me:9320: result: $with_ext_const" >&5
     7513+echo "$as_me:9345: result: $with_ext_const" >&5
    74827514 echo "${ECHO_T}$with_ext_const" >&6
    74837515 NCURSES_CONST='/*nothing*/'
    74847516 if test "$with_ext_const" = yes ; then
    7485 @@ -8978,7 +9325,7 @@
     7517@@ -8978,7 +9350,7 @@
    74867518 fi
    74877519 
    74887520 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
    74897521-echo "$as_me:8981: checking if you want to use extended colors" >&5
    7490 +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
    74917523 echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6
    74927524 
    74937525 # Check whether --enable-ext-colors or --disable-ext-colors was given.
    7494 @@ -8988,12 +9335,12 @@
     7526@@ -8988,12 +9360,12 @@
    74957527 else
    74967528   with_ext_colors=no
    74977529 fi;
    74987530-echo "$as_me:8991: result: $with_ext_colors" >&5
    7499 +echo "$as_me:9338: result: $with_ext_colors" >&5
     7531+echo "$as_me:9363: result: $with_ext_colors" >&5
    75007532 echo "${ECHO_T}$with_ext_colors" >&6
    75017533 NCURSES_EXT_COLORS=0
     
    75037535        if test "$with_widec" != yes ; then
    75047536-               { { echo "$as_me:8996: error: This option applies only to wide-character library" >&5
    7505 +               { { 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
    75067538 echo "$as_me: error: This option applies only to wide-character library" >&2;}
    75077539    { (exit 1); exit 1; }; }
    75087540        else
    7509 @@ -9004,7 +9351,7 @@
     7541@@ -9004,7 +9376,7 @@
    75107542        5.*)
    75117543                cf_cv_rel_version=6.0
    75127544                cf_cv_abi_version=6
    75137545-               { echo "$as_me:9007: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
    7514 +               { 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
    75157547 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
    75167548                ;;
    75177549        esac
    7518 @@ -9019,7 +9366,7 @@
     7550@@ -9019,7 +9391,7 @@
    75197551 fi
    75207552 
    75217553 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
    75227554-echo "$as_me:9022: checking if you want to use extended mouse encoding" >&5
    7523 +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
    75247556 echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6
    75257557 
    75267558 # Check whether --enable-ext-mouse or --disable-ext-mouse was given.
    7527 @@ -9029,7 +9376,7 @@
     7559@@ -9029,7 +9401,7 @@
    75287560 else
    75297561   with_ext_mouse=no
    75307562 fi;
    75317563-echo "$as_me:9032: result: $with_ext_mouse" >&5
    7532 +echo "$as_me:9379: result: $with_ext_mouse" >&5
     7564+echo "$as_me:9404: result: $with_ext_mouse" >&5
    75337565 echo "${ECHO_T}$with_ext_mouse" >&6
    75347566 NCURSES_MOUSE_VERSION=1
    75357567 if test "$with_ext_mouse" = yes ; then
    7536 @@ -9040,7 +9387,7 @@
     7568@@ -9040,7 +9412,7 @@
    75377569        5.*)
    75387570                cf_cv_rel_version=6.0
    75397571                cf_cv_abi_version=6
    75407572-               { echo "$as_me:9043: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
    7541 +               { 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
    75427574 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
    75437575                ;;
    75447576        esac
    7545 @@ -9048,7 +9395,7 @@
     7577@@ -9048,7 +9420,7 @@
    75467578 
    75477579 fi
    75487580 
    75497581-echo "$as_me:9051: checking if you want \$NCURSES_NO_PADDING code" >&5
    7550 +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
    75517583 echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
    75527584 
    75537585 # Check whether --enable-no-padding or --disable-no-padding was given.
    7554 @@ -9058,19 +9405,19 @@
     7586@@ -9058,19 +9430,19 @@
    75557587 else
    75567588   with_no_padding=$with_ext_funcs
    75577589 fi;
    75587590-echo "$as_me:9061: result: $with_no_padding" >&5
    7559 +echo "$as_me:9408: result: $with_no_padding" >&5
     7591+echo "$as_me:9433: result: $with_no_padding" >&5
    75607592 echo "${ECHO_T}$with_no_padding" >&6
    75617593 test "$with_no_padding" = yes && cat >>confdefs.h <<\EOF
     
    75647596 
    75657597-echo "$as_me:9067: checking for ANSI C header files" >&5
    7566 +echo "$as_me:9414: checking for ANSI C header files" >&5
     7598+echo "$as_me:9439: checking for ANSI C header files" >&5
    75677599 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
    75687600 if test "${ac_cv_header_stdc+set}" = set; then
     
    75717603   cat >conftest.$ac_ext <<_ACEOF
    75727604-#line 9073 "configure"
    7573 +#line 9420 "configure"
     7605+#line 9445 "configure"
    75747606 #include "confdefs.h"
    75757607 #include <stdlib.h>
    75767608 #include <stdarg.h>
    7577 @@ -9078,13 +9425,13 @@
     7609@@ -9078,13 +9450,13 @@
    75787610 #include <float.h>
    75797611 
    75807612 _ACEOF
    75817613-if { (eval echo "$as_me:9081: \"$ac_cpp conftest.$ac_ext\"") >&5
    7582 +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
    75837615   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    75847616   ac_status=$?
     
    75877619   cat conftest.err >&5
    75887620-  echo "$as_me:9087: \$? = $ac_status" >&5
    7589 +  echo "$as_me:9434: \$? = $ac_status" >&5
     7621+  echo "$as_me:9459: \$? = $ac_status" >&5
    75907622   (exit $ac_status); } >/dev/null; then
    75917623   if test -s conftest.err; then
    75927624     ac_cpp_err=$ac_c_preproc_warn_flag
    7593 @@ -9106,7 +9453,7 @@
     7625@@ -9106,7 +9478,7 @@
    75947626 if test $ac_cv_header_stdc = yes; then
    75957627   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    75967628   cat >conftest.$ac_ext <<_ACEOF
    75977629-#line 9109 "configure"
    7598 +#line 9456 "configure"
     7630+#line 9481 "configure"
    75997631 #include "confdefs.h"
    76007632 #include <string.h>
    76017633 
    7602 @@ -9124,7 +9471,7 @@
     7634@@ -9124,7 +9496,7 @@
    76037635 if test $ac_cv_header_stdc = yes; then
    76047636   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    76057637   cat >conftest.$ac_ext <<_ACEOF
    76067638-#line 9127 "configure"
    7607 +#line 9474 "configure"
     7639+#line 9499 "configure"
    76087640 #include "confdefs.h"
    76097641 #include <stdlib.h>
    76107642 
    7611 @@ -9145,7 +9492,7 @@
     7643@@ -9145,7 +9517,7 @@
    76127644   :
    76137645 else
    76147646   cat >conftest.$ac_ext <<_ACEOF
    76157647-#line 9148 "configure"
    7616 +#line 9495 "configure"
     7648+#line 9520 "configure"
    76177649 #include "confdefs.h"
    76187650 #include <ctype.h>
    76197651 #if ((' ' & 0x0FF) == 0x020)
    7620 @@ -9171,15 +9518,15 @@
     7652@@ -9171,15 +9543,15 @@
    76217653 }
    76227654 _ACEOF
    76237655 rm -f conftest$ac_exeext
    76247656-if { (eval echo "$as_me:9174: \"$ac_link\"") >&5
    7625 +if { (eval echo "$as_me:9521: \"$ac_link\"") >&5
     7657+if { (eval echo "$as_me:9546: \"$ac_link\"") >&5
    76267658   (eval $ac_link) 2>&5
    76277659   ac_status=$?
    76287660-  echo "$as_me:9177: \$? = $ac_status" >&5
    7629 +  echo "$as_me:9524: \$? = $ac_status" >&5
     7661+  echo "$as_me:9549: \$? = $ac_status" >&5
    76307662   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    76317663-  { (eval echo "$as_me:9179: \"$ac_try\"") >&5
    7632 +  { (eval echo "$as_me:9526: \"$ac_try\"") >&5
     7664+  { (eval echo "$as_me:9551: \"$ac_try\"") >&5
    76337665   (eval $ac_try) 2>&5
    76347666   ac_status=$?
    76357667-  echo "$as_me:9182: \$? = $ac_status" >&5
    7636 +  echo "$as_me:9529: \$? = $ac_status" >&5
     7668+  echo "$as_me:9554: \$? = $ac_status" >&5
    76377669   (exit $ac_status); }; }; then
    76387670   :
    76397671 else
    7640 @@ -9192,7 +9539,7 @@
     7672@@ -9192,7 +9564,7 @@
    76417673 fi
    76427674 fi
    76437675 fi
    76447676-echo "$as_me:9195: result: $ac_cv_header_stdc" >&5
    7645 +echo "$as_me:9542: result: $ac_cv_header_stdc" >&5
     7677+echo "$as_me:9567: result: $ac_cv_header_stdc" >&5
    76467678 echo "${ECHO_T}$ac_cv_header_stdc" >&6
    76477679 if test $ac_cv_header_stdc = yes; then
    76487680 
    7649 @@ -9208,28 +9555,28 @@
     7681@@ -9208,28 +9580,28 @@
    76507682                   inttypes.h stdint.h unistd.h
    76517683 do
    76527684 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    76537685-echo "$as_me:9211: checking for $ac_header" >&5
    7654 +echo "$as_me:9558: checking for $ac_header" >&5
     7686+echo "$as_me:9583: checking for $ac_header" >&5
    76557687 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
    76567688 if eval "test \"\${$as_ac_Header+set}\" = set"; then
     
    76597691   cat >conftest.$ac_ext <<_ACEOF
    76607692-#line 9217 "configure"
    7661 +#line 9564 "configure"
     7693+#line 9589 "configure"
    76627694 #include "confdefs.h"
    76637695 $ac_includes_default
     
    76667698 rm -f conftest.$ac_objext
    76677699-if { (eval echo "$as_me:9223: \"$ac_compile\"") >&5
    7668 +if { (eval echo "$as_me:9570: \"$ac_compile\"") >&5
     7700+if { (eval echo "$as_me:9595: \"$ac_compile\"") >&5
    76697701   (eval $ac_compile) 2>&5
    76707702   ac_status=$?
    76717703-  echo "$as_me:9226: \$? = $ac_status" >&5
    7672 +  echo "$as_me:9573: \$? = $ac_status" >&5
     7704+  echo "$as_me:9598: \$? = $ac_status" >&5
    76737705   (exit $ac_status); } &&
    76747706          { ac_try='test -s conftest.$ac_objext'
    76757707-  { (eval echo "$as_me:9229: \"$ac_try\"") >&5
    7676 +  { (eval echo "$as_me:9576: \"$ac_try\"") >&5
     7708+  { (eval echo "$as_me:9601: \"$ac_try\"") >&5
    76777709   (eval $ac_try) 2>&5
    76787710   ac_status=$?
    76797711-  echo "$as_me:9232: \$? = $ac_status" >&5
    7680 +  echo "$as_me:9579: \$? = $ac_status" >&5
     7712+  echo "$as_me:9604: \$? = $ac_status" >&5
    76817713   (exit $ac_status); }; }; then
    76827714   eval "$as_ac_Header=yes"
    76837715 else
    7684 @@ -9239,7 +9586,7 @@
     7716@@ -9239,7 +9611,7 @@
    76857717 fi
    76867718 rm -f conftest.$ac_objext conftest.$ac_ext
    76877719 fi
    76887720-echo "$as_me:9242: result: `eval echo '${'$as_ac_Header'}'`" >&5
    7689 +echo "$as_me:9589: result: `eval echo '${'$as_ac_Header'}'`" >&5
     7721+echo "$as_me:9614: result: `eval echo '${'$as_ac_Header'}'`" >&5
    76907722 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    76917723 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    76927724   cat >>confdefs.h <<EOF
    7693 @@ -9249,13 +9596,13 @@
     7725@@ -9249,13 +9621,13 @@
    76947726 fi
    76957727 done
    76967728 
    76977729-echo "$as_me:9252: checking for signed char" >&5
    7698 +echo "$as_me:9599: checking for signed char" >&5
     7730+echo "$as_me:9624: checking for signed char" >&5
    76997731 echo $ECHO_N "checking for signed char... $ECHO_C" >&6
    77007732 if test "${ac_cv_type_signed_char+set}" = set; then
     
    77037735   cat >conftest.$ac_ext <<_ACEOF
    77047736-#line 9258 "configure"
    7705 +#line 9605 "configure"
     7737+#line 9630 "configure"
    77067738 #include "confdefs.h"
    77077739 $ac_includes_default
    77087740 int
    7709 @@ -9270,16 +9617,16 @@
     7741@@ -9270,16 +9642,16 @@
    77107742 }
    77117743 _ACEOF
    77127744 rm -f conftest.$ac_objext
    77137745-if { (eval echo "$as_me:9273: \"$ac_compile\"") >&5
    7714 +if { (eval echo "$as_me:9620: \"$ac_compile\"") >&5
     7746+if { (eval echo "$as_me:9645: \"$ac_compile\"") >&5
    77157747   (eval $ac_compile) 2>&5
    77167748   ac_status=$?
    77177749-  echo "$as_me:9276: \$? = $ac_status" >&5
    7718 +  echo "$as_me:9623: \$? = $ac_status" >&5
     7750+  echo "$as_me:9648: \$? = $ac_status" >&5
    77197751   (exit $ac_status); } &&
    77207752          { ac_try='test -s conftest.$ac_objext'
    77217753-  { (eval echo "$as_me:9279: \"$ac_try\"") >&5
    7722 +  { (eval echo "$as_me:9626: \"$ac_try\"") >&5
     7754+  { (eval echo "$as_me:9651: \"$ac_try\"") >&5
    77237755   (eval $ac_try) 2>&5
    77247756   ac_status=$?
    77257757-  echo "$as_me:9282: \$? = $ac_status" >&5
    7726 +  echo "$as_me:9629: \$? = $ac_status" >&5
     7758+  echo "$as_me:9654: \$? = $ac_status" >&5
    77277759   (exit $ac_status); }; }; then
    77287760   ac_cv_type_signed_char=yes
    77297761 else
    7730 @@ -9289,10 +9636,10 @@
     7762@@ -9289,10 +9661,10 @@
    77317763 fi
    77327764 rm -f conftest.$ac_objext conftest.$ac_ext
    77337765 fi
    77347766-echo "$as_me:9292: result: $ac_cv_type_signed_char" >&5
    7735 +echo "$as_me:9639: result: $ac_cv_type_signed_char" >&5
     7767+echo "$as_me:9664: result: $ac_cv_type_signed_char" >&5
    77367768 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
    77377769 
    77387770-echo "$as_me:9295: checking size of signed char" >&5
    7739 +echo "$as_me:9642: checking size of signed char" >&5
     7771+echo "$as_me:9667: checking size of signed char" >&5
    77407772 echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
    77417773 if test "${ac_cv_sizeof_signed_char+set}" = set; then
    77427774   echo $ECHO_N "(cached) $ECHO_C" >&6
    7743 @@ -9301,7 +9648,7 @@
     7775@@ -9301,7 +9673,7 @@
    77447776   if test "$cross_compiling" = yes; then
    77457777   # Depending upon the size, compute the lo and hi bounds.
    77467778 cat >conftest.$ac_ext <<_ACEOF
    77477779-#line 9304 "configure"
    7748 +#line 9651 "configure"
     7780+#line 9676 "configure"
    77497781 #include "confdefs.h"
    77507782 $ac_includes_default
    77517783 int
    7752 @@ -9313,21 +9660,21 @@
     7784@@ -9313,21 +9685,21 @@
    77537785 }
    77547786 _ACEOF
    77557787 rm -f conftest.$ac_objext
    77567788-if { (eval echo "$as_me:9316: \"$ac_compile\"") >&5
    7757 +if { (eval echo "$as_me:9663: \"$ac_compile\"") >&5
     7789+if { (eval echo "$as_me:9688: \"$ac_compile\"") >&5
    77587790   (eval $ac_compile) 2>&5
    77597791   ac_status=$?
    77607792-  echo "$as_me:9319: \$? = $ac_status" >&5
    7761 +  echo "$as_me:9666: \$? = $ac_status" >&5
     7793+  echo "$as_me:9691: \$? = $ac_status" >&5
    77627794   (exit $ac_status); } &&
    77637795          { ac_try='test -s conftest.$ac_objext'
    77647796-  { (eval echo "$as_me:9322: \"$ac_try\"") >&5
    7765 +  { (eval echo "$as_me:9669: \"$ac_try\"") >&5
     7797+  { (eval echo "$as_me:9694: \"$ac_try\"") >&5
    77667798   (eval $ac_try) 2>&5
    77677799   ac_status=$?
    77687800-  echo "$as_me:9325: \$? = $ac_status" >&5
    7769 +  echo "$as_me:9672: \$? = $ac_status" >&5
     7801+  echo "$as_me:9697: \$? = $ac_status" >&5
    77707802   (exit $ac_status); }; }; then
    77717803   ac_lo=0 ac_mid=0
     
    77737805     cat >conftest.$ac_ext <<_ACEOF
    77747806-#line 9330 "configure"
    7775 +#line 9677 "configure"
     7807+#line 9702 "configure"
    77767808 #include "confdefs.h"
    77777809 $ac_includes_default
    77787810 int
    7779 @@ -9339,16 +9686,16 @@
     7811@@ -9339,16 +9711,16 @@
    77807812 }
    77817813 _ACEOF
    77827814 rm -f conftest.$ac_objext
    77837815-if { (eval echo "$as_me:9342: \"$ac_compile\"") >&5
    7784 +if { (eval echo "$as_me:9689: \"$ac_compile\"") >&5
     7816+if { (eval echo "$as_me:9714: \"$ac_compile\"") >&5
    77857817   (eval $ac_compile) 2>&5
    77867818   ac_status=$?
    77877819-  echo "$as_me:9345: \$? = $ac_status" >&5
    7788 +  echo "$as_me:9692: \$? = $ac_status" >&5
     7820+  echo "$as_me:9717: \$? = $ac_status" >&5
    77897821   (exit $ac_status); } &&
    77907822          { ac_try='test -s conftest.$ac_objext'
    77917823-  { (eval echo "$as_me:9348: \"$ac_try\"") >&5
    7792 +  { (eval echo "$as_me:9695: \"$ac_try\"") >&5
     7824+  { (eval echo "$as_me:9720: \"$ac_try\"") >&5
    77937825   (eval $ac_try) 2>&5
    77947826   ac_status=$?
    77957827-  echo "$as_me:9351: \$? = $ac_status" >&5
    7796 +  echo "$as_me:9698: \$? = $ac_status" >&5
     7828+  echo "$as_me:9723: \$? = $ac_status" >&5
    77977829   (exit $ac_status); }; }; then
    77987830   ac_hi=$ac_mid; break
    77997831 else
    7800 @@ -9364,7 +9711,7 @@
     7832@@ -9364,7 +9736,7 @@
    78017833 ac_hi=-1 ac_mid=-1
    78027834   while :; do
    78037835     cat >conftest.$ac_ext <<_ACEOF
    78047836-#line 9367 "configure"
    7805 +#line 9714 "configure"
     7837+#line 9739 "configure"
    78067838 #include "confdefs.h"
    78077839 $ac_includes_default
    78087840 int
    7809 @@ -9376,16 +9723,16 @@
     7841@@ -9376,16 +9748,16 @@
    78107842 }
    78117843 _ACEOF
    78127844 rm -f conftest.$ac_objext
    78137845-if { (eval echo "$as_me:9379: \"$ac_compile\"") >&5
    7814 +if { (eval echo "$as_me:9726: \"$ac_compile\"") >&5
     7846+if { (eval echo "$as_me:9751: \"$ac_compile\"") >&5
    78157847   (eval $ac_compile) 2>&5
    78167848   ac_status=$?
    78177849-  echo "$as_me:9382: \$? = $ac_status" >&5
    7818 +  echo "$as_me:9729: \$? = $ac_status" >&5
     7850+  echo "$as_me:9754: \$? = $ac_status" >&5
    78197851   (exit $ac_status); } &&
    78207852          { ac_try='test -s conftest.$ac_objext'
    78217853-  { (eval echo "$as_me:9385: \"$ac_try\"") >&5
    7822 +  { (eval echo "$as_me:9732: \"$ac_try\"") >&5
     7854+  { (eval echo "$as_me:9757: \"$ac_try\"") >&5
    78237855   (eval $ac_try) 2>&5
    78247856   ac_status=$?
    78257857-  echo "$as_me:9388: \$? = $ac_status" >&5
    7826 +  echo "$as_me:9735: \$? = $ac_status" >&5
     7858+  echo "$as_me:9760: \$? = $ac_status" >&5
    78277859   (exit $ac_status); }; }; then
    78287860   ac_lo=$ac_mid; break
    78297861 else
    7830 @@ -9401,7 +9748,7 @@
     7862@@ -9401,7 +9773,7 @@
    78317863 while test "x$ac_lo" != "x$ac_hi"; do
    78327864   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
    78337865   cat >conftest.$ac_ext <<_ACEOF
    78347866-#line 9404 "configure"
    7835 +#line 9751 "configure"
     7867+#line 9776 "configure"
    78367868 #include "confdefs.h"
    78377869 $ac_includes_default
    78387870 int
    7839 @@ -9413,16 +9760,16 @@
     7871@@ -9413,16 +9785,16 @@
    78407872 }
    78417873 _ACEOF
    78427874 rm -f conftest.$ac_objext
    78437875-if { (eval echo "$as_me:9416: \"$ac_compile\"") >&5
    7844 +if { (eval echo "$as_me:9763: \"$ac_compile\"") >&5
     7876+if { (eval echo "$as_me:9788: \"$ac_compile\"") >&5
    78457877   (eval $ac_compile) 2>&5
    78467878   ac_status=$?
    78477879-  echo "$as_me:9419: \$? = $ac_status" >&5
    7848 +  echo "$as_me:9766: \$? = $ac_status" >&5
     7880+  echo "$as_me:9791: \$? = $ac_status" >&5
    78497881   (exit $ac_status); } &&
    78507882          { ac_try='test -s conftest.$ac_objext'
    78517883-  { (eval echo "$as_me:9422: \"$ac_try\"") >&5
    7852 +  { (eval echo "$as_me:9769: \"$ac_try\"") >&5
     7884+  { (eval echo "$as_me:9794: \"$ac_try\"") >&5
    78537885   (eval $ac_try) 2>&5
    78547886   ac_status=$?
    78557887-  echo "$as_me:9425: \$? = $ac_status" >&5
    7856 +  echo "$as_me:9772: \$? = $ac_status" >&5
     7888+  echo "$as_me:9797: \$? = $ac_status" >&5
    78577889   (exit $ac_status); }; }; then
    78587890   ac_hi=$ac_mid
    78597891 else
    7860 @@ -9435,12 +9782,12 @@
     7892@@ -9435,12 +9807,12 @@
    78617893 ac_cv_sizeof_signed_char=$ac_lo
    78627894 else
    78637895   if test "$cross_compiling" = yes; then
    78647896-  { { echo "$as_me:9438: error: cannot run test program while cross compiling" >&5
    7865 +  { { 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
    78667898 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    78677899    { (exit 1); exit 1; }; }
     
    78697901   cat >conftest.$ac_ext <<_ACEOF
    78707902-#line 9443 "configure"
    7871 +#line 9790 "configure"
     7903+#line 9815 "configure"
    78727904 #include "confdefs.h"
    78737905 $ac_includes_default
    78747906 int
    7875 @@ -9456,15 +9803,15 @@
     7907@@ -9456,15 +9828,15 @@
    78767908 }
    78777909 _ACEOF
    78787910 rm -f conftest$ac_exeext
    78797911-if { (eval echo "$as_me:9459: \"$ac_link\"") >&5
    7880 +if { (eval echo "$as_me:9806: \"$ac_link\"") >&5
     7912+if { (eval echo "$as_me:9831: \"$ac_link\"") >&5
    78817913   (eval $ac_link) 2>&5
    78827914   ac_status=$?
    78837915-  echo "$as_me:9462: \$? = $ac_status" >&5
    7884 +  echo "$as_me:9809: \$? = $ac_status" >&5
     7916+  echo "$as_me:9834: \$? = $ac_status" >&5
    78857917   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    78867918-  { (eval echo "$as_me:9464: \"$ac_try\"") >&5
    7887 +  { (eval echo "$as_me:9811: \"$ac_try\"") >&5
     7919+  { (eval echo "$as_me:9836: \"$ac_try\"") >&5
    78887920   (eval $ac_try) 2>&5
    78897921   ac_status=$?
    78907922-  echo "$as_me:9467: \$? = $ac_status" >&5
    7891 +  echo "$as_me:9814: \$? = $ac_status" >&5
     7923+  echo "$as_me:9839: \$? = $ac_status" >&5
    78927924   (exit $ac_status); }; }; then
    78937925   ac_cv_sizeof_signed_char=`cat conftest.val`
    78947926 else
    7895 @@ -9480,7 +9827,7 @@
     7927@@ -9480,7 +9852,7 @@
    78967928   ac_cv_sizeof_signed_char=0
    78977929 fi
    78987930 fi
    78997931-echo "$as_me:9483: result: $ac_cv_sizeof_signed_char" >&5
    7900 +echo "$as_me:9830: result: $ac_cv_sizeof_signed_char" >&5
     7932+echo "$as_me:9855: result: $ac_cv_sizeof_signed_char" >&5
    79017933 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
    79027934 cat >>confdefs.h <<EOF
    79037935 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
    7904 @@ -9491,7 +9838,7 @@
     7936@@ -9491,7 +9863,7 @@
    79057937 else
    79067938        NCURSES_SBOOL="char"
    79077939 fi
    79087940-echo "$as_me:9494: checking if you want to use signed Boolean array in term.h" >&5
    7909 +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
    79107942 echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
    79117943 
    79127944 # Check whether --enable-signed-char or --disable-signed-char was given.
    7913 @@ -9501,12 +9848,12 @@
     7945@@ -9501,12 +9873,12 @@
    79147946 else
    79157947   with_signed_char=no
    79167948 fi;
    79177949-echo "$as_me:9504: result: $with_signed_char" >&5
    7918 +echo "$as_me:9851: result: $with_signed_char" >&5
     7950+echo "$as_me:9876: result: $with_signed_char" >&5
    79197951 echo "${ECHO_T}$with_signed_char" >&6
    79207952 test "$with_signed_char" != yes && NCURSES_SBOOL="char"
     
    79227954 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
    79237955-echo "$as_me:9509: checking if you want SIGWINCH handler" >&5
    7924 +echo "$as_me:9856: checking if you want SIGWINCH handler" >&5
     7956+echo "$as_me:9881: checking if you want SIGWINCH handler" >&5
    79257957 echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
    79267958 
    79277959 # Check whether --enable-sigwinch or --disable-sigwinch was given.
    7928 @@ -9516,14 +9863,14 @@
     7960@@ -9516,14 +9888,14 @@
    79297961 else
    79307962   with_sigwinch=$with_ext_funcs
    79317963 fi;
    79327964-echo "$as_me:9519: result: $with_sigwinch" >&5
    7933 +echo "$as_me:9866: result: $with_sigwinch" >&5
     7965+echo "$as_me:9891: result: $with_sigwinch" >&5
    79347966 echo "${ECHO_T}$with_sigwinch" >&6
    79357967 test "$with_sigwinch" = yes && cat >>confdefs.h <<\EOF
     
    79397971 ###   use option --enable-tcap-names to allow user to define new capabilities
    79407972-echo "$as_me:9526: checking if you want user-definable terminal capabilities like termcap" >&5
    7941 +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
    79427974 echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
    79437975 
    79447976 # Check whether --enable-tcap-names or --disable-tcap-names was given.
    7945 @@ -9533,7 +9880,7 @@
     7977@@ -9533,7 +9905,7 @@
    79467978 else
    79477979   with_tcap_names=$with_ext_funcs
    79487980 fi;
    79497981-echo "$as_me:9536: result: $with_tcap_names" >&5
    7950 +echo "$as_me:9883: result: $with_tcap_names" >&5
     7982+echo "$as_me:9908: result: $with_tcap_names" >&5
    79517983 echo "${ECHO_T}$with_tcap_names" >&6
    79527984 NCURSES_XNAMES=0
    79537985 test "$with_tcap_names" = yes && NCURSES_XNAMES=1
    7954 @@ -9541,7 +9888,7 @@
     7986@@ -9541,7 +9913,7 @@
    79557987 ###############################################################################
    79567988 # These options are relatively safe to experiment with.
    79577989 
    79587990-echo "$as_me:9544: checking if you want all development code" >&5
    7959 +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
    79607992 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
    79617993 
    79627994 # Check whether --with-develop or --without-develop was given.
    7963 @@ -9551,11 +9898,11 @@
     7995@@ -9551,11 +9923,11 @@
    79647996 else
    79657997   with_develop=no
    79667998 fi;
    79677999-echo "$as_me:9554: result: $with_develop" >&5
    7968 +echo "$as_me:9901: result: $with_develop" >&5
     8000+echo "$as_me:9926: result: $with_develop" >&5
    79698001 echo "${ECHO_T}$with_develop" >&6
    79708002 
    79718003 ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
    79728004-echo "$as_me:9558: checking if you want hard-tabs code" >&5
    7973 +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
    79748006 echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
    79758007 
    79768008 # Check whether --enable-hard-tabs or --disable-hard-tabs was given.
    7977 @@ -9565,14 +9912,14 @@
     8009@@ -9565,14 +9937,14 @@
    79788010 else
    79798011   enable_hard_tabs=$with_develop
    79808012 fi;
    79818013-echo "$as_me:9568: result: $enable_hard_tabs" >&5
    7982 +echo "$as_me:9915: result: $enable_hard_tabs" >&5
     8014+echo "$as_me:9940: result: $enable_hard_tabs" >&5
    79838015 echo "${ECHO_T}$enable_hard_tabs" >&6
    79848016 test "$enable_hard_tabs" = yes && cat >>confdefs.h <<\EOF
     
    79888020 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
    79898021-echo "$as_me:9575: checking if you want limited support for xmc" >&5
    7990 +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
    79918023 echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
    79928024 
    79938025 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
    7994 @@ -9582,7 +9929,7 @@
     8026@@ -9582,7 +9954,7 @@
    79958027 else
    79968028   enable_xmc_glitch=$with_develop
    79978029 fi;
    79988030-echo "$as_me:9585: result: $enable_xmc_glitch" >&5
    7999 +echo "$as_me:9932: result: $enable_xmc_glitch" >&5
     8031+echo "$as_me:9957: result: $enable_xmc_glitch" >&5
    80008032 echo "${ECHO_T}$enable_xmc_glitch" >&6
    80018033 test "$enable_xmc_glitch" = yes && cat >>confdefs.h <<\EOF
    80028034 #define USE_XMC_SUPPORT 1
    8003 @@ -9591,7 +9938,7 @@
     8035@@ -9591,7 +9963,7 @@
    80048036 ###############################################################################
    80058037 # These are just experimental, probably should not be in a package:
    80068038 
    80078039-echo "$as_me:9594: checking if you do not want to assume colors are white-on-black" >&5
    8008 +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
    80098041 echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
    80108042 
    80118043 # Check whether --enable-assumed-color or --disable-assumed-color was given.
    8012 @@ -9601,14 +9948,14 @@
     8044@@ -9601,14 +9973,14 @@
    80138045 else
    80148046   with_assumed_color=yes
    80158047 fi;
    80168048-echo "$as_me:9604: result: $with_assumed_color" >&5
    8017 +echo "$as_me:9951: result: $with_assumed_color" >&5
     8049+echo "$as_me:9976: result: $with_assumed_color" >&5
    80188050 echo "${ECHO_T}$with_assumed_color" >&6
    80198051 test "$with_assumed_color" = yes && cat >>confdefs.h <<\EOF
     
    80238055 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
    80248056-echo "$as_me:9611: checking if you want hashmap scrolling-optimization code" >&5
    8025 +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
    80268058 echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
    80278059 
    80288060 # Check whether --enable-hashmap or --disable-hashmap was given.
    8029 @@ -9618,14 +9965,14 @@
     8061@@ -9618,14 +9990,14 @@
    80308062 else
    80318063   with_hashmap=yes
    80328064 fi;
    80338065-echo "$as_me:9621: result: $with_hashmap" >&5
    8034 +echo "$as_me:9968: result: $with_hashmap" >&5
     8066+echo "$as_me:9993: result: $with_hashmap" >&5
    80358067 echo "${ECHO_T}$with_hashmap" >&6
    80368068 test "$with_hashmap" = yes && cat >>confdefs.h <<\EOF
     
    80408072 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
    80418073-echo "$as_me:9628: checking if you want colorfgbg code" >&5
    8042 +echo "$as_me:9975: checking if you want colorfgbg code" >&5
     8074+echo "$as_me:10000: checking if you want colorfgbg code" >&5
    80438075 echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
    80448076 
    80458077 # Check whether --enable-colorfgbg or --disable-colorfgbg was given.
    8046 @@ -9635,7 +9982,7 @@
     8078@@ -9635,7 +10007,7 @@
    80478079 else
    80488080   with_colorfgbg=no
    80498081 fi;
    80508082-echo "$as_me:9638: result: $with_colorfgbg" >&5
    8051 +echo "$as_me:9985: result: $with_colorfgbg" >&5
     8083+echo "$as_me:10010: result: $with_colorfgbg" >&5
    80528084 echo "${ECHO_T}$with_colorfgbg" >&6
    80538085 test "$with_colorfgbg" = yes && cat >>confdefs.h <<\EOF
    80548086 #define USE_COLORFGBG 1
    8055 @@ -9644,7 +9991,7 @@
     8087@@ -9644,7 +10016,7 @@
    80568088 # This is still experimental (20080329), but should ultimately be moved to
    80578089 # the script-block --with-normal, etc.
    80588090 
    80598091-echo "$as_me:9647: checking if you want to link with the pthread library" >&5
    8060 +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
    80618093 echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
    80628094 
    80638095 # Check whether --with-pthread or --without-pthread was given.
    8064 @@ -9654,27 +10001,27 @@
     8096@@ -9654,27 +10026,27 @@
    80658097 else
    80668098   with_pthread=no
    80678099 fi;
    80688100-echo "$as_me:9657: result: $with_pthread" >&5
    8069 +echo "$as_me:10004: result: $with_pthread" >&5
     8101+echo "$as_me:10029: result: $with_pthread" >&5
    80708102 echo "${ECHO_T}$with_pthread" >&6
    80718103 
    80728104 if test "$with_pthread" != no ; then
    80738105-    echo "$as_me:9661: checking for pthread.h" >&5
    8074 +    echo "$as_me:10008: checking for pthread.h" >&5
     8106+    echo "$as_me:10033: checking for pthread.h" >&5
    80758107 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
    80768108 if test "${ac_cv_header_pthread_h+set}" = set; then
     
    80798111   cat >conftest.$ac_ext <<_ACEOF
    80808112-#line 9667 "configure"
    8081 +#line 10014 "configure"
     8113+#line 10039 "configure"
    80828114 #include "confdefs.h"
    80838115 #include <pthread.h>
    80848116 _ACEOF
    80858117-if { (eval echo "$as_me:9671: \"$ac_cpp conftest.$ac_ext\"") >&5
    8086 +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
    80878119   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    80888120   ac_status=$?
     
    80918123   cat conftest.err >&5
    80928124-  echo "$as_me:9677: \$? = $ac_status" >&5
    8093 +  echo "$as_me:10024: \$? = $ac_status" >&5
     8125+  echo "$as_me:10049: \$? = $ac_status" >&5
    80948126   (exit $ac_status); } >/dev/null; then
    80958127   if test -s conftest.err; then
    80968128     ac_cpp_err=$ac_c_preproc_warn_flag
    8097 @@ -9693,7 +10040,7 @@
     8129@@ -9693,7 +10065,7 @@
    80988130 fi
    80998131 rm -f conftest.err conftest.$ac_ext
    81008132 fi
    81018133-echo "$as_me:9696: result: $ac_cv_header_pthread_h" >&5
    8102 +echo "$as_me:10043: result: $ac_cv_header_pthread_h" >&5
     8134+echo "$as_me:10068: result: $ac_cv_header_pthread_h" >&5
    81038135 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
    81048136 if test $ac_cv_header_pthread_h = yes; then
    81058137 
    8106 @@ -9701,12 +10048,12 @@
     8138@@ -9701,12 +10073,12 @@
    81078139 #define HAVE_PTHREADS_H 1
    81088140 EOF
    81098141 
    81108142-        echo "$as_me:9704: checking if we can link with the pthread library" >&5
    8111 +        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
    81128144 echo $ECHO_N "checking if we can link with the pthread library... $ECHO_C" >&6
    81138145         cf_save_LIBS="$LIBS"
     
    81158147         cat >conftest.$ac_ext <<_ACEOF
    81168148-#line 9709 "configure"
    8117 +#line 10056 "configure"
     8149+#line 10081 "configure"
    81188150 #include "confdefs.h"
    81198151 
    81208152 #include <pthread.h>
    8121 @@ -9722,16 +10069,16 @@
     8153@@ -9722,16 +10094,16 @@
    81228154 }
    81238155 _ACEOF
    81248156 rm -f conftest.$ac_objext conftest$ac_exeext
    81258157-if { (eval echo "$as_me:9725: \"$ac_link\"") >&5
    8126 +if { (eval echo "$as_me:10072: \"$ac_link\"") >&5
     8158+if { (eval echo "$as_me:10097: \"$ac_link\"") >&5
    81278159   (eval $ac_link) 2>&5
    81288160   ac_status=$?
    81298161-  echo "$as_me:9728: \$? = $ac_status" >&5
    8130 +  echo "$as_me:10075: \$? = $ac_status" >&5
     8162+  echo "$as_me:10100: \$? = $ac_status" >&5
    81318163   (exit $ac_status); } &&
    81328164          { ac_try='test -s conftest$ac_exeext'
    81338165-  { (eval echo "$as_me:9731: \"$ac_try\"") >&5
    8134 +  { (eval echo "$as_me:10078: \"$ac_try\"") >&5
     8166+  { (eval echo "$as_me:10103: \"$ac_try\"") >&5
    81358167   (eval $ac_try) 2>&5
    81368168   ac_status=$?
    81378169-  echo "$as_me:9734: \$? = $ac_status" >&5
    8138 +  echo "$as_me:10081: \$? = $ac_status" >&5
     8170+  echo "$as_me:10106: \$? = $ac_status" >&5
    81398171   (exit $ac_status); }; }; then
    81408172   with_pthread=yes
    81418173 else
    8142 @@ -9741,7 +10088,7 @@
     8174@@ -9741,7 +10113,7 @@
    81438175 fi
    81448176 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    81458177         LIBS="$cf_save_LIBS"
    81468178-        echo "$as_me:9744: result: $with_pthread" >&5
    8147 +        echo "$as_me:10091: result: $with_pthread" >&5
     8179+        echo "$as_me:10116: result: $with_pthread" >&5
    81488180 echo "${ECHO_T}$with_pthread" >&6
    81498181 
    81508182         if test "$with_pthread" = yes ; then
    8151 @@ -9751,7 +10098,7 @@
     8183@@ -9751,7 +10123,7 @@
    81528184 EOF
    81538185 
    81548186         else
    81558187-            { { echo "$as_me:9754: error: Cannot link with pthread library" >&5
    8156 +            { { echo "$as_me:10101: error: Cannot link with pthread library" >&5
     8188+            { { echo "$as_me:10126: error: Cannot link with pthread library" >&5
    81578189 echo "$as_me: error: Cannot link with pthread library" >&2;}
    81588190    { (exit 1); exit 1; }; }
    81598191         fi
    8160 @@ -9760,7 +10107,7 @@
     8192@@ -9760,7 +10132,7 @@
    81618193 
    81628194 fi
    81638195 
    81648196-echo "$as_me:9763: checking if you want to use weak-symbols for pthreads" >&5
    8165 +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
    81668198 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
    81678199 
    81688200 # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
    8169 @@ -9770,18 +10117,18 @@
     8201@@ -9770,18 +10142,18 @@
    81708202 else
    81718203   use_weak_symbols=no
    81728204 fi;
    81738205-echo "$as_me:9773: result: $use_weak_symbols" >&5
    8174 +echo "$as_me:10120: result: $use_weak_symbols" >&5
     8206+echo "$as_me:10145: result: $use_weak_symbols" >&5
    81758207 echo "${ECHO_T}$use_weak_symbols" >&6
    81768208 if test "$use_weak_symbols" = yes ; then
    81778209 
    81788210-echo "$as_me:9777: checking if $CC supports weak symbols" >&5
    8179 +echo "$as_me:10124: checking if $CC supports weak symbols" >&5
     8211+echo "$as_me:10149: checking if $CC supports weak symbols" >&5
    81808212 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
    81818213 if test "${cf_cv_weak_symbols+set}" = set; then
     
    81858217 cat >conftest.$ac_ext <<_ACEOF
    81868218-#line 9784 "configure"
    8187 +#line 10131 "configure"
     8219+#line 10156 "configure"
    81888220 #include "confdefs.h"
    81898221 
    81908222 #include <stdio.h>
    8191 @@ -9807,16 +10154,16 @@
     8223@@ -9807,16 +10179,16 @@
    81928224 }
    81938225 _ACEOF
    81948226 rm -f conftest.$ac_objext
    81958227-if { (eval echo "$as_me:9810: \"$ac_compile\"") >&5
    8196 +if { (eval echo "$as_me:10157: \"$ac_compile\"") >&5
     8228+if { (eval echo "$as_me:10182: \"$ac_compile\"") >&5
    81978229   (eval $ac_compile) 2>&5
    81988230   ac_status=$?
    81998231-  echo "$as_me:9813: \$? = $ac_status" >&5
    8200 +  echo "$as_me:10160: \$? = $ac_status" >&5
     8232+  echo "$as_me:10185: \$? = $ac_status" >&5
    82018233   (exit $ac_status); } &&
    82028234          { ac_try='test -s conftest.$ac_objext'
    82038235-  { (eval echo "$as_me:9816: \"$ac_try\"") >&5
    8204 +  { (eval echo "$as_me:10163: \"$ac_try\"") >&5
     8236+  { (eval echo "$as_me:10188: \"$ac_try\"") >&5
    82058237   (eval $ac_try) 2>&5
    82068238   ac_status=$?
    82078239-  echo "$as_me:9819: \$? = $ac_status" >&5
    8208 +  echo "$as_me:10166: \$? = $ac_status" >&5
     8240+  echo "$as_me:10191: \$? = $ac_status" >&5
    82098241   (exit $ac_status); }; }; then
    82108242   cf_cv_weak_symbols=yes
    82118243 else
    8212 @@ -9827,7 +10174,7 @@
     8244@@ -9827,7 +10199,7 @@
    82138245 rm -f conftest.$ac_objext conftest.$ac_ext
    82148246 
    82158247 fi
    82168248-echo "$as_me:9830: result: $cf_cv_weak_symbols" >&5
    8217 +echo "$as_me:10177: result: $cf_cv_weak_symbols" >&5
     8249+echo "$as_me:10202: result: $cf_cv_weak_symbols" >&5
    82188250 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
    82198251 
    82208252 else
    8221 @@ -9857,7 +10204,7 @@
     8253@@ -9857,7 +10229,7 @@
    82228254 # opaque outside of that, so there is no --enable-opaque option.  We can use
    82238255 # this option without --with-pthreads, but this will be always set for
    82248256 # pthreads.
    82258257-echo "$as_me:9860: checking if you want experimental reentrant code" >&5
    8226 +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
    82278259 echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6
    82288260 
    82298261 # Check whether --enable-reentrant or --disable-reentrant was given.
    8230 @@ -9867,7 +10214,7 @@
     8262@@ -9867,7 +10239,7 @@
    82318263 else
    82328264   with_reentrant=no
    82338265 fi;
    82348266-echo "$as_me:9870: result: $with_reentrant" >&5
    8235 +echo "$as_me:10217: result: $with_reentrant" >&5
     8267+echo "$as_me:10242: result: $with_reentrant" >&5
    82368268 echo "${ECHO_T}$with_reentrant" >&6
    82378269 if test "$with_reentrant" = yes ; then
    82388270        cf_cv_enable_reentrant=1
    8239 @@ -9891,7 +10238,7 @@
     8271@@ -9891,7 +10263,7 @@
    82408272        5.*)
    82418273                cf_cv_rel_version=6.0
    82428274                cf_cv_abi_version=6
    82438275-               { echo "$as_me:9894: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
    8244 +               { 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
    82458277 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
    82468278                ;;
    82478279        esac
    8248 @@ -9904,7 +10251,7 @@
     8280@@ -9904,7 +10276,7 @@
    82498281        NCURSES_SIZE_T=short
    82508282 fi
    82518283 
    82528284-echo "$as_me:9907: checking if you want experimental safe-sprintf code" >&5
    8253 +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
    82548286 echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
    82558287 
    82568288 # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
    8257 @@ -9914,7 +10261,7 @@
     8289@@ -9914,7 +10286,7 @@
    82588290 else
    82598291   with_safe_sprintf=no
    82608292 fi;
    82618293-echo "$as_me:9917: result: $with_safe_sprintf" >&5
    8262 +echo "$as_me:10264: result: $with_safe_sprintf" >&5
     8294+echo "$as_me:10289: result: $with_safe_sprintf" >&5
    82638295 echo "${ECHO_T}$with_safe_sprintf" >&6
    82648296 test "$with_safe_sprintf" = yes && cat >>confdefs.h <<\EOF
    82658297 #define USE_SAFE_SPRINTF 1
    8266 @@ -9923,7 +10270,7 @@
     8298@@ -9923,7 +10295,7 @@
    82678299 ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
    82688300 # when hashmap is used scroll hints are useless
    82698301 if test "$with_hashmap" = no ; then
    82708302-echo "$as_me:9926: checking if you want to experiment without scrolling-hints code" >&5
    8271 +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
    82728304 echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
    82738305 
    82748306 # Check whether --enable-scroll-hints or --disable-scroll-hints was given.
    8275 @@ -9933,7 +10280,7 @@
     8307@@ -9933,7 +10305,7 @@
    82768308 else
    82778309   with_scroll_hints=yes
    82788310 fi;
    82798311-echo "$as_me:9936: result: $with_scroll_hints" >&5
    8280 +echo "$as_me:10283: result: $with_scroll_hints" >&5
     8312+echo "$as_me:10308: result: $with_scroll_hints" >&5
    82818313 echo "${ECHO_T}$with_scroll_hints" >&6
    82828314 test "$with_scroll_hints" = yes && cat >>confdefs.h <<\EOF
    82838315 #define USE_SCROLL_HINTS 1
    8284 @@ -9941,7 +10288,7 @@
     8316@@ -9941,7 +10313,7 @@
    82858317 
    82868318 fi
    82878319 
    82888320-echo "$as_me:9944: checking if you want experimental wgetch-events code" >&5
    8289 +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
    82908322 echo $ECHO_N "checking if you want experimental wgetch-events code... $ECHO_C" >&6
    82918323 
    82928324 # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
    8293 @@ -9951,7 +10298,7 @@
     8325@@ -9951,7 +10323,7 @@
    82948326 else
    82958327   with_wgetch_events=no
    82968328 fi;
    82978329-echo "$as_me:9954: result: $with_wgetch_events" >&5
    8298 +echo "$as_me:10301: result: $with_wgetch_events" >&5
     8330+echo "$as_me:10326: result: $with_wgetch_events" >&5
    82998331 echo "${ECHO_T}$with_wgetch_events" >&6
    83008332 test "$with_wgetch_events" = yes && cat >>confdefs.h <<\EOF
    83018333 #define NCURSES_WGETCH_EVENTS 1
    8302 @@ -9960,7 +10307,7 @@
     8334@@ -9960,7 +10332,7 @@
    83038335 ###############################################################################
    83048336 
    83058337 ###    use option --disable-echo to suppress full display compiling commands
    83068338-echo "$as_me:9963: checking if you want to display full commands during build" >&5
    8307 +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
    83088340 echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6
    83098341 
    83108342 # Check whether --enable-echo or --disable-echo was given.
    8311 @@ -9977,11 +10324,11 @@
     8343@@ -9977,11 +10349,11 @@
    83128344        test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent"
    83138345        test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent"
    83148346 fi
    83158347-echo "$as_me:9980: result: $with_echo" >&5
    8316 +echo "$as_me:10327: result: $with_echo" >&5
     8348+echo "$as_me:10352: result: $with_echo" >&5
    83178349 echo "${ECHO_T}$with_echo" >&6
    83188350 
    83198351 ###    use option --enable-warnings to turn on all gcc warnings
    83208352-echo "$as_me:9984: checking if you want to see compiler warnings" >&5
    8321 +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
    83228354 echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
    83238355 
    83248356 # Check whether --enable-warnings or --disable-warnings was given.
    8325 @@ -9989,7 +10336,7 @@
     8357@@ -9989,7 +10361,7 @@
    83268358   enableval="$enable_warnings"
    83278359   with_warnings=$enableval
    83288360 fi;
    83298361-echo "$as_me:9992: result: $with_warnings" >&5
    8330 +echo "$as_me:10339: result: $with_warnings" >&5
     8362+echo "$as_me:10364: result: $with_warnings" >&5
    83318363 echo "${ECHO_T}$with_warnings" >&6
    83328364 
    83338365 if test "x$with_warnings" = "xyes"; then
    8334 @@ -10000,12 +10347,12 @@
     8366@@ -10000,12 +10372,12 @@
    83358367 if test "$GCC" = yes ; then
    83368368        case $host_os in
    83378369        linux*|gnu*)
    83388370-               echo "$as_me:10003: checking if this is really Intel C compiler" >&5
    8339 +               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
    83408372 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
    83418373                cf_save_CFLAGS="$CFLAGS"
     
    83438375                cat >conftest.$ac_ext <<_ACEOF
    83448376-#line 10008 "configure"
    8345 +#line 10355 "configure"
     8377+#line 10380 "configure"
    83468378 #include "confdefs.h"
    83478379 
    83488380 int
    8349 @@ -10022,16 +10369,16 @@
     8381@@ -10022,16 +10394,16 @@
    83508382 }
    83518383 _ACEOF
    83528384 rm -f conftest.$ac_objext
    83538385-if { (eval echo "$as_me:10025: \"$ac_compile\"") >&5
    8354 +if { (eval echo "$as_me:10372: \"$ac_compile\"") >&5
     8386+if { (eval echo "$as_me:10397: \"$ac_compile\"") >&5
    83558387   (eval $ac_compile) 2>&5
    83568388   ac_status=$?
    83578389-  echo "$as_me:10028: \$? = $ac_status" >&5
    8358 +  echo "$as_me:10375: \$? = $ac_status" >&5
     8390+  echo "$as_me:10400: \$? = $ac_status" >&5
    83598391   (exit $ac_status); } &&
    83608392          { ac_try='test -s conftest.$ac_objext'
    83618393-  { (eval echo "$as_me:10031: \"$ac_try\"") >&5
    8362 +  { (eval echo "$as_me:10378: \"$ac_try\"") >&5
     8394+  { (eval echo "$as_me:10403: \"$ac_try\"") >&5
    83638395   (eval $ac_try) 2>&5
    83648396   ac_status=$?
    83658397-  echo "$as_me:10034: \$? = $ac_status" >&5
    8366 +  echo "$as_me:10381: \$? = $ac_status" >&5
     8398+  echo "$as_me:10406: \$? = $ac_status" >&5
    83678399   (exit $ac_status); }; }; then
    83688400   INTEL_COMPILER=yes
    83698401 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
    8370 @@ -10042,14 +10389,14 @@
     8402@@ -10042,14 +10414,14 @@
    83718403 fi
    83728404 rm -f conftest.$ac_objext conftest.$ac_ext
    83738405                CFLAGS="$cf_save_CFLAGS"
    83748406-               echo "$as_me:10045: result: $INTEL_COMPILER" >&5
    8375 +               echo "$as_me:10392: result: $INTEL_COMPILER" >&5
     8407+               echo "$as_me:10417: result: $INTEL_COMPILER" >&5
    83768408 echo "${ECHO_T}$INTEL_COMPILER" >&6
    83778409                ;;
     
    83818413 cat > conftest.$ac_ext <<EOF
    83828414-#line 10052 "${as_me-configure}"
    8383 +#line 10399 "${as_me-configure}"
     8415+#line 10424 "${as_me-configure}"
    83848416 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
    83858417 EOF
    83868418 
    8387 @@ -10067,7 +10414,7 @@
     8419@@ -10067,7 +10439,7 @@
    83888420 # remark #981: operands are evaluated in unspecified order
    83898421 # warning #269: invalid format string conversion
    83908422 
    83918423-       { echo "$as_me:10070: checking for $CC warning options..." >&5
    8392 +       { echo "$as_me:10417: checking for $CC warning options..." >&5
     8424+       { echo "$as_me:10442: checking for $CC warning options..." >&5
    83938425 echo "$as_me: checking for $CC warning options..." >&6;}
    83948426        cf_save_CFLAGS="$CFLAGS"
    83958427        EXTRA_CFLAGS="-Wall"
    8396 @@ -10084,12 +10431,12 @@
     8428@@ -10084,12 +10456,12 @@
    83978429                wd981
    83988430        do
    83998431                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
    84008432-               if { (eval echo "$as_me:10087: \"$ac_compile\"") >&5
    8401 +               if { (eval echo "$as_me:10434: \"$ac_compile\"") >&5
     8433+               if { (eval echo "$as_me:10459: \"$ac_compile\"") >&5
    84028434   (eval $ac_compile) 2>&5
    84038435   ac_status=$?
    84048436-  echo "$as_me:10090: \$? = $ac_status" >&5
    8405 +  echo "$as_me:10437: \$? = $ac_status" >&5
     8437+  echo "$as_me:10462: \$? = $ac_status" >&5
    84068438   (exit $ac_status); }; then
    84078439-                       test -n "$verbose" && echo "$as_me:10092: result: ... -$cf_opt" >&5
    8408 +                       test -n "$verbose" && echo "$as_me:10439: result: ... -$cf_opt" >&5
     8440+                       test -n "$verbose" && echo "$as_me:10464: result: ... -$cf_opt" >&5
    84098441 echo "${ECHO_T}... -$cf_opt" >&6
    84108442                        EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
    84118443                fi
    8412 @@ -10098,7 +10445,7 @@
     8444@@ -10098,7 +10470,7 @@
    84138445 
    84148446 elif test "$GCC" = yes
    84158447 then
    84168448-       { echo "$as_me:10101: checking for $CC warning options..." >&5
    8417 +       { echo "$as_me:10448: checking for $CC warning options..." >&5
     8449+       { echo "$as_me:10473: checking for $CC warning options..." >&5
    84188450 echo "$as_me: checking for $CC warning options..." >&6;}
    84198451        cf_save_CFLAGS="$CFLAGS"
    84208452        EXTRA_CFLAGS="-W -Wall"
    8421 @@ -10118,12 +10465,12 @@
     8453@@ -10118,12 +10490,12 @@
    84228454                Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum
    84238455        do
    84248456                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
    84258457-               if { (eval echo "$as_me:10121: \"$ac_compile\"") >&5
    8426 +               if { (eval echo "$as_me:10468: \"$ac_compile\"") >&5
     8458+               if { (eval echo "$as_me:10493: \"$ac_compile\"") >&5
    84278459   (eval $ac_compile) 2>&5
    84288460   ac_status=$?
    84298461-  echo "$as_me:10124: \$? = $ac_status" >&5
    8430 +  echo "$as_me:10471: \$? = $ac_status" >&5
     8462+  echo "$as_me:10496: \$? = $ac_status" >&5
    84318463   (exit $ac_status); }; then
    84328464-                       test -n "$verbose" && echo "$as_me:10126: result: ... -$cf_opt" >&5
    8433 +                       test -n "$verbose" && echo "$as_me:10473: result: ... -$cf_opt" >&5
     8465+                       test -n "$verbose" && echo "$as_me:10498: result: ... -$cf_opt" >&5
    84348466 echo "${ECHO_T}... -$cf_opt" >&6
    84358467                        case $cf_opt in #(vi
    84368468                        Wcast-qual) #(vi
    8437 @@ -10134,7 +10481,7 @@
     8469@@ -10134,7 +10506,7 @@
    84388470                                [34].*)
    84398471                                        test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
    84408472 
    84418473-echo "${as_me-configure}:10137: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
    8442 +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
    84438475 
    84448476                                        continue;;
    84458477                                esac
    8446 @@ -10154,12 +10501,12 @@
     8478@@ -10154,12 +10526,12 @@
    84478479 if test "$GCC" = yes ; then
    84488480        case $host_os in
    84498481        linux*|gnu*)
    84508482-               echo "$as_me:10157: checking if this is really Intel C++ compiler" >&5
    8451 +               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
    84528484 echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6
    84538485                cf_save_CFLAGS="$CXXFLAGS"
     
    84558487                cat >conftest.$ac_ext <<_ACEOF
    84568488-#line 10162 "configure"
    8457 +#line 10509 "configure"
     8489+#line 10534 "configure"
    84588490 #include "confdefs.h"
    84598491 
    84608492 int
    8461 @@ -10176,16 +10523,16 @@
     8493@@ -10176,16 +10548,16 @@
    84628494 }
    84638495 _ACEOF
    84648496 rm -f conftest.$ac_objext
    84658497-if { (eval echo "$as_me:10179: \"$ac_compile\"") >&5
    8466 +if { (eval echo "$as_me:10526: \"$ac_compile\"") >&5
     8498+if { (eval echo "$as_me:10551: \"$ac_compile\"") >&5
    84678499   (eval $ac_compile) 2>&5
    84688500   ac_status=$?
    84698501-  echo "$as_me:10182: \$? = $ac_status" >&5
    8470 +  echo "$as_me:10529: \$? = $ac_status" >&5
     8502+  echo "$as_me:10554: \$? = $ac_status" >&5
    84718503   (exit $ac_status); } &&
    84728504          { ac_try='test -s conftest.$ac_objext'
    84738505-  { (eval echo "$as_me:10185: \"$ac_try\"") >&5
    8474 +  { (eval echo "$as_me:10532: \"$ac_try\"") >&5
     8506+  { (eval echo "$as_me:10557: \"$ac_try\"") >&5
    84758507   (eval $ac_try) 2>&5
    84768508   ac_status=$?
    84778509-  echo "$as_me:10188: \$? = $ac_status" >&5
    8478 +  echo "$as_me:10535: \$? = $ac_status" >&5
     8510+  echo "$as_me:10560: \$? = $ac_status" >&5
    84798511   (exit $ac_status); }; }; then
    84808512   INTEL_CPLUSPLUS=yes
    84818513 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
    8482 @@ -10196,7 +10543,7 @@
     8514@@ -10196,7 +10568,7 @@
    84838515 fi
    84848516 rm -f conftest.$ac_objext conftest.$ac_ext
    84858517                CXXFLAGS="$cf_save_CFLAGS"
    84868518-               echo "$as_me:10199: result: $INTEL_CPLUSPLUS" >&5
    8487 +               echo "$as_me:10546: result: $INTEL_CPLUSPLUS" >&5
     8519+               echo "$as_me:10571: result: $INTEL_CPLUSPLUS" >&5
    84888520 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
    84898521                ;;
    84908522        esac
    8491 @@ -10210,7 +10557,7 @@
     8523@@ -10210,7 +10582,7 @@
    84928524 ac_main_return=return
    84938525 
    84948526 cat > conftest.$ac_ext <<EOF
    84958527-#line 10213 "configure"
    8496 +#line 10560 "configure"
     8528+#line 10585 "configure"
    84978529 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
    84988530 EOF
    84998531 
    8500 @@ -10228,7 +10575,7 @@
     8532@@ -10228,7 +10600,7 @@
    85018533 # remark #981: operands are evaluated in unspecified order
    85028534 # warning #269: invalid format string conversion
    85038535 
    85048536-       { echo "$as_me:10231: checking for $CC warning options..." >&5
    8505 +       { echo "$as_me:10578: checking for $CC warning options..." >&5
     8537+       { echo "$as_me:10603: checking for $CC warning options..." >&5
    85068538 echo "$as_me: checking for $CC warning options..." >&6;}
    85078539        cf_save_CXXFLAGS="$CXXFLAGS"
    85088540        EXTRA_CXXFLAGS="-Wall"
    8509 @@ -10245,12 +10592,12 @@
     8541@@ -10245,12 +10617,12 @@
    85108542                wd981
    85118543        do
    85128544                CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
    85138545-               if { (eval echo "$as_me:10248: \"$ac_compile\"") >&5
    8514 +               if { (eval echo "$as_me:10595: \"$ac_compile\"") >&5
     8546+               if { (eval echo "$as_me:10620: \"$ac_compile\"") >&5
    85158547   (eval $ac_compile) 2>&5
    85168548   ac_status=$?
    85178549-  echo "$as_me:10251: \$? = $ac_status" >&5
    8518 +  echo "$as_me:10598: \$? = $ac_status" >&5
     8550+  echo "$as_me:10623: \$? = $ac_status" >&5
    85198551   (exit $ac_status); }; then
    85208552-                       test -n "$verbose" && echo "$as_me:10253: result: ... -$cf_opt" >&5
    8521 +                       test -n "$verbose" && echo "$as_me:10600: result: ... -$cf_opt" >&5
     8553+                       test -n "$verbose" && echo "$as_me:10625: result: ... -$cf_opt" >&5
    85228554 echo "${ECHO_T}... -$cf_opt" >&6
    85238555                        EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
    85248556                fi
    8525 @@ -10259,7 +10606,7 @@
     8557@@ -10259,7 +10631,7 @@
    85268558 
    85278559 elif test "$GXX" = yes
    85288560 then
    85298561-       { echo "$as_me:10262: checking for $CXX warning options..." >&5
    8530 +       { echo "$as_me:10609: checking for $CXX warning options..." >&5
     8562+       { echo "$as_me:10634: checking for $CXX warning options..." >&5
    85318563 echo "$as_me: checking for $CXX warning options..." >&6;}
    85328564        cf_save_CXXFLAGS="$CXXFLAGS"
    85338565        EXTRA_CXXFLAGS="-W -Wall"
    8534 @@ -10288,16 +10635,16 @@
     8566@@ -10288,16 +10660,16 @@
    85358567                Wundef $cf_gxx_extra_warnings Wno-unused
    85368568        do
    85378569                CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
    85388570-               if { (eval echo "$as_me:10291: \"$ac_compile\"") >&5
    8539 +               if { (eval echo "$as_me:10638: \"$ac_compile\"") >&5
     8571+               if { (eval echo "$as_me:10663: \"$ac_compile\"") >&5
    85408572   (eval $ac_compile) 2>&5
    85418573   ac_status=$?
    85428574-  echo "$as_me:10294: \$? = $ac_status" >&5
    8543 +  echo "$as_me:10641: \$? = $ac_status" >&5
     8575+  echo "$as_me:10666: \$? = $ac_status" >&5
    85448576   (exit $ac_status); }; then
    85458577-                       test -n "$verbose" && echo "$as_me:10296: result: ... -$cf_opt" >&5
    8546 +                       test -n "$verbose" && echo "$as_me:10643: result: ... -$cf_opt" >&5
     8578+                       test -n "$verbose" && echo "$as_me:10668: result: ... -$cf_opt" >&5
    85478579 echo "${ECHO_T}... -$cf_opt" >&6
    85488580                        EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
    85498581                else
    85508582-                       test -n "$verbose" && echo "$as_me:10300: result: ... no -$cf_opt" >&5
    8551 +                       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
    85528584 echo "${ECHO_T}... no -$cf_opt" >&6
    85538585                fi
    85548586        done
    8555 @@ -10333,10 +10680,10 @@
     8587@@ -10333,10 +10705,10 @@
    85568588 EOF
    85578589 if test "$GCC" = yes
    85588590 then
    85598591-       { echo "$as_me:10336: checking for $CC __attribute__ directives..." >&5
    8560 +       { echo "$as_me:10683: checking for $CC __attribute__ directives..." >&5
     8592+       { echo "$as_me:10708: checking for $CC __attribute__ directives..." >&5
    85618593 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
    85628594 cat > conftest.$ac_ext <<EOF
    85638595-#line 10339 "${as_me-configure}"
    8564 +#line 10686 "${as_me-configure}"
     8596+#line 10711 "${as_me-configure}"
    85658597 #include "confdefs.h"
    85668598 #include "conftest.h"
    85678599 #include "conftest.i"
    8568 @@ -10374,12 +10721,12 @@
     8600@@ -10374,12 +10746,12 @@
    85698601 EOF
    85708602                        ;;
    85718603                esac
    85728604-               if { (eval echo "$as_me:10377: \"$ac_compile\"") >&5
    8573 +               if { (eval echo "$as_me:10724: \"$ac_compile\"") >&5
     8605+               if { (eval echo "$as_me:10749: \"$ac_compile\"") >&5
    85748606   (eval $ac_compile) 2>&5
    85758607   ac_status=$?
    85768608-  echo "$as_me:10380: \$? = $ac_status" >&5
    8577 +  echo "$as_me:10727: \$? = $ac_status" >&5
     8609+  echo "$as_me:10752: \$? = $ac_status" >&5
    85788610   (exit $ac_status); }; then
    85798611-                       test -n "$verbose" && echo "$as_me:10382: result: ... $cf_attribute" >&5
    8580 +                       test -n "$verbose" && echo "$as_me:10729: result: ... $cf_attribute" >&5
     8612+                       test -n "$verbose" && echo "$as_me:10754: result: ... $cf_attribute" >&5
    85818613 echo "${ECHO_T}... $cf_attribute" >&6
    85828614                        cat conftest.h >>confdefs.h
    85838615                fi
    8584 @@ -10391,7 +10738,7 @@
     8616@@ -10391,7 +10763,7 @@
    85858617 fi
    85868618 
    85878619 ###    use option --enable-assertions to turn on generation of assertion code
    85888620-echo "$as_me:10394: checking if you want to enable runtime assertions" >&5
    8589 +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
    85908622 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
    85918623 
    85928624 # Check whether --enable-assertions or --disable-assertions was given.
    8593 @@ -10401,7 +10748,7 @@
     8625@@ -10401,7 +10773,7 @@
    85948626 else
    85958627   with_assertions=no
    85968628 fi;
    85978629-echo "$as_me:10404: result: $with_assertions" >&5
    8598 +echo "$as_me:10751: result: $with_assertions" >&5
     8630+echo "$as_me:10776: result: $with_assertions" >&5
    85998631 echo "${ECHO_T}$with_assertions" >&6
    86008632 if test -n "$GCC"
    86018633 then
    8602 @@ -10419,7 +10766,7 @@
     8634@@ -10419,7 +10791,7 @@
    86038635 
    86048636 ###    use option --disable-leaks to suppress "permanent" leaks, for testing
    86058637 
    86068638-echo "$as_me:10422: checking if you want to use dmalloc for testing" >&5
    8607 +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
    86088640 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
    86098641 
    86108642 # Check whether --with-dmalloc or --without-dmalloc was given.
    8611 @@ -10435,7 +10782,7 @@
     8643@@ -10435,7 +10807,7 @@
    86128644 else
    86138645   with_dmalloc=
    86148646 fi;
    86158647-echo "$as_me:10438: result: ${with_dmalloc:-no}" >&5
    8616 +echo "$as_me:10785: result: ${with_dmalloc:-no}" >&5
     8648+echo "$as_me:10810: result: ${with_dmalloc:-no}" >&5
    86178649 echo "${ECHO_T}${with_dmalloc:-no}" >&6
    86188650 
    86198651 case .$with_cflags in #(vi
    8620 @@ -10505,7 +10852,7 @@
     8652@@ -10505,7 +10877,7 @@
    86218653 
    86228654 if test -n "$cf_new_cppflags" ; then
     
    86278659 
    86288660 if test -n "$cf_new_extra_cppflags" ; then
    8629 @@ -10519,23 +10866,23 @@
     8661@@ -10519,23 +10891,23 @@
    86308662 esac
    86318663 
    86328664 if test "$with_dmalloc" = yes ; then
    86338665-       echo "$as_me:10522: checking for dmalloc.h" >&5
    8634 +       echo "$as_me:10869: checking for dmalloc.h" >&5
     8666+       echo "$as_me:10894: checking for dmalloc.h" >&5
    86358667 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
    86368668 if test "${ac_cv_header_dmalloc_h+set}" = set; then
     
    86398671   cat >conftest.$ac_ext <<_ACEOF
    86408672-#line 10528 "configure"
    8641 +#line 10875 "configure"
     8673+#line 10900 "configure"
    86428674 #include "confdefs.h"
    86438675 #include <dmalloc.h>
    86448676 _ACEOF
    86458677-if { (eval echo "$as_me:10532: \"$ac_cpp conftest.$ac_ext\"") >&5
    8646 +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
    86478679   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    86488680   ac_status=$?
     
    86518683   cat conftest.err >&5
    86528684-  echo "$as_me:10538: \$? = $ac_status" >&5
    8653 +  echo "$as_me:10885: \$? = $ac_status" >&5
     8685+  echo "$as_me:10910: \$? = $ac_status" >&5
    86548686   (exit $ac_status); } >/dev/null; then
    86558687   if test -s conftest.err; then
    86568688     ac_cpp_err=$ac_c_preproc_warn_flag
    8657 @@ -10554,11 +10901,11 @@
     8689@@ -10554,11 +10926,11 @@
    86588690 fi
    86598691 rm -f conftest.err conftest.$ac_ext
    86608692 fi
    86618693-echo "$as_me:10557: result: $ac_cv_header_dmalloc_h" >&5
    8662 +echo "$as_me:10904: result: $ac_cv_header_dmalloc_h" >&5
     8694+echo "$as_me:10929: result: $ac_cv_header_dmalloc_h" >&5
    86638695 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
    86648696 if test $ac_cv_header_dmalloc_h = yes; then
    86658697 
    86668698-echo "$as_me:10561: checking for dmalloc_debug in -ldmalloc" >&5
    8667 +echo "$as_me:10908: checking for dmalloc_debug in -ldmalloc" >&5
     8699+echo "$as_me:10933: checking for dmalloc_debug in -ldmalloc" >&5
    86688700 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
    86698701 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
    86708702   echo $ECHO_N "(cached) $ECHO_C" >&6
    8671 @@ -10566,7 +10913,7 @@
     8703@@ -10566,7 +10938,7 @@
    86728704   ac_check_lib_save_LIBS=$LIBS
    86738705 LIBS="-ldmalloc  $LIBS"
    86748706 cat >conftest.$ac_ext <<_ACEOF
    86758707-#line 10569 "configure"
    8676 +#line 10916 "configure"
     8708+#line 10941 "configure"
    86778709 #include "confdefs.h"
    86788710 
    86798711 /* Override any gcc2 internal prototype to avoid an error.  */
    8680 @@ -10585,16 +10932,16 @@
     8712@@ -10585,16 +10957,16 @@
    86818713 }
    86828714 _ACEOF
    86838715 rm -f conftest.$ac_objext conftest$ac_exeext
    86848716-if { (eval echo "$as_me:10588: \"$ac_link\"") >&5
    8685 +if { (eval echo "$as_me:10935: \"$ac_link\"") >&5
     8717+if { (eval echo "$as_me:10960: \"$ac_link\"") >&5
    86868718   (eval $ac_link) 2>&5
    86878719   ac_status=$?
    86888720-  echo "$as_me:10591: \$? = $ac_status" >&5
    8689 +  echo "$as_me:10938: \$? = $ac_status" >&5
     8721+  echo "$as_me:10963: \$? = $ac_status" >&5
    86908722   (exit $ac_status); } &&
    86918723          { ac_try='test -s conftest$ac_exeext'
    86928724-  { (eval echo "$as_me:10594: \"$ac_try\"") >&5
    8693 +  { (eval echo "$as_me:10941: \"$ac_try\"") >&5
     8725+  { (eval echo "$as_me:10966: \"$ac_try\"") >&5
    86948726   (eval $ac_try) 2>&5
    86958727   ac_status=$?
    86968728-  echo "$as_me:10597: \$? = $ac_status" >&5
    8697 +  echo "$as_me:10944: \$? = $ac_status" >&5
     8729+  echo "$as_me:10969: \$? = $ac_status" >&5
    86988730   (exit $ac_status); }; }; then
    86998731   ac_cv_lib_dmalloc_dmalloc_debug=yes
    87008732 else
    8701 @@ -10605,7 +10952,7 @@
     8733@@ -10605,7 +10977,7 @@
    87028734 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    87038735 LIBS=$ac_check_lib_save_LIBS
    87048736 fi
    87058737-echo "$as_me:10608: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
    8706 +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
    87078739 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
    87088740 if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
    87098741   cat >>confdefs.h <<EOF
    8710 @@ -10620,7 +10967,7 @@
     8742@@ -10620,7 +10992,7 @@
    87118743 
    87128744 fi
    87138745 
    87148746-echo "$as_me:10623: checking if you want to use dbmalloc for testing" >&5
    8715 +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
    87168748 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
    87178749 
    87188750 # Check whether --with-dbmalloc or --without-dbmalloc was given.
    8719 @@ -10636,7 +10983,7 @@
     8751@@ -10636,7 +11008,7 @@
    87208752 else
    87218753   with_dbmalloc=
    87228754 fi;
    87238755-echo "$as_me:10639: result: ${with_dbmalloc:-no}" >&5
    8724 +echo "$as_me:10986: result: ${with_dbmalloc:-no}" >&5
     8756+echo "$as_me:11011: result: ${with_dbmalloc:-no}" >&5
    87258757 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
    87268758 
    87278759 case .$with_cflags in #(vi
    8728 @@ -10706,7 +11053,7 @@
     8760@@ -10706,7 +11078,7 @@
    87298761 
    87308762 if test -n "$cf_new_cppflags" ; then
     
    87358767 
    87368768 if test -n "$cf_new_extra_cppflags" ; then
    8737 @@ -10720,23 +11067,23 @@
     8769@@ -10720,23 +11092,23 @@
    87388770 esac
    87398771 
    87408772 if test "$with_dbmalloc" = yes ; then
    87418773-       echo "$as_me:10723: checking for dbmalloc.h" >&5
    8742 +       echo "$as_me:11070: checking for dbmalloc.h" >&5
     8774+       echo "$as_me:11095: checking for dbmalloc.h" >&5
    87438775 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
    87448776 if test "${ac_cv_header_dbmalloc_h+set}" = set; then
     
    87478779   cat >conftest.$ac_ext <<_ACEOF
    87488780-#line 10729 "configure"
    8749 +#line 11076 "configure"
     8781+#line 11101 "configure"
    87508782 #include "confdefs.h"
    87518783 #include <dbmalloc.h>
    87528784 _ACEOF
    87538785-if { (eval echo "$as_me:10733: \"$ac_cpp conftest.$ac_ext\"") >&5
    8754 +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
    87558787   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    87568788   ac_status=$?
     
    87598791   cat conftest.err >&5
    87608792-  echo "$as_me:10739: \$? = $ac_status" >&5
    8761 +  echo "$as_me:11086: \$? = $ac_status" >&5
     8793+  echo "$as_me:11111: \$? = $ac_status" >&5
    87628794   (exit $ac_status); } >/dev/null; then
    87638795   if test -s conftest.err; then
    87648796     ac_cpp_err=$ac_c_preproc_warn_flag
    8765 @@ -10755,11 +11102,11 @@
     8797@@ -10755,11 +11127,11 @@
    87668798 fi
    87678799 rm -f conftest.err conftest.$ac_ext
    87688800 fi
    87698801-echo "$as_me:10758: result: $ac_cv_header_dbmalloc_h" >&5
    8770 +echo "$as_me:11105: result: $ac_cv_header_dbmalloc_h" >&5
     8802+echo "$as_me:11130: result: $ac_cv_header_dbmalloc_h" >&5
    87718803 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
    87728804 if test $ac_cv_header_dbmalloc_h = yes; then
    87738805 
    87748806-echo "$as_me:10762: checking for debug_malloc in -ldbmalloc" >&5
    8775 +echo "$as_me:11109: checking for debug_malloc in -ldbmalloc" >&5
     8807+echo "$as_me:11134: checking for debug_malloc in -ldbmalloc" >&5
    87768808 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
    87778809 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
    87788810   echo $ECHO_N "(cached) $ECHO_C" >&6
    8779 @@ -10767,7 +11114,7 @@
     8811@@ -10767,7 +11139,7 @@
    87808812   ac_check_lib_save_LIBS=$LIBS
    87818813 LIBS="-ldbmalloc  $LIBS"
    87828814 cat >conftest.$ac_ext <<_ACEOF
    87838815-#line 10770 "configure"
    8784 +#line 11117 "configure"
     8816+#line 11142 "configure"
    87858817 #include "confdefs.h"
    87868818 
    87878819 /* Override any gcc2 internal prototype to avoid an error.  */
    8788 @@ -10786,16 +11133,16 @@
     8820@@ -10786,16 +11158,16 @@
    87898821 }
    87908822 _ACEOF
    87918823 rm -f conftest.$ac_objext conftest$ac_exeext
    87928824-if { (eval echo "$as_me:10789: \"$ac_link\"") >&5
    8793 +if { (eval echo "$as_me:11136: \"$ac_link\"") >&5
     8825+if { (eval echo "$as_me:11161: \"$ac_link\"") >&5
    87948826   (eval $ac_link) 2>&5
    87958827   ac_status=$?
    87968828-  echo "$as_me:10792: \$? = $ac_status" >&5
    8797 +  echo "$as_me:11139: \$? = $ac_status" >&5
     8829+  echo "$as_me:11164: \$? = $ac_status" >&5
    87988830   (exit $ac_status); } &&
    87998831          { ac_try='test -s conftest$ac_exeext'
    88008832-  { (eval echo "$as_me:10795: \"$ac_try\"") >&5
    8801 +  { (eval echo "$as_me:11142: \"$ac_try\"") >&5
     8833+  { (eval echo "$as_me:11167: \"$ac_try\"") >&5
    88028834   (eval $ac_try) 2>&5
    88038835   ac_status=$?
    88048836-  echo "$as_me:10798: \$? = $ac_status" >&5
    8805 +  echo "$as_me:11145: \$? = $ac_status" >&5
     8837+  echo "$as_me:11170: \$? = $ac_status" >&5
    88068838   (exit $ac_status); }; }; then
    88078839   ac_cv_lib_dbmalloc_debug_malloc=yes
    88088840 else
    8809 @@ -10806,7 +11153,7 @@
     8841@@ -10806,7 +11178,7 @@
    88108842 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    88118843 LIBS=$ac_check_lib_save_LIBS
    88128844 fi
    88138845-echo "$as_me:10809: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
    8814 +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
    88158847 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
    88168848 if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
    88178849   cat >>confdefs.h <<EOF
    8818 @@ -10821,7 +11168,7 @@
     8850@@ -10821,7 +11193,7 @@
    88198851 
    88208852 fi
    88218853 
    88228854-echo "$as_me:10824: checking if you want to use valgrind for testing" >&5
    8823 +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
    88248856 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
    88258857 
    88268858 # Check whether --with-valgrind or --without-valgrind was given.
    8827 @@ -10837,7 +11184,7 @@
     8859@@ -10837,7 +11209,7 @@
    88288860 else
    88298861   with_valgrind=
    88308862 fi;
    88318863-echo "$as_me:10840: result: ${with_valgrind:-no}" >&5
    8832 +echo "$as_me:11187: result: ${with_valgrind:-no}" >&5
     8864+echo "$as_me:11212: result: ${with_valgrind:-no}" >&5
    88338865 echo "${ECHO_T}${with_valgrind:-no}" >&6
    88348866 
    88358867 case .$with_cflags in #(vi
    8836 @@ -10907,7 +11254,7 @@
     8868@@ -10907,7 +11279,7 @@
    88378869 
    88388870 if test -n "$cf_new_cppflags" ; then
     
    88438875 
    88448876 if test -n "$cf_new_extra_cppflags" ; then
    8845 @@ -10920,7 +11267,7 @@
     8877@@ -10920,7 +11292,7 @@
    88468878        ;;
    88478879 esac
    88488880 
    88498881-echo "$as_me:10923: checking if you want to perform memory-leak testing" >&5
    8850 +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
    88518883 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
    88528884 
    88538885 # Check whether --enable-leaks or --disable-leaks was given.
    8854 @@ -10930,7 +11277,7 @@
     8886@@ -10930,7 +11302,7 @@
    88558887 else
    88568888   : ${with_no_leaks:=no}
    88578889 fi;
    88588890-echo "$as_me:10933: result: $with_no_leaks" >&5
    8859 +echo "$as_me:11280: result: $with_no_leaks" >&5
     8891+echo "$as_me:11305: result: $with_no_leaks" >&5
    88608892 echo "${ECHO_T}$with_no_leaks" >&6
    88618893 
    88628894 if test "$with_no_leaks" = yes ; then
    8863 @@ -10975,7 +11322,7 @@
     8895@@ -10975,7 +11347,7 @@
    88648896        ;;
    88658897 esac
    88668898 
    88678899-echo "$as_me:10978: checking whether to add trace feature to all models" >&5
    8868 +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
    88698901 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
    88708902 
    88718903 # Check whether --with-trace or --without-trace was given.
    8872 @@ -10985,7 +11332,7 @@
     8904@@ -10985,7 +11357,7 @@
    88738905 else
    88748906   cf_with_trace=$cf_all_traces
    88758907 fi;
    88768908-echo "$as_me:10988: result: $cf_with_trace" >&5
    8877 +echo "$as_me:11335: result: $cf_with_trace" >&5
     8909+echo "$as_me:11360: result: $cf_with_trace" >&5
    88788910 echo "${ECHO_T}$cf_with_trace" >&6
    88798911 
    88808912 if test "$cf_with_trace" = yes ; then
    8881 @@ -11052,7 +11399,7 @@
     8913@@ -11052,7 +11424,7 @@
    88828914 
    88838915 if test -n "$cf_new_cppflags" ; then
     
    88888920 
    88898921 if test -n "$cf_new_extra_cppflags" ; then
    8890 @@ -11066,13 +11413,13 @@
     8922@@ -11066,13 +11438,17 @@
    88918923 fi
    88928924 
    88938925 ###    Checks for libraries.
    88948926-echo "$as_me:11069: checking for gettimeofday" >&5
    8895 +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
    88968932 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
    88978933 if test "${ac_cv_func_gettimeofday+set}" = set; then
     
    89008936   cat >conftest.$ac_ext <<_ACEOF
    89018937-#line 11075 "configure"
    8902 +#line 11422 "configure"
     8938+#line 11451 "configure"
    89038939 #include "confdefs.h"
    89048940 /* System header to define __stub macros and hopefully few prototypes,
    89058941     which can conflict with char gettimeofday (); below.  */
    8906 @@ -11103,16 +11450,16 @@
     8942@@ -11103,16 +11479,16 @@
    89078943 }
    89088944 _ACEOF
    89098945 rm -f conftest.$ac_objext conftest$ac_exeext
    89108946-if { (eval echo "$as_me:11106: \"$ac_link\"") >&5
    8911 +if { (eval echo "$as_me:11453: \"$ac_link\"") >&5
     8947+if { (eval echo "$as_me:11482: \"$ac_link\"") >&5
    89128948   (eval $ac_link) 2>&5
    89138949   ac_status=$?
    89148950-  echo "$as_me:11109: \$? = $ac_status" >&5
    8915 +  echo "$as_me:11456: \$? = $ac_status" >&5
     8951+  echo "$as_me:11485: \$? = $ac_status" >&5
    89168952   (exit $ac_status); } &&
    89178953          { ac_try='test -s conftest$ac_exeext'
    89188954-  { (eval echo "$as_me:11112: \"$ac_try\"") >&5
    8919 +  { (eval echo "$as_me:11459: \"$ac_try\"") >&5
     8955+  { (eval echo "$as_me:11488: \"$ac_try\"") >&5
    89208956   (eval $ac_try) 2>&5
    89218957   ac_status=$?
    89228958-  echo "$as_me:11115: \$? = $ac_status" >&5
    8923 +  echo "$as_me:11462: \$? = $ac_status" >&5
     8959+  echo "$as_me:11491: \$? = $ac_status" >&5
    89248960   (exit $ac_status); }; }; then
    89258961   ac_cv_func_gettimeofday=yes
    89268962 else
    8927 @@ -11122,7 +11469,7 @@
     8963@@ -11122,7 +11498,7 @@
    89288964 fi
    89298965 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    89308966 fi
    89318967-echo "$as_me:11125: result: $ac_cv_func_gettimeofday" >&5
    8932 +echo "$as_me:11472: result: $ac_cv_func_gettimeofday" >&5
     8968+echo "$as_me:11501: result: $ac_cv_func_gettimeofday" >&5
    89338969 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
    89348970 if test $ac_cv_func_gettimeofday = yes; then
    89358971   cat >>confdefs.h <<\EOF
    8936 @@ -11131,7 +11478,7 @@
     8972@@ -11131,7 +11507,7 @@
    89378973 
    89388974 else
    89398975 
    89408976-echo "$as_me:11134: checking for gettimeofday in -lbsd" >&5
    8941 +echo "$as_me:11481: checking for gettimeofday in -lbsd" >&5
     8977+echo "$as_me:11510: checking for gettimeofday in -lbsd" >&5
    89428978 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
    89438979 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
    89448980   echo $ECHO_N "(cached) $ECHO_C" >&6
    8945 @@ -11139,7 +11486,7 @@
     8981@@ -11139,7 +11515,7 @@
    89468982   ac_check_lib_save_LIBS=$LIBS
    89478983 LIBS="-lbsd  $LIBS"
    89488984 cat >conftest.$ac_ext <<_ACEOF
    89498985-#line 11142 "configure"
    8950 +#line 11489 "configure"
     8986+#line 11518 "configure"
    89518987 #include "confdefs.h"
    89528988 
    89538989 /* Override any gcc2 internal prototype to avoid an error.  */
    8954 @@ -11158,16 +11505,16 @@
     8990@@ -11158,16 +11534,16 @@
    89558991 }
    89568992 _ACEOF
    89578993 rm -f conftest.$ac_objext conftest$ac_exeext
    89588994-if { (eval echo "$as_me:11161: \"$ac_link\"") >&5
    8959 +if { (eval echo "$as_me:11508: \"$ac_link\"") >&5
     8995+if { (eval echo "$as_me:11537: \"$ac_link\"") >&5
    89608996   (eval $ac_link) 2>&5
    89618997   ac_status=$?
    89628998-  echo "$as_me:11164: \$? = $ac_status" >&5
    8963 +  echo "$as_me:11511: \$? = $ac_status" >&5
     8999+  echo "$as_me:11540: \$? = $ac_status" >&5
    89649000   (exit $ac_status); } &&
    89659001          { ac_try='test -s conftest$ac_exeext'
    89669002-  { (eval echo "$as_me:11167: \"$ac_try\"") >&5
    8967 +  { (eval echo "$as_me:11514: \"$ac_try\"") >&5
     9003+  { (eval echo "$as_me:11543: \"$ac_try\"") >&5
    89689004   (eval $ac_try) 2>&5
    89699005   ac_status=$?
    89709006-  echo "$as_me:11170: \$? = $ac_status" >&5
    8971 +  echo "$as_me:11517: \$? = $ac_status" >&5
     9007+  echo "$as_me:11546: \$? = $ac_status" >&5
    89729008   (exit $ac_status); }; }; then
    89739009   ac_cv_lib_bsd_gettimeofday=yes
    89749010 else
    8975 @@ -11178,7 +11525,7 @@
     9011@@ -11178,7 +11554,7 @@
    89769012 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    89779013 LIBS=$ac_check_lib_save_LIBS
    89789014 fi
    89799015-echo "$as_me:11181: result: $ac_cv_lib_bsd_gettimeofday" >&5
    8980 +echo "$as_me:11528: result: $ac_cv_lib_bsd_gettimeofday" >&5
     9016+echo "$as_me:11557: result: $ac_cv_lib_bsd_gettimeofday" >&5
    89819017 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
    89829018 if test $ac_cv_lib_bsd_gettimeofday = yes; then
    89839019   cat >>confdefs.h <<\EOF
    8984 @@ -11190,14 +11537,14 @@
    8985  
    8986  fi
     9020@@ -11189,15 +11565,17 @@
     9021 fi
     9022 
     9023 fi
     9024+       ;;
     9025+esac
    89879026 
    89889027-echo "$as_me:11193: checking if -lm needed for math functions" >&5
    8989 +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
    89909029 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
    89919030 if test "${cf_cv_need_libm+set}" = set; then
     
    89959034        cat >conftest.$ac_ext <<_ACEOF
    89969035-#line 11200 "configure"
    8997 +#line 11547 "configure"
     9036+#line 11578 "configure"
    89989037 #include "confdefs.h"
    89999038 
    90009039        #include <stdio.h>
    9001 @@ -11212,16 +11559,16 @@
     9040@@ -11212,16 +11590,16 @@
    90029041 }
    90039042 _ACEOF
    90049043 rm -f conftest.$ac_objext conftest$ac_exeext
    90059044-if { (eval echo "$as_me:11215: \"$ac_link\"") >&5
    9006 +if { (eval echo "$as_me:11562: \"$ac_link\"") >&5
     9045+if { (eval echo "$as_me:11593: \"$ac_link\"") >&5
    90079046   (eval $ac_link) 2>&5
    90089047   ac_status=$?
    90099048-  echo "$as_me:11218: \$? = $ac_status" >&5
    9010 +  echo "$as_me:11565: \$? = $ac_status" >&5
     9049+  echo "$as_me:11596: \$? = $ac_status" >&5
    90119050   (exit $ac_status); } &&
    90129051          { ac_try='test -s conftest$ac_exeext'
    90139052-  { (eval echo "$as_me:11221: \"$ac_try\"") >&5
    9014 +  { (eval echo "$as_me:11568: \"$ac_try\"") >&5
     9053+  { (eval echo "$as_me:11599: \"$ac_try\"") >&5
    90159054   (eval $ac_try) 2>&5
    90169055   ac_status=$?
    90179056-  echo "$as_me:11224: \$? = $ac_status" >&5
    9018 +  echo "$as_me:11571: \$? = $ac_status" >&5
     9057+  echo "$as_me:11602: \$? = $ac_status" >&5
    90199058   (exit $ac_status); }; }; then
    90209059   cf_cv_need_libm=no
    90219060 else
    9022 @@ -11231,7 +11578,7 @@
     9061@@ -11231,7 +11609,7 @@
    90239062 fi
    90249063 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    90259064 fi
    90269065-echo "$as_me:11234: result: $cf_cv_need_libm" >&5
    9027 +echo "$as_me:11581: result: $cf_cv_need_libm" >&5
     9066+echo "$as_me:11612: result: $cf_cv_need_libm" >&5
    90289067 echo "${ECHO_T}$cf_cv_need_libm" >&6
    90299068 if test "$cf_cv_need_libm" = yes
    90309069 then
    9031 @@ -11239,13 +11586,13 @@
     9070@@ -11239,13 +11617,13 @@
    90329071 fi
    90339072 
    90349073 ###    Checks for header files.
    90359074-echo "$as_me:11242: checking for ANSI C header files" >&5
    9036 +echo "$as_me:11589: checking for ANSI C header files" >&5
     9075+echo "$as_me:11620: checking for ANSI C header files" >&5
    90379076 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
    90389077 if test "${ac_cv_header_stdc+set}" = set; then
     
    90419080   cat >conftest.$ac_ext <<_ACEOF
    90429081-#line 11248 "configure"
    9043 +#line 11595 "configure"
     9082+#line 11626 "configure"
    90449083 #include "confdefs.h"
    90459084 #include <stdlib.h>
    90469085 #include <stdarg.h>
    9047 @@ -11253,13 +11600,13 @@
     9086@@ -11253,13 +11631,13 @@
    90489087 #include <float.h>
    90499088 
    90509089 _ACEOF
    90519090-if { (eval echo "$as_me:11256: \"$ac_cpp conftest.$ac_ext\"") >&5
    9052 +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
    90539092   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    90549093   ac_status=$?
     
    90579096   cat conftest.err >&5
    90589097-  echo "$as_me:11262: \$? = $ac_status" >&5
    9059 +  echo "$as_me:11609: \$? = $ac_status" >&5
     9098+  echo "$as_me:11640: \$? = $ac_status" >&5
    90609099   (exit $ac_status); } >/dev/null; then
    90619100   if test -s conftest.err; then
    90629101     ac_cpp_err=$ac_c_preproc_warn_flag
    9063 @@ -11281,7 +11628,7 @@
     9102@@ -11281,7 +11659,7 @@
    90649103 if test $ac_cv_header_stdc = yes; then
    90659104   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    90669105   cat >conftest.$ac_ext <<_ACEOF
    90679106-#line 11284 "configure"
    9068 +#line 11631 "configure"
     9107+#line 11662 "configure"
    90699108 #include "confdefs.h"
    90709109 #include <string.h>
    90719110 
    9072 @@ -11299,7 +11646,7 @@
     9111@@ -11299,7 +11677,7 @@
    90739112 if test $ac_cv_header_stdc = yes; then
    90749113   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    90759114   cat >conftest.$ac_ext <<_ACEOF
    90769115-#line 11302 "configure"
    9077 +#line 11649 "configure"
     9116+#line 11680 "configure"
    90789117 #include "confdefs.h"
    90799118 #include <stdlib.h>
    90809119 
    9081 @@ -11320,7 +11667,7 @@
     9120@@ -11320,7 +11698,7 @@
    90829121   :
    90839122 else
    90849123   cat >conftest.$ac_ext <<_ACEOF
    90859124-#line 11323 "configure"
    9086 +#line 11670 "configure"
     9125+#line 11701 "configure"
    90879126 #include "confdefs.h"
    90889127 #include <ctype.h>
    90899128 #if ((' ' & 0x0FF) == 0x020)
    9090 @@ -11346,15 +11693,15 @@
     9129@@ -11346,15 +11724,15 @@
    90919130 }
    90929131 _ACEOF
    90939132 rm -f conftest$ac_exeext
    90949133-if { (eval echo "$as_me:11349: \"$ac_link\"") >&5
    9095 +if { (eval echo "$as_me:11696: \"$ac_link\"") >&5
     9134+if { (eval echo "$as_me:11727: \"$ac_link\"") >&5
    90969135   (eval $ac_link) 2>&5
    90979136   ac_status=$?
    90989137-  echo "$as_me:11352: \$? = $ac_status" >&5
    9099 +  echo "$as_me:11699: \$? = $ac_status" >&5
     9138+  echo "$as_me:11730: \$? = $ac_status" >&5
    91009139   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    91019140-  { (eval echo "$as_me:11354: \"$ac_try\"") >&5
    9102 +  { (eval echo "$as_me:11701: \"$ac_try\"") >&5
     9141+  { (eval echo "$as_me:11732: \"$ac_try\"") >&5
    91039142   (eval $ac_try) 2>&5
    91049143   ac_status=$?
    91059144-  echo "$as_me:11357: \$? = $ac_status" >&5
    9106 +  echo "$as_me:11704: \$? = $ac_status" >&5
     9145+  echo "$as_me:11735: \$? = $ac_status" >&5
    91079146   (exit $ac_status); }; }; then
    91089147   :
    91099148 else
    9110 @@ -11367,7 +11714,7 @@
     9149@@ -11367,7 +11745,7 @@
    91119150 fi
    91129151 fi
    91139152 fi
    91149153-echo "$as_me:11370: result: $ac_cv_header_stdc" >&5
    9115 +echo "$as_me:11717: result: $ac_cv_header_stdc" >&5
     9154+echo "$as_me:11748: result: $ac_cv_header_stdc" >&5
    91169155 echo "${ECHO_T}$ac_cv_header_stdc" >&6
    91179156 if test $ac_cv_header_stdc = yes; then
    91189157 
    9119 @@ -11380,13 +11727,13 @@
     9158@@ -11380,13 +11758,13 @@
    91209159 ac_header_dirent=no
    91219160 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
    91229161   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
    91239162-echo "$as_me:11383: checking for $ac_hdr that defines DIR" >&5
    9124 +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
    91259164 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
    91269165 if eval "test \"\${$as_ac_Header+set}\" = set"; then
     
    91299168   cat >conftest.$ac_ext <<_ACEOF
    91309169-#line 11389 "configure"
    9131 +#line 11736 "configure"
     9170+#line 11767 "configure"
    91329171 #include "confdefs.h"
    91339172 #include <sys/types.h>
    91349173 #include <$ac_hdr>
    9135 @@ -11401,16 +11748,16 @@
     9174@@ -11401,16 +11779,16 @@
    91369175 }
    91379176 _ACEOF
    91389177 rm -f conftest.$ac_objext
    91399178-if { (eval echo "$as_me:11404: \"$ac_compile\"") >&5
    9140 +if { (eval echo "$as_me:11751: \"$ac_compile\"") >&5
     9179+if { (eval echo "$as_me:11782: \"$ac_compile\"") >&5
    91419180   (eval $ac_compile) 2>&5
    91429181   ac_status=$?
    91439182-  echo "$as_me:11407: \$? = $ac_status" >&5
    9144 +  echo "$as_me:11754: \$? = $ac_status" >&5
     9183+  echo "$as_me:11785: \$? = $ac_status" >&5
    91459184   (exit $ac_status); } &&
    91469185          { ac_try='test -s conftest.$ac_objext'
    91479186-  { (eval echo "$as_me:11410: \"$ac_try\"") >&5
    9148 +  { (eval echo "$as_me:11757: \"$ac_try\"") >&5
     9187+  { (eval echo "$as_me:11788: \"$ac_try\"") >&5
    91499188   (eval $ac_try) 2>&5
    91509189   ac_status=$?
    91519190-  echo "$as_me:11413: \$? = $ac_status" >&5
    9152 +  echo "$as_me:11760: \$? = $ac_status" >&5
     9191+  echo "$as_me:11791: \$? = $ac_status" >&5
    91539192   (exit $ac_status); }; }; then
    91549193   eval "$as_ac_Header=yes"
    91559194 else
    9156 @@ -11420,7 +11767,7 @@
     9195@@ -11420,7 +11798,7 @@
    91579196 fi
    91589197 rm -f conftest.$ac_objext conftest.$ac_ext
    91599198 fi
    91609199-echo "$as_me:11423: result: `eval echo '${'$as_ac_Header'}'`" >&5
    9161 +echo "$as_me:11770: result: `eval echo '${'$as_ac_Header'}'`" >&5
     9200+echo "$as_me:11801: result: `eval echo '${'$as_ac_Header'}'`" >&5
    91629201 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    91639202 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    91649203   cat >>confdefs.h <<EOF
    9165 @@ -11433,7 +11780,7 @@
     9204@@ -11433,7 +11811,7 @@
    91669205 done
    91679206 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
    91689207 if test $ac_header_dirent = dirent.h; then
    91699208-  echo "$as_me:11436: checking for opendir in -ldir" >&5
    9170 +  echo "$as_me:11783: checking for opendir in -ldir" >&5
     9209+  echo "$as_me:11814: checking for opendir in -ldir" >&5
    91719210 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
    91729211 if test "${ac_cv_lib_dir_opendir+set}" = set; then
    91739212   echo $ECHO_N "(cached) $ECHO_C" >&6
    9174 @@ -11441,7 +11788,7 @@
     9213@@ -11441,7 +11819,7 @@
    91759214   ac_check_lib_save_LIBS=$LIBS
    91769215 LIBS="-ldir  $LIBS"
    91779216 cat >conftest.$ac_ext <<_ACEOF
    91789217-#line 11444 "configure"
    9179 +#line 11791 "configure"
     9218+#line 11822 "configure"
    91809219 #include "confdefs.h"
    91819220 
    91829221 /* Override any gcc2 internal prototype to avoid an error.  */
    9183 @@ -11460,16 +11807,16 @@
     9222@@ -11460,16 +11838,16 @@
    91849223 }
    91859224 _ACEOF
    91869225 rm -f conftest.$ac_objext conftest$ac_exeext
    91879226-if { (eval echo "$as_me:11463: \"$ac_link\"") >&5
    9188 +if { (eval echo "$as_me:11810: \"$ac_link\"") >&5
     9227+if { (eval echo "$as_me:11841: \"$ac_link\"") >&5
    91899228   (eval $ac_link) 2>&5
    91909229   ac_status=$?
    91919230-  echo "$as_me:11466: \$? = $ac_status" >&5
    9192 +  echo "$as_me:11813: \$? = $ac_status" >&5
     9231+  echo "$as_me:11844: \$? = $ac_status" >&5
    91939232   (exit $ac_status); } &&
    91949233          { ac_try='test -s conftest$ac_exeext'
    91959234-  { (eval echo "$as_me:11469: \"$ac_try\"") >&5
    9196 +  { (eval echo "$as_me:11816: \"$ac_try\"") >&5
     9235+  { (eval echo "$as_me:11847: \"$ac_try\"") >&5
    91979236   (eval $ac_try) 2>&5
    91989237   ac_status=$?
    91999238-  echo "$as_me:11472: \$? = $ac_status" >&5
    9200 +  echo "$as_me:11819: \$? = $ac_status" >&5
     9239+  echo "$as_me:11850: \$? = $ac_status" >&5
    92019240   (exit $ac_status); }; }; then
    92029241   ac_cv_lib_dir_opendir=yes
    92039242 else
    9204 @@ -11480,14 +11827,14 @@
     9243@@ -11480,14 +11858,14 @@
    92059244 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    92069245 LIBS=$ac_check_lib_save_LIBS
    92079246 fi
    92089247-echo "$as_me:11483: result: $ac_cv_lib_dir_opendir" >&5
    9209 +echo "$as_me:11830: result: $ac_cv_lib_dir_opendir" >&5
     9248+echo "$as_me:11861: result: $ac_cv_lib_dir_opendir" >&5
    92109249 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
    92119250 if test $ac_cv_lib_dir_opendir = yes; then
     
    92159254 else
    92169255-  echo "$as_me:11490: checking for opendir in -lx" >&5
    9217 +  echo "$as_me:11837: checking for opendir in -lx" >&5
     9256+  echo "$as_me:11868: checking for opendir in -lx" >&5
    92189257 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
    92199258 if test "${ac_cv_lib_x_opendir+set}" = set; then
    92209259   echo $ECHO_N "(cached) $ECHO_C" >&6
    9221 @@ -11495,7 +11842,7 @@
     9260@@ -11495,7 +11873,7 @@
    92229261   ac_check_lib_save_LIBS=$LIBS
    92239262 LIBS="-lx  $LIBS"
    92249263 cat >conftest.$ac_ext <<_ACEOF
    92259264-#line 11498 "configure"
    9226 +#line 11845 "configure"
     9265+#line 11876 "configure"
    92279266 #include "confdefs.h"
    92289267 
    92299268 /* Override any gcc2 internal prototype to avoid an error.  */
    9230 @@ -11514,16 +11861,16 @@
     9269@@ -11514,16 +11892,16 @@
    92319270 }
    92329271 _ACEOF
    92339272 rm -f conftest.$ac_objext conftest$ac_exeext
    92349273-if { (eval echo "$as_me:11517: \"$ac_link\"") >&5
    9235 +if { (eval echo "$as_me:11864: \"$ac_link\"") >&5
     9274+if { (eval echo "$as_me:11895: \"$ac_link\"") >&5
    92369275   (eval $ac_link) 2>&5
    92379276   ac_status=$?
    92389277-  echo "$as_me:11520: \$? = $ac_status" >&5
    9239 +  echo "$as_me:11867: \$? = $ac_status" >&5
     9278+  echo "$as_me:11898: \$? = $ac_status" >&5
    92409279   (exit $ac_status); } &&
    92419280          { ac_try='test -s conftest$ac_exeext'
    92429281-  { (eval echo "$as_me:11523: \"$ac_try\"") >&5
    9243 +  { (eval echo "$as_me:11870: \"$ac_try\"") >&5
     9282+  { (eval echo "$as_me:11901: \"$ac_try\"") >&5
    92449283   (eval $ac_try) 2>&5
    92459284   ac_status=$?
    92469285-  echo "$as_me:11526: \$? = $ac_status" >&5
    9247 +  echo "$as_me:11873: \$? = $ac_status" >&5
     9286+  echo "$as_me:11904: \$? = $ac_status" >&5
    92489287   (exit $ac_status); }; }; then
    92499288   ac_cv_lib_x_opendir=yes
    92509289 else
    9251 @@ -11534,7 +11881,7 @@
     9290@@ -11534,7 +11912,7 @@
    92529291 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    92539292 LIBS=$ac_check_lib_save_LIBS
    92549293 fi
    92559294-echo "$as_me:11537: result: $ac_cv_lib_x_opendir" >&5
    9256 +echo "$as_me:11884: result: $ac_cv_lib_x_opendir" >&5
     9295+echo "$as_me:11915: result: $ac_cv_lib_x_opendir" >&5
    92579296 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
    92589297 if test $ac_cv_lib_x_opendir = yes; then
    92599298   LIBS="$LIBS -lx"
    9260 @@ -11542,13 +11889,13 @@
     9299@@ -11542,13 +11920,13 @@
    92619300 
    92629301 fi
    92639302 
    92649303-echo "$as_me:11545: checking whether time.h and sys/time.h may both be included" >&5
    9265 +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
    92669305 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
    92679306 if test "${ac_cv_header_time+set}" = set; then
     
    92709309   cat >conftest.$ac_ext <<_ACEOF
    92719310-#line 11551 "configure"
    9272 +#line 11898 "configure"
     9311+#line 11929 "configure"
    92739312 #include "confdefs.h"
    92749313 #include <sys/types.h>
    92759314 #include <sys/time.h>
    9276 @@ -11564,16 +11911,16 @@
     9315@@ -11564,16 +11942,16 @@
    92779316 }
    92789317 _ACEOF
    92799318 rm -f conftest.$ac_objext
    92809319-if { (eval echo "$as_me:11567: \"$ac_compile\"") >&5
    9281 +if { (eval echo "$as_me:11914: \"$ac_compile\"") >&5
     9320+if { (eval echo "$as_me:11945: \"$ac_compile\"") >&5
    92829321   (eval $ac_compile) 2>&5
    92839322   ac_status=$?
    92849323-  echo "$as_me:11570: \$? = $ac_status" >&5
    9285 +  echo "$as_me:11917: \$? = $ac_status" >&5
     9324+  echo "$as_me:11948: \$? = $ac_status" >&5
    92869325   (exit $ac_status); } &&
    92879326          { ac_try='test -s conftest.$ac_objext'
    92889327-  { (eval echo "$as_me:11573: \"$ac_try\"") >&5
    9289 +  { (eval echo "$as_me:11920: \"$ac_try\"") >&5
     9328+  { (eval echo "$as_me:11951: \"$ac_try\"") >&5
    92909329   (eval $ac_try) 2>&5
    92919330   ac_status=$?
    92929331-  echo "$as_me:11576: \$? = $ac_status" >&5
    9293 +  echo "$as_me:11923: \$? = $ac_status" >&5
     9332+  echo "$as_me:11954: \$? = $ac_status" >&5
    92949333   (exit $ac_status); }; }; then
    92959334   ac_cv_header_time=yes
    92969335 else
    9297 @@ -11583,7 +11930,7 @@
     9336@@ -11583,7 +11961,7 @@
    92989337 fi
    92999338 rm -f conftest.$ac_objext conftest.$ac_ext
    93009339 fi
    93019340-echo "$as_me:11586: result: $ac_cv_header_time" >&5
    9302 +echo "$as_me:11933: result: $ac_cv_header_time" >&5
     9341+echo "$as_me:11964: result: $ac_cv_header_time" >&5
    93039342 echo "${ECHO_T}$ac_cv_header_time" >&6
    93049343 if test $ac_cv_header_time = yes; then
    93059344 
    9306 @@ -11593,14 +11940,14 @@
     9345@@ -11593,14 +11971,14 @@
    93079346 
    93089347 fi
    93099348 
    93109349-echo "$as_me:11596: checking for regular-expression headers" >&5
    9311 +echo "$as_me:11943: checking for regular-expression headers" >&5
     9350+echo "$as_me:11974: checking for regular-expression headers" >&5
    93129351 echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
    93139352 if test "${cf_cv_regex+set}" = set; then
     
    93179356 cat >conftest.$ac_ext <<_ACEOF
    93189357-#line 11603 "configure"
    9319 +#line 11950 "configure"
     9358+#line 11981 "configure"
    93209359 #include "confdefs.h"
    93219360 #include <sys/types.h>
    93229361 #include <regex.h>
    9323 @@ -11618,16 +11965,16 @@
     9362@@ -11618,16 +11996,16 @@
    93249363 }
    93259364 _ACEOF
    93269365 rm -f conftest.$ac_objext conftest$ac_exeext
    93279366-if { (eval echo "$as_me:11621: \"$ac_link\"") >&5
    9328 +if { (eval echo "$as_me:11968: \"$ac_link\"") >&5
     9367+if { (eval echo "$as_me:11999: \"$ac_link\"") >&5
    93299368   (eval $ac_link) 2>&5
    93309369   ac_status=$?
    93319370-  echo "$as_me:11624: \$? = $ac_status" >&5
    9332 +  echo "$as_me:11971: \$? = $ac_status" >&5
     9371+  echo "$as_me:12002: \$? = $ac_status" >&5
    93339372   (exit $ac_status); } &&
    93349373          { ac_try='test -s conftest$ac_exeext'
    93359374-  { (eval echo "$as_me:11627: \"$ac_try\"") >&5
    9336 +  { (eval echo "$as_me:11974: \"$ac_try\"") >&5
     9375+  { (eval echo "$as_me:12005: \"$ac_try\"") >&5
    93379376   (eval $ac_try) 2>&5
    93389377   ac_status=$?
    93399378-  echo "$as_me:11630: \$? = $ac_status" >&5
    9340 +  echo "$as_me:11977: \$? = $ac_status" >&5
     9379+  echo "$as_me:12008: \$? = $ac_status" >&5
    93419380   (exit $ac_status); }; }; then
    93429381   cf_cv_regex="regex.h"
    93439382 else
    9344 @@ -11635,7 +11982,7 @@
     9383@@ -11635,7 +12013,7 @@
    93459384 cat conftest.$ac_ext >&5
    93469385 
    93479386        cat >conftest.$ac_ext <<_ACEOF
    93489387-#line 11638 "configure"
    9349 +#line 11985 "configure"
     9388+#line 12016 "configure"
    93509389 #include "confdefs.h"
    93519390 #include <regexp.h>
    93529391 int
    9353 @@ -11650,16 +11997,16 @@
     9392@@ -11650,16 +12028,16 @@
    93549393 }
    93559394 _ACEOF
    93569395 rm -f conftest.$ac_objext conftest$ac_exeext
    93579396-if { (eval echo "$as_me:11653: \"$ac_link\"") >&5
    9358 +if { (eval echo "$as_me:12000: \"$ac_link\"") >&5
     9397+if { (eval echo "$as_me:12031: \"$ac_link\"") >&5
    93599398   (eval $ac_link) 2>&5
    93609399   ac_status=$?
    93619400-  echo "$as_me:11656: \$? = $ac_status" >&5
    9362 +  echo "$as_me:12003: \$? = $ac_status" >&5
     9401+  echo "$as_me:12034: \$? = $ac_status" >&5
    93639402   (exit $ac_status); } &&
    93649403          { ac_try='test -s conftest$ac_exeext'
    93659404-  { (eval echo "$as_me:11659: \"$ac_try\"") >&5
    9366 +  { (eval echo "$as_me:12006: \"$ac_try\"") >&5
     9405+  { (eval echo "$as_me:12037: \"$ac_try\"") >&5
    93679406   (eval $ac_try) 2>&5
    93689407   ac_status=$?
    93699408-  echo "$as_me:11662: \$? = $ac_status" >&5
    9370 +  echo "$as_me:12009: \$? = $ac_status" >&5
     9409+  echo "$as_me:12040: \$? = $ac_status" >&5
    93719410   (exit $ac_status); }; }; then
    93729411   cf_cv_regex="regexp.h"
    93739412 else
    9374 @@ -11669,7 +12016,7 @@
     9413@@ -11669,7 +12047,7 @@
    93759414                cf_save_LIBS="$LIBS"
    93769415                LIBS="-lgen $LIBS"
    93779416                cat >conftest.$ac_ext <<_ACEOF
    93789417-#line 11672 "configure"
    9379 +#line 12019 "configure"
     9418+#line 12050 "configure"
    93809419 #include "confdefs.h"
    93819420 #include <regexpr.h>
    93829421 int
    9383 @@ -11684,16 +12031,16 @@
     9422@@ -11684,16 +12062,16 @@
    93849423 }
    93859424 _ACEOF
    93869425 rm -f conftest.$ac_objext conftest$ac_exeext
    93879426-if { (eval echo "$as_me:11687: \"$ac_link\"") >&5
    9388 +if { (eval echo "$as_me:12034: \"$ac_link\"") >&5
     9427+if { (eval echo "$as_me:12065: \"$ac_link\"") >&5
    93899428   (eval $ac_link) 2>&5
    93909429   ac_status=$?
    93919430-  echo "$as_me:11690: \$? = $ac_status" >&5
    9392 +  echo "$as_me:12037: \$? = $ac_status" >&5
     9431+  echo "$as_me:12068: \$? = $ac_status" >&5
    93939432   (exit $ac_status); } &&
    93949433          { ac_try='test -s conftest$ac_exeext'
    93959434-  { (eval echo "$as_me:11693: \"$ac_try\"") >&5
    9396 +  { (eval echo "$as_me:12040: \"$ac_try\"") >&5
     9435+  { (eval echo "$as_me:12071: \"$ac_try\"") >&5
    93979436   (eval $ac_try) 2>&5
    93989437   ac_status=$?
    93999438-  echo "$as_me:11696: \$? = $ac_status" >&5
    9400 +  echo "$as_me:12043: \$? = $ac_status" >&5
     9439+  echo "$as_me:12074: \$? = $ac_status" >&5
    94019440   (exit $ac_status); }; }; then
    94029441   cf_cv_regex="regexpr.h"
    94039442 else
    9404 @@ -11709,7 +12056,7 @@
     9443@@ -11709,7 +12087,7 @@
    94059444 
    94069445 fi
    94079446 
    94089447-echo "$as_me:11712: result: $cf_cv_regex" >&5
    9409 +echo "$as_me:12059: result: $cf_cv_regex" >&5
     9448+echo "$as_me:12090: result: $cf_cv_regex" >&5
    94109449 echo "${ECHO_T}$cf_cv_regex" >&6
    94119450 case $cf_cv_regex in
    94129451        regex.h)   cat >>confdefs.h <<\EOF
    9413 @@ -11745,23 +12092,23 @@
     9452@@ -11745,23 +12123,23 @@
    94149453 
    94159454 do
    94169455 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    94179456-echo "$as_me:11748: checking for $ac_header" >&5
    9418 +echo "$as_me:12095: checking for $ac_header" >&5
     9457+echo "$as_me:12126: checking for $ac_header" >&5
    94199458 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
    94209459 if eval "test \"\${$as_ac_Header+set}\" = set"; then
     
    94239462   cat >conftest.$ac_ext <<_ACEOF
    94249463-#line 11754 "configure"
    9425 +#line 12101 "configure"
     9464+#line 12132 "configure"
    94269465 #include "confdefs.h"
    94279466 #include <$ac_header>
    94289467 _ACEOF
    94299468-if { (eval echo "$as_me:11758: \"$ac_cpp conftest.$ac_ext\"") >&5
    9430 +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
    94319470   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    94329471   ac_status=$?
     
    94359474   cat conftest.err >&5
    94369475-  echo "$as_me:11764: \$? = $ac_status" >&5
    9437 +  echo "$as_me:12111: \$? = $ac_status" >&5
     9476+  echo "$as_me:12142: \$? = $ac_status" >&5
    94389477   (exit $ac_status); } >/dev/null; then
    94399478   if test -s conftest.err; then
    94409479     ac_cpp_err=$ac_c_preproc_warn_flag
    9441 @@ -11780,7 +12127,7 @@
     9480@@ -11780,7 +12158,7 @@
    94429481 fi
    94439482 rm -f conftest.err conftest.$ac_ext
    94449483 fi
    94459484-echo "$as_me:11783: result: `eval echo '${'$as_ac_Header'}'`" >&5
    9446 +echo "$as_me:12130: result: `eval echo '${'$as_ac_Header'}'`" >&5
     9485+echo "$as_me:12161: result: `eval echo '${'$as_ac_Header'}'`" >&5
    94479486 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    94489487 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    94499488   cat >>confdefs.h <<EOF
    9450 @@ -11794,7 +12141,7 @@
     9489@@ -11794,7 +12172,7 @@
    94519490 # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
    94529491 if test "$ISC" = yes ; then
    94539492 
    94549493-echo "$as_me:11797: checking for main in -lcposix" >&5
    9455 +echo "$as_me:12144: checking for main in -lcposix" >&5
     9494+echo "$as_me:12175: checking for main in -lcposix" >&5
    94569495 echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
    94579496 if test "${ac_cv_lib_cposix_main+set}" = set; then
    94589497   echo $ECHO_N "(cached) $ECHO_C" >&6
    9459 @@ -11802,7 +12149,7 @@
     9498@@ -11802,7 +12180,7 @@
    94609499   ac_check_lib_save_LIBS=$LIBS
    94619500 LIBS="-lcposix  $LIBS"
    94629501 cat >conftest.$ac_ext <<_ACEOF
    94639502-#line 11805 "configure"
    9464 +#line 12152 "configure"
     9503+#line 12183 "configure"
    94659504 #include "confdefs.h"
    94669505 
    94679506 int
    9468 @@ -11814,16 +12161,16 @@
     9507@@ -11814,16 +12192,16 @@
    94699508 }
    94709509 _ACEOF
    94719510 rm -f conftest.$ac_objext conftest$ac_exeext
    94729511-if { (eval echo "$as_me:11817: \"$ac_link\"") >&5
    9473 +if { (eval echo "$as_me:12164: \"$ac_link\"") >&5
     9512+if { (eval echo "$as_me:12195: \"$ac_link\"") >&5
    94749513   (eval $ac_link) 2>&5
    94759514   ac_status=$?
    94769515-  echo "$as_me:11820: \$? = $ac_status" >&5
    9477 +  echo "$as_me:12167: \$? = $ac_status" >&5
     9516+  echo "$as_me:12198: \$? = $ac_status" >&5
    94789517   (exit $ac_status); } &&
    94799518          { ac_try='test -s conftest$ac_exeext'
    94809519-  { (eval echo "$as_me:11823: \"$ac_try\"") >&5
    9481 +  { (eval echo "$as_me:12170: \"$ac_try\"") >&5
     9520+  { (eval echo "$as_me:12201: \"$ac_try\"") >&5
    94829521   (eval $ac_try) 2>&5
    94839522   ac_status=$?
    94849523-  echo "$as_me:11826: \$? = $ac_status" >&5
    9485 +  echo "$as_me:12173: \$? = $ac_status" >&5
     9524+  echo "$as_me:12204: \$? = $ac_status" >&5
    94869525   (exit $ac_status); }; }; then
    94879526   ac_cv_lib_cposix_main=yes
    94889527 else
    9489 @@ -11834,7 +12181,7 @@
     9528@@ -11834,7 +12212,7 @@
    94909529 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    94919530 LIBS=$ac_check_lib_save_LIBS
    94929531 fi
    94939532-echo "$as_me:11837: result: $ac_cv_lib_cposix_main" >&5
    9494 +echo "$as_me:12184: result: $ac_cv_lib_cposix_main" >&5
     9533+echo "$as_me:12215: result: $ac_cv_lib_cposix_main" >&5
    94959534 echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
    94969535 if test $ac_cv_lib_cposix_main = yes; then
    94979536   cat >>confdefs.h <<EOF
    9498 @@ -11845,7 +12192,7 @@
     9537@@ -11845,7 +12223,7 @@
    94999538 
    95009539 fi
    95019540 
    95029541-       echo "$as_me:11848: checking for bzero in -linet" >&5
    9503 +       echo "$as_me:12195: checking for bzero in -linet" >&5
     9542+       echo "$as_me:12226: checking for bzero in -linet" >&5
    95049543 echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
    95059544 if test "${ac_cv_lib_inet_bzero+set}" = set; then
    95069545   echo $ECHO_N "(cached) $ECHO_C" >&6
    9507 @@ -11853,7 +12200,7 @@
     9546@@ -11853,7 +12231,7 @@
    95089547   ac_check_lib_save_LIBS=$LIBS
    95099548 LIBS="-linet  $LIBS"
    95109549 cat >conftest.$ac_ext <<_ACEOF
    95119550-#line 11856 "configure"
    9512 +#line 12203 "configure"
     9551+#line 12234 "configure"
    95139552 #include "confdefs.h"
    95149553 
    95159554 /* Override any gcc2 internal prototype to avoid an error.  */
    9516 @@ -11872,16 +12219,16 @@
     9555@@ -11872,16 +12250,16 @@
    95179556 }
    95189557 _ACEOF
    95199558 rm -f conftest.$ac_objext conftest$ac_exeext
    95209559-if { (eval echo "$as_me:11875: \"$ac_link\"") >&5
    9521 +if { (eval echo "$as_me:12222: \"$ac_link\"") >&5
     9560+if { (eval echo "$as_me:12253: \"$ac_link\"") >&5
    95229561   (eval $ac_link) 2>&5
    95239562   ac_status=$?
    95249563-  echo "$as_me:11878: \$? = $ac_status" >&5
    9525 +  echo "$as_me:12225: \$? = $ac_status" >&5
     9564+  echo "$as_me:12256: \$? = $ac_status" >&5
    95269565   (exit $ac_status); } &&
    95279566          { ac_try='test -s conftest$ac_exeext'
    95289567-  { (eval echo "$as_me:11881: \"$ac_try\"") >&5
    9529 +  { (eval echo "$as_me:12228: \"$ac_try\"") >&5
     9568+  { (eval echo "$as_me:12259: \"$ac_try\"") >&5
    95309569   (eval $ac_try) 2>&5
    95319570   ac_status=$?
    95329571-  echo "$as_me:11884: \$? = $ac_status" >&5
    9533 +  echo "$as_me:12231: \$? = $ac_status" >&5
     9572+  echo "$as_me:12262: \$? = $ac_status" >&5
    95349573   (exit $ac_status); }; }; then
    95359574   ac_cv_lib_inet_bzero=yes
    95369575 else
    9537 @@ -11892,21 +12239,21 @@
     9576@@ -11892,21 +12270,21 @@
    95389577 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    95399578 LIBS=$ac_check_lib_save_LIBS
    95409579 fi
    95419580-echo "$as_me:11895: result: $ac_cv_lib_inet_bzero" >&5
    9542 +echo "$as_me:12242: result: $ac_cv_lib_inet_bzero" >&5
     9581+echo "$as_me:12273: result: $ac_cv_lib_inet_bzero" >&5
    95439582 echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
    95449583 if test $ac_cv_lib_inet_bzero = yes; then
     
    95489587 
    95499588-echo "$as_me:11902: checking if sys/time.h works with sys/select.h" >&5
    9550 +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
    95519590 echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
    95529591 if test "${cf_cv_sys_time_select+set}" = set; then
     
    95569595 cat >conftest.$ac_ext <<_ACEOF
    95579596-#line 11909 "configure"
    9558 +#line 12256 "configure"
     9597+#line 12287 "configure"
    95599598 #include "confdefs.h"
    95609599 
    95619600 #include <sys/types.h>
    9562 @@ -11926,16 +12273,16 @@
     9601@@ -11926,16 +12304,16 @@
    95639602 }
    95649603 _ACEOF
    95659604 rm -f conftest.$ac_objext
    95669605-if { (eval echo "$as_me:11929: \"$ac_compile\"") >&5
    9567 +if { (eval echo "$as_me:12276: \"$ac_compile\"") >&5
     9606+if { (eval echo "$as_me:12307: \"$ac_compile\"") >&5
    95689607   (eval $ac_compile) 2>&5
    95699608   ac_status=$?
    95709609-  echo "$as_me:11932: \$? = $ac_status" >&5
    9571 +  echo "$as_me:12279: \$? = $ac_status" >&5
     9610+  echo "$as_me:12310: \$? = $ac_status" >&5
    95729611   (exit $ac_status); } &&
    95739612          { ac_try='test -s conftest.$ac_objext'
    95749613-  { (eval echo "$as_me:11935: \"$ac_try\"") >&5
    9575 +  { (eval echo "$as_me:12282: \"$ac_try\"") >&5
     9614+  { (eval echo "$as_me:12313: \"$ac_try\"") >&5
    95769615   (eval $ac_try) 2>&5
    95779616   ac_status=$?
    95789617-  echo "$as_me:11938: \$? = $ac_status" >&5
    9579 +  echo "$as_me:12285: \$? = $ac_status" >&5
     9618+  echo "$as_me:12316: \$? = $ac_status" >&5
    95809619   (exit $ac_status); }; }; then
    95819620   cf_cv_sys_time_select=yes
    95829621 else
    9583 @@ -11947,7 +12294,7 @@
     9622@@ -11947,7 +12325,7 @@
    95849623 
    95859624 fi
    95869625 
    95879626-echo "$as_me:11950: result: $cf_cv_sys_time_select" >&5
    9588 +echo "$as_me:12297: result: $cf_cv_sys_time_select" >&5
     9627+echo "$as_me:12328: result: $cf_cv_sys_time_select" >&5
    95899628 echo "${ECHO_T}$cf_cv_sys_time_select" >&6
    95909629 test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF
    95919630 #define HAVE_SYS_TIME_SELECT 1
    9592 @@ -11961,7 +12308,7 @@
     9631@@ -11961,7 +12339,7 @@
    95939632 ac_compiler_gnu=$ac_cv_c_compiler_gnu
    95949633 ac_main_return=return
    95959634 
    95969635-echo "$as_me:11964: checking for $CC option to accept ANSI C" >&5
    9597 +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
    95989637 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
    95999638 if test "${ac_cv_prog_cc_stdc+set}" = set; then
    96009639   echo $ECHO_N "(cached) $ECHO_C" >&6
    9601 @@ -11969,7 +12316,7 @@
     9640@@ -11969,7 +12347,7 @@
    96029641   ac_cv_prog_cc_stdc=no
    96039642 ac_save_CC=$CC
    96049643 cat >conftest.$ac_ext <<_ACEOF
    96059644-#line 11972 "configure"
    9606 +#line 12319 "configure"
     9645+#line 12350 "configure"
    96079646 #include "confdefs.h"
    96089647 #include <stdarg.h>
    96099648 #include <stdio.h>
    9610 @@ -12018,16 +12365,16 @@
     9649@@ -12018,16 +12396,16 @@
    96119650 do
    96129651   CC="$ac_save_CC $ac_arg"
    96139652   rm -f conftest.$ac_objext
    96149653-if { (eval echo "$as_me:12021: \"$ac_compile\"") >&5
    9615 +if { (eval echo "$as_me:12368: \"$ac_compile\"") >&5
     9654+if { (eval echo "$as_me:12399: \"$ac_compile\"") >&5
    96169655   (eval $ac_compile) 2>&5
    96179656   ac_status=$?
    96189657-  echo "$as_me:12024: \$? = $ac_status" >&5
    9619 +  echo "$as_me:12371: \$? = $ac_status" >&5
     9658+  echo "$as_me:12402: \$? = $ac_status" >&5
    96209659   (exit $ac_status); } &&
    96219660          { ac_try='test -s conftest.$ac_objext'
    96229661-  { (eval echo "$as_me:12027: \"$ac_try\"") >&5
    9623 +  { (eval echo "$as_me:12374: \"$ac_try\"") >&5
     9662+  { (eval echo "$as_me:12405: \"$ac_try\"") >&5
    96249663   (eval $ac_try) 2>&5
    96259664   ac_status=$?
    96269665-  echo "$as_me:12030: \$? = $ac_status" >&5
    9627 +  echo "$as_me:12377: \$? = $ac_status" >&5
     9666+  echo "$as_me:12408: \$? = $ac_status" >&5
    96289667   (exit $ac_status); }; }; then
    96299668   ac_cv_prog_cc_stdc=$ac_arg
    96309669 break
    9631 @@ -12044,21 +12391,21 @@
     9670@@ -12044,21 +12422,21 @@
    96329671 
    96339672 case "x$ac_cv_prog_cc_stdc" in
    96349673   x|xno)
    96359674-    echo "$as_me:12047: result: none needed" >&5
    9636 +    echo "$as_me:12394: result: none needed" >&5
     9675+    echo "$as_me:12425: result: none needed" >&5
    96379676 echo "${ECHO_T}none needed" >&6 ;;
    96389677   *)
    96399678-    echo "$as_me:12050: result: $ac_cv_prog_cc_stdc" >&5
    9640 +    echo "$as_me:12397: result: $ac_cv_prog_cc_stdc" >&5
     9679+    echo "$as_me:12428: result: $ac_cv_prog_cc_stdc" >&5
    96419680 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
    96429681     CC="$CC $ac_cv_prog_cc_stdc" ;;
     
    96449683 
    96459684-echo "$as_me:12055: checking for an ANSI C-conforming const" >&5
    9646 +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
    96479686 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
    96489687 if test "${ac_cv_c_const+set}" = set; then
     
    96519690   cat >conftest.$ac_ext <<_ACEOF
    96529691-#line 12061 "configure"
    9653 +#line 12408 "configure"
     9692+#line 12439 "configure"
    96549693 #include "confdefs.h"
    96559694 
    96569695 int
    9657 @@ -12116,16 +12463,16 @@
     9696@@ -12116,16 +12494,16 @@
    96589697 }
    96599698 _ACEOF
    96609699 rm -f conftest.$ac_objext
    96619700-if { (eval echo "$as_me:12119: \"$ac_compile\"") >&5
    9662 +if { (eval echo "$as_me:12466: \"$ac_compile\"") >&5
     9701+if { (eval echo "$as_me:12497: \"$ac_compile\"") >&5
    96639702   (eval $ac_compile) 2>&5
    96649703   ac_status=$?
    96659704-  echo "$as_me:12122: \$? = $ac_status" >&5
    9666 +  echo "$as_me:12469: \$? = $ac_status" >&5
     9705+  echo "$as_me:12500: \$? = $ac_status" >&5
    96679706   (exit $ac_status); } &&
    96689707          { ac_try='test -s conftest.$ac_objext'
    96699708-  { (eval echo "$as_me:12125: \"$ac_try\"") >&5
    9670 +  { (eval echo "$as_me:12472: \"$ac_try\"") >&5
     9709+  { (eval echo "$as_me:12503: \"$ac_try\"") >&5
    96719710   (eval $ac_try) 2>&5
    96729711   ac_status=$?
    96739712-  echo "$as_me:12128: \$? = $ac_status" >&5
    9674 +  echo "$as_me:12475: \$? = $ac_status" >&5
     9713+  echo "$as_me:12506: \$? = $ac_status" >&5
    96759714   (exit $ac_status); }; }; then
    96769715   ac_cv_c_const=yes
    96779716 else
    9678 @@ -12135,7 +12482,7 @@
     9717@@ -12135,7 +12513,7 @@
    96799718 fi
    96809719 rm -f conftest.$ac_objext conftest.$ac_ext
    96819720 fi
    96829721-echo "$as_me:12138: result: $ac_cv_c_const" >&5
    9683 +echo "$as_me:12485: result: $ac_cv_c_const" >&5
     9722+echo "$as_me:12516: result: $ac_cv_c_const" >&5
    96849723 echo "${ECHO_T}$ac_cv_c_const" >&6
    96859724 if test $ac_cv_c_const = no; then
    96869725 
    9687 @@ -12145,7 +12492,7 @@
     9726@@ -12145,7 +12523,7 @@
    96889727 
    96899728 fi
    96909729 
    96919730-echo "$as_me:12148: checking for inline" >&5
    9692 +echo "$as_me:12495: checking for inline" >&5
     9731+echo "$as_me:12526: checking for inline" >&5
    96939732 echo $ECHO_N "checking for inline... $ECHO_C" >&6
    96949733 if test "${ac_cv_c_inline+set}" = set; then
    96959734   echo $ECHO_N "(cached) $ECHO_C" >&6
    9696 @@ -12153,7 +12500,7 @@
     9735@@ -12153,7 +12531,7 @@
    96979736   ac_cv_c_inline=no
    96989737 for ac_kw in inline __inline__ __inline; do
    96999738   cat >conftest.$ac_ext <<_ACEOF
    97009739-#line 12156 "configure"
    9701 +#line 12503 "configure"
     9740+#line 12534 "configure"
    97029741 #include "confdefs.h"
    97039742 #ifndef __cplusplus
    97049743 static $ac_kw int static_foo () {return 0; }
    9705 @@ -12162,16 +12509,16 @@
     9744@@ -12162,16 +12540,16 @@
    97069745 
    97079746 _ACEOF
    97089747 rm -f conftest.$ac_objext
    97099748-if { (eval echo "$as_me:12165: \"$ac_compile\"") >&5
    9710 +if { (eval echo "$as_me:12512: \"$ac_compile\"") >&5
     9749+if { (eval echo "$as_me:12543: \"$ac_compile\"") >&5
    97119750   (eval $ac_compile) 2>&5
    97129751   ac_status=$?
    97139752-  echo "$as_me:12168: \$? = $ac_status" >&5
    9714 +  echo "$as_me:12515: \$? = $ac_status" >&5
     9753+  echo "$as_me:12546: \$? = $ac_status" >&5
    97159754   (exit $ac_status); } &&
    97169755          { ac_try='test -s conftest.$ac_objext'
    97179756-  { (eval echo "$as_me:12171: \"$ac_try\"") >&5
    9718 +  { (eval echo "$as_me:12518: \"$ac_try\"") >&5
     9757+  { (eval echo "$as_me:12549: \"$ac_try\"") >&5
    97199758   (eval $ac_try) 2>&5
    97209759   ac_status=$?
    97219760-  echo "$as_me:12174: \$? = $ac_status" >&5
    9722 +  echo "$as_me:12521: \$? = $ac_status" >&5
     9761+  echo "$as_me:12552: \$? = $ac_status" >&5
    97239762   (exit $ac_status); }; }; then
    97249763   ac_cv_c_inline=$ac_kw; break
    97259764 else
    9726 @@ -12182,7 +12529,7 @@
     9765@@ -12182,7 +12560,7 @@
    97279766 done
    97289767 
    97299768 fi
    97309769-echo "$as_me:12185: result: $ac_cv_c_inline" >&5
    9731 +echo "$as_me:12532: result: $ac_cv_c_inline" >&5
     9770+echo "$as_me:12563: result: $ac_cv_c_inline" >&5
    97329771 echo "${ECHO_T}$ac_cv_c_inline" >&6
    97339772 case $ac_cv_c_inline in
    97349773   inline | yes) ;;
    9735 @@ -12205,7 +12552,7 @@
     9774@@ -12205,7 +12583,7 @@
    97369775     :
    97379776   elif test "$GCC" = yes
    97389777   then
    97399778-    echo "$as_me:12208: checking if gcc supports options to tune inlining" >&5
    9740 +    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
    97419780 echo $ECHO_N "checking if gcc supports options to tune inlining... $ECHO_C" >&6
    97429781 if test "${cf_cv_gcc_inline+set}" = set; then
    97439782   echo $ECHO_N "(cached) $ECHO_C" >&6
    9744 @@ -12214,7 +12561,7 @@
     9783@@ -12214,7 +12592,7 @@
    97459784       cf_save_CFLAGS=$CFLAGS
    97469785       CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
    97479786       cat >conftest.$ac_ext <<_ACEOF
    97489787-#line 12217 "configure"
    9749 +#line 12564 "configure"
     9788+#line 12595 "configure"
    97509789 #include "confdefs.h"
    97519790 inline int foo(void) { return 1; }
    97529791 int
    9753 @@ -12226,16 +12573,16 @@
     9792@@ -12226,16 +12604,16 @@
    97549793 }
    97559794 _ACEOF
    97569795 rm -f conftest.$ac_objext
    97579796-if { (eval echo "$as_me:12229: \"$ac_compile\"") >&5
    9758 +if { (eval echo "$as_me:12576: \"$ac_compile\"") >&5
     9797+if { (eval echo "$as_me:12607: \"$ac_compile\"") >&5
    97599798   (eval $ac_compile) 2>&5
    97609799   ac_status=$?
    97619800-  echo "$as_me:12232: \$? = $ac_status" >&5
    9762 +  echo "$as_me:12579: \$? = $ac_status" >&5
     9801+  echo "$as_me:12610: \$? = $ac_status" >&5
    97639802   (exit $ac_status); } &&
    97649803          { ac_try='test -s conftest.$ac_objext'
    97659804-  { (eval echo "$as_me:12235: \"$ac_try\"") >&5
    9766 +  { (eval echo "$as_me:12582: \"$ac_try\"") >&5
     9805+  { (eval echo "$as_me:12613: \"$ac_try\"") >&5
    97679806   (eval $ac_try) 2>&5
    97689807   ac_status=$?
    97699808-  echo "$as_me:12238: \$? = $ac_status" >&5
    9770 +  echo "$as_me:12585: \$? = $ac_status" >&5
     9809+  echo "$as_me:12616: \$? = $ac_status" >&5
    97719810   (exit $ac_status); }; }; then
    97729811   cf_cv_gcc_inline=yes
    97739812 else
    9774 @@ -12247,7 +12594,7 @@
     9813@@ -12247,7 +12625,7 @@
    97759814       CFLAGS=$cf_save_CFLAGS
    97769815 
    97779816 fi
    97789817-echo "$as_me:12250: result: $cf_cv_gcc_inline" >&5
    9779 +echo "$as_me:12597: result: $cf_cv_gcc_inline" >&5
     9818+echo "$as_me:12628: result: $cf_cv_gcc_inline" >&5
    97809819 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
    97819820     if test "$cf_cv_gcc_inline" = yes ; then
    97829821 
    9783 @@ -12311,7 +12658,7 @@
     9822@@ -12311,7 +12689,7 @@
    97849823 
    97859824 if test -n "$cf_new_cppflags" ; then
     
    97909829 
    97919830 if test -n "$cf_new_extra_cppflags" ; then
    9792 @@ -12323,7 +12670,7 @@
     9831@@ -12323,7 +12701,7 @@
    97939832   fi
    97949833 fi
    97959834 
    97969835-echo "$as_me:12326: checking for signal global datatype" >&5
    9797 +echo "$as_me:12673: checking for signal global datatype" >&5
     9836+echo "$as_me:12704: checking for signal global datatype" >&5
    97989837 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
    97999838 if test "${cf_cv_sig_atomic_t+set}" = set; then
    98009839   echo $ECHO_N "(cached) $ECHO_C" >&6
    9801 @@ -12335,7 +12682,7 @@
     9840@@ -12335,7 +12713,7 @@
    98029841                "int"
    98039842        do
    98049843        cat >conftest.$ac_ext <<_ACEOF
    98059844-#line 12338 "configure"
    9806 +#line 12685 "configure"
     9845+#line 12716 "configure"
    98079846 #include "confdefs.h"
    98089847 
    98099848 #include <sys/types.h>
    9810 @@ -12358,16 +12705,16 @@
     9849@@ -12358,16 +12736,16 @@
    98119850 }
    98129851 _ACEOF
    98139852 rm -f conftest.$ac_objext
    98149853-if { (eval echo "$as_me:12361: \"$ac_compile\"") >&5
    9815 +if { (eval echo "$as_me:12708: \"$ac_compile\"") >&5
     9854+if { (eval echo "$as_me:12739: \"$ac_compile\"") >&5
    98169855   (eval $ac_compile) 2>&5
    98179856   ac_status=$?
    98189857-  echo "$as_me:12364: \$? = $ac_status" >&5
    9819 +  echo "$as_me:12711: \$? = $ac_status" >&5
     9858+  echo "$as_me:12742: \$? = $ac_status" >&5
    98209859   (exit $ac_status); } &&
    98219860          { ac_try='test -s conftest.$ac_objext'
    98229861-  { (eval echo "$as_me:12367: \"$ac_try\"") >&5
    9823 +  { (eval echo "$as_me:12714: \"$ac_try\"") >&5
     9862+  { (eval echo "$as_me:12745: \"$ac_try\"") >&5
    98249863   (eval $ac_try) 2>&5
    98259864   ac_status=$?
    98269865-  echo "$as_me:12370: \$? = $ac_status" >&5
    9827 +  echo "$as_me:12717: \$? = $ac_status" >&5
     9866+  echo "$as_me:12748: \$? = $ac_status" >&5
    98289867   (exit $ac_status); }; }; then
    98299868   cf_cv_sig_atomic_t=$cf_type
    98309869 else
    9831 @@ -12381,7 +12728,7 @@
     9870@@ -12381,7 +12759,7 @@
    98329871 
    98339872 fi
    98349873 
    98359874-echo "$as_me:12384: result: $cf_cv_sig_atomic_t" >&5
    9836 +echo "$as_me:12731: result: $cf_cv_sig_atomic_t" >&5
     9875+echo "$as_me:12762: result: $cf_cv_sig_atomic_t" >&5
    98379876 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
    98389877 test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <<EOF
    98399878 #define SIG_ATOMIC_T $cf_cv_sig_atomic_t
    9840 @@ -12389,7 +12736,7 @@
     9879@@ -12389,7 +12767,7 @@
    98419880 
    98429881 if test $NCURSES_CHTYPE = auto ; then
    98439882 
    98449883-echo "$as_me:12392: checking for type of chtype" >&5
    9845 +echo "$as_me:12739: checking for type of chtype" >&5
     9884+echo "$as_me:12770: checking for type of chtype" >&5
    98469885 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
    98479886 if test "${cf_cv_typeof_chtype+set}" = set; then
    98489887   echo $ECHO_N "(cached) $ECHO_C" >&6
    9849 @@ -12399,7 +12746,7 @@
     9888@@ -12399,7 +12777,7 @@
    98509889   cf_cv_typeof_chtype=long
    98519890 else
    98529891   cat >conftest.$ac_ext <<_ACEOF
    98539892-#line 12402 "configure"
    9854 +#line 12749 "configure"
     9893+#line 12780 "configure"
    98559894 #include "confdefs.h"
    98569895 
    98579896 #define WANT_BITS 31
    9858 @@ -12434,15 +12781,15 @@
     9897@@ -12434,15 +12812,15 @@
    98599898 
    98609899 _ACEOF
    98619900 rm -f conftest$ac_exeext
    98629901-if { (eval echo "$as_me:12437: \"$ac_link\"") >&5
    9863 +if { (eval echo "$as_me:12784: \"$ac_link\"") >&5
     9902+if { (eval echo "$as_me:12815: \"$ac_link\"") >&5
    98649903   (eval $ac_link) 2>&5
    98659904   ac_status=$?
    98669905-  echo "$as_me:12440: \$? = $ac_status" >&5
    9867 +  echo "$as_me:12787: \$? = $ac_status" >&5
     9906+  echo "$as_me:12818: \$? = $ac_status" >&5
    98689907   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    98699908-  { (eval echo "$as_me:12442: \"$ac_try\"") >&5
    9870 +  { (eval echo "$as_me:12789: \"$ac_try\"") >&5
     9909+  { (eval echo "$as_me:12820: \"$ac_try\"") >&5
    98719910   (eval $ac_try) 2>&5
    98729911   ac_status=$?
    98739912-  echo "$as_me:12445: \$? = $ac_status" >&5
    9874 +  echo "$as_me:12792: \$? = $ac_status" >&5
     9913+  echo "$as_me:12823: \$? = $ac_status" >&5
    98759914   (exit $ac_status); }; }; then
    98769915   cf_cv_typeof_chtype=`cat cf_test.out`
    98779916 else
    9878 @@ -12457,7 +12804,7 @@
     9917@@ -12457,7 +12835,7 @@
    98799918 
    98809919 fi
    98819920 
    98829921-echo "$as_me:12460: result: $cf_cv_typeof_chtype" >&5
    9883 +echo "$as_me:12807: result: $cf_cv_typeof_chtype" >&5
     9922+echo "$as_me:12838: result: $cf_cv_typeof_chtype" >&5
    98849923 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
    98859924 
    98869925 cat >>confdefs.h <<EOF
    9887 @@ -12469,14 +12816,14 @@
     9926@@ -12469,14 +12847,14 @@
    98889927 fi
    98899928 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
    98909929 
    98919930-echo "$as_me:12472: checking if unsigned literals are legal" >&5
    9892 +echo "$as_me:12819: checking if unsigned literals are legal" >&5
     9931+echo "$as_me:12850: checking if unsigned literals are legal" >&5
    98939932 echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
    98949933 if test "${cf_cv_unsigned_literals+set}" = set; then
     
    98989937        cat >conftest.$ac_ext <<_ACEOF
    98999938-#line 12479 "configure"
    9900 +#line 12826 "configure"
     9939+#line 12857 "configure"
    99019940 #include "confdefs.h"
    99029941 
    99039942 int
    9904 @@ -12488,16 +12835,16 @@
     9943@@ -12488,16 +12866,16 @@
    99059944 }
    99069945 _ACEOF
    99079946 rm -f conftest.$ac_objext
    99089947-if { (eval echo "$as_me:12491: \"$ac_compile\"") >&5
    9909 +if { (eval echo "$as_me:12838: \"$ac_compile\"") >&5
     9948+if { (eval echo "$as_me:12869: \"$ac_compile\"") >&5
    99109949   (eval $ac_compile) 2>&5
    99119950   ac_status=$?
    99129951-  echo "$as_me:12494: \$? = $ac_status" >&5
    9913 +  echo "$as_me:12841: \$? = $ac_status" >&5
     9952+  echo "$as_me:12872: \$? = $ac_status" >&5
    99149953   (exit $ac_status); } &&
    99159954          { ac_try='test -s conftest.$ac_objext'
    99169955-  { (eval echo "$as_me:12497: \"$ac_try\"") >&5
    9917 +  { (eval echo "$as_me:12844: \"$ac_try\"") >&5
     9956+  { (eval echo "$as_me:12875: \"$ac_try\"") >&5
    99189957   (eval $ac_try) 2>&5
    99199958   ac_status=$?
    99209959-  echo "$as_me:12500: \$? = $ac_status" >&5
    9921 +  echo "$as_me:12847: \$? = $ac_status" >&5
     9960+  echo "$as_me:12878: \$? = $ac_status" >&5
    99229961   (exit $ac_status); }; }; then
    99239962   cf_cv_unsigned_literals=yes
    99249963 else
    9925 @@ -12509,7 +12856,7 @@
     9964@@ -12509,7 +12887,7 @@
    99269965 
    99279966 fi
    99289967 
    99299968-echo "$as_me:12512: result: $cf_cv_unsigned_literals" >&5
    9930 +echo "$as_me:12859: result: $cf_cv_unsigned_literals" >&5
     9969+echo "$as_me:12890: result: $cf_cv_unsigned_literals" >&5
    99319970 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
    99329971 
    99339972 cf_cv_1UL="1"
    9934 @@ -12525,14 +12872,14 @@
     9973@@ -12525,14 +12903,14 @@
    99359974 
    99369975 ###    Checks for external-data
    99379976 
    99389977-echo "$as_me:12528: checking if external errno is declared" >&5
    9939 +echo "$as_me:12875: checking if external errno is declared" >&5
     9978+echo "$as_me:12906: checking if external errno is declared" >&5
    99409979 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
    99419980 if test "${cf_cv_dcl_errno+set}" = set; then
     
    99459984     cat >conftest.$ac_ext <<_ACEOF
    99469985-#line 12535 "configure"
    9947 +#line 12882 "configure"
     9986+#line 12913 "configure"
    99489987 #include "confdefs.h"
    99499988 
    99509989 #ifdef HAVE_STDLIB_H
    9951 @@ -12550,16 +12897,16 @@
     9990@@ -12550,16 +12928,16 @@
    99529991 }
    99539992 _ACEOF
    99549993 rm -f conftest.$ac_objext
    99559994-if { (eval echo "$as_me:12553: \"$ac_compile\"") >&5
    9956 +if { (eval echo "$as_me:12900: \"$ac_compile\"") >&5
     9995+if { (eval echo "$as_me:12931: \"$ac_compile\"") >&5
    99579996   (eval $ac_compile) 2>&5
    99589997   ac_status=$?
    99599998-  echo "$as_me:12556: \$? = $ac_status" >&5
    9960 +  echo "$as_me:12903: \$? = $ac_status" >&5
     9999+  echo "$as_me:12934: \$? = $ac_status" >&5
    996110000   (exit $ac_status); } &&
    996210001          { ac_try='test -s conftest.$ac_objext'
    996310002-  { (eval echo "$as_me:12559: \"$ac_try\"") >&5
    9964 +  { (eval echo "$as_me:12906: \"$ac_try\"") >&5
     10003+  { (eval echo "$as_me:12937: \"$ac_try\"") >&5
    996510004   (eval $ac_try) 2>&5
    996610005   ac_status=$?
    996710006-  echo "$as_me:12562: \$? = $ac_status" >&5
    9968 +  echo "$as_me:12909: \$? = $ac_status" >&5
     10007+  echo "$as_me:12940: \$? = $ac_status" >&5
    996910008   (exit $ac_status); }; }; then
    997010009   cf_cv_dcl_errno=yes
    997110010 else
    9972 @@ -12570,7 +12917,7 @@
     10011@@ -12570,7 +12948,7 @@
    997310012 rm -f conftest.$ac_objext conftest.$ac_ext
    997410013 
    997510014 fi
    997610015-echo "$as_me:12573: result: $cf_cv_dcl_errno" >&5
    9977 +echo "$as_me:12920: result: $cf_cv_dcl_errno" >&5
     10016+echo "$as_me:12951: result: $cf_cv_dcl_errno" >&5
    997810017 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
    997910018 
    998010019 if test "$cf_cv_dcl_errno" = no ; then
    9981 @@ -12585,14 +12932,14 @@
     10020@@ -12585,14 +12963,14 @@
    998210021 
    998310022 # It's possible (for near-UNIX clones) that the data doesn't exist
    998410023 
    998510024-echo "$as_me:12588: checking if external errno exists" >&5
    9986 +echo "$as_me:12935: checking if external errno exists" >&5
     10025+echo "$as_me:12966: checking if external errno exists" >&5
    998710026 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
    998810027 if test "${cf_cv_have_errno+set}" = set; then
     
    999210031     cat >conftest.$ac_ext <<_ACEOF
    999310032-#line 12595 "configure"
    9994 +#line 12942 "configure"
     10033+#line 12973 "configure"
    999510034 #include "confdefs.h"
    999610035 
    999710036 #undef errno
    9998 @@ -12607,16 +12954,16 @@
     10037@@ -12607,16 +12985,16 @@
    999910038 }
    1000010039 _ACEOF
    1000110040 rm -f conftest.$ac_objext conftest$ac_exeext
    1000210041-if { (eval echo "$as_me:12610: \"$ac_link\"") >&5
    10003 +if { (eval echo "$as_me:12957: \"$ac_link\"") >&5
     10042+if { (eval echo "$as_me:12988: \"$ac_link\"") >&5
    1000410043   (eval $ac_link) 2>&5
    1000510044   ac_status=$?
    1000610045-  echo "$as_me:12613: \$? = $ac_status" >&5
    10007 +  echo "$as_me:12960: \$? = $ac_status" >&5
     10046+  echo "$as_me:12991: \$? = $ac_status" >&5
    1000810047   (exit $ac_status); } &&
    1000910048          { ac_try='test -s conftest$ac_exeext'
    1001010049-  { (eval echo "$as_me:12616: \"$ac_try\"") >&5
    10011 +  { (eval echo "$as_me:12963: \"$ac_try\"") >&5
     10050+  { (eval echo "$as_me:12994: \"$ac_try\"") >&5
    1001210051   (eval $ac_try) 2>&5
    1001310052   ac_status=$?
    1001410053-  echo "$as_me:12619: \$? = $ac_status" >&5
    10015 +  echo "$as_me:12966: \$? = $ac_status" >&5
     10054+  echo "$as_me:12997: \$? = $ac_status" >&5
    1001610055   (exit $ac_status); }; }; then
    1001710056   cf_cv_have_errno=yes
    1001810057 else
    10019 @@ -12627,7 +12974,7 @@
     10058@@ -12627,7 +13005,7 @@
    1002010059 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1002110060 
    1002210061 fi
    1002310062-echo "$as_me:12630: result: $cf_cv_have_errno" >&5
    10024 +echo "$as_me:12977: result: $cf_cv_have_errno" >&5
     10063+echo "$as_me:13008: result: $cf_cv_have_errno" >&5
    1002510064 echo "${ECHO_T}$cf_cv_have_errno" >&6
    1002610065 
    1002710066 if test "$cf_cv_have_errno" = yes ; then
    10028 @@ -12640,7 +12987,7 @@
     10067@@ -12640,7 +13018,7 @@
    1002910068 
    1003010069 fi
    1003110070 
    1003210071-echo "$as_me:12643: checking if data-only library module links" >&5
    10033 +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
    1003410073 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
    1003510074 if test "${cf_cv_link_dataonly+set}" = set; then
    1003610075   echo $ECHO_N "(cached) $ECHO_C" >&6
    10037 @@ -12648,20 +12995,20 @@
     10076@@ -12648,20 +13026,20 @@
    1003810077 
    1003910078        rm -f conftest.a
    1004010079        cat >conftest.$ac_ext <<EOF
    1004110080-#line 12651 "configure"
    10042 +#line 12998 "configure"
     10081+#line 13029 "configure"
    1004310082 int    testdata[3] = { 123, 456, 789 };
    1004410083 EOF
    1004510084-       if { (eval echo "$as_me:12654: \"$ac_compile\"") >&5
    10046 +       if { (eval echo "$as_me:13001: \"$ac_compile\"") >&5
     10085+       if { (eval echo "$as_me:13032: \"$ac_compile\"") >&5
    1004710086   (eval $ac_compile) 2>&5
    1004810087   ac_status=$?
    1004910088-  echo "$as_me:12657: \$? = $ac_status" >&5
    10050 +  echo "$as_me:13004: \$? = $ac_status" >&5
     10089+  echo "$as_me:13035: \$? = $ac_status" >&5
    1005110090   (exit $ac_status); } ; then
    1005210091                mv conftest.o data.o && \
     
    1005710096        cat >conftest.$ac_ext <<EOF
    1005810097-#line 12664 "configure"
    10059 +#line 13011 "configure"
     10098+#line 13042 "configure"
    1006010099 int    testfunc()
    1006110100 {
    1006210101 #if defined(NeXT)
    10063 @@ -12674,13 +13021,13 @@
     10102@@ -12674,13 +13052,13 @@
    1006410103 #endif
    1006510104 }
    1006610105 EOF
    1006710106-       if { (eval echo "$as_me:12677: \"$ac_compile\"") >&5
    10068 +       if { (eval echo "$as_me:13024: \"$ac_compile\"") >&5
     10107+       if { (eval echo "$as_me:13055: \"$ac_compile\"") >&5
    1006910108   (eval $ac_compile) 2>&5
    1007010109   ac_status=$?
    1007110110-  echo "$as_me:12680: \$? = $ac_status" >&5
    10072 +  echo "$as_me:13027: \$? = $ac_status" >&5
     10111+  echo "$as_me:13058: \$? = $ac_status" >&5
    1007310112   (exit $ac_status); }; then
    1007410113                mv conftest.o func.o && \
     
    1007810117        rm -f conftest.$ac_ext func.o
    1007910118        ( eval $RANLIB conftest.a ) 2>&5 >/dev/null
    10080 @@ -12690,7 +13037,7 @@
     10119@@ -12690,7 +13068,7 @@
    1008110120   cf_cv_link_dataonly=unknown
    1008210121 else
    1008310122   cat >conftest.$ac_ext <<_ACEOF
    1008410123-#line 12693 "configure"
    10085 +#line 13040 "configure"
     10124+#line 13071 "configure"
    1008610125 #include "confdefs.h"
    1008710126 
    1008810127        int main()
    10089 @@ -12701,15 +13048,15 @@
     10128@@ -12701,15 +13079,15 @@
    1009010129 
    1009110130 _ACEOF
    1009210131 rm -f conftest$ac_exeext
    1009310132-if { (eval echo "$as_me:12704: \"$ac_link\"") >&5
    10094 +if { (eval echo "$as_me:13051: \"$ac_link\"") >&5
     10133+if { (eval echo "$as_me:13082: \"$ac_link\"") >&5
    1009510134   (eval $ac_link) 2>&5
    1009610135   ac_status=$?
    1009710136-  echo "$as_me:12707: \$? = $ac_status" >&5
    10098 +  echo "$as_me:13054: \$? = $ac_status" >&5
     10137+  echo "$as_me:13085: \$? = $ac_status" >&5
    1009910138   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1010010139-  { (eval echo "$as_me:12709: \"$ac_try\"") >&5
    10101 +  { (eval echo "$as_me:13056: \"$ac_try\"") >&5
     10140+  { (eval echo "$as_me:13087: \"$ac_try\"") >&5
    1010210141   (eval $ac_try) 2>&5
    1010310142   ac_status=$?
    1010410143-  echo "$as_me:12712: \$? = $ac_status" >&5
    10105 +  echo "$as_me:13059: \$? = $ac_status" >&5
     10144+  echo "$as_me:13090: \$? = $ac_status" >&5
    1010610145   (exit $ac_status); }; }; then
    1010710146   cf_cv_link_dataonly=yes
    1010810147 else
    10109 @@ -12724,7 +13071,7 @@
     10148@@ -12724,7 +13102,7 @@
    1011010149 
    1011110150 fi
    1011210151 
    1011310152-echo "$as_me:12727: result: $cf_cv_link_dataonly" >&5
    10114 +echo "$as_me:13074: result: $cf_cv_link_dataonly" >&5
     10153+echo "$as_me:13105: result: $cf_cv_link_dataonly" >&5
    1011510154 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
    1011610155 
    1011710156 if test "$cf_cv_link_dataonly" = no ; then
    10118 @@ -12759,13 +13106,13 @@
     10157@@ -12759,13 +13137,13 @@
    1011910158 
    1012010159 do
    1012110160 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
    1012210161-echo "$as_me:12762: checking for $ac_func" >&5
    10123 +echo "$as_me:13109: checking for $ac_func" >&5
     10162+echo "$as_me:13140: checking for $ac_func" >&5
    1012410163 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
    1012510164 if eval "test \"\${$as_ac_var+set}\" = set"; then
     
    1012810167   cat >conftest.$ac_ext <<_ACEOF
    1012910168-#line 12768 "configure"
    10130 +#line 13115 "configure"
     10169+#line 13146 "configure"
    1013110170 #include "confdefs.h"
    1013210171 /* System header to define __stub macros and hopefully few prototypes,
    1013310172     which can conflict with char $ac_func (); below.  */
    10134 @@ -12796,16 +13143,16 @@
     10173@@ -12796,16 +13174,16 @@
    1013510174 }
    1013610175 _ACEOF
    1013710176 rm -f conftest.$ac_objext conftest$ac_exeext
    1013810177-if { (eval echo "$as_me:12799: \"$ac_link\"") >&5
    10139 +if { (eval echo "$as_me:13146: \"$ac_link\"") >&5
     10178+if { (eval echo "$as_me:13177: \"$ac_link\"") >&5
    1014010179   (eval $ac_link) 2>&5
    1014110180   ac_status=$?
    1014210181-  echo "$as_me:12802: \$? = $ac_status" >&5
    10143 +  echo "$as_me:13149: \$? = $ac_status" >&5
     10182+  echo "$as_me:13180: \$? = $ac_status" >&5
    1014410183   (exit $ac_status); } &&
    1014510184          { ac_try='test -s conftest$ac_exeext'
    1014610185-  { (eval echo "$as_me:12805: \"$ac_try\"") >&5
    10147 +  { (eval echo "$as_me:13152: \"$ac_try\"") >&5
     10186+  { (eval echo "$as_me:13183: \"$ac_try\"") >&5
    1014810187   (eval $ac_try) 2>&5
    1014910188   ac_status=$?
    1015010189-  echo "$as_me:12808: \$? = $ac_status" >&5
    10151 +  echo "$as_me:13155: \$? = $ac_status" >&5
     10190+  echo "$as_me:13186: \$? = $ac_status" >&5
    1015210191   (exit $ac_status); }; }; then
    1015310192   eval "$as_ac_var=yes"
    1015410193 else
    10155 @@ -12815,7 +13162,7 @@
     10194@@ -12815,7 +13193,7 @@
    1015610195 fi
    1015710196 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1015810197 fi
    1015910198-echo "$as_me:12818: result: `eval echo '${'$as_ac_var'}'`" >&5
    10160 +echo "$as_me:13165: result: `eval echo '${'$as_ac_var'}'`" >&5
     10199+echo "$as_me:13196: result: `eval echo '${'$as_ac_var'}'`" >&5
    1016110200 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
    1016210201 if test `eval echo '${'$as_ac_var'}'` = yes; then
    1016310202   cat >>confdefs.h <<EOF
    10164 @@ -12827,14 +13174,14 @@
     10203@@ -12827,14 +13205,14 @@
    1016510204 
    1016610205 if test "$with_getcap" = "yes" ; then
    1016710206 
    1016810207-echo "$as_me:12830: checking for terminal-capability database functions" >&5
    10169 +echo "$as_me:13177: checking for terminal-capability database functions" >&5
     10208+echo "$as_me:13208: checking for terminal-capability database functions" >&5
    1017010209 echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
    1017110210 if test "${cf_cv_cgetent+set}" = set; then
     
    1017510214 cat >conftest.$ac_ext <<_ACEOF
    1017610215-#line 12837 "configure"
    10177 +#line 13184 "configure"
     10216+#line 13215 "configure"
    1017810217 #include "confdefs.h"
    1017910218 
    1018010219 #include <stdlib.h>
    10181 @@ -12854,16 +13201,16 @@
     10220@@ -12854,16 +13232,16 @@
    1018210221 }
    1018310222 _ACEOF
    1018410223 rm -f conftest.$ac_objext conftest$ac_exeext
    1018510224-if { (eval echo "$as_me:12857: \"$ac_link\"") >&5
    10186 +if { (eval echo "$as_me:13204: \"$ac_link\"") >&5
     10225+if { (eval echo "$as_me:13235: \"$ac_link\"") >&5
    1018710226   (eval $ac_link) 2>&5
    1018810227   ac_status=$?
    1018910228-  echo "$as_me:12860: \$? = $ac_status" >&5
    10190 +  echo "$as_me:13207: \$? = $ac_status" >&5
     10229+  echo "$as_me:13238: \$? = $ac_status" >&5
    1019110230   (exit $ac_status); } &&
    1019210231          { ac_try='test -s conftest$ac_exeext'
    1019310232-  { (eval echo "$as_me:12863: \"$ac_try\"") >&5
    10194 +  { (eval echo "$as_me:13210: \"$ac_try\"") >&5
     10233+  { (eval echo "$as_me:13241: \"$ac_try\"") >&5
    1019510234   (eval $ac_try) 2>&5
    1019610235   ac_status=$?
    1019710236-  echo "$as_me:12866: \$? = $ac_status" >&5
    10198 +  echo "$as_me:13213: \$? = $ac_status" >&5
     10237+  echo "$as_me:13244: \$? = $ac_status" >&5
    1019910238   (exit $ac_status); }; }; then
    1020010239   cf_cv_cgetent=yes
    1020110240 else
    10202 @@ -12875,7 +13222,7 @@
     10241@@ -12875,7 +13253,7 @@
    1020310242 
    1020410243 fi
    1020510244 
    1020610245-echo "$as_me:12878: result: $cf_cv_cgetent" >&5
    10207 +echo "$as_me:13225: result: $cf_cv_cgetent" >&5
     10246+echo "$as_me:13256: result: $cf_cv_cgetent" >&5
    1020810247 echo "${ECHO_T}$cf_cv_cgetent" >&6
    1020910248 test "$cf_cv_cgetent" = yes && cat >>confdefs.h <<\EOF
    1021010249 #define HAVE_BSD_CGETENT 1
    10211 @@ -12883,14 +13230,14 @@
     10250@@ -12883,14 +13261,14 @@
    1021210251 
    1021310252 fi
    1021410253 
    1021510254-echo "$as_me:12886: checking for isascii" >&5
    10216 +echo "$as_me:13233: checking for isascii" >&5
     10255+echo "$as_me:13264: checking for isascii" >&5
    1021710256 echo $ECHO_N "checking for isascii... $ECHO_C" >&6
    1021810257 if test "${cf_cv_have_isascii+set}" = set; then
     
    1022210261        cat >conftest.$ac_ext <<_ACEOF
    1022310262-#line 12893 "configure"
    10224 +#line 13240 "configure"
     10263+#line 13271 "configure"
    1022510264 #include "confdefs.h"
    1022610265 #include <ctype.h>
    1022710266 int
    10228 @@ -12902,16 +13249,16 @@
     10267@@ -12902,16 +13280,16 @@
    1022910268 }
    1023010269 _ACEOF
    1023110270 rm -f conftest.$ac_objext conftest$ac_exeext
    1023210271-if { (eval echo "$as_me:12905: \"$ac_link\"") >&5
    10233 +if { (eval echo "$as_me:13252: \"$ac_link\"") >&5
     10272+if { (eval echo "$as_me:13283: \"$ac_link\"") >&5
    1023410273   (eval $ac_link) 2>&5
    1023510274   ac_status=$?
    1023610275-  echo "$as_me:12908: \$? = $ac_status" >&5
    10237 +  echo "$as_me:13255: \$? = $ac_status" >&5
     10276+  echo "$as_me:13286: \$? = $ac_status" >&5
    1023810277   (exit $ac_status); } &&
    1023910278          { ac_try='test -s conftest$ac_exeext'
    1024010279-  { (eval echo "$as_me:12911: \"$ac_try\"") >&5
    10241 +  { (eval echo "$as_me:13258: \"$ac_try\"") >&5
     10280+  { (eval echo "$as_me:13289: \"$ac_try\"") >&5
    1024210281   (eval $ac_try) 2>&5
    1024310282   ac_status=$?
    1024410283-  echo "$as_me:12914: \$? = $ac_status" >&5
    10245 +  echo "$as_me:13261: \$? = $ac_status" >&5
     10284+  echo "$as_me:13292: \$? = $ac_status" >&5
    1024610285   (exit $ac_status); }; }; then
    1024710286   cf_cv_have_isascii=yes
    1024810287 else
    10249 @@ -12922,17 +13269,17 @@
     10288@@ -12922,17 +13300,17 @@
    1025010289 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1025110290 
    1025210291 fi
    1025310292-echo "$as_me:12925: result: $cf_cv_have_isascii" >&5
    10254 +echo "$as_me:13272: result: $cf_cv_have_isascii" >&5
     10293+echo "$as_me:13303: result: $cf_cv_have_isascii" >&5
    1025510294 echo "${ECHO_T}$cf_cv_have_isascii" >&6
    1025610295 test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF
     
    1026010299 if test "$ac_cv_func_sigaction" = yes; then
    1026110300-echo "$as_me:12932: checking whether sigaction needs _POSIX_SOURCE" >&5
    10262 +echo "$as_me:13279: checking whether sigaction needs _POSIX_SOURCE" >&5
     10301+echo "$as_me:13310: checking whether sigaction needs _POSIX_SOURCE" >&5
    1026310302 echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
    1026410303 cat >conftest.$ac_ext <<_ACEOF
    1026510304-#line 12935 "configure"
    10266 +#line 13282 "configure"
     10305+#line 13313 "configure"
    1026710306 #include "confdefs.h"
    1026810307 
    1026910308 #include <sys/types.h>
    10270 @@ -12946,16 +13293,16 @@
     10309@@ -12946,16 +13324,16 @@
    1027110310 }
    1027210311 _ACEOF
    1027310312 rm -f conftest.$ac_objext
    1027410313-if { (eval echo "$as_me:12949: \"$ac_compile\"") >&5
    10275 +if { (eval echo "$as_me:13296: \"$ac_compile\"") >&5
     10314+if { (eval echo "$as_me:13327: \"$ac_compile\"") >&5
    1027610315   (eval $ac_compile) 2>&5
    1027710316   ac_status=$?
    1027810317-  echo "$as_me:12952: \$? = $ac_status" >&5
    10279 +  echo "$as_me:13299: \$? = $ac_status" >&5
     10318+  echo "$as_me:13330: \$? = $ac_status" >&5
    1028010319   (exit $ac_status); } &&
    1028110320          { ac_try='test -s conftest.$ac_objext'
    1028210321-  { (eval echo "$as_me:12955: \"$ac_try\"") >&5
    10283 +  { (eval echo "$as_me:13302: \"$ac_try\"") >&5
     10322+  { (eval echo "$as_me:13333: \"$ac_try\"") >&5
    1028410323   (eval $ac_try) 2>&5
    1028510324   ac_status=$?
    1028610325-  echo "$as_me:12958: \$? = $ac_status" >&5
    10287 +  echo "$as_me:13305: \$? = $ac_status" >&5
     10326+  echo "$as_me:13336: \$? = $ac_status" >&5
    1028810327   (exit $ac_status); }; }; then
    1028910328   sigact_bad=no
    1029010329 else
    10291 @@ -12963,7 +13310,7 @@
     10330@@ -12963,7 +13341,7 @@
    1029210331 cat conftest.$ac_ext >&5
    1029310332 
    1029410333 cat >conftest.$ac_ext <<_ACEOF
    1029510334-#line 12966 "configure"
    10296 +#line 13313 "configure"
     10335+#line 13344 "configure"
    1029710336 #include "confdefs.h"
    1029810337 
    1029910338 #define _POSIX_SOURCE
    10300 @@ -12978,16 +13325,16 @@
     10339@@ -12978,16 +13356,16 @@
    1030110340 }
    1030210341 _ACEOF
    1030310342 rm -f conftest.$ac_objext
    1030410343-if { (eval echo "$as_me:12981: \"$ac_compile\"") >&5
    10305 +if { (eval echo "$as_me:13328: \"$ac_compile\"") >&5
     10344+if { (eval echo "$as_me:13359: \"$ac_compile\"") >&5
    1030610345   (eval $ac_compile) 2>&5
    1030710346   ac_status=$?
    1030810347-  echo "$as_me:12984: \$? = $ac_status" >&5
    10309 +  echo "$as_me:13331: \$? = $ac_status" >&5
     10348+  echo "$as_me:13362: \$? = $ac_status" >&5
    1031010349   (exit $ac_status); } &&
    1031110350          { ac_try='test -s conftest.$ac_objext'
    1031210351-  { (eval echo "$as_me:12987: \"$ac_try\"") >&5
    10313 +  { (eval echo "$as_me:13334: \"$ac_try\"") >&5
     10352+  { (eval echo "$as_me:13365: \"$ac_try\"") >&5
    1031410353   (eval $ac_try) 2>&5
    1031510354   ac_status=$?
    1031610355-  echo "$as_me:12990: \$? = $ac_status" >&5
    10317 +  echo "$as_me:13337: \$? = $ac_status" >&5
     10356+  echo "$as_me:13368: \$? = $ac_status" >&5
    1031810357   (exit $ac_status); }; }; then
    1031910358   sigact_bad=yes
    1032010359         cat >>confdefs.h <<\EOF
    10321 @@ -13002,11 +13349,11 @@
     10360@@ -13002,11 +13380,11 @@
    1032210361 rm -f conftest.$ac_objext conftest.$ac_ext
    1032310362 fi
    1032410363 rm -f conftest.$ac_objext conftest.$ac_ext
    1032510364-echo "$as_me:13005: result: $sigact_bad" >&5
    10326 +echo "$as_me:13352: result: $sigact_bad" >&5
     10365+echo "$as_me:13383: result: $sigact_bad" >&5
    1032710366 echo "${ECHO_T}$sigact_bad" >&6
    1032810367 fi
    1032910368 
    1033010369-echo "$as_me:13009: checking if nanosleep really works" >&5
    10331 +echo "$as_me:13356: checking if nanosleep really works" >&5
     10370+echo "$as_me:13387: checking if nanosleep really works" >&5
    1033210371 echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
    1033310372 if test "${cf_cv_func_nanosleep+set}" = set; then
    1033410373   echo $ECHO_N "(cached) $ECHO_C" >&6
    10335 @@ -13016,7 +13363,7 @@
     10374@@ -13016,7 +13394,7 @@
    1033610375   cf_cv_func_nanosleep=unknown
    1033710376 else
    1033810377   cat >conftest.$ac_ext <<_ACEOF
    1033910378-#line 13019 "configure"
    10340 +#line 13366 "configure"
     10379+#line 13397 "configure"
    1034110380 #include "confdefs.h"
    1034210381 
    1034310382 #include <stdio.h>
    10344 @@ -13041,15 +13388,15 @@
     10383@@ -13041,15 +13419,15 @@
    1034510384 
    1034610385 _ACEOF
    1034710386 rm -f conftest$ac_exeext
    1034810387-if { (eval echo "$as_me:13044: \"$ac_link\"") >&5
    10349 +if { (eval echo "$as_me:13391: \"$ac_link\"") >&5
     10388+if { (eval echo "$as_me:13422: \"$ac_link\"") >&5
    1035010389   (eval $ac_link) 2>&5
    1035110390   ac_status=$?
    1035210391-  echo "$as_me:13047: \$? = $ac_status" >&5
    10353 +  echo "$as_me:13394: \$? = $ac_status" >&5
     10392+  echo "$as_me:13425: \$? = $ac_status" >&5
    1035410393   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1035510394-  { (eval echo "$as_me:13049: \"$ac_try\"") >&5
    10356 +  { (eval echo "$as_me:13396: \"$ac_try\"") >&5
     10395+  { (eval echo "$as_me:13427: \"$ac_try\"") >&5
    1035710396   (eval $ac_try) 2>&5
    1035810397   ac_status=$?
    1035910398-  echo "$as_me:13052: \$? = $ac_status" >&5
    10360 +  echo "$as_me:13399: \$? = $ac_status" >&5
     10399+  echo "$as_me:13430: \$? = $ac_status" >&5
    1036110400   (exit $ac_status); }; }; then
    1036210401   cf_cv_func_nanosleep=yes
    1036310402 else
    10364 @@ -13061,7 +13408,7 @@
     10403@@ -13061,7 +13439,7 @@
    1036510404 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
    1036610405 fi
    1036710406 fi
    1036810407-echo "$as_me:13064: result: $cf_cv_func_nanosleep" >&5
    10369 +echo "$as_me:13411: result: $cf_cv_func_nanosleep" >&5
     10408+echo "$as_me:13442: result: $cf_cv_func_nanosleep" >&5
    1037010409 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
    1037110410 
    1037210411 test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF
    10373 @@ -13075,23 +13422,23 @@
     10412@@ -13075,23 +13453,23 @@
    1037410413 
    1037510414 do
    1037610415 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    1037710416-echo "$as_me:13078: checking for $ac_header" >&5
    10378 +echo "$as_me:13425: checking for $ac_header" >&5
     10417+echo "$as_me:13456: checking for $ac_header" >&5
    1037910418 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
    1038010419 if eval "test \"\${$as_ac_Header+set}\" = set"; then
     
    1038310422   cat >conftest.$ac_ext <<_ACEOF
    1038410423-#line 13084 "configure"
    10385 +#line 13431 "configure"
     10424+#line 13462 "configure"
    1038610425 #include "confdefs.h"
    1038710426 #include <$ac_header>
    1038810427 _ACEOF
    1038910428-if { (eval echo "$as_me:13088: \"$ac_cpp conftest.$ac_ext\"") >&5
    10390 +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
    1039110430   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1039210431   ac_status=$?
     
    1039510434   cat conftest.err >&5
    1039610435-  echo "$as_me:13094: \$? = $ac_status" >&5
    10397 +  echo "$as_me:13441: \$? = $ac_status" >&5
     10436+  echo "$as_me:13472: \$? = $ac_status" >&5
    1039810437   (exit $ac_status); } >/dev/null; then
    1039910438   if test -s conftest.err; then
    1040010439     ac_cpp_err=$ac_c_preproc_warn_flag
    10401 @@ -13110,7 +13457,7 @@
     10440@@ -13110,7 +13488,7 @@
    1040210441 fi
    1040310442 rm -f conftest.err conftest.$ac_ext
    1040410443 fi
    1040510444-echo "$as_me:13113: result: `eval echo '${'$as_ac_Header'}'`" >&5
    10406 +echo "$as_me:13460: result: `eval echo '${'$as_ac_Header'}'`" >&5
     10445+echo "$as_me:13491: result: `eval echo '${'$as_ac_Header'}'`" >&5
    1040710446 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    1040810447 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    1040910448   cat >>confdefs.h <<EOF
    10410 @@ -13125,23 +13472,23 @@
     10449@@ -13125,23 +13503,23 @@
    1041110450 for ac_header in sys/termio.h
    1041210451 do
    1041310452 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    1041410453-echo "$as_me:13128: checking for $ac_header" >&5
    10415 +echo "$as_me:13475: checking for $ac_header" >&5
     10454+echo "$as_me:13506: checking for $ac_header" >&5
    1041610455 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
    1041710456 if eval "test \"\${$as_ac_Header+set}\" = set"; then
     
    1042010459   cat >conftest.$ac_ext <<_ACEOF
    1042110460-#line 13134 "configure"
    10422 +#line 13481 "configure"
     10461+#line 13512 "configure"
    1042310462 #include "confdefs.h"
    1042410463 #include <$ac_header>
    1042510464 _ACEOF
    1042610465-if { (eval echo "$as_me:13138: \"$ac_cpp conftest.$ac_ext\"") >&5
    10427 +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
    1042810467   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1042910468   ac_status=$?
     
    1043210471   cat conftest.err >&5
    1043310472-  echo "$as_me:13144: \$? = $ac_status" >&5
    10434 +  echo "$as_me:13491: \$? = $ac_status" >&5
     10473+  echo "$as_me:13522: \$? = $ac_status" >&5
    1043510474   (exit $ac_status); } >/dev/null; then
    1043610475   if test -s conftest.err; then
    1043710476     ac_cpp_err=$ac_c_preproc_warn_flag
    10438 @@ -13160,7 +13507,7 @@
     10477@@ -13160,7 +13538,7 @@
    1043910478 fi
    1044010479 rm -f conftest.err conftest.$ac_ext
    1044110480 fi
    1044210481-echo "$as_me:13163: result: `eval echo '${'$as_ac_Header'}'`" >&5
    10443 +echo "$as_me:13510: result: `eval echo '${'$as_ac_Header'}'`" >&5
     10482+echo "$as_me:13541: result: `eval echo '${'$as_ac_Header'}'`" >&5
    1044410483 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    1044510484 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    1044610485   cat >>confdefs.h <<EOF
    10447 @@ -13178,10 +13525,10 @@
     10486@@ -13178,10 +13556,10 @@
    1044810487        *)      termios_bad=maybe ;;
    1044910488        esac
    1045010489        if test "$termios_bad" = maybe ; then
    1045110490-       echo "$as_me:13181: checking whether termios.h needs _POSIX_SOURCE" >&5
    10452 +       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
    1045310492 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
    1045410493        cat >conftest.$ac_ext <<_ACEOF
    1045510494-#line 13184 "configure"
    10456 +#line 13531 "configure"
     10495+#line 13562 "configure"
    1045710496 #include "confdefs.h"
    1045810497 #include <termios.h>
    1045910498 int
    10460 @@ -13193,16 +13540,16 @@
     10499@@ -13193,16 +13571,16 @@
    1046110500 }
    1046210501 _ACEOF
    1046310502 rm -f conftest.$ac_objext
    1046410503-if { (eval echo "$as_me:13196: \"$ac_compile\"") >&5
    10465 +if { (eval echo "$as_me:13543: \"$ac_compile\"") >&5
     10504+if { (eval echo "$as_me:13574: \"$ac_compile\"") >&5
    1046610505   (eval $ac_compile) 2>&5
    1046710506   ac_status=$?
    1046810507-  echo "$as_me:13199: \$? = $ac_status" >&5
    10469 +  echo "$as_me:13546: \$? = $ac_status" >&5
     10508+  echo "$as_me:13577: \$? = $ac_status" >&5
    1047010509   (exit $ac_status); } &&
    1047110510          { ac_try='test -s conftest.$ac_objext'
    1047210511-  { (eval echo "$as_me:13202: \"$ac_try\"") >&5
    10473 +  { (eval echo "$as_me:13549: \"$ac_try\"") >&5
     10512+  { (eval echo "$as_me:13580: \"$ac_try\"") >&5
    1047410513   (eval $ac_try) 2>&5
    1047510514   ac_status=$?
    1047610515-  echo "$as_me:13205: \$? = $ac_status" >&5
    10477 +  echo "$as_me:13552: \$? = $ac_status" >&5
     10516+  echo "$as_me:13583: \$? = $ac_status" >&5
    1047810517   (exit $ac_status); }; }; then
    1047910518   termios_bad=no
    1048010519 else
    10481 @@ -13210,7 +13557,7 @@
     10520@@ -13210,7 +13588,7 @@
    1048210521 cat conftest.$ac_ext >&5
    1048310522 
    1048410523                cat >conftest.$ac_ext <<_ACEOF
    1048510524-#line 13213 "configure"
    10486 +#line 13560 "configure"
     10525+#line 13591 "configure"
    1048710526 #include "confdefs.h"
    1048810527 
    1048910528 #define _POSIX_SOURCE
    10490 @@ -13224,16 +13571,16 @@
     10529@@ -13224,16 +13602,16 @@
    1049110530 }
    1049210531 _ACEOF
    1049310532 rm -f conftest.$ac_objext
    1049410533-if { (eval echo "$as_me:13227: \"$ac_compile\"") >&5
    10495 +if { (eval echo "$as_me:13574: \"$ac_compile\"") >&5
     10534+if { (eval echo "$as_me:13605: \"$ac_compile\"") >&5
    1049610535   (eval $ac_compile) 2>&5
    1049710536   ac_status=$?
    1049810537-  echo "$as_me:13230: \$? = $ac_status" >&5
    10499 +  echo "$as_me:13577: \$? = $ac_status" >&5
     10538+  echo "$as_me:13608: \$? = $ac_status" >&5
    1050010539   (exit $ac_status); } &&
    1050110540          { ac_try='test -s conftest.$ac_objext'
    1050210541-  { (eval echo "$as_me:13233: \"$ac_try\"") >&5
    10503 +  { (eval echo "$as_me:13580: \"$ac_try\"") >&5
     10542+  { (eval echo "$as_me:13611: \"$ac_try\"") >&5
    1050410543   (eval $ac_try) 2>&5
    1050510544   ac_status=$?
    1050610545-  echo "$as_me:13236: \$? = $ac_status" >&5
    10507 +  echo "$as_me:13583: \$? = $ac_status" >&5
     10546+  echo "$as_me:13614: \$? = $ac_status" >&5
    1050810547   (exit $ac_status); }; }; then
    1050910548   termios_bad=unknown
    1051010549 else
    10511 @@ -13248,19 +13595,19 @@
     10550@@ -13248,19 +13626,19 @@
    1051210551 
    1051310552 fi
    1051410553 rm -f conftest.$ac_objext conftest.$ac_ext
    1051510554-       echo "$as_me:13251: result: $termios_bad" >&5
    10516 +       echo "$as_me:13598: result: $termios_bad" >&5
     10555+       echo "$as_me:13629: result: $termios_bad" >&5
    1051710556 echo "${ECHO_T}$termios_bad" >&6
    1051810557        fi
     
    1052010559 
    1052110560-echo "$as_me:13256: checking for tcgetattr" >&5
    10522 +echo "$as_me:13603: checking for tcgetattr" >&5
     10561+echo "$as_me:13634: checking for tcgetattr" >&5
    1052310562 echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
    1052410563 if test "${cf_cv_have_tcgetattr+set}" = set; then
     
    1052810567 cat >conftest.$ac_ext <<_ACEOF
    1052910568-#line 13263 "configure"
    10530 +#line 13610 "configure"
     10569+#line 13641 "configure"
    1053110570 #include "confdefs.h"
    1053210571 
    1053310572 #include <sys/types.h>
    10534 @@ -13288,16 +13635,16 @@
     10573@@ -13288,16 +13666,16 @@
    1053510574 }
    1053610575 _ACEOF
    1053710576 rm -f conftest.$ac_objext conftest$ac_exeext
    1053810577-if { (eval echo "$as_me:13291: \"$ac_link\"") >&5
    10539 +if { (eval echo "$as_me:13638: \"$ac_link\"") >&5
     10578+if { (eval echo "$as_me:13669: \"$ac_link\"") >&5
    1054010579   (eval $ac_link) 2>&5
    1054110580   ac_status=$?
    1054210581-  echo "$as_me:13294: \$? = $ac_status" >&5
    10543 +  echo "$as_me:13641: \$? = $ac_status" >&5
     10582+  echo "$as_me:13672: \$? = $ac_status" >&5
    1054410583   (exit $ac_status); } &&
    1054510584          { ac_try='test -s conftest$ac_exeext'
    1054610585-  { (eval echo "$as_me:13297: \"$ac_try\"") >&5
    10547 +  { (eval echo "$as_me:13644: \"$ac_try\"") >&5
     10586+  { (eval echo "$as_me:13675: \"$ac_try\"") >&5
    1054810587   (eval $ac_try) 2>&5
    1054910588   ac_status=$?
    1055010589-  echo "$as_me:13300: \$? = $ac_status" >&5
    10551 +  echo "$as_me:13647: \$? = $ac_status" >&5
     10590+  echo "$as_me:13678: \$? = $ac_status" >&5
    1055210591   (exit $ac_status); }; }; then
    1055310592   cf_cv_have_tcgetattr=yes
    1055410593 else
    10555 @@ -13307,20 +13654,20 @@
     10594@@ -13307,20 +13685,20 @@
    1055610595 fi
    1055710596 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1055810597 fi
    1055910598-echo "$as_me:13310: result: $cf_cv_have_tcgetattr" >&5
    10560 +echo "$as_me:13657: result: $cf_cv_have_tcgetattr" >&5
     10599+echo "$as_me:13688: result: $cf_cv_have_tcgetattr" >&5
    1056110600 echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
    1056210601 test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF
     
    1056510604 
    1056610605-echo "$as_me:13316: checking for vsscanf function or workaround" >&5
    10567 +echo "$as_me:13663: checking for vsscanf function or workaround" >&5
     10606+echo "$as_me:13694: checking for vsscanf function or workaround" >&5
    1056810607 echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
    1056910608 if test "${cf_cv_func_vsscanf+set}" = set; then
     
    1057310612 cat >conftest.$ac_ext <<_ACEOF
    1057410613-#line 13323 "configure"
    10575 +#line 13670 "configure"
     10614+#line 13701 "configure"
    1057610615 #include "confdefs.h"
    1057710616 
    1057810617 #include <stdarg.h>
    10579 @@ -13336,16 +13683,16 @@
     10618@@ -13336,16 +13714,16 @@
    1058010619 }
    1058110620 _ACEOF
    1058210621 rm -f conftest.$ac_objext conftest$ac_exeext
    1058310622-if { (eval echo "$as_me:13339: \"$ac_link\"") >&5
    10584 +if { (eval echo "$as_me:13686: \"$ac_link\"") >&5
     10623+if { (eval echo "$as_me:13717: \"$ac_link\"") >&5
    1058510624   (eval $ac_link) 2>&5
    1058610625   ac_status=$?
    1058710626-  echo "$as_me:13342: \$? = $ac_status" >&5
    10588 +  echo "$as_me:13689: \$? = $ac_status" >&5
     10627+  echo "$as_me:13720: \$? = $ac_status" >&5
    1058910628   (exit $ac_status); } &&
    1059010629          { ac_try='test -s conftest$ac_exeext'
    1059110630-  { (eval echo "$as_me:13345: \"$ac_try\"") >&5
    10592 +  { (eval echo "$as_me:13692: \"$ac_try\"") >&5
     10631+  { (eval echo "$as_me:13723: \"$ac_try\"") >&5
    1059310632   (eval $ac_try) 2>&5
    1059410633   ac_status=$?
    1059510634-  echo "$as_me:13348: \$? = $ac_status" >&5
    10596 +  echo "$as_me:13695: \$? = $ac_status" >&5
     10635+  echo "$as_me:13726: \$? = $ac_status" >&5
    1059710636   (exit $ac_status); }; }; then
    1059810637   cf_cv_func_vsscanf=vsscanf
    1059910638 else
    10600 @@ -13353,7 +13700,7 @@
     10639@@ -13353,7 +13731,7 @@
    1060110640 cat conftest.$ac_ext >&5
    1060210641 
    1060310642 cat >conftest.$ac_ext <<_ACEOF
    1060410643-#line 13356 "configure"
    10605 +#line 13703 "configure"
     10644+#line 13734 "configure"
    1060610645 #include "confdefs.h"
    1060710646 
    1060810647 #include <stdarg.h>
    10609 @@ -13375,16 +13722,16 @@
     10648@@ -13375,16 +13753,16 @@
    1061010649 }
    1061110650 _ACEOF
    1061210651 rm -f conftest.$ac_objext conftest$ac_exeext
    1061310652-if { (eval echo "$as_me:13378: \"$ac_link\"") >&5
    10614 +if { (eval echo "$as_me:13725: \"$ac_link\"") >&5
     10653+if { (eval echo "$as_me:13756: \"$ac_link\"") >&5
    1061510654   (eval $ac_link) 2>&5
    1061610655   ac_status=$?
    1061710656-  echo "$as_me:13381: \$? = $ac_status" >&5
    10618 +  echo "$as_me:13728: \$? = $ac_status" >&5
     10657+  echo "$as_me:13759: \$? = $ac_status" >&5
    1061910658   (exit $ac_status); } &&
    1062010659          { ac_try='test -s conftest$ac_exeext'
    1062110660-  { (eval echo "$as_me:13384: \"$ac_try\"") >&5
    10622 +  { (eval echo "$as_me:13731: \"$ac_try\"") >&5
     10661+  { (eval echo "$as_me:13762: \"$ac_try\"") >&5
    1062310662   (eval $ac_try) 2>&5
    1062410663   ac_status=$?
    1062510664-  echo "$as_me:13387: \$? = $ac_status" >&5
    10626 +  echo "$as_me:13734: \$? = $ac_status" >&5
     10665+  echo "$as_me:13765: \$? = $ac_status" >&5
    1062710666   (exit $ac_status); }; }; then
    1062810667   cf_cv_func_vsscanf=vfscanf
    1062910668 else
    10630 @@ -13392,7 +13739,7 @@
     10669@@ -13392,7 +13770,7 @@
    1063110670 cat conftest.$ac_ext >&5
    1063210671 
    1063310672 cat >conftest.$ac_ext <<_ACEOF
    1063410673-#line 13395 "configure"
    10635 +#line 13742 "configure"
     10674+#line 13773 "configure"
    1063610675 #include "confdefs.h"
    1063710676 
    1063810677 #include <stdarg.h>
    10639 @@ -13414,16 +13761,16 @@
     10678@@ -13414,16 +13792,16 @@
    1064010679 }
    1064110680 _ACEOF
    1064210681 rm -f conftest.$ac_objext conftest$ac_exeext
    1064310682-if { (eval echo "$as_me:13417: \"$ac_link\"") >&5
    10644 +if { (eval echo "$as_me:13764: \"$ac_link\"") >&5
     10683+if { (eval echo "$as_me:13795: \"$ac_link\"") >&5
    1064510684   (eval $ac_link) 2>&5
    1064610685   ac_status=$?
    1064710686-  echo "$as_me:13420: \$? = $ac_status" >&5
    10648 +  echo "$as_me:13767: \$? = $ac_status" >&5
     10687+  echo "$as_me:13798: \$? = $ac_status" >&5
    1064910688   (exit $ac_status); } &&
    1065010689          { ac_try='test -s conftest$ac_exeext'
    1065110690-  { (eval echo "$as_me:13423: \"$ac_try\"") >&5
    10652 +  { (eval echo "$as_me:13770: \"$ac_try\"") >&5
     10691+  { (eval echo "$as_me:13801: \"$ac_try\"") >&5
    1065310692   (eval $ac_try) 2>&5
    1065410693   ac_status=$?
    1065510694-  echo "$as_me:13426: \$? = $ac_status" >&5
    10656 +  echo "$as_me:13773: \$? = $ac_status" >&5
     10695+  echo "$as_me:13804: \$? = $ac_status" >&5
    1065710696   (exit $ac_status); }; }; then
    1065810697   cf_cv_func_vsscanf=_doscan
    1065910698 else
    10660 @@ -13438,7 +13785,7 @@
     10699@@ -13438,7 +13816,7 @@
    1066110700 fi
    1066210701 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1066310702 fi
    1066410703-echo "$as_me:13441: result: $cf_cv_func_vsscanf" >&5
    10665 +echo "$as_me:13788: result: $cf_cv_func_vsscanf" >&5
     10704+echo "$as_me:13819: result: $cf_cv_func_vsscanf" >&5
    1066610705 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
    1066710706 
    1066810707 case $cf_cv_func_vsscanf in #(vi
    10669 @@ -13456,7 +13803,7 @@
     10708@@ -13456,7 +13834,7 @@
    1067010709 ;;
    1067110710 esac
    1067210711 
    1067310712-echo "$as_me:13459: checking for working mkstemp" >&5
    10674 +echo "$as_me:13806: checking for working mkstemp" >&5
     10713+echo "$as_me:13837: checking for working mkstemp" >&5
    1067510714 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
    1067610715 if test "${cf_cv_func_mkstemp+set}" = set; then
    1067710716   echo $ECHO_N "(cached) $ECHO_C" >&6
    10678 @@ -13464,13 +13811,13 @@
     10717@@ -13464,13 +13842,13 @@
    1067910718 
    1068010719 rm -f conftest*
    1068110720 if test "$cross_compiling" = yes; then
    1068210721-  echo "$as_me:13467: checking for mkstemp" >&5
    10683 +  echo "$as_me:13814: checking for mkstemp" >&5
     10722+  echo "$as_me:13845: checking for mkstemp" >&5
    1068410723 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
    1068510724 if test "${ac_cv_func_mkstemp+set}" = set; then
     
    1068810727   cat >conftest.$ac_ext <<_ACEOF
    1068910728-#line 13473 "configure"
    10690 +#line 13820 "configure"
     10729+#line 13851 "configure"
    1069110730 #include "confdefs.h"
    1069210731 /* System header to define __stub macros and hopefully few prototypes,
    1069310732     which can conflict with char mkstemp (); below.  */
    10694 @@ -13501,16 +13848,16 @@
     10733@@ -13501,16 +13879,16 @@
    1069510734 }
    1069610735 _ACEOF
    1069710736 rm -f conftest.$ac_objext conftest$ac_exeext
    1069810737-if { (eval echo "$as_me:13504: \"$ac_link\"") >&5
    10699 +if { (eval echo "$as_me:13851: \"$ac_link\"") >&5
     10738+if { (eval echo "$as_me:13882: \"$ac_link\"") >&5
    1070010739   (eval $ac_link) 2>&5
    1070110740   ac_status=$?
    1070210741-  echo "$as_me:13507: \$? = $ac_status" >&5
    10703 +  echo "$as_me:13854: \$? = $ac_status" >&5
     10742+  echo "$as_me:13885: \$? = $ac_status" >&5
    1070410743   (exit $ac_status); } &&
    1070510744          { ac_try='test -s conftest$ac_exeext'
    1070610745-  { (eval echo "$as_me:13510: \"$ac_try\"") >&5
    10707 +  { (eval echo "$as_me:13857: \"$ac_try\"") >&5
     10746+  { (eval echo "$as_me:13888: \"$ac_try\"") >&5
    1070810747   (eval $ac_try) 2>&5
    1070910748   ac_status=$?
    1071010749-  echo "$as_me:13513: \$? = $ac_status" >&5
    10711 +  echo "$as_me:13860: \$? = $ac_status" >&5
     10750+  echo "$as_me:13891: \$? = $ac_status" >&5
    1071210751   (exit $ac_status); }; }; then
    1071310752   ac_cv_func_mkstemp=yes
    1071410753 else
    10715 @@ -13520,12 +13867,12 @@
     10754@@ -13520,12 +13898,12 @@
    1071610755 fi
    1071710756 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1071810757 fi
    1071910758-echo "$as_me:13523: result: $ac_cv_func_mkstemp" >&5
    10720 +echo "$as_me:13870: result: $ac_cv_func_mkstemp" >&5
     10759+echo "$as_me:13901: result: $ac_cv_func_mkstemp" >&5
    1072110760 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
    1072210761 
     
    1072410763   cat >conftest.$ac_ext <<_ACEOF
    1072510764-#line 13528 "configure"
    10726 +#line 13875 "configure"
     10765+#line 13906 "configure"
    1072710766 #include "confdefs.h"
    1072810767 
    1072910768 #include <sys/types.h>
    10730 @@ -13563,15 +13910,15 @@
     10769@@ -13563,15 +13941,15 @@
    1073110770 
    1073210771 _ACEOF
    1073310772 rm -f conftest$ac_exeext
    1073410773-if { (eval echo "$as_me:13566: \"$ac_link\"") >&5
    10735 +if { (eval echo "$as_me:13913: \"$ac_link\"") >&5
     10774+if { (eval echo "$as_me:13944: \"$ac_link\"") >&5
    1073610775   (eval $ac_link) 2>&5
    1073710776   ac_status=$?
    1073810777-  echo "$as_me:13569: \$? = $ac_status" >&5
    10739 +  echo "$as_me:13916: \$? = $ac_status" >&5
     10778+  echo "$as_me:13947: \$? = $ac_status" >&5
    1074010779   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1074110780-  { (eval echo "$as_me:13571: \"$ac_try\"") >&5
    10742 +  { (eval echo "$as_me:13918: \"$ac_try\"") >&5
     10781+  { (eval echo "$as_me:13949: \"$ac_try\"") >&5
    1074310782   (eval $ac_try) 2>&5
    1074410783   ac_status=$?
    1074510784-  echo "$as_me:13574: \$? = $ac_status" >&5
    10746 +  echo "$as_me:13921: \$? = $ac_status" >&5
     10785+  echo "$as_me:13952: \$? = $ac_status" >&5
    1074710786   (exit $ac_status); }; }; then
    1074810787   cf_cv_func_mkstemp=yes
    1074910788 
    10750 @@ -13586,7 +13933,7 @@
     10789@@ -13586,7 +13964,7 @@
    1075110790 fi
    1075210791 
    1075310792 fi
    1075410793-echo "$as_me:13589: result: $cf_cv_func_mkstemp" >&5
    10755 +echo "$as_me:13936: result: $cf_cv_func_mkstemp" >&5
     10794+echo "$as_me:13967: result: $cf_cv_func_mkstemp" >&5
    1075610795 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
    1075710796 if test "$cf_cv_func_mkstemp" = yes ; then
    1075810797        cat >>confdefs.h <<\EOF
    10759 @@ -13604,21 +13951,21 @@
     10798@@ -13604,21 +13982,21 @@
    1076010799 fi
    1076110800 
    1076210801 if test "$cross_compiling" = yes ; then
    1076310802-       { echo "$as_me:13607: WARNING: cross compiling: assume setvbuf params not reversed" >&5
    10764 +       { 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
    1076510804 echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
    1076610805 else
    1076710806-       echo "$as_me:13610: checking whether setvbuf arguments are reversed" >&5
    10768 +       echo "$as_me:13957: checking whether setvbuf arguments are reversed" >&5
     10807+       echo "$as_me:13988: checking whether setvbuf arguments are reversed" >&5
    1076910808 echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
    1077010809 if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
     
    1077310812   if test "$cross_compiling" = yes; then
    1077410813-  { { echo "$as_me:13616: error: cannot run test program while cross compiling" >&5
    10775 +  { { 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
    1077610815 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    1077710816    { (exit 1); exit 1; }; }
     
    1077910818   cat >conftest.$ac_ext <<_ACEOF
    1078010819-#line 13621 "configure"
    10781 +#line 13968 "configure"
     10820+#line 13999 "configure"
    1078210821 #include "confdefs.h"
    1078310822 #include <stdio.h>
    1078410823 /* If setvbuf has the reversed format, exit 0. */
    10785 @@ -13635,15 +13982,15 @@
     10824@@ -13635,15 +14013,15 @@
    1078610825 }
    1078710826 _ACEOF
    1078810827 rm -f conftest$ac_exeext
    1078910828-if { (eval echo "$as_me:13638: \"$ac_link\"") >&5
    10790 +if { (eval echo "$as_me:13985: \"$ac_link\"") >&5
     10829+if { (eval echo "$as_me:14016: \"$ac_link\"") >&5
    1079110830   (eval $ac_link) 2>&5
    1079210831   ac_status=$?
    1079310832-  echo "$as_me:13641: \$? = $ac_status" >&5
    10794 +  echo "$as_me:13988: \$? = $ac_status" >&5
     10833+  echo "$as_me:14019: \$? = $ac_status" >&5
    1079510834   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1079610835-  { (eval echo "$as_me:13643: \"$ac_try\"") >&5
    10797 +  { (eval echo "$as_me:13990: \"$ac_try\"") >&5
     10836+  { (eval echo "$as_me:14021: \"$ac_try\"") >&5
    1079810837   (eval $ac_try) 2>&5
    1079910838   ac_status=$?
    1080010839-  echo "$as_me:13646: \$? = $ac_status" >&5
    10801 +  echo "$as_me:13993: \$? = $ac_status" >&5
     10840+  echo "$as_me:14024: \$? = $ac_status" >&5
    1080210841   (exit $ac_status); }; }; then
    1080310842   ac_cv_func_setvbuf_reversed=yes
    1080410843 else
    10805 @@ -13656,7 +14003,7 @@
     10844@@ -13656,7 +14034,7 @@
    1080610845 fi
    1080710846 rm -f core core.* *.core
    1080810847 fi
    1080910848-echo "$as_me:13659: result: $ac_cv_func_setvbuf_reversed" >&5
    10810 +echo "$as_me:14006: result: $ac_cv_func_setvbuf_reversed" >&5
     10849+echo "$as_me:14037: result: $ac_cv_func_setvbuf_reversed" >&5
    1081110850 echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
    1081210851 if test $ac_cv_func_setvbuf_reversed = yes; then
    1081310852 
    10814 @@ -13667,13 +14014,13 @@
     10853@@ -13667,13 +14045,13 @@
    1081510854 fi
    1081610855 
    1081710856 fi
    1081810857-echo "$as_me:13670: checking return type of signal handlers" >&5
    10819 +echo "$as_me:14017: checking return type of signal handlers" >&5
     10858+echo "$as_me:14048: checking return type of signal handlers" >&5
    1082010859 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
    1082110860 if test "${ac_cv_type_signal+set}" = set; then
     
    1082410863   cat >conftest.$ac_ext <<_ACEOF
    1082510864-#line 13676 "configure"
    10826 +#line 14023 "configure"
     10865+#line 14054 "configure"
    1082710866 #include "confdefs.h"
    1082810867 #include <sys/types.h>
    1082910868 #include <signal.h>
    10830 @@ -13695,16 +14042,16 @@
     10869@@ -13695,16 +14073,16 @@
    1083110870 }
    1083210871 _ACEOF
    1083310872 rm -f conftest.$ac_objext
    1083410873-if { (eval echo "$as_me:13698: \"$ac_compile\"") >&5
    10835 +if { (eval echo "$as_me:14045: \"$ac_compile\"") >&5
     10874+if { (eval echo "$as_me:14076: \"$ac_compile\"") >&5
    1083610875   (eval $ac_compile) 2>&5
    1083710876   ac_status=$?
    1083810877-  echo "$as_me:13701: \$? = $ac_status" >&5
    10839 +  echo "$as_me:14048: \$? = $ac_status" >&5
     10878+  echo "$as_me:14079: \$? = $ac_status" >&5
    1084010879   (exit $ac_status); } &&
    1084110880          { ac_try='test -s conftest.$ac_objext'
    1084210881-  { (eval echo "$as_me:13704: \"$ac_try\"") >&5
    10843 +  { (eval echo "$as_me:14051: \"$ac_try\"") >&5
     10882+  { (eval echo "$as_me:14082: \"$ac_try\"") >&5
    1084410883   (eval $ac_try) 2>&5
    1084510884   ac_status=$?
    1084610885-  echo "$as_me:13707: \$? = $ac_status" >&5
    10847 +  echo "$as_me:14054: \$? = $ac_status" >&5
     10886+  echo "$as_me:14085: \$? = $ac_status" >&5
    1084810887   (exit $ac_status); }; }; then
    1084910888   ac_cv_type_signal=void
    1085010889 else
    10851 @@ -13714,21 +14061,21 @@
     10890@@ -13714,21 +14092,21 @@
    1085210891 fi
    1085310892 rm -f conftest.$ac_objext conftest.$ac_ext
    1085410893 fi
    1085510894-echo "$as_me:13717: result: $ac_cv_type_signal" >&5
    10856 +echo "$as_me:14064: result: $ac_cv_type_signal" >&5
     10895+echo "$as_me:14095: result: $ac_cv_type_signal" >&5
    1085710896 echo "${ECHO_T}$ac_cv_type_signal" >&6
    1085810897 
     
    1086210901 
    1086310902-echo "$as_me:13724: checking for type sigaction_t" >&5
    10864 +echo "$as_me:14071: checking for type sigaction_t" >&5
     10903+echo "$as_me:14102: checking for type sigaction_t" >&5
    1086510904 echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
    1086610905 if test "${cf_cv_type_sigaction+set}" = set; then
     
    1087010909        cat >conftest.$ac_ext <<_ACEOF
    1087110910-#line 13731 "configure"
    10872 +#line 14078 "configure"
     10911+#line 14109 "configure"
    1087310912 #include "confdefs.h"
    1087410913 
    1087510914 #include <signal.h>
    10876 @@ -13741,16 +14088,16 @@
     10915@@ -13741,16 +14119,16 @@
    1087710916 }
    1087810917 _ACEOF
    1087910918 rm -f conftest.$ac_objext
    1088010919-if { (eval echo "$as_me:13744: \"$ac_compile\"") >&5
    10881 +if { (eval echo "$as_me:14091: \"$ac_compile\"") >&5
     10920+if { (eval echo "$as_me:14122: \"$ac_compile\"") >&5
    1088210921   (eval $ac_compile) 2>&5
    1088310922   ac_status=$?
    1088410923-  echo "$as_me:13747: \$? = $ac_status" >&5
    10885 +  echo "$as_me:14094: \$? = $ac_status" >&5
     10924+  echo "$as_me:14125: \$? = $ac_status" >&5
    1088610925   (exit $ac_status); } &&
    1088710926          { ac_try='test -s conftest.$ac_objext'
    1088810927-  { (eval echo "$as_me:13750: \"$ac_try\"") >&5
    10889 +  { (eval echo "$as_me:14097: \"$ac_try\"") >&5
     10928+  { (eval echo "$as_me:14128: \"$ac_try\"") >&5
    1089010929   (eval $ac_try) 2>&5
    1089110930   ac_status=$?
    1089210931-  echo "$as_me:13753: \$? = $ac_status" >&5
    10893 +  echo "$as_me:14100: \$? = $ac_status" >&5
     10932+  echo "$as_me:14131: \$? = $ac_status" >&5
    1089410933   (exit $ac_status); }; }; then
    1089510934   cf_cv_type_sigaction=yes
    1089610935 else
    10897 @@ -13761,13 +14108,13 @@
     10936@@ -13761,13 +14139,13 @@
    1089810937 rm -f conftest.$ac_objext conftest.$ac_ext
    1089910938 fi
    1090010939 
    1090110940-echo "$as_me:13764: result: $cf_cv_type_sigaction" >&5
    10902 +echo "$as_me:14111: result: $cf_cv_type_sigaction" >&5
     10941+echo "$as_me:14142: result: $cf_cv_type_sigaction" >&5
    1090310942 echo "${ECHO_T}$cf_cv_type_sigaction" >&6
    1090410943 test "$cf_cv_type_sigaction" = yes && cat >>confdefs.h <<\EOF
     
    1090710946 
    1090810947-echo "$as_me:13770: checking declaration of size-change" >&5
    10909 +echo "$as_me:14117: checking declaration of size-change" >&5
     10948+echo "$as_me:14148: checking declaration of size-change" >&5
    1091010949 echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
    1091110950 if test "${cf_cv_sizechange+set}" = set; then
    1091210951   echo $ECHO_N "(cached) $ECHO_C" >&6
    10913 @@ -13782,7 +14129,7 @@
     10952@@ -13782,7 +14160,7 @@
    1091410953     CPPFLAGS="$cf_save_CPPFLAGS"
    1091510954     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
    1091610955     cat >conftest.$ac_ext <<_ACEOF
    1091710956-#line 13785 "configure"
    10918 +#line 14132 "configure"
     10957+#line 14163 "configure"
    1091910958 #include "confdefs.h"
    1092010959 #include <sys/types.h>
    1092110960 #ifdef HAVE_TERMIOS_H
    10922 @@ -13826,16 +14173,16 @@
     10961@@ -13826,16 +14204,16 @@
    1092310962 }
    1092410963 _ACEOF
    1092510964 rm -f conftest.$ac_objext
    1092610965-if { (eval echo "$as_me:13829: \"$ac_compile\"") >&5
    10927 +if { (eval echo "$as_me:14176: \"$ac_compile\"") >&5
     10966+if { (eval echo "$as_me:14207: \"$ac_compile\"") >&5
    1092810967   (eval $ac_compile) 2>&5
    1092910968   ac_status=$?
    1093010969-  echo "$as_me:13832: \$? = $ac_status" >&5
    10931 +  echo "$as_me:14179: \$? = $ac_status" >&5
     10970+  echo "$as_me:14210: \$? = $ac_status" >&5
    1093210971   (exit $ac_status); } &&
    1093310972          { ac_try='test -s conftest.$ac_objext'
    1093410973-  { (eval echo "$as_me:13835: \"$ac_try\"") >&5
    10935 +  { (eval echo "$as_me:14182: \"$ac_try\"") >&5
     10974+  { (eval echo "$as_me:14213: \"$ac_try\"") >&5
    1093610975   (eval $ac_try) 2>&5
    1093710976   ac_status=$?
    1093810977-  echo "$as_me:13838: \$? = $ac_status" >&5
    10939 +  echo "$as_me:14185: \$? = $ac_status" >&5
     10978+  echo "$as_me:14216: \$? = $ac_status" >&5
    1094010979   (exit $ac_status); }; }; then
    1094110980   cf_cv_sizechange=yes
    1094210981 else
    10943 @@ -13854,7 +14201,7 @@
     10982@@ -13854,7 +14232,7 @@
    1094410983 done
    1094510984 
    1094610985 fi
    1094710986-echo "$as_me:13857: result: $cf_cv_sizechange" >&5
    10948 +echo "$as_me:14204: result: $cf_cv_sizechange" >&5
     10987+echo "$as_me:14235: result: $cf_cv_sizechange" >&5
    1094910988 echo "${ECHO_T}$cf_cv_sizechange" >&6
    1095010989 if test "$cf_cv_sizechange" != no ; then
    1095110990        cat >>confdefs.h <<\EOF
    10952 @@ -13871,13 +14218,13 @@
     10991@@ -13871,13 +14249,13 @@
    1095310992        esac
    1095410993 fi
    1095510994 
    1095610995-echo "$as_me:13874: checking for memmove" >&5
    10957 +echo "$as_me:14221: checking for memmove" >&5
     10996+echo "$as_me:14252: checking for memmove" >&5
    1095810997 echo $ECHO_N "checking for memmove... $ECHO_C" >&6
    1095910998 if test "${ac_cv_func_memmove+set}" = set; then
     
    1096211001   cat >conftest.$ac_ext <<_ACEOF
    1096311002-#line 13880 "configure"
    10964 +#line 14227 "configure"
     11003+#line 14258 "configure"
    1096511004 #include "confdefs.h"
    1096611005 /* System header to define __stub macros and hopefully few prototypes,
    1096711006     which can conflict with char memmove (); below.  */
    10968 @@ -13908,16 +14255,16 @@
     11007@@ -13908,16 +14286,16 @@
    1096911008 }
    1097011009 _ACEOF
    1097111010 rm -f conftest.$ac_objext conftest$ac_exeext
    1097211011-if { (eval echo "$as_me:13911: \"$ac_link\"") >&5
    10973 +if { (eval echo "$as_me:14258: \"$ac_link\"") >&5
     11012+if { (eval echo "$as_me:14289: \"$ac_link\"") >&5
    1097411013   (eval $ac_link) 2>&5
    1097511014   ac_status=$?
    1097611015-  echo "$as_me:13914: \$? = $ac_status" >&5
    10977 +  echo "$as_me:14261: \$? = $ac_status" >&5
     11016+  echo "$as_me:14292: \$? = $ac_status" >&5
    1097811017   (exit $ac_status); } &&
    1097911018          { ac_try='test -s conftest$ac_exeext'
    1098011019-  { (eval echo "$as_me:13917: \"$ac_try\"") >&5
    10981 +  { (eval echo "$as_me:14264: \"$ac_try\"") >&5
     11020+  { (eval echo "$as_me:14295: \"$ac_try\"") >&5
    1098211021   (eval $ac_try) 2>&5
    1098311022   ac_status=$?
    1098411023-  echo "$as_me:13920: \$? = $ac_status" >&5
    10985 +  echo "$as_me:14267: \$? = $ac_status" >&5
     11024+  echo "$as_me:14298: \$? = $ac_status" >&5
    1098611025   (exit $ac_status); }; }; then
    1098711026   ac_cv_func_memmove=yes
    1098811027 else
    10989 @@ -13927,19 +14274,19 @@
     11028@@ -13927,19 +14305,19 @@
    1099011029 fi
    1099111030 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1099211031 fi
    1099311032-echo "$as_me:13930: result: $ac_cv_func_memmove" >&5
    10994 +echo "$as_me:14277: result: $ac_cv_func_memmove" >&5
     11033+echo "$as_me:14308: result: $ac_cv_func_memmove" >&5
    1099511034 echo "${ECHO_T}$ac_cv_func_memmove" >&6
    1099611035 if test $ac_cv_func_memmove = yes; then
     
    1099911038 
    1100011039-echo "$as_me:13936: checking for bcopy" >&5
    11001 +echo "$as_me:14283: checking for bcopy" >&5
     11040+echo "$as_me:14314: checking for bcopy" >&5
    1100211041 echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
    1100311042 if test "${ac_cv_func_bcopy+set}" = set; then
     
    1100611045   cat >conftest.$ac_ext <<_ACEOF
    1100711046-#line 13942 "configure"
    11008 +#line 14289 "configure"
     11047+#line 14320 "configure"
    1100911048 #include "confdefs.h"
    1101011049 /* System header to define __stub macros and hopefully few prototypes,
    1101111050     which can conflict with char bcopy (); below.  */
    11012 @@ -13970,16 +14317,16 @@
     11051@@ -13970,16 +14348,16 @@
    1101311052 }
    1101411053 _ACEOF
    1101511054 rm -f conftest.$ac_objext conftest$ac_exeext
    1101611055-if { (eval echo "$as_me:13973: \"$ac_link\"") >&5
    11017 +if { (eval echo "$as_me:14320: \"$ac_link\"") >&5
     11056+if { (eval echo "$as_me:14351: \"$ac_link\"") >&5
    1101811057   (eval $ac_link) 2>&5
    1101911058   ac_status=$?
    1102011059-  echo "$as_me:13976: \$? = $ac_status" >&5
    11021 +  echo "$as_me:14323: \$? = $ac_status" >&5
     11060+  echo "$as_me:14354: \$? = $ac_status" >&5
    1102211061   (exit $ac_status); } &&
    1102311062          { ac_try='test -s conftest$ac_exeext'
    1102411063-  { (eval echo "$as_me:13979: \"$ac_try\"") >&5
    11025 +  { (eval echo "$as_me:14326: \"$ac_try\"") >&5
     11064+  { (eval echo "$as_me:14357: \"$ac_try\"") >&5
    1102611065   (eval $ac_try) 2>&5
    1102711066   ac_status=$?
    1102811067-  echo "$as_me:13982: \$? = $ac_status" >&5
    11029 +  echo "$as_me:14329: \$? = $ac_status" >&5
     11068+  echo "$as_me:14360: \$? = $ac_status" >&5
    1103011069   (exit $ac_status); }; }; then
    1103111070   ac_cv_func_bcopy=yes
    1103211071 else
    11033 @@ -13989,11 +14336,11 @@
     11072@@ -13989,11 +14367,11 @@
    1103411073 fi
    1103511074 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1103611075 fi
    1103711076-echo "$as_me:13992: result: $ac_cv_func_bcopy" >&5
    11038 +echo "$as_me:14339: result: $ac_cv_func_bcopy" >&5
     11077+echo "$as_me:14370: result: $ac_cv_func_bcopy" >&5
    1103911078 echo "${ECHO_T}$ac_cv_func_bcopy" >&6
    1104011079 if test $ac_cv_func_bcopy = yes; then
    1104111080 
    1104211081-       echo "$as_me:13996: checking if bcopy does overlapping moves" >&5
    11043 +       echo "$as_me:14343: checking if bcopy does overlapping moves" >&5
     11082+       echo "$as_me:14374: checking if bcopy does overlapping moves" >&5
    1104411083 echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
    1104511084 if test "${cf_cv_good_bcopy+set}" = set; then
    1104611085   echo $ECHO_N "(cached) $ECHO_C" >&6
    11047 @@ -14003,7 +14350,7 @@
     11086@@ -14003,7 +14381,7 @@
    1104811087   cf_cv_good_bcopy=unknown
    1104911088 else
    1105011089   cat >conftest.$ac_ext <<_ACEOF
    1105111090-#line 14006 "configure"
    11052 +#line 14353 "configure"
     11091+#line 14384 "configure"
    1105311092 #include "confdefs.h"
    1105411093 
    1105511094 int main() {
    11056 @@ -14017,15 +14364,15 @@
     11095@@ -14017,15 +14395,15 @@
    1105711096 
    1105811097 _ACEOF
    1105911098 rm -f conftest$ac_exeext
    1106011099-if { (eval echo "$as_me:14020: \"$ac_link\"") >&5
    11061 +if { (eval echo "$as_me:14367: \"$ac_link\"") >&5
     11100+if { (eval echo "$as_me:14398: \"$ac_link\"") >&5
    1106211101   (eval $ac_link) 2>&5
    1106311102   ac_status=$?
    1106411103-  echo "$as_me:14023: \$? = $ac_status" >&5
    11065 +  echo "$as_me:14370: \$? = $ac_status" >&5
     11104+  echo "$as_me:14401: \$? = $ac_status" >&5
    1106611105   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1106711106-  { (eval echo "$as_me:14025: \"$ac_try\"") >&5
    11068 +  { (eval echo "$as_me:14372: \"$ac_try\"") >&5
     11107+  { (eval echo "$as_me:14403: \"$ac_try\"") >&5
    1106911108   (eval $ac_try) 2>&5
    1107011109   ac_status=$?
    1107111110-  echo "$as_me:14028: \$? = $ac_status" >&5
    11072 +  echo "$as_me:14375: \$? = $ac_status" >&5
     11111+  echo "$as_me:14406: \$? = $ac_status" >&5
    1107311112   (exit $ac_status); }; }; then
    1107411113   cf_cv_good_bcopy=yes
    1107511114 else
    11076 @@ -14038,7 +14385,7 @@
     11115@@ -14038,7 +14416,7 @@
    1107711116 fi
    1107811117 
    1107911118 fi
    1108011119-echo "$as_me:14041: result: $cf_cv_good_bcopy" >&5
    11081 +echo "$as_me:14388: result: $cf_cv_good_bcopy" >&5
     11120+echo "$as_me:14419: result: $cf_cv_good_bcopy" >&5
    1108211121 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
    1108311122 
    1108411123 else
    11085 @@ -14059,7 +14406,7 @@
     11124@@ -14059,7 +14437,7 @@
    1108611125 
    1108711126 fi
    1108811127 
    1108911128-echo "$as_me:14062: checking if poll really works" >&5
    11090 +echo "$as_me:14409: checking if poll really works" >&5
     11129+echo "$as_me:14440: checking if poll really works" >&5
    1109111130 echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
    1109211131 if test "${cf_cv_working_poll+set}" = set; then
    1109311132   echo $ECHO_N "(cached) $ECHO_C" >&6
    11094 @@ -14069,7 +14416,7 @@
     11133@@ -14069,7 +14447,7 @@
    1109511134   cf_cv_working_poll=unknown
    1109611135 else
    1109711136   cat >conftest.$ac_ext <<_ACEOF
    1109811137-#line 14072 "configure"
    11099 +#line 14419 "configure"
     11138+#line 14450 "configure"
    1110011139 #include "confdefs.h"
    1110111140 
    1110211141 #include <stdio.h>
    11103 @@ -14090,15 +14437,15 @@
     11142@@ -14090,15 +14468,15 @@
    1110411143 }
    1110511144 _ACEOF
    1110611145 rm -f conftest$ac_exeext
    1110711146-if { (eval echo "$as_me:14093: \"$ac_link\"") >&5
    11108 +if { (eval echo "$as_me:14440: \"$ac_link\"") >&5
     11147+if { (eval echo "$as_me:14471: \"$ac_link\"") >&5
    1110911148   (eval $ac_link) 2>&5
    1111011149   ac_status=$?
    1111111150-  echo "$as_me:14096: \$? = $ac_status" >&5
    11112 +  echo "$as_me:14443: \$? = $ac_status" >&5
     11151+  echo "$as_me:14474: \$? = $ac_status" >&5
    1111311152   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1111411153-  { (eval echo "$as_me:14098: \"$ac_try\"") >&5
    11115 +  { (eval echo "$as_me:14445: \"$ac_try\"") >&5
     11154+  { (eval echo "$as_me:14476: \"$ac_try\"") >&5
    1111611155   (eval $ac_try) 2>&5
    1111711156   ac_status=$?
    1111811157-  echo "$as_me:14101: \$? = $ac_status" >&5
    11119 +  echo "$as_me:14448: \$? = $ac_status" >&5
     11158+  echo "$as_me:14479: \$? = $ac_status" >&5
    1112011159   (exit $ac_status); }; }; then
    1112111160   cf_cv_working_poll=yes
    1112211161 else
    11123 @@ -14110,7 +14457,7 @@
     11162@@ -14110,7 +14488,7 @@
    1112411163 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
    1112511164 fi
    1112611165 fi
    1112711166-echo "$as_me:14113: result: $cf_cv_working_poll" >&5
    11128 +echo "$as_me:14460: result: $cf_cv_working_poll" >&5
     11167+echo "$as_me:14491: result: $cf_cv_working_poll" >&5
    1112911168 echo "${ECHO_T}$cf_cv_working_poll" >&6
    1113011169 test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF
    1113111170 #define HAVE_WORKING_POLL 1
    11132 @@ -14118,7 +14465,7 @@
     11171@@ -14118,7 +14496,7 @@
    1113311172 
    1113411173 # special check for test/ditto.c
    1113511174 
    1113611175-echo "$as_me:14121: checking for openpty in -lutil" >&5
    11137 +echo "$as_me:14468: checking for openpty in -lutil" >&5
     11176+echo "$as_me:14499: checking for openpty in -lutil" >&5
    1113811177 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
    1113911178 if test "${ac_cv_lib_util_openpty+set}" = set; then
    1114011179   echo $ECHO_N "(cached) $ECHO_C" >&6
    11141 @@ -14126,7 +14473,7 @@
     11180@@ -14126,7 +14504,7 @@
    1114211181   ac_check_lib_save_LIBS=$LIBS
    1114311182 LIBS="-lutil  $LIBS"
    1114411183 cat >conftest.$ac_ext <<_ACEOF
    1114511184-#line 14129 "configure"
    11146 +#line 14476 "configure"
     11185+#line 14507 "configure"
    1114711186 #include "confdefs.h"
    1114811187 
    1114911188 /* Override any gcc2 internal prototype to avoid an error.  */
    11150 @@ -14145,16 +14492,16 @@
     11189@@ -14145,16 +14523,16 @@
    1115111190 }
    1115211191 _ACEOF
    1115311192 rm -f conftest.$ac_objext conftest$ac_exeext
    1115411193-if { (eval echo "$as_me:14148: \"$ac_link\"") >&5
    11155 +if { (eval echo "$as_me:14495: \"$ac_link\"") >&5
     11194+if { (eval echo "$as_me:14526: \"$ac_link\"") >&5
    1115611195   (eval $ac_link) 2>&5
    1115711196   ac_status=$?
    1115811197-  echo "$as_me:14151: \$? = $ac_status" >&5
    11159 +  echo "$as_me:14498: \$? = $ac_status" >&5
     11198+  echo "$as_me:14529: \$? = $ac_status" >&5
    1116011199   (exit $ac_status); } &&
    1116111200          { ac_try='test -s conftest$ac_exeext'
    1116211201-  { (eval echo "$as_me:14154: \"$ac_try\"") >&5
    11163 +  { (eval echo "$as_me:14501: \"$ac_try\"") >&5
     11202+  { (eval echo "$as_me:14532: \"$ac_try\"") >&5
    1116411203   (eval $ac_try) 2>&5
    1116511204   ac_status=$?
    1116611205-  echo "$as_me:14157: \$? = $ac_status" >&5
    11167 +  echo "$as_me:14504: \$? = $ac_status" >&5
     11206+  echo "$as_me:14535: \$? = $ac_status" >&5
    1116811207   (exit $ac_status); }; }; then
    1116911208   ac_cv_lib_util_openpty=yes
    1117011209 else
    11171 @@ -14165,7 +14512,7 @@
     11210@@ -14165,7 +14543,7 @@
    1117211211 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1117311212 LIBS=$ac_check_lib_save_LIBS
    1117411213 fi
    1117511214-echo "$as_me:14168: result: $ac_cv_lib_util_openpty" >&5
    11176 +echo "$as_me:14515: result: $ac_cv_lib_util_openpty" >&5
     11215+echo "$as_me:14546: result: $ac_cv_lib_util_openpty" >&5
    1117711216 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
    1117811217 if test $ac_cv_lib_util_openpty = yes; then
    1117911218   cf_cv_lib_util=yes
    11180 @@ -14173,7 +14520,7 @@
     11219@@ -14173,7 +14551,7 @@
    1118111220   cf_cv_lib_util=no
    1118211221 fi
    1118311222 
    1118411223-echo "$as_me:14176: checking for openpty header" >&5
    11185 +echo "$as_me:14523: checking for openpty header" >&5
     11224+echo "$as_me:14554: checking for openpty header" >&5
    1118611225 echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
    1118711226 if test "${cf_cv_func_openpty+set}" = set; then
    1118811227   echo $ECHO_N "(cached) $ECHO_C" >&6
    11189 @@ -14184,7 +14531,7 @@
     11228@@ -14184,7 +14562,7 @@
    1119011229     for cf_header in pty.h libutil.h util.h
    1119111230     do
    1119211231     cat >conftest.$ac_ext <<_ACEOF
    1119311232-#line 14187 "configure"
    11194 +#line 14534 "configure"
     11233+#line 14565 "configure"
    1119511234 #include "confdefs.h"
    1119611235 
    1119711236 #include <$cf_header>
    11198 @@ -14201,16 +14548,16 @@
     11237@@ -14201,16 +14579,16 @@
    1119911238 }
    1120011239 _ACEOF
    1120111240 rm -f conftest.$ac_objext conftest$ac_exeext
    1120211241-if { (eval echo "$as_me:14204: \"$ac_link\"") >&5
    11203 +if { (eval echo "$as_me:14551: \"$ac_link\"") >&5
     11242+if { (eval echo "$as_me:14582: \"$ac_link\"") >&5
    1120411243   (eval $ac_link) 2>&5
    1120511244   ac_status=$?
    1120611245-  echo "$as_me:14207: \$? = $ac_status" >&5
    11207 +  echo "$as_me:14554: \$? = $ac_status" >&5
     11246+  echo "$as_me:14585: \$? = $ac_status" >&5
    1120811247   (exit $ac_status); } &&
    1120911248          { ac_try='test -s conftest$ac_exeext'
    1121011249-  { (eval echo "$as_me:14210: \"$ac_try\"") >&5
    11211 +  { (eval echo "$as_me:14557: \"$ac_try\"") >&5
     11250+  { (eval echo "$as_me:14588: \"$ac_try\"") >&5
    1121211251   (eval $ac_try) 2>&5
    1121311252   ac_status=$?
    1121411253-  echo "$as_me:14213: \$? = $ac_status" >&5
    11215 +  echo "$as_me:14560: \$? = $ac_status" >&5
     11254+  echo "$as_me:14591: \$? = $ac_status" >&5
    1121611255   (exit $ac_status); }; }; then
    1121711256 
    1121811257         cf_cv_func_openpty=$cf_header
    11219 @@ -14228,7 +14575,7 @@
     11258@@ -14228,7 +14606,7 @@
    1122011259     LIBS="$cf_save_LIBS"
    1122111260 
    1122211261 fi
    1122311262-echo "$as_me:14231: result: $cf_cv_func_openpty" >&5
    11224 +echo "$as_me:14578: result: $cf_cv_func_openpty" >&5
     11263+echo "$as_me:14609: result: $cf_cv_func_openpty" >&5
    1122511264 echo "${ECHO_T}$cf_cv_func_openpty" >&6
    1122611265 
    1122711266 if test "$cf_cv_func_openpty" != no ; then
    11228 @@ -14274,13 +14621,13 @@
     11267@@ -14274,13 +14652,13 @@
    1122911268                fi
    1123011269 
     
    1123811277                          cat >conftest.$ac_ext <<_ACEOF
    1123911278-#line 14283 "configure"
    11240 +#line 14630 "configure"
     11279+#line 14661 "configure"
    1124111280 #include "confdefs.h"
    1124211281 #include <stdio.h>
    1124311282 int
    11244 @@ -14292,16 +14639,16 @@
     11283@@ -14292,16 +14670,16 @@
    1124511284 }
    1124611285 _ACEOF
    1124711286 rm -f conftest.$ac_objext
    1124811287-if { (eval echo "$as_me:14295: \"$ac_compile\"") >&5
    11249 +if { (eval echo "$as_me:14642: \"$ac_compile\"") >&5
     11288+if { (eval echo "$as_me:14673: \"$ac_compile\"") >&5
    1125011289   (eval $ac_compile) 2>&5
    1125111290   ac_status=$?
    1125211291-  echo "$as_me:14298: \$? = $ac_status" >&5
    11253 +  echo "$as_me:14645: \$? = $ac_status" >&5
     11292+  echo "$as_me:14676: \$? = $ac_status" >&5
    1125411293   (exit $ac_status); } &&
    1125511294          { ac_try='test -s conftest.$ac_objext'
    1125611295-  { (eval echo "$as_me:14301: \"$ac_try\"") >&5
    11257 +  { (eval echo "$as_me:14648: \"$ac_try\"") >&5
     11296+  { (eval echo "$as_me:14679: \"$ac_try\"") >&5
    1125811297   (eval $ac_try) 2>&5
    1125911298   ac_status=$?
    1126011299-  echo "$as_me:14304: \$? = $ac_status" >&5
    11261 +  echo "$as_me:14651: \$? = $ac_status" >&5
     11300+  echo "$as_me:14682: \$? = $ac_status" >&5
    1126211301   (exit $ac_status); }; }; then
    1126311302   :
    1126411303 else
    11265 @@ -14318,13 +14665,13 @@
     11304@@ -14318,13 +14696,13 @@
    1126611305                if test "$cf_have_incdir" = no ; then
    1126711306                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
    1126811307 
    1126911308-echo "${as_me-configure}:14321: testing adding $cf_add_incdir to include-path ..." 1>&5
    11270 +echo "${as_me-configure}:14668: testing adding $cf_add_incdir to include-path ..." 1>&5
     11309+echo "${as_me-configure}:14699: testing adding $cf_add_incdir to include-path ..." 1>&5
    1127111310 
    1127211311-                 CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
     
    1128211321                  break
    1128311322                fi
    11284 @@ -14352,7 +14699,7 @@
     11323@@ -14352,7 +14730,7 @@
    1128511324       if test "$cf_have_libdir" = no ; then
    1128611325         test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
    1128711326 
    1128811327-echo "${as_me-configure}:14355: testing adding $cf_add_libdir to library-path ..." 1>&5
    11289 +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
    1129011329 
    1129111330         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
    1129211331       fi
    11293 @@ -14363,23 +14710,23 @@
     11332@@ -14363,23 +14741,23 @@
    1129411333     fi
    1129511334 esac
    1129611335 
    1129711336-echo "$as_me:14366: checking for db.h" >&5
    11298 +echo "$as_me:14713: checking for db.h" >&5
     11337+echo "$as_me:14744: checking for db.h" >&5
    1129911338 echo $ECHO_N "checking for db.h... $ECHO_C" >&6
    1130011339 if test "${ac_cv_header_db_h+set}" = set; then
     
    1130311342   cat >conftest.$ac_ext <<_ACEOF
    1130411343-#line 14372 "configure"
    11305 +#line 14719 "configure"
     11344+#line 14750 "configure"
    1130611345 #include "confdefs.h"
    1130711346 #include <db.h>
    1130811347 _ACEOF
    1130911348-if { (eval echo "$as_me:14376: \"$ac_cpp conftest.$ac_ext\"") >&5
    11310 +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
    1131111350   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1131211351   ac_status=$?
     
    1131511354   cat conftest.err >&5
    1131611355-  echo "$as_me:14382: \$? = $ac_status" >&5
    11317 +  echo "$as_me:14729: \$? = $ac_status" >&5
     11356+  echo "$as_me:14760: \$? = $ac_status" >&5
    1131811357   (exit $ac_status); } >/dev/null; then
    1131911358   if test -s conftest.err; then
    1132011359     ac_cpp_err=$ac_c_preproc_warn_flag
    11321 @@ -14398,11 +14745,11 @@
     11360@@ -14398,11 +14776,11 @@
    1132211361 fi
    1132311362 rm -f conftest.err conftest.$ac_ext
    1132411363 fi
    1132511364-echo "$as_me:14401: result: $ac_cv_header_db_h" >&5
    11326 +echo "$as_me:14748: result: $ac_cv_header_db_h" >&5
     11365+echo "$as_me:14779: result: $ac_cv_header_db_h" >&5
    1132711366 echo "${ECHO_T}$ac_cv_header_db_h" >&6
    1132811367 if test $ac_cv_header_db_h = yes; then
    1132911368 
    1133011369-echo "$as_me:14405: checking for version of db" >&5
    11331 +echo "$as_me:14752: checking for version of db" >&5
     11370+echo "$as_me:14783: checking for version of db" >&5
    1133211371 echo $ECHO_N "checking for version of db... $ECHO_C" >&6
    1133311372 if test "${cf_cv_hashed_db_version+set}" = set; then
    1133411373   echo $ECHO_N "(cached) $ECHO_C" >&6
    11335 @@ -14413,10 +14760,10 @@
     11374@@ -14413,10 +14791,10 @@
    1133611375 for cf_db_version in 1 2 3 4 5
    1133711376 do
    1133811377 
    1133911378-echo "${as_me-configure}:14416: testing checking for db version $cf_db_version ..." 1>&5
    11340 +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
    1134111380 
    1134211381        cat >conftest.$ac_ext <<_ACEOF
    1134311382-#line 14419 "configure"
    11344 +#line 14766 "configure"
     11383+#line 14797 "configure"
    1134511384 #include "confdefs.h"
    1134611385 
    1134711386 $ac_includes_default
    11348 @@ -14446,16 +14793,16 @@
     11387@@ -14446,16 +14824,16 @@
    1134911388 }
    1135011389 _ACEOF
    1135111390 rm -f conftest.$ac_objext
    1135211391-if { (eval echo "$as_me:14449: \"$ac_compile\"") >&5
    11353 +if { (eval echo "$as_me:14796: \"$ac_compile\"") >&5
     11392+if { (eval echo "$as_me:14827: \"$ac_compile\"") >&5
    1135411393   (eval $ac_compile) 2>&5
    1135511394   ac_status=$?
    1135611395-  echo "$as_me:14452: \$? = $ac_status" >&5
    11357 +  echo "$as_me:14799: \$? = $ac_status" >&5
     11396+  echo "$as_me:14830: \$? = $ac_status" >&5
    1135811397   (exit $ac_status); } &&
    1135911398          { ac_try='test -s conftest.$ac_objext'
    1136011399-  { (eval echo "$as_me:14455: \"$ac_try\"") >&5
    11361 +  { (eval echo "$as_me:14802: \"$ac_try\"") >&5
     11400+  { (eval echo "$as_me:14833: \"$ac_try\"") >&5
    1136211401   (eval $ac_try) 2>&5
    1136311402   ac_status=$?
    1136411403-  echo "$as_me:14458: \$? = $ac_status" >&5
    11365 +  echo "$as_me:14805: \$? = $ac_status" >&5
     11404+  echo "$as_me:14836: \$? = $ac_status" >&5
    1136611405   (exit $ac_status); }; }; then
    1136711406 
    1136811407        cf_cv_hashed_db_version=$cf_db_version
    11369 @@ -14469,16 +14816,16 @@
     11408@@ -14469,16 +14847,16 @@
    1137011409 done
    1137111410 
    1137211411 fi
    1137311412-echo "$as_me:14472: result: $cf_cv_hashed_db_version" >&5
    11374 +echo "$as_me:14819: result: $cf_cv_hashed_db_version" >&5
     11413+echo "$as_me:14850: result: $cf_cv_hashed_db_version" >&5
    1137511414 echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
    1137611415 
    1137711416 if test "$cf_cv_hashed_db_version" = unknown ; then
    1137811417-       { { echo "$as_me:14476: error: Cannot determine version of db" >&5
    11379 +       { { echo "$as_me:14823: error: Cannot determine version of db" >&5
     11418+       { { echo "$as_me:14854: error: Cannot determine version of db" >&5
    1138011419 echo "$as_me: error: Cannot determine version of db" >&2;}
    1138111420    { (exit 1); exit 1; }; }
     
    1138311422 
    1138411423-echo "$as_me:14481: checking for db libraries" >&5
    11385 +echo "$as_me:14828: checking for db libraries" >&5
     11424+echo "$as_me:14859: checking for db libraries" >&5
    1138611425 echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
    1138711426 if test "${cf_cv_hashed_db_libs+set}" = set; then
    1138811427   echo $ECHO_N "(cached) $ECHO_C" >&6
    11389 @@ -14492,10 +14839,10 @@
     11428@@ -14492,10 +14870,10 @@
    1139011429                LIBS="-l$cf_db_libs $LIBS"
    1139111430        fi
    1139211431 
    1139311432-echo "${as_me-configure}:14495: testing checking for library "$cf_db_libs" ..." 1>&5
    11394 +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
    1139511434 
    1139611435        cat >conftest.$ac_ext <<_ACEOF
    1139711436-#line 14498 "configure"
    11398 +#line 14845 "configure"
     11437+#line 14876 "configure"
    1139911438 #include "confdefs.h"
    1140011439 
    1140111440 $ac_includes_default
    11402 @@ -14550,16 +14897,16 @@
     11441@@ -14550,16 +14928,16 @@
    1140311442 }
    1140411443 _ACEOF
    1140511444 rm -f conftest.$ac_objext conftest$ac_exeext
    1140611445-if { (eval echo "$as_me:14553: \"$ac_link\"") >&5
    11407 +if { (eval echo "$as_me:14900: \"$ac_link\"") >&5
     11446+if { (eval echo "$as_me:14931: \"$ac_link\"") >&5
    1140811447   (eval $ac_link) 2>&5
    1140911448   ac_status=$?
    1141011449-  echo "$as_me:14556: \$? = $ac_status" >&5
    11411 +  echo "$as_me:14903: \$? = $ac_status" >&5
     11450+  echo "$as_me:14934: \$? = $ac_status" >&5
    1141211451   (exit $ac_status); } &&
    1141311452          { ac_try='test -s conftest$ac_exeext'
    1141411453-  { (eval echo "$as_me:14559: \"$ac_try\"") >&5
    11415 +  { (eval echo "$as_me:14906: \"$ac_try\"") >&5
     11454+  { (eval echo "$as_me:14937: \"$ac_try\"") >&5
    1141611455   (eval $ac_try) 2>&5
    1141711456   ac_status=$?
    1141811457-  echo "$as_me:14562: \$? = $ac_status" >&5
    11419 +  echo "$as_me:14909: \$? = $ac_status" >&5
     11458+  echo "$as_me:14940: \$? = $ac_status" >&5
    1142011459   (exit $ac_status); }; }; then
    1142111460 
    1142211461        if test -n "$cf_db_libs" ; then
    11423 @@ -14579,11 +14926,11 @@
     11462@@ -14579,11 +14957,11 @@
    1142411463 done
    1142511464 
    1142611465 fi
    1142711466-echo "$as_me:14582: result: $cf_cv_hashed_db_libs" >&5
    11428 +echo "$as_me:14929: result: $cf_cv_hashed_db_libs" >&5
     11467+echo "$as_me:14960: result: $cf_cv_hashed_db_libs" >&5
    1142911468 echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
    1143011469 
    1143111470        if test "$cf_cv_hashed_db_libs" = unknown ; then
    1143211471-               { { echo "$as_me:14586: error: Cannot determine library for db" >&5
    11433 +               { { echo "$as_me:14933: error: Cannot determine library for db" >&5
     11472+               { { echo "$as_me:14964: error: Cannot determine library for db" >&5
    1143411473 echo "$as_me: error: Cannot determine library for db" >&2;}
    1143511474    { (exit 1); exit 1; }; }
    1143611475        elif test "$cf_cv_hashed_db_libs" != default ; then
    11437 @@ -14593,7 +14940,7 @@
     11476@@ -14593,7 +14971,7 @@
    1143811477 
    1143911478 else
    1144011479 
    1144111480-       { { echo "$as_me:14596: error: Cannot find db.h" >&5
    11442 +       { { echo "$as_me:14943: error: Cannot find db.h" >&5
     11481+       { { echo "$as_me:14974: error: Cannot find db.h" >&5
    1144311482 echo "$as_me: error: Cannot find db.h" >&2;}
    1144411483    { (exit 1); exit 1; }; }
    1144511484 
    11446 @@ -14608,7 +14955,7 @@
     11485@@ -14608,7 +14986,7 @@
    1144711486 
    1144811487 # Just in case, check if the C compiler has a bool type.
    1144911488 
    1145011489-echo "$as_me:14611: checking if we should include stdbool.h" >&5
    11451 +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
    1145211491 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
    1145311492 
    1145411493 if test "${cf_cv_header_stdbool_h+set}" = set; then
    11455 @@ -14616,7 +14963,7 @@
     11494@@ -14616,7 +14994,7 @@
    1145611495 else
    1145711496 
    1145811497        cat >conftest.$ac_ext <<_ACEOF
    1145911498-#line 14619 "configure"
    11460 +#line 14966 "configure"
     11499+#line 14997 "configure"
    1146111500 #include "confdefs.h"
    1146211501 
    1146311502 int
    11464 @@ -14628,23 +14975,23 @@
     11503@@ -14628,23 +15006,23 @@
    1146511504 }
    1146611505 _ACEOF
    1146711506 rm -f conftest.$ac_objext
    1146811507-if { (eval echo "$as_me:14631: \"$ac_compile\"") >&5
    11469 +if { (eval echo "$as_me:14978: \"$ac_compile\"") >&5
     11508+if { (eval echo "$as_me:15009: \"$ac_compile\"") >&5
    1147011509   (eval $ac_compile) 2>&5
    1147111510   ac_status=$?
    1147211511-  echo "$as_me:14634: \$? = $ac_status" >&5
    11473 +  echo "$as_me:14981: \$? = $ac_status" >&5
     11512+  echo "$as_me:15012: \$? = $ac_status" >&5
    1147411513   (exit $ac_status); } &&
    1147511514          { ac_try='test -s conftest.$ac_objext'
    1147611515-  { (eval echo "$as_me:14637: \"$ac_try\"") >&5
    11477 +  { (eval echo "$as_me:14984: \"$ac_try\"") >&5
     11516+  { (eval echo "$as_me:15015: \"$ac_try\"") >&5
    1147811517   (eval $ac_try) 2>&5
    1147911518   ac_status=$?
    1148011519-  echo "$as_me:14640: \$? = $ac_status" >&5
    11481 +  echo "$as_me:14987: \$? = $ac_status" >&5
     11520+  echo "$as_me:15018: \$? = $ac_status" >&5
    1148211521   (exit $ac_status); }; }; then
    1148311522   cf_cv_header_stdbool_h=0
     
    1148711526 cat >conftest.$ac_ext <<_ACEOF
    1148811527-#line 14647 "configure"
    11489 +#line 14994 "configure"
     11528+#line 15025 "configure"
    1149011529 #include "confdefs.h"
    1149111530 
    1149211531 #ifndef __BEOS__
    11493 @@ -14660,16 +15007,16 @@
     11532@@ -14660,16 +15038,16 @@
    1149411533 }
    1149511534 _ACEOF
    1149611535 rm -f conftest.$ac_objext
    1149711536-if { (eval echo "$as_me:14663: \"$ac_compile\"") >&5
    11498 +if { (eval echo "$as_me:15010: \"$ac_compile\"") >&5
     11537+if { (eval echo "$as_me:15041: \"$ac_compile\"") >&5
    1149911538   (eval $ac_compile) 2>&5
    1150011539   ac_status=$?
    1150111540-  echo "$as_me:14666: \$? = $ac_status" >&5
    11502 +  echo "$as_me:15013: \$? = $ac_status" >&5
     11541+  echo "$as_me:15044: \$? = $ac_status" >&5
    1150311542   (exit $ac_status); } &&
    1150411543          { ac_try='test -s conftest.$ac_objext'
    1150511544-  { (eval echo "$as_me:14669: \"$ac_try\"") >&5
    11506 +  { (eval echo "$as_me:15016: \"$ac_try\"") >&5
     11545+  { (eval echo "$as_me:15047: \"$ac_try\"") >&5
    1150711546   (eval $ac_try) 2>&5
    1150811547   ac_status=$?
    1150911548-  echo "$as_me:14672: \$? = $ac_status" >&5
    11510 +  echo "$as_me:15019: \$? = $ac_status" >&5
     11549+  echo "$as_me:15050: \$? = $ac_status" >&5
    1151111550   (exit $ac_status); }; }; then
    1151211551   cf_cv_header_stdbool_h=1
    1151311552 else
    11514 @@ -14683,13 +15030,13 @@
     11553@@ -14683,13 +15061,13 @@
    1151511554 fi
    1151611555 
    1151711556 if test "$cf_cv_header_stdbool_h" = 1
    1151811557-then   echo "$as_me:14686: result: yes" >&5
    11519 +then   echo "$as_me:15033: result: yes" >&5
     11558+then   echo "$as_me:15064: result: yes" >&5
    1152011559 echo "${ECHO_T}yes" >&6
    1152111560-else   echo "$as_me:14688: result: no" >&5
    11522 +else   echo "$as_me:15035: result: no" >&5
     11561+else   echo "$as_me:15066: result: no" >&5
    1152311562 echo "${ECHO_T}no" >&6
    1152411563 fi
    1152511564 
    1152611565-echo "$as_me:14692: checking for builtin bool type" >&5
    11527 +echo "$as_me:15039: checking for builtin bool type" >&5
     11566+echo "$as_me:15070: checking for builtin bool type" >&5
    1152811567 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
    1152911568 
    1153011569 if test "${cf_cv_cc_bool_type+set}" = set; then
    11531 @@ -14697,7 +15044,7 @@
     11570@@ -14697,7 +15075,7 @@
    1153211571 else
    1153311572 
    1153411573        cat >conftest.$ac_ext <<_ACEOF
    1153511574-#line 14700 "configure"
    11536 +#line 15047 "configure"
     11575+#line 15078 "configure"
    1153711576 #include "confdefs.h"
    1153811577 
    1153911578 #include <stdio.h>
    11540 @@ -14712,16 +15059,16 @@
     11579@@ -14712,16 +15090,16 @@
    1154111580 }
    1154211581 _ACEOF
    1154311582 rm -f conftest.$ac_objext
    1154411583-if { (eval echo "$as_me:14715: \"$ac_compile\"") >&5
    11545 +if { (eval echo "$as_me:15062: \"$ac_compile\"") >&5
     11584+if { (eval echo "$as_me:15093: \"$ac_compile\"") >&5
    1154611585   (eval $ac_compile) 2>&5
    1154711586   ac_status=$?
    1154811587-  echo "$as_me:14718: \$? = $ac_status" >&5
    11549 +  echo "$as_me:15065: \$? = $ac_status" >&5
     11588+  echo "$as_me:15096: \$? = $ac_status" >&5
    1155011589   (exit $ac_status); } &&
    1155111590          { ac_try='test -s conftest.$ac_objext'
    1155211591-  { (eval echo "$as_me:14721: \"$ac_try\"") >&5
    11553 +  { (eval echo "$as_me:15068: \"$ac_try\"") >&5
     11592+  { (eval echo "$as_me:15099: \"$ac_try\"") >&5
    1155411593   (eval $ac_try) 2>&5
    1155511594   ac_status=$?
    1155611595-  echo "$as_me:14724: \$? = $ac_status" >&5
    11557 +  echo "$as_me:15071: \$? = $ac_status" >&5
     11596+  echo "$as_me:15102: \$? = $ac_status" >&5
    1155811597   (exit $ac_status); }; }; then
    1155911598   cf_cv_cc_bool_type=1
    1156011599 else
    11561 @@ -14734,9 +15081,9 @@
     11600@@ -14734,9 +15112,9 @@
    1156211601 fi
    1156311602 
    1156411603 if test "$cf_cv_cc_bool_type" = 1
    1156511604-then   echo "$as_me:14737: result: yes" >&5
    11566 +then   echo "$as_me:15084: result: yes" >&5
     11605+then   echo "$as_me:15115: result: yes" >&5
    1156711606 echo "${ECHO_T}yes" >&6
    1156811607-else   echo "$as_me:14739: result: no" >&5
    11569 +else   echo "$as_me:15086: result: no" >&5
     11608+else   echo "$as_me:15117: result: no" >&5
    1157011609 echo "${ECHO_T}no" >&6
    1157111610 fi
    1157211611 
    11573 @@ -14758,7 +15105,7 @@
     11612@@ -14758,7 +15136,7 @@
    1157411613        cf_stdcpp_libname=stdc++
    1157511614        ;;
    1157611615 esac
    1157711616-echo "$as_me:14761: checking for library $cf_stdcpp_libname" >&5
    11578 +echo "$as_me:15108: checking for library $cf_stdcpp_libname" >&5
     11617+echo "$as_me:15139: checking for library $cf_stdcpp_libname" >&5
    1157911618 echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
    1158011619 if test "${cf_cv_libstdcpp+set}" = set; then
    1158111620   echo $ECHO_N "(cached) $ECHO_C" >&6
    11582 @@ -14767,7 +15114,7 @@
     11621@@ -14767,7 +15145,7 @@
    1158311622        cf_save="$LIBS"
    1158411623        LIBS="$LIBS -l$cf_stdcpp_libname"
    1158511624 cat >conftest.$ac_ext <<_ACEOF
    1158611625-#line 14770 "configure"
    11587 +#line 15117 "configure"
     11626+#line 15148 "configure"
    1158811627 #include "confdefs.h"
    1158911628 
    1159011629 #include <strstream.h>
    11591 @@ -14783,16 +15130,16 @@
     11630@@ -14783,16 +15161,16 @@
    1159211631 }
    1159311632 _ACEOF
    1159411633 rm -f conftest.$ac_objext conftest$ac_exeext
    1159511634-if { (eval echo "$as_me:14786: \"$ac_link\"") >&5
    11596 +if { (eval echo "$as_me:15133: \"$ac_link\"") >&5
     11635+if { (eval echo "$as_me:15164: \"$ac_link\"") >&5
    1159711636   (eval $ac_link) 2>&5
    1159811637   ac_status=$?
    1159911638-  echo "$as_me:14789: \$? = $ac_status" >&5
    11600 +  echo "$as_me:15136: \$? = $ac_status" >&5
     11639+  echo "$as_me:15167: \$? = $ac_status" >&5
    1160111640   (exit $ac_status); } &&
    1160211641          { ac_try='test -s conftest$ac_exeext'
    1160311642-  { (eval echo "$as_me:14792: \"$ac_try\"") >&5
    11604 +  { (eval echo "$as_me:15139: \"$ac_try\"") >&5
     11643+  { (eval echo "$as_me:15170: \"$ac_try\"") >&5
    1160511644   (eval $ac_try) 2>&5
    1160611645   ac_status=$?
    1160711646-  echo "$as_me:14795: \$? = $ac_status" >&5
    11608 +  echo "$as_me:15142: \$? = $ac_status" >&5
     11647+  echo "$as_me:15173: \$? = $ac_status" >&5
    1160911648   (exit $ac_status); }; }; then
    1161011649   cf_cv_libstdcpp=yes
    1161111650 else
    11612 @@ -14804,12 +15151,12 @@
     11651@@ -14804,12 +15182,12 @@
    1161311652        LIBS="$cf_save"
    1161411653 
    1161511654 fi
    1161611655-echo "$as_me:14807: result: $cf_cv_libstdcpp" >&5
    11617 +echo "$as_me:15154: result: $cf_cv_libstdcpp" >&5
     11656+echo "$as_me:15185: result: $cf_cv_libstdcpp" >&5
    1161811657 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
    1161911658 test "$cf_cv_libstdcpp" = yes && CXXLIBS="$CXXLIBS -l$cf_stdcpp_libname"
     
    1162111660 
    1162211661-       echo "$as_me:14812: checking whether $CXX understands -c and -o together" >&5
    11623 +       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
    1162411663 echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
    1162511664 if test "${cf_cv_prog_CXX_c_o+set}" = set; then
    1162611665   echo $ECHO_N "(cached) $ECHO_C" >&6
    11627 @@ -14825,15 +15172,15 @@
     11666@@ -14825,15 +15203,15 @@
    1162811667 # We do the test twice because some compilers refuse to overwrite an
    1162911668 # existing .o file with -o, though they will create one.
    1163011669 ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
    1163111670-if { (eval echo "$as_me:14828: \"$ac_try\"") >&5
    11632 +if { (eval echo "$as_me:15175: \"$ac_try\"") >&5
     11671+if { (eval echo "$as_me:15206: \"$ac_try\"") >&5
    1163311672   (eval $ac_try) 2>&5
    1163411673   ac_status=$?
    1163511674-  echo "$as_me:14831: \$? = $ac_status" >&5
    11636 +  echo "$as_me:15178: \$? = $ac_status" >&5
     11675+  echo "$as_me:15209: \$? = $ac_status" >&5
    1163711676   (exit $ac_status); } &&
    1163811677-  test -f conftest2.$ac_objext && { (eval echo "$as_me:14833: \"$ac_try\"") >&5
    11639 +  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
    1164011679   (eval $ac_try) 2>&5
    1164111680   ac_status=$?
    1164211681-  echo "$as_me:14836: \$? = $ac_status" >&5
    11643 +  echo "$as_me:15183: \$? = $ac_status" >&5
     11682+  echo "$as_me:15214: \$? = $ac_status" >&5
    1164411683   (exit $ac_status); };
    1164511684 then
    1164611685   eval cf_cv_prog_CXX_c_o=yes
    11647 @@ -14844,10 +15191,10 @@
     11686@@ -14844,10 +15222,10 @@
    1164811687 
    1164911688 fi
    1165011689 if test $cf_cv_prog_CXX_c_o = yes; then
    1165111690-  echo "$as_me:14847: result: yes" >&5
    11652 +  echo "$as_me:15194: result: yes" >&5
     11691+  echo "$as_me:15225: result: yes" >&5
    1165311692 echo "${ECHO_T}yes" >&6
    1165411693 else
    1165511694-  echo "$as_me:14850: result: no" >&5
    11656 +  echo "$as_me:15197: result: no" >&5
     11695+  echo "$as_me:15228: result: no" >&5
    1165711696 echo "${ECHO_T}no" >&6
    1165811697 fi
    1165911698 
    11660 @@ -14867,12 +15214,12 @@
     11699@@ -14867,12 +15245,12 @@
    1166111700        ;;
    1166211701 esac
    1166311702 if test "$GXX" = yes; then
    1166411703-       echo "$as_me:14870: checking for lib$cf_gpp_libname" >&5
    11665 +       echo "$as_me:15217: checking for lib$cf_gpp_libname" >&5
     11704+       echo "$as_me:15248: checking for lib$cf_gpp_libname" >&5
    1166611705 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
    1166711706        cf_save="$LIBS"
     
    1166911708        cat >conftest.$ac_ext <<_ACEOF
    1167011709-#line 14875 "configure"
    11671 +#line 15222 "configure"
     11710+#line 15253 "configure"
    1167211711 #include "confdefs.h"
    1167311712 
    1167411713 #include <$cf_gpp_libname/builtin.h>
    11675 @@ -14886,16 +15233,16 @@
     11714@@ -14886,16 +15264,16 @@
    1167611715 }
    1167711716 _ACEOF
    1167811717 rm -f conftest.$ac_objext conftest$ac_exeext
    1167911718-if { (eval echo "$as_me:14889: \"$ac_link\"") >&5
    11680 +if { (eval echo "$as_me:15236: \"$ac_link\"") >&5
     11719+if { (eval echo "$as_me:15267: \"$ac_link\"") >&5
    1168111720   (eval $ac_link) 2>&5
    1168211721   ac_status=$?
    1168311722-  echo "$as_me:14892: \$? = $ac_status" >&5
    11684 +  echo "$as_me:15239: \$? = $ac_status" >&5
     11723+  echo "$as_me:15270: \$? = $ac_status" >&5
    1168511724   (exit $ac_status); } &&
    1168611725          { ac_try='test -s conftest$ac_exeext'
    1168711726-  { (eval echo "$as_me:14895: \"$ac_try\"") >&5
    11688 +  { (eval echo "$as_me:15242: \"$ac_try\"") >&5
     11727+  { (eval echo "$as_me:15273: \"$ac_try\"") >&5
    1168911728   (eval $ac_try) 2>&5
    1169011729   ac_status=$?
    1169111730-  echo "$as_me:14898: \$? = $ac_status" >&5
    11692 +  echo "$as_me:15245: \$? = $ac_status" >&5
     11731+  echo "$as_me:15276: \$? = $ac_status" >&5
    1169311732   (exit $ac_status); }; }; then
    1169411733   cf_cxx_library=yes
    1169511734         CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
    11696 @@ -14914,7 +15261,7 @@
     11735@@ -14914,7 +15292,7 @@
    1169711736   echo "$as_me: failed program was:" >&5
    1169811737 cat conftest.$ac_ext >&5
    1169911738 cat >conftest.$ac_ext <<_ACEOF
    1170011739-#line 14917 "configure"
    11701 +#line 15264 "configure"
     11740+#line 15295 "configure"
    1170211741 #include "confdefs.h"
    1170311742 
    1170411743 #include <builtin.h>
    11705 @@ -14928,16 +15275,16 @@
     11744@@ -14928,16 +15306,16 @@
    1170611745 }
    1170711746 _ACEOF
    1170811747 rm -f conftest.$ac_objext conftest$ac_exeext
    1170911748-if { (eval echo "$as_me:14931: \"$ac_link\"") >&5
    11710 +if { (eval echo "$as_me:15278: \"$ac_link\"") >&5
     11749+if { (eval echo "$as_me:15309: \"$ac_link\"") >&5
    1171111750   (eval $ac_link) 2>&5
    1171211751   ac_status=$?
    1171311752-  echo "$as_me:14934: \$? = $ac_status" >&5
    11714 +  echo "$as_me:15281: \$? = $ac_status" >&5
     11753+  echo "$as_me:15312: \$? = $ac_status" >&5
    1171511754   (exit $ac_status); } &&
    1171611755          { ac_try='test -s conftest$ac_exeext'
    1171711756-  { (eval echo "$as_me:14937: \"$ac_try\"") >&5
    11718 +  { (eval echo "$as_me:15284: \"$ac_try\"") >&5
     11757+  { (eval echo "$as_me:15315: \"$ac_try\"") >&5
    1171911758   (eval $ac_try) 2>&5
    1172011759   ac_status=$?
    1172111760-  echo "$as_me:14940: \$? = $ac_status" >&5
    11722 +  echo "$as_me:15287: \$? = $ac_status" >&5
     11761+  echo "$as_me:15318: \$? = $ac_status" >&5
    1172311762   (exit $ac_status); }; }; then
    1172411763   cf_cxx_library=yes
    1172511764         CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
    11726 @@ -14954,7 +15301,7 @@
     11765@@ -14954,7 +15332,7 @@
    1172711766 fi
    1172811767 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    1172911768        LIBS="$cf_save"
    1173011769-       echo "$as_me:14957: result: $cf_cxx_library" >&5
    11731 +       echo "$as_me:15304: result: $cf_cxx_library" >&5
     11770+       echo "$as_me:15335: result: $cf_cxx_library" >&5
    1173211771 echo "${ECHO_T}$cf_cxx_library" >&6
    1173311772 fi
    1173411773 
    11735 @@ -14970,7 +15317,7 @@
     11774@@ -14970,7 +15348,7 @@
    1173611775 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    1173711776 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    1173811777 ac_main_return=return
    1173911778-echo "$as_me:14973: checking how to run the C++ preprocessor" >&5
    11740 +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
    1174111780 echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
    1174211781 if test -z "$CXXCPP"; then
    1174311782   if test "${ac_cv_prog_CXXCPP+set}" = set; then
    11744 @@ -14987,18 +15334,18 @@
     11783@@ -14987,18 +15365,18 @@
    1174511784   # On the NeXT, cc -E runs the code through the compiler's parser,
    1174611785   # not just through cpp. "Syntax error" is here to catch this case.
    1174711786   cat >conftest.$ac_ext <<_ACEOF
    1174811787-#line 14990 "configure"
    11749 +#line 15337 "configure"
     11788+#line 15368 "configure"
    1175011789 #include "confdefs.h"
    1175111790 #include <assert.h>
     
    1175311792 _ACEOF
    1175411793-if { (eval echo "$as_me:14995: \"$ac_cpp conftest.$ac_ext\"") >&5
    11755 +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
    1175611795   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1175711796   ac_status=$?
     
    1176011799   cat conftest.err >&5
    1176111800-  echo "$as_me:15001: \$? = $ac_status" >&5
    11762 +  echo "$as_me:15348: \$? = $ac_status" >&5
     11801+  echo "$as_me:15379: \$? = $ac_status" >&5
    1176311802   (exit $ac_status); } >/dev/null; then
    1176411803   if test -s conftest.err; then
    1176511804     ac_cpp_err=$ac_cxx_preproc_warn_flag
    11766 @@ -15021,17 +15368,17 @@
     11805@@ -15021,17 +15399,17 @@
    1176711806   # OK, works on sane cases.  Now check whether non-existent headers
    1176811807   # can be detected and how.
    1176911808   cat >conftest.$ac_ext <<_ACEOF
    1177011809-#line 15024 "configure"
    11771 +#line 15371 "configure"
     11810+#line 15402 "configure"
    1177211811 #include "confdefs.h"
    1177311812 #include <ac_nonexistent.h>
    1177411813 _ACEOF
    1177511814-if { (eval echo "$as_me:15028: \"$ac_cpp conftest.$ac_ext\"") >&5
    11776 +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
    1177711816   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1177811817   ac_status=$?
     
    1178111820   cat conftest.err >&5
    1178211821-  echo "$as_me:15034: \$? = $ac_status" >&5
    11783 +  echo "$as_me:15381: \$? = $ac_status" >&5
     11822+  echo "$as_me:15412: \$? = $ac_status" >&5
    1178411823   (exit $ac_status); } >/dev/null; then
    1178511824   if test -s conftest.err; then
    1178611825     ac_cpp_err=$ac_cxx_preproc_warn_flag
    11787 @@ -15068,7 +15415,7 @@
     11826@@ -15068,7 +15446,7 @@
    1178811827 else
    1178911828   ac_cv_prog_CXXCPP=$CXXCPP
    1179011829 fi
    1179111830-echo "$as_me:15071: result: $CXXCPP" >&5
    11792 +echo "$as_me:15418: result: $CXXCPP" >&5
     11831+echo "$as_me:15449: result: $CXXCPP" >&5
    1179311832 echo "${ECHO_T}$CXXCPP" >&6
    1179411833 ac_preproc_ok=false
    1179511834 for ac_cxx_preproc_warn_flag in '' yes
    11796 @@ -15078,18 +15425,18 @@
     11835@@ -15078,18 +15456,18 @@
    1179711836   # On the NeXT, cc -E runs the code through the compiler's parser,
    1179811837   # not just through cpp. "Syntax error" is here to catch this case.
    1179911838   cat >conftest.$ac_ext <<_ACEOF
    1180011839-#line 15081 "configure"
    11801 +#line 15428 "configure"
     11840+#line 15459 "configure"
    1180211841 #include "confdefs.h"
    1180311842 #include <assert.h>
     
    1180511844 _ACEOF
    1180611845-if { (eval echo "$as_me:15086: \"$ac_cpp conftest.$ac_ext\"") >&5
    11807 +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
    1180811847   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1180911848   ac_status=$?
     
    1181211851   cat conftest.err >&5
    1181311852-  echo "$as_me:15092: \$? = $ac_status" >&5
    11814 +  echo "$as_me:15439: \$? = $ac_status" >&5
     11853+  echo "$as_me:15470: \$? = $ac_status" >&5
    1181511854   (exit $ac_status); } >/dev/null; then
    1181611855   if test -s conftest.err; then
    1181711856     ac_cpp_err=$ac_cxx_preproc_warn_flag
    11818 @@ -15112,17 +15459,17 @@
     11857@@ -15112,17 +15490,17 @@
    1181911858   # OK, works on sane cases.  Now check whether non-existent headers
    1182011859   # can be detected and how.
    1182111860   cat >conftest.$ac_ext <<_ACEOF
    1182211861-#line 15115 "configure"
    11823 +#line 15462 "configure"
     11862+#line 15493 "configure"
    1182411863 #include "confdefs.h"
    1182511864 #include <ac_nonexistent.h>
    1182611865 _ACEOF
    1182711866-if { (eval echo "$as_me:15119: \"$ac_cpp conftest.$ac_ext\"") >&5
    11828 +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
    1182911868   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1183011869   ac_status=$?
     
    1183311872   cat conftest.err >&5
    1183411873-  echo "$as_me:15125: \$? = $ac_status" >&5
    11835 +  echo "$as_me:15472: \$? = $ac_status" >&5
     11874+  echo "$as_me:15503: \$? = $ac_status" >&5
    1183611875   (exit $ac_status); } >/dev/null; then
    1183711876   if test -s conftest.err; then
    1183811877     ac_cpp_err=$ac_cxx_preproc_warn_flag
    11839 @@ -15150,7 +15497,7 @@
     11878@@ -15150,7 +15528,7 @@
    1184011879 if $ac_preproc_ok; then
    1184111880   :
    1184211881 else
    1184311882-  { { echo "$as_me:15153: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
    11844 +  { { 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
    1184511884 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    1184611885    { (exit 1); exit 1; }; }
    1184711886 fi
    11848 @@ -15165,23 +15512,23 @@
     11887@@ -15165,23 +15543,23 @@
    1184911888 for ac_header in iostream typeinfo
    1185011889 do
    1185111890 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    1185211891-echo "$as_me:15168: checking for $ac_header" >&5
    11853 +echo "$as_me:15515: checking for $ac_header" >&5
     11892+echo "$as_me:15546: checking for $ac_header" >&5
    1185411893 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
    1185511894 if eval "test \"\${$as_ac_Header+set}\" = set"; then
     
    1185811897   cat >conftest.$ac_ext <<_ACEOF
    1185911898-#line 15174 "configure"
    11860 +#line 15521 "configure"
     11899+#line 15552 "configure"
    1186111900 #include "confdefs.h"
    1186211901 #include <$ac_header>
    1186311902 _ACEOF
    1186411903-if { (eval echo "$as_me:15178: \"$ac_cpp conftest.$ac_ext\"") >&5
    11865 +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
    1186611905   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    1186711906   ac_status=$?
     
    1187011909   cat conftest.err >&5
    1187111910-  echo "$as_me:15184: \$? = $ac_status" >&5
    11872 +  echo "$as_me:15531: \$? = $ac_status" >&5
     11911+  echo "$as_me:15562: \$? = $ac_status" >&5
    1187311912   (exit $ac_status); } >/dev/null; then
    1187411913   if test -s conftest.err; then
    1187511914     ac_cpp_err=$ac_cxx_preproc_warn_flag
    11876 @@ -15200,7 +15547,7 @@
     11915@@ -15200,7 +15578,7 @@
    1187711916 fi
    1187811917 rm -f conftest.err conftest.$ac_ext
    1187911918 fi
    1188011919-echo "$as_me:15203: result: `eval echo '${'$as_ac_Header'}'`" >&5
    11881 +echo "$as_me:15550: result: `eval echo '${'$as_ac_Header'}'`" >&5
     11920+echo "$as_me:15581: result: `eval echo '${'$as_ac_Header'}'`" >&5
    1188211921 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    1188311922 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    1188411923   cat >>confdefs.h <<EOF
    11885 @@ -15211,10 +15558,10 @@
     11924@@ -15211,10 +15589,10 @@
    1188611925 done
    1188711926 
    1188811927     if test x"$ac_cv_header_iostream" = xyes ; then
    1188911928-        echo "$as_me:15214: checking if iostream uses std-namespace" >&5
    11890 +        echo "$as_me:15561: checking if iostream uses std-namespace" >&5
     11929+        echo "$as_me:15592: checking if iostream uses std-namespace" >&5
    1189111930 echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
    1189211931         cat >conftest.$ac_ext <<_ACEOF
    1189311932-#line 15217 "configure"
    11894 +#line 15564 "configure"
     11933+#line 15595 "configure"
    1189511934 #include "confdefs.h"
    1189611935 
    1189711936 #include <iostream>
    11898 @@ -15231,16 +15578,16 @@
     11937@@ -15231,16 +15609,16 @@
    1189911938 }
    1190011939 _ACEOF
    1190111940 rm -f conftest.$ac_objext
    1190211941-if { (eval echo "$as_me:15234: \"$ac_compile\"") >&5
    11903 +if { (eval echo "$as_me:15581: \"$ac_compile\"") >&5
     11942+if { (eval echo "$as_me:15612: \"$ac_compile\"") >&5
    1190411943   (eval $ac_compile) 2>&5
    1190511944   ac_status=$?
    1190611945-  echo "$as_me:15237: \$? = $ac_status" >&5
    11907 +  echo "$as_me:15584: \$? = $ac_status" >&5
     11946+  echo "$as_me:15615: \$? = $ac_status" >&5
    1190811947   (exit $ac_status); } &&
    1190911948          { ac_try='test -s conftest.$ac_objext'
    1191011949-  { (eval echo "$as_me:15240: \"$ac_try\"") >&5
    11911 +  { (eval echo "$as_me:15587: \"$ac_try\"") >&5
     11950+  { (eval echo "$as_me:15618: \"$ac_try\"") >&5
    1191211951   (eval $ac_try) 2>&5
    1191311952   ac_status=$?
    1191411953-  echo "$as_me:15243: \$? = $ac_status" >&5
    11915 +  echo "$as_me:15590: \$? = $ac_status" >&5
     11954+  echo "$as_me:15621: \$? = $ac_status" >&5
    1191611955   (exit $ac_status); }; }; then
    1191711956   cf_iostream_namespace=yes
    1191811957 else
    11919 @@ -15249,7 +15596,7 @@
     11958@@ -15249,7 +15627,7 @@
    1192011959 cf_iostream_namespace=no
    1192111960 fi
    1192211961 rm -f conftest.$ac_objext conftest.$ac_ext
    1192311962-        echo "$as_me:15252: result: $cf_iostream_namespace" >&5
    11924 +        echo "$as_me:15599: result: $cf_iostream_namespace" >&5
     11963+        echo "$as_me:15630: result: $cf_iostream_namespace" >&5
    1192511964 echo "${ECHO_T}$cf_iostream_namespace" >&6
    1192611965         if test "$cf_iostream_namespace" = yes ; then
    1192711966             cat >>confdefs.h <<\EOF
    11928 @@ -15259,7 +15606,7 @@
     11967@@ -15259,7 +15637,7 @@
    1192911968         fi
    1193011969     fi
    1193111970 
    1193211971-echo "$as_me:15262: checking if we should include stdbool.h" >&5
    11933 +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
    1193411973 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
    1193511974 
    1193611975 if test "${cf_cv_header_stdbool_h+set}" = set; then
    11937 @@ -15267,7 +15614,7 @@
     11976@@ -15267,7 +15645,7 @@
    1193811977 else
    1193911978 
    1194011979        cat >conftest.$ac_ext <<_ACEOF
    1194111980-#line 15270 "configure"
    11942 +#line 15617 "configure"
     11981+#line 15648 "configure"
    1194311982 #include "confdefs.h"
    1194411983 
    1194511984 int
    11946 @@ -15279,23 +15626,23 @@
     11985@@ -15279,23 +15657,23 @@
    1194711986 }
    1194811987 _ACEOF
    1194911988 rm -f conftest.$ac_objext
    1195011989-if { (eval echo "$as_me:15282: \"$ac_compile\"") >&5
    11951 +if { (eval echo "$as_me:15629: \"$ac_compile\"") >&5
     11990+if { (eval echo "$as_me:15660: \"$ac_compile\"") >&5
    1195211991   (eval $ac_compile) 2>&5
    1195311992   ac_status=$?
    1195411993-  echo "$as_me:15285: \$? = $ac_status" >&5
    11955 +  echo "$as_me:15632: \$? = $ac_status" >&5
     11994+  echo "$as_me:15663: \$? = $ac_status" >&5
    1195611995   (exit $ac_status); } &&
    1195711996          { ac_try='test -s conftest.$ac_objext'
    1195811997-  { (eval echo "$as_me:15288: \"$ac_try\"") >&5
    11959 +  { (eval echo "$as_me:15635: \"$ac_try\"") >&5
     11998+  { (eval echo "$as_me:15666: \"$ac_try\"") >&5
    1196011999   (eval $ac_try) 2>&5
    1196112000   ac_status=$?
    1196212001-  echo "$as_me:15291: \$? = $ac_status" >&5
    11963 +  echo "$as_me:15638: \$? = $ac_status" >&5
     12002+  echo "$as_me:15669: \$? = $ac_status" >&5
    1196412003   (exit $ac_status); }; }; then
    1196512004   cf_cv_header_stdbool_h=0
     
    1196912008 cat >conftest.$ac_ext <<_ACEOF
    1197012009-#line 15298 "configure"
    11971 +#line 15645 "configure"
     12010+#line 15676 "configure"
    1197212011 #include "confdefs.h"
    1197312012 
    1197412013 #ifndef __BEOS__
    11975 @@ -15311,16 +15658,16 @@
     12014@@ -15311,16 +15689,16 @@
    1197612015 }
    1197712016 _ACEOF
    1197812017 rm -f conftest.$ac_objext
    1197912018-if { (eval echo "$as_me:15314: \"$ac_compile\"") >&5
    11980 +if { (eval echo "$as_me:15661: \"$ac_compile\"") >&5
     12019+if { (eval echo "$as_me:15692: \"$ac_compile\"") >&5
    1198112020   (eval $ac_compile) 2>&5
    1198212021   ac_status=$?
    1198312022-  echo "$as_me:15317: \$? = $ac_status" >&5
    11984 +  echo "$as_me:15664: \$? = $ac_status" >&5
     12023+  echo "$as_me:15695: \$? = $ac_status" >&5
    1198512024   (exit $ac_status); } &&
    1198612025          { ac_try='test -s conftest.$ac_objext'
    1198712026-  { (eval echo "$as_me:15320: \"$ac_try\"") >&5
    11988 +  { (eval echo "$as_me:15667: \"$ac_try\"") >&5
     12027+  { (eval echo "$as_me:15698: \"$ac_try\"") >&5
    1198912028   (eval $ac_try) 2>&5
    1199012029   ac_status=$?
    1199112030-  echo "$as_me:15323: \$? = $ac_status" >&5
    11992 +  echo "$as_me:15670: \$? = $ac_status" >&5
     12031+  echo "$as_me:15701: \$? = $ac_status" >&5
    1199312032   (exit $ac_status); }; }; then
    1199412033   cf_cv_header_stdbool_h=1
    1199512034 else
    11996 @@ -15334,13 +15681,13 @@
     12035@@ -15334,13 +15712,13 @@
    1199712036 fi
    1199812037 
    1199912038 if test "$cf_cv_header_stdbool_h" = 1
    1200012039-then   echo "$as_me:15337: result: yes" >&5
    12001 +then   echo "$as_me:15684: result: yes" >&5
     12040+then   echo "$as_me:15715: result: yes" >&5
    1200212041 echo "${ECHO_T}yes" >&6
    1200312042-else   echo "$as_me:15339: result: no" >&5
    12004 +else   echo "$as_me:15686: result: no" >&5
     12043+else   echo "$as_me:15717: result: no" >&5
    1200512044 echo "${ECHO_T}no" >&6
    1200612045 fi
    1200712046 
    1200812047-echo "$as_me:15343: checking for builtin bool type" >&5
    12009 +echo "$as_me:15690: checking for builtin bool type" >&5
     12048+echo "$as_me:15721: checking for builtin bool type" >&5
    1201012049 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
    1201112050 
    1201212051 if test "${cf_cv_builtin_bool+set}" = set; then
    12013 @@ -15348,7 +15695,7 @@
     12052@@ -15348,7 +15726,7 @@
    1201412053 else
    1201512054 
    1201612055        cat >conftest.$ac_ext <<_ACEOF
    1201712056-#line 15351 "configure"
    12018 +#line 15698 "configure"
     12057+#line 15729 "configure"
    1201912058 #include "confdefs.h"
    1202012059 
    1202112060 #include <stdio.h>
    12022 @@ -15363,16 +15710,16 @@
     12061@@ -15363,16 +15741,16 @@
    1202312062 }
    1202412063 _ACEOF
    1202512064 rm -f conftest.$ac_objext
    1202612065-if { (eval echo "$as_me:15366: \"$ac_compile\"") >&5
    12027 +if { (eval echo "$as_me:15713: \"$ac_compile\"") >&5
     12066+if { (eval echo "$as_me:15744: \"$ac_compile\"") >&5
    1202812067   (eval $ac_compile) 2>&5
    1202912068   ac_status=$?
    1203012069-  echo "$as_me:15369: \$? = $ac_status" >&5
    12031 +  echo "$as_me:15716: \$? = $ac_status" >&5
     12070+  echo "$as_me:15747: \$? = $ac_status" >&5
    1203212071   (exit $ac_status); } &&
    1203312072          { ac_try='test -s conftest.$ac_objext'
    1203412073-  { (eval echo "$as_me:15372: \"$ac_try\"") >&5
    12035 +  { (eval echo "$as_me:15719: \"$ac_try\"") >&5
     12074+  { (eval echo "$as_me:15750: \"$ac_try\"") >&5
    1203612075   (eval $ac_try) 2>&5
    1203712076   ac_status=$?
    1203812077-  echo "$as_me:15375: \$? = $ac_status" >&5
    12039 +  echo "$as_me:15722: \$? = $ac_status" >&5
     12078+  echo "$as_me:15753: \$? = $ac_status" >&5
    1204012079   (exit $ac_status); }; }; then
    1204112080   cf_cv_builtin_bool=1
    1204212081 else
    12043 @@ -15385,13 +15732,13 @@
     12082@@ -15385,13 +15763,13 @@
    1204412083 fi
    1204512084 
    1204612085 if test "$cf_cv_builtin_bool" = 1
    1204712086-then   echo "$as_me:15388: result: yes" >&5
    12048 +then   echo "$as_me:15735: result: yes" >&5
     12087+then   echo "$as_me:15766: result: yes" >&5
    1204912088 echo "${ECHO_T}yes" >&6
    1205012089-else   echo "$as_me:15390: result: no" >&5
    12051 +else   echo "$as_me:15737: result: no" >&5
     12090+else   echo "$as_me:15768: result: no" >&5
    1205212091 echo "${ECHO_T}no" >&6
    1205312092 fi
    1205412093 
    1205512094-echo "$as_me:15394: checking for size of bool" >&5
    12056 +echo "$as_me:15741: checking for size of bool" >&5
     12095+echo "$as_me:15772: checking for size of bool" >&5
    1205712096 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
    1205812097 if test "${cf_cv_type_of_bool+set}" = set; then
    1205912098   echo $ECHO_N "(cached) $ECHO_C" >&6
    12060 @@ -15402,7 +15749,7 @@
     12099@@ -15402,7 +15780,7 @@
    1206112100   cf_cv_type_of_bool=unknown
    1206212101 else
    1206312102   cat >conftest.$ac_ext <<_ACEOF
    1206412103-#line 15405 "configure"
    12065 +#line 15752 "configure"
     12104+#line 15783 "configure"
    1206612105 #include "confdefs.h"
    1206712106 
    1206812107 #include <stdlib.h>
    12069 @@ -15444,15 +15791,15 @@
     12108@@ -15444,15 +15822,15 @@
    1207012109 
    1207112110 _ACEOF
    1207212111 rm -f conftest$ac_exeext
    1207312112-if { (eval echo "$as_me:15447: \"$ac_link\"") >&5
    12074 +if { (eval echo "$as_me:15794: \"$ac_link\"") >&5
     12113+if { (eval echo "$as_me:15825: \"$ac_link\"") >&5
    1207512114   (eval $ac_link) 2>&5
    1207612115   ac_status=$?
    1207712116-  echo "$as_me:15450: \$? = $ac_status" >&5
    12078 +  echo "$as_me:15797: \$? = $ac_status" >&5
     12117+  echo "$as_me:15828: \$? = $ac_status" >&5
    1207912118   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1208012119-  { (eval echo "$as_me:15452: \"$ac_try\"") >&5
    12081 +  { (eval echo "$as_me:15799: \"$ac_try\"") >&5
     12120+  { (eval echo "$as_me:15830: \"$ac_try\"") >&5
    1208212121   (eval $ac_try) 2>&5
    1208312122   ac_status=$?
    1208412123-  echo "$as_me:15455: \$? = $ac_status" >&5
    12085 +  echo "$as_me:15802: \$? = $ac_status" >&5
     12124+  echo "$as_me:15833: \$? = $ac_status" >&5
    1208612125   (exit $ac_status); }; }; then
    1208712126   cf_cv_type_of_bool=`cat cf_test.out`
    1208812127                 if test -z "$cf_cv_type_of_bool"; then
    12089 @@ -15470,18 +15817,18 @@
     12128@@ -15470,18 +15848,18 @@
    1209012129 fi
    1209112130 
    1209212131        rm -f cf_test.out
    1209312132-echo "$as_me:15473: result: $cf_cv_type_of_bool" >&5
    12094 +echo "$as_me:15820: result: $cf_cv_type_of_bool" >&5
     12133+echo "$as_me:15851: result: $cf_cv_type_of_bool" >&5
    1209512134 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
    1209612135 if test "$cf_cv_type_of_bool" = unknown ; then
     
    1209912138        esac
    1210012139-       { echo "$as_me:15479: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
    12101 +       { 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
    1210212141 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
    1210312142        cf_cv_type_of_bool=$NCURSES_BOOL
     
    1210512144 
    1210612145-echo "$as_me:15484: checking for special defines needed for etip.h" >&5
    12107 +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
    1210812147 echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
    1210912148 cf_save_CXXFLAGS="$CXXFLAGS"
    1211012149 cf_result="none"
    12111 @@ -15493,7 +15840,7 @@
     12150@@ -15493,7 +15871,7 @@
    1211212151        test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
    1211312152        test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
    1211412153 cat >conftest.$ac_ext <<_ACEOF
    1211512154-#line 15496 "configure"
    12116 +#line 15843 "configure"
     12155+#line 15874 "configure"
    1211712156 #include "confdefs.h"
    1211812157 
    1211912158 #include <etip.h.in>
    12120 @@ -15507,16 +15854,16 @@
     12159@@ -15507,16 +15885,16 @@
    1212112160 }
    1212212161 _ACEOF
    1212312162 rm -f conftest.$ac_objext
    1212412163-if { (eval echo "$as_me:15510: \"$ac_compile\"") >&5
    12125 +if { (eval echo "$as_me:15857: \"$ac_compile\"") >&5
     12164+if { (eval echo "$as_me:15888: \"$ac_compile\"") >&5
    1212612165   (eval $ac_compile) 2>&5
    1212712166   ac_status=$?
    1212812167-  echo "$as_me:15513: \$? = $ac_status" >&5
    12129 +  echo "$as_me:15860: \$? = $ac_status" >&5
     12168+  echo "$as_me:15891: \$? = $ac_status" >&5
    1213012169   (exit $ac_status); } &&
    1213112170          { ac_try='test -s conftest.$ac_objext'
    1213212171-  { (eval echo "$as_me:15516: \"$ac_try\"") >&5
    12133 +  { (eval echo "$as_me:15863: \"$ac_try\"") >&5
     12172+  { (eval echo "$as_me:15894: \"$ac_try\"") >&5
    1213412173   (eval $ac_try) 2>&5
    1213512174   ac_status=$?
    1213612175-  echo "$as_me:15519: \$? = $ac_status" >&5
    12137 +  echo "$as_me:15866: \$? = $ac_status" >&5
     12176+  echo "$as_me:15897: \$? = $ac_status" >&5
    1213812177   (exit $ac_status); }; }; then
    1213912178 
    1214012179        test -n "$cf_math" && cat >>confdefs.h <<EOF
    12141 @@ -15537,12 +15884,12 @@
     12180@@ -15537,12 +15915,12 @@
    1214212181 rm -f conftest.$ac_objext conftest.$ac_ext
    1214312182 done
    1214412183 done
    1214512184-echo "$as_me:15540: result: $cf_result" >&5
    12146 +echo "$as_me:15887: result: $cf_result" >&5
     12185+echo "$as_me:15918: result: $cf_result" >&5
    1214712186 echo "${ECHO_T}$cf_result" >&6
    1214812187 CXXFLAGS="$cf_save_CXXFLAGS"
     
    1215012189 if test -n "$CXX"; then
    1215112190-echo "$as_me:15545: checking if $CXX accepts parameter initialization" >&5
    12152 +echo "$as_me:15892: checking if $CXX accepts parameter initialization" >&5
     12191+echo "$as_me:15923: checking if $CXX accepts parameter initialization" >&5
    1215312192 echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
    1215412193 if test "${cf_cv_cpp_param_init+set}" = set; then
    1215512194   echo $ECHO_N "(cached) $ECHO_C" >&6
    12156 @@ -15559,7 +15906,7 @@
     12195@@ -15559,7 +15937,7 @@
    1215712196   cf_cv_cpp_param_init=unknown
    1215812197 else
    1215912198   cat >conftest.$ac_ext <<_ACEOF
    1216012199-#line 15562 "configure"
    12161 +#line 15909 "configure"
     12200+#line 15940 "configure"
    1216212201 #include "confdefs.h"
    1216312202 
    1216412203 class TEST {
    12165 @@ -15578,15 +15925,15 @@
     12204@@ -15578,15 +15956,15 @@
    1216612205 
    1216712206 _ACEOF
    1216812207 rm -f conftest$ac_exeext
    1216912208-if { (eval echo "$as_me:15581: \"$ac_link\"") >&5
    12170 +if { (eval echo "$as_me:15928: \"$ac_link\"") >&5
     12209+if { (eval echo "$as_me:15959: \"$ac_link\"") >&5
    1217112210   (eval $ac_link) 2>&5
    1217212211   ac_status=$?
    1217312212-  echo "$as_me:15584: \$? = $ac_status" >&5
    12174 +  echo "$as_me:15931: \$? = $ac_status" >&5
     12213+  echo "$as_me:15962: \$? = $ac_status" >&5
    1217512214   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1217612215-  { (eval echo "$as_me:15586: \"$ac_try\"") >&5
    12177 +  { (eval echo "$as_me:15933: \"$ac_try\"") >&5
     12216+  { (eval echo "$as_me:15964: \"$ac_try\"") >&5
    1217812217   (eval $ac_try) 2>&5
    1217912218   ac_status=$?
    1218012219-  echo "$as_me:15589: \$? = $ac_status" >&5
    12181 +  echo "$as_me:15936: \$? = $ac_status" >&5
     12220+  echo "$as_me:15967: \$? = $ac_status" >&5
    1218212221   (exit $ac_status); }; }; then
    1218312222   cf_cv_cpp_param_init=yes
    1218412223 else
    12185 @@ -15605,7 +15952,7 @@
     12224@@ -15605,7 +15983,7 @@
    1218612225 ac_main_return=return
    1218712226 
    1218812227 fi
    1218912228-echo "$as_me:15608: result: $cf_cv_cpp_param_init" >&5
    12190 +echo "$as_me:15955: result: $cf_cv_cpp_param_init" >&5
     12229+echo "$as_me:15986: result: $cf_cv_cpp_param_init" >&5
    1219112230 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
    1219212231 fi
    1219312232 test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF
    12194 @@ -15614,7 +15961,7 @@
     12233@@ -15614,7 +15992,7 @@
    1219512234 
    1219612235 if test -n "$CXX"; then
    1219712236 
    1219812237-echo "$as_me:15617: checking if $CXX accepts static_cast" >&5
    12199 +echo "$as_me:15964: checking if $CXX accepts static_cast" >&5
     12238+echo "$as_me:15995: checking if $CXX accepts static_cast" >&5
    1220012239 echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
    1220112240 if test "${cf_cv_cpp_static_cast+set}" = set; then
    1220212241   echo $ECHO_N "(cached) $ECHO_C" >&6
    12203 @@ -15628,7 +15975,7 @@
     12242@@ -15628,7 +16006,7 @@
    1220412243 ac_main_return=return
    1220512244 
    1220612245        cat >conftest.$ac_ext <<_ACEOF
    1220712246-#line 15631 "configure"
    12208 +#line 15978 "configure"
     12247+#line 16009 "configure"
    1220912248 #include "confdefs.h"
    1221012249 
    1221112250 class NCursesPanel
    12212 @@ -15672,16 +16019,16 @@
     12251@@ -15672,16 +16050,16 @@
    1221312252 }
    1221412253 _ACEOF
    1221512254 rm -f conftest.$ac_objext
    1221612255-if { (eval echo "$as_me:15675: \"$ac_compile\"") >&5
    12217 +if { (eval echo "$as_me:16022: \"$ac_compile\"") >&5
     12256+if { (eval echo "$as_me:16053: \"$ac_compile\"") >&5
    1221812257   (eval $ac_compile) 2>&5
    1221912258   ac_status=$?
    1222012259-  echo "$as_me:15678: \$? = $ac_status" >&5
    12221 +  echo "$as_me:16025: \$? = $ac_status" >&5
     12260+  echo "$as_me:16056: \$? = $ac_status" >&5
    1222212261   (exit $ac_status); } &&
    1222312262          { ac_try='test -s conftest.$ac_objext'
    1222412263-  { (eval echo "$as_me:15681: \"$ac_try\"") >&5
    12225 +  { (eval echo "$as_me:16028: \"$ac_try\"") >&5
     12264+  { (eval echo "$as_me:16059: \"$ac_try\"") >&5
    1222612265   (eval $ac_try) 2>&5
    1222712266   ac_status=$?
    1222812267-  echo "$as_me:15684: \$? = $ac_status" >&5
    12229 +  echo "$as_me:16031: \$? = $ac_status" >&5
     12268+  echo "$as_me:16062: \$? = $ac_status" >&5
    1223012269   (exit $ac_status); }; }; then
    1223112270   cf_cv_cpp_static_cast=yes
    1223212271 else
    12233 @@ -15699,7 +16046,7 @@
     12272@@ -15699,7 +16077,7 @@
    1223412273 ac_main_return=return
    1223512274 
    1223612275 fi
    1223712276-echo "$as_me:15702: result: $cf_cv_cpp_static_cast" >&5
    12238 +echo "$as_me:16049: result: $cf_cv_cpp_static_cast" >&5
     12277+echo "$as_me:16080: result: $cf_cv_cpp_static_cast" >&5
    1223912278 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
    1224012279 
    1224112280 fi
    12242 @@ -15709,12 +16056,12 @@
     12281@@ -15709,12 +16087,12 @@
    1224312282 EOF
    1224412283 
     
    1225512294            ;;
    1225612295        sco3.2v5*) #(vi
    12257 @@ -15723,7 +16070,7 @@
     12296@@ -15723,7 +16101,7 @@
    1225812297        solaris2*)
    1225912298            if test "$GXX" != yes ; then
     
    1226412303            ;;
    1226512304        esac
    12266 @@ -15747,7 +16094,7 @@
     12305@@ -15747,7 +16125,7 @@
    1226712306        else
    1226812307                if test "$cf_cv_header_stdbool_h" = 1 ; then
    1226912308 
    1227012309-echo "$as_me:15750: checking for size of bool" >&5
    12271 +echo "$as_me:16097: checking for size of bool" >&5
     12310+echo "$as_me:16128: checking for size of bool" >&5
    1227212311 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
    1227312312 if test "${cf_cv_type_of_bool+set}" = set; then
    1227412313   echo $ECHO_N "(cached) $ECHO_C" >&6
    12275 @@ -15758,7 +16105,7 @@
     12314@@ -15758,7 +16136,7 @@
    1227612315   cf_cv_type_of_bool=unknown
    1227712316 else
    1227812317   cat >conftest.$ac_ext <<_ACEOF
    1227912318-#line 15761 "configure"
    12280 +#line 16108 "configure"
     12319+#line 16139 "configure"
    1228112320 #include "confdefs.h"
    1228212321 
    1228312322 #include <stdlib.h>
    12284 @@ -15800,15 +16147,15 @@
     12323@@ -15800,15 +16178,15 @@
    1228512324 
    1228612325 _ACEOF
    1228712326 rm -f conftest$ac_exeext
    1228812327-if { (eval echo "$as_me:15803: \"$ac_link\"") >&5
    12289 +if { (eval echo "$as_me:16150: \"$ac_link\"") >&5
     12328+if { (eval echo "$as_me:16181: \"$ac_link\"") >&5
    1229012329   (eval $ac_link) 2>&5
    1229112330   ac_status=$?
    1229212331-  echo "$as_me:15806: \$? = $ac_status" >&5
    12293 +  echo "$as_me:16153: \$? = $ac_status" >&5
     12332+  echo "$as_me:16184: \$? = $ac_status" >&5
    1229412333   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    1229512334-  { (eval echo "$as_me:15808: \"$ac_try\"") >&5
    12296 +  { (eval echo "$as_me:16155: \"$ac_try\"") >&5
     12335+  { (eval echo "$as_me:16186: \"$ac_try\"") >&5
    1229712336   (eval $ac_try) 2>&5
    1229812337   ac_status=$?
    1229912338-  echo "$as_me:15811: \$? = $ac_status" >&5
    12300 +  echo "$as_me:16158: \$? = $ac_status" >&5
     12339+  echo "$as_me:16189: \$? = $ac_status" >&5
    1230112340   (exit $ac_status); }; }; then
    1230212341   cf_cv_type_of_bool=`cat cf_test.out`
    1230312342                 if test -z "$cf_cv_type_of_bool"; then
    12304 @@ -15826,25 +16173,25 @@
     12343@@ -15826,25 +16204,25 @@
    1230512344 fi
    1230612345 
    1230712346        rm -f cf_test.out
    1230812347-echo "$as_me:15829: result: $cf_cv_type_of_bool" >&5
    12309 +echo "$as_me:16176: result: $cf_cv_type_of_bool" >&5
     12348+echo "$as_me:16207: result: $cf_cv_type_of_bool" >&5
    1231012349 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
    1231112350 if test "$cf_cv_type_of_bool" = unknown ; then
     
    1231412353        esac
    1231512354-       { echo "$as_me:15835: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
    12316 +       { 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
    1231712356 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
    1231812357        cf_cv_type_of_bool=$NCURSES_BOOL
     
    1232112360                else
    1232212361-                       echo "$as_me:15841: checking for fallback type of bool" >&5
    12323 +                       echo "$as_me:16188: checking for fallback type of bool" >&5
     12362+                       echo "$as_me:16219: checking for fallback type of bool" >&5
    1232412363 echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
    1232512364                        case "$host_cpu" in #(vi
     
    1232812367                        esac
    1232912368-                       echo "$as_me:15847: result: $cf_cv_type_of_bool" >&5
    12330 +                       echo "$as_me:16194: result: $cf_cv_type_of_bool" >&5
     12369+                       echo "$as_me:16225: result: $cf_cv_type_of_bool" >&5
    1233112370 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
    1233212371                fi
    1233312372        fi
    12334 @@ -15873,7 +16220,7 @@
     12373@@ -15873,7 +16251,7 @@
    1233512374 
    1233612375 if test "$cf_with_ada" != "no" ; then
    1233712376     if test "$with_libtool" != "no"; then
    1233812377-       { echo "$as_me:15876: WARNING: libtool does not support Ada - disabling feature" >&5
    12339 +       { 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
    1234012379 echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
    1234112380        cf_with_ada=no
    1234212381     fi
    12343 @@ -15883,7 +16230,7 @@
     12382@@ -15883,7 +16261,7 @@
    1234412383 cf_ada_make=gnatmake
    1234512384 # Extract the first word of "$cf_ada_make", so it can be a program name with args.
    1234612385 set dummy $cf_ada_make; ac_word=$2
    1234712386-echo "$as_me:15886: checking for $ac_word" >&5
    12348 +echo "$as_me:16233: checking for $ac_word" >&5
     12387+echo "$as_me:16264: checking for $ac_word" >&5
    1234912388 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    1235012389 if test "${ac_cv_prog_gnat_exists+set}" = set; then
    1235112390   echo $ECHO_N "(cached) $ECHO_C" >&6
    12352 @@ -15898,7 +16245,7 @@
     12391@@ -15898,7 +16276,7 @@
    1235312392   test -z "$ac_dir" && ac_dir=.
    1235412393   $as_executable_p "$ac_dir/$ac_word" || continue
    1235512394 ac_cv_prog_gnat_exists="yes"
    1235612395-echo "$as_me:15901: found $ac_dir/$ac_word" >&5
    12357 +echo "$as_me:16248: found $ac_dir/$ac_word" >&5
     12396+echo "$as_me:16279: found $ac_dir/$ac_word" >&5
    1235812397 break
    1235912398 done
    1236012399 
    12361 @@ -15907,10 +16254,10 @@
     12400@@ -15907,10 +16285,10 @@
    1236212401 fi
    1236312402 gnat_exists=$ac_cv_prog_gnat_exists
    1236412403 if test -n "$gnat_exists"; then
    1236512404-  echo "$as_me:15910: result: $gnat_exists" >&5
    12366 +  echo "$as_me:16257: result: $gnat_exists" >&5
     12405+  echo "$as_me:16288: result: $gnat_exists" >&5
    1236712406 echo "${ECHO_T}$gnat_exists" >&6
    1236812407 else
    1236912408-  echo "$as_me:15913: result: no" >&5
    12370 +  echo "$as_me:16260: result: no" >&5
     12409+  echo "$as_me:16291: result: no" >&5
    1237112410 echo "${ECHO_T}no" >&6
    1237212411 fi
    1237312412 
    12374 @@ -15918,11 +16265,11 @@
     12413@@ -15918,11 +16296,11 @@
    1237512414    cf_ada_make=
    1237612415 else
    1237712416 
    1237812417-echo "$as_me:15921: checking for gnat version" >&5
    12379 +echo "$as_me:16268: checking for gnat version" >&5
     12418+echo "$as_me:16299: checking for gnat version" >&5
    1238012419 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
    1238112420 cf_gnat_version=`${cf_ada_make-gnatmake} -v 2>&1 | grep '[0-9].[0-9][0-9]*' |\
    1238212421   sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
    1238312422-echo "$as_me:15925: result: $cf_gnat_version" >&5
    12384 +echo "$as_me:16272: result: $cf_gnat_version" >&5
     12423+echo "$as_me:16303: result: $cf_gnat_version" >&5
    1238512424 echo "${ECHO_T}$cf_gnat_version" >&6
    1238612425 
    1238712426 case $cf_gnat_version in
    12388 @@ -15945,7 +16292,7 @@
     12427@@ -15945,7 +16323,7 @@
    1238912428 
    1239012429    # Extract the first word of "m4", so it can be a program name with args.
    1239112430 set dummy m4; ac_word=$2
    1239212431-echo "$as_me:15948: checking for $ac_word" >&5
    12393 +echo "$as_me:16295: checking for $ac_word" >&5
     12432+echo "$as_me:16326: checking for $ac_word" >&5
    1239412433 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    1239512434 if test "${ac_cv_prog_M4_exists+set}" = set; then
    1239612435   echo $ECHO_N "(cached) $ECHO_C" >&6
    12397 @@ -15960,7 +16307,7 @@
     12436@@ -15960,7 +16338,7 @@
    1239812437   test -z "$ac_dir" && ac_dir=.
    1239912438   $as_executable_p "$ac_dir/$ac_word" || continue
    1240012439 ac_cv_prog_M4_exists="yes"
    1240112440-echo "$as_me:15963: found $ac_dir/$ac_word" >&5
    12402 +echo "$as_me:16310: found $ac_dir/$ac_word" >&5
     12441+echo "$as_me:16341: found $ac_dir/$ac_word" >&5
    1240312442 break
    1240412443 done
    1240512444 
    12406 @@ -15969,10 +16316,10 @@
     12445@@ -15969,10 +16347,10 @@
    1240712446 fi
    1240812447 M4_exists=$ac_cv_prog_M4_exists
    1240912448 if test -n "$M4_exists"; then
    1241012449-  echo "$as_me:15972: result: $M4_exists" >&5
    12411 +  echo "$as_me:16319: result: $M4_exists" >&5
     12450+  echo "$as_me:16350: result: $M4_exists" >&5
    1241212451 echo "${ECHO_T}$M4_exists" >&6
    1241312452 else
    1241412453-  echo "$as_me:15975: result: no" >&5
    12415 +  echo "$as_me:16322: result: no" >&5
     12454+  echo "$as_me:16353: result: no" >&5
    1241612455 echo "${ECHO_T}no" >&6
    1241712456 fi
    1241812457 
    12419 @@ -15981,7 +16328,7 @@
     12458@@ -15981,7 +16359,7 @@
    1242012459       echo Ada95 binding required program m4 not found. Ada95 binding disabled.
    1242112460    fi
    1242212461    if test "$cf_cv_prog_gnat_correct" = yes; then
    1242312462-      echo "$as_me:15984: checking if GNAT works" >&5
    12424 +      echo "$as_me:16331: checking if GNAT works" >&5
     12463+      echo "$as_me:16362: checking if GNAT works" >&5
    1242512464 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
    1242612465 
    1242712466 rm -f conftest*
    12428 @@ -16009,14 +16356,14 @@
     12467@@ -16009,14 +16387,14 @@
    1242912468 fi
    1243012469 rm -f conftest*
    1243112470 
    1243212471-      echo "$as_me:16012: result: $cf_cv_prog_gnat_correct" >&5
    12433 +      echo "$as_me:16359: result: $cf_cv_prog_gnat_correct" >&5
     12472+      echo "$as_me:16390: result: $cf_cv_prog_gnat_correct" >&5
    1243412473 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
    1243512474    fi
     
    1243912478 
    1244012479-   echo "$as_me:16019: checking if GNAT pragma Unreferenced works" >&5
    12441 +   echo "$as_me:16366: checking if GNAT pragma Unreferenced works" >&5
     12480+   echo "$as_me:16397: checking if GNAT pragma Unreferenced works" >&5
    1244212481 echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6
    1244312482 
    1244412483 rm -f conftest*
    12445 @@ -16043,7 +16390,7 @@
     12484@@ -16043,7 +16421,7 @@
    1244612485 fi
    1244712486 rm -f conftest*
    1244812487 
    1244912488-   echo "$as_me:16046: result: $cf_cv_pragma_unreferenced" >&5
    12450 +   echo "$as_me:16393: result: $cf_cv_pragma_unreferenced" >&5
     12489+   echo "$as_me:16424: result: $cf_cv_pragma_unreferenced" >&5
    1245112490 echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6
    1245212491 
    1245312492    # if the pragma is supported, use it (needed in the Trace code).
    12454 @@ -16096,7 +16443,7 @@
     12493@@ -16096,7 +16474,7 @@
    1245512494   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    1245612495   ;;
    1245712496 *)
    1245812497-  { { echo "$as_me:16099: error: expected a pathname, not \"$withval\"" >&5
    12459 +  { { echo "$as_me:16446: error: expected a pathname, not \"$withval\"" >&5
     12498+  { { echo "$as_me:16477: error: expected a pathname, not \"$withval\"" >&5
    1246012499 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    1246112500    { (exit 1); exit 1; }; }
    1246212501   ;;
    12463 @@ -16138,7 +16485,7 @@
     12502@@ -16138,7 +16516,7 @@
    1246412503   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    1246512504   ;;
    1246612505 *)
    1246712506-  { { echo "$as_me:16141: error: expected a pathname, not \"$withval\"" >&5
    12468 +  { { echo "$as_me:16488: error: expected a pathname, not \"$withval\"" >&5
     12507+  { { echo "$as_me:16519: error: expected a pathname, not \"$withval\"" >&5
    1246912508 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    1247012509    { (exit 1); exit 1; }; }
    1247112510   ;;
    12472 @@ -16163,7 +16510,7 @@
     12511@@ -16163,7 +16541,7 @@
    1247312512 ### chooses to split module lists into libraries.
    1247412513 ###
    1247512514 ### (see CF_LIB_RULES).
    1247612515-echo "$as_me:16166: checking for library subsets" >&5
    12477 +echo "$as_me:16513: checking for library subsets" >&5
     12516+echo "$as_me:16544: checking for library subsets" >&5
    1247812517 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
    1247912518 LIB_SUBSETS=
    1248012519 
    12481 @@ -16188,14 +16535,14 @@
     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+
    1248212544 test "$with_widec"     = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
    1248312545 test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
    1248412546 
    1248512547-echo "$as_me:16191: result: $LIB_SUBSETS" >&5
    12486 +echo "$as_me:16538: result: $LIB_SUBSETS" >&5
     12548+echo "$as_me:16580: result: $LIB_SUBSETS" >&5
    1248712549 echo "${ECHO_T}$LIB_SUBSETS" >&6
    1248812550 
     
    1249712559 if test "$GCC" != yes; then
    1249812560        CPPFLAGS="$CPPFLAGS -I\${includedir}"
    12499 @@ -16226,7 +16573,7 @@
     12561@@ -16226,7 +16615,7 @@
    1250012562 fi
    1250112563 
    1250212564 ### Build up pieces for makefile rules
    1250312565-echo "$as_me:16229: checking default library suffix" >&5
    12504 +echo "$as_me:16576: checking default library suffix" >&5
     12566+echo "$as_me:16618: checking default library suffix" >&5
    1250512567 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
    1250612568 
    1250712569        case $DFT_LWR_MODEL in
    12508 @@ -16237,46 +16584,50 @@
     12570@@ -16237,46 +16626,50 @@
    1250912571        shared)  DFT_ARG_SUFFIX=''   ;;
    1251012572        esac
    1251112573        test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
    1251212574-echo "$as_me:16240: result: $DFT_ARG_SUFFIX" >&5
    12513 +echo "$as_me:16587: result: $DFT_ARG_SUFFIX" >&5
     12575+echo "$as_me:16629: result: $DFT_ARG_SUFFIX" >&5
    1251412576 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
    1251512577 
    1251612578-echo "$as_me:16243: checking default library-dependency suffix" >&5
    12517 +echo "$as_me:16590: checking default library-dependency suffix" >&5
     12579+echo "$as_me:16632: checking default library-dependency suffix" >&5
    1251812580 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
    1251912581 
     
    1257012632                                DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
    1257112633                                ;;
    12572 @@ -16289,10 +16640,10 @@
     12634@@ -16289,10 +16682,10 @@
    1257312635        esac
    1257412636        test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}"
    1257512637        test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}"
    1257612638-echo "$as_me:16292: result: $DFT_DEP_SUFFIX" >&5
    12577 +echo "$as_me:16643: result: $DFT_DEP_SUFFIX" >&5
     12639+echo "$as_me:16685: result: $DFT_DEP_SUFFIX" >&5
    1257812640 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
    1257912641 
    1258012642-echo "$as_me:16295: checking default object directory" >&5
    12581 +echo "$as_me:16646: checking default object directory" >&5
     12643+echo "$as_me:16688: checking default object directory" >&5
    1258212644 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
    1258312645 
    1258412646        case $DFT_LWR_MODEL in
    12585 @@ -16308,51 +16659,55 @@
     12647@@ -16308,51 +16701,55 @@
    1258612648                        DFT_OBJ_SUBDIR='obj_s' ;;
    1258712649                esac
    1258812650        esac
    1258912651-echo "$as_me:16311: result: $DFT_OBJ_SUBDIR" >&5
    12590 +echo "$as_me:16662: result: $DFT_OBJ_SUBDIR" >&5
     12652+echo "$as_me:16704: result: $DFT_OBJ_SUBDIR" >&5
    1259112653 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
    1259212654 
     
    1259412656 if test "$cf_with_cxx" = yes ; then
    1259512657-echo "$as_me:16316: checking c++ library-dependency suffix" >&5
    12596 +echo "$as_me:16667: checking c++ library-dependency suffix" >&5
     12658+echo "$as_me:16709: checking c++ library-dependency suffix" >&5
    1259712659 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
    1259812660 if test "$with_libtool" != "no"; then
     
    1265212714                                CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
    1265312715                                ;;
    12654 @@ -16366,7 +16721,7 @@
     12716@@ -16366,7 +16763,7 @@
    1265512717        test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}"
    1265612718        test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}"
    1265712719 fi
    1265812720-echo "$as_me:16369: result: $CXX_LIB_SUFFIX" >&5
    12659 +echo "$as_me:16724: result: $CXX_LIB_SUFFIX" >&5
     12721+echo "$as_me:16766: result: $CXX_LIB_SUFFIX" >&5
    1266012722 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
    1266112723 
    1266212724 fi
    12663 @@ -16480,7 +16835,7 @@
     12725@@ -16480,7 +16877,7 @@
    1266412726 
    1266512727 if test "$GCC" = yes ; then
     
    1267012732                LDFLAGS_SHARED=
    1267112733                ;;
    12672 @@ -16491,7 +16846,7 @@
     12734@@ -16491,7 +16888,7 @@
    1267312735     esac
    1267412736 else
     
    1267912741                LDFLAGS_SHARED=-bdynamic
    1268012742                ;;
    12681 @@ -16519,12 +16874,12 @@
     12743@@ -16519,12 +16916,12 @@
    1268212744        ;;
    1268312745 esac
    1268412746 
    1268512747-echo "$as_me:16522: checking where we will install curses.h" >&5
    12686 +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
    1268712749 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
    1268812750 test "$with_overwrite" = no && \
     
    1269012752        includedir='${prefix}/include/ncurses'${LIB_SUFFIX}
    1269112753-echo "$as_me:16527: result: $includedir" >&5
    12692 +echo "$as_me:16882: result: $includedir" >&5
     12754+echo "$as_me:16924: result: $includedir" >&5
    1269312755 echo "${ECHO_T}$includedir" >&6
    1269412756 
    1269512757 ### Resolve a conflict between normal and wide-curses by forcing applications
    12696 @@ -16532,10 +16887,11 @@
     12758@@ -16532,10 +16929,11 @@
    1269712759 if test "$with_overwrite" != no ; then
    1269812760 if test "$NCURSES_LIBUTF8" = 1 ; then
    1269912761        NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
    1270012762-       { echo "$as_me:16535: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
    12701 +       { 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
    1270212764 echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
    1270312765 fi
     
    1270712769 # used to separate tack out of the tree
    1270812770 NCURSES_TREE=
    12709 @@ -16548,7 +16904,7 @@
     12771@@ -16548,7 +16946,7 @@
    1271012772 ### Construct the list of subdirectories for which we'll customize makefiles
    1271112773 ### with the appropriate compile-rules.
    1271212774 
    1271312775-echo "$as_me:16551: checking for src modules" >&5
    12714 +echo "$as_me:16907: checking for src modules" >&5
     12776+echo "$as_me:16949: checking for src modules" >&5
    1271512777 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
    1271612778 
    1271712779 # dependencies and linker-arguments for test-programs
    12718 @@ -16611,13 +16967,17 @@
     12780@@ -16611,13 +17009,17 @@
    1271912781                fi
    1272012782        fi
    1272112783 done
    1272212784-echo "$as_me:16614: result: $cf_cv_src_modules" >&5
    12723 +echo "$as_me:16970: result: $cf_cv_src_modules" >&5
     12785+echo "$as_me:17012: result: $cf_cv_src_modules" >&5
    1272412786 echo "${ECHO_T}$cf_cv_src_modules" >&6
    1272512787 
     
    1273612798 do
    1273712799        SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir"
    12738 @@ -16628,8 +16988,8 @@
     12800@@ -16628,8 +17030,8 @@
    1273912801 
    1274012802 ADA_SUBDIRS=
     
    1274712809 
    1274812810 SUB_MAKEFILES=
    12749 @@ -16639,15 +16999,15 @@
     12811@@ -16639,15 +17041,15 @@
    1275012812 done
    1275112813 
     
    1276812830 
    1276912831 DIRS_TO_MAKE="lib"
    12770 @@ -16680,7 +17040,7 @@
     12832@@ -16680,7 +17082,7 @@
    1277112833 done
    1277212834 
     
    1277712839 
    1277812840 cat >>confdefs.h <<EOF
    12779 @@ -16749,7 +17109,7 @@
     12841@@ -16749,7 +17151,7 @@
    1278012842 
    1278112843 if test -n "$cf_new_cppflags" ; then
     
    1278612848 
    1278712849 if test -n "$cf_new_extra_cppflags" ; then
    12788 @@ -16760,18 +17120,18 @@
     12850@@ -16760,18 +17162,18 @@
    1278912851 ### If we're building with rpath, try to link non-standard libs that way too.
    1279012852 if test "$DFT_LWR_MODEL" = "shared"; then
    1279112853 
    1279212854-echo "$as_me:16763: checking for updated LDFLAGS" >&5
    12793 +echo "$as_me:17123: checking for updated LDFLAGS" >&5
     12855+echo "$as_me:17165: checking for updated LDFLAGS" >&5
    1279412856 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
    1279512857 if test -n "$LDFLAGS" ; then
    1279612858-echo "$as_me:16766: result: maybe" >&5
    12797 +echo "$as_me:17126: result: maybe" >&5
     12859+echo "$as_me:17168: result: maybe" >&5
    1279812860 echo "${ECHO_T}maybe" >&6
    1279912861 test -n "$verbose" && echo "   ...checking LDFLAGS $LDFLAGS" 1>&6
    1280012862 
    1280112863-echo "${as_me-configure}:16770: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
    12802 +echo "${as_me-configure}:17130: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
     12864+echo "${as_me-configure}:17172: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
    1280312865 
    1280412866 test -n "$verbose" && echo "   ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
    1280512867 
    1280612868-echo "${as_me-configure}:16774: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
    12807 +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
    1280812870 
    1280912871 case "$EXTRA_LDFLAGS" in #(vi
    1281012872 -Wl,-rpath,*) #(vi
    12811 @@ -16793,7 +17153,7 @@
     12873@@ -16793,7 +17195,7 @@
    1281212874        do
    1281312875                test -n "$verbose" && echo "    Filtering $cf_rpath_src" 1>&6
    1281412876 
    1281512877-echo "${as_me-configure}:16796: testing Filtering $cf_rpath_src ..." 1>&5
    12816 +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
    1281712879 
    1281812880                case $cf_rpath_src in #(vi
    1281912881                -L*) #(vi
    12820 @@ -16804,7 +17164,7 @@
     12882@@ -16804,7 +17206,7 @@
    1282112883                        fi
    1282212884                        test -n "$verbose" && echo "    ...Filter $cf_rpath_tmp" 1>&6
    1282312885 
    1282412886-echo "${as_me-configure}:16807: testing ...Filter $cf_rpath_tmp ..." 1>&5
    12825 +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
    1282612888 
    1282712889                        EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
    1282812890                        ;;
    12829 @@ -16814,15 +17174,15 @@
     12891@@ -16814,15 +17216,15 @@
    1283012892        LDFLAGS=$cf_rpath_dst
    1283112893        test -n "$verbose" && echo "    ...checked LDFLAGS $LDFLAGS" 1>&6
    1283212894 
    1283312895-echo "${as_me-configure}:16817: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
    12834 +echo "${as_me-configure}:17177: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
     12896+echo "${as_me-configure}:17219: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
    1283512897 
    1283612898        test -n "$verbose" && echo "    ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
    1283712899 
    1283812900-echo "${as_me-configure}:16821: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
    12839 +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
    1284012902 
    1284112903 fi
    1284212904 else
    1284312905-echo "$as_me:16825: result: no" >&5
    12844 +echo "$as_me:17185: result: no" >&5
     12906+echo "$as_me:17227: result: no" >&5
    1284512907 echo "${ECHO_T}no" >&6
    1284612908 fi
    1284712909 
    12848 @@ -16849,8 +17209,18 @@
     12910@@ -16849,8 +17251,18 @@
    1284912911 fi
    1285012912 
     
    1286612928 ac_config_commands="$ac_config_commands default"
    1286712929 cat >confcache <<\_ACEOF
    12868 @@ -16932,7 +17302,7 @@
     12930@@ -16932,7 +17344,7 @@
    1286912931 : ${CONFIG_STATUS=./config.status}
    1287012932 ac_clean_files_save=$ac_clean_files
    1287112933 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
    1287212934-{ echo "$as_me:16935: creating $CONFIG_STATUS" >&5
    12873 +{ echo "$as_me:17305: creating $CONFIG_STATUS" >&5
     12935+{ echo "$as_me:17347: creating $CONFIG_STATUS" >&5
    1287412936 echo "$as_me: creating $CONFIG_STATUS" >&6;}
    1287512937 cat >$CONFIG_STATUS <<_ACEOF
    1287612938 #! $SHELL
    12877 @@ -17064,7 +17434,7 @@
     12939@@ -17064,7 +17476,7 @@
    1287812940 cat >>$CONFIG_STATUS <<EOF
    1287912941 ac_cs_version="\\
     
    1288412946 
    1288512947 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
    12886 @@ -17108,7 +17478,7 @@
     12948@@ -17108,7 +17520,7 @@
    1288712949     echo "$ac_cs_version"; exit 0 ;;
    1288812950   --he | --h)
    1288912951     # Conflict between --help and --header
    1289012952-    { { echo "$as_me:17111: error: ambiguous option: $1
    12891 +    { { echo "$as_me:17481: error: ambiguous option: $1
     12953+    { { echo "$as_me:17523: error: ambiguous option: $1
    1289212954 Try \`$0 --help' for more information." >&5
    1289312955 echo "$as_me: error: ambiguous option: $1
    1289412956 Try \`$0 --help' for more information." >&2;}
    12895 @@ -17127,7 +17497,7 @@
     12957@@ -17127,7 +17539,7 @@
    1289612958     ac_need_defaults=false;;
    1289712959 
    1289812960   # This is an error.
    1289912961-  -*) { { echo "$as_me:17130: error: unrecognized option: $1
    12900 +  -*) { { echo "$as_me:17500: error: unrecognized option: $1
     12962+  -*) { { echo "$as_me:17542: error: unrecognized option: $1
    1290112963 Try \`$0 --help' for more information." >&5
    1290212964 echo "$as_me: error: unrecognized option: $1
    1290312965 Try \`$0 --help' for more information." >&2;}
    12904 @@ -17146,7 +17516,7 @@
     12966@@ -17146,7 +17558,7 @@
    1290512967 ## Running config.status.  ##
    1290612968 ## ----------------------- ##
     
    1291112973   CONFIG_HEADERS  = $CONFIG_HEADERS
    1291212974   CONFIG_LINKS    = $CONFIG_LINKS
    12913 @@ -17181,13 +17551,13 @@
     12975@@ -17181,13 +17593,13 @@
    1291412976 NCURSES_PATCH="$NCURSES_PATCH"
    1291512977 SRC_SUBDIRS="$SRC_SUBDIRS"
     
    1292812990 WITH_ECHO="$with_echo"
    1292912991 WITH_OVERWRITE="$with_overwrite"
    12930 @@ -17206,6 +17576,7 @@
     12992@@ -17206,6 +17618,7 @@
    1293112993 cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix"
    1293212994 cf_cv_system_name="$cf_cv_system_name"
     
    1293612998 target="$target"
    1293712999 
    12938 @@ -17224,7 +17595,7 @@
     13000@@ -17224,7 +17637,7 @@
    1293913001   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    1294013002   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
    1294113003   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
    1294213004-  *) { { echo "$as_me:17227: error: invalid argument: $ac_config_target" >&5
    12943 +  *) { { echo "$as_me:17598: error: invalid argument: $ac_config_target" >&5
     13005+  *) { { echo "$as_me:17640: error: invalid argument: $ac_config_target" >&5
    1294413006 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    1294513007    { (exit 1); exit 1; }; };;
    1294613008   esac
    12947 @@ -17349,6 +17720,8 @@
     13009@@ -17349,6 +17762,8 @@
    1294813010 s,@LINT@,$LINT,;t t
    1294913011 s,@LINT_OPTS@,$LINT_OPTS,;t t
     
    1295413016 s,@MAKE_LOWER_TAGS@,$MAKE_LOWER_TAGS,;t t
    1295513017 s,@MAKE_UPPER_TAGS@,$MAKE_UPPER_TAGS,;t t
    12956 @@ -17359,7 +17732,7 @@
     13018@@ -17359,7 +17774,7 @@
    1295713019 s,@ac_ct_LD@,$ac_ct_LD,;t t
    1295813020 s,@AR@,$AR,;t t
     
    1296313025 s,@BUILD_CC@,$BUILD_CC,;t t
    1296413026 s,@BUILD_CPP@,$BUILD_CPP,;t t
    12965 @@ -17392,6 +17765,7 @@
     13027@@ -17392,6 +17807,7 @@
    1296613028 s,@CXX_G_OPT@,$CXX_G_OPT,;t t
    1296713029 s,@LD_MODEL@,$LD_MODEL,;t t
     
    1297113033 s,@MK_SHARED_LIB@,$MK_SHARED_LIB,;t t
    1297213034 s,@LINK_PROGS@,$LINK_PROGS,;t t
    12973 @@ -17401,7 +17775,6 @@
     13035@@ -17401,7 +17817,6 @@
    1297413036 s,@LOCAL_LDFLAGS2@,$LOCAL_LDFLAGS2,;t t
    1297513037 s,@INSTALL_LIB@,$INSTALL_LIB,;t t
     
    1297913041 s,@WHICH_XTERM@,$WHICH_XTERM,;t t
    1298013042 s,@TERMINFO_DIRS@,$TERMINFO_DIRS,;t t
    12981 @@ -17425,6 +17798,7 @@
     13043@@ -17425,6 +17840,9 @@
    1298213044 s,@NCURSES_OSPEED@,$NCURSES_OSPEED,;t t
    1298313045 s,@MANPAGE_RENAMES@,$MANPAGE_RENAMES,;t t
    1298413046 s,@NCURSES_EXT_FUNCS@,$NCURSES_EXT_FUNCS,;t t
    1298513047+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
    1298613050 s,@NCURSES_CONST@,$NCURSES_CONST,;t t
    1298713051 s,@NCURSES_EXT_COLORS@,$NCURSES_EXT_COLORS,;t t
    1298813052 s,@NCURSES_MOUSE_VERSION@,$NCURSES_MOUSE_VERSION,;t t
    12989 @@ -17449,7 +17823,7 @@
     13053@@ -17449,7 +17867,7 @@
    1299013054 s,@CXXCPP@,$CXXCPP,;t t
    1299113055 s,@CXXLDFLAGS@,$CXXLDFLAGS,;t t
     
    1299613060 s,@USE_CXX_BOOL@,$USE_CXX_BOOL,;t t
    1299713061 s,@gnat_exists@,$gnat_exists,;t t
    12998 @@ -17493,6 +17867,7 @@
     13062@@ -17493,6 +17911,7 @@
    1299913063 s,@HAVE_TCGETATTR@,$HAVE_TCGETATTR,;t t
    1300013064 s,@HAVE_TERMIO_H@,$HAVE_TERMIO_H,;t t
     
    1300413068 
    1300513069 EOF
    13006 @@ -17607,7 +17982,7 @@
     13070@@ -17607,7 +18026,7 @@
    1300713071   esac
    1300813072 
    1300913073   if test x"$ac_file" != x-; then
    1301013074-    { echo "$as_me:17610: creating $ac_file" >&5
    13011 +    { echo "$as_me:17985: creating $ac_file" >&5
     13075+    { echo "$as_me:18029: creating $ac_file" >&5
    1301213076 echo "$as_me: creating $ac_file" >&6;}
    1301313077     rm -f "$ac_file"
    1301413078   fi
    13015 @@ -17625,7 +18000,7 @@
     13079@@ -17625,7 +18044,7 @@
    1301613080       -) echo $tmp/stdin ;;
    1301713081       [\\/$]*)
    1301813082          # Absolute (can't be DOS-style, as IFS=:)
    1301913083-         test -f "$f" || { { echo "$as_me:17628: error: cannot find input file: $f" >&5
    13020 +         test -f "$f" || { { echo "$as_me:18003: error: cannot find input file: $f" >&5
     13084+         test -f "$f" || { { echo "$as_me:18047: error: cannot find input file: $f" >&5
    1302113085 echo "$as_me: error: cannot find input file: $f" >&2;}
    1302213086    { (exit 1); exit 1; }; }
    1302313087          echo $f;;
    13024 @@ -17638,7 +18013,7 @@
     13088@@ -17638,7 +18057,7 @@
    1302513089            echo $srcdir/$f
    1302613090          else
    1302713091            # /dev/null tree
    1302813092-           { { echo "$as_me:17641: error: cannot find input file: $f" >&5
    13029 +           { { echo "$as_me:18016: error: cannot find input file: $f" >&5
     13093+           { { echo "$as_me:18060: error: cannot find input file: $f" >&5
    1303013094 echo "$as_me: error: cannot find input file: $f" >&2;}
    1303113095    { (exit 1); exit 1; }; }
    1303213096          fi;;
    13033 @@ -17704,7 +18079,7 @@
     13097@@ -17704,7 +18123,7 @@
    1303413098   * )   ac_file_in=$ac_file.in ;;
    1303513099   esac
    1303613100 
    1303713101-  test x"$ac_file" != x- && { echo "$as_me:17707: creating $ac_file" >&5
    13038 +  test x"$ac_file" != x- && { echo "$as_me:18082: creating $ac_file" >&5
     13102+  test x"$ac_file" != x- && { echo "$as_me:18126: creating $ac_file" >&5
    1303913103 echo "$as_me: creating $ac_file" >&6;}
    1304013104 
    1304113105   # First look for the input files in the build tree, otherwise in the
    13042 @@ -17715,7 +18090,7 @@
     13106@@ -17715,7 +18134,7 @@
    1304313107       -) echo $tmp/stdin ;;
    1304413108       [\\/$]*)
    1304513109          # Absolute (can't be DOS-style, as IFS=:)
    1304613110-         test -f "$f" || { { echo "$as_me:17718: error: cannot find input file: $f" >&5
    13047 +         test -f "$f" || { { echo "$as_me:18093: error: cannot find input file: $f" >&5
     13111+         test -f "$f" || { { echo "$as_me:18137: error: cannot find input file: $f" >&5
    1304813112 echo "$as_me: error: cannot find input file: $f" >&2;}
    1304913113    { (exit 1); exit 1; }; }
    1305013114          echo $f;;
    13051 @@ -17728,7 +18103,7 @@
     13115@@ -17728,7 +18147,7 @@
    1305213116            echo $srcdir/$f
    1305313117          else
    1305413118            # /dev/null tree
    1305513119-           { { echo "$as_me:17731: error: cannot find input file: $f" >&5
    13056 +           { { echo "$as_me:18106: error: cannot find input file: $f" >&5
     13120+           { { echo "$as_me:18150: error: cannot find input file: $f" >&5
    1305713121 echo "$as_me: error: cannot find input file: $f" >&2;}
    1305813122    { (exit 1); exit 1; }; }
    1305913123          fi;;
    13060 @@ -17786,7 +18161,7 @@
     13124@@ -17786,7 +18205,7 @@
    1306113125   rm -f $tmp/in
    1306213126   if test x"$ac_file" != x-; then
    1306313127     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
    1306413128-      { echo "$as_me:17789: $ac_file is unchanged" >&5
    13065 +      { echo "$as_me:18164: $ac_file is unchanged" >&5
     13129+      { echo "$as_me:18208: $ac_file is unchanged" >&5
    1306613130 echo "$as_me: $ac_file is unchanged" >&6;}
    1306713131     else
    1306813132       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
    13069 @@ -17873,40 +18248,44 @@
     13133@@ -17873,40 +18292,44 @@
    1307013134                for cf_item in $cf_LIST_MODELS
    1307113135                do
     
    1312313187                                cf_depsuf=$cf_suffix
    1312413188                                ;;
    13125 @@ -18020,40 +18399,44 @@
     13189@@ -18020,40 +18443,44 @@
    1312613190 
    1312713191 cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
     
    1317913243                                cf_depsuf=$cf_suffix
    1318013244                                ;;
    13181 @@ -18234,18 +18617,28 @@
     13245@@ -18234,18 +18661,28 @@
    1318213246 install.libs uninstall.libs \\
    1318313247 install.data uninstall.data ::
     
    1320813272 if test -f $srcdir/$tack.h; then
    1320913273 cat >> Makefile <<CF_EOF
    13210 @@ -18256,6 +18649,7 @@
     13274@@ -18256,6 +18693,7 @@
    1321113275 CF_EOF
    1321213276 fi
     
    1321813282diff -Naur ncurses-5.7.orig/configure.in ncurses-5.7/configure.in
    1321913283--- ncurses-5.7.orig/configure.in       2008-10-18 07:53:32.000000000 -0700
    13220 +++ ncurses-5.7/configure.in    2009-02-07 22:08:38.023632072 -0800
     13284+++ ncurses-5.7/configure.in    2009-02-15 23:21:24.616480793 -0800
    1322113285@@ -1,5 +1,5 @@
    1322213286 dnl***************************************************************************
     
    1323113295 dnl
    1323213296-dnl $Id: configure.in,v 1.454 2008/10/18 14:53:32 tom Exp $
    13233 +dnl $Id: configure.in,v 1.465 2009/02/07 18:41:03 tom Exp $
     13297+dnl $Id: configure.in,v 1.466 2009/02/15 00:19:01 tom Exp $
    1323413298 dnl Process this file with autoconf to produce a configure script.
    1323513299 dnl
     
    1323913303 AC_PREREQ(2.13.20020210)
    1324013304-AC_REVISION($Revision: 1.454 $)
    13241 +AC_REVISION($Revision: 1.465 $)
     13305+AC_REVISION($Revision: 1.466 $)
    1324213306 AC_INIT(ncurses/base/lib_initscr.c)
    1324313307 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
     
    1330713371 ###############################################################################
    1330813372 CF_HELP_MESSAGE(Extensions:)
    13309 @@ -828,10 +860,13 @@
     13373@@ -828,10 +860,30 @@
    1331013374        AC_DEFINE(HAVE_USE_DEFAULT_COLORS)
    1331113375        AC_DEFINE(HAVE_WRESIZE)
     
    1331813382 AC_SUBST(NCURSES_EXT_FUNCS)
    1331913383+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)
    1332013401 
    1332113402 ###   use option --enable-const to turn on use of const beyond that in XSI.
    1332213403 AC_MSG_CHECKING(for extended use of const keyword)
    13323 @@ -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 @@
    1332413424        CF_CPP_STATIC_CAST
    1332513425 
     
    1333613436            ;;
    1333713437        sco3.2v5*) #(vi
    13338 @@ -1368,13 +1403,13 @@
     13438@@ -1368,13 +1426,13 @@
    1333913439        solaris2*)
    1334013440            if test "$GXX" != yes ; then
     
    1335213452        cf_cxx_library=no
    1335313453        cf_cv_builtin_bool=1
    13354 @@ -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 @@
    1335513482        AC_MSG_WARN(Wide-character applications must define HAVE_LIBUTF8_H to include curses.h)
    1335613483 fi
     
    1336013487 AC_SUBST(WITH_OVERWRITE)
    1336113488 AC_SUBST(TICS_LIST)
    13362 @@ -1742,12 +1778,12 @@
     13489@@ -1742,12 +1812,12 @@
    1336313490 CF_SRC_MODULES($modules_to_build)
    1336413491 
     
    1337513502 AC_DEFINE_UNQUOTED(NCURSES_VERSION_STRING, "${NCURSES_MAJOR}.${NCURSES_MINOR}.${NCURSES_PATCH}")
    1337613503 
    13377 @@ -1765,8 +1801,19 @@
     13504@@ -1765,8 +1835,19 @@
    1337813505 CF_SUBST_IF(["$ac_cv_header_termios_h" = yes], HAVE_TERMIOS_H, 1, 0)
    1337913506 
     
    1339613523        include/MKterm.h.awk \
    1339713524        include/curses.head:include/curses.h.in \
    13398 @@ -1796,13 +1843,13 @@
     13525@@ -1796,13 +1877,13 @@
    1339913526 NCURSES_PATCH="$NCURSES_PATCH"
    1340013527 SRC_SUBDIRS="$SRC_SUBDIRS"
     
    1341313540 WITH_ECHO="$with_echo"
    1341413541 WITH_OVERWRITE="$with_overwrite"
    13415 @@ -1821,6 +1868,7 @@
     13542@@ -1821,6 +1902,7 @@
    1341613543 cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix"
    1341713544 cf_cv_system_name="$cf_cv_system_name"
     
    1342313550diff -Naur ncurses-5.7.orig/dist.mk ncurses-5.7/dist.mk
    1342413551--- ncurses-5.7.orig/dist.mk    2008-11-01 17:58:38.000000000 -0700
    13425 +++ ncurses-5.7/dist.mk 2009-02-07 22:08:38.023632072 -0800
     13552+++ ncurses-5.7/dist.mk 2009-02-15 23:21:24.616480793 -0800
    1342613553@@ -25,7 +25,7 @@
    1342713554 # use or other dealings in this Software without prior written               #
     
    1342913556 ##############################################################################
    1343013557-# $Id: dist.mk,v 1.671 2008/11/02 00:58:38 tom Exp $
    13431 +# $Id: dist.mk,v 1.685 2009/02/07 14:08:14 tom Exp $
     13558+# $Id: dist.mk,v 1.686 2009/02/14 21:09:27 tom Exp $
    1343213559 # Makefile for creating ncurses distributions.
    1343313560 #
     
    1343813565 NCURSES_MINOR = 7
    1343913566-NCURSES_PATCH = 20081102
    13440 +NCURSES_PATCH = 20090207
     13567+NCURSES_PATCH = 20090214
    1344113568 
    1344213569 # We don't append the patch to the version, since this only applies to releases
     
    1344413571diff -Naur ncurses-5.7.orig/form/frm_driver.c ncurses-5.7/form/frm_driver.c
    1344513572--- ncurses-5.7.orig/form/frm_driver.c  2008-10-18 09:25:00.000000000 -0700
    13446 +++ ncurses-5.7/form/frm_driver.c       2009-02-07 22:08:20.957088421 -0800
     13573+++ ncurses-5.7/form/frm_driver.c       2009-02-15 23:21:03.083101270 -0800
    1344713574@@ -32,7 +32,7 @@
    1344813575 
     
    1346413591diff -Naur ncurses-5.7.orig/form/Makefile.in ncurses-5.7/form/Makefile.in
    1346513592--- ncurses-5.7.orig/form/Makefile.in   2007-04-28 07:56:11.000000000 -0700
    13466 +++ ncurses-5.7/form/Makefile.in        2009-02-07 22:08:29.738503702 -0800
     13593+++ ncurses-5.7/form/Makefile.in        2009-02-15 23:21:09.919538762 -0800
    1346713594@@ -1,6 +1,6 @@
    1346813595-# $Id: Makefile.in,v 1.47 2007/04/28 14:56:11 tom Exp $
     
    1348513612diff -Naur ncurses-5.7.orig/include/curses.h.in ncurses-5.7/include/curses.h.in
    1348613613--- ncurses-5.7.orig/include/curses.h.in        2008-08-30 13:11:29.000000000 -0700
    13487 +++ ncurses-5.7/include/curses.h.in     2009-02-07 22:08:26.211171952 -0800
     13614+++ ncurses-5.7/include/curses.h.in     2009-02-15 23:21:24.620481072 -0800
     13615@@ -1,5 +1,5 @@
     13616 /****************************************************************************
     13617- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     13618+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     13619  *                                                                          *
     13620  * Permission is hereby granted, free of charge, to any person obtaining a  *
     13621  * copy of this software and associated documentation files (the            *
    1348813622@@ -32,7 +32,7 @@
    1348913623  *     and: Thomas E. Dickey                        1996-on                 *
     
    1349113625 
    1349213626-/* $Id: curses.h.in,v 1.187 2008/08/30 20:11:29 tom Exp $ */
    13493 +/* $Id: curses.h.in,v 1.190 2008/12/20 22:28:52 tom Exp $ */
     13627+/* $Id: curses.h.in,v 1.193 2009/02/15 00:04:23 tom Exp $ */
    1349413628 
    1349513629 #ifndef __NCURSES_H
     
    1350813642 #define NCURSES_VERSION_MAJOR @NCURSES_MAJOR@
    1350913643 #define NCURSES_VERSION_MINOR @NCURSES_MINOR@
    13510 @@ -856,18 +850,18 @@
     13644@@ -110,6 +104,13 @@
     13645 #endif
     13646 
     13647 /*
     13648+ * The reentrant code relies on the opaque setting, but adds features.
     13649+ */
     13650+#ifndef NCURSES_REENTRANT
     13651+#define NCURSES_REENTRANT @cf_cv_enable_reentrant@
     13652+#endif
     13653+
     13654+/*
     13655  * The internal type used for window dimensions.
     13656  */
     13657 #undef NCURSES_SIZE_T
     13658@@ -224,7 +225,7 @@
     13659 
     13660 /* line graphics */
     13661 
     13662-#if @BROKEN_LINKER@ || @cf_cv_enable_reentrant@
     13663+#if @BROKEN_LINKER@ || NCURSES_REENTRANT
     13664 NCURSES_WRAPPED_VAR(chtype*, acs_map);
     13665 #define acs_map (_nc_acs_map())
     13666 #else
     13667@@ -646,7 +647,7 @@
     13668 extern NCURSES_EXPORT(int) mvwinnstr (WINDOW *, int, int, char *, int);                /* generated */
     13669 extern NCURSES_EXPORT(int) mvwinsch (WINDOW *, int, int, chtype);              /* generated */
     13670 extern NCURSES_EXPORT(int) mvwinsnstr (WINDOW *, int, int, const char *, int); /* generated */
     13671-extern NCURSES_EXPORT(int) mvwinsstr (WINDOW *, int, int, const char *);               /* generated */
     13672+extern NCURSES_EXPORT(int) mvwinsstr (WINDOW *, int, int, const char *);       /* generated */
     13673 extern NCURSES_EXPORT(int) mvwinstr (WINDOW *, int, int, char *);              /* generated */
     13674 extern NCURSES_EXPORT(int) mvwprintw (WINDOW*,int,int, const char *,...)       /* implemented */
     13675                GCC_PRINTFLIKE(4,5);
     13676@@ -654,9 +655,9 @@
     13677                GCC_SCANFLIKE(4,5);
     13678 extern NCURSES_EXPORT(int) mvwvline (WINDOW *,int, int, chtype, int);  /* generated */
     13679 extern NCURSES_EXPORT(int) napms (int);                                        /* implemented */
     13680-extern NCURSES_EXPORT(WINDOW *) newpad (int,int);                              /* implemented */
     13681+extern NCURSES_EXPORT(WINDOW *) newpad (int,int);                      /* implemented */
     13682 extern NCURSES_EXPORT(SCREEN *) newterm (NCURSES_CONST char *,FILE *,FILE *);  /* implemented */
     13683-extern NCURSES_EXPORT(WINDOW *) newwin (int,int,int,int);                      /* implemented */
     13684+extern NCURSES_EXPORT(WINDOW *) newwin (int,int,int,int);              /* implemented */
     13685 extern NCURSES_EXPORT(int) nl (void);                                  /* implemented */
     13686 extern NCURSES_EXPORT(int) nocbreak (void);                            /* implemented */
     13687 extern NCURSES_EXPORT(int) nodelay (WINDOW *,bool);                    /* implemented */
     13688@@ -710,7 +711,7 @@
     13689 extern NCURSES_EXPORT(int) slk_refresh (void);                         /* implemented */
     13690 extern NCURSES_EXPORT(int) slk_restore (void);                         /* implemented */
     13691 extern NCURSES_EXPORT(int) slk_set (int,const char *,int);             /* implemented */
     13692-extern NCURSES_EXPORT(int) slk_touch (void);                           /* implemented */
     13693+extern NCURSES_EXPORT(int) slk_touch (void);                           /* implemented */
     13694 extern NCURSES_EXPORT(int) standout (void);                            /* generated */
     13695 extern NCURSES_EXPORT(int) standend (void);                            /* generated */
     13696 extern NCURSES_EXPORT(int) start_color (void);                         /* implemented */
     13697@@ -856,23 +857,117 @@
    1351113698  * These extensions provide access to information stored in the WINDOW even
    1351213699  * when NCURSES_OPAQUE is set:
     
    1353913726 #else
    1354013727 #define curses_version() NCURSES_VERSION
     13728 #endif
     13729 
     13730+/*
     13731+ * Extra extension-functions, which pass a SCREEN pointer rather than using
     13732+ * a global variable SP.
     13733+ */
     13734+#if @NCURSES_SP_FUNCS@
     13735+#undef  NCURSES_SP_FUNCS
     13736+#define NCURSES_SP_FUNCS @NCURSES_PATCH@
     13737+#define NCURSES_SP_NAME(name) name##_sp
     13738+
     13739+extern NCURSES_EXPORT(SCREEN*) new_prescr(void); /* implemented */
     13740+
     13741+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(baudrate) (SCREEN*); /* implemented */
     13742+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(beep) (SCREEN*); /* implemented */
     13743+extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(can_change_color) (SCREEN*); /* implemented */
     13744+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(cbreak) (SCREEN*); /* implemented */
     13745+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(color_content) (SCREEN*, short, short*, short*, short*); /* implemented */
     13746+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(def_prog_mode) (SCREEN*); /* implemented */
     13747+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(def_shell_mode) (SCREEN*); /* implemented */
     13748+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(delay_output) (SCREEN*, int); /* implemented */
     13749+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(doupdate) (SCREEN*); /* implemented */
     13750+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(echo) (SCREEN*); /* implemented */
     13751+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(endwin) (SCREEN*); /* implemented */
     13752+extern NCURSES_EXPORT(char) NCURSES_SP_NAME(erasechar) (SCREEN*);/* implemented */
     13753+extern NCURSES_EXPORT(void) NCURSES_SP_NAME(filter) (SCREEN*); /* implemented */
     13754+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(flash) (SCREEN*); /* implemented */
     13755+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(flushinp) (SCREEN*); /* implemented */
     13756+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(halfdelay)(SCREEN*, int); /* implemented */
     13757+extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(has_colors) (SCREEN*); /* implemented */
     13758+extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(has_ic) (SCREEN*); /* implemented */
     13759+extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(has_il) (SCREEN*); /* implemented */
     13760+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(init_color) (SCREEN*, short, short, short, short); /* implemented */
     13761+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(init_pair) (SCREEN*, short, short, short); /* implemented */
     13762+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(intrflush) (SCREEN*, WINDOW*, bool);        /* implemented */
     13763+extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(isendwin) (SCREEN*); /* implemented */
     13764+extern NCURSES_EXPORT(NCURSES_CONST char *) NCURSES_SP_NAME(keyname) (SCREEN*, int); /* implemented */
     13765+extern NCURSES_EXPORT(char) NCURSES_SP_NAME(killchar) (SCREEN*); /* implemented */
     13766+extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(longname) (SCREEN*); /* implemented */
     13767+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(mvcur) (SCREEN*, int, int, int, int); /* implemented */
     13768+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(napms) (SCREEN*, int); /* implemented */
     13769+extern NCURSES_EXPORT(WINDOW *) NCURSES_SP_NAME(newpad) (SCREEN*, int, int); /* implemented */
     13770+extern NCURSES_EXPORT(SCREEN *) NCURSES_SP_NAME(newterm) (SCREEN*, NCURSES_CONST char *, FILE *, FILE *); /* implemented */
     13771+extern NCURSES_EXPORT(WINDOW *) NCURSES_SP_NAME(newwin) (SCREEN*, int, int, int, int); /* implemented */
     13772+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(nl) (SCREEN*); /* implemented */
     13773+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(nocbreak) (SCREEN*); /* implemented */
     13774+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(noecho) (SCREEN*); /* implemented */
     13775+extern NCURSES_EXPORT(void) NCURSES_SP_NAME(nofilter) (SCREEN*); /* implemented */
     13776+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(nonl) (SCREEN*); /* implemented */
     13777+extern NCURSES_EXPORT(void) NCURSES_SP_NAME(noqiflush) (SCREEN*); /* implemented */
     13778+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(noraw) (SCREEN*); /* implemented */
     13779+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(pair_content) (SCREEN*, short, short*, short*); /* implemented */
     13780+extern NCURSES_EXPORT(void) NCURSES_SP_NAME(qiflush) (SCREEN*); /* implemented */
     13781+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(raw) (SCREEN*); /* implemented */
     13782+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(reset_prog_mode) (SCREEN*); /* implemented */
     13783+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(reset_shell_mode) (SCREEN*); /* implemented */
     13784+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(ripoffline) (SCREEN*, int, int (*)(WINDOW *, int)); /* implemented */
     13785+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(scr_set) (SCREEN*, const char *); /* implemented */
     13786+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attroff) (SCREEN*, const chtype); /* implemented */
     13787+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attron) (SCREEN*, const chtype); /* implemented */
     13788+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attrset) (SCREEN*, const chtype); /* implemented */
     13789+extern NCURSES_EXPORT(attr_t) NCURSES_SP_NAME(slk_attr) (SCREEN*); /* implemented */
     13790+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attr_set) (SCREEN*, const attr_t, short, void*); /* implemented */
     13791+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_clear) (SCREEN*); /* implemented */
     13792+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_color) (SCREEN*, short); /* implemented */
     13793+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_init) (SCREEN*, int); /* implemented */
     13794+extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(slk_label) (SCREEN*, int); /* implemented */
     13795+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_noutrefresh) (SCREEN*); /* implemented */
     13796+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_refresh) (SCREEN*); /* implemented */
     13797+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_restore) (SCREEN*); /* implemented */
     13798+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_set) (SCREEN*, int, const char *, int); /* implemented */
     13799+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_touch) (SCREEN*); /* implemented */
     13800+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(start_color) (SCREEN*); /* implemented */
     13801+extern NCURSES_EXPORT(chtype) NCURSES_SP_NAME(termattrs) (SCREEN*); /* implemented */
     13802+extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(termname) (SCREEN*); /* implemented */
     13803+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(typeahead) (SCREEN*, int); /* implemented */
     13804+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(ungetch) (SCREEN*, int); /* implemented */
     13805+extern NCURSES_EXPORT(void) NCURSES_SP_NAME(use_env) (SCREEN*, bool); /* implemented */
     13806+#if @NCURSES_EXT_FUNCS@
     13807+extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(keybound) (SCREEN*, int, int);
     13808+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(assume_default_colors) (SCREEN*, int, int);
     13809+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(define_key) (SCREEN*, const char *, int);
     13810+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(get_escdelay) (SCREEN*);
     13811+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(key_defined)(SCREEN*, const char *);
     13812+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(keyok) (SCREEN*, int, bool);
     13813+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(set_escdelay) (SCREEN*, int);
     13814+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(set_tabsize) (SCREEN*, int);
     13815+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(use_default_colors) (SCREEN*);
     13816+extern NCURSES_EXPORT(int) NCURSES_SP_NAME(use_legacy_coding) (SCREEN*, int);
     13817+#endif
     13818+#else
     13819+#undef  NCURSES_SP_FUNCS
     13820+#define NCURSES_SP_FUNCS 0
     13821+#define NCURSES_SP_NAME(name) name
     13822+#endif
     13823+
     13824 /* attributes */
     13825 
     13826 #define NCURSES_ATTR_SHIFT       8
     13827@@ -1173,7 +1268,7 @@
     13828  *        It gives the ESC expire time in milliseconds.
     13829  *     b. ttytype is needed for backward compatibility
     13830  */
     13831-#if @cf_cv_enable_reentrant@
     13832+#if NCURSES_REENTRANT
     13833 
     13834 NCURSES_WRAPPED_VAR(WINDOW *, curscr);
     13835 NCURSES_WRAPPED_VAR(WINDOW *, newscr);
    1354113836diff -Naur ncurses-5.7.orig/include/curses.tail ncurses-5.7/include/curses.tail
    1354213837--- ncurses-5.7.orig/include/curses.tail        2008-07-05 13:20:38.000000000 -0700
    13543 +++ ncurses-5.7/include/curses.tail     2009-02-07 22:08:17.958857941 -0800
     13838+++ ncurses-5.7/include/curses.tail     2009-02-15 23:21:00.214919122 -0800
    1354413839@@ -1,4 +1,4 @@
    1354513840-/* $Id: curses.tail,v 1.16 2008/07/05 20:20:38 tom Exp $ */
     
    1355813853diff -Naur ncurses-5.7.orig/include/curses.wide ncurses-5.7/include/curses.wide
    1355913854--- ncurses-5.7.orig/include/curses.wide        2007-03-10 09:52:23.000000000 -0800
    13560 +++ ncurses-5.7/include/curses.wide     2009-02-07 22:08:19.476430787 -0800
     13855+++ ncurses-5.7/include/curses.wide     2009-02-15 23:21:01.799020254 -0800
    1356113856@@ -1,9 +1,11 @@
    1356213857-/* $Id: curses.wide,v 1.34 2007/03/10 17:52:23 tom Exp $ */
     
    1357413869diff -Naur ncurses-5.7.orig/INSTALL ncurses-5.7/INSTALL
    1357513870--- ncurses-5.7.orig/INSTALL    2008-11-02 13:13:51.000000000 -0800
    13576 +++ ncurses-5.7/INSTALL 2009-02-07 22:08:29.713894399 -0800
     13871+++ ncurses-5.7/INSTALL 2009-02-15 23:21:09.895537365 -0800
    1357713872@@ -1,5 +1,5 @@
    1357813873 -------------------------------------------------------------------------------
     
    1362513920diff -Naur ncurses-5.7.orig/man/curs_color.3x ncurses-5.7/man/curs_color.3x
    1362613921--- ncurses-5.7.orig/man/curs_color.3x  2005-12-17 16:00:37.000000000 -0800
    13627 +++ ncurses-5.7/man/curs_color.3x       2009-02-07 22:08:36.698833077 -0800
     13922+++ ncurses-5.7/man/curs_color.3x       2009-02-15 23:21:17.376018158 -0800
    1362813923@@ -1,5 +1,5 @@
    1362913924 .\"***************************************************************************
     
    1365613951diff -Naur ncurses-5.7.orig/man/curs_mouse.3x ncurses-5.7/man/curs_mouse.3x
    1365713952--- ncurses-5.7.orig/man/curs_mouse.3x  2006-12-30 15:43:34.000000000 -0800
    13658 +++ ncurses-5.7/man/curs_mouse.3x       2009-02-07 22:08:17.958857941 -0800
     13953+++ ncurses-5.7/man/curs_mouse.3x       2009-02-15 23:21:00.214919122 -0800
    1365913954@@ -1,6 +1,6 @@
    1366013955 '\" t
     
    1370213997diff -Naur ncurses-5.7.orig/man/keybound.3x ncurses-5.7/man/keybound.3x
    1370313998--- ncurses-5.7.orig/man/keybound.3x    2006-02-25 13:47:06.000000000 -0800
    13704 +++ ncurses-5.7/man/keybound.3x 2009-02-07 22:08:22.700246404 -0800
     13999+++ ncurses-5.7/man/keybound.3x 2009-02-15 23:21:04.663202123 -0800
    1370514000@@ -1,5 +1,5 @@
    1370614001 .\"***************************************************************************
     
    1372314018diff -Naur ncurses-5.7.orig/man/tabs.1 ncurses-5.7/man/tabs.1
    1372414019--- ncurses-5.7.orig/man/tabs.1 1969-12-31 16:00:00.000000000 -0800
    13725 +++ ncurses-5.7/man/tabs.1      2009-02-07 22:08:16.560228245 -0800
     14020+++ ncurses-5.7/man/tabs.1      2009-02-15 23:20:58.758823578 -0800
    1372614021@@ -0,0 +1,143 @@
    1372714022+.\"***************************************************************************
     
    1387014165diff -Naur ncurses-5.7.orig/man/tset.1 ncurses-5.7/man/tset.1
    1387114166--- ncurses-5.7.orig/man/tset.1 2006-12-24 07:00:30.000000000 -0800
    13872 +++ ncurses-5.7/man/tset.1      2009-02-07 22:08:16.560228245 -0800
     14167+++ ncurses-5.7/man/tset.1      2009-02-15 23:20:58.758823578 -0800
    1387314168@@ -1,5 +1,5 @@
    1387414169 .\"***************************************************************************
     
    1389114186diff -Naur ncurses-5.7.orig/MANIFEST ncurses-5.7/MANIFEST
    1389214187--- ncurses-5.7.orig/MANIFEST   2008-10-25 16:47:24.000000000 -0700
    13893 +++ ncurses-5.7/MANIFEST        2009-02-07 22:08:29.713894399 -0800
     14188+++ ncurses-5.7/MANIFEST        2009-02-15 23:21:09.895537365 -0800
    1389414189@@ -640,6 +640,7 @@
    1389514190 ./man/ncurses.3x
     
    1393414229diff -Naur ncurses-5.7.orig/menu/Makefile.in ncurses-5.7/menu/Makefile.in
    1393514230--- ncurses-5.7.orig/menu/Makefile.in   2007-04-28 07:56:11.000000000 -0700
    13936 +++ ncurses-5.7/menu/Makefile.in        2009-02-07 22:08:29.738503702 -0800
     14231+++ ncurses-5.7/menu/Makefile.in        2009-02-15 23:21:09.919538762 -0800
    1393714232@@ -1,6 +1,6 @@
    1393814233-# $Id: Makefile.in,v 1.48 2007/04/28 14:56:11 tom Exp $
     
    1395514250diff -Naur ncurses-5.7.orig/misc/gen-pkgconfig.in ncurses-5.7/misc/gen-pkgconfig.in
    1395614251--- ncurses-5.7.orig/misc/gen-pkgconfig.in      1969-12-31 16:00:00.000000000 -0800
    13957 +++ ncurses-5.7/misc/gen-pkgconfig.in   2009-02-07 22:08:36.698833077 -0800
     14252+++ ncurses-5.7/misc/gen-pkgconfig.in   2009-02-15 23:21:17.376018158 -0800
    1395814253@@ -0,0 +1,119 @@
    1395914254+#!@SHELL@
     
    1407814373diff -Naur ncurses-5.7.orig/misc/Makefile.in ncurses-5.7/misc/Makefile.in
    1407914374--- ncurses-5.7.orig/misc/Makefile.in   2007-03-31 08:54:17.000000000 -0700
    14080 +++ ncurses-5.7/misc/Makefile.in        2009-02-07 22:08:38.023632072 -0800
     14375+++ ncurses-5.7/misc/Makefile.in        2009-02-15 23:21:19.700165665 -0800
    1408114376@@ -1,6 +1,6 @@
    1408214377-# $Id: Makefile.in,v 1.43 2007/03/31 15:54:17 tom Exp $
     
    1416114456diff -Naur ncurses-5.7.orig/misc/ncurses-config.in ncurses-5.7/misc/ncurses-config.in
    1416214457--- ncurses-5.7.orig/misc/ncurses-config.in     2007-03-17 13:02:19.000000000 -0700
    14163 +++ ncurses-5.7/misc/ncurses-config.in  2009-02-07 22:08:36.698833077 -0800
     14458+++ ncurses-5.7/misc/ncurses-config.in  2009-02-15 23:21:17.376018158 -0800
    1416414459@@ -1,7 +1,7 @@
    1416514460 #!@SHELL@
     
    1428814583diff -Naur ncurses-5.7.orig/misc/terminfo.src ncurses-5.7/misc/terminfo.src
    1428914584--- ncurses-5.7.orig/misc/terminfo.src  2008-10-12 16:03:54.000000000 -0700
    14290 +++ ncurses-5.7/misc/terminfo.src       2009-02-07 22:08:33.758021512 -0800
     14585+++ ncurses-5.7/misc/terminfo.src       2009-02-15 23:21:14.363823718 -0800
    1429114586@@ -6,8 +6,8 @@
    1429214587 # Report bugs and new terminal descriptions to
     
    1445414749diff -Naur ncurses-5.7.orig/mk-1st.awk ncurses-5.7/mk-1st.awk
    1445514750--- ncurses-5.7.orig/mk-1st.awk 2007-03-24 15:10:55.000000000 -0700
    14456 +++ ncurses-5.7/mk-1st.awk      2009-02-07 22:08:31.055101551 -0800
     14751+++ ncurses-5.7/mk-1st.awk      2009-02-15 23:21:11.279628160 -0800
    1445714752@@ -1,6 +1,6 @@
    1445814753-# $Id: mk-1st.awk,v 1.78 2007/03/24 22:10:55 tom Exp $
     
    1448214777                                if ( host == "vxworks" )
    1448314778                                {
     14779diff -Naur ncurses-5.7.orig/ncurses/base/define_key.c ncurses-5.7/ncurses/base/define_key.c
     14780--- ncurses-5.7.orig/ncurses/base/define_key.c  2006-12-30 15:23:31.000000000 -0800
     14781+++ ncurses-5.7/ncurses/base/define_key.c       2009-02-15 23:21:24.620481072 -0800
     14782@@ -1,5 +1,5 @@
     14783 /****************************************************************************
     14784- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
     14785+ * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc.              *
     14786  *                                                                          *
     14787  * Permission is hereby granted, free of charge, to any person obtaining a  *
     14788  * copy of this software and associated documentation files (the            *
     14789@@ -27,20 +27,21 @@
     14790  ****************************************************************************/
     14791 
     14792 /****************************************************************************
     14793- *  Author: Thomas E. Dickey                    1997-on                     *
     14794+ *  Author: Thomas E. Dickey                        1997-on                 *
     14795+ *     and: Juergen Pfeifer                         2009                    *
     14796  ****************************************************************************/
     14797 
     14798 #include <curses.priv.h>
     14799 
     14800-MODULE_ID("$Id: define_key.c,v 1.13 2006/12/30 23:23:31 tom Exp $")
     14801+MODULE_ID("$Id: define_key.c,v 1.15 2009/02/15 00:30:40 tom Exp $")
     14802 
     14803 NCURSES_EXPORT(int)
     14804-define_key(const char *str, int keycode)
     14805+NCURSES_SP_NAME(define_key) (NCURSES_SP_DCLx const char *str, int keycode)
     14806 {
     14807     int code = ERR;
     14808 
     14809     T((T_CALLED("define_key(%s,%d)"), _nc_visbuf(str), keycode));
     14810-    if (SP == 0) {
     14811+    if (SP_PARM == 0) {
     14812        code = ERR;
     14813     } else if (keycode > 0) {
     14814        unsigned ukey = (unsigned) keycode;
     14815@@ -48,12 +49,12 @@
     14816        if (str != 0) {
     14817            define_key(str, 0);
     14818        } else if (has_key(keycode)) {
     14819-           while (_nc_remove_key(&(SP->_keytry), ukey))
     14820+           while (_nc_remove_key(&(SP_PARM->_keytry), ukey))
     14821                code = OK;
     14822        }
     14823        if (str != 0) {
     14824            if (key_defined(str) == 0) {
     14825-               if (_nc_add_to_try(&(SP->_keytry), str, ukey) == OK) {
     14826+               if (_nc_add_to_try(&(SP_PARM->_keytry), str, ukey) == OK) {
     14827                    code = OK;
     14828                } else {
     14829                    code = ERR;
     14830@@ -63,8 +64,16 @@
     14831            }
     14832        }
     14833     } else {
     14834-       while (_nc_remove_string(&(SP->_keytry), str))
     14835+       while (_nc_remove_string(&(SP_PARM->_keytry), str))
     14836            code = OK;
     14837     }
     14838     returnCode(code);
     14839 }
     14840+
     14841+#if NCURSES_SP_FUNCS
     14842+NCURSES_EXPORT(int)
     14843+define_key(const char *str, int keycode)
     14844+{
     14845+    return NCURSES_SP_NAME(define_key) (CURRENT_SCREEN, str, keycode);
     14846+}
     14847+#endif
     14848diff -Naur ncurses-5.7.orig/ncurses/base/keybound.c ncurses-5.7/ncurses/base/keybound.c
     14849--- ncurses-5.7.orig/ncurses/base/keybound.c    2006-06-17 11:19:24.000000000 -0700
     14850+++ ncurses-5.7/ncurses/base/keybound.c 2009-02-15 23:21:24.620481072 -0800
     14851@@ -1,5 +1,5 @@
     14852 /****************************************************************************
     14853- * Copyright (c) 1999-2005,2006 Free Software Foundation, Inc.              *
     14854+ * Copyright (c) 1999-2006,2009 Free Software Foundation, Inc.              *
     14855  *                                                                          *
     14856  * Permission is hereby granted, free of charge, to any person obtaining a  *
     14857  * copy of this software and associated documentation files (the            *
     14858@@ -27,25 +27,34 @@
     14859  ****************************************************************************/
     14860 
     14861 /****************************************************************************
     14862- *  Author: Thomas E. Dickey                 1999-on                        *
     14863+ *  Author: Thomas E. Dickey                        1999-on                 *
     14864+ *     and: Juergen Pfeifer                         2009                    *
     14865  ****************************************************************************/
     14866 
     14867 #include <curses.priv.h>
     14868 
     14869-MODULE_ID("$Id: keybound.c,v 1.7 2006/06/17 18:19:24 tom Exp $")
     14870+MODULE_ID("$Id: keybound.c,v 1.8 2009/02/15 00:31:10 tom Exp $")
     14871 
     14872 /*
     14873  * Returns the count'th string definition which is associated with the
     14874  * given keycode.  The result is malloc'd, must be freed by the caller.
     14875  */
     14876 NCURSES_EXPORT(char *)
     14877-keybound(int code, int count)
     14878+NCURSES_SP_NAME(keybound) (NCURSES_SP_DCLx int code, int count)
     14879 {
     14880     char *result = 0;
     14881 
     14882     T((T_CALLED("keybound(%d,%d)"), code, count));
     14883-    if (SP != 0 && code >= 0) {
     14884-       result = _nc_expand_try(SP->_keytry, (unsigned) code, &count, 0);
     14885+    if (SP_PARM != 0 && code >= 0) {
     14886+       result = _nc_expand_try(SP_PARM->_keytry, (unsigned) code, &count, 0);
     14887     }
     14888     returnPtr(result);
     14889 }
     14890+
     14891+#if NCURSES_SP_FUNCS
     14892+NCURSES_EXPORT(char *)
     14893+keybound(int code, int count)
     14894+{
     14895+    return NCURSES_SP_NAME(keybound) (CURRENT_SCREEN, code, count);
     14896+}
     14897+#endif
     14898diff -Naur ncurses-5.7.orig/ncurses/base/key_defined.c ncurses-5.7/ncurses/base/key_defined.c
     14899--- ncurses-5.7.orig/ncurses/base/key_defined.c 2006-12-30 15:22:55.000000000 -0800
     14900+++ ncurses-5.7/ncurses/base/key_defined.c      2009-02-15 23:21:24.620481072 -0800
     14901@@ -1,5 +1,5 @@
     14902 /****************************************************************************
     14903- * Copyright (c) 2003,2006 Free Software Foundation, Inc.                   *
     14904+ * Copyright (c) 2003-2006,2009 Free Software Foundation, Inc.              *
     14905  *                                                                          *
     14906  * Permission is hereby granted, free of charge, to any person obtaining a  *
     14907  * copy of this software and associated documentation files (the            *
     14908@@ -27,12 +27,13 @@
     14909  ****************************************************************************/
     14910 
     14911 /****************************************************************************
     14912- *  Author: Thomas E. Dickey, 2003                                          *
     14913+ *  Author: Thomas E. Dickey                        2003                    *
     14914+ *     and: Juergen Pfeifer                         2009                    *
     14915  ****************************************************************************/
     14916 
     14917 #include <curses.priv.h>
     14918 
     14919-MODULE_ID("$Id: key_defined.c,v 1.6 2006/12/30 23:22:55 tom Exp $")
     14920+MODULE_ID("$Id: key_defined.c,v 1.7 2009/02/15 00:30:00 tom Exp $")
     14921 
     14922 static int
     14923 find_definition(TRIES * tree, const char *str)
     14924@@ -65,14 +66,22 @@
     14925  * Otherwise, return the keycode's value (neither OK/ERR).
     14926  */
     14927 NCURSES_EXPORT(int)
     14928-key_defined(const char *str)
     14929+NCURSES_SP_NAME(key_defined) (NCURSES_SP_DCLx const char *str)
     14930 {
     14931     int code = ERR;
     14932 
     14933     T((T_CALLED("key_defined(%s)"), _nc_visbuf(str)));
     14934-    if (SP != 0 && str != 0) {
     14935-       code = find_definition(SP->_keytry, str);
     14936+    if (SP_PARM != 0 && str != 0) {
     14937+       code = find_definition(SP_PARM->_keytry, str);
     14938     }
     14939 
     14940     returnCode(code);
     14941 }
     14942+
     14943+#if NCURSES_SP_FUNCS
     14944+NCURSES_EXPORT(int)
     14945+key_defined(const char *str)
     14946+{
     14947+    return NCURSES_SP_NAME(key_defined) (CURRENT_SCREEN, str);
     14948+}
     14949+#endif
     14950diff -Naur ncurses-5.7.orig/ncurses/base/keyok.c ncurses-5.7/ncurses/base/keyok.c
     14951--- ncurses-5.7.orig/ncurses/base/keyok.c       2006-12-30 08:22:33.000000000 -0800
     14952+++ ncurses-5.7/ncurses/base/keyok.c    2009-02-15 23:21:24.620481072 -0800
     14953@@ -1,5 +1,5 @@
     14954 /****************************************************************************
     14955- * Copyright (c) 1998-2000,2006 Free Software Foundation, Inc.              *
     14956+ * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc.              *
     14957  *                                                                          *
     14958  * Permission is hereby granted, free of charge, to any person obtaining a  *
     14959  * copy of this software and associated documentation files (the            *
     14960@@ -27,12 +27,13 @@
     14961  ****************************************************************************/
     14962 
     14963 /****************************************************************************
     14964- *  Author: Thomas E. Dickey            1997-on                             *
     14965+ *  Author: Thomas E. Dickey                        1997-on                 *
     14966+ *     and: Juergen Pfeifer                         2009                    *
     14967  ****************************************************************************/
     14968 
     14969 #include <curses.priv.h>
     14970 
     14971-MODULE_ID("$Id: keyok.c,v 1.7 2006/12/30 16:22:33 tom Exp $")
     14972+MODULE_ID("$Id: keyok.c,v 1.8 2009/02/15 00:31:38 tom Exp $")
     14973 
     14974 /*
     14975  * Enable (or disable) ncurses' interpretation of a keycode by adding (or
     14976@@ -45,7 +46,7 @@
     14977  */
     14978 
     14979 NCURSES_EXPORT(int)
     14980-keyok(int c, bool flag)
     14981+NCURSES_SP_NAME(keyok) (NCURSES_SP_DCLx int c, bool flag)
     14982 {
     14983     int code = ERR;
     14984     int count = 0;
     14985@@ -55,18 +56,18 @@
     14986     if (c >= 0) {
     14987        unsigned ch = (unsigned) c;
     14988        if (flag) {
     14989-           while ((s = _nc_expand_try(SP->_key_ok, ch, &count, 0)) != 0
     14990-                  && _nc_remove_key(&(SP->_key_ok), ch)) {
     14991-               code = _nc_add_to_try(&(SP->_keytry), s, ch);
     14992+           while ((s = _nc_expand_try(SP_PARM->_key_ok, ch, &count, 0)) != 0
     14993+                  && _nc_remove_key(&(SP_PARM->_key_ok), ch)) {
     14994+               code = _nc_add_to_try(&(SP_PARM->_keytry), s, ch);
     14995                free(s);
     14996                count = 0;
     14997                if (code != OK)
     14998                    break;
     14999            }
     15000        } else {
     15001-           while ((s = _nc_expand_try(SP->_keytry, ch, &count, 0)) != 0
     15002-                  && _nc_remove_key(&(SP->_keytry), ch)) {
     15003-               code = _nc_add_to_try(&(SP->_key_ok), s, ch);
     15004+           while ((s = _nc_expand_try(SP_PARM->_keytry, ch, &count, 0)) != 0
     15005+                  && _nc_remove_key(&(SP_PARM->_keytry), ch)) {
     15006+               code = _nc_add_to_try(&(SP_PARM->_key_ok), s, ch);
     15007                free(s);
     15008                count = 0;
     15009                if (code != OK)
     15010@@ -76,3 +77,11 @@
     15011     }
     15012     returnCode(code);
     15013 }
     15014+
     15015+#if NCURSES_SP_FUNCS
     15016+NCURSES_EXPORT(int)
     15017+keyok(int c, bool flag)
     15018+{
     15019+    return NCURSES_SP_NAME(keyok) (CURRENT_SCREEN, c, flag);
     15020+}
     15021+#endif
     15022diff -Naur ncurses-5.7.orig/ncurses/base/legacy_coding.c ncurses-5.7/ncurses/base/legacy_coding.c
     15023--- ncurses-5.7.orig/ncurses/base/legacy_coding.c       2005-12-17 15:38:17.000000000 -0800
     15024+++ ncurses-5.7/ncurses/base/legacy_coding.c    2009-02-15 23:21:24.620481072 -0800
     15025@@ -1,5 +1,5 @@
     15026 /****************************************************************************
     15027- * Copyright (c) 2005 Free Software Foundation, Inc.                        *
     15028+ * Copyright (c) 2005,2009 Free Software Foundation, Inc.                   *
     15029  *                                                                          *
     15030  * Permission is hereby granted, free of charge, to any person obtaining a  *
     15031  * copy of this software and associated documentation files (the            *
     15032@@ -27,22 +27,31 @@
     15033  ****************************************************************************/
     15034 
     15035 /****************************************************************************
     15036- *  Author: Thomas E. Dickey                                                *
     15037+ *  Author: Thomas E. Dickey          2005                                  *
     15038+ *          Juergen Pfeifer           2009                                  *
     15039  ****************************************************************************/
     15040 
     15041 #include <curses.priv.h>
     15042 
     15043-MODULE_ID("$Id: legacy_coding.c,v 1.2 2005/12/17 23:38:17 tom Exp $")
     15044+MODULE_ID("$Id: legacy_coding.c,v 1.3 2009/02/14 21:46:14 tom Exp $")
     15045 
     15046 NCURSES_EXPORT(int)
     15047-use_legacy_coding(int level)
     15048+NCURSES_SP_NAME(use_legacy_coding) (NCURSES_SP_DCLx int level)
     15049 {
     15050     int result = ERR;
     15051 
     15052     T((T_CALLED("use_legacy_coding(%d)"), level));
     15053-    if (level >= 0 && level <= 2 && SP != 0) {
     15054-       result = SP->_legacy_coding;
     15055-       SP->_legacy_coding = level;
     15056+    if (level >= 0 && level <= 2 && SP_PARM != 0) {
     15057+       result = SP_PARM->_legacy_coding;
     15058+       SP_PARM->_legacy_coding = level;
     15059     }
     15060     returnCode(result);
     15061 }
     15062+
     15063+#if NCURSES_SP_FUNCS
     15064+NCURSES_EXPORT(int)
     15065+use_legacy_coding(int level)
     15066+{
     15067+    return NCURSES_SP_NAME(use_legacy_coding) (CURRENT_SCREEN, level);
     15068+}
     15069+#endif
    1448415070diff -Naur ncurses-5.7.orig/ncurses/base/lib_addch.c ncurses-5.7/ncurses/base/lib_addch.c
    1448515071--- ncurses-5.7.orig/ncurses/base/lib_addch.c   2008-08-16 12:20:04.000000000 -0700
    14486 +++ ncurses-5.7/ncurses/base/lib_addch.c        2009-02-07 22:08:35.070519626 -0800
     15072+++ ncurses-5.7/ncurses/base/lib_addch.c        2009-02-15 23:21:15.875920379 -0800
    1448715073@@ -1,5 +1,5 @@
    1448815074 /****************************************************************************
     
    1453915125            /*
    1454015126             * Check for cells which are orphaned by adding this character, set
     15127diff -Naur ncurses-5.7.orig/ncurses/base/lib_beep.c ncurses-5.7/ncurses/base/lib_beep.c
     15128--- ncurses-5.7.orig/ncurses/base/lib_beep.c    2005-04-09 08:20:04.000000000 -0700
     15129+++ ncurses-5.7/ncurses/base/lib_beep.c 2009-02-15 23:21:24.620481072 -0800
     15130@@ -1,5 +1,5 @@
     15131 /****************************************************************************
     15132- * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc.              *
     15133+ * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc.              *
     15134  *                                                                          *
     15135  * Permission is hereby granted, free of charge, to any person obtaining a  *
     15136  * copy of this software and associated documentation files (the            *
     15137@@ -30,6 +30,7 @@
     15138  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     15139  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     15140  *     and: Thomas E. Dickey                        1996-on                 *
     15141+ *     and: Juergen Pfeifer                         2009                    *
     15142  ****************************************************************************/
     15143 
     15144 /*
     15145@@ -42,7 +43,7 @@
     15146 #include <curses.priv.h>
     15147 #include <term.h>              /* beep, flash */
     15148 
     15149-MODULE_ID("$Id: lib_beep.c,v 1.10 2005/04/09 15:20:04 tom Exp $")
     15150+MODULE_ID("$Id: lib_beep.c,v 1.11 2009/02/15 00:32:06 tom Exp $")
     15151 
     15152 /*
     15153  *     beep()
     15154@@ -53,7 +54,7 @@
     15155  */
     15156 
     15157 NCURSES_EXPORT(int)
     15158-beep(void)
     15159+NCURSES_SP_NAME(beep) (NCURSES_SP_DCL0)
     15160 {
     15161     int res = ERR;
     15162 
     15163@@ -74,3 +75,11 @@
     15164 
     15165     returnCode(res);
     15166 }
     15167+
     15168+#if NCURSES_SP_FUNCS
     15169+NCURSES_EXPORT(int)
     15170+beep(void)
     15171+{
     15172+    return NCURSES_SP_NAME(beep) (CURRENT_SCREEN);
     15173+}
     15174+#endif
    1454115175diff -Naur ncurses-5.7.orig/ncurses/base/lib_color.c ncurses-5.7/ncurses/base/lib_color.c
    1454215176--- ncurses-5.7.orig/ncurses/base/lib_color.c   2007-04-07 10:07:28.000000000 -0700
    14543 +++ ncurses-5.7/ncurses/base/lib_color.c        2009-02-07 22:08:36.698833077 -0800
     15177+++ ncurses-5.7/ncurses/base/lib_color.c        2009-02-15 23:21:24.620481072 -0800
    1454415178@@ -1,5 +1,5 @@
    1454515179 /****************************************************************************
     
    1454915183  * Permission is hereby granted, free of charge, to any person obtaining a  *
    1455015184  * copy of this software and associated documentation files (the            *
    14551 @@ -42,7 +42,7 @@
     15185@@ -30,6 +30,7 @@
     15186  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     15187  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     15188  *     and: Thomas E. Dickey                        1996-on                 *
     15189+ *     and: Juergen Pfeifer                         2009                    *
     15190  ****************************************************************************/
     15191 
     15192 /* lib_color.c
     15193@@ -42,7 +43,7 @@
    1455215194 #include <term.h>
    1455315195 #include <tic.h>
    1455415196 
    1455515197-MODULE_ID("$Id: lib_color.c,v 1.85 2007/04/07 17:07:28 tom Exp $")
    14556 +MODULE_ID("$Id: lib_color.c,v 1.87 2009/01/25 00:25:31 tom Exp $")
     15198+MODULE_ID("$Id: lib_color.c,v 1.88 2009/02/15 00:33:02 tom Exp $")
    1455715199 
    1455815200 /*
    1455915201  * These should be screen structure members.  They need to be globals for
    14560 @@ -108,6 +108,13 @@
     15202@@ -108,6 +109,13 @@
    1456115203 };
    1456215204 /* *INDENT-ON* */
     
    1457215214 /*
    1457315215  * These are called from _nc_do_color(), which in turn is called from
    14574 @@ -255,6 +262,15 @@
     15216@@ -237,15 +245,15 @@
     15217 }
     15218 
     15219 NCURSES_EXPORT(int)
     15220-start_color(void)
     15221+NCURSES_SP_NAME(start_color) (NCURSES_SP_DCL0)
     15222 {
     15223     int result = ERR;
     15224 
     15225     T((T_CALLED("start_color()")));
     15226 
     15227-    if (SP == 0) {
     15228+    if (SP_PARM == 0) {
     15229        result = ERR;
     15230-    } else if (SP->_coloron) {
     15231+    } else if (SP_PARM->_coloron) {
     15232        result = OK;
     15233     } else {
     15234 
     15235@@ -255,27 +263,38 @@
    1457515236        }
    1457615237 
    1457715238        if (max_pairs > 0 && max_colors > 0) {
    14578 +           SP->_pair_limit = max_pairs;
     15239-           SP->_pair_count = max_pairs;
     15240-           SP->_color_count = max_colors;
     15241+           SP_PARM->_pair_limit = max_pairs;
    1457915242+
    1458015243+#if NCURSES_EXT_FUNCS
     
    1458315246+            * allow for default-color as a component of a color-pair.
    1458415247+            */
    14585 +           SP->_pair_limit += (1 + (2 * max_colors));
     15248+           SP_PARM->_pair_limit += (1 + (2 * max_colors));
    1458615249+#endif
    14587             SP->_pair_count = max_pairs;
    14588             SP->_color_count = max_colors;
     15250+           SP_PARM->_pair_count = max_pairs;
     15251+           SP_PARM->_color_count = max_colors;
    1458915252 #if !USE_REENTRANT
    14590 @@ -263,7 +279,7 @@
     15253            COLOR_PAIRS = max_pairs;
     15254            COLORS = max_colors;
    1459115255 #endif
    1459215256 
    14593             if ((SP->_color_pairs = TYPE_CALLOC(colorpair_t,
     15257-           if ((SP->_color_pairs = TYPE_CALLOC(colorpair_t,
    1459415258-                                               max_pairs)) != 0) {
    14595 +                                               SP->_pair_limit)) != 0) {
    14596                 if ((SP->_color_table = TYPE_CALLOC(color_t,
    14597                                                     max_colors)) != 0) {
    14598                     SP->_color_pairs[0] = PAIR_OF(default_fg(), default_bg());
    14599 @@ -331,21 +347,69 @@
    14600  init_pair(short pair, short f, short b)
     15259-               if ((SP->_color_table = TYPE_CALLOC(color_t,
     15260-                                                   max_colors)) != 0) {
     15261-                   SP->_color_pairs[0] = PAIR_OF(default_fg(), default_bg());
     15262+           SP_PARM->_color_pairs = TYPE_CALLOC(colorpair_t,
     15263+                                               SP_PARM->_pair_limit);
     15264+           if (SP_PARM->_color_pairs != 0) {
     15265+               SP_PARM->_color_table = TYPE_CALLOC(color_t, max_colors);
     15266+               if (SP_PARM->_color_table != 0) {
     15267+                   SP_PARM->_color_pairs[0] = PAIR_OF(default_fg(),
     15268+                                                      default_bg());
     15269                    init_color_table();
     15270 
     15271                    T(("started color: COLORS = %d, COLOR_PAIRS = %d",
     15272                       COLORS, COLOR_PAIRS));
     15273 
     15274-                   SP->_coloron = 1;
     15275+                   SP_PARM->_coloron = 1;
     15276                    result = OK;
     15277-               } else if (SP->_color_pairs != 0) {
     15278-                   FreeAndNull(SP->_color_pairs);
     15279+               } else if (SP_PARM->_color_pairs != 0) {
     15280+                   FreeAndNull(SP_PARM->_color_pairs);
     15281                }
     15282            }
     15283        } else {
     15284@@ -285,6 +304,14 @@
     15285     returnCode(result);
     15286 }
     15287 
     15288+#if NCURSES_SP_FUNCS
     15289+NCURSES_EXPORT(int)
     15290+start_color(void)
     15291+{
     15292+    return NCURSES_SP_NAME(start_color) (CURRENT_SCREEN);
     15293+}
     15294+#endif
     15295+
     15296 /* This function was originally written by Daniel Weaver <danw@znyx.com> */
     15297 static void
     15298 rgb2hls(short r, short g, short b, short *h, short *l, short *s)
     15299@@ -328,24 +355,72 @@
     15300  * values.
     15301  */
     15302 NCURSES_EXPORT(int)
     15303-init_pair(short pair, short f, short b)
     15304+NCURSES_SP_NAME(init_pair) (NCURSES_SP_DCLx short pair, short f, short b)
    1460115305 {
    1460215306     colorpair_t result;
     
    1460915313        returnCode(ERR);
    1461015314+
    14611 +    previous = SP->_color_pairs[pair];
     15315+    previous = SP_PARM->_color_pairs[pair];
    1461215316 #if NCURSES_EXT_FUNCS
    14613      if (SP->_default_color) {
     15317-    if (SP->_default_color) {
    1461415318-       if (f < 0)
     15319+    if (SP_PARM->_default_color) {
    1461515320+       bool isDefault = FALSE;
    1461615321+       bool wasDefault = FALSE;
    14617 +       int default_pairs = SP->_default_pairs;
     15322+       int default_pairs = SP_PARM->_default_pairs;
    1461815323+
    1461915324+       /*
     
    1466515370+        * with sequentially adding new pairs.
    1466615371+        */
    14667 +       if (pair > (SP->_pair_count + default_pairs)) {
     15372+       if (pair > (SP_PARM->_pair_count + default_pairs)) {
    1466815373            returnCode(ERR);
    1466915374+       }
    14670 +       SP->_default_pairs = default_pairs;
     15375+       SP_PARM->_default_pairs = default_pairs;
    1467115376     } else
    1467215377 #endif
    1467315378     {
    14674 @@ -361,8 +425,8 @@
     15379@@ -361,8 +436,8 @@
    1467515380      * pair colors with the new ones).
    1467615381      */
     
    1468315388 
    1468415389        for (y = 0; y <= curscr->_maxy; y++) {
    14685 @@ -496,11 +560,11 @@
     15390@@ -381,9 +456,9 @@
     15391                _nc_make_oldhash(y);
     15392        }
     15393     }
     15394-    SP->_color_pairs[pair] = result;
     15395-    if (GET_SCREEN_PAIR(SP) == pair)
     15396-       SET_SCREEN_PAIR(SP, (chtype) (~0));     /* force attribute update */
     15397+    SP_PARM->_color_pairs[pair] = result;
     15398+    if (GET_SCREEN_PAIR(SP_PARM) == pair)
     15399+       SET_SCREEN_PAIR(SP_PARM, (chtype) (~0));        /* force attribute update */
     15400 
     15401     if (initialize_pair && InPalette(f) && InPalette(b)) {
     15402        const color_t *tp = hue_lightness_saturation ? hls_palette : cga_palette;
     15403@@ -404,54 +479,79 @@
     15404     returnCode(OK);
     15405 }
     15406 
     15407+#if NCURSES_SP_FUNCS
     15408+NCURSES_EXPORT(int)
     15409+init_pair(short pair, short f, short b)
     15410+{
     15411+    return NCURSES_SP_NAME(init_pair) (CURRENT_SCREEN, pair, f, b);
     15412+}
     15413+#endif
     15414+
     15415 #define okRGB(n) ((n) >= 0 && (n) <= 1000)
     15416 
     15417 NCURSES_EXPORT(int)
     15418-init_color(short color, short r, short g, short b)
     15419+NCURSES_SP_NAME(init_color) (NCURSES_SP_DCLx
     15420+                            short color, short r, short g, short b)
     15421 {
     15422     int result = ERR;
     15423 
     15424     T((T_CALLED("init_color(%d,%d,%d,%d)"), color, r, g, b));
     15425 
     15426     if (initialize_color != NULL
     15427-       && SP != 0
     15428-       && SP->_coloron
     15429+       && SP_PARM != 0
     15430+       && SP_PARM->_coloron
     15431        && (color >= 0 && OkColorHi(color))
     15432        && (okRGB(r) && okRGB(g) && okRGB(b))) {
     15433 
     15434-       SP->_color_table[color].init = 1;
     15435-       SP->_color_table[color].r = r;
     15436-       SP->_color_table[color].g = g;
     15437-       SP->_color_table[color].b = b;
     15438+       SP_PARM->_color_table[color].init = 1;
     15439+       SP_PARM->_color_table[color].r = r;
     15440+       SP_PARM->_color_table[color].g = g;
     15441+       SP_PARM->_color_table[color].b = b;
     15442 
     15443        if (hue_lightness_saturation) {
     15444            rgb2hls(r, g, b,
     15445-                   &SP->_color_table[color].red,
     15446-                   &SP->_color_table[color].green,
     15447-                   &SP->_color_table[color].blue);
     15448+                   &SP_PARM->_color_table[color].red,
     15449+                   &SP_PARM->_color_table[color].green,
     15450+                   &SP_PARM->_color_table[color].blue);
     15451        } else {
     15452-           SP->_color_table[color].red = r;
     15453-           SP->_color_table[color].green = g;
     15454-           SP->_color_table[color].blue = b;
     15455+           SP_PARM->_color_table[color].red = r;
     15456+           SP_PARM->_color_table[color].green = g;
     15457+           SP_PARM->_color_table[color].blue = b;
     15458        }
     15459 
     15460        TPUTS_TRACE("initialize_color");
     15461        putp(TPARM_4(initialize_color, color, r, g, b));
     15462-       SP->_color_defs = max(color + 1, SP->_color_defs);
     15463+       SP_PARM->_color_defs = max(color + 1, SP_PARM->_color_defs);
     15464        result = OK;
     15465     }
     15466     returnCode(result);
     15467 }
     15468 
     15469+#if NCURSES_SP_FUNCS
     15470+NCURSES_EXPORT(int)
     15471+init_color(short color, short r, short g, short b)
     15472+{
     15473+    return NCURSES_SP_NAME(init_color) (CURRENT_SCREEN, color, r, g, b);
     15474+}
     15475+#endif
     15476+
     15477 NCURSES_EXPORT(bool)
     15478-can_change_color(void)
     15479+NCURSES_SP_NAME(can_change_color) (NCURSES_SP_DCL0)
     15480 {
     15481     T((T_CALLED("can_change_color()")));
     15482     returnCode((can_change != 0) ? TRUE : FALSE);
     15483 }
     15484 
     15485+#if NCURSES_SP_FUNCS
     15486 NCURSES_EXPORT(bool)
     15487-has_colors(void)
     15488+can_change_color(void)
     15489+{
     15490+    return NCURSES_SP_NAME(can_change_color) (CURRENT_SCREEN);
     15491+}
     15492+#endif
     15493+
     15494+NCURSES_EXPORT(bool)
     15495+NCURSES_SP_NAME(has_colors) (NCURSES_SP_DCL0)
     15496 {
     15497     T((T_CALLED("has_colors()")));
     15498     returnCode((VALID_NUMERIC(max_colors) && VALID_NUMERIC(max_pairs)
     15499@@ -462,18 +562,27 @@
     15500                    || set_color_pair)) ? TRUE : FALSE);
     15501 }
     15502 
     15503+#if NCURSES_SP_FUNCS
     15504+NCURSES_EXPORT(bool)
     15505+has_colors(void)
     15506+{
     15507+    return NCURSES_SP_NAME(has_colors) (CURRENT_SCREEN);
     15508+}
     15509+#endif
     15510+
     15511 NCURSES_EXPORT(int)
     15512-color_content(short color, short *r, short *g, short *b)
     15513+NCURSES_SP_NAME(color_content) (NCURSES_SP_DCLx short color, short *r,
     15514+                               short *g, short *b)
     15515 {
     15516     int result;
     15517 
     15518     T((T_CALLED("color_content(%d,%p,%p,%p)"), color, r, g, b));
     15519-    if (color < 0 || !OkColorHi(color) || SP == 0 || !SP->_coloron) {
     15520+    if (color < 0 || !OkColorHi(color) || SP_PARM == 0 || !SP_PARM->_coloron) {
     15521        result = ERR;
     15522     } else {
     15523-       NCURSES_COLOR_T c_r = SP->_color_table[color].red;
     15524-       NCURSES_COLOR_T c_g = SP->_color_table[color].green;
     15525-       NCURSES_COLOR_T c_b = SP->_color_table[color].blue;
     15526+       NCURSES_COLOR_T c_r = SP_PARM->_color_table[color].red;
     15527+       NCURSES_COLOR_T c_g = SP_PARM->_color_table[color].green;
     15528+       NCURSES_COLOR_T c_b = SP_PARM->_color_table[color].blue;
     15529 
     15530        if (r)
     15531            *r = c_r;
     15532@@ -489,18 +598,27 @@
     15533     returnCode(result);
     15534 }
     15535 
     15536+#if NCURSES_SP_FUNCS
     15537 NCURSES_EXPORT(int)
     15538-pair_content(short pair, short *f, short *b)
     15539+color_content(short color, short *r, short *g, short *b)
     15540+{
     15541+    return NCURSES_SP_NAME(color_content) (CURRENT_SCREEN, color, r, g, b);
     15542+}
     15543+#endif
     15544+
     15545+NCURSES_EXPORT(int)
     15546+NCURSES_SP_NAME(pair_content) (NCURSES_SP_DCLx short pair, short *f,
     15547+                              short *b)
     15548 {
     15549     int result;
    1468615550 
    1468715551     T((T_CALLED("pair_content(%d,%p,%p)"), pair, f, b));
     
    1469315557-       NCURSES_COLOR_T fg = ((SP->_color_pairs[pair] >> C_SHIFT) & C_MASK);
    1469415558-       NCURSES_COLOR_T bg = (SP->_color_pairs[pair] & C_MASK);
    14695 +       NCURSES_COLOR_T fg = FORE_OF(SP->_color_pairs[pair]);
    14696 +       NCURSES_COLOR_T bg = BACK_OF(SP->_color_pairs[pair]);
     15559+       NCURSES_COLOR_T fg = FORE_OF(SP_PARM->_color_pairs[pair]);
     15560+       NCURSES_COLOR_T bg = BACK_OF(SP_PARM->_color_pairs[pair]);
    1469715561 
    1469815562 #if NCURSES_EXT_FUNCS
    1469915563        if (fg == COLOR_DEFAULT)
    14700 @@ -527,7 +591,7 @@
     15564@@ -520,6 +638,14 @@
     15565     returnCode(result);
     15566 }
     15567 
     15568+#if NCURSES_SP_FUNCS
     15569+NCURSES_EXPORT(int)
     15570+pair_content(short pair, short *f, short *b)
     15571+{
     15572+    return NCURSES_SP_NAME(pair_content) (CURRENT_SCREEN, pair, f, b);
     15573+}
     15574+#endif
     15575+
     15576 NCURSES_EXPORT(void)
     15577 _nc_do_color(short old_pair, short pair, bool reverse, int (*outc) (int))
     15578 {
     15579@@ -527,7 +653,7 @@
    1470115580     NCURSES_COLOR_T bg = COLOR_DEFAULT;
    1470215581     NCURSES_COLOR_T old_fg, old_bg;
     
    1470915588diff -Naur ncurses-5.7.orig/ncurses/base/lib_colorset.c ncurses-5.7/ncurses/base/lib_colorset.c
    1471015589--- ncurses-5.7.orig/ncurses/base/lib_colorset.c        2005-01-29 13:40:51.000000000 -0800
    14711 +++ ncurses-5.7/ncurses/base/lib_colorset.c     2009-02-07 22:08:36.698833077 -0800
     15590+++ ncurses-5.7/ncurses/base/lib_colorset.c     2009-02-15 23:21:17.376018158 -0800
    1471215591@@ -1,5 +1,5 @@
    1471315592 /****************************************************************************
     
    1475515634+    returnCode(code);
    1475615635 }
     15636diff -Naur ncurses-5.7.orig/ncurses/base/lib_dft_fgbg.c ncurses-5.7/ncurses/base/lib_dft_fgbg.c
     15637--- ncurses-5.7.orig/ncurses/base/lib_dft_fgbg.c        2005-11-26 12:03:38.000000000 -0800
     15638+++ ncurses-5.7/ncurses/base/lib_dft_fgbg.c     2009-02-15 23:21:24.620481072 -0800
     15639@@ -1,5 +1,5 @@
     15640 /****************************************************************************
     15641- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
     15642+ * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc.              *
     15643  *                                                                          *
     15644  * Permission is hereby granted, free of charge, to any person obtaining a  *
     15645  * copy of this software and associated documentation files (the            *
     15646@@ -27,31 +27,40 @@
     15647  ****************************************************************************/
     15648 
     15649 /****************************************************************************
     15650- *  Author: Thomas E. Dickey                                                *
     15651+ *  Author: Thomas E. Dickey          1998-on                               *
     15652+ *          Juergen Pfeifer           2009                                  *
     15653  ****************************************************************************/
     15654 
     15655 #include <curses.priv.h>
     15656 #include <term.h>
     15657 
     15658-MODULE_ID("$Id: lib_dft_fgbg.c,v 1.18 2005/11/26 20:03:38 tom Exp $")
     15659+MODULE_ID("$Id: lib_dft_fgbg.c,v 1.19 2009/02/14 21:53:21 tom Exp $")
     15660 
     15661 /*
     15662  * Modify the behavior of color-pair 0 so that the library doesn't assume that
     15663  * it is white on black.  This is an extension to XSI curses.
     15664  */
     15665 NCURSES_EXPORT(int)
     15666-use_default_colors(void)
     15667+NCURSES_SP_NAME(use_default_colors) (NCURSES_SP_DCL0)
     15668 {
     15669     T((T_CALLED("use_default_colors()")));
     15670-    returnCode(assume_default_colors(-1, -1));
     15671+    returnCode(NCURSES_SP_NAME(assume_default_colors) (NCURSES_SP_ARGx - 1, -1));
     15672+}
     15673+
     15674+#if NCURSES_SP_FUNCS
     15675+NCURSES_EXPORT(int)
     15676+use_default_colors(void)
     15677+{
     15678+    return NCURSES_SP_NAME(use_default_colors) (CURRENT_SCREEN);
     15679 }
     15680+#endif
     15681 
     15682 /*
     15683  * Modify the behavior of color-pair 0 so that the library assumes that it
     15684  * is something specific, possibly not white on black.
     15685  */
     15686 NCURSES_EXPORT(int)
     15687-assume_default_colors(int fg, int bg)
     15688+NCURSES_SP_NAME(assume_default_colors) (NCURSES_SP_DCLx int fg, int bg)
     15689 {
     15690     T((T_CALLED("assume_default_colors(%d,%d)"), fg, bg));
     15691 
     15692@@ -61,15 +70,23 @@
     15693     if (initialize_pair)       /* don't know how to handle this */
     15694        returnCode(ERR);
     15695 
     15696-    SP->_default_color = isDefaultColor(fg) || isDefaultColor(bg);
     15697-    SP->_has_sgr_39_49 = (tigetflag("AX") == TRUE);
     15698-    SP->_default_fg = isDefaultColor(fg) ? COLOR_DEFAULT : (fg & C_MASK);
     15699-    SP->_default_bg = isDefaultColor(bg) ? COLOR_DEFAULT : (bg & C_MASK);
     15700-    if (SP->_color_pairs != 0) {
     15701-       bool save = SP->_default_color;
     15702-       SP->_default_color = TRUE;
     15703+    SP_PARM->_default_color = isDefaultColor(fg) || isDefaultColor(bg);
     15704+    SP_PARM->_has_sgr_39_49 = (tigetflag("AX") == TRUE);
     15705+    SP_PARM->_default_fg = isDefaultColor(fg) ? COLOR_DEFAULT : (fg & C_MASK);
     15706+    SP_PARM->_default_bg = isDefaultColor(bg) ? COLOR_DEFAULT : (bg & C_MASK);
     15707+    if (SP_PARM->_color_pairs != 0) {
     15708+       bool save = SP_PARM->_default_color;
     15709+       SP_PARM->_default_color = TRUE;
     15710        init_pair(0, (short) fg, (short) bg);
     15711-       SP->_default_color = save;
     15712+       SP_PARM->_default_color = save;
     15713     }
     15714     returnCode(OK);
     15715 }
     15716+
     15717+#if NCURSES_SP_FUNCS
     15718+NCURSES_EXPORT(int)
     15719+assume_default_colors(int fg, int bg)
     15720+{
     15721+    return NCURSES_SP_NAME(assume_default_colors) (CURRENT_SCREEN, fg, bg);
     15722+}
     15723+#endif
     15724diff -Naur ncurses-5.7.orig/ncurses/base/lib_echo.c ncurses-5.7/ncurses/base/lib_echo.c
     15725--- ncurses-5.7.orig/ncurses/base/lib_echo.c    2000-12-09 18:43:27.000000000 -0800
     15726+++ ncurses-5.7/ncurses/base/lib_echo.c 2009-02-15 23:21:24.620481072 -0800
     15727@@ -1,5 +1,5 @@
     15728 /****************************************************************************
     15729- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
     15730+ * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc.              *
     15731  *                                                                          *
     15732  * Permission is hereby granted, free of charge, to any person obtaining a  *
     15733  * copy of this software and associated documentation files (the            *
     15734@@ -29,6 +29,8 @@
     15735 /****************************************************************************
     15736  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     15737  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     15738+ *     and: Thomas E. Dickey                        1996-on                 *
     15739+ *     and: Juergen Pfeifer                         2009                    *
     15740  ****************************************************************************/
     15741 
     15742 /*
     15743@@ -42,20 +44,36 @@
     15744 
     15745 #include <curses.priv.h>
     15746 
     15747-MODULE_ID("$Id: lib_echo.c,v 1.5 2000/12/10 02:43:27 tom Exp $")
     15748+MODULE_ID("$Id: lib_echo.c,v 1.6 2009/02/15 00:34:19 tom Exp $")
     15749 
     15750 NCURSES_EXPORT(int)
     15751-echo(void)
     15752+NCURSES_SP_NAME(echo) (NCURSES_SP_DCL0)
     15753 {
     15754     T((T_CALLED("echo()")));
     15755-    SP->_echo = TRUE;
     15756+    SP_PARM->_echo = TRUE;
     15757     returnCode(OK);
     15758 }
     15759 
     15760+#if NCURSES_SP_FUNCS
     15761 NCURSES_EXPORT(int)
     15762-noecho(void)
     15763+echo(void)
     15764+{
     15765+    return NCURSES_SP_NAME(echo) (CURRENT_SCREEN);
     15766+}
     15767+#endif
     15768+
     15769+NCURSES_EXPORT(int)
     15770+NCURSES_SP_NAME(noecho) (NCURSES_SP_DCL0)
     15771 {
     15772     T((T_CALLED("noecho()")));
     15773-    SP->_echo = FALSE;
     15774+    SP_PARM->_echo = FALSE;
     15775     returnCode(OK);
     15776 }
     15777+
     15778+#if NCURSES_SP_FUNCS
     15779+NCURSES_EXPORT(int)
     15780+noecho(void)
     15781+{
     15782+    return NCURSES_SP_NAME(noecho) (CURRENT_SCREEN);
     15783+}
     15784+#endif
     15785diff -Naur ncurses-5.7.orig/ncurses/base/lib_endwin.c ncurses-5.7/ncurses/base/lib_endwin.c
     15786--- ncurses-5.7.orig/ncurses/base/lib_endwin.c  2000-12-09 18:43:27.000000000 -0800
     15787+++ ncurses-5.7/ncurses/base/lib_endwin.c       2009-02-15 23:21:24.620481072 -0800
     15788@@ -1,5 +1,5 @@
     15789 /****************************************************************************
     15790- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
     15791+ * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc.              *
     15792  *                                                                          *
     15793  * Permission is hereby granted, free of charge, to any person obtaining a  *
     15794  * copy of this software and associated documentation files (the            *
     15795@@ -29,6 +29,8 @@
     15796 /****************************************************************************
     15797  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     15798  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     15799+ *     and: Thomas E. Dickey                        1996-on                 *
     15800+ *     and: Juergen Pfeifer                         2009                    *
     15801  ****************************************************************************/
     15802 
     15803 /*
     15804@@ -41,16 +43,16 @@
     15805 #include <curses.priv.h>
     15806 #include <term.h>
     15807 
     15808-MODULE_ID("$Id: lib_endwin.c,v 1.19 2000/12/10 02:43:27 tom Exp $")
     15809+MODULE_ID("$Id: lib_endwin.c,v 1.20 2009/02/15 00:35:00 tom Exp $")
     15810 
     15811 NCURSES_EXPORT(int)
     15812-endwin(void)
     15813+NCURSES_SP_NAME(endwin) (NCURSES_SP_DCL0)
     15814 {
     15815     T((T_CALLED("endwin()")));
     15816 
     15817-    if (SP) {
     15818-       SP->_endwin = TRUE;
     15819-       SP->_mouse_wrap(SP);
     15820+    if (SP_PARM) {
     15821+       SP_PARM->_endwin = TRUE;
     15822+       SP_PARM->_mouse_wrap(SP_PARM);
     15823        _nc_screen_wrap();
     15824        _nc_mvcur_wrap();       /* wrap up cursor addressing */
     15825        returnCode(reset_shell_mode());
     15826@@ -58,3 +60,11 @@
     15827 
     15828     returnCode(ERR);
     15829 }
     15830+
     15831+#if NCURSES_SP_FUNCS
     15832+NCURSES_EXPORT(int)
     15833+endwin(void)
     15834+{
     15835+    return NCURSES_SP_NAME(endwin) (CURRENT_SCREEN);
     15836+}
     15837+#endif
     15838diff -Naur ncurses-5.7.orig/ncurses/base/lib_flash.c ncurses-5.7/ncurses/base/lib_flash.c
     15839--- ncurses-5.7.orig/ncurses/base/lib_flash.c   2000-12-09 18:43:27.000000000 -0800
     15840+++ ncurses-5.7/ncurses/base/lib_flash.c        2009-02-15 23:21:24.624480793 -0800
     15841@@ -1,5 +1,5 @@
     15842 /****************************************************************************
     15843- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
     15844+ * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc.              *
     15845  *                                                                          *
     15846  * Permission is hereby granted, free of charge, to any person obtaining a  *
     15847  * copy of this software and associated documentation files (the            *
     15848@@ -29,6 +29,8 @@
     15849 /****************************************************************************
     15850  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     15851  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     15852+ *     and: Thomas E. Dickey                        1996-on                 *
     15853+ *     and: Juergen Pfeifer                         2009                    *
     15854  ****************************************************************************/
     15855 
     15856 /*
     15857@@ -41,7 +43,7 @@
     15858 #include <curses.priv.h>
     15859 #include <term.h>              /* beep, flash */
     15860 
     15861-MODULE_ID("$Id: lib_flash.c,v 1.6 2000/12/10 02:43:27 tom Exp $")
     15862+MODULE_ID("$Id: lib_flash.c,v 1.7 2009/02/15 00:35:15 tom Exp $")
     15863 
     15864 /*
     15865  *     flash()
     15866@@ -52,7 +54,7 @@
     15867  */
     15868 
     15869 NCURSES_EXPORT(int)
     15870-flash(void)
     15871+NCURSES_SP_NAME(flash) (NCURSES_SP_DCL0)
     15872 {
     15873     int res = ERR;
     15874 
     15875@@ -71,3 +73,11 @@
     15876 
     15877     returnCode(res);
     15878 }
     15879+
     15880+#if NCURSES_SP_FUNCS
     15881+NCURSES_EXPORT(int)
     15882+flash(void)
     15883+{
     15884+    return NCURSES_SP_NAME(flash) (CURRENT_SCREEN);
     15885+}
     15886+#endif
    1475715887diff -Naur ncurses-5.7.orig/ncurses/base/lib_freeall.c ncurses-5.7/ncurses/base/lib_freeall.c
    1475815888--- ncurses-5.7.orig/ncurses/base/lib_freeall.c 2008-09-27 06:09:57.000000000 -0700
    14759 +++ ncurses-5.7/ncurses/base/lib_freeall.c      2009-02-07 22:08:20.957088421 -0800
     15889+++ ncurses-5.7/ncurses/base/lib_freeall.c      2009-02-15 23:21:03.083101270 -0800
    1476015890@@ -40,7 +40,7 @@
    1476115891 extern int malloc_errfd;       /* FIXME */
     
    1477615906     (void) _nc_printf_string(0, empty_va);
    1477715907 #ifdef TRACE
     15908diff -Naur ncurses-5.7.orig/ncurses/base/lib_getch.c ncurses-5.7/ncurses/base/lib_getch.c
     15909--- ncurses-5.7.orig/ncurses/base/lib_getch.c   2008-09-20 12:46:13.000000000 -0700
     15910+++ ncurses-5.7/ncurses/base/lib_getch.c        2009-02-15 23:21:24.624480793 -0800
     15911@@ -1,5 +1,5 @@
     15912 /****************************************************************************
     15913- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     15914+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     15915  *                                                                          *
     15916  * Permission is hereby granted, free of charge, to any person obtaining a  *
     15917  * copy of this software and associated documentation files (the            *
     15918@@ -30,6 +30,7 @@
     15919  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     15920  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     15921  *     and: Thomas E. Dickey                        1996-on                 *
     15922+ *     and: Juergen Pfeifer                         2009                    *
     15923  ****************************************************************************/
     15924 
     15925 /*
     15926@@ -41,7 +42,7 @@
     15927 
     15928 #include <curses.priv.h>
     15929 
     15930-MODULE_ID("$Id: lib_getch.c,v 1.99 2008/09/20 19:46:13 tom Exp $")
     15931+MODULE_ID("$Id: lib_getch.c,v 1.100 2009/02/15 00:36:00 tom Exp $")
     15932 
     15933 #include <fifo_defs.h>
     15934 
     15935@@ -54,27 +55,36 @@
     15936 }
     15937 #else
     15938 #define GetEscdelay(sp) ESCDELAY
     15939-NCURSES_EXPORT_VAR(int)
     15940-ESCDELAY = 1000;               /* max interval betw. chars in funkeys, in millisecs */
     15941+NCURSES_EXPORT_VAR (int)
     15942+  ESCDELAY = 1000;             /* max interval betw. chars in funkeys, in millisecs */
     15943 #endif
     15944 
     15945 #if NCURSES_EXT_FUNCS
     15946 NCURSES_EXPORT(int)
     15947-set_escdelay(int value)
     15948+NCURSES_SP_NAME(set_escdelay) (NCURSES_SP_DCLx int value)
     15949 {
     15950     int code = OK;
     15951 #if USE_REENTRANT
     15952-    if (SP) {
     15953-       SP->_ESCDELAY = value;
     15954+    if (SP_PARM) {
     15955+       SP_PARM->_ESCDELAY = value;
     15956     } else {
     15957        code = ERR;
     15958     }
     15959 #else
     15960+    (void) SP_PARM;
     15961     ESCDELAY = value;
     15962 #endif
     15963     return code;
     15964 }
     15965+
     15966+#if NCURSES_SP_FUNCS
     15967+NCURSES_EXPORT(int)
     15968+set_escdelay(int value)
     15969+{
     15970+    return NCURSES_SP_NAME(set_escdelay) (CURRENT_SCREEN, value);
     15971+}
     15972 #endif
     15973+#endif /* NCURSES_EXT_FUNCS */
     15974 
     15975 static int
     15976 _nc_use_meta(WINDOW *win)
     15977diff -Naur ncurses-5.7.orig/ncurses/base/lib_isendwin.c ncurses-5.7/ncurses/base/lib_isendwin.c
     15978--- ncurses-5.7.orig/ncurses/base/lib_isendwin.c        2000-12-09 18:43:27.000000000 -0800
     15979+++ ncurses-5.7/ncurses/base/lib_isendwin.c     2009-02-15 23:21:24.624480793 -0800
     15980@@ -1,5 +1,5 @@
     15981 /****************************************************************************
     15982- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
     15983+ * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc.              *
     15984  *                                                                          *
     15985  * Permission is hereby granted, free of charge, to any person obtaining a  *
     15986  * copy of this software and associated documentation files (the            *
     15987@@ -29,6 +29,8 @@
     15988 /****************************************************************************
     15989  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     15990  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     15991+ *     and: Thomas E. Dickey                        1996-on                 *
     15992+ *     and: Juergen Pfeifer                         2009                    *
     15993  ****************************************************************************/
     15994 
     15995 /*
     15996@@ -40,12 +42,20 @@
     15997 
     15998 #include <curses.priv.h>
     15999 
     16000-MODULE_ID("$Id: lib_isendwin.c,v 1.6 2000/12/10 02:43:27 tom Exp $")
     16001+MODULE_ID("$Id: lib_isendwin.c,v 1.7 2009/02/15 00:36:24 tom Exp $")
     16002 
     16003 NCURSES_EXPORT(bool)
     16004-isendwin(void)
     16005+NCURSES_SP_NAME(isendwin) (NCURSES_SP_DCL0)
     16006 {
     16007-    if (SP == NULL)
     16008+    if (SP_PARM == NULL)
     16009        return FALSE;
     16010-    return SP->_endwin;
     16011+    return SP_PARM->_endwin;
     16012+}
     16013+
     16014+#if NCURSES_SP_FUNCS
     16015+NCURSES_EXPORT(bool)
     16016+isendwin(void)
     16017+{
     16018+    return NCURSES_SP_NAME(isendwin) (CURRENT_SCREEN);
     16019 }
     16020+#endif
    1477816021diff -Naur ncurses-5.7.orig/ncurses/base/lib_mouse.c ncurses-5.7/ncurses/base/lib_mouse.c
    1477916022--- ncurses-5.7.orig/ncurses/base/lib_mouse.c   2008-10-18 14:48:55.000000000 -0700
    14780 +++ ncurses-5.7/ncurses/base/lib_mouse.c        2009-02-07 22:08:20.957088421 -0800
     16023+++ ncurses-5.7/ncurses/base/lib_mouse.c        2009-02-15 23:21:03.083101270 -0800
    1478116024@@ -79,7 +79,7 @@
    1478216025 
     
    1483516078 
    1483616079 NCURSES_EXPORT(bool)
     16080diff -Naur ncurses-5.7.orig/ncurses/base/lib_newterm.c ncurses-5.7/ncurses/base/lib_newterm.c
     16081--- ncurses-5.7.orig/ncurses/base/lib_newterm.c 2008-08-16 14:20:48.000000000 -0700
     16082+++ ncurses-5.7/ncurses/base/lib_newterm.c      2009-02-15 23:21:24.624480793 -0800
     16083@@ -1,5 +1,5 @@
     16084 /****************************************************************************
     16085- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     16086+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     16087  *                                                                          *
     16088  * Permission is hereby granted, free of charge, to any person obtaining a  *
     16089  * copy of this software and associated documentation files (the            *
     16090@@ -30,6 +30,7 @@
     16091  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     16092  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     16093  *     and: Thomas E. Dickey                        1996-on                 *
     16094+ *     and: Juergen Pfeifer                         2009                    *
     16095  ****************************************************************************/
     16096 
     16097 /*
     16098@@ -48,7 +49,7 @@
     16099 #include <term.h>              /* clear_screen, cup & friends, cur_term */
     16100 #include <tic.h>
     16101 
     16102-MODULE_ID("$Id: lib_newterm.c,v 1.73 2008/08/16 21:20:48 Werner.Fink Exp $")
     16103+MODULE_ID("$Id: lib_newterm.c,v 1.74 2009/02/15 00:37:10 tom Exp $")
     16104 
     16105 #ifndef ONLCR                  /* Allows compilation under the QNX 4.2 OS */
     16106 #define ONLCR 0
     16107@@ -95,7 +96,7 @@
     16108  * initialized.
     16109  */
     16110 NCURSES_EXPORT(void)
     16111-filter(void)
     16112+NCURSES_SP_NAME(filter) (NCURSES_SP_DCL0)
     16113 {
     16114     START_TRACE();
     16115     T((T_CALLED("filter")));
     16116@@ -103,23 +104,40 @@
     16117     returnVoid;
     16118 }
     16119 
     16120+#if NCURSES_SP_FUNCS
     16121+NCURSES_EXPORT(void)
     16122+filter(void)
     16123+{
     16124+    NCURSES_SP_NAME(filter) (CURRENT_SCREEN);
     16125+}
     16126+#endif
     16127+
     16128 #if NCURSES_EXT_FUNCS
     16129 /*
     16130  * An extension, allowing the application to open a new screen without
     16131  * requiring it to also be filtered.
     16132  */
     16133 NCURSES_EXPORT(void)
     16134-nofilter(void)
     16135+NCURSES_SP_NAME(nofilter) (NCURSES_SP_DCL0)
     16136 {
     16137     START_TRACE();
     16138     T((T_CALLED("nofilter")));
     16139     _nc_prescreen.filter_mode = FALSE;
     16140     returnVoid;
     16141 }
     16142+
     16143+#if NCURSES_SP_FUNCS
     16144+NCURSES_EXPORT(void)
     16145+nofilter(void)
     16146+{
     16147+    NCURSES_SP_NAME(nofilter) (CURRENT_SCREEN);
     16148+}
     16149 #endif
     16150+#endif /* NCURSES_EXT_FUNCS */
     16151 
     16152 NCURSES_EXPORT(SCREEN *)
     16153-newterm(NCURSES_CONST char *name, FILE *ofp, FILE *ifp)
     16154+NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx NCURSES_CONST char *name, FILE
     16155+                         *ofp, FILE *ifp)
     16156 {
     16157     int value;
     16158     int errret;
     16159@@ -133,8 +151,8 @@
     16160     _nc_init_pthreads();
     16161     _nc_lock_global(curses);
     16162 
     16163-    current = SP;
     16164-    its_term = (SP ? SP->_term : 0);
     16165+    current = SP_PARM;
     16166+    its_term = (SP_PARM ? SP_PARM->_term : 0);
     16167 
     16168     /* this loads the capability entry, then sets LINES and COLS */
     16169     if (setupterm(name, fileno(ofp), &errret) != ERR) {
     16170@@ -159,7 +177,7 @@
     16171            _nc_set_screen(current);
     16172            result = 0;
     16173        } else {
     16174-           assert(SP != 0);
     16175+           assert(SP_PARM != 0);
     16176            /*
     16177             * In setupterm() we did a set_curterm(), but it was before we set
     16178             * SP.  So the "current" screen's terminal pointer was overwritten
     16179@@ -233,3 +251,11 @@
     16180     _nc_unlock_global(curses);
     16181     returnSP(result);
     16182 }
     16183+
     16184+#if NCURSES_SP_FUNCS
     16185+NCURSES_EXPORT(SCREEN *)
     16186+newterm(NCURSES_CONST char *name, FILE *ofp, FILE *ifp)
     16187+{
     16188+    return NCURSES_SP_NAME(newterm) (CURRENT_SCREEN, name, ofp, ifp);
     16189+}
     16190+#endif
     16191diff -Naur ncurses-5.7.orig/ncurses/base/lib_newwin.c ncurses-5.7/ncurses/base/lib_newwin.c
     16192--- ncurses-5.7.orig/ncurses/base/lib_newwin.c  2008-06-07 06:58:09.000000000 -0700
     16193+++ ncurses-5.7/ncurses/base/lib_newwin.c       2009-02-15 23:21:24.624480793 -0800
     16194@@ -1,5 +1,5 @@
     16195 /****************************************************************************
     16196- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     16197+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     16198  *                                                                          *
     16199  * Permission is hereby granted, free of charge, to any person obtaining a  *
     16200  * copy of this software and associated documentation files (the            *
     16201@@ -30,6 +30,7 @@
     16202  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     16203  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     16204  *     and: Thomas E. Dickey                        1996-on                 *
     16205+ *     and: Juergen Pfeifer                         2009                    *
     16206  ****************************************************************************/
     16207 
     16208 /*
     16209@@ -42,7 +43,7 @@
     16210 #include <curses.priv.h>
     16211 #include <stddef.h>
     16212 
     16213-MODULE_ID("$Id: lib_newwin.c,v 1.52 2008/06/07 13:58:09 tom Exp $")
     16214+MODULE_ID("$Id: lib_newwin.c,v 1.53 2009/02/15 00:38:00 tom Exp $")
     16215 
     16216 #define window_is(name) ((sp)->_##name == win)
     16217 
     16218@@ -115,7 +116,8 @@
     16219 }
     16220 
     16221 NCURSES_EXPORT(WINDOW *)
     16222-newwin(int num_lines, int num_columns, int begy, int begx)
     16223+NCURSES_SP_NAME(newwin) (NCURSES_SP_DCLx
     16224+                        int num_lines, int num_columns, int begy, int begx)
     16225 {
     16226     WINDOW *win;
     16227     NCURSES_CH_T *ptr;
     16228@@ -127,7 +129,7 @@
     16229        returnWin(0);
     16230 
     16231     if (num_lines == 0)
     16232-       num_lines = SP->_lines_avail - begy;
     16233+       num_lines = SP_PARM->_lines_avail - begy;
     16234     if (num_columns == 0)
     16235        num_columns = screen_columns - begx;
     16236 
     16237@@ -149,6 +151,15 @@
     16238     returnWin(win);
     16239 }
     16240 
     16241+#if NCURSES_SP_FUNCS
     16242+NCURSES_EXPORT(WINDOW *)
     16243+newwin(int num_lines, int num_columns, int begy, int begx)
     16244+{
     16245+    return NCURSES_SP_NAME(newwin) (CURRENT_SCREEN, num_lines, num_columns,
     16246+                                   begy, begx);
     16247+}
     16248+#endif
     16249+
     16250 NCURSES_EXPORT(WINDOW *)
     16251 derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int begx)
     16252 {
     16253diff -Naur ncurses-5.7.orig/ncurses/base/lib_nl.c ncurses-5.7/ncurses/base/lib_nl.c
     16254--- ncurses-5.7.orig/ncurses/base/lib_nl.c      2000-12-09 18:43:27.000000000 -0800
     16255+++ ncurses-5.7/ncurses/base/lib_nl.c   2009-02-15 23:21:24.624480793 -0800
     16256@@ -1,5 +1,5 @@
     16257 /****************************************************************************
     16258- * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc.              *
     16259+ * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc.              *
     16260  *                                                                          *
     16261  * Permission is hereby granted, free of charge, to any person obtaining a  *
     16262  * copy of this software and associated documentation files (the            *
     16263@@ -29,6 +29,8 @@
     16264 /****************************************************************************
     16265  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     16266  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     16267+ *     and: Thomas E. Dickey                        1996-on                 *
     16268+ *     and: Juergen Pfeifer                         2009                    *
     16269  ****************************************************************************/
     16270 
     16271 /*
     16272@@ -42,18 +44,18 @@
     16273 
     16274 #include <curses.priv.h>
     16275 
     16276-MODULE_ID("$Id: lib_nl.c,v 1.8 2000/12/10 02:43:27 tom Exp $")
     16277+MODULE_ID("$Id: lib_nl.c,v 1.9 2009/02/15 00:38:22 tom Exp $")
     16278 
     16279 #ifdef __EMX__
     16280 #include <io.h>
     16281 #endif
     16282 
     16283 NCURSES_EXPORT(int)
     16284-nl(void)
     16285+NCURSES_SP_NAME(nl) (NCURSES_SP_DCL0)
     16286 {
     16287     T((T_CALLED("nl()")));
     16288 
     16289-    SP->_nl = TRUE;
     16290+    SP_PARM->_nl = TRUE;
     16291 
     16292 #ifdef __EMX__
     16293     _nc_flush();
     16294@@ -63,12 +65,20 @@
     16295     returnCode(OK);
     16296 }
     16297 
     16298+#if NCURSES_SP_FUNCS
     16299 NCURSES_EXPORT(int)
     16300-nonl(void)
     16301+nl(void)
     16302+{
     16303+    return NCURSES_SP_NAME(nl) (CURRENT_SCREEN);
     16304+}
     16305+#endif
     16306+
     16307+NCURSES_EXPORT(int)
     16308+NCURSES_SP_NAME(nonl) (NCURSES_SP_DCL0)
     16309 {
     16310     T((T_CALLED("nonl()")));
     16311 
     16312-    SP->_nl = FALSE;
     16313+    SP_PARM->_nl = FALSE;
     16314 
     16315 #ifdef __EMX__
     16316     _nc_flush();
     16317@@ -77,3 +87,11 @@
     16318 
     16319     returnCode(OK);
     16320 }
     16321+
     16322+#if NCURSES_SP_FUNCS
     16323+NCURSES_EXPORT(int)
     16324+nonl(void)
     16325+{
     16326+    return NCURSES_SP_NAME(nonl) (CURRENT_SCREEN);
     16327+}
     16328+#endif
     16329diff -Naur ncurses-5.7.orig/ncurses/base/lib_pad.c ncurses-5.7/ncurses/base/lib_pad.c
     16330--- ncurses-5.7.orig/ncurses/base/lib_pad.c     2006-10-14 13:47:13.000000000 -0700
     16331+++ ncurses-5.7/ncurses/base/lib_pad.c  2009-02-15 23:21:24.624480793 -0800
     16332@@ -1,5 +1,5 @@
     16333 /****************************************************************************
     16334- * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.                   *
     16335+ * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc.                   *
     16336  *                                                                          *
     16337  * Permission is hereby granted, free of charge, to any person obtaining a  *
     16338  * copy of this software and associated documentation files (the            *
     16339@@ -29,6 +29,8 @@
     16340 /****************************************************************************
     16341  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     16342  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     16343+ *     and: Thomas E. Dickey                        1996-on                 *
     16344+ *     and: Juergen Pfeifer                         2009                    *
     16345  ****************************************************************************/
     16346 
     16347 /*
     16348@@ -40,10 +42,10 @@
     16349 
     16350 #include <curses.priv.h>
     16351 
     16352-MODULE_ID("$Id: lib_pad.c,v 1.41 2006/10/14 20:47:13 tom Exp $")
     16353+MODULE_ID("$Id: lib_pad.c,v 1.42 2009/02/15 00:38:48 tom Exp $")
     16354 
     16355 NCURSES_EXPORT(WINDOW *)
     16356-newpad(int l, int c)
     16357+NCURSES_SP_NAME(newpad) (NCURSES_SP_DCLx int l, int c)
     16358 {
     16359     WINDOW *win;
     16360     NCURSES_CH_T *ptr;
     16361@@ -70,6 +72,14 @@
     16362     returnWin(win);
     16363 }
     16364 
     16365+#if NCURSES_SP_FUNCS
     16366+NCURSES_EXPORT(WINDOW *)
     16367+newpad(int l, int c)
     16368+{
     16369+    return NCURSES_SP_NAME(newpad) (CURRENT_SCREEN, l, c);
     16370+}
     16371+#endif
     16372+
     16373 NCURSES_EXPORT(WINDOW *)
     16374 subpad(WINDOW *orig, int l, int c, int begy, int begx)
     16375 {
     16376diff -Naur ncurses-5.7.orig/ncurses/base/lib_screen.c ncurses-5.7/ncurses/base/lib_screen.c
     16377--- ncurses-5.7.orig/ncurses/base/lib_screen.c  2008-08-16 12:05:37.000000000 -0700
     16378+++ ncurses-5.7/ncurses/base/lib_screen.c       2009-02-15 23:21:24.624480793 -0800
     16379@@ -1,5 +1,5 @@
     16380 /****************************************************************************
     16381- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     16382+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     16383  *                                                                          *
     16384  * Permission is hereby granted, free of charge, to any person obtaining a  *
     16385  * copy of this software and associated documentation files (the            *
     16386@@ -30,11 +30,12 @@
     16387  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     16388  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     16389  *     and: Thomas E. Dickey                        1996 on                 *
     16390+ *     and: Juergen Pfeifer                         2009                    *
     16391  ****************************************************************************/
     16392 
     16393 #include <curses.priv.h>
     16394 
     16395-MODULE_ID("$Id: lib_screen.c,v 1.31 2008/08/16 19:05:37 tom Exp $")
     16396+MODULE_ID("$Id: lib_screen.c,v 1.32 2009/02/15 00:39:13 tom Exp $")
     16397 
     16398 #define MAX_SIZE 0x3fff                /* 16k is big enough for a window or pad */
     16399 
     16400@@ -141,7 +142,7 @@
     16401 }
     16402 
     16403 NCURSES_EXPORT(int)
     16404-scr_restore(const char *file)
     16405+NCURSES_SP_NAME(scr_restore) (NCURSES_SP_DCLx const char *file)
     16406 {
     16407     FILE *fp = 0;
     16408 
     16409@@ -152,15 +153,23 @@
     16410        returnCode(ERR);
     16411     } else {
     16412        delwin(newscr);
     16413-       SP->_newscr = getwin(fp);
     16414+       SP_PARM->_newscr = getwin(fp);
     16415 #if !USE_REENTRANT
     16416-       newscr = SP->_newscr;
     16417+       newscr = SP_PARM->_newscr;
     16418 #endif
     16419        (void) fclose(fp);
     16420        returnCode(OK);
     16421     }
     16422 }
     16423 
     16424+#if NCURSES_SP_FUNCS
     16425+NCURSES_EXPORT(int)
     16426+scr_restore(const char *file)
     16427+{
     16428+    return NCURSES_SP_NAME(scr_restore) (CURRENT_SCREEN, file);
     16429+}
     16430+#endif
     16431+
     16432 NCURSES_EXPORT(int)
     16433 scr_dump(const char *file)
     16434 {
     16435@@ -179,7 +188,7 @@
     16436 }
     16437 
     16438 NCURSES_EXPORT(int)
     16439-scr_init(const char *file)
     16440+NCURSES_SP_NAME(scr_init) (NCURSES_SP_DCLx const char *file)
     16441 {
     16442     FILE *fp = 0;
     16443 
     16444@@ -193,17 +202,25 @@
     16445        returnCode(ERR);
     16446     } else {
     16447        delwin(curscr);
     16448-       SP->_curscr = getwin(fp);
     16449+       SP_PARM->_curscr = getwin(fp);
     16450 #if !USE_REENTRANT
     16451-       curscr = SP->_curscr;
     16452+       curscr = SP_PARM->_curscr;
     16453 #endif
     16454        (void) fclose(fp);
     16455        returnCode(OK);
     16456     }
     16457 }
     16458 
     16459+#if NCURSES_SP_FUNCS
     16460 NCURSES_EXPORT(int)
     16461-scr_set(const char *file)
     16462+scr_init(const char *file)
     16463+{
     16464+    return NCURSES_SP_NAME(scr_init) (CURRENT_SCREEN, file);
     16465+}
     16466+#endif
     16467+
     16468+NCURSES_EXPORT(int)
     16469+NCURSES_SP_NAME(scr_set) (NCURSES_SP_DCLx const char *file)
     16470 {
     16471     T((T_CALLED("scr_set(%s)"), _nc_visbuf(file)));
     16472 
     16473@@ -211,10 +228,18 @@
     16474        returnCode(ERR);
     16475     } else {
     16476        delwin(newscr);
     16477-       SP->_newscr = dupwin(curscr);
     16478+       SP_PARM->_newscr = dupwin(curscr);
     16479 #if !USE_REENTRANT
     16480-       newscr = SP->_newscr;
     16481+       newscr = SP_PARM->_newscr;
     16482 #endif
     16483        returnCode(OK);
     16484     }
     16485 }
     16486+
     16487+#if NCURSES_SP_FUNCS
     16488+NCURSES_EXPORT(int)
     16489+scr_set(const char *file)
     16490+{
     16491+    return NCURSES_SP_NAME(scr_set) (CURRENT_SCREEN, file);
     16492+}
     16493+#endif
     16494diff -Naur ncurses-5.7.orig/ncurses/base/lib_set_term.c ncurses-5.7/ncurses/base/lib_set_term.c
     16495--- ncurses-5.7.orig/ncurses/base/lib_set_term.c        2008-08-04 11:11:12.000000000 -0700
     16496+++ ncurses-5.7/ncurses/base/lib_set_term.c     2009-02-15 23:21:24.624480793 -0800
     16497@@ -1,5 +1,5 @@
     16498 /****************************************************************************
     16499- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     16500+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     16501  *                                                                          *
     16502  * Permission is hereby granted, free of charge, to any person obtaining a  *
     16503  * copy of this software and associated documentation files (the            *
     16504@@ -30,6 +30,7 @@
     16505  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     16506  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     16507  *     and: Thomas E. Dickey                        1996-on                 *
     16508+ *     and: Juergen Pfeifer                         2009                    *
     16509  ****************************************************************************/
     16510 
     16511 /*
     16512@@ -44,7 +45,7 @@
     16513 #include <term.h>              /* cur_term */
     16514 #include <tic.h>
     16515 
     16516-MODULE_ID("$Id: lib_set_term.c,v 1.117 2008/08/04 18:11:12 tom Exp $")
     16517+MODULE_ID("$Id: lib_set_term.c,v 1.118 2009/02/15 00:39:46 tom Exp $")
     16518 
     16519 NCURSES_EXPORT(SCREEN *)
     16520 set_term(SCREEN *screenp)
     16521@@ -635,7 +636,9 @@
     16522 }
     16523 
     16524 NCURSES_EXPORT(int)
     16525-ripoffline(int line, int (*init) (WINDOW *, int))
     16526+NCURSES_SP_NAME(ripoffline) (NCURSES_SP_DCLx
     16527+                            int line,
     16528+                            int (*init) (WINDOW *, int))
     16529 {
     16530     START_TRACE();
     16531     T((T_CALLED("ripoffline(%d,%p)"), line, init));
     16532@@ -645,3 +648,11 @@
     16533 
     16534     returnCode(_nc_ripoffline((line < 0) ? -1 : 1, init));
     16535 }
     16536+
     16537+#if NCURSES_SP_FUNCS
     16538+NCURSES_EXPORT(int)
     16539+ripoffline(int line, int (*init) (WINDOW *, int))
     16540+{
     16541+    return NCURSES_SP_NAME(ripoffline) (CURRENT_SCREEN, line, init);
     16542+}
     16543+#endif
     16544diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatrof.c ncurses-5.7/ncurses/base/lib_slkatrof.c
     16545--- ncurses-5.7.orig/ncurses/base/lib_slkatrof.c        2005-01-08 15:01:32.000000000 -0800
     16546+++ ncurses-5.7/ncurses/base/lib_slkatrof.c     2009-02-15 23:21:24.624480793 -0800
     16547@@ -1,5 +1,5 @@
     16548 /****************************************************************************
     16549- * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc.              *
     16550+ * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc.              *
     16551  *                                                                          *
     16552  * Permission is hereby granted, free of charge, to any person obtaining a  *
     16553  * copy of this software and associated documentation files (the            *
     16554@@ -38,21 +38,29 @@
     16555  */
     16556 #include <curses.priv.h>
     16557 
     16558-MODULE_ID("$Id: lib_slkatrof.c,v 1.8 2005/01/08 23:01:32 tom Exp $")
     16559+MODULE_ID("$Id: lib_slkatrof.c,v 1.9 2009/02/15 00:33:48 tom Exp $")
     16560 
     16561 NCURSES_EXPORT(int)
     16562-slk_attroff(const chtype attr)
     16563+NCURSES_SP_NAME(slk_attroff) (NCURSES_SP_DCLx const chtype attr)
     16564 {
     16565     T((T_CALLED("slk_attroff(%s)"), _traceattr(attr)));
     16566 
     16567-    if (SP != 0 && SP->_slk != 0) {
     16568-       TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP->_slk->attr))));
     16569-       RemAttr(SP->_slk->attr, attr);
     16570+    if (SP_PARM != 0 && SP_PARM->_slk != 0) {
     16571+       TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
     16572+       RemAttr(SP_PARM->_slk->attr, attr);
     16573        if ((attr & A_COLOR) != 0) {
     16574-           SetPair(SP->_slk->attr, 0);
     16575+           SetPair(SP_PARM->_slk->attr, 0);
     16576        }
     16577-       TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr))));
     16578+       TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
     16579        returnCode(OK);
     16580     } else
     16581        returnCode(ERR);
     16582 }
     16583+
     16584+#if NCURSES_SP_FUNCS
     16585+NCURSES_EXPORT(int)
     16586+slk_attroff(const chtype attr)
     16587+{
     16588+    return NCURSES_SP_NAME(slk_attroff) (CURRENT_SCREEN, attr);
     16589+}
     16590+#endif
     16591diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatron.c ncurses-5.7/ncurses/base/lib_slkatron.c
     16592--- ncurses-5.7.orig/ncurses/base/lib_slkatron.c        2005-01-08 15:02:01.000000000 -0800
     16593+++ ncurses-5.7/ncurses/base/lib_slkatron.c     2009-02-15 23:21:24.624480793 -0800
     16594@@ -1,5 +1,5 @@
     16595 /****************************************************************************
     16596- * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc.              *
     16597+ * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc.              *
     16598  *                                                                          *
     16599  * Permission is hereby granted, free of charge, to any person obtaining a  *
     16600  * copy of this software and associated documentation files (the            *
     16601@@ -38,21 +38,29 @@
     16602  */
     16603 #include <curses.priv.h>
     16604 
     16605-MODULE_ID("$Id: lib_slkatron.c,v 1.8 2005/01/08 23:02:01 tom Exp $")
     16606+MODULE_ID("$Id: lib_slkatron.c,v 1.9 2009/02/15 00:33:48 tom Exp $")
     16607 
     16608 NCURSES_EXPORT(int)
     16609-slk_attron(const chtype attr)
     16610+NCURSES_SP_NAME(slk_attron) (NCURSES_SP_DCLx const chtype attr)
     16611 {
     16612     T((T_CALLED("slk_attron(%s)"), _traceattr(attr)));
     16613 
     16614-    if (SP != 0 && SP->_slk != 0) {
     16615-       TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP->_slk->attr))));
     16616-       AddAttr(SP->_slk->attr, attr);
     16617+    if (SP_PARM != 0 && SP_PARM->_slk != 0) {
     16618+       TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
     16619+       AddAttr(SP_PARM->_slk->attr, attr);
     16620        if ((attr & A_COLOR) != 0) {
     16621-           SetPair(SP->_slk->attr, PAIR_NUMBER(attr));
     16622+           SetPair(SP_PARM->_slk->attr, PAIR_NUMBER(attr));
     16623        }
     16624-       TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr))));
     16625+       TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
     16626        returnCode(OK);
     16627     } else
     16628        returnCode(ERR);
     16629 }
     16630+
     16631+#if NCURSES_SP_FUNCS
     16632+NCURSES_EXPORT(int)
     16633+slk_attron(const chtype attr)
     16634+{
     16635+    return NCURSES_SP_NAME(slk_attron) (CURRENT_SCREEN, attr);
     16636+}
     16637+#endif
    1483716638diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatr_set.c ncurses-5.7/ncurses/base/lib_slkatr_set.c
    1483816639--- ncurses-5.7.orig/ncurses/base/lib_slkatr_set.c      2005-01-28 13:11:53.000000000 -0800
    14839 +++ ncurses-5.7/ncurses/base/lib_slkatr_set.c   2009-02-07 22:08:36.698833077 -0800
     16640+++ ncurses-5.7/ncurses/base/lib_slkatr_set.c   2009-02-15 23:21:24.624480793 -0800
    1484016641@@ -1,5 +1,5 @@
    1484116642 /****************************************************************************
     
    1485416655 
    1485516656 /*
    14856 @@ -38,22 +38,27 @@
     16657@@ -38,22 +38,39 @@
    1485716658  */
    1485816659 #include <curses.priv.h>
    1485916660 
    1486016661-MODULE_ID("$Id: lib_slkatr_set.c,v 1.10 2005/01/28 21:11:53 tom Exp $")
    14861 +MODULE_ID("$Id: lib_slkatr_set.c,v 1.11 2009/01/25 00:47:15 tom Exp $")
     16662+MODULE_ID("$Id: lib_slkatr_set.c,v 1.12 2009/02/15 00:33:48 tom Exp $")
    1486216663 
    1486316664 NCURSES_EXPORT(int)
    14864  slk_attr_set(const attr_t attr, short color_pair_number, void *opts)
     16665-slk_attr_set(const attr_t attr, short color_pair_number, void *opts)
     16666+NCURSES_SP_NAME(slk_attr_set) (NCURSES_SP_DCLx
     16667+                              const attr_t attr,
     16668+                              short color_pair_number,
     16669+                              void *opts)
    1486516670 {
    1486616671+    int code = ERR;
     
    1487016675-    if (SP != 0 && SP->_slk != 0 && !opts &&
    1487116676-       color_pair_number >= 0 && color_pair_number < COLOR_PAIRS) {
    14872 +    if (SP != 0
    14873 +       && SP->_slk != 0
     16677-       TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP->_slk->attr))));
     16678-       SetAttr(SP->_slk->attr, attr);
     16679+    if (SP_PARM != 0
     16680+       && SP_PARM->_slk != 0
    1487416681+       && !opts
    1487516682+       && color_pair_number >= 0
    14876 +       && color_pair_number < SP->_pair_limit) {
    14877         TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP->_slk->attr))));
    14878         SetAttr(SP->_slk->attr, attr);
     16683+       && color_pair_number < SP_PARM->_pair_limit) {
     16684+       TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
     16685+       SetAttr(SP_PARM->_slk->attr, attr);
    1487916686        if (color_pair_number > 0) {
    14880             SetPair(SP->_slk->attr, color_pair_number);
     16687-           SetPair(SP->_slk->attr, color_pair_number);
     16688+           SetPair(SP_PARM->_slk->attr, color_pair_number);
    1488116689        }
    14882         TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr))));
     16690-       TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr))));
    1488316691-       returnCode(OK);
    1488416692-    } else
    1488516693-       returnCode(ERR);
     16694+       TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
    1488616695+       code = OK;
    1488716696+    }
    1488816697+    returnCode(code);
    14889  }
     16698+}
     16699+
     16700+#if NCURSES_SP_FUNCS
     16701+NCURSES_EXPORT(int)
     16702+slk_attr_set(const attr_t attr, short color_pair_number, void *opts)
     16703+{
     16704+    return NCURSES_SP_NAME(slk_attr_set) (CURRENT_SCREEN, attr,
     16705+                                         color_pair_number, opts);
     16706 }
     16707+#endif
     16708diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatrset.c ncurses-5.7/ncurses/base/lib_slkatrset.c
     16709--- ncurses-5.7.orig/ncurses/base/lib_slkatrset.c       2005-01-08 13:46:47.000000000 -0800
     16710+++ ncurses-5.7/ncurses/base/lib_slkatrset.c    2009-02-15 23:21:24.628481072 -0800
     16711@@ -1,5 +1,5 @@
     16712 /****************************************************************************
     16713- * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc.              *
     16714+ * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc.              *
     16715  *                                                                          *
     16716  * Permission is hereby granted, free of charge, to any person obtaining a  *
     16717  * copy of this software and associated documentation files (the            *
     16718@@ -38,16 +38,24 @@
     16719  */
     16720 #include <curses.priv.h>
     16721 
     16722-MODULE_ID("$Id: lib_slkatrset.c,v 1.7 2005/01/08 21:46:47 tom Exp $")
     16723+MODULE_ID("$Id: lib_slkatrset.c,v 1.8 2009/02/15 00:33:48 tom Exp $")
     16724 
     16725 NCURSES_EXPORT(int)
     16726-slk_attrset(const chtype attr)
     16727+NCURSES_SP_NAME(slk_attrset) (NCURSES_SP_DCLx const chtype attr)
     16728 {
     16729     T((T_CALLED("slk_attrset(%s)"), _traceattr(attr)));
     16730 
     16731-    if (SP != 0 && SP->_slk != 0) {
     16732-       SetAttr(SP->_slk->attr, attr);
     16733+    if (SP_PARM != 0 && SP_PARM->_slk != 0) {
     16734+       SetAttr(SP_PARM->_slk->attr, attr);
     16735        returnCode(OK);
     16736     } else
     16737        returnCode(ERR);
     16738 }
     16739+
     16740+#if NCURSES_SP_FUNCS
     16741+NCURSES_EXPORT(int)
     16742+slk_attrset(const chtype attr)
     16743+{
     16744+    return NCURSES_SP_NAME(slk_attrset) (CURRENT_SCREEN, attr);
     16745+}
     16746+#endif
     16747diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkattr.c ncurses-5.7/ncurses/base/lib_slkattr.c
     16748--- ncurses-5.7.orig/ncurses/base/lib_slkattr.c 2005-01-08 13:44:28.000000000 -0800
     16749+++ ncurses-5.7/ncurses/base/lib_slkattr.c      2009-02-15 23:21:24.628481072 -0800
     16750@@ -1,5 +1,5 @@
     16751 /****************************************************************************
     16752- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
     16753+ * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc.              *
     16754  *                                                                          *
     16755  * Permission is hereby granted, free of charge, to any person obtaining a  *
     16756  * copy of this software and associated documentation files (the            *
     16757@@ -38,19 +38,27 @@
     16758  */
     16759 #include <curses.priv.h>
     16760 
     16761-MODULE_ID("$Id: lib_slkattr.c,v 1.6 2005/01/08 21:44:28 tom Exp $")
     16762+MODULE_ID("$Id: lib_slkattr.c,v 1.7 2009/02/15 00:33:48 tom Exp $")
     16763 
     16764 NCURSES_EXPORT(attr_t)
     16765-slk_attr(void)
     16766+NCURSES_SP_NAME(slk_attr) (NCURSES_SP_DCL0)
     16767 {
     16768     T((T_CALLED("slk_attr()")));
     16769 
     16770-    if (SP != 0 && SP->_slk != 0) {
     16771-       attr_t result = AttrOf(SP->_slk->attr) & ALL_BUT_COLOR;
     16772-       int pair = GetPair(SP->_slk->attr);
     16773+    if (SP_PARM != 0 && SP_PARM->_slk != 0) {
     16774+       attr_t result = AttrOf(SP_PARM->_slk->attr) & ALL_BUT_COLOR;
     16775+       int pair = GetPair(SP_PARM->_slk->attr);
     16776 
     16777        result |= COLOR_PAIR(pair);
     16778        returnAttr(result);
     16779     } else
     16780        returnAttr(0);
     16781 }
     16782+
     16783+#if NCURSES_SP_FUNCS
     16784+NCURSES_EXPORT(attr_t)
     16785+slk_attr(void)
     16786+{
     16787+    return NCURSES_SP_NAME(slk_attr) (CURRENT_SCREEN);
     16788+}
     16789+#endif
     16790diff -Naur ncurses-5.7.orig/ncurses/base/lib_slk.c ncurses-5.7/ncurses/base/lib_slk.c
     16791--- ncurses-5.7.orig/ncurses/base/lib_slk.c     2008-09-27 07:07:33.000000000 -0700
     16792+++ ncurses-5.7/ncurses/base/lib_slk.c  2009-02-15 23:21:24.624480793 -0800
     16793@@ -1,5 +1,5 @@
     16794 /****************************************************************************
     16795- * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc.              *
     16796+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     16797  *                                                                          *
     16798  * Permission is hereby granted, free of charge, to any person obtaining a  *
     16799  * copy of this software and associated documentation files (the            *
     16800@@ -45,7 +45,7 @@
     16801 #include <ctype.h>
     16802 #include <term.h>              /* num_labels, label_*, plab_norm */
     16803 
     16804-MODULE_ID("$Id: lib_slk.c,v 1.35 2008/09/27 14:07:33 juergen Exp $")
     16805+MODULE_ID("$Id: lib_slk.c,v 1.36 2009/02/15 00:33:48 tom Exp $")
     16806 
     16807 /*
     16808  * Free any memory related to soft labels, return an error.
     16809@@ -178,14 +178,22 @@
     16810  * Restore the soft labels on the screen.
     16811  */
     16812 NCURSES_EXPORT(int)
     16813-slk_restore(void)
     16814+NCURSES_SP_NAME(slk_restore) (NCURSES_SP_DCL0)
     16815 {
     16816     T((T_CALLED("slk_restore()")));
     16817 
     16818-    if (SP->_slk == NULL)
     16819+    if (SP_PARM->_slk == NULL)
     16820        return (ERR);
     16821-    SP->_slk->hidden = FALSE;
     16822-    SP->_slk->dirty = TRUE;
     16823+    SP_PARM->_slk->hidden = FALSE;
     16824+    SP_PARM->_slk->dirty = TRUE;
     16825 
     16826     returnCode(slk_refresh());
     16827 }
     16828+
     16829+#if NCURSES_SP_FUNCS
     16830+NCURSES_EXPORT(int)
     16831+slk_restore(void)
     16832+{
     16833+    return NCURSES_SP_NAME(slk_restore) (CURRENT_SCREEN);
     16834+}
     16835+#endif
     16836diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkclear.c ncurses-5.7/ncurses/base/lib_slkclear.c
     16837--- ncurses-5.7.orig/ncurses/base/lib_slkclear.c        2007-12-29 09:51:47.000000000 -0800
     16838+++ ncurses-5.7/ncurses/base/lib_slkclear.c     2009-02-15 23:21:24.628481072 -0800
     16839@@ -1,5 +1,5 @@
     16840 /****************************************************************************
     16841- * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
     16842+ * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.              *
     16843  *                                                                          *
     16844  * Permission is hereby granted, free of charge, to any person obtaining a  *
     16845  * copy of this software and associated documentation files (the            *
     16846@@ -40,27 +40,35 @@
     16847  */
     16848 #include <curses.priv.h>
     16849 
     16850-MODULE_ID("$Id: lib_slkclear.c,v 1.10 2007/12/29 17:51:47 tom Exp $")
     16851+MODULE_ID("$Id: lib_slkclear.c,v 1.11 2009/02/15 00:33:48 tom Exp $")
     16852 
     16853 NCURSES_EXPORT(int)
     16854-slk_clear(void)
     16855+NCURSES_SP_NAME(slk_clear) (NCURSES_SP_DCL0)
     16856 {
     16857     int rc = ERR;
     16858 
     16859     T((T_CALLED("slk_clear()")));
     16860 
     16861-    if (SP != NULL && SP->_slk != NULL) {
     16862-       SP->_slk->hidden = TRUE;
     16863+    if (SP_PARM != NULL && SP_PARM->_slk != NULL) {
     16864+       SP_PARM->_slk->hidden = TRUE;
     16865        /* For simulated SLK's it looks much more natural to
     16866           inherit those attributes from the standard screen */
     16867-       SP->_slk->win->_nc_bkgd = stdscr->_nc_bkgd;
     16868-       WINDOW_ATTRS(SP->_slk->win) = WINDOW_ATTRS(stdscr);
     16869-       if (SP->_slk->win == stdscr) {
     16870+       SP_PARM->_slk->win->_nc_bkgd = stdscr->_nc_bkgd;
     16871+       WINDOW_ATTRS(SP_PARM->_slk->win) = WINDOW_ATTRS(stdscr);
     16872+       if (SP_PARM->_slk->win == stdscr) {
     16873            rc = OK;
     16874        } else {
     16875-           werase(SP->_slk->win);
     16876-           rc = wrefresh(SP->_slk->win);
     16877+           werase(SP_PARM->_slk->win);
     16878+           rc = wrefresh(SP_PARM->_slk->win);
     16879        }
     16880     }
     16881     returnCode(rc);
     16882 }
     16883+
     16884+#if NCURSES_SP_FUNCS
     16885+NCURSES_EXPORT(int)
     16886+slk_clear(void)
     16887+{
     16888+    return NCURSES_SP_NAME(slk_clear) (CURRENT_SCREEN);
     16889+}
     16890+#endif
    1489016891diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkcolor.c ncurses-5.7/ncurses/base/lib_slkcolor.c
    1489116892--- ncurses-5.7.orig/ncurses/base/lib_slkcolor.c        2005-01-28 13:11:53.000000000 -0800
    14892 +++ ncurses-5.7/ncurses/base/lib_slkcolor.c     2009-02-07 22:08:36.698833077 -0800
     16893+++ ncurses-5.7/ncurses/base/lib_slkcolor.c     2009-02-15 23:21:24.628481072 -0800
    1489316894@@ -1,5 +1,5 @@
    1489416895 /****************************************************************************
     
    1490716908 
    1490816909 /*
    14909 @@ -38,19 +38,23 @@
     16910@@ -38,19 +38,31 @@
    1491016911  */
    1491116912 #include <curses.priv.h>
    1491216913 
    1491316914-MODULE_ID("$Id: lib_slkcolor.c,v 1.12 2005/01/28 21:11:53 tom Exp $")
    14914 +MODULE_ID("$Id: lib_slkcolor.c,v 1.13 2009/01/25 00:48:07 tom Exp $")
     16915+MODULE_ID("$Id: lib_slkcolor.c,v 1.14 2009/02/15 00:33:48 tom Exp $")
    1491516916 
    1491616917 NCURSES_EXPORT(int)
    14917  slk_color(short color_pair_number)
     16918-slk_color(short color_pair_number)
     16919+NCURSES_SP_NAME(slk_color) (NCURSES_SP_DCLx short color_pair_number)
    1491816920 {
    1491916921+    int code = ERR;
     
    1492316925-    if (SP != 0 && SP->_slk != 0 &&
    1492416926-       color_pair_number >= 0 && color_pair_number < COLOR_PAIRS) {
    14925 +    if (SP != 0
    14926 +       && SP->_slk != 0
    14927 +       && color_pair_number >= 0
    14928 +       && color_pair_number < SP->_pair_limit) {
    14929         TR(TRACE_ATTRS, ("... current is %s", _tracech_t(CHREF(SP->_slk->attr))));
    14930         SetPair(SP->_slk->attr, color_pair_number);
    14931         TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr))));
     16927-       TR(TRACE_ATTRS, ("... current is %s", _tracech_t(CHREF(SP->_slk->attr))));
     16928-       SetPair(SP->_slk->attr, color_pair_number);
     16929-       TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr))));
    1493216930-       returnCode(OK);
    1493316931-    } else
    1493416932-       returnCode(ERR);
     16933+    if (SP_PARM != 0
     16934+       && SP_PARM->_slk != 0
     16935+       && color_pair_number >= 0
     16936+       && color_pair_number < SP_PARM->_pair_limit) {
     16937+       TR(TRACE_ATTRS, ("... current is %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
     16938+       SetPair(SP_PARM->_slk->attr, color_pair_number);
     16939+       TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP_PARM->_slk->attr))));
    1493516940+       code = OK;
    1493616941+    }
    1493716942+    returnCode(code);
    14938  }
     16943+}
     16944+
     16945+#if NCURSES_SP_FUNCS
     16946+NCURSES_EXPORT(int)
     16947+slk_color(short color_pair_number)
     16948+{
     16949+    return NCURSES_SP_NAME(slk_color) (CURRENT_SCREEN, color_pair_number);
     16950 }
     16951+#endif
     16952diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkinit.c ncurses-5.7/ncurses/base/lib_slkinit.c
     16953--- ncurses-5.7.orig/ncurses/base/lib_slkinit.c 2008-01-12 12:23:39.000000000 -0800
     16954+++ ncurses-5.7/ncurses/base/lib_slkinit.c      2009-02-15 23:21:24.628481072 -0800
     16955@@ -1,5 +1,5 @@
     16956 /****************************************************************************
     16957- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     16958+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     16959  *                                                                          *
     16960  * Permission is hereby granted, free of charge, to any person obtaining a  *
     16961  * copy of this software and associated documentation files (the            *
     16962@@ -30,6 +30,7 @@
     16963  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     16964  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     16965  *     and: Thomas E. Dickey                        1996-on                 *
     16966+ *     and: Juergen Pfeifer                         2009                    *
     16967  ****************************************************************************/
     16968 
     16969 /*
     16970@@ -39,10 +40,10 @@
     16971  */
     16972 #include <curses.priv.h>
     16973 
     16974-MODULE_ID("$Id: lib_slkinit.c,v 1.7 2008/01/12 20:23:39 tom Exp $")
     16975+MODULE_ID("$Id: lib_slkinit.c,v 1.8 2009/02/15 00:42:36 tom Exp $")
     16976 
     16977 NCURSES_EXPORT(int)
     16978-slk_init(int format)
     16979+NCURSES_SP_NAME(slk_init) (NCURSES_SP_DCLx int format)
     16980 {
     16981     int code = ERR;
     16982 
     16983@@ -53,3 +54,11 @@
     16984     }
     16985     returnCode(code);
     16986 }
     16987+
     16988+#if NCURSES_SP_FUNCS
     16989+NCURSES_EXPORT(int)
     16990+slk_init(int format)
     16991+{
     16992+    return NCURSES_SP_NAME(slk_init) (CURRENT_SCREEN, format);
     16993+}
     16994+#endif
     16995diff -Naur ncurses-5.7.orig/ncurses/base/lib_slklab.c ncurses-5.7/ncurses/base/lib_slklab.c
     16996--- ncurses-5.7.orig/ncurses/base/lib_slklab.c  2003-03-29 14:53:48.000000000 -0800
     16997+++ ncurses-5.7/ncurses/base/lib_slklab.c       2009-02-15 23:21:24.628481072 -0800
     16998@@ -1,5 +1,5 @@
     16999 /****************************************************************************
     17000- * Copyright (c) 1998-2000,2003 Free Software Foundation, Inc.              *
     17001+ * Copyright (c) 1998-2003,2009 Free Software Foundation, Inc.              *
     17002  *                                                                          *
     17003  * Permission is hereby granted, free of charge, to any person obtaining a  *
     17004  * copy of this software and associated documentation files (the            *
     17005@@ -29,6 +29,8 @@
     17006 /****************************************************************************
     17007  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     17008  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     17009+ *     and: Thomas E. Dickey                        1996-on                 *
     17010+ *     and: Juergen Pfeifer                         2009                    *
     17011  ****************************************************************************/
     17012 
     17013 /*
     17014@@ -38,14 +40,22 @@
     17015  */
     17016 #include <curses.priv.h>
     17017 
     17018-MODULE_ID("$Id: lib_slklab.c,v 1.7 2003/03/29 22:53:48 tom Exp $")
     17019+MODULE_ID("$Id: lib_slklab.c,v 1.8 2009/02/15 00:42:53 tom Exp $")
     17020 
     17021 NCURSES_EXPORT(char *)
     17022-slk_label(int n)
     17023+NCURSES_SP_NAME(slk_label) (NCURSES_SP_DCLx int n)
     17024 {
     17025     T((T_CALLED("slk_label(%d)"), n));
     17026 
     17027-    if (SP == NULL || SP->_slk == NULL || n < 1 || n > SP->_slk->labcnt)
     17028+    if (SP_PARM == NULL || SP_PARM->_slk == NULL || n < 1 || n > SP_PARM->_slk->labcnt)
     17029        returnPtr(0);
     17030-    returnPtr(SP->_slk->ent[n - 1].ent_text);
     17031+    returnPtr(SP_PARM->_slk->ent[n - 1].ent_text);
     17032+}
     17033+
     17034+#if NCURSES_SP_FUNCS
     17035+NCURSES_EXPORT(char *)
     17036+slk_label(int n)
     17037+{
     17038+    return NCURSES_SP_NAME(slk_label) (CURRENT_SCREEN, n);
     17039 }
     17040+#endif
     17041diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkrefr.c ncurses-5.7/ncurses/base/lib_slkrefr.c
     17042--- ncurses-5.7.orig/ncurses/base/lib_slkrefr.c 2008-09-27 07:07:53.000000000 -0700
     17043+++ ncurses-5.7/ncurses/base/lib_slkrefr.c      2009-02-15 23:21:24.628481072 -0800
     17044@@ -1,5 +1,5 @@
     17045 /****************************************************************************
     17046- * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
     17047+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     17048  *                                                                          *
     17049  * Permission is hereby granted, free of charge, to any person obtaining a  *
     17050  * copy of this software and associated documentation files (the            *
     17051@@ -40,7 +40,7 @@
     17052 #include <curses.priv.h>
     17053 #include <term.h>              /* num_labels, label_*, plab_norm */
     17054 
     17055-MODULE_ID("$Id: lib_slkrefr.c,v 1.17 2008/09/27 14:07:53 juergen Exp $")
     17056+MODULE_ID("$Id: lib_slkrefr.c,v 1.18 2009/02/15 00:33:48 tom Exp $")
     17057 
     17058 /*
     17059  * Paint the info line for the PC style SLK emulation.
     17060@@ -113,32 +113,48 @@
     17061  * Refresh the soft labels.
     17062  */
     17063 NCURSES_EXPORT(int)
     17064-slk_noutrefresh(void)
     17065+NCURSES_SP_NAME(slk_noutrefresh) (NCURSES_SP_DCL0)
     17066 {
     17067     T((T_CALLED("slk_noutrefresh()")));
     17068 
     17069-    if (SP == NULL || SP->_slk == NULL)
     17070+    if (SP_PARM == NULL || SP_PARM->_slk == NULL)
     17071        returnCode(ERR);
     17072-    if (SP->_slk->hidden)
     17073+    if (SP_PARM->_slk->hidden)
     17074        returnCode(OK);
     17075-    slk_intern_refresh(SP->_slk);
     17076+    slk_intern_refresh(SP_PARM->_slk);
     17077+
     17078+    returnCode(wnoutrefresh(SP_PARM->_slk->win));
     17079+}
     17080 
     17081-    returnCode(wnoutrefresh(SP->_slk->win));
     17082+#if NCURSES_SP_FUNCS
     17083+NCURSES_EXPORT(int)
     17084+slk_noutrefresh(void)
     17085+{
     17086+    return NCURSES_SP_NAME(slk_noutrefresh) (CURRENT_SCREEN);
     17087 }
     17088+#endif
     17089 
     17090 /*
     17091  * Refresh the soft labels.
     17092  */
     17093 NCURSES_EXPORT(int)
     17094-slk_refresh(void)
     17095+NCURSES_SP_NAME(slk_refresh) (NCURSES_SP_DCL0)
     17096 {
     17097     T((T_CALLED("slk_refresh()")));
     17098 
     17099-    if (SP == NULL || SP->_slk == NULL)
     17100+    if (SP_PARM == NULL || SP_PARM->_slk == NULL)
     17101        returnCode(ERR);
     17102-    if (SP->_slk->hidden)
     17103+    if (SP_PARM->_slk->hidden)
     17104        returnCode(OK);
     17105-    slk_intern_refresh(SP->_slk);
     17106+    slk_intern_refresh(SP_PARM->_slk);
     17107+
     17108+    returnCode(wrefresh(SP_PARM->_slk->win));
     17109+}
     17110 
     17111-    returnCode(wrefresh(SP->_slk->win));
     17112+#if NCURSES_SP_FUNCS
     17113+NCURSES_EXPORT(int)
     17114+slk_refresh(void)
     17115+{
     17116+    return NCURSES_SP_NAME(slk_refresh) (CURRENT_SCREEN);
     17117 }
     17118+#endif
     17119diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkset.c ncurses-5.7/ncurses/base/lib_slkset.c
     17120--- ncurses-5.7.orig/ncurses/base/lib_slkset.c  2007-10-13 13:08:46.000000000 -0700
     17121+++ ncurses-5.7/ncurses/base/lib_slkset.c       2009-02-15 23:21:24.628481072 -0800
     17122@@ -1,5 +1,5 @@
     17123 /****************************************************************************
     17124- * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
     17125+ * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.              *
     17126  *                                                                          *
     17127  * Permission is hereby granted, free of charge, to any person obtaining a  *
     17128  * copy of this software and associated documentation files (the            *
     17129@@ -44,10 +44,10 @@
     17130 #endif
     17131 #endif
     17132 
     17133-MODULE_ID("$Id: lib_slkset.c,v 1.17 2007/10/13 20:08:46 tom Exp $")
     17134+MODULE_ID("$Id: lib_slkset.c,v 1.18 2009/02/15 00:33:48 tom Exp $")
     17135 
     17136 NCURSES_EXPORT(int)
     17137-slk_set(int i, const char *astr, int format)
     17138+NCURSES_SP_NAME(slk_set) (NCURSES_SP_DCLx int i, const char *astr, int format)
     17139 {
     17140     SLK *slk;
     17141     int offset;
     17142@@ -59,8 +59,8 @@
     17143 
     17144     T((T_CALLED("slk_set(%d, \"%s\", %d)"), i, str, format));
     17145 
     17146-    if (SP == 0
     17147-       || (slk = SP->_slk) == 0
     17148+    if (SP_PARM == 0
     17149+       || (slk = SP_PARM->_slk) == 0
     17150        || i < 1
     17151        || i > slk->labcnt
     17152        || format < 0
     17153@@ -70,7 +70,7 @@
     17154        str = "";
     17155     --i;                       /* Adjust numbering of labels */
     17156 
     17157-    limit = MAX_SKEY_LEN(SP->slk_format);
     17158+    limit = MAX_SKEY_LEN(SP_PARM->slk_format);
     17159     while (isspace(UChar(*str)))
     17160        str++;                  /* skip over leading spaces  */
     17161     p = str;
     17162@@ -147,3 +147,11 @@
     17163     slk->ent[i].dirty = TRUE;
     17164     returnCode(OK);
     17165 }
     17166+
     17167+#if NCURSES_SP_FUNCS
     17168+NCURSES_EXPORT(int)
     17169+slk_set(int i, const char *astr, int format)
     17170+{
     17171+    return NCURSES_SP_NAME(slk_set) (CURRENT_SCREEN, i, astr, format);
     17172+}
     17173+#endif
     17174diff -Naur ncurses-5.7.orig/ncurses/base/lib_slktouch.c ncurses-5.7/ncurses/base/lib_slktouch.c
     17175--- ncurses-5.7.orig/ncurses/base/lib_slktouch.c        2000-12-09 18:43:27.000000000 -0800
     17176+++ ncurses-5.7/ncurses/base/lib_slktouch.c     2009-02-15 23:21:24.628481072 -0800
     17177@@ -1,5 +1,5 @@
     17178 /****************************************************************************
     17179- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
     17180+ * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc.              *
     17181  *                                                                          *
     17182  * Permission is hereby granted, free of charge, to any person obtaining a  *
     17183  * copy of this software and associated documentation files (the            *
     17184@@ -27,8 +27,8 @@
     17185  ****************************************************************************/
     17186 
     17187 /****************************************************************************
     17188- *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     17189- *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     17190+ *  Author: Juergen Pfeifer                         1997,2009               *
     17191+ *     and: Thomas E. Dickey                        1996-on                 *
     17192  ****************************************************************************/
     17193 
     17194 /*
     17195@@ -38,16 +38,24 @@
     17196  */
     17197 #include <curses.priv.h>
     17198 
     17199-MODULE_ID("$Id: lib_slktouch.c,v 1.5 2000/12/10 02:43:27 tom Exp $")
     17200+MODULE_ID("$Id: lib_slktouch.c,v 1.6 2009/02/15 00:44:36 tom Exp $")
     17201 
     17202 NCURSES_EXPORT(int)
     17203-slk_touch(void)
     17204+NCURSES_SP_NAME(slk_touch) (NCURSES_SP_DCL0)
     17205 {
     17206     T((T_CALLED("slk_touch()")));
     17207 
     17208-    if (SP == NULL || SP->_slk == NULL)
     17209+    if (SP_PARM == NULL || SP_PARM->_slk == NULL)
     17210        returnCode(ERR);
     17211-    SP->_slk->dirty = TRUE;
     17212+    SP_PARM->_slk->dirty = TRUE;
     17213 
     17214     returnCode(OK);
     17215 }
     17216+
     17217+#if NCURSES_SP_FUNCS
     17218+NCURSES_EXPORT(int)
     17219+slk_touch(void)
     17220+{
     17221+    return NCURSES_SP_NAME(slk_touch) (CURRENT_SCREEN);
     17222+}
     17223+#endif
     17224diff -Naur ncurses-5.7.orig/ncurses/base/lib_ungetch.c ncurses-5.7/ncurses/base/lib_ungetch.c
     17225--- ncurses-5.7.orig/ncurses/base/lib_ungetch.c 2008-05-31 09:44:54.000000000 -0700
     17226+++ ncurses-5.7/ncurses/base/lib_ungetch.c      2009-02-15 23:21:24.628481072 -0800
     17227@@ -1,5 +1,5 @@
     17228 /****************************************************************************
     17229- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     17230+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     17231  *                                                                          *
     17232  * Permission is hereby granted, free of charge, to any person obtaining a  *
     17233  * copy of this software and associated documentation files (the            *
     17234@@ -30,6 +30,7 @@
     17235  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     17236  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     17237  *     and: Thomas E. Dickey                        1996-on                 *
     17238+ *     and: Juergen Pfeifer                         2009                    *
     17239  ****************************************************************************/
     17240 
     17241 /*
     17242@@ -41,7 +42,7 @@
     17243 
     17244 #include <curses.priv.h>
     17245 
     17246-MODULE_ID("$Id: lib_ungetch.c,v 1.11 2008/05/31 16:44:54 tom Exp $")
     17247+MODULE_ID("$Id: lib_ungetch.c,v 1.12 2009/02/15 00:46:58 tom Exp $")
     17248 
     17249 #include <fifo_defs.h>
     17250 
     17251@@ -83,8 +84,16 @@
     17252 }
     17253 
     17254 NCURSES_EXPORT(int)
     17255+NCURSES_SP_NAME(ungetch) (NCURSES_SP_DCLx int ch)
     17256+{
     17257+    T((T_CALLED("ungetch(%s)"), _nc_tracechar(SP_PARM, ch)));
     17258+    returnCode(_nc_ungetch(SP_PARM, ch));
     17259+}
     17260+
     17261+#if NCURSES_SP_FUNCS
     17262+NCURSES_EXPORT(int)
     17263 ungetch(int ch)
     17264 {
     17265-    T((T_CALLED("ungetch(%s)"), _nc_tracechar(SP, ch)));
     17266-    returnCode(_nc_ungetch(SP, ch));
     17267+    return NCURSES_SP_NAME(ungetch) (CURRENT_SCREEN, ch);
     17268 }
     17269+#endif
     17270diff -Naur ncurses-5.7.orig/ncurses/base/MKkeyname.awk ncurses-5.7/ncurses/base/MKkeyname.awk
     17271--- ncurses-5.7.orig/ncurses/base/MKkeyname.awk 2008-07-12 11:40:00.000000000 -0700
     17272+++ ncurses-5.7/ncurses/base/MKkeyname.awk      2009-02-15 23:21:24.620481072 -0800
     17273@@ -1,6 +1,6 @@
     17274-# $Id: MKkeyname.awk,v 1.40 2008/07/12 18:40:00 tom Exp $
     17275+# $Id: MKkeyname.awk,v 1.41 2009/02/15 00:24:58 tom Exp $
     17276 ##############################################################################
     17277-# Copyright (c) 1999-2007,2008 Free Software Foundation, Inc.                #
     17278+# Copyright (c) 1999-2008,2009 Free Software Foundation, Inc.                #
     17279 #                                                                            #
     17280 # Permission is hereby granted, free of charge, to any person obtaining a    #
     17281 # copy of this software and associated documentation files (the "Software"), #
     17282@@ -141,11 +141,20 @@
     17283        print " return result;"
     17284        print "}"
     17285        print ""
     17286-       print "NCURSES_EXPORT(NCURSES_CONST char *) keyname (int c)"
     17287+       print "NCURSES_EXPORT(NCURSES_CONST char *)"
     17288+       print "NCURSES_SP_NAME(keyname) (NCURSES_SP_DCLx int c)"
     17289        print "{"
     17290-       print "\treturn _nc_keyname(SP, c);"
     17291+       print "\treturn _nc_keyname(SP_PARM, c);"
     17292        print "}"
     17293        print ""
     17294+       print "#if NCURSES_SP_FUNCS"
     17295+       print "NCURSES_EXPORT(NCURSES_CONST char *)"
     17296+       print "keyname (int c)"
     17297+       print "{"
     17298+       print " return NCURSES_SP_NAME(keyname) (CURRENT_SCREEN, c);"
     17299+       print "}"
     17300+       print "#endif"
     17301+       print ""
     17302        print "#if NO_LEAKS"
     17303        print "void _nc_keyname_leaks(void)"
     17304        print "{"
    1493917305diff -Naur ncurses-5.7.orig/ncurses/curses.priv.h ncurses-5.7/ncurses/curses.priv.h
    1494017306--- ncurses-5.7.orig/ncurses/curses.priv.h      2008-10-04 14:37:45.000000000 -0700
    14941 +++ ncurses-5.7/ncurses/curses.priv.h   2009-02-07 22:08:36.698833077 -0800
     17307+++ ncurses-5.7/ncurses/curses.priv.h   2009-02-15 23:21:24.628481072 -0800
    1494217308@@ -1,5 +1,5 @@
    1494317309 /****************************************************************************
     
    1495217318 /*
    1495317319- * $Id: curses.priv.h,v 1.394 2008/10/04 21:37:45 tom Exp $
    14954 + * $Id: curses.priv.h,v 1.396 2009/01/24 23:04:59 tom Exp $
     17320+ * $Id: curses.priv.h,v 1.399 2009/02/15 01:05:47 tom Exp $
    1495517321  *
    1495617322  *     curses.priv.h
    1495717323  *
    14958 @@ -404,6 +404,8 @@
     17324@@ -97,8 +97,6 @@
     17325 extern int errno;
     17326 #endif
     17327 
     17328-#include <nc_panel.h>
     17329-
     17330 /* Some systems have a broken 'select()', but workable 'poll()'.  Use that */
     17331 #if HAVE_WORKING_POLL
     17332 #define USE_FUNC_POLL 1
     17333@@ -257,6 +255,38 @@
     17334 #define NCURSES_OPAQUE 0
     17335 
     17336 #include <curses.h>    /* we'll use -Ipath directive to get the right one! */
     17337+
     17338+/*
     17339+ * If curses.h did not expose the SCREEN-functions, then we do not need the
     17340+ * parameter in the corresponding unextended functions.
     17341+ */
     17342+#if NCURSES_SP_FUNCS
     17343+#define SP_PARM         sp     /* use parameter */
     17344+#define NCURSES_SP_ARG          SP_PARM
     17345+#define NCURSES_SP_DCL  SCREEN *NCURSES_SP_ARG
     17346+#define NCURSES_SP_DCL0 NCURSES_SP_DCL
     17347+#define NCURSES_SP_ARGx         NCURSES_SP_ARG,
     17348+#define NCURSES_SP_DCLx SCREEN *NCURSES_SP_ARGx
     17349+#else
     17350+#define SP_PARM         SP     /* use global variable */
     17351+#define NCURSES_SP_ARG
     17352+#define NCURSES_SP_DCL
     17353+#define NCURSES_SP_DCL0 void
     17354+#define NCURSES_SP_ARGx
     17355+#define NCURSES_SP_DCLx
     17356+#endif
     17357+
     17358+#include <nc_panel.h>
     17359+
     17360+#define IsPreScreen(sp)      (((sp)!=0) && sp->_prescreen)
     17361+#define HasTerminal(sp)      (((sp)!=0) && (0!=((sp)->_term)))
     17362+#define IsValidScreen(sp)    (HasTerminal(sp) && !sp->_prescreen)
     17363+#if BROKEN_LINKER || USE_REENTRANT
     17364+#define TerminalOf(sp)       ((sp)?((sp)->_term?(sp)->_term:_nc_prescreen._cur_term): _nc_prescreen._cur_term)
     17365+#else
     17366+#define TerminalOf(sp)       ((sp)?((sp)->_term?(sp)->_term:cur_term):cur_term)
     17367+#endif
     17368+
     17369 #include <term.h>
     17370 #include <term_entry.h>
     17371 #include <nc_tparm.h>
     17372@@ -404,6 +434,8 @@
    1495917373 #define C_SHIFT 9              /* we need more bits than there are colors */
    1496017374 #define C_MASK                 ((1 << C_SHIFT) - 1)
     
    1496517379 
    1496617380 #define COLOR_DEFAULT          C_MASK
    14967 @@ -794,11 +796,13 @@
     17381@@ -703,6 +735,8 @@
     17382        char            *_setbuf;       /* buffered I/O for output          */
     17383        bool            _filtered;      /* filter() was called              */
     17384        bool            _buffered;      /* setvbuf uses _setbuf data        */
     17385+        bool            _prescreen;     /* is in prescreen phase            */
     17386+        bool            _use_env;       /* LINES & COLS from environment?   */
     17387        int             _checkfd;       /* filedesc for typeahead check     */
     17388        TERMINAL        *_term;         /* terminal type information        */
     17389        TTY             _saved_tty;     /* savetty/resetty information      */
     17390@@ -794,11 +828,13 @@
    1496817391        int             _color_count;   /* count of colors in palette        */
    1496917392        colorpair_t     *_color_pairs;  /* screen's color pair list          */
     
    1497917402        chtype          _ok_attributes; /* valid attributes for terminal     */
    1498017403        chtype          _xmc_suppress;  /* attributes to suppress if xmc     */
    14981 @@ -1519,7 +1523,7 @@
     17404@@ -1519,7 +1555,7 @@
    1498217405 extern NCURSES_EXPORT(void) _nc_screen_wrap (void);
    1498317406 
     
    1498817411 /* lib_mvcur.c */
    1498917412 #define INFINITY       1000000 /* cost: too high to use */
     17413@@ -1681,6 +1717,8 @@
     17414 #define _nc_set_screen(sp) SP = sp
     17415 #endif
     17416 
     17417+#define CURRENT_SCREEN SP
     17418+
     17419 /*
     17420  * We don't want to use the lines or columns capabilities internally, because
     17421  * if the application is running multiple screens under X, it's quite possible
    1499017422diff -Naur ncurses-5.7.orig/ncurses/Makefile.in ncurses-5.7/ncurses/Makefile.in
    1499117423--- ncurses-5.7.orig/ncurses/Makefile.in        2008-10-18 07:11:54.000000000 -0700
    14992 +++ ncurses-5.7/ncurses/Makefile.in     2009-02-07 22:08:29.738503702 -0800
     17424+++ ncurses-5.7/ncurses/Makefile.in     2009-02-15 23:21:09.919538762 -0800
    1499317425@@ -1,6 +1,6 @@
    1499417426-# $Id: Makefile.in,v 1.113 2008/10/18 14:11:54 tom Exp $
     
    1501117443diff -Naur ncurses-5.7.orig/ncurses/tinfo/entries.c ncurses-5.7/ncurses/tinfo/entries.c
    1501217444--- ncurses-5.7.orig/ncurses/tinfo/entries.c    2008-09-27 06:11:10.000000000 -0700
    15013 +++ ncurses-5.7/ncurses/tinfo/entries.c 2009-02-07 22:08:20.961189552 -0800
     17445+++ ncurses-5.7/ncurses/tinfo/entries.c 2009-02-15 23:21:03.083101270 -0800
    1501417446@@ -37,7 +37,7 @@
    1501517447 #include <tic.h>
     
    1503317465diff -Naur ncurses-5.7.orig/ncurses/tinfo/hashed_db.c ncurses-5.7/ncurses/tinfo/hashed_db.c
    1503417466--- ncurses-5.7.orig/ncurses/tinfo/hashed_db.c  2006-08-19 12:48:38.000000000 -0700
    15035 +++ ncurses-5.7/ncurses/tinfo/hashed_db.c       2009-02-07 22:08:22.700246404 -0800
     17467+++ ncurses-5.7/ncurses/tinfo/hashed_db.c       2009-02-15 23:21:04.663202123 -0800
    1503617468@@ -1,5 +1,5 @@
    1503717469 /****************************************************************************
     
    1513717569 }
    1513817570 
    15139 diff -Naur ncurses-5.7.orig/ncurses/tty/tty_update.c ncurses-5.7/ncurses/tty/tty_update.c
    15140 --- ncurses-5.7.orig/ncurses/tty/tty_update.c   2008-08-30 13:08:19.000000000 -0700
    15141 +++ ncurses-5.7/ncurses/tty/tty_update.c        2009-02-07 22:08:36.702933371 -0800
     17571diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_baudrate.c ncurses-5.7/ncurses/tinfo/lib_baudrate.c
     17572--- ncurses-5.7.orig/ncurses/tinfo/lib_baudrate.c       2008-06-28 08:19:24.000000000 -0700
     17573+++ ncurses-5.7/ncurses/tinfo/lib_baudrate.c    2009-02-15 23:21:24.628481072 -0800
    1514217574@@ -1,5 +1,5 @@
    1514317575 /****************************************************************************
     
    1514717579  * Permission is hereby granted, free of charge, to any person obtaining a  *
    1514817580  * copy of this software and associated documentation files (the            *
    15149 @@ -78,7 +78,7 @@
     17581@@ -80,7 +80,7 @@
     17582 #undef USE_OLD_TTY
     17583 #endif /* USE_OLD_TTY */
     17584 
     17585-MODULE_ID("$Id: lib_baudrate.c,v 1.27 2008/06/28 15:19:24 tom Exp $")
     17586+MODULE_ID("$Id: lib_baudrate.c,v 1.28 2009/02/14 21:41:22 tom Exp $")
     17587 
     17588 /*
     17589  *     int
     17590@@ -195,7 +195,7 @@
     17591 }
     17592 
     17593 NCURSES_EXPORT(int)
     17594-baudrate(void)
     17595+NCURSES_SP_NAME(baudrate) (NCURSES_SP_DCL0)
     17596 {
     17597     int result;
     17598 
     17599@@ -207,7 +207,7 @@
     17600      * that take into account costs that depend on baudrate.
     17601      */
     17602 #ifdef TRACE
     17603-    if (!isatty(fileno(SP ? SP->_ofp : stdout))
     17604+    if (!isatty(fileno(SP_PARM ? SP_PARM->_ofp : stdout))
     17605        && getenv("BAUDRATE") != 0) {
     17606        int ret;
     17607        if ((ret = _nc_getenv_num("BAUDRATE")) <= 0)
     17608@@ -236,3 +236,11 @@
     17609 
     17610     returnCode(result);
     17611 }
     17612+
     17613+#if NCURSES_SP_FUNCS
     17614+NCURSES_EXPORT(int)
     17615+baudrate(void)
     17616+{
     17617+    return NCURSES_SP_NAME(baudrate) (CURRENT_SCREEN);
     17618+}
     17619+#endif
     17620diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_has_cap.c ncurses-5.7/ncurses/tinfo/lib_has_cap.c
     17621--- ncurses-5.7.orig/ncurses/tinfo/lib_has_cap.c        2003-10-25 12:43:55.000000000 -0700
     17622+++ ncurses-5.7/ncurses/tinfo/lib_has_cap.c     2009-02-15 23:21:24.632481631 -0800
     17623@@ -1,5 +1,5 @@
     17624 /****************************************************************************
     17625- * Copyright (c) 1998-2000,2003 Free Software Foundation, Inc.              *
     17626+ * Copyright (c) 1998-2003,2009 Free Software Foundation, Inc.              *
     17627  *                                                                          *
     17628  * Permission is hereby granted, free of charge, to any person obtaining a  *
     17629  * copy of this software and associated documentation files (the            *
     17630@@ -30,6 +30,7 @@
     17631  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     17632  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     17633  *     and: Thomas E. Dickey                        1996-2003               *
     17634+ *     and: Juergen Pfeifer                         2009                    *
     17635  ****************************************************************************/
     17636 
     17637 /*
     17638@@ -43,10 +44,10 @@
     17639 
     17640 #include <term.h>
     17641 
     17642-MODULE_ID("$Id: lib_has_cap.c,v 1.4 2003/10/25 19:43:55 tom Exp $")
     17643+MODULE_ID("$Id: lib_has_cap.c,v 1.5 2009/02/15 00:47:12 tom Exp $")
     17644 
     17645 NCURSES_EXPORT(bool)
     17646-has_ic(void)
     17647+NCURSES_SP_NAME(has_ic) (NCURSES_SP_DCL0)
     17648 {
     17649     T((T_CALLED("has_ic()")));
     17650     returnCode(cur_term &&
     17651@@ -55,11 +56,27 @@
     17652               && (delete_character || parm_dch));
     17653 }
     17654 
     17655+#if NCURSES_SP_FUNCS
     17656 NCURSES_EXPORT(bool)
     17657-has_il(void)
     17658+has_ic(void)
     17659+{
     17660+    return NCURSES_SP_NAME(has_ic) (CURRENT_SCREEN);
     17661+}
     17662+#endif
     17663+
     17664+NCURSES_EXPORT(bool)
     17665+NCURSES_SP_NAME(has_il) (NCURSES_SP_DCL0)
     17666 {
     17667     T((T_CALLED("has_il()")));
     17668     returnCode(cur_term
     17669               && (insert_line || parm_insert_line)
     17670               && (delete_line || parm_delete_line));
     17671 }
     17672+
     17673+#if NCURSES_SP_FUNCS
     17674+NCURSES_EXPORT(bool)
     17675+has_il(void)
     17676+{
     17677+    return NCURSES_SP_NAME(has_il) (CURRENT_SCREEN);
     17678+}
     17679+#endif
     17680diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_kernel.c ncurses-5.7/ncurses/tinfo/lib_kernel.c
     17681--- ncurses-5.7.orig/ncurses/tinfo/lib_kernel.c 2004-05-08 10:11:21.000000000 -0700
     17682+++ ncurses-5.7/ncurses/tinfo/lib_kernel.c      2009-02-15 23:21:24.632481631 -0800
     17683@@ -1,5 +1,5 @@
     17684 /****************************************************************************
     17685- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
     17686+ * Copyright (c) 1998-2004,2009 Free Software Foundation, Inc.              *
     17687  *                                                                          *
     17688  * Permission is hereby granted, free of charge, to any person obtaining a  *
     17689  * copy of this software and associated documentation files (the            *
     17690@@ -29,7 +29,8 @@
     17691 /****************************************************************************
     17692  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     17693  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     17694- *     and: Thomas E. Dickey 2002                                           *
     17695+ *     and: Thomas E. Dickey                        2002                    *
     17696+ *     and: Juergen Pfeifer                         2009                    *
     17697  ****************************************************************************/
     17698 
     17699 /*
     17700@@ -48,7 +49,7 @@
     17701 #include <curses.priv.h>
     17702 #include <term.h>              /* cur_term */
     17703 
     17704-MODULE_ID("$Id: lib_kernel.c,v 1.24 2004/05/08 17:11:21 tom Exp $")
     17705+MODULE_ID("$Id: lib_kernel.c,v 1.25 2009/02/15 00:47:52 tom Exp $")
     17706 
     17707 static int
     17708 _nc_vdisable(void)
     17709@@ -79,7 +80,7 @@
     17710  */
     17711 
     17712 NCURSES_EXPORT(char)
     17713-erasechar(void)
     17714+NCURSES_SP_NAME(erasechar) (NCURSES_SP_DCL0)
     17715 {
     17716     int result = ERR;
     17717     T((T_CALLED("erasechar()")));
     17718@@ -96,6 +97,14 @@
     17719     returnCode(result);
     17720 }
     17721 
     17722+#if NCURSES_SP_FUNCS
     17723+NCURSES_EXPORT(char)
     17724+erasechar(void)
     17725+{
     17726+    return NCURSES_SP_NAME(erasechar) (CURRENT_SCREEN);
     17727+}
     17728+#endif
     17729+
     17730 /*
     17731  *     killchar()
     17732  *
     17733@@ -104,7 +113,7 @@
     17734  */
     17735 
     17736 NCURSES_EXPORT(char)
     17737-killchar(void)
     17738+NCURSES_SP_NAME(killchar) (NCURSES_SP_DCL0)
     17739 {
     17740     int result = ERR;
     17741     T((T_CALLED("killchar()")));
     17742@@ -121,6 +130,14 @@
     17743     returnCode(result);
     17744 }
     17745 
     17746+#if NCURSES_SP_FUNCS
     17747+NCURSES_EXPORT(char)
     17748+killchar(void)
     17749+{
     17750+    return NCURSES_SP_NAME(killchar) (CURRENT_SCREEN);
     17751+}
     17752+#endif
     17753+
     17754 /*
     17755  *     flushinp()
     17756  *
     17757@@ -129,7 +146,7 @@
     17758  */
     17759 
     17760 NCURSES_EXPORT(int)
     17761-flushinp(void)
     17762+NCURSES_SP_NAME(flushinp) (NCURSES_SP_DCL0)
     17763 {
     17764     T((T_CALLED("flushinp()")));
     17765 
     17766@@ -143,12 +160,20 @@
     17767        } while
     17768            (errno == EINTR);
     17769 #endif
     17770-       if (SP) {
     17771-           SP->_fifohead = -1;
     17772-           SP->_fifotail = 0;
     17773-           SP->_fifopeek = 0;
     17774+       if (SP_PARM) {
     17775+           SP_PARM->_fifohead = -1;
     17776+           SP_PARM->_fifotail = 0;
     17777+           SP_PARM->_fifopeek = 0;
     17778        }
     17779        returnCode(OK);
     17780     }
     17781     returnCode(ERR);
     17782 }
     17783+
     17784+#if NCURSES_SP_FUNCS
     17785+NCURSES_EXPORT(int)
     17786+flushinp(void)
     17787+{
     17788+    return NCURSES_SP_NAME(flushinp) (CURRENT_SCREEN);
     17789+}
     17790+#endif
     17791diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_longname.c ncurses-5.7/ncurses/tinfo/lib_longname.c
     17792--- ncurses-5.7.orig/ncurses/tinfo/lib_longname.c       2000-12-09 18:55:07.000000000 -0800
     17793+++ ncurses-5.7/ncurses/tinfo/lib_longname.c    2009-02-15 23:21:24.632481631 -0800
     17794@@ -1,5 +1,5 @@
     17795 /****************************************************************************
     17796- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
     17797+ * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc.              *
     17798  *                                                                          *
     17799  * Permission is hereby granted, free of charge, to any person obtaining a  *
     17800  * copy of this software and associated documentation files (the            *
     17801@@ -29,6 +29,8 @@
     17802 /****************************************************************************
     17803  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     17804  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     17805+ *     and: Thomas E. Dickey                        1996-on                 *
     17806+ *     and: Juergen Pfeifer                         2009                    *
     17807  ****************************************************************************/
     17808 
     17809 /*
     17810@@ -40,10 +42,10 @@
     17811 
     17812 #include <curses.priv.h>
     17813 
     17814-MODULE_ID("$Id: lib_longname.c,v 1.9 2000/12/10 02:55:07 tom Exp $")
     17815+MODULE_ID("$Id: lib_longname.c,v 1.10 2009/02/15 00:48:15 tom Exp $")
     17816 
     17817 NCURSES_EXPORT(char *)
     17818-longname(void)
     17819+NCURSES_SP_NAME(longname) (NCURSES_SP_DCL0)
     17820 {
     17821     char *ptr;
     17822 
     17823@@ -55,3 +57,11 @@
     17824 
     17825     returnPtr(ttytype);
     17826 }
     17827+
     17828+#if NCURSES_SP_FUNCS
     17829+NCURSES_EXPORT(char *)
     17830+longname(void)
     17831+{
     17832+    return NCURSES_SP_NAME(longname) (CURRENT_SCREEN);
     17833+}
     17834+#endif
     17835diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_napms.c ncurses-5.7/ncurses/tinfo/lib_napms.c
     17836--- ncurses-5.7.orig/ncurses/tinfo/lib_napms.c  2008-05-03 14:34:13.000000000 -0700
     17837+++ ncurses-5.7/ncurses/tinfo/lib_napms.c       2009-02-15 23:21:24.632481631 -0800
     17838@@ -1,5 +1,5 @@
     17839 /****************************************************************************
     17840- * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc.              *
     17841+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     17842  *                                                                          *
     17843  * Permission is hereby granted, free of charge, to any person obtaining a  *
     17844  * copy of this software and associated documentation files (the            *
     17845@@ -29,6 +29,8 @@
     17846 /****************************************************************************
     17847  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     17848  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     17849+ *     and: Thomas E. Dickey                        1996-on                 *
     17850+ *     and: Juergen Pfeifer                         2009                    *
     17851  ****************************************************************************/
     17852 
     17853 /*
     17854@@ -49,10 +51,10 @@
     17855 #endif
     17856 #endif
     17857 
     17858-MODULE_ID("$Id: lib_napms.c,v 1.17 2008/05/03 21:34:13 tom Exp $")
     17859+MODULE_ID("$Id: lib_napms.c,v 1.18 2009/02/15 00:48:27 tom Exp $")
     17860 
     17861 NCURSES_EXPORT(int)
     17862-napms(int ms)
     17863+NCURSES_SP_NAME(napms) (NCURSES_SP_DCLx int ms)
     17864 {
     17865     T((T_CALLED("napms(%d)"), ms));
     17866 
     17867@@ -72,3 +74,11 @@
     17868 
     17869     returnCode(OK);
     17870 }
     17871+
     17872+#if NCURSES_SP_FUNCS
     17873+NCURSES_EXPORT(int)
     17874+napms(int ms)
     17875+{
     17876+    return NCURSES_SP_NAME(napms) (CURRENT_SCREEN, ms);
     17877+}
     17878+#endif
     17879diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_options.c ncurses-5.7/ncurses/tinfo/lib_options.c
     17880--- ncurses-5.7.orig/ncurses/tinfo/lib_options.c        2008-08-16 14:20:48.000000000 -0700
     17881+++ ncurses-5.7/ncurses/tinfo/lib_options.c     2009-02-15 23:21:24.632481631 -0800
     17882@@ -1,5 +1,5 @@
     17883 /****************************************************************************
     17884- * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
     17885+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     17886  *                                                                          *
     17887  * Permission is hereby granted, free of charge, to any person obtaining a  *
     17888  * copy of this software and associated documentation files (the            *
     17889@@ -30,6 +30,7 @@
     17890  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     17891  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     17892  *     and: Thomas E. Dickey                        1996-on                 *
     17893+ *     and: Juergen Pfeifer                         2009                    *
     17894  ****************************************************************************/
     17895 
     17896 /*
     17897@@ -43,7 +44,7 @@
     17898 
     17899 #include <term.h>
     17900 
     17901-MODULE_ID("$Id: lib_options.c,v 1.58 2008/08/16 21:20:48 Werner.Fink Exp $")
     17902+MODULE_ID("$Id: lib_options.c,v 1.59 2009/02/15 00:48:40 tom Exp $")
     17903 
     17904 static int _nc_curs_set(SCREEN *, int);
     17905 static int _nc_meta(SCREEN *, bool);
     17906@@ -72,18 +73,26 @@
     17907 }
     17908 
     17909 NCURSES_EXPORT(int)
     17910-halfdelay(int t)
     17911+NCURSES_SP_NAME(halfdelay) (NCURSES_SP_DCLx int t)
     17912 {
     17913     T((T_CALLED("halfdelay(%d)"), t));
     17914 
     17915-    if (t < 1 || t > 255 || SP == 0)
     17916+    if (t < 1 || t > 255 || SP_PARM == 0)
     17917        returnCode(ERR);
     17918 
     17919     cbreak();
     17920-    SP->_cbreak = t + 1;
     17921+    SP_PARM->_cbreak = t + 1;
     17922     returnCode(OK);
     17923 }
     17924 
     17925+#if NCURSES_SP_FUNCS
     17926+NCURSES_EXPORT(int)
     17927+halfdelay(int t)
     17928+{
     17929+    return NCURSES_SP_NAME(halfdelay) (CURRENT_SCREEN, t);
     17930+}
     17931+#endif
     17932+
     17933 NCURSES_EXPORT(int)
     17934 nodelay(WINDOW *win, bool flag)
     17935 {
     17936@@ -158,17 +167,25 @@
     17937 }
     17938 
     17939 NCURSES_EXPORT(int)
     17940-typeahead(int fd)
     17941+NCURSES_SP_NAME(typeahead) (NCURSES_SP_DCLx int fd)
     17942 {
     17943     T((T_CALLED("typeahead(%d)"), fd));
     17944-    if (SP != 0) {
     17945-       SP->_checkfd = fd;
     17946+    if (SP_PARM != 0) {
     17947+       SP_PARM->_checkfd = fd;
     17948        returnCode(OK);
     17949     } else {
     17950        returnCode(ERR);
     17951     }
     17952 }
     17953 
     17954+#if NCURSES_SP_FUNCS
     17955+NCURSES_EXPORT(int)
     17956+typeahead(int fd)
     17957+{
     17958+    return NCURSES_SP_NAME(typeahead) (CURRENT_SCREEN, fd);
     17959+}
     17960+#endif
     17961+
     17962 /*
     17963 **      has_key()
     17964 **
     17965diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_raw.c ncurses-5.7/ncurses/tinfo/lib_raw.c
     17966--- ncurses-5.7.orig/ncurses/tinfo/lib_raw.c    2007-09-29 14:50:22.000000000 -0700
     17967+++ ncurses-5.7/ncurses/tinfo/lib_raw.c 2009-02-15 23:21:24.632481631 -0800
     17968@@ -1,5 +1,5 @@
     17969 /****************************************************************************
     17970- * Copyright (c) 1998-2002,2007 Free Software Foundation, Inc.              *
     17971+ * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.              *
     17972  *                                                                          *
     17973  * Permission is hereby granted, free of charge, to any person obtaining a  *
     17974  * copy of this software and associated documentation files (the            *
     17975@@ -29,7 +29,8 @@
     17976 /****************************************************************************
     17977  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     17978  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     17979- *     and: Thomas E. Dickey 1998 on                                        *
     17980+ *     and: Thomas E. Dickey                        1998-on                 *
     17981+ *     and: Juergen Pfeifer                         2009                    *
     17982  ****************************************************************************/
     17983 
     17984 /*
     17985@@ -49,7 +50,7 @@
     17986 #include <curses.priv.h>
     17987 #include <term.h>              /* cur_term */
     17988 
     17989-MODULE_ID("$Id: lib_raw.c,v 1.14 2007/09/29 21:50:22 tom Exp $")
     17990+MODULE_ID("$Id: lib_raw.c,v 1.15 2009/02/15 00:49:02 tom Exp $")
     17991 
     17992 #if SVR4_TERMIO && !defined(_POSIX_SOURCE)
     17993 #define _POSIX_SOURCE
     17994@@ -61,7 +62,7 @@
     17995 
     17996 #ifdef __EMX__
     17997 #include <io.h>
     17998-#define _nc_setmode(mode) setmode(SP->_ifd, mode)
     17999+#define _nc_setmode(mode) setmode(SP_PARM->_ifd, mode)
     18000 #else
     18001 #define _nc_setmode(mode)      /* nothing */
     18002 #endif
     18003@@ -77,13 +78,13 @@
     18004 #endif /* TRACE */
     18005 
     18006 NCURSES_EXPORT(int)
     18007-raw(void)
     18008+NCURSES_SP_NAME(raw) (NCURSES_SP_DCL0)
     18009 {
     18010     int result = ERR;
     18011 
     18012     T((T_CALLED("raw()")));
     18013 
     18014-    if (SP != 0 && cur_term != 0) {
     18015+    if (SP_PARM != 0 && cur_term != 0) {
     18016        TTY buf;
     18017 
     18018        BEFORE("raw");
     18019@@ -99,8 +100,8 @@
     18020        buf.sg_flags |= RAW;
     18021 #endif
     18022        if ((result = _nc_set_tty_mode(&buf)) == OK) {
     18023-           SP->_raw = TRUE;
     18024-           SP->_cbreak = 1;
     18025+           SP_PARM->_raw = TRUE;
     18026+           SP_PARM->_cbreak = 1;
     18027            cur_term->Nttyb = buf;
     18028        }
     18029        AFTER("raw");
     18030@@ -108,14 +109,22 @@
     18031     returnCode(result);
     18032 }
     18033 
     18034+#if NCURSES_SP_FUNCS
     18035 NCURSES_EXPORT(int)
     18036-cbreak(void)
     18037+raw(void)
     18038+{
     18039+    return NCURSES_SP_NAME(raw) (CURRENT_SCREEN);
     18040+}
     18041+#endif
     18042+
     18043+NCURSES_EXPORT(int)
     18044+NCURSES_SP_NAME(cbreak) (NCURSES_SP_DCL0)
     18045 {
     18046     int result = ERR;
     18047 
     18048     T((T_CALLED("cbreak()")));
     18049 
     18050-    if (SP != 0 && cur_term != 0) {
     18051+    if (SP_PARM != 0 && cur_term != 0) {
     18052        TTY buf;
     18053 
     18054        BEFORE("cbreak");
     18055@@ -132,7 +141,7 @@
     18056        buf.sg_flags |= CBREAK;
     18057 #endif
     18058        if ((result = _nc_set_tty_mode(&buf)) == OK) {
     18059-           SP->_cbreak = 1;
     18060+           SP_PARM->_cbreak = 1;
     18061            cur_term->Nttyb = buf;
     18062        }
     18063        AFTER("cbreak");
     18064@@ -140,12 +149,20 @@
     18065     returnCode(result);
     18066 }
     18067 
     18068+#if NCURSES_SP_FUNCS
     18069+NCURSES_EXPORT(int)
     18070+cbreak(void)
     18071+{
     18072+    return NCURSES_SP_NAME(cbreak) (CURRENT_SCREEN);
     18073+}
     18074+#endif
     18075+
     18076 /*
     18077  * Note:
     18078  * this implementation may be wrong.  See the comment under intrflush().
     18079  */
     18080 NCURSES_EXPORT(void)
     18081-qiflush(void)
     18082+NCURSES_SP_NAME(qiflush) (NCURSES_SP_DCL0)
     18083 {
     18084     int result = ERR;
     18085 
     18086@@ -169,14 +186,22 @@
     18087     returnVoid;
     18088 }
     18089 
     18090+#if NCURSES_SP_FUNCS
     18091+NCURSES_EXPORT(void)
     18092+qiflush(void)
     18093+{
     18094+    NCURSES_SP_NAME(qiflush) (CURRENT_SCREEN);
     18095+}
     18096+#endif
     18097+
     18098 NCURSES_EXPORT(int)
     18099-noraw(void)
     18100+NCURSES_SP_NAME(noraw) (NCURSES_SP_DCL0)
     18101 {
     18102     int result = ERR;
     18103 
     18104     T((T_CALLED("noraw()")));
     18105 
     18106-    if (SP != 0 && cur_term != 0) {
     18107+    if (SP_PARM != 0 && cur_term != 0) {
     18108        TTY buf;
     18109 
     18110        BEFORE("noraw");
     18111@@ -191,8 +216,8 @@
     18112        buf.sg_flags &= ~(RAW | CBREAK);
     18113 #endif
     18114        if ((result = _nc_set_tty_mode(&buf)) == OK) {
     18115-           SP->_raw = FALSE;
     18116-           SP->_cbreak = 0;
     18117+           SP_PARM->_raw = FALSE;
     18118+           SP_PARM->_cbreak = 0;
     18119            cur_term->Nttyb = buf;
     18120        }
     18121        AFTER("noraw");
     18122@@ -200,14 +225,22 @@
     18123     returnCode(result);
     18124 }
     18125 
     18126+#if NCURSES_SP_FUNCS
     18127 NCURSES_EXPORT(int)
     18128-nocbreak(void)
     18129+noraw(void)
     18130+{
     18131+    return NCURSES_SP_NAME(noraw) (CURRENT_SCREEN);
     18132+}
     18133+#endif
     18134+
     18135+NCURSES_EXPORT(int)
     18136+NCURSES_SP_NAME(nocbreak) (NCURSES_SP_DCL0)
     18137 {
     18138     int result = ERR;
     18139 
     18140     T((T_CALLED("nocbreak()")));
     18141 
     18142-    if (SP != 0 && cur_term != 0) {
     18143+    if (SP_PARM != 0 && cur_term != 0) {
     18144        TTY buf;
     18145 
     18146        BEFORE("nocbreak");
     18147@@ -221,7 +254,7 @@
     18148        buf.sg_flags &= ~CBREAK;
     18149 #endif
     18150        if ((result = _nc_set_tty_mode(&buf)) == OK) {
     18151-           SP->_cbreak = 0;
     18152+           SP_PARM->_cbreak = 0;
     18153            cur_term->Nttyb = buf;
     18154        }
     18155        AFTER("nocbreak");
     18156@@ -229,12 +262,20 @@
     18157     returnCode(result);
     18158 }
     18159 
     18160+#if NCURSES_SP_FUNCS
     18161+NCURSES_EXPORT(int)
     18162+nocbreak(void)
     18163+{
     18164+    return NCURSES_SP_NAME(nocbreak) (CURRENT_SCREEN);
     18165+}
     18166+#endif
     18167+
     18168 /*
     18169  * Note:
     18170  * this implementation may be wrong.  See the comment under intrflush().
     18171  */
     18172 NCURSES_EXPORT(void)
     18173-noqiflush(void)
     18174+NCURSES_SP_NAME(noqiflush) (NCURSES_SP_DCL0)
     18175 {
     18176     int result = ERR;
     18177 
     18178@@ -259,6 +300,14 @@
     18179     returnVoid;
     18180 }
     18181 
     18182+#if NCURSES_SP_FUNCS
     18183+NCURSES_EXPORT(void)
     18184+noqiflush(void)
     18185+{
     18186+    NCURSES_SP_NAME(noqiflush) (CURRENT_SCREEN);
     18187+}
     18188+#endif
     18189+
     18190 /*
     18191  * This call does the same thing as the qiflush()/noqiflush() pair.  We know
     18192  * for certain that SVr3 intrflush() tweaks the NOFLSH bit; on the other hand,
     18193@@ -267,7 +316,7 @@
     18194  * curs_inopts(3x) is too exact to be coincidence.
     18195  */
     18196 NCURSES_EXPORT(int)
     18197-intrflush(WINDOW *win GCC_UNUSED, bool flag)
     18198+NCURSES_SP_NAME(intrflush) (NCURSES_SP_DCLx WINDOW *win GCC_UNUSED, bool flag)
     18199 {
     18200     int result = ERR;
     18201 
     18202@@ -294,3 +343,11 @@
     18203     }
     18204     returnCode(result);
     18205 }
     18206+
     18207+#if NCURSES_SP_FUNCS
     18208+NCURSES_EXPORT(int)
     18209+intrflush(WINDOW *win GCC_UNUSED, bool flag)
     18210+{
     18211+    return NCURSES_SP_NAME(intrflush) (CURRENT_SCREEN, win, flag);
     18212+}
     18213+#endif
     18214diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_setup.c ncurses-5.7/ncurses/tinfo/lib_setup.c
     18215--- ncurses-5.7.orig/ncurses/tinfo/lib_setup.c  2008-08-03 15:42:33.000000000 -0700
     18216+++ ncurses-5.7/ncurses/tinfo/lib_setup.c       2009-02-15 23:21:24.632481631 -0800
     18217@@ -1,5 +1,5 @@
     18218 /****************************************************************************
     18219- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     18220+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     18221  *                                                                          *
     18222  * Permission is hereby granted, free of charge, to any person obtaining a  *
     18223  * copy of this software and associated documentation files (the            *
     18224@@ -30,6 +30,7 @@
     18225  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     18226  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     18227  *     and: Thomas E. Dickey                        1996-on                 *
     18228+ *     and: Juergen Pfeifer                         2009                    *
     18229  ****************************************************************************/
     18230 
     18231 /*
     18232@@ -53,7 +54,7 @@
     18233 
     18234 #include <term.h>              /* lines, columns, cur_term */
     18235 
     18236-MODULE_ID("$Id: lib_setup.c,v 1.111 2008/08/03 22:42:33 tom Exp $")
     18237+MODULE_ID("$Id: lib_setup.c,v 1.113 2009/02/14 22:21:40 tom Exp $")
     18238 
     18239 /****************************************************************************
     18240  *
     18241@@ -149,21 +150,30 @@
     18242 
     18243 #if NCURSES_EXT_FUNCS
     18244 NCURSES_EXPORT(int)
     18245-set_tabsize(int value)
     18246+NCURSES_SP_NAME(set_tabsize) (NCURSES_SP_DCLx int value)
     18247 {
     18248     int code = OK;
     18249 #if USE_REENTRANT
     18250-    if (SP) {
     18251-       SP->_TABSIZE = value;
     18252+    if (SP_PARM) {
     18253+       SP_PARM->_TABSIZE = value;
     18254     } else {
     18255        code = ERR;
     18256     }
     18257 #else
     18258+    (void) SP_PARM;
     18259     TABSIZE = value;
     18260 #endif
     18261     return code;
     18262 }
     18263+
     18264+#if NCURSES_SP_FUNCS
     18265+NCURSES_EXPORT(int)
     18266+set_tabsize(int value)
     18267+{
     18268+    return NCURSES_SP_NAME(set_tabsize) (CURRENT_SCREEN, value);
     18269+}
     18270 #endif
     18271+#endif /* NCURSES_EXT_FUNCS */
     18272 
     18273 #if USE_SIGWINCH
     18274 /*
     18275@@ -188,13 +198,25 @@
     18276 #endif
     18277 
     18278 NCURSES_EXPORT(void)
     18279-use_env(bool f)
     18280+NCURSES_SP_NAME(use_env) (NCURSES_SP_DCLx bool f)
     18281 {
     18282     T((T_CALLED("use_env()")));
     18283-    _nc_prescreen.use_env = f;
     18284+    if (IsPreScreen(SP_PARM)) {
     18285+       SP_PARM->_use_env = f;
     18286+    } else {
     18287+       _nc_prescreen.use_env = f;
     18288+    }
     18289     returnVoid;
     18290 }
     18291 
     18292+#if NCURSES_SP_FUNCS
     18293+NCURSES_EXPORT(void)
     18294+use_env(bool f)
     18295+{
     18296+    NCURSES_SP_NAME(use_env) (CURRENT_SCREEN, f);
     18297+}
     18298+#endif
     18299+
     18300 NCURSES_EXPORT(void)
     18301 _nc_get_screensize(SCREEN *sp, int *linep, int *colp)
     18302 /* Obtain lines/columns values from the environment and/or terminfo entry */
     18303diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_termname.c ncurses-5.7/ncurses/tinfo/lib_termname.c
     18304--- ncurses-5.7.orig/ncurses/tinfo/lib_termname.c       2003-12-27 10:23:01.000000000 -0800
     18305+++ ncurses-5.7/ncurses/tinfo/lib_termname.c    2009-02-15 23:21:24.632481631 -0800
     18306@@ -1,5 +1,5 @@
     18307 /****************************************************************************
     18308- * Copyright (c) 1998-2001,2003 Free Software Foundation, Inc.              *
     18309+ * Copyright (c) 1998-2003,2009 Free Software Foundation, Inc.              *
     18310  *                                                                          *
     18311  * Permission is hereby granted, free of charge, to any person obtaining a  *
     18312  * copy of this software and associated documentation files (the            *
     18313@@ -28,17 +28,31 @@
     18314 
     18315 #include <curses.priv.h>
     18316 
     18317-MODULE_ID("$Id: lib_termname.c,v 1.8 2003/12/27 18:23:01 tom Exp $")
     18318+MODULE_ID("$Id: lib_termname.c,v 1.10 2009/02/15 01:07:06 tom Exp $")
     18319 
     18320 NCURSES_EXPORT(char *)
     18321-termname(void)
     18322+NCURSES_SP_NAME(termname) (NCURSES_SP_DCL0)
     18323 {
     18324     char *name = 0;
     18325 
     18326     T((T_CALLED("termname()")));
     18327 
     18328+#if NCURSES_SP_FUNCS
     18329+    if (TerminalOf(SP_PARM) != 0) {
     18330+       name = TerminalOf(SP_PARM)->_termname;
     18331+    }
     18332+#else
     18333     if (cur_term != 0)
     18334        name = cur_term->_termname;
     18335+#endif
     18336 
     18337     returnPtr(name);
     18338 }
     18339+
     18340+#if NCURSES_SP_FUNCS
     18341+NCURSES_EXPORT(char *)
     18342+termname(void)
     18343+{
     18344+    return NCURSES_SP_NAME(termname) (CURRENT_SCREEN);
     18345+}
     18346+#endif
     18347diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_tputs.c ncurses-5.7/ncurses/tinfo/lib_tputs.c
     18348--- ncurses-5.7.orig/ncurses/tinfo/lib_tputs.c  2008-06-28 06:12:15.000000000 -0700
     18349+++ ncurses-5.7/ncurses/tinfo/lib_tputs.c       2009-02-15 23:21:24.632481631 -0800
     18350@@ -1,5 +1,5 @@
     18351 /****************************************************************************
     18352- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     18353+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     18354  *                                                                          *
     18355  * Permission is hereby granted, free of charge, to any person obtaining a  *
     18356  * copy of this software and associated documentation files (the            *
     18357@@ -30,6 +30,7 @@
     18358  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     18359  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     18360  *     and: Thomas E. Dickey                        1996-on                 *
     18361+ *     and: Juergen Pfeifer                         2009                    *
     18362  ****************************************************************************/
     18363 
     18364 /*
     18365@@ -46,7 +47,7 @@
     18366 #include <termcap.h>           /* ospeed */
     18367 #include <tic.h>
     18368 
     18369-MODULE_ID("$Id: lib_tputs.c,v 1.66 2008/06/28 13:12:15 tom Exp $")
     18370+MODULE_ID("$Id: lib_tputs.c,v 1.67 2009/02/15 00:49:44 tom Exp $")
     18371 
     18372 NCURSES_EXPORT_VAR(char) PC = 0;              /* used by termcap library */
     18373 NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0;        /* used by termcap library */
     18374@@ -72,7 +73,7 @@
     18375 static int (*my_outch) (int c) = _nc_outch;
     18376 
     18377 NCURSES_EXPORT(int)
     18378-delay_output(int ms)
     18379+NCURSES_SP_NAME(delay_output) (NCURSES_SP_DCLx int ms)
     18380 {
     18381     T((T_CALLED("delay_output(%d)"), ms));
     18382 
     18383@@ -92,6 +93,14 @@
     18384     returnCode(OK);
     18385 }
     18386 
     18387+#if NCURSES_SP_FUNCS
     18388+NCURSES_EXPORT(int)
     18389+delay_output(int ms)
     18390+{
     18391+    return NCURSES_SP_NAME(delay_output) (CURRENT_SCREEN, ms);
     18392+}
     18393+#endif
     18394+
     18395 NCURSES_EXPORT(void)
     18396 _nc_flush(void)
     18397 {
     18398diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_ttyflags.c ncurses-5.7/ncurses/tinfo/lib_ttyflags.c
     18399--- ncurses-5.7.orig/ncurses/tinfo/lib_ttyflags.c       2008-08-03 15:10:44.000000000 -0700
     18400+++ ncurses-5.7/ncurses/tinfo/lib_ttyflags.c    2009-02-15 23:21:24.632481631 -0800
     18401@@ -1,5 +1,5 @@
     18402 /****************************************************************************
     18403- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     18404+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     18405  *                                                                          *
     18406  * Permission is hereby granted, free of charge, to any person obtaining a  *
     18407  * copy of this software and associated documentation files (the            *
     18408@@ -38,7 +38,7 @@
     18409 #include <curses.priv.h>
     18410 #include <term.h>              /* cur_term */
     18411 
     18412-MODULE_ID("$Id: lib_ttyflags.c,v 1.18 2008/08/03 22:10:44 tom Exp $")
     18413+MODULE_ID("$Id: lib_ttyflags.c,v 1.19 2009/02/15 00:33:49 tom Exp $")
     18414 
     18415 NCURSES_EXPORT(int)
     18416 _nc_get_tty_mode(TTY * buf)
     18417@@ -101,7 +101,7 @@
     18418 }
     18419 
     18420 NCURSES_EXPORT(int)
     18421-def_shell_mode(void)
     18422+NCURSES_SP_NAME(def_shell_mode) (NCURSES_SP_DCL0)
     18423 {
     18424     int rc = ERR;
     18425 
     18426@@ -125,8 +125,16 @@
     18427     returnCode(rc);
     18428 }
     18429 
     18430+#if NCURSES_SP_FUNCS
     18431 NCURSES_EXPORT(int)
     18432-def_prog_mode(void)
     18433+def_shell_mode(void)
     18434+{
     18435+    return NCURSES_SP_NAME(def_shell_mode) (CURRENT_SCREEN);
     18436+}
     18437+#endif
     18438+
     18439+NCURSES_EXPORT(int)
     18440+NCURSES_SP_NAME(def_prog_mode) (NCURSES_SP_DCL0)
     18441 {
     18442     int rc = ERR;
     18443 
     18444@@ -148,16 +156,24 @@
     18445     returnCode(rc);
     18446 }
     18447 
     18448+#if NCURSES_SP_FUNCS
     18449 NCURSES_EXPORT(int)
     18450-reset_prog_mode(void)
     18451+def_prog_mode(void)
     18452+{
     18453+    return NCURSES_SP_NAME(def_prog_mode) (CURRENT_SCREEN);
     18454+}
     18455+#endif
     18456+
     18457+NCURSES_EXPORT(int)
     18458+NCURSES_SP_NAME(reset_prog_mode) (NCURSES_SP_DCL0)
     18459 {
     18460     T((T_CALLED("reset_prog_mode()")));
     18461 
     18462     if (cur_term != 0) {
     18463        if (_nc_set_tty_mode(&cur_term->Nttyb) == OK) {
     18464-           if (SP) {
     18465-               if (SP->_keypad_on)
     18466-                   _nc_keypad(SP, TRUE);
     18467+           if (SP_PARM) {
     18468+               if (SP_PARM->_keypad_on)
     18469+                   _nc_keypad(SP_PARM, TRUE);
     18470                NC_BUFFERED(TRUE);
     18471            }
     18472            returnCode(OK);
     18473@@ -166,14 +182,22 @@
     18474     returnCode(ERR);
     18475 }
     18476 
     18477+#if NCURSES_SP_FUNCS
     18478 NCURSES_EXPORT(int)
     18479-reset_shell_mode(void)
     18480+reset_prog_mode(void)
     18481+{
     18482+    return NCURSES_SP_NAME(reset_prog_mode) (CURRENT_SCREEN);
     18483+}
     18484+#endif
     18485+
     18486+NCURSES_EXPORT(int)
     18487+NCURSES_SP_NAME(reset_shell_mode) (NCURSES_SP_DCL0)
     18488 {
     18489     T((T_CALLED("reset_shell_mode()")));
     18490 
     18491     if (cur_term != 0) {
     18492-       if (SP) {
     18493-           _nc_keypad(SP, FALSE);
     18494+       if (SP_PARM) {
     18495+           _nc_keypad(SP_PARM, FALSE);
     18496            _nc_flush();
     18497            NC_BUFFERED(FALSE);
     18498        }
     18499@@ -182,6 +206,14 @@
     18500     returnCode(ERR);
     18501 }
     18502 
     18503+#if NCURSES_SP_FUNCS
     18504+NCURSES_EXPORT(int)
     18505+reset_shell_mode(void)
     18506+{
     18507+    return NCURSES_SP_NAME(reset_shell_mode) (CURRENT_SCREEN);
     18508+}
     18509+#endif
     18510+
     18511 static TTY *
     18512 saved_tty(void)
     18513 {
     18514diff -Naur ncurses-5.7.orig/ncurses/tty/lib_mvcur.c ncurses-5.7/ncurses/tty/lib_mvcur.c
     18515--- ncurses-5.7.orig/ncurses/tty/lib_mvcur.c    2008-08-16 12:30:58.000000000 -0700
     18516+++ ncurses-5.7/ncurses/tty/lib_mvcur.c 2009-02-15 23:21:24.632481631 -0800
     18517@@ -1,5 +1,5 @@
     18518 /****************************************************************************
     18519- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     18520+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     18521  *                                                                          *
     18522  * Permission is hereby granted, free of charge, to any person obtaining a  *
     18523  * copy of this software and associated documentation files (the            *
     18524@@ -30,6 +30,7 @@
     18525  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     18526  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     18527  *     and: Thomas E. Dickey                        1996-on                 *
     18528+ *     and: Juergen Pfeifer                         2009                    *
     18529  ****************************************************************************/
     18530 
     18531 /*
     18532@@ -155,7 +156,7 @@
     18533 #include <term.h>
     18534 #include <ctype.h>
     18535 
     18536-MODULE_ID("$Id: lib_mvcur.c,v 1.113 2008/08/16 19:30:58 tom Exp $")
     18537+MODULE_ID("$Id: lib_mvcur.c,v 1.114 2009/02/15 00:50:33 tom Exp $")
     18538 
     18539 #define WANT_CHAR(y, x)        SP->_newscr->_line[y].text[x]   /* desired state */
     18540 #define BAUDRATE       cur_term->_baudrate     /* bits per second */
     18541@@ -853,9 +854,10 @@
     18542        return (ERR);
     18543 }
     18544 
     18545-NCURSES_EXPORT(int)
     18546-mvcur(int yold, int xold, int ynew, int xnew)
     18547 /* optimized cursor move from (yold, xold) to (ynew, xnew) */
     18548+NCURSES_EXPORT(int)
     18549+NCURSES_SP_NAME(mvcur) (NCURSES_SP_DCLx
     18550+                       int yold, int xold, int ynew, int xnew)
     18551 {
     18552     NCURSES_CH_T oldattr;
     18553     int code;
     18554@@ -863,7 +865,7 @@
     18555     TR(TRACE_CALLS | TRACE_MOVE, (T_CALLED("mvcur(%d,%d,%d,%d)"),
     18556                                  yold, xold, ynew, xnew));
     18557 
     18558-    if (SP == 0) {
     18559+    if (SP_PARM == 0) {
     18560        code = ERR;
     18561     } else if (yold == ynew && xold == xnew) {
     18562        code = OK;
     18563@@ -884,7 +886,7 @@
     18564         * character set -- these have a strong tendency to screw up the CR &
     18565         * LF used for local character motions!
     18566         */
     18567-       oldattr = SCREEN_ATTRS(SP);
     18568+       oldattr = SCREEN_ATTRS(SP_PARM);
     18569        if ((AttrOf(oldattr) & A_ALTCHARSET)
     18570            || (AttrOf(oldattr) && !move_standout_mode)) {
     18571            TR(TRACE_CHARPUT, ("turning off (%#lx) %s before move",
     18572@@ -896,7 +898,7 @@
     18573        if (xold >= screen_columns) {
     18574            int l;
     18575 
     18576-           if (SP->_nl) {
     18577+           if (SP_PARM->_nl) {
     18578                l = (xold + 1) / screen_columns;
     18579                yold += l;
     18580                if (yold >= screen_lines)
     18581@@ -940,7 +942,7 @@
     18582        /*
     18583         * Restore attributes if we disabled them before moving.
     18584         */
     18585-       if (!SameAttrOf(oldattr, SCREEN_ATTRS(SP))) {
     18586+       if (!SameAttrOf(oldattr, SCREEN_ATTRS(SP_PARM))) {
     18587            TR(TRACE_CHARPUT, ("turning on (%#lx) %s after move",
     18588                               (unsigned long) AttrOf(oldattr),
     18589                               _traceattr(AttrOf(oldattr))));
     18590@@ -950,6 +952,14 @@
     18591     returnCode(code);
     18592 }
     18593 
     18594+#if NCURSES_SP_FUNCS
     18595+NCURSES_EXPORT(int)
     18596+mvcur(int yold, int xold, int ynew, int xnew)
     18597+{
     18598+    return NCURSES_SP_NAME(mvcur) (CURRENT_SCREEN, yold, xold, ynew, xnew);
     18599+}
     18600+#endif
     18601+
     18602 #if defined(TRACE) || defined(NCURSES_TEST)
     18603 NCURSES_EXPORT_VAR(int) _nc_optimize_enable = OPTIMIZE_ALL;
     18604 #endif
     18605diff -Naur ncurses-5.7.orig/ncurses/tty/lib_vidattr.c ncurses-5.7/ncurses/tty/lib_vidattr.c
     18606--- ncurses-5.7.orig/ncurses/tty/lib_vidattr.c  2007-06-30 14:58:04.000000000 -0700
     18607+++ ncurses-5.7/ncurses/tty/lib_vidattr.c       2009-02-15 23:21:24.636481910 -0800
     18608@@ -1,5 +1,5 @@
     18609 /****************************************************************************
     18610- * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
     18611+ * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.              *
     18612  *                                                                          *
     18613  * Permission is hereby granted, free of charge, to any person obtaining a  *
     18614  * copy of this software and associated documentation files (the            *
     18615@@ -29,7 +29,8 @@
     18616 /****************************************************************************
     18617  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     18618  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     18619- *     and: Thomas E. Dickey                        1996 on                 *
     18620+ *     and: Thomas E. Dickey                        1996-on                 *
     18621+ *     and: Juergen Pfeifer                         2009                    *
     18622  ****************************************************************************/
     18623 
     18624 /*
     18625@@ -65,7 +66,7 @@
     18626 #include <curses.priv.h>
     18627 #include <term.h>
     18628 
     18629-MODULE_ID("$Id: lib_vidattr.c,v 1.49 2007/06/30 21:58:04 tom Exp $")
     18630+MODULE_ID("$Id: lib_vidattr.c,v 1.50 2009/02/15 00:51:03 tom Exp $")
     18631 
     18632 #define doPut(mode) TPUTS_TRACE(#mode); tputs(mode, 1, outc)
     18633 
     18634@@ -299,7 +300,7 @@
     18635 }
     18636 
     18637 NCURSES_EXPORT(chtype)
     18638-termattrs(void)
     18639+NCURSES_SP_NAME(termattrs) (NCURSES_SP_DCL0)
     18640 {
     18641     chtype attrs = A_NORMAL;
     18642 
     18643@@ -331,8 +332,16 @@
     18644     if (enter_underline_mode)
     18645        attrs |= A_UNDERLINE;
     18646 
     18647-    if (SP->_coloron)
     18648+    if (SP_PARM->_coloron)
     18649        attrs |= A_COLOR;
     18650 
     18651     returnChar(attrs);
     18652 }
     18653+
     18654+#if NCURSES_SP_FUNCS
     18655+NCURSES_EXPORT(chtype)
     18656+termattrs(void)
     18657+{
     18658+    return NCURSES_SP_NAME(termattrs) (CURRENT_SCREEN);
     18659+}
     18660+#endif
     18661diff -Naur ncurses-5.7.orig/ncurses/tty/tty_update.c ncurses-5.7/ncurses/tty/tty_update.c
     18662--- ncurses-5.7.orig/ncurses/tty/tty_update.c   2008-08-30 13:08:19.000000000 -0700
     18663+++ ncurses-5.7/ncurses/tty/tty_update.c        2009-02-15 23:21:24.636481910 -0800
     18664@@ -1,5 +1,5 @@
     18665 /****************************************************************************
     18666- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     18667+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     18668  *                                                                          *
     18669  * Permission is hereby granted, free of charge, to any person obtaining a  *
     18670  * copy of this software and associated documentation files (the            *
     18671@@ -30,6 +30,7 @@
     18672  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
     18673  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
     18674  *     and: Thomas E. Dickey                        1996-on                 *
     18675+ *     and: Juergen Pfeifer                         2009                    *
     18676  ****************************************************************************/
     18677 
     18678 /*-----------------------------------------------------------------
     18679@@ -78,7 +79,7 @@
    1515018680 #include <ctype.h>
    1515118681 #include <term.h>
    1515218682 
    1515318683-MODULE_ID("$Id: tty_update.c,v 1.246 2008/08/30 20:08:19 tom Exp $")
    15154 +MODULE_ID("$Id: tty_update.c,v 1.247 2009/01/25 00:48:36 tom Exp $")
     18684+MODULE_ID("$Id: tty_update.c,v 1.248 2009/02/15 00:51:22 tom Exp $")
    1515518685 
    1515618686 /*
    1515718687  * This define controls the line-breakout optimization.  Every once in a
    15158 @@ -1165,8 +1165,8 @@
     18688@@ -618,7 +619,7 @@
     18689                if_USE_SCROLL_HINTS(win->_line[row].oldindex = row)
     18690 
     18691 NCURSES_EXPORT(int)
     18692-doupdate(void)
     18693+NCURSES_SP_NAME(doupdate) (NCURSES_SP_DCL0)
     18694 {
     18695     int i;
     18696     int nonempty;
     18697@@ -645,11 +646,11 @@
     18698 
     18699     _nc_signal_handler(FALSE);
     18700 
     18701-    if (SP->_fifohold)
     18702-       SP->_fifohold--;
     18703+    if (SP_PARM->_fifohold)
     18704+       SP_PARM->_fifohold--;
     18705 
     18706 #if USE_SIZECHANGE
     18707-    if (SP->_endwin || _nc_handle_sigwinch(SP)) {
     18708+    if (SP_PARM->_endwin || _nc_handle_sigwinch(SP_PARM)) {
     18709        /*
     18710         * This is a transparent extension:  XSI does not address it,
     18711         * and applications need not know that ncurses can do it.
     18712@@ -658,20 +659,20 @@
     18713         * (this can happen in an xterm, for example), and resize the
     18714         * ncurses data structures accordingly.
     18715         */
     18716-       _nc_update_screensize(SP);
     18717+       _nc_update_screensize(SP_PARM);
     18718     }
     18719 #endif
     18720 
     18721-    if (SP->_endwin) {
     18722+    if (SP_PARM->_endwin) {
     18723 
     18724        T(("coming back from shell mode"));
     18725        reset_prog_mode();
     18726 
     18727        _nc_mvcur_resume();
     18728        _nc_screen_resume();
     18729-       SP->_mouse_resume(SP);
     18730+       SP_PARM->_mouse_resume(SP_PARM);
     18731 
     18732-       SP->_endwin = FALSE;
     18733+       SP_PARM->_endwin = FALSE;
     18734     }
     18735 #if USE_TRACE_TIMES
     18736     /* zero the metering machinery */
     18737@@ -699,7 +700,7 @@
     18738            for (j = 0; j < screen_columns; j++) {
     18739                bool failed = FALSE;
     18740                NCURSES_CH_T *thisline = newscr->_line[i].text;
     18741-               attr_t thisattr = AttrOf(thisline[j]) & SP->_xmc_triggers;
     18742+               attr_t thisattr = AttrOf(thisline[j]) & SP_PARM->_xmc_triggers;
     18743                attr_t turnon = thisattr & ~rattr;
     18744 
     18745                /* is an attribute turned on here? */
     18746@@ -717,7 +718,7 @@
     18747                 * there's enough room to set the attribute before the first
     18748                 * non-blank in the run.
     18749                 */
     18750-#define SAFE(a)        (!((a) & SP->_xmc_triggers))
     18751+#define SAFE(a)        (!((a) & SP_PARM->_xmc_triggers))
     18752                if (ISBLANK(thisline[j]) && SAFE(turnon)) {
     18753                    RemAttr(thisline[j], turnon);
     18754                    continue;
     18755@@ -748,7 +749,7 @@
     18756                    for (m = i; m < screen_lines; m++) {
     18757                        for (; n < screen_columns; n++) {
     18758                            attr_t testattr = AttrOf(newscr->_line[m].text[n]);
     18759-                           if ((testattr & SP->_xmc_triggers) == rattr) {
     18760+                           if ((testattr & SP_PARM->_xmc_triggers) == rattr) {
     18761                                end_onscreen = TRUE;
     18762                                TR(TRACE_ATTRS,
     18763                                   ("Range attributed with %s ends at (%d, %d)",
     18764@@ -809,7 +810,7 @@
     18765                    for (p = i; p < screen_lines; p++) {
     18766                        for (; q < screen_columns; q++) {
     18767                            attr_t testattr = AttrOf(newscr->_line[p].text[q]);
     18768-                           if ((testattr & SP->_xmc_triggers) == rattr)
     18769+                           if ((testattr & SP_PARM->_xmc_triggers) == rattr)
     18770                                goto foundend;
     18771                            RemAttr(newscr->_line[p].text[q], turnon);
     18772                        }
     18773@@ -857,7 +858,7 @@
     18774 
     18775        nonempty = min(screen_lines, newscr->_maxy + 1);
     18776 
     18777-       if (SP->_scrolling) {
     18778+       if (SP_PARM->_scrolling) {
     18779            _nc_scroll_optimize();
     18780        }
     18781 
     18782@@ -940,6 +941,14 @@
     18783     returnCode(OK);
     18784 }
     18785 
     18786+#if NCURSES_SP_FUNCS
     18787+NCURSES_EXPORT(int)
     18788+doupdate(void)
     18789+{
     18790+    return NCURSES_SP_NAME(doupdate) (CURRENT_SCREEN);
     18791+}
     18792+#endif
     18793+
     18794 /*
     18795  *     ClrBlank(win)
     18796  *
     18797@@ -1165,8 +1174,8 @@
    1515918798                newPair = GetPair(newLine[n]);
    1516018799                if (oldPair != newPair
     
    1516918808diff -Naur ncurses-5.7.orig/NEWS ncurses-5.7/NEWS
    1517018809--- ncurses-5.7.orig/NEWS       2008-11-01 17:56:22.000000000 -0700
    15171 +++ ncurses-5.7/NEWS    2009-02-07 22:08:38.011328119 -0800
     18810+++ ncurses-5.7/NEWS    2009-02-15 23:21:24.600479396 -0800
    1517218811@@ -1,5 +1,5 @@
    1517318812 -------------------------------------------------------------------------------
     
    1518218821 -------------------------------------------------------------------------------
    1518318822--- $Id: NEWS,v 1.1320 2008/11/02 00:56:22 tom Exp $
    15184 +-- $Id: NEWS,v 1.1362 2009/02/07 19:20:43 tom Exp $
     18823+-- $Id: NEWS,v 1.1364 2009/02/15 00:20:00 tom Exp $
    1518518824 -------------------------------------------------------------------------------
    1518618825 
    1518718826 This is a log of changes that ncurses has gone through since Zeyd started
    15188 @@ -45,6 +45,141 @@
     18827@@ -45,6 +45,150 @@
    1518918828 Changes through 1.9.9e did not credit all contributions;
    1519018829 it is not possible to add this information.
    1519118830 
     18831+20090214
     18832+       + add configure script --enable-sp-funcs to enable the new set of
     18833+         extended functions.
     18834+       + start integrating patches by Juergen Pfeifer:
     18835+         + add extended functions which specify the SCREEN pointer for several
     18836+           curses functions which use the global SP (these are incomplete;
     18837+           some internals work is needed to complete these).
     18838+         + add special cases to configure script for MinGW port.
     18839+
    1519218840+20090207
    1519318841+       + update several configure macros from lynx changes
     
    1533018978diff -Naur ncurses-5.7.orig/panel/Makefile.in ncurses-5.7/panel/Makefile.in
    1533118979--- ncurses-5.7.orig/panel/Makefile.in  2007-04-28 07:56:11.000000000 -0700
    15332 +++ ncurses-5.7/panel/Makefile.in       2009-02-07 22:08:29.738503702 -0800
     18980+++ ncurses-5.7/panel/Makefile.in       2009-02-15 23:21:09.919538762 -0800
    1533318981@@ -1,6 +1,6 @@
    1533418982-# $Id: Makefile.in,v 1.52 2007/04/28 14:56:11 tom Exp $
     
    1535118999diff -Naur ncurses-5.7.orig/progs/Makefile.in ncurses-5.7/progs/Makefile.in
    1535219000--- ncurses-5.7.orig/progs/Makefile.in  2008-09-07 06:58:55.000000000 -0700
    15353 +++ ncurses-5.7/progs/Makefile.in       2009-02-07 22:08:16.568430787 -0800
     19001+++ ncurses-5.7/progs/Makefile.in       2009-02-15 23:20:58.766824137 -0800
    1535419002@@ -1,6 +1,6 @@
    1535519003-# $Id: Makefile.in,v 1.79 2008/09/07 13:58:55 tom Exp $
     
    1541719065diff -Naur ncurses-5.7.orig/progs/modules ncurses-5.7/progs/modules
    1541819066--- ncurses-5.7.orig/progs/modules      2006-12-23 16:53:21.000000000 -0800
    15419 +++ ncurses-5.7/progs/modules   2009-02-07 22:08:16.568430787 -0800
     19067+++ ncurses-5.7/progs/modules   2009-02-15 23:20:58.766824137 -0800
    1542019068@@ -1,7 +1,7 @@
    1542119069-# $Id: modules,v 1.13 2006/12/24 00:53:21 tom Exp $
     
    1543819086diff -Naur ncurses-5.7.orig/progs/tabs.c ncurses-5.7/progs/tabs.c
    1543919087--- ncurses-5.7.orig/progs/tabs.c       1969-12-31 16:00:00.000000000 -0800
    15440 +++ ncurses-5.7/progs/tabs.c    2009-02-07 22:08:17.958857941 -0800
     19088+++ ncurses-5.7/progs/tabs.c    2009-02-15 23:21:00.214919122 -0800
    1544119089@@ -0,0 +1,506 @@
    1544219090+/****************************************************************************
     
    1594819596diff -Naur ncurses-5.7.orig/test/clip_printw.c ncurses-5.7/test/clip_printw.c
    1594919597--- ncurses-5.7.orig/test/clip_printw.c 1969-12-31 16:00:00.000000000 -0800
    15950 +++ ncurses-5.7/test/clip_printw.c      2009-02-07 22:08:26.211171952 -0800
     19598+++ ncurses-5.7/test/clip_printw.c      2009-02-15 23:21:06.503320016 -0800
    1595119599@@ -0,0 +1,360 @@
    1595219600+/****************************************************************************
     
    1631219960diff -Naur ncurses-5.7.orig/test/demo_forms.c ncurses-5.7/test/demo_forms.c
    1631319961--- ncurses-5.7.orig/test/demo_forms.c  2008-10-18 13:38:20.000000000 -0700
    16314 +++ ncurses-5.7/test/demo_forms.c       2009-02-07 22:08:26.215273362 -0800
     19962+++ ncurses-5.7/test/demo_forms.c       2009-02-15 23:21:06.503320016 -0800
    1631519963@@ -26,7 +26,7 @@
    1631619964  * authorization.                                                           *
     
    1634719995diff -Naur ncurses-5.7.orig/test/edit_field.c ncurses-5.7/test/edit_field.c
    1634819996--- ncurses-5.7.orig/test/edit_field.c  2008-10-18 13:40:20.000000000 -0700
    16349 +++ ncurses-5.7/test/edit_field.c       2009-02-07 22:08:26.215273362 -0800
     19997+++ ncurses-5.7/test/edit_field.c       2009-02-15 23:21:06.503320016 -0800
    1635019998@@ -26,7 +26,7 @@
    1635119999  * authorization.                                                           *
     
    1637020018diff -Naur ncurses-5.7.orig/test/edit_field.h ncurses-5.7/test/edit_field.h
    1637120019--- ncurses-5.7.orig/test/edit_field.h  2006-06-03 09:38:57.000000000 -0700
    16372 +++ ncurses-5.7/test/edit_field.h       2009-02-07 22:08:26.215273362 -0800
     20020+++ ncurses-5.7/test/edit_field.h       2009-02-15 23:21:06.507320016 -0800
    1637320021@@ -1,5 +1,5 @@
    1637420022 /****************************************************************************
     
    1640020048diff -Naur ncurses-5.7.orig/test/filter.c ncurses-5.7/test/filter.c
    1640120049--- ncurses-5.7.orig/test/filter.c      2006-12-09 08:53:47.000000000 -0800
    16402 +++ ncurses-5.7/test/filter.c   2009-02-07 22:08:20.961189552 -0800
     20050+++ ncurses-5.7/test/filter.c   2009-02-15 23:21:03.083101270 -0800
    1640320051@@ -1,5 +1,5 @@
    1640420052 /****************************************************************************
     
    1647220120diff -Naur ncurses-5.7.orig/test/insdelln.c ncurses-5.7/test/insdelln.c
    1647320121--- ncurses-5.7.orig/test/insdelln.c    1969-12-31 16:00:00.000000000 -0800
    16474 +++ ncurses-5.7/test/insdelln.c 2009-02-07 22:08:26.215273362 -0800
     20122+++ ncurses-5.7/test/insdelln.c 2009-02-15 23:21:06.507320016 -0800
    1647520123@@ -0,0 +1,380 @@
    1647620124+/****************************************************************************
     
    1685620504diff -Naur ncurses-5.7.orig/test/modules ncurses-5.7/test/modules
    1685720505--- ncurses-5.7.orig/test/modules       2007-08-18 10:57:08.000000000 -0700
    16858 +++ ncurses-5.7/test/modules    2009-02-07 22:08:26.215273362 -0800
     20506+++ ncurses-5.7/test/modules    2009-02-15 23:21:06.507320016 -0800
    1685920507@@ -1,4 +1,4 @@
    1686020508-# $Id: modules,v 1.36 2007/08/18 17:57:08 tom Exp $
     
    1688120529diff -Naur ncurses-5.7.orig/test/ncurses.c ncurses-5.7/test/ncurses.c
    1688220530--- ncurses-5.7.orig/test/ncurses.c     2008-09-27 07:34:58.000000000 -0700
    16883 +++ ncurses-5.7/test/ncurses.c  2009-02-07 22:08:36.702933371 -0800
     20531+++ ncurses-5.7/test/ncurses.c  2009-02-15 23:21:17.380017041 -0800
    1688420532@@ -40,7 +40,7 @@
    1688520533    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
     
    1737321021diff -Naur ncurses-5.7.orig/test/programs ncurses-5.7/test/programs
    1737421022--- ncurses-5.7.orig/test/programs      2008-08-16 14:47:39.000000000 -0700
    17375 +++ ncurses-5.7/test/programs   2009-02-07 22:08:26.215273362 -0800
     21023+++ ncurses-5.7/test/programs   2009-02-15 23:21:06.507320016 -0800
    1737621024@@ -1,4 +1,4 @@
    1737721025-# $Id: programs,v 1.14 2008/08/16 21:47:39 tom Exp $
     
    1739821046diff -Naur ncurses-5.7.orig/test/README ncurses-5.7/test/README
    1739921047--- ncurses-5.7.orig/test/README        2008-10-18 14:02:45.000000000 -0700
    17400 +++ ncurses-5.7/test/README     2009-02-07 22:08:26.211171952 -0800
     21048+++ ncurses-5.7/test/README     2009-02-15 23:21:06.503320016 -0800
    1740121049@@ -25,7 +25,7 @@
    1740221050 -- sale, use or other dealings in this Software without prior written        --
     
    1769421342diff -Naur ncurses-5.7.orig/test/test.priv.h ncurses-5.7/test/test.priv.h
    1769521343--- ncurses-5.7.orig/test/test.priv.h   2008-10-04 14:53:41.000000000 -0700
    17696 +++ ncurses-5.7/test/test.priv.h        2009-02-07 22:08:26.215273362 -0800
     21344+++ ncurses-5.7/test/test.priv.h        2009-02-15 23:21:06.507320016 -0800
    1769721345@@ -29,7 +29,7 @@
    1769821346 /****************************************************************************
     
    1771621364diff -Naur ncurses-5.7.orig/TO-DO ncurses-5.7/TO-DO
    1771721365--- ncurses-5.7.orig/TO-DO      2008-10-11 12:22:27.000000000 -0700
    17718 +++ ncurses-5.7/TO-DO   2009-02-07 22:08:19.472330214 -0800
     21366+++ ncurses-5.7/TO-DO   2009-02-15 23:21:01.795020533 -0800
    1771921367@@ -25,7 +25,7 @@
    1772021368 -- sale, use or other dealings in this Software without prior written        --
Note: See TracChangeset for help on using the changeset viewer.