- Timestamp:
- Jul 23, 2009, 6:30:28 PM (15 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- b763d06
- Parents:
- 58d7fd7
- File:
-
- 1 moved
-
patches/ncurses-5.7-branch_update-18.patch (moved) (moved from patches/ncurses-5.7-branch_update-14.patch ) (1035 diffs)
Legend:
- Unmodified
- Added
- Removed
-
patches/ncurses-5.7-branch_update-18.patch
r58d7fd7 rf3a8d18 1 1 Submitted By: Jim Gifford (jim at cross-lfs dot org) 2 Date: 0 6-05-20092 Date: 07-19-2009 3 3 Initial Package Version: 5.7 4 4 Origin: Upstream 5 5 Upstream Status: Applied 6 6 Description: This is a branch update for NCurses-5.7, and should be 7 rechecked periodically. This patch covers up to 5.7-20090 530.7 rechecked periodically. This patch covers up to 5.7-20090718. 8 8 9 9 diff -Naur ncurses-5.7.orig/aclocal.m4 ncurses-5.7/aclocal.m4 10 10 --- ncurses-5.7.orig/aclocal.m4 2008-10-25 15:15:32.000000000 -0700 11 +++ ncurses-5.7/aclocal.m4 2009-0 6-05 14:01:31.000000000 -070011 +++ ncurses-5.7/aclocal.m4 2009-07-19 15:04:17.000000000 -0700 12 12 @@ -1,5 +1,5 @@ 13 13 dnl*************************************************************************** … … 22 22 dnl 23 23 -dnl $Id: aclocal.m4,v 1.470 2008/10/25 22:15:32 tom Exp $ 24 +dnl $Id: aclocal.m4,v 1.48 7 2009/04/04 22:32:42tom Exp $24 +dnl $Id: aclocal.m4,v 1.488 2009/07/17 09:14:49 tom Exp $ 25 25 dnl Macros used in NCURSES auto-configuration script. 26 26 dnl … … 933 933 dnl --------------------------------------------------------------------------- 934 934 -dnl CF_XOPEN_SOURCE version: 26 updated: 2008/07/27 11:26:57 935 +dnl CF_XOPEN_SOURCE version: 2 8 updated: 2008/12/27 12:30:03935 +dnl CF_XOPEN_SOURCE version: 29 updated: 2009/07/16 21:07:04 936 936 dnl --------------- 937 937 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, … … 946 946 ;; 947 947 freebsd*|dragonfly*) #(vi 948 @@ -5569,7 +5727,7 @@ 948 @@ -5563,13 +5721,16 @@ 949 cf_XOPEN_SOURCE=600 950 CPPFLAGS="$CPPFLAGS -D_BSD_TYPES -D__BSD_VISIBLE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" 951 ;; 952 +hpux11*) #(vi 953 + CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE=500" 954 + ;; 955 hpux*) #(vi 956 CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE" 957 ;; 949 958 irix[[56]].*) #(vi 950 959 CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE" … … 957 966 diff -Naur ncurses-5.7.orig/Ada95/gen/adacurses-config.in ncurses-5.7/Ada95/gen/adacurses-config.in 958 967 --- ncurses-5.7.orig/Ada95/gen/adacurses-config.in 2007-04-07 14:06:50.000000000 -0700 959 +++ ncurses-5.7/Ada95/gen/adacurses-config.in 2009-0 6-05 14:01:07.000000000 -0700968 +++ ncurses-5.7/Ada95/gen/adacurses-config.in 2009-07-19 15:02:13.000000000 -0700 960 969 @@ -1,18 +1,47 @@ 961 970 #! /bin/sh … … 1031 1040 diff -Naur ncurses-5.7.orig/Ada95/gen/gen.c ncurses-5.7/Ada95/gen/gen.c 1032 1041 --- ncurses-5.7.orig/Ada95/gen/gen.c 2008-10-04 14:59:37.000000000 -0700 1033 +++ ncurses-5.7/Ada95/gen/gen.c 2009-0 6-05 14:01:24.000000000 -07001042 +++ ncurses-5.7/Ada95/gen/gen.c 2009-07-19 15:03:45.000000000 -0700 1034 1043 @@ -1,5 +1,5 @@ 1035 1044 /**************************************************************************** … … 1070 1079 diff -Naur ncurses-5.7.orig/Ada95/gen/Makefile.in ncurses-5.7/Ada95/gen/Makefile.in 1071 1080 --- ncurses-5.7.orig/Ada95/gen/Makefile.in 2008-10-04 15:58:31.000000000 -0700 1072 +++ ncurses-5.7/Ada95/gen/Makefile.in 2009-0 6-05 14:01:07.000000000 -07001081 +++ ncurses-5.7/Ada95/gen/Makefile.in 2009-07-19 15:02:13.000000000 -0700 1073 1082 @@ -1,5 +1,5 @@ 1074 1083 ############################################################################## … … 1126 1135 diff -Naur ncurses-5.7.orig/Ada95/samples/Makefile.in ncurses-5.7/Ada95/samples/Makefile.in 1127 1136 --- ncurses-5.7.orig/Ada95/samples/Makefile.in 2006-12-17 08:45:02.000000000 -0800 1128 +++ ncurses-5.7/Ada95/samples/Makefile.in 2009-0 6-05 14:01:07.000000000 -07001137 +++ ncurses-5.7/Ada95/samples/Makefile.in 2009-07-19 15:02:13.000000000 -0700 1129 1138 @@ -1,5 +1,5 @@ 1130 1139 ############################################################################## … … 1165 1174 diff -Naur ncurses-5.7.orig/Ada95/src/Makefile.in ncurses-5.7/Ada95/src/Makefile.in 1166 1175 --- ncurses-5.7.orig/Ada95/src/Makefile.in 2007-09-15 11:22:24.000000000 -0700 1167 +++ ncurses-5.7/Ada95/src/Makefile.in 2009-0 6-05 14:01:07.000000000 -07001176 +++ ncurses-5.7/Ada95/src/Makefile.in 2009-07-19 15:02:13.000000000 -0700 1168 1177 @@ -1,5 +1,5 @@ 1169 1178 ############################################################################## … … 1257 1266 diff -Naur ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb 1258 1267 --- ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb 2008-07-26 11:51:11.000000000 -0700 1259 +++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb 2009-0 6-05 14:00:52.000000000 -07001268 +++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb 2009-07-19 15:01:57.000000000 -0700 1260 1269 @@ -35,8 +35,8 @@ 1261 1270 ------------------------------------------------------------------------------ … … 1280 1289 diff -Naur ncurses-5.7.orig/c++/cursesw.cc ncurses-5.7/c++/cursesw.cc 1281 1290 --- ncurses-5.7.orig/c++/cursesw.cc 2007-12-15 15:01:57.000000000 -0800 1282 +++ ncurses-5.7/c++/cursesw.cc 2009-0 6-05 14:01:30.000000000 -07001291 +++ ncurses-5.7/c++/cursesw.cc 2009-07-19 15:03:48.000000000 -0700 1283 1292 @@ -1,6 +1,6 @@ 1284 1293 // * this is for making emacs happy: -*-Mode: C++;-*- … … 1327 1336 diff -Naur ncurses-5.7.orig/c++/demo.cc ncurses-5.7/c++/demo.cc 1328 1337 --- ncurses-5.7.orig/c++/demo.cc 2008-08-04 10:16:57.000000000 -0700 1329 +++ ncurses-5.7/c++/demo.cc 2009-0 6-05 14:01:49.000000000 -07001338 +++ ncurses-5.7/c++/demo.cc 2009-07-19 15:03:58.000000000 -0700 1330 1339 @@ -35,7 +35,7 @@ 1331 1340 * Demo code for NCursesMenu and NCursesForm written by … … 1353 1362 diff -Naur ncurses-5.7.orig/c++/internal.h ncurses-5.7/c++/internal.h 1354 1363 --- ncurses-5.7.orig/c++/internal.h 2008-10-25 14:35:44.000000000 -0700 1355 +++ ncurses-5.7/c++/internal.h 2009-0 6-05 14:01:49.000000000 -07001364 +++ ncurses-5.7/c++/internal.h 2009-07-19 15:03:58.000000000 -0700 1356 1365 @@ -31,7 +31,7 @@ 1357 1366 * Author: Juergen Pfeifer, 1997 * … … 1377 1386 diff -Naur ncurses-5.7.orig/c++/Makefile.in ncurses-5.7/c++/Makefile.in 1378 1387 --- ncurses-5.7.orig/c++/Makefile.in 2007-04-28 08:29:12.000000000 -0700 1379 +++ ncurses-5.7/c++/Makefile.in 2009-0 6-05 14:01:30.000000000 -07001388 +++ ncurses-5.7/c++/Makefile.in 2009-07-19 15:03:48.000000000 -0700 1380 1389 @@ -1,6 +1,6 @@ 1381 1390 -# $Id: Makefile.in,v 1.84 2007/04/28 15:29:12 tom Exp $ … … 1435 1444 diff -Naur ncurses-5.7.orig/config.guess ncurses-5.7/config.guess 1436 1445 --- ncurses-5.7.orig/config.guess 2008-08-30 13:25:07.000000000 -0700 1437 +++ ncurses-5.7/config.guess 2009-0 6-05 14:01:03.000000000 -07001446 +++ ncurses-5.7/config.guess 2009-07-19 15:02:08.000000000 -0700 1438 1447 @@ -4,7 +4,7 @@ 1439 1448 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 … … 1505 1514 diff -Naur ncurses-5.7.orig/config.sub ncurses-5.7/config.sub 1506 1515 --- ncurses-5.7.orig/config.sub 2008-08-30 13:25:02.000000000 -0700 1507 +++ ncurses-5.7/config.sub 2009-0 6-05 14:01:03.000000000 -07001516 +++ ncurses-5.7/config.sub 2009-07-19 15:02:08.000000000 -0700 1508 1517 @@ -4,7 +4,7 @@ 1509 1518 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 … … 1589 1598 diff -Naur ncurses-5.7.orig/configure ncurses-5.7/configure 1590 1599 --- ncurses-5.7.orig/configure 2008-10-25 17:04:38.000000000 -0700 1591 +++ ncurses-5.7/configure 2009-0 6-05 14:01:31.000000000 -07001600 +++ ncurses-5.7/configure 2009-07-19 15:04:17.000000000 -0700 1592 1601 @@ -1,7 +1,7 @@ 1593 1602 #! /bin/sh 1594 1603 -# From configure.in Revision: 1.454 . 1595 +# From configure.in Revision: 1.47 0.1604 +# From configure.in Revision: 1.472 . 1596 1605 # Guess values for system-dependent variables and create Makefiles. 1597 1606 -# Generated by Autoconf 2.52.20080325. … … 1612 1621 --with-install-prefix prefixes actual install-location ($DESTDIR) 1613 1622 Build-Tools Needed to Compile Temporary Applications for Cross-compiling: 1614 @@ -762,6 +765,7 @@ 1623 @@ -752,6 +755,7 @@ 1624 --with-chtype=TYPE override type of chtype 1625 --with-ospeed=TYPE override type of ospeed variable 1626 --with-mmask-t=TYPE override type of mmask_t 1627 + --with-ccharw-max=XXX override size CCHARW_MAX 1628 --with-rcs-ids compile-in RCS identifiers 1629 Options to Specify How Manpages are Installed: 1630 --with-manpage-format specify manpage-format: gzip/compress/BSDI/normal and 1631 @@ -762,6 +766,7 @@ 1615 1632 --with-manpage-tbl specify manpage processing with tbl 1616 1633 Extensions: … … 1620 1637 --enable-ext-colors compile for 256-color support 1621 1638 --enable-ext-mouse compile for extended mouse-encoding 1622 @@ -780,6 +78 4,7 @@1639 @@ -780,6 +785,7 @@ 1623 1640 --with-pthread use POSIX thread library 1624 1641 --enable-weak-symbols enable weak-symbols for pthreads … … 1628 1645 --disable-scroll-hints compile without scroll-hints code 1629 1646 --enable-wgetch-events compile with experimental wgetch-events code 1630 @@ -870,7 +87 5,7 @@1647 @@ -870,7 +876,7 @@ 1631 1648 running configure, to aid debugging if configure makes a mistake. 1632 1649 … … 1637 1654 $ $0 $@ 1638 1655 1639 @@ -994,7 + 999,7 @@1656 @@ -994,7 +1000,7 @@ 1640 1657 fi 1641 1658 for ac_site_file in $CONFIG_SITE; do 1642 1659 if test -r "$ac_site_file"; then 1643 1660 - { echo "$as_me:997: loading site script $ac_site_file" >&5 1644 + { echo "$as_me:100 2: loading site script $ac_site_file" >&51661 + { echo "$as_me:1003: loading site script $ac_site_file" >&5 1645 1662 echo "$as_me: loading site script $ac_site_file" >&6;} 1646 1663 cat "$ac_site_file" >&5 1647 1664 . "$ac_site_file" 1648 @@ -1005,7 +101 0,7 @@1665 @@ -1005,7 +1011,7 @@ 1649 1666 # Some versions of bash will fail to source /dev/null (special 1650 1667 # files actually), so we avoid doing that. 1651 1668 if test -f "$cache_file"; then 1652 1669 - { echo "$as_me:1008: loading cache $cache_file" >&5 1653 + { echo "$as_me:101 3: loading cache $cache_file" >&51670 + { echo "$as_me:1014: loading cache $cache_file" >&5 1654 1671 echo "$as_me: loading cache $cache_file" >&6;} 1655 1672 case $cache_file in 1656 1673 [\\/]* | ?:[\\/]* ) . $cache_file;; 1657 @@ -1013,7 +101 8,7 @@1674 @@ -1013,7 +1019,7 @@ 1658 1675 esac 1659 1676 fi 1660 1677 else 1661 1678 - { echo "$as_me:1016: creating cache $cache_file" >&5 1662 + { echo "$as_me:102 1: creating cache $cache_file" >&51679 + { echo "$as_me:1022: creating cache $cache_file" >&5 1663 1680 echo "$as_me: creating cache $cache_file" >&6;} 1664 1681 >$cache_file 1665 1682 fi 1666 @@ -1029,21 +103 4,21 @@1683 @@ -1029,21 +1035,21 @@ 1667 1684 eval ac_new_val="\$ac_env_${ac_var}_value" 1668 1685 case $ac_old_set,$ac_new_set in 1669 1686 set,) 1670 1687 - { echo "$as_me:1032: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 1671 + { echo "$as_me:103 7: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&51688 + { echo "$as_me:1038: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 1672 1689 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} 1673 1690 ac_cache_corrupted=: ;; 1674 1691 ,set) 1675 1692 - { echo "$as_me:1036: error: \`$ac_var' was not set in the previous run" >&5 1676 + { echo "$as_me:104 1: error: \`$ac_var' was not set in the previous run" >&51693 + { echo "$as_me:1042: error: \`$ac_var' was not set in the previous run" >&5 1677 1694 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} 1678 1695 ac_cache_corrupted=: ;; … … 1681 1698 if test "x$ac_old_val" != "x$ac_new_val"; then 1682 1699 - { echo "$as_me:1042: error: \`$ac_var' has changed since the previous run:" >&5 1683 + { echo "$as_me:104 7: error: \`$ac_var' has changed since the previous run:" >&51700 + { echo "$as_me:1048: error: \`$ac_var' has changed since the previous run:" >&5 1684 1701 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} 1685 1702 - { echo "$as_me:1044: former value: $ac_old_val" >&5 1686 + { echo "$as_me:10 49: former value: $ac_old_val" >&51703 + { echo "$as_me:1050: former value: $ac_old_val" >&5 1687 1704 echo "$as_me: former value: $ac_old_val" >&2;} 1688 1705 - { echo "$as_me:1046: current value: $ac_new_val" >&5 1689 + { echo "$as_me:105 1: current value: $ac_new_val" >&51706 + { echo "$as_me:1052: current value: $ac_new_val" >&5 1690 1707 echo "$as_me: current value: $ac_new_val" >&2;} 1691 1708 ac_cache_corrupted=: 1692 1709 fi;; 1693 @@ -1062,9 +106 7,9 @@1710 @@ -1062,9 +1068,9 @@ 1694 1711 fi 1695 1712 done 1696 1713 if $ac_cache_corrupted; then 1697 1714 - { echo "$as_me:1065: error: changes in the environment can compromise the build" >&5 1698 + { echo "$as_me:107 0: error: changes in the environment can compromise the build" >&51715 + { echo "$as_me:1071: error: changes in the environment can compromise the build" >&5 1699 1716 echo "$as_me: error: changes in the environment can compromise the build" >&2;} 1700 1717 - { { echo "$as_me:1067: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 1701 + { { echo "$as_me:107 2: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&51718 + { { echo "$as_me:1073: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 1702 1719 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} 1703 1720 { (exit 1); exit 1; }; } 1704 1721 fi 1705 @@ -1085,10 +109 0,10 @@1722 @@ -1085,10 +1091,10 @@ 1706 1723 echo "#! $SHELL" >conftest.sh 1707 1724 echo "exit 0" >>conftest.sh 1708 1725 chmod +x conftest.sh 1709 1726 -if { (echo "$as_me:1088: PATH=\".;.\"; conftest.sh") >&5 1710 +if { (echo "$as_me:109 3: PATH=\".;.\"; conftest.sh") >&51727 +if { (echo "$as_me:1094: PATH=\".;.\"; conftest.sh") >&5 1711 1728 (PATH=".;."; conftest.sh) 2>&5 1712 1729 ac_status=$? 1713 1730 - echo "$as_me:1091: \$? = $ac_status" >&5 1714 + echo "$as_me:109 6: \$? = $ac_status" >&51731 + echo "$as_me:1097: \$? = $ac_status" >&5 1715 1732 (exit $ac_status); }; then 1716 1733 ac_path_separator=';' 1717 1734 else 1718 @@ -1101,7 +110 6,7 @@1735 @@ -1101,7 +1107,7 @@ 1719 1736 1720 1737 top_builddir=`pwd` 1721 1738 1722 1739 -echo "$as_me:1104: checking for egrep" >&5 1723 +echo "$as_me:11 09: checking for egrep" >&51740 +echo "$as_me:1110: checking for egrep" >&5 1724 1741 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 1725 1742 if test "${ac_cv_prog_egrep+set}" = set; then 1726 1743 echo $ECHO_N "(cached) $ECHO_C" >&6 1727 @@ -1111,11 +111 6,11 @@1744 @@ -1111,11 +1117,11 @@ 1728 1745 else ac_cv_prog_egrep='egrep' 1729 1746 fi 1730 1747 fi 1731 1748 -echo "$as_me:1114: result: $ac_cv_prog_egrep" >&5 1732 +echo "$as_me:11 19: result: $ac_cv_prog_egrep" >&51749 +echo "$as_me:1120: result: $ac_cv_prog_egrep" >&5 1733 1750 echo "${ECHO_T}$ac_cv_prog_egrep" >&6 1734 1751 EGREP=$ac_cv_prog_egrep 1735 1752 1736 1753 -test -z "$EGREP" && { { echo "$as_me:1118: error: No egrep program found" >&5 1737 +test -z "$EGREP" && { { echo "$as_me:112 3: error: No egrep program found" >&51754 +test -z "$EGREP" && { { echo "$as_me:1124: error: No egrep program found" >&5 1738 1755 echo "$as_me: error: No egrep program found" >&2;} 1739 1756 { (exit 1); exit 1; }; } 1740 1757 1741 @@ -1125,7 +113 0,7 @@1758 @@ -1125,7 +1131,7 @@ 1742 1759 cf_cv_abi_version=${NCURSES_MAJOR} 1743 1760 cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR} 1744 1761 cf_cv_timestamp=`date` 1745 1762 -echo "$as_me:1128: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 1746 +echo "$as_me:113 3: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&51763 +echo "$as_me:1134: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 1747 1764 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6 1748 1765 1749 1766 test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0 1750 @@ -1133,7 +113 8,7 @@1767 @@ -1133,7 +1139,7 @@ 1751 1768 # Check whether --with-rel-version or --without-rel-version was given. 1752 1769 if test "${with_rel_version+set}" = set; then 1753 1770 withval="$with_rel_version" 1754 1771 - { echo "$as_me:1136: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5 1755 + { echo "$as_me:114 1: WARNING: overriding release version $cf_cv_rel_version to $withval" >&51772 + { echo "$as_me:1142: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5 1756 1773 echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;} 1757 1774 cf_cv_rel_version=$withval 1758 1775 fi; 1759 @@ -1146,13 +115 1,13 @@1776 @@ -1146,13 +1152,13 @@ 1760 1777 [0-9]*) #(vi 1761 1778 ;; 1762 1779 *) 1763 1780 - { { echo "$as_me:1149: error: Release major-version is not a number: $NCURSES_MAJOR" >&5 1764 + { { echo "$as_me:115 4: error: Release major-version is not a number: $NCURSES_MAJOR" >&51781 + { { echo "$as_me:1155: error: Release major-version is not a number: $NCURSES_MAJOR" >&5 1765 1782 echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;} 1766 1783 { (exit 1); exit 1; }; } … … 1769 1786 else 1770 1787 - { { echo "$as_me:1155: error: Release major-version value is empty" >&5 1771 + { { echo "$as_me:116 0: error: Release major-version value is empty" >&51788 + { { echo "$as_me:1161: error: Release major-version value is empty" >&5 1772 1789 echo "$as_me: error: Release major-version value is empty" >&2;} 1773 1790 { (exit 1); exit 1; }; } 1774 1791 fi 1775 @@ -1162,13 +116 7,13 @@1792 @@ -1162,13 +1168,13 @@ 1776 1793 [0-9]*) #(vi 1777 1794 ;; 1778 1795 *) 1779 1796 - { { echo "$as_me:1165: error: Release minor-version is not a number: $NCURSES_MINOR" >&5 1780 + { { echo "$as_me:117 0: error: Release minor-version is not a number: $NCURSES_MINOR" >&51797 + { { echo "$as_me:1171: error: Release minor-version is not a number: $NCURSES_MINOR" >&5 1781 1798 echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;} 1782 1799 { (exit 1); exit 1; }; } … … 1785 1802 else 1786 1803 - { { echo "$as_me:1171: error: Release minor-version value is empty" >&5 1787 + { { echo "$as_me:117 6: error: Release minor-version value is empty" >&51804 + { { echo "$as_me:1177: error: Release minor-version value is empty" >&5 1788 1805 echo "$as_me: error: Release minor-version value is empty" >&2;} 1789 1806 { (exit 1); exit 1; }; } 1790 1807 fi 1791 @@ -1178,7 +118 3,7 @@1808 @@ -1178,7 +1184,7 @@ 1792 1809 # Check whether --with-abi-version or --without-abi-version was given. 1793 1810 if test "${with_abi_version+set}" = set; then 1794 1811 withval="$with_abi_version" 1795 1812 - { echo "$as_me:1181: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5 1796 + { echo "$as_me:118 6: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&51813 + { echo "$as_me:1187: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5 1797 1814 echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;} 1798 1815 cf_cv_abi_version=$withval 1799 1816 fi; 1800 @@ -1188,13 +119 3,13 @@1817 @@ -1188,13 +1194,13 @@ 1801 1818 [0-9]*) #(vi 1802 1819 ;; 1803 1820 *) 1804 1821 - { { echo "$as_me:1191: error: ABI version is not a number: $cf_cv_abi_version" >&5 1805 + { { echo "$as_me:119 6: error: ABI version is not a number: $cf_cv_abi_version" >&51822 + { { echo "$as_me:1197: error: ABI version is not a number: $cf_cv_abi_version" >&5 1806 1823 echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;} 1807 1824 { (exit 1); exit 1; }; } … … 1810 1827 else 1811 1828 - { { echo "$as_me:1197: error: ABI version value is empty" >&5 1812 + { { echo "$as_me:120 2: error: ABI version value is empty" >&51829 + { { echo "$as_me:1203: error: ABI version value is empty" >&5 1813 1830 echo "$as_me: error: ABI version value is empty" >&2;} 1814 1831 { (exit 1); exit 1; }; } 1815 1832 fi 1816 @@ -1216,7 +122 1,7 @@1833 @@ -1216,7 +1222,7 @@ 1817 1834 fi 1818 1835 done 1819 1836 if test -z "$ac_aux_dir"; then 1820 1837 - { { echo "$as_me:1219: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 1821 + { { echo "$as_me:122 4: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&51838 + { { echo "$as_me:1225: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 1822 1839 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} 1823 1840 { (exit 1); exit 1; }; } 1824 1841 fi 1825 @@ -1226,11 +123 1,11 @@1842 @@ -1226,11 +1232,11 @@ 1826 1843 1827 1844 # Make sure we can run config.sub. 1828 1845 $ac_config_sub sun4 >/dev/null 2>&1 || 1829 1846 - { { echo "$as_me:1229: error: cannot run $ac_config_sub" >&5 1830 + { { echo "$as_me:123 4: error: cannot run $ac_config_sub" >&51847 + { { echo "$as_me:1235: error: cannot run $ac_config_sub" >&5 1831 1848 echo "$as_me: error: cannot run $ac_config_sub" >&2;} 1832 1849 { (exit 1); exit 1; }; } 1833 1850 1834 1851 -echo "$as_me:1233: checking build system type" >&5 1835 +echo "$as_me:123 8: checking build system type" >&51852 +echo "$as_me:1239: checking build system type" >&5 1836 1853 echo $ECHO_N "checking build system type... $ECHO_C" >&6 1837 1854 if test "${ac_cv_build+set}" = set; then 1838 1855 echo $ECHO_N "(cached) $ECHO_C" >&6 1839 @@ -1239,23 +124 4,23 @@1856 @@ -1239,23 +1245,23 @@ 1840 1857 test -z "$ac_cv_build_alias" && 1841 1858 ac_cv_build_alias=`$ac_config_guess` 1842 1859 test -z "$ac_cv_build_alias" && 1843 1860 - { { echo "$as_me:1242: error: cannot guess build type; you must specify one" >&5 1844 + { { echo "$as_me:124 7: error: cannot guess build type; you must specify one" >&51861 + { { echo "$as_me:1248: error: cannot guess build type; you must specify one" >&5 1845 1862 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} 1846 1863 { (exit 1); exit 1; }; } 1847 1864 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || 1848 1865 - { { echo "$as_me:1246: error: $ac_config_sub $ac_cv_build_alias failed." >&5 1849 + { { echo "$as_me:125 1: error: $ac_config_sub $ac_cv_build_alias failed." >&51866 + { { echo "$as_me:1252: error: $ac_config_sub $ac_cv_build_alias failed." >&5 1850 1867 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} 1851 1868 { (exit 1); exit 1; }; } … … 1853 1870 fi 1854 1871 -echo "$as_me:1251: result: $ac_cv_build" >&5 1855 +echo "$as_me:125 6: result: $ac_cv_build" >&51872 +echo "$as_me:1257: result: $ac_cv_build" >&5 1856 1873 echo "${ECHO_T}$ac_cv_build" >&6 1857 1874 build=$ac_cv_build … … 1861 1878 1862 1879 -echo "$as_me:1258: checking host system type" >&5 1863 +echo "$as_me:126 3: checking host system type" >&51880 +echo "$as_me:1264: checking host system type" >&5 1864 1881 echo $ECHO_N "checking host system type... $ECHO_C" >&6 1865 1882 if test "${ac_cv_host+set}" = set; then 1866 1883 echo $ECHO_N "(cached) $ECHO_C" >&6 1867 @@ -1264,12 +12 69,12 @@1884 @@ -1264,12 +1270,12 @@ 1868 1885 test -z "$ac_cv_host_alias" && 1869 1886 ac_cv_host_alias=$ac_cv_build_alias 1870 1887 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || 1871 1888 - { { echo "$as_me:1267: error: $ac_config_sub $ac_cv_host_alias failed" >&5 1872 + { { echo "$as_me:127 2: error: $ac_config_sub $ac_cv_host_alias failed" >&51889 + { { echo "$as_me:1273: error: $ac_config_sub $ac_cv_host_alias failed" >&5 1873 1890 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} 1874 1891 { (exit 1); exit 1; }; } … … 1876 1893 fi 1877 1894 -echo "$as_me:1272: result: $ac_cv_host" >&5 1878 +echo "$as_me:127 7: result: $ac_cv_host" >&51895 +echo "$as_me:1278: result: $ac_cv_host" >&5 1879 1896 echo "${ECHO_T}$ac_cv_host" >&6 1880 1897 host=$ac_cv_host 1881 1898 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` 1882 @@ -1277,7 +128 2,7 @@1899 @@ -1277,7 +1283,7 @@ 1883 1900 host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` 1884 1901 1885 1902 if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then 1886 1903 - echo "$as_me:1280: checking target system type" >&5 1887 + echo "$as_me:128 5: checking target system type" >&51904 + echo "$as_me:1286: checking target system type" >&5 1888 1905 echo $ECHO_N "checking target system type... $ECHO_C" >&6 1889 1906 if test "${ac_cv_target+set}" = set; then 1890 1907 echo $ECHO_N "(cached) $ECHO_C" >&6 1891 @@ -1286,12 +129 1,12 @@1908 @@ -1286,12 +1292,12 @@ 1892 1909 test "x$ac_cv_target_alias" = "x" && 1893 1910 ac_cv_target_alias=$ac_cv_host_alias 1894 1911 ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || 1895 1912 - { { echo "$as_me:1289: error: $ac_config_sub $ac_cv_target_alias failed" >&5 1896 + { { echo "$as_me:129 4: error: $ac_config_sub $ac_cv_target_alias failed" >&51913 + { { echo "$as_me:1295: error: $ac_config_sub $ac_cv_target_alias failed" >&5 1897 1914 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} 1898 1915 { (exit 1); exit 1; }; } … … 1900 1917 fi 1901 1918 -echo "$as_me:1294: result: $ac_cv_target" >&5 1902 +echo "$as_me:1 299: result: $ac_cv_target" >&51919 +echo "$as_me:1300: result: $ac_cv_target" >&5 1903 1920 echo "${ECHO_T}$ac_cv_target" >&6 1904 1921 target=$ac_cv_target 1905 1922 target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` 1906 @@ -1322,13 +132 7,13 @@1923 @@ -1322,13 +1328,13 @@ 1907 1924 fi 1908 1925 1909 1926 test -z "$system_name" && system_name="$cf_cv_system_name" 1910 1927 -test -n "$cf_cv_system_name" && echo "$as_me:1325: result: Configuring for $cf_cv_system_name" >&5 1911 +test -n "$cf_cv_system_name" && echo "$as_me:133 0: result: Configuring for $cf_cv_system_name" >&51928 +test -n "$cf_cv_system_name" && echo "$as_me:1331: result: Configuring for $cf_cv_system_name" >&5 1912 1929 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 1913 1930 1914 1931 if test ".$system_name" != ".$cf_cv_system_name" ; then 1915 1932 - echo "$as_me:1329: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 1916 + echo "$as_me:133 4: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&51933 + echo "$as_me:1335: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 1917 1934 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 1918 1935 - { { echo "$as_me:1331: error: \"Please remove config.cache and try again.\"" >&5 1919 + { { echo "$as_me:133 6: error: \"Please remove config.cache and try again.\"" >&51936 + { { echo "$as_me:1337: error: \"Please remove config.cache and try again.\"" >&5 1920 1937 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} 1921 1938 { (exit 1); exit 1; }; } 1922 1939 fi 1923 @@ -1336,7 +134 1,7 @@1940 @@ -1336,7 +1342,7 @@ 1924 1941 # Check whether --with-system-type or --without-system-type was given. 1925 1942 if test "${with_system_type+set}" = set; then 1926 1943 withval="$with_system_type" 1927 1944 - { echo "$as_me:1339: WARNING: overriding system type to $withval" >&5 1928 + { echo "$as_me:134 4: WARNING: overriding system type to $withval" >&51945 + { echo "$as_me:1345: WARNING: overriding system type to $withval" >&5 1929 1946 echo "$as_me: WARNING: overriding system type to $withval" >&2;} 1930 1947 cf_cv_system_name=$withval 1931 1948 fi; 1932 @@ -1346,7 +135 1,7 @@1949 @@ -1346,7 +1352,7 @@ 1933 1950 1934 1951 ### Default install-location 1935 1952 1936 1953 -echo "$as_me:1349: checking for prefix" >&5 1937 +echo "$as_me:135 4: checking for prefix" >&51954 +echo "$as_me:1355: checking for prefix" >&5 1938 1955 echo $ECHO_N "checking for prefix... $ECHO_C" >&6 1939 1956 if test "x$prefix" = "xNONE" ; then 1940 1957 case "$cf_cv_system_name" in 1941 @@ -1358,11 +136 3,11 @@1958 @@ -1358,11 +1364,11 @@ 1942 1959 ;; 1943 1960 esac 1944 1961 fi 1945 1962 -echo "$as_me:1361: result: $prefix" >&5 1946 +echo "$as_me:136 6: result: $prefix" >&51963 +echo "$as_me:1367: result: $prefix" >&5 1947 1964 echo "${ECHO_T}$prefix" >&6 1948 1965 1949 1966 if test "x$prefix" = "xNONE" ; then 1950 1967 -echo "$as_me:1365: checking for default include-directory" >&5 1951 +echo "$as_me:137 0: checking for default include-directory" >&51968 +echo "$as_me:1371: checking for default include-directory" >&5 1952 1969 echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6 1953 1970 test -n "$verbose" && echo 1>&6 1954 1971 for cf_symbol in \ 1955 @@ -1385,7 +139 0,7 @@1972 @@ -1385,7 +1391,7 @@ 1956 1973 fi 1957 1974 test -n "$verbose" && echo " tested $cf_dir" 1>&6 1958 1975 done 1959 1976 -echo "$as_me:1388: result: $includedir" >&5 1960 +echo "$as_me:139 3: result: $includedir" >&51977 +echo "$as_me:1394: result: $includedir" >&5 1961 1978 echo "${ECHO_T}$includedir" >&6 1962 1979 fi 1963 1980 1964 @@ -1399,7 +140 4,7 @@1981 @@ -1399,7 +1405,7 @@ 1965 1982 if test -n "$ac_tool_prefix"; then 1966 1983 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. 1967 1984 set dummy ${ac_tool_prefix}gcc; ac_word=$2 1968 1985 -echo "$as_me:1402: checking for $ac_word" >&5 1969 +echo "$as_me:140 7: checking for $ac_word" >&51986 +echo "$as_me:1408: checking for $ac_word" >&5 1970 1987 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 1971 1988 if test "${ac_cv_prog_CC+set}" = set; then 1972 1989 echo $ECHO_N "(cached) $ECHO_C" >&6 1973 @@ -1414,7 +14 19,7 @@1990 @@ -1414,7 +1420,7 @@ 1974 1991 test -z "$ac_dir" && ac_dir=. 1975 1992 $as_executable_p "$ac_dir/$ac_word" || continue 1976 1993 ac_cv_prog_CC="${ac_tool_prefix}gcc" 1977 1994 -echo "$as_me:1417: found $ac_dir/$ac_word" >&5 1978 +echo "$as_me:142 2: found $ac_dir/$ac_word" >&51995 +echo "$as_me:1423: found $ac_dir/$ac_word" >&5 1979 1996 break 1980 1997 done 1981 1998 1982 @@ -1422,10 +142 7,10 @@1999 @@ -1422,10 +1428,10 @@ 1983 2000 fi 1984 2001 CC=$ac_cv_prog_CC 1985 2002 if test -n "$CC"; then 1986 2003 - echo "$as_me:1425: result: $CC" >&5 1987 + echo "$as_me:143 0: result: $CC" >&52004 + echo "$as_me:1431: result: $CC" >&5 1988 2005 echo "${ECHO_T}$CC" >&6 1989 2006 else 1990 2007 - echo "$as_me:1428: result: no" >&5 1991 + echo "$as_me:143 3: result: no" >&52008 + echo "$as_me:1434: result: no" >&5 1992 2009 echo "${ECHO_T}no" >&6 1993 2010 fi 1994 2011 1995 @@ -1434,7 +14 39,7 @@2012 @@ -1434,7 +1440,7 @@ 1996 2013 ac_ct_CC=$CC 1997 2014 # Extract the first word of "gcc", so it can be a program name with args. 1998 2015 set dummy gcc; ac_word=$2 1999 2016 -echo "$as_me:1437: checking for $ac_word" >&5 2000 +echo "$as_me:144 2: checking for $ac_word" >&52017 +echo "$as_me:1443: checking for $ac_word" >&5 2001 2018 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 2002 2019 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then 2003 2020 echo $ECHO_N "(cached) $ECHO_C" >&6 2004 @@ -1449,7 +145 4,7 @@2021 @@ -1449,7 +1455,7 @@ 2005 2022 test -z "$ac_dir" && ac_dir=. 2006 2023 $as_executable_p "$ac_dir/$ac_word" || continue 2007 2024 ac_cv_prog_ac_ct_CC="gcc" 2008 2025 -echo "$as_me:1452: found $ac_dir/$ac_word" >&5 2009 +echo "$as_me:145 7: found $ac_dir/$ac_word" >&52026 +echo "$as_me:1458: found $ac_dir/$ac_word" >&5 2010 2027 break 2011 2028 done 2012 2029 2013 @@ -1457,10 +146 2,10 @@2030 @@ -1457,10 +1463,10 @@ 2014 2031 fi 2015 2032 ac_ct_CC=$ac_cv_prog_ac_ct_CC 2016 2033 if test -n "$ac_ct_CC"; then 2017 2034 - echo "$as_me:1460: result: $ac_ct_CC" >&5 2018 + echo "$as_me:146 5: result: $ac_ct_CC" >&52035 + echo "$as_me:1466: result: $ac_ct_CC" >&5 2019 2036 echo "${ECHO_T}$ac_ct_CC" >&6 2020 2037 else 2021 2038 - echo "$as_me:1463: result: no" >&5 2022 + echo "$as_me:146 8: result: no" >&52039 + echo "$as_me:1469: result: no" >&5 2023 2040 echo "${ECHO_T}no" >&6 2024 2041 fi 2025 2042 2026 @@ -1473,7 +147 8,7 @@2043 @@ -1473,7 +1479,7 @@ 2027 2044 if test -n "$ac_tool_prefix"; then 2028 2045 # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. 2029 2046 set dummy ${ac_tool_prefix}cc; ac_word=$2 2030 2047 -echo "$as_me:1476: checking for $ac_word" >&5 2031 +echo "$as_me:148 1: checking for $ac_word" >&52048 +echo "$as_me:1482: checking for $ac_word" >&5 2032 2049 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 2033 2050 if test "${ac_cv_prog_CC+set}" = set; then 2034 2051 echo $ECHO_N "(cached) $ECHO_C" >&6 2035 @@ -1488,7 +149 3,7 @@2052 @@ -1488,7 +1494,7 @@ 2036 2053 test -z "$ac_dir" && ac_dir=. 2037 2054 $as_executable_p "$ac_dir/$ac_word" || continue 2038 2055 ac_cv_prog_CC="${ac_tool_prefix}cc" 2039 2056 -echo "$as_me:1491: found $ac_dir/$ac_word" >&5 2040 +echo "$as_me:149 6: found $ac_dir/$ac_word" >&52057 +echo "$as_me:1497: found $ac_dir/$ac_word" >&5 2041 2058 break 2042 2059 done 2043 2060 2044 @@ -1496,10 +150 1,10 @@2061 @@ -1496,10 +1502,10 @@ 2045 2062 fi 2046 2063 CC=$ac_cv_prog_CC 2047 2064 if test -n "$CC"; then 2048 2065 - echo "$as_me:1499: result: $CC" >&5 2049 + echo "$as_me:150 4: result: $CC" >&52066 + echo "$as_me:1505: result: $CC" >&5 2050 2067 echo "${ECHO_T}$CC" >&6 2051 2068 else 2052 2069 - echo "$as_me:1502: result: no" >&5 2053 + echo "$as_me:150 7: result: no" >&52070 + echo "$as_me:1508: result: no" >&5 2054 2071 echo "${ECHO_T}no" >&6 2055 2072 fi 2056 2073 2057 @@ -1508,7 +151 3,7 @@2074 @@ -1508,7 +1514,7 @@ 2058 2075 ac_ct_CC=$CC 2059 2076 # Extract the first word of "cc", so it can be a program name with args. 2060 2077 set dummy cc; ac_word=$2 2061 2078 -echo "$as_me:1511: checking for $ac_word" >&5 2062 +echo "$as_me:151 6: checking for $ac_word" >&52079 +echo "$as_me:1517: checking for $ac_word" >&5 2063 2080 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 2064 2081 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then 2065 2082 echo $ECHO_N "(cached) $ECHO_C" >&6 2066 @@ -1523,7 +152 8,7 @@2083 @@ -1523,7 +1529,7 @@ 2067 2084 test -z "$ac_dir" && ac_dir=. 2068 2085 $as_executable_p "$ac_dir/$ac_word" || continue 2069 2086 ac_cv_prog_ac_ct_CC="cc" 2070 2087 -echo "$as_me:1526: found $ac_dir/$ac_word" >&5 2071 +echo "$as_me:153 1: found $ac_dir/$ac_word" >&52088 +echo "$as_me:1532: found $ac_dir/$ac_word" >&5 2072 2089 break 2073 2090 done 2074 2091 2075 @@ -1531,10 +153 6,10 @@2092 @@ -1531,10 +1537,10 @@ 2076 2093 fi 2077 2094 ac_ct_CC=$ac_cv_prog_ac_ct_CC 2078 2095 if test -n "$ac_ct_CC"; then 2079 2096 - echo "$as_me:1534: result: $ac_ct_CC" >&5 2080 + echo "$as_me:15 39: result: $ac_ct_CC" >&52097 + echo "$as_me:1540: result: $ac_ct_CC" >&5 2081 2098 echo "${ECHO_T}$ac_ct_CC" >&6 2082 2099 else 2083 2100 - echo "$as_me:1537: result: no" >&5 2084 + echo "$as_me:154 2: result: no" >&52101 + echo "$as_me:1543: result: no" >&5 2085 2102 echo "${ECHO_T}no" >&6 2086 2103 fi 2087 2104 2088 @@ -1547,7 +155 2,7 @@2105 @@ -1547,7 +1553,7 @@ 2089 2106 if test -z "$CC"; then 2090 2107 # Extract the first word of "cc", so it can be a program name with args. 2091 2108 set dummy cc; ac_word=$2 2092 2109 -echo "$as_me:1550: checking for $ac_word" >&5 2093 +echo "$as_me:155 5: checking for $ac_word" >&52110 +echo "$as_me:1556: checking for $ac_word" >&5 2094 2111 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 2095 2112 if test "${ac_cv_prog_CC+set}" = set; then 2096 2113 echo $ECHO_N "(cached) $ECHO_C" >&6 2097 @@ -1567,7 +157 2,7 @@2114 @@ -1567,7 +1573,7 @@ 2098 2115 continue 2099 2116 fi 2100 2117 ac_cv_prog_CC="cc" 2101 2118 -echo "$as_me:1570: found $ac_dir/$ac_word" >&5 2102 +echo "$as_me:157 5: found $ac_dir/$ac_word" >&52119 +echo "$as_me:1576: found $ac_dir/$ac_word" >&5 2103 2120 break 2104 2121 done 2105 2122 2106 @@ -1589,10 +159 4,10 @@2123 @@ -1589,10 +1595,10 @@ 2107 2124 fi 2108 2125 CC=$ac_cv_prog_CC 2109 2126 if test -n "$CC"; then 2110 2127 - echo "$as_me:1592: result: $CC" >&5 2111 + echo "$as_me:159 7: result: $CC" >&52128 + echo "$as_me:1598: result: $CC" >&5 2112 2129 echo "${ECHO_T}$CC" >&6 2113 2130 else 2114 2131 - echo "$as_me:1595: result: no" >&5 2115 + echo "$as_me:160 0: result: no" >&52132 + echo "$as_me:1601: result: no" >&5 2116 2133 echo "${ECHO_T}no" >&6 2117 2134 fi 2118 2135 2119 @@ -1603,7 +160 8,7 @@2136 @@ -1603,7 +1609,7 @@ 2120 2137 do 2121 2138 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 2122 2139 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 2123 2140 -echo "$as_me:1606: checking for $ac_word" >&5 2124 +echo "$as_me:161 1: checking for $ac_word" >&52141 +echo "$as_me:1612: checking for $ac_word" >&5 2125 2142 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 2126 2143 if test "${ac_cv_prog_CC+set}" = set; then 2127 2144 echo $ECHO_N "(cached) $ECHO_C" >&6 2128 @@ -1618,7 +162 3,7 @@2145 @@ -1618,7 +1624,7 @@ 2129 2146 test -z "$ac_dir" && ac_dir=. 2130 2147 $as_executable_p "$ac_dir/$ac_word" || continue 2131 2148 ac_cv_prog_CC="$ac_tool_prefix$ac_prog" 2132 2149 -echo "$as_me:1621: found $ac_dir/$ac_word" >&5 2133 +echo "$as_me:162 6: found $ac_dir/$ac_word" >&52150 +echo "$as_me:1627: found $ac_dir/$ac_word" >&5 2134 2151 break 2135 2152 done 2136 2153 2137 @@ -1626,10 +163 1,10 @@2154 @@ -1626,10 +1632,10 @@ 2138 2155 fi 2139 2156 CC=$ac_cv_prog_CC 2140 2157 if test -n "$CC"; then 2141 2158 - echo "$as_me:1629: result: $CC" >&5 2142 + echo "$as_me:163 4: result: $CC" >&52159 + echo "$as_me:1635: result: $CC" >&5 2143 2160 echo "${ECHO_T}$CC" >&6 2144 2161 else 2145 2162 - echo "$as_me:1632: result: no" >&5 2146 + echo "$as_me:163 7: result: no" >&52163 + echo "$as_me:1638: result: no" >&5 2147 2164 echo "${ECHO_T}no" >&6 2148 2165 fi 2149 2166 2150 @@ -1642,7 +164 7,7 @@2167 @@ -1642,7 +1648,7 @@ 2151 2168 do 2152 2169 # Extract the first word of "$ac_prog", so it can be a program name with args. 2153 2170 set dummy $ac_prog; ac_word=$2 2154 2171 -echo "$as_me:1645: checking for $ac_word" >&5 2155 +echo "$as_me:165 0: checking for $ac_word" >&52172 +echo "$as_me:1651: checking for $ac_word" >&5 2156 2173 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 2157 2174 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then 2158 2175 echo $ECHO_N "(cached) $ECHO_C" >&6 2159 @@ -1657,7 +166 2,7 @@2176 @@ -1657,7 +1663,7 @@ 2160 2177 test -z "$ac_dir" && ac_dir=. 2161 2178 $as_executable_p "$ac_dir/$ac_word" || continue 2162 2179 ac_cv_prog_ac_ct_CC="$ac_prog" 2163 2180 -echo "$as_me:1660: found $ac_dir/$ac_word" >&5 2164 +echo "$as_me:166 5: found $ac_dir/$ac_word" >&52181 +echo "$as_me:1666: found $ac_dir/$ac_word" >&5 2165 2182 break 2166 2183 done 2167 2184 2168 @@ -1665,10 +167 0,10 @@2185 @@ -1665,10 +1671,10 @@ 2169 2186 fi 2170 2187 ac_ct_CC=$ac_cv_prog_ac_ct_CC 2171 2188 if test -n "$ac_ct_CC"; then 2172 2189 - echo "$as_me:1668: result: $ac_ct_CC" >&5 2173 + echo "$as_me:167 3: result: $ac_ct_CC" >&52190 + echo "$as_me:1674: result: $ac_ct_CC" >&5 2174 2191 echo "${ECHO_T}$ac_ct_CC" >&6 2175 2192 else 2176 2193 - echo "$as_me:1671: result: no" >&5 2177 + echo "$as_me:167 6: result: no" >&52194 + echo "$as_me:1677: result: no" >&5 2178 2195 echo "${ECHO_T}no" >&6 2179 2196 fi 2180 2197 2181 @@ -1680,32 +168 5,32 @@2198 @@ -1680,32 +1686,32 @@ 2182 2199 2183 2200 fi 2184 2201 2185 2202 -test -z "$CC" && { { echo "$as_me:1683: error: no acceptable cc found in \$PATH" >&5 2186 +test -z "$CC" && { { echo "$as_me:168 8: error: no acceptable cc found in \$PATH" >&52203 +test -z "$CC" && { { echo "$as_me:1689: error: no acceptable cc found in \$PATH" >&5 2187 2204 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} 2188 2205 { (exit 1); exit 1; }; } … … 2190 2207 # Provide some information about the compiler. 2191 2208 -echo "$as_me:1688:" \ 2192 +echo "$as_me:169 3:" \2209 +echo "$as_me:1694:" \ 2193 2210 "checking for C compiler version" >&5 2194 2211 ac_compiler=`set X $ac_compile; echo $2` 2195 2212 -{ (eval echo "$as_me:1691: \"$ac_compiler --version </dev/null >&5\"") >&5 2196 +{ (eval echo "$as_me:169 6: \"$ac_compiler --version </dev/null >&5\"") >&52213 +{ (eval echo "$as_me:1697: \"$ac_compiler --version </dev/null >&5\"") >&5 2197 2214 (eval $ac_compiler --version </dev/null >&5) 2>&5 2198 2215 ac_status=$? 2199 2216 - echo "$as_me:1694: \$? = $ac_status" >&5 2200 + echo "$as_me:1 699: \$? = $ac_status" >&52217 + echo "$as_me:1700: \$? = $ac_status" >&5 2201 2218 (exit $ac_status); } 2202 2219 -{ (eval echo "$as_me:1696: \"$ac_compiler -v </dev/null >&5\"") >&5 2203 +{ (eval echo "$as_me:170 1: \"$ac_compiler -v </dev/null >&5\"") >&52220 +{ (eval echo "$as_me:1702: \"$ac_compiler -v </dev/null >&5\"") >&5 2204 2221 (eval $ac_compiler -v </dev/null >&5) 2>&5 2205 2222 ac_status=$? 2206 2223 - echo "$as_me:1699: \$? = $ac_status" >&5 2207 + echo "$as_me:170 4: \$? = $ac_status" >&52224 + echo "$as_me:1705: \$? = $ac_status" >&5 2208 2225 (exit $ac_status); } 2209 2226 -{ (eval echo "$as_me:1701: \"$ac_compiler -V </dev/null >&5\"") >&5 2210 +{ (eval echo "$as_me:170 6: \"$ac_compiler -V </dev/null >&5\"") >&52227 +{ (eval echo "$as_me:1707: \"$ac_compiler -V </dev/null >&5\"") >&5 2211 2228 (eval $ac_compiler -V </dev/null >&5) 2>&5 2212 2229 ac_status=$? 2213 2230 - echo "$as_me:1704: \$? = $ac_status" >&5 2214 + echo "$as_me:17 09: \$? = $ac_status" >&52231 + echo "$as_me:1710: \$? = $ac_status" >&5 2215 2232 (exit $ac_status); } 2216 2233 2217 2234 cat >conftest.$ac_ext <<_ACEOF 2218 2235 -#line 1708 "configure" 2219 +#line 171 3"configure"2236 +#line 1714 "configure" 2220 2237 #include "confdefs.h" 2221 2238 2222 2239 int 2223 @@ -1721,13 +172 6,13 @@2240 @@ -1721,13 +1727,13 @@ 2224 2241 # Try to create an executable without -o first, disregard a.out. 2225 2242 # It will help us diagnose broken compilers, and finding out an intuition 2226 2243 # of exeext. 2227 2244 -echo "$as_me:1724: checking for C compiler default output" >&5 2228 +echo "$as_me:17 29: checking for C compiler default output" >&52245 +echo "$as_me:1730: checking for C compiler default output" >&5 2229 2246 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 2230 2247 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` 2231 2248 -if { (eval echo "$as_me:1727: \"$ac_link_default\"") >&5 2232 +if { (eval echo "$as_me:173 2: \"$ac_link_default\"") >&52249 +if { (eval echo "$as_me:1733: \"$ac_link_default\"") >&5 2233 2250 (eval $ac_link_default) 2>&5 2234 2251 ac_status=$? 2235 2252 - echo "$as_me:1730: \$? = $ac_status" >&5 2236 + echo "$as_me:173 5: \$? = $ac_status" >&52253 + echo "$as_me:1736: \$? = $ac_status" >&5 2237 2254 (exit $ac_status); }; then 2238 2255 # Find the output, starting from the most likely. This scheme is 2239 2256 # not robust to junk in `.', hence go to wildcards (a.*) only as a last 2240 @@ -1736,7 +174 1,7 @@2257 @@ -1736,7 +1742,7 @@ 2241 2258 ls a.out conftest 2>/dev/null; 2242 2259 ls a.* conftest.* 2>/dev/null`; do … … 2247 2264 # certainly right. 2248 2265 break;; 2249 @@ -1750,34 +175 5,34 @@2266 @@ -1750,34 +1756,34 @@ 2250 2267 else 2251 2268 echo "$as_me: failed program was:" >&5 2252 2269 cat conftest.$ac_ext >&5 2253 2270 -{ { echo "$as_me:1753: error: C compiler cannot create executables" >&5 2254 +{ { echo "$as_me:175 8: error: C compiler cannot create executables" >&52271 +{ { echo "$as_me:1759: error: C compiler cannot create executables" >&5 2255 2272 echo "$as_me: error: C compiler cannot create executables" >&2;} 2256 2273 { (exit 77); exit 77; }; } … … 2259 2276 ac_exeext=$ac_cv_exeext 2260 2277 -echo "$as_me:1759: result: $ac_file" >&5 2261 +echo "$as_me:176 4: result: $ac_file" >&52278 +echo "$as_me:1765: result: $ac_file" >&5 2262 2279 echo "${ECHO_T}$ac_file" >&6 2263 2280 … … 2265 2282 # the compiler is broken, or we cross compile. 2266 2283 -echo "$as_me:1764: checking whether the C compiler works" >&5 2267 +echo "$as_me:17 69: checking whether the C compiler works" >&52284 +echo "$as_me:1770: checking whether the C compiler works" >&5 2268 2285 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 2269 2286 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 … … 2272 2289 if { ac_try='./$ac_file' 2273 2290 - { (eval echo "$as_me:1770: \"$ac_try\"") >&5 2274 + { (eval echo "$as_me:177 5: \"$ac_try\"") >&52291 + { (eval echo "$as_me:1776: \"$ac_try\"") >&5 2275 2292 (eval $ac_try) 2>&5 2276 2293 ac_status=$? 2277 2294 - echo "$as_me:1773: \$? = $ac_status" >&5 2278 + echo "$as_me:177 8: \$? = $ac_status" >&52295 + echo "$as_me:1779: \$? = $ac_status" >&5 2279 2296 (exit $ac_status); }; }; then 2280 2297 cross_compiling=no … … 2284 2301 else 2285 2302 - { { echo "$as_me:1780: error: cannot run C compiled programs. 2286 + { { echo "$as_me:178 5: error: cannot run C compiled programs.2303 + { { echo "$as_me:1786: error: cannot run C compiled programs. 2287 2304 If you meant to cross compile, use \`--host'." >&5 2288 2305 echo "$as_me: error: cannot run C compiled programs. 2289 2306 If you meant to cross compile, use \`--host'." >&2;} 2290 @@ -1785,24 +179 0,24 @@2307 @@ -1785,24 +1791,24 @@ 2291 2308 fi 2292 2309 fi 2293 2310 fi 2294 2311 -echo "$as_me:1788: result: yes" >&5 2295 +echo "$as_me:179 3: result: yes" >&52312 +echo "$as_me:1794: result: yes" >&5 2296 2313 echo "${ECHO_T}yes" >&6 2297 2314 … … 2301 2318 # the compiler is broken, or we cross compile. 2302 2319 -echo "$as_me:1795: checking whether we are cross compiling" >&5 2303 +echo "$as_me:180 0: checking whether we are cross compiling" >&52320 +echo "$as_me:1801: checking whether we are cross compiling" >&5 2304 2321 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 2305 2322 -echo "$as_me:1797: result: $cross_compiling" >&5 2306 +echo "$as_me:180 2: result: $cross_compiling" >&52323 +echo "$as_me:1803: result: $cross_compiling" >&5 2307 2324 echo "${ECHO_T}$cross_compiling" >&6 2308 2325 2309 2326 -echo "$as_me:1800: checking for executable suffix" >&5 2310 +echo "$as_me:180 5: checking for executable suffix" >&52327 +echo "$as_me:1806: checking for executable suffix" >&5 2311 2328 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 2312 2329 -if { (eval echo "$as_me:1802: \"$ac_link\"") >&5 2313 +if { (eval echo "$as_me:180 7: \"$ac_link\"") >&52330 +if { (eval echo "$as_me:1808: \"$ac_link\"") >&5 2314 2331 (eval $ac_link) 2>&5 2315 2332 ac_status=$? 2316 2333 - echo "$as_me:1805: \$? = $ac_status" >&5 2317 + echo "$as_me:181 0: \$? = $ac_status" >&52334 + echo "$as_me:1811: \$? = $ac_status" >&5 2318 2335 (exit $ac_status); }; then 2319 2336 # If both `conftest.exe' and `conftest' are `present' (well, observable) 2320 2337 # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will 2321 @@ -1810,7 +181 5,7 @@2338 @@ -1810,7 +1816,7 @@ 2322 2339 # `rm'. 2323 2340 for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do … … 2328 2345 export ac_cv_exeext 2329 2346 break;; 2330 @@ -1818,25 +182 3,25 @@2347 @@ -1818,25 +1824,25 @@ 2331 2348 esac 2332 2349 done 2333 2350 else 2334 2351 - { { echo "$as_me:1821: error: cannot compute EXEEXT: cannot compile and link" >&5 2335 + { { echo "$as_me:182 6: error: cannot compute EXEEXT: cannot compile and link" >&52352 + { { echo "$as_me:1827: error: cannot compute EXEEXT: cannot compile and link" >&5 2336 2353 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} 2337 2354 { (exit 1); exit 1; }; } … … 2340 2357 rm -f conftest$ac_cv_exeext 2341 2358 -echo "$as_me:1827: result: $ac_cv_exeext" >&5 2342 +echo "$as_me:183 2: result: $ac_cv_exeext" >&52359 +echo "$as_me:1833: result: $ac_cv_exeext" >&5 2343 2360 echo "${ECHO_T}$ac_cv_exeext" >&6 2344 2361 … … 2347 2364 ac_exeext=$EXEEXT 2348 2365 -echo "$as_me:1833: checking for object suffix" >&5 2349 +echo "$as_me:183 8: checking for object suffix" >&52366 +echo "$as_me:1839: checking for object suffix" >&5 2350 2367 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 2351 2368 if test "${ac_cv_objext+set}" = set; then … … 2354 2371 cat >conftest.$ac_ext <<_ACEOF 2355 2372 -#line 1839 "configure" 2356 +#line 184 4"configure"2373 +#line 1845 "configure" 2357 2374 #include "confdefs.h" 2358 2375 2359 2376 int 2360 @@ -1848,14 +185 3,14 @@2377 @@ -1848,14 +1854,14 @@ 2361 2378 } 2362 2379 _ACEOF 2363 2380 rm -f conftest.o conftest.obj 2364 2381 -if { (eval echo "$as_me:1851: \"$ac_compile\"") >&5 2365 +if { (eval echo "$as_me:185 6: \"$ac_compile\"") >&52382 +if { (eval echo "$as_me:1857: \"$ac_compile\"") >&5 2366 2383 (eval $ac_compile) 2>&5 2367 2384 ac_status=$? 2368 2385 - echo "$as_me:1854: \$? = $ac_status" >&5 2369 + echo "$as_me:18 59: \$? = $ac_status" >&52386 + echo "$as_me:1860: \$? = $ac_status" >&5 2370 2387 (exit $ac_status); }; then 2371 2388 for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do … … 2376 2393 break;; 2377 2394 esac 2378 @@ -1863,24 +186 8,24 @@2395 @@ -1863,24 +1869,24 @@ 2379 2396 else 2380 2397 echo "$as_me: failed program was:" >&5 2381 2398 cat conftest.$ac_ext >&5 2382 2399 -{ { echo "$as_me:1866: error: cannot compute OBJEXT: cannot compile" >&5 2383 +{ { echo "$as_me:187 1: error: cannot compute OBJEXT: cannot compile" >&52400 +{ { echo "$as_me:1872: error: cannot compute OBJEXT: cannot compile" >&5 2384 2401 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} 2385 2402 { (exit 1); exit 1; }; } … … 2389 2406 fi 2390 2407 -echo "$as_me:1873: result: $ac_cv_objext" >&5 2391 +echo "$as_me:187 8: result: $ac_cv_objext" >&52408 +echo "$as_me:1879: result: $ac_cv_objext" >&5 2392 2409 echo "${ECHO_T}$ac_cv_objext" >&6 2393 2410 OBJEXT=$ac_cv_objext 2394 2411 ac_objext=$OBJEXT 2395 2412 -echo "$as_me:1877: checking whether we are using the GNU C compiler" >&5 2396 +echo "$as_me:188 2: checking whether we are using the GNU C compiler" >&52413 +echo "$as_me:1883: checking whether we are using the GNU C compiler" >&5 2397 2414 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 2398 2415 if test "${ac_cv_c_compiler_gnu+set}" = set; then … … 2401 2418 cat >conftest.$ac_ext <<_ACEOF 2402 2419 -#line 1883 "configure" 2403 +#line 188 8"configure"2420 +#line 1889 "configure" 2404 2421 #include "confdefs.h" 2405 2422 2406 2423 int 2407 @@ -1895,16 +190 0,16 @@2424 @@ -1895,16 +1901,16 @@ 2408 2425 } 2409 2426 _ACEOF 2410 2427 rm -f conftest.$ac_objext 2411 2428 -if { (eval echo "$as_me:1898: \"$ac_compile\"") >&5 2412 +if { (eval echo "$as_me:190 3: \"$ac_compile\"") >&52429 +if { (eval echo "$as_me:1904: \"$ac_compile\"") >&5 2413 2430 (eval $ac_compile) 2>&5 2414 2431 ac_status=$? 2415 2432 - echo "$as_me:1901: \$? = $ac_status" >&5 2416 + echo "$as_me:190 6: \$? = $ac_status" >&52433 + echo "$as_me:1907: \$? = $ac_status" >&5 2417 2434 (exit $ac_status); } && 2418 2435 { ac_try='test -s conftest.$ac_objext' 2419 2436 - { (eval echo "$as_me:1904: \"$ac_try\"") >&5 2420 + { (eval echo "$as_me:19 09: \"$ac_try\"") >&52437 + { (eval echo "$as_me:1910: \"$ac_try\"") >&5 2421 2438 (eval $ac_try) 2>&5 2422 2439 ac_status=$? 2423 2440 - echo "$as_me:1907: \$? = $ac_status" >&5 2424 + echo "$as_me:191 2: \$? = $ac_status" >&52441 + echo "$as_me:1913: \$? = $ac_status" >&5 2425 2442 (exit $ac_status); }; }; then 2426 2443 ac_compiler_gnu=yes 2427 2444 else 2428 @@ -1916,19 +192 1,19 @@2445 @@ -1916,19 +1922,19 @@ 2429 2446 ac_cv_c_compiler_gnu=$ac_compiler_gnu 2430 2447 2431 2448 fi 2432 2449 -echo "$as_me:1919: result: $ac_cv_c_compiler_gnu" >&5 2433 +echo "$as_me:192 4: result: $ac_cv_c_compiler_gnu" >&52450 +echo "$as_me:1925: result: $ac_cv_c_compiler_gnu" >&5 2434 2451 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 2435 2452 GCC=`test $ac_compiler_gnu = yes && echo yes` … … 2438 2455 CFLAGS="-g" 2439 2456 -echo "$as_me:1925: checking whether $CC accepts -g" >&5 2440 +echo "$as_me:193 0: checking whether $CC accepts -g" >&52457 +echo "$as_me:1931: checking whether $CC accepts -g" >&5 2441 2458 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 2442 2459 if test "${ac_cv_prog_cc_g+set}" = set; then … … 2445 2462 cat >conftest.$ac_ext <<_ACEOF 2446 2463 -#line 1931 "configure" 2447 +#line 193 6"configure"2464 +#line 1937 "configure" 2448 2465 #include "confdefs.h" 2449 2466 2450 2467 int 2451 @@ -1940,16 +194 5,16 @@2468 @@ -1940,16 +1946,16 @@ 2452 2469 } 2453 2470 _ACEOF 2454 2471 rm -f conftest.$ac_objext 2455 2472 -if { (eval echo "$as_me:1943: \"$ac_compile\"") >&5 2456 +if { (eval echo "$as_me:194 8: \"$ac_compile\"") >&52473 +if { (eval echo "$as_me:1949: \"$ac_compile\"") >&5 2457 2474 (eval $ac_compile) 2>&5 2458 2475 ac_status=$? 2459 2476 - echo "$as_me:1946: \$? = $ac_status" >&5 2460 + echo "$as_me:195 1: \$? = $ac_status" >&52477 + echo "$as_me:1952: \$? = $ac_status" >&5 2461 2478 (exit $ac_status); } && 2462 2479 { ac_try='test -s conftest.$ac_objext' 2463 2480 - { (eval echo "$as_me:1949: \"$ac_try\"") >&5 2464 + { (eval echo "$as_me:195 4: \"$ac_try\"") >&52481 + { (eval echo "$as_me:1955: \"$ac_try\"") >&5 2465 2482 (eval $ac_try) 2>&5 2466 2483 ac_status=$? 2467 2484 - echo "$as_me:1952: \$? = $ac_status" >&5 2468 + echo "$as_me:195 7: \$? = $ac_status" >&52485 + echo "$as_me:1958: \$? = $ac_status" >&5 2469 2486 (exit $ac_status); }; }; then 2470 2487 ac_cv_prog_cc_g=yes 2471 2488 else 2472 @@ -1959,7 +196 4,7 @@2489 @@ -1959,7 +1965,7 @@ 2473 2490 fi 2474 2491 rm -f conftest.$ac_objext conftest.$ac_ext 2475 2492 fi 2476 2493 -echo "$as_me:1962: result: $ac_cv_prog_cc_g" >&5 2477 +echo "$as_me:196 7: result: $ac_cv_prog_cc_g" >&52494 +echo "$as_me:1968: result: $ac_cv_prog_cc_g" >&5 2478 2495 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 2479 2496 if test "$ac_test_CFLAGS" = set; then 2480 2497 CFLAGS=$ac_save_CFLAGS 2481 @@ -1986,16 +199 1,16 @@2498 @@ -1986,16 +1992,16 @@ 2482 2499 #endif 2483 2500 _ACEOF 2484 2501 rm -f conftest.$ac_objext 2485 2502 -if { (eval echo "$as_me:1989: \"$ac_compile\"") >&5 2486 +if { (eval echo "$as_me:199 4: \"$ac_compile\"") >&52503 +if { (eval echo "$as_me:1995: \"$ac_compile\"") >&5 2487 2504 (eval $ac_compile) 2>&5 2488 2505 ac_status=$? 2489 2506 - echo "$as_me:1992: \$? = $ac_status" >&5 2490 + echo "$as_me:199 7: \$? = $ac_status" >&52507 + echo "$as_me:1998: \$? = $ac_status" >&5 2491 2508 (exit $ac_status); } && 2492 2509 { ac_try='test -s conftest.$ac_objext' 2493 2510 - { (eval echo "$as_me:1995: \"$ac_try\"") >&5 2494 + { (eval echo "$as_me:200 0: \"$ac_try\"") >&52511 + { (eval echo "$as_me:2001: \"$ac_try\"") >&5 2495 2512 (eval $ac_try) 2>&5 2496 2513 ac_status=$? 2497 2514 - echo "$as_me:1998: \$? = $ac_status" >&5 2498 + echo "$as_me:200 3: \$? = $ac_status" >&52515 + echo "$as_me:2004: \$? = $ac_status" >&5 2499 2516 (exit $ac_status); }; }; then 2500 2517 for ac_declaration in \ 2501 2518 ''\ 2502 @@ -2007,7 +201 2,7 @@2519 @@ -2007,7 +2013,7 @@ 2503 2520 'void exit (int);' 2504 2521 do 2505 2522 cat >conftest.$ac_ext <<_ACEOF 2506 2523 -#line 2010 "configure" 2507 +#line 201 5"configure"2524 +#line 2016 "configure" 2508 2525 #include "confdefs.h" 2509 2526 #include <stdlib.h> 2510 2527 $ac_declaration 2511 @@ -2020,16 +202 5,16 @@2528 @@ -2020,16 +2026,16 @@ 2512 2529 } 2513 2530 _ACEOF 2514 2531 rm -f conftest.$ac_objext 2515 2532 -if { (eval echo "$as_me:2023: \"$ac_compile\"") >&5 2516 +if { (eval echo "$as_me:202 8: \"$ac_compile\"") >&52533 +if { (eval echo "$as_me:2029: \"$ac_compile\"") >&5 2517 2534 (eval $ac_compile) 2>&5 2518 2535 ac_status=$? 2519 2536 - echo "$as_me:2026: \$? = $ac_status" >&5 2520 + echo "$as_me:203 1: \$? = $ac_status" >&52537 + echo "$as_me:2032: \$? = $ac_status" >&5 2521 2538 (exit $ac_status); } && 2522 2539 { ac_try='test -s conftest.$ac_objext' 2523 2540 - { (eval echo "$as_me:2029: \"$ac_try\"") >&5 2524 + { (eval echo "$as_me:203 4: \"$ac_try\"") >&52541 + { (eval echo "$as_me:2035: \"$ac_try\"") >&5 2525 2542 (eval $ac_try) 2>&5 2526 2543 ac_status=$? 2527 2544 - echo "$as_me:2032: \$? = $ac_status" >&5 2528 + echo "$as_me:203 7: \$? = $ac_status" >&52545 + echo "$as_me:2038: \$? = $ac_status" >&5 2529 2546 (exit $ac_status); }; }; then 2530 2547 : 2531 2548 else 2532 @@ -2039,7 +204 4,7 @@2549 @@ -2039,7 +2045,7 @@ 2533 2550 fi 2534 2551 rm -f conftest.$ac_objext conftest.$ac_ext 2535 2552 cat >conftest.$ac_ext <<_ACEOF 2536 2553 -#line 2042 "configure" 2537 +#line 204 7"configure"2554 +#line 2048 "configure" 2538 2555 #include "confdefs.h" 2539 2556 $ac_declaration 2540 2557 int 2541 @@ -2051,16 +205 6,16 @@2558 @@ -2051,16 +2057,16 @@ 2542 2559 } 2543 2560 _ACEOF 2544 2561 rm -f conftest.$ac_objext 2545 2562 -if { (eval echo "$as_me:2054: \"$ac_compile\"") >&5 2546 +if { (eval echo "$as_me:20 59: \"$ac_compile\"") >&52563 +if { (eval echo "$as_me:2060: \"$ac_compile\"") >&5 2547 2564 (eval $ac_compile) 2>&5 2548 2565 ac_status=$? 2549 2566 - echo "$as_me:2057: \$? = $ac_status" >&5 2550 + echo "$as_me:206 2: \$? = $ac_status" >&52567 + echo "$as_me:2063: \$? = $ac_status" >&5 2551 2568 (exit $ac_status); } && 2552 2569 { ac_try='test -s conftest.$ac_objext' 2553 2570 - { (eval echo "$as_me:2060: \"$ac_try\"") >&5 2554 + { (eval echo "$as_me:206 5: \"$ac_try\"") >&52571 + { (eval echo "$as_me:2066: \"$ac_try\"") >&5 2555 2572 (eval $ac_try) 2>&5 2556 2573 ac_status=$? 2557 2574 - echo "$as_me:2063: \$? = $ac_status" >&5 2558 + echo "$as_me:206 8: \$? = $ac_status" >&52575 + echo "$as_me:2069: \$? = $ac_status" >&5 2559 2576 (exit $ac_status); }; }; then 2560 2577 break 2561 2578 else 2562 @@ -2090,11 +209 5,11 @@2579 @@ -2090,11 +2096,11 @@ 2563 2580 2564 2581 GCC_VERSION=none 2565 2582 if test "$GCC" = yes ; then 2566 2583 - echo "$as_me:2093: checking version of $CC" >&5 2567 + echo "$as_me:209 8: checking version of $CC" >&52584 + echo "$as_me:2099: checking version of $CC" >&5 2568 2585 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 2569 2586 GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" 2570 2587 test -z "$GCC_VERSION" && GCC_VERSION=unknown 2571 2588 - echo "$as_me:2097: result: $GCC_VERSION" >&5 2572 + echo "$as_me:210 2: result: $GCC_VERSION" >&52589 + echo "$as_me:2103: result: $GCC_VERSION" >&5 2573 2590 echo "${ECHO_T}$GCC_VERSION" >&6 2574 2591 fi 2575 2592 2576 @@ -2104,7 +21 09,7 @@2593 @@ -2104,7 +2110,7 @@ 2577 2594 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 2578 2595 ac_compiler_gnu=$ac_cv_c_compiler_gnu 2579 2596 ac_main_return=return 2580 2597 -echo "$as_me:2107: checking how to run the C preprocessor" >&5 2581 +echo "$as_me:211 2: checking how to run the C preprocessor" >&52598 +echo "$as_me:2113: checking how to run the C preprocessor" >&5 2582 2599 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 2583 2600 # On Suns, sometimes $CPP names a directory. 2584 2601 if test -n "$CPP" && test -d "$CPP"; then 2585 @@ -2125,18 +213 0,18 @@2602 @@ -2125,18 +2131,18 @@ 2586 2603 # On the NeXT, cc -E runs the code through the compiler's parser, 2587 2604 # not just through cpp. "Syntax error" is here to catch this case. 2588 2605 cat >conftest.$ac_ext <<_ACEOF 2589 2606 -#line 2128 "configure" 2590 +#line 213 3"configure"2607 +#line 2134 "configure" 2591 2608 #include "confdefs.h" 2592 2609 #include <assert.h> … … 2594 2611 _ACEOF 2595 2612 -if { (eval echo "$as_me:2133: \"$ac_cpp conftest.$ac_ext\"") >&5 2596 +if { (eval echo "$as_me:213 8: \"$ac_cpp conftest.$ac_ext\"") >&52613 +if { (eval echo "$as_me:2139: \"$ac_cpp conftest.$ac_ext\"") >&5 2597 2614 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 2598 2615 ac_status=$? … … 2601 2618 cat conftest.err >&5 2602 2619 - echo "$as_me:2139: \$? = $ac_status" >&5 2603 + echo "$as_me:214 4: \$? = $ac_status" >&52620 + echo "$as_me:2145: \$? = $ac_status" >&5 2604 2621 (exit $ac_status); } >/dev/null; then 2605 2622 if test -s conftest.err; then 2606 2623 ac_cpp_err=$ac_c_preproc_warn_flag 2607 @@ -2159,17 +216 4,17 @@2624 @@ -2159,17 +2165,17 @@ 2608 2625 # OK, works on sane cases. Now check whether non-existent headers 2609 2626 # can be detected and how. 2610 2627 cat >conftest.$ac_ext <<_ACEOF 2611 2628 -#line 2162 "configure" 2612 +#line 216 7"configure"2629 +#line 2168 "configure" 2613 2630 #include "confdefs.h" 2614 2631 #include <ac_nonexistent.h> 2615 2632 _ACEOF 2616 2633 -if { (eval echo "$as_me:2166: \"$ac_cpp conftest.$ac_ext\"") >&5 2617 +if { (eval echo "$as_me:217 1: \"$ac_cpp conftest.$ac_ext\"") >&52634 +if { (eval echo "$as_me:2172: \"$ac_cpp conftest.$ac_ext\"") >&5 2618 2635 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 2619 2636 ac_status=$? … … 2622 2639 cat conftest.err >&5 2623 2640 - echo "$as_me:2172: \$? = $ac_status" >&5 2624 + echo "$as_me:217 7: \$? = $ac_status" >&52641 + echo "$as_me:2178: \$? = $ac_status" >&5 2625 2642 (exit $ac_status); } >/dev/null; then 2626 2643 if test -s conftest.err; then 2627 2644 ac_cpp_err=$ac_c_preproc_warn_flag 2628 @@ -2206,7 +221 1,7 @@2645 @@ -2206,7 +2212,7 @@ 2629 2646 else 2630 2647 ac_cv_prog_CPP=$CPP 2631 2648 fi 2632 2649 -echo "$as_me:2209: result: $CPP" >&5 2633 +echo "$as_me:221 4: result: $CPP" >&52650 +echo "$as_me:2215: result: $CPP" >&5 2634 2651 echo "${ECHO_T}$CPP" >&6 2635 2652 ac_preproc_ok=false 2636 2653 for ac_c_preproc_warn_flag in '' yes 2637 @@ -2216,18 +222 1,18 @@2654 @@ -2216,18 +2222,18 @@ 2638 2655 # On the NeXT, cc -E runs the code through the compiler's parser, 2639 2656 # not just through cpp. "Syntax error" is here to catch this case. 2640 2657 cat >conftest.$ac_ext <<_ACEOF 2641 2658 -#line 2219 "configure" 2642 +#line 222 4"configure"2659 +#line 2225 "configure" 2643 2660 #include "confdefs.h" 2644 2661 #include <assert.h> … … 2646 2663 _ACEOF 2647 2664 -if { (eval echo "$as_me:2224: \"$ac_cpp conftest.$ac_ext\"") >&5 2648 +if { (eval echo "$as_me:22 29: \"$ac_cpp conftest.$ac_ext\"") >&52665 +if { (eval echo "$as_me:2230: \"$ac_cpp conftest.$ac_ext\"") >&5 2649 2666 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 2650 2667 ac_status=$? … … 2653 2670 cat conftest.err >&5 2654 2671 - echo "$as_me:2230: \$? = $ac_status" >&5 2655 + echo "$as_me:223 5: \$? = $ac_status" >&52672 + echo "$as_me:2236: \$? = $ac_status" >&5 2656 2673 (exit $ac_status); } >/dev/null; then 2657 2674 if test -s conftest.err; then 2658 2675 ac_cpp_err=$ac_c_preproc_warn_flag 2659 @@ -2250,17 +225 5,17 @@2676 @@ -2250,17 +2256,17 @@ 2660 2677 # OK, works on sane cases. Now check whether non-existent headers 2661 2678 # can be detected and how. 2662 2679 cat >conftest.$ac_ext <<_ACEOF 2663 2680 -#line 2253 "configure" 2664 +#line 225 8"configure"2681 +#line 2259 "configure" 2665 2682 #include "confdefs.h" 2666 2683 #include <ac_nonexistent.h> 2667 2684 _ACEOF 2668 2685 -if { (eval echo "$as_me:2257: \"$ac_cpp conftest.$ac_ext\"") >&5 2669 +if { (eval echo "$as_me:226 2: \"$ac_cpp conftest.$ac_ext\"") >&52686 +if { (eval echo "$as_me:2263: \"$ac_cpp conftest.$ac_ext\"") >&5 2670 2687 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 2671 2688 ac_status=$? … … 2674 2691 cat conftest.err >&5 2675 2692 - echo "$as_me:2263: \$? = $ac_status" >&5 2676 + echo "$as_me:226 8: \$? = $ac_status" >&52693 + echo "$as_me:2269: \$? = $ac_status" >&5 2677 2694 (exit $ac_status); } >/dev/null; then 2678 2695 if test -s conftest.err; then 2679 2696 ac_cpp_err=$ac_c_preproc_warn_flag 2680 @@ -2288,7 +229 3,7 @@2697 @@ -2288,7 +2294,7 @@ 2681 2698 if $ac_preproc_ok; then 2682 2699 : 2683 2700 else 2684 2701 - { { echo "$as_me:2291: error: C preprocessor \"$CPP\" fails sanity check" >&5 2685 + { { echo "$as_me:229 6: error: C preprocessor \"$CPP\" fails sanity check" >&52702 + { { echo "$as_me:2297: error: C preprocessor \"$CPP\" fails sanity check" >&5 2686 2703 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} 2687 2704 { (exit 1); exit 1; }; } 2688 2705 fi 2689 @@ -2301,14 +230 6,14 @@2706 @@ -2301,14 +2307,14 @@ 2690 2707 ac_main_return=return 2691 2708 2692 2709 if test $ac_cv_c_compiler_gnu = yes; then 2693 2710 - echo "$as_me:2304: checking whether $CC needs -traditional" >&5 2694 + echo "$as_me:23 09: checking whether $CC needs -traditional" >&52711 + echo "$as_me:2310: checking whether $CC needs -traditional" >&5 2695 2712 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 2696 2713 if test "${ac_cv_prog_gcc_traditional+set}" = set; then … … 2700 2717 cat >conftest.$ac_ext <<_ACEOF 2701 2718 -#line 2311 "configure" 2702 +#line 231 6"configure"2719 +#line 2317 "configure" 2703 2720 #include "confdefs.h" 2704 2721 #include <sgtty.h> 2705 2722 int Autoconf = TIOCGETP; 2706 @@ -2323,7 +232 8,7 @@2723 @@ -2323,7 +2329,7 @@ 2707 2724 2708 2725 if test $ac_cv_prog_gcc_traditional = no; then 2709 2726 cat >conftest.$ac_ext <<_ACEOF 2710 2727 -#line 2326 "configure" 2711 +#line 233 1"configure"2728 +#line 2332 "configure" 2712 2729 #include "confdefs.h" 2713 2730 #include <termio.h> 2714 2731 int Autoconf = TCGETA; 2715 @@ -2336,14 +234 1,14 @@2732 @@ -2336,14 +2342,14 @@ 2716 2733 2717 2734 fi 2718 2735 fi 2719 2736 -echo "$as_me:2339: result: $ac_cv_prog_gcc_traditional" >&5 2720 +echo "$as_me:234 4: result: $ac_cv_prog_gcc_traditional" >&52737 +echo "$as_me:2345: result: $ac_cv_prog_gcc_traditional" >&5 2721 2738 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 2722 2739 if test $ac_cv_prog_gcc_traditional = yes; then … … 2726 2743 2727 2744 -echo "$as_me:2346: checking whether $CC understands -c and -o together" >&5 2728 +echo "$as_me:235 1: checking whether $CC understands -c and -o together" >&52745 +echo "$as_me:2352: checking whether $CC understands -c and -o together" >&5 2729 2746 echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6 2730 2747 if test "${cf_cv_prog_CC_c_o+set}" = set; then 2731 2748 echo $ECHO_N "(cached) $ECHO_C" >&6 2732 @@ -2359,15 +236 4,15 @@2749 @@ -2359,15 +2365,15 @@ 2733 2750 # We do the test twice because some compilers refuse to overwrite an 2734 2751 # existing .o file with -o, though they will create one. 2735 2752 ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' 2736 2753 -if { (eval echo "$as_me:2362: \"$ac_try\"") >&5 2737 +if { (eval echo "$as_me:236 7: \"$ac_try\"") >&52754 +if { (eval echo "$as_me:2368: \"$ac_try\"") >&5 2738 2755 (eval $ac_try) 2>&5 2739 2756 ac_status=$? 2740 2757 - echo "$as_me:2365: \$? = $ac_status" >&5 2741 + echo "$as_me:237 0: \$? = $ac_status" >&52758 + echo "$as_me:2371: \$? = $ac_status" >&5 2742 2759 (exit $ac_status); } && 2743 2760 - test -f conftest2.$ac_objext && { (eval echo "$as_me:2367: \"$ac_try\"") >&5 2744 + test -f conftest2.$ac_objext && { (eval echo "$as_me:237 2: \"$ac_try\"") >&52761 + test -f conftest2.$ac_objext && { (eval echo "$as_me:2373: \"$ac_try\"") >&5 2745 2762 (eval $ac_try) 2>&5 2746 2763 ac_status=$? 2747 2764 - echo "$as_me:2370: \$? = $ac_status" >&5 2748 + echo "$as_me:237 5: \$? = $ac_status" >&52765 + echo "$as_me:2376: \$? = $ac_status" >&5 2749 2766 (exit $ac_status); }; 2750 2767 then 2751 2768 eval cf_cv_prog_CC_c_o=yes 2752 @@ -2378,19 +238 3,19 @@2769 @@ -2378,19 +2384,19 @@ 2753 2770 2754 2771 fi 2755 2772 if test $cf_cv_prog_CC_c_o = yes; then 2756 2773 - echo "$as_me:2381: result: yes" >&5 2757 + echo "$as_me:238 6: result: yes" >&52774 + echo "$as_me:2387: result: yes" >&5 2758 2775 echo "${ECHO_T}yes" >&6 2759 2776 else 2760 2777 - echo "$as_me:2384: result: no" >&5 2761 + echo "$as_me:23 89: result: no" >&52778 + echo "$as_me:2390: result: no" >&5 2762 2779 echo "${ECHO_T}no" >&6 2763 2780 fi 2764 2781 2765 2782 -echo "$as_me:2388: checking for POSIXized ISC" >&5 2766 +echo "$as_me:239 3: checking for POSIXized ISC" >&52783 +echo "$as_me:2394: checking for POSIXized ISC" >&5 2767 2784 echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6 2768 2785 if test -d /etc/conf/kconfig.d && … … 2770 2787 then 2771 2788 - echo "$as_me:2393: result: yes" >&5 2772 + echo "$as_me:239 8: result: yes" >&52789 + echo "$as_me:2399: result: yes" >&5 2773 2790 echo "${ECHO_T}yes" >&6 2774 2791 ISC=yes # If later tests want to check for ISC. 2775 2792 2776 @@ -2404,12 +24 09,12 @@2793 @@ -2404,12 +2410,12 @@ 2777 2794 CC="$CC -Xp" 2778 2795 fi 2779 2796 else 2780 2797 - echo "$as_me:2407: result: no" >&5 2781 + echo "$as_me:241 2: result: no" >&52798 + echo "$as_me:2413: result: no" >&5 2782 2799 echo "${ECHO_T}no" >&6 2783 2800 ISC= … … 2785 2802 2786 2803 -echo "$as_me:2412: checking for ${CC-cc} option to accept ANSI C" >&5 2787 +echo "$as_me:241 7: checking for ${CC-cc} option to accept ANSI C" >&52804 +echo "$as_me:2418: checking for ${CC-cc} option to accept ANSI C" >&5 2788 2805 echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6 2789 2806 if test "${cf_cv_ansi_cc+set}" = set; then 2790 2807 echo $ECHO_N "(cached) $ECHO_C" >&6 2791 @@ -2494,7 +2 499,7 @@2808 @@ -2494,7 +2500,7 @@ 2792 2809 2793 2810 if test -n "$cf_new_cppflags" ; then … … 2798 2815 2799 2816 if test -n "$cf_new_extra_cppflags" ; then 2800 @@ -2503,7 +250 8,7 @@2817 @@ -2503,7 +2509,7 @@ 2801 2818 fi 2802 2819 2803 2820 cat >conftest.$ac_ext <<_ACEOF 2804 2821 -#line 2506 "configure" 2805 +#line 251 1"configure"2822 +#line 2512 "configure" 2806 2823 #include "confdefs.h" 2807 2824 2808 2825 #ifndef CC_HAS_PROTOS 2809 @@ -2524,16 +25 29,16 @@2826 @@ -2524,16 +2530,16 @@ 2810 2827 } 2811 2828 _ACEOF 2812 2829 rm -f conftest.$ac_objext 2813 2830 -if { (eval echo "$as_me:2527: \"$ac_compile\"") >&5 2814 +if { (eval echo "$as_me:253 2: \"$ac_compile\"") >&52831 +if { (eval echo "$as_me:2533: \"$ac_compile\"") >&5 2815 2832 (eval $ac_compile) 2>&5 2816 2833 ac_status=$? 2817 2834 - echo "$as_me:2530: \$? = $ac_status" >&5 2818 + echo "$as_me:253 5: \$? = $ac_status" >&52835 + echo "$as_me:2536: \$? = $ac_status" >&5 2819 2836 (exit $ac_status); } && 2820 2837 { ac_try='test -s conftest.$ac_objext' 2821 2838 - { (eval echo "$as_me:2533: \"$ac_try\"") >&5 2822 + { (eval echo "$as_me:253 8: \"$ac_try\"") >&52839 + { (eval echo "$as_me:2539: \"$ac_try\"") >&5 2823 2840 (eval $ac_try) 2>&5 2824 2841 ac_status=$? 2825 2842 - echo "$as_me:2536: \$? = $ac_status" >&5 2826 + echo "$as_me:254 1: \$? = $ac_status" >&52843 + echo "$as_me:2542: \$? = $ac_status" >&5 2827 2844 (exit $ac_status); }; }; then 2828 2845 cf_cv_ansi_cc="$cf_arg"; break 2829 2846 else 2830 @@ -2546,7 +255 1,7 @@2847 @@ -2546,7 +2552,7 @@ 2831 2848 CPPFLAGS="$cf_save_CPPFLAGS" 2832 2849 2833 2850 fi 2834 2851 -echo "$as_me:2549: result: $cf_cv_ansi_cc" >&5 2835 +echo "$as_me:255 4: result: $cf_cv_ansi_cc" >&52852 +echo "$as_me:2555: result: $cf_cv_ansi_cc" >&5 2836 2853 echo "${ECHO_T}$cf_cv_ansi_cc" >&6 2837 2854 2838 2855 if test "$cf_cv_ansi_cc" != "no"; then 2839 @@ -2612,7 +261 7,7 @@2856 @@ -2612,7 +2618,7 @@ 2840 2857 2841 2858 if test -n "$cf_new_cppflags" ; then … … 2846 2863 2847 2864 if test -n "$cf_new_extra_cppflags" ; then 2848 @@ -2629,7 +263 4,7 @@2865 @@ -2629,7 +2635,7 @@ 2849 2866 fi 2850 2867 2851 2868 if test "$cf_cv_ansi_cc" = "no"; then 2852 2869 - { { echo "$as_me:2632: error: Your compiler does not appear to recognize prototypes. 2853 + { { echo "$as_me:263 7: error: Your compiler does not appear to recognize prototypes.2870 + { { echo "$as_me:2638: error: Your compiler does not appear to recognize prototypes. 2854 2871 You have the following choices: 2855 2872 a. adjust your compiler options 2856 2873 b. get an up-to-date compiler 2857 @@ -2663,13 +266 8,13 @@2874 @@ -2663,13 +2669,13 @@ 2858 2875 LDCONFIG=: 2859 2876 else … … 2867 2884 set dummy ldconfig; ac_word=$2 2868 2885 -echo "$as_me:2672: checking for $ac_word" >&5 2869 +echo "$as_me:267 7: checking for $ac_word" >&52886 +echo "$as_me:2678: checking for $ac_word" >&5 2870 2887 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 2871 2888 if test "${ac_cv_path_LDCONFIG+set}" = set; then 2872 2889 echo $ECHO_N "(cached) $ECHO_C" >&6 2873 @@ -2686,7 +269 1,7 @@2890 @@ -2686,7 +2692,7 @@ 2874 2891 test -z "$ac_dir" && ac_dir=. 2875 2892 if $as_executable_p "$ac_dir/$ac_word"; then 2876 2893 ac_cv_path_LDCONFIG="$ac_dir/$ac_word" 2877 2894 - echo "$as_me:2689: found $ac_dir/$ac_word" >&5 2878 + echo "$as_me:269 4: found $ac_dir/$ac_word" >&52895 + echo "$as_me:2695: found $ac_dir/$ac_word" >&5 2879 2896 break 2880 2897 fi 2881 2898 done 2882 @@ -2697,10 +270 2,10 @@2899 @@ -2697,10 +2703,10 @@ 2883 2900 LDCONFIG=$ac_cv_path_LDCONFIG 2884 2901 2885 2902 if test -n "$LDCONFIG"; then 2886 2903 - echo "$as_me:2700: result: $LDCONFIG" >&5 2887 + echo "$as_me:270 5: result: $LDCONFIG" >&52904 + echo "$as_me:2706: result: $LDCONFIG" >&5 2888 2905 echo "${ECHO_T}$LDCONFIG" >&6 2889 2906 else 2890 2907 - echo "$as_me:2703: result: no" >&5 2891 + echo "$as_me:270 8: result: no" >&52908 + echo "$as_me:2709: result: no" >&5 2892 2909 echo "${ECHO_T}no" >&6 2893 2910 fi 2894 2911 2895 @@ -2708,7 +271 3,7 @@2912 @@ -2708,7 +2714,7 @@ 2896 2913 esac 2897 2914 fi 2898 2915 2899 2916 -echo "$as_me:2711: checking if you want to ensure bool is consistent with C++" >&5 2900 +echo "$as_me:271 6: checking if you want to ensure bool is consistent with C++" >&52917 +echo "$as_me:2717: checking if you want to ensure bool is consistent with C++" >&5 2901 2918 echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6 2902 2919 2903 2920 # Check whether --with-cxx or --without-cxx was given. 2904 @@ -2718,7 +272 3,7 @@2921 @@ -2718,7 +2724,7 @@ 2905 2922 else 2906 2923 cf_with_cxx=yes 2907 2924 fi; 2908 2925 -echo "$as_me:2721: result: $cf_with_cxx" >&5 2909 +echo "$as_me:272 6: result: $cf_with_cxx" >&52926 +echo "$as_me:2727: result: $cf_with_cxx" >&5 2910 2927 echo "${ECHO_T}$cf_with_cxx" >&6 2911 2928 if test "X$cf_with_cxx" = Xno ; then 2912 2929 CXX="" 2913 @@ -2736,7 +274 1,7 @@2930 @@ -2736,7 +2742,7 @@ 2914 2931 do 2915 2932 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 2916 2933 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 2917 2934 -echo "$as_me:2739: checking for $ac_word" >&5 2918 +echo "$as_me:274 4: checking for $ac_word" >&52935 +echo "$as_me:2745: checking for $ac_word" >&5 2919 2936 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 2920 2937 if test "${ac_cv_prog_CXX+set}" = set; then 2921 2938 echo $ECHO_N "(cached) $ECHO_C" >&6 2922 @@ -2751,7 +275 6,7 @@2939 @@ -2751,7 +2757,7 @@ 2923 2940 test -z "$ac_dir" && ac_dir=. 2924 2941 $as_executable_p "$ac_dir/$ac_word" || continue 2925 2942 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" 2926 2943 -echo "$as_me:2754: found $ac_dir/$ac_word" >&5 2927 +echo "$as_me:27 59: found $ac_dir/$ac_word" >&52944 +echo "$as_me:2760: found $ac_dir/$ac_word" >&5 2928 2945 break 2929 2946 done 2930 2947 2931 @@ -2759,10 +276 4,10 @@2948 @@ -2759,10 +2765,10 @@ 2932 2949 fi 2933 2950 CXX=$ac_cv_prog_CXX 2934 2951 if test -n "$CXX"; then 2935 2952 - echo "$as_me:2762: result: $CXX" >&5 2936 + echo "$as_me:276 7: result: $CXX" >&52953 + echo "$as_me:2768: result: $CXX" >&5 2937 2954 echo "${ECHO_T}$CXX" >&6 2938 2955 else 2939 2956 - echo "$as_me:2765: result: no" >&5 2940 + echo "$as_me:277 0: result: no" >&52957 + echo "$as_me:2771: result: no" >&5 2941 2958 echo "${ECHO_T}no" >&6 2942 2959 fi 2943 2960 2944 @@ -2775,7 +278 0,7 @@2961 @@ -2775,7 +2781,7 @@ 2945 2962 do 2946 2963 # Extract the first word of "$ac_prog", so it can be a program name with args. 2947 2964 set dummy $ac_prog; ac_word=$2 2948 2965 -echo "$as_me:2778: checking for $ac_word" >&5 2949 +echo "$as_me:278 3: checking for $ac_word" >&52966 +echo "$as_me:2784: checking for $ac_word" >&5 2950 2967 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 2951 2968 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then 2952 2969 echo $ECHO_N "(cached) $ECHO_C" >&6 2953 @@ -2790,7 +279 5,7 @@2970 @@ -2790,7 +2796,7 @@ 2954 2971 test -z "$ac_dir" && ac_dir=. 2955 2972 $as_executable_p "$ac_dir/$ac_word" || continue 2956 2973 ac_cv_prog_ac_ct_CXX="$ac_prog" 2957 2974 -echo "$as_me:2793: found $ac_dir/$ac_word" >&5 2958 +echo "$as_me:279 8: found $ac_dir/$ac_word" >&52975 +echo "$as_me:2799: found $ac_dir/$ac_word" >&5 2959 2976 break 2960 2977 done 2961 2978 2962 @@ -2798,10 +280 3,10 @@2979 @@ -2798,10 +2804,10 @@ 2963 2980 fi 2964 2981 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX 2965 2982 if test -n "$ac_ct_CXX"; then 2966 2983 - echo "$as_me:2801: result: $ac_ct_CXX" >&5 2967 + echo "$as_me:280 6: result: $ac_ct_CXX" >&52984 + echo "$as_me:2807: result: $ac_ct_CXX" >&5 2968 2985 echo "${ECHO_T}$ac_ct_CXX" >&6 2969 2986 else 2970 2987 - echo "$as_me:2804: result: no" >&5 2971 + echo "$as_me:28 09: result: no" >&52988 + echo "$as_me:2810: result: no" >&5 2972 2989 echo "${ECHO_T}no" >&6 2973 2990 fi 2974 2991 2975 @@ -2813,32 +281 8,32 @@2992 @@ -2813,32 +2819,32 @@ 2976 2993 fi 2977 2994 2978 2995 # Provide some information about the compiler. 2979 2996 -echo "$as_me:2816:" \ 2980 +echo "$as_me:282 1:" \2997 +echo "$as_me:2822:" \ 2981 2998 "checking for C++ compiler version" >&5 2982 2999 ac_compiler=`set X $ac_compile; echo $2` 2983 3000 -{ (eval echo "$as_me:2819: \"$ac_compiler --version </dev/null >&5\"") >&5 2984 +{ (eval echo "$as_me:282 4: \"$ac_compiler --version </dev/null >&5\"") >&53001 +{ (eval echo "$as_me:2825: \"$ac_compiler --version </dev/null >&5\"") >&5 2985 3002 (eval $ac_compiler --version </dev/null >&5) 2>&5 2986 3003 ac_status=$? 2987 3004 - echo "$as_me:2822: \$? = $ac_status" >&5 2988 + echo "$as_me:282 7: \$? = $ac_status" >&53005 + echo "$as_me:2828: \$? = $ac_status" >&5 2989 3006 (exit $ac_status); } 2990 3007 -{ (eval echo "$as_me:2824: \"$ac_compiler -v </dev/null >&5\"") >&5 2991 +{ (eval echo "$as_me:28 29: \"$ac_compiler -v </dev/null >&5\"") >&53008 +{ (eval echo "$as_me:2830: \"$ac_compiler -v </dev/null >&5\"") >&5 2992 3009 (eval $ac_compiler -v </dev/null >&5) 2>&5 2993 3010 ac_status=$? 2994 3011 - echo "$as_me:2827: \$? = $ac_status" >&5 2995 + echo "$as_me:283 2: \$? = $ac_status" >&53012 + echo "$as_me:2833: \$? = $ac_status" >&5 2996 3013 (exit $ac_status); } 2997 3014 -{ (eval echo "$as_me:2829: \"$ac_compiler -V </dev/null >&5\"") >&5 2998 +{ (eval echo "$as_me:283 4: \"$ac_compiler -V </dev/null >&5\"") >&53015 +{ (eval echo "$as_me:2835: \"$ac_compiler -V </dev/null >&5\"") >&5 2999 3016 (eval $ac_compiler -V </dev/null >&5) 2>&5 3000 3017 ac_status=$? 3001 3018 - echo "$as_me:2832: \$? = $ac_status" >&5 3002 + echo "$as_me:283 7: \$? = $ac_status" >&53019 + echo "$as_me:2838: \$? = $ac_status" >&5 3003 3020 (exit $ac_status); } 3004 3021 3005 3022 -echo "$as_me:2835: checking whether we are using the GNU C++ compiler" >&5 3006 +echo "$as_me:284 0: checking whether we are using the GNU C++ compiler" >&53023 +echo "$as_me:2841: checking whether we are using the GNU C++ compiler" >&5 3007 3024 echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 3008 3025 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then … … 3011 3028 cat >conftest.$ac_ext <<_ACEOF 3012 3029 -#line 2841 "configure" 3013 +#line 284 6"configure"3030 +#line 2847 "configure" 3014 3031 #include "confdefs.h" 3015 3032 3016 3033 int 3017 @@ -2853,16 +285 8,16 @@3034 @@ -2853,16 +2859,16 @@ 3018 3035 } 3019 3036 _ACEOF 3020 3037 rm -f conftest.$ac_objext 3021 3038 -if { (eval echo "$as_me:2856: \"$ac_compile\"") >&5 3022 +if { (eval echo "$as_me:286 1: \"$ac_compile\"") >&53039 +if { (eval echo "$as_me:2862: \"$ac_compile\"") >&5 3023 3040 (eval $ac_compile) 2>&5 3024 3041 ac_status=$? 3025 3042 - echo "$as_me:2859: \$? = $ac_status" >&5 3026 + echo "$as_me:286 4: \$? = $ac_status" >&53043 + echo "$as_me:2865: \$? = $ac_status" >&5 3027 3044 (exit $ac_status); } && 3028 3045 { ac_try='test -s conftest.$ac_objext' 3029 3046 - { (eval echo "$as_me:2862: \"$ac_try\"") >&5 3030 + { (eval echo "$as_me:286 7: \"$ac_try\"") >&53047 + { (eval echo "$as_me:2868: \"$ac_try\"") >&5 3031 3048 (eval $ac_try) 2>&5 3032 3049 ac_status=$? 3033 3050 - echo "$as_me:2865: \$? = $ac_status" >&5 3034 + echo "$as_me:287 0: \$? = $ac_status" >&53051 + echo "$as_me:2871: \$? = $ac_status" >&5 3035 3052 (exit $ac_status); }; }; then 3036 3053 ac_compiler_gnu=yes 3037 3054 else 3038 @@ -2874,19 +28 79,19 @@3055 @@ -2874,19 +2880,19 @@ 3039 3056 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu 3040 3057 3041 3058 fi 3042 3059 -echo "$as_me:2877: result: $ac_cv_cxx_compiler_gnu" >&5 3043 +echo "$as_me:288 2: result: $ac_cv_cxx_compiler_gnu" >&53060 +echo "$as_me:2883: result: $ac_cv_cxx_compiler_gnu" >&5 3044 3061 echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 3045 3062 GXX=`test $ac_compiler_gnu = yes && echo yes` … … 3048 3065 CXXFLAGS="-g" 3049 3066 -echo "$as_me:2883: checking whether $CXX accepts -g" >&5 3050 +echo "$as_me:288 8: checking whether $CXX accepts -g" >&53067 +echo "$as_me:2889: checking whether $CXX accepts -g" >&5 3051 3068 echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 3052 3069 if test "${ac_cv_prog_cxx_g+set}" = set; then … … 3055 3072 cat >conftest.$ac_ext <<_ACEOF 3056 3073 -#line 2889 "configure" 3057 +#line 289 4"configure"3074 +#line 2895 "configure" 3058 3075 #include "confdefs.h" 3059 3076 3060 3077 int 3061 @@ -2898,16 +290 3,16 @@3078 @@ -2898,16 +2904,16 @@ 3062 3079 } 3063 3080 _ACEOF 3064 3081 rm -f conftest.$ac_objext 3065 3082 -if { (eval echo "$as_me:2901: \"$ac_compile\"") >&5 3066 +if { (eval echo "$as_me:290 6: \"$ac_compile\"") >&53083 +if { (eval echo "$as_me:2907: \"$ac_compile\"") >&5 3067 3084 (eval $ac_compile) 2>&5 3068 3085 ac_status=$? 3069 3086 - echo "$as_me:2904: \$? = $ac_status" >&5 3070 + echo "$as_me:29 09: \$? = $ac_status" >&53087 + echo "$as_me:2910: \$? = $ac_status" >&5 3071 3088 (exit $ac_status); } && 3072 3089 { ac_try='test -s conftest.$ac_objext' 3073 3090 - { (eval echo "$as_me:2907: \"$ac_try\"") >&5 3074 + { (eval echo "$as_me:291 2: \"$ac_try\"") >&53091 + { (eval echo "$as_me:2913: \"$ac_try\"") >&5 3075 3092 (eval $ac_try) 2>&5 3076 3093 ac_status=$? 3077 3094 - echo "$as_me:2910: \$? = $ac_status" >&5 3078 + echo "$as_me:291 5: \$? = $ac_status" >&53095 + echo "$as_me:2916: \$? = $ac_status" >&5 3079 3096 (exit $ac_status); }; }; then 3080 3097 ac_cv_prog_cxx_g=yes 3081 3098 else 3082 @@ -2917,7 +292 2,7 @@3099 @@ -2917,7 +2923,7 @@ 3083 3100 fi 3084 3101 rm -f conftest.$ac_objext conftest.$ac_ext 3085 3102 fi 3086 3103 -echo "$as_me:2920: result: $ac_cv_prog_cxx_g" >&5 3087 +echo "$as_me:292 5: result: $ac_cv_prog_cxx_g" >&53104 +echo "$as_me:2926: result: $ac_cv_prog_cxx_g" >&5 3088 3105 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 3089 3106 if test "$ac_test_CXXFLAGS" = set; then 3090 3107 CXXFLAGS=$ac_save_CXXFLAGS 3091 @@ -2944,7 +29 49,7 @@3108 @@ -2944,7 +2950,7 @@ 3092 3109 'void exit (int);' 3093 3110 do 3094 3111 cat >conftest.$ac_ext <<_ACEOF 3095 3112 -#line 2947 "configure" 3096 +#line 295 2"configure"3113 +#line 2953 "configure" 3097 3114 #include "confdefs.h" 3098 3115 #include <stdlib.h> 3099 3116 $ac_declaration 3100 @@ -2957,16 +296 2,16 @@3117 @@ -2957,16 +2963,16 @@ 3101 3118 } 3102 3119 _ACEOF 3103 3120 rm -f conftest.$ac_objext 3104 3121 -if { (eval echo "$as_me:2960: \"$ac_compile\"") >&5 3105 +if { (eval echo "$as_me:296 5: \"$ac_compile\"") >&53122 +if { (eval echo "$as_me:2966: \"$ac_compile\"") >&5 3106 3123 (eval $ac_compile) 2>&5 3107 3124 ac_status=$? 3108 3125 - echo "$as_me:2963: \$? = $ac_status" >&5 3109 + echo "$as_me:296 8: \$? = $ac_status" >&53126 + echo "$as_me:2969: \$? = $ac_status" >&5 3110 3127 (exit $ac_status); } && 3111 3128 { ac_try='test -s conftest.$ac_objext' 3112 3129 - { (eval echo "$as_me:2966: \"$ac_try\"") >&5 3113 + { (eval echo "$as_me:297 1: \"$ac_try\"") >&53130 + { (eval echo "$as_me:2972: \"$ac_try\"") >&5 3114 3131 (eval $ac_try) 2>&5 3115 3132 ac_status=$? 3116 3133 - echo "$as_me:2969: \$? = $ac_status" >&5 3117 + echo "$as_me:297 4: \$? = $ac_status" >&53134 + echo "$as_me:2975: \$? = $ac_status" >&5 3118 3135 (exit $ac_status); }; }; then 3119 3136 : 3120 3137 else 3121 @@ -2976,7 +298 1,7 @@3138 @@ -2976,7 +2982,7 @@ 3122 3139 fi 3123 3140 rm -f conftest.$ac_objext conftest.$ac_ext 3124 3141 cat >conftest.$ac_ext <<_ACEOF 3125 3142 -#line 2979 "configure" 3126 +#line 298 4"configure"3143 +#line 2985 "configure" 3127 3144 #include "confdefs.h" 3128 3145 $ac_declaration 3129 3146 int 3130 @@ -2988,16 +299 3,16 @@3147 @@ -2988,16 +2994,16 @@ 3131 3148 } 3132 3149 _ACEOF 3133 3150 rm -f conftest.$ac_objext 3134 3151 -if { (eval echo "$as_me:2991: \"$ac_compile\"") >&5 3135 +if { (eval echo "$as_me:299 6: \"$ac_compile\"") >&53152 +if { (eval echo "$as_me:2997: \"$ac_compile\"") >&5 3136 3153 (eval $ac_compile) 2>&5 3137 3154 ac_status=$? 3138 3155 - echo "$as_me:2994: \$? = $ac_status" >&5 3139 + echo "$as_me: 2999: \$? = $ac_status" >&53156 + echo "$as_me:3000: \$? = $ac_status" >&5 3140 3157 (exit $ac_status); } && 3141 3158 { ac_try='test -s conftest.$ac_objext' 3142 3159 - { (eval echo "$as_me:2997: \"$ac_try\"") >&5 3143 + { (eval echo "$as_me:300 2: \"$ac_try\"") >&53160 + { (eval echo "$as_me:3003: \"$ac_try\"") >&5 3144 3161 (eval $ac_try) 2>&5 3145 3162 ac_status=$? 3146 3163 - echo "$as_me:3000: \$? = $ac_status" >&5 3147 + echo "$as_me:300 5: \$? = $ac_status" >&53164 + echo "$as_me:3006: \$? = $ac_status" >&5 3148 3165 (exit $ac_status); }; }; then 3149 3166 break 3150 3167 else 3151 @@ -3024,7 +30 29,7 @@3168 @@ -3024,7 +3030,7 @@ 3152 3169 if test "$CXX" = "g++" ; then 3153 3170 # Extract the first word of "g++", so it can be a program name with args. 3154 3171 set dummy g++; ac_word=$2 3155 3172 -echo "$as_me:3027: checking for $ac_word" >&5 3156 +echo "$as_me:303 2: checking for $ac_word" >&53173 +echo "$as_me:3033: checking for $ac_word" >&5 3157 3174 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3158 3175 if test "${ac_cv_path_CXX+set}" = set; then 3159 3176 echo $ECHO_N "(cached) $ECHO_C" >&6 3160 @@ -3041,7 +304 6,7 @@3177 @@ -3041,7 +3047,7 @@ 3161 3178 test -z "$ac_dir" && ac_dir=. 3162 3179 if $as_executable_p "$ac_dir/$ac_word"; then 3163 3180 ac_cv_path_CXX="$ac_dir/$ac_word" 3164 3181 - echo "$as_me:3044: found $ac_dir/$ac_word" >&5 3165 + echo "$as_me:30 49: found $ac_dir/$ac_word" >&53182 + echo "$as_me:3050: found $ac_dir/$ac_word" >&5 3166 3183 break 3167 3184 fi 3168 3185 done 3169 @@ -3052,16 +305 7,16 @@3186 @@ -3052,16 +3058,16 @@ 3170 3187 CXX=$ac_cv_path_CXX 3171 3188 3172 3189 if test -n "$CXX"; then 3173 3190 - echo "$as_me:3055: result: $CXX" >&5 3174 + echo "$as_me:306 0: result: $CXX" >&53191 + echo "$as_me:3061: result: $CXX" >&5 3175 3192 echo "${ECHO_T}$CXX" >&6 3176 3193 else 3177 3194 - echo "$as_me:3058: result: no" >&5 3178 + echo "$as_me:306 3: result: no" >&53195 + echo "$as_me:3064: result: no" >&5 3179 3196 echo "${ECHO_T}no" >&6 3180 3197 fi … … 3183 3200 if test "$CXX" = "g++" ; then 3184 3201 - { echo "$as_me:3064: WARNING: ignoring hardcoded g++" >&5 3185 + { echo "$as_me:30 69: WARNING: ignoring hardcoded g++" >&53202 + { echo "$as_me:3070: WARNING: ignoring hardcoded g++" >&5 3186 3203 echo "$as_me: WARNING: ignoring hardcoded g++" >&2;} 3187 3204 cf_with_cxx=no; CXX=""; GXX=""; 3188 3205 fi 3189 @@ -3069,11 +307 4,11 @@3206 @@ -3069,11 +3075,11 @@ 3190 3207 3191 3208 GXX_VERSION=none 3192 3209 if test "$GXX" = yes; then 3193 3210 - echo "$as_me:3072: checking version of g++" >&5 3194 + echo "$as_me:307 7: checking version of g++" >&53211 + echo "$as_me:3078: checking version of g++" >&5 3195 3212 echo $ECHO_N "checking version of g++... $ECHO_C" >&6 3196 3213 GXX_VERSION="`${CXX-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" 3197 3214 test -z "$GXX_VERSION" && GXX_VERSION=unknown 3198 3215 - echo "$as_me:3076: result: $GXX_VERSION" >&5 3199 + echo "$as_me:308 1: result: $GXX_VERSION" >&53216 + echo "$as_me:3082: result: $GXX_VERSION" >&5 3200 3217 echo "${ECHO_T}$GXX_VERSION" >&6 3201 3218 fi 3202 3219 3203 @@ -3081,12 +308 6,12 @@3220 @@ -3081,12 +3087,12 @@ 3204 3221 1*|2.[0-6]*) 3205 3222 # GXX=""; CXX=""; ac_cv_prog_gxx=no 3206 3223 # cf_cxx_library=no 3207 3224 - { echo "$as_me:3084: WARNING: templates do not work" >&5 3208 + { echo "$as_me:30 89: WARNING: templates do not work" >&53225 + { echo "$as_me:3090: WARNING: templates do not work" >&5 3209 3226 echo "$as_me: WARNING: templates do not work" >&2;} 3210 3227 ;; … … 3212 3229 3213 3230 -echo "$as_me:3089: checking if you want to build C++ binding and demo" >&5 3214 +echo "$as_me:309 4: checking if you want to build C++ binding and demo" >&53231 +echo "$as_me:3095: checking if you want to build C++ binding and demo" >&5 3215 3232 echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6 3216 3233 3217 3234 # Check whether --with-cxx-binding or --without-cxx-binding was given. 3218 @@ -3096,10 +310 1,10 @@3235 @@ -3096,10 +3102,10 @@ 3219 3236 else 3220 3237 cf_with_cxx_binding=$cf_with_cxx 3221 3238 fi; 3222 3239 -echo "$as_me:3099: result: $cf_with_cxx_binding" >&5 3223 +echo "$as_me:310 4: result: $cf_with_cxx_binding" >&53240 +echo "$as_me:3105: result: $cf_with_cxx_binding" >&5 3224 3241 echo "${ECHO_T}$cf_with_cxx_binding" >&6 3225 3242 3226 3243 -echo "$as_me:3102: checking if you want to build with Ada95" >&5 3227 +echo "$as_me:310 7: checking if you want to build with Ada95" >&53244 +echo "$as_me:3108: checking if you want to build with Ada95" >&5 3228 3245 echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6 3229 3246 3230 3247 # Check whether --with-ada or --without-ada was given. 3231 @@ -3109,10 +311 4,23 @@3248 @@ -3109,10 +3115,23 @@ 3232 3249 else 3233 3250 cf_with_ada=yes 3234 3251 fi; 3235 3252 -echo "$as_me:3112: result: $cf_with_ada" >&5 3236 +echo "$as_me:311 7: result: $cf_with_ada" >&53253 +echo "$as_me:3118: result: $cf_with_ada" >&5 3237 3254 echo "${ECHO_T}$cf_with_ada" >&6 3238 3255 3239 3256 -echo "$as_me:3115: checking if you want to build programs such as tic" >&5 3240 +echo "$as_me:312 0: checking if you want to install manpages" >&53257 +echo "$as_me:3121: checking if you want to install manpages" >&5 3241 3258 +echo $ECHO_N "checking if you want to install manpages... $ECHO_C" >&6 3242 3259 + … … 3248 3265 + cf_with_manpages=yes 3249 3266 +fi; 3250 +echo "$as_me:313 0: result: $cf_with_manpages" >&53267 +echo "$as_me:3131: result: $cf_with_manpages" >&5 3251 3268 +echo "${ECHO_T}$cf_with_manpages" >&6 3252 3269 + 3253 +echo "$as_me:313 3: checking if you want to build programs such as tic" >&53270 +echo "$as_me:3134: checking if you want to build programs such as tic" >&5 3254 3271 echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6 3255 3272 3256 3273 # Check whether --with-progs or --without-progs was given. 3257 @@ -3122,10 +314 0,10 @@3274 @@ -3122,10 +3141,10 @@ 3258 3275 else 3259 3276 cf_with_progs=yes 3260 3277 fi; 3261 3278 -echo "$as_me:3125: result: $cf_with_progs" >&5 3262 +echo "$as_me:314 3: result: $cf_with_progs" >&53279 +echo "$as_me:3144: result: $cf_with_progs" >&5 3263 3280 echo "${ECHO_T}$cf_with_progs" >&6 3264 3281 3265 3282 -echo "$as_me:3128: checking if you wish to install curses.h" >&5 3266 +echo "$as_me:314 6: checking if you wish to install curses.h" >&53283 +echo "$as_me:3147: checking if you wish to install curses.h" >&5 3267 3284 echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6 3268 3285 3269 3286 # Check whether --with-curses-h or --without-curses-h was given. 3270 @@ -3135,7 +315 3,7 @@3287 @@ -3135,7 +3154,7 @@ 3271 3288 else 3272 3289 with_curses_h=yes 3273 3290 fi; 3274 3291 -echo "$as_me:3138: result: $with_curses_h" >&5 3275 +echo "$as_me:315 6: result: $with_curses_h" >&53292 +echo "$as_me:3157: result: $with_curses_h" >&5 3276 3293 echo "${ECHO_T}$with_curses_h" >&6 3277 3294 3278 3295 modules_to_build="ncurses" 3279 @@ -3161,7 +31 79,7 @@3296 @@ -3161,7 +3180,7 @@ 3280 3297 do 3281 3298 # Extract the first word of "$ac_prog", so it can be a program name with args. 3282 3299 set dummy $ac_prog; ac_word=$2 3283 3300 -echo "$as_me:3164: checking for $ac_word" >&5 3284 +echo "$as_me:318 2: checking for $ac_word" >&53301 +echo "$as_me:3183: checking for $ac_word" >&5 3285 3302 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3286 3303 if test "${ac_cv_prog_AWK+set}" = set; then 3287 3304 echo $ECHO_N "(cached) $ECHO_C" >&6 3288 @@ -3176,7 +319 4,7 @@3305 @@ -3176,7 +3195,7 @@ 3289 3306 test -z "$ac_dir" && ac_dir=. 3290 3307 $as_executable_p "$ac_dir/$ac_word" || continue 3291 3308 ac_cv_prog_AWK="$ac_prog" 3292 3309 -echo "$as_me:3179: found $ac_dir/$ac_word" >&5 3293 +echo "$as_me:319 7: found $ac_dir/$ac_word" >&53310 +echo "$as_me:3198: found $ac_dir/$ac_word" >&5 3294 3311 break 3295 3312 done 3296 3313 3297 @@ -3184,21 +320 2,21 @@3314 @@ -3184,21 +3203,21 @@ 3298 3315 fi 3299 3316 AWK=$ac_cv_prog_AWK 3300 3317 if test -n "$AWK"; then 3301 3318 - echo "$as_me:3187: result: $AWK" >&5 3302 + echo "$as_me:320 5: result: $AWK" >&53319 + echo "$as_me:3206: result: $AWK" >&5 3303 3320 echo "${ECHO_T}$AWK" >&6 3304 3321 else 3305 3322 - echo "$as_me:3190: result: no" >&5 3306 + echo "$as_me:320 8: result: no" >&53323 + echo "$as_me:3209: result: no" >&5 3307 3324 echo "${ECHO_T}no" >&6 3308 3325 fi … … 3312 3329 3313 3330 -test -z "$AWK" && { { echo "$as_me:3197: error: No awk program found" >&5 3314 +test -z "$AWK" && { { echo "$as_me:321 5: error: No awk program found" >&53331 +test -z "$AWK" && { { echo "$as_me:3216: error: No awk program found" >&5 3315 3332 echo "$as_me: error: No awk program found" >&2;} 3316 3333 { (exit 1); exit 1; }; } 3317 3334 3318 3335 -echo "$as_me:3201: checking for egrep" >&5 3319 +echo "$as_me:32 19: checking for egrep" >&53336 +echo "$as_me:3220: checking for egrep" >&5 3320 3337 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 3321 3338 if test "${ac_cv_prog_egrep+set}" = set; then 3322 3339 echo $ECHO_N "(cached) $ECHO_C" >&6 3323 @@ -3208,11 +322 6,11 @@3340 @@ -3208,11 +3227,11 @@ 3324 3341 else ac_cv_prog_egrep='egrep' 3325 3342 fi 3326 3343 fi 3327 3344 -echo "$as_me:3211: result: $ac_cv_prog_egrep" >&5 3328 +echo "$as_me:32 29: result: $ac_cv_prog_egrep" >&53345 +echo "$as_me:3230: result: $ac_cv_prog_egrep" >&5 3329 3346 echo "${ECHO_T}$ac_cv_prog_egrep" >&6 3330 3347 EGREP=$ac_cv_prog_egrep 3331 3348 3332 3349 -test -z "$EGREP" && { { echo "$as_me:3215: error: No egrep program found" >&5 3333 +test -z "$EGREP" && { { echo "$as_me:323 3: error: No egrep program found" >&53350 +test -z "$EGREP" && { { echo "$as_me:3234: error: No egrep program found" >&5 3334 3351 echo "$as_me: error: No egrep program found" >&2;} 3335 3352 { (exit 1); exit 1; }; } 3336 3353 3337 @@ -3228,7 +324 6,7 @@3354 @@ -3228,7 +3247,7 @@ 3338 3355 # AFS /usr/afsws/bin/install, which mishandles nonexistent args 3339 3356 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" 3340 3357 # ./install, which can be erroneously created by make from ./install.sh. 3341 3358 -echo "$as_me:3231: checking for a BSD compatible install" >&5 3342 +echo "$as_me:32 49: checking for a BSD compatible install" >&53359 +echo "$as_me:3250: checking for a BSD compatible install" >&5 3343 3360 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 3344 3361 if test -z "$INSTALL"; then 3345 3362 if test "${ac_cv_path_install+set}" = set; then 3346 @@ -3277,7 +329 5,7 @@3363 @@ -3277,7 +3296,7 @@ 3347 3364 INSTALL=$ac_install_sh 3348 3365 fi 3349 3366 fi 3350 3367 -echo "$as_me:3280: result: $INSTALL" >&5 3351 +echo "$as_me:329 8: result: $INSTALL" >&53368 +echo "$as_me:3299: result: $INSTALL" >&5 3352 3369 echo "${ECHO_T}$INSTALL" >&6 3353 3370 3354 3371 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. 3355 @@ -3302,7 +332 0,7 @@3372 @@ -3302,7 +3321,7 @@ 3356 3373 do 3357 3374 # Extract the first word of "$ac_prog", so it can be a program name with args. 3358 3375 set dummy $ac_prog; ac_word=$2 3359 3376 -echo "$as_me:3305: checking for $ac_word" >&5 3360 +echo "$as_me:332 3: checking for $ac_word" >&53377 +echo "$as_me:3324: checking for $ac_word" >&5 3361 3378 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3362 3379 if test "${ac_cv_prog_LINT+set}" = set; then 3363 3380 echo $ECHO_N "(cached) $ECHO_C" >&6 3364 @@ -3317,7 +333 5,7 @@3381 @@ -3317,7 +3336,7 @@ 3365 3382 test -z "$ac_dir" && ac_dir=. 3366 3383 $as_executable_p "$ac_dir/$ac_word" || continue 3367 3384 ac_cv_prog_LINT="$ac_prog" 3368 3385 -echo "$as_me:3320: found $ac_dir/$ac_word" >&5 3369 +echo "$as_me:333 8: found $ac_dir/$ac_word" >&53386 +echo "$as_me:3339: found $ac_dir/$ac_word" >&5 3370 3387 break 3371 3388 done 3372 3389 3373 @@ -3325,28 +334 3,28 @@3390 @@ -3325,28 +3344,28 @@ 3374 3391 fi 3375 3392 LINT=$ac_cv_prog_LINT 3376 3393 if test -n "$LINT"; then 3377 3394 - echo "$as_me:3328: result: $LINT" >&5 3378 + echo "$as_me:334 6: result: $LINT" >&53395 + echo "$as_me:3347: result: $LINT" >&5 3379 3396 echo "${ECHO_T}$LINT" >&6 3380 3397 else 3381 3398 - echo "$as_me:3331: result: no" >&5 3382 + echo "$as_me:33 49: result: no" >&53399 + echo "$as_me:3350: result: no" >&5 3383 3400 echo "${ECHO_T}no" >&6 3384 3401 fi … … 3388 3405 3389 3406 -echo "$as_me:3338: checking whether ln -s works" >&5 3390 +echo "$as_me:335 6: checking whether ln -s works" >&53407 +echo "$as_me:3357: checking whether ln -s works" >&5 3391 3408 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 3392 3409 LN_S=$as_ln_s 3393 3410 if test "$LN_S" = "ln -s"; then 3394 3411 - echo "$as_me:3342: result: yes" >&5 3395 + echo "$as_me:336 0: result: yes" >&53412 + echo "$as_me:3361: result: yes" >&5 3396 3413 echo "${ECHO_T}yes" >&6 3397 3414 else 3398 3415 - echo "$as_me:3345: result: no, using $LN_S" >&5 3399 + echo "$as_me:336 3: result: no, using $LN_S" >&53416 + echo "$as_me:3364: result: no, using $LN_S" >&5 3400 3417 echo "${ECHO_T}no, using $LN_S" >&6 3401 3418 fi 3402 3419 3403 3420 -echo "$as_me:3349: checking for long file names" >&5 3404 +echo "$as_me:336 7: checking for long file names" >&53421 +echo "$as_me:3368: checking for long file names" >&5 3405 3422 echo $ECHO_N "checking for long file names... $ECHO_C" >&6 3406 3423 if test "${ac_cv_sys_long_file_names+set}" = set; then 3407 3424 echo $ECHO_N "(cached) $ECHO_C" >&6 3408 @@ -3385,7 +340 3,7 @@3425 @@ -3385,7 +3404,7 @@ 3409 3426 rm -rf $ac_xdir 2>/dev/null 3410 3427 done 3411 3428 fi 3412 3429 -echo "$as_me:3388: result: $ac_cv_sys_long_file_names" >&5 3413 +echo "$as_me:340 6: result: $ac_cv_sys_long_file_names" >&53430 +echo "$as_me:3407: result: $ac_cv_sys_long_file_names" >&5 3414 3431 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 3415 3432 if test $ac_cv_sys_long_file_names = yes; then 3416 3433 3417 @@ -3395,7 +341 3,136 @@3434 @@ -3395,7 +3414,136 @@ 3418 3435 3419 3436 fi … … 3422 3439 +# if we find pkg-config, check if we should install the ".pc" files. 3423 3440 + 3424 +echo "$as_me:341 8: checking if you want to use pkg-config" >&53441 +echo "$as_me:3419: checking if you want to use pkg-config" >&5 3425 3442 +echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6 3426 3443 + … … 3432 3449 + cf_pkg_config=yes 3433 3450 +fi; 3434 +echo "$as_me:342 8: result: $cf_pkg_config" >&53451 +echo "$as_me:3429: result: $cf_pkg_config" >&5 3435 3452 +echo "${ECHO_T}$cf_pkg_config" >&6 3436 3453 + … … 3442 3459 + # Extract the first word of "pkg-config", so it can be a program name with args. 3443 3460 +set dummy pkg-config; ac_word=$2 3444 +echo "$as_me:343 8: checking for $ac_word" >&53461 +echo "$as_me:3439: checking for $ac_word" >&5 3445 3462 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3446 3463 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then … … 3459 3476 + if $as_executable_p "$ac_dir/$ac_word"; then 3460 3477 + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" 3461 + echo "$as_me:345 5: found $ac_dir/$ac_word" >&53478 + echo "$as_me:3456: found $ac_dir/$ac_word" >&5 3462 3479 + break 3463 3480 +fi … … 3471 3488 + 3472 3489 +if test -n "$PKG_CONFIG"; then 3473 + echo "$as_me:346 7: result: $PKG_CONFIG" >&53490 + echo "$as_me:3468: result: $PKG_CONFIG" >&5 3474 3491 +echo "${ECHO_T}$PKG_CONFIG" >&6 3475 3492 +else 3476 + echo "$as_me:347 0: result: no" >&53493 + echo "$as_me:3471: result: no" >&5 3477 3494 +echo "${ECHO_T}no" >&6 3478 3495 +fi … … 3512 3529 + ;; 3513 3530 +*) 3514 + { { echo "$as_me:350 8: error: expected a pathname, not \"$PKG_CONFIG\"" >&53531 + { { echo "$as_me:3509: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 3515 3532 +echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} 3516 3533 + { (exit 1); exit 1; }; } … … 3521 3538 + 3522 3539 +if test "$PKG_CONFIG" != no ; then 3523 + echo "$as_me:351 7: checking if we should install .pc files for $PKG_CONFIG" >&53540 + echo "$as_me:3518: checking if we should install .pc files for $PKG_CONFIG" >&5 3524 3541 +echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6 3525 3542 + … … 3538 3555 + enable_pc_files=no 3539 3556 +fi; 3540 + echo "$as_me:353 4: result: $enable_pc_files" >&53557 + echo "$as_me:3535: result: $enable_pc_files" >&5 3541 3558 +echo "${ECHO_T}$enable_pc_files" >&6 3542 3559 + else 3543 + echo "$as_me:353 7: result: no" >&53560 + echo "$as_me:3538: result: no" >&5 3544 3561 +echo "${ECHO_T}no" >&6 3545 + { echo "$as_me:35 39: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&53562 + { echo "$as_me:3540: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5 3546 3563 +echo "$as_me: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&2;} 3547 3564 + enable_pc_files=no … … 3549 3566 +fi 3550 3567 + 3551 +echo "$as_me:354 5: checking if we should assume mixed-case filenames" >&53568 +echo "$as_me:3546: checking if we should assume mixed-case filenames" >&5 3552 3569 echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6 3553 3570 3554 3571 # Check whether --enable-mixed-case or --disable-mixed-case was given. 3555 @@ -3405,11 +355 2,11 @@3572 @@ -3405,11 +3553,11 @@ 3556 3573 else 3557 3574 enable_mixedcase=auto 3558 3575 fi; 3559 3576 -echo "$as_me:3408: result: $enable_mixedcase" >&5 3560 +echo "$as_me:355 5: result: $enable_mixedcase" >&53577 +echo "$as_me:3556: result: $enable_mixedcase" >&5 3561 3578 echo "${ECHO_T}$enable_mixedcase" >&6 3562 3579 if test "$enable_mixedcase" = "auto" ; then 3563 3580 3564 3581 -echo "$as_me:3412: checking if filesystem supports mixed-case filenames" >&5 3565 +echo "$as_me:35 59: checking if filesystem supports mixed-case filenames" >&53582 +echo "$as_me:3560: checking if filesystem supports mixed-case filenames" >&5 3566 3583 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 3567 3584 if test "${cf_cv_mixedcase+set}" = set; then 3568 3585 echo $ECHO_N "(cached) $ECHO_C" >&6 3569 @@ -3436,7 +358 3,7 @@3586 @@ -3436,7 +3584,7 @@ 3570 3587 fi 3571 3588 3572 3589 fi 3573 3590 -echo "$as_me:3439: result: $cf_cv_mixedcase" >&5 3574 +echo "$as_me:358 6: result: $cf_cv_mixedcase" >&53591 +echo "$as_me:3587: result: $cf_cv_mixedcase" >&5 3575 3592 echo "${ECHO_T}$cf_cv_mixedcase" >&6 3576 3593 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF 3577 3594 #define MIXEDCASE_FILENAMES 1 3578 @@ -3453,7 +360 0,7 @@3595 @@ -3453,7 +3601,7 @@ 3579 3596 fi 3580 3597 3581 3598 # do this after mixed-case option (tags/TAGS is not as important as tic). 3582 3599 -echo "$as_me:3456: checking whether ${MAKE-make} sets \${MAKE}" >&5 3583 +echo "$as_me:360 3: checking whether ${MAKE-make} sets \${MAKE}" >&53600 +echo "$as_me:3604: checking whether ${MAKE-make} sets \${MAKE}" >&5 3584 3601 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 3585 3602 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` 3586 3603 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then 3587 @@ -3473,18 +362 0,18 @@3604 @@ -3473,18 +3621,18 @@ 3588 3605 rm -f conftest.make 3589 3606 fi 3590 3607 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then 3591 3608 - echo "$as_me:3476: result: yes" >&5 3592 + echo "$as_me:362 3: result: yes" >&53609 + echo "$as_me:3624: result: yes" >&5 3593 3610 echo "${ECHO_T}yes" >&6 3594 3611 SET_MAKE= 3595 3612 else 3596 3613 - echo "$as_me:3480: result: no" >&5 3597 + echo "$as_me:362 7: result: no" >&53614 + echo "$as_me:3628: result: no" >&5 3598 3615 echo "${ECHO_T}no" >&6 3599 3616 SET_MAKE="MAKE=${MAKE-make}" … … 3603 3620 set dummy ctags; ac_word=$2 3604 3621 -echo "$as_me:3487: checking for $ac_word" >&5 3605 +echo "$as_me:363 4: checking for $ac_word" >&53622 +echo "$as_me:3635: checking for $ac_word" >&5 3606 3623 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3607 3624 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then 3608 3625 echo $ECHO_N "(cached) $ECHO_C" >&6 3609 @@ -3499,7 +364 6,7 @@3626 @@ -3499,7 +3647,7 @@ 3610 3627 test -z "$ac_dir" && ac_dir=. 3611 3628 $as_executable_p "$ac_dir/$ac_word" || continue 3612 3629 ac_cv_prog_MAKE_LOWER_TAGS="yes" 3613 3630 -echo "$as_me:3502: found $ac_dir/$ac_word" >&5 3614 +echo "$as_me:36 49: found $ac_dir/$ac_word" >&53631 +echo "$as_me:3650: found $ac_dir/$ac_word" >&5 3615 3632 break 3616 3633 done 3617 3634 3618 @@ -3508,17 +365 5,17 @@3635 @@ -3508,17 +3656,17 @@ 3619 3636 fi 3620 3637 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS 3621 3638 if test -n "$MAKE_LOWER_TAGS"; then 3622 3639 - echo "$as_me:3511: result: $MAKE_LOWER_TAGS" >&5 3623 + echo "$as_me:365 8: result: $MAKE_LOWER_TAGS" >&53640 + echo "$as_me:3659: result: $MAKE_LOWER_TAGS" >&5 3624 3641 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 3625 3642 else 3626 3643 - echo "$as_me:3514: result: no" >&5 3627 + echo "$as_me:366 1: result: no" >&53644 + echo "$as_me:3662: result: no" >&5 3628 3645 echo "${ECHO_T}no" >&6 3629 3646 fi … … 3633 3650 set dummy etags; ac_word=$2 3634 3651 -echo "$as_me:3521: checking for $ac_word" >&5 3635 +echo "$as_me:366 8: checking for $ac_word" >&53652 +echo "$as_me:3669: checking for $ac_word" >&5 3636 3653 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3637 3654 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then 3638 3655 echo $ECHO_N "(cached) $ECHO_C" >&6 3639 @@ -3533,7 +368 0,7 @@3656 @@ -3533,7 +3681,7 @@ 3640 3657 test -z "$ac_dir" && ac_dir=. 3641 3658 $as_executable_p "$ac_dir/$ac_word" || continue 3642 3659 ac_cv_prog_MAKE_UPPER_TAGS="yes" 3643 3660 -echo "$as_me:3536: found $ac_dir/$ac_word" >&5 3644 +echo "$as_me:368 3: found $ac_dir/$ac_word" >&53661 +echo "$as_me:3684: found $ac_dir/$ac_word" >&5 3645 3662 break 3646 3663 done 3647 3664 3648 @@ -3542,10 +36 89,10 @@3665 @@ -3542,10 +3690,10 @@ 3649 3666 fi 3650 3667 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS 3651 3668 if test -n "$MAKE_UPPER_TAGS"; then 3652 3669 - echo "$as_me:3545: result: $MAKE_UPPER_TAGS" >&5 3653 + echo "$as_me:369 2: result: $MAKE_UPPER_TAGS" >&53670 + echo "$as_me:3693: result: $MAKE_UPPER_TAGS" >&5 3654 3671 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 3655 3672 else 3656 3673 - echo "$as_me:3548: result: no" >&5 3657 + echo "$as_me:369 5: result: no" >&53674 + echo "$as_me:3696: result: no" >&5 3658 3675 echo "${ECHO_T}no" >&6 3659 3676 fi 3660 3677 3661 @@ -3565,7 +371 2,7 @@3678 @@ -3565,7 +3713,7 @@ 3662 3679 MAKE_LOWER_TAGS="#" 3663 3680 fi 3664 3681 3665 3682 -echo "$as_me:3568: checking for makeflags variable" >&5 3666 +echo "$as_me:371 5: checking for makeflags variable" >&53683 +echo "$as_me:3716: checking for makeflags variable" >&5 3667 3684 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 3668 3685 if test "${cf_cv_makeflags+set}" = set; then 3669 3686 echo $ECHO_N "(cached) $ECHO_C" >&6 3670 @@ -3599,13 +374 6,13 @@3687 @@ -3599,13 +3747,13 @@ 3671 3688 rm -f cf_makeflags.tmp 3672 3689 3673 3690 fi 3674 3691 -echo "$as_me:3602: result: $cf_cv_makeflags" >&5 3675 +echo "$as_me:37 49: result: $cf_cv_makeflags" >&53692 +echo "$as_me:3750: result: $cf_cv_makeflags" >&5 3676 3693 echo "${ECHO_T}$cf_cv_makeflags" >&6 3677 3694 … … 3680 3697 set dummy ${ac_tool_prefix}ranlib; ac_word=$2 3681 3698 -echo "$as_me:3608: checking for $ac_word" >&5 3682 +echo "$as_me:375 5: checking for $ac_word" >&53699 +echo "$as_me:3756: checking for $ac_word" >&5 3683 3700 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3684 3701 if test "${ac_cv_prog_RANLIB+set}" = set; then 3685 3702 echo $ECHO_N "(cached) $ECHO_C" >&6 3686 @@ -3620,7 +376 7,7 @@3703 @@ -3620,7 +3768,7 @@ 3687 3704 test -z "$ac_dir" && ac_dir=. 3688 3705 $as_executable_p "$ac_dir/$ac_word" || continue 3689 3706 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" 3690 3707 -echo "$as_me:3623: found $ac_dir/$ac_word" >&5 3691 +echo "$as_me:377 0: found $ac_dir/$ac_word" >&53708 +echo "$as_me:3771: found $ac_dir/$ac_word" >&5 3692 3709 break 3693 3710 done 3694 3711 3695 @@ -3628,10 +377 5,10 @@3712 @@ -3628,10 +3776,10 @@ 3696 3713 fi 3697 3714 RANLIB=$ac_cv_prog_RANLIB 3698 3715 if test -n "$RANLIB"; then 3699 3716 - echo "$as_me:3631: result: $RANLIB" >&5 3700 + echo "$as_me:377 8: result: $RANLIB" >&53717 + echo "$as_me:3779: result: $RANLIB" >&5 3701 3718 echo "${ECHO_T}$RANLIB" >&6 3702 3719 else 3703 3720 - echo "$as_me:3634: result: no" >&5 3704 + echo "$as_me:378 1: result: no" >&53721 + echo "$as_me:3782: result: no" >&5 3705 3722 echo "${ECHO_T}no" >&6 3706 3723 fi 3707 3724 3708 @@ -3640,7 +378 7,7 @@3725 @@ -3640,7 +3788,7 @@ 3709 3726 ac_ct_RANLIB=$RANLIB 3710 3727 # Extract the first word of "ranlib", so it can be a program name with args. 3711 3728 set dummy ranlib; ac_word=$2 3712 3729 -echo "$as_me:3643: checking for $ac_word" >&5 3713 +echo "$as_me:379 0: checking for $ac_word" >&53730 +echo "$as_me:3791: checking for $ac_word" >&5 3714 3731 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3715 3732 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then 3716 3733 echo $ECHO_N "(cached) $ECHO_C" >&6 3717 @@ -3655,7 +380 2,7 @@3734 @@ -3655,7 +3803,7 @@ 3718 3735 test -z "$ac_dir" && ac_dir=. 3719 3736 $as_executable_p "$ac_dir/$ac_word" || continue 3720 3737 ac_cv_prog_ac_ct_RANLIB="ranlib" 3721 3738 -echo "$as_me:3658: found $ac_dir/$ac_word" >&5 3722 +echo "$as_me:380 5: found $ac_dir/$ac_word" >&53739 +echo "$as_me:3806: found $ac_dir/$ac_word" >&5 3723 3740 break 3724 3741 done 3725 3742 3726 @@ -3664,10 +381 1,10 @@3743 @@ -3664,10 +3812,10 @@ 3727 3744 fi 3728 3745 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB 3729 3746 if test -n "$ac_ct_RANLIB"; then 3730 3747 - echo "$as_me:3667: result: $ac_ct_RANLIB" >&5 3731 + echo "$as_me:381 4: result: $ac_ct_RANLIB" >&53748 + echo "$as_me:3815: result: $ac_ct_RANLIB" >&5 3732 3749 echo "${ECHO_T}$ac_ct_RANLIB" >&6 3733 3750 else 3734 3751 - echo "$as_me:3670: result: no" >&5 3735 + echo "$as_me:381 7: result: no" >&53752 + echo "$as_me:3818: result: no" >&5 3736 3753 echo "${ECHO_T}no" >&6 3737 3754 fi 3738 3755 3739 @@ -3679,7 +382 6,7 @@3756 @@ -3679,7 +3827,7 @@ 3740 3757 if test -n "$ac_tool_prefix"; then 3741 3758 # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. 3742 3759 set dummy ${ac_tool_prefix}ld; ac_word=$2 3743 3760 -echo "$as_me:3682: checking for $ac_word" >&5 3744 +echo "$as_me:38 29: checking for $ac_word" >&53761 +echo "$as_me:3830: checking for $ac_word" >&5 3745 3762 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3746 3763 if test "${ac_cv_prog_LD+set}" = set; then 3747 3764 echo $ECHO_N "(cached) $ECHO_C" >&6 3748 @@ -3694,7 +384 1,7 @@3765 @@ -3694,7 +3842,7 @@ 3749 3766 test -z "$ac_dir" && ac_dir=. 3750 3767 $as_executable_p "$ac_dir/$ac_word" || continue 3751 3768 ac_cv_prog_LD="${ac_tool_prefix}ld" 3752 3769 -echo "$as_me:3697: found $ac_dir/$ac_word" >&5 3753 +echo "$as_me:384 4: found $ac_dir/$ac_word" >&53770 +echo "$as_me:3845: found $ac_dir/$ac_word" >&5 3754 3771 break 3755 3772 done 3756 3773 3757 @@ -3702,10 +38 49,10 @@3774 @@ -3702,10 +3850,10 @@ 3758 3775 fi 3759 3776 LD=$ac_cv_prog_LD 3760 3777 if test -n "$LD"; then 3761 3778 - echo "$as_me:3705: result: $LD" >&5 3762 + echo "$as_me:385 2: result: $LD" >&53779 + echo "$as_me:3853: result: $LD" >&5 3763 3780 echo "${ECHO_T}$LD" >&6 3764 3781 else 3765 3782 - echo "$as_me:3708: result: no" >&5 3766 + echo "$as_me:385 5: result: no" >&53783 + echo "$as_me:3856: result: no" >&5 3767 3784 echo "${ECHO_T}no" >&6 3768 3785 fi 3769 3786 3770 @@ -3714,7 +386 1,7 @@3787 @@ -3714,7 +3862,7 @@ 3771 3788 ac_ct_LD=$LD 3772 3789 # Extract the first word of "ld", so it can be a program name with args. 3773 3790 set dummy ld; ac_word=$2 3774 3791 -echo "$as_me:3717: checking for $ac_word" >&5 3775 +echo "$as_me:386 4: checking for $ac_word" >&53792 +echo "$as_me:3865: checking for $ac_word" >&5 3776 3793 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3777 3794 if test "${ac_cv_prog_ac_ct_LD+set}" = set; then 3778 3795 echo $ECHO_N "(cached) $ECHO_C" >&6 3779 @@ -3729,7 +387 6,7 @@3796 @@ -3729,7 +3877,7 @@ 3780 3797 test -z "$ac_dir" && ac_dir=. 3781 3798 $as_executable_p "$ac_dir/$ac_word" || continue 3782 3799 ac_cv_prog_ac_ct_LD="ld" 3783 3800 -echo "$as_me:3732: found $ac_dir/$ac_word" >&5 3784 +echo "$as_me:38 79: found $ac_dir/$ac_word" >&53801 +echo "$as_me:3880: found $ac_dir/$ac_word" >&5 3785 3802 break 3786 3803 done 3787 3804 3788 @@ -3738,10 +388 5,10 @@3805 @@ -3738,10 +3886,10 @@ 3789 3806 fi 3790 3807 ac_ct_LD=$ac_cv_prog_ac_ct_LD 3791 3808 if test -n "$ac_ct_LD"; then 3792 3809 - echo "$as_me:3741: result: $ac_ct_LD" >&5 3793 + echo "$as_me:388 8: result: $ac_ct_LD" >&53810 + echo "$as_me:3889: result: $ac_ct_LD" >&5 3794 3811 echo "${ECHO_T}$ac_ct_LD" >&6 3795 3812 else 3796 3813 - echo "$as_me:3744: result: no" >&5 3797 + echo "$as_me:389 1: result: no" >&53814 + echo "$as_me:3892: result: no" >&5 3798 3815 echo "${ECHO_T}no" >&6 3799 3816 fi 3800 3817 3801 @@ -3753,7 +390 0,7 @@3818 @@ -3753,7 +3901,7 @@ 3802 3819 if test -n "$ac_tool_prefix"; then 3803 3820 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 3804 3821 set dummy ${ac_tool_prefix}ar; ac_word=$2 3805 3822 -echo "$as_me:3756: checking for $ac_word" >&5 3806 +echo "$as_me:390 3: checking for $ac_word" >&53823 +echo "$as_me:3904: checking for $ac_word" >&5 3807 3824 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3808 3825 if test "${ac_cv_prog_AR+set}" = set; then 3809 3826 echo $ECHO_N "(cached) $ECHO_C" >&6 3810 @@ -3768,7 +391 5,7 @@3827 @@ -3768,7 +3916,7 @@ 3811 3828 test -z "$ac_dir" && ac_dir=. 3812 3829 $as_executable_p "$ac_dir/$ac_word" || continue 3813 3830 ac_cv_prog_AR="${ac_tool_prefix}ar" 3814 3831 -echo "$as_me:3771: found $ac_dir/$ac_word" >&5 3815 +echo "$as_me:391 8: found $ac_dir/$ac_word" >&53832 +echo "$as_me:3919: found $ac_dir/$ac_word" >&5 3816 3833 break 3817 3834 done 3818 3835 3819 @@ -3776,10 +392 3,10 @@3836 @@ -3776,10 +3924,10 @@ 3820 3837 fi 3821 3838 AR=$ac_cv_prog_AR 3822 3839 if test -n "$AR"; then 3823 3840 - echo "$as_me:3779: result: $AR" >&5 3824 + echo "$as_me:392 6: result: $AR" >&53841 + echo "$as_me:3927: result: $AR" >&5 3825 3842 echo "${ECHO_T}$AR" >&6 3826 3843 else 3827 3844 - echo "$as_me:3782: result: no" >&5 3828 + echo "$as_me:39 29: result: no" >&53845 + echo "$as_me:3930: result: no" >&5 3829 3846 echo "${ECHO_T}no" >&6 3830 3847 fi 3831 3848 3832 @@ -3788,7 +393 5,7 @@3849 @@ -3788,7 +3936,7 @@ 3833 3850 ac_ct_AR=$AR 3834 3851 # Extract the first word of "ar", so it can be a program name with args. 3835 3852 set dummy ar; ac_word=$2 3836 3853 -echo "$as_me:3791: checking for $ac_word" >&5 3837 +echo "$as_me:393 8: checking for $ac_word" >&53854 +echo "$as_me:3939: checking for $ac_word" >&5 3838 3855 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3839 3856 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then 3840 3857 echo $ECHO_N "(cached) $ECHO_C" >&6 3841 @@ -3803,7 +395 0,7 @@3858 @@ -3803,7 +3951,7 @@ 3842 3859 test -z "$ac_dir" && ac_dir=. 3843 3860 $as_executable_p "$ac_dir/$ac_word" || continue 3844 3861 ac_cv_prog_ac_ct_AR="ar" 3845 3862 -echo "$as_me:3806: found $ac_dir/$ac_word" >&5 3846 +echo "$as_me:395 3: found $ac_dir/$ac_word" >&53863 +echo "$as_me:3954: found $ac_dir/$ac_word" >&5 3847 3864 break 3848 3865 done 3849 3866 3850 @@ -3812,10 +39 59,10 @@3867 @@ -3812,10 +3960,10 @@ 3851 3868 fi 3852 3869 ac_ct_AR=$ac_cv_prog_ac_ct_AR 3853 3870 if test -n "$ac_ct_AR"; then 3854 3871 - echo "$as_me:3815: result: $ac_ct_AR" >&5 3855 + echo "$as_me:396 2: result: $ac_ct_AR" >&53872 + echo "$as_me:3963: result: $ac_ct_AR" >&5 3856 3873 echo "${ECHO_T}$ac_ct_AR" >&6 3857 3874 else 3858 3875 - echo "$as_me:3818: result: no" >&5 3859 + echo "$as_me:396 5: result: no" >&53876 + echo "$as_me:3966: result: no" >&5 3860 3877 echo "${ECHO_T}no" >&6 3861 3878 fi 3862 3879 3863 @@ -3824,25 +397 1,123 @@3880 @@ -3824,25 +3972,123 @@ 3864 3881 AR="$ac_cv_prog_AR" 3865 3882 fi … … 3869 3886 + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 3870 3887 +set dummy ${ac_tool_prefix}ar; ac_word=$2 3871 +echo "$as_me:397 7: checking for $ac_word" >&53888 +echo "$as_me:3978: checking for $ac_word" >&5 3872 3889 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3873 3890 +if test "${ac_cv_prog_AR+set}" = set; then … … 3884 3901 + $as_executable_p "$ac_dir/$ac_word" || continue 3885 3902 +ac_cv_prog_AR="${ac_tool_prefix}ar" 3886 +echo "$as_me:399 2: found $ac_dir/$ac_word" >&53903 +echo "$as_me:3993: found $ac_dir/$ac_word" >&5 3887 3904 +break 3888 3905 +done … … 3894 3911 +AR=$ac_cv_prog_AR 3895 3912 +if test -n "$AR"; then 3896 + echo "$as_me:400 0: result: $AR" >&53913 + echo "$as_me:4001: result: $AR" >&5 3897 3914 +echo "${ECHO_T}$AR" >&6 3898 3915 +else 3899 + echo "$as_me:400 3: result: no" >&53916 + echo "$as_me:4004: result: no" >&5 3900 3917 +echo "${ECHO_T}no" >&6 3901 3918 +fi … … 3908 3925 + # Extract the first word of "ar", so it can be a program name with args. 3909 3926 +set dummy ar; ac_word=$2 3910 +echo "$as_me:401 2: checking for $ac_word" >&53927 +echo "$as_me:4013: checking for $ac_word" >&5 3911 3928 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3912 3929 +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then … … 3923 3940 + $as_executable_p "$ac_dir/$ac_word" || continue 3924 3941 +ac_cv_prog_ac_ct_AR="ar" 3925 +echo "$as_me:402 7: found $ac_dir/$ac_word" >&53942 +echo "$as_me:4028: found $ac_dir/$ac_word" >&5 3926 3943 +break 3927 3944 +done … … 3932 3949 +ac_ct_AR=$ac_cv_prog_ac_ct_AR 3933 3950 +if test -n "$ac_ct_AR"; then 3934 + echo "$as_me:403 6: result: $ac_ct_AR" >&53951 + echo "$as_me:4037: result: $ac_ct_AR" >&5 3935 3952 +echo "${ECHO_T}$ac_ct_AR" >&6 3936 3953 +else 3937 + echo "$as_me:40 39: result: no" >&53954 + echo "$as_me:4040: result: no" >&5 3938 3955 +echo "${ECHO_T}no" >&6 3939 3956 +fi … … 3944 3961 +fi 3945 3962 + 3946 +echo "$as_me:404 8: checking for options to update archives" >&53963 +echo "$as_me:4049: checking for options to update archives" >&5 3947 3964 +echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 3948 3965 +if test "${cf_cv_ar_flags+set}" = set; then … … 3955 3972 + rm -f conftest.$ac_cv_objext 3956 3973 + rm -f conftest.a 3957 3958 -cf_cv_subst_AR_OPTS=$AR_OPTS 3959 -echo "$as_me:3840: result: $AR_OPTS" >&5 3960 -echo "${ECHO_T}$AR_OPTS" >&6 3974 + 3961 3975 + cat >conftest.$ac_ext <<EOF 3962 +#line 406 1"configure"3976 +#line 4062 "configure" 3963 3977 +int testdata[3] = { 123, 456, 789 }; 3964 3978 +EOF 3965 + if { (eval echo "$as_me:406 4: \"$ac_compile\"") >&53979 + if { (eval echo "$as_me:4065: \"$ac_compile\"") >&5 3966 3980 + (eval $ac_compile) 2>&5 3967 3981 + ac_status=$? 3968 + echo "$as_me:406 7: \$? = $ac_status" >&53982 + echo "$as_me:4068: \$? = $ac_status" >&5 3969 3983 + (exit $ac_status); } ; then 3970 3984 + $AR $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null … … 3975 3989 + else 3976 3990 + test -n "$verbose" && echo " cannot compile test-program" 1>&6 3977 + 3978 +echo "${as_me-configure}:4077: testing cannot compile test-program ..." 1>&5 3991 3992 -cf_cv_subst_AR_OPTS=$AR_OPTS 3993 -echo "$as_me:3840: result: $AR_OPTS" >&5 3994 -echo "${ECHO_T}$AR_OPTS" >&6 3995 +echo "${as_me-configure}:4078: testing cannot compile test-program ..." 1>&5 3979 3996 + 3980 3997 + break … … 3984 4001 3985 4002 fi 3986 +echo "$as_me:408 5: result: $cf_cv_ar_flags" >&54003 +echo "$as_me:4086: result: $cf_cv_ar_flags" >&5 3987 4004 +echo "${ECHO_T}$cf_cv_ar_flags" >&6 3988 4005 +test -z "$ARFLAGS" && ARFLAGS=$cf_cv_ar_flags … … 3990 4007 3991 4008 -echo "$as_me:3845: checking if you have specified an install-prefix" >&5 3992 +echo "$as_me:409 0: checking if you have specified an install-prefix" >&54009 +echo "$as_me:4091: checking if you have specified an install-prefix" >&5 3993 4010 echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6 3994 4011 3995 4012 # Check whether --with-install-prefix or --without-install-prefix was given. 3996 @@ -3855,7 +410 0,7 @@4013 @@ -3855,7 +4101,7 @@ 3997 4014 ;; 3998 4015 esac 3999 4016 fi; 4000 4017 -echo "$as_me:3858: result: $DESTDIR" >&5 4001 +echo "$as_me:410 3: result: $DESTDIR" >&54018 +echo "$as_me:4104: result: $DESTDIR" >&5 4002 4019 echo "${ECHO_T}$DESTDIR" >&6 4003 4020 4004 4021 ############################################################################### 4005 @@ -3883,7 +412 8,7 @@4022 @@ -3883,7 +4129,7 @@ 4006 4023 do 4007 4024 # Extract the first word of "$ac_prog", so it can be a program name with args. 4008 4025 set dummy $ac_prog; ac_word=$2 4009 4026 -echo "$as_me:3886: checking for $ac_word" >&5 4010 +echo "$as_me:413 1: checking for $ac_word" >&54027 +echo "$as_me:4132: checking for $ac_word" >&5 4011 4028 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 4012 4029 if test "${ac_cv_prog_BUILD_CC+set}" = set; then 4013 4030 echo $ECHO_N "(cached) $ECHO_C" >&6 4014 @@ -3898,7 +414 3,7 @@4031 @@ -3898,7 +4144,7 @@ 4015 4032 test -z "$ac_dir" && ac_dir=. 4016 4033 $as_executable_p "$ac_dir/$ac_word" || continue 4017 4034 ac_cv_prog_BUILD_CC="$ac_prog" 4018 4035 -echo "$as_me:3901: found $ac_dir/$ac_word" >&5 4019 +echo "$as_me:414 6: found $ac_dir/$ac_word" >&54036 +echo "$as_me:4147: found $ac_dir/$ac_word" >&5 4020 4037 break 4021 4038 done 4022 4039 4023 @@ -3906,10 +415 1,10 @@4040 @@ -3906,10 +4152,10 @@ 4024 4041 fi 4025 4042 BUILD_CC=$ac_cv_prog_BUILD_CC 4026 4043 if test -n "$BUILD_CC"; then 4027 4044 - echo "$as_me:3909: result: $BUILD_CC" >&5 4028 + echo "$as_me:415 4: result: $BUILD_CC" >&54045 + echo "$as_me:4155: result: $BUILD_CC" >&5 4029 4046 echo "${ECHO_T}$BUILD_CC" >&6 4030 4047 else 4031 4048 - echo "$as_me:3912: result: no" >&5 4032 + echo "$as_me:415 7: result: no" >&54049 + echo "$as_me:4158: result: no" >&5 4033 4050 echo "${ECHO_T}no" >&6 4034 4051 fi 4035 4052 4036 @@ -3917,12 +416 2,12 @@4053 @@ -3917,12 +4163,12 @@ 4037 4054 done 4038 4055 4039 4056 fi; 4040 4057 - echo "$as_me:3920: checking for native build C compiler" >&5 4041 + echo "$as_me:416 5: checking for native build C compiler" >&54058 + echo "$as_me:4166: checking for native build C compiler" >&5 4042 4059 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 4043 4060 - echo "$as_me:3922: result: $BUILD_CC" >&5 4044 + echo "$as_me:416 7: result: $BUILD_CC" >&54061 + echo "$as_me:4168: result: $BUILD_CC" >&5 4045 4062 echo "${ECHO_T}$BUILD_CC" >&6 4046 4063 4047 4064 - echo "$as_me:3925: checking for native build C preprocessor" >&5 4048 + echo "$as_me:417 0: checking for native build C preprocessor" >&54065 + echo "$as_me:4171: checking for native build C preprocessor" >&5 4049 4066 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6 4050 4067 4051 4068 # Check whether --with-build-cpp or --without-build-cpp was given. 4052 @@ -3932,10 +417 7,10 @@4069 @@ -3932,10 +4178,10 @@ 4053 4070 else 4054 4071 BUILD_CPP='${BUILD_CC} -E' 4055 4072 fi; 4056 4073 - echo "$as_me:3935: result: $BUILD_CPP" >&5 4057 + echo "$as_me:418 0: result: $BUILD_CPP" >&54074 + echo "$as_me:4181: result: $BUILD_CPP" >&5 4058 4075 echo "${ECHO_T}$BUILD_CPP" >&6 4059 4076 4060 4077 - echo "$as_me:3938: checking for native build C flags" >&5 4061 + echo "$as_me:418 3: checking for native build C flags" >&54078 + echo "$as_me:4184: checking for native build C flags" >&5 4062 4079 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6 4063 4080 4064 4081 # Check whether --with-build-cflags or --without-build-cflags was given. 4065 @@ -3943,10 +418 8,10 @@4082 @@ -3943,10 +4189,10 @@ 4066 4083 withval="$with_build_cflags" 4067 4084 BUILD_CFLAGS="$withval" 4068 4085 fi; 4069 4086 - echo "$as_me:3946: result: $BUILD_CFLAGS" >&5 4070 + echo "$as_me:419 1: result: $BUILD_CFLAGS" >&54087 + echo "$as_me:4192: result: $BUILD_CFLAGS" >&5 4071 4088 echo "${ECHO_T}$BUILD_CFLAGS" >&6 4072 4089 4073 4090 - echo "$as_me:3949: checking for native build C preprocessor-flags" >&5 4074 + echo "$as_me:419 4: checking for native build C preprocessor-flags" >&54091 + echo "$as_me:4195: checking for native build C preprocessor-flags" >&5 4075 4092 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6 4076 4093 4077 4094 # Check whether --with-build-cppflags or --without-build-cppflags was given. 4078 @@ -3954,10 +4 199,10 @@4095 @@ -3954,10 +4200,10 @@ 4079 4096 withval="$with_build_cppflags" 4080 4097 BUILD_CPPFLAGS="$withval" 4081 4098 fi; 4082 4099 - echo "$as_me:3957: result: $BUILD_CPPFLAGS" >&5 4083 + echo "$as_me:420 2: result: $BUILD_CPPFLAGS" >&54100 + echo "$as_me:4203: result: $BUILD_CPPFLAGS" >&5 4084 4101 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 4085 4102 4086 4103 - echo "$as_me:3960: checking for native build linker-flags" >&5 4087 + echo "$as_me:420 5: checking for native build linker-flags" >&54104 + echo "$as_me:4206: checking for native build linker-flags" >&5 4088 4105 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6 4089 4106 4090 4107 # Check whether --with-build-ldflags or --without-build-ldflags was given. 4091 @@ -3965,10 +421 0,10 @@4108 @@ -3965,10 +4211,10 @@ 4092 4109 withval="$with_build_ldflags" 4093 4110 BUILD_LDFLAGS="$withval" 4094 4111 fi; 4095 4112 - echo "$as_me:3968: result: $BUILD_LDFLAGS" >&5 4096 + echo "$as_me:421 3: result: $BUILD_LDFLAGS" >&54113 + echo "$as_me:4214: result: $BUILD_LDFLAGS" >&5 4097 4114 echo "${ECHO_T}$BUILD_LDFLAGS" >&6 4098 4115 4099 4116 - echo "$as_me:3971: checking for native build linker-libraries" >&5 4100 + echo "$as_me:421 6: checking for native build linker-libraries" >&54117 + echo "$as_me:4217: checking for native build linker-libraries" >&5 4101 4118 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6 4102 4119 4103 4120 # Check whether --with-build-libs or --without-build-libs was given. 4104 @@ -3976,7 +422 1,7 @@4121 @@ -3976,7 +4222,7 @@ 4105 4122 withval="$with_build_libs" 4106 4123 BUILD_LIBS="$withval" 4107 4124 fi; 4108 4125 - echo "$as_me:3979: result: $BUILD_LIBS" >&5 4109 + echo "$as_me:422 4: result: $BUILD_LIBS" >&54126 + echo "$as_me:4225: result: $BUILD_LIBS" >&5 4110 4127 echo "${ECHO_T}$BUILD_LIBS" >&6 4111 4128 4112 4129 # this assumes we're on Unix. 4113 @@ -3986,7 +423 1,7 @@4130 @@ -3986,7 +4232,7 @@ 4114 4131 : ${BUILD_CC:='${CC}'} 4115 4132 4116 4133 if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then 4117 4134 - { { echo "$as_me:3989: error: Cross-build requires two compilers. 4118 + { { echo "$as_me:423 4: error: Cross-build requires two compilers.4135 + { { echo "$as_me:4235: error: Cross-build requires two compilers. 4119 4136 Use --with-build-cc to specify the native compiler." >&5 4120 4137 echo "$as_me: error: Cross-build requires two compilers. 4121 4138 Use --with-build-cc to specify the native compiler." >&2;} 4122 @@ -4027,7 +427 2,7 @@4139 @@ -4027,7 +4273,7 @@ 4123 4140 LIB_INSTALL= 4124 4141 LIB_UNINSTALL= 4125 4142 4126 4143 -echo "$as_me:4030: checking if you want to build libraries with libtool" >&5 4127 +echo "$as_me:427 5: checking if you want to build libraries with libtool" >&54144 +echo "$as_me:4276: checking if you want to build libraries with libtool" >&5 4128 4145 echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6 4129 4146 4130 4147 # Check whether --with-libtool or --without-libtool was given. 4131 @@ -4037,11 +428 2,11 @@4148 @@ -4037,11 +4283,11 @@ 4132 4149 else 4133 4150 with_libtool=no 4134 4151 fi; 4135 4152 -echo "$as_me:4040: result: $with_libtool" >&5 4136 +echo "$as_me:428 5: result: $with_libtool" >&54153 +echo "$as_me:4286: result: $with_libtool" >&5 4137 4154 echo "${ECHO_T}$with_libtool" >&6 4138 4155 if test "$with_libtool" != "no"; then … … 4143 4160 if test "x$prefix" != xNONE; then 4144 4161 cf_path_syntax="$prefix" 4145 @@ -4068,7 +431 3,7 @@4162 @@ -4068,7 +4314,7 @@ 4146 4163 with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%` 4147 4164 ;; 4148 4165 *) 4149 4166 - { { echo "$as_me:4071: error: expected a pathname, not \"$with_libtool\"" >&5 4150 + { { echo "$as_me:431 6: error: expected a pathname, not \"$with_libtool\"" >&54167 + { { echo "$as_me:4317: error: expected a pathname, not \"$with_libtool\"" >&5 4151 4168 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;} 4152 4169 { (exit 1); exit 1; }; } 4153 4170 ;; 4154 @@ -4076,9 +432 1,9 @@4171 @@ -4076,9 +4322,9 @@ 4155 4172 4156 4173 LIBTOOL=$with_libtool … … 4160 4177 set dummy libtool; ac_word=$2 4161 4178 -echo "$as_me:4081: checking for $ac_word" >&5 4162 +echo "$as_me:432 6: checking for $ac_word" >&54179 +echo "$as_me:4327: checking for $ac_word" >&5 4163 4180 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 4164 4181 if test "${ac_cv_path_LIBTOOL+set}" = set; then 4165 4182 echo $ECHO_N "(cached) $ECHO_C" >&6 4166 @@ -4095,7 +434 0,7 @@4183 @@ -4095,7 +4341,7 @@ 4167 4184 test -z "$ac_dir" && ac_dir=. 4168 4185 if $as_executable_p "$ac_dir/$ac_word"; then 4169 4186 ac_cv_path_LIBTOOL="$ac_dir/$ac_word" 4170 4187 - echo "$as_me:4098: found $ac_dir/$ac_word" >&5 4171 + echo "$as_me:434 3: found $ac_dir/$ac_word" >&54188 + echo "$as_me:4344: found $ac_dir/$ac_word" >&5 4172 4189 break 4173 4190 fi 4174 4191 done 4175 @@ -4106,20 +435 1,20 @@4192 @@ -4106,20 +4352,20 @@ 4176 4193 LIBTOOL=$ac_cv_path_LIBTOOL 4177 4194 4178 4195 if test -n "$LIBTOOL"; then 4179 4196 - echo "$as_me:4109: result: $LIBTOOL" >&5 4180 + echo "$as_me:435 4: result: $LIBTOOL" >&54197 + echo "$as_me:4355: result: $LIBTOOL" >&5 4181 4198 echo "${ECHO_T}$LIBTOOL" >&6 4182 4199 else 4183 4200 - echo "$as_me:4112: result: no" >&5 4184 + echo "$as_me:435 7: result: no" >&54201 + echo "$as_me:4358: result: no" >&5 4185 4202 echo "${ECHO_T}no" >&6 4186 4203 fi … … 4191 4208 + fi 4192 4209 + if test -z "$LIBTOOL" ; then 4193 + { { echo "$as_me:436 3: error: Cannot find libtool" >&54210 + { { echo "$as_me:4364: error: Cannot find libtool" >&5 4194 4211 echo "$as_me: error: Cannot find libtool" >&2;} 4195 4212 { (exit 1); exit 1; }; } … … 4201 4218 LIB_SUFFIX=.la 4202 4219 LIB_CLEAN='${LIBTOOL} --mode=clean' 4203 @@ -4130,24 +437 5,32 @@4220 @@ -4130,24 +4376,32 @@ 4204 4221 LIB_PREP=: 4205 4222 4206 4223 # Show the version of libtool 4207 4224 - echo "$as_me:4133: checking version of libtool" >&5 4208 + echo "$as_me:437 8: checking version of libtool" >&54225 + echo "$as_me:4379: checking version of libtool" >&5 4209 4226 echo $ECHO_N "checking version of libtool... $ECHO_C" >&6 4210 4227 … … 4215 4232 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.].*//'` 4216 4233 - echo "$as_me:4140: result: $cf_cv_libtool_version" >&5 4217 + echo "$as_me:438 5: result: $cf_cv_libtool_version" >&54234 + echo "$as_me:4386: result: $cf_cv_libtool_version" >&5 4218 4235 echo "${ECHO_T}$cf_cv_libtool_version" >&6 4219 4236 if test -z "$cf_cv_libtool_version" ; then 4220 4237 - { { echo "$as_me:4143: error: This is not GNU libtool" >&5 4221 + { { echo "$as_me:438 8: error: This is not GNU libtool" >&54238 + { { echo "$as_me:4389: error: This is not GNU libtool" >&5 4222 4239 echo "$as_me: error: This is not GNU libtool" >&2;} 4223 4240 { (exit 1); exit 1; }; } … … 4240 4257 LIBTOOL="$LIBTOOL --tag=CC" 4241 4258 ;; 4242 @@ -4168,7 +442 1,7 @@4259 @@ -4168,7 +4422,7 @@ 4243 4260 4244 4261 else 4245 4262 4246 4263 -echo "$as_me:4171: checking if you want to build shared libraries" >&5 4247 +echo "$as_me:442 4: checking if you want to build shared libraries" >&54264 +echo "$as_me:4425: checking if you want to build shared libraries" >&5 4248 4265 echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6 4249 4266 4250 4267 # Check whether --with-shared or --without-shared was given. 4251 @@ -4178,11 +443 1,11 @@4268 @@ -4178,11 +4432,11 @@ 4252 4269 else 4253 4270 with_shared=no 4254 4271 fi; 4255 4272 -echo "$as_me:4181: result: $with_shared" >&5 4256 +echo "$as_me:443 4: result: $with_shared" >&54273 +echo "$as_me:4435: result: $with_shared" >&5 4257 4274 echo "${ECHO_T}$with_shared" >&6 4258 4275 test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared" 4259 4276 4260 4277 -echo "$as_me:4185: checking if you want to build static libraries" >&5 4261 +echo "$as_me:443 8: checking if you want to build static libraries" >&54278 +echo "$as_me:4439: checking if you want to build static libraries" >&5 4262 4279 echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6 4263 4280 4264 4281 # Check whether --with-normal or --without-normal was given. 4265 @@ -4192,11 +444 5,11 @@4282 @@ -4192,11 +4446,11 @@ 4266 4283 else 4267 4284 with_normal=yes 4268 4285 fi; 4269 4286 -echo "$as_me:4195: result: $with_normal" >&5 4270 +echo "$as_me:444 8: result: $with_normal" >&54287 +echo "$as_me:4449: result: $with_normal" >&5 4271 4288 echo "${ECHO_T}$with_normal" >&6 4272 4289 test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal" 4273 4290 4274 4291 -echo "$as_me:4199: checking if you want to build debug libraries" >&5 4275 +echo "$as_me:445 2: checking if you want to build debug libraries" >&54292 +echo "$as_me:4453: checking if you want to build debug libraries" >&5 4276 4293 echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6 4277 4294 4278 4295 # Check whether --with-debug or --without-debug was given. 4279 @@ -4206,11 +44 59,11 @@4296 @@ -4206,11 +4460,11 @@ 4280 4297 else 4281 4298 with_debug=yes 4282 4299 fi; 4283 4300 -echo "$as_me:4209: result: $with_debug" >&5 4284 +echo "$as_me:446 2: result: $with_debug" >&54301 +echo "$as_me:4463: result: $with_debug" >&5 4285 4302 echo "${ECHO_T}$with_debug" >&6 4286 4303 test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug" 4287 4304 4288 4305 -echo "$as_me:4213: checking if you want to build profiling libraries" >&5 4289 +echo "$as_me:446 6: checking if you want to build profiling libraries" >&54306 +echo "$as_me:4467: checking if you want to build profiling libraries" >&5 4290 4307 echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6 4291 4308 4292 4309 # Check whether --with-profile or --without-profile was given. 4293 @@ -4220,7 +447 3,7 @@4310 @@ -4220,7 +4474,7 @@ 4294 4311 else 4295 4312 with_profile=no 4296 4313 fi; 4297 4314 -echo "$as_me:4223: result: $with_profile" >&5 4298 +echo "$as_me:447 6: result: $with_profile" >&54315 +echo "$as_me:4477: result: $with_profile" >&5 4299 4316 echo "${ECHO_T}$with_profile" >&6 4300 4317 test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile" 4301 4318 4302 @@ -4228,19 +448 1,19 @@4319 @@ -4228,19 +4482,19 @@ 4303 4320 4304 4321 ############################################################################### 4305 4322 4306 4323 -echo "$as_me:4231: checking for specified models" >&5 4307 +echo "$as_me:448 4: checking for specified models" >&54324 +echo "$as_me:4485: checking for specified models" >&5 4308 4325 echo $ECHO_N "checking for specified models... $ECHO_C" >&6 4309 4326 test -z "$cf_list_models" && cf_list_models=normal 4310 4327 test "$with_libtool" != "no" && cf_list_models=libtool 4311 4328 -echo "$as_me:4235: result: $cf_list_models" >&5 4312 +echo "$as_me:448 8: result: $cf_list_models" >&54329 +echo "$as_me:4489: result: $cf_list_models" >&5 4313 4330 echo "${ECHO_T}$cf_list_models" >&6 4314 4331 … … 4316 4333 ### up test-applications. 4317 4334 -echo "$as_me:4240: checking for default model" >&5 4318 +echo "$as_me:449 3: checking for default model" >&54335 +echo "$as_me:4494: checking for default model" >&5 4319 4336 echo $ECHO_N "checking for default model... $ECHO_C" >&6 4320 4337 DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'` 4321 4338 -echo "$as_me:4243: result: $DFT_LWR_MODEL" >&5 4322 +echo "$as_me:449 6: result: $DFT_LWR_MODEL" >&54339 +echo "$as_me:4497: result: $DFT_LWR_MODEL" >&5 4323 4340 echo "${ECHO_T}$DFT_LWR_MODEL" >&6 4324 4341 4325 4342 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 4326 @@ -4269,7 +452 2,7 @@4343 @@ -4269,7 +4523,7 @@ 4327 4344 4328 4345 ############################################################################### 4329 4346 4330 4347 -echo "$as_me:4272: checking if you want to build a separate terminfo library" >&5 4331 +echo "$as_me:452 5: checking if you want to build a separate terminfo library" >&54348 +echo "$as_me:4526: checking if you want to build a separate terminfo library" >&5 4332 4349 echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6 4333 4350 4334 4351 # Check whether --with-termlib or --without-termlib was given. 4335 @@ -4279,10 +453 2,10 @@4352 @@ -4279,10 +4533,10 @@ 4336 4353 else 4337 4354 with_termlib=no 4338 4355 fi; 4339 4356 -echo "$as_me:4282: result: $with_termlib" >&5 4340 +echo "$as_me:453 5: result: $with_termlib" >&54357 +echo "$as_me:4536: result: $with_termlib" >&5 4341 4358 echo "${ECHO_T}$with_termlib" >&6 4342 4359 4343 4360 -echo "$as_me:4285: checking if you want to build a separate tic library" >&5 4344 +echo "$as_me:453 8: checking if you want to build a separate tic library" >&54361 +echo "$as_me:4539: checking if you want to build a separate tic library" >&5 4345 4362 echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6 4346 4363 4347 4364 # Check whether --with-ticlib or --without-ticlib was given. 4348 @@ -4292,13 +454 5,13 @@4365 @@ -4292,13 +4546,13 @@ 4349 4366 else 4350 4367 with_ticlib=no 4351 4368 fi; 4352 4369 -echo "$as_me:4295: result: $with_ticlib" >&5 4353 +echo "$as_me:454 8: result: $with_ticlib" >&54370 +echo "$as_me:4549: result: $with_ticlib" >&5 4354 4371 echo "${ECHO_T}$with_ticlib" >&6 4355 4372 … … 4358 4375 4359 4376 -echo "$as_me:4301: checking if you want to link with the GPM mouse library" >&5 4360 +echo "$as_me:455 4: checking if you want to link with the GPM mouse library" >&54377 +echo "$as_me:4555: checking if you want to link with the GPM mouse library" >&5 4361 4378 echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6 4362 4379 4363 4380 # Check whether --with-gpm or --without-gpm was given. 4364 @@ -4308,27 +456 1,27 @@4381 @@ -4308,27 +4562,27 @@ 4365 4382 else 4366 4383 with_gpm=maybe 4367 4384 fi; 4368 4385 -echo "$as_me:4311: result: $with_gpm" >&5 4369 +echo "$as_me:456 4: result: $with_gpm" >&54386 +echo "$as_me:4565: result: $with_gpm" >&5 4370 4387 echo "${ECHO_T}$with_gpm" >&6 4371 4388 4372 4389 if test "$with_gpm" != no ; then 4373 4390 - echo "$as_me:4315: checking for gpm.h" >&5 4374 + echo "$as_me:456 8: checking for gpm.h" >&54391 + echo "$as_me:4569: checking for gpm.h" >&5 4375 4392 echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6 4376 4393 if test "${ac_cv_header_gpm_h+set}" = set; then … … 4379 4396 cat >conftest.$ac_ext <<_ACEOF 4380 4397 -#line 4321 "configure" 4381 +#line 457 4"configure"4398 +#line 4575 "configure" 4382 4399 #include "confdefs.h" 4383 4400 #include <gpm.h> 4384 4401 _ACEOF 4385 4402 -if { (eval echo "$as_me:4325: \"$ac_cpp conftest.$ac_ext\"") >&5 4386 +if { (eval echo "$as_me:457 8: \"$ac_cpp conftest.$ac_ext\"") >&54403 +if { (eval echo "$as_me:4579: \"$ac_cpp conftest.$ac_ext\"") >&5 4387 4404 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 4388 4405 ac_status=$? … … 4391 4408 cat conftest.err >&5 4392 4409 - echo "$as_me:4331: \$? = $ac_status" >&5 4393 + echo "$as_me:458 4: \$? = $ac_status" >&54410 + echo "$as_me:4585: \$? = $ac_status" >&5 4394 4411 (exit $ac_status); } >/dev/null; then 4395 4412 if test -s conftest.err; then 4396 4413 ac_cpp_err=$ac_c_preproc_warn_flag 4397 @@ -4347,7 +460 0,7 @@4414 @@ -4347,7 +4601,7 @@ 4398 4415 fi 4399 4416 rm -f conftest.err conftest.$ac_ext 4400 4417 fi 4401 4418 -echo "$as_me:4350: result: $ac_cv_header_gpm_h" >&5 4402 +echo "$as_me:460 3: result: $ac_cv_header_gpm_h" >&54419 +echo "$as_me:4604: result: $ac_cv_header_gpm_h" >&5 4403 4420 echo "${ECHO_T}$ac_cv_header_gpm_h" >&6 4404 4421 if test $ac_cv_header_gpm_h = yes; then 4405 4422 4406 @@ -4358,14 +461 1,14 @@4423 @@ -4358,14 +4612,14 @@ 4407 4424 if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then 4408 4425 test -n "$verbose" && echo " assuming we really have GPM library" 1>&6 4409 4426 4410 4427 -echo "${as_me-configure}:4361: testing assuming we really have GPM library ..." 1>&5 4411 +echo "${as_me-configure}:461 4: testing assuming we really have GPM library ..." 1>&54428 +echo "${as_me-configure}:4615: testing assuming we really have GPM library ..." 1>&5 4412 4429 4413 4430 cat >>confdefs.h <<\EOF … … 4417 4434 else 4418 4435 - echo "$as_me:4368: checking for Gpm_Open in -lgpm" >&5 4419 + echo "$as_me:462 1: checking for Gpm_Open in -lgpm" >&54436 + echo "$as_me:4622: checking for Gpm_Open in -lgpm" >&5 4420 4437 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 4421 4438 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then 4422 4439 echo $ECHO_N "(cached) $ECHO_C" >&6 4423 @@ -4373,7 +462 6,7 @@4440 @@ -4373,7 +4627,7 @@ 4424 4441 ac_check_lib_save_LIBS=$LIBS 4425 4442 LIBS="-lgpm $LIBS" 4426 4443 cat >conftest.$ac_ext <<_ACEOF 4427 4444 -#line 4376 "configure" 4428 +#line 46 29"configure"4445 +#line 4630 "configure" 4429 4446 #include "confdefs.h" 4430 4447 4431 4448 /* Override any gcc2 internal prototype to avoid an error. */ 4432 @@ -4392,16 +464 5,16 @@4449 @@ -4392,16 +4646,16 @@ 4433 4450 } 4434 4451 _ACEOF 4435 4452 rm -f conftest.$ac_objext conftest$ac_exeext 4436 4453 -if { (eval echo "$as_me:4395: \"$ac_link\"") >&5 4437 +if { (eval echo "$as_me:464 8: \"$ac_link\"") >&54454 +if { (eval echo "$as_me:4649: \"$ac_link\"") >&5 4438 4455 (eval $ac_link) 2>&5 4439 4456 ac_status=$? 4440 4457 - echo "$as_me:4398: \$? = $ac_status" >&5 4441 + echo "$as_me:465 1: \$? = $ac_status" >&54458 + echo "$as_me:4652: \$? = $ac_status" >&5 4442 4459 (exit $ac_status); } && 4443 4460 { ac_try='test -s conftest$ac_exeext' 4444 4461 - { (eval echo "$as_me:4401: \"$ac_try\"") >&5 4445 + { (eval echo "$as_me:465 4: \"$ac_try\"") >&54462 + { (eval echo "$as_me:4655: \"$ac_try\"") >&5 4446 4463 (eval $ac_try) 2>&5 4447 4464 ac_status=$? 4448 4465 - echo "$as_me:4404: \$? = $ac_status" >&5 4449 + echo "$as_me:465 7: \$? = $ac_status" >&54466 + echo "$as_me:4658: \$? = $ac_status" >&5 4450 4467 (exit $ac_status); }; }; then 4451 4468 ac_cv_lib_gpm_Gpm_Open=yes 4452 4469 else 4453 @@ -4412,13 +466 5,13 @@4470 @@ -4412,13 +4666,13 @@ 4454 4471 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4455 4472 LIBS=$ac_check_lib_save_LIBS 4456 4473 fi 4457 4474 -echo "$as_me:4415: result: $ac_cv_lib_gpm_Gpm_Open" >&5 4458 +echo "$as_me:466 8: result: $ac_cv_lib_gpm_Gpm_Open" >&54475 +echo "$as_me:4669: result: $ac_cv_lib_gpm_Gpm_Open" >&5 4459 4476 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 4460 4477 if test $ac_cv_lib_gpm_Gpm_Open = yes; then … … 4463 4480 4464 4481 - { { echo "$as_me:4421: error: Cannot link with GPM library" >&5 4465 + { { echo "$as_me:467 4: error: Cannot link with GPM library" >&54482 + { { echo "$as_me:4675: error: Cannot link with GPM library" >&5 4466 4483 echo "$as_me: error: Cannot link with GPM library" >&2;} 4467 4484 { (exit 1); exit 1; }; } 4468 4485 fi 4469 @@ -4428,7 +468 1,7 @@4486 @@ -4428,7 +4682,7 @@ 4470 4487 4471 4488 else 4472 4489 4473 4490 - test "$with_gpm" != maybe && { echo "$as_me:4431: WARNING: Cannot find GPM header" >&5 4474 + test "$with_gpm" != maybe && { echo "$as_me:468 4: WARNING: Cannot find GPM header" >&54491 + test "$with_gpm" != maybe && { echo "$as_me:4685: WARNING: Cannot find GPM header" >&5 4475 4492 echo "$as_me: WARNING: Cannot find GPM header" >&2;} 4476 4493 with_gpm=no 4477 4494 4478 @@ -4437,7 +469 0,7 @@4495 @@ -4437,7 +4691,7 @@ 4479 4496 fi 4480 4497 4481 4498 if test "$with_gpm" != no ; then 4482 4499 - echo "$as_me:4440: checking if you want to load GPM dynamically" >&5 4483 + echo "$as_me:469 3: checking if you want to load GPM dynamically" >&54500 + echo "$as_me:4694: checking if you want to load GPM dynamically" >&5 4484 4501 echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6 4485 4502 4486 4503 # Check whether --with-dlsym or --without-dlsym was given. 4487 @@ -4447,18 +470 0,18 @@4504 @@ -4447,18 +4701,18 @@ 4488 4505 else 4489 4506 with_dlsym=yes 4490 4507 fi; 4491 4508 - echo "$as_me:4450: result: $with_dlsym" >&5 4492 + echo "$as_me:470 3: result: $with_dlsym" >&54509 + echo "$as_me:4704: result: $with_dlsym" >&5 4493 4510 echo "${ECHO_T}$with_dlsym" >&6 4494 4511 if test "$with_dlsym" = yes ; then … … 4496 4513 cf_have_dlsym=no 4497 4514 -echo "$as_me:4455: checking for dlsym" >&5 4498 +echo "$as_me:470 8: checking for dlsym" >&54515 +echo "$as_me:4709: checking for dlsym" >&5 4499 4516 echo $ECHO_N "checking for dlsym... $ECHO_C" >&6 4500 4517 if test "${ac_cv_func_dlsym+set}" = set; then … … 4503 4520 cat >conftest.$ac_ext <<_ACEOF 4504 4521 -#line 4461 "configure" 4505 +#line 471 4"configure"4522 +#line 4715 "configure" 4506 4523 #include "confdefs.h" 4507 4524 /* System header to define __stub macros and hopefully few prototypes, 4508 4525 which can conflict with char dlsym (); below. */ 4509 @@ -4489,16 +474 2,16 @@4526 @@ -4489,16 +4743,16 @@ 4510 4527 } 4511 4528 _ACEOF 4512 4529 rm -f conftest.$ac_objext conftest$ac_exeext 4513 4530 -if { (eval echo "$as_me:4492: \"$ac_link\"") >&5 4514 +if { (eval echo "$as_me:474 5: \"$ac_link\"") >&54531 +if { (eval echo "$as_me:4746: \"$ac_link\"") >&5 4515 4532 (eval $ac_link) 2>&5 4516 4533 ac_status=$? 4517 4534 - echo "$as_me:4495: \$? = $ac_status" >&5 4518 + echo "$as_me:474 8: \$? = $ac_status" >&54535 + echo "$as_me:4749: \$? = $ac_status" >&5 4519 4536 (exit $ac_status); } && 4520 4537 { ac_try='test -s conftest$ac_exeext' 4521 4538 - { (eval echo "$as_me:4498: \"$ac_try\"") >&5 4522 + { (eval echo "$as_me:475 1: \"$ac_try\"") >&54539 + { (eval echo "$as_me:4752: \"$ac_try\"") >&5 4523 4540 (eval $ac_try) 2>&5 4524 4541 ac_status=$? 4525 4542 - echo "$as_me:4501: \$? = $ac_status" >&5 4526 + echo "$as_me:475 4: \$? = $ac_status" >&54543 + echo "$as_me:4755: \$? = $ac_status" >&5 4527 4544 (exit $ac_status); }; }; then 4528 4545 ac_cv_func_dlsym=yes 4529 4546 else 4530 @@ -4508,14 +476 1,14 @@4547 @@ -4508,14 +4762,14 @@ 4531 4548 fi 4532 4549 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4533 4550 fi 4534 4551 -echo "$as_me:4511: result: $ac_cv_func_dlsym" >&5 4535 +echo "$as_me:476 4: result: $ac_cv_func_dlsym" >&54552 +echo "$as_me:4765: result: $ac_cv_func_dlsym" >&5 4536 4553 echo "${ECHO_T}$ac_cv_func_dlsym" >&6 4537 4554 if test $ac_cv_func_dlsym = yes; then … … 4541 4558 cf_have_libdl=no 4542 4559 -echo "$as_me:4518: checking for dlsym in -ldl" >&5 4543 +echo "$as_me:477 1: checking for dlsym in -ldl" >&54560 +echo "$as_me:4772: checking for dlsym in -ldl" >&5 4544 4561 echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6 4545 4562 if test "${ac_cv_lib_dl_dlsym+set}" = set; then 4546 4563 echo $ECHO_N "(cached) $ECHO_C" >&6 4547 @@ -4523,7 +477 6,7 @@4564 @@ -4523,7 +4777,7 @@ 4548 4565 ac_check_lib_save_LIBS=$LIBS 4549 4566 LIBS="-ldl $LIBS" 4550 4567 cat >conftest.$ac_ext <<_ACEOF 4551 4568 -#line 4526 "configure" 4552 +#line 47 79"configure"4569 +#line 4780 "configure" 4553 4570 #include "confdefs.h" 4554 4571 4555 4572 /* Override any gcc2 internal prototype to avoid an error. */ 4556 @@ -4542,16 +479 5,16 @@4573 @@ -4542,16 +4796,16 @@ 4557 4574 } 4558 4575 _ACEOF 4559 4576 rm -f conftest.$ac_objext conftest$ac_exeext 4560 4577 -if { (eval echo "$as_me:4545: \"$ac_link\"") >&5 4561 +if { (eval echo "$as_me:479 8: \"$ac_link\"") >&54578 +if { (eval echo "$as_me:4799: \"$ac_link\"") >&5 4562 4579 (eval $ac_link) 2>&5 4563 4580 ac_status=$? 4564 4581 - echo "$as_me:4548: \$? = $ac_status" >&5 4565 + echo "$as_me:480 1: \$? = $ac_status" >&54582 + echo "$as_me:4802: \$? = $ac_status" >&5 4566 4583 (exit $ac_status); } && 4567 4584 { ac_try='test -s conftest$ac_exeext' 4568 4585 - { (eval echo "$as_me:4551: \"$ac_try\"") >&5 4569 + { (eval echo "$as_me:480 4: \"$ac_try\"") >&54586 + { (eval echo "$as_me:4805: \"$ac_try\"") >&5 4570 4587 (eval $ac_try) 2>&5 4571 4588 ac_status=$? 4572 4589 - echo "$as_me:4554: \$? = $ac_status" >&5 4573 + echo "$as_me:480 7: \$? = $ac_status" >&54590 + echo "$as_me:4808: \$? = $ac_status" >&5 4574 4591 (exit $ac_status); }; }; then 4575 4592 ac_cv_lib_dl_dlsym=yes 4576 4593 else 4577 @@ -4562,7 +481 5,7 @@4594 @@ -4562,7 +4816,7 @@ 4578 4595 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4579 4596 LIBS=$ac_check_lib_save_LIBS 4580 4597 fi 4581 4598 -echo "$as_me:4565: result: $ac_cv_lib_dl_dlsym" >&5 4582 +echo "$as_me:481 8: result: $ac_cv_lib_dl_dlsym" >&54599 +echo "$as_me:4819: result: $ac_cv_lib_dl_dlsym" >&5 4583 4600 echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6 4584 4601 if test $ac_cv_lib_dl_dlsym = yes; then 4585 4602 4586 @@ -4575,10 +482 8,10 @@4603 @@ -4575,10 +4829,10 @@ 4587 4604 if test "$cf_have_dlsym" = yes ; then 4588 4605 test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS" 4589 4606 4590 4607 - echo "$as_me:4578: checking whether able to link to dl*() functions" >&5 4591 + echo "$as_me:483 1: checking whether able to link to dl*() functions" >&54608 + echo "$as_me:4832: checking whether able to link to dl*() functions" >&5 4592 4609 echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6 4593 4610 cat >conftest.$ac_ext <<_ACEOF 4594 4611 -#line 4581 "configure" 4595 +#line 483 4"configure"4612 +#line 4835 "configure" 4596 4613 #include "confdefs.h" 4597 4614 #include <dlfcn.h> 4598 4615 int 4599 @@ -4596,16 +48 49,16 @@4616 @@ -4596,16 +4850,16 @@ 4600 4617 } 4601 4618 _ACEOF 4602 4619 rm -f conftest.$ac_objext conftest$ac_exeext 4603 4620 -if { (eval echo "$as_me:4599: \"$ac_link\"") >&5 4604 +if { (eval echo "$as_me:485 2: \"$ac_link\"") >&54621 +if { (eval echo "$as_me:4853: \"$ac_link\"") >&5 4605 4622 (eval $ac_link) 2>&5 4606 4623 ac_status=$? 4607 4624 - echo "$as_me:4602: \$? = $ac_status" >&5 4608 + echo "$as_me:485 5: \$? = $ac_status" >&54625 + echo "$as_me:4856: \$? = $ac_status" >&5 4609 4626 (exit $ac_status); } && 4610 4627 { ac_try='test -s conftest$ac_exeext' 4611 4628 - { (eval echo "$as_me:4605: \"$ac_try\"") >&5 4612 + { (eval echo "$as_me:485 8: \"$ac_try\"") >&54629 + { (eval echo "$as_me:4859: \"$ac_try\"") >&5 4613 4630 (eval $ac_try) 2>&5 4614 4631 ac_status=$? 4615 4632 - echo "$as_me:4608: \$? = $ac_status" >&5 4616 + echo "$as_me:486 1: \$? = $ac_status" >&54633 + echo "$as_me:4862: \$? = $ac_status" >&5 4617 4634 (exit $ac_status); }; }; then 4618 4635 4619 4636 cat >>confdefs.h <<\EOF 4620 @@ -4616,15 +48 69,15 @@4637 @@ -4616,15 +4870,15 @@ 4621 4638 echo "$as_me: failed program was:" >&5 4622 4639 cat conftest.$ac_ext >&5 4623 4640 4624 4641 - { { echo "$as_me:4619: error: Cannot link test program for libdl" >&5 4625 + { { echo "$as_me:487 2: error: Cannot link test program for libdl" >&54642 + { { echo "$as_me:4873: error: Cannot link test program for libdl" >&5 4626 4643 echo "$as_me: error: Cannot link test program for libdl" >&2;} 4627 4644 { (exit 1); exit 1; }; } … … 4629 4646 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4630 4647 - echo "$as_me:4624: result: ok" >&5 4631 + echo "$as_me:487 7: result: ok" >&54648 + echo "$as_me:4878: result: ok" >&5 4632 4649 echo "${ECHO_T}ok" >&6 4633 4650 else 4634 4651 - { { echo "$as_me:4627: error: Cannot find dlsym function" >&5 4635 + { { echo "$as_me:488 0: error: Cannot find dlsym function" >&54652 + { { echo "$as_me:4881: error: Cannot find dlsym function" >&5 4636 4653 echo "$as_me: error: Cannot find dlsym function" >&2;} 4637 4654 { (exit 1); exit 1; }; } 4638 4655 fi 4639 @@ -4632,12 +488 5,12 @@4656 @@ -4632,12 +4886,12 @@ 4640 4657 if test "$with_gpm" != yes ; then 4641 4658 test -n "$verbose" && echo " assuming soname for gpm is $with_gpm" 1>&6 4642 4659 4643 4660 -echo "${as_me-configure}:4635: testing assuming soname for gpm is $with_gpm ..." 1>&5 4644 +echo "${as_me-configure}:488 8: testing assuming soname for gpm is $with_gpm ..." 1>&54661 +echo "${as_me-configure}:4889: testing assuming soname for gpm is $with_gpm ..." 1>&5 4645 4662 4646 4663 cf_cv_gpm_soname="$with_gpm" … … 4648 4665 4649 4666 -echo "$as_me:4640: checking for soname of gpm library" >&5 4650 +echo "$as_me:489 3: checking for soname of gpm library" >&54667 +echo "$as_me:4894: checking for soname of gpm library" >&5 4651 4668 echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6 4652 4669 if test "${cf_cv_gpm_soname+set}" = set; then 4653 4670 echo $ECHO_N "(cached) $ECHO_C" >&6 4654 @@ -4655,15 +490 8,15 @@4671 @@ -4655,15 +4909,15 @@ 4655 4672 CF_EOF 4656 4673 cf_save_LIBS="$LIBS" 4657 4674 LIBS="-lgpm $LIBS" 4658 4675 - if { (eval echo "$as_me:4658: \"$ac_compile\"") >&5 4659 + if { (eval echo "$as_me:491 1: \"$ac_compile\"") >&54676 + if { (eval echo "$as_me:4912: \"$ac_compile\"") >&5 4660 4677 (eval $ac_compile) 2>&5 4661 4678 ac_status=$? 4662 4679 - echo "$as_me:4661: \$? = $ac_status" >&5 4663 + echo "$as_me:491 4: \$? = $ac_status" >&54680 + echo "$as_me:4915: \$? = $ac_status" >&5 4664 4681 (exit $ac_status); } ; then 4665 4682 - if { (eval echo "$as_me:4663: \"$ac_link\"") >&5 4666 + if { (eval echo "$as_me:491 6: \"$ac_link\"") >&54683 + if { (eval echo "$as_me:4917: \"$ac_link\"") >&5 4667 4684 (eval $ac_link) 2>&5 4668 4685 ac_status=$? 4669 4686 - echo "$as_me:4666: \$? = $ac_status" >&5 4670 + echo "$as_me:49 19: \$? = $ac_status" >&54687 + echo "$as_me:4920: \$? = $ac_status" >&5 4671 4688 (exit $ac_status); } ; then 4672 4689 cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.` 4673 4690 test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown 4674 @@ -4674,7 +492 7,7 @@4691 @@ -4674,7 +4928,7 @@ 4675 4692 fi 4676 4693 4677 4694 fi 4678 4695 -echo "$as_me:4677: result: $cf_cv_gpm_soname" >&5 4679 +echo "$as_me:493 0: result: $cf_cv_gpm_soname" >&54696 +echo "$as_me:4931: result: $cf_cv_gpm_soname" >&5 4680 4697 echo "${ECHO_T}$cf_cv_gpm_soname" >&6 4681 4698 4682 4699 fi 4683 @@ -4690,7 +494 3,7 @@4700 @@ -4690,7 +4944,7 @@ 4684 4701 #define HAVE_LIBGPM 1 4685 4702 EOF 4686 4703 4687 4704 -echo "$as_me:4693: checking for Gpm_Wgetch in -lgpm" >&5 4688 +echo "$as_me:494 6: checking for Gpm_Wgetch in -lgpm" >&54705 +echo "$as_me:4947: checking for Gpm_Wgetch in -lgpm" >&5 4689 4706 echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6 4690 4707 if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then 4691 4708 echo $ECHO_N "(cached) $ECHO_C" >&6 4692 @@ -4698,7 +495 1,7 @@4709 @@ -4698,7 +4952,7 @@ 4693 4710 ac_check_lib_save_LIBS=$LIBS 4694 4711 LIBS="-lgpm $LIBS" 4695 4712 cat >conftest.$ac_ext <<_ACEOF 4696 4713 -#line 4701 "configure" 4697 +#line 495 4"configure"4714 +#line 4955 "configure" 4698 4715 #include "confdefs.h" 4699 4716 4700 4717 /* Override any gcc2 internal prototype to avoid an error. */ 4701 @@ -4717,16 +497 0,16 @@4718 @@ -4717,16 +4971,16 @@ 4702 4719 } 4703 4720 _ACEOF 4704 4721 rm -f conftest.$ac_objext conftest$ac_exeext 4705 4722 -if { (eval echo "$as_me:4720: \"$ac_link\"") >&5 4706 +if { (eval echo "$as_me:497 3: \"$ac_link\"") >&54723 +if { (eval echo "$as_me:4974: \"$ac_link\"") >&5 4707 4724 (eval $ac_link) 2>&5 4708 4725 ac_status=$? 4709 4726 - echo "$as_me:4723: \$? = $ac_status" >&5 4710 + echo "$as_me:497 6: \$? = $ac_status" >&54727 + echo "$as_me:4977: \$? = $ac_status" >&5 4711 4728 (exit $ac_status); } && 4712 4729 { ac_try='test -s conftest$ac_exeext' 4713 4730 - { (eval echo "$as_me:4726: \"$ac_try\"") >&5 4714 + { (eval echo "$as_me:49 79: \"$ac_try\"") >&54731 + { (eval echo "$as_me:4980: \"$ac_try\"") >&5 4715 4732 (eval $ac_try) 2>&5 4716 4733 ac_status=$? 4717 4734 - echo "$as_me:4729: \$? = $ac_status" >&5 4718 + echo "$as_me:498 2: \$? = $ac_status" >&54735 + echo "$as_me:4983: \$? = $ac_status" >&5 4719 4736 (exit $ac_status); }; }; then 4720 4737 ac_cv_lib_gpm_Gpm_Wgetch=yes 4721 4738 else 4722 @@ -4737,11 +499 0,11 @@4739 @@ -4737,11 +4991,11 @@ 4723 4740 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4724 4741 LIBS=$ac_check_lib_save_LIBS 4725 4742 fi 4726 4743 -echo "$as_me:4740: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 4727 +echo "$as_me:499 3: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&54744 +echo "$as_me:4994: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 4728 4745 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6 4729 4746 if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then 4730 4747 4731 4748 -echo "$as_me:4744: checking if GPM is weakly bound to curses library" >&5 4732 +echo "$as_me:499 7: checking if GPM is weakly bound to curses library" >&54749 +echo "$as_me:4998: checking if GPM is weakly bound to curses library" >&5 4733 4750 echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6 4734 4751 if test "${cf_cv_check_gpm_wgetch+set}" = set; then 4735 4752 echo $ECHO_N "(cached) $ECHO_C" >&6 4736 @@ -4765,15 +501 8,15 @@4753 @@ -4765,15 +5019,15 @@ 4737 4754 # to rely on the static library, noting that some packagers may not 4738 4755 # include it. 4739 4756 LIBS="-static -lgpm -dynamic $LIBS" 4740 4757 - if { (eval echo "$as_me:4768: \"$ac_compile\"") >&5 4741 + if { (eval echo "$as_me:502 1: \"$ac_compile\"") >&54758 + if { (eval echo "$as_me:5022: \"$ac_compile\"") >&5 4742 4759 (eval $ac_compile) 2>&5 4743 4760 ac_status=$? 4744 4761 - echo "$as_me:4771: \$? = $ac_status" >&5 4745 + echo "$as_me:502 4: \$? = $ac_status" >&54762 + echo "$as_me:5025: \$? = $ac_status" >&5 4746 4763 (exit $ac_status); } ; then 4747 4764 - if { (eval echo "$as_me:4773: \"$ac_link\"") >&5 4748 + if { (eval echo "$as_me:502 6: \"$ac_link\"") >&54765 + if { (eval echo "$as_me:5027: \"$ac_link\"") >&5 4749 4766 (eval $ac_link) 2>&5 4750 4767 ac_status=$? 4751 4768 - echo "$as_me:4776: \$? = $ac_status" >&5 4752 + echo "$as_me:50 29: \$? = $ac_status" >&54769 + echo "$as_me:5030: \$? = $ac_status" >&5 4753 4770 (exit $ac_status); } ; then 4754 4771 cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'` 4755 4772 test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes 4756 @@ -4785,11 +503 8,11 @@4773 @@ -4785,11 +5039,11 @@ 4757 4774 fi 4758 4775 4759 4776 fi 4760 4777 -echo "$as_me:4788: result: $cf_cv_check_gpm_wgetch" >&5 4761 +echo "$as_me:504 1: result: $cf_cv_check_gpm_wgetch" >&54778 +echo "$as_me:5042: result: $cf_cv_check_gpm_wgetch" >&5 4762 4779 echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6 4763 4780 4764 4781 if test "$cf_cv_check_gpm_wgetch" != yes ; then 4765 4782 - { echo "$as_me:4792: WARNING: GPM library is already linked with curses - read the FAQ" >&5 4766 + { echo "$as_me:504 5: WARNING: GPM library is already linked with curses - read the FAQ" >&54783 + { echo "$as_me:5046: WARNING: GPM library is already linked with curses - read the FAQ" >&5 4767 4784 echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;} 4768 4785 fi 4769 4786 4770 @@ -4799,7 +505 2,7 @@4787 @@ -4799,7 +5053,7 @@ 4771 4788 4772 4789 # not everyone has "test -c" 4773 4790 if test -c /dev/sysmouse 2>/dev/null ; then 4774 4791 -echo "$as_me:4802: checking if you want to use sysmouse" >&5 4775 +echo "$as_me:505 5: checking if you want to use sysmouse" >&54792 +echo "$as_me:5056: checking if you want to use sysmouse" >&5 4776 4793 echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6 4777 4794 4778 4795 # Check whether --with-sysmouse or --without-sysmouse was given. 4779 @@ -4811,7 +506 4,7 @@4796 @@ -4811,7 +5065,7 @@ 4780 4797 fi; 4781 4798 if test "$cf_with_sysmouse" != no ; then 4782 4799 cat >conftest.$ac_ext <<_ACEOF 4783 4800 -#line 4814 "configure" 4784 +#line 506 7"configure"4801 +#line 5068 "configure" 4785 4802 #include "confdefs.h" 4786 4803 4787 4804 #include <osreldate.h> 4788 @@ -4834,16 +508 7,16 @@4805 @@ -4834,16 +5088,16 @@ 4789 4806 } 4790 4807 _ACEOF 4791 4808 rm -f conftest.$ac_objext 4792 4809 -if { (eval echo "$as_me:4837: \"$ac_compile\"") >&5 4793 +if { (eval echo "$as_me:509 0: \"$ac_compile\"") >&54810 +if { (eval echo "$as_me:5091: \"$ac_compile\"") >&5 4794 4811 (eval $ac_compile) 2>&5 4795 4812 ac_status=$? 4796 4813 - echo "$as_me:4840: \$? = $ac_status" >&5 4797 + echo "$as_me:509 3: \$? = $ac_status" >&54814 + echo "$as_me:5094: \$? = $ac_status" >&5 4798 4815 (exit $ac_status); } && 4799 4816 { ac_try='test -s conftest.$ac_objext' 4800 4817 - { (eval echo "$as_me:4843: \"$ac_try\"") >&5 4801 + { (eval echo "$as_me:509 6: \"$ac_try\"") >&54818 + { (eval echo "$as_me:5097: \"$ac_try\"") >&5 4802 4819 (eval $ac_try) 2>&5 4803 4820 ac_status=$? 4804 4821 - echo "$as_me:4846: \$? = $ac_status" >&5 4805 + echo "$as_me:5 099: \$? = $ac_status" >&54822 + echo "$as_me:5100: \$? = $ac_status" >&5 4806 4823 (exit $ac_status); }; }; then 4807 4824 cf_with_sysmouse=yes 4808 4825 else 4809 @@ -4853,7 +510 6,7 @@4826 @@ -4853,7 +5107,7 @@ 4810 4827 fi 4811 4828 rm -f conftest.$ac_objext conftest.$ac_ext 4812 4829 fi 4813 4830 -echo "$as_me:4856: result: $cf_with_sysmouse" >&5 4814 +echo "$as_me:51 09: result: $cf_with_sysmouse" >&54831 +echo "$as_me:5110: result: $cf_with_sysmouse" >&5 4815 4832 echo "${ECHO_T}$cf_with_sysmouse" >&6 4816 4833 test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF 4817 4834 #define USE_SYSMOUSE 1 4818 @@ -4871,7 +512 4,7 @@4835 @@ -4871,7 +5125,7 @@ 4819 4836 test -n "$GXX" && test "${ac_cv_prog_cxx_g}" != yes && CXX_G_OPT='' 4820 4837 fi 4821 4838 4822 4839 -echo "$as_me:4874: checking for default loader flags" >&5 4823 +echo "$as_me:512 7: checking for default loader flags" >&54840 +echo "$as_me:5128: checking for default loader flags" >&5 4824 4841 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 4825 4842 case $DFT_LWR_MODEL in 4826 4843 libtool) LD_MODEL='' ;; 4827 @@ -4880,13 +513 3,13 @@4844 @@ -4880,13 +5134,13 @@ 4828 4845 profile) LD_MODEL='-pg';; 4829 4846 shared) LD_MODEL='' ;; 4830 4847 esac 4831 4848 -echo "$as_me:4883: result: $LD_MODEL" >&5 4832 +echo "$as_me:513 6: result: $LD_MODEL" >&54849 +echo "$as_me:5137: result: $LD_MODEL" >&5 4833 4850 echo "${ECHO_T}$LD_MODEL" >&6 4834 4851 … … 4837 4854 4838 4855 -echo "$as_me:4889: checking if rpath option should be used" >&5 4839 +echo "$as_me:514 2: checking if rpath option should be used" >&54856 +echo "$as_me:5143: checking if rpath option should be used" >&5 4840 4857 echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6 4841 4858 4842 4859 # Check whether --enable-rpath or --disable-rpath was given. 4843 @@ -4896,10 +51 49,10 @@4860 @@ -4896,10 +5150,10 @@ 4844 4861 else 4845 4862 cf_cv_ld_rpath=no 4846 4863 fi; 4847 4864 -echo "$as_me:4899: result: $cf_cv_ld_rpath" >&5 4848 +echo "$as_me:515 2: result: $cf_cv_ld_rpath" >&54865 +echo "$as_me:5153: result: $cf_cv_ld_rpath" >&5 4849 4866 echo "${ECHO_T}$cf_cv_ld_rpath" >&6 4850 4867 4851 4868 -echo "$as_me:4902: checking if shared libraries should be relinked during install" >&5 4852 +echo "$as_me:515 5: checking if shared libraries should be relinked during install" >&54869 +echo "$as_me:5156: checking if shared libraries should be relinked during install" >&5 4853 4870 echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6 4854 4871 4855 4872 # Check whether --enable-relink or --disable-relink was given. 4856 @@ -4909,19 +516 2,20 @@4873 @@ -4909,19 +5163,20 @@ 4857 4874 else 4858 4875 cf_cv_do_relink=yes 4859 4876 fi; 4860 4877 -echo "$as_me:4912: result: $cf_cv_do_relink" >&5 4861 +echo "$as_me:516 5: result: $cf_cv_do_relink" >&54878 +echo "$as_me:5166: result: $cf_cv_do_relink" >&5 4862 4879 echo "${ECHO_T}$cf_cv_do_relink" >&6 4863 4880 ;; … … 4873 4890 4874 4891 - echo "$as_me:4924: checking if release/abi version should be used for shared libs" >&5 4875 + echo "$as_me:517 8: checking if release/abi version should be used for shared libs" >&54892 + echo "$as_me:5179: checking if release/abi version should be used for shared libs" >&5 4876 4893 echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 4877 4894 4878 4895 # Check whether --with-shlib-version or --without-shlib-version was given. 4879 @@ -4936,7 +519 0,7 @@4896 @@ -4936,7 +5191,7 @@ 4880 4897 cf_cv_shlib_version=$withval 4881 4898 ;; 4882 4899 *) 4883 4900 - { { echo "$as_me:4939: error: option value must be one of: rel, abi, auto or no" >&5 4884 + { { echo "$as_me:519 3: error: option value must be one of: rel, abi, auto or no" >&54901 + { { echo "$as_me:5194: error: option value must be one of: rel, abi, auto or no" >&5 4885 4902 echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;} 4886 4903 { (exit 1); exit 1; }; } 4887 4904 ;; 4888 @@ -4945,7 +5 199,7 @@4905 @@ -4945,7 +5200,7 @@ 4889 4906 else 4890 4907 cf_cv_shlib_version=auto 4891 4908 fi; 4892 4909 - echo "$as_me:4948: result: $cf_cv_shlib_version" >&5 4893 + echo "$as_me:520 2: result: $cf_cv_shlib_version" >&54910 + echo "$as_me:5203: result: $cf_cv_shlib_version" >&5 4894 4911 echo "${ECHO_T}$cf_cv_shlib_version" >&6 4895 4912 4896 4913 cf_cv_rm_so_locs=no 4897 @@ -4954,14 +520 8,14 @@4914 @@ -4954,14 +5209,14 @@ 4898 4915 CC_SHARED_OPTS= 4899 4916 if test "$GCC" = yes 4900 4917 then 4901 4918 - echo "$as_me:4957: checking which $CC option to use" >&5 4902 + echo "$as_me:521 1: checking which $CC option to use" >&54919 + echo "$as_me:5212: checking which $CC option to use" >&5 4903 4920 echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 4904 4921 cf_save_CFLAGS="$CFLAGS" … … 4908 4925 cat >conftest.$ac_ext <<_ACEOF 4909 4926 -#line 4964 "configure" 4910 +#line 521 8"configure"4927 +#line 5219 "configure" 4911 4928 #include "confdefs.h" 4912 4929 #include <stdio.h> 4913 4930 int 4914 @@ -4973,16 +522 7,16 @@4931 @@ -4973,16 +5228,16 @@ 4915 4932 } 4916 4933 _ACEOF 4917 4934 rm -f conftest.$ac_objext 4918 4935 -if { (eval echo "$as_me:4976: \"$ac_compile\"") >&5 4919 +if { (eval echo "$as_me:523 0: \"$ac_compile\"") >&54936 +if { (eval echo "$as_me:5231: \"$ac_compile\"") >&5 4920 4937 (eval $ac_compile) 2>&5 4921 4938 ac_status=$? 4922 4939 - echo "$as_me:4979: \$? = $ac_status" >&5 4923 + echo "$as_me:523 3: \$? = $ac_status" >&54940 + echo "$as_me:5234: \$? = $ac_status" >&5 4924 4941 (exit $ac_status); } && 4925 4942 { ac_try='test -s conftest.$ac_objext' 4926 4943 - { (eval echo "$as_me:4982: \"$ac_try\"") >&5 4927 + { (eval echo "$as_me:523 6: \"$ac_try\"") >&54944 + { (eval echo "$as_me:5237: \"$ac_try\"") >&5 4928 4945 (eval $ac_try) 2>&5 4929 4946 ac_status=$? 4930 4947 - echo "$as_me:4985: \$? = $ac_status" >&5 4931 + echo "$as_me:52 39: \$? = $ac_status" >&54948 + echo "$as_me:5240: \$? = $ac_status" >&5 4932 4949 (exit $ac_status); }; }; then 4933 4950 break 4934 4951 else 4935 @@ -4991,7 +524 5,7 @@4952 @@ -4991,7 +5246,7 @@ 4936 4953 fi 4937 4954 rm -f conftest.$ac_objext conftest.$ac_ext 4938 4955 done 4939 4956 - echo "$as_me:4994: result: $CC_SHARED_OPTS" >&5 4940 + echo "$as_me:524 8: result: $CC_SHARED_OPTS" >&54957 + echo "$as_me:5249: result: $CC_SHARED_OPTS" >&5 4941 4958 echo "${ECHO_T}$CC_SHARED_OPTS" >&6 4942 4959 CFLAGS="$cf_save_CFLAGS" 4943 4960 fi 4944 @@ -4999,6 +525 3,12 @@4961 @@ -4999,6 +5254,12 @@ 4945 4962 cf_cv_shlib_version_infix=no 4946 4963 … … 4955 4972 MK_SHARED_LIB='${CC} ${CFLAGS} -o $@ -Xlinker -soname=`basename $@` -nostart -e 0' 4956 4973 ;; 4957 @@ -5027,7 +528 7,7 @@4974 @@ -5027,7 +5288,7 @@ 4958 4975 MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' 4959 4976 test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi 4960 4977 cf_cv_shlib_version_infix=yes 4961 4978 - echo "$as_me:5030: checking if ld -search_paths_first works" >&5 4962 + echo "$as_me:529 0: checking if ld -search_paths_first works" >&54979 + echo "$as_me:5291: checking if ld -search_paths_first works" >&5 4963 4980 echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 4964 4981 if test "${cf_cv_ldflags_search_paths_first+set}" = set; then 4965 4982 echo $ECHO_N "(cached) $ECHO_C" >&6 4966 @@ -5036,7 +529 6,7 @@4983 @@ -5036,7 +5297,7 @@ 4967 4984 cf_save_LDFLAGS=$LDFLAGS 4968 4985 LDFLAGS="$LDFLAGS -Wl,-search_paths_first" 4969 4986 cat >conftest.$ac_ext <<_ACEOF 4970 4987 -#line 5039 "configure" 4971 +#line 5 299"configure"4988 +#line 5300 "configure" 4972 4989 #include "confdefs.h" 4973 4990 4974 4991 int 4975 @@ -5048,16 +530 8,16 @@4992 @@ -5048,16 +5309,16 @@ 4976 4993 } 4977 4994 _ACEOF 4978 4995 rm -f conftest.$ac_objext conftest$ac_exeext 4979 4996 -if { (eval echo "$as_me:5051: \"$ac_link\"") >&5 4980 +if { (eval echo "$as_me:531 1: \"$ac_link\"") >&54997 +if { (eval echo "$as_me:5312: \"$ac_link\"") >&5 4981 4998 (eval $ac_link) 2>&5 4982 4999 ac_status=$? 4983 5000 - echo "$as_me:5054: \$? = $ac_status" >&5 4984 + echo "$as_me:531 4: \$? = $ac_status" >&55001 + echo "$as_me:5315: \$? = $ac_status" >&5 4985 5002 (exit $ac_status); } && 4986 5003 { ac_try='test -s conftest$ac_exeext' 4987 5004 - { (eval echo "$as_me:5057: \"$ac_try\"") >&5 4988 + { (eval echo "$as_me:531 7: \"$ac_try\"") >&55005 + { (eval echo "$as_me:5318: \"$ac_try\"") >&5 4989 5006 (eval $ac_try) 2>&5 4990 5007 ac_status=$? 4991 5008 - echo "$as_me:5060: \$? = $ac_status" >&5 4992 + echo "$as_me:532 0: \$? = $ac_status" >&55009 + echo "$as_me:5321: \$? = $ac_status" >&5 4993 5010 (exit $ac_status); }; }; then 4994 5011 cf_cv_ldflags_search_paths_first=yes 4995 5012 else 4996 @@ -5068,7 +532 8,7 @@5013 @@ -5068,7 +5329,7 @@ 4997 5014 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4998 5015 LDFLAGS=$cf_save_LDFLAGS 4999 5016 fi 5000 5017 -echo "$as_me:5071: result: $cf_cv_ldflags_search_paths_first" >&5 5001 +echo "$as_me:533 1: result: $cf_cv_ldflags_search_paths_first" >&55018 +echo "$as_me:5332: result: $cf_cv_ldflags_search_paths_first" >&5 5002 5019 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 5003 5020 if test $cf_cv_ldflags_search_paths_first = yes; then 5004 5021 LDFLAGS="$LDFLAGS -Wl,-search_paths_first" 5005 @@ -5090,10 +535 0,10 @@5022 @@ -5090,10 +5351,10 @@ 5006 5023 irix*) 5007 5024 if test "$cf_cv_ld_rpath" = yes ; then … … 5016 5033 fi 5017 5034 fi 5018 @@ -5112,7 +537 2,7 @@5035 @@ -5112,7 +5373,7 @@ 5019 5036 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" 5020 5037 fi … … 5025 5042 fi 5026 5043 5027 @@ -5131,7 +539 1,7 @@5044 @@ -5131,7 +5392,7 @@ 5028 5045 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" 5029 5046 fi … … 5034 5051 fi 5035 5052 CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" 5036 @@ -5143,7 +540 3,7 @@5053 @@ -5143,7 +5404,7 @@ 5037 5054 cf_cv_shared_soname='`basename $@`' 5038 5055 fi … … 5043 5060 nto-qnx*|openbsd*|freebsd[12].*) 5044 5061 CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" 5045 @@ -5155,7 +541 5,7 @@5062 @@ -5155,7 +5416,7 @@ 5046 5063 if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then 5047 5064 LOCAL_LDFLAGS="-rpath \$(LOCAL_LIBDIR)" … … 5052 5069 fi 5053 5070 5054 @@ -5166,11 +542 6,11 @@5071 @@ -5166,11 +5427,11 @@ 5055 5072 cf_cv_shared_soname='`basename $@`' 5056 5073 fi … … 5066 5083 LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)" 5067 5084 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" 5068 @@ -5192,7 +545 2,7 @@5085 @@ -5192,7 +5453,7 @@ 5069 5086 5070 5087 MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@' … … 5075 5092 ;; 5076 5093 osf*|mls+*) 5077 @@ -5211,7 +547 1,7 @@5094 @@ -5211,7 +5472,7 @@ 5078 5095 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" 5079 5096 fi … … 5084 5101 fi 5085 5102 cf_cv_rm_so_locs=yes 5086 @@ -5246,7 +550 6,7 @@5103 @@ -5246,7 +5507,7 @@ 5087 5104 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" 5088 5105 fi … … 5093 5110 fi 5094 5111 5095 @@ -5258,7 +551 8,43 @@5112 @@ -5258,7 +5519,43 @@ 5096 5113 fi 5097 5114 … … 5103 5120 + CFLAGS="$cf_shared_opts $cf_save_CFLAGS" 5104 5121 + cat >conftest.$ac_ext <<_ACEOF 5105 +#line 552 6"configure"5122 +#line 5527 "configure" 5106 5123 +#include "confdefs.h" 5107 5124 +#include <stdio.h> … … 5115 5132 +_ACEOF 5116 5133 +rm -f conftest.$ac_objext 5117 +if { (eval echo "$as_me:553 8: \"$ac_compile\"") >&55134 +if { (eval echo "$as_me:5539: \"$ac_compile\"") >&5 5118 5135 + (eval $ac_compile) 2>&5 5119 5136 + ac_status=$? 5120 + echo "$as_me:554 1: \$? = $ac_status" >&55137 + echo "$as_me:5542: \$? = $ac_status" >&5 5121 5138 + (exit $ac_status); } && 5122 5139 + { ac_try='test -s conftest.$ac_objext' 5123 + { (eval echo "$as_me:554 4: \"$ac_try\"") >&55140 + { (eval echo "$as_me:5545: \"$ac_try\"") >&5 5124 5141 + (eval $ac_try) 2>&5 5125 5142 + ac_status=$? 5126 + echo "$as_me:554 7: \$? = $ac_status" >&55143 + echo "$as_me:5548: \$? = $ac_status" >&5 5127 5144 + (exit $ac_status); }; }; then 5128 5145 + break … … 5138 5155 else 5139 5156 MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $@' 5140 @@ -5285,20 +558 1,20 @@5157 @@ -5285,20 +5582,20 @@ 5141 5158 test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes 5142 5159 ;; 5143 5160 *) 5144 5161 - { echo "$as_me:5288: WARNING: ignored --with-shlib-version" >&5 5145 + { echo "$as_me:558 4: WARNING: ignored --with-shlib-version" >&55162 + { echo "$as_me:5585: WARNING: ignored --with-shlib-version" >&5 5146 5163 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} 5147 5164 ;; … … 5153 5170 - echo "$as_me:5296: checking if we need a space after rpath option" >&5 5154 5171 + if test -n "$LD_RPATH_OPT" ; then 5155 + echo "$as_me:559 2: checking if we need a space after rpath option" >&55172 + echo "$as_me:5593: checking if we need a space after rpath option" >&5 5156 5173 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 5157 5174 cf_save_LIBS="$LIBS" … … 5160 5177 cat >conftest.$ac_ext <<_ACEOF 5161 5178 -#line 5301 "configure" 5162 +#line 559 7"configure"5179 +#line 5598 "configure" 5163 5180 #include "confdefs.h" 5164 5181 5165 5182 int 5166 @@ -5310,16 +560 6,16 @@5183 @@ -5310,16 +5607,16 @@ 5167 5184 } 5168 5185 _ACEOF 5169 5186 rm -f conftest.$ac_objext conftest$ac_exeext 5170 5187 -if { (eval echo "$as_me:5313: \"$ac_link\"") >&5 5171 +if { (eval echo "$as_me:56 09: \"$ac_link\"") >&55188 +if { (eval echo "$as_me:5610: \"$ac_link\"") >&5 5172 5189 (eval $ac_link) 2>&5 5173 5190 ac_status=$? 5174 5191 - echo "$as_me:5316: \$? = $ac_status" >&5 5175 + echo "$as_me:561 2: \$? = $ac_status" >&55192 + echo "$as_me:5613: \$? = $ac_status" >&5 5176 5193 (exit $ac_status); } && 5177 5194 { ac_try='test -s conftest$ac_exeext' 5178 5195 - { (eval echo "$as_me:5319: \"$ac_try\"") >&5 5179 + { (eval echo "$as_me:561 5: \"$ac_try\"") >&55196 + { (eval echo "$as_me:5616: \"$ac_try\"") >&5 5180 5197 (eval $ac_try) 2>&5 5181 5198 ac_status=$? 5182 5199 - echo "$as_me:5322: \$? = $ac_status" >&5 5183 + echo "$as_me:561 8: \$? = $ac_status" >&55200 + echo "$as_me:5619: \$? = $ac_status" >&5 5184 5201 (exit $ac_status); }; }; then 5185 5202 cf_rpath_space=no 5186 5203 else 5187 @@ -5329,16 +562 5,16 @@5204 @@ -5329,16 +5626,16 @@ 5188 5205 fi 5189 5206 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 5190 5207 LIBS="$cf_save_LIBS" 5191 5208 - echo "$as_me:5332: result: $cf_rpath_space" >&5 5192 + echo "$as_me:562 8: result: $cf_rpath_space" >&55209 + echo "$as_me:5629: result: $cf_rpath_space" >&5 5193 5210 echo "${ECHO_T}$cf_rpath_space" >&6 5194 5211 - test "$cf_rpath_space" = yes && cf_ld_rpath_opt="$cf_ld_rpath_opt " … … 5202 5219 if test "$model" = "shared"; then 5203 5220 - { { echo "$as_me:5341: error: Shared libraries are not supported in this version" >&5 5204 + { { echo "$as_me:563 7: error: Shared libraries are not supported in this version" >&55221 + { { echo "$as_me:5638: error: Shared libraries are not supported in this version" >&5 5205 5222 echo "$as_me: error: Shared libraries are not supported in this version" >&2;} 5206 5223 { (exit 1); exit 1; }; } 5207 5224 fi 5208 @@ -5348,7 +564 4,7 @@5225 @@ -5348,7 +5645,7 @@ 5209 5226 ############################################################################### 5210 5227 5211 5228 ### use option --disable-overwrite to leave out the link to -lcurses 5212 5229 -echo "$as_me:5351: checking if you wish to install ncurses overwriting curses" >&5 5213 +echo "$as_me:564 7: checking if you wish to install ncurses overwriting curses" >&55230 +echo "$as_me:5648: checking if you wish to install ncurses overwriting curses" >&5 5214 5231 echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6 5215 5232 5216 5233 # Check whether --enable-overwrite or --disable-overwrite was given. 5217 @@ -5358,10 +565 4,10 @@5234 @@ -5358,10 +5655,10 @@ 5218 5235 else 5219 5236 if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi 5220 5237 fi; 5221 5238 -echo "$as_me:5361: result: $with_overwrite" >&5 5222 +echo "$as_me:565 7: result: $with_overwrite" >&55239 +echo "$as_me:5658: result: $with_overwrite" >&5 5223 5240 echo "${ECHO_T}$with_overwrite" >&6 5224 5241 5225 5242 -echo "$as_me:5364: checking if external terminfo-database is used" >&5 5226 +echo "$as_me:566 0: checking if external terminfo-database is used" >&55243 +echo "$as_me:5661: checking if external terminfo-database is used" >&5 5227 5244 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 5228 5245 5229 5246 # Check whether --enable-database or --disable-database was given. 5230 @@ -5371,7 +566 7,7 @@5247 @@ -5371,7 +5668,7 @@ 5231 5248 else 5232 5249 use_database=yes 5233 5250 fi; 5234 5251 -echo "$as_me:5374: result: $use_database" >&5 5235 +echo "$as_me:567 0: result: $use_database" >&55252 +echo "$as_me:5671: result: $use_database" >&5 5236 5253 echo "${ECHO_T}$use_database" >&6 5237 5254 5238 5255 case $host_os in #(vi 5239 @@ -5384,8 +568 0,8 @@5256 @@ -5384,8 +5681,8 @@ 5240 5257 esac 5241 5258 … … 5248 5265 5249 5266 if test "$use_database" != no ; then 5250 @@ -5393,7 +56 89,7 @@5267 @@ -5393,7 +5690,7 @@ 5251 5268 #define USE_DATABASE 1 5252 5269 EOF 5253 5270 5254 5271 - echo "$as_me:5396: checking which terminfo source-file will be installed" >&5 5255 + echo "$as_me:569 2: checking which terminfo source-file will be installed" >&55272 + echo "$as_me:5693: checking which terminfo source-file will be installed" >&5 5256 5273 echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6 5257 5274 5258 5275 # Check whether --enable-database or --disable-database was given. 5259 @@ -5401,10 +569 7,10 @@5276 @@ -5401,10 +5698,10 @@ 5260 5277 enableval="$enable_database" 5261 5278 TERMINFO_SRC=$withval 5262 5279 fi; 5263 5280 - echo "$as_me:5404: result: $TERMINFO_SRC" >&5 5264 + echo "$as_me:570 0: result: $TERMINFO_SRC" >&55281 + echo "$as_me:5701: result: $TERMINFO_SRC" >&5 5265 5282 echo "${ECHO_T}$TERMINFO_SRC" >&6 5266 5283 5267 5284 - echo "$as_me:5407: checking whether to use hashed database instead of directory/tree" >&5 5268 + echo "$as_me:570 3: checking whether to use hashed database instead of directory/tree" >&55285 + echo "$as_me:5704: checking whether to use hashed database instead of directory/tree" >&5 5269 5286 echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6 5270 5287 5271 5288 # Check whether --with-hashed-db or --without-hashed-db was given. 5272 @@ -5414,13 +571 0,13 @@5289 @@ -5414,13 +5711,13 @@ 5273 5290 else 5274 5291 with_hashed_db=no 5275 5292 fi; 5276 5293 - echo "$as_me:5417: result: $with_hashed_db" >&5 5277 + echo "$as_me:571 3: result: $with_hashed_db" >&55294 + echo "$as_me:5714: result: $with_hashed_db" >&5 5278 5295 echo "${ECHO_T}$with_hashed_db" >&6 5279 5296 else … … 5282 5299 5283 5300 -echo "$as_me:5423: checking for list of fallback descriptions" >&5 5284 +echo "$as_me:57 19: checking for list of fallback descriptions" >&55301 +echo "$as_me:5720: checking for list of fallback descriptions" >&5 5285 5302 echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6 5286 5303 5287 5304 # Check whether --with-fallbacks or --without-fallbacks was given. 5288 @@ -5430,11 +572 6,11 @@5305 @@ -5430,11 +5727,11 @@ 5289 5306 else 5290 5307 with_fallback= 5291 5308 fi; 5292 5309 -echo "$as_me:5433: result: $with_fallback" >&5 5293 +echo "$as_me:57 29: result: $with_fallback" >&55310 +echo "$as_me:5730: result: $with_fallback" >&5 5294 5311 echo "${ECHO_T}$with_fallback" >&6 5295 5312 FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'` 5296 5313 5297 5314 -echo "$as_me:5437: checking if you want modern xterm or antique" >&5 5298 +echo "$as_me:573 3: checking if you want modern xterm or antique" >&55315 +echo "$as_me:5734: checking if you want modern xterm or antique" >&5 5299 5316 echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6 5300 5317 5301 5318 # Check whether --with-xterm-new or --without-xterm-new was given. 5302 @@ -5448,7 +574 4,7 @@5319 @@ -5448,7 +5745,7 @@ 5303 5320 no) with_xterm_new=xterm-old;; 5304 5321 *) with_xterm_new=xterm-new;; 5305 5322 esac 5306 5323 -echo "$as_me:5451: result: $with_xterm_new" >&5 5307 +echo "$as_me:574 7: result: $with_xterm_new" >&55324 +echo "$as_me:5748: result: $with_xterm_new" >&5 5308 5325 echo "${ECHO_T}$with_xterm_new" >&6 5309 5326 WHICH_XTERM=$with_xterm_new 5310 5327 5311 @@ -5458,7 +575 4,7 @@5328 @@ -5458,7 +5755,7 @@ 5312 5329 MAKE_TERMINFO="#" 5313 5330 else 5314 5331 5315 5332 -echo "$as_me:5461: checking for list of terminfo directories" >&5 5316 +echo "$as_me:575 7: checking for list of terminfo directories" >&55333 +echo "$as_me:5758: checking for list of terminfo directories" >&5 5317 5334 echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6 5318 5335 5319 5336 # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given. 5320 @@ -5468,7 +576 4,7 @@5337 @@ -5468,7 +5765,7 @@ 5321 5338 else 5322 5339 withval=${TERMINFO_DIRS-${datadir}/terminfo} … … 5327 5344 for cf_src_path in $withval 5328 5345 do 5329 @@ -5498,7 +579 4,7 @@5346 @@ -5498,7 +5795,7 @@ 5330 5347 cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` 5331 5348 ;; 5332 5349 *) 5333 5350 - { { echo "$as_me:5501: error: expected a pathname, not \"$cf_src_path\"" >&5 5334 + { { echo "$as_me:579 7: error: expected a pathname, not \"$cf_src_path\"" >&55351 + { { echo "$as_me:5798: error: expected a pathname, not \"$cf_src_path\"" >&5 5335 5352 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} 5336 5353 { (exit 1); exit 1; }; } 5337 5354 ;; 5338 @@ -5511,13 +580 7,13 @@5355 @@ -5511,13 +5808,13 @@ 5339 5356 5340 5357 eval 'TERMINFO_DIRS="$cf_dst_path"' 5341 5358 5342 5359 -echo "$as_me:5514: result: $TERMINFO_DIRS" >&5 5343 +echo "$as_me:581 0: result: $TERMINFO_DIRS" >&55360 +echo "$as_me:5811: result: $TERMINFO_DIRS" >&5 5344 5361 echo "${ECHO_T}$TERMINFO_DIRS" >&6 5345 5362 test -n "$TERMINFO_DIRS" && cat >>confdefs.h <<EOF … … 5348 5365 5349 5366 -echo "$as_me:5520: checking for default terminfo directory" >&5 5350 +echo "$as_me:581 6: checking for default terminfo directory" >&55367 +echo "$as_me:5817: checking for default terminfo directory" >&5 5351 5368 echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6 5352 5369 5353 5370 # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given. 5354 @@ -5553,7 +58 49,7 @@5371 @@ -5553,7 +5850,7 @@ 5355 5372 withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` 5356 5373 ;; 5357 5374 *) 5358 5375 - { { echo "$as_me:5556: error: expected a pathname, not \"$withval\"" >&5 5359 + { { echo "$as_me:585 2: error: expected a pathname, not \"$withval\"" >&55376 + { { echo "$as_me:5853: error: expected a pathname, not \"$withval\"" >&5 5360 5377 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} 5361 5378 { (exit 1); exit 1; }; } 5362 5379 ;; 5363 @@ -5562,7 +585 8,7 @@5380 @@ -5562,7 +5859,7 @@ 5364 5381 fi 5365 5382 TERMINFO="$withval" 5366 5383 5367 5384 -echo "$as_me:5565: result: $TERMINFO" >&5 5368 +echo "$as_me:586 1: result: $TERMINFO" >&55385 +echo "$as_me:5862: result: $TERMINFO" >&5 5369 5386 echo "${ECHO_T}$TERMINFO" >&6 5370 5387 cat >>confdefs.h <<EOF 5371 5388 #define TERMINFO "$TERMINFO" 5372 @@ -5572,7 +586 8,7 @@5389 @@ -5572,7 +5869,7 @@ 5373 5390 5374 5391 ### use option --disable-big-core to make tic run on small machines 5375 5392 ### We need 4Mb, check if we can allocate 50% more than that. 5376 5393 -echo "$as_me:5575: checking if big-core option selected" >&5 5377 +echo "$as_me:587 1: checking if big-core option selected" >&55394 +echo "$as_me:5872: checking if big-core option selected" >&5 5378 5395 echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6 5379 5396 5380 5397 # Check whether --enable-big-core or --disable-big-core was given. 5381 @@ -5584,7 +588 0,7 @@5398 @@ -5584,7 +5881,7 @@ 5382 5399 with_big_core=no 5383 5400 else 5384 5401 cat >conftest.$ac_ext <<_ACEOF 5385 5402 -#line 5587 "configure" 5386 +#line 588 3"configure"5403 +#line 5884 "configure" 5387 5404 #include "confdefs.h" 5388 5405 5389 5406 #include <stdlib.h> 5390 @@ -5598,15 +589 4,15 @@5407 @@ -5598,15 +5895,15 @@ 5391 5408 } 5392 5409 _ACEOF 5393 5410 rm -f conftest$ac_exeext 5394 5411 -if { (eval echo "$as_me:5601: \"$ac_link\"") >&5 5395 +if { (eval echo "$as_me:589 7: \"$ac_link\"") >&55412 +if { (eval echo "$as_me:5898: \"$ac_link\"") >&5 5396 5413 (eval $ac_link) 2>&5 5397 5414 ac_status=$? 5398 5415 - echo "$as_me:5604: \$? = $ac_status" >&5 5399 + echo "$as_me:590 0: \$? = $ac_status" >&55416 + echo "$as_me:5901: \$? = $ac_status" >&5 5400 5417 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 5401 5418 - { (eval echo "$as_me:5606: \"$ac_try\"") >&5 5402 + { (eval echo "$as_me:590 2: \"$ac_try\"") >&55419 + { (eval echo "$as_me:5903: \"$ac_try\"") >&5 5403 5420 (eval $ac_try) 2>&5 5404 5421 ac_status=$? 5405 5422 - echo "$as_me:5609: \$? = $ac_status" >&5 5406 + echo "$as_me:590 5: \$? = $ac_status" >&55423 + echo "$as_me:5906: \$? = $ac_status" >&5 5407 5424 (exit $ac_status); }; }; then 5408 5425 with_big_core=yes 5409 5426 else 5410 @@ -5618,7 +591 4,7 @@5427 @@ -5618,7 +5915,7 @@ 5411 5428 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 5412 5429 fi 5413 5430 fi; 5414 5431 -echo "$as_me:5621: result: $with_big_core" >&5 5415 +echo "$as_me:591 7: result: $with_big_core" >&55432 +echo "$as_me:5918: result: $with_big_core" >&5 5416 5433 echo "${ECHO_T}$with_big_core" >&6 5417 5434 test "$with_big_core" = "yes" && cat >>confdefs.h <<\EOF 5418 5435 #define HAVE_BIG_CORE 1 5419 @@ -5627,7 +592 3,7 @@5436 @@ -5627,7 +5924,7 @@ 5420 5437 ### ISO C only guarantees 512-char strings, we have tables which load faster 5421 5438 ### when constructed using "big" strings. More than the C compiler, the awk 5422 5439 ### program is a limit on most vendor UNIX systems. Check that we can build. 5423 5440 -echo "$as_me:5630: checking if big-strings option selected" >&5 5424 +echo "$as_me:592 6: checking if big-strings option selected" >&55441 +echo "$as_me:5927: checking if big-strings option selected" >&5 5425 5442 echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6 5426 5443 5427 5444 # Check whether --enable-big-strings or --disable-big-strings was given. 5428 @@ -5636,29 +593 2,29 @@5445 @@ -5636,29 +5933,29 @@ 5429 5446 with_big_strings=$enableval 5430 5447 else … … 5459 5476 fi; 5460 5477 -echo "$as_me:5654: result: $with_big_strings" >&5 5461 +echo "$as_me:595 0: result: $with_big_strings" >&55478 +echo "$as_me:5951: result: $with_big_strings" >&5 5462 5479 echo "${ECHO_T}$with_big_strings" >&6 5463 5480 … … 5467 5484 ### use option --enable-termcap to compile in the termcap fallback support 5468 5485 -echo "$as_me:5661: checking if you want termcap-fallback support" >&5 5469 +echo "$as_me:595 7: checking if you want termcap-fallback support" >&55486 +echo "$as_me:5958: checking if you want termcap-fallback support" >&5 5470 5487 echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6 5471 5488 5472 5489 # Check whether --enable-termcap or --disable-termcap was given. 5473 @@ -5668,13 +596 4,13 @@5490 @@ -5668,13 +5965,13 @@ 5474 5491 else 5475 5492 with_termcap=no 5476 5493 fi; 5477 5494 -echo "$as_me:5671: result: $with_termcap" >&5 5478 +echo "$as_me:596 7: result: $with_termcap" >&55495 +echo "$as_me:5968: result: $with_termcap" >&5 5479 5496 echo "${ECHO_T}$with_termcap" >&6 5480 5497 … … 5483 5500 if test -z "$with_fallback" ; then 5484 5501 - { { echo "$as_me:5677: error: You have disabled the database w/o specifying fallbacks" >&5 5485 + { { echo "$as_me:597 3: error: You have disabled the database w/o specifying fallbacks" >&55502 + { { echo "$as_me:5974: error: You have disabled the database w/o specifying fallbacks" >&5 5486 5503 echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;} 5487 5504 { (exit 1); exit 1; }; } 5488 5505 fi 5489 @@ -5686,7 +598 2,7 @@5506 @@ -5686,7 +5983,7 @@ 5490 5507 else 5491 5508 5492 5509 if test "$with_ticlib" != no ; then 5493 5510 - { { echo "$as_me:5689: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 5494 + { { echo "$as_me:598 5: error: Options --with-ticlib and --enable-termcap cannot be combined" >&55511 + { { echo "$as_me:5986: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 5495 5512 echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;} 5496 5513 { (exit 1); exit 1; }; } 5497 5514 fi 5498 @@ -5695,7 +599 1,7 @@5515 @@ -5695,7 +5992,7 @@ 5499 5516 #define USE_TERMCAP 1 5500 5517 EOF 5501 5518 5502 5519 -echo "$as_me:5698: checking for list of termcap files" >&5 5503 +echo "$as_me:599 4: checking for list of termcap files" >&55520 +echo "$as_me:5995: checking for list of termcap files" >&5 5504 5521 echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6 5505 5522 5506 5523 # Check whether --with-termpath or --without-termpath was given. 5507 @@ -5705,7 +600 1,7 @@5524 @@ -5705,7 +6002,7 @@ 5508 5525 else 5509 5526 withval=${TERMPATH-/etc/termcap:/usr/share/misc/termcap} … … 5514 5531 for cf_src_path in $withval 5515 5532 do 5516 @@ -5735,7 +603 1,7 @@5533 @@ -5735,7 +6032,7 @@ 5517 5534 cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` 5518 5535 ;; 5519 5536 *) 5520 5537 - { { echo "$as_me:5738: error: expected a pathname, not \"$cf_src_path\"" >&5 5521 + { { echo "$as_me:603 4: error: expected a pathname, not \"$cf_src_path\"" >&55538 + { { echo "$as_me:6035: error: expected a pathname, not \"$cf_src_path\"" >&5 5522 5539 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} 5523 5540 { (exit 1); exit 1; }; } 5524 5541 ;; 5525 @@ -5748,14 +604 4,14 @@5542 @@ -5748,14 +6045,14 @@ 5526 5543 5527 5544 eval 'TERMPATH="$cf_dst_path"' 5528 5545 5529 5546 -echo "$as_me:5751: result: $TERMPATH" >&5 5530 +echo "$as_me:604 7: result: $TERMPATH" >&55547 +echo "$as_me:6048: result: $TERMPATH" >&5 5531 5548 echo "${ECHO_T}$TERMPATH" >&6 5532 5549 test -n "$TERMPATH" && cat >>confdefs.h <<EOF … … 5536 5553 ### use option --enable-getcap to use a hacked getcap for reading termcaps 5537 5554 -echo "$as_me:5758: checking if fast termcap-loader is needed" >&5 5538 +echo "$as_me:605 4: checking if fast termcap-loader is needed" >&55555 +echo "$as_me:6055: checking if fast termcap-loader is needed" >&5 5539 5556 echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6 5540 5557 5541 5558 # Check whether --enable-getcap or --disable-getcap was given. 5542 @@ -5765,13 +606 1,13 @@5559 @@ -5765,13 +6062,13 @@ 5543 5560 else 5544 5561 with_getcap=no 5545 5562 fi; 5546 5563 -echo "$as_me:5768: result: $with_getcap" >&5 5547 +echo "$as_me:606 4: result: $with_getcap" >&55564 +echo "$as_me:6065: result: $with_getcap" >&5 5548 5565 echo "${ECHO_T}$with_getcap" >&6 5549 5566 test "$with_getcap" = "yes" && cat >>confdefs.h <<\EOF … … 5552 5569 5553 5570 -echo "$as_me:5774: checking if translated termcaps will be cached in ~/.terminfo" >&5 5554 +echo "$as_me:607 0: checking if translated termcaps will be cached in ~/.terminfo" >&55571 +echo "$as_me:6071: checking if translated termcaps will be cached in ~/.terminfo" >&5 5555 5572 echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6 5556 5573 5557 5574 # Check whether --enable-getcap-cache or --disable-getcap-cache was given. 5558 @@ -5781,7 +607 7,7 @@5575 @@ -5781,7 +6078,7 @@ 5559 5576 else 5560 5577 with_getcap_cache=no 5561 5578 fi; 5562 5579 -echo "$as_me:5784: result: $with_getcap_cache" >&5 5563 +echo "$as_me:608 0: result: $with_getcap_cache" >&55580 +echo "$as_me:6081: result: $with_getcap_cache" >&5 5564 5581 echo "${ECHO_T}$with_getcap_cache" >&6 5565 5582 test "$with_getcap_cache" = "yes" && cat >>confdefs.h <<\EOF 5566 5583 #define USE_GETCAP_CACHE 1 5567 @@ -5790,7 +608 6,7 @@5584 @@ -5790,7 +6087,7 @@ 5568 5585 fi 5569 5586 5570 5587 ### Use option --disable-home-terminfo to completely remove ~/.terminfo 5571 5588 -echo "$as_me:5793: checking if ~/.terminfo is wanted" >&5 5572 +echo "$as_me:60 89: checking if ~/.terminfo is wanted" >&55589 +echo "$as_me:6090: checking if ~/.terminfo is wanted" >&5 5573 5590 echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6 5574 5591 5575 5592 # Check whether --enable-home-terminfo or --disable-home-terminfo was given. 5576 @@ -5800,13 +609 6,13 @@5593 @@ -5800,13 +6097,13 @@ 5577 5594 else 5578 5595 with_home_terminfo=yes 5579 5596 fi; 5580 5597 -echo "$as_me:5803: result: $with_home_terminfo" >&5 5581 +echo "$as_me:6 099: result: $with_home_terminfo" >&55598 +echo "$as_me:6100: result: $with_home_terminfo" >&5 5582 5599 echo "${ECHO_T}$with_home_terminfo" >&6 5583 5600 test "$with_home_terminfo" = "yes" && cat >>confdefs.h <<\EOF … … 5586 5603 5587 5604 -echo "$as_me:5809: checking if you want to use restricted environment when running as root" >&5 5588 +echo "$as_me:610 5: checking if you want to use restricted environment when running as root" >&55605 +echo "$as_me:6106: checking if you want to use restricted environment when running as root" >&5 5589 5606 echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6 5590 5607 5591 5608 # Check whether --enable-root-environ or --disable-root-environ was given. 5592 @@ -5816,7 +611 2,7 @@5609 @@ -5816,7 +6113,7 @@ 5593 5610 else 5594 5611 with_root_environ=yes 5595 5612 fi; 5596 5613 -echo "$as_me:5819: result: $with_root_environ" >&5 5597 +echo "$as_me:611 5: result: $with_root_environ" >&55614 +echo "$as_me:6116: result: $with_root_environ" >&5 5598 5615 echo "${ECHO_T}$with_root_environ" >&6 5599 5616 test "$with_root_environ" = yes && cat >>confdefs.h <<\EOF 5600 5617 #define USE_ROOT_ENVIRON 1 5601 @@ -5830,13 +612 6,13 @@5618 @@ -5830,13 +6127,13 @@ 5602 5619 unlink 5603 5620 do 5604 5621 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 5605 5622 -echo "$as_me:5833: checking for $ac_func" >&5 5606 +echo "$as_me:61 29: checking for $ac_func" >&55623 +echo "$as_me:6130: checking for $ac_func" >&5 5607 5624 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 5608 5625 if eval "test \"\${$as_ac_var+set}\" = set"; then … … 5611 5628 cat >conftest.$ac_ext <<_ACEOF 5612 5629 -#line 5839 "configure" 5613 +#line 613 5"configure"5630 +#line 6136 "configure" 5614 5631 #include "confdefs.h" 5615 5632 /* System header to define __stub macros and hopefully few prototypes, 5616 5633 which can conflict with char $ac_func (); below. */ 5617 @@ -5867,16 +616 3,16 @@5634 @@ -5867,16 +6164,16 @@ 5618 5635 } 5619 5636 _ACEOF 5620 5637 rm -f conftest.$ac_objext conftest$ac_exeext 5621 5638 -if { (eval echo "$as_me:5870: \"$ac_link\"") >&5 5622 +if { (eval echo "$as_me:616 6: \"$ac_link\"") >&55639 +if { (eval echo "$as_me:6167: \"$ac_link\"") >&5 5623 5640 (eval $ac_link) 2>&5 5624 5641 ac_status=$? 5625 5642 - echo "$as_me:5873: \$? = $ac_status" >&5 5626 + echo "$as_me:61 69: \$? = $ac_status" >&55643 + echo "$as_me:6170: \$? = $ac_status" >&5 5627 5644 (exit $ac_status); } && 5628 5645 { ac_try='test -s conftest$ac_exeext' 5629 5646 - { (eval echo "$as_me:5876: \"$ac_try\"") >&5 5630 + { (eval echo "$as_me:617 2: \"$ac_try\"") >&55647 + { (eval echo "$as_me:6173: \"$ac_try\"") >&5 5631 5648 (eval $ac_try) 2>&5 5632 5649 ac_status=$? 5633 5650 - echo "$as_me:5879: \$? = $ac_status" >&5 5634 + echo "$as_me:617 5: \$? = $ac_status" >&55651 + echo "$as_me:6176: \$? = $ac_status" >&5 5635 5652 (exit $ac_status); }; }; then 5636 5653 eval "$as_ac_var=yes" 5637 5654 else 5638 @@ -5886,7 +618 2,7 @@5655 @@ -5886,7 +6183,7 @@ 5639 5656 fi 5640 5657 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 5641 5658 fi 5642 5659 -echo "$as_me:5889: result: `eval echo '${'$as_ac_var'}'`" >&5 5643 +echo "$as_me:618 5: result: `eval echo '${'$as_ac_var'}'`" >&55660 +echo "$as_me:6186: result: `eval echo '${'$as_ac_var'}'`" >&5 5644 5661 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 5645 5662 if test `eval echo '${'$as_ac_var'}'` = yes; then 5646 5663 cat >>confdefs.h <<EOF 5647 @@ -5903,13 +6 199,13 @@5664 @@ -5903,13 +6200,13 @@ 5648 5665 symlink 5649 5666 do 5650 5667 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 5651 5668 -echo "$as_me:5906: checking for $ac_func" >&5 5652 +echo "$as_me:620 2: checking for $ac_func" >&55669 +echo "$as_me:6203: checking for $ac_func" >&5 5653 5670 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 5654 5671 if eval "test \"\${$as_ac_var+set}\" = set"; then … … 5657 5674 cat >conftest.$ac_ext <<_ACEOF 5658 5675 -#line 5912 "configure" 5659 +#line 620 8"configure"5676 +#line 6209 "configure" 5660 5677 #include "confdefs.h" 5661 5678 /* System header to define __stub macros and hopefully few prototypes, 5662 5679 which can conflict with char $ac_func (); below. */ 5663 @@ -5940,16 +623 6,16 @@5680 @@ -5940,16 +6237,16 @@ 5664 5681 } 5665 5682 _ACEOF 5666 5683 rm -f conftest.$ac_objext conftest$ac_exeext 5667 5684 -if { (eval echo "$as_me:5943: \"$ac_link\"") >&5 5668 +if { (eval echo "$as_me:62 39: \"$ac_link\"") >&55685 +if { (eval echo "$as_me:6240: \"$ac_link\"") >&5 5669 5686 (eval $ac_link) 2>&5 5670 5687 ac_status=$? 5671 5688 - echo "$as_me:5946: \$? = $ac_status" >&5 5672 + echo "$as_me:624 2: \$? = $ac_status" >&55689 + echo "$as_me:6243: \$? = $ac_status" >&5 5673 5690 (exit $ac_status); } && 5674 5691 { ac_try='test -s conftest$ac_exeext' 5675 5692 - { (eval echo "$as_me:5949: \"$ac_try\"") >&5 5676 + { (eval echo "$as_me:624 5: \"$ac_try\"") >&55693 + { (eval echo "$as_me:6246: \"$ac_try\"") >&5 5677 5694 (eval $ac_try) 2>&5 5678 5695 ac_status=$? 5679 5696 - echo "$as_me:5952: \$? = $ac_status" >&5 5680 + echo "$as_me:624 8: \$? = $ac_status" >&55697 + echo "$as_me:6249: \$? = $ac_status" >&5 5681 5698 (exit $ac_status); }; }; then 5682 5699 eval "$as_ac_var=yes" 5683 5700 else 5684 @@ -5959,7 +625 5,7 @@5701 @@ -5959,7 +6256,7 @@ 5685 5702 fi 5686 5703 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 5687 5704 fi 5688 5705 -echo "$as_me:5962: result: `eval echo '${'$as_ac_var'}'`" >&5 5689 +echo "$as_me:625 8: result: `eval echo '${'$as_ac_var'}'`" >&55706 +echo "$as_me:6259: result: `eval echo '${'$as_ac_var'}'`" >&5 5690 5707 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 5691 5708 if test `eval echo '${'$as_ac_var'}'` = yes; then 5692 5709 cat >>confdefs.h <<EOF 5693 @@ -5970,7 +626 6,7 @@5710 @@ -5970,7 +6267,7 @@ 5694 5711 done 5695 5712 5696 5713 else 5697 5714 - echo "$as_me:5973: checking if link/symlink functions work" >&5 5698 + echo "$as_me:62 69: checking if link/symlink functions work" >&55715 + echo "$as_me:6270: checking if link/symlink functions work" >&5 5699 5716 echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6 5700 5717 if test "${cf_cv_link_funcs+set}" = set; then 5701 5718 echo $ECHO_N "(cached) $ECHO_C" >&6 5702 @@ -5983,7 +62 79,7 @@5719 @@ -5983,7 +6280,7 @@ 5703 5720 eval 'ac_cv_func_'$cf_func'=error' 5704 5721 else 5705 5722 cat >conftest.$ac_ext <<_ACEOF 5706 5723 -#line 5986 "configure" 5707 +#line 628 2"configure"5724 +#line 6283 "configure" 5708 5725 #include "confdefs.h" 5709 5726 5710 5727 #include <sys/types.h> 5711 @@ -6013,15 +63 09,15 @@5728 @@ -6013,15 +6310,15 @@ 5712 5729 5713 5730 _ACEOF 5714 5731 rm -f conftest$ac_exeext 5715 5732 -if { (eval echo "$as_me:6016: \"$ac_link\"") >&5 5716 +if { (eval echo "$as_me:631 2: \"$ac_link\"") >&55733 +if { (eval echo "$as_me:6313: \"$ac_link\"") >&5 5717 5734 (eval $ac_link) 2>&5 5718 5735 ac_status=$? 5719 5736 - echo "$as_me:6019: \$? = $ac_status" >&5 5720 + echo "$as_me:631 5: \$? = $ac_status" >&55737 + echo "$as_me:6316: \$? = $ac_status" >&5 5721 5738 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 5722 5739 - { (eval echo "$as_me:6021: \"$ac_try\"") >&5 5723 + { (eval echo "$as_me:631 7: \"$ac_try\"") >&55740 + { (eval echo "$as_me:6318: \"$ac_try\"") >&5 5724 5741 (eval $ac_try) 2>&5 5725 5742 ac_status=$? 5726 5743 - echo "$as_me:6024: \$? = $ac_status" >&5 5727 + echo "$as_me:632 0: \$? = $ac_status" >&55744 + echo "$as_me:6321: \$? = $ac_status" >&5 5728 5745 (exit $ac_status); }; }; then 5729 5746 5730 5747 cf_cv_link_funcs="$cf_cv_link_funcs $cf_func" 5731 @@ -6039,7 +633 5,7 @@5748 @@ -6039,7 +6336,7 @@ 5732 5749 test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no 5733 5750 5734 5751 fi 5735 5752 -echo "$as_me:6042: result: $cf_cv_link_funcs" >&5 5736 +echo "$as_me:633 8: result: $cf_cv_link_funcs" >&55753 +echo "$as_me:6339: result: $cf_cv_link_funcs" >&5 5737 5754 echo "${ECHO_T}$cf_cv_link_funcs" >&6 5738 5755 test "$ac_cv_func_link" = yes && cat >>confdefs.h <<\EOF 5739 5756 #define HAVE_LINK 1 5740 @@ -6057,7 +635 3,7 @@5757 @@ -6057,7 +6354,7 @@ 5741 5758 # soft links (symbolic links) are useful for some systems where hard links do 5742 5759 # not work, or to make it simpler to copy terminfo trees around. 5743 5760 if test "$ac_cv_func_symlink" = yes ; then 5744 5761 - echo "$as_me:6060: checking if tic should use symbolic links" >&5 5745 + echo "$as_me:635 6: checking if tic should use symbolic links" >&55762 + echo "$as_me:6357: checking if tic should use symbolic links" >&5 5746 5763 echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6 5747 5764 5748 5765 # Check whether --enable-symlinks or --disable-symlinks was given. 5749 @@ -6067,21 +636 3,21 @@5766 @@ -6067,21 +6364,21 @@ 5750 5767 else 5751 5768 with_symlinks=no 5752 5769 fi; 5753 5770 - echo "$as_me:6070: result: $with_symlinks" >&5 5754 + echo "$as_me:636 6: result: $with_symlinks" >&55771 + echo "$as_me:6367: result: $with_symlinks" >&5 5755 5772 echo "${ECHO_T}$with_symlinks" >&6 5756 5773 fi … … 5760 5777 if test "$with_symlinks" = no ; then 5761 5778 - echo "$as_me:6077: checking if tic should use hard links" >&5 5762 + echo "$as_me:637 3: checking if tic should use hard links" >&55779 + echo "$as_me:6374: checking if tic should use hard links" >&5 5763 5780 echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6 5764 5781 if test "$ac_cv_func_link" = yes ; then … … 5768 5785 fi 5769 5786 - echo "$as_me:6084: result: $with_links" >&5 5770 + echo "$as_me:638 0: result: $with_links" >&55787 + echo "$as_me:6381: result: $with_links" >&5 5771 5788 echo "${ECHO_T}$with_links" >&6 5772 5789 fi 5773 5790 5774 @@ -6094,7 +639 0,7 @@5791 @@ -6094,7 +6391,7 @@ 5775 5792 EOF 5776 5793 5777 5794 ### use option --enable-broken-linker to force on use of broken-linker support 5778 5795 -echo "$as_me:6097: checking if you want broken-linker support code" >&5 5779 +echo "$as_me:639 3: checking if you want broken-linker support code" >&55796 +echo "$as_me:6394: checking if you want broken-linker support code" >&5 5780 5797 echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 5781 5798 5782 5799 # Check whether --enable-broken_linker or --disable-broken_linker was given. 5783 @@ -6104,7 +640 0,7 @@5800 @@ -6104,7 +6401,7 @@ 5784 5801 else 5785 5802 with_broken_linker=${BROKEN_LINKER-no} 5786 5803 fi; 5787 5804 -echo "$as_me:6107: result: $with_broken_linker" >&5 5788 +echo "$as_me:640 3: result: $with_broken_linker" >&55805 +echo "$as_me:6404: result: $with_broken_linker" >&5 5789 5806 echo "${ECHO_T}$with_broken_linker" >&6 5790 5807 5791 5808 BROKEN_LINKER=0 5792 @@ -6124,14 +642 0,14 @@5809 @@ -6124,14 +6421,14 @@ 5793 5810 BROKEN_LINKER=1 5794 5811 test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6 5795 5812 5796 5813 -echo "${as_me-configure}:6127: testing cygwin linker is broken anyway ..." 1>&5 5797 +echo "${as_me-configure}:642 3: testing cygwin linker is broken anyway ..." 1>&55814 +echo "${as_me-configure}:6424: testing cygwin linker is broken anyway ..." 1>&5 5798 5815 5799 5816 ;; … … 5803 5820 ### use option --enable-bsdpad to have tputs process BSD-style prefix padding 5804 5821 -echo "$as_me:6134: checking if tputs should process BSD-style prefix padding" >&5 5805 +echo "$as_me:643 0: checking if tputs should process BSD-style prefix padding" >&55822 +echo "$as_me:6431: checking if tputs should process BSD-style prefix padding" >&5 5806 5823 echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6 5807 5824 5808 5825 # Check whether --enable-bsdpad or --disable-bsdpad was given. 5809 @@ -6141,7 +643 7,7 @@5826 @@ -6141,7 +6438,7 @@ 5810 5827 else 5811 5828 with_bsdpad=no 5812 5829 fi; 5813 5830 -echo "$as_me:6144: result: $with_bsdpad" >&5 5814 +echo "$as_me:644 0: result: $with_bsdpad" >&55831 +echo "$as_me:6441: result: $with_bsdpad" >&5 5815 5832 echo "${ECHO_T}$with_bsdpad" >&6 5816 5833 test "$with_bsdpad" = yes && cat >>confdefs.h <<\EOF 5817 5834 #define BSD_TPUTS 1 5818 @@ -6158,7 +645 4,7 @@5835 @@ -6158,7 +6455,7 @@ 5819 5836 5820 5837 # Check to define _XOPEN_SOURCE "automatically" 5821 5838 5822 5839 -echo "$as_me:6161: checking if $CC -U and -D options work together" >&5 5823 +echo "$as_me:645 7: checking if $CC -U and -D options work together" >&55840 +echo "$as_me:6458: checking if $CC -U and -D options work together" >&5 5824 5841 echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6 5825 5842 if test "${cf_cv_cc_u_d_options+set}" = set; then 5826 5843 echo $ECHO_N "(cached) $ECHO_C" >&6 5827 @@ -6167,7 +646 3,7 @@5844 @@ -6167,7 +6464,7 @@ 5828 5845 cf_save_CPPFLAGS="$CPPFLAGS" 5829 5846 CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS" 5830 5847 cat >conftest.$ac_ext <<_ACEOF 5831 5848 -#line 6170 "configure" 5832 +#line 646 6"configure"5849 +#line 6467 "configure" 5833 5850 #include "confdefs.h" 5834 5851 5835 5852 int 5836 @@ -6186,16 +648 2,16 @@5853 @@ -6186,16 +6483,16 @@ 5837 5854 } 5838 5855 _ACEOF 5839 5856 rm -f conftest.$ac_objext 5840 5857 -if { (eval echo "$as_me:6189: \"$ac_compile\"") >&5 5841 +if { (eval echo "$as_me:648 5: \"$ac_compile\"") >&55858 +if { (eval echo "$as_me:6486: \"$ac_compile\"") >&5 5842 5859 (eval $ac_compile) 2>&5 5843 5860 ac_status=$? 5844 5861 - echo "$as_me:6192: \$? = $ac_status" >&5 5845 + echo "$as_me:648 8: \$? = $ac_status" >&55862 + echo "$as_me:6489: \$? = $ac_status" >&5 5846 5863 (exit $ac_status); } && 5847 5864 { ac_try='test -s conftest.$ac_objext' 5848 5865 - { (eval echo "$as_me:6195: \"$ac_try\"") >&5 5849 + { (eval echo "$as_me:649 1: \"$ac_try\"") >&55866 + { (eval echo "$as_me:6492: \"$ac_try\"") >&5 5850 5867 (eval $ac_try) 2>&5 5851 5868 ac_status=$? 5852 5869 - echo "$as_me:6198: \$? = $ac_status" >&5 5853 + echo "$as_me:649 4: \$? = $ac_status" >&55870 + echo "$as_me:6495: \$? = $ac_status" >&5 5854 5871 (exit $ac_status); }; }; then 5855 5872 5856 5873 cf_cv_cc_u_d_options=yes 5857 @@ -6209,14 +650 5,14 @@5874 @@ -6209,14 +6506,14 @@ 5858 5875 CPPFLAGS="$cf_save_CPPFLAGS" 5859 5876 5860 5877 fi 5861 5878 -echo "$as_me:6212: result: $cf_cv_cc_u_d_options" >&5 5862 +echo "$as_me:650 8: result: $cf_cv_cc_u_d_options" >&55879 +echo "$as_me:6509: result: $cf_cv_cc_u_d_options" >&5 5863 5880 echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6 5864 5881 … … 5872 5889 ;; 5873 5890 freebsd*|dragonfly*) #(vi 5874 @@ -6233,16 +6529,16 @@ 5891 @@ -6227,22 +6524,25 @@ 5892 cf_XOPEN_SOURCE=600 5893 CPPFLAGS="$CPPFLAGS -D_BSD_TYPES -D__BSD_VISIBLE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" 5894 ;; 5895 +hpux11*) #(vi 5896 + CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE=500" 5897 + ;; 5898 hpux*) #(vi 5899 CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE" 5900 ;; 5875 5901 irix[56].*) #(vi 5876 5902 CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE" … … 5880 5906 5881 5907 -echo "$as_me:6238: checking if we must define _GNU_SOURCE" >&5 5882 +echo "$as_me:653 4: checking if we must define _GNU_SOURCE" >&55908 +echo "$as_me:6538: checking if we must define _GNU_SOURCE" >&5 5883 5909 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 5884 5910 if test "${cf_cv_gnu_source+set}" = set; then … … 5888 5914 cat >conftest.$ac_ext <<_ACEOF 5889 5915 -#line 6245 "configure" 5890 +#line 654 1"configure"5916 +#line 6545 "configure" 5891 5917 #include "confdefs.h" 5892 5918 #include <sys/types.h> 5893 5919 int 5894 @@ -6257,16 +655 3,16 @@5920 @@ -6257,16 +6557,16 @@ 5895 5921 } 5896 5922 _ACEOF 5897 5923 rm -f conftest.$ac_objext 5898 5924 -if { (eval echo "$as_me:6260: \"$ac_compile\"") >&5 5899 +if { (eval echo "$as_me:65 56: \"$ac_compile\"") >&55925 +if { (eval echo "$as_me:6560: \"$ac_compile\"") >&5 5900 5926 (eval $ac_compile) 2>&5 5901 5927 ac_status=$? 5902 5928 - echo "$as_me:6263: \$? = $ac_status" >&5 5903 + echo "$as_me:65 59: \$? = $ac_status" >&55929 + echo "$as_me:6563: \$? = $ac_status" >&5 5904 5930 (exit $ac_status); } && 5905 5931 { ac_try='test -s conftest.$ac_objext' 5906 5932 - { (eval echo "$as_me:6266: \"$ac_try\"") >&5 5907 + { (eval echo "$as_me:656 2: \"$ac_try\"") >&55933 + { (eval echo "$as_me:6566: \"$ac_try\"") >&5 5908 5934 (eval $ac_try) 2>&5 5909 5935 ac_status=$? 5910 5936 - echo "$as_me:6269: \$? = $ac_status" >&5 5911 + echo "$as_me:656 5: \$? = $ac_status" >&55937 + echo "$as_me:6569: \$? = $ac_status" >&5 5912 5938 (exit $ac_status); }; }; then 5913 5939 cf_cv_gnu_source=no 5914 5940 else 5915 @@ -6275,7 +657 1,7 @@5941 @@ -6275,7 +6575,7 @@ 5916 5942 cf_save="$CPPFLAGS" 5917 5943 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" 5918 5944 cat >conftest.$ac_ext <<_ACEOF 5919 5945 -#line 6278 "configure" 5920 +#line 657 4"configure"5946 +#line 6578 "configure" 5921 5947 #include "confdefs.h" 5922 5948 #include <sys/types.h> 5923 5949 int 5924 @@ -6290,16 +65 86,16 @@5950 @@ -6290,16 +6590,16 @@ 5925 5951 } 5926 5952 _ACEOF 5927 5953 rm -f conftest.$ac_objext 5928 5954 -if { (eval echo "$as_me:6293: \"$ac_compile\"") >&5 5929 +if { (eval echo "$as_me:65 89: \"$ac_compile\"") >&55955 +if { (eval echo "$as_me:6593: \"$ac_compile\"") >&5 5930 5956 (eval $ac_compile) 2>&5 5931 5957 ac_status=$? 5932 5958 - echo "$as_me:6296: \$? = $ac_status" >&5 5933 + echo "$as_me:659 2: \$? = $ac_status" >&55959 + echo "$as_me:6596: \$? = $ac_status" >&5 5934 5960 (exit $ac_status); } && 5935 5961 { ac_try='test -s conftest.$ac_objext' 5936 5962 - { (eval echo "$as_me:6299: \"$ac_try\"") >&5 5937 + { (eval echo "$as_me:659 5: \"$ac_try\"") >&55963 + { (eval echo "$as_me:6599: \"$ac_try\"") >&5 5938 5964 (eval $ac_try) 2>&5 5939 5965 ac_status=$? 5940 5966 - echo "$as_me:6302: \$? = $ac_status" >&5 5941 + echo "$as_me:6 598: \$? = $ac_status" >&55967 + echo "$as_me:6602: \$? = $ac_status" >&5 5942 5968 (exit $ac_status); }; }; then 5943 5969 cf_cv_gnu_source=no 5944 5970 else 5945 @@ -6314,7 +661 0,7 @@5971 @@ -6314,7 +6614,7 @@ 5946 5972 rm -f conftest.$ac_objext conftest.$ac_ext 5947 5973 5948 5974 fi 5949 5975 -echo "$as_me:6317: result: $cf_cv_gnu_source" >&5 5950 +echo "$as_me:661 3: result: $cf_cv_gnu_source" >&55976 +echo "$as_me:6617: result: $cf_cv_gnu_source" >&5 5951 5977 echo "${ECHO_T}$cf_cv_gnu_source" >&6 5952 5978 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" 5953 5979 5954 @@ -6341,14 +66 37,14 @@5980 @@ -6341,14 +6641,14 @@ 5955 5981 CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__" 5956 5982 ;; 5957 5983 *) 5958 5984 - echo "$as_me:6344: checking if we should define _XOPEN_SOURCE" >&5 5959 + echo "$as_me:664 0: checking if we should define _XOPEN_SOURCE" >&55985 + echo "$as_me:6644: checking if we should define _XOPEN_SOURCE" >&5 5960 5986 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 5961 5987 if test "${cf_cv_xopen_source+set}" = set; then … … 5965 5991 cat >conftest.$ac_ext <<_ACEOF 5966 5992 -#line 6351 "configure" 5967 +#line 66 47"configure"5993 +#line 6651 "configure" 5968 5994 #include "confdefs.h" 5969 5995 #include <sys/types.h> 5970 5996 int 5971 @@ -6363,16 +66 59,16 @@5997 @@ -6363,16 +6663,16 @@ 5972 5998 } 5973 5999 _ACEOF 5974 6000 rm -f conftest.$ac_objext 5975 6001 -if { (eval echo "$as_me:6366: \"$ac_compile\"") >&5 5976 +if { (eval echo "$as_me:666 2: \"$ac_compile\"") >&56002 +if { (eval echo "$as_me:6666: \"$ac_compile\"") >&5 5977 6003 (eval $ac_compile) 2>&5 5978 6004 ac_status=$? 5979 6005 - echo "$as_me:6369: \$? = $ac_status" >&5 5980 + echo "$as_me:666 5: \$? = $ac_status" >&56006 + echo "$as_me:6669: \$? = $ac_status" >&5 5981 6007 (exit $ac_status); } && 5982 6008 { ac_try='test -s conftest.$ac_objext' 5983 6009 - { (eval echo "$as_me:6372: \"$ac_try\"") >&5 5984 + { (eval echo "$as_me:66 68: \"$ac_try\"") >&56010 + { (eval echo "$as_me:6672: \"$ac_try\"") >&5 5985 6011 (eval $ac_try) 2>&5 5986 6012 ac_status=$? 5987 6013 - echo "$as_me:6375: \$? = $ac_status" >&5 5988 + echo "$as_me:667 1: \$? = $ac_status" >&56014 + echo "$as_me:6675: \$? = $ac_status" >&5 5989 6015 (exit $ac_status); }; }; then 5990 6016 cf_cv_xopen_source=no 5991 6017 else 5992 @@ -6381,7 +66 77,7 @@6018 @@ -6381,7 +6681,7 @@ 5993 6019 cf_save="$CPPFLAGS" 5994 6020 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" 5995 6021 cat >conftest.$ac_ext <<_ACEOF 5996 6022 -#line 6384 "configure" 5997 +#line 668 0"configure"6023 +#line 6684 "configure" 5998 6024 #include "confdefs.h" 5999 6025 #include <sys/types.h> 6000 6026 int 6001 @@ -6396,16 +669 2,16 @@6027 @@ -6396,16 +6696,16 @@ 6002 6028 } 6003 6029 _ACEOF 6004 6030 rm -f conftest.$ac_objext 6005 6031 -if { (eval echo "$as_me:6399: \"$ac_compile\"") >&5 6006 +if { (eval echo "$as_me:669 5: \"$ac_compile\"") >&56032 +if { (eval echo "$as_me:6699: \"$ac_compile\"") >&5 6007 6033 (eval $ac_compile) 2>&5 6008 6034 ac_status=$? 6009 6035 - echo "$as_me:6402: \$? = $ac_status" >&5 6010 + echo "$as_me:6 698: \$? = $ac_status" >&56036 + echo "$as_me:6702: \$? = $ac_status" >&5 6011 6037 (exit $ac_status); } && 6012 6038 { ac_try='test -s conftest.$ac_objext' 6013 6039 - { (eval echo "$as_me:6405: \"$ac_try\"") >&5 6014 + { (eval echo "$as_me:670 1: \"$ac_try\"") >&56040 + { (eval echo "$as_me:6705: \"$ac_try\"") >&5 6015 6041 (eval $ac_try) 2>&5 6016 6042 ac_status=$? 6017 6043 - echo "$as_me:6408: \$? = $ac_status" >&5 6018 + echo "$as_me:670 4: \$? = $ac_status" >&56044 + echo "$as_me:6708: \$? = $ac_status" >&5 6019 6045 (exit $ac_status); }; }; then 6020 6046 cf_cv_xopen_source=no 6021 6047 else 6022 @@ -6420,7 +67 16,7 @@6048 @@ -6420,7 +6720,7 @@ 6023 6049 rm -f conftest.$ac_objext conftest.$ac_ext 6024 6050 6025 6051 fi 6026 6052 -echo "$as_me:6423: result: $cf_cv_xopen_source" >&5 6027 +echo "$as_me:67 19: result: $cf_cv_xopen_source" >&56053 +echo "$as_me:6723: result: $cf_cv_xopen_source" >&5 6028 6054 echo "${ECHO_T}$cf_cv_xopen_source" >&6 6029 6055 if test "$cf_cv_xopen_source" != no ; then 6030 6056 6031 @@ -6454,16 +675 0,16 @@6057 @@ -6454,16 +6754,16 @@ 6032 6058 sed -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?[ ]/ /g' \ 6033 6059 -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?$//g'` 6034 6060 6035 6061 -echo "$as_me:6457: checking if we should define _POSIX_C_SOURCE" >&5 6036 +echo "$as_me:675 3: checking if we should define _POSIX_C_SOURCE" >&56062 +echo "$as_me:6757: checking if we should define _POSIX_C_SOURCE" >&5 6037 6063 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 6038 6064 if test "${cf_cv_posix_c_source+set}" = set; then … … 6041 6067 6042 6068 -echo "${as_me-configure}:6463: testing if the symbol is already defined go no further ..." 1>&5 6043 +echo "${as_me-configure}:67 59: testing if the symbol is already defined go no further ..." 1>&56069 +echo "${as_me-configure}:6763: testing if the symbol is already defined go no further ..." 1>&5 6044 6070 6045 6071 cat >conftest.$ac_ext <<_ACEOF 6046 6072 -#line 6466 "configure" 6047 +#line 676 2"configure"6073 +#line 6766 "configure" 6048 6074 #include "confdefs.h" 6049 6075 #include <sys/types.h> 6050 6076 int 6051 @@ -6478,16 +677 4,16 @@6077 @@ -6478,16 +6778,16 @@ 6052 6078 } 6053 6079 _ACEOF 6054 6080 rm -f conftest.$ac_objext 6055 6081 -if { (eval echo "$as_me:6481: \"$ac_compile\"") >&5 6056 +if { (eval echo "$as_me:67 77: \"$ac_compile\"") >&56082 +if { (eval echo "$as_me:6781: \"$ac_compile\"") >&5 6057 6083 (eval $ac_compile) 2>&5 6058 6084 ac_status=$? 6059 6085 - echo "$as_me:6484: \$? = $ac_status" >&5 6060 + echo "$as_me:678 0: \$? = $ac_status" >&56086 + echo "$as_me:6784: \$? = $ac_status" >&5 6061 6087 (exit $ac_status); } && 6062 6088 { ac_try='test -s conftest.$ac_objext' 6063 6089 - { (eval echo "$as_me:6487: \"$ac_try\"") >&5 6064 + { (eval echo "$as_me:678 3: \"$ac_try\"") >&56090 + { (eval echo "$as_me:6787: \"$ac_try\"") >&5 6065 6091 (eval $ac_try) 2>&5 6066 6092 ac_status=$? 6067 6093 - echo "$as_me:6490: \$? = $ac_status" >&5 6068 + echo "$as_me:67 86: \$? = $ac_status" >&56094 + echo "$as_me:6790: \$? = $ac_status" >&5 6069 6095 (exit $ac_status); }; }; then 6070 6096 cf_cv_posix_c_source=no 6071 6097 else 6072 @@ -6508,7 +680 4,7 @@6098 @@ -6508,7 +6808,7 @@ 6073 6099 esac 6074 6100 if test "$cf_want_posix_source" = yes ; then 6075 6101 cat >conftest.$ac_ext <<_ACEOF 6076 6102 -#line 6511 "configure" 6077 +#line 68 07"configure"6103 +#line 6811 "configure" 6078 6104 #include "confdefs.h" 6079 6105 #include <sys/types.h> 6080 6106 int 6081 @@ -6523,16 +68 19,16 @@6107 @@ -6523,16 +6823,16 @@ 6082 6108 } 6083 6109 _ACEOF 6084 6110 rm -f conftest.$ac_objext 6085 6111 -if { (eval echo "$as_me:6526: \"$ac_compile\"") >&5 6086 +if { (eval echo "$as_me:682 2: \"$ac_compile\"") >&56112 +if { (eval echo "$as_me:6826: \"$ac_compile\"") >&5 6087 6113 (eval $ac_compile) 2>&5 6088 6114 ac_status=$? 6089 6115 - echo "$as_me:6529: \$? = $ac_status" >&5 6090 + echo "$as_me:682 5: \$? = $ac_status" >&56116 + echo "$as_me:6829: \$? = $ac_status" >&5 6091 6117 (exit $ac_status); } && 6092 6118 { ac_try='test -s conftest.$ac_objext' 6093 6119 - { (eval echo "$as_me:6532: \"$ac_try\"") >&5 6094 + { (eval echo "$as_me:68 28: \"$ac_try\"") >&56120 + { (eval echo "$as_me:6832: \"$ac_try\"") >&5 6095 6121 (eval $ac_try) 2>&5 6096 6122 ac_status=$? 6097 6123 - echo "$as_me:6535: \$? = $ac_status" >&5 6098 + echo "$as_me:683 1: \$? = $ac_status" >&56124 + echo "$as_me:6835: \$? = $ac_status" >&5 6099 6125 (exit $ac_status); }; }; then 6100 6126 : 6101 6127 else 6102 @@ -6543,15 +68 39,15 @@6128 @@ -6543,15 +6843,15 @@ 6103 6129 rm -f conftest.$ac_objext conftest.$ac_ext 6104 6130 fi 6105 6131 6106 6132 -echo "${as_me-configure}:6546: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 6107 +echo "${as_me-configure}:684 2: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&56133 +echo "${as_me-configure}:6846: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 6108 6134 6109 6135 CFLAGS="$cf_trim_CFLAGS" … … 6111 6137 6112 6138 -echo "${as_me-configure}:6551: testing if the second compile does not leave our definition intact error ..." 1>&5 6113 +echo "${as_me-configure}:68 47: testing if the second compile does not leave our definition intact error ..." 1>&56139 +echo "${as_me-configure}:6851: testing if the second compile does not leave our definition intact error ..." 1>&5 6114 6140 6115 6141 cat >conftest.$ac_ext <<_ACEOF 6116 6142 -#line 6554 "configure" 6117 +#line 685 0"configure"6143 +#line 6854 "configure" 6118 6144 #include "confdefs.h" 6119 6145 #include <sys/types.h> 6120 6146 int 6121 @@ -6566,16 +686 2,16 @@6147 @@ -6566,16 +6866,16 @@ 6122 6148 } 6123 6149 _ACEOF 6124 6150 rm -f conftest.$ac_objext 6125 6151 -if { (eval echo "$as_me:6569: \"$ac_compile\"") >&5 6126 +if { (eval echo "$as_me:686 5: \"$ac_compile\"") >&56152 +if { (eval echo "$as_me:6869: \"$ac_compile\"") >&5 6127 6153 (eval $ac_compile) 2>&5 6128 6154 ac_status=$? 6129 6155 - echo "$as_me:6572: \$? = $ac_status" >&5 6130 + echo "$as_me:68 68: \$? = $ac_status" >&56156 + echo "$as_me:6872: \$? = $ac_status" >&5 6131 6157 (exit $ac_status); } && 6132 6158 { ac_try='test -s conftest.$ac_objext' 6133 6159 - { (eval echo "$as_me:6575: \"$ac_try\"") >&5 6134 + { (eval echo "$as_me:687 1: \"$ac_try\"") >&56160 + { (eval echo "$as_me:6875: \"$ac_try\"") >&5 6135 6161 (eval $ac_try) 2>&5 6136 6162 ac_status=$? 6137 6163 - echo "$as_me:6578: \$? = $ac_status" >&5 6138 + echo "$as_me:687 4: \$? = $ac_status" >&56164 + echo "$as_me:6878: \$? = $ac_status" >&5 6139 6165 (exit $ac_status); }; }; then 6140 6166 : 6141 6167 else 6142 @@ -6591,7 +68 87,7 @@6168 @@ -6591,7 +6891,7 @@ 6143 6169 rm -f conftest.$ac_objext conftest.$ac_ext 6144 6170 6145 6171 fi 6146 6172 -echo "$as_me:6594: result: $cf_cv_posix_c_source" >&5 6147 +echo "$as_me:689 0: result: $cf_cv_posix_c_source" >&56173 +echo "$as_me:6894: result: $cf_cv_posix_c_source" >&5 6148 6174 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 6149 6175 6150 6176 if test "$cf_cv_posix_c_source" != no ; then 6151 @@ -6610,14 +69 06,14 @@6177 @@ -6610,14 +6910,14 @@ 6152 6178 6153 6179 # Work around breakage on OS X 6154 6180 6155 6181 -echo "$as_me:6613: checking if SIGWINCH is defined" >&5 6156 +echo "$as_me:69 09: checking if SIGWINCH is defined" >&56182 +echo "$as_me:6913: checking if SIGWINCH is defined" >&5 6157 6183 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6 6158 6184 if test "${cf_cv_define_sigwinch+set}" = set; then … … 6162 6188 cat >conftest.$ac_ext <<_ACEOF 6163 6189 -#line 6620 "configure" 6164 +#line 69 16"configure"6190 +#line 6920 "configure" 6165 6191 #include "confdefs.h" 6166 6192 6167 6193 #include <sys/types.h> 6168 @@ -6632,23 +69 28,23 @@6194 @@ -6632,23 +6932,23 @@ 6169 6195 } 6170 6196 _ACEOF 6171 6197 rm -f conftest.$ac_objext 6172 6198 -if { (eval echo "$as_me:6635: \"$ac_compile\"") >&5 6173 +if { (eval echo "$as_me:693 1: \"$ac_compile\"") >&56199 +if { (eval echo "$as_me:6935: \"$ac_compile\"") >&5 6174 6200 (eval $ac_compile) 2>&5 6175 6201 ac_status=$? 6176 6202 - echo "$as_me:6638: \$? = $ac_status" >&5 6177 + echo "$as_me:693 4: \$? = $ac_status" >&56203 + echo "$as_me:6938: \$? = $ac_status" >&5 6178 6204 (exit $ac_status); } && 6179 6205 { ac_try='test -s conftest.$ac_objext' 6180 6206 - { (eval echo "$as_me:6641: \"$ac_try\"") >&5 6181 + { (eval echo "$as_me:69 37: \"$ac_try\"") >&56207 + { (eval echo "$as_me:6941: \"$ac_try\"") >&5 6182 6208 (eval $ac_try) 2>&5 6183 6209 ac_status=$? 6184 6210 - echo "$as_me:6644: \$? = $ac_status" >&5 6185 + echo "$as_me:694 0: \$? = $ac_status" >&56211 + echo "$as_me:6944: \$? = $ac_status" >&5 6186 6212 (exit $ac_status); }; }; then 6187 6213 cf_cv_define_sigwinch=yes … … 6191 6217 cat >conftest.$ac_ext <<_ACEOF 6192 6218 -#line 6651 "configure" 6193 +#line 69 47"configure"6219 +#line 6951 "configure" 6194 6220 #include "confdefs.h" 6195 6221 6196 6222 #undef _XOPEN_SOURCE 6197 @@ -6666,16 +696 2,16 @@6223 @@ -6666,16 +6966,16 @@ 6198 6224 } 6199 6225 _ACEOF 6200 6226 rm -f conftest.$ac_objext 6201 6227 -if { (eval echo "$as_me:6669: \"$ac_compile\"") >&5 6202 +if { (eval echo "$as_me:696 5: \"$ac_compile\"") >&56228 +if { (eval echo "$as_me:6969: \"$ac_compile\"") >&5 6203 6229 (eval $ac_compile) 2>&5 6204 6230 ac_status=$? 6205 6231 - echo "$as_me:6672: \$? = $ac_status" >&5 6206 + echo "$as_me:69 68: \$? = $ac_status" >&56232 + echo "$as_me:6972: \$? = $ac_status" >&5 6207 6233 (exit $ac_status); } && 6208 6234 { ac_try='test -s conftest.$ac_objext' 6209 6235 - { (eval echo "$as_me:6675: \"$ac_try\"") >&5 6210 + { (eval echo "$as_me:697 1: \"$ac_try\"") >&56236 + { (eval echo "$as_me:6975: \"$ac_try\"") >&5 6211 6237 (eval $ac_try) 2>&5 6212 6238 ac_status=$? 6213 6239 - echo "$as_me:6678: \$? = $ac_status" >&5 6214 + echo "$as_me:697 4: \$? = $ac_status" >&56240 + echo "$as_me:6978: \$? = $ac_status" >&5 6215 6241 (exit $ac_status); }; }; then 6216 6242 cf_cv_define_sigwinch=maybe 6217 6243 else 6218 @@ -6689,11 +698 5,11 @@6244 @@ -6689,11 +6989,11 @@ 6219 6245 rm -f conftest.$ac_objext conftest.$ac_ext 6220 6246 6221 6247 fi 6222 6248 -echo "$as_me:6692: result: $cf_cv_define_sigwinch" >&5 6223 +echo "$as_me:69 88: result: $cf_cv_define_sigwinch" >&56249 +echo "$as_me:6992: result: $cf_cv_define_sigwinch" >&5 6224 6250 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6 6225 6251 6226 6252 if test "$cf_cv_define_sigwinch" = maybe ; then 6227 6253 -echo "$as_me:6696: checking for actual SIGWINCH definition" >&5 6228 +echo "$as_me:699 2: checking for actual SIGWINCH definition" >&56254 +echo "$as_me:6996: checking for actual SIGWINCH definition" >&5 6229 6255 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6 6230 6256 if test "${cf_cv_fixup_sigwinch+set}" = set; then 6231 6257 echo $ECHO_N "(cached) $ECHO_C" >&6 6232 @@ -6704,7 +700 0,7 @@6258 @@ -6704,7 +7004,7 @@ 6233 6259 while test $cf_sigwinch != 1 6234 6260 do 6235 6261 cat >conftest.$ac_ext <<_ACEOF 6236 6262 -#line 6707 "configure" 6237 +#line 700 3"configure"6263 +#line 7007 "configure" 6238 6264 #include "confdefs.h" 6239 6265 6240 6266 #undef _XOPEN_SOURCE 6241 @@ -6726,16 +702 2,16 @@6267 @@ -6726,16 +7026,16 @@ 6242 6268 } 6243 6269 _ACEOF 6244 6270 rm -f conftest.$ac_objext 6245 6271 -if { (eval echo "$as_me:6729: \"$ac_compile\"") >&5 6246 +if { (eval echo "$as_me:702 5: \"$ac_compile\"") >&56272 +if { (eval echo "$as_me:7029: \"$ac_compile\"") >&5 6247 6273 (eval $ac_compile) 2>&5 6248 6274 ac_status=$? 6249 6275 - echo "$as_me:6732: \$? = $ac_status" >&5 6250 + echo "$as_me:70 28: \$? = $ac_status" >&56276 + echo "$as_me:7032: \$? = $ac_status" >&5 6251 6277 (exit $ac_status); } && 6252 6278 { ac_try='test -s conftest.$ac_objext' 6253 6279 - { (eval echo "$as_me:6735: \"$ac_try\"") >&5 6254 + { (eval echo "$as_me:703 1: \"$ac_try\"") >&56280 + { (eval echo "$as_me:7035: \"$ac_try\"") >&5 6255 6281 (eval $ac_try) 2>&5 6256 6282 ac_status=$? 6257 6283 - echo "$as_me:6738: \$? = $ac_status" >&5 6258 + echo "$as_me:703 4: \$? = $ac_status" >&56284 + echo "$as_me:7038: \$? = $ac_status" >&5 6259 6285 (exit $ac_status); }; }; then 6260 6286 cf_cv_fixup_sigwinch=$cf_sigwinch 6261 6287 break 6262 @@ -6749,7 +704 5,7 @@6288 @@ -6749,7 +7049,7 @@ 6263 6289 done 6264 6290 6265 6291 fi 6266 6292 -echo "$as_me:6752: result: $cf_cv_fixup_sigwinch" >&5 6267 +echo "$as_me:70 48: result: $cf_cv_fixup_sigwinch" >&56293 +echo "$as_me:7052: result: $cf_cv_fixup_sigwinch" >&5 6268 6294 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 6269 6295 6270 6296 if test "$cf_cv_fixup_sigwinch" != unknown ; then 6271 @@ -6759,13 +705 5,13 @@6297 @@ -6759,13 +7059,13 @@ 6272 6298 6273 6299 # Checks for CODESET support. 6274 6300 6275 6301 - echo "$as_me:6762: checking for nl_langinfo and CODESET" >&5 6276 + echo "$as_me:70 58: checking for nl_langinfo and CODESET" >&56302 + echo "$as_me:7062: checking for nl_langinfo and CODESET" >&5 6277 6303 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 6278 6304 if test "${am_cv_langinfo_codeset+set}" = set; then … … 6281 6307 cat >conftest.$ac_ext <<_ACEOF 6282 6308 -#line 6768 "configure" 6283 +#line 706 4"configure"6309 +#line 7068 "configure" 6284 6310 #include "confdefs.h" 6285 6311 #include <langinfo.h> 6286 6312 int 6287 @@ -6777,16 +707 3,16 @@6313 @@ -6777,16 +7077,16 @@ 6288 6314 } 6289 6315 _ACEOF 6290 6316 rm -f conftest.$ac_objext conftest$ac_exeext 6291 6317 -if { (eval echo "$as_me:6780: \"$ac_link\"") >&5 6292 +if { (eval echo "$as_me:70 76: \"$ac_link\"") >&56318 +if { (eval echo "$as_me:7080: \"$ac_link\"") >&5 6293 6319 (eval $ac_link) 2>&5 6294 6320 ac_status=$? 6295 6321 - echo "$as_me:6783: \$? = $ac_status" >&5 6296 + echo "$as_me:70 79: \$? = $ac_status" >&56322 + echo "$as_me:7083: \$? = $ac_status" >&5 6297 6323 (exit $ac_status); } && 6298 6324 { ac_try='test -s conftest$ac_exeext' 6299 6325 - { (eval echo "$as_me:6786: \"$ac_try\"") >&5 6300 + { (eval echo "$as_me:708 2: \"$ac_try\"") >&56326 + { (eval echo "$as_me:7086: \"$ac_try\"") >&5 6301 6327 (eval $ac_try) 2>&5 6302 6328 ac_status=$? 6303 6329 - echo "$as_me:6789: \$? = $ac_status" >&5 6304 + echo "$as_me:708 5: \$? = $ac_status" >&56330 + echo "$as_me:7089: \$? = $ac_status" >&5 6305 6331 (exit $ac_status); }; }; then 6306 6332 am_cv_langinfo_codeset=yes 6307 6333 else 6308 @@ -6797,7 +709 3,7 @@6334 @@ -6797,7 +7097,7 @@ 6309 6335 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 6310 6336 6311 6337 fi 6312 6338 -echo "$as_me:6800: result: $am_cv_langinfo_codeset" >&5 6313 +echo "$as_me:7 096: result: $am_cv_langinfo_codeset" >&56339 +echo "$as_me:7100: result: $am_cv_langinfo_codeset" >&5 6314 6340 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 6315 6341 if test $am_cv_langinfo_codeset = yes; then 6316 6342 6317 @@ -6811,7 +71 07,7 @@6343 @@ -6811,7 +7111,7 @@ 6318 6344 NCURSES_OK_WCHAR_T= 6319 6345 NCURSES_OK_WINT_T= 6320 6346 6321 6347 -echo "$as_me:6814: checking if you want wide-character code" >&5 6322 +echo "$as_me:711 0: checking if you want wide-character code" >&56348 +echo "$as_me:7114: checking if you want wide-character code" >&5 6323 6349 echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 6324 6350 6325 6351 # Check whether --enable-widec or --disable-widec was given. 6326 @@ -6821,7 +71 17,7 @@6352 @@ -6821,7 +7121,7 @@ 6327 6353 else 6328 6354 with_widec=no 6329 6355 fi; 6330 6356 -echo "$as_me:6824: result: $with_widec" >&5 6331 +echo "$as_me:712 0: result: $with_widec" >&56357 +echo "$as_me:7124: result: $with_widec" >&5 6332 6358 echo "${ECHO_T}$with_widec" >&6 6333 6359 if test "$with_widec" = yes ; then 6334 6360 LIB_SUFFIX="w${LIB_SUFFIX}" 6335 @@ -6829,10 +712 5,10 @@6361 @@ -6829,10 +7129,10 @@ 6336 6362 #define USE_WIDEC_SUPPORT 1 6337 6363 EOF 6338 6364 6339 6365 -echo "$as_me:6832: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 6340 +echo "$as_me:71 28: checking if we must define _XOPEN_SOURCE_EXTENDED" >&56366 +echo "$as_me:7132: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 6341 6367 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6 6342 6368 cat >conftest.$ac_ext <<_ACEOF 6343 6369 -#line 6835 "configure" 6344 +#line 713 1"configure"6370 +#line 7135 "configure" 6345 6371 #include "confdefs.h" 6346 6372 #include <sys/types.h> 6347 6373 6348 @@ -6848,16 +714 4,16 @@6374 @@ -6848,16 +7148,16 @@ 6349 6375 } 6350 6376 _ACEOF 6351 6377 rm -f conftest.$ac_objext 6352 6378 -if { (eval echo "$as_me:6851: \"$ac_compile\"") >&5 6353 +if { (eval echo "$as_me:71 47: \"$ac_compile\"") >&56379 +if { (eval echo "$as_me:7151: \"$ac_compile\"") >&5 6354 6380 (eval $ac_compile) 2>&5 6355 6381 ac_status=$? 6356 6382 - echo "$as_me:6854: \$? = $ac_status" >&5 6357 + echo "$as_me:715 0: \$? = $ac_status" >&56383 + echo "$as_me:7154: \$? = $ac_status" >&5 6358 6384 (exit $ac_status); } && 6359 6385 { ac_try='test -s conftest.$ac_objext' 6360 6386 - { (eval echo "$as_me:6857: \"$ac_try\"") >&5 6361 + { (eval echo "$as_me:715 3: \"$ac_try\"") >&56387 + { (eval echo "$as_me:7157: \"$ac_try\"") >&5 6362 6388 (eval $ac_try) 2>&5 6363 6389 ac_status=$? 6364 6390 - echo "$as_me:6860: \$? = $ac_status" >&5 6365 + echo "$as_me:71 56: \$? = $ac_status" >&56391 + echo "$as_me:7160: \$? = $ac_status" >&5 6366 6392 (exit $ac_status); }; }; then 6367 6393 cf_result=no 6368 6394 else 6369 @@ -6866,16 +716 2,16 @@6395 @@ -6866,16 +7166,16 @@ 6370 6396 cf_result=yes 6371 6397 fi 6372 6398 rm -f conftest.$ac_objext conftest.$ac_ext 6373 6399 -echo "$as_me:6869: result: $cf_result" >&5 6374 +echo "$as_me:716 5: result: $cf_result" >&56400 +echo "$as_me:7169: result: $cf_result" >&5 6375 6401 echo "${ECHO_T}$cf_result" >&6 6376 6402 … … 6379 6405 elif test "x" != "x" ; then 6380 6406 - echo "$as_me:6875: checking checking for compatible value versus " >&5 6381 + echo "$as_me:717 1: checking checking for compatible value versus " >&56407 + echo "$as_me:7175: checking checking for compatible value versus " >&5 6382 6408 echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6 6383 6409 cat >conftest.$ac_ext <<_ACEOF 6384 6410 -#line 6878 "configure" 6385 +#line 717 4"configure"6411 +#line 7178 "configure" 6386 6412 #include "confdefs.h" 6387 6413 #include <sys/types.h> 6388 6414 6389 @@ -6891,16 +71 87,16 @@6415 @@ -6891,16 +7191,16 @@ 6390 6416 } 6391 6417 _ACEOF 6392 6418 rm -f conftest.$ac_objext 6393 6419 -if { (eval echo "$as_me:6894: \"$ac_compile\"") >&5 6394 +if { (eval echo "$as_me:719 0: \"$ac_compile\"") >&56420 +if { (eval echo "$as_me:7194: \"$ac_compile\"") >&5 6395 6421 (eval $ac_compile) 2>&5 6396 6422 ac_status=$? 6397 6423 - echo "$as_me:6897: \$? = $ac_status" >&5 6398 + echo "$as_me:719 3: \$? = $ac_status" >&56424 + echo "$as_me:7197: \$? = $ac_status" >&5 6399 6425 (exit $ac_status); } && 6400 6426 { ac_try='test -s conftest.$ac_objext' 6401 6427 - { (eval echo "$as_me:6900: \"$ac_try\"") >&5 6402 + { (eval echo "$as_me:7 196: \"$ac_try\"") >&56428 + { (eval echo "$as_me:7200: \"$ac_try\"") >&5 6403 6429 (eval $ac_try) 2>&5 6404 6430 ac_status=$? 6405 6431 - echo "$as_me:6903: \$? = $ac_status" >&5 6406 + echo "$as_me:7 199: \$? = $ac_status" >&56432 + echo "$as_me:7203: \$? = $ac_status" >&5 6407 6433 (exit $ac_status); }; }; then 6408 6434 cf_result=yes 6409 6435 else 6410 @@ -6909,7 +720 5,7 @@6436 @@ -6909,7 +7209,7 @@ 6411 6437 cf_result=no 6412 6438 fi 6413 6439 rm -f conftest.$ac_objext conftest.$ac_ext 6414 6440 - echo "$as_me:6912: result: $cf_result" >&5 6415 + echo "$as_me:72 08: result: $cf_result" >&56441 + echo "$as_me:7212: result: $cf_result" >&5 6416 6442 echo "${ECHO_T}$cf_result" >&6 6417 6443 if test "$cf_result" = no ; then 6418 6444 # perhaps we can override it - try... 6419 @@ -6923,13 +72 19,13 @@6445 @@ -6923,13 +7223,13 @@ 6420 6446 for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs 6421 6447 do 6422 6448 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 6423 6449 -echo "$as_me:6926: checking for $ac_func" >&5 6424 +echo "$as_me:722 2: checking for $ac_func" >&56450 +echo "$as_me:7226: checking for $ac_func" >&5 6425 6451 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 6426 6452 if eval "test \"\${$as_ac_var+set}\" = set"; then … … 6429 6455 cat >conftest.$ac_ext <<_ACEOF 6430 6456 -#line 6932 "configure" 6431 +#line 72 28"configure"6457 +#line 7232 "configure" 6432 6458 #include "confdefs.h" 6433 6459 /* System header to define __stub macros and hopefully few prototypes, 6434 6460 which can conflict with char $ac_func (); below. */ 6435 @@ -6960,16 +72 56,16 @@6461 @@ -6960,16 +7260,16 @@ 6436 6462 } 6437 6463 _ACEOF 6438 6464 rm -f conftest.$ac_objext conftest$ac_exeext 6439 6465 -if { (eval echo "$as_me:6963: \"$ac_link\"") >&5 6440 +if { (eval echo "$as_me:72 59: \"$ac_link\"") >&56466 +if { (eval echo "$as_me:7263: \"$ac_link\"") >&5 6441 6467 (eval $ac_link) 2>&5 6442 6468 ac_status=$? 6443 6469 - echo "$as_me:6966: \$? = $ac_status" >&5 6444 + echo "$as_me:726 2: \$? = $ac_status" >&56470 + echo "$as_me:7266: \$? = $ac_status" >&5 6445 6471 (exit $ac_status); } && 6446 6472 { ac_try='test -s conftest$ac_exeext' 6447 6473 - { (eval echo "$as_me:6969: \"$ac_try\"") >&5 6448 + { (eval echo "$as_me:726 5: \"$ac_try\"") >&56474 + { (eval echo "$as_me:7269: \"$ac_try\"") >&5 6449 6475 (eval $ac_try) 2>&5 6450 6476 ac_status=$? 6451 6477 - echo "$as_me:6972: \$? = $ac_status" >&5 6452 + echo "$as_me:72 68: \$? = $ac_status" >&56478 + echo "$as_me:7272: \$? = $ac_status" >&5 6453 6479 (exit $ac_status); }; }; then 6454 6480 eval "$as_ac_var=yes" 6455 6481 else 6456 @@ -6979,7 +727 5,7 @@6482 @@ -6979,7 +7279,7 @@ 6457 6483 fi 6458 6484 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 6459 6485 fi 6460 6486 -echo "$as_me:6982: result: `eval echo '${'$as_ac_var'}'`" >&5 6461 +echo "$as_me:72 78: result: `eval echo '${'$as_ac_var'}'`" >&56487 +echo "$as_me:7282: result: `eval echo '${'$as_ac_var'}'`" >&5 6462 6488 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 6463 6489 if test `eval echo '${'$as_ac_var'}'` = yes; then 6464 6490 cat >>confdefs.h <<EOF 6465 @@ -6991,7 +72 87,7 @@6491 @@ -6991,7 +7291,7 @@ 6466 6492 6467 6493 if test "$ac_cv_func_putwc" != yes ; then 6468 6494 6469 6495 -echo "$as_me:6994: checking for multibyte character support" >&5 6470 +echo "$as_me:729 0: checking for multibyte character support" >&56496 +echo "$as_me:7294: checking for multibyte character support" >&5 6471 6497 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 6472 6498 if test "${cf_cv_utf8_lib+set}" = set; then 6473 6499 echo $ECHO_N "(cached) $ECHO_C" >&6 6474 @@ -6999,7 +729 5,7 @@6500 @@ -6999,7 +7299,7 @@ 6475 6501 6476 6502 cf_save_LIBS="$LIBS" 6477 6503 cat >conftest.$ac_ext <<_ACEOF 6478 6504 -#line 7002 "configure" 6479 +#line 7 298"configure"6505 +#line 7302 "configure" 6480 6506 #include "confdefs.h" 6481 6507 6482 6508 #include <stdlib.h> 6483 @@ -7012,16 +73 08,16 @@6509 @@ -7012,16 +7312,16 @@ 6484 6510 } 6485 6511 _ACEOF 6486 6512 rm -f conftest.$ac_objext conftest$ac_exeext 6487 6513 -if { (eval echo "$as_me:7015: \"$ac_link\"") >&5 6488 +if { (eval echo "$as_me:731 1: \"$ac_link\"") >&56514 +if { (eval echo "$as_me:7315: \"$ac_link\"") >&5 6489 6515 (eval $ac_link) 2>&5 6490 6516 ac_status=$? 6491 6517 - echo "$as_me:7018: \$? = $ac_status" >&5 6492 + echo "$as_me:731 4: \$? = $ac_status" >&56518 + echo "$as_me:7318: \$? = $ac_status" >&5 6493 6519 (exit $ac_status); } && 6494 6520 { ac_try='test -s conftest$ac_exeext' 6495 6521 - { (eval echo "$as_me:7021: \"$ac_try\"") >&5 6496 + { (eval echo "$as_me:73 17: \"$ac_try\"") >&56522 + { (eval echo "$as_me:7321: \"$ac_try\"") >&5 6497 6523 (eval $ac_try) 2>&5 6498 6524 ac_status=$? 6499 6525 - echo "$as_me:7024: \$? = $ac_status" >&5 6500 + echo "$as_me:732 0: \$? = $ac_status" >&56526 + echo "$as_me:7324: \$? = $ac_status" >&5 6501 6527 (exit $ac_status); }; }; then 6502 6528 cf_cv_utf8_lib=yes 6503 6529 else 6504 @@ -7033,10 +73 29,10 @@6530 @@ -7033,10 +7333,10 @@ 6505 6531 cf_cv_header_path_utf8= 6506 6532 cf_cv_library_path_utf8= 6507 6533 6508 6534 -echo "${as_me-configure}:7036: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 6509 +echo "${as_me-configure}:733 2: testing Starting FIND_LINKAGE(utf8,) ..." 1>&56535 +echo "${as_me-configure}:7336: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 6510 6536 6511 6537 cat >conftest.$ac_ext <<_ACEOF 6512 6538 -#line 7039 "configure" 6513 +#line 733 5"configure"6539 +#line 7339 "configure" 6514 6540 #include "confdefs.h" 6515 6541 6516 6542 #include <libutf8.h> 6517 @@ -7049,16 +734 5,16 @@6543 @@ -7049,16 +7349,16 @@ 6518 6544 } 6519 6545 _ACEOF 6520 6546 rm -f conftest.$ac_objext conftest$ac_exeext 6521 6547 -if { (eval echo "$as_me:7052: \"$ac_link\"") >&5 6522 +if { (eval echo "$as_me:73 48: \"$ac_link\"") >&56548 +if { (eval echo "$as_me:7352: \"$ac_link\"") >&5 6523 6549 (eval $ac_link) 2>&5 6524 6550 ac_status=$? 6525 6551 - echo "$as_me:7055: \$? = $ac_status" >&5 6526 + echo "$as_me:735 1: \$? = $ac_status" >&56552 + echo "$as_me:7355: \$? = $ac_status" >&5 6527 6553 (exit $ac_status); } && 6528 6554 { ac_try='test -s conftest$ac_exeext' 6529 6555 - { (eval echo "$as_me:7058: \"$ac_try\"") >&5 6530 + { (eval echo "$as_me:735 4: \"$ac_try\"") >&56556 + { (eval echo "$as_me:7358: \"$ac_try\"") >&5 6531 6557 (eval $ac_try) 2>&5 6532 6558 ac_status=$? 6533 6559 - echo "$as_me:7061: \$? = $ac_status" >&5 6534 + echo "$as_me:73 57: \$? = $ac_status" >&56560 + echo "$as_me:7361: \$? = $ac_status" >&5 6535 6561 (exit $ac_status); }; }; then 6536 6562 cf_cv_find_linkage_utf8=yes 6537 6563 else 6538 @@ -7067,12 +736 3,41 @@6564 @@ -7067,12 +7367,41 @@ 6539 6565 6540 6566 cf_cv_find_linkage_utf8=no … … 6543 6569 + test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 6544 6570 + 6545 +echo "${as_me-configure}:73 68: testing find linkage for utf8 library ..." 1>&56546 + 6547 +echo "${as_me-configure}:737 0: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&56571 +echo "${as_me-configure}:7372: testing find linkage for utf8 library ..." 1>&5 6572 + 6573 +echo "${as_me-configure}:7374: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 6548 6574 6549 6575 cf_save_CPPFLAGS="$CPPFLAGS" … … 6580 6606 test "/usr" != "$prefix" && \ 6581 6607 test -d "/usr" && \ 6582 @@ -7143,16 +74 68,18 @@6608 @@ -7143,16 +7472,18 @@ 6583 6609 test -d $oldincludedir/utf8 && cf_search="$cf_search $oldincludedir/utf8" 6584 6610 } … … 6592 6618 6593 6619 -echo "${as_me-configure}:7151: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 6594 +echo "${as_me-configure}:74 78: testing ... testing $cf_cv_header_path_utf8 ..." 1>&56620 +echo "${as_me-configure}:7482: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 6595 6621 6596 6622 CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8" 6597 6623 cat >conftest.$ac_ext <<_ACEOF 6598 6624 -#line 7155 "configure" 6599 +#line 748 2"configure"6625 +#line 7486 "configure" 6600 6626 #include "confdefs.h" 6601 6627 6602 6628 #include <libutf8.h> 6603 @@ -7165,21 +749 2,21 @@6629 @@ -7165,21 +7496,21 @@ 6604 6630 } 6605 6631 _ACEOF 6606 6632 rm -f conftest.$ac_objext 6607 6633 -if { (eval echo "$as_me:7168: \"$ac_compile\"") >&5 6608 +if { (eval echo "$as_me:749 5: \"$ac_compile\"") >&56634 +if { (eval echo "$as_me:7499: \"$ac_compile\"") >&5 6609 6635 (eval $ac_compile) 2>&5 6610 6636 ac_status=$? 6611 6637 - echo "$as_me:7171: \$? = $ac_status" >&5 6612 + echo "$as_me:7 498: \$? = $ac_status" >&56638 + echo "$as_me:7502: \$? = $ac_status" >&5 6613 6639 (exit $ac_status); } && 6614 6640 { ac_try='test -s conftest.$ac_objext' 6615 6641 - { (eval echo "$as_me:7174: \"$ac_try\"") >&5 6616 + { (eval echo "$as_me:750 1: \"$ac_try\"") >&56642 + { (eval echo "$as_me:7505: \"$ac_try\"") >&5 6617 6643 (eval $ac_try) 2>&5 6618 6644 ac_status=$? 6619 6645 - echo "$as_me:7177: \$? = $ac_status" >&5 6620 + echo "$as_me:750 4: \$? = $ac_status" >&56646 + echo "$as_me:7508: \$? = $ac_status" >&5 6621 6647 (exit $ac_status); }; }; then 6622 6648 … … 6624 6650 6625 6651 -echo "${as_me-configure}:7182: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 6626 +echo "${as_me-configure}:75 09: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&56652 +echo "${as_me-configure}:7513: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 6627 6653 6628 6654 cf_cv_find_linkage_utf8=maybe 6629 6655 cf_test_CPPFLAGS="$CPPFLAGS" 6630 @@ -7197,13 +752 4,39 @@6656 @@ -7197,13 +7528,39 @@ 6631 6657 6632 6658 if test "$cf_cv_find_linkage_utf8" = maybe ; then 6633 6659 6634 6660 -echo "${as_me-configure}:7200: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 6635 +echo "${as_me-configure}:75 27: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&56661 +echo "${as_me-configure}:7531: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 6636 6662 6637 6663 cf_save_LIBS="$LIBS" … … 6670 6696 test "/usr" != "$prefix" && \ 6671 6697 test -d "/usr" && \ 6672 @@ -7260,18 +761 3,20 @@6698 @@ -7260,18 +7617,20 @@ 6673 6699 test -d $HOME/utf8/lib/utf8 && cf_search="$cf_search $HOME/utf8/lib/utf8" 6674 6700 } … … 6682 6708 6683 6709 -echo "${as_me-configure}:7268: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 6684 +echo "${as_me-configure}:762 3: testing ... testing $cf_cv_library_path_utf8 ..." 1>&56710 +echo "${as_me-configure}:7627: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 6685 6711 6686 6712 CPPFLAGS="$cf_test_CPPFLAGS" … … 6689 6715 cat >conftest.$ac_ext <<_ACEOF 6690 6716 -#line 7274 "configure" 6691 +#line 76 29"configure"6717 +#line 7633 "configure" 6692 6718 #include "confdefs.h" 6693 6719 6694 6720 #include <libutf8.h> 6695 @@ -7284,21 +76 39,21 @@6721 @@ -7284,21 +7643,21 @@ 6696 6722 } 6697 6723 _ACEOF 6698 6724 rm -f conftest.$ac_objext conftest$ac_exeext 6699 6725 -if { (eval echo "$as_me:7287: \"$ac_link\"") >&5 6700 +if { (eval echo "$as_me:764 2: \"$ac_link\"") >&56726 +if { (eval echo "$as_me:7646: \"$ac_link\"") >&5 6701 6727 (eval $ac_link) 2>&5 6702 6728 ac_status=$? 6703 6729 - echo "$as_me:7290: \$? = $ac_status" >&5 6704 + echo "$as_me:764 5: \$? = $ac_status" >&56730 + echo "$as_me:7649: \$? = $ac_status" >&5 6705 6731 (exit $ac_status); } && 6706 6732 { ac_try='test -s conftest$ac_exeext' 6707 6733 - { (eval echo "$as_me:7293: \"$ac_try\"") >&5 6708 + { (eval echo "$as_me:76 48: \"$ac_try\"") >&56734 + { (eval echo "$as_me:7652: \"$ac_try\"") >&5 6709 6735 (eval $ac_try) 2>&5 6710 6736 ac_status=$? 6711 6737 - echo "$as_me:7296: \$? = $ac_status" >&5 6712 + echo "$as_me:765 1: \$? = $ac_status" >&56738 + echo "$as_me:7655: \$? = $ac_status" >&5 6713 6739 (exit $ac_status); }; }; then 6714 6740 … … 6716 6742 6717 6743 -echo "${as_me-configure}:7301: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 6718 +echo "${as_me-configure}:76 56: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&56744 +echo "${as_me-configure}:7660: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 6719 6745 6720 6746 cf_cv_find_linkage_utf8=yes 6721 6747 cf_cv_library_file_utf8="-lutf8" 6722 @@ -7336,7 +769 1,7 @@6748 @@ -7336,7 +7695,7 @@ 6723 6749 fi 6724 6750 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 6725 6751 fi 6726 6752 -echo "$as_me:7339: result: $cf_cv_utf8_lib" >&5 6727 +echo "$as_me:769 4: result: $cf_cv_utf8_lib" >&56753 +echo "$as_me:7698: result: $cf_cv_utf8_lib" >&5 6728 6754 echo "${ECHO_T}$cf_cv_utf8_lib" >&6 6729 6755 6730 6756 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between 6731 @@ -7364,13 +77 19,13 @@6757 @@ -7364,13 +7723,13 @@ 6732 6758 fi 6733 6759 … … 6741 6767 cat >conftest.$ac_ext <<_ACEOF 6742 6768 -#line 7373 "configure" 6743 +#line 77 28"configure"6769 +#line 7732 "configure" 6744 6770 #include "confdefs.h" 6745 6771 #include <stdio.h> 6746 6772 int 6747 @@ -7382,16 +77 37,16 @@6773 @@ -7382,16 +7741,16 @@ 6748 6774 } 6749 6775 _ACEOF 6750 6776 rm -f conftest.$ac_objext 6751 6777 -if { (eval echo "$as_me:7385: \"$ac_compile\"") >&5 6752 +if { (eval echo "$as_me:774 0: \"$ac_compile\"") >&56778 +if { (eval echo "$as_me:7744: \"$ac_compile\"") >&5 6753 6779 (eval $ac_compile) 2>&5 6754 6780 ac_status=$? 6755 6781 - echo "$as_me:7388: \$? = $ac_status" >&5 6756 + echo "$as_me:774 3: \$? = $ac_status" >&56782 + echo "$as_me:7747: \$? = $ac_status" >&5 6757 6783 (exit $ac_status); } && 6758 6784 { ac_try='test -s conftest.$ac_objext' 6759 6785 - { (eval echo "$as_me:7391: \"$ac_try\"") >&5 6760 + { (eval echo "$as_me:77 46: \"$ac_try\"") >&56786 + { (eval echo "$as_me:7750: \"$ac_try\"") >&5 6761 6787 (eval $ac_try) 2>&5 6762 6788 ac_status=$? 6763 6789 - echo "$as_me:7394: \$? = $ac_status" >&5 6764 + echo "$as_me:77 49: \$? = $ac_status" >&56790 + echo "$as_me:7753: \$? = $ac_status" >&5 6765 6791 (exit $ac_status); }; }; then 6766 6792 : 6767 6793 else 6768 @@ -7408,13 +776 3,13 @@6794 @@ -7408,13 +7767,13 @@ 6769 6795 if test "$cf_have_incdir" = no ; then 6770 6796 test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 6771 6797 6772 6798 -echo "${as_me-configure}:7411: testing adding $cf_add_incdir to include-path ..." 1>&5 6773 +echo "${as_me-configure}:77 66: testing adding $cf_add_incdir to include-path ..." 1>&56799 +echo "${as_me-configure}:7770: testing adding $cf_add_incdir to include-path ..." 1>&5 6774 6800 6775 6801 - CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" … … 6785 6811 break 6786 6812 fi 6787 @@ -7442,7 +7 797,7 @@6813 @@ -7442,7 +7801,7 @@ 6788 6814 if test "$cf_have_libdir" = no ; then 6789 6815 test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 6790 6816 6791 6817 -echo "${as_me-configure}:7445: testing adding $cf_add_libdir to library-path ..." 1>&5 6792 +echo "${as_me-configure}:780 0: testing adding $cf_add_libdir to library-path ..." 1>&56818 +echo "${as_me-configure}:7804: testing adding $cf_add_libdir to library-path ..." 1>&5 6793 6819 6794 6820 LDFLAGS="-L$cf_add_libdir $LDFLAGS" 6795 6821 fi 6796 @@ -7459,14 +781 4,14 @@6822 @@ -7459,14 +7818,14 @@ 6797 6823 fi 6798 6824 6799 6825 # This is needed on Tru64 5.0 to declare mbstate_t 6800 6826 -echo "$as_me:7462: checking if we must include wchar.h to declare mbstate_t" >&5 6801 +echo "$as_me:78 17: checking if we must include wchar.h to declare mbstate_t" >&56827 +echo "$as_me:7821: checking if we must include wchar.h to declare mbstate_t" >&5 6802 6828 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6 6803 6829 if test "${cf_cv_mbstate_t+set}" = set; then … … 6807 6833 cat >conftest.$ac_ext <<_ACEOF 6808 6834 -#line 7469 "configure" 6809 +#line 782 4"configure"6835 +#line 7828 "configure" 6810 6836 #include "confdefs.h" 6811 6837 6812 6838 #include <stdlib.h> 6813 @@ -7484,23 +78 39,23 @@6839 @@ -7484,23 +7843,23 @@ 6814 6840 } 6815 6841 _ACEOF 6816 6842 rm -f conftest.$ac_objext 6817 6843 -if { (eval echo "$as_me:7487: \"$ac_compile\"") >&5 6818 +if { (eval echo "$as_me:784 2: \"$ac_compile\"") >&56844 +if { (eval echo "$as_me:7846: \"$ac_compile\"") >&5 6819 6845 (eval $ac_compile) 2>&5 6820 6846 ac_status=$? 6821 6847 - echo "$as_me:7490: \$? = $ac_status" >&5 6822 + echo "$as_me:784 5: \$? = $ac_status" >&56848 + echo "$as_me:7849: \$? = $ac_status" >&5 6823 6849 (exit $ac_status); } && 6824 6850 { ac_try='test -s conftest.$ac_objext' 6825 6851 - { (eval echo "$as_me:7493: \"$ac_try\"") >&5 6826 + { (eval echo "$as_me:78 48: \"$ac_try\"") >&56852 + { (eval echo "$as_me:7852: \"$ac_try\"") >&5 6827 6853 (eval $ac_try) 2>&5 6828 6854 ac_status=$? 6829 6855 - echo "$as_me:7496: \$? = $ac_status" >&5 6830 + echo "$as_me:785 1: \$? = $ac_status" >&56856 + echo "$as_me:7855: \$? = $ac_status" >&5 6831 6857 (exit $ac_status); }; }; then 6832 6858 cf_cv_mbstate_t=no … … 6836 6862 cat >conftest.$ac_ext <<_ACEOF 6837 6863 -#line 7503 "configure" 6838 +#line 78 58"configure"6864 +#line 7862 "configure" 6839 6865 #include "confdefs.h" 6840 6866 6841 6867 #include <stdlib.h> 6842 @@ -7519,16 +787 4,16 @@6868 @@ -7519,16 +7878,16 @@ 6843 6869 } 6844 6870 _ACEOF 6845 6871 rm -f conftest.$ac_objext 6846 6872 -if { (eval echo "$as_me:7522: \"$ac_compile\"") >&5 6847 +if { (eval echo "$as_me:78 77: \"$ac_compile\"") >&56873 +if { (eval echo "$as_me:7881: \"$ac_compile\"") >&5 6848 6874 (eval $ac_compile) 2>&5 6849 6875 ac_status=$? 6850 6876 - echo "$as_me:7525: \$? = $ac_status" >&5 6851 + echo "$as_me:788 0: \$? = $ac_status" >&56877 + echo "$as_me:7884: \$? = $ac_status" >&5 6852 6878 (exit $ac_status); } && 6853 6879 { ac_try='test -s conftest.$ac_objext' 6854 6880 - { (eval echo "$as_me:7528: \"$ac_try\"") >&5 6855 + { (eval echo "$as_me:788 3: \"$ac_try\"") >&56881 + { (eval echo "$as_me:7887: \"$ac_try\"") >&5 6856 6882 (eval $ac_try) 2>&5 6857 6883 ac_status=$? 6858 6884 - echo "$as_me:7531: \$? = $ac_status" >&5 6859 + echo "$as_me:78 86: \$? = $ac_status" >&56885 + echo "$as_me:7890: \$? = $ac_status" >&5 6860 6886 (exit $ac_status); }; }; then 6861 6887 cf_cv_mbstate_t=yes 6862 6888 else 6863 @@ -7540,7 +789 5,7 @@6889 @@ -7540,7 +7899,7 @@ 6864 6890 fi 6865 6891 rm -f conftest.$ac_objext conftest.$ac_ext 6866 6892 fi 6867 6893 -echo "$as_me:7543: result: $cf_cv_mbstate_t" >&5 6868 +echo "$as_me:7 898: result: $cf_cv_mbstate_t" >&56894 +echo "$as_me:7902: result: $cf_cv_mbstate_t" >&5 6869 6895 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 6870 6896 6871 6897 if test "$cf_cv_mbstate_t" = yes ; then 6872 @@ -7557,14 +791 2,14 @@6898 @@ -7557,14 +7916,14 @@ 6873 6899 fi 6874 6900 6875 6901 # This is needed on Tru64 5.0 to declare wchar_t 6876 6902 -echo "$as_me:7560: checking if we must include wchar.h to declare wchar_t" >&5 6877 +echo "$as_me:791 5: checking if we must include wchar.h to declare wchar_t" >&56903 +echo "$as_me:7919: checking if we must include wchar.h to declare wchar_t" >&5 6878 6904 echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6 6879 6905 if test "${cf_cv_wchar_t+set}" = set; then … … 6883 6909 cat >conftest.$ac_ext <<_ACEOF 6884 6910 -#line 7567 "configure" 6885 +#line 792 2"configure"6911 +#line 7926 "configure" 6886 6912 #include "confdefs.h" 6887 6913 6888 6914 #include <stdlib.h> 6889 @@ -7582,23 +79 37,23 @@6915 @@ -7582,23 +7941,23 @@ 6890 6916 } 6891 6917 _ACEOF 6892 6918 rm -f conftest.$ac_objext 6893 6919 -if { (eval echo "$as_me:7585: \"$ac_compile\"") >&5 6894 +if { (eval echo "$as_me:794 0: \"$ac_compile\"") >&56920 +if { (eval echo "$as_me:7944: \"$ac_compile\"") >&5 6895 6921 (eval $ac_compile) 2>&5 6896 6922 ac_status=$? 6897 6923 - echo "$as_me:7588: \$? = $ac_status" >&5 6898 + echo "$as_me:794 3: \$? = $ac_status" >&56924 + echo "$as_me:7947: \$? = $ac_status" >&5 6899 6925 (exit $ac_status); } && 6900 6926 { ac_try='test -s conftest.$ac_objext' 6901 6927 - { (eval echo "$as_me:7591: \"$ac_try\"") >&5 6902 + { (eval echo "$as_me:79 46: \"$ac_try\"") >&56928 + { (eval echo "$as_me:7950: \"$ac_try\"") >&5 6903 6929 (eval $ac_try) 2>&5 6904 6930 ac_status=$? 6905 6931 - echo "$as_me:7594: \$? = $ac_status" >&5 6906 + echo "$as_me:79 49: \$? = $ac_status" >&56932 + echo "$as_me:7953: \$? = $ac_status" >&5 6907 6933 (exit $ac_status); }; }; then 6908 6934 cf_cv_wchar_t=no … … 6912 6938 cat >conftest.$ac_ext <<_ACEOF 6913 6939 -#line 7601 "configure" 6914 +#line 79 56"configure"6940 +#line 7960 "configure" 6915 6941 #include "confdefs.h" 6916 6942 6917 6943 #include <stdlib.h> 6918 @@ -7617,16 +797 2,16 @@6944 @@ -7617,16 +7976,16 @@ 6919 6945 } 6920 6946 _ACEOF 6921 6947 rm -f conftest.$ac_objext 6922 6948 -if { (eval echo "$as_me:7620: \"$ac_compile\"") >&5 6923 +if { (eval echo "$as_me:797 5: \"$ac_compile\"") >&56949 +if { (eval echo "$as_me:7979: \"$ac_compile\"") >&5 6924 6950 (eval $ac_compile) 2>&5 6925 6951 ac_status=$? 6926 6952 - echo "$as_me:7623: \$? = $ac_status" >&5 6927 + echo "$as_me:79 78: \$? = $ac_status" >&56953 + echo "$as_me:7982: \$? = $ac_status" >&5 6928 6954 (exit $ac_status); } && 6929 6955 { ac_try='test -s conftest.$ac_objext' 6930 6956 - { (eval echo "$as_me:7626: \"$ac_try\"") >&5 6931 + { (eval echo "$as_me:798 1: \"$ac_try\"") >&56957 + { (eval echo "$as_me:7985: \"$ac_try\"") >&5 6932 6958 (eval $ac_try) 2>&5 6933 6959 ac_status=$? 6934 6960 - echo "$as_me:7629: \$? = $ac_status" >&5 6935 + echo "$as_me:798 4: \$? = $ac_status" >&56961 + echo "$as_me:7988: \$? = $ac_status" >&5 6936 6962 (exit $ac_status); }; }; then 6937 6963 cf_cv_wchar_t=yes 6938 6964 else 6939 @@ -7638,7 +799 3,7 @@6965 @@ -7638,7 +7997,7 @@ 6940 6966 fi 6941 6967 rm -f conftest.$ac_objext conftest.$ac_ext 6942 6968 fi 6943 6969 -echo "$as_me:7641: result: $cf_cv_wchar_t" >&5 6944 +echo "$as_me: 7996: result: $cf_cv_wchar_t" >&56970 +echo "$as_me:8000: result: $cf_cv_wchar_t" >&5 6945 6971 echo "${ECHO_T}$cf_cv_wchar_t" >&6 6946 6972 6947 6973 if test "$cf_cv_wchar_t" = yes ; then 6948 @@ -7660,14 +801 5,14 @@6974 @@ -7660,14 +8019,14 @@ 6949 6975 fi 6950 6976 6951 6977 # This is needed on Tru64 5.0 to declare wint_t 6952 6978 -echo "$as_me:7663: checking if we must include wchar.h to declare wint_t" >&5 6953 +echo "$as_me:80 18: checking if we must include wchar.h to declare wint_t" >&56979 +echo "$as_me:8022: checking if we must include wchar.h to declare wint_t" >&5 6954 6980 echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6 6955 6981 if test "${cf_cv_wint_t+set}" = set; then … … 6959 6985 cat >conftest.$ac_ext <<_ACEOF 6960 6986 -#line 7670 "configure" 6961 +#line 802 5"configure"6987 +#line 8029 "configure" 6962 6988 #include "confdefs.h" 6963 6989 6964 6990 #include <stdlib.h> 6965 @@ -7685,23 +804 0,23 @@6991 @@ -7685,23 +8044,23 @@ 6966 6992 } 6967 6993 _ACEOF 6968 6994 rm -f conftest.$ac_objext 6969 6995 -if { (eval echo "$as_me:7688: \"$ac_compile\"") >&5 6970 +if { (eval echo "$as_me:804 3: \"$ac_compile\"") >&56996 +if { (eval echo "$as_me:8047: \"$ac_compile\"") >&5 6971 6997 (eval $ac_compile) 2>&5 6972 6998 ac_status=$? 6973 6999 - echo "$as_me:7691: \$? = $ac_status" >&5 6974 + echo "$as_me:80 46: \$? = $ac_status" >&57000 + echo "$as_me:8050: \$? = $ac_status" >&5 6975 7001 (exit $ac_status); } && 6976 7002 { ac_try='test -s conftest.$ac_objext' 6977 7003 - { (eval echo "$as_me:7694: \"$ac_try\"") >&5 6978 + { (eval echo "$as_me:80 49: \"$ac_try\"") >&57004 + { (eval echo "$as_me:8053: \"$ac_try\"") >&5 6979 7005 (eval $ac_try) 2>&5 6980 7006 ac_status=$? 6981 7007 - echo "$as_me:7697: \$? = $ac_status" >&5 6982 + echo "$as_me:805 2: \$? = $ac_status" >&57008 + echo "$as_me:8056: \$? = $ac_status" >&5 6983 7009 (exit $ac_status); }; }; then 6984 7010 cf_cv_wint_t=no … … 6988 7014 cat >conftest.$ac_ext <<_ACEOF 6989 7015 -#line 7704 "configure" 6990 +#line 80 59"configure"7016 +#line 8063 "configure" 6991 7017 #include "confdefs.h" 6992 7018 6993 7019 #include <stdlib.h> 6994 @@ -7720,16 +807 5,16 @@7020 @@ -7720,16 +8079,16 @@ 6995 7021 } 6996 7022 _ACEOF 6997 7023 rm -f conftest.$ac_objext 6998 7024 -if { (eval echo "$as_me:7723: \"$ac_compile\"") >&5 6999 +if { (eval echo "$as_me:80 78: \"$ac_compile\"") >&57025 +if { (eval echo "$as_me:8082: \"$ac_compile\"") >&5 7000 7026 (eval $ac_compile) 2>&5 7001 7027 ac_status=$? 7002 7028 - echo "$as_me:7726: \$? = $ac_status" >&5 7003 + echo "$as_me:808 1: \$? = $ac_status" >&57029 + echo "$as_me:8085: \$? = $ac_status" >&5 7004 7030 (exit $ac_status); } && 7005 7031 { ac_try='test -s conftest.$ac_objext' 7006 7032 - { (eval echo "$as_me:7729: \"$ac_try\"") >&5 7007 + { (eval echo "$as_me:808 4: \"$ac_try\"") >&57033 + { (eval echo "$as_me:8088: \"$ac_try\"") >&5 7008 7034 (eval $ac_try) 2>&5 7009 7035 ac_status=$? 7010 7036 - echo "$as_me:7732: \$? = $ac_status" >&5 7011 + echo "$as_me:80 87: \$? = $ac_status" >&57037 + echo "$as_me:8091: \$? = $ac_status" >&5 7012 7038 (exit $ac_status); }; }; then 7013 7039 cf_cv_wint_t=yes 7014 7040 else 7015 @@ -7741,7 +8 096,7 @@7041 @@ -7741,7 +8100,7 @@ 7016 7042 fi 7017 7043 rm -f conftest.$ac_objext conftest.$ac_ext 7018 7044 fi 7019 7045 -echo "$as_me:7744: result: $cf_cv_wint_t" >&5 7020 +echo "$as_me:8 099: result: $cf_cv_wint_t" >&57046 +echo "$as_me:8103: result: $cf_cv_wint_t" >&5 7021 7047 echo "${ECHO_T}$cf_cv_wint_t" >&6 7022 7048 7023 7049 if test "$cf_cv_wint_t" = yes ; then 7024 @@ -7780,7 +813 5,7 @@7050 @@ -7780,7 +8139,7 @@ 7025 7051 ;; 7026 7052 esac 7027 7053 7028 7054 -echo "$as_me:7783: checking whether to enable _LP64 definition in curses.h" >&5 7029 +echo "$as_me:81 38: checking whether to enable _LP64 definition in curses.h" >&57055 +echo "$as_me:8142: checking whether to enable _LP64 definition in curses.h" >&5 7030 7056 echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6 7031 7057 7032 7058 # Check whether --enable-lp64 or --disable-lp64 was given. 7033 @@ -7790,7 +814 5,7 @@7059 @@ -7790,7 +8149,7 @@ 7034 7060 else 7035 7061 with_lp64=$default_with_lp64 7036 7062 fi; 7037 7063 -echo "$as_me:7793: result: $with_lp64" >&5 7038 +echo "$as_me:81 48: result: $with_lp64" >&57064 +echo "$as_me:8152: result: $with_lp64" >&5 7039 7065 echo "${ECHO_T}$with_lp64" >&6 7040 7066 7041 7067 if test "$with_lp64" = yes ; then 7042 @@ -7806,7 +816 1,7 @@7068 @@ -7806,7 +8165,7 @@ 7043 7069 fi; 7044 7070 if test "$enable_largefile" != no; then 7045 7071 7046 7072 - echo "$as_me:7809: checking for special C compiler options needed for large files" >&5 7047 + echo "$as_me:816 4: checking for special C compiler options needed for large files" >&57073 + echo "$as_me:8168: checking for special C compiler options needed for large files" >&5 7048 7074 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 7049 7075 if test "${ac_cv_sys_largefile_CC+set}" = set; then 7050 7076 echo $ECHO_N "(cached) $ECHO_C" >&6 7051 @@ -7818,7 +817 3,7 @@7077 @@ -7818,7 +8177,7 @@ 7052 7078 # IRIX 6.2 and later do not support large files by default, 7053 7079 # so use the C compiler's -n32 option if that helps. 7054 7080 cat >conftest.$ac_ext <<_ACEOF 7055 7081 -#line 7821 "configure" 7056 +#line 81 76"configure"7082 +#line 8180 "configure" 7057 7083 #include "confdefs.h" 7058 7084 #include <sys/types.h> 7059 7085 /* Check that off_t can represent 2**63 - 1 correctly. 7060 @@ -7838,16 +819 3,16 @@7086 @@ -7838,16 +8197,16 @@ 7061 7087 } 7062 7088 _ACEOF 7063 7089 rm -f conftest.$ac_objext 7064 7090 -if { (eval echo "$as_me:7841: \"$ac_compile\"") >&5 7065 +if { (eval echo "$as_me:8 196: \"$ac_compile\"") >&57091 +if { (eval echo "$as_me:8200: \"$ac_compile\"") >&5 7066 7092 (eval $ac_compile) 2>&5 7067 7093 ac_status=$? 7068 7094 - echo "$as_me:7844: \$? = $ac_status" >&5 7069 + echo "$as_me:8 199: \$? = $ac_status" >&57095 + echo "$as_me:8203: \$? = $ac_status" >&5 7070 7096 (exit $ac_status); } && 7071 7097 { ac_try='test -s conftest.$ac_objext' 7072 7098 - { (eval echo "$as_me:7847: \"$ac_try\"") >&5 7073 + { (eval echo "$as_me:820 2: \"$ac_try\"") >&57099 + { (eval echo "$as_me:8206: \"$ac_try\"") >&5 7074 7100 (eval $ac_try) 2>&5 7075 7101 ac_status=$? 7076 7102 - echo "$as_me:7850: \$? = $ac_status" >&5 7077 + echo "$as_me:820 5: \$? = $ac_status" >&57103 + echo "$as_me:8209: \$? = $ac_status" >&5 7078 7104 (exit $ac_status); }; }; then 7079 7105 break 7080 7106 else 7081 @@ -7857,16 +821 2,16 @@7107 @@ -7857,16 +8216,16 @@ 7082 7108 rm -f conftest.$ac_objext 7083 7109 CC="$CC -n32" 7084 7110 rm -f conftest.$ac_objext 7085 7111 -if { (eval echo "$as_me:7860: \"$ac_compile\"") >&5 7086 +if { (eval echo "$as_me:821 5: \"$ac_compile\"") >&57112 +if { (eval echo "$as_me:8219: \"$ac_compile\"") >&5 7087 7113 (eval $ac_compile) 2>&5 7088 7114 ac_status=$? 7089 7115 - echo "$as_me:7863: \$? = $ac_status" >&5 7090 + echo "$as_me:82 18: \$? = $ac_status" >&57116 + echo "$as_me:8222: \$? = $ac_status" >&5 7091 7117 (exit $ac_status); } && 7092 7118 { ac_try='test -s conftest.$ac_objext' 7093 7119 - { (eval echo "$as_me:7866: \"$ac_try\"") >&5 7094 + { (eval echo "$as_me:822 1: \"$ac_try\"") >&57120 + { (eval echo "$as_me:8225: \"$ac_try\"") >&5 7095 7121 (eval $ac_try) 2>&5 7096 7122 ac_status=$? 7097 7123 - echo "$as_me:7869: \$? = $ac_status" >&5 7098 + echo "$as_me:822 4: \$? = $ac_status" >&57124 + echo "$as_me:8228: \$? = $ac_status" >&5 7099 7125 (exit $ac_status); }; }; then 7100 7126 ac_cv_sys_largefile_CC=' -n32'; break 7101 7127 else 7102 @@ -7880,13 +823 5,13 @@7128 @@ -7880,13 +8239,13 @@ 7103 7129 rm -f conftest.$ac_ext 7104 7130 fi 7105 7131 fi 7106 7132 -echo "$as_me:7883: result: $ac_cv_sys_largefile_CC" >&5 7107 +echo "$as_me:82 38: result: $ac_cv_sys_largefile_CC" >&57133 +echo "$as_me:8242: result: $ac_cv_sys_largefile_CC" >&5 7108 7134 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 7109 7135 if test "$ac_cv_sys_largefile_CC" != no; then … … 7112 7138 7113 7139 - echo "$as_me:7889: checking for _FILE_OFFSET_BITS value needed for large files" >&5 7114 + echo "$as_me:824 4: checking for _FILE_OFFSET_BITS value needed for large files" >&57140 + echo "$as_me:8248: checking for _FILE_OFFSET_BITS value needed for large files" >&5 7115 7141 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 7116 7142 if test "${ac_cv_sys_file_offset_bits+set}" = set; then 7117 7143 echo $ECHO_N "(cached) $ECHO_C" >&6 7118 @@ -7894,7 +82 49,7 @@7144 @@ -7894,7 +8253,7 @@ 7119 7145 while :; do 7120 7146 ac_cv_sys_file_offset_bits=no 7121 7147 cat >conftest.$ac_ext <<_ACEOF 7122 7148 -#line 7897 "configure" 7123 +#line 825 2"configure"7149 +#line 8256 "configure" 7124 7150 #include "confdefs.h" 7125 7151 #include <sys/types.h> 7126 7152 /* Check that off_t can represent 2**63 - 1 correctly. 7127 @@ -7914,16 +82 69,16 @@7153 @@ -7914,16 +8273,16 @@ 7128 7154 } 7129 7155 _ACEOF 7130 7156 rm -f conftest.$ac_objext 7131 7157 -if { (eval echo "$as_me:7917: \"$ac_compile\"") >&5 7132 +if { (eval echo "$as_me:827 2: \"$ac_compile\"") >&57158 +if { (eval echo "$as_me:8276: \"$ac_compile\"") >&5 7133 7159 (eval $ac_compile) 2>&5 7134 7160 ac_status=$? 7135 7161 - echo "$as_me:7920: \$? = $ac_status" >&5 7136 + echo "$as_me:827 5: \$? = $ac_status" >&57162 + echo "$as_me:8279: \$? = $ac_status" >&5 7137 7163 (exit $ac_status); } && 7138 7164 { ac_try='test -s conftest.$ac_objext' 7139 7165 - { (eval echo "$as_me:7923: \"$ac_try\"") >&5 7140 + { (eval echo "$as_me:82 78: \"$ac_try\"") >&57166 + { (eval echo "$as_me:8282: \"$ac_try\"") >&5 7141 7167 (eval $ac_try) 2>&5 7142 7168 ac_status=$? 7143 7169 - echo "$as_me:7926: \$? = $ac_status" >&5 7144 + echo "$as_me:828 1: \$? = $ac_status" >&57170 + echo "$as_me:8285: \$? = $ac_status" >&5 7145 7171 (exit $ac_status); }; }; then 7146 7172 break 7147 7173 else 7148 @@ -7932,7 +82 87,7 @@7174 @@ -7932,7 +8291,7 @@ 7149 7175 fi 7150 7176 rm -f conftest.$ac_objext conftest.$ac_ext 7151 7177 cat >conftest.$ac_ext <<_ACEOF 7152 7178 -#line 7935 "configure" 7153 +#line 829 0"configure"7179 +#line 8294 "configure" 7154 7180 #include "confdefs.h" 7155 7181 #define _FILE_OFFSET_BITS 64 7156 7182 #include <sys/types.h> 7157 @@ -7953,16 +83 08,16 @@7183 @@ -7953,16 +8312,16 @@ 7158 7184 } 7159 7185 _ACEOF 7160 7186 rm -f conftest.$ac_objext 7161 7187 -if { (eval echo "$as_me:7956: \"$ac_compile\"") >&5 7162 +if { (eval echo "$as_me:831 1: \"$ac_compile\"") >&57188 +if { (eval echo "$as_me:8315: \"$ac_compile\"") >&5 7163 7189 (eval $ac_compile) 2>&5 7164 7190 ac_status=$? 7165 7191 - echo "$as_me:7959: \$? = $ac_status" >&5 7166 + echo "$as_me:831 4: \$? = $ac_status" >&57192 + echo "$as_me:8318: \$? = $ac_status" >&5 7167 7193 (exit $ac_status); } && 7168 7194 { ac_try='test -s conftest.$ac_objext' 7169 7195 - { (eval echo "$as_me:7962: \"$ac_try\"") >&5 7170 + { (eval echo "$as_me:83 17: \"$ac_try\"") >&57196 + { (eval echo "$as_me:8321: \"$ac_try\"") >&5 7171 7197 (eval $ac_try) 2>&5 7172 7198 ac_status=$? 7173 7199 - echo "$as_me:7965: \$? = $ac_status" >&5 7174 + echo "$as_me:832 0: \$? = $ac_status" >&57200 + echo "$as_me:8324: \$? = $ac_status" >&5 7175 7201 (exit $ac_status); }; }; then 7176 7202 ac_cv_sys_file_offset_bits=64; break 7177 7203 else 7178 @@ -7973,7 +83 28,7 @@7204 @@ -7973,7 +8332,7 @@ 7179 7205 break 7180 7206 done 7181 7207 fi 7182 7208 -echo "$as_me:7976: result: $ac_cv_sys_file_offset_bits" >&5 7183 +echo "$as_me:833 1: result: $ac_cv_sys_file_offset_bits" >&57209 +echo "$as_me:8335: result: $ac_cv_sys_file_offset_bits" >&5 7184 7210 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 7185 7211 if test "$ac_cv_sys_file_offset_bits" != no; then 7186 7212 7187 @@ -7983,7 +83 38,7 @@7213 @@ -7983,7 +8342,7 @@ 7188 7214 7189 7215 fi 7190 7216 rm -f conftest* 7191 7217 - echo "$as_me:7986: checking for _LARGE_FILES value needed for large files" >&5 7192 + echo "$as_me:834 1: checking for _LARGE_FILES value needed for large files" >&57218 + echo "$as_me:8345: checking for _LARGE_FILES value needed for large files" >&5 7193 7219 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 7194 7220 if test "${ac_cv_sys_large_files+set}" = set; then 7195 7221 echo $ECHO_N "(cached) $ECHO_C" >&6 7196 @@ -7991,7 +83 46,7 @@7222 @@ -7991,7 +8350,7 @@ 7197 7223 while :; do 7198 7224 ac_cv_sys_large_files=no 7199 7225 cat >conftest.$ac_ext <<_ACEOF 7200 7226 -#line 7994 "configure" 7201 +#line 83 49"configure"7227 +#line 8353 "configure" 7202 7228 #include "confdefs.h" 7203 7229 #include <sys/types.h> 7204 7230 /* Check that off_t can represent 2**63 - 1 correctly. 7205 @@ -8011,16 +83 66,16 @@7231 @@ -8011,16 +8370,16 @@ 7206 7232 } 7207 7233 _ACEOF 7208 7234 rm -f conftest.$ac_objext 7209 7235 -if { (eval echo "$as_me:8014: \"$ac_compile\"") >&5 7210 +if { (eval echo "$as_me:83 69: \"$ac_compile\"") >&57236 +if { (eval echo "$as_me:8373: \"$ac_compile\"") >&5 7211 7237 (eval $ac_compile) 2>&5 7212 7238 ac_status=$? 7213 7239 - echo "$as_me:8017: \$? = $ac_status" >&5 7214 + echo "$as_me:837 2: \$? = $ac_status" >&57240 + echo "$as_me:8376: \$? = $ac_status" >&5 7215 7241 (exit $ac_status); } && 7216 7242 { ac_try='test -s conftest.$ac_objext' 7217 7243 - { (eval echo "$as_me:8020: \"$ac_try\"") >&5 7218 + { (eval echo "$as_me:837 5: \"$ac_try\"") >&57244 + { (eval echo "$as_me:8379: \"$ac_try\"") >&5 7219 7245 (eval $ac_try) 2>&5 7220 7246 ac_status=$? 7221 7247 - echo "$as_me:8023: \$? = $ac_status" >&5 7222 + echo "$as_me:83 78: \$? = $ac_status" >&57248 + echo "$as_me:8382: \$? = $ac_status" >&5 7223 7249 (exit $ac_status); }; }; then 7224 7250 break 7225 7251 else 7226 @@ -8029,7 +838 4,7 @@7252 @@ -8029,7 +8388,7 @@ 7227 7253 fi 7228 7254 rm -f conftest.$ac_objext conftest.$ac_ext 7229 7255 cat >conftest.$ac_ext <<_ACEOF 7230 7256 -#line 8032 "configure" 7231 +#line 83 87"configure"7257 +#line 8391 "configure" 7232 7258 #include "confdefs.h" 7233 7259 #define _LARGE_FILES 1 7234 7260 #include <sys/types.h> 7235 @@ -8050,16 +840 5,16 @@7261 @@ -8050,16 +8409,16 @@ 7236 7262 } 7237 7263 _ACEOF 7238 7264 rm -f conftest.$ac_objext 7239 7265 -if { (eval echo "$as_me:8053: \"$ac_compile\"") >&5 7240 +if { (eval echo "$as_me:84 08: \"$ac_compile\"") >&57266 +if { (eval echo "$as_me:8412: \"$ac_compile\"") >&5 7241 7267 (eval $ac_compile) 2>&5 7242 7268 ac_status=$? 7243 7269 - echo "$as_me:8056: \$? = $ac_status" >&5 7244 + echo "$as_me:841 1: \$? = $ac_status" >&57270 + echo "$as_me:8415: \$? = $ac_status" >&5 7245 7271 (exit $ac_status); } && 7246 7272 { ac_try='test -s conftest.$ac_objext' 7247 7273 - { (eval echo "$as_me:8059: \"$ac_try\"") >&5 7248 + { (eval echo "$as_me:841 4: \"$ac_try\"") >&57274 + { (eval echo "$as_me:8418: \"$ac_try\"") >&5 7249 7275 (eval $ac_try) 2>&5 7250 7276 ac_status=$? 7251 7277 - echo "$as_me:8062: \$? = $ac_status" >&5 7252 + echo "$as_me:84 17: \$? = $ac_status" >&57278 + echo "$as_me:8421: \$? = $ac_status" >&5 7253 7279 (exit $ac_status); }; }; then 7254 7280 ac_cv_sys_large_files=1; break 7255 7281 else 7256 @@ -8070,7 +842 5,7 @@7282 @@ -8070,7 +8429,7 @@ 7257 7283 break 7258 7284 done 7259 7285 fi 7260 7286 -echo "$as_me:8073: result: $ac_cv_sys_large_files" >&5 7261 +echo "$as_me:84 28: result: $ac_cv_sys_large_files" >&57287 +echo "$as_me:8432: result: $ac_cv_sys_large_files" >&5 7262 7288 echo "${ECHO_T}$ac_cv_sys_large_files" >&6 7263 7289 if test "$ac_cv_sys_large_files" != no; then 7264 7290 7265 @@ -8083,7 +84 38,7 @@7291 @@ -8083,7 +8442,7 @@ 7266 7292 fi 7267 7293 7268 7294 if test "$enable_largefile" != no ; then 7269 7295 - echo "$as_me:8086: checking for _LARGEFILE_SOURCE value needed for large files" >&5 7270 + echo "$as_me:844 1: checking for _LARGEFILE_SOURCE value needed for large files" >&57296 + echo "$as_me:8445: checking for _LARGEFILE_SOURCE value needed for large files" >&5 7271 7297 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 7272 7298 if test "${ac_cv_sys_largefile_source+set}" = set; then 7273 7299 echo $ECHO_N "(cached) $ECHO_C" >&6 7274 @@ -8091,7 +84 46,7 @@7300 @@ -8091,7 +8450,7 @@ 7275 7301 while :; do 7276 7302 ac_cv_sys_largefile_source=no 7277 7303 cat >conftest.$ac_ext <<_ACEOF 7278 7304 -#line 8094 "configure" 7279 +#line 84 49"configure"7305 +#line 8453 "configure" 7280 7306 #include "confdefs.h" 7281 7307 #include <stdio.h> 7282 7308 int 7283 @@ -8103,16 +84 58,16 @@7309 @@ -8103,16 +8462,16 @@ 7284 7310 } 7285 7311 _ACEOF 7286 7312 rm -f conftest.$ac_objext 7287 7313 -if { (eval echo "$as_me:8106: \"$ac_compile\"") >&5 7288 +if { (eval echo "$as_me:846 1: \"$ac_compile\"") >&57314 +if { (eval echo "$as_me:8465: \"$ac_compile\"") >&5 7289 7315 (eval $ac_compile) 2>&5 7290 7316 ac_status=$? 7291 7317 - echo "$as_me:8109: \$? = $ac_status" >&5 7292 + echo "$as_me:846 4: \$? = $ac_status" >&57318 + echo "$as_me:8468: \$? = $ac_status" >&5 7293 7319 (exit $ac_status); } && 7294 7320 { ac_try='test -s conftest.$ac_objext' 7295 7321 - { (eval echo "$as_me:8112: \"$ac_try\"") >&5 7296 + { (eval echo "$as_me:84 67: \"$ac_try\"") >&57322 + { (eval echo "$as_me:8471: \"$ac_try\"") >&5 7297 7323 (eval $ac_try) 2>&5 7298 7324 ac_status=$? 7299 7325 - echo "$as_me:8115: \$? = $ac_status" >&5 7300 + echo "$as_me:847 0: \$? = $ac_status" >&57326 + echo "$as_me:8474: \$? = $ac_status" >&5 7301 7327 (exit $ac_status); }; }; then 7302 7328 break 7303 7329 else 7304 @@ -8121,7 +84 76,7 @@7330 @@ -8121,7 +8480,7 @@ 7305 7331 fi 7306 7332 rm -f conftest.$ac_objext conftest.$ac_ext 7307 7333 cat >conftest.$ac_ext <<_ACEOF 7308 7334 -#line 8124 "configure" 7309 +#line 84 79"configure"7335 +#line 8483 "configure" 7310 7336 #include "confdefs.h" 7311 7337 #define _LARGEFILE_SOURCE 1 7312 7338 #include <stdio.h> 7313 @@ -8134,16 +84 89,16 @@7339 @@ -8134,16 +8493,16 @@ 7314 7340 } 7315 7341 _ACEOF 7316 7342 rm -f conftest.$ac_objext 7317 7343 -if { (eval echo "$as_me:8137: \"$ac_compile\"") >&5 7318 +if { (eval echo "$as_me:849 2: \"$ac_compile\"") >&57344 +if { (eval echo "$as_me:8496: \"$ac_compile\"") >&5 7319 7345 (eval $ac_compile) 2>&5 7320 7346 ac_status=$? 7321 7347 - echo "$as_me:8140: \$? = $ac_status" >&5 7322 + echo "$as_me:849 5: \$? = $ac_status" >&57348 + echo "$as_me:8499: \$? = $ac_status" >&5 7323 7349 (exit $ac_status); } && 7324 7350 { ac_try='test -s conftest.$ac_objext' 7325 7351 - { (eval echo "$as_me:8143: \"$ac_try\"") >&5 7326 + { (eval echo "$as_me:8 498: \"$ac_try\"") >&57352 + { (eval echo "$as_me:8502: \"$ac_try\"") >&5 7327 7353 (eval $ac_try) 2>&5 7328 7354 ac_status=$? 7329 7355 - echo "$as_me:8146: \$? = $ac_status" >&5 7330 + echo "$as_me:850 1: \$? = $ac_status" >&57356 + echo "$as_me:8505: \$? = $ac_status" >&5 7331 7357 (exit $ac_status); }; }; then 7332 7358 ac_cv_sys_largefile_source=1; break 7333 7359 else 7334 @@ -8154,7 +85 09,7 @@7360 @@ -8154,7 +8513,7 @@ 7335 7361 break 7336 7362 done 7337 7363 fi 7338 7364 -echo "$as_me:8157: result: $ac_cv_sys_largefile_source" >&5 7339 +echo "$as_me:851 2: result: $ac_cv_sys_largefile_source" >&57365 +echo "$as_me:8516: result: $ac_cv_sys_largefile_source" >&5 7340 7366 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 7341 7367 if test "$ac_cv_sys_largefile_source" != no; then 7342 7368 7343 @@ -8168,13 +852 3,13 @@7369 @@ -8168,13 +8527,13 @@ 7344 7370 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug 7345 7371 # in glibc 2.1.3, but that breaks too many other things. 7346 7372 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. 7347 7373 -echo "$as_me:8171: checking for fseeko" >&5 7348 +echo "$as_me:85 26: checking for fseeko" >&57374 +echo "$as_me:8530: checking for fseeko" >&5 7349 7375 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 7350 7376 if test "${ac_cv_func_fseeko+set}" = set; then … … 7353 7379 cat >conftest.$ac_ext <<_ACEOF 7354 7380 -#line 8177 "configure" 7355 +#line 853 2"configure"7381 +#line 8536 "configure" 7356 7382 #include "confdefs.h" 7357 7383 #include <stdio.h> 7358 7384 int 7359 @@ -8186,16 +854 1,16 @@7385 @@ -8186,16 +8545,16 @@ 7360 7386 } 7361 7387 _ACEOF 7362 7388 rm -f conftest.$ac_objext conftest$ac_exeext 7363 7389 -if { (eval echo "$as_me:8189: \"$ac_link\"") >&5 7364 +if { (eval echo "$as_me:854 4: \"$ac_link\"") >&57390 +if { (eval echo "$as_me:8548: \"$ac_link\"") >&5 7365 7391 (eval $ac_link) 2>&5 7366 7392 ac_status=$? 7367 7393 - echo "$as_me:8192: \$? = $ac_status" >&5 7368 + echo "$as_me:85 47: \$? = $ac_status" >&57394 + echo "$as_me:8551: \$? = $ac_status" >&5 7369 7395 (exit $ac_status); } && 7370 7396 { ac_try='test -s conftest$ac_exeext' 7371 7397 - { (eval echo "$as_me:8195: \"$ac_try\"") >&5 7372 + { (eval echo "$as_me:855 0: \"$ac_try\"") >&57398 + { (eval echo "$as_me:8554: \"$ac_try\"") >&5 7373 7399 (eval $ac_try) 2>&5 7374 7400 ac_status=$? 7375 7401 - echo "$as_me:8198: \$? = $ac_status" >&5 7376 + echo "$as_me:855 3: \$? = $ac_status" >&57402 + echo "$as_me:8557: \$? = $ac_status" >&5 7377 7403 (exit $ac_status); }; }; then 7378 7404 ac_cv_func_fseeko=yes 7379 7405 else 7380 @@ -8205,7 +856 0,7 @@7406 @@ -8205,7 +8564,7 @@ 7381 7407 fi 7382 7408 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 7383 7409 fi 7384 7410 -echo "$as_me:8208: result: $ac_cv_func_fseeko" >&5 7385 +echo "$as_me:856 3: result: $ac_cv_func_fseeko" >&57411 +echo "$as_me:8567: result: $ac_cv_func_fseeko" >&5 7386 7412 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 7387 7413 if test $ac_cv_func_fseeko = yes; then 7388 7414 7389 @@ -8226,14 +858 1,14 @@7415 @@ -8226,14 +8585,14 @@ 7390 7416 test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE " 7391 7417 test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits " 7392 7418 7393 7419 - echo "$as_me:8229: checking whether to use struct dirent64" >&5 7394 + echo "$as_me:858 4: checking whether to use struct dirent64" >&57420 + echo "$as_me:8588: checking whether to use struct dirent64" >&5 7395 7421 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 7396 7422 if test "${cf_cv_struct_dirent64+set}" = set; then … … 7400 7426 cat >conftest.$ac_ext <<_ACEOF 7401 7427 -#line 8236 "configure" 7402 +#line 859 1"configure"7428 +#line 8595 "configure" 7403 7429 #include "confdefs.h" 7404 7430 7405 7431 #include <sys/types.h> 7406 @@ -8254,16 +86 09,16 @@7432 @@ -8254,16 +8613,16 @@ 7407 7433 } 7408 7434 _ACEOF 7409 7435 rm -f conftest.$ac_objext 7410 7436 -if { (eval echo "$as_me:8257: \"$ac_compile\"") >&5 7411 +if { (eval echo "$as_me:861 2: \"$ac_compile\"") >&57437 +if { (eval echo "$as_me:8616: \"$ac_compile\"") >&5 7412 7438 (eval $ac_compile) 2>&5 7413 7439 ac_status=$? 7414 7440 - echo "$as_me:8260: \$? = $ac_status" >&5 7415 + echo "$as_me:861 5: \$? = $ac_status" >&57441 + echo "$as_me:8619: \$? = $ac_status" >&5 7416 7442 (exit $ac_status); } && 7417 7443 { ac_try='test -s conftest.$ac_objext' 7418 7444 - { (eval echo "$as_me:8263: \"$ac_try\"") >&5 7419 + { (eval echo "$as_me:86 18: \"$ac_try\"") >&57445 + { (eval echo "$as_me:8622: \"$ac_try\"") >&5 7420 7446 (eval $ac_try) 2>&5 7421 7447 ac_status=$? 7422 7448 - echo "$as_me:8266: \$? = $ac_status" >&5 7423 + echo "$as_me:862 1: \$? = $ac_status" >&57449 + echo "$as_me:8625: \$? = $ac_status" >&5 7424 7450 (exit $ac_status); }; }; then 7425 7451 cf_cv_struct_dirent64=yes 7426 7452 else 7427 @@ -8274,7 +86 29,7 @@7453 @@ -8274,7 +8633,7 @@ 7428 7454 rm -f conftest.$ac_objext conftest.$ac_ext 7429 7455 7430 7456 fi 7431 7457 -echo "$as_me:8277: result: $cf_cv_struct_dirent64" >&5 7432 +echo "$as_me:863 2: result: $cf_cv_struct_dirent64" >&57458 +echo "$as_me:8636: result: $cf_cv_struct_dirent64" >&5 7433 7459 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 7434 7460 test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF 7435 7461 #define HAVE_STRUCT_DIRENT64 1 7436 @@ -8283,7 +86 38,7 @@7462 @@ -8283,7 +8642,7 @@ 7437 7463 fi 7438 7464 7439 7465 ### use option --disable-tparm-varargs to make tparm() conform to X/Open 7440 7466 -echo "$as_me:8286: checking if you want tparm not to use X/Open fixed-parameter list" >&5 7441 +echo "$as_me:864 1: checking if you want tparm not to use X/Open fixed-parameter list" >&57467 +echo "$as_me:8645: checking if you want tparm not to use X/Open fixed-parameter list" >&5 7442 7468 echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6 7443 7469 7444 7470 # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given. 7445 @@ -8293,14 +86 48,14 @@7471 @@ -8293,14 +8652,14 @@ 7446 7472 else 7447 7473 with_tparm_varargs=yes 7448 7474 fi; 7449 7475 -echo "$as_me:8296: result: $with_tparm_varargs" >&5 7450 +echo "$as_me:865 1: result: $with_tparm_varargs" >&57476 +echo "$as_me:8655: result: $with_tparm_varargs" >&5 7451 7477 echo "${ECHO_T}$with_tparm_varargs" >&6 7452 7478 NCURSES_TPARM_VARARGS=0 … … 7456 7482 if test "$with_ticlib" != no ; then 7457 7483 -echo "$as_me:8303: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 7458 +echo "$as_me:86 58: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&57484 +echo "$as_me:8662: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 7459 7485 echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6 7460 7486 7461 7487 # Check whether --enable-tic-depends or --disable-tic-depends was given. 7462 @@ -8310,14 +866 5,14 @@7488 @@ -8310,14 +8669,14 @@ 7463 7489 else 7464 7490 with_tic_depends=yes 7465 7491 fi; 7466 7492 -echo "$as_me:8313: result: $with_tic_depends" >&5 7467 +echo "$as_me:86 68: result: $with_tic_depends" >&57493 +echo "$as_me:8672: result: $with_tic_depends" >&5 7468 7494 echo "${ECHO_T}$with_tic_depends" >&6 7469 7495 else … … 7473 7499 ### use option --with-bool to override bool's type 7474 7500 -echo "$as_me:8320: checking for type of bool" >&5 7475 +echo "$as_me:867 5: checking for type of bool" >&57501 +echo "$as_me:8679: checking for type of bool" >&5 7476 7502 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 7477 7503 7478 7504 # Check whether --with-bool or --without-bool was given. 7479 @@ -8327,10 +868 2,10 @@7505 @@ -8327,10 +8686,10 @@ 7480 7506 else 7481 7507 NCURSES_BOOL=auto 7482 7508 fi; 7483 7509 -echo "$as_me:8330: result: $NCURSES_BOOL" >&5 7484 +echo "$as_me:868 5: result: $NCURSES_BOOL" >&57510 +echo "$as_me:8689: result: $NCURSES_BOOL" >&5 7485 7511 echo "${ECHO_T}$NCURSES_BOOL" >&6 7486 7512 7487 7513 -echo "$as_me:8333: checking for alternate terminal capabilities file" >&5 7488 +echo "$as_me:86 88: checking for alternate terminal capabilities file" >&57514 +echo "$as_me:8692: checking for alternate terminal capabilities file" >&5 7489 7515 echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6 7490 7516 7491 7517 # Check whether --with-caps or --without-caps was given. 7492 @@ -8341,11 +8 696,11 @@7518 @@ -8341,11 +8700,11 @@ 7493 7519 TERMINFO_CAPS=Caps 7494 7520 fi; 7495 7521 test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps 7496 7522 -echo "$as_me:8344: result: $TERMINFO_CAPS" >&5 7497 +echo "$as_me:8 699: result: $TERMINFO_CAPS" >&57523 +echo "$as_me:8703: result: $TERMINFO_CAPS" >&5 7498 7524 echo "${ECHO_T}$TERMINFO_CAPS" >&6 7499 7525 7500 7526 ### use option --with-chtype to override chtype's type 7501 7527 -echo "$as_me:8348: checking for type of chtype" >&5 7502 +echo "$as_me:870 3: checking for type of chtype" >&57528 +echo "$as_me:8707: checking for type of chtype" >&5 7503 7529 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 7504 7530 7505 7531 # Check whether --with-chtype or --without-chtype was given. 7506 @@ -8355,11 +871 0,11 @@7532 @@ -8355,11 +8714,11 @@ 7507 7533 else 7508 7534 NCURSES_CHTYPE=auto 7509 7535 fi; 7510 7536 -echo "$as_me:8358: result: $NCURSES_CHTYPE" >&5 7511 +echo "$as_me:871 3: result: $NCURSES_CHTYPE" >&57537 +echo "$as_me:8717: result: $NCURSES_CHTYPE" >&5 7512 7538 echo "${ECHO_T}$NCURSES_CHTYPE" >&6 7513 7539 7514 7540 ### use option --with-ospeed to override ospeed's type 7515 7541 -echo "$as_me:8362: checking for type of ospeed" >&5 7516 +echo "$as_me:87 17: checking for type of ospeed" >&57542 +echo "$as_me:8721: checking for type of ospeed" >&5 7517 7543 echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6 7518 7544 7519 7545 # Check whether --with-ospeed or --without-ospeed was given. 7520 @@ -8369,11 +872 4,11 @@7546 @@ -8369,11 +8728,11 @@ 7521 7547 else 7522 7548 NCURSES_OSPEED=short 7523 7549 fi; 7524 7550 -echo "$as_me:8372: result: $NCURSES_OSPEED" >&5 7525 +echo "$as_me:87 27: result: $NCURSES_OSPEED" >&57551 +echo "$as_me:8731: result: $NCURSES_OSPEED" >&5 7526 7552 echo "${ECHO_T}$NCURSES_OSPEED" >&6 7527 7553 7528 7554 ### use option --with-mmask-t to override mmask_t's type 7529 7555 -echo "$as_me:8376: checking for type of mmask_t" >&5 7530 +echo "$as_me:873 1: checking for type of mmask_t" >&57556 +echo "$as_me:8735: checking for type of mmask_t" >&5 7531 7557 echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6 7532 7558 7533 7559 # Check whether --with-mmask-t or --without-mmask-t was given. 7534 @@ -8383,11 +87 38,11@@7560 @@ -8383,11 +8742,25 @@ 7535 7561 else 7536 7562 NCURSES_MMASK_T=auto 7537 7563 fi; 7538 7564 -echo "$as_me:8386: result: $NCURSES_MMASK_T" >&5 7539 +echo "$as_me:874 1: result: $NCURSES_MMASK_T" >&57565 +echo "$as_me:8745: result: $NCURSES_MMASK_T" >&5 7540 7566 echo "${ECHO_T}$NCURSES_MMASK_T" >&6 7541 7567 7568 +### use option --with-ccharw-max to override CCHARW_MAX size 7569 +echo "$as_me:8749: checking for size CCHARW_MAX" >&5 7570 +echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6 7571 + 7572 +# Check whether --with-ccharw-max or --without-ccharw-max was given. 7573 +if test "${with_ccharw_max+set}" = set; then 7574 + withval="$with_ccharw_max" 7575 + NCURSES_CCHARW_MAX="$withval" 7576 +else 7577 + NCURSES_CCHARW_MAX=5 7578 +fi; 7579 +echo "$as_me:8759: result: $NCURSES_CCHARW_MAX" >&5 7580 +echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6 7581 + 7542 7582 ### Enable compiling-in rcs id's 7543 7583 -echo "$as_me:8390: checking if RCS identifiers should be compiled-in" >&5 7544 +echo "$as_me:87 45: checking if RCS identifiers should be compiled-in" >&57584 +echo "$as_me:8763: checking if RCS identifiers should be compiled-in" >&5 7545 7585 echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 7546 7586 7547 7587 # Check whether --with-rcs-ids or --without-rcs-ids was given. 7548 @@ -8397,7 +87 52,7 @@7588 @@ -8397,7 +8770,7 @@ 7549 7589 else 7550 7590 with_rcs_ids=no 7551 7591 fi; 7552 7592 -echo "$as_me:8400: result: $with_rcs_ids" >&5 7553 +echo "$as_me:87 55: result: $with_rcs_ids" >&57593 +echo "$as_me:8773: result: $with_rcs_ids" >&5 7554 7594 echo "${ECHO_T}$with_rcs_ids" >&6 7555 7595 test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF 7556 7596 #define USE_RCS_IDS 1 7557 @@ -8405,7 +87 60,7 @@7597 @@ -8405,7 +8778,7 @@ 7558 7598 7559 7599 ############################################################################### 7560 7600 7561 7601 -echo "$as_me:8408: checking format of man-pages" >&5 7562 +echo "$as_me:87 63: checking format of man-pages" >&57602 +echo "$as_me:8781: checking format of man-pages" >&5 7563 7603 echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6 7564 7604 7565 7605 # Check whether --with-manpage-format or --without-manpage-format was given. 7566 @@ -8433,7 +8 788,7 @@7606 @@ -8433,7 +8806,7 @@ 7567 7607 cf_catonly=yes 7568 7608 cf_example=date … … 7573 7613 test -z "$cf_dir" && cf_dir=/usr/man 7574 7614 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 7575 @@ -8494,14 +88 49,14 @@7615 @@ -8494,14 +8867,14 @@ 7576 7616 ;; 7577 7617 esac 7578 7618 7579 7619 -echo "$as_me:8497: result: $MANPAGE_FORMAT" >&5 7580 +echo "$as_me:88 52: result: $MANPAGE_FORMAT" >&57620 +echo "$as_me:8870: result: $MANPAGE_FORMAT" >&5 7581 7621 echo "${ECHO_T}$MANPAGE_FORMAT" >&6 7582 7622 if test -n "$cf_unknown" ; then 7583 7623 - { echo "$as_me:8500: WARNING: Unexpected manpage-format $cf_unknown" >&5 7584 + { echo "$as_me:88 55: WARNING: Unexpected manpage-format $cf_unknown" >&57624 + { echo "$as_me:8873: WARNING: Unexpected manpage-format $cf_unknown" >&5 7585 7625 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;} 7586 7626 fi 7587 7627 7588 7628 -echo "$as_me:8504: checking for manpage renaming" >&5 7589 +echo "$as_me:88 59: checking for manpage renaming" >&57629 +echo "$as_me:8877: checking for manpage renaming" >&5 7590 7630 echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6 7591 7631 7592 7632 # Check whether --with-manpage-renames or --without-manpage-renames was given. 7593 @@ -8529,7 +8 884,7 @@7633 @@ -8529,7 +8902,7 @@ 7594 7634 if test -f $srcdir/man/$MANPAGE_RENAMES ; then 7595 7635 MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES 7596 7636 elif test ! -f $MANPAGE_RENAMES ; then 7597 7637 - { { echo "$as_me:8532: error: not a filename: $MANPAGE_RENAMES" >&5 7598 + { { echo "$as_me:8 887: error: not a filename: $MANPAGE_RENAMES" >&57638 + { { echo "$as_me:8905: error: not a filename: $MANPAGE_RENAMES" >&5 7599 7639 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} 7600 7640 { (exit 1); exit 1; }; } 7601 7641 fi 7602 @@ -8543,10 +8 898,10 @@7642 @@ -8543,10 +8916,10 @@ 7603 7643 fi 7604 7644 fi 7605 7645 7606 7646 -echo "$as_me:8546: result: $MANPAGE_RENAMES" >&5 7607 +echo "$as_me:89 01: result: $MANPAGE_RENAMES" >&57647 +echo "$as_me:8919: result: $MANPAGE_RENAMES" >&5 7608 7648 echo "${ECHO_T}$MANPAGE_RENAMES" >&6 7609 7649 7610 7650 -echo "$as_me:8549: checking if manpage aliases will be installed" >&5 7611 +echo "$as_me:89 04: checking if manpage aliases will be installed" >&57651 +echo "$as_me:8922: checking if manpage aliases will be installed" >&5 7612 7652 echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6 7613 7653 7614 7654 # Check whether --with-manpage-aliases or --without-manpage-aliases was given. 7615 @@ -8557,7 +89 12,7 @@7655 @@ -8557,7 +8930,7 @@ 7616 7656 MANPAGE_ALIASES=yes 7617 7657 fi; 7618 7658 7619 7659 -echo "$as_me:8560: result: $MANPAGE_ALIASES" >&5 7620 +echo "$as_me:89 15: result: $MANPAGE_ALIASES" >&57660 +echo "$as_me:8933: result: $MANPAGE_ALIASES" >&5 7621 7661 echo "${ECHO_T}$MANPAGE_ALIASES" >&6 7622 7662 7623 7663 if test "$LN_S" = "ln -s"; then 7624 @@ -8568,7 +89 23,7 @@7664 @@ -8568,7 +8941,7 @@ 7625 7665 7626 7666 MANPAGE_SYMLINKS=no 7627 7667 if test "$MANPAGE_ALIASES" = yes ; then 7628 7668 -echo "$as_me:8571: checking if manpage symlinks should be used" >&5 7629 +echo "$as_me:89 26: checking if manpage symlinks should be used" >&57669 +echo "$as_me:8944: checking if manpage symlinks should be used" >&5 7630 7670 echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6 7631 7671 7632 7672 # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given. 7633 @@ -8581,17 +89 36,17 @@7673 @@ -8581,17 +8954,17 @@ 7634 7674 7635 7675 if test "$$cf_use_symlinks" = no; then 7636 7676 if test "$MANPAGE_SYMLINKS" = yes ; then 7637 7677 - { echo "$as_me:8584: WARNING: cannot make symlinks" >&5 7638 + { echo "$as_me:89 39: WARNING: cannot make symlinks" >&57678 + { echo "$as_me:8957: WARNING: cannot make symlinks" >&5 7639 7679 echo "$as_me: WARNING: cannot make symlinks" >&2;} 7640 7680 MANPAGE_SYMLINKS=no … … 7643 7683 7644 7684 -echo "$as_me:8590: result: $MANPAGE_SYMLINKS" >&5 7645 +echo "$as_me:89 45: result: $MANPAGE_SYMLINKS" >&57685 +echo "$as_me:8963: result: $MANPAGE_SYMLINKS" >&5 7646 7686 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6 7647 7687 fi 7648 7688 7649 7689 -echo "$as_me:8594: checking for manpage tbl" >&5 7650 +echo "$as_me:89 49: checking for manpage tbl" >&57690 +echo "$as_me:8967: checking for manpage tbl" >&5 7651 7691 echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6 7652 7692 7653 7693 # Check whether --with-manpage-tbl or --without-manpage-tbl was given. 7654 @@ -8602,7 +89 57,7 @@7694 @@ -8602,7 +8975,7 @@ 7655 7695 MANPAGE_TBL=no 7656 7696 fi; 7657 7697 7658 7698 -echo "$as_me:8605: result: $MANPAGE_TBL" >&5 7659 +echo "$as_me:89 60: result: $MANPAGE_TBL" >&57699 +echo "$as_me:8978: result: $MANPAGE_TBL" >&5 7660 7700 echo "${ECHO_T}$MANPAGE_TBL" >&6 7661 7701 7662 7702 if test "$prefix" = "NONE" ; then 7663 @@ -8718,7 +90 73,7 @@7703 @@ -8718,7 +9091,7 @@ 7664 7704 s,@NCURSES_OSPEED@,\$NCURSES_OSPEED,g 7665 7705 CF_EOF … … 7670 7710 cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 7671 7711 cf_name=`echo $cf_name|sed "$program_transform_name"` 7672 @@ -8913,7 +92 68,7 @@7712 @@ -8913,7 +9286,7 @@ 7673 7713 ############################################################################### 7674 7714 7675 7715 ### Note that some functions (such as const) are normally disabled anyway. 7676 7716 -echo "$as_me:8916: checking if you want to build with function extensions" >&5 7677 +echo "$as_me:92 71: checking if you want to build with function extensions" >&57717 +echo "$as_me:9289: checking if you want to build with function extensions" >&5 7678 7718 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 7679 7719 7680 7720 # Check whether --enable-ext-funcs or --disable-ext-funcs was given. 7681 @@ -8923,7 +92 78,7 @@7721 @@ -8923,7 +9296,7 @@ 7682 7722 else 7683 7723 with_ext_funcs=yes 7684 7724 fi; 7685 7725 -echo "$as_me:8926: result: $with_ext_funcs" >&5 7686 +echo "$as_me:92 81: result: $with_ext_funcs" >&57726 +echo "$as_me:9299: result: $with_ext_funcs" >&5 7687 7727 echo "${ECHO_T}$with_ext_funcs" >&6 7688 7728 if test "$with_ext_funcs" = yes ; then 7689 7729 NCURSES_EXT_FUNCS=1 7690 @@ -8955,12 +93 10,38 @@7730 @@ -8955,12 +9328,38 @@ 7691 7731 #define NCURSES_EXT_FUNCS 1 7692 7732 EOF … … 7698 7738 +fi 7699 7739 + 7700 +echo "$as_me:93 19: checking if you want to build with experimental SCREEN extensions" >&57740 +echo "$as_me:9337: checking if you want to build with experimental SCREEN extensions" >&5 7701 7741 +echo $ECHO_N "checking if you want to build with experimental SCREEN extensions... $ECHO_C" >&6 7702 7742 + … … 7708 7748 + with_sp_funcs=no 7709 7749 +fi; 7710 +echo "$as_me:93 29: result: $with_sp_funcs" >&57750 +echo "$as_me:9347: result: $with_sp_funcs" >&5 7711 7751 +echo "${ECHO_T}$with_sp_funcs" >&6 7712 7752 +if test "$with_sp_funcs" = yes ; then … … 7724 7764 ### use option --enable-const to turn on use of const beyond that in XSI. 7725 7765 -echo "$as_me:8963: checking for extended use of const keyword" >&5 7726 +echo "$as_me:93 44: checking for extended use of const keyword" >&57766 +echo "$as_me:9362: checking for extended use of const keyword" >&5 7727 7767 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 7728 7768 7729 7769 # Check whether --enable-const or --disable-const was given. 7730 @@ -8970,7 +93 51,7 @@7770 @@ -8970,7 +9369,7 @@ 7731 7771 else 7732 7772 with_ext_const=no 7733 7773 fi; 7734 7774 -echo "$as_me:8973: result: $with_ext_const" >&5 7735 +echo "$as_me:93 54: result: $with_ext_const" >&57775 +echo "$as_me:9372: result: $with_ext_const" >&5 7736 7776 echo "${ECHO_T}$with_ext_const" >&6 7737 7777 NCURSES_CONST='/*nothing*/' 7738 7778 if test "$with_ext_const" = yes ; then 7739 @@ -8978,7 +93 59,7 @@7779 @@ -8978,7 +9377,7 @@ 7740 7780 fi 7741 7781 7742 7782 ### use option --enable-ext-colors to turn on use of colors beyond 16. 7743 7783 -echo "$as_me:8981: checking if you want to use extended colors" >&5 7744 +echo "$as_me:93 62: checking if you want to use extended colors" >&57784 +echo "$as_me:9380: checking if you want to use extended colors" >&5 7745 7785 echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6 7746 7786 7747 7787 # Check whether --enable-ext-colors or --disable-ext-colors was given. 7748 @@ -8988,12 +93 69,12 @@7788 @@ -8988,12 +9387,12 @@ 7749 7789 else 7750 7790 with_ext_colors=no 7751 7791 fi; 7752 7792 -echo "$as_me:8991: result: $with_ext_colors" >&5 7753 +echo "$as_me:93 72: result: $with_ext_colors" >&57793 +echo "$as_me:9390: result: $with_ext_colors" >&5 7754 7794 echo "${ECHO_T}$with_ext_colors" >&6 7755 7795 NCURSES_EXT_COLORS=0 … … 7757 7797 if test "$with_widec" != yes ; then 7758 7798 - { { echo "$as_me:8996: error: This option applies only to wide-character library" >&5 7759 + { { echo "$as_me:93 77: error: This option applies only to wide-character library" >&57799 + { { echo "$as_me:9395: error: This option applies only to wide-character library" >&5 7760 7800 echo "$as_me: error: This option applies only to wide-character library" >&2;} 7761 7801 { (exit 1); exit 1; }; } 7762 7802 else 7763 @@ -9004,7 +9 385,7 @@7803 @@ -9004,7 +9403,7 @@ 7764 7804 5.*) 7765 7805 cf_cv_rel_version=6.0 7766 7806 cf_cv_abi_version=6 7767 7807 - { echo "$as_me:9007: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 7768 + { echo "$as_me:9 388: WARNING: Overriding ABI version to $cf_cv_abi_version" >&57808 + { echo "$as_me:9406: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 7769 7809 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} 7770 7810 ;; 7771 7811 esac 7772 @@ -9019,7 +94 00,7 @@7812 @@ -9019,7 +9418,7 @@ 7773 7813 fi 7774 7814 7775 7815 ### use option --enable-ext-mouse to modify coding to support 5-button mice 7776 7816 -echo "$as_me:9022: checking if you want to use extended mouse encoding" >&5 7777 +echo "$as_me:94 03: checking if you want to use extended mouse encoding" >&57817 +echo "$as_me:9421: checking if you want to use extended mouse encoding" >&5 7778 7818 echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6 7779 7819 7780 7820 # Check whether --enable-ext-mouse or --disable-ext-mouse was given. 7781 @@ -9029,7 +94 10,7 @@7821 @@ -9029,7 +9428,7 @@ 7782 7822 else 7783 7823 with_ext_mouse=no 7784 7824 fi; 7785 7825 -echo "$as_me:9032: result: $with_ext_mouse" >&5 7786 +echo "$as_me:94 13: result: $with_ext_mouse" >&57826 +echo "$as_me:9431: result: $with_ext_mouse" >&5 7787 7827 echo "${ECHO_T}$with_ext_mouse" >&6 7788 7828 NCURSES_MOUSE_VERSION=1 7789 7829 if test "$with_ext_mouse" = yes ; then 7790 @@ -9040,7 +94 21,7 @@7830 @@ -9040,7 +9439,7 @@ 7791 7831 5.*) 7792 7832 cf_cv_rel_version=6.0 7793 7833 cf_cv_abi_version=6 7794 7834 - { echo "$as_me:9043: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 7795 + { echo "$as_me:94 24: WARNING: Overriding ABI version to $cf_cv_abi_version" >&57835 + { echo "$as_me:9442: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 7796 7836 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} 7797 7837 ;; 7798 7838 esac 7799 @@ -9048,7 +94 29,7 @@7839 @@ -9048,7 +9447,7 @@ 7800 7840 7801 7841 fi 7802 7842 7803 7843 -echo "$as_me:9051: checking if you want \$NCURSES_NO_PADDING code" >&5 7804 +echo "$as_me:94 32: checking if you want \$NCURSES_NO_PADDING code" >&57844 +echo "$as_me:9450: checking if you want \$NCURSES_NO_PADDING code" >&5 7805 7845 echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6 7806 7846 7807 7847 # Check whether --enable-no-padding or --disable-no-padding was given. 7808 @@ -9058,19 +94 39,19 @@7848 @@ -9058,19 +9457,19 @@ 7809 7849 else 7810 7850 with_no_padding=$with_ext_funcs 7811 7851 fi; 7812 7852 -echo "$as_me:9061: result: $with_no_padding" >&5 7813 +echo "$as_me:94 42: result: $with_no_padding" >&57853 +echo "$as_me:9460: result: $with_no_padding" >&5 7814 7854 echo "${ECHO_T}$with_no_padding" >&6 7815 7855 test "$with_no_padding" = yes && cat >>confdefs.h <<\EOF … … 7818 7858 7819 7859 -echo "$as_me:9067: checking for ANSI C header files" >&5 7820 +echo "$as_me:94 48: checking for ANSI C header files" >&57860 +echo "$as_me:9466: checking for ANSI C header files" >&5 7821 7861 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 7822 7862 if test "${ac_cv_header_stdc+set}" = set; then … … 7825 7865 cat >conftest.$ac_ext <<_ACEOF 7826 7866 -#line 9073 "configure" 7827 +#line 94 54"configure"7867 +#line 9472 "configure" 7828 7868 #include "confdefs.h" 7829 7869 #include <stdlib.h> 7830 7870 #include <stdarg.h> 7831 @@ -9078,13 +94 59,13 @@7871 @@ -9078,13 +9477,13 @@ 7832 7872 #include <float.h> 7833 7873 7834 7874 _ACEOF 7835 7875 -if { (eval echo "$as_me:9081: \"$ac_cpp conftest.$ac_ext\"") >&5 7836 +if { (eval echo "$as_me:94 62: \"$ac_cpp conftest.$ac_ext\"") >&57876 +if { (eval echo "$as_me:9480: \"$ac_cpp conftest.$ac_ext\"") >&5 7837 7877 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 7838 7878 ac_status=$? … … 7841 7881 cat conftest.err >&5 7842 7882 - echo "$as_me:9087: \$? = $ac_status" >&5 7843 + echo "$as_me:94 68: \$? = $ac_status" >&57883 + echo "$as_me:9486: \$? = $ac_status" >&5 7844 7884 (exit $ac_status); } >/dev/null; then 7845 7885 if test -s conftest.err; then 7846 7886 ac_cpp_err=$ac_c_preproc_warn_flag 7847 @@ -9106,7 +9 487,7 @@7887 @@ -9106,7 +9505,7 @@ 7848 7888 if test $ac_cv_header_stdc = yes; then 7849 7889 # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 7850 7890 cat >conftest.$ac_ext <<_ACEOF 7851 7891 -#line 9109 "configure" 7852 +#line 9 490"configure"7892 +#line 9508 "configure" 7853 7893 #include "confdefs.h" 7854 7894 #include <string.h> 7855 7895 7856 @@ -9124,7 +95 05,7 @@7896 @@ -9124,7 +9523,7 @@ 7857 7897 if test $ac_cv_header_stdc = yes; then 7858 7898 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 7859 7899 cat >conftest.$ac_ext <<_ACEOF 7860 7900 -#line 9127 "configure" 7861 +#line 95 08"configure"7901 +#line 9526 "configure" 7862 7902 #include "confdefs.h" 7863 7903 #include <stdlib.h> 7864 7904 7865 @@ -9145,7 +95 26,7 @@7905 @@ -9145,7 +9544,7 @@ 7866 7906 : 7867 7907 else 7868 7908 cat >conftest.$ac_ext <<_ACEOF 7869 7909 -#line 9148 "configure" 7870 +#line 95 29"configure"7910 +#line 9547 "configure" 7871 7911 #include "confdefs.h" 7872 7912 #include <ctype.h> 7873 7913 #if ((' ' & 0x0FF) == 0x020) 7874 @@ -9171,15 +95 52,15 @@7914 @@ -9171,15 +9570,15 @@ 7875 7915 } 7876 7916 _ACEOF 7877 7917 rm -f conftest$ac_exeext 7878 7918 -if { (eval echo "$as_me:9174: \"$ac_link\"") >&5 7879 +if { (eval echo "$as_me:95 55: \"$ac_link\"") >&57919 +if { (eval echo "$as_me:9573: \"$ac_link\"") >&5 7880 7920 (eval $ac_link) 2>&5 7881 7921 ac_status=$? 7882 7922 - echo "$as_me:9177: \$? = $ac_status" >&5 7883 + echo "$as_me:95 58: \$? = $ac_status" >&57923 + echo "$as_me:9576: \$? = $ac_status" >&5 7884 7924 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 7885 7925 - { (eval echo "$as_me:9179: \"$ac_try\"") >&5 7886 + { (eval echo "$as_me:95 60: \"$ac_try\"") >&57926 + { (eval echo "$as_me:9578: \"$ac_try\"") >&5 7887 7927 (eval $ac_try) 2>&5 7888 7928 ac_status=$? 7889 7929 - echo "$as_me:9182: \$? = $ac_status" >&5 7890 + echo "$as_me:95 63: \$? = $ac_status" >&57930 + echo "$as_me:9581: \$? = $ac_status" >&5 7891 7931 (exit $ac_status); }; }; then 7892 7932 : 7893 7933 else 7894 @@ -9192,7 +95 73,7 @@7934 @@ -9192,7 +9591,7 @@ 7895 7935 fi 7896 7936 fi 7897 7937 fi 7898 7938 -echo "$as_me:9195: result: $ac_cv_header_stdc" >&5 7899 +echo "$as_me:95 76: result: $ac_cv_header_stdc" >&57939 +echo "$as_me:9594: result: $ac_cv_header_stdc" >&5 7900 7940 echo "${ECHO_T}$ac_cv_header_stdc" >&6 7901 7941 if test $ac_cv_header_stdc = yes; then 7902 7942 7903 @@ -9208,28 +9 589,28 @@7943 @@ -9208,28 +9607,28 @@ 7904 7944 inttypes.h stdint.h unistd.h 7905 7945 do 7906 7946 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 7907 7947 -echo "$as_me:9211: checking for $ac_header" >&5 7908 +echo "$as_me:9 592: checking for $ac_header" >&57948 +echo "$as_me:9610: checking for $ac_header" >&5 7909 7949 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 7910 7950 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 7913 7953 cat >conftest.$ac_ext <<_ACEOF 7914 7954 -#line 9217 "configure" 7915 +#line 9 598"configure"7955 +#line 9616 "configure" 7916 7956 #include "confdefs.h" 7917 7957 $ac_includes_default … … 7920 7960 rm -f conftest.$ac_objext 7921 7961 -if { (eval echo "$as_me:9223: \"$ac_compile\"") >&5 7922 +if { (eval echo "$as_me:96 04: \"$ac_compile\"") >&57962 +if { (eval echo "$as_me:9622: \"$ac_compile\"") >&5 7923 7963 (eval $ac_compile) 2>&5 7924 7964 ac_status=$? 7925 7965 - echo "$as_me:9226: \$? = $ac_status" >&5 7926 + echo "$as_me:96 07: \$? = $ac_status" >&57966 + echo "$as_me:9625: \$? = $ac_status" >&5 7927 7967 (exit $ac_status); } && 7928 7968 { ac_try='test -s conftest.$ac_objext' 7929 7969 - { (eval echo "$as_me:9229: \"$ac_try\"") >&5 7930 + { (eval echo "$as_me:96 10: \"$ac_try\"") >&57970 + { (eval echo "$as_me:9628: \"$ac_try\"") >&5 7931 7971 (eval $ac_try) 2>&5 7932 7972 ac_status=$? 7933 7973 - echo "$as_me:9232: \$? = $ac_status" >&5 7934 + echo "$as_me:96 13: \$? = $ac_status" >&57974 + echo "$as_me:9631: \$? = $ac_status" >&5 7935 7975 (exit $ac_status); }; }; then 7936 7976 eval "$as_ac_Header=yes" 7937 7977 else 7938 @@ -9239,7 +96 20,7 @@7978 @@ -9239,7 +9638,7 @@ 7939 7979 fi 7940 7980 rm -f conftest.$ac_objext conftest.$ac_ext 7941 7981 fi 7942 7982 -echo "$as_me:9242: result: `eval echo '${'$as_ac_Header'}'`" >&5 7943 +echo "$as_me:96 23: result: `eval echo '${'$as_ac_Header'}'`" >&57983 +echo "$as_me:9641: result: `eval echo '${'$as_ac_Header'}'`" >&5 7944 7984 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 7945 7985 if test `eval echo '${'$as_ac_Header'}'` = yes; then 7946 7986 cat >>confdefs.h <<EOF 7947 @@ -9249,13 +96 30,13 @@7987 @@ -9249,13 +9648,13 @@ 7948 7988 fi 7949 7989 done 7950 7990 7951 7991 -echo "$as_me:9252: checking for signed char" >&5 7952 +echo "$as_me:96 33: checking for signed char" >&57992 +echo "$as_me:9651: checking for signed char" >&5 7953 7993 echo $ECHO_N "checking for signed char... $ECHO_C" >&6 7954 7994 if test "${ac_cv_type_signed_char+set}" = set; then … … 7957 7997 cat >conftest.$ac_ext <<_ACEOF 7958 7998 -#line 9258 "configure" 7959 +#line 96 39"configure"7999 +#line 9657 "configure" 7960 8000 #include "confdefs.h" 7961 8001 $ac_includes_default 7962 8002 int 7963 @@ -9270,16 +96 51,16 @@8003 @@ -9270,16 +9669,16 @@ 7964 8004 } 7965 8005 _ACEOF 7966 8006 rm -f conftest.$ac_objext 7967 8007 -if { (eval echo "$as_me:9273: \"$ac_compile\"") >&5 7968 +if { (eval echo "$as_me:96 54: \"$ac_compile\"") >&58008 +if { (eval echo "$as_me:9672: \"$ac_compile\"") >&5 7969 8009 (eval $ac_compile) 2>&5 7970 8010 ac_status=$? 7971 8011 - echo "$as_me:9276: \$? = $ac_status" >&5 7972 + echo "$as_me:96 57: \$? = $ac_status" >&58012 + echo "$as_me:9675: \$? = $ac_status" >&5 7973 8013 (exit $ac_status); } && 7974 8014 { ac_try='test -s conftest.$ac_objext' 7975 8015 - { (eval echo "$as_me:9279: \"$ac_try\"") >&5 7976 + { (eval echo "$as_me:96 60: \"$ac_try\"") >&58016 + { (eval echo "$as_me:9678: \"$ac_try\"") >&5 7977 8017 (eval $ac_try) 2>&5 7978 8018 ac_status=$? 7979 8019 - echo "$as_me:9282: \$? = $ac_status" >&5 7980 + echo "$as_me:96 63: \$? = $ac_status" >&58020 + echo "$as_me:9681: \$? = $ac_status" >&5 7981 8021 (exit $ac_status); }; }; then 7982 8022 ac_cv_type_signed_char=yes 7983 8023 else 7984 @@ -9289,10 +96 70,10 @@8024 @@ -9289,10 +9688,10 @@ 7985 8025 fi 7986 8026 rm -f conftest.$ac_objext conftest.$ac_ext 7987 8027 fi 7988 8028 -echo "$as_me:9292: result: $ac_cv_type_signed_char" >&5 7989 +echo "$as_me:96 73: result: $ac_cv_type_signed_char" >&58029 +echo "$as_me:9691: result: $ac_cv_type_signed_char" >&5 7990 8030 echo "${ECHO_T}$ac_cv_type_signed_char" >&6 7991 8031 7992 8032 -echo "$as_me:9295: checking size of signed char" >&5 7993 +echo "$as_me:96 76: checking size of signed char" >&58033 +echo "$as_me:9694: checking size of signed char" >&5 7994 8034 echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 7995 8035 if test "${ac_cv_sizeof_signed_char+set}" = set; then 7996 8036 echo $ECHO_N "(cached) $ECHO_C" >&6 7997 @@ -9301,7 +9 682,7 @@8037 @@ -9301,7 +9700,7 @@ 7998 8038 if test "$cross_compiling" = yes; then 7999 8039 # Depending upon the size, compute the lo and hi bounds. 8000 8040 cat >conftest.$ac_ext <<_ACEOF 8001 8041 -#line 9304 "configure" 8002 +#line 9 685"configure"8042 +#line 9703 "configure" 8003 8043 #include "confdefs.h" 8004 8044 $ac_includes_default 8005 8045 int 8006 @@ -9313,21 +9 694,21 @@8046 @@ -9313,21 +9712,21 @@ 8007 8047 } 8008 8048 _ACEOF 8009 8049 rm -f conftest.$ac_objext 8010 8050 -if { (eval echo "$as_me:9316: \"$ac_compile\"") >&5 8011 +if { (eval echo "$as_me:9 697: \"$ac_compile\"") >&58051 +if { (eval echo "$as_me:9715: \"$ac_compile\"") >&5 8012 8052 (eval $ac_compile) 2>&5 8013 8053 ac_status=$? 8014 8054 - echo "$as_me:9319: \$? = $ac_status" >&5 8015 + echo "$as_me:97 00: \$? = $ac_status" >&58055 + echo "$as_me:9718: \$? = $ac_status" >&5 8016 8056 (exit $ac_status); } && 8017 8057 { ac_try='test -s conftest.$ac_objext' 8018 8058 - { (eval echo "$as_me:9322: \"$ac_try\"") >&5 8019 + { (eval echo "$as_me:97 03: \"$ac_try\"") >&58059 + { (eval echo "$as_me:9721: \"$ac_try\"") >&5 8020 8060 (eval $ac_try) 2>&5 8021 8061 ac_status=$? 8022 8062 - echo "$as_me:9325: \$? = $ac_status" >&5 8023 + echo "$as_me:97 06: \$? = $ac_status" >&58063 + echo "$as_me:9724: \$? = $ac_status" >&5 8024 8064 (exit $ac_status); }; }; then 8025 8065 ac_lo=0 ac_mid=0 … … 8027 8067 cat >conftest.$ac_ext <<_ACEOF 8028 8068 -#line 9330 "configure" 8029 +#line 97 11"configure"8069 +#line 9729 "configure" 8030 8070 #include "confdefs.h" 8031 8071 $ac_includes_default 8032 8072 int 8033 @@ -9339,16 +97 20,16 @@8073 @@ -9339,16 +9738,16 @@ 8034 8074 } 8035 8075 _ACEOF 8036 8076 rm -f conftest.$ac_objext 8037 8077 -if { (eval echo "$as_me:9342: \"$ac_compile\"") >&5 8038 +if { (eval echo "$as_me:97 23: \"$ac_compile\"") >&58078 +if { (eval echo "$as_me:9741: \"$ac_compile\"") >&5 8039 8079 (eval $ac_compile) 2>&5 8040 8080 ac_status=$? 8041 8081 - echo "$as_me:9345: \$? = $ac_status" >&5 8042 + echo "$as_me:97 26: \$? = $ac_status" >&58082 + echo "$as_me:9744: \$? = $ac_status" >&5 8043 8083 (exit $ac_status); } && 8044 8084 { ac_try='test -s conftest.$ac_objext' 8045 8085 - { (eval echo "$as_me:9348: \"$ac_try\"") >&5 8046 + { (eval echo "$as_me:97 29: \"$ac_try\"") >&58086 + { (eval echo "$as_me:9747: \"$ac_try\"") >&5 8047 8087 (eval $ac_try) 2>&5 8048 8088 ac_status=$? 8049 8089 - echo "$as_me:9351: \$? = $ac_status" >&5 8050 + echo "$as_me:97 32: \$? = $ac_status" >&58090 + echo "$as_me:9750: \$? = $ac_status" >&5 8051 8091 (exit $ac_status); }; }; then 8052 8092 ac_hi=$ac_mid; break 8053 8093 else 8054 @@ -9364,7 +97 45,7 @@8094 @@ -9364,7 +9763,7 @@ 8055 8095 ac_hi=-1 ac_mid=-1 8056 8096 while :; do 8057 8097 cat >conftest.$ac_ext <<_ACEOF 8058 8098 -#line 9367 "configure" 8059 +#line 97 48"configure"8099 +#line 9766 "configure" 8060 8100 #include "confdefs.h" 8061 8101 $ac_includes_default 8062 8102 int 8063 @@ -9376,16 +97 57,16 @@8103 @@ -9376,16 +9775,16 @@ 8064 8104 } 8065 8105 _ACEOF 8066 8106 rm -f conftest.$ac_objext 8067 8107 -if { (eval echo "$as_me:9379: \"$ac_compile\"") >&5 8068 +if { (eval echo "$as_me:97 60: \"$ac_compile\"") >&58108 +if { (eval echo "$as_me:9778: \"$ac_compile\"") >&5 8069 8109 (eval $ac_compile) 2>&5 8070 8110 ac_status=$? 8071 8111 - echo "$as_me:9382: \$? = $ac_status" >&5 8072 + echo "$as_me:97 63: \$? = $ac_status" >&58112 + echo "$as_me:9781: \$? = $ac_status" >&5 8073 8113 (exit $ac_status); } && 8074 8114 { ac_try='test -s conftest.$ac_objext' 8075 8115 - { (eval echo "$as_me:9385: \"$ac_try\"") >&5 8076 + { (eval echo "$as_me:97 66: \"$ac_try\"") >&58116 + { (eval echo "$as_me:9784: \"$ac_try\"") >&5 8077 8117 (eval $ac_try) 2>&5 8078 8118 ac_status=$? 8079 8119 - echo "$as_me:9388: \$? = $ac_status" >&5 8080 + echo "$as_me:97 69: \$? = $ac_status" >&58120 + echo "$as_me:9787: \$? = $ac_status" >&5 8081 8121 (exit $ac_status); }; }; then 8082 8122 ac_lo=$ac_mid; break 8083 8123 else 8084 @@ -9401,7 +9 782,7 @@8124 @@ -9401,7 +9800,7 @@ 8085 8125 while test "x$ac_lo" != "x$ac_hi"; do 8086 8126 ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 8087 8127 cat >conftest.$ac_ext <<_ACEOF 8088 8128 -#line 9404 "configure" 8089 +#line 9 785"configure"8129 +#line 9803 "configure" 8090 8130 #include "confdefs.h" 8091 8131 $ac_includes_default 8092 8132 int 8093 @@ -9413,16 +9 794,16 @@8133 @@ -9413,16 +9812,16 @@ 8094 8134 } 8095 8135 _ACEOF 8096 8136 rm -f conftest.$ac_objext 8097 8137 -if { (eval echo "$as_me:9416: \"$ac_compile\"") >&5 8098 +if { (eval echo "$as_me:9 797: \"$ac_compile\"") >&58138 +if { (eval echo "$as_me:9815: \"$ac_compile\"") >&5 8099 8139 (eval $ac_compile) 2>&5 8100 8140 ac_status=$? 8101 8141 - echo "$as_me:9419: \$? = $ac_status" >&5 8102 + echo "$as_me:98 00: \$? = $ac_status" >&58142 + echo "$as_me:9818: \$? = $ac_status" >&5 8103 8143 (exit $ac_status); } && 8104 8144 { ac_try='test -s conftest.$ac_objext' 8105 8145 - { (eval echo "$as_me:9422: \"$ac_try\"") >&5 8106 + { (eval echo "$as_me:98 03: \"$ac_try\"") >&58146 + { (eval echo "$as_me:9821: \"$ac_try\"") >&5 8107 8147 (eval $ac_try) 2>&5 8108 8148 ac_status=$? 8109 8149 - echo "$as_me:9425: \$? = $ac_status" >&5 8110 + echo "$as_me:98 06: \$? = $ac_status" >&58150 + echo "$as_me:9824: \$? = $ac_status" >&5 8111 8151 (exit $ac_status); }; }; then 8112 8152 ac_hi=$ac_mid 8113 8153 else 8114 @@ -9435,12 +98 16,12 @@8154 @@ -9435,12 +9834,12 @@ 8115 8155 ac_cv_sizeof_signed_char=$ac_lo 8116 8156 else 8117 8157 if test "$cross_compiling" = yes; then 8118 8158 - { { echo "$as_me:9438: error: cannot run test program while cross compiling" >&5 8119 + { { echo "$as_me:98 19: error: cannot run test program while cross compiling" >&58159 + { { echo "$as_me:9837: error: cannot run test program while cross compiling" >&5 8120 8160 echo "$as_me: error: cannot run test program while cross compiling" >&2;} 8121 8161 { (exit 1); exit 1; }; } … … 8123 8163 cat >conftest.$ac_ext <<_ACEOF 8124 8164 -#line 9443 "configure" 8125 +#line 98 24"configure"8165 +#line 9842 "configure" 8126 8166 #include "confdefs.h" 8127 8167 $ac_includes_default 8128 8168 int 8129 @@ -9456,15 +98 37,15 @@8169 @@ -9456,15 +9855,15 @@ 8130 8170 } 8131 8171 _ACEOF 8132 8172 rm -f conftest$ac_exeext 8133 8173 -if { (eval echo "$as_me:9459: \"$ac_link\"") >&5 8134 +if { (eval echo "$as_me:98 40: \"$ac_link\"") >&58174 +if { (eval echo "$as_me:9858: \"$ac_link\"") >&5 8135 8175 (eval $ac_link) 2>&5 8136 8176 ac_status=$? 8137 8177 - echo "$as_me:9462: \$? = $ac_status" >&5 8138 + echo "$as_me:98 43: \$? = $ac_status" >&58178 + echo "$as_me:9861: \$? = $ac_status" >&5 8139 8179 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 8140 8180 - { (eval echo "$as_me:9464: \"$ac_try\"") >&5 8141 + { (eval echo "$as_me:98 45: \"$ac_try\"") >&58181 + { (eval echo "$as_me:9863: \"$ac_try\"") >&5 8142 8182 (eval $ac_try) 2>&5 8143 8183 ac_status=$? 8144 8184 - echo "$as_me:9467: \$? = $ac_status" >&5 8145 + echo "$as_me:98 48: \$? = $ac_status" >&58185 + echo "$as_me:9866: \$? = $ac_status" >&5 8146 8186 (exit $ac_status); }; }; then 8147 8187 ac_cv_sizeof_signed_char=`cat conftest.val` 8148 8188 else 8149 @@ -9480,7 +98 61,7 @@8189 @@ -9480,7 +9879,7 @@ 8150 8190 ac_cv_sizeof_signed_char=0 8151 8191 fi 8152 8192 fi 8153 8193 -echo "$as_me:9483: result: $ac_cv_sizeof_signed_char" >&5 8154 +echo "$as_me:98 64: result: $ac_cv_sizeof_signed_char" >&58194 +echo "$as_me:9882: result: $ac_cv_sizeof_signed_char" >&5 8155 8195 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 8156 8196 cat >>confdefs.h <<EOF 8157 8197 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char 8158 @@ -9491,7 +98 72,7 @@8198 @@ -9491,7 +9890,7 @@ 8159 8199 else 8160 8200 NCURSES_SBOOL="char" 8161 8201 fi 8162 8202 -echo "$as_me:9494: checking if you want to use signed Boolean array in term.h" >&5 8163 +echo "$as_me:98 75: checking if you want to use signed Boolean array in term.h" >&58203 +echo "$as_me:9893: checking if you want to use signed Boolean array in term.h" >&5 8164 8204 echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6 8165 8205 8166 8206 # Check whether --enable-signed-char or --disable-signed-char was given. 8167 @@ -9501,12 +9 882,12 @@8207 @@ -9501,12 +9900,12 @@ 8168 8208 else 8169 8209 with_signed_char=no 8170 8210 fi; 8171 8211 -echo "$as_me:9504: result: $with_signed_char" >&5 8172 +echo "$as_me:9 885: result: $with_signed_char" >&58212 +echo "$as_me:9903: result: $with_signed_char" >&5 8173 8213 echo "${ECHO_T}$with_signed_char" >&6 8174 8214 test "$with_signed_char" != yes && NCURSES_SBOOL="char" … … 8176 8216 ### use option --enable-sigwinch to turn on use of SIGWINCH logic 8177 8217 -echo "$as_me:9509: checking if you want SIGWINCH handler" >&5 8178 +echo "$as_me:9 890: checking if you want SIGWINCH handler" >&58218 +echo "$as_me:9908: checking if you want SIGWINCH handler" >&5 8179 8219 echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6 8180 8220 8181 8221 # Check whether --enable-sigwinch or --disable-sigwinch was given. 8182 @@ -9516,14 +9 897,14 @@8222 @@ -9516,14 +9915,14 @@ 8183 8223 else 8184 8224 with_sigwinch=$with_ext_funcs 8185 8225 fi; 8186 8226 -echo "$as_me:9519: result: $with_sigwinch" >&5 8187 +echo "$as_me:99 00: result: $with_sigwinch" >&58227 +echo "$as_me:9918: result: $with_sigwinch" >&5 8188 8228 echo "${ECHO_T}$with_sigwinch" >&6 8189 8229 test "$with_sigwinch" = yes && cat >>confdefs.h <<\EOF … … 8193 8233 ### use option --enable-tcap-names to allow user to define new capabilities 8194 8234 -echo "$as_me:9526: checking if you want user-definable terminal capabilities like termcap" >&5 8195 +echo "$as_me:99 07: checking if you want user-definable terminal capabilities like termcap" >&58235 +echo "$as_me:9925: checking if you want user-definable terminal capabilities like termcap" >&5 8196 8236 echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6 8197 8237 8198 8238 # Check whether --enable-tcap-names or --disable-tcap-names was given. 8199 @@ -9533,7 +99 14,7 @@8239 @@ -9533,7 +9932,7 @@ 8200 8240 else 8201 8241 with_tcap_names=$with_ext_funcs 8202 8242 fi; 8203 8243 -echo "$as_me:9536: result: $with_tcap_names" >&5 8204 +echo "$as_me:99 17: result: $with_tcap_names" >&58244 +echo "$as_me:9935: result: $with_tcap_names" >&5 8205 8245 echo "${ECHO_T}$with_tcap_names" >&6 8206 8246 NCURSES_XNAMES=0 8207 8247 test "$with_tcap_names" = yes && NCURSES_XNAMES=1 8208 @@ -9541,7 +99 22,7 @@8248 @@ -9541,7 +9940,7 @@ 8209 8249 ############################################################################### 8210 8250 # These options are relatively safe to experiment with. 8211 8251 8212 8252 -echo "$as_me:9544: checking if you want all development code" >&5 8213 +echo "$as_me:99 25: checking if you want all development code" >&58253 +echo "$as_me:9943: checking if you want all development code" >&5 8214 8254 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 8215 8255 8216 8256 # Check whether --with-develop or --without-develop was given. 8217 @@ -9551,11 +99 32,11 @@8257 @@ -9551,11 +9950,11 @@ 8218 8258 else 8219 8259 with_develop=no 8220 8260 fi; 8221 8261 -echo "$as_me:9554: result: $with_develop" >&5 8222 +echo "$as_me:99 35: result: $with_develop" >&58262 +echo "$as_me:9953: result: $with_develop" >&5 8223 8263 echo "${ECHO_T}$with_develop" >&6 8224 8264 8225 8265 ### use option --enable-hard-tabs to turn on use of hard-tabs optimize 8226 8266 -echo "$as_me:9558: checking if you want hard-tabs code" >&5 8227 +echo "$as_me:99 39: checking if you want hard-tabs code" >&58267 +echo "$as_me:9957: checking if you want hard-tabs code" >&5 8228 8268 echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6 8229 8269 8230 8270 # Check whether --enable-hard-tabs or --disable-hard-tabs was given. 8231 @@ -9565,14 +99 46,14 @@8271 @@ -9565,14 +9964,14 @@ 8232 8272 else 8233 8273 enable_hard_tabs=$with_develop 8234 8274 fi; 8235 8275 -echo "$as_me:9568: result: $enable_hard_tabs" >&5 8236 +echo "$as_me:99 49: result: $enable_hard_tabs" >&58276 +echo "$as_me:9967: result: $enable_hard_tabs" >&5 8237 8277 echo "${ECHO_T}$enable_hard_tabs" >&6 8238 8278 test "$enable_hard_tabs" = yes && cat >>confdefs.h <<\EOF … … 8242 8282 ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize 8243 8283 -echo "$as_me:9575: checking if you want limited support for xmc" >&5 8244 +echo "$as_me:99 56: checking if you want limited support for xmc" >&58284 +echo "$as_me:9974: checking if you want limited support for xmc" >&5 8245 8285 echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6 8246 8286 8247 8287 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. 8248 @@ -9582,7 +99 63,7 @@8288 @@ -9582,7 +9981,7 @@ 8249 8289 else 8250 8290 enable_xmc_glitch=$with_develop 8251 8291 fi; 8252 8292 -echo "$as_me:9585: result: $enable_xmc_glitch" >&5 8253 +echo "$as_me:99 66: result: $enable_xmc_glitch" >&58293 +echo "$as_me:9984: result: $enable_xmc_glitch" >&5 8254 8294 echo "${ECHO_T}$enable_xmc_glitch" >&6 8255 8295 test "$enable_xmc_glitch" = yes && cat >>confdefs.h <<\EOF 8256 8296 #define USE_XMC_SUPPORT 1 8257 @@ -9591,7 +99 72,7 @@8297 @@ -9591,7 +9990,7 @@ 8258 8298 ############################################################################### 8259 8299 # These are just experimental, probably should not be in a package: 8260 8300 8261 8301 -echo "$as_me:9594: checking if you do not want to assume colors are white-on-black" >&5 8262 +echo "$as_me:99 75: checking if you do not want to assume colors are white-on-black" >&58302 +echo "$as_me:9993: checking if you do not want to assume colors are white-on-black" >&5 8263 8303 echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6 8264 8304 8265 8305 # Check whether --enable-assumed-color or --disable-assumed-color was given. 8266 @@ -9601,14 + 9982,14 @@8306 @@ -9601,14 +10000,14 @@ 8267 8307 else 8268 8308 with_assumed_color=yes 8269 8309 fi; 8270 8310 -echo "$as_me:9604: result: $with_assumed_color" >&5 8271 +echo "$as_me: 9985: result: $with_assumed_color" >&58311 +echo "$as_me:10003: result: $with_assumed_color" >&5 8272 8312 echo "${ECHO_T}$with_assumed_color" >&6 8273 8313 test "$with_assumed_color" = yes && cat >>confdefs.h <<\EOF … … 8277 8317 ### use option --enable-hashmap to turn on use of hashmap scrolling logic 8278 8318 -echo "$as_me:9611: checking if you want hashmap scrolling-optimization code" >&5 8279 +echo "$as_me: 9992: checking if you want hashmap scrolling-optimization code" >&58319 +echo "$as_me:10010: checking if you want hashmap scrolling-optimization code" >&5 8280 8320 echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6 8281 8321 8282 8322 # Check whether --enable-hashmap or --disable-hashmap was given. 8283 @@ -9618,14 + 9999,14 @@8323 @@ -9618,14 +10017,14 @@ 8284 8324 else 8285 8325 with_hashmap=yes 8286 8326 fi; 8287 8327 -echo "$as_me:9621: result: $with_hashmap" >&5 8288 +echo "$as_me:100 02: result: $with_hashmap" >&58328 +echo "$as_me:10020: result: $with_hashmap" >&5 8289 8329 echo "${ECHO_T}$with_hashmap" >&6 8290 8330 test "$with_hashmap" = yes && cat >>confdefs.h <<\EOF … … 8294 8334 ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment 8295 8335 -echo "$as_me:9628: checking if you want colorfgbg code" >&5 8296 +echo "$as_me:100 09: checking if you want colorfgbg code" >&58336 +echo "$as_me:10027: checking if you want colorfgbg code" >&5 8297 8337 echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6 8298 8338 8299 8339 # Check whether --enable-colorfgbg or --disable-colorfgbg was given. 8300 @@ -9635,7 +100 16,7 @@8340 @@ -9635,7 +10034,7 @@ 8301 8341 else 8302 8342 with_colorfgbg=no 8303 8343 fi; 8304 8344 -echo "$as_me:9638: result: $with_colorfgbg" >&5 8305 +echo "$as_me:100 19: result: $with_colorfgbg" >&58345 +echo "$as_me:10037: result: $with_colorfgbg" >&5 8306 8346 echo "${ECHO_T}$with_colorfgbg" >&6 8307 8347 test "$with_colorfgbg" = yes && cat >>confdefs.h <<\EOF 8308 8348 #define USE_COLORFGBG 1 8309 @@ -9644,7 +100 25,7 @@8349 @@ -9644,7 +10043,7 @@ 8310 8350 # This is still experimental (20080329), but should ultimately be moved to 8311 8351 # the script-block --with-normal, etc. 8312 8352 8313 8353 -echo "$as_me:9647: checking if you want to link with the pthread library" >&5 8314 +echo "$as_me:100 28: checking if you want to link with the pthread library" >&58354 +echo "$as_me:10046: checking if you want to link with the pthread library" >&5 8315 8355 echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 8316 8356 8317 8357 # Check whether --with-pthread or --without-pthread was given. 8318 @@ -9654,27 +100 35,27 @@8358 @@ -9654,27 +10053,27 @@ 8319 8359 else 8320 8360 with_pthread=no 8321 8361 fi; 8322 8362 -echo "$as_me:9657: result: $with_pthread" >&5 8323 +echo "$as_me:100 38: result: $with_pthread" >&58363 +echo "$as_me:10056: result: $with_pthread" >&5 8324 8364 echo "${ECHO_T}$with_pthread" >&6 8325 8365 8326 8366 if test "$with_pthread" != no ; then 8327 8367 - echo "$as_me:9661: checking for pthread.h" >&5 8328 + echo "$as_me:100 42: checking for pthread.h" >&58368 + echo "$as_me:10060: checking for pthread.h" >&5 8329 8369 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 8330 8370 if test "${ac_cv_header_pthread_h+set}" = set; then … … 8333 8373 cat >conftest.$ac_ext <<_ACEOF 8334 8374 -#line 9667 "configure" 8335 +#line 100 48"configure"8375 +#line 10066 "configure" 8336 8376 #include "confdefs.h" 8337 8377 #include <pthread.h> 8338 8378 _ACEOF 8339 8379 -if { (eval echo "$as_me:9671: \"$ac_cpp conftest.$ac_ext\"") >&5 8340 +if { (eval echo "$as_me:100 52: \"$ac_cpp conftest.$ac_ext\"") >&58380 +if { (eval echo "$as_me:10070: \"$ac_cpp conftest.$ac_ext\"") >&5 8341 8381 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 8342 8382 ac_status=$? … … 8345 8385 cat conftest.err >&5 8346 8386 - echo "$as_me:9677: \$? = $ac_status" >&5 8347 + echo "$as_me:100 58: \$? = $ac_status" >&58387 + echo "$as_me:10076: \$? = $ac_status" >&5 8348 8388 (exit $ac_status); } >/dev/null; then 8349 8389 if test -s conftest.err; then 8350 8390 ac_cpp_err=$ac_c_preproc_warn_flag 8351 @@ -9693,7 +100 74,7 @@8391 @@ -9693,7 +10092,7 @@ 8352 8392 fi 8353 8393 rm -f conftest.err conftest.$ac_ext 8354 8394 fi 8355 8395 -echo "$as_me:9696: result: $ac_cv_header_pthread_h" >&5 8356 +echo "$as_me:100 77: result: $ac_cv_header_pthread_h" >&58396 +echo "$as_me:10095: result: $ac_cv_header_pthread_h" >&5 8357 8397 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 8358 8398 if test $ac_cv_header_pthread_h = yes; then 8359 8399 8360 @@ -9701,12 +10 082,12 @@8400 @@ -9701,12 +10100,12 @@ 8361 8401 #define HAVE_PTHREADS_H 1 8362 8402 EOF 8363 8403 8364 8404 - echo "$as_me:9704: checking if we can link with the pthread library" >&5 8365 + echo "$as_me:10 085: checking if we can link with the pthread library" >&58405 + echo "$as_me:10103: checking if we can link with the pthread library" >&5 8366 8406 echo $ECHO_N "checking if we can link with the pthread library... $ECHO_C" >&6 8367 8407 cf_save_LIBS="$LIBS" … … 8369 8409 cat >conftest.$ac_ext <<_ACEOF 8370 8410 -#line 9709 "configure" 8371 +#line 10 090"configure"8411 +#line 10108 "configure" 8372 8412 #include "confdefs.h" 8373 8413 8374 8414 #include <pthread.h> 8375 @@ -9722,16 +101 03,16 @@8415 @@ -9722,16 +10121,16 @@ 8376 8416 } 8377 8417 _ACEOF 8378 8418 rm -f conftest.$ac_objext conftest$ac_exeext 8379 8419 -if { (eval echo "$as_me:9725: \"$ac_link\"") >&5 8380 +if { (eval echo "$as_me:101 06: \"$ac_link\"") >&58420 +if { (eval echo "$as_me:10124: \"$ac_link\"") >&5 8381 8421 (eval $ac_link) 2>&5 8382 8422 ac_status=$? 8383 8423 - echo "$as_me:9728: \$? = $ac_status" >&5 8384 + echo "$as_me:101 09: \$? = $ac_status" >&58424 + echo "$as_me:10127: \$? = $ac_status" >&5 8385 8425 (exit $ac_status); } && 8386 8426 { ac_try='test -s conftest$ac_exeext' 8387 8427 - { (eval echo "$as_me:9731: \"$ac_try\"") >&5 8388 + { (eval echo "$as_me:101 12: \"$ac_try\"") >&58428 + { (eval echo "$as_me:10130: \"$ac_try\"") >&5 8389 8429 (eval $ac_try) 2>&5 8390 8430 ac_status=$? 8391 8431 - echo "$as_me:9734: \$? = $ac_status" >&5 8392 + echo "$as_me:101 15: \$? = $ac_status" >&58432 + echo "$as_me:10133: \$? = $ac_status" >&5 8393 8433 (exit $ac_status); }; }; then 8394 8434 with_pthread=yes 8395 8435 else 8396 @@ -9741,7 +101 22,7 @@8436 @@ -9741,7 +10140,7 @@ 8397 8437 fi 8398 8438 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 8399 8439 LIBS="$cf_save_LIBS" 8400 8440 - echo "$as_me:9744: result: $with_pthread" >&5 8401 + echo "$as_me:101 25: result: $with_pthread" >&58441 + echo "$as_me:10143: result: $with_pthread" >&5 8402 8442 echo "${ECHO_T}$with_pthread" >&6 8403 8443 8404 8444 if test "$with_pthread" = yes ; then 8405 @@ -9751,7 +101 32,7 @@8445 @@ -9751,7 +10150,7 @@ 8406 8446 EOF 8407 8447 8408 8448 else 8409 8449 - { { echo "$as_me:9754: error: Cannot link with pthread library" >&5 8410 + { { echo "$as_me:101 35: error: Cannot link with pthread library" >&58450 + { { echo "$as_me:10153: error: Cannot link with pthread library" >&5 8411 8451 echo "$as_me: error: Cannot link with pthread library" >&2;} 8412 8452 { (exit 1); exit 1; }; } 8413 8453 fi 8414 @@ -9760,7 +101 41,7 @@8454 @@ -9760,7 +10159,7 @@ 8415 8455 8416 8456 fi 8417 8457 8418 8458 -echo "$as_me:9763: checking if you want to use weak-symbols for pthreads" >&5 8419 +echo "$as_me:101 44: checking if you want to use weak-symbols for pthreads" >&58459 +echo "$as_me:10162: checking if you want to use weak-symbols for pthreads" >&5 8420 8460 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 8421 8461 8422 8462 # Check whether --enable-weak-symbols or --disable-weak-symbols was given. 8423 @@ -9770,18 +101 51,18 @@8463 @@ -9770,18 +10169,18 @@ 8424 8464 else 8425 8465 use_weak_symbols=no 8426 8466 fi; 8427 8467 -echo "$as_me:9773: result: $use_weak_symbols" >&5 8428 +echo "$as_me:101 54: result: $use_weak_symbols" >&58468 +echo "$as_me:10172: result: $use_weak_symbols" >&5 8429 8469 echo "${ECHO_T}$use_weak_symbols" >&6 8430 8470 if test "$use_weak_symbols" = yes ; then 8431 8471 8432 8472 -echo "$as_me:9777: checking if $CC supports weak symbols" >&5 8433 +echo "$as_me:101 58: checking if $CC supports weak symbols" >&58473 +echo "$as_me:10176: checking if $CC supports weak symbols" >&5 8434 8474 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 8435 8475 if test "${cf_cv_weak_symbols+set}" = set; then … … 8439 8479 cat >conftest.$ac_ext <<_ACEOF 8440 8480 -#line 9784 "configure" 8441 +#line 101 65"configure"8481 +#line 10183 "configure" 8442 8482 #include "confdefs.h" 8443 8483 8444 8484 #include <stdio.h> 8445 @@ -9807,16 +10 188,16 @@8485 @@ -9807,16 +10206,16 @@ 8446 8486 } 8447 8487 _ACEOF 8448 8488 rm -f conftest.$ac_objext 8449 8489 -if { (eval echo "$as_me:9810: \"$ac_compile\"") >&5 8450 +if { (eval echo "$as_me:10 191: \"$ac_compile\"") >&58490 +if { (eval echo "$as_me:10209: \"$ac_compile\"") >&5 8451 8491 (eval $ac_compile) 2>&5 8452 8492 ac_status=$? 8453 8493 - echo "$as_me:9813: \$? = $ac_status" >&5 8454 + echo "$as_me:10 194: \$? = $ac_status" >&58494 + echo "$as_me:10212: \$? = $ac_status" >&5 8455 8495 (exit $ac_status); } && 8456 8496 { ac_try='test -s conftest.$ac_objext' 8457 8497 - { (eval echo "$as_me:9816: \"$ac_try\"") >&5 8458 + { (eval echo "$as_me:10 197: \"$ac_try\"") >&58498 + { (eval echo "$as_me:10215: \"$ac_try\"") >&5 8459 8499 (eval $ac_try) 2>&5 8460 8500 ac_status=$? 8461 8501 - echo "$as_me:9819: \$? = $ac_status" >&5 8462 + echo "$as_me:102 00: \$? = $ac_status" >&58502 + echo "$as_me:10218: \$? = $ac_status" >&5 8463 8503 (exit $ac_status); }; }; then 8464 8504 cf_cv_weak_symbols=yes 8465 8505 else 8466 @@ -9827,7 +102 08,7 @@8506 @@ -9827,7 +10226,7 @@ 8467 8507 rm -f conftest.$ac_objext conftest.$ac_ext 8468 8508 8469 8509 fi 8470 8510 -echo "$as_me:9830: result: $cf_cv_weak_symbols" >&5 8471 +echo "$as_me:102 11: result: $cf_cv_weak_symbols" >&58511 +echo "$as_me:10229: result: $cf_cv_weak_symbols" >&5 8472 8512 echo "${ECHO_T}$cf_cv_weak_symbols" >&6 8473 8513 8474 8514 else 8475 @@ -9857,7 +102 38,7 @@8515 @@ -9857,7 +10256,7 @@ 8476 8516 # opaque outside of that, so there is no --enable-opaque option. We can use 8477 8517 # this option without --with-pthreads, but this will be always set for 8478 8518 # pthreads. 8479 8519 -echo "$as_me:9860: checking if you want experimental reentrant code" >&5 8480 +echo "$as_me:102 41: checking if you want experimental reentrant code" >&58520 +echo "$as_me:10259: checking if you want experimental reentrant code" >&5 8481 8521 echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6 8482 8522 8483 8523 # Check whether --enable-reentrant or --disable-reentrant was given. 8484 @@ -9867,21 +102 48,21 @@8524 @@ -9867,21 +10266,21 @@ 8485 8525 else 8486 8526 with_reentrant=no 8487 8527 fi; 8488 8528 -echo "$as_me:9870: result: $with_reentrant" >&5 8489 +echo "$as_me:102 51: result: $with_reentrant" >&58529 +echo "$as_me:10269: result: $with_reentrant" >&5 8490 8530 echo "${ECHO_T}$with_reentrant" >&6 8491 8531 if test "$with_reentrant" = yes ; then … … 8509 8549 #define USE_REENTRANT 1 8510 8550 EOF 8511 @@ -9891,7 +102 72,7 @@8551 @@ -9891,7 +10290,7 @@ 8512 8552 5.*) 8513 8553 cf_cv_rel_version=6.0 8514 8554 cf_cv_abi_version=6 8515 8555 - { echo "$as_me:9894: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 8516 + { echo "$as_me:102 75: WARNING: Overriding ABI version to $cf_cv_abi_version" >&58556 + { echo "$as_me:10293: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 8517 8557 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} 8518 8558 ;; 8519 8559 esac 8520 @@ -9904,7 +10 285,29 @@8560 @@ -9904,7 +10303,29 @@ 8521 8561 NCURSES_SIZE_T=short 8522 8562 fi … … 8525 8565 +### Allow using a different wrap-prefix 8526 8566 +if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then 8527 + echo "$as_me:10 290: checking for prefix used to wrap public variables" >&58567 + echo "$as_me:10308: checking for prefix used to wrap public variables" >&5 8528 8568 +echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 8529 8569 + … … 8535 8575 + NCURSES_WRAP_PREFIX=_nc_ 8536 8576 +fi; 8537 + echo "$as_me:103 00: result: $NCURSES_WRAP_PREFIX" >&58577 + echo "$as_me:10318: result: $NCURSES_WRAP_PREFIX" >&5 8538 8578 +echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 8539 8579 +else … … 8545 8585 +EOF 8546 8586 + 8547 +echo "$as_me:103 10: checking if you want experimental safe-sprintf code" >&58587 +echo "$as_me:10328: checking if you want experimental safe-sprintf code" >&5 8548 8588 echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6 8549 8589 8550 8590 # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given. 8551 @@ -9914,7 +103 17,7 @@8591 @@ -9914,7 +10335,7 @@ 8552 8592 else 8553 8593 with_safe_sprintf=no 8554 8594 fi; 8555 8595 -echo "$as_me:9917: result: $with_safe_sprintf" >&5 8556 +echo "$as_me:103 20: result: $with_safe_sprintf" >&58596 +echo "$as_me:10338: result: $with_safe_sprintf" >&5 8557 8597 echo "${ECHO_T}$with_safe_sprintf" >&6 8558 8598 test "$with_safe_sprintf" = yes && cat >>confdefs.h <<\EOF 8559 8599 #define USE_SAFE_SPRINTF 1 8560 @@ -9923,7 +103 26,7 @@8600 @@ -9923,7 +10344,7 @@ 8561 8601 ### use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic 8562 8602 # when hashmap is used scroll hints are useless 8563 8603 if test "$with_hashmap" = no ; then 8564 8604 -echo "$as_me:9926: checking if you want to experiment without scrolling-hints code" >&5 8565 +echo "$as_me:103 29: checking if you want to experiment without scrolling-hints code" >&58605 +echo "$as_me:10347: checking if you want to experiment without scrolling-hints code" >&5 8566 8606 echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6 8567 8607 8568 8608 # Check whether --enable-scroll-hints or --disable-scroll-hints was given. 8569 @@ -9933,7 +103 36,7 @@8609 @@ -9933,7 +10354,7 @@ 8570 8610 else 8571 8611 with_scroll_hints=yes 8572 8612 fi; 8573 8613 -echo "$as_me:9936: result: $with_scroll_hints" >&5 8574 +echo "$as_me:103 39: result: $with_scroll_hints" >&58614 +echo "$as_me:10357: result: $with_scroll_hints" >&5 8575 8615 echo "${ECHO_T}$with_scroll_hints" >&6 8576 8616 test "$with_scroll_hints" = yes && cat >>confdefs.h <<\EOF 8577 8617 #define USE_SCROLL_HINTS 1 8578 @@ -9941,7 +103 44,7 @@8618 @@ -9941,7 +10362,7 @@ 8579 8619 8580 8620 fi 8581 8621 8582 8622 -echo "$as_me:9944: checking if you want experimental wgetch-events code" >&5 8583 +echo "$as_me:103 47: checking if you want experimental wgetch-events code" >&58623 +echo "$as_me:10365: checking if you want experimental wgetch-events code" >&5 8584 8624 echo $ECHO_N "checking if you want experimental wgetch-events code... $ECHO_C" >&6 8585 8625 8586 8626 # Check whether --enable-wgetch-events or --disable-wgetch-events was given. 8587 @@ -9951,7 +103 54,7 @@8627 @@ -9951,7 +10372,7 @@ 8588 8628 else 8589 8629 with_wgetch_events=no 8590 8630 fi; 8591 8631 -echo "$as_me:9954: result: $with_wgetch_events" >&5 8592 +echo "$as_me:103 57: result: $with_wgetch_events" >&58632 +echo "$as_me:10375: result: $with_wgetch_events" >&5 8593 8633 echo "${ECHO_T}$with_wgetch_events" >&6 8594 8634 test "$with_wgetch_events" = yes && cat >>confdefs.h <<\EOF 8595 8635 #define NCURSES_WGETCH_EVENTS 1 8596 @@ -9960,7 +103 63,7 @@8636 @@ -9960,7 +10381,7 @@ 8597 8637 ############################################################################### 8598 8638 8599 8639 ### use option --disable-echo to suppress full display compiling commands 8600 8640 -echo "$as_me:9963: checking if you want to display full commands during build" >&5 8601 +echo "$as_me:103 66: checking if you want to display full commands during build" >&58641 +echo "$as_me:10384: checking if you want to display full commands during build" >&5 8602 8642 echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6 8603 8643 8604 8644 # Check whether --enable-echo or --disable-echo was given. 8605 @@ -9977,11 +103 80,11 @@8645 @@ -9977,11 +10398,11 @@ 8606 8646 test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent" 8607 8647 test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent" 8608 8648 fi 8609 8649 -echo "$as_me:9980: result: $with_echo" >&5 8610 +echo "$as_me:10 383: result: $with_echo" >&58650 +echo "$as_me:10401: result: $with_echo" >&5 8611 8651 echo "${ECHO_T}$with_echo" >&6 8612 8652 8613 8653 ### use option --enable-warnings to turn on all gcc warnings 8614 8654 -echo "$as_me:9984: checking if you want to see compiler warnings" >&5 8615 +echo "$as_me:10 387: checking if you want to see compiler warnings" >&58655 +echo "$as_me:10405: checking if you want to see compiler warnings" >&5 8616 8656 echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6 8617 8657 8618 8658 # Check whether --enable-warnings or --disable-warnings was given. 8619 @@ -9989,7 +10 392,7 @@8659 @@ -9989,7 +10410,7 @@ 8620 8660 enableval="$enable_warnings" 8621 8661 with_warnings=$enableval 8622 8662 fi; 8623 8663 -echo "$as_me:9992: result: $with_warnings" >&5 8624 +echo "$as_me:10 395: result: $with_warnings" >&58664 +echo "$as_me:10413: result: $with_warnings" >&5 8625 8665 echo "${ECHO_T}$with_warnings" >&6 8626 8666 8627 8667 if test "x$with_warnings" = "xyes"; then 8628 @@ -10000,12 +104 03,12 @@8668 @@ -10000,12 +10421,12 @@ 8629 8669 if test "$GCC" = yes ; then 8630 8670 case $host_os in 8631 8671 linux*|gnu*) 8632 8672 - echo "$as_me:10003: checking if this is really Intel C compiler" >&5 8633 + echo "$as_me:104 06: checking if this is really Intel C compiler" >&58673 + echo "$as_me:10424: checking if this is really Intel C compiler" >&5 8634 8674 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 8635 8675 cf_save_CFLAGS="$CFLAGS" … … 8637 8677 cat >conftest.$ac_ext <<_ACEOF 8638 8678 -#line 10008 "configure" 8639 +#line 104 11"configure"8679 +#line 10429 "configure" 8640 8680 #include "confdefs.h" 8641 8681 8642 8682 int 8643 @@ -10022,16 +104 25,16 @@8683 @@ -10022,16 +10443,16 @@ 8644 8684 } 8645 8685 _ACEOF 8646 8686 rm -f conftest.$ac_objext 8647 8687 -if { (eval echo "$as_me:10025: \"$ac_compile\"") >&5 8648 +if { (eval echo "$as_me:104 28: \"$ac_compile\"") >&58688 +if { (eval echo "$as_me:10446: \"$ac_compile\"") >&5 8649 8689 (eval $ac_compile) 2>&5 8650 8690 ac_status=$? 8651 8691 - echo "$as_me:10028: \$? = $ac_status" >&5 8652 + echo "$as_me:104 31: \$? = $ac_status" >&58692 + echo "$as_me:10449: \$? = $ac_status" >&5 8653 8693 (exit $ac_status); } && 8654 8694 { ac_try='test -s conftest.$ac_objext' 8655 8695 - { (eval echo "$as_me:10031: \"$ac_try\"") >&5 8656 + { (eval echo "$as_me:104 34: \"$ac_try\"") >&58696 + { (eval echo "$as_me:10452: \"$ac_try\"") >&5 8657 8697 (eval $ac_try) 2>&5 8658 8698 ac_status=$? 8659 8699 - echo "$as_me:10034: \$? = $ac_status" >&5 8660 + echo "$as_me:104 37: \$? = $ac_status" >&58700 + echo "$as_me:10455: \$? = $ac_status" >&5 8661 8701 (exit $ac_status); }; }; then 8662 8702 INTEL_COMPILER=yes 8663 8703 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" 8664 @@ -10042,14 +104 45,14 @@8704 @@ -10042,14 +10463,14 @@ 8665 8705 fi 8666 8706 rm -f conftest.$ac_objext conftest.$ac_ext 8667 8707 CFLAGS="$cf_save_CFLAGS" 8668 8708 - echo "$as_me:10045: result: $INTEL_COMPILER" >&5 8669 + echo "$as_me:104 48: result: $INTEL_COMPILER" >&58709 + echo "$as_me:10466: result: $INTEL_COMPILER" >&5 8670 8710 echo "${ECHO_T}$INTEL_COMPILER" >&6 8671 8711 ;; … … 8675 8715 cat > conftest.$ac_ext <<EOF 8676 8716 -#line 10052 "${as_me-configure}" 8677 +#line 104 55"${as_me-configure}"8717 +#line 10473 "${as_me-configure}" 8678 8718 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } 8679 8719 EOF 8680 8720 8681 @@ -10057,7 +104 60,6 @@8721 @@ -10057,7 +10478,6 @@ 8682 8722 then 8683 8723 # The "-wdXXX" options suppress warnings: … … 8687 8727 # remark #1684: conversion from pointer to same-sized integral type (potential portability problem) 8688 8728 # remark #193: zero used for undefined preprocessing identifier 8689 @@ -10065,31 +104 67,30 @@8729 @@ -10065,31 +10485,30 @@ 8690 8730 # remark #810: conversion from "int" to "Dimension={unsigned short}" may lose significant bits 8691 8731 # remark #869: parameter "tw" was never referenced … … 8695 8735 8696 8736 - { echo "$as_me:10070: checking for $CC warning options..." >&5 8697 + { echo "$as_me:104 72: checking for $CC warning options..." >&58737 + { echo "$as_me:10490: checking for $CC warning options..." >&5 8698 8738 echo "$as_me: checking for $CC warning options..." >&6;} 8699 8739 cf_save_CFLAGS="$CFLAGS" … … 8714 8754 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" 8715 8755 - if { (eval echo "$as_me:10087: \"$ac_compile\"") >&5 8716 + if { (eval echo "$as_me:10 488: \"$ac_compile\"") >&58756 + if { (eval echo "$as_me:10506: \"$ac_compile\"") >&5 8717 8757 (eval $ac_compile) 2>&5 8718 8758 ac_status=$? 8719 8759 - echo "$as_me:10090: \$? = $ac_status" >&5 8720 + echo "$as_me:10 491: \$? = $ac_status" >&58760 + echo "$as_me:10509: \$? = $ac_status" >&5 8721 8761 (exit $ac_status); }; then 8722 8762 - test -n "$verbose" && echo "$as_me:10092: result: ... -$cf_opt" >&5 8723 + test -n "$verbose" && echo "$as_me:10 493: result: ... -$cf_opt" >&58763 + test -n "$verbose" && echo "$as_me:10511: result: ... -$cf_opt" >&5 8724 8764 echo "${ECHO_T}... -$cf_opt" >&6 8725 8765 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" 8726 8766 fi 8727 @@ -10098,7 +10 499,7 @@8767 @@ -10098,7 +10517,7 @@ 8728 8768 8729 8769 elif test "$GCC" = yes 8730 8770 then 8731 8771 - { echo "$as_me:10101: checking for $CC warning options..." >&5 8732 + { echo "$as_me:105 02: checking for $CC warning options..." >&58772 + { echo "$as_me:10520: checking for $CC warning options..." >&5 8733 8773 echo "$as_me: checking for $CC warning options..." >&6;} 8734 8774 cf_save_CFLAGS="$CFLAGS" 8735 8775 EXTRA_CFLAGS="-W -Wall" 8736 @@ -10118,12 +105 19,12 @@8776 @@ -10118,12 +10537,12 @@ 8737 8777 Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum 8738 8778 do 8739 8779 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" 8740 8780 - if { (eval echo "$as_me:10121: \"$ac_compile\"") >&5 8741 + if { (eval echo "$as_me:105 22: \"$ac_compile\"") >&58781 + if { (eval echo "$as_me:10540: \"$ac_compile\"") >&5 8742 8782 (eval $ac_compile) 2>&5 8743 8783 ac_status=$? 8744 8784 - echo "$as_me:10124: \$? = $ac_status" >&5 8745 + echo "$as_me:105 25: \$? = $ac_status" >&58785 + echo "$as_me:10543: \$? = $ac_status" >&5 8746 8786 (exit $ac_status); }; then 8747 8787 - test -n "$verbose" && echo "$as_me:10126: result: ... -$cf_opt" >&5 8748 + test -n "$verbose" && echo "$as_me:105 27: result: ... -$cf_opt" >&58788 + test -n "$verbose" && echo "$as_me:10545: result: ... -$cf_opt" >&5 8749 8789 echo "${ECHO_T}... -$cf_opt" >&6 8750 8790 case $cf_opt in #(vi 8751 8791 Wcast-qual) #(vi 8752 @@ -10134,7 +105 35,7 @@8792 @@ -10134,7 +10553,7 @@ 8753 8793 [34].*) 8754 8794 test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 8755 8795 8756 8796 -echo "${as_me-configure}:10137: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 8757 +echo "${as_me-configure}:105 38: testing feature is broken in gcc $GCC_VERSION ..." 1>&58797 +echo "${as_me-configure}:10556: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 8758 8798 8759 8799 continue;; 8760 8800 esac 8761 @@ -10154,12 +105 55,12 @@8801 @@ -10154,12 +10573,12 @@ 8762 8802 if test "$GCC" = yes ; then 8763 8803 case $host_os in 8764 8804 linux*|gnu*) 8765 8805 - echo "$as_me:10157: checking if this is really Intel C++ compiler" >&5 8766 + echo "$as_me:105 58: checking if this is really Intel C++ compiler" >&58806 + echo "$as_me:10576: checking if this is really Intel C++ compiler" >&5 8767 8807 echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6 8768 8808 cf_save_CFLAGS="$CXXFLAGS" … … 8770 8810 cat >conftest.$ac_ext <<_ACEOF 8771 8811 -#line 10162 "configure" 8772 +#line 105 63"configure"8812 +#line 10581 "configure" 8773 8813 #include "confdefs.h" 8774 8814 8775 8815 int 8776 @@ -10176,16 +105 77,16 @@8816 @@ -10176,16 +10595,16 @@ 8777 8817 } 8778 8818 _ACEOF 8779 8819 rm -f conftest.$ac_objext 8780 8820 -if { (eval echo "$as_me:10179: \"$ac_compile\"") >&5 8781 +if { (eval echo "$as_me:105 80: \"$ac_compile\"") >&58821 +if { (eval echo "$as_me:10598: \"$ac_compile\"") >&5 8782 8822 (eval $ac_compile) 2>&5 8783 8823 ac_status=$? 8784 8824 - echo "$as_me:10182: \$? = $ac_status" >&5 8785 + echo "$as_me:10 583: \$? = $ac_status" >&58825 + echo "$as_me:10601: \$? = $ac_status" >&5 8786 8826 (exit $ac_status); } && 8787 8827 { ac_try='test -s conftest.$ac_objext' 8788 8828 - { (eval echo "$as_me:10185: \"$ac_try\"") >&5 8789 + { (eval echo "$as_me:10 586: \"$ac_try\"") >&58829 + { (eval echo "$as_me:10604: \"$ac_try\"") >&5 8790 8830 (eval $ac_try) 2>&5 8791 8831 ac_status=$? 8792 8832 - echo "$as_me:10188: \$? = $ac_status" >&5 8793 + echo "$as_me:10 589: \$? = $ac_status" >&58833 + echo "$as_me:10607: \$? = $ac_status" >&5 8794 8834 (exit $ac_status); }; }; then 8795 8835 INTEL_CPLUSPLUS=yes 8796 8836 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" 8797 @@ -10196,7 +10 597,7 @@8837 @@ -10196,7 +10615,7 @@ 8798 8838 fi 8799 8839 rm -f conftest.$ac_objext conftest.$ac_ext 8800 8840 CXXFLAGS="$cf_save_CFLAGS" 8801 8841 - echo "$as_me:10199: result: $INTEL_CPLUSPLUS" >&5 8802 + echo "$as_me:106 00: result: $INTEL_CPLUSPLUS" >&58842 + echo "$as_me:10618: result: $INTEL_CPLUSPLUS" >&5 8803 8843 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 8804 8844 ;; 8805 8845 esac 8806 @@ -10210,7 +106 11,7 @@8846 @@ -10210,7 +10629,7 @@ 8807 8847 ac_main_return=return 8808 8848 8809 8849 cat > conftest.$ac_ext <<EOF 8810 8850 -#line 10213 "configure" 8811 +#line 106 14"configure"8851 +#line 10632 "configure" 8812 8852 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } 8813 8853 EOF 8814 8854 8815 @@ -10228,7 +106 29,7 @@8855 @@ -10228,7 +10647,7 @@ 8816 8856 # remark #981: operands are evaluated in unspecified order 8817 8857 # warning #269: invalid format string conversion 8818 8858 8819 8859 - { echo "$as_me:10231: checking for $CC warning options..." >&5 8820 + { echo "$as_me:106 32: checking for $CC warning options..." >&58860 + { echo "$as_me:10650: checking for $CC warning options..." >&5 8821 8861 echo "$as_me: checking for $CC warning options..." >&6;} 8822 8862 cf_save_CXXFLAGS="$CXXFLAGS" 8823 8863 EXTRA_CXXFLAGS="-Wall" 8824 @@ -10245,12 +106 46,12 @@8864 @@ -10245,12 +10664,12 @@ 8825 8865 wd981 8826 8866 do 8827 8867 CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt" 8828 8868 - if { (eval echo "$as_me:10248: \"$ac_compile\"") >&5 8829 + if { (eval echo "$as_me:106 49: \"$ac_compile\"") >&58869 + if { (eval echo "$as_me:10667: \"$ac_compile\"") >&5 8830 8870 (eval $ac_compile) 2>&5 8831 8871 ac_status=$? 8832 8872 - echo "$as_me:10251: \$? = $ac_status" >&5 8833 + echo "$as_me:106 52: \$? = $ac_status" >&58873 + echo "$as_me:10670: \$? = $ac_status" >&5 8834 8874 (exit $ac_status); }; then 8835 8875 - test -n "$verbose" && echo "$as_me:10253: result: ... -$cf_opt" >&5 8836 + test -n "$verbose" && echo "$as_me:106 54: result: ... -$cf_opt" >&58876 + test -n "$verbose" && echo "$as_me:10672: result: ... -$cf_opt" >&5 8837 8877 echo "${ECHO_T}... -$cf_opt" >&6 8838 8878 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" 8839 8879 fi 8840 @@ -10259,7 +106 60,7 @@8880 @@ -10259,7 +10678,7 @@ 8841 8881 8842 8882 elif test "$GXX" = yes 8843 8883 then 8844 8884 - { echo "$as_me:10262: checking for $CXX warning options..." >&5 8845 + { echo "$as_me:106 63: checking for $CXX warning options..." >&58885 + { echo "$as_me:10681: checking for $CXX warning options..." >&5 8846 8886 echo "$as_me: checking for $CXX warning options..." >&6;} 8847 8887 cf_save_CXXFLAGS="$CXXFLAGS" 8848 8888 EXTRA_CXXFLAGS="-W -Wall" 8849 @@ -10288,16 +10 689,16 @@8889 @@ -10288,16 +10707,16 @@ 8850 8890 Wundef $cf_gxx_extra_warnings Wno-unused 8851 8891 do 8852 8892 CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt" 8853 8893 - if { (eval echo "$as_me:10291: \"$ac_compile\"") >&5 8854 + if { (eval echo "$as_me:10 692: \"$ac_compile\"") >&58894 + if { (eval echo "$as_me:10710: \"$ac_compile\"") >&5 8855 8895 (eval $ac_compile) 2>&5 8856 8896 ac_status=$? 8857 8897 - echo "$as_me:10294: \$? = $ac_status" >&5 8858 + echo "$as_me:10 695: \$? = $ac_status" >&58898 + echo "$as_me:10713: \$? = $ac_status" >&5 8859 8899 (exit $ac_status); }; then 8860 8900 - test -n "$verbose" && echo "$as_me:10296: result: ... -$cf_opt" >&5 8861 + test -n "$verbose" && echo "$as_me:10 697: result: ... -$cf_opt" >&58901 + test -n "$verbose" && echo "$as_me:10715: result: ... -$cf_opt" >&5 8862 8902 echo "${ECHO_T}... -$cf_opt" >&6 8863 8903 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" 8864 8904 else 8865 8905 - test -n "$verbose" && echo "$as_me:10300: result: ... no -$cf_opt" >&5 8866 + test -n "$verbose" && echo "$as_me:107 01: result: ... no -$cf_opt" >&58906 + test -n "$verbose" && echo "$as_me:10719: result: ... no -$cf_opt" >&5 8867 8907 echo "${ECHO_T}... no -$cf_opt" >&6 8868 8908 fi 8869 8909 done 8870 @@ -10333,10 +107 34,10 @@8910 @@ -10333,10 +10752,10 @@ 8871 8911 EOF 8872 8912 if test "$GCC" = yes 8873 8913 then 8874 8914 - { echo "$as_me:10336: checking for $CC __attribute__ directives..." >&5 8875 + { echo "$as_me:107 37: checking for $CC __attribute__ directives..." >&58915 + { echo "$as_me:10755: checking for $CC __attribute__ directives..." >&5 8876 8916 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} 8877 8917 cat > conftest.$ac_ext <<EOF 8878 8918 -#line 10339 "${as_me-configure}" 8879 +#line 107 40"${as_me-configure}"8919 +#line 10758 "${as_me-configure}" 8880 8920 #include "confdefs.h" 8881 8921 #include "conftest.h" 8882 8922 #include "conftest.i" 8883 @@ -10374,12 +107 75,12 @@8923 @@ -10374,12 +10793,12 @@ 8884 8924 EOF 8885 8925 ;; 8886 8926 esac 8887 8927 - if { (eval echo "$as_me:10377: \"$ac_compile\"") >&5 8888 + if { (eval echo "$as_me:107 78: \"$ac_compile\"") >&58928 + if { (eval echo "$as_me:10796: \"$ac_compile\"") >&5 8889 8929 (eval $ac_compile) 2>&5 8890 8930 ac_status=$? 8891 8931 - echo "$as_me:10380: \$? = $ac_status" >&5 8892 + echo "$as_me:107 81: \$? = $ac_status" >&58932 + echo "$as_me:10799: \$? = $ac_status" >&5 8893 8933 (exit $ac_status); }; then 8894 8934 - test -n "$verbose" && echo "$as_me:10382: result: ... $cf_attribute" >&5 8895 + test -n "$verbose" && echo "$as_me:10 783: result: ... $cf_attribute" >&58935 + test -n "$verbose" && echo "$as_me:10801: result: ... $cf_attribute" >&5 8896 8936 echo "${ECHO_T}... $cf_attribute" >&6 8897 8937 cat conftest.h >>confdefs.h 8898 8938 fi 8899 @@ -10391,7 +10 792,7 @@8939 @@ -10391,7 +10810,7 @@ 8900 8940 fi 8901 8941 8902 8942 ### use option --enable-assertions to turn on generation of assertion code 8903 8943 -echo "$as_me:10394: checking if you want to enable runtime assertions" >&5 8904 +echo "$as_me:10 795: checking if you want to enable runtime assertions" >&58944 +echo "$as_me:10813: checking if you want to enable runtime assertions" >&5 8905 8945 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 8906 8946 8907 8947 # Check whether --enable-assertions or --disable-assertions was given. 8908 @@ -10401,7 +108 02,7 @@8948 @@ -10401,7 +10820,7 @@ 8909 8949 else 8910 8950 with_assertions=no 8911 8951 fi; 8912 8952 -echo "$as_me:10404: result: $with_assertions" >&5 8913 +echo "$as_me:108 05: result: $with_assertions" >&58953 +echo "$as_me:10823: result: $with_assertions" >&5 8914 8954 echo "${ECHO_T}$with_assertions" >&6 8915 8955 if test -n "$GCC" 8916 8956 then 8917 @@ -10419,7 +108 20,7 @@8957 @@ -10419,7 +10838,7 @@ 8918 8958 8919 8959 ### use option --disable-leaks to suppress "permanent" leaks, for testing 8920 8960 8921 8961 -echo "$as_me:10422: checking if you want to use dmalloc for testing" >&5 8922 +echo "$as_me:108 23: checking if you want to use dmalloc for testing" >&58962 +echo "$as_me:10841: checking if you want to use dmalloc for testing" >&5 8923 8963 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 8924 8964 8925 8965 # Check whether --with-dmalloc or --without-dmalloc was given. 8926 @@ -10435,7 +108 36,7 @@8966 @@ -10435,7 +10854,7 @@ 8927 8967 else 8928 8968 with_dmalloc= 8929 8969 fi; 8930 8970 -echo "$as_me:10438: result: ${with_dmalloc:-no}" >&5 8931 +echo "$as_me:108 39: result: ${with_dmalloc:-no}" >&58971 +echo "$as_me:10857: result: ${with_dmalloc:-no}" >&5 8932 8972 echo "${ECHO_T}${with_dmalloc:-no}" >&6 8933 8973 8934 8974 case .$with_cflags in #(vi 8935 @@ -10505,7 +109 06,7 @@8975 @@ -10505,7 +10924,7 @@ 8936 8976 8937 8977 if test -n "$cf_new_cppflags" ; then … … 8942 8982 8943 8983 if test -n "$cf_new_extra_cppflags" ; then 8944 @@ -10519,23 +109 20,23 @@8984 @@ -10519,23 +10938,23 @@ 8945 8985 esac 8946 8986 8947 8987 if test "$with_dmalloc" = yes ; then 8948 8988 - echo "$as_me:10522: checking for dmalloc.h" >&5 8949 + echo "$as_me:109 23: checking for dmalloc.h" >&58989 + echo "$as_me:10941: checking for dmalloc.h" >&5 8950 8990 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6 8951 8991 if test "${ac_cv_header_dmalloc_h+set}" = set; then … … 8954 8994 cat >conftest.$ac_ext <<_ACEOF 8955 8995 -#line 10528 "configure" 8956 +#line 109 29"configure"8996 +#line 10947 "configure" 8957 8997 #include "confdefs.h" 8958 8998 #include <dmalloc.h> 8959 8999 _ACEOF 8960 9000 -if { (eval echo "$as_me:10532: \"$ac_cpp conftest.$ac_ext\"") >&5 8961 +if { (eval echo "$as_me:109 33: \"$ac_cpp conftest.$ac_ext\"") >&59001 +if { (eval echo "$as_me:10951: \"$ac_cpp conftest.$ac_ext\"") >&5 8962 9002 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 8963 9003 ac_status=$? … … 8966 9006 cat conftest.err >&5 8967 9007 - echo "$as_me:10538: \$? = $ac_status" >&5 8968 + echo "$as_me:109 39: \$? = $ac_status" >&59008 + echo "$as_me:10957: \$? = $ac_status" >&5 8969 9009 (exit $ac_status); } >/dev/null; then 8970 9010 if test -s conftest.err; then 8971 9011 ac_cpp_err=$ac_c_preproc_warn_flag 8972 @@ -10554,11 +109 55,11 @@9012 @@ -10554,11 +10973,11 @@ 8973 9013 fi 8974 9014 rm -f conftest.err conftest.$ac_ext 8975 9015 fi 8976 9016 -echo "$as_me:10557: result: $ac_cv_header_dmalloc_h" >&5 8977 +echo "$as_me:109 58: result: $ac_cv_header_dmalloc_h" >&59017 +echo "$as_me:10976: result: $ac_cv_header_dmalloc_h" >&5 8978 9018 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6 8979 9019 if test $ac_cv_header_dmalloc_h = yes; then 8980 9020 8981 9021 -echo "$as_me:10561: checking for dmalloc_debug in -ldmalloc" >&5 8982 +echo "$as_me:109 62: checking for dmalloc_debug in -ldmalloc" >&59022 +echo "$as_me:10980: checking for dmalloc_debug in -ldmalloc" >&5 8983 9023 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 8984 9024 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then 8985 9025 echo $ECHO_N "(cached) $ECHO_C" >&6 8986 @@ -10566,7 +109 67,7 @@9026 @@ -10566,7 +10985,7 @@ 8987 9027 ac_check_lib_save_LIBS=$LIBS 8988 9028 LIBS="-ldmalloc $LIBS" 8989 9029 cat >conftest.$ac_ext <<_ACEOF 8990 9030 -#line 10569 "configure" 8991 +#line 109 70"configure"9031 +#line 10988 "configure" 8992 9032 #include "confdefs.h" 8993 9033 8994 9034 /* Override any gcc2 internal prototype to avoid an error. */ 8995 @@ -10585,16 +1 0986,16 @@9035 @@ -10585,16 +11004,16 @@ 8996 9036 } 8997 9037 _ACEOF 8998 9038 rm -f conftest.$ac_objext conftest$ac_exeext 8999 9039 -if { (eval echo "$as_me:10588: \"$ac_link\"") >&5 9000 +if { (eval echo "$as_me:1 0989: \"$ac_link\"") >&59040 +if { (eval echo "$as_me:11007: \"$ac_link\"") >&5 9001 9041 (eval $ac_link) 2>&5 9002 9042 ac_status=$? 9003 9043 - echo "$as_me:10591: \$? = $ac_status" >&5 9004 + echo "$as_me:1 0992: \$? = $ac_status" >&59044 + echo "$as_me:11010: \$? = $ac_status" >&5 9005 9045 (exit $ac_status); } && 9006 9046 { ac_try='test -s conftest$ac_exeext' 9007 9047 - { (eval echo "$as_me:10594: \"$ac_try\"") >&5 9008 + { (eval echo "$as_me:1 0995: \"$ac_try\"") >&59048 + { (eval echo "$as_me:11013: \"$ac_try\"") >&5 9009 9049 (eval $ac_try) 2>&5 9010 9050 ac_status=$? 9011 9051 - echo "$as_me:10597: \$? = $ac_status" >&5 9012 + echo "$as_me:1 0998: \$? = $ac_status" >&59052 + echo "$as_me:11016: \$? = $ac_status" >&5 9013 9053 (exit $ac_status); }; }; then 9014 9054 ac_cv_lib_dmalloc_dmalloc_debug=yes 9015 9055 else 9016 @@ -10605,7 +110 06,7 @@9056 @@ -10605,7 +11024,7 @@ 9017 9057 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 9018 9058 LIBS=$ac_check_lib_save_LIBS 9019 9059 fi 9020 9060 -echo "$as_me:10608: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 9021 +echo "$as_me:110 09: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&59061 +echo "$as_me:11027: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 9022 9062 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 9023 9063 if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then 9024 9064 cat >>confdefs.h <<EOF 9025 @@ -10620,7 +110 21,7 @@9065 @@ -10620,7 +11039,7 @@ 9026 9066 9027 9067 fi 9028 9068 9029 9069 -echo "$as_me:10623: checking if you want to use dbmalloc for testing" >&5 9030 +echo "$as_me:110 24: checking if you want to use dbmalloc for testing" >&59070 +echo "$as_me:11042: checking if you want to use dbmalloc for testing" >&5 9031 9071 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 9032 9072 9033 9073 # Check whether --with-dbmalloc or --without-dbmalloc was given. 9034 @@ -10636,7 +110 37,7 @@9074 @@ -10636,7 +11055,7 @@ 9035 9075 else 9036 9076 with_dbmalloc= 9037 9077 fi; 9038 9078 -echo "$as_me:10639: result: ${with_dbmalloc:-no}" >&5 9039 +echo "$as_me:110 40: result: ${with_dbmalloc:-no}" >&59079 +echo "$as_me:11058: result: ${with_dbmalloc:-no}" >&5 9040 9080 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 9041 9081 9042 9082 case .$with_cflags in #(vi 9043 @@ -10706,7 +111 07,7 @@9083 @@ -10706,7 +11125,7 @@ 9044 9084 9045 9085 if test -n "$cf_new_cppflags" ; then … … 9050 9090 9051 9091 if test -n "$cf_new_extra_cppflags" ; then 9052 @@ -10720,23 +111 21,23 @@9092 @@ -10720,23 +11139,23 @@ 9053 9093 esac 9054 9094 9055 9095 if test "$with_dbmalloc" = yes ; then 9056 9096 - echo "$as_me:10723: checking for dbmalloc.h" >&5 9057 + echo "$as_me:111 24: checking for dbmalloc.h" >&59097 + echo "$as_me:11142: checking for dbmalloc.h" >&5 9058 9098 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6 9059 9099 if test "${ac_cv_header_dbmalloc_h+set}" = set; then … … 9062 9102 cat >conftest.$ac_ext <<_ACEOF 9063 9103 -#line 10729 "configure" 9064 +#line 111 30"configure"9104 +#line 11148 "configure" 9065 9105 #include "confdefs.h" 9066 9106 #include <dbmalloc.h> 9067 9107 _ACEOF 9068 9108 -if { (eval echo "$as_me:10733: \"$ac_cpp conftest.$ac_ext\"") >&5 9069 +if { (eval echo "$as_me:111 34: \"$ac_cpp conftest.$ac_ext\"") >&59109 +if { (eval echo "$as_me:11152: \"$ac_cpp conftest.$ac_ext\"") >&5 9070 9110 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 9071 9111 ac_status=$? … … 9074 9114 cat conftest.err >&5 9075 9115 - echo "$as_me:10739: \$? = $ac_status" >&5 9076 + echo "$as_me:111 40: \$? = $ac_status" >&59116 + echo "$as_me:11158: \$? = $ac_status" >&5 9077 9117 (exit $ac_status); } >/dev/null; then 9078 9118 if test -s conftest.err; then 9079 9119 ac_cpp_err=$ac_c_preproc_warn_flag 9080 @@ -10755,11 +111 56,11 @@9120 @@ -10755,11 +11174,11 @@ 9081 9121 fi 9082 9122 rm -f conftest.err conftest.$ac_ext 9083 9123 fi 9084 9124 -echo "$as_me:10758: result: $ac_cv_header_dbmalloc_h" >&5 9085 +echo "$as_me:111 59: result: $ac_cv_header_dbmalloc_h" >&59125 +echo "$as_me:11177: result: $ac_cv_header_dbmalloc_h" >&5 9086 9126 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6 9087 9127 if test $ac_cv_header_dbmalloc_h = yes; then 9088 9128 9089 9129 -echo "$as_me:10762: checking for debug_malloc in -ldbmalloc" >&5 9090 +echo "$as_me:111 63: checking for debug_malloc in -ldbmalloc" >&59130 +echo "$as_me:11181: checking for debug_malloc in -ldbmalloc" >&5 9091 9131 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 9092 9132 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then 9093 9133 echo $ECHO_N "(cached) $ECHO_C" >&6 9094 @@ -10767,7 +111 68,7 @@9134 @@ -10767,7 +11186,7 @@ 9095 9135 ac_check_lib_save_LIBS=$LIBS 9096 9136 LIBS="-ldbmalloc $LIBS" 9097 9137 cat >conftest.$ac_ext <<_ACEOF 9098 9138 -#line 10770 "configure" 9099 +#line 111 71"configure"9139 +#line 11189 "configure" 9100 9140 #include "confdefs.h" 9101 9141 9102 9142 /* Override any gcc2 internal prototype to avoid an error. */ 9103 @@ -10786,16 +11 187,16 @@9143 @@ -10786,16 +11205,16 @@ 9104 9144 } 9105 9145 _ACEOF 9106 9146 rm -f conftest.$ac_objext conftest$ac_exeext 9107 9147 -if { (eval echo "$as_me:10789: \"$ac_link\"") >&5 9108 +if { (eval echo "$as_me:11 190: \"$ac_link\"") >&59148 +if { (eval echo "$as_me:11208: \"$ac_link\"") >&5 9109 9149 (eval $ac_link) 2>&5 9110 9150 ac_status=$? 9111 9151 - echo "$as_me:10792: \$? = $ac_status" >&5 9112 + echo "$as_me:11 193: \$? = $ac_status" >&59152 + echo "$as_me:11211: \$? = $ac_status" >&5 9113 9153 (exit $ac_status); } && 9114 9154 { ac_try='test -s conftest$ac_exeext' 9115 9155 - { (eval echo "$as_me:10795: \"$ac_try\"") >&5 9116 + { (eval echo "$as_me:11 196: \"$ac_try\"") >&59156 + { (eval echo "$as_me:11214: \"$ac_try\"") >&5 9117 9157 (eval $ac_try) 2>&5 9118 9158 ac_status=$? 9119 9159 - echo "$as_me:10798: \$? = $ac_status" >&5 9120 + echo "$as_me:11 199: \$? = $ac_status" >&59160 + echo "$as_me:11217: \$? = $ac_status" >&5 9121 9161 (exit $ac_status); }; }; then 9122 9162 ac_cv_lib_dbmalloc_debug_malloc=yes 9123 9163 else 9124 @@ -10806,7 +112 07,7 @@9164 @@ -10806,7 +11225,7 @@ 9125 9165 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 9126 9166 LIBS=$ac_check_lib_save_LIBS 9127 9167 fi 9128 9168 -echo "$as_me:10809: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 9129 +echo "$as_me:112 10: result: $ac_cv_lib_dbmalloc_debug_malloc" >&59169 +echo "$as_me:11228: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 9130 9170 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 9131 9171 if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then 9132 9172 cat >>confdefs.h <<EOF 9133 @@ -10821,7 +112 22,7 @@9173 @@ -10821,7 +11240,7 @@ 9134 9174 9135 9175 fi 9136 9176 9137 9177 -echo "$as_me:10824: checking if you want to use valgrind for testing" >&5 9138 +echo "$as_me:112 25: checking if you want to use valgrind for testing" >&59178 +echo "$as_me:11243: checking if you want to use valgrind for testing" >&5 9139 9179 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6 9140 9180 9141 9181 # Check whether --with-valgrind or --without-valgrind was given. 9142 @@ -10837,7 +112 38,7 @@9182 @@ -10837,7 +11256,7 @@ 9143 9183 else 9144 9184 with_valgrind= 9145 9185 fi; 9146 9186 -echo "$as_me:10840: result: ${with_valgrind:-no}" >&5 9147 +echo "$as_me:112 41: result: ${with_valgrind:-no}" >&59187 +echo "$as_me:11259: result: ${with_valgrind:-no}" >&5 9148 9188 echo "${ECHO_T}${with_valgrind:-no}" >&6 9149 9189 9150 9190 case .$with_cflags in #(vi 9151 @@ -10907,7 +113 08,7 @@9191 @@ -10907,7 +11326,7 @@ 9152 9192 9153 9193 if test -n "$cf_new_cppflags" ; then … … 9158 9198 9159 9199 if test -n "$cf_new_extra_cppflags" ; then 9160 @@ -10920,7 +113 21,7 @@9200 @@ -10920,7 +11339,7 @@ 9161 9201 ;; 9162 9202 esac 9163 9203 9164 9204 -echo "$as_me:10923: checking if you want to perform memory-leak testing" >&5 9165 +echo "$as_me:113 24: checking if you want to perform memory-leak testing" >&59205 +echo "$as_me:11342: checking if you want to perform memory-leak testing" >&5 9166 9206 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 9167 9207 9168 9208 # Check whether --enable-leaks or --disable-leaks was given. 9169 @@ -10930,7 +113 31,7 @@9209 @@ -10930,7 +11349,7 @@ 9170 9210 else 9171 9211 : ${with_no_leaks:=no} 9172 9212 fi; 9173 9213 -echo "$as_me:10933: result: $with_no_leaks" >&5 9174 +echo "$as_me:113 34: result: $with_no_leaks" >&59214 +echo "$as_me:11352: result: $with_no_leaks" >&5 9175 9215 echo "${ECHO_T}$with_no_leaks" >&6 9176 9216 9177 9217 if test "$with_no_leaks" = yes ; then 9178 @@ -10975,7 +113 76,7 @@9218 @@ -10975,7 +11394,7 @@ 9179 9219 ;; 9180 9220 esac 9181 9221 9182 9222 -echo "$as_me:10978: checking whether to add trace feature to all models" >&5 9183 +echo "$as_me:113 79: checking whether to add trace feature to all models" >&59223 +echo "$as_me:11397: checking whether to add trace feature to all models" >&5 9184 9224 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 9185 9225 9186 9226 # Check whether --with-trace or --without-trace was given. 9187 @@ -10985,7 +11 386,7 @@9227 @@ -10985,7 +11404,7 @@ 9188 9228 else 9189 9229 cf_with_trace=$cf_all_traces 9190 9230 fi; 9191 9231 -echo "$as_me:10988: result: $cf_with_trace" >&5 9192 +echo "$as_me:11 389: result: $cf_with_trace" >&59232 +echo "$as_me:11407: result: $cf_with_trace" >&5 9193 9233 echo "${ECHO_T}$cf_with_trace" >&6 9194 9234 9195 9235 if test "$cf_with_trace" = yes ; then 9196 @@ -11052,7 +114 53,7 @@9236 @@ -11052,7 +11471,7 @@ 9197 9237 9198 9238 if test -n "$cf_new_cppflags" ; then … … 9203 9243 9204 9244 if test -n "$cf_new_extra_cppflags" ; then 9205 @@ -11066,13 +114 67,17 @@9245 @@ -11066,13 +11485,17 @@ 9206 9246 fi 9207 9247 … … 9212 9252 + ;; 9213 9253 +*) 9214 +echo "$as_me:114 74: checking for gettimeofday" >&59254 +echo "$as_me:11492: checking for gettimeofday" >&5 9215 9255 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 9216 9256 if test "${ac_cv_func_gettimeofday+set}" = set; then … … 9219 9259 cat >conftest.$ac_ext <<_ACEOF 9220 9260 -#line 11075 "configure" 9221 +#line 114 80"configure"9261 +#line 11498 "configure" 9222 9262 #include "confdefs.h" 9223 9263 /* System header to define __stub macros and hopefully few prototypes, 9224 9264 which can conflict with char gettimeofday (); below. */ 9225 @@ -11103,16 +115 08,16 @@9265 @@ -11103,16 +11526,16 @@ 9226 9266 } 9227 9267 _ACEOF 9228 9268 rm -f conftest.$ac_objext conftest$ac_exeext 9229 9269 -if { (eval echo "$as_me:11106: \"$ac_link\"") >&5 9230 +if { (eval echo "$as_me:115 11: \"$ac_link\"") >&59270 +if { (eval echo "$as_me:11529: \"$ac_link\"") >&5 9231 9271 (eval $ac_link) 2>&5 9232 9272 ac_status=$? 9233 9273 - echo "$as_me:11109: \$? = $ac_status" >&5 9234 + echo "$as_me:115 14: \$? = $ac_status" >&59274 + echo "$as_me:11532: \$? = $ac_status" >&5 9235 9275 (exit $ac_status); } && 9236 9276 { ac_try='test -s conftest$ac_exeext' 9237 9277 - { (eval echo "$as_me:11112: \"$ac_try\"") >&5 9238 + { (eval echo "$as_me:115 17: \"$ac_try\"") >&59278 + { (eval echo "$as_me:11535: \"$ac_try\"") >&5 9239 9279 (eval $ac_try) 2>&5 9240 9280 ac_status=$? 9241 9281 - echo "$as_me:11115: \$? = $ac_status" >&5 9242 + echo "$as_me:115 20: \$? = $ac_status" >&59282 + echo "$as_me:11538: \$? = $ac_status" >&5 9243 9283 (exit $ac_status); }; }; then 9244 9284 ac_cv_func_gettimeofday=yes 9245 9285 else 9246 @@ -11122,7 +115 27,7 @@9286 @@ -11122,7 +11545,7 @@ 9247 9287 fi 9248 9288 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 9249 9289 fi 9250 9290 -echo "$as_me:11125: result: $ac_cv_func_gettimeofday" >&5 9251 +echo "$as_me:115 30: result: $ac_cv_func_gettimeofday" >&59291 +echo "$as_me:11548: result: $ac_cv_func_gettimeofday" >&5 9252 9292 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 9253 9293 if test $ac_cv_func_gettimeofday = yes; then 9254 9294 cat >>confdefs.h <<\EOF 9255 @@ -11131,7 +115 36,7 @@9295 @@ -11131,7 +11554,7 @@ 9256 9296 9257 9297 else 9258 9298 9259 9299 -echo "$as_me:11134: checking for gettimeofday in -lbsd" >&5 9260 +echo "$as_me:115 39: checking for gettimeofday in -lbsd" >&59300 +echo "$as_me:11557: checking for gettimeofday in -lbsd" >&5 9261 9301 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 9262 9302 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then 9263 9303 echo $ECHO_N "(cached) $ECHO_C" >&6 9264 @@ -11139,7 +115 44,7 @@9304 @@ -11139,7 +11562,7 @@ 9265 9305 ac_check_lib_save_LIBS=$LIBS 9266 9306 LIBS="-lbsd $LIBS" 9267 9307 cat >conftest.$ac_ext <<_ACEOF 9268 9308 -#line 11142 "configure" 9269 +#line 115 47"configure"9309 +#line 11565 "configure" 9270 9310 #include "confdefs.h" 9271 9311 9272 9312 /* Override any gcc2 internal prototype to avoid an error. */ 9273 @@ -11158,16 +115 63,16 @@9313 @@ -11158,16 +11581,16 @@ 9274 9314 } 9275 9315 _ACEOF 9276 9316 rm -f conftest.$ac_objext conftest$ac_exeext 9277 9317 -if { (eval echo "$as_me:11161: \"$ac_link\"") >&5 9278 +if { (eval echo "$as_me:115 66: \"$ac_link\"") >&59318 +if { (eval echo "$as_me:11584: \"$ac_link\"") >&5 9279 9319 (eval $ac_link) 2>&5 9280 9320 ac_status=$? 9281 9321 - echo "$as_me:11164: \$? = $ac_status" >&5 9282 + echo "$as_me:115 69: \$? = $ac_status" >&59322 + echo "$as_me:11587: \$? = $ac_status" >&5 9283 9323 (exit $ac_status); } && 9284 9324 { ac_try='test -s conftest$ac_exeext' 9285 9325 - { (eval echo "$as_me:11167: \"$ac_try\"") >&5 9286 + { (eval echo "$as_me:115 72: \"$ac_try\"") >&59326 + { (eval echo "$as_me:11590: \"$ac_try\"") >&5 9287 9327 (eval $ac_try) 2>&5 9288 9328 ac_status=$? 9289 9329 - echo "$as_me:11170: \$? = $ac_status" >&5 9290 + echo "$as_me:115 75: \$? = $ac_status" >&59330 + echo "$as_me:11593: \$? = $ac_status" >&5 9291 9331 (exit $ac_status); }; }; then 9292 9332 ac_cv_lib_bsd_gettimeofday=yes 9293 9333 else 9294 @@ -11178,7 +11 583,7 @@9334 @@ -11178,7 +11601,7 @@ 9295 9335 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 9296 9336 LIBS=$ac_check_lib_save_LIBS 9297 9337 fi 9298 9338 -echo "$as_me:11181: result: $ac_cv_lib_bsd_gettimeofday" >&5 9299 +echo "$as_me:11 586: result: $ac_cv_lib_bsd_gettimeofday" >&59339 +echo "$as_me:11604: result: $ac_cv_lib_bsd_gettimeofday" >&5 9300 9340 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 9301 9341 if test $ac_cv_lib_bsd_gettimeofday = yes; then 9302 9342 cat >>confdefs.h <<\EOF 9303 @@ -11189,15 +11 594,17 @@9343 @@ -11189,15 +11612,17 @@ 9304 9344 fi 9305 9345 … … 9309 9349 9310 9350 -echo "$as_me:11193: checking if -lm needed for math functions" >&5 9311 +echo "$as_me:116 00: checking if -lm needed for math functions" >&59351 +echo "$as_me:11618: checking if -lm needed for math functions" >&5 9312 9352 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6 9313 9353 if test "${cf_cv_need_libm+set}" = set; then … … 9317 9357 cat >conftest.$ac_ext <<_ACEOF 9318 9358 -#line 11200 "configure" 9319 +#line 116 07"configure"9359 +#line 11625 "configure" 9320 9360 #include "confdefs.h" 9321 9361 9322 9362 #include <stdio.h> 9323 @@ -11212,16 +116 19,16 @@9363 @@ -11212,16 +11637,16 @@ 9324 9364 } 9325 9365 _ACEOF 9326 9366 rm -f conftest.$ac_objext conftest$ac_exeext 9327 9367 -if { (eval echo "$as_me:11215: \"$ac_link\"") >&5 9328 +if { (eval echo "$as_me:116 22: \"$ac_link\"") >&59368 +if { (eval echo "$as_me:11640: \"$ac_link\"") >&5 9329 9369 (eval $ac_link) 2>&5 9330 9370 ac_status=$? 9331 9371 - echo "$as_me:11218: \$? = $ac_status" >&5 9332 + echo "$as_me:116 25: \$? = $ac_status" >&59372 + echo "$as_me:11643: \$? = $ac_status" >&5 9333 9373 (exit $ac_status); } && 9334 9374 { ac_try='test -s conftest$ac_exeext' 9335 9375 - { (eval echo "$as_me:11221: \"$ac_try\"") >&5 9336 + { (eval echo "$as_me:116 28: \"$ac_try\"") >&59376 + { (eval echo "$as_me:11646: \"$ac_try\"") >&5 9337 9377 (eval $ac_try) 2>&5 9338 9378 ac_status=$? 9339 9379 - echo "$as_me:11224: \$? = $ac_status" >&5 9340 + echo "$as_me:116 31: \$? = $ac_status" >&59380 + echo "$as_me:11649: \$? = $ac_status" >&5 9341 9381 (exit $ac_status); }; }; then 9342 9382 cf_cv_need_libm=no 9343 9383 else 9344 @@ -11231,7 +116 38,7 @@9384 @@ -11231,7 +11656,7 @@ 9345 9385 fi 9346 9386 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 9347 9387 fi 9348 9388 -echo "$as_me:11234: result: $cf_cv_need_libm" >&5 9349 +echo "$as_me:116 41: result: $cf_cv_need_libm" >&59389 +echo "$as_me:11659: result: $cf_cv_need_libm" >&5 9350 9390 echo "${ECHO_T}$cf_cv_need_libm" >&6 9351 9391 if test "$cf_cv_need_libm" = yes 9352 9392 then 9353 @@ -11239,13 +116 46,13 @@9393 @@ -11239,13 +11664,13 @@ 9354 9394 fi 9355 9395 9356 9396 ### Checks for header files. 9357 9397 -echo "$as_me:11242: checking for ANSI C header files" >&5 9358 +echo "$as_me:116 49: checking for ANSI C header files" >&59398 +echo "$as_me:11667: checking for ANSI C header files" >&5 9359 9399 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 9360 9400 if test "${ac_cv_header_stdc+set}" = set; then … … 9363 9403 cat >conftest.$ac_ext <<_ACEOF 9364 9404 -#line 11248 "configure" 9365 +#line 116 55"configure"9405 +#line 11673 "configure" 9366 9406 #include "confdefs.h" 9367 9407 #include <stdlib.h> 9368 9408 #include <stdarg.h> 9369 @@ -11253,13 +116 60,13 @@9409 @@ -11253,13 +11678,13 @@ 9370 9410 #include <float.h> 9371 9411 9372 9412 _ACEOF 9373 9413 -if { (eval echo "$as_me:11256: \"$ac_cpp conftest.$ac_ext\"") >&5 9374 +if { (eval echo "$as_me:116 63: \"$ac_cpp conftest.$ac_ext\"") >&59414 +if { (eval echo "$as_me:11681: \"$ac_cpp conftest.$ac_ext\"") >&5 9375 9415 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 9376 9416 ac_status=$? … … 9379 9419 cat conftest.err >&5 9380 9420 - echo "$as_me:11262: \$? = $ac_status" >&5 9381 + echo "$as_me:116 69: \$? = $ac_status" >&59421 + echo "$as_me:11687: \$? = $ac_status" >&5 9382 9422 (exit $ac_status); } >/dev/null; then 9383 9423 if test -s conftest.err; then 9384 9424 ac_cpp_err=$ac_c_preproc_warn_flag 9385 @@ -11281,7 +11 688,7 @@9425 @@ -11281,7 +11706,7 @@ 9386 9426 if test $ac_cv_header_stdc = yes; then 9387 9427 # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 9388 9428 cat >conftest.$ac_ext <<_ACEOF 9389 9429 -#line 11284 "configure" 9390 +#line 11 691"configure"9430 +#line 11709 "configure" 9391 9431 #include "confdefs.h" 9392 9432 #include <string.h> 9393 9433 9394 @@ -11299,7 +117 06,7 @@9434 @@ -11299,7 +11724,7 @@ 9395 9435 if test $ac_cv_header_stdc = yes; then 9396 9436 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 9397 9437 cat >conftest.$ac_ext <<_ACEOF 9398 9438 -#line 11302 "configure" 9399 +#line 117 09"configure"9439 +#line 11727 "configure" 9400 9440 #include "confdefs.h" 9401 9441 #include <stdlib.h> 9402 9442 9403 @@ -11320,7 +117 27,7 @@9443 @@ -11320,7 +11745,7 @@ 9404 9444 : 9405 9445 else 9406 9446 cat >conftest.$ac_ext <<_ACEOF 9407 9447 -#line 11323 "configure" 9408 +#line 117 30"configure"9448 +#line 11748 "configure" 9409 9449 #include "confdefs.h" 9410 9450 #include <ctype.h> 9411 9451 #if ((' ' & 0x0FF) == 0x020) 9412 @@ -11346,15 +117 53,15 @@9452 @@ -11346,15 +11771,15 @@ 9413 9453 } 9414 9454 _ACEOF 9415 9455 rm -f conftest$ac_exeext 9416 9456 -if { (eval echo "$as_me:11349: \"$ac_link\"") >&5 9417 +if { (eval echo "$as_me:117 56: \"$ac_link\"") >&59457 +if { (eval echo "$as_me:11774: \"$ac_link\"") >&5 9418 9458 (eval $ac_link) 2>&5 9419 9459 ac_status=$? 9420 9460 - echo "$as_me:11352: \$? = $ac_status" >&5 9421 + echo "$as_me:117 59: \$? = $ac_status" >&59461 + echo "$as_me:11777: \$? = $ac_status" >&5 9422 9462 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 9423 9463 - { (eval echo "$as_me:11354: \"$ac_try\"") >&5 9424 + { (eval echo "$as_me:117 61: \"$ac_try\"") >&59464 + { (eval echo "$as_me:11779: \"$ac_try\"") >&5 9425 9465 (eval $ac_try) 2>&5 9426 9466 ac_status=$? 9427 9467 - echo "$as_me:11357: \$? = $ac_status" >&5 9428 + echo "$as_me:117 64: \$? = $ac_status" >&59468 + echo "$as_me:11782: \$? = $ac_status" >&5 9429 9469 (exit $ac_status); }; }; then 9430 9470 : 9431 9471 else 9432 @@ -11367,7 +117 74,7 @@9472 @@ -11367,7 +11792,7 @@ 9433 9473 fi 9434 9474 fi 9435 9475 fi 9436 9476 -echo "$as_me:11370: result: $ac_cv_header_stdc" >&5 9437 +echo "$as_me:117 77: result: $ac_cv_header_stdc" >&59477 +echo "$as_me:11795: result: $ac_cv_header_stdc" >&5 9438 9478 echo "${ECHO_T}$ac_cv_header_stdc" >&6 9439 9479 if test $ac_cv_header_stdc = yes; then 9440 9480 9441 @@ -11380,13 +11 787,13 @@9481 @@ -11380,13 +11805,13 @@ 9442 9482 ac_header_dirent=no 9443 9483 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do 9444 9484 as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` 9445 9485 -echo "$as_me:11383: checking for $ac_hdr that defines DIR" >&5 9446 +echo "$as_me:11 790: checking for $ac_hdr that defines DIR" >&59486 +echo "$as_me:11808: checking for $ac_hdr that defines DIR" >&5 9447 9487 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 9448 9488 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 9451 9491 cat >conftest.$ac_ext <<_ACEOF 9452 9492 -#line 11389 "configure" 9453 +#line 11 796"configure"9493 +#line 11814 "configure" 9454 9494 #include "confdefs.h" 9455 9495 #include <sys/types.h> 9456 9496 #include <$ac_hdr> 9457 @@ -11401,16 +118 08,16 @@9497 @@ -11401,16 +11826,16 @@ 9458 9498 } 9459 9499 _ACEOF 9460 9500 rm -f conftest.$ac_objext 9461 9501 -if { (eval echo "$as_me:11404: \"$ac_compile\"") >&5 9462 +if { (eval echo "$as_me:118 11: \"$ac_compile\"") >&59502 +if { (eval echo "$as_me:11829: \"$ac_compile\"") >&5 9463 9503 (eval $ac_compile) 2>&5 9464 9504 ac_status=$? 9465 9505 - echo "$as_me:11407: \$? = $ac_status" >&5 9466 + echo "$as_me:118 14: \$? = $ac_status" >&59506 + echo "$as_me:11832: \$? = $ac_status" >&5 9467 9507 (exit $ac_status); } && 9468 9508 { ac_try='test -s conftest.$ac_objext' 9469 9509 - { (eval echo "$as_me:11410: \"$ac_try\"") >&5 9470 + { (eval echo "$as_me:118 17: \"$ac_try\"") >&59510 + { (eval echo "$as_me:11835: \"$ac_try\"") >&5 9471 9511 (eval $ac_try) 2>&5 9472 9512 ac_status=$? 9473 9513 - echo "$as_me:11413: \$? = $ac_status" >&5 9474 + echo "$as_me:118 20: \$? = $ac_status" >&59514 + echo "$as_me:11838: \$? = $ac_status" >&5 9475 9515 (exit $ac_status); }; }; then 9476 9516 eval "$as_ac_Header=yes" 9477 9517 else 9478 @@ -11420,7 +118 27,7 @@9518 @@ -11420,7 +11845,7 @@ 9479 9519 fi 9480 9520 rm -f conftest.$ac_objext conftest.$ac_ext 9481 9521 fi 9482 9522 -echo "$as_me:11423: result: `eval echo '${'$as_ac_Header'}'`" >&5 9483 +echo "$as_me:118 30: result: `eval echo '${'$as_ac_Header'}'`" >&59523 +echo "$as_me:11848: result: `eval echo '${'$as_ac_Header'}'`" >&5 9484 9524 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 9485 9525 if test `eval echo '${'$as_ac_Header'}'` = yes; then 9486 9526 cat >>confdefs.h <<EOF 9487 @@ -11433,7 +118 40,7 @@9527 @@ -11433,7 +11858,7 @@ 9488 9528 done 9489 9529 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. 9490 9530 if test $ac_header_dirent = dirent.h; then 9491 9531 - echo "$as_me:11436: checking for opendir in -ldir" >&5 9492 + echo "$as_me:118 43: checking for opendir in -ldir" >&59532 + echo "$as_me:11861: checking for opendir in -ldir" >&5 9493 9533 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 9494 9534 if test "${ac_cv_lib_dir_opendir+set}" = set; then 9495 9535 echo $ECHO_N "(cached) $ECHO_C" >&6 9496 @@ -11441,7 +118 48,7 @@9536 @@ -11441,7 +11866,7 @@ 9497 9537 ac_check_lib_save_LIBS=$LIBS 9498 9538 LIBS="-ldir $LIBS" 9499 9539 cat >conftest.$ac_ext <<_ACEOF 9500 9540 -#line 11444 "configure" 9501 +#line 118 51"configure"9541 +#line 11869 "configure" 9502 9542 #include "confdefs.h" 9503 9543 9504 9544 /* Override any gcc2 internal prototype to avoid an error. */ 9505 @@ -11460,16 +118 67,16 @@9545 @@ -11460,16 +11885,16 @@ 9506 9546 } 9507 9547 _ACEOF 9508 9548 rm -f conftest.$ac_objext conftest$ac_exeext 9509 9549 -if { (eval echo "$as_me:11463: \"$ac_link\"") >&5 9510 +if { (eval echo "$as_me:118 70: \"$ac_link\"") >&59550 +if { (eval echo "$as_me:11888: \"$ac_link\"") >&5 9511 9551 (eval $ac_link) 2>&5 9512 9552 ac_status=$? 9513 9553 - echo "$as_me:11466: \$? = $ac_status" >&5 9514 + echo "$as_me:118 73: \$? = $ac_status" >&59554 + echo "$as_me:11891: \$? = $ac_status" >&5 9515 9555 (exit $ac_status); } && 9516 9556 { ac_try='test -s conftest$ac_exeext' 9517 9557 - { (eval echo "$as_me:11469: \"$ac_try\"") >&5 9518 + { (eval echo "$as_me:118 76: \"$ac_try\"") >&59558 + { (eval echo "$as_me:11894: \"$ac_try\"") >&5 9519 9559 (eval $ac_try) 2>&5 9520 9560 ac_status=$? 9521 9561 - echo "$as_me:11472: \$? = $ac_status" >&5 9522 + echo "$as_me:118 79: \$? = $ac_status" >&59562 + echo "$as_me:11897: \$? = $ac_status" >&5 9523 9563 (exit $ac_status); }; }; then 9524 9564 ac_cv_lib_dir_opendir=yes 9525 9565 else 9526 @@ -11480,14 +11 887,14 @@9566 @@ -11480,14 +11905,14 @@ 9527 9567 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 9528 9568 LIBS=$ac_check_lib_save_LIBS 9529 9569 fi 9530 9570 -echo "$as_me:11483: result: $ac_cv_lib_dir_opendir" >&5 9531 +echo "$as_me:11 890: result: $ac_cv_lib_dir_opendir" >&59571 +echo "$as_me:11908: result: $ac_cv_lib_dir_opendir" >&5 9532 9572 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 9533 9573 if test $ac_cv_lib_dir_opendir = yes; then … … 9537 9577 else 9538 9578 - echo "$as_me:11490: checking for opendir in -lx" >&5 9539 + echo "$as_me:11 897: checking for opendir in -lx" >&59579 + echo "$as_me:11915: checking for opendir in -lx" >&5 9540 9580 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 9541 9581 if test "${ac_cv_lib_x_opendir+set}" = set; then 9542 9582 echo $ECHO_N "(cached) $ECHO_C" >&6 9543 @@ -11495,7 +119 02,7 @@9583 @@ -11495,7 +11920,7 @@ 9544 9584 ac_check_lib_save_LIBS=$LIBS 9545 9585 LIBS="-lx $LIBS" 9546 9586 cat >conftest.$ac_ext <<_ACEOF 9547 9587 -#line 11498 "configure" 9548 +#line 119 05"configure"9588 +#line 11923 "configure" 9549 9589 #include "confdefs.h" 9550 9590 9551 9591 /* Override any gcc2 internal prototype to avoid an error. */ 9552 @@ -11514,16 +119 21,16 @@9592 @@ -11514,16 +11939,16 @@ 9553 9593 } 9554 9594 _ACEOF 9555 9595 rm -f conftest.$ac_objext conftest$ac_exeext 9556 9596 -if { (eval echo "$as_me:11517: \"$ac_link\"") >&5 9557 +if { (eval echo "$as_me:119 24: \"$ac_link\"") >&59597 +if { (eval echo "$as_me:11942: \"$ac_link\"") >&5 9558 9598 (eval $ac_link) 2>&5 9559 9599 ac_status=$? 9560 9600 - echo "$as_me:11520: \$? = $ac_status" >&5 9561 + echo "$as_me:119 27: \$? = $ac_status" >&59601 + echo "$as_me:11945: \$? = $ac_status" >&5 9562 9602 (exit $ac_status); } && 9563 9603 { ac_try='test -s conftest$ac_exeext' 9564 9604 - { (eval echo "$as_me:11523: \"$ac_try\"") >&5 9565 + { (eval echo "$as_me:119 30: \"$ac_try\"") >&59605 + { (eval echo "$as_me:11948: \"$ac_try\"") >&5 9566 9606 (eval $ac_try) 2>&5 9567 9607 ac_status=$? 9568 9608 - echo "$as_me:11526: \$? = $ac_status" >&5 9569 + echo "$as_me:119 33: \$? = $ac_status" >&59609 + echo "$as_me:11951: \$? = $ac_status" >&5 9570 9610 (exit $ac_status); }; }; then 9571 9611 ac_cv_lib_x_opendir=yes 9572 9612 else 9573 @@ -11534,7 +119 41,7 @@9613 @@ -11534,7 +11959,7 @@ 9574 9614 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 9575 9615 LIBS=$ac_check_lib_save_LIBS 9576 9616 fi 9577 9617 -echo "$as_me:11537: result: $ac_cv_lib_x_opendir" >&5 9578 +echo "$as_me:119 44: result: $ac_cv_lib_x_opendir" >&59618 +echo "$as_me:11962: result: $ac_cv_lib_x_opendir" >&5 9579 9619 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 9580 9620 if test $ac_cv_lib_x_opendir = yes; then 9581 9621 LIBS="$LIBS -lx" 9582 @@ -11542,13 +119 49,13 @@9622 @@ -11542,13 +11967,13 @@ 9583 9623 9584 9624 fi 9585 9625 9586 9626 -echo "$as_me:11545: checking whether time.h and sys/time.h may both be included" >&5 9587 +echo "$as_me:119 52: checking whether time.h and sys/time.h may both be included" >&59627 +echo "$as_me:11970: checking whether time.h and sys/time.h may both be included" >&5 9588 9628 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 9589 9629 if test "${ac_cv_header_time+set}" = set; then … … 9592 9632 cat >conftest.$ac_ext <<_ACEOF 9593 9633 -#line 11551 "configure" 9594 +#line 119 58"configure"9634 +#line 11976 "configure" 9595 9635 #include "confdefs.h" 9596 9636 #include <sys/types.h> 9597 9637 #include <sys/time.h> 9598 @@ -11564,16 +119 71,16 @@9638 @@ -11564,16 +11989,16 @@ 9599 9639 } 9600 9640 _ACEOF 9601 9641 rm -f conftest.$ac_objext 9602 9642 -if { (eval echo "$as_me:11567: \"$ac_compile\"") >&5 9603 +if { (eval echo "$as_me:119 74: \"$ac_compile\"") >&59643 +if { (eval echo "$as_me:11992: \"$ac_compile\"") >&5 9604 9644 (eval $ac_compile) 2>&5 9605 9645 ac_status=$? 9606 9646 - echo "$as_me:11570: \$? = $ac_status" >&5 9607 + echo "$as_me:119 77: \$? = $ac_status" >&59647 + echo "$as_me:11995: \$? = $ac_status" >&5 9608 9648 (exit $ac_status); } && 9609 9649 { ac_try='test -s conftest.$ac_objext' 9610 9650 - { (eval echo "$as_me:11573: \"$ac_try\"") >&5 9611 + { (eval echo "$as_me:119 80: \"$ac_try\"") >&59651 + { (eval echo "$as_me:11998: \"$ac_try\"") >&5 9612 9652 (eval $ac_try) 2>&5 9613 9653 ac_status=$? 9614 9654 - echo "$as_me:11576: \$? = $ac_status" >&5 9615 + echo "$as_me:1 1983: \$? = $ac_status" >&59655 + echo "$as_me:12001: \$? = $ac_status" >&5 9616 9656 (exit $ac_status); }; }; then 9617 9657 ac_cv_header_time=yes 9618 9658 else 9619 @@ -11583,7 +1 1990,7 @@9659 @@ -11583,7 +12008,7 @@ 9620 9660 fi 9621 9661 rm -f conftest.$ac_objext conftest.$ac_ext 9622 9662 fi 9623 9663 -echo "$as_me:11586: result: $ac_cv_header_time" >&5 9624 +echo "$as_me:1 1993: result: $ac_cv_header_time" >&59664 +echo "$as_me:12011: result: $ac_cv_header_time" >&5 9625 9665 echo "${ECHO_T}$ac_cv_header_time" >&6 9626 9666 if test $ac_cv_header_time = yes; then 9627 9667 9628 @@ -11593,14 +120 00,14 @@9668 @@ -11593,14 +12018,14 @@ 9629 9669 9630 9670 fi 9631 9671 9632 9672 -echo "$as_me:11596: checking for regular-expression headers" >&5 9633 +echo "$as_me:120 03: checking for regular-expression headers" >&59673 +echo "$as_me:12021: checking for regular-expression headers" >&5 9634 9674 echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6 9635 9675 if test "${cf_cv_regex+set}" = set; then … … 9639 9679 cat >conftest.$ac_ext <<_ACEOF 9640 9680 -#line 11603 "configure" 9641 +#line 120 10"configure"9681 +#line 12028 "configure" 9642 9682 #include "confdefs.h" 9643 9683 #include <sys/types.h> 9644 9684 #include <regex.h> 9645 @@ -11618,16 +120 25,16 @@9685 @@ -11618,16 +12043,16 @@ 9646 9686 } 9647 9687 _ACEOF 9648 9688 rm -f conftest.$ac_objext conftest$ac_exeext 9649 9689 -if { (eval echo "$as_me:11621: \"$ac_link\"") >&5 9650 +if { (eval echo "$as_me:120 28: \"$ac_link\"") >&59690 +if { (eval echo "$as_me:12046: \"$ac_link\"") >&5 9651 9691 (eval $ac_link) 2>&5 9652 9692 ac_status=$? 9653 9693 - echo "$as_me:11624: \$? = $ac_status" >&5 9654 + echo "$as_me:120 31: \$? = $ac_status" >&59694 + echo "$as_me:12049: \$? = $ac_status" >&5 9655 9695 (exit $ac_status); } && 9656 9696 { ac_try='test -s conftest$ac_exeext' 9657 9697 - { (eval echo "$as_me:11627: \"$ac_try\"") >&5 9658 + { (eval echo "$as_me:120 34: \"$ac_try\"") >&59698 + { (eval echo "$as_me:12052: \"$ac_try\"") >&5 9659 9699 (eval $ac_try) 2>&5 9660 9700 ac_status=$? 9661 9701 - echo "$as_me:11630: \$? = $ac_status" >&5 9662 + echo "$as_me:120 37: \$? = $ac_status" >&59702 + echo "$as_me:12055: \$? = $ac_status" >&5 9663 9703 (exit $ac_status); }; }; then 9664 9704 cf_cv_regex="regex.h" 9665 9705 else 9666 @@ -11635,7 +120 42,7 @@9706 @@ -11635,7 +12060,7 @@ 9667 9707 cat conftest.$ac_ext >&5 9668 9708 9669 9709 cat >conftest.$ac_ext <<_ACEOF 9670 9710 -#line 11638 "configure" 9671 +#line 120 45"configure"9711 +#line 12063 "configure" 9672 9712 #include "confdefs.h" 9673 9713 #include <regexp.h> 9674 9714 int 9675 @@ -11650,16 +120 57,16 @@9715 @@ -11650,16 +12075,16 @@ 9676 9716 } 9677 9717 _ACEOF 9678 9718 rm -f conftest.$ac_objext conftest$ac_exeext 9679 9719 -if { (eval echo "$as_me:11653: \"$ac_link\"") >&5 9680 +if { (eval echo "$as_me:120 60: \"$ac_link\"") >&59720 +if { (eval echo "$as_me:12078: \"$ac_link\"") >&5 9681 9721 (eval $ac_link) 2>&5 9682 9722 ac_status=$? 9683 9723 - echo "$as_me:11656: \$? = $ac_status" >&5 9684 + echo "$as_me:120 63: \$? = $ac_status" >&59724 + echo "$as_me:12081: \$? = $ac_status" >&5 9685 9725 (exit $ac_status); } && 9686 9726 { ac_try='test -s conftest$ac_exeext' 9687 9727 - { (eval echo "$as_me:11659: \"$ac_try\"") >&5 9688 + { (eval echo "$as_me:120 66: \"$ac_try\"") >&59728 + { (eval echo "$as_me:12084: \"$ac_try\"") >&5 9689 9729 (eval $ac_try) 2>&5 9690 9730 ac_status=$? 9691 9731 - echo "$as_me:11662: \$? = $ac_status" >&5 9692 + echo "$as_me:120 69: \$? = $ac_status" >&59732 + echo "$as_me:12087: \$? = $ac_status" >&5 9693 9733 (exit $ac_status); }; }; then 9694 9734 cf_cv_regex="regexp.h" 9695 9735 else 9696 @@ -11669,7 +120 76,7 @@9736 @@ -11669,7 +12094,7 @@ 9697 9737 cf_save_LIBS="$LIBS" 9698 9738 LIBS="-lgen $LIBS" 9699 9739 cat >conftest.$ac_ext <<_ACEOF 9700 9740 -#line 11672 "configure" 9701 +#line 120 79"configure"9741 +#line 12097 "configure" 9702 9742 #include "confdefs.h" 9703 9743 #include <regexpr.h> 9704 9744 int 9705 @@ -11684,16 +12 091,16 @@9745 @@ -11684,16 +12109,16 @@ 9706 9746 } 9707 9747 _ACEOF 9708 9748 rm -f conftest.$ac_objext conftest$ac_exeext 9709 9749 -if { (eval echo "$as_me:11687: \"$ac_link\"") >&5 9710 +if { (eval echo "$as_me:12 094: \"$ac_link\"") >&59750 +if { (eval echo "$as_me:12112: \"$ac_link\"") >&5 9711 9751 (eval $ac_link) 2>&5 9712 9752 ac_status=$? 9713 9753 - echo "$as_me:11690: \$? = $ac_status" >&5 9714 + echo "$as_me:12 097: \$? = $ac_status" >&59754 + echo "$as_me:12115: \$? = $ac_status" >&5 9715 9755 (exit $ac_status); } && 9716 9756 { ac_try='test -s conftest$ac_exeext' 9717 9757 - { (eval echo "$as_me:11693: \"$ac_try\"") >&5 9718 + { (eval echo "$as_me:121 00: \"$ac_try\"") >&59758 + { (eval echo "$as_me:12118: \"$ac_try\"") >&5 9719 9759 (eval $ac_try) 2>&5 9720 9760 ac_status=$? 9721 9761 - echo "$as_me:11696: \$? = $ac_status" >&5 9722 + echo "$as_me:121 03: \$? = $ac_status" >&59762 + echo "$as_me:12121: \$? = $ac_status" >&5 9723 9763 (exit $ac_status); }; }; then 9724 9764 cf_cv_regex="regexpr.h" 9725 9765 else 9726 @@ -11709,7 +121 16,7 @@9766 @@ -11709,7 +12134,7 @@ 9727 9767 9728 9768 fi 9729 9769 9730 9770 -echo "$as_me:11712: result: $cf_cv_regex" >&5 9731 +echo "$as_me:121 19: result: $cf_cv_regex" >&59771 +echo "$as_me:12137: result: $cf_cv_regex" >&5 9732 9772 echo "${ECHO_T}$cf_cv_regex" >&6 9733 9773 case $cf_cv_regex in 9734 9774 regex.h) cat >>confdefs.h <<\EOF 9735 @@ -11745,23 +121 52,23 @@9775 @@ -11745,23 +12170,23 @@ 9736 9776 9737 9777 do 9738 9778 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 9739 9779 -echo "$as_me:11748: checking for $ac_header" >&5 9740 +echo "$as_me:121 55: checking for $ac_header" >&59780 +echo "$as_me:12173: checking for $ac_header" >&5 9741 9781 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 9742 9782 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 9745 9785 cat >conftest.$ac_ext <<_ACEOF 9746 9786 -#line 11754 "configure" 9747 +#line 121 61"configure"9787 +#line 12179 "configure" 9748 9788 #include "confdefs.h" 9749 9789 #include <$ac_header> 9750 9790 _ACEOF 9751 9791 -if { (eval echo "$as_me:11758: \"$ac_cpp conftest.$ac_ext\"") >&5 9752 +if { (eval echo "$as_me:121 65: \"$ac_cpp conftest.$ac_ext\"") >&59792 +if { (eval echo "$as_me:12183: \"$ac_cpp conftest.$ac_ext\"") >&5 9753 9793 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 9754 9794 ac_status=$? … … 9757 9797 cat conftest.err >&5 9758 9798 - echo "$as_me:11764: \$? = $ac_status" >&5 9759 + echo "$as_me:121 71: \$? = $ac_status" >&59799 + echo "$as_me:12189: \$? = $ac_status" >&5 9760 9800 (exit $ac_status); } >/dev/null; then 9761 9801 if test -s conftest.err; then 9762 9802 ac_cpp_err=$ac_c_preproc_warn_flag 9763 @@ -11780,7 +12 187,7 @@9803 @@ -11780,7 +12205,7 @@ 9764 9804 fi 9765 9805 rm -f conftest.err conftest.$ac_ext 9766 9806 fi 9767 9807 -echo "$as_me:11783: result: `eval echo '${'$as_ac_Header'}'`" >&5 9768 +echo "$as_me:12 190: result: `eval echo '${'$as_ac_Header'}'`" >&59808 +echo "$as_me:12208: result: `eval echo '${'$as_ac_Header'}'`" >&5 9769 9809 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 9770 9810 if test `eval echo '${'$as_ac_Header'}'` = yes; then 9771 9811 cat >>confdefs.h <<EOF 9772 @@ -11794,7 +122 01,7 @@9812 @@ -11794,7 +12219,7 @@ 9773 9813 # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set 9774 9814 if test "$ISC" = yes ; then 9775 9815 9776 9816 -echo "$as_me:11797: checking for main in -lcposix" >&5 9777 +echo "$as_me:122 04: checking for main in -lcposix" >&59817 +echo "$as_me:12222: checking for main in -lcposix" >&5 9778 9818 echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6 9779 9819 if test "${ac_cv_lib_cposix_main+set}" = set; then 9780 9820 echo $ECHO_N "(cached) $ECHO_C" >&6 9781 @@ -11802,7 +122 09,7 @@9821 @@ -11802,7 +12227,7 @@ 9782 9822 ac_check_lib_save_LIBS=$LIBS 9783 9823 LIBS="-lcposix $LIBS" 9784 9824 cat >conftest.$ac_ext <<_ACEOF 9785 9825 -#line 11805 "configure" 9786 +#line 122 12"configure"9826 +#line 12230 "configure" 9787 9827 #include "confdefs.h" 9788 9828 9789 9829 int 9790 @@ -11814,16 +122 21,16 @@9830 @@ -11814,16 +12239,16 @@ 9791 9831 } 9792 9832 _ACEOF 9793 9833 rm -f conftest.$ac_objext conftest$ac_exeext 9794 9834 -if { (eval echo "$as_me:11817: \"$ac_link\"") >&5 9795 +if { (eval echo "$as_me:122 24: \"$ac_link\"") >&59835 +if { (eval echo "$as_me:12242: \"$ac_link\"") >&5 9796 9836 (eval $ac_link) 2>&5 9797 9837 ac_status=$? 9798 9838 - echo "$as_me:11820: \$? = $ac_status" >&5 9799 + echo "$as_me:122 27: \$? = $ac_status" >&59839 + echo "$as_me:12245: \$? = $ac_status" >&5 9800 9840 (exit $ac_status); } && 9801 9841 { ac_try='test -s conftest$ac_exeext' 9802 9842 - { (eval echo "$as_me:11823: \"$ac_try\"") >&5 9803 + { (eval echo "$as_me:122 30: \"$ac_try\"") >&59843 + { (eval echo "$as_me:12248: \"$ac_try\"") >&5 9804 9844 (eval $ac_try) 2>&5 9805 9845 ac_status=$? 9806 9846 - echo "$as_me:11826: \$? = $ac_status" >&5 9807 + echo "$as_me:122 33: \$? = $ac_status" >&59847 + echo "$as_me:12251: \$? = $ac_status" >&5 9808 9848 (exit $ac_status); }; }; then 9809 9849 ac_cv_lib_cposix_main=yes 9810 9850 else 9811 @@ -11834,7 +122 41,7 @@9851 @@ -11834,7 +12259,7 @@ 9812 9852 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 9813 9853 LIBS=$ac_check_lib_save_LIBS 9814 9854 fi 9815 9855 -echo "$as_me:11837: result: $ac_cv_lib_cposix_main" >&5 9816 +echo "$as_me:122 44: result: $ac_cv_lib_cposix_main" >&59856 +echo "$as_me:12262: result: $ac_cv_lib_cposix_main" >&5 9817 9857 echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6 9818 9858 if test $ac_cv_lib_cposix_main = yes; then 9819 9859 cat >>confdefs.h <<EOF 9820 @@ -11845,7 +122 52,7 @@9860 @@ -11845,7 +12270,7 @@ 9821 9861 9822 9862 fi 9823 9863 9824 9864 - echo "$as_me:11848: checking for bzero in -linet" >&5 9825 + echo "$as_me:122 55: checking for bzero in -linet" >&59865 + echo "$as_me:12273: checking for bzero in -linet" >&5 9826 9866 echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6 9827 9867 if test "${ac_cv_lib_inet_bzero+set}" = set; then 9828 9868 echo $ECHO_N "(cached) $ECHO_C" >&6 9829 @@ -11853,7 +122 60,7 @@9869 @@ -11853,7 +12278,7 @@ 9830 9870 ac_check_lib_save_LIBS=$LIBS 9831 9871 LIBS="-linet $LIBS" 9832 9872 cat >conftest.$ac_ext <<_ACEOF 9833 9873 -#line 11856 "configure" 9834 +#line 122 63"configure"9874 +#line 12281 "configure" 9835 9875 #include "confdefs.h" 9836 9876 9837 9877 /* Override any gcc2 internal prototype to avoid an error. */ 9838 @@ -11872,16 +122 79,16 @@9878 @@ -11872,16 +12297,16 @@ 9839 9879 } 9840 9880 _ACEOF 9841 9881 rm -f conftest.$ac_objext conftest$ac_exeext 9842 9882 -if { (eval echo "$as_me:11875: \"$ac_link\"") >&5 9843 +if { (eval echo "$as_me:12 282: \"$ac_link\"") >&59883 +if { (eval echo "$as_me:12300: \"$ac_link\"") >&5 9844 9884 (eval $ac_link) 2>&5 9845 9885 ac_status=$? 9846 9886 - echo "$as_me:11878: \$? = $ac_status" >&5 9847 + echo "$as_me:12 285: \$? = $ac_status" >&59887 + echo "$as_me:12303: \$? = $ac_status" >&5 9848 9888 (exit $ac_status); } && 9849 9889 { ac_try='test -s conftest$ac_exeext' 9850 9890 - { (eval echo "$as_me:11881: \"$ac_try\"") >&5 9851 + { (eval echo "$as_me:12 288: \"$ac_try\"") >&59891 + { (eval echo "$as_me:12306: \"$ac_try\"") >&5 9852 9892 (eval $ac_try) 2>&5 9853 9893 ac_status=$? 9854 9894 - echo "$as_me:11884: \$? = $ac_status" >&5 9855 + echo "$as_me:12 291: \$? = $ac_status" >&59895 + echo "$as_me:12309: \$? = $ac_status" >&5 9856 9896 (exit $ac_status); }; }; then 9857 9897 ac_cv_lib_inet_bzero=yes 9858 9898 else 9859 @@ -11892,21 +12 299,21 @@9899 @@ -11892,21 +12317,21 @@ 9860 9900 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 9861 9901 LIBS=$ac_check_lib_save_LIBS 9862 9902 fi 9863 9903 -echo "$as_me:11895: result: $ac_cv_lib_inet_bzero" >&5 9864 +echo "$as_me:123 02: result: $ac_cv_lib_inet_bzero" >&59904 +echo "$as_me:12320: result: $ac_cv_lib_inet_bzero" >&5 9865 9905 echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6 9866 9906 if test $ac_cv_lib_inet_bzero = yes; then … … 9870 9910 9871 9911 -echo "$as_me:11902: checking if sys/time.h works with sys/select.h" >&5 9872 +echo "$as_me:123 09: checking if sys/time.h works with sys/select.h" >&59912 +echo "$as_me:12327: checking if sys/time.h works with sys/select.h" >&5 9873 9913 echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6 9874 9914 if test "${cf_cv_sys_time_select+set}" = set; then … … 9878 9918 cat >conftest.$ac_ext <<_ACEOF 9879 9919 -#line 11909 "configure" 9880 +#line 123 16"configure"9920 +#line 12334 "configure" 9881 9921 #include "confdefs.h" 9882 9922 9883 9923 #include <sys/types.h> 9884 @@ -11926,16 +123 33,16 @@9924 @@ -11926,16 +12351,16 @@ 9885 9925 } 9886 9926 _ACEOF 9887 9927 rm -f conftest.$ac_objext 9888 9928 -if { (eval echo "$as_me:11929: \"$ac_compile\"") >&5 9889 +if { (eval echo "$as_me:123 36: \"$ac_compile\"") >&59929 +if { (eval echo "$as_me:12354: \"$ac_compile\"") >&5 9890 9930 (eval $ac_compile) 2>&5 9891 9931 ac_status=$? 9892 9932 - echo "$as_me:11932: \$? = $ac_status" >&5 9893 + echo "$as_me:123 39: \$? = $ac_status" >&59933 + echo "$as_me:12357: \$? = $ac_status" >&5 9894 9934 (exit $ac_status); } && 9895 9935 { ac_try='test -s conftest.$ac_objext' 9896 9936 - { (eval echo "$as_me:11935: \"$ac_try\"") >&5 9897 + { (eval echo "$as_me:123 42: \"$ac_try\"") >&59937 + { (eval echo "$as_me:12360: \"$ac_try\"") >&5 9898 9938 (eval $ac_try) 2>&5 9899 9939 ac_status=$? 9900 9940 - echo "$as_me:11938: \$? = $ac_status" >&5 9901 + echo "$as_me:123 45: \$? = $ac_status" >&59941 + echo "$as_me:12363: \$? = $ac_status" >&5 9902 9942 (exit $ac_status); }; }; then 9903 9943 cf_cv_sys_time_select=yes 9904 9944 else 9905 @@ -11947,7 +123 54,7 @@9945 @@ -11947,7 +12372,7 @@ 9906 9946 9907 9947 fi 9908 9948 9909 9949 -echo "$as_me:11950: result: $cf_cv_sys_time_select" >&5 9910 +echo "$as_me:123 57: result: $cf_cv_sys_time_select" >&59950 +echo "$as_me:12375: result: $cf_cv_sys_time_select" >&5 9911 9951 echo "${ECHO_T}$cf_cv_sys_time_select" >&6 9912 9952 test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF 9913 9953 #define HAVE_SYS_TIME_SELECT 1 9914 @@ -11961,7 +123 68,7 @@9954 @@ -11961,7 +12386,7 @@ 9915 9955 ac_compiler_gnu=$ac_cv_c_compiler_gnu 9916 9956 ac_main_return=return 9917 9957 9918 9958 -echo "$as_me:11964: checking for $CC option to accept ANSI C" >&5 9919 +echo "$as_me:123 71: checking for $CC option to accept ANSI C" >&59959 +echo "$as_me:12389: checking for $CC option to accept ANSI C" >&5 9920 9960 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 9921 9961 if test "${ac_cv_prog_cc_stdc+set}" = set; then 9922 9962 echo $ECHO_N "(cached) $ECHO_C" >&6 9923 @@ -11969,7 +123 76,7 @@9963 @@ -11969,7 +12394,7 @@ 9924 9964 ac_cv_prog_cc_stdc=no 9925 9965 ac_save_CC=$CC 9926 9966 cat >conftest.$ac_ext <<_ACEOF 9927 9967 -#line 11972 "configure" 9928 +#line 123 79"configure"9968 +#line 12397 "configure" 9929 9969 #include "confdefs.h" 9930 9970 #include <stdarg.h> 9931 9971 #include <stdio.h> 9932 @@ -12018,16 +124 25,16 @@9972 @@ -12018,16 +12443,16 @@ 9933 9973 do 9934 9974 CC="$ac_save_CC $ac_arg" 9935 9975 rm -f conftest.$ac_objext 9936 9976 -if { (eval echo "$as_me:12021: \"$ac_compile\"") >&5 9937 +if { (eval echo "$as_me:124 28: \"$ac_compile\"") >&59977 +if { (eval echo "$as_me:12446: \"$ac_compile\"") >&5 9938 9978 (eval $ac_compile) 2>&5 9939 9979 ac_status=$? 9940 9980 - echo "$as_me:12024: \$? = $ac_status" >&5 9941 + echo "$as_me:124 31: \$? = $ac_status" >&59981 + echo "$as_me:12449: \$? = $ac_status" >&5 9942 9982 (exit $ac_status); } && 9943 9983 { ac_try='test -s conftest.$ac_objext' 9944 9984 - { (eval echo "$as_me:12027: \"$ac_try\"") >&5 9945 + { (eval echo "$as_me:124 34: \"$ac_try\"") >&59985 + { (eval echo "$as_me:12452: \"$ac_try\"") >&5 9946 9986 (eval $ac_try) 2>&5 9947 9987 ac_status=$? 9948 9988 - echo "$as_me:12030: \$? = $ac_status" >&5 9949 + echo "$as_me:124 37: \$? = $ac_status" >&59989 + echo "$as_me:12455: \$? = $ac_status" >&5 9950 9990 (exit $ac_status); }; }; then 9951 9991 ac_cv_prog_cc_stdc=$ac_arg 9952 9992 break 9953 @@ -12044,21 +124 51,21 @@9993 @@ -12044,21 +12469,21 @@ 9954 9994 9955 9995 case "x$ac_cv_prog_cc_stdc" in 9956 9996 x|xno) 9957 9997 - echo "$as_me:12047: result: none needed" >&5 9958 + echo "$as_me:124 54: result: none needed" >&59998 + echo "$as_me:12472: result: none needed" >&5 9959 9999 echo "${ECHO_T}none needed" >&6 ;; 9960 10000 *) 9961 10001 - echo "$as_me:12050: result: $ac_cv_prog_cc_stdc" >&5 9962 + echo "$as_me:124 57: result: $ac_cv_prog_cc_stdc" >&510002 + echo "$as_me:12475: result: $ac_cv_prog_cc_stdc" >&5 9963 10003 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 9964 10004 CC="$CC $ac_cv_prog_cc_stdc" ;; … … 9966 10006 9967 10007 -echo "$as_me:12055: checking for an ANSI C-conforming const" >&5 9968 +echo "$as_me:124 62: checking for an ANSI C-conforming const" >&510008 +echo "$as_me:12480: checking for an ANSI C-conforming const" >&5 9969 10009 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 9970 10010 if test "${ac_cv_c_const+set}" = set; then … … 9973 10013 cat >conftest.$ac_ext <<_ACEOF 9974 10014 -#line 12061 "configure" 9975 +#line 124 68"configure"10015 +#line 12486 "configure" 9976 10016 #include "confdefs.h" 9977 10017 9978 10018 int 9979 @@ -12116,16 +125 23,16 @@10019 @@ -12116,16 +12541,16 @@ 9980 10020 } 9981 10021 _ACEOF 9982 10022 rm -f conftest.$ac_objext 9983 10023 -if { (eval echo "$as_me:12119: \"$ac_compile\"") >&5 9984 +if { (eval echo "$as_me:125 26: \"$ac_compile\"") >&510024 +if { (eval echo "$as_me:12544: \"$ac_compile\"") >&5 9985 10025 (eval $ac_compile) 2>&5 9986 10026 ac_status=$? 9987 10027 - echo "$as_me:12122: \$? = $ac_status" >&5 9988 + echo "$as_me:125 29: \$? = $ac_status" >&510028 + echo "$as_me:12547: \$? = $ac_status" >&5 9989 10029 (exit $ac_status); } && 9990 10030 { ac_try='test -s conftest.$ac_objext' 9991 10031 - { (eval echo "$as_me:12125: \"$ac_try\"") >&5 9992 + { (eval echo "$as_me:125 32: \"$ac_try\"") >&510032 + { (eval echo "$as_me:12550: \"$ac_try\"") >&5 9993 10033 (eval $ac_try) 2>&5 9994 10034 ac_status=$? 9995 10035 - echo "$as_me:12128: \$? = $ac_status" >&5 9996 + echo "$as_me:125 35: \$? = $ac_status" >&510036 + echo "$as_me:12553: \$? = $ac_status" >&5 9997 10037 (exit $ac_status); }; }; then 9998 10038 ac_cv_c_const=yes 9999 10039 else 10000 @@ -12135,7 +125 42,7 @@10040 @@ -12135,7 +12560,7 @@ 10001 10041 fi 10002 10042 rm -f conftest.$ac_objext conftest.$ac_ext 10003 10043 fi 10004 10044 -echo "$as_me:12138: result: $ac_cv_c_const" >&5 10005 +echo "$as_me:125 45: result: $ac_cv_c_const" >&510045 +echo "$as_me:12563: result: $ac_cv_c_const" >&5 10006 10046 echo "${ECHO_T}$ac_cv_c_const" >&6 10007 10047 if test $ac_cv_c_const = no; then 10008 10048 10009 @@ -12145,7 +125 52,7 @@10049 @@ -12145,7 +12570,7 @@ 10010 10050 10011 10051 fi 10012 10052 10013 10053 -echo "$as_me:12148: checking for inline" >&5 10014 +echo "$as_me:125 55: checking for inline" >&510054 +echo "$as_me:12573: checking for inline" >&5 10015 10055 echo $ECHO_N "checking for inline... $ECHO_C" >&6 10016 10056 if test "${ac_cv_c_inline+set}" = set; then 10017 10057 echo $ECHO_N "(cached) $ECHO_C" >&6 10018 @@ -12153,7 +125 60,7 @@10058 @@ -12153,7 +12578,7 @@ 10019 10059 ac_cv_c_inline=no 10020 10060 for ac_kw in inline __inline__ __inline; do 10021 10061 cat >conftest.$ac_ext <<_ACEOF 10022 10062 -#line 12156 "configure" 10023 +#line 125 63"configure"10063 +#line 12581 "configure" 10024 10064 #include "confdefs.h" 10025 10065 #ifndef __cplusplus 10026 10066 static $ac_kw int static_foo () {return 0; } 10027 @@ -12162,16 +125 69,16 @@10067 @@ -12162,16 +12587,16 @@ 10028 10068 10029 10069 _ACEOF 10030 10070 rm -f conftest.$ac_objext 10031 10071 -if { (eval echo "$as_me:12165: \"$ac_compile\"") >&5 10032 +if { (eval echo "$as_me:125 72: \"$ac_compile\"") >&510072 +if { (eval echo "$as_me:12590: \"$ac_compile\"") >&5 10033 10073 (eval $ac_compile) 2>&5 10034 10074 ac_status=$? 10035 10075 - echo "$as_me:12168: \$? = $ac_status" >&5 10036 + echo "$as_me:125 75: \$? = $ac_status" >&510076 + echo "$as_me:12593: \$? = $ac_status" >&5 10037 10077 (exit $ac_status); } && 10038 10078 { ac_try='test -s conftest.$ac_objext' 10039 10079 - { (eval echo "$as_me:12171: \"$ac_try\"") >&5 10040 + { (eval echo "$as_me:125 78: \"$ac_try\"") >&510080 + { (eval echo "$as_me:12596: \"$ac_try\"") >&5 10041 10081 (eval $ac_try) 2>&5 10042 10082 ac_status=$? 10043 10083 - echo "$as_me:12174: \$? = $ac_status" >&5 10044 + echo "$as_me:125 81: \$? = $ac_status" >&510084 + echo "$as_me:12599: \$? = $ac_status" >&5 10045 10085 (exit $ac_status); }; }; then 10046 10086 ac_cv_c_inline=$ac_kw; break 10047 10087 else 10048 @@ -12182,7 +12 589,7 @@10088 @@ -12182,7 +12607,7 @@ 10049 10089 done 10050 10090 10051 10091 fi 10052 10092 -echo "$as_me:12185: result: $ac_cv_c_inline" >&5 10053 +echo "$as_me:12 592: result: $ac_cv_c_inline" >&510093 +echo "$as_me:12610: result: $ac_cv_c_inline" >&5 10054 10094 echo "${ECHO_T}$ac_cv_c_inline" >&6 10055 10095 case $ac_cv_c_inline in 10056 10096 inline | yes) ;; 10057 @@ -12205,7 +126 12,7 @@10097 @@ -12205,7 +12630,7 @@ 10058 10098 : 10059 10099 elif test "$GCC" = yes 10060 10100 then 10061 10101 - echo "$as_me:12208: checking if gcc supports options to tune inlining" >&5 10062 + echo "$as_me:126 15: checking if gcc supports options to tune inlining" >&510102 + echo "$as_me:12633: checking if gcc supports options to tune inlining" >&5 10063 10103 echo $ECHO_N "checking if gcc supports options to tune inlining... $ECHO_C" >&6 10064 10104 if test "${cf_cv_gcc_inline+set}" = set; then 10065 10105 echo $ECHO_N "(cached) $ECHO_C" >&6 10066 @@ -12214,7 +126 21,7 @@10106 @@ -12214,7 +12639,7 @@ 10067 10107 cf_save_CFLAGS=$CFLAGS 10068 10108 CFLAGS="$CFLAGS --param max-inline-insns-single=1200" 10069 10109 cat >conftest.$ac_ext <<_ACEOF 10070 10110 -#line 12217 "configure" 10071 +#line 126 24"configure"10111 +#line 12642 "configure" 10072 10112 #include "confdefs.h" 10073 10113 inline int foo(void) { return 1; } 10074 10114 int 10075 @@ -12226,16 +126 33,16 @@10115 @@ -12226,16 +12651,16 @@ 10076 10116 } 10077 10117 _ACEOF 10078 10118 rm -f conftest.$ac_objext 10079 10119 -if { (eval echo "$as_me:12229: \"$ac_compile\"") >&5 10080 +if { (eval echo "$as_me:126 36: \"$ac_compile\"") >&510120 +if { (eval echo "$as_me:12654: \"$ac_compile\"") >&5 10081 10121 (eval $ac_compile) 2>&5 10082 10122 ac_status=$? 10083 10123 - echo "$as_me:12232: \$? = $ac_status" >&5 10084 + echo "$as_me:126 39: \$? = $ac_status" >&510124 + echo "$as_me:12657: \$? = $ac_status" >&5 10085 10125 (exit $ac_status); } && 10086 10126 { ac_try='test -s conftest.$ac_objext' 10087 10127 - { (eval echo "$as_me:12235: \"$ac_try\"") >&5 10088 + { (eval echo "$as_me:126 42: \"$ac_try\"") >&510128 + { (eval echo "$as_me:12660: \"$ac_try\"") >&5 10089 10129 (eval $ac_try) 2>&5 10090 10130 ac_status=$? 10091 10131 - echo "$as_me:12238: \$? = $ac_status" >&5 10092 + echo "$as_me:126 45: \$? = $ac_status" >&510132 + echo "$as_me:12663: \$? = $ac_status" >&5 10093 10133 (exit $ac_status); }; }; then 10094 10134 cf_cv_gcc_inline=yes 10095 10135 else 10096 @@ -12247,7 +126 54,7 @@10136 @@ -12247,7 +12672,7 @@ 10097 10137 CFLAGS=$cf_save_CFLAGS 10098 10138 10099 10139 fi 10100 10140 -echo "$as_me:12250: result: $cf_cv_gcc_inline" >&5 10101 +echo "$as_me:126 57: result: $cf_cv_gcc_inline" >&510141 +echo "$as_me:12675: result: $cf_cv_gcc_inline" >&5 10102 10142 echo "${ECHO_T}$cf_cv_gcc_inline" >&6 10103 10143 if test "$cf_cv_gcc_inline" = yes ; then 10104 10144 10105 @@ -12311,7 +127 18,7 @@10145 @@ -12311,7 +12736,7 @@ 10106 10146 10107 10147 if test -n "$cf_new_cppflags" ; then … … 10112 10152 10113 10153 if test -n "$cf_new_extra_cppflags" ; then 10114 @@ -12323,7 +127 30,7 @@10154 @@ -12323,7 +12748,7 @@ 10115 10155 fi 10116 10156 fi 10117 10157 10118 10158 -echo "$as_me:12326: checking for signal global datatype" >&5 10119 +echo "$as_me:127 33: checking for signal global datatype" >&510159 +echo "$as_me:12751: checking for signal global datatype" >&5 10120 10160 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 10121 10161 if test "${cf_cv_sig_atomic_t+set}" = set; then 10122 10162 echo $ECHO_N "(cached) $ECHO_C" >&6 10123 @@ -12335,7 +127 42,7 @@10163 @@ -12335,7 +12760,7 @@ 10124 10164 "int" 10125 10165 do 10126 10166 cat >conftest.$ac_ext <<_ACEOF 10127 10167 -#line 12338 "configure" 10128 +#line 127 45"configure"10168 +#line 12763 "configure" 10129 10169 #include "confdefs.h" 10130 10170 10131 10171 #include <sys/types.h> 10132 @@ -12358,16 +127 65,16 @@10172 @@ -12358,16 +12783,16 @@ 10133 10173 } 10134 10174 _ACEOF 10135 10175 rm -f conftest.$ac_objext 10136 10176 -if { (eval echo "$as_me:12361: \"$ac_compile\"") >&5 10137 +if { (eval echo "$as_me:127 68: \"$ac_compile\"") >&510177 +if { (eval echo "$as_me:12786: \"$ac_compile\"") >&5 10138 10178 (eval $ac_compile) 2>&5 10139 10179 ac_status=$? 10140 10180 - echo "$as_me:12364: \$? = $ac_status" >&5 10141 + echo "$as_me:127 71: \$? = $ac_status" >&510181 + echo "$as_me:12789: \$? = $ac_status" >&5 10142 10182 (exit $ac_status); } && 10143 10183 { ac_try='test -s conftest.$ac_objext' 10144 10184 - { (eval echo "$as_me:12367: \"$ac_try\"") >&5 10145 + { (eval echo "$as_me:127 74: \"$ac_try\"") >&510185 + { (eval echo "$as_me:12792: \"$ac_try\"") >&5 10146 10186 (eval $ac_try) 2>&5 10147 10187 ac_status=$? 10148 10188 - echo "$as_me:12370: \$? = $ac_status" >&5 10149 + echo "$as_me:127 77: \$? = $ac_status" >&510189 + echo "$as_me:12795: \$? = $ac_status" >&5 10150 10190 (exit $ac_status); }; }; then 10151 10191 cf_cv_sig_atomic_t=$cf_type 10152 10192 else 10153 @@ -12381,7 +12 788,7 @@10193 @@ -12381,7 +12806,7 @@ 10154 10194 10155 10195 fi 10156 10196 10157 10197 -echo "$as_me:12384: result: $cf_cv_sig_atomic_t" >&5 10158 +echo "$as_me:12 791: result: $cf_cv_sig_atomic_t" >&510198 +echo "$as_me:12809: result: $cf_cv_sig_atomic_t" >&5 10159 10199 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 10160 10200 test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <<EOF 10161 10201 #define SIG_ATOMIC_T $cf_cv_sig_atomic_t 10162 @@ -12389,7 +12 796,7 @@10202 @@ -12389,7 +12814,7 @@ 10163 10203 10164 10204 if test $NCURSES_CHTYPE = auto ; then 10165 10205 10166 10206 -echo "$as_me:12392: checking for type of chtype" >&5 10167 +echo "$as_me:12 799: checking for type of chtype" >&510207 +echo "$as_me:12817: checking for type of chtype" >&5 10168 10208 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 10169 10209 if test "${cf_cv_typeof_chtype+set}" = set; then 10170 10210 echo $ECHO_N "(cached) $ECHO_C" >&6 10171 @@ -12399,7 +128 06,7 @@10211 @@ -12399,7 +12824,7 @@ 10172 10212 cf_cv_typeof_chtype=long 10173 10213 else 10174 10214 cat >conftest.$ac_ext <<_ACEOF 10175 10215 -#line 12402 "configure" 10176 +#line 128 09"configure"10216 +#line 12827 "configure" 10177 10217 #include "confdefs.h" 10178 10218 10179 10219 #define WANT_BITS 31 10180 @@ -12434,15 +128 41,15 @@10220 @@ -12434,15 +12859,15 @@ 10181 10221 10182 10222 _ACEOF 10183 10223 rm -f conftest$ac_exeext 10184 10224 -if { (eval echo "$as_me:12437: \"$ac_link\"") >&5 10185 +if { (eval echo "$as_me:128 44: \"$ac_link\"") >&510225 +if { (eval echo "$as_me:12862: \"$ac_link\"") >&5 10186 10226 (eval $ac_link) 2>&5 10187 10227 ac_status=$? 10188 10228 - echo "$as_me:12440: \$? = $ac_status" >&5 10189 + echo "$as_me:128 47: \$? = $ac_status" >&510229 + echo "$as_me:12865: \$? = $ac_status" >&5 10190 10230 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 10191 10231 - { (eval echo "$as_me:12442: \"$ac_try\"") >&5 10192 + { (eval echo "$as_me:128 49: \"$ac_try\"") >&510232 + { (eval echo "$as_me:12867: \"$ac_try\"") >&5 10193 10233 (eval $ac_try) 2>&5 10194 10234 ac_status=$? 10195 10235 - echo "$as_me:12445: \$? = $ac_status" >&5 10196 + echo "$as_me:128 52: \$? = $ac_status" >&510236 + echo "$as_me:12870: \$? = $ac_status" >&5 10197 10237 (exit $ac_status); }; }; then 10198 10238 cf_cv_typeof_chtype=`cat cf_test.out` 10199 10239 else 10200 @@ -12457,7 +128 64,7 @@10240 @@ -12457,7 +12882,7 @@ 10201 10241 10202 10242 fi 10203 10243 10204 10244 -echo "$as_me:12460: result: $cf_cv_typeof_chtype" >&5 10205 +echo "$as_me:128 67: result: $cf_cv_typeof_chtype" >&510245 +echo "$as_me:12885: result: $cf_cv_typeof_chtype" >&5 10206 10246 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 10207 10247 10208 10248 cat >>confdefs.h <<EOF 10209 @@ -12469,14 +128 76,14 @@10249 @@ -12469,14 +12894,14 @@ 10210 10250 fi 10211 10251 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype="" 10212 10252 10213 10253 -echo "$as_me:12472: checking if unsigned literals are legal" >&5 10214 +echo "$as_me:128 79: checking if unsigned literals are legal" >&510254 +echo "$as_me:12897: checking if unsigned literals are legal" >&5 10215 10255 echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6 10216 10256 if test "${cf_cv_unsigned_literals+set}" = set; then … … 10220 10260 cat >conftest.$ac_ext <<_ACEOF 10221 10261 -#line 12479 "configure" 10222 +#line 12 886"configure"10262 +#line 12904 "configure" 10223 10263 #include "confdefs.h" 10224 10264 10225 10265 int 10226 @@ -12488,16 +12 895,16 @@10266 @@ -12488,16 +12913,16 @@ 10227 10267 } 10228 10268 _ACEOF 10229 10269 rm -f conftest.$ac_objext 10230 10270 -if { (eval echo "$as_me:12491: \"$ac_compile\"") >&5 10231 +if { (eval echo "$as_me:12 898: \"$ac_compile\"") >&510271 +if { (eval echo "$as_me:12916: \"$ac_compile\"") >&5 10232 10272 (eval $ac_compile) 2>&5 10233 10273 ac_status=$? 10234 10274 - echo "$as_me:12494: \$? = $ac_status" >&5 10235 + echo "$as_me:129 01: \$? = $ac_status" >&510275 + echo "$as_me:12919: \$? = $ac_status" >&5 10236 10276 (exit $ac_status); } && 10237 10277 { ac_try='test -s conftest.$ac_objext' 10238 10278 - { (eval echo "$as_me:12497: \"$ac_try\"") >&5 10239 + { (eval echo "$as_me:129 04: \"$ac_try\"") >&510279 + { (eval echo "$as_me:12922: \"$ac_try\"") >&5 10240 10280 (eval $ac_try) 2>&5 10241 10281 ac_status=$? 10242 10282 - echo "$as_me:12500: \$? = $ac_status" >&5 10243 + echo "$as_me:129 07: \$? = $ac_status" >&510283 + echo "$as_me:12925: \$? = $ac_status" >&5 10244 10284 (exit $ac_status); }; }; then 10245 10285 cf_cv_unsigned_literals=yes 10246 10286 else 10247 @@ -12509,7 +129 16,7 @@10287 @@ -12509,7 +12934,7 @@ 10248 10288 10249 10289 fi 10250 10290 10251 10291 -echo "$as_me:12512: result: $cf_cv_unsigned_literals" >&5 10252 +echo "$as_me:129 19: result: $cf_cv_unsigned_literals" >&510292 +echo "$as_me:12937: result: $cf_cv_unsigned_literals" >&5 10253 10293 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 10254 10294 10255 10295 cf_cv_1UL="1" 10256 @@ -12525,14 +129 32,14 @@10296 @@ -12525,14 +12950,14 @@ 10257 10297 10258 10298 ### Checks for external-data 10259 10299 10260 10300 -echo "$as_me:12528: checking if external errno is declared" >&5 10261 +echo "$as_me:129 35: checking if external errno is declared" >&510301 +echo "$as_me:12953: checking if external errno is declared" >&5 10262 10302 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 10263 10303 if test "${cf_cv_dcl_errno+set}" = set; then … … 10267 10307 cat >conftest.$ac_ext <<_ACEOF 10268 10308 -#line 12535 "configure" 10269 +#line 129 42"configure"10309 +#line 12960 "configure" 10270 10310 #include "confdefs.h" 10271 10311 10272 10312 #ifdef HAVE_STDLIB_H 10273 @@ -12550,16 +129 57,16 @@10313 @@ -12550,16 +12975,16 @@ 10274 10314 } 10275 10315 _ACEOF 10276 10316 rm -f conftest.$ac_objext 10277 10317 -if { (eval echo "$as_me:12553: \"$ac_compile\"") >&5 10278 +if { (eval echo "$as_me:129 60: \"$ac_compile\"") >&510318 +if { (eval echo "$as_me:12978: \"$ac_compile\"") >&5 10279 10319 (eval $ac_compile) 2>&5 10280 10320 ac_status=$? 10281 10321 - echo "$as_me:12556: \$? = $ac_status" >&5 10282 + echo "$as_me:129 63: \$? = $ac_status" >&510322 + echo "$as_me:12981: \$? = $ac_status" >&5 10283 10323 (exit $ac_status); } && 10284 10324 { ac_try='test -s conftest.$ac_objext' 10285 10325 - { (eval echo "$as_me:12559: \"$ac_try\"") >&5 10286 + { (eval echo "$as_me:129 66: \"$ac_try\"") >&510326 + { (eval echo "$as_me:12984: \"$ac_try\"") >&5 10287 10327 (eval $ac_try) 2>&5 10288 10328 ac_status=$? 10289 10329 - echo "$as_me:12562: \$? = $ac_status" >&5 10290 + echo "$as_me:129 69: \$? = $ac_status" >&510330 + echo "$as_me:12987: \$? = $ac_status" >&5 10291 10331 (exit $ac_status); }; }; then 10292 10332 cf_cv_dcl_errno=yes 10293 10333 else 10294 @@ -12570,7 +129 77,7 @@10334 @@ -12570,7 +12995,7 @@ 10295 10335 rm -f conftest.$ac_objext conftest.$ac_ext 10296 10336 10297 10337 fi 10298 10338 -echo "$as_me:12573: result: $cf_cv_dcl_errno" >&5 10299 +echo "$as_me:129 80: result: $cf_cv_dcl_errno" >&510339 +echo "$as_me:12998: result: $cf_cv_dcl_errno" >&5 10300 10340 echo "${ECHO_T}$cf_cv_dcl_errno" >&6 10301 10341 10302 10342 if test "$cf_cv_dcl_errno" = no ; then 10303 @@ -12585,14 +1 2992,14 @@10343 @@ -12585,14 +13010,14 @@ 10304 10344 10305 10345 # It's possible (for near-UNIX clones) that the data doesn't exist 10306 10346 10307 10347 -echo "$as_me:12588: checking if external errno exists" >&5 10308 +echo "$as_me:1 2995: checking if external errno exists" >&510348 +echo "$as_me:13013: checking if external errno exists" >&5 10309 10349 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 10310 10350 if test "${cf_cv_have_errno+set}" = set; then … … 10314 10354 cat >conftest.$ac_ext <<_ACEOF 10315 10355 -#line 12595 "configure" 10316 +#line 130 02"configure"10356 +#line 13020 "configure" 10317 10357 #include "confdefs.h" 10318 10358 10319 10359 #undef errno 10320 @@ -12607,16 +130 14,16 @@10360 @@ -12607,16 +13032,16 @@ 10321 10361 } 10322 10362 _ACEOF 10323 10363 rm -f conftest.$ac_objext conftest$ac_exeext 10324 10364 -if { (eval echo "$as_me:12610: \"$ac_link\"") >&5 10325 +if { (eval echo "$as_me:130 17: \"$ac_link\"") >&510365 +if { (eval echo "$as_me:13035: \"$ac_link\"") >&5 10326 10366 (eval $ac_link) 2>&5 10327 10367 ac_status=$? 10328 10368 - echo "$as_me:12613: \$? = $ac_status" >&5 10329 + echo "$as_me:130 20: \$? = $ac_status" >&510369 + echo "$as_me:13038: \$? = $ac_status" >&5 10330 10370 (exit $ac_status); } && 10331 10371 { ac_try='test -s conftest$ac_exeext' 10332 10372 - { (eval echo "$as_me:12616: \"$ac_try\"") >&5 10333 + { (eval echo "$as_me:130 23: \"$ac_try\"") >&510373 + { (eval echo "$as_me:13041: \"$ac_try\"") >&5 10334 10374 (eval $ac_try) 2>&5 10335 10375 ac_status=$? 10336 10376 - echo "$as_me:12619: \$? = $ac_status" >&5 10337 + echo "$as_me:130 26: \$? = $ac_status" >&510377 + echo "$as_me:13044: \$? = $ac_status" >&5 10338 10378 (exit $ac_status); }; }; then 10339 10379 cf_cv_have_errno=yes 10340 10380 else 10341 @@ -12627,7 +130 34,7 @@10381 @@ -12627,7 +13052,7 @@ 10342 10382 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 10343 10383 10344 10384 fi 10345 10385 -echo "$as_me:12630: result: $cf_cv_have_errno" >&5 10346 +echo "$as_me:130 37: result: $cf_cv_have_errno" >&510386 +echo "$as_me:13055: result: $cf_cv_have_errno" >&5 10347 10387 echo "${ECHO_T}$cf_cv_have_errno" >&6 10348 10388 10349 10389 if test "$cf_cv_have_errno" = yes ; then 10350 @@ -12640,7 +130 47,7 @@10390 @@ -12640,7 +13065,7 @@ 10351 10391 10352 10392 fi 10353 10393 10354 10394 -echo "$as_me:12643: checking if data-only library module links" >&5 10355 +echo "$as_me:130 50: checking if data-only library module links" >&510395 +echo "$as_me:13068: checking if data-only library module links" >&5 10356 10396 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 10357 10397 if test "${cf_cv_link_dataonly+set}" = set; then 10358 10398 echo $ECHO_N "(cached) $ECHO_C" >&6 10359 @@ -12648,20 +130 55,20 @@10399 @@ -12648,20 +13073,20 @@ 10360 10400 10361 10401 rm -f conftest.a 10362 10402 cat >conftest.$ac_ext <<EOF 10363 10403 -#line 12651 "configure" 10364 +#line 130 58"configure"10404 +#line 13076 "configure" 10365 10405 int testdata[3] = { 123, 456, 789 }; 10366 10406 EOF 10367 10407 - if { (eval echo "$as_me:12654: \"$ac_compile\"") >&5 10368 + if { (eval echo "$as_me:130 61: \"$ac_compile\"") >&510408 + if { (eval echo "$as_me:13079: \"$ac_compile\"") >&5 10369 10409 (eval $ac_compile) 2>&5 10370 10410 ac_status=$? 10371 10411 - echo "$as_me:12657: \$? = $ac_status" >&5 10372 + echo "$as_me:130 64: \$? = $ac_status" >&510412 + echo "$as_me:13082: \$? = $ac_status" >&5 10373 10413 (exit $ac_status); } ; then 10374 10414 mv conftest.o data.o && \ … … 10379 10419 cat >conftest.$ac_ext <<EOF 10380 10420 -#line 12664 "configure" 10381 +#line 130 71"configure"10421 +#line 13089 "configure" 10382 10422 int testfunc() 10383 10423 { 10384 10424 #if defined(NeXT) 10385 @@ -12674,13 +130 81,13 @@10425 @@ -12674,13 +13099,13 @@ 10386 10426 #endif 10387 10427 } 10388 10428 EOF 10389 10429 - if { (eval echo "$as_me:12677: \"$ac_compile\"") >&5 10390 + if { (eval echo "$as_me:13 084: \"$ac_compile\"") >&510430 + if { (eval echo "$as_me:13102: \"$ac_compile\"") >&5 10391 10431 (eval $ac_compile) 2>&5 10392 10432 ac_status=$? 10393 10433 - echo "$as_me:12680: \$? = $ac_status" >&5 10394 + echo "$as_me:13 087: \$? = $ac_status" >&510434 + echo "$as_me:13105: \$? = $ac_status" >&5 10395 10435 (exit $ac_status); }; then 10396 10436 mv conftest.o func.o && \ … … 10400 10440 rm -f conftest.$ac_ext func.o 10401 10441 ( eval $RANLIB conftest.a ) 2>&5 >/dev/null 10402 @@ -12690,7 +13 097,7 @@10442 @@ -12690,7 +13115,7 @@ 10403 10443 cf_cv_link_dataonly=unknown 10404 10444 else 10405 10445 cat >conftest.$ac_ext <<_ACEOF 10406 10446 -#line 12693 "configure" 10407 +#line 131 00"configure"10447 +#line 13118 "configure" 10408 10448 #include "confdefs.h" 10409 10449 10410 10450 int main() 10411 @@ -12701,15 +131 08,15 @@10451 @@ -12701,15 +13126,15 @@ 10412 10452 10413 10453 _ACEOF 10414 10454 rm -f conftest$ac_exeext 10415 10455 -if { (eval echo "$as_me:12704: \"$ac_link\"") >&5 10416 +if { (eval echo "$as_me:131 11: \"$ac_link\"") >&510456 +if { (eval echo "$as_me:13129: \"$ac_link\"") >&5 10417 10457 (eval $ac_link) 2>&5 10418 10458 ac_status=$? 10419 10459 - echo "$as_me:12707: \$? = $ac_status" >&5 10420 + echo "$as_me:131 14: \$? = $ac_status" >&510460 + echo "$as_me:13132: \$? = $ac_status" >&5 10421 10461 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 10422 10462 - { (eval echo "$as_me:12709: \"$ac_try\"") >&5 10423 + { (eval echo "$as_me:131 16: \"$ac_try\"") >&510463 + { (eval echo "$as_me:13134: \"$ac_try\"") >&5 10424 10464 (eval $ac_try) 2>&5 10425 10465 ac_status=$? 10426 10466 - echo "$as_me:12712: \$? = $ac_status" >&5 10427 + echo "$as_me:131 19: \$? = $ac_status" >&510467 + echo "$as_me:13137: \$? = $ac_status" >&5 10428 10468 (exit $ac_status); }; }; then 10429 10469 cf_cv_link_dataonly=yes 10430 10470 else 10431 @@ -12724,7 +131 31,7 @@10471 @@ -12724,7 +13149,7 @@ 10432 10472 10433 10473 fi 10434 10474 10435 10475 -echo "$as_me:12727: result: $cf_cv_link_dataonly" >&5 10436 +echo "$as_me:131 34: result: $cf_cv_link_dataonly" >&510476 +echo "$as_me:13152: result: $cf_cv_link_dataonly" >&5 10437 10477 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 10438 10478 10439 10479 if test "$cf_cv_link_dataonly" = no ; then 10440 @@ -12759,13 +131 66,13 @@10480 @@ -12759,13 +13184,13 @@ 10441 10481 10442 10482 do 10443 10483 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 10444 10484 -echo "$as_me:12762: checking for $ac_func" >&5 10445 +echo "$as_me:131 69: checking for $ac_func" >&510485 +echo "$as_me:13187: checking for $ac_func" >&5 10446 10486 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 10447 10487 if eval "test \"\${$as_ac_var+set}\" = set"; then … … 10450 10490 cat >conftest.$ac_ext <<_ACEOF 10451 10491 -#line 12768 "configure" 10452 +#line 131 75"configure"10492 +#line 13193 "configure" 10453 10493 #include "confdefs.h" 10454 10494 /* System header to define __stub macros and hopefully few prototypes, 10455 10495 which can conflict with char $ac_func (); below. */ 10456 @@ -12796,16 +132 03,16 @@10496 @@ -12796,16 +13221,16 @@ 10457 10497 } 10458 10498 _ACEOF 10459 10499 rm -f conftest.$ac_objext conftest$ac_exeext 10460 10500 -if { (eval echo "$as_me:12799: \"$ac_link\"") >&5 10461 +if { (eval echo "$as_me:132 06: \"$ac_link\"") >&510501 +if { (eval echo "$as_me:13224: \"$ac_link\"") >&5 10462 10502 (eval $ac_link) 2>&5 10463 10503 ac_status=$? 10464 10504 - echo "$as_me:12802: \$? = $ac_status" >&5 10465 + echo "$as_me:132 09: \$? = $ac_status" >&510505 + echo "$as_me:13227: \$? = $ac_status" >&5 10466 10506 (exit $ac_status); } && 10467 10507 { ac_try='test -s conftest$ac_exeext' 10468 10508 - { (eval echo "$as_me:12805: \"$ac_try\"") >&5 10469 + { (eval echo "$as_me:132 12: \"$ac_try\"") >&510509 + { (eval echo "$as_me:13230: \"$ac_try\"") >&5 10470 10510 (eval $ac_try) 2>&5 10471 10511 ac_status=$? 10472 10512 - echo "$as_me:12808: \$? = $ac_status" >&5 10473 + echo "$as_me:132 15: \$? = $ac_status" >&510513 + echo "$as_me:13233: \$? = $ac_status" >&5 10474 10514 (exit $ac_status); }; }; then 10475 10515 eval "$as_ac_var=yes" 10476 10516 else 10477 @@ -12815,7 +132 22,7 @@10517 @@ -12815,7 +13240,7 @@ 10478 10518 fi 10479 10519 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 10480 10520 fi 10481 10521 -echo "$as_me:12818: result: `eval echo '${'$as_ac_var'}'`" >&5 10482 +echo "$as_me:132 25: result: `eval echo '${'$as_ac_var'}'`" >&510522 +echo "$as_me:13243: result: `eval echo '${'$as_ac_var'}'`" >&5 10483 10523 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 10484 10524 if test `eval echo '${'$as_ac_var'}'` = yes; then 10485 10525 cat >>confdefs.h <<EOF 10486 @@ -12827,14 +132 34,14 @@10526 @@ -12827,14 +13252,14 @@ 10487 10527 10488 10528 if test "$with_getcap" = "yes" ; then 10489 10529 10490 10530 -echo "$as_me:12830: checking for terminal-capability database functions" >&5 10491 +echo "$as_me:132 37: checking for terminal-capability database functions" >&510531 +echo "$as_me:13255: checking for terminal-capability database functions" >&5 10492 10532 echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6 10493 10533 if test "${cf_cv_cgetent+set}" = set; then … … 10497 10537 cat >conftest.$ac_ext <<_ACEOF 10498 10538 -#line 12837 "configure" 10499 +#line 132 44"configure"10539 +#line 13262 "configure" 10500 10540 #include "confdefs.h" 10501 10541 10502 10542 #include <stdlib.h> 10503 @@ -12854,16 +132 61,16 @@10543 @@ -12854,16 +13279,16 @@ 10504 10544 } 10505 10545 _ACEOF 10506 10546 rm -f conftest.$ac_objext conftest$ac_exeext 10507 10547 -if { (eval echo "$as_me:12857: \"$ac_link\"") >&5 10508 +if { (eval echo "$as_me:132 64: \"$ac_link\"") >&510548 +if { (eval echo "$as_me:13282: \"$ac_link\"") >&5 10509 10549 (eval $ac_link) 2>&5 10510 10550 ac_status=$? 10511 10551 - echo "$as_me:12860: \$? = $ac_status" >&5 10512 + echo "$as_me:132 67: \$? = $ac_status" >&510552 + echo "$as_me:13285: \$? = $ac_status" >&5 10513 10553 (exit $ac_status); } && 10514 10554 { ac_try='test -s conftest$ac_exeext' 10515 10555 - { (eval echo "$as_me:12863: \"$ac_try\"") >&5 10516 + { (eval echo "$as_me:132 70: \"$ac_try\"") >&510556 + { (eval echo "$as_me:13288: \"$ac_try\"") >&5 10517 10557 (eval $ac_try) 2>&5 10518 10558 ac_status=$? 10519 10559 - echo "$as_me:12866: \$? = $ac_status" >&5 10520 + echo "$as_me:132 73: \$? = $ac_status" >&510560 + echo "$as_me:13291: \$? = $ac_status" >&5 10521 10561 (exit $ac_status); }; }; then 10522 10562 cf_cv_cgetent=yes 10523 10563 else 10524 @@ -12875,7 +13 282,7 @@10564 @@ -12875,7 +13300,7 @@ 10525 10565 10526 10566 fi 10527 10567 10528 10568 -echo "$as_me:12878: result: $cf_cv_cgetent" >&5 10529 +echo "$as_me:13 285: result: $cf_cv_cgetent" >&510569 +echo "$as_me:13303: result: $cf_cv_cgetent" >&5 10530 10570 echo "${ECHO_T}$cf_cv_cgetent" >&6 10531 10571 test "$cf_cv_cgetent" = yes && cat >>confdefs.h <<\EOF 10532 10572 #define HAVE_BSD_CGETENT 1 10533 @@ -12883,14 +13 290,14 @@10573 @@ -12883,14 +13308,14 @@ 10534 10574 10535 10575 fi 10536 10576 10537 10577 -echo "$as_me:12886: checking for isascii" >&5 10538 +echo "$as_me:13 293: checking for isascii" >&510578 +echo "$as_me:13311: checking for isascii" >&5 10539 10579 echo $ECHO_N "checking for isascii... $ECHO_C" >&6 10540 10580 if test "${cf_cv_have_isascii+set}" = set; then … … 10544 10584 cat >conftest.$ac_ext <<_ACEOF 10545 10585 -#line 12893 "configure" 10546 +#line 133 00"configure"10586 +#line 13318 "configure" 10547 10587 #include "confdefs.h" 10548 10588 #include <ctype.h> 10549 10589 int 10550 @@ -12902,16 +133 09,16 @@10590 @@ -12902,16 +13327,16 @@ 10551 10591 } 10552 10592 _ACEOF 10553 10593 rm -f conftest.$ac_objext conftest$ac_exeext 10554 10594 -if { (eval echo "$as_me:12905: \"$ac_link\"") >&5 10555 +if { (eval echo "$as_me:133 12: \"$ac_link\"") >&510595 +if { (eval echo "$as_me:13330: \"$ac_link\"") >&5 10556 10596 (eval $ac_link) 2>&5 10557 10597 ac_status=$? 10558 10598 - echo "$as_me:12908: \$? = $ac_status" >&5 10559 + echo "$as_me:133 15: \$? = $ac_status" >&510599 + echo "$as_me:13333: \$? = $ac_status" >&5 10560 10600 (exit $ac_status); } && 10561 10601 { ac_try='test -s conftest$ac_exeext' 10562 10602 - { (eval echo "$as_me:12911: \"$ac_try\"") >&5 10563 + { (eval echo "$as_me:133 18: \"$ac_try\"") >&510603 + { (eval echo "$as_me:13336: \"$ac_try\"") >&5 10564 10604 (eval $ac_try) 2>&5 10565 10605 ac_status=$? 10566 10606 - echo "$as_me:12914: \$? = $ac_status" >&5 10567 + echo "$as_me:133 21: \$? = $ac_status" >&510607 + echo "$as_me:13339: \$? = $ac_status" >&5 10568 10608 (exit $ac_status); }; }; then 10569 10609 cf_cv_have_isascii=yes 10570 10610 else 10571 @@ -12922,17 +133 29,17 @@10611 @@ -12922,17 +13347,17 @@ 10572 10612 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 10573 10613 10574 10614 fi 10575 10615 -echo "$as_me:12925: result: $cf_cv_have_isascii" >&5 10576 +echo "$as_me:133 32: result: $cf_cv_have_isascii" >&510616 +echo "$as_me:13350: result: $cf_cv_have_isascii" >&5 10577 10617 echo "${ECHO_T}$cf_cv_have_isascii" >&6 10578 10618 test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF … … 10582 10622 if test "$ac_cv_func_sigaction" = yes; then 10583 10623 -echo "$as_me:12932: checking whether sigaction needs _POSIX_SOURCE" >&5 10584 +echo "$as_me:133 39: checking whether sigaction needs _POSIX_SOURCE" >&510624 +echo "$as_me:13357: checking whether sigaction needs _POSIX_SOURCE" >&5 10585 10625 echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6 10586 10626 cat >conftest.$ac_ext <<_ACEOF 10587 10627 -#line 12935 "configure" 10588 +#line 133 42"configure"10628 +#line 13360 "configure" 10589 10629 #include "confdefs.h" 10590 10630 10591 10631 #include <sys/types.h> 10592 @@ -12946,16 +133 53,16 @@10632 @@ -12946,16 +13371,16 @@ 10593 10633 } 10594 10634 _ACEOF 10595 10635 rm -f conftest.$ac_objext 10596 10636 -if { (eval echo "$as_me:12949: \"$ac_compile\"") >&5 10597 +if { (eval echo "$as_me:133 56: \"$ac_compile\"") >&510637 +if { (eval echo "$as_me:13374: \"$ac_compile\"") >&5 10598 10638 (eval $ac_compile) 2>&5 10599 10639 ac_status=$? 10600 10640 - echo "$as_me:12952: \$? = $ac_status" >&5 10601 + echo "$as_me:133 59: \$? = $ac_status" >&510641 + echo "$as_me:13377: \$? = $ac_status" >&5 10602 10642 (exit $ac_status); } && 10603 10643 { ac_try='test -s conftest.$ac_objext' 10604 10644 - { (eval echo "$as_me:12955: \"$ac_try\"") >&5 10605 + { (eval echo "$as_me:133 62: \"$ac_try\"") >&510645 + { (eval echo "$as_me:13380: \"$ac_try\"") >&5 10606 10646 (eval $ac_try) 2>&5 10607 10647 ac_status=$? 10608 10648 - echo "$as_me:12958: \$? = $ac_status" >&5 10609 + echo "$as_me:133 65: \$? = $ac_status" >&510649 + echo "$as_me:13383: \$? = $ac_status" >&5 10610 10650 (exit $ac_status); }; }; then 10611 10651 sigact_bad=no 10612 10652 else 10613 @@ -12963,7 +133 70,7 @@10653 @@ -12963,7 +13388,7 @@ 10614 10654 cat conftest.$ac_ext >&5 10615 10655 10616 10656 cat >conftest.$ac_ext <<_ACEOF 10617 10657 -#line 12966 "configure" 10618 +#line 133 73"configure"10658 +#line 13391 "configure" 10619 10659 #include "confdefs.h" 10620 10660 10621 10661 #define _POSIX_SOURCE 10622 @@ -12978,16 +13 385,16 @@10662 @@ -12978,16 +13403,16 @@ 10623 10663 } 10624 10664 _ACEOF 10625 10665 rm -f conftest.$ac_objext 10626 10666 -if { (eval echo "$as_me:12981: \"$ac_compile\"") >&5 10627 +if { (eval echo "$as_me:13 388: \"$ac_compile\"") >&510667 +if { (eval echo "$as_me:13406: \"$ac_compile\"") >&5 10628 10668 (eval $ac_compile) 2>&5 10629 10669 ac_status=$? 10630 10670 - echo "$as_me:12984: \$? = $ac_status" >&5 10631 + echo "$as_me:13 391: \$? = $ac_status" >&510671 + echo "$as_me:13409: \$? = $ac_status" >&5 10632 10672 (exit $ac_status); } && 10633 10673 { ac_try='test -s conftest.$ac_objext' 10634 10674 - { (eval echo "$as_me:12987: \"$ac_try\"") >&5 10635 + { (eval echo "$as_me:13 394: \"$ac_try\"") >&510675 + { (eval echo "$as_me:13412: \"$ac_try\"") >&5 10636 10676 (eval $ac_try) 2>&5 10637 10677 ac_status=$? 10638 10678 - echo "$as_me:12990: \$? = $ac_status" >&5 10639 + echo "$as_me:13 397: \$? = $ac_status" >&510679 + echo "$as_me:13415: \$? = $ac_status" >&5 10640 10680 (exit $ac_status); }; }; then 10641 10681 sigact_bad=yes 10642 10682 cat >>confdefs.h <<\EOF 10643 @@ -13002,11 +134 09,11 @@10683 @@ -13002,11 +13427,11 @@ 10644 10684 rm -f conftest.$ac_objext conftest.$ac_ext 10645 10685 fi 10646 10686 rm -f conftest.$ac_objext conftest.$ac_ext 10647 10687 -echo "$as_me:13005: result: $sigact_bad" >&5 10648 +echo "$as_me:134 12: result: $sigact_bad" >&510688 +echo "$as_me:13430: result: $sigact_bad" >&5 10649 10689 echo "${ECHO_T}$sigact_bad" >&6 10650 10690 fi 10651 10691 10652 10692 -echo "$as_me:13009: checking if nanosleep really works" >&5 10653 +echo "$as_me:134 16: checking if nanosleep really works" >&510693 +echo "$as_me:13434: checking if nanosleep really works" >&5 10654 10694 echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6 10655 10695 if test "${cf_cv_func_nanosleep+set}" = set; then 10656 10696 echo $ECHO_N "(cached) $ECHO_C" >&6 10657 @@ -13016,7 +134 23,7 @@10697 @@ -13016,7 +13441,7 @@ 10658 10698 cf_cv_func_nanosleep=unknown 10659 10699 else 10660 10700 cat >conftest.$ac_ext <<_ACEOF 10661 10701 -#line 13019 "configure" 10662 +#line 134 26"configure"10702 +#line 13444 "configure" 10663 10703 #include "confdefs.h" 10664 10704 10665 10705 #include <stdio.h> 10666 @@ -13041,15 +134 48,15 @@10706 @@ -13041,15 +13466,15 @@ 10667 10707 10668 10708 _ACEOF 10669 10709 rm -f conftest$ac_exeext 10670 10710 -if { (eval echo "$as_me:13044: \"$ac_link\"") >&5 10671 +if { (eval echo "$as_me:134 51: \"$ac_link\"") >&510711 +if { (eval echo "$as_me:13469: \"$ac_link\"") >&5 10672 10712 (eval $ac_link) 2>&5 10673 10713 ac_status=$? 10674 10714 - echo "$as_me:13047: \$? = $ac_status" >&5 10675 + echo "$as_me:134 54: \$? = $ac_status" >&510715 + echo "$as_me:13472: \$? = $ac_status" >&5 10676 10716 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 10677 10717 - { (eval echo "$as_me:13049: \"$ac_try\"") >&5 10678 + { (eval echo "$as_me:134 56: \"$ac_try\"") >&510718 + { (eval echo "$as_me:13474: \"$ac_try\"") >&5 10679 10719 (eval $ac_try) 2>&5 10680 10720 ac_status=$? 10681 10721 - echo "$as_me:13052: \$? = $ac_status" >&5 10682 + echo "$as_me:134 59: \$? = $ac_status" >&510722 + echo "$as_me:13477: \$? = $ac_status" >&5 10683 10723 (exit $ac_status); }; }; then 10684 10724 cf_cv_func_nanosleep=yes 10685 10725 else 10686 @@ -13061,7 +134 68,7 @@10726 @@ -13061,7 +13486,7 @@ 10687 10727 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 10688 10728 fi 10689 10729 fi 10690 10730 -echo "$as_me:13064: result: $cf_cv_func_nanosleep" >&5 10691 +echo "$as_me:134 71: result: $cf_cv_func_nanosleep" >&510731 +echo "$as_me:13489: result: $cf_cv_func_nanosleep" >&5 10692 10732 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 10693 10733 10694 10734 test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF 10695 @@ -13075,23 +13 482,23 @@10735 @@ -13075,23 +13500,23 @@ 10696 10736 10697 10737 do 10698 10738 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 10699 10739 -echo "$as_me:13078: checking for $ac_header" >&5 10700 +echo "$as_me:13 485: checking for $ac_header" >&510740 +echo "$as_me:13503: checking for $ac_header" >&5 10701 10741 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 10702 10742 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 10705 10745 cat >conftest.$ac_ext <<_ACEOF 10706 10746 -#line 13084 "configure" 10707 +#line 13 491"configure"10747 +#line 13509 "configure" 10708 10748 #include "confdefs.h" 10709 10749 #include <$ac_header> 10710 10750 _ACEOF 10711 10751 -if { (eval echo "$as_me:13088: \"$ac_cpp conftest.$ac_ext\"") >&5 10712 +if { (eval echo "$as_me:13 495: \"$ac_cpp conftest.$ac_ext\"") >&510752 +if { (eval echo "$as_me:13513: \"$ac_cpp conftest.$ac_ext\"") >&5 10713 10753 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 10714 10754 ac_status=$? … … 10717 10757 cat conftest.err >&5 10718 10758 - echo "$as_me:13094: \$? = $ac_status" >&5 10719 + echo "$as_me:135 01: \$? = $ac_status" >&510759 + echo "$as_me:13519: \$? = $ac_status" >&5 10720 10760 (exit $ac_status); } >/dev/null; then 10721 10761 if test -s conftest.err; then 10722 10762 ac_cpp_err=$ac_c_preproc_warn_flag 10723 @@ -13110,7 +135 17,7 @@10763 @@ -13110,7 +13535,7 @@ 10724 10764 fi 10725 10765 rm -f conftest.err conftest.$ac_ext 10726 10766 fi 10727 10767 -echo "$as_me:13113: result: `eval echo '${'$as_ac_Header'}'`" >&5 10728 +echo "$as_me:135 20: result: `eval echo '${'$as_ac_Header'}'`" >&510768 +echo "$as_me:13538: result: `eval echo '${'$as_ac_Header'}'`" >&5 10729 10769 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 10730 10770 if test `eval echo '${'$as_ac_Header'}'` = yes; then 10731 10771 cat >>confdefs.h <<EOF 10732 @@ -13125,23 +135 32,23 @@10772 @@ -13125,23 +13550,23 @@ 10733 10773 for ac_header in sys/termio.h 10734 10774 do 10735 10775 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 10736 10776 -echo "$as_me:13128: checking for $ac_header" >&5 10737 +echo "$as_me:135 35: checking for $ac_header" >&510777 +echo "$as_me:13553: checking for $ac_header" >&5 10738 10778 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 10739 10779 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 10742 10782 cat >conftest.$ac_ext <<_ACEOF 10743 10783 -#line 13134 "configure" 10744 +#line 135 41"configure"10784 +#line 13559 "configure" 10745 10785 #include "confdefs.h" 10746 10786 #include <$ac_header> 10747 10787 _ACEOF 10748 10788 -if { (eval echo "$as_me:13138: \"$ac_cpp conftest.$ac_ext\"") >&5 10749 +if { (eval echo "$as_me:135 45: \"$ac_cpp conftest.$ac_ext\"") >&510789 +if { (eval echo "$as_me:13563: \"$ac_cpp conftest.$ac_ext\"") >&5 10750 10790 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 10751 10791 ac_status=$? … … 10754 10794 cat conftest.err >&5 10755 10795 - echo "$as_me:13144: \$? = $ac_status" >&5 10756 + echo "$as_me:135 51: \$? = $ac_status" >&510796 + echo "$as_me:13569: \$? = $ac_status" >&5 10757 10797 (exit $ac_status); } >/dev/null; then 10758 10798 if test -s conftest.err; then 10759 10799 ac_cpp_err=$ac_c_preproc_warn_flag 10760 @@ -13160,7 +135 67,7 @@10800 @@ -13160,7 +13585,7 @@ 10761 10801 fi 10762 10802 rm -f conftest.err conftest.$ac_ext 10763 10803 fi 10764 10804 -echo "$as_me:13163: result: `eval echo '${'$as_ac_Header'}'`" >&5 10765 +echo "$as_me:135 70: result: `eval echo '${'$as_ac_Header'}'`" >&510805 +echo "$as_me:13588: result: `eval echo '${'$as_ac_Header'}'`" >&5 10766 10806 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 10767 10807 if test `eval echo '${'$as_ac_Header'}'` = yes; then 10768 10808 cat >>confdefs.h <<EOF 10769 @@ -13178,10 +13 585,10 @@10809 @@ -13178,10 +13603,10 @@ 10770 10810 *) termios_bad=maybe ;; 10771 10811 esac 10772 10812 if test "$termios_bad" = maybe ; then 10773 10813 - echo "$as_me:13181: checking whether termios.h needs _POSIX_SOURCE" >&5 10774 + echo "$as_me:13 588: checking whether termios.h needs _POSIX_SOURCE" >&510814 + echo "$as_me:13606: checking whether termios.h needs _POSIX_SOURCE" >&5 10775 10815 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6 10776 10816 cat >conftest.$ac_ext <<_ACEOF 10777 10817 -#line 13184 "configure" 10778 +#line 13 591"configure"10818 +#line 13609 "configure" 10779 10819 #include "confdefs.h" 10780 10820 #include <termios.h> 10781 10821 int 10782 @@ -13193,16 +136 00,16 @@10822 @@ -13193,16 +13618,16 @@ 10783 10823 } 10784 10824 _ACEOF 10785 10825 rm -f conftest.$ac_objext 10786 10826 -if { (eval echo "$as_me:13196: \"$ac_compile\"") >&5 10787 +if { (eval echo "$as_me:136 03: \"$ac_compile\"") >&510827 +if { (eval echo "$as_me:13621: \"$ac_compile\"") >&5 10788 10828 (eval $ac_compile) 2>&5 10789 10829 ac_status=$? 10790 10830 - echo "$as_me:13199: \$? = $ac_status" >&5 10791 + echo "$as_me:136 06: \$? = $ac_status" >&510831 + echo "$as_me:13624: \$? = $ac_status" >&5 10792 10832 (exit $ac_status); } && 10793 10833 { ac_try='test -s conftest.$ac_objext' 10794 10834 - { (eval echo "$as_me:13202: \"$ac_try\"") >&5 10795 + { (eval echo "$as_me:136 09: \"$ac_try\"") >&510835 + { (eval echo "$as_me:13627: \"$ac_try\"") >&5 10796 10836 (eval $ac_try) 2>&5 10797 10837 ac_status=$? 10798 10838 - echo "$as_me:13205: \$? = $ac_status" >&5 10799 + echo "$as_me:136 12: \$? = $ac_status" >&510839 + echo "$as_me:13630: \$? = $ac_status" >&5 10800 10840 (exit $ac_status); }; }; then 10801 10841 termios_bad=no 10802 10842 else 10803 @@ -13210,7 +136 17,7 @@10843 @@ -13210,7 +13635,7 @@ 10804 10844 cat conftest.$ac_ext >&5 10805 10845 10806 10846 cat >conftest.$ac_ext <<_ACEOF 10807 10847 -#line 13213 "configure" 10808 +#line 136 20"configure"10848 +#line 13638 "configure" 10809 10849 #include "confdefs.h" 10810 10850 10811 10851 #define _POSIX_SOURCE 10812 @@ -13224,16 +136 31,16 @@10852 @@ -13224,16 +13649,16 @@ 10813 10853 } 10814 10854 _ACEOF 10815 10855 rm -f conftest.$ac_objext 10816 10856 -if { (eval echo "$as_me:13227: \"$ac_compile\"") >&5 10817 +if { (eval echo "$as_me:136 34: \"$ac_compile\"") >&510857 +if { (eval echo "$as_me:13652: \"$ac_compile\"") >&5 10818 10858 (eval $ac_compile) 2>&5 10819 10859 ac_status=$? 10820 10860 - echo "$as_me:13230: \$? = $ac_status" >&5 10821 + echo "$as_me:136 37: \$? = $ac_status" >&510861 + echo "$as_me:13655: \$? = $ac_status" >&5 10822 10862 (exit $ac_status); } && 10823 10863 { ac_try='test -s conftest.$ac_objext' 10824 10864 - { (eval echo "$as_me:13233: \"$ac_try\"") >&5 10825 + { (eval echo "$as_me:136 40: \"$ac_try\"") >&510865 + { (eval echo "$as_me:13658: \"$ac_try\"") >&5 10826 10866 (eval $ac_try) 2>&5 10827 10867 ac_status=$? 10828 10868 - echo "$as_me:13236: \$? = $ac_status" >&5 10829 + echo "$as_me:136 43: \$? = $ac_status" >&510869 + echo "$as_me:13661: \$? = $ac_status" >&5 10830 10870 (exit $ac_status); }; }; then 10831 10871 termios_bad=unknown 10832 10872 else 10833 @@ -13248,19 +136 55,19 @@10873 @@ -13248,19 +13673,19 @@ 10834 10874 10835 10875 fi 10836 10876 rm -f conftest.$ac_objext conftest.$ac_ext 10837 10877 - echo "$as_me:13251: result: $termios_bad" >&5 10838 + echo "$as_me:136 58: result: $termios_bad" >&510878 + echo "$as_me:13676: result: $termios_bad" >&5 10839 10879 echo "${ECHO_T}$termios_bad" >&6 10840 10880 fi … … 10842 10882 10843 10883 -echo "$as_me:13256: checking for tcgetattr" >&5 10844 +echo "$as_me:136 63: checking for tcgetattr" >&510884 +echo "$as_me:13681: checking for tcgetattr" >&5 10845 10885 echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6 10846 10886 if test "${cf_cv_have_tcgetattr+set}" = set; then … … 10850 10890 cat >conftest.$ac_ext <<_ACEOF 10851 10891 -#line 13263 "configure" 10852 +#line 136 70"configure"10892 +#line 13688 "configure" 10853 10893 #include "confdefs.h" 10854 10894 10855 10895 #include <sys/types.h> 10856 @@ -13288,16 +13 695,16 @@10896 @@ -13288,16 +13713,16 @@ 10857 10897 } 10858 10898 _ACEOF 10859 10899 rm -f conftest.$ac_objext conftest$ac_exeext 10860 10900 -if { (eval echo "$as_me:13291: \"$ac_link\"") >&5 10861 +if { (eval echo "$as_me:13 698: \"$ac_link\"") >&510901 +if { (eval echo "$as_me:13716: \"$ac_link\"") >&5 10862 10902 (eval $ac_link) 2>&5 10863 10903 ac_status=$? 10864 10904 - echo "$as_me:13294: \$? = $ac_status" >&5 10865 + echo "$as_me:137 01: \$? = $ac_status" >&510905 + echo "$as_me:13719: \$? = $ac_status" >&5 10866 10906 (exit $ac_status); } && 10867 10907 { ac_try='test -s conftest$ac_exeext' 10868 10908 - { (eval echo "$as_me:13297: \"$ac_try\"") >&5 10869 + { (eval echo "$as_me:137 04: \"$ac_try\"") >&510909 + { (eval echo "$as_me:13722: \"$ac_try\"") >&5 10870 10910 (eval $ac_try) 2>&5 10871 10911 ac_status=$? 10872 10912 - echo "$as_me:13300: \$? = $ac_status" >&5 10873 + echo "$as_me:137 07: \$? = $ac_status" >&510913 + echo "$as_me:13725: \$? = $ac_status" >&5 10874 10914 (exit $ac_status); }; }; then 10875 10915 cf_cv_have_tcgetattr=yes 10876 10916 else 10877 @@ -13307,20 +137 14,20 @@10917 @@ -13307,20 +13732,20 @@ 10878 10918 fi 10879 10919 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 10880 10920 fi 10881 10921 -echo "$as_me:13310: result: $cf_cv_have_tcgetattr" >&5 10882 +echo "$as_me:137 17: result: $cf_cv_have_tcgetattr" >&510922 +echo "$as_me:13735: result: $cf_cv_have_tcgetattr" >&5 10883 10923 echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6 10884 10924 test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF … … 10887 10927 10888 10928 -echo "$as_me:13316: checking for vsscanf function or workaround" >&5 10889 +echo "$as_me:137 23: checking for vsscanf function or workaround" >&510929 +echo "$as_me:13741: checking for vsscanf function or workaround" >&5 10890 10930 echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6 10891 10931 if test "${cf_cv_func_vsscanf+set}" = set; then … … 10895 10935 cat >conftest.$ac_ext <<_ACEOF 10896 10936 -#line 13323 "configure" 10897 +#line 137 30"configure"10937 +#line 13748 "configure" 10898 10938 #include "confdefs.h" 10899 10939 10900 10940 #include <stdarg.h> 10901 @@ -13336,16 +137 43,16 @@10941 @@ -13336,16 +13761,16 @@ 10902 10942 } 10903 10943 _ACEOF 10904 10944 rm -f conftest.$ac_objext conftest$ac_exeext 10905 10945 -if { (eval echo "$as_me:13339: \"$ac_link\"") >&5 10906 +if { (eval echo "$as_me:137 46: \"$ac_link\"") >&510946 +if { (eval echo "$as_me:13764: \"$ac_link\"") >&5 10907 10947 (eval $ac_link) 2>&5 10908 10948 ac_status=$? 10909 10949 - echo "$as_me:13342: \$? = $ac_status" >&5 10910 + echo "$as_me:137 49: \$? = $ac_status" >&510950 + echo "$as_me:13767: \$? = $ac_status" >&5 10911 10951 (exit $ac_status); } && 10912 10952 { ac_try='test -s conftest$ac_exeext' 10913 10953 - { (eval echo "$as_me:13345: \"$ac_try\"") >&5 10914 + { (eval echo "$as_me:137 52: \"$ac_try\"") >&510954 + { (eval echo "$as_me:13770: \"$ac_try\"") >&5 10915 10955 (eval $ac_try) 2>&5 10916 10956 ac_status=$? 10917 10957 - echo "$as_me:13348: \$? = $ac_status" >&5 10918 + echo "$as_me:137 55: \$? = $ac_status" >&510958 + echo "$as_me:13773: \$? = $ac_status" >&5 10919 10959 (exit $ac_status); }; }; then 10920 10960 cf_cv_func_vsscanf=vsscanf 10921 10961 else 10922 @@ -13353,7 +137 60,7 @@10962 @@ -13353,7 +13778,7 @@ 10923 10963 cat conftest.$ac_ext >&5 10924 10964 10925 10965 cat >conftest.$ac_ext <<_ACEOF 10926 10966 -#line 13356 "configure" 10927 +#line 137 63"configure"10967 +#line 13781 "configure" 10928 10968 #include "confdefs.h" 10929 10969 10930 10970 #include <stdarg.h> 10931 @@ -13375,16 +13 782,16 @@10971 @@ -13375,16 +13800,16 @@ 10932 10972 } 10933 10973 _ACEOF 10934 10974 rm -f conftest.$ac_objext conftest$ac_exeext 10935 10975 -if { (eval echo "$as_me:13378: \"$ac_link\"") >&5 10936 +if { (eval echo "$as_me:13 785: \"$ac_link\"") >&510976 +if { (eval echo "$as_me:13803: \"$ac_link\"") >&5 10937 10977 (eval $ac_link) 2>&5 10938 10978 ac_status=$? 10939 10979 - echo "$as_me:13381: \$? = $ac_status" >&5 10940 + echo "$as_me:13 788: \$? = $ac_status" >&510980 + echo "$as_me:13806: \$? = $ac_status" >&5 10941 10981 (exit $ac_status); } && 10942 10982 { ac_try='test -s conftest$ac_exeext' 10943 10983 - { (eval echo "$as_me:13384: \"$ac_try\"") >&5 10944 + { (eval echo "$as_me:13 791: \"$ac_try\"") >&510984 + { (eval echo "$as_me:13809: \"$ac_try\"") >&5 10945 10985 (eval $ac_try) 2>&5 10946 10986 ac_status=$? 10947 10987 - echo "$as_me:13387: \$? = $ac_status" >&5 10948 + echo "$as_me:13 794: \$? = $ac_status" >&510988 + echo "$as_me:13812: \$? = $ac_status" >&5 10949 10989 (exit $ac_status); }; }; then 10950 10990 cf_cv_func_vsscanf=vfscanf 10951 10991 else 10952 @@ -13392,7 +13 799,7 @@10992 @@ -13392,7 +13817,7 @@ 10953 10993 cat conftest.$ac_ext >&5 10954 10994 10955 10995 cat >conftest.$ac_ext <<_ACEOF 10956 10996 -#line 13395 "configure" 10957 +#line 138 02"configure"10997 +#line 13820 "configure" 10958 10998 #include "confdefs.h" 10959 10999 10960 11000 #include <stdarg.h> 10961 @@ -13414,16 +138 21,16 @@11001 @@ -13414,16 +13839,16 @@ 10962 11002 } 10963 11003 _ACEOF 10964 11004 rm -f conftest.$ac_objext conftest$ac_exeext 10965 11005 -if { (eval echo "$as_me:13417: \"$ac_link\"") >&5 10966 +if { (eval echo "$as_me:138 24: \"$ac_link\"") >&511006 +if { (eval echo "$as_me:13842: \"$ac_link\"") >&5 10967 11007 (eval $ac_link) 2>&5 10968 11008 ac_status=$? 10969 11009 - echo "$as_me:13420: \$? = $ac_status" >&5 10970 + echo "$as_me:138 27: \$? = $ac_status" >&511010 + echo "$as_me:13845: \$? = $ac_status" >&5 10971 11011 (exit $ac_status); } && 10972 11012 { ac_try='test -s conftest$ac_exeext' 10973 11013 - { (eval echo "$as_me:13423: \"$ac_try\"") >&5 10974 + { (eval echo "$as_me:138 30: \"$ac_try\"") >&511014 + { (eval echo "$as_me:13848: \"$ac_try\"") >&5 10975 11015 (eval $ac_try) 2>&5 10976 11016 ac_status=$? 10977 11017 - echo "$as_me:13426: \$? = $ac_status" >&5 10978 + echo "$as_me:138 33: \$? = $ac_status" >&511018 + echo "$as_me:13851: \$? = $ac_status" >&5 10979 11019 (exit $ac_status); }; }; then 10980 11020 cf_cv_func_vsscanf=_doscan 10981 11021 else 10982 @@ -13438,7 +138 45,7 @@11022 @@ -13438,7 +13863,7 @@ 10983 11023 fi 10984 11024 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 10985 11025 fi 10986 11026 -echo "$as_me:13441: result: $cf_cv_func_vsscanf" >&5 10987 +echo "$as_me:138 48: result: $cf_cv_func_vsscanf" >&511027 +echo "$as_me:13866: result: $cf_cv_func_vsscanf" >&5 10988 11028 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 10989 11029 10990 11030 case $cf_cv_func_vsscanf in #(vi 10991 @@ -13456,7 +138 63,7 @@11031 @@ -13456,7 +13881,7 @@ 10992 11032 ;; 10993 11033 esac 10994 11034 10995 11035 -echo "$as_me:13459: checking for working mkstemp" >&5 10996 +echo "$as_me:138 66: checking for working mkstemp" >&511036 +echo "$as_me:13884: checking for working mkstemp" >&5 10997 11037 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 10998 11038 if test "${cf_cv_func_mkstemp+set}" = set; then 10999 11039 echo $ECHO_N "(cached) $ECHO_C" >&6 11000 @@ -13464,13 +138 71,13 @@11040 @@ -13464,13 +13889,13 @@ 11001 11041 11002 11042 rm -f conftest* 11003 11043 if test "$cross_compiling" = yes; then 11004 11044 - echo "$as_me:13467: checking for mkstemp" >&5 11005 + echo "$as_me:138 74: checking for mkstemp" >&511045 + echo "$as_me:13892: checking for mkstemp" >&5 11006 11046 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 11007 11047 if test "${ac_cv_func_mkstemp+set}" = set; then … … 11010 11050 cat >conftest.$ac_ext <<_ACEOF 11011 11051 -#line 13473 "configure" 11012 +#line 138 80"configure"11052 +#line 13898 "configure" 11013 11053 #include "confdefs.h" 11014 11054 /* System header to define __stub macros and hopefully few prototypes, 11015 11055 which can conflict with char mkstemp (); below. */ 11016 @@ -13501,16 +139 08,16 @@11056 @@ -13501,16 +13926,16 @@ 11017 11057 } 11018 11058 _ACEOF 11019 11059 rm -f conftest.$ac_objext conftest$ac_exeext 11020 11060 -if { (eval echo "$as_me:13504: \"$ac_link\"") >&5 11021 +if { (eval echo "$as_me:139 11: \"$ac_link\"") >&511061 +if { (eval echo "$as_me:13929: \"$ac_link\"") >&5 11022 11062 (eval $ac_link) 2>&5 11023 11063 ac_status=$? 11024 11064 - echo "$as_me:13507: \$? = $ac_status" >&5 11025 + echo "$as_me:139 14: \$? = $ac_status" >&511065 + echo "$as_me:13932: \$? = $ac_status" >&5 11026 11066 (exit $ac_status); } && 11027 11067 { ac_try='test -s conftest$ac_exeext' 11028 11068 - { (eval echo "$as_me:13510: \"$ac_try\"") >&5 11029 + { (eval echo "$as_me:139 17: \"$ac_try\"") >&511069 + { (eval echo "$as_me:13935: \"$ac_try\"") >&5 11030 11070 (eval $ac_try) 2>&5 11031 11071 ac_status=$? 11032 11072 - echo "$as_me:13513: \$? = $ac_status" >&5 11033 + echo "$as_me:139 20: \$? = $ac_status" >&511073 + echo "$as_me:13938: \$? = $ac_status" >&5 11034 11074 (exit $ac_status); }; }; then 11035 11075 ac_cv_func_mkstemp=yes 11036 11076 else 11037 @@ -13520,12 +139 27,12 @@11077 @@ -13520,12 +13945,12 @@ 11038 11078 fi 11039 11079 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 11040 11080 fi 11041 11081 -echo "$as_me:13523: result: $ac_cv_func_mkstemp" >&5 11042 +echo "$as_me:139 30: result: $ac_cv_func_mkstemp" >&511082 +echo "$as_me:13948: result: $ac_cv_func_mkstemp" >&5 11043 11083 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 11044 11084 … … 11046 11086 cat >conftest.$ac_ext <<_ACEOF 11047 11087 -#line 13528 "configure" 11048 +#line 139 35"configure"11088 +#line 13953 "configure" 11049 11089 #include "confdefs.h" 11050 11090 11051 11091 #include <sys/types.h> 11052 @@ -13563,15 +139 70,15 @@11092 @@ -13563,15 +13988,15 @@ 11053 11093 11054 11094 _ACEOF 11055 11095 rm -f conftest$ac_exeext 11056 11096 -if { (eval echo "$as_me:13566: \"$ac_link\"") >&5 11057 +if { (eval echo "$as_me:139 73: \"$ac_link\"") >&511097 +if { (eval echo "$as_me:13991: \"$ac_link\"") >&5 11058 11098 (eval $ac_link) 2>&5 11059 11099 ac_status=$? 11060 11100 - echo "$as_me:13569: \$? = $ac_status" >&5 11061 + echo "$as_me:139 76: \$? = $ac_status" >&511101 + echo "$as_me:13994: \$? = $ac_status" >&5 11062 11102 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 11063 11103 - { (eval echo "$as_me:13571: \"$ac_try\"") >&5 11064 + { (eval echo "$as_me:139 78: \"$ac_try\"") >&511104 + { (eval echo "$as_me:13996: \"$ac_try\"") >&5 11065 11105 (eval $ac_try) 2>&5 11066 11106 ac_status=$? 11067 11107 - echo "$as_me:13574: \$? = $ac_status" >&5 11068 + echo "$as_me:139 81: \$? = $ac_status" >&511108 + echo "$as_me:13999: \$? = $ac_status" >&5 11069 11109 (exit $ac_status); }; }; then 11070 11110 cf_cv_func_mkstemp=yes 11071 11111 11072 @@ -13586,7 +1 3993,7 @@11112 @@ -13586,7 +14011,7 @@ 11073 11113 fi 11074 11114 11075 11115 fi 11076 11116 -echo "$as_me:13589: result: $cf_cv_func_mkstemp" >&5 11077 +echo "$as_me:1 3996: result: $cf_cv_func_mkstemp" >&511117 +echo "$as_me:14014: result: $cf_cv_func_mkstemp" >&5 11078 11118 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 11079 11119 if test "$cf_cv_func_mkstemp" = yes ; then 11080 11120 cat >>confdefs.h <<\EOF 11081 @@ -13604,21 +140 11,21 @@11121 @@ -13604,21 +14029,21 @@ 11082 11122 fi 11083 11123 11084 11124 if test "$cross_compiling" = yes ; then 11085 11125 - { echo "$as_me:13607: WARNING: cross compiling: assume setvbuf params not reversed" >&5 11086 + { echo "$as_me:140 14: WARNING: cross compiling: assume setvbuf params not reversed" >&511126 + { echo "$as_me:14032: WARNING: cross compiling: assume setvbuf params not reversed" >&5 11087 11127 echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;} 11088 11128 else 11089 11129 - echo "$as_me:13610: checking whether setvbuf arguments are reversed" >&5 11090 + echo "$as_me:140 17: checking whether setvbuf arguments are reversed" >&511130 + echo "$as_me:14035: checking whether setvbuf arguments are reversed" >&5 11091 11131 echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 11092 11132 if test "${ac_cv_func_setvbuf_reversed+set}" = set; then … … 11095 11135 if test "$cross_compiling" = yes; then 11096 11136 - { { echo "$as_me:13616: error: cannot run test program while cross compiling" >&5 11097 + { { echo "$as_me:140 23: error: cannot run test program while cross compiling" >&511137 + { { echo "$as_me:14041: error: cannot run test program while cross compiling" >&5 11098 11138 echo "$as_me: error: cannot run test program while cross compiling" >&2;} 11099 11139 { (exit 1); exit 1; }; } … … 11101 11141 cat >conftest.$ac_ext <<_ACEOF 11102 11142 -#line 13621 "configure" 11103 +#line 140 28"configure"11143 +#line 14046 "configure" 11104 11144 #include "confdefs.h" 11105 11145 #include <stdio.h> 11106 11146 /* If setvbuf has the reversed format, exit 0. */ 11107 @@ -13635,15 +140 42,15 @@11147 @@ -13635,15 +14060,15 @@ 11108 11148 } 11109 11149 _ACEOF 11110 11150 rm -f conftest$ac_exeext 11111 11151 -if { (eval echo "$as_me:13638: \"$ac_link\"") >&5 11112 +if { (eval echo "$as_me:140 45: \"$ac_link\"") >&511152 +if { (eval echo "$as_me:14063: \"$ac_link\"") >&5 11113 11153 (eval $ac_link) 2>&5 11114 11154 ac_status=$? 11115 11155 - echo "$as_me:13641: \$? = $ac_status" >&5 11116 + echo "$as_me:140 48: \$? = $ac_status" >&511156 + echo "$as_me:14066: \$? = $ac_status" >&5 11117 11157 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 11118 11158 - { (eval echo "$as_me:13643: \"$ac_try\"") >&5 11119 + { (eval echo "$as_me:140 50: \"$ac_try\"") >&511159 + { (eval echo "$as_me:14068: \"$ac_try\"") >&5 11120 11160 (eval $ac_try) 2>&5 11121 11161 ac_status=$? 11122 11162 - echo "$as_me:13646: \$? = $ac_status" >&5 11123 + echo "$as_me:140 53: \$? = $ac_status" >&511163 + echo "$as_me:14071: \$? = $ac_status" >&5 11124 11164 (exit $ac_status); }; }; then 11125 11165 ac_cv_func_setvbuf_reversed=yes 11126 11166 else 11127 @@ -13656,7 +140 63,7 @@11167 @@ -13656,7 +14081,7 @@ 11128 11168 fi 11129 11169 rm -f core core.* *.core 11130 11170 fi 11131 11171 -echo "$as_me:13659: result: $ac_cv_func_setvbuf_reversed" >&5 11132 +echo "$as_me:140 66: result: $ac_cv_func_setvbuf_reversed" >&511172 +echo "$as_me:14084: result: $ac_cv_func_setvbuf_reversed" >&5 11133 11173 echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 11134 11174 if test $ac_cv_func_setvbuf_reversed = yes; then 11135 11175 11136 @@ -13667,13 +140 74,13 @@11176 @@ -13667,13 +14092,13 @@ 11137 11177 fi 11138 11178 11139 11179 fi 11140 11180 -echo "$as_me:13670: checking return type of signal handlers" >&5 11141 +echo "$as_me:140 77: checking return type of signal handlers" >&511181 +echo "$as_me:14095: checking return type of signal handlers" >&5 11142 11182 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 11143 11183 if test "${ac_cv_type_signal+set}" = set; then … … 11146 11186 cat >conftest.$ac_ext <<_ACEOF 11147 11187 -#line 13676 "configure" 11148 +#line 14 083"configure"11188 +#line 14101 "configure" 11149 11189 #include "confdefs.h" 11150 11190 #include <sys/types.h> 11151 11191 #include <signal.h> 11152 @@ -13695,16 +141 02,16 @@11192 @@ -13695,16 +14120,16 @@ 11153 11193 } 11154 11194 _ACEOF 11155 11195 rm -f conftest.$ac_objext 11156 11196 -if { (eval echo "$as_me:13698: \"$ac_compile\"") >&5 11157 +if { (eval echo "$as_me:141 05: \"$ac_compile\"") >&511197 +if { (eval echo "$as_me:14123: \"$ac_compile\"") >&5 11158 11198 (eval $ac_compile) 2>&5 11159 11199 ac_status=$? 11160 11200 - echo "$as_me:13701: \$? = $ac_status" >&5 11161 + echo "$as_me:141 08: \$? = $ac_status" >&511201 + echo "$as_me:14126: \$? = $ac_status" >&5 11162 11202 (exit $ac_status); } && 11163 11203 { ac_try='test -s conftest.$ac_objext' 11164 11204 - { (eval echo "$as_me:13704: \"$ac_try\"") >&5 11165 + { (eval echo "$as_me:141 11: \"$ac_try\"") >&511205 + { (eval echo "$as_me:14129: \"$ac_try\"") >&5 11166 11206 (eval $ac_try) 2>&5 11167 11207 ac_status=$? 11168 11208 - echo "$as_me:13707: \$? = $ac_status" >&5 11169 + echo "$as_me:141 14: \$? = $ac_status" >&511209 + echo "$as_me:14132: \$? = $ac_status" >&5 11170 11210 (exit $ac_status); }; }; then 11171 11211 ac_cv_type_signal=void 11172 11212 else 11173 @@ -13714,21 +141 21,21 @@11213 @@ -13714,21 +14139,21 @@ 11174 11214 fi 11175 11215 rm -f conftest.$ac_objext conftest.$ac_ext 11176 11216 fi 11177 11217 -echo "$as_me:13717: result: $ac_cv_type_signal" >&5 11178 +echo "$as_me:141 24: result: $ac_cv_type_signal" >&511218 +echo "$as_me:14142: result: $ac_cv_type_signal" >&5 11179 11219 echo "${ECHO_T}$ac_cv_type_signal" >&6 11180 11220 … … 11184 11224 11185 11225 -echo "$as_me:13724: checking for type sigaction_t" >&5 11186 +echo "$as_me:141 31: checking for type sigaction_t" >&511226 +echo "$as_me:14149: checking for type sigaction_t" >&5 11187 11227 echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6 11188 11228 if test "${cf_cv_type_sigaction+set}" = set; then … … 11192 11232 cat >conftest.$ac_ext <<_ACEOF 11193 11233 -#line 13731 "configure" 11194 +#line 141 38"configure"11234 +#line 14156 "configure" 11195 11235 #include "confdefs.h" 11196 11236 11197 11237 #include <signal.h> 11198 @@ -13741,16 +141 48,16 @@11238 @@ -13741,16 +14166,16 @@ 11199 11239 } 11200 11240 _ACEOF 11201 11241 rm -f conftest.$ac_objext 11202 11242 -if { (eval echo "$as_me:13744: \"$ac_compile\"") >&5 11203 +if { (eval echo "$as_me:141 51: \"$ac_compile\"") >&511243 +if { (eval echo "$as_me:14169: \"$ac_compile\"") >&5 11204 11244 (eval $ac_compile) 2>&5 11205 11245 ac_status=$? 11206 11246 - echo "$as_me:13747: \$? = $ac_status" >&5 11207 + echo "$as_me:141 54: \$? = $ac_status" >&511247 + echo "$as_me:14172: \$? = $ac_status" >&5 11208 11248 (exit $ac_status); } && 11209 11249 { ac_try='test -s conftest.$ac_objext' 11210 11250 - { (eval echo "$as_me:13750: \"$ac_try\"") >&5 11211 + { (eval echo "$as_me:141 57: \"$ac_try\"") >&511251 + { (eval echo "$as_me:14175: \"$ac_try\"") >&5 11212 11252 (eval $ac_try) 2>&5 11213 11253 ac_status=$? 11214 11254 - echo "$as_me:13753: \$? = $ac_status" >&5 11215 + echo "$as_me:141 60: \$? = $ac_status" >&511255 + echo "$as_me:14178: \$? = $ac_status" >&5 11216 11256 (exit $ac_status); }; }; then 11217 11257 cf_cv_type_sigaction=yes 11218 11258 else 11219 @@ -13761,13 +141 68,13 @@11259 @@ -13761,13 +14186,13 @@ 11220 11260 rm -f conftest.$ac_objext conftest.$ac_ext 11221 11261 fi 11222 11262 11223 11263 -echo "$as_me:13764: result: $cf_cv_type_sigaction" >&5 11224 +echo "$as_me:141 71: result: $cf_cv_type_sigaction" >&511264 +echo "$as_me:14189: result: $cf_cv_type_sigaction" >&5 11225 11265 echo "${ECHO_T}$cf_cv_type_sigaction" >&6 11226 11266 test "$cf_cv_type_sigaction" = yes && cat >>confdefs.h <<\EOF … … 11229 11269 11230 11270 -echo "$as_me:13770: checking declaration of size-change" >&5 11231 +echo "$as_me:141 77: checking declaration of size-change" >&511271 +echo "$as_me:14195: checking declaration of size-change" >&5 11232 11272 echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6 11233 11273 if test "${cf_cv_sizechange+set}" = set; then 11234 11274 echo $ECHO_N "(cached) $ECHO_C" >&6 11235 @@ -13782,7 +14 189,7 @@11275 @@ -13782,7 +14207,7 @@ 11236 11276 CPPFLAGS="$cf_save_CPPFLAGS" 11237 11277 test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" 11238 11278 cat >conftest.$ac_ext <<_ACEOF 11239 11279 -#line 13785 "configure" 11240 +#line 14 192"configure"11280 +#line 14210 "configure" 11241 11281 #include "confdefs.h" 11242 11282 #include <sys/types.h> 11243 11283 #ifdef HAVE_TERMIOS_H 11244 @@ -13826,16 +142 33,16 @@11284 @@ -13826,16 +14251,16 @@ 11245 11285 } 11246 11286 _ACEOF 11247 11287 rm -f conftest.$ac_objext 11248 11288 -if { (eval echo "$as_me:13829: \"$ac_compile\"") >&5 11249 +if { (eval echo "$as_me:142 36: \"$ac_compile\"") >&511289 +if { (eval echo "$as_me:14254: \"$ac_compile\"") >&5 11250 11290 (eval $ac_compile) 2>&5 11251 11291 ac_status=$? 11252 11292 - echo "$as_me:13832: \$? = $ac_status" >&5 11253 + echo "$as_me:142 39: \$? = $ac_status" >&511293 + echo "$as_me:14257: \$? = $ac_status" >&5 11254 11294 (exit $ac_status); } && 11255 11295 { ac_try='test -s conftest.$ac_objext' 11256 11296 - { (eval echo "$as_me:13835: \"$ac_try\"") >&5 11257 + { (eval echo "$as_me:142 42: \"$ac_try\"") >&511297 + { (eval echo "$as_me:14260: \"$ac_try\"") >&5 11258 11298 (eval $ac_try) 2>&5 11259 11299 ac_status=$? 11260 11300 - echo "$as_me:13838: \$? = $ac_status" >&5 11261 + echo "$as_me:142 45: \$? = $ac_status" >&511301 + echo "$as_me:14263: \$? = $ac_status" >&5 11262 11302 (exit $ac_status); }; }; then 11263 11303 cf_cv_sizechange=yes 11264 11304 else 11265 @@ -13854,7 +142 61,7 @@11305 @@ -13854,7 +14279,7 @@ 11266 11306 done 11267 11307 11268 11308 fi 11269 11309 -echo "$as_me:13857: result: $cf_cv_sizechange" >&5 11270 +echo "$as_me:142 64: result: $cf_cv_sizechange" >&511310 +echo "$as_me:14282: result: $cf_cv_sizechange" >&5 11271 11311 echo "${ECHO_T}$cf_cv_sizechange" >&6 11272 11312 if test "$cf_cv_sizechange" != no ; then 11273 11313 cat >>confdefs.h <<\EOF 11274 @@ -13871,13 +142 78,13 @@11314 @@ -13871,13 +14296,13 @@ 11275 11315 esac 11276 11316 fi 11277 11317 11278 11318 -echo "$as_me:13874: checking for memmove" >&5 11279 +echo "$as_me:142 81: checking for memmove" >&511319 +echo "$as_me:14299: checking for memmove" >&5 11280 11320 echo $ECHO_N "checking for memmove... $ECHO_C" >&6 11281 11321 if test "${ac_cv_func_memmove+set}" = set; then … … 11284 11324 cat >conftest.$ac_ext <<_ACEOF 11285 11325 -#line 13880 "configure" 11286 +#line 14 287"configure"11326 +#line 14305 "configure" 11287 11327 #include "confdefs.h" 11288 11328 /* System header to define __stub macros and hopefully few prototypes, 11289 11329 which can conflict with char memmove (); below. */ 11290 @@ -13908,16 +143 15,16 @@11330 @@ -13908,16 +14333,16 @@ 11291 11331 } 11292 11332 _ACEOF 11293 11333 rm -f conftest.$ac_objext conftest$ac_exeext 11294 11334 -if { (eval echo "$as_me:13911: \"$ac_link\"") >&5 11295 +if { (eval echo "$as_me:143 18: \"$ac_link\"") >&511335 +if { (eval echo "$as_me:14336: \"$ac_link\"") >&5 11296 11336 (eval $ac_link) 2>&5 11297 11337 ac_status=$? 11298 11338 - echo "$as_me:13914: \$? = $ac_status" >&5 11299 + echo "$as_me:143 21: \$? = $ac_status" >&511339 + echo "$as_me:14339: \$? = $ac_status" >&5 11300 11340 (exit $ac_status); } && 11301 11341 { ac_try='test -s conftest$ac_exeext' 11302 11342 - { (eval echo "$as_me:13917: \"$ac_try\"") >&5 11303 + { (eval echo "$as_me:143 24: \"$ac_try\"") >&511343 + { (eval echo "$as_me:14342: \"$ac_try\"") >&5 11304 11344 (eval $ac_try) 2>&5 11305 11345 ac_status=$? 11306 11346 - echo "$as_me:13920: \$? = $ac_status" >&5 11307 + echo "$as_me:143 27: \$? = $ac_status" >&511347 + echo "$as_me:14345: \$? = $ac_status" >&5 11308 11348 (exit $ac_status); }; }; then 11309 11349 ac_cv_func_memmove=yes 11310 11350 else 11311 @@ -13927,19 +143 34,19 @@11351 @@ -13927,19 +14352,19 @@ 11312 11352 fi 11313 11353 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 11314 11354 fi 11315 11355 -echo "$as_me:13930: result: $ac_cv_func_memmove" >&5 11316 +echo "$as_me:143 37: result: $ac_cv_func_memmove" >&511356 +echo "$as_me:14355: result: $ac_cv_func_memmove" >&5 11317 11357 echo "${ECHO_T}$ac_cv_func_memmove" >&6 11318 11358 if test $ac_cv_func_memmove = yes; then … … 11321 11361 11322 11362 -echo "$as_me:13936: checking for bcopy" >&5 11323 +echo "$as_me:143 43: checking for bcopy" >&511363 +echo "$as_me:14361: checking for bcopy" >&5 11324 11364 echo $ECHO_N "checking for bcopy... $ECHO_C" >&6 11325 11365 if test "${ac_cv_func_bcopy+set}" = set; then … … 11328 11368 cat >conftest.$ac_ext <<_ACEOF 11329 11369 -#line 13942 "configure" 11330 +#line 143 49"configure"11370 +#line 14367 "configure" 11331 11371 #include "confdefs.h" 11332 11372 /* System header to define __stub macros and hopefully few prototypes, 11333 11373 which can conflict with char bcopy (); below. */ 11334 @@ -13970,16 +143 77,16 @@11374 @@ -13970,16 +14395,16 @@ 11335 11375 } 11336 11376 _ACEOF 11337 11377 rm -f conftest.$ac_objext conftest$ac_exeext 11338 11378 -if { (eval echo "$as_me:13973: \"$ac_link\"") >&5 11339 +if { (eval echo "$as_me:143 80: \"$ac_link\"") >&511379 +if { (eval echo "$as_me:14398: \"$ac_link\"") >&5 11340 11380 (eval $ac_link) 2>&5 11341 11381 ac_status=$? 11342 11382 - echo "$as_me:13976: \$? = $ac_status" >&5 11343 + echo "$as_me:14 383: \$? = $ac_status" >&511383 + echo "$as_me:14401: \$? = $ac_status" >&5 11344 11384 (exit $ac_status); } && 11345 11385 { ac_try='test -s conftest$ac_exeext' 11346 11386 - { (eval echo "$as_me:13979: \"$ac_try\"") >&5 11347 + { (eval echo "$as_me:14 386: \"$ac_try\"") >&511387 + { (eval echo "$as_me:14404: \"$ac_try\"") >&5 11348 11388 (eval $ac_try) 2>&5 11349 11389 ac_status=$? 11350 11390 - echo "$as_me:13982: \$? = $ac_status" >&5 11351 + echo "$as_me:14 389: \$? = $ac_status" >&511391 + echo "$as_me:14407: \$? = $ac_status" >&5 11352 11392 (exit $ac_status); }; }; then 11353 11393 ac_cv_func_bcopy=yes 11354 11394 else 11355 @@ -13989,11 +14 396,11 @@11395 @@ -13989,11 +14414,11 @@ 11356 11396 fi 11357 11397 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 11358 11398 fi 11359 11399 -echo "$as_me:13992: result: $ac_cv_func_bcopy" >&5 11360 +echo "$as_me:14 399: result: $ac_cv_func_bcopy" >&511400 +echo "$as_me:14417: result: $ac_cv_func_bcopy" >&5 11361 11401 echo "${ECHO_T}$ac_cv_func_bcopy" >&6 11362 11402 if test $ac_cv_func_bcopy = yes; then 11363 11403 11364 11404 - echo "$as_me:13996: checking if bcopy does overlapping moves" >&5 11365 + echo "$as_me:144 03: checking if bcopy does overlapping moves" >&511405 + echo "$as_me:14421: checking if bcopy does overlapping moves" >&5 11366 11406 echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6 11367 11407 if test "${cf_cv_good_bcopy+set}" = set; then 11368 11408 echo $ECHO_N "(cached) $ECHO_C" >&6 11369 @@ -14003,7 +144 10,7 @@11409 @@ -14003,7 +14428,7 @@ 11370 11410 cf_cv_good_bcopy=unknown 11371 11411 else 11372 11412 cat >conftest.$ac_ext <<_ACEOF 11373 11413 -#line 14006 "configure" 11374 +#line 144 13"configure"11414 +#line 14431 "configure" 11375 11415 #include "confdefs.h" 11376 11416 11377 11417 int main() { 11378 @@ -14017,15 +144 24,15 @@11418 @@ -14017,15 +14442,15 @@ 11379 11419 11380 11420 _ACEOF 11381 11421 rm -f conftest$ac_exeext 11382 11422 -if { (eval echo "$as_me:14020: \"$ac_link\"") >&5 11383 +if { (eval echo "$as_me:144 27: \"$ac_link\"") >&511423 +if { (eval echo "$as_me:14445: \"$ac_link\"") >&5 11384 11424 (eval $ac_link) 2>&5 11385 11425 ac_status=$? 11386 11426 - echo "$as_me:14023: \$? = $ac_status" >&5 11387 + echo "$as_me:144 30: \$? = $ac_status" >&511427 + echo "$as_me:14448: \$? = $ac_status" >&5 11388 11428 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 11389 11429 - { (eval echo "$as_me:14025: \"$ac_try\"") >&5 11390 + { (eval echo "$as_me:144 32: \"$ac_try\"") >&511430 + { (eval echo "$as_me:14450: \"$ac_try\"") >&5 11391 11431 (eval $ac_try) 2>&5 11392 11432 ac_status=$? 11393 11433 - echo "$as_me:14028: \$? = $ac_status" >&5 11394 + echo "$as_me:144 35: \$? = $ac_status" >&511434 + echo "$as_me:14453: \$? = $ac_status" >&5 11395 11435 (exit $ac_status); }; }; then 11396 11436 cf_cv_good_bcopy=yes 11397 11437 else 11398 @@ -14038,7 +144 45,7 @@11438 @@ -14038,7 +14463,7 @@ 11399 11439 fi 11400 11440 11401 11441 fi 11402 11442 -echo "$as_me:14041: result: $cf_cv_good_bcopy" >&5 11403 +echo "$as_me:144 48: result: $cf_cv_good_bcopy" >&511443 +echo "$as_me:14466: result: $cf_cv_good_bcopy" >&5 11404 11444 echo "${ECHO_T}$cf_cv_good_bcopy" >&6 11405 11445 11406 11446 else 11407 @@ -14059,7 +144 66,7 @@11447 @@ -14059,7 +14484,7 @@ 11408 11448 11409 11449 fi 11410 11450 11411 11451 -echo "$as_me:14062: checking if poll really works" >&5 11412 +echo "$as_me:144 69: checking if poll really works" >&511452 +echo "$as_me:14487: checking if poll really works" >&5 11413 11453 echo $ECHO_N "checking if poll really works... $ECHO_C" >&6 11414 11454 if test "${cf_cv_working_poll+set}" = set; then 11415 11455 echo $ECHO_N "(cached) $ECHO_C" >&6 11416 @@ -14069,7 +144 76,7 @@11456 @@ -14069,7 +14494,7 @@ 11417 11457 cf_cv_working_poll=unknown 11418 11458 else 11419 11459 cat >conftest.$ac_ext <<_ACEOF 11420 11460 -#line 14072 "configure" 11421 +#line 144 79"configure"11461 +#line 14497 "configure" 11422 11462 #include "confdefs.h" 11423 11463 11424 11464 #include <stdio.h> 11425 @@ -14090,15 +14 497,15 @@11465 @@ -14090,15 +14515,15 @@ 11426 11466 } 11427 11467 _ACEOF 11428 11468 rm -f conftest$ac_exeext 11429 11469 -if { (eval echo "$as_me:14093: \"$ac_link\"") >&5 11430 +if { (eval echo "$as_me:145 00: \"$ac_link\"") >&511470 +if { (eval echo "$as_me:14518: \"$ac_link\"") >&5 11431 11471 (eval $ac_link) 2>&5 11432 11472 ac_status=$? 11433 11473 - echo "$as_me:14096: \$? = $ac_status" >&5 11434 + echo "$as_me:145 03: \$? = $ac_status" >&511474 + echo "$as_me:14521: \$? = $ac_status" >&5 11435 11475 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 11436 11476 - { (eval echo "$as_me:14098: \"$ac_try\"") >&5 11437 + { (eval echo "$as_me:145 05: \"$ac_try\"") >&511477 + { (eval echo "$as_me:14523: \"$ac_try\"") >&5 11438 11478 (eval $ac_try) 2>&5 11439 11479 ac_status=$? 11440 11480 - echo "$as_me:14101: \$? = $ac_status" >&5 11441 + echo "$as_me:145 08: \$? = $ac_status" >&511481 + echo "$as_me:14526: \$? = $ac_status" >&5 11442 11482 (exit $ac_status); }; }; then 11443 11483 cf_cv_working_poll=yes 11444 11484 else 11445 @@ -14110,7 +145 17,7 @@11485 @@ -14110,7 +14535,7 @@ 11446 11486 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 11447 11487 fi 11448 11488 fi 11449 11489 -echo "$as_me:14113: result: $cf_cv_working_poll" >&5 11450 +echo "$as_me:145 20: result: $cf_cv_working_poll" >&511490 +echo "$as_me:14538: result: $cf_cv_working_poll" >&5 11451 11491 echo "${ECHO_T}$cf_cv_working_poll" >&6 11452 11492 test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF 11453 11493 #define HAVE_WORKING_POLL 1 11454 @@ -14118,7 +145 25,7 @@11494 @@ -14118,7 +14543,7 @@ 11455 11495 11456 11496 # special check for test/ditto.c 11457 11497 11458 11498 -echo "$as_me:14121: checking for openpty in -lutil" >&5 11459 +echo "$as_me:145 28: checking for openpty in -lutil" >&511499 +echo "$as_me:14546: checking for openpty in -lutil" >&5 11460 11500 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 11461 11501 if test "${ac_cv_lib_util_openpty+set}" = set; then 11462 11502 echo $ECHO_N "(cached) $ECHO_C" >&6 11463 @@ -14126,7 +145 33,7 @@11503 @@ -14126,7 +14551,7 @@ 11464 11504 ac_check_lib_save_LIBS=$LIBS 11465 11505 LIBS="-lutil $LIBS" 11466 11506 cat >conftest.$ac_ext <<_ACEOF 11467 11507 -#line 14129 "configure" 11468 +#line 145 36"configure"11508 +#line 14554 "configure" 11469 11509 #include "confdefs.h" 11470 11510 11471 11511 /* Override any gcc2 internal prototype to avoid an error. */ 11472 @@ -14145,16 +145 52,16 @@11512 @@ -14145,16 +14570,16 @@ 11473 11513 } 11474 11514 _ACEOF 11475 11515 rm -f conftest.$ac_objext conftest$ac_exeext 11476 11516 -if { (eval echo "$as_me:14148: \"$ac_link\"") >&5 11477 +if { (eval echo "$as_me:145 55: \"$ac_link\"") >&511517 +if { (eval echo "$as_me:14573: \"$ac_link\"") >&5 11478 11518 (eval $ac_link) 2>&5 11479 11519 ac_status=$? 11480 11520 - echo "$as_me:14151: \$? = $ac_status" >&5 11481 + echo "$as_me:145 58: \$? = $ac_status" >&511521 + echo "$as_me:14576: \$? = $ac_status" >&5 11482 11522 (exit $ac_status); } && 11483 11523 { ac_try='test -s conftest$ac_exeext' 11484 11524 - { (eval echo "$as_me:14154: \"$ac_try\"") >&5 11485 + { (eval echo "$as_me:145 61: \"$ac_try\"") >&511525 + { (eval echo "$as_me:14579: \"$ac_try\"") >&5 11486 11526 (eval $ac_try) 2>&5 11487 11527 ac_status=$? 11488 11528 - echo "$as_me:14157: \$? = $ac_status" >&5 11489 + echo "$as_me:145 64: \$? = $ac_status" >&511529 + echo "$as_me:14582: \$? = $ac_status" >&5 11490 11530 (exit $ac_status); }; }; then 11491 11531 ac_cv_lib_util_openpty=yes 11492 11532 else 11493 @@ -14165,7 +145 72,7 @@11533 @@ -14165,7 +14590,7 @@ 11494 11534 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 11495 11535 LIBS=$ac_check_lib_save_LIBS 11496 11536 fi 11497 11537 -echo "$as_me:14168: result: $ac_cv_lib_util_openpty" >&5 11498 +echo "$as_me:145 75: result: $ac_cv_lib_util_openpty" >&511538 +echo "$as_me:14593: result: $ac_cv_lib_util_openpty" >&5 11499 11539 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 11500 11540 if test $ac_cv_lib_util_openpty = yes; then 11501 11541 cf_cv_lib_util=yes 11502 @@ -14173,7 +145 80,7 @@11542 @@ -14173,7 +14598,7 @@ 11503 11543 cf_cv_lib_util=no 11504 11544 fi 11505 11545 11506 11546 -echo "$as_me:14176: checking for openpty header" >&5 11507 +echo "$as_me:14 583: checking for openpty header" >&511547 +echo "$as_me:14601: checking for openpty header" >&5 11508 11548 echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 11509 11549 if test "${cf_cv_func_openpty+set}" = set; then 11510 11550 echo $ECHO_N "(cached) $ECHO_C" >&6 11511 @@ -14184,7 +14 591,7 @@11551 @@ -14184,7 +14609,7 @@ 11512 11552 for cf_header in pty.h libutil.h util.h 11513 11553 do 11514 11554 cat >conftest.$ac_ext <<_ACEOF 11515 11555 -#line 14187 "configure" 11516 +#line 14 594"configure"11556 +#line 14612 "configure" 11517 11557 #include "confdefs.h" 11518 11558 11519 11559 #include <$cf_header> 11520 @@ -14201,16 +146 08,16 @@11560 @@ -14201,16 +14626,16 @@ 11521 11561 } 11522 11562 _ACEOF 11523 11563 rm -f conftest.$ac_objext conftest$ac_exeext 11524 11564 -if { (eval echo "$as_me:14204: \"$ac_link\"") >&5 11525 +if { (eval echo "$as_me:146 11: \"$ac_link\"") >&511565 +if { (eval echo "$as_me:14629: \"$ac_link\"") >&5 11526 11566 (eval $ac_link) 2>&5 11527 11567 ac_status=$? 11528 11568 - echo "$as_me:14207: \$? = $ac_status" >&5 11529 + echo "$as_me:146 14: \$? = $ac_status" >&511569 + echo "$as_me:14632: \$? = $ac_status" >&5 11530 11570 (exit $ac_status); } && 11531 11571 { ac_try='test -s conftest$ac_exeext' 11532 11572 - { (eval echo "$as_me:14210: \"$ac_try\"") >&5 11533 + { (eval echo "$as_me:146 17: \"$ac_try\"") >&511573 + { (eval echo "$as_me:14635: \"$ac_try\"") >&5 11534 11574 (eval $ac_try) 2>&5 11535 11575 ac_status=$? 11536 11576 - echo "$as_me:14213: \$? = $ac_status" >&5 11537 + echo "$as_me:146 20: \$? = $ac_status" >&511577 + echo "$as_me:14638: \$? = $ac_status" >&5 11538 11578 (exit $ac_status); }; }; then 11539 11579 11540 11580 cf_cv_func_openpty=$cf_header 11541 @@ -14228,7 +146 35,7 @@11581 @@ -14228,7 +14653,7 @@ 11542 11582 LIBS="$cf_save_LIBS" 11543 11583 11544 11584 fi 11545 11585 -echo "$as_me:14231: result: $cf_cv_func_openpty" >&5 11546 +echo "$as_me:146 38: result: $cf_cv_func_openpty" >&511586 +echo "$as_me:14656: result: $cf_cv_func_openpty" >&5 11547 11587 echo "${ECHO_T}$cf_cv_func_openpty" >&6 11548 11588 11549 11589 if test "$cf_cv_func_openpty" != no ; then 11550 @@ -14274,13 +146 81,13 @@11590 @@ -14274,13 +14699,13 @@ 11551 11591 fi 11552 11592 … … 11560 11600 cat >conftest.$ac_ext <<_ACEOF 11561 11601 -#line 14283 "configure" 11562 +#line 14 690"configure"11602 +#line 14708 "configure" 11563 11603 #include "confdefs.h" 11564 11604 #include <stdio.h> 11565 11605 int 11566 @@ -14292,16 +14 699,16 @@11606 @@ -14292,16 +14717,16 @@ 11567 11607 } 11568 11608 _ACEOF 11569 11609 rm -f conftest.$ac_objext 11570 11610 -if { (eval echo "$as_me:14295: \"$ac_compile\"") >&5 11571 +if { (eval echo "$as_me:147 02: \"$ac_compile\"") >&511611 +if { (eval echo "$as_me:14720: \"$ac_compile\"") >&5 11572 11612 (eval $ac_compile) 2>&5 11573 11613 ac_status=$? 11574 11614 - echo "$as_me:14298: \$? = $ac_status" >&5 11575 + echo "$as_me:147 05: \$? = $ac_status" >&511615 + echo "$as_me:14723: \$? = $ac_status" >&5 11576 11616 (exit $ac_status); } && 11577 11617 { ac_try='test -s conftest.$ac_objext' 11578 11618 - { (eval echo "$as_me:14301: \"$ac_try\"") >&5 11579 + { (eval echo "$as_me:147 08: \"$ac_try\"") >&511619 + { (eval echo "$as_me:14726: \"$ac_try\"") >&5 11580 11620 (eval $ac_try) 2>&5 11581 11621 ac_status=$? 11582 11622 - echo "$as_me:14304: \$? = $ac_status" >&5 11583 + echo "$as_me:147 11: \$? = $ac_status" >&511623 + echo "$as_me:14729: \$? = $ac_status" >&5 11584 11624 (exit $ac_status); }; }; then 11585 11625 : 11586 11626 else 11587 @@ -14318,13 +147 25,13 @@11627 @@ -14318,13 +14743,13 @@ 11588 11628 if test "$cf_have_incdir" = no ; then 11589 11629 test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 11590 11630 11591 11631 -echo "${as_me-configure}:14321: testing adding $cf_add_incdir to include-path ..." 1>&5 11592 +echo "${as_me-configure}:147 28: testing adding $cf_add_incdir to include-path ..." 1>&511632 +echo "${as_me-configure}:14746: testing adding $cf_add_incdir to include-path ..." 1>&5 11593 11633 11594 11634 - CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" … … 11604 11644 break 11605 11645 fi 11606 @@ -14352,7 +147 59,7 @@11646 @@ -14352,7 +14777,7 @@ 11607 11647 if test "$cf_have_libdir" = no ; then 11608 11648 test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 11609 11649 11610 11650 -echo "${as_me-configure}:14355: testing adding $cf_add_libdir to library-path ..." 1>&5 11611 +echo "${as_me-configure}:147 62: testing adding $cf_add_libdir to library-path ..." 1>&511651 +echo "${as_me-configure}:14780: testing adding $cf_add_libdir to library-path ..." 1>&5 11612 11652 11613 11653 LDFLAGS="-L$cf_add_libdir $LDFLAGS" 11614 11654 fi 11615 @@ -14363,23 +147 70,23 @@11655 @@ -14363,23 +14788,23 @@ 11616 11656 fi 11617 11657 esac 11618 11658 11619 11659 -echo "$as_me:14366: checking for db.h" >&5 11620 +echo "$as_me:147 73: checking for db.h" >&511660 +echo "$as_me:14791: checking for db.h" >&5 11621 11661 echo $ECHO_N "checking for db.h... $ECHO_C" >&6 11622 11662 if test "${ac_cv_header_db_h+set}" = set; then … … 11625 11665 cat >conftest.$ac_ext <<_ACEOF 11626 11666 -#line 14372 "configure" 11627 +#line 147 79"configure"11667 +#line 14797 "configure" 11628 11668 #include "confdefs.h" 11629 11669 #include <db.h> 11630 11670 _ACEOF 11631 11671 -if { (eval echo "$as_me:14376: \"$ac_cpp conftest.$ac_ext\"") >&5 11632 +if { (eval echo "$as_me:14 783: \"$ac_cpp conftest.$ac_ext\"") >&511672 +if { (eval echo "$as_me:14801: \"$ac_cpp conftest.$ac_ext\"") >&5 11633 11673 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 11634 11674 ac_status=$? … … 11637 11677 cat conftest.err >&5 11638 11678 - echo "$as_me:14382: \$? = $ac_status" >&5 11639 + echo "$as_me:14 789: \$? = $ac_status" >&511679 + echo "$as_me:14807: \$? = $ac_status" >&5 11640 11680 (exit $ac_status); } >/dev/null; then 11641 11681 if test -s conftest.err; then 11642 11682 ac_cpp_err=$ac_c_preproc_warn_flag 11643 @@ -14398,11 +148 05,11 @@11683 @@ -14398,11 +14823,11 @@ 11644 11684 fi 11645 11685 rm -f conftest.err conftest.$ac_ext 11646 11686 fi 11647 11687 -echo "$as_me:14401: result: $ac_cv_header_db_h" >&5 11648 +echo "$as_me:148 08: result: $ac_cv_header_db_h" >&511688 +echo "$as_me:14826: result: $ac_cv_header_db_h" >&5 11649 11689 echo "${ECHO_T}$ac_cv_header_db_h" >&6 11650 11690 if test $ac_cv_header_db_h = yes; then 11651 11691 11652 11692 -echo "$as_me:14405: checking for version of db" >&5 11653 +echo "$as_me:148 12: checking for version of db" >&511693 +echo "$as_me:14830: checking for version of db" >&5 11654 11694 echo $ECHO_N "checking for version of db... $ECHO_C" >&6 11655 11695 if test "${cf_cv_hashed_db_version+set}" = set; then 11656 11696 echo $ECHO_N "(cached) $ECHO_C" >&6 11657 @@ -14413,10 +148 20,10 @@11697 @@ -14413,10 +14838,10 @@ 11658 11698 for cf_db_version in 1 2 3 4 5 11659 11699 do 11660 11700 11661 11701 -echo "${as_me-configure}:14416: testing checking for db version $cf_db_version ..." 1>&5 11662 +echo "${as_me-configure}:148 23: testing checking for db version $cf_db_version ..." 1>&511702 +echo "${as_me-configure}:14841: testing checking for db version $cf_db_version ..." 1>&5 11663 11703 11664 11704 cat >conftest.$ac_ext <<_ACEOF 11665 11705 -#line 14419 "configure" 11666 +#line 148 26"configure"11706 +#line 14844 "configure" 11667 11707 #include "confdefs.h" 11668 11708 11669 11709 $ac_includes_default 11670 @@ -14446,16 +148 53,16 @@11710 @@ -14446,16 +14871,16 @@ 11671 11711 } 11672 11712 _ACEOF 11673 11713 rm -f conftest.$ac_objext 11674 11714 -if { (eval echo "$as_me:14449: \"$ac_compile\"") >&5 11675 +if { (eval echo "$as_me:148 56: \"$ac_compile\"") >&511715 +if { (eval echo "$as_me:14874: \"$ac_compile\"") >&5 11676 11716 (eval $ac_compile) 2>&5 11677 11717 ac_status=$? 11678 11718 - echo "$as_me:14452: \$? = $ac_status" >&5 11679 + echo "$as_me:148 59: \$? = $ac_status" >&511719 + echo "$as_me:14877: \$? = $ac_status" >&5 11680 11720 (exit $ac_status); } && 11681 11721 { ac_try='test -s conftest.$ac_objext' 11682 11722 - { (eval echo "$as_me:14455: \"$ac_try\"") >&5 11683 + { (eval echo "$as_me:148 62: \"$ac_try\"") >&511723 + { (eval echo "$as_me:14880: \"$ac_try\"") >&5 11684 11724 (eval $ac_try) 2>&5 11685 11725 ac_status=$? 11686 11726 - echo "$as_me:14458: \$? = $ac_status" >&5 11687 + echo "$as_me:148 65: \$? = $ac_status" >&511727 + echo "$as_me:14883: \$? = $ac_status" >&5 11688 11728 (exit $ac_status); }; }; then 11689 11729 11690 11730 cf_cv_hashed_db_version=$cf_db_version 11691 @@ -14469,16 +148 76,16 @@11731 @@ -14469,16 +14894,16 @@ 11692 11732 done 11693 11733 11694 11734 fi 11695 11735 -echo "$as_me:14472: result: $cf_cv_hashed_db_version" >&5 11696 +echo "$as_me:148 79: result: $cf_cv_hashed_db_version" >&511736 +echo "$as_me:14897: result: $cf_cv_hashed_db_version" >&5 11697 11737 echo "${ECHO_T}$cf_cv_hashed_db_version" >&6 11698 11738 11699 11739 if test "$cf_cv_hashed_db_version" = unknown ; then 11700 11740 - { { echo "$as_me:14476: error: Cannot determine version of db" >&5 11701 + { { echo "$as_me:14 883: error: Cannot determine version of db" >&511741 + { { echo "$as_me:14901: error: Cannot determine version of db" >&5 11702 11742 echo "$as_me: error: Cannot determine version of db" >&2;} 11703 11743 { (exit 1); exit 1; }; } … … 11705 11745 11706 11746 -echo "$as_me:14481: checking for db libraries" >&5 11707 +echo "$as_me:14 888: checking for db libraries" >&511747 +echo "$as_me:14906: checking for db libraries" >&5 11708 11748 echo $ECHO_N "checking for db libraries... $ECHO_C" >&6 11709 11749 if test "${cf_cv_hashed_db_libs+set}" = set; then 11710 11750 echo $ECHO_N "(cached) $ECHO_C" >&6 11711 @@ -14492,10 +14 899,10 @@11751 @@ -14492,10 +14917,10 @@ 11712 11752 LIBS="-l$cf_db_libs $LIBS" 11713 11753 fi 11714 11754 11715 11755 -echo "${as_me-configure}:14495: testing checking for library "$cf_db_libs" ..." 1>&5 11716 +echo "${as_me-configure}:149 02: testing checking for library "$cf_db_libs" ..." 1>&511756 +echo "${as_me-configure}:14920: testing checking for library "$cf_db_libs" ..." 1>&5 11717 11757 11718 11758 cat >conftest.$ac_ext <<_ACEOF 11719 11759 -#line 14498 "configure" 11720 +#line 149 05"configure"11760 +#line 14923 "configure" 11721 11761 #include "confdefs.h" 11722 11762 11723 11763 $ac_includes_default 11724 @@ -14550,16 +149 57,16 @@11764 @@ -14550,16 +14975,16 @@ 11725 11765 } 11726 11766 _ACEOF 11727 11767 rm -f conftest.$ac_objext conftest$ac_exeext 11728 11768 -if { (eval echo "$as_me:14553: \"$ac_link\"") >&5 11729 +if { (eval echo "$as_me:149 60: \"$ac_link\"") >&511769 +if { (eval echo "$as_me:14978: \"$ac_link\"") >&5 11730 11770 (eval $ac_link) 2>&5 11731 11771 ac_status=$? 11732 11772 - echo "$as_me:14556: \$? = $ac_status" >&5 11733 + echo "$as_me:149 63: \$? = $ac_status" >&511773 + echo "$as_me:14981: \$? = $ac_status" >&5 11734 11774 (exit $ac_status); } && 11735 11775 { ac_try='test -s conftest$ac_exeext' 11736 11776 - { (eval echo "$as_me:14559: \"$ac_try\"") >&5 11737 + { (eval echo "$as_me:149 66: \"$ac_try\"") >&511777 + { (eval echo "$as_me:14984: \"$ac_try\"") >&5 11738 11778 (eval $ac_try) 2>&5 11739 11779 ac_status=$? 11740 11780 - echo "$as_me:14562: \$? = $ac_status" >&5 11741 + echo "$as_me:149 69: \$? = $ac_status" >&511781 + echo "$as_me:14987: \$? = $ac_status" >&5 11742 11782 (exit $ac_status); }; }; then 11743 11783 11744 11784 if test -n "$cf_db_libs" ; then 11745 @@ -14579,11 +1 4986,11 @@11785 @@ -14579,11 +15004,11 @@ 11746 11786 done 11747 11787 11748 11788 fi 11749 11789 -echo "$as_me:14582: result: $cf_cv_hashed_db_libs" >&5 11750 +echo "$as_me:1 4989: result: $cf_cv_hashed_db_libs" >&511790 +echo "$as_me:15007: result: $cf_cv_hashed_db_libs" >&5 11751 11791 echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6 11752 11792 11753 11793 if test "$cf_cv_hashed_db_libs" = unknown ; then 11754 11794 - { { echo "$as_me:14586: error: Cannot determine library for db" >&5 11755 + { { echo "$as_me:1 4993: error: Cannot determine library for db" >&511795 + { { echo "$as_me:15011: error: Cannot determine library for db" >&5 11756 11796 echo "$as_me: error: Cannot determine library for db" >&2;} 11757 11797 { (exit 1); exit 1; }; } 11758 11798 elif test "$cf_cv_hashed_db_libs" != default ; then 11759 @@ -14593,7 +150 00,7 @@11799 @@ -14593,7 +15018,7 @@ 11760 11800 11761 11801 else 11762 11802 11763 11803 - { { echo "$as_me:14596: error: Cannot find db.h" >&5 11764 + { { echo "$as_me:150 03: error: Cannot find db.h" >&511804 + { { echo "$as_me:15021: error: Cannot find db.h" >&5 11765 11805 echo "$as_me: error: Cannot find db.h" >&2;} 11766 11806 { (exit 1); exit 1; }; } 11767 11807 11768 @@ -14608,7 +150 15,7 @@11808 @@ -14608,7 +15033,7 @@ 11769 11809 11770 11810 # Just in case, check if the C compiler has a bool type. 11771 11811 11772 11812 -echo "$as_me:14611: checking if we should include stdbool.h" >&5 11773 +echo "$as_me:150 18: checking if we should include stdbool.h" >&511813 +echo "$as_me:15036: checking if we should include stdbool.h" >&5 11774 11814 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 11775 11815 11776 11816 if test "${cf_cv_header_stdbool_h+set}" = set; then 11777 @@ -14616,7 +150 23,7 @@11817 @@ -14616,7 +15041,7 @@ 11778 11818 else 11779 11819 11780 11820 cat >conftest.$ac_ext <<_ACEOF 11781 11821 -#line 14619 "configure" 11782 +#line 150 26"configure"11822 +#line 15044 "configure" 11783 11823 #include "confdefs.h" 11784 11824 11785 11825 int 11786 @@ -14628,23 +150 35,23 @@11826 @@ -14628,23 +15053,23 @@ 11787 11827 } 11788 11828 _ACEOF 11789 11829 rm -f conftest.$ac_objext 11790 11830 -if { (eval echo "$as_me:14631: \"$ac_compile\"") >&5 11791 +if { (eval echo "$as_me:150 38: \"$ac_compile\"") >&511831 +if { (eval echo "$as_me:15056: \"$ac_compile\"") >&5 11792 11832 (eval $ac_compile) 2>&5 11793 11833 ac_status=$? 11794 11834 - echo "$as_me:14634: \$? = $ac_status" >&5 11795 + echo "$as_me:150 41: \$? = $ac_status" >&511835 + echo "$as_me:15059: \$? = $ac_status" >&5 11796 11836 (exit $ac_status); } && 11797 11837 { ac_try='test -s conftest.$ac_objext' 11798 11838 - { (eval echo "$as_me:14637: \"$ac_try\"") >&5 11799 + { (eval echo "$as_me:150 44: \"$ac_try\"") >&511839 + { (eval echo "$as_me:15062: \"$ac_try\"") >&5 11800 11840 (eval $ac_try) 2>&5 11801 11841 ac_status=$? 11802 11842 - echo "$as_me:14640: \$? = $ac_status" >&5 11803 + echo "$as_me:150 47: \$? = $ac_status" >&511843 + echo "$as_me:15065: \$? = $ac_status" >&5 11804 11844 (exit $ac_status); }; }; then 11805 11845 cf_cv_header_stdbool_h=0 … … 11809 11849 cat >conftest.$ac_ext <<_ACEOF 11810 11850 -#line 14647 "configure" 11811 +#line 150 54"configure"11851 +#line 15072 "configure" 11812 11852 #include "confdefs.h" 11813 11853 11814 11854 #ifndef __BEOS__ 11815 @@ -14660,16 +150 67,16 @@11855 @@ -14660,16 +15085,16 @@ 11816 11856 } 11817 11857 _ACEOF 11818 11858 rm -f conftest.$ac_objext 11819 11859 -if { (eval echo "$as_me:14663: \"$ac_compile\"") >&5 11820 +if { (eval echo "$as_me:150 70: \"$ac_compile\"") >&511860 +if { (eval echo "$as_me:15088: \"$ac_compile\"") >&5 11821 11861 (eval $ac_compile) 2>&5 11822 11862 ac_status=$? 11823 11863 - echo "$as_me:14666: \$? = $ac_status" >&5 11824 + echo "$as_me:150 73: \$? = $ac_status" >&511864 + echo "$as_me:15091: \$? = $ac_status" >&5 11825 11865 (exit $ac_status); } && 11826 11866 { ac_try='test -s conftest.$ac_objext' 11827 11867 - { (eval echo "$as_me:14669: \"$ac_try\"") >&5 11828 + { (eval echo "$as_me:150 76: \"$ac_try\"") >&511868 + { (eval echo "$as_me:15094: \"$ac_try\"") >&5 11829 11869 (eval $ac_try) 2>&5 11830 11870 ac_status=$? 11831 11871 - echo "$as_me:14672: \$? = $ac_status" >&5 11832 + echo "$as_me:150 79: \$? = $ac_status" >&511872 + echo "$as_me:15097: \$? = $ac_status" >&5 11833 11873 (exit $ac_status); }; }; then 11834 11874 cf_cv_header_stdbool_h=1 11835 11875 else 11836 @@ -14683,13 +15 090,13 @@11876 @@ -14683,13 +15108,13 @@ 11837 11877 fi 11838 11878 11839 11879 if test "$cf_cv_header_stdbool_h" = 1 11840 11880 -then echo "$as_me:14686: result: yes" >&5 11841 +then echo "$as_me:15 093: result: yes" >&511881 +then echo "$as_me:15111: result: yes" >&5 11842 11882 echo "${ECHO_T}yes" >&6 11843 11883 -else echo "$as_me:14688: result: no" >&5 11844 +else echo "$as_me:15 095: result: no" >&511884 +else echo "$as_me:15113: result: no" >&5 11845 11885 echo "${ECHO_T}no" >&6 11846 11886 fi 11847 11887 11848 11888 -echo "$as_me:14692: checking for builtin bool type" >&5 11849 +echo "$as_me:15 099: checking for builtin bool type" >&511889 +echo "$as_me:15117: checking for builtin bool type" >&5 11850 11890 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 11851 11891 11852 11892 if test "${cf_cv_cc_bool_type+set}" = set; then 11853 @@ -14697,7 +151 04,7 @@11893 @@ -14697,7 +15122,7 @@ 11854 11894 else 11855 11895 11856 11896 cat >conftest.$ac_ext <<_ACEOF 11857 11897 -#line 14700 "configure" 11858 +#line 151 07"configure"11898 +#line 15125 "configure" 11859 11899 #include "confdefs.h" 11860 11900 11861 11901 #include <stdio.h> 11862 @@ -14712,16 +151 19,16 @@11902 @@ -14712,16 +15137,16 @@ 11863 11903 } 11864 11904 _ACEOF 11865 11905 rm -f conftest.$ac_objext 11866 11906 -if { (eval echo "$as_me:14715: \"$ac_compile\"") >&5 11867 +if { (eval echo "$as_me:151 22: \"$ac_compile\"") >&511907 +if { (eval echo "$as_me:15140: \"$ac_compile\"") >&5 11868 11908 (eval $ac_compile) 2>&5 11869 11909 ac_status=$? 11870 11910 - echo "$as_me:14718: \$? = $ac_status" >&5 11871 + echo "$as_me:151 25: \$? = $ac_status" >&511911 + echo "$as_me:15143: \$? = $ac_status" >&5 11872 11912 (exit $ac_status); } && 11873 11913 { ac_try='test -s conftest.$ac_objext' 11874 11914 - { (eval echo "$as_me:14721: \"$ac_try\"") >&5 11875 + { (eval echo "$as_me:151 28: \"$ac_try\"") >&511915 + { (eval echo "$as_me:15146: \"$ac_try\"") >&5 11876 11916 (eval $ac_try) 2>&5 11877 11917 ac_status=$? 11878 11918 - echo "$as_me:14724: \$? = $ac_status" >&5 11879 + echo "$as_me:151 31: \$? = $ac_status" >&511919 + echo "$as_me:15149: \$? = $ac_status" >&5 11880 11920 (exit $ac_status); }; }; then 11881 11921 cf_cv_cc_bool_type=1 11882 11922 else 11883 @@ -14734,9 +151 41,9 @@11923 @@ -14734,9 +15159,9 @@ 11884 11924 fi 11885 11925 11886 11926 if test "$cf_cv_cc_bool_type" = 1 11887 11927 -then echo "$as_me:14737: result: yes" >&5 11888 +then echo "$as_me:151 44: result: yes" >&511928 +then echo "$as_me:15162: result: yes" >&5 11889 11929 echo "${ECHO_T}yes" >&6 11890 11930 -else echo "$as_me:14739: result: no" >&5 11891 +else echo "$as_me:151 46: result: no" >&511931 +else echo "$as_me:15164: result: no" >&5 11892 11932 echo "${ECHO_T}no" >&6 11893 11933 fi 11894 11934 11895 @@ -14758,7 +151 65,7 @@11935 @@ -14758,7 +15183,7 @@ 11896 11936 cf_stdcpp_libname=stdc++ 11897 11937 ;; 11898 11938 esac 11899 11939 -echo "$as_me:14761: checking for library $cf_stdcpp_libname" >&5 11900 +echo "$as_me:151 68: checking for library $cf_stdcpp_libname" >&511940 +echo "$as_me:15186: checking for library $cf_stdcpp_libname" >&5 11901 11941 echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6 11902 11942 if test "${cf_cv_libstdcpp+set}" = set; then 11903 11943 echo $ECHO_N "(cached) $ECHO_C" >&6 11904 @@ -14767,7 +151 74,7 @@11944 @@ -14767,7 +15192,7 @@ 11905 11945 cf_save="$LIBS" 11906 11946 LIBS="$LIBS -l$cf_stdcpp_libname" 11907 11947 cat >conftest.$ac_ext <<_ACEOF 11908 11948 -#line 14770 "configure" 11909 +#line 151 77"configure"11949 +#line 15195 "configure" 11910 11950 #include "confdefs.h" 11911 11951 11912 11952 #include <strstream.h> 11913 @@ -14783,16 +15 190,16 @@11953 @@ -14783,16 +15208,16 @@ 11914 11954 } 11915 11955 _ACEOF 11916 11956 rm -f conftest.$ac_objext conftest$ac_exeext 11917 11957 -if { (eval echo "$as_me:14786: \"$ac_link\"") >&5 11918 +if { (eval echo "$as_me:15 193: \"$ac_link\"") >&511958 +if { (eval echo "$as_me:15211: \"$ac_link\"") >&5 11919 11959 (eval $ac_link) 2>&5 11920 11960 ac_status=$? 11921 11961 - echo "$as_me:14789: \$? = $ac_status" >&5 11922 + echo "$as_me:15 196: \$? = $ac_status" >&511962 + echo "$as_me:15214: \$? = $ac_status" >&5 11923 11963 (exit $ac_status); } && 11924 11964 { ac_try='test -s conftest$ac_exeext' 11925 11965 - { (eval echo "$as_me:14792: \"$ac_try\"") >&5 11926 + { (eval echo "$as_me:15 199: \"$ac_try\"") >&511966 + { (eval echo "$as_me:15217: \"$ac_try\"") >&5 11927 11967 (eval $ac_try) 2>&5 11928 11968 ac_status=$? 11929 11969 - echo "$as_me:14795: \$? = $ac_status" >&5 11930 + echo "$as_me:152 02: \$? = $ac_status" >&511970 + echo "$as_me:15220: \$? = $ac_status" >&5 11931 11971 (exit $ac_status); }; }; then 11932 11972 cf_cv_libstdcpp=yes 11933 11973 else 11934 @@ -14804,12 +152 11,12 @@11974 @@ -14804,12 +15229,12 @@ 11935 11975 LIBS="$cf_save" 11936 11976 11937 11977 fi 11938 11978 -echo "$as_me:14807: result: $cf_cv_libstdcpp" >&5 11939 +echo "$as_me:152 14: result: $cf_cv_libstdcpp" >&511979 +echo "$as_me:15232: result: $cf_cv_libstdcpp" >&5 11940 11980 echo "${ECHO_T}$cf_cv_libstdcpp" >&6 11941 11981 test "$cf_cv_libstdcpp" = yes && CXXLIBS="$CXXLIBS -l$cf_stdcpp_libname" … … 11943 11983 11944 11984 - echo "$as_me:14812: checking whether $CXX understands -c and -o together" >&5 11945 + echo "$as_me:152 19: checking whether $CXX understands -c and -o together" >&511985 + echo "$as_me:15237: checking whether $CXX understands -c and -o together" >&5 11946 11986 echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6 11947 11987 if test "${cf_cv_prog_CXX_c_o+set}" = set; then 11948 11988 echo $ECHO_N "(cached) $ECHO_C" >&6 11949 @@ -14825,15 +152 32,15 @@11989 @@ -14825,15 +15250,15 @@ 11950 11990 # We do the test twice because some compilers refuse to overwrite an 11951 11991 # existing .o file with -o, though they will create one. 11952 11992 ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5' 11953 11993 -if { (eval echo "$as_me:14828: \"$ac_try\"") >&5 11954 +if { (eval echo "$as_me:152 35: \"$ac_try\"") >&511994 +if { (eval echo "$as_me:15253: \"$ac_try\"") >&5 11955 11995 (eval $ac_try) 2>&5 11956 11996 ac_status=$? 11957 11997 - echo "$as_me:14831: \$? = $ac_status" >&5 11958 + echo "$as_me:152 38: \$? = $ac_status" >&511998 + echo "$as_me:15256: \$? = $ac_status" >&5 11959 11999 (exit $ac_status); } && 11960 12000 - test -f conftest2.$ac_objext && { (eval echo "$as_me:14833: \"$ac_try\"") >&5 11961 + test -f conftest2.$ac_objext && { (eval echo "$as_me:152 40: \"$ac_try\"") >&512001 + test -f conftest2.$ac_objext && { (eval echo "$as_me:15258: \"$ac_try\"") >&5 11962 12002 (eval $ac_try) 2>&5 11963 12003 ac_status=$? 11964 12004 - echo "$as_me:14836: \$? = $ac_status" >&5 11965 + echo "$as_me:152 43: \$? = $ac_status" >&512005 + echo "$as_me:15261: \$? = $ac_status" >&5 11966 12006 (exit $ac_status); }; 11967 12007 then 11968 12008 eval cf_cv_prog_CXX_c_o=yes 11969 @@ -14844,10 +152 51,10 @@12009 @@ -14844,10 +15269,10 @@ 11970 12010 11971 12011 fi 11972 12012 if test $cf_cv_prog_CXX_c_o = yes; then 11973 12013 - echo "$as_me:14847: result: yes" >&5 11974 + echo "$as_me:152 54: result: yes" >&512014 + echo "$as_me:15272: result: yes" >&5 11975 12015 echo "${ECHO_T}yes" >&6 11976 12016 else 11977 12017 - echo "$as_me:14850: result: no" >&5 11978 + echo "$as_me:152 57: result: no" >&512018 + echo "$as_me:15275: result: no" >&5 11979 12019 echo "${ECHO_T}no" >&6 11980 12020 fi 11981 12021 11982 @@ -14867,12 +152 74,12 @@12022 @@ -14867,12 +15292,12 @@ 11983 12023 ;; 11984 12024 esac 11985 12025 if test "$GXX" = yes; then 11986 12026 - echo "$as_me:14870: checking for lib$cf_gpp_libname" >&5 11987 + echo "$as_me:152 77: checking for lib$cf_gpp_libname" >&512027 + echo "$as_me:15295: checking for lib$cf_gpp_libname" >&5 11988 12028 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 11989 12029 cf_save="$LIBS" … … 11991 12031 cat >conftest.$ac_ext <<_ACEOF 11992 12032 -#line 14875 "configure" 11993 +#line 15 282"configure"12033 +#line 15300 "configure" 11994 12034 #include "confdefs.h" 11995 12035 11996 12036 #include <$cf_gpp_libname/builtin.h> 11997 @@ -14886,16 +15 293,16 @@12037 @@ -14886,16 +15311,16 @@ 11998 12038 } 11999 12039 _ACEOF 12000 12040 rm -f conftest.$ac_objext conftest$ac_exeext 12001 12041 -if { (eval echo "$as_me:14889: \"$ac_link\"") >&5 12002 +if { (eval echo "$as_me:15 296: \"$ac_link\"") >&512042 +if { (eval echo "$as_me:15314: \"$ac_link\"") >&5 12003 12043 (eval $ac_link) 2>&5 12004 12044 ac_status=$? 12005 12045 - echo "$as_me:14892: \$? = $ac_status" >&5 12006 + echo "$as_me:15 299: \$? = $ac_status" >&512046 + echo "$as_me:15317: \$? = $ac_status" >&5 12007 12047 (exit $ac_status); } && 12008 12048 { ac_try='test -s conftest$ac_exeext' 12009 12049 - { (eval echo "$as_me:14895: \"$ac_try\"") >&5 12010 + { (eval echo "$as_me:153 02: \"$ac_try\"") >&512050 + { (eval echo "$as_me:15320: \"$ac_try\"") >&5 12011 12051 (eval $ac_try) 2>&5 12012 12052 ac_status=$? 12013 12053 - echo "$as_me:14898: \$? = $ac_status" >&5 12014 + echo "$as_me:153 05: \$? = $ac_status" >&512054 + echo "$as_me:15323: \$? = $ac_status" >&5 12015 12055 (exit $ac_status); }; }; then 12016 12056 cf_cxx_library=yes 12017 12057 CXXLIBS="$CXXLIBS -l$cf_gpp_libname" 12018 @@ -14914,7 +153 21,7 @@12058 @@ -14914,7 +15339,7 @@ 12019 12059 echo "$as_me: failed program was:" >&5 12020 12060 cat conftest.$ac_ext >&5 12021 12061 cat >conftest.$ac_ext <<_ACEOF 12022 12062 -#line 14917 "configure" 12023 +#line 153 24"configure"12063 +#line 15342 "configure" 12024 12064 #include "confdefs.h" 12025 12065 12026 12066 #include <builtin.h> 12027 @@ -14928,16 +153 35,16 @@12067 @@ -14928,16 +15353,16 @@ 12028 12068 } 12029 12069 _ACEOF 12030 12070 rm -f conftest.$ac_objext conftest$ac_exeext 12031 12071 -if { (eval echo "$as_me:14931: \"$ac_link\"") >&5 12032 +if { (eval echo "$as_me:153 38: \"$ac_link\"") >&512072 +if { (eval echo "$as_me:15356: \"$ac_link\"") >&5 12033 12073 (eval $ac_link) 2>&5 12034 12074 ac_status=$? 12035 12075 - echo "$as_me:14934: \$? = $ac_status" >&5 12036 + echo "$as_me:153 41: \$? = $ac_status" >&512076 + echo "$as_me:15359: \$? = $ac_status" >&5 12037 12077 (exit $ac_status); } && 12038 12078 { ac_try='test -s conftest$ac_exeext' 12039 12079 - { (eval echo "$as_me:14937: \"$ac_try\"") >&5 12040 + { (eval echo "$as_me:153 44: \"$ac_try\"") >&512080 + { (eval echo "$as_me:15362: \"$ac_try\"") >&5 12041 12081 (eval $ac_try) 2>&5 12042 12082 ac_status=$? 12043 12083 - echo "$as_me:14940: \$? = $ac_status" >&5 12044 + echo "$as_me:153 47: \$? = $ac_status" >&512084 + echo "$as_me:15365: \$? = $ac_status" >&5 12045 12085 (exit $ac_status); }; }; then 12046 12086 cf_cxx_library=yes 12047 12087 CXXLIBS="$CXXLIBS -l$cf_gpp_libname" 12048 @@ -14954,7 +153 61,7 @@12088 @@ -14954,7 +15379,7 @@ 12049 12089 fi 12050 12090 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 12051 12091 LIBS="$cf_save" 12052 12092 - echo "$as_me:14957: result: $cf_cxx_library" >&5 12053 + echo "$as_me:153 64: result: $cf_cxx_library" >&512093 + echo "$as_me:15382: result: $cf_cxx_library" >&5 12054 12094 echo "${ECHO_T}$cf_cxx_library" >&6 12055 12095 fi 12056 12096 12057 @@ -14970,7 +153 77,7 @@12097 @@ -14970,7 +15395,7 @@ 12058 12098 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 12059 12099 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 12060 12100 ac_main_return=return 12061 12101 -echo "$as_me:14973: checking how to run the C++ preprocessor" >&5 12062 +echo "$as_me:153 80: checking how to run the C++ preprocessor" >&512102 +echo "$as_me:15398: checking how to run the C++ preprocessor" >&5 12063 12103 echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 12064 12104 if test -z "$CXXCPP"; then 12065 12105 if test "${ac_cv_prog_CXXCPP+set}" = set; then 12066 @@ -14987,18 +15 394,18 @@12106 @@ -14987,18 +15412,18 @@ 12067 12107 # On the NeXT, cc -E runs the code through the compiler's parser, 12068 12108 # not just through cpp. "Syntax error" is here to catch this case. 12069 12109 cat >conftest.$ac_ext <<_ACEOF 12070 12110 -#line 14990 "configure" 12071 +#line 15 397"configure"12111 +#line 15415 "configure" 12072 12112 #include "confdefs.h" 12073 12113 #include <assert.h> … … 12075 12115 _ACEOF 12076 12116 -if { (eval echo "$as_me:14995: \"$ac_cpp conftest.$ac_ext\"") >&5 12077 +if { (eval echo "$as_me:154 02: \"$ac_cpp conftest.$ac_ext\"") >&512117 +if { (eval echo "$as_me:15420: \"$ac_cpp conftest.$ac_ext\"") >&5 12078 12118 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 12079 12119 ac_status=$? … … 12082 12122 cat conftest.err >&5 12083 12123 - echo "$as_me:15001: \$? = $ac_status" >&5 12084 + echo "$as_me:154 08: \$? = $ac_status" >&512124 + echo "$as_me:15426: \$? = $ac_status" >&5 12085 12125 (exit $ac_status); } >/dev/null; then 12086 12126 if test -s conftest.err; then 12087 12127 ac_cpp_err=$ac_cxx_preproc_warn_flag 12088 @@ -15021,17 +154 28,17 @@12128 @@ -15021,17 +15446,17 @@ 12089 12129 # OK, works on sane cases. Now check whether non-existent headers 12090 12130 # can be detected and how. 12091 12131 cat >conftest.$ac_ext <<_ACEOF 12092 12132 -#line 15024 "configure" 12093 +#line 154 31"configure"12133 +#line 15449 "configure" 12094 12134 #include "confdefs.h" 12095 12135 #include <ac_nonexistent.h> 12096 12136 _ACEOF 12097 12137 -if { (eval echo "$as_me:15028: \"$ac_cpp conftest.$ac_ext\"") >&5 12098 +if { (eval echo "$as_me:154 35: \"$ac_cpp conftest.$ac_ext\"") >&512138 +if { (eval echo "$as_me:15453: \"$ac_cpp conftest.$ac_ext\"") >&5 12099 12139 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 12100 12140 ac_status=$? … … 12103 12143 cat conftest.err >&5 12104 12144 - echo "$as_me:15034: \$? = $ac_status" >&5 12105 + echo "$as_me:154 41: \$? = $ac_status" >&512145 + echo "$as_me:15459: \$? = $ac_status" >&5 12106 12146 (exit $ac_status); } >/dev/null; then 12107 12147 if test -s conftest.err; then 12108 12148 ac_cpp_err=$ac_cxx_preproc_warn_flag 12109 @@ -15068,7 +154 75,7 @@12149 @@ -15068,7 +15493,7 @@ 12110 12150 else 12111 12151 ac_cv_prog_CXXCPP=$CXXCPP 12112 12152 fi 12113 12153 -echo "$as_me:15071: result: $CXXCPP" >&5 12114 +echo "$as_me:154 78: result: $CXXCPP" >&512154 +echo "$as_me:15496: result: $CXXCPP" >&5 12115 12155 echo "${ECHO_T}$CXXCPP" >&6 12116 12156 ac_preproc_ok=false 12117 12157 for ac_cxx_preproc_warn_flag in '' yes 12118 @@ -15078,18 +15 485,18 @@12158 @@ -15078,18 +15503,18 @@ 12119 12159 # On the NeXT, cc -E runs the code through the compiler's parser, 12120 12160 # not just through cpp. "Syntax error" is here to catch this case. 12121 12161 cat >conftest.$ac_ext <<_ACEOF 12122 12162 -#line 15081 "configure" 12123 +#line 15 488"configure"12163 +#line 15506 "configure" 12124 12164 #include "confdefs.h" 12125 12165 #include <assert.h> … … 12127 12167 _ACEOF 12128 12168 -if { (eval echo "$as_me:15086: \"$ac_cpp conftest.$ac_ext\"") >&5 12129 +if { (eval echo "$as_me:15 493: \"$ac_cpp conftest.$ac_ext\"") >&512169 +if { (eval echo "$as_me:15511: \"$ac_cpp conftest.$ac_ext\"") >&5 12130 12170 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 12131 12171 ac_status=$? … … 12134 12174 cat conftest.err >&5 12135 12175 - echo "$as_me:15092: \$? = $ac_status" >&5 12136 + echo "$as_me:15 499: \$? = $ac_status" >&512176 + echo "$as_me:15517: \$? = $ac_status" >&5 12137 12177 (exit $ac_status); } >/dev/null; then 12138 12178 if test -s conftest.err; then 12139 12179 ac_cpp_err=$ac_cxx_preproc_warn_flag 12140 @@ -15112,17 +155 19,17 @@12180 @@ -15112,17 +15537,17 @@ 12141 12181 # OK, works on sane cases. Now check whether non-existent headers 12142 12182 # can be detected and how. 12143 12183 cat >conftest.$ac_ext <<_ACEOF 12144 12184 -#line 15115 "configure" 12145 +#line 155 22"configure"12185 +#line 15540 "configure" 12146 12186 #include "confdefs.h" 12147 12187 #include <ac_nonexistent.h> 12148 12188 _ACEOF 12149 12189 -if { (eval echo "$as_me:15119: \"$ac_cpp conftest.$ac_ext\"") >&5 12150 +if { (eval echo "$as_me:155 26: \"$ac_cpp conftest.$ac_ext\"") >&512190 +if { (eval echo "$as_me:15544: \"$ac_cpp conftest.$ac_ext\"") >&5 12151 12191 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 12152 12192 ac_status=$? … … 12155 12195 cat conftest.err >&5 12156 12196 - echo "$as_me:15125: \$? = $ac_status" >&5 12157 + echo "$as_me:155 32: \$? = $ac_status" >&512197 + echo "$as_me:15550: \$? = $ac_status" >&5 12158 12198 (exit $ac_status); } >/dev/null; then 12159 12199 if test -s conftest.err; then 12160 12200 ac_cpp_err=$ac_cxx_preproc_warn_flag 12161 @@ -15150,7 +155 57,7 @@12201 @@ -15150,7 +15575,7 @@ 12162 12202 if $ac_preproc_ok; then 12163 12203 : 12164 12204 else 12165 12205 - { { echo "$as_me:15153: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 12166 + { { echo "$as_me:155 60: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&512206 + { { echo "$as_me:15578: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 12167 12207 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} 12168 12208 { (exit 1); exit 1; }; } 12169 12209 fi 12170 @@ -15165,23 +155 72,23 @@12210 @@ -15165,23 +15590,23 @@ 12171 12211 for ac_header in iostream typeinfo 12172 12212 do 12173 12213 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 12174 12214 -echo "$as_me:15168: checking for $ac_header" >&5 12175 +echo "$as_me:155 75: checking for $ac_header" >&512215 +echo "$as_me:15593: checking for $ac_header" >&5 12176 12216 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 12177 12217 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 12180 12220 cat >conftest.$ac_ext <<_ACEOF 12181 12221 -#line 15174 "configure" 12182 +#line 155 81"configure"12222 +#line 15599 "configure" 12183 12223 #include "confdefs.h" 12184 12224 #include <$ac_header> 12185 12225 _ACEOF 12186 12226 -if { (eval echo "$as_me:15178: \"$ac_cpp conftest.$ac_ext\"") >&5 12187 +if { (eval echo "$as_me:15 585: \"$ac_cpp conftest.$ac_ext\"") >&512227 +if { (eval echo "$as_me:15603: \"$ac_cpp conftest.$ac_ext\"") >&5 12188 12228 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 12189 12229 ac_status=$? … … 12192 12232 cat conftest.err >&5 12193 12233 - echo "$as_me:15184: \$? = $ac_status" >&5 12194 + echo "$as_me:15 591: \$? = $ac_status" >&512234 + echo "$as_me:15609: \$? = $ac_status" >&5 12195 12235 (exit $ac_status); } >/dev/null; then 12196 12236 if test -s conftest.err; then 12197 12237 ac_cpp_err=$ac_cxx_preproc_warn_flag 12198 @@ -15200,7 +156 07,7 @@12238 @@ -15200,7 +15625,7 @@ 12199 12239 fi 12200 12240 rm -f conftest.err conftest.$ac_ext 12201 12241 fi 12202 12242 -echo "$as_me:15203: result: `eval echo '${'$as_ac_Header'}'`" >&5 12203 +echo "$as_me:156 10: result: `eval echo '${'$as_ac_Header'}'`" >&512243 +echo "$as_me:15628: result: `eval echo '${'$as_ac_Header'}'`" >&5 12204 12244 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 12205 12245 if test `eval echo '${'$as_ac_Header'}'` = yes; then 12206 12246 cat >>confdefs.h <<EOF 12207 @@ -15211,10 +156 18,10 @@12247 @@ -15211,10 +15636,10 @@ 12208 12248 done 12209 12249 12210 12250 if test x"$ac_cv_header_iostream" = xyes ; then 12211 12251 - echo "$as_me:15214: checking if iostream uses std-namespace" >&5 12212 + echo "$as_me:156 21: checking if iostream uses std-namespace" >&512252 + echo "$as_me:15639: checking if iostream uses std-namespace" >&5 12213 12253 echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6 12214 12254 cat >conftest.$ac_ext <<_ACEOF 12215 12255 -#line 15217 "configure" 12216 +#line 156 24"configure"12256 +#line 15642 "configure" 12217 12257 #include "confdefs.h" 12218 12258 12219 12259 #include <iostream> 12220 @@ -15231,16 +156 38,16 @@12260 @@ -15231,16 +15656,16 @@ 12221 12261 } 12222 12262 _ACEOF 12223 12263 rm -f conftest.$ac_objext 12224 12264 -if { (eval echo "$as_me:15234: \"$ac_compile\"") >&5 12225 +if { (eval echo "$as_me:156 41: \"$ac_compile\"") >&512265 +if { (eval echo "$as_me:15659: \"$ac_compile\"") >&5 12226 12266 (eval $ac_compile) 2>&5 12227 12267 ac_status=$? 12228 12268 - echo "$as_me:15237: \$? = $ac_status" >&5 12229 + echo "$as_me:156 44: \$? = $ac_status" >&512269 + echo "$as_me:15662: \$? = $ac_status" >&5 12230 12270 (exit $ac_status); } && 12231 12271 { ac_try='test -s conftest.$ac_objext' 12232 12272 - { (eval echo "$as_me:15240: \"$ac_try\"") >&5 12233 + { (eval echo "$as_me:156 47: \"$ac_try\"") >&512273 + { (eval echo "$as_me:15665: \"$ac_try\"") >&5 12234 12274 (eval $ac_try) 2>&5 12235 12275 ac_status=$? 12236 12276 - echo "$as_me:15243: \$? = $ac_status" >&5 12237 + echo "$as_me:156 50: \$? = $ac_status" >&512277 + echo "$as_me:15668: \$? = $ac_status" >&5 12238 12278 (exit $ac_status); }; }; then 12239 12279 cf_iostream_namespace=yes 12240 12280 else 12241 @@ -15249,7 +156 56,7 @@12281 @@ -15249,7 +15674,7 @@ 12242 12282 cf_iostream_namespace=no 12243 12283 fi 12244 12284 rm -f conftest.$ac_objext conftest.$ac_ext 12245 12285 - echo "$as_me:15252: result: $cf_iostream_namespace" >&5 12246 + echo "$as_me:156 59: result: $cf_iostream_namespace" >&512286 + echo "$as_me:15677: result: $cf_iostream_namespace" >&5 12247 12287 echo "${ECHO_T}$cf_iostream_namespace" >&6 12248 12288 if test "$cf_iostream_namespace" = yes ; then 12249 12289 cat >>confdefs.h <<\EOF 12250 @@ -15259,7 +156 66,7 @@12290 @@ -15259,7 +15684,7 @@ 12251 12291 fi 12252 12292 fi 12253 12293 12254 12294 -echo "$as_me:15262: checking if we should include stdbool.h" >&5 12255 +echo "$as_me:156 69: checking if we should include stdbool.h" >&512295 +echo "$as_me:15687: checking if we should include stdbool.h" >&5 12256 12296 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 12257 12297 12258 12298 if test "${cf_cv_header_stdbool_h+set}" = set; then 12259 @@ -15267,7 +156 74,7 @@12299 @@ -15267,7 +15692,7 @@ 12260 12300 else 12261 12301 12262 12302 cat >conftest.$ac_ext <<_ACEOF 12263 12303 -#line 15270 "configure" 12264 +#line 156 77"configure"12304 +#line 15695 "configure" 12265 12305 #include "confdefs.h" 12266 12306 12267 12307 int 12268 @@ -15279,23 +15 686,23 @@12308 @@ -15279,23 +15704,23 @@ 12269 12309 } 12270 12310 _ACEOF 12271 12311 rm -f conftest.$ac_objext 12272 12312 -if { (eval echo "$as_me:15282: \"$ac_compile\"") >&5 12273 +if { (eval echo "$as_me:15 689: \"$ac_compile\"") >&512313 +if { (eval echo "$as_me:15707: \"$ac_compile\"") >&5 12274 12314 (eval $ac_compile) 2>&5 12275 12315 ac_status=$? 12276 12316 - echo "$as_me:15285: \$? = $ac_status" >&5 12277 + echo "$as_me:15 692: \$? = $ac_status" >&512317 + echo "$as_me:15710: \$? = $ac_status" >&5 12278 12318 (exit $ac_status); } && 12279 12319 { ac_try='test -s conftest.$ac_objext' 12280 12320 - { (eval echo "$as_me:15288: \"$ac_try\"") >&5 12281 + { (eval echo "$as_me:15 695: \"$ac_try\"") >&512321 + { (eval echo "$as_me:15713: \"$ac_try\"") >&5 12282 12322 (eval $ac_try) 2>&5 12283 12323 ac_status=$? 12284 12324 - echo "$as_me:15291: \$? = $ac_status" >&5 12285 + echo "$as_me:15 698: \$? = $ac_status" >&512325 + echo "$as_me:15716: \$? = $ac_status" >&5 12286 12326 (exit $ac_status); }; }; then 12287 12327 cf_cv_header_stdbool_h=0 … … 12291 12331 cat >conftest.$ac_ext <<_ACEOF 12292 12332 -#line 15298 "configure" 12293 +#line 157 05"configure"12333 +#line 15723 "configure" 12294 12334 #include "confdefs.h" 12295 12335 12296 12336 #ifndef __BEOS__ 12297 @@ -15311,16 +157 18,16 @@12337 @@ -15311,16 +15736,16 @@ 12298 12338 } 12299 12339 _ACEOF 12300 12340 rm -f conftest.$ac_objext 12301 12341 -if { (eval echo "$as_me:15314: \"$ac_compile\"") >&5 12302 +if { (eval echo "$as_me:157 21: \"$ac_compile\"") >&512342 +if { (eval echo "$as_me:15739: \"$ac_compile\"") >&5 12303 12343 (eval $ac_compile) 2>&5 12304 12344 ac_status=$? 12305 12345 - echo "$as_me:15317: \$? = $ac_status" >&5 12306 + echo "$as_me:157 24: \$? = $ac_status" >&512346 + echo "$as_me:15742: \$? = $ac_status" >&5 12307 12347 (exit $ac_status); } && 12308 12348 { ac_try='test -s conftest.$ac_objext' 12309 12349 - { (eval echo "$as_me:15320: \"$ac_try\"") >&5 12310 + { (eval echo "$as_me:157 27: \"$ac_try\"") >&512350 + { (eval echo "$as_me:15745: \"$ac_try\"") >&5 12311 12351 (eval $ac_try) 2>&5 12312 12352 ac_status=$? 12313 12353 - echo "$as_me:15323: \$? = $ac_status" >&5 12314 + echo "$as_me:157 30: \$? = $ac_status" >&512354 + echo "$as_me:15748: \$? = $ac_status" >&5 12315 12355 (exit $ac_status); }; }; then 12316 12356 cf_cv_header_stdbool_h=1 12317 12357 else 12318 @@ -15334,13 +157 41,13 @@12358 @@ -15334,13 +15759,13 @@ 12319 12359 fi 12320 12360 12321 12361 if test "$cf_cv_header_stdbool_h" = 1 12322 12362 -then echo "$as_me:15337: result: yes" >&5 12323 +then echo "$as_me:157 44: result: yes" >&512363 +then echo "$as_me:15762: result: yes" >&5 12324 12364 echo "${ECHO_T}yes" >&6 12325 12365 -else echo "$as_me:15339: result: no" >&5 12326 +else echo "$as_me:157 46: result: no" >&512366 +else echo "$as_me:15764: result: no" >&5 12327 12367 echo "${ECHO_T}no" >&6 12328 12368 fi 12329 12369 12330 12370 -echo "$as_me:15343: checking for builtin bool type" >&5 12331 +echo "$as_me:157 50: checking for builtin bool type" >&512371 +echo "$as_me:15768: checking for builtin bool type" >&5 12332 12372 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 12333 12373 12334 12374 if test "${cf_cv_builtin_bool+set}" = set; then 12335 @@ -15348,7 +157 55,7 @@12375 @@ -15348,7 +15773,7 @@ 12336 12376 else 12337 12377 12338 12378 cat >conftest.$ac_ext <<_ACEOF 12339 12379 -#line 15351 "configure" 12340 +#line 157 58"configure"12380 +#line 15776 "configure" 12341 12381 #include "confdefs.h" 12342 12382 12343 12383 #include <stdio.h> 12344 @@ -15363,16 +157 70,16 @@12384 @@ -15363,16 +15788,16 @@ 12345 12385 } 12346 12386 _ACEOF 12347 12387 rm -f conftest.$ac_objext 12348 12388 -if { (eval echo "$as_me:15366: \"$ac_compile\"") >&5 12349 +if { (eval echo "$as_me:157 73: \"$ac_compile\"") >&512389 +if { (eval echo "$as_me:15791: \"$ac_compile\"") >&5 12350 12390 (eval $ac_compile) 2>&5 12351 12391 ac_status=$? 12352 12392 - echo "$as_me:15369: \$? = $ac_status" >&5 12353 + echo "$as_me:157 76: \$? = $ac_status" >&512393 + echo "$as_me:15794: \$? = $ac_status" >&5 12354 12394 (exit $ac_status); } && 12355 12395 { ac_try='test -s conftest.$ac_objext' 12356 12396 - { (eval echo "$as_me:15372: \"$ac_try\"") >&5 12357 + { (eval echo "$as_me:157 79: \"$ac_try\"") >&512397 + { (eval echo "$as_me:15797: \"$ac_try\"") >&5 12358 12398 (eval $ac_try) 2>&5 12359 12399 ac_status=$? 12360 12400 - echo "$as_me:15375: \$? = $ac_status" >&5 12361 + echo "$as_me:15 782: \$? = $ac_status" >&512401 + echo "$as_me:15800: \$? = $ac_status" >&5 12362 12402 (exit $ac_status); }; }; then 12363 12403 cf_cv_builtin_bool=1 12364 12404 else 12365 @@ -15385,13 +15 792,13 @@12405 @@ -15385,13 +15810,13 @@ 12366 12406 fi 12367 12407 12368 12408 if test "$cf_cv_builtin_bool" = 1 12369 12409 -then echo "$as_me:15388: result: yes" >&5 12370 +then echo "$as_me:15 795: result: yes" >&512410 +then echo "$as_me:15813: result: yes" >&5 12371 12411 echo "${ECHO_T}yes" >&6 12372 12412 -else echo "$as_me:15390: result: no" >&5 12373 +else echo "$as_me:15 797: result: no" >&512413 +else echo "$as_me:15815: result: no" >&5 12374 12414 echo "${ECHO_T}no" >&6 12375 12415 fi 12376 12416 12377 12417 -echo "$as_me:15394: checking for size of bool" >&5 12378 +echo "$as_me:158 01: checking for size of bool" >&512418 +echo "$as_me:15819: checking for size of bool" >&5 12379 12419 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 12380 12420 if test "${cf_cv_type_of_bool+set}" = set; then 12381 12421 echo $ECHO_N "(cached) $ECHO_C" >&6 12382 @@ -15402,7 +158 09,7 @@12422 @@ -15402,7 +15827,7 @@ 12383 12423 cf_cv_type_of_bool=unknown 12384 12424 else 12385 12425 cat >conftest.$ac_ext <<_ACEOF 12386 12426 -#line 15405 "configure" 12387 +#line 158 12"configure"12427 +#line 15830 "configure" 12388 12428 #include "confdefs.h" 12389 12429 12390 12430 #include <stdlib.h> 12391 @@ -15444,15 +158 51,15 @@12431 @@ -15444,15 +15869,15 @@ 12392 12432 12393 12433 _ACEOF 12394 12434 rm -f conftest$ac_exeext 12395 12435 -if { (eval echo "$as_me:15447: \"$ac_link\"") >&5 12396 +if { (eval echo "$as_me:158 54: \"$ac_link\"") >&512436 +if { (eval echo "$as_me:15872: \"$ac_link\"") >&5 12397 12437 (eval $ac_link) 2>&5 12398 12438 ac_status=$? 12399 12439 - echo "$as_me:15450: \$? = $ac_status" >&5 12400 + echo "$as_me:158 57: \$? = $ac_status" >&512440 + echo "$as_me:15875: \$? = $ac_status" >&5 12401 12441 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 12402 12442 - { (eval echo "$as_me:15452: \"$ac_try\"") >&5 12403 + { (eval echo "$as_me:158 59: \"$ac_try\"") >&512443 + { (eval echo "$as_me:15877: \"$ac_try\"") >&5 12404 12444 (eval $ac_try) 2>&5 12405 12445 ac_status=$? 12406 12446 - echo "$as_me:15455: \$? = $ac_status" >&5 12407 + echo "$as_me:158 62: \$? = $ac_status" >&512447 + echo "$as_me:15880: \$? = $ac_status" >&5 12408 12448 (exit $ac_status); }; }; then 12409 12449 cf_cv_type_of_bool=`cat cf_test.out` 12410 12450 if test -z "$cf_cv_type_of_bool"; then 12411 @@ -15470,18 +158 77,18 @@12451 @@ -15470,18 +15895,18 @@ 12412 12452 fi 12413 12453 12414 12454 rm -f cf_test.out 12415 12455 -echo "$as_me:15473: result: $cf_cv_type_of_bool" >&5 12416 +echo "$as_me:158 80: result: $cf_cv_type_of_bool" >&512456 +echo "$as_me:15898: result: $cf_cv_type_of_bool" >&5 12417 12457 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 12418 12458 if test "$cf_cv_type_of_bool" = unknown ; then … … 12421 12461 esac 12422 12462 - { echo "$as_me:15479: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 12423 + { echo "$as_me:15 886: WARNING: Assuming $NCURSES_BOOL for type of bool" >&512463 + { echo "$as_me:15904: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 12424 12464 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} 12425 12465 cf_cv_type_of_bool=$NCURSES_BOOL … … 12427 12467 12428 12468 -echo "$as_me:15484: checking for special defines needed for etip.h" >&5 12429 +echo "$as_me:15 891: checking for special defines needed for etip.h" >&512469 +echo "$as_me:15909: checking for special defines needed for etip.h" >&5 12430 12470 echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6 12431 12471 cf_save_CXXFLAGS="$CXXFLAGS" 12432 12472 cf_result="none" 12433 @@ -15493,7 +159 00,7 @@12473 @@ -15493,7 +15918,7 @@ 12434 12474 test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" 12435 12475 test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" 12436 12476 cat >conftest.$ac_ext <<_ACEOF 12437 12477 -#line 15496 "configure" 12438 +#line 159 03"configure"12478 +#line 15921 "configure" 12439 12479 #include "confdefs.h" 12440 12480 12441 12481 #include <etip.h.in> 12442 @@ -15507,16 +159 14,16 @@12482 @@ -15507,16 +15932,16 @@ 12443 12483 } 12444 12484 _ACEOF 12445 12485 rm -f conftest.$ac_objext 12446 12486 -if { (eval echo "$as_me:15510: \"$ac_compile\"") >&5 12447 +if { (eval echo "$as_me:159 17: \"$ac_compile\"") >&512487 +if { (eval echo "$as_me:15935: \"$ac_compile\"") >&5 12448 12488 (eval $ac_compile) 2>&5 12449 12489 ac_status=$? 12450 12490 - echo "$as_me:15513: \$? = $ac_status" >&5 12451 + echo "$as_me:159 20: \$? = $ac_status" >&512491 + echo "$as_me:15938: \$? = $ac_status" >&5 12452 12492 (exit $ac_status); } && 12453 12493 { ac_try='test -s conftest.$ac_objext' 12454 12494 - { (eval echo "$as_me:15516: \"$ac_try\"") >&5 12455 + { (eval echo "$as_me:159 23: \"$ac_try\"") >&512495 + { (eval echo "$as_me:15941: \"$ac_try\"") >&5 12456 12496 (eval $ac_try) 2>&5 12457 12497 ac_status=$? 12458 12498 - echo "$as_me:15519: \$? = $ac_status" >&5 12459 + echo "$as_me:159 26: \$? = $ac_status" >&512499 + echo "$as_me:15944: \$? = $ac_status" >&5 12460 12500 (exit $ac_status); }; }; then 12461 12501 12462 12502 test -n "$cf_math" && cat >>confdefs.h <<EOF 12463 @@ -15537,12 +159 44,12 @@12503 @@ -15537,12 +15962,12 @@ 12464 12504 rm -f conftest.$ac_objext conftest.$ac_ext 12465 12505 done 12466 12506 done 12467 12507 -echo "$as_me:15540: result: $cf_result" >&5 12468 +echo "$as_me:159 47: result: $cf_result" >&512508 +echo "$as_me:15965: result: $cf_result" >&5 12469 12509 echo "${ECHO_T}$cf_result" >&6 12470 12510 CXXFLAGS="$cf_save_CXXFLAGS" … … 12472 12512 if test -n "$CXX"; then 12473 12513 -echo "$as_me:15545: checking if $CXX accepts parameter initialization" >&5 12474 +echo "$as_me:159 52: checking if $CXX accepts parameter initialization" >&512514 +echo "$as_me:15970: checking if $CXX accepts parameter initialization" >&5 12475 12515 echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6 12476 12516 if test "${cf_cv_cpp_param_init+set}" = set; then 12477 12517 echo $ECHO_N "(cached) $ECHO_C" >&6 12478 @@ -15559,7 +159 66,7 @@12518 @@ -15559,7 +15984,7 @@ 12479 12519 cf_cv_cpp_param_init=unknown 12480 12520 else 12481 12521 cat >conftest.$ac_ext <<_ACEOF 12482 12522 -#line 15562 "configure" 12483 +#line 159 69"configure"12523 +#line 15987 "configure" 12484 12524 #include "confdefs.h" 12485 12525 12486 12526 class TEST { 12487 @@ -15578,15 +1 5985,15 @@12527 @@ -15578,15 +16003,15 @@ 12488 12528 12489 12529 _ACEOF 12490 12530 rm -f conftest$ac_exeext 12491 12531 -if { (eval echo "$as_me:15581: \"$ac_link\"") >&5 12492 +if { (eval echo "$as_me:1 5988: \"$ac_link\"") >&512532 +if { (eval echo "$as_me:16006: \"$ac_link\"") >&5 12493 12533 (eval $ac_link) 2>&5 12494 12534 ac_status=$? 12495 12535 - echo "$as_me:15584: \$? = $ac_status" >&5 12496 + echo "$as_me:1 5991: \$? = $ac_status" >&512536 + echo "$as_me:16009: \$? = $ac_status" >&5 12497 12537 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 12498 12538 - { (eval echo "$as_me:15586: \"$ac_try\"") >&5 12499 + { (eval echo "$as_me:1 5993: \"$ac_try\"") >&512539 + { (eval echo "$as_me:16011: \"$ac_try\"") >&5 12500 12540 (eval $ac_try) 2>&5 12501 12541 ac_status=$? 12502 12542 - echo "$as_me:15589: \$? = $ac_status" >&5 12503 + echo "$as_me:1 5996: \$? = $ac_status" >&512543 + echo "$as_me:16014: \$? = $ac_status" >&5 12504 12544 (exit $ac_status); }; }; then 12505 12545 cf_cv_cpp_param_init=yes 12506 12546 else 12507 @@ -15605,7 +160 12,7 @@12547 @@ -15605,7 +16030,7 @@ 12508 12548 ac_main_return=return 12509 12549 12510 12550 fi 12511 12551 -echo "$as_me:15608: result: $cf_cv_cpp_param_init" >&5 12512 +echo "$as_me:160 15: result: $cf_cv_cpp_param_init" >&512552 +echo "$as_me:16033: result: $cf_cv_cpp_param_init" >&5 12513 12553 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 12514 12554 fi 12515 12555 test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF 12516 @@ -15614,7 +160 21,7 @@12556 @@ -15614,7 +16039,7 @@ 12517 12557 12518 12558 if test -n "$CXX"; then 12519 12559 12520 12560 -echo "$as_me:15617: checking if $CXX accepts static_cast" >&5 12521 +echo "$as_me:160 24: checking if $CXX accepts static_cast" >&512561 +echo "$as_me:16042: checking if $CXX accepts static_cast" >&5 12522 12562 echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6 12523 12563 if test "${cf_cv_cpp_static_cast+set}" = set; then 12524 12564 echo $ECHO_N "(cached) $ECHO_C" >&6 12525 @@ -15628,7 +160 35,7 @@12565 @@ -15628,7 +16053,7 @@ 12526 12566 ac_main_return=return 12527 12567 12528 12568 cat >conftest.$ac_ext <<_ACEOF 12529 12569 -#line 15631 "configure" 12530 +#line 160 38"configure"12570 +#line 16056 "configure" 12531 12571 #include "confdefs.h" 12532 12572 12533 12573 class NCursesPanel 12534 @@ -15672,16 +160 79,16 @@12574 @@ -15672,16 +16097,16 @@ 12535 12575 } 12536 12576 _ACEOF 12537 12577 rm -f conftest.$ac_objext 12538 12578 -if { (eval echo "$as_me:15675: \"$ac_compile\"") >&5 12539 +if { (eval echo "$as_me:16 082: \"$ac_compile\"") >&512579 +if { (eval echo "$as_me:16100: \"$ac_compile\"") >&5 12540 12580 (eval $ac_compile) 2>&5 12541 12581 ac_status=$? 12542 12582 - echo "$as_me:15678: \$? = $ac_status" >&5 12543 + echo "$as_me:16 085: \$? = $ac_status" >&512583 + echo "$as_me:16103: \$? = $ac_status" >&5 12544 12584 (exit $ac_status); } && 12545 12585 { ac_try='test -s conftest.$ac_objext' 12546 12586 - { (eval echo "$as_me:15681: \"$ac_try\"") >&5 12547 + { (eval echo "$as_me:16 088: \"$ac_try\"") >&512587 + { (eval echo "$as_me:16106: \"$ac_try\"") >&5 12548 12588 (eval $ac_try) 2>&5 12549 12589 ac_status=$? 12550 12590 - echo "$as_me:15684: \$? = $ac_status" >&5 12551 + echo "$as_me:16 091: \$? = $ac_status" >&512591 + echo "$as_me:16109: \$? = $ac_status" >&5 12552 12592 (exit $ac_status); }; }; then 12553 12593 cf_cv_cpp_static_cast=yes 12554 12594 else 12555 @@ -15699,7 +161 06,7 @@12595 @@ -15699,7 +16124,7 @@ 12556 12596 ac_main_return=return 12557 12597 12558 12598 fi 12559 12599 -echo "$as_me:15702: result: $cf_cv_cpp_static_cast" >&5 12560 +echo "$as_me:161 09: result: $cf_cv_cpp_static_cast" >&512600 +echo "$as_me:16127: result: $cf_cv_cpp_static_cast" >&5 12561 12601 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 12562 12602 12563 12603 fi 12564 @@ -15709,12 +161 16,12 @@12604 @@ -15709,12 +16134,12 @@ 12565 12605 EOF 12566 12606 … … 12577 12617 ;; 12578 12618 sco3.2v5*) #(vi 12579 @@ -15723,7 +161 30,7 @@12619 @@ -15723,7 +16148,7 @@ 12580 12620 solaris2*) 12581 12621 if test "$GXX" != yes ; then … … 12586 12626 ;; 12587 12627 esac 12588 @@ -15747,7 +161 54,7 @@12628 @@ -15747,7 +16172,7 @@ 12589 12629 else 12590 12630 if test "$cf_cv_header_stdbool_h" = 1 ; then 12591 12631 12592 12632 -echo "$as_me:15750: checking for size of bool" >&5 12593 +echo "$as_me:161 57: checking for size of bool" >&512633 +echo "$as_me:16175: checking for size of bool" >&5 12594 12634 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 12595 12635 if test "${cf_cv_type_of_bool+set}" = set; then 12596 12636 echo $ECHO_N "(cached) $ECHO_C" >&6 12597 @@ -15758,7 +161 65,7 @@12637 @@ -15758,7 +16183,7 @@ 12598 12638 cf_cv_type_of_bool=unknown 12599 12639 else 12600 12640 cat >conftest.$ac_ext <<_ACEOF 12601 12641 -#line 15761 "configure" 12602 +#line 161 68"configure"12642 +#line 16186 "configure" 12603 12643 #include "confdefs.h" 12604 12644 12605 12645 #include <stdlib.h> 12606 @@ -15800,15 +162 07,15 @@12646 @@ -15800,15 +16225,15 @@ 12607 12647 12608 12648 _ACEOF 12609 12649 rm -f conftest$ac_exeext 12610 12650 -if { (eval echo "$as_me:15803: \"$ac_link\"") >&5 12611 +if { (eval echo "$as_me:162 10: \"$ac_link\"") >&512651 +if { (eval echo "$as_me:16228: \"$ac_link\"") >&5 12612 12652 (eval $ac_link) 2>&5 12613 12653 ac_status=$? 12614 12654 - echo "$as_me:15806: \$? = $ac_status" >&5 12615 + echo "$as_me:162 13: \$? = $ac_status" >&512655 + echo "$as_me:16231: \$? = $ac_status" >&5 12616 12656 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 12617 12657 - { (eval echo "$as_me:15808: \"$ac_try\"") >&5 12618 + { (eval echo "$as_me:162 15: \"$ac_try\"") >&512658 + { (eval echo "$as_me:16233: \"$ac_try\"") >&5 12619 12659 (eval $ac_try) 2>&5 12620 12660 ac_status=$? 12621 12661 - echo "$as_me:15811: \$? = $ac_status" >&5 12622 + echo "$as_me:162 18: \$? = $ac_status" >&512662 + echo "$as_me:16236: \$? = $ac_status" >&5 12623 12663 (exit $ac_status); }; }; then 12624 12664 cf_cv_type_of_bool=`cat cf_test.out` 12625 12665 if test -z "$cf_cv_type_of_bool"; then 12626 @@ -15826,25 +162 33,25 @@12666 @@ -15826,25 +16251,25 @@ 12627 12667 fi 12628 12668 12629 12669 rm -f cf_test.out 12630 12670 -echo "$as_me:15829: result: $cf_cv_type_of_bool" >&5 12631 +echo "$as_me:162 36: result: $cf_cv_type_of_bool" >&512671 +echo "$as_me:16254: result: $cf_cv_type_of_bool" >&5 12632 12672 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 12633 12673 if test "$cf_cv_type_of_bool" = unknown ; then … … 12636 12676 esac 12637 12677 - { echo "$as_me:15835: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 12638 + { echo "$as_me:162 42: WARNING: Assuming $NCURSES_BOOL for type of bool" >&512678 + { echo "$as_me:16260: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 12639 12679 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} 12640 12680 cf_cv_type_of_bool=$NCURSES_BOOL … … 12643 12683 else 12644 12684 - echo "$as_me:15841: checking for fallback type of bool" >&5 12645 + echo "$as_me:162 48: checking for fallback type of bool" >&512685 + echo "$as_me:16266: checking for fallback type of bool" >&5 12646 12686 echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6 12647 12687 case "$host_cpu" in #(vi … … 12650 12690 esac 12651 12691 - echo "$as_me:15847: result: $cf_cv_type_of_bool" >&5 12652 + echo "$as_me:162 54: result: $cf_cv_type_of_bool" >&512692 + echo "$as_me:16272: result: $cf_cv_type_of_bool" >&5 12653 12693 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 12654 12694 fi 12655 12695 fi 12656 @@ -15873,7 +162 80,7 @@12696 @@ -15873,7 +16298,7 @@ 12657 12697 12658 12698 if test "$cf_with_ada" != "no" ; then 12659 12699 if test "$with_libtool" != "no"; then 12660 12700 - { echo "$as_me:15876: WARNING: libtool does not support Ada - disabling feature" >&5 12661 + { echo "$as_me:16 283: WARNING: libtool does not support Ada - disabling feature" >&512701 + { echo "$as_me:16301: WARNING: libtool does not support Ada - disabling feature" >&5 12662 12702 echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} 12663 12703 cf_with_ada=no 12664 12704 fi 12665 @@ -15883,7 +16 290,7 @@12705 @@ -15883,7 +16308,7 @@ 12666 12706 cf_ada_make=gnatmake 12667 12707 # Extract the first word of "$cf_ada_make", so it can be a program name with args. 12668 12708 set dummy $cf_ada_make; ac_word=$2 12669 12709 -echo "$as_me:15886: checking for $ac_word" >&5 12670 +echo "$as_me:16 293: checking for $ac_word" >&512710 +echo "$as_me:16311: checking for $ac_word" >&5 12671 12711 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 12672 12712 if test "${ac_cv_prog_gnat_exists+set}" = set; then 12673 12713 echo $ECHO_N "(cached) $ECHO_C" >&6 12674 @@ -15898,7 +163 05,7 @@12714 @@ -15898,7 +16323,7 @@ 12675 12715 test -z "$ac_dir" && ac_dir=. 12676 12716 $as_executable_p "$ac_dir/$ac_word" || continue 12677 12717 ac_cv_prog_gnat_exists="yes" 12678 12718 -echo "$as_me:15901: found $ac_dir/$ac_word" >&5 12679 +echo "$as_me:163 08: found $ac_dir/$ac_word" >&512719 +echo "$as_me:16326: found $ac_dir/$ac_word" >&5 12680 12720 break 12681 12721 done 12682 12722 12683 @@ -15907,10 +163 14,10 @@12723 @@ -15907,10 +16332,10 @@ 12684 12724 fi 12685 12725 gnat_exists=$ac_cv_prog_gnat_exists 12686 12726 if test -n "$gnat_exists"; then 12687 12727 - echo "$as_me:15910: result: $gnat_exists" >&5 12688 + echo "$as_me:163 17: result: $gnat_exists" >&512728 + echo "$as_me:16335: result: $gnat_exists" >&5 12689 12729 echo "${ECHO_T}$gnat_exists" >&6 12690 12730 else 12691 12731 - echo "$as_me:15913: result: no" >&5 12692 + echo "$as_me:163 20: result: no" >&512732 + echo "$as_me:16338: result: no" >&5 12693 12733 echo "${ECHO_T}no" >&6 12694 12734 fi 12695 12735 12696 @@ -15918,11 +163 25,11 @@12736 @@ -15918,11 +16343,11 @@ 12697 12737 cf_ada_make= 12698 12738 else 12699 12739 12700 12740 -echo "$as_me:15921: checking for gnat version" >&5 12701 +echo "$as_me:163 28: checking for gnat version" >&512741 +echo "$as_me:16346: checking for gnat version" >&5 12702 12742 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 12703 12743 cf_gnat_version=`${cf_ada_make-gnatmake} -v 2>&1 | grep '[0-9].[0-9][0-9]*' |\ 12704 12744 sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` 12705 12745 -echo "$as_me:15925: result: $cf_gnat_version" >&5 12706 +echo "$as_me:163 32: result: $cf_gnat_version" >&512746 +echo "$as_me:16350: result: $cf_gnat_version" >&5 12707 12747 echo "${ECHO_T}$cf_gnat_version" >&6 12708 12748 12709 12749 case $cf_gnat_version in 12710 @@ -15945,7 +163 52,7 @@12750 @@ -15945,7 +16370,7 @@ 12711 12751 12712 12752 # Extract the first word of "m4", so it can be a program name with args. 12713 12753 set dummy m4; ac_word=$2 12714 12754 -echo "$as_me:15948: checking for $ac_word" >&5 12715 +echo "$as_me:163 55: checking for $ac_word" >&512755 +echo "$as_me:16373: checking for $ac_word" >&5 12716 12756 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 12717 12757 if test "${ac_cv_prog_M4_exists+set}" = set; then 12718 12758 echo $ECHO_N "(cached) $ECHO_C" >&6 12719 @@ -15960,7 +163 67,7 @@12759 @@ -15960,7 +16385,7 @@ 12720 12760 test -z "$ac_dir" && ac_dir=. 12721 12761 $as_executable_p "$ac_dir/$ac_word" || continue 12722 12762 ac_cv_prog_M4_exists="yes" 12723 12763 -echo "$as_me:15963: found $ac_dir/$ac_word" >&5 12724 +echo "$as_me:163 70: found $ac_dir/$ac_word" >&512764 +echo "$as_me:16388: found $ac_dir/$ac_word" >&5 12725 12765 break 12726 12766 done 12727 12767 12728 @@ -15969,10 +163 76,10 @@12768 @@ -15969,10 +16394,10 @@ 12729 12769 fi 12730 12770 M4_exists=$ac_cv_prog_M4_exists 12731 12771 if test -n "$M4_exists"; then 12732 12772 - echo "$as_me:15972: result: $M4_exists" >&5 12733 + echo "$as_me:163 79: result: $M4_exists" >&512773 + echo "$as_me:16397: result: $M4_exists" >&5 12734 12774 echo "${ECHO_T}$M4_exists" >&6 12735 12775 else 12736 12776 - echo "$as_me:15975: result: no" >&5 12737 + echo "$as_me:16 382: result: no" >&512777 + echo "$as_me:16400: result: no" >&5 12738 12778 echo "${ECHO_T}no" >&6 12739 12779 fi 12740 12780 12741 @@ -15981,7 +16 388,7 @@12781 @@ -15981,7 +16406,7 @@ 12742 12782 echo Ada95 binding required program m4 not found. Ada95 binding disabled. 12743 12783 fi 12744 12784 if test "$cf_cv_prog_gnat_correct" = yes; then 12745 12785 - echo "$as_me:15984: checking if GNAT works" >&5 12746 + echo "$as_me:16 391: checking if GNAT works" >&512786 + echo "$as_me:16409: checking if GNAT works" >&5 12747 12787 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 12748 12788 12749 12789 rm -f conftest* 12750 @@ -16009,14 +164 16,14 @@12790 @@ -16009,14 +16434,14 @@ 12751 12791 fi 12752 12792 rm -f conftest* 12753 12793 12754 12794 - echo "$as_me:16012: result: $cf_cv_prog_gnat_correct" >&5 12755 + echo "$as_me:164 19: result: $cf_cv_prog_gnat_correct" >&512795 + echo "$as_me:16437: result: $cf_cv_prog_gnat_correct" >&5 12756 12796 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 12757 12797 fi … … 12761 12801 12762 12802 - echo "$as_me:16019: checking if GNAT pragma Unreferenced works" >&5 12763 + echo "$as_me:164 26: checking if GNAT pragma Unreferenced works" >&512803 + echo "$as_me:16444: checking if GNAT pragma Unreferenced works" >&5 12764 12804 echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6 12765 12805 12766 12806 rm -f conftest* 12767 @@ -16043,7 +164 50,7 @@12807 @@ -16043,7 +16468,7 @@ 12768 12808 fi 12769 12809 rm -f conftest* 12770 12810 12771 12811 - echo "$as_me:16046: result: $cf_cv_pragma_unreferenced" >&5 12772 + echo "$as_me:164 53: result: $cf_cv_pragma_unreferenced" >&512812 + echo "$as_me:16471: result: $cf_cv_pragma_unreferenced" >&5 12773 12813 echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6 12774 12814 12775 12815 # if the pragma is supported, use it (needed in the Trace code). 12776 @@ -16096,7 +165 03,7 @@12816 @@ -16096,7 +16521,7 @@ 12777 12817 withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` 12778 12818 ;; 12779 12819 *) 12780 12820 - { { echo "$as_me:16099: error: expected a pathname, not \"$withval\"" >&5 12781 + { { echo "$as_me:165 06: error: expected a pathname, not \"$withval\"" >&512821 + { { echo "$as_me:16524: error: expected a pathname, not \"$withval\"" >&5 12782 12822 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} 12783 12823 { (exit 1); exit 1; }; } 12784 12824 ;; 12785 @@ -16138,7 +165 45,7 @@12825 @@ -16138,7 +16563,7 @@ 12786 12826 withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` 12787 12827 ;; 12788 12828 *) 12789 12829 - { { echo "$as_me:16141: error: expected a pathname, not \"$withval\"" >&5 12790 + { { echo "$as_me:165 48: error: expected a pathname, not \"$withval\"" >&512830 + { { echo "$as_me:16566: error: expected a pathname, not \"$withval\"" >&5 12791 12831 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} 12792 12832 { (exit 1); exit 1; }; } 12793 12833 ;; 12794 @@ -16163,7 +165 70,7 @@12834 @@ -16163,7 +16588,7 @@ 12795 12835 ### chooses to split module lists into libraries. 12796 12836 ### 12797 12837 ### (see CF_LIB_RULES). 12798 12838 -echo "$as_me:16166: checking for library subsets" >&5 12799 +echo "$as_me:165 73: checking for library subsets" >&512839 +echo "$as_me:16591: checking for library subsets" >&5 12800 12840 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 12801 12841 LIB_SUBSETS= 12802 12842 12803 @@ -16176,7 +16 583,17 @@12843 @@ -16176,7 +16601,17 @@ 12804 12844 fi 12805 12845 fi … … 12820 12860 if test "$with_termlib" != no ; then 12821 12861 LIB_SUBSETS="${LIB_SUBSETS} " 12822 @@ -16185,17 +166 02,18 @@12862 @@ -16185,17 +16620,18 @@ 12823 12863 fi 12824 12864 … … 12829 12869 12830 12870 -echo "$as_me:16191: result: $LIB_SUBSETS" >&5 12831 +echo "$as_me:166 09: result: $LIB_SUBSETS" >&512871 +echo "$as_me:16627: result: $LIB_SUBSETS" >&5 12832 12872 echo "${ECHO_T}$LIB_SUBSETS" >&6 12833 12873 … … 12842 12882 if test "$GCC" != yes; then 12843 12883 CPPFLAGS="$CPPFLAGS -I\${includedir}" 12844 @@ -16226,7 +166 44,7 @@12884 @@ -16226,7 +16662,7 @@ 12845 12885 fi 12846 12886 12847 12887 ### Build up pieces for makefile rules 12848 12888 -echo "$as_me:16229: checking default library suffix" >&5 12849 +echo "$as_me:166 47: checking default library suffix" >&512889 +echo "$as_me:16665: checking default library suffix" >&5 12850 12890 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 12851 12891 12852 12892 case $DFT_LWR_MODEL in 12853 @@ -16237,46 +166 55,50 @@12893 @@ -16237,46 +16673,50 @@ 12854 12894 shared) DFT_ARG_SUFFIX='' ;; 12855 12895 esac 12856 12896 test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" 12857 12897 -echo "$as_me:16240: result: $DFT_ARG_SUFFIX" >&5 12858 +echo "$as_me:166 58: result: $DFT_ARG_SUFFIX" >&512898 +echo "$as_me:16676: result: $DFT_ARG_SUFFIX" >&5 12859 12899 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 12860 12900 12861 12901 -echo "$as_me:16243: checking default library-dependency suffix" >&5 12862 +echo "$as_me:166 61: checking default library-dependency suffix" >&512902 +echo "$as_me:16679: checking default library-dependency suffix" >&5 12863 12903 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 12864 12904 … … 12915 12955 DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX 12916 12956 ;; 12917 @@ -16289,10 +167 11,10 @@12957 @@ -16289,10 +16729,10 @@ 12918 12958 esac 12919 12959 test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}" 12920 12960 test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}" 12921 12961 -echo "$as_me:16292: result: $DFT_DEP_SUFFIX" >&5 12922 +echo "$as_me:167 14: result: $DFT_DEP_SUFFIX" >&512962 +echo "$as_me:16732: result: $DFT_DEP_SUFFIX" >&5 12923 12963 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 12924 12964 12925 12965 -echo "$as_me:16295: checking default object directory" >&5 12926 +echo "$as_me:167 17: checking default object directory" >&512966 +echo "$as_me:16735: checking default object directory" >&5 12927 12967 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 12928 12968 12929 12969 case $DFT_LWR_MODEL in 12930 @@ -16308,51 +167 30,55 @@12970 @@ -16308,51 +16748,55 @@ 12931 12971 DFT_OBJ_SUBDIR='obj_s' ;; 12932 12972 esac 12933 12973 esac 12934 12974 -echo "$as_me:16311: result: $DFT_OBJ_SUBDIR" >&5 12935 +echo "$as_me:167 33: result: $DFT_OBJ_SUBDIR" >&512975 +echo "$as_me:16751: result: $DFT_OBJ_SUBDIR" >&5 12936 12976 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 12937 12977 … … 12939 12979 if test "$cf_with_cxx" = yes ; then 12940 12980 -echo "$as_me:16316: checking c++ library-dependency suffix" >&5 12941 +echo "$as_me:167 38: checking c++ library-dependency suffix" >&512981 +echo "$as_me:16756: checking c++ library-dependency suffix" >&5 12942 12982 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 12943 12983 if test "$with_libtool" != "no"; then … … 12997 13037 CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX 12998 13038 ;; 12999 @@ -16366,7 +16 792,7 @@13039 @@ -16366,7 +16810,7 @@ 13000 13040 test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}" 13001 13041 test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}" 13002 13042 fi 13003 13043 -echo "$as_me:16369: result: $CXX_LIB_SUFFIX" >&5 13004 +echo "$as_me:16 795: result: $CXX_LIB_SUFFIX" >&513044 +echo "$as_me:16813: result: $CXX_LIB_SUFFIX" >&5 13005 13045 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 13006 13046 13007 13047 fi 13008 @@ -16431,6 +168 57,8 @@13048 @@ -16431,6 +16875,8 @@ 13009 13049 TEST_ARGS="${TEST_DEPS}" 13010 13050 TEST_ARG2="${TEST_DEP2}" … … 13015 13055 TEST_ARGS="-l${TINFO_ARG_SUFFIX}" 13016 13056 TEST_ARG2="-l${TINFO_ARG_SUFFIX}" 13017 @@ -16480,7 +169 08,7 @@13057 @@ -16480,7 +16926,7 @@ 13018 13058 13019 13059 if test "$GCC" = yes ; then … … 13024 13064 LDFLAGS_SHARED= 13025 13065 ;; 13026 @@ -16491,7 +169 19,7 @@13066 @@ -16491,7 +16937,7 @@ 13027 13067 esac 13028 13068 else … … 13033 13073 LDFLAGS_SHARED=-bdynamic 13034 13074 ;; 13035 @@ -16519,12 +169 47,12 @@13075 @@ -16519,12 +16965,12 @@ 13036 13076 ;; 13037 13077 esac 13038 13078 13039 13079 -echo "$as_me:16522: checking where we will install curses.h" >&5 13040 +echo "$as_me:169 50: checking where we will install curses.h" >&513080 +echo "$as_me:16968: checking where we will install curses.h" >&5 13041 13081 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 13042 13082 test "$with_overwrite" = no && \ … … 13044 13084 includedir='${prefix}/include/ncurses'${LIB_SUFFIX} 13045 13085 -echo "$as_me:16527: result: $includedir" >&5 13046 +echo "$as_me:169 55: result: $includedir" >&513086 +echo "$as_me:16973: result: $includedir" >&5 13047 13087 echo "${ECHO_T}$includedir" >&6 13048 13088 13049 13089 ### Resolve a conflict between normal and wide-curses by forcing applications 13050 @@ -16532,10 +169 60,11 @@13090 @@ -16532,10 +16978,11 @@ 13051 13091 if test "$with_overwrite" != no ; then 13052 13092 if test "$NCURSES_LIBUTF8" = 1 ; then 13053 13093 NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' 13054 13094 - { echo "$as_me:16535: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 13055 + { echo "$as_me:169 63: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&513095 + { echo "$as_me:16981: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 13056 13096 echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;} 13057 13097 fi … … 13061 13101 # used to separate tack out of the tree 13062 13102 NCURSES_TREE= 13063 @@ -16548,7 +169 77,7 @@13103 @@ -16548,7 +16995,7 @@ 13064 13104 ### Construct the list of subdirectories for which we'll customize makefiles 13065 13105 ### with the appropriate compile-rules. 13066 13106 13067 13107 -echo "$as_me:16551: checking for src modules" >&5 13068 +echo "$as_me:169 80: checking for src modules" >&513108 +echo "$as_me:16998: checking for src modules" >&5 13069 13109 echo $ECHO_N "checking for src modules... $ECHO_C" >&6 13070 13110 13071 13111 # dependencies and linker-arguments for test-programs 13072 @@ -16611,13 +170 40,17 @@13112 @@ -16611,13 +17058,17 @@ 13073 13113 fi 13074 13114 fi 13075 13115 done 13076 13116 -echo "$as_me:16614: result: $cf_cv_src_modules" >&5 13077 +echo "$as_me:170 43: result: $cf_cv_src_modules" >&513117 +echo "$as_me:17061: result: $cf_cv_src_modules" >&5 13078 13118 echo "${ECHO_T}$cf_cv_src_modules" >&6 13079 13119 … … 13090 13130 do 13091 13131 SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir" 13092 @@ -16628,8 +170 61,8 @@13132 @@ -16628,8 +17079,8 @@ 13093 13133 13094 13134 ADA_SUBDIRS= … … 13101 13141 13102 13142 SUB_MAKEFILES= 13103 @@ -16639,15 +170 72,15 @@13143 @@ -16639,15 +17090,15 @@ 13104 13144 done 13105 13145 … … 13122 13162 13123 13163 DIRS_TO_MAKE="lib" 13124 @@ -16680,7 +171 13,7 @@13164 @@ -16680,7 +17131,7 @@ 13125 13165 done 13126 13166 … … 13131 13171 13132 13172 cat >>confdefs.h <<EOF 13133 @@ -16749,7 +17 182,7 @@13173 @@ -16749,7 +17200,7 @@ 13134 13174 13135 13175 if test -n "$cf_new_cppflags" ; then … … 13140 13180 13141 13181 if test -n "$cf_new_extra_cppflags" ; then 13142 @@ -16760,18 +17 193,18 @@13182 @@ -16760,18 +17211,18 @@ 13143 13183 ### If we're building with rpath, try to link non-standard libs that way too. 13144 13184 if test "$DFT_LWR_MODEL" = "shared"; then 13145 13185 13146 13186 -echo "$as_me:16763: checking for updated LDFLAGS" >&5 13147 +echo "$as_me:17 196: checking for updated LDFLAGS" >&513187 +echo "$as_me:17214: checking for updated LDFLAGS" >&5 13148 13188 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6 13149 13189 if test -n "$LDFLAGS" ; then 13150 13190 -echo "$as_me:16766: result: maybe" >&5 13151 +echo "$as_me:17 199: result: maybe" >&513191 +echo "$as_me:17217: result: maybe" >&5 13152 13192 echo "${ECHO_T}maybe" >&6 13153 13193 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 13154 13194 13155 13195 -echo "${as_me-configure}:16770: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 13156 +echo "${as_me-configure}:172 03: testing ...checking LDFLAGS $LDFLAGS ..." 1>&513196 +echo "${as_me-configure}:17221: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 13157 13197 13158 13198 test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 13159 13199 13160 13200 -echo "${as_me-configure}:16774: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 13161 +echo "${as_me-configure}:172 07: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&513201 +echo "${as_me-configure}:17225: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 13162 13202 13163 13203 case "$EXTRA_LDFLAGS" in #(vi 13164 13204 -Wl,-rpath,*) #(vi 13165 @@ -16793,7 +172 26,7 @@13205 @@ -16793,7 +17244,7 @@ 13166 13206 do 13167 13207 test -n "$verbose" && echo " Filtering $cf_rpath_src" 1>&6 13168 13208 13169 13209 -echo "${as_me-configure}:16796: testing Filtering $cf_rpath_src ..." 1>&5 13170 +echo "${as_me-configure}:172 29: testing Filtering $cf_rpath_src ..." 1>&513210 +echo "${as_me-configure}:17247: testing Filtering $cf_rpath_src ..." 1>&5 13171 13211 13172 13212 case $cf_rpath_src in #(vi 13173 13213 -L*) #(vi 13174 @@ -16804,7 +172 37,7 @@13214 @@ -16804,7 +17255,7 @@ 13175 13215 fi 13176 13216 test -n "$verbose" && echo " ...Filter $cf_rpath_tmp" 1>&6 13177 13217 13178 13218 -echo "${as_me-configure}:16807: testing ...Filter $cf_rpath_tmp ..." 1>&5 13179 +echo "${as_me-configure}:172 40: testing ...Filter $cf_rpath_tmp ..." 1>&513219 +echo "${as_me-configure}:17258: testing ...Filter $cf_rpath_tmp ..." 1>&5 13180 13220 13181 13221 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" 13182 13222 ;; 13183 @@ -16814,15 +172 47,15 @@13223 @@ -16814,15 +17265,15 @@ 13184 13224 LDFLAGS=$cf_rpath_dst 13185 13225 test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 13186 13226 13187 13227 -echo "${as_me-configure}:16817: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 13188 +echo "${as_me-configure}:172 50: testing ...checked LDFLAGS $LDFLAGS ..." 1>&513228 +echo "${as_me-configure}:17268: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 13189 13229 13190 13230 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 13191 13231 13192 13232 -echo "${as_me-configure}:16821: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 13193 +echo "${as_me-configure}:172 54: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&513233 +echo "${as_me-configure}:17272: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 13194 13234 13195 13235 fi 13196 13236 else 13197 13237 -echo "$as_me:16825: result: no" >&5 13198 +echo "$as_me:172 58: result: no" >&513238 +echo "$as_me:17276: result: no" >&5 13199 13239 echo "${ECHO_T}no" >&6 13200 13240 fi 13201 13241 13202 @@ -16849, 8 +17282,18@@13242 @@ -16849,9 +17300,19 @@ 13203 13243 fi 13204 13244 … … 13209 13249 + 13210 13250 SUB_MAKEFILES="$SUB_MAKEFILES misc/ncurses-config:misc/ncurses-config.in" 13251 -ac_config_files="$ac_config_files include/MKterm.h.awk include/curses.head:include/curses.h.in include/termcap.h include/unctrl.h $SUB_MAKEFILES Makefile" 13211 13252 + 13212 13253 +if test x"$enable_pc_files" = xyes ; then \ … … 13217 13258 +fi 13218 13259 + 13219 ac_config_files="$ac_config_files include/MKterm.h.awk include/curses.head:include/curses.h.ininclude/termcap.h include/unctrl.h $SUB_MAKEFILES Makefile"13260 +ac_config_files="$ac_config_files include/MKterm.h.awk include/curses.head:include/curses.h.in include/ncurses_dll.h include/termcap.h include/unctrl.h $SUB_MAKEFILES Makefile" 13220 13261 ac_config_commands="$ac_config_commands default" 13221 13262 cat >confcache <<\_ACEOF 13222 @@ -16932,7 +17375,7 @@ 13263 # This file is a shell script that caches the results of configure 13264 @@ -16932,7 +17393,7 @@ 13223 13265 : ${CONFIG_STATUS=./config.status} 13224 13266 ac_clean_files_save=$ac_clean_files 13225 13267 ac_clean_files="$ac_clean_files $CONFIG_STATUS" 13226 13268 -{ echo "$as_me:16935: creating $CONFIG_STATUS" >&5 13227 +{ echo "$as_me:173 78: creating $CONFIG_STATUS" >&513269 +{ echo "$as_me:17396: creating $CONFIG_STATUS" >&5 13228 13270 echo "$as_me: creating $CONFIG_STATUS" >&6;} 13229 13271 cat >$CONFIG_STATUS <<_ACEOF 13230 13272 #! $SHELL 13231 @@ -17064,7 +175 07,7 @@13273 @@ -17064,7 +17525,7 @@ 13232 13274 cat >>$CONFIG_STATUS <<EOF 13233 13275 ac_cs_version="\\ … … 13238 13280 13239 13281 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 13240 @@ -17108,7 +175 51,7 @@13282 @@ -17108,7 +17569,7 @@ 13241 13283 echo "$ac_cs_version"; exit 0 ;; 13242 13284 --he | --h) 13243 13285 # Conflict between --help and --header 13244 13286 - { { echo "$as_me:17111: error: ambiguous option: $1 13245 + { { echo "$as_me:175 54: error: ambiguous option: $113287 + { { echo "$as_me:17572: error: ambiguous option: $1 13246 13288 Try \`$0 --help' for more information." >&5 13247 13289 echo "$as_me: error: ambiguous option: $1 13248 13290 Try \`$0 --help' for more information." >&2;} 13249 @@ -17127,7 +175 70,7 @@13291 @@ -17127,7 +17588,7 @@ 13250 13292 ac_need_defaults=false;; 13251 13293 13252 13294 # This is an error. 13253 13295 - -*) { { echo "$as_me:17130: error: unrecognized option: $1 13254 + -*) { { echo "$as_me:175 73: error: unrecognized option: $113296 + -*) { { echo "$as_me:17591: error: unrecognized option: $1 13255 13297 Try \`$0 --help' for more information." >&5 13256 13298 echo "$as_me: error: unrecognized option: $1 13257 13299 Try \`$0 --help' for more information." >&2;} 13258 @@ -17146,7 +17 589,7 @@13300 @@ -17146,7 +17607,7 @@ 13259 13301 ## Running config.status. ## 13260 13302 ## ----------------------- ## … … 13265 13307 CONFIG_HEADERS = $CONFIG_HEADERS 13266 13308 CONFIG_LINKS = $CONFIG_LINKS 13267 @@ -17181,13 +176 24,13 @@13309 @@ -17181,13 +17642,13 @@ 13268 13310 NCURSES_PATCH="$NCURSES_PATCH" 13269 13311 SRC_SUBDIRS="$SRC_SUBDIRS" … … 13282 13324 WITH_ECHO="$with_echo" 13283 13325 WITH_OVERWRITE="$with_overwrite" 13284 @@ -17206,6 +176 49,7 @@13326 @@ -17206,6 +17667,7 @@ 13285 13327 cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix" 13286 13328 cf_cv_system_name="$cf_cv_system_name" … … 13290 13332 target="$target" 13291 13333 13292 @@ -17224,7 +17668,7 @@ 13334 @@ -17218,13 +17680,14 @@ 13335 # Handling of arguments. 13336 "include/MKterm.h.awk" ) CONFIG_FILES="$CONFIG_FILES include/MKterm.h.awk" ;; 13337 "include/curses.head" ) CONFIG_FILES="$CONFIG_FILES include/curses.head:include/curses.h.in" ;; 13338 + "include/ncurses_dll.h" ) CONFIG_FILES="$CONFIG_FILES include/ncurses_dll.h" ;; 13339 "include/termcap.h" ) CONFIG_FILES="$CONFIG_FILES include/termcap.h" ;; 13340 "include/unctrl.h" ) CONFIG_FILES="$CONFIG_FILES include/unctrl.h" ;; 13341 "$SUB_MAKEFILES" ) CONFIG_FILES="$CONFIG_FILES $SUB_MAKEFILES" ;; 13293 13342 "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; 13294 13343 "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; 13295 13344 "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; 13296 13345 - *) { { echo "$as_me:17227: error: invalid argument: $ac_config_target" >&5 13297 + *) { { echo "$as_me:176 71: error: invalid argument: $ac_config_target" >&513346 + *) { { echo "$as_me:17690: error: invalid argument: $ac_config_target" >&5 13298 13347 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} 13299 13348 { (exit 1); exit 1; }; };; 13300 13349 esac 13301 @@ -17349,6 +17 793,8 @@13350 @@ -17349,6 +17812,8 @@ 13302 13351 s,@LINT@,$LINT,;t t 13303 13352 s,@LINT_OPTS@,$LINT_OPTS,;t t … … 13308 13357 s,@MAKE_LOWER_TAGS@,$MAKE_LOWER_TAGS,;t t 13309 13358 s,@MAKE_UPPER_TAGS@,$MAKE_UPPER_TAGS,;t t 13310 @@ -17359,7 +178 05,7 @@13359 @@ -17359,7 +17824,7 @@ 13311 13360 s,@ac_ct_LD@,$ac_ct_LD,;t t 13312 13361 s,@AR@,$AR,;t t … … 13317 13366 s,@BUILD_CC@,$BUILD_CC,;t t 13318 13367 s,@BUILD_CPP@,$BUILD_CPP,;t t 13319 @@ -17371,6 +178 17,7 @@13368 @@ -17371,6 +17836,7 @@ 13320 13369 s,@BUILD_OBJEXT@,$BUILD_OBJEXT,;t t 13321 13370 s,@cf_list_models@,$cf_list_models,;t t … … 13325 13374 s,@LIBTOOL_OPTS@,$LIBTOOL_OPTS,;t t 13326 13375 s,@LIB_CREATE@,$LIB_CREATE,;t t 13327 @@ -17392,6 +178 39,7 @@13376 @@ -17392,6 +17858,7 @@ 13328 13377 s,@CXX_G_OPT@,$CXX_G_OPT,;t t 13329 13378 s,@LD_MODEL@,$LD_MODEL,;t t … … 13333 13382 s,@MK_SHARED_LIB@,$MK_SHARED_LIB,;t t 13334 13383 s,@LINK_PROGS@,$LINK_PROGS,;t t 13335 @@ -17401,7 +178 49,6 @@13384 @@ -17401,7 +17868,6 @@ 13336 13385 s,@LOCAL_LDFLAGS2@,$LOCAL_LDFLAGS2,;t t 13337 13386 s,@INSTALL_LIB@,$INSTALL_LIB,;t t … … 13341 13390 s,@WHICH_XTERM@,$WHICH_XTERM,;t t 13342 13391 s,@TERMINFO_DIRS@,$TERMINFO_DIRS,;t t 13343 @@ -17425,6 +17872,9 @@ 13392 @@ -17423,8 +17889,12 @@ 13393 s,@NCURSES_BOOL@,$NCURSES_BOOL,;t t 13394 s,@TERMINFO_CAPS@,$TERMINFO_CAPS,;t t 13344 13395 s,@NCURSES_OSPEED@,$NCURSES_OSPEED,;t t 13396 +s,@NCURSES_CCHARW_MAX@,$NCURSES_CCHARW_MAX,;t t 13345 13397 s,@MANPAGE_RENAMES@,$MANPAGE_RENAMES,;t t 13346 13398 s,@NCURSES_EXT_FUNCS@,$NCURSES_EXT_FUNCS,;t t … … 13351 13403 s,@NCURSES_EXT_COLORS@,$NCURSES_EXT_COLORS,;t t 13352 13404 s,@NCURSES_MOUSE_VERSION@,$NCURSES_MOUSE_VERSION,;t t 13353 @@ -17435,6 +17 885,7 @@13405 @@ -17435,6 +17905,7 @@ 13354 13406 s,@cf_cv_enable_opaque@,$cf_cv_enable_opaque,;t t 13355 13407 s,@NCURSES_OPAQUE@,$NCURSES_OPAQUE,;t t … … 13359 13411 s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t 13360 13412 s,@EXTRA_CXXFLAGS@,$EXTRA_CXXFLAGS,;t t 13361 @@ -17449,7 +179 00,7 @@13413 @@ -17449,7 +17920,7 @@ 13362 13414 s,@CXXCPP@,$CXXCPP,;t t 13363 13415 s,@CXXLDFLAGS@,$CXXLDFLAGS,;t t … … 13368 13420 s,@USE_CXX_BOOL@,$USE_CXX_BOOL,;t t 13369 13421 s,@gnat_exists@,$gnat_exists,;t t 13370 @@ -17493,6 +179 44,7 @@13422 @@ -17493,6 +17964,7 @@ 13371 13423 s,@HAVE_TCGETATTR@,$HAVE_TCGETATTR,;t t 13372 13424 s,@HAVE_TERMIO_H@,$HAVE_TERMIO_H,;t t … … 13376 13428 13377 13429 EOF 13378 @@ -17607,7 +180 59,7 @@13430 @@ -17607,7 +18079,7 @@ 13379 13431 esac 13380 13432 13381 13433 if test x"$ac_file" != x-; then 13382 13434 - { echo "$as_me:17610: creating $ac_file" >&5 13383 + { echo "$as_me:180 62: creating $ac_file" >&513435 + { echo "$as_me:18082: creating $ac_file" >&5 13384 13436 echo "$as_me: creating $ac_file" >&6;} 13385 13437 rm -f "$ac_file" 13386 13438 fi 13387 @@ -17625,7 +180 77,7 @@13439 @@ -17625,7 +18097,7 @@ 13388 13440 -) echo $tmp/stdin ;; 13389 13441 [\\/$]*) 13390 13442 # Absolute (can't be DOS-style, as IFS=:) 13391 13443 - test -f "$f" || { { echo "$as_me:17628: error: cannot find input file: $f" >&5 13392 + test -f "$f" || { { echo "$as_me:18 080: error: cannot find input file: $f" >&513444 + test -f "$f" || { { echo "$as_me:18100: error: cannot find input file: $f" >&5 13393 13445 echo "$as_me: error: cannot find input file: $f" >&2;} 13394 13446 { (exit 1); exit 1; }; } 13395 13447 echo $f;; 13396 @@ -17638,7 +18 090,7 @@13448 @@ -17638,7 +18110,7 @@ 13397 13449 echo $srcdir/$f 13398 13450 else 13399 13451 # /dev/null tree 13400 13452 - { { echo "$as_me:17641: error: cannot find input file: $f" >&5 13401 + { { echo "$as_me:18 093: error: cannot find input file: $f" >&513453 + { { echo "$as_me:18113: error: cannot find input file: $f" >&5 13402 13454 echo "$as_me: error: cannot find input file: $f" >&2;} 13403 13455 { (exit 1); exit 1; }; } 13404 13456 fi;; 13405 @@ -17704,7 +181 56,7 @@13457 @@ -17704,7 +18176,7 @@ 13406 13458 * ) ac_file_in=$ac_file.in ;; 13407 13459 esac 13408 13460 13409 13461 - test x"$ac_file" != x- && { echo "$as_me:17707: creating $ac_file" >&5 13410 + test x"$ac_file" != x- && { echo "$as_me:181 59: creating $ac_file" >&513462 + test x"$ac_file" != x- && { echo "$as_me:18179: creating $ac_file" >&5 13411 13463 echo "$as_me: creating $ac_file" >&6;} 13412 13464 13413 13465 # First look for the input files in the build tree, otherwise in the 13414 @@ -17715,7 +181 67,7 @@13466 @@ -17715,7 +18187,7 @@ 13415 13467 -) echo $tmp/stdin ;; 13416 13468 [\\/$]*) 13417 13469 # Absolute (can't be DOS-style, as IFS=:) 13418 13470 - test -f "$f" || { { echo "$as_me:17718: error: cannot find input file: $f" >&5 13419 + test -f "$f" || { { echo "$as_me:181 70: error: cannot find input file: $f" >&513471 + test -f "$f" || { { echo "$as_me:18190: error: cannot find input file: $f" >&5 13420 13472 echo "$as_me: error: cannot find input file: $f" >&2;} 13421 13473 { (exit 1); exit 1; }; } 13422 13474 echo $f;; 13423 @@ -17728,7 +18 180,7 @@13475 @@ -17728,7 +18200,7 @@ 13424 13476 echo $srcdir/$f 13425 13477 else 13426 13478 # /dev/null tree 13427 13479 - { { echo "$as_me:17731: error: cannot find input file: $f" >&5 13428 + { { echo "$as_me:18 183: error: cannot find input file: $f" >&513480 + { { echo "$as_me:18203: error: cannot find input file: $f" >&5 13429 13481 echo "$as_me: error: cannot find input file: $f" >&2;} 13430 13482 { (exit 1); exit 1; }; } 13431 13483 fi;; 13432 @@ -17786,7 +182 38,7 @@13484 @@ -17786,7 +18258,7 @@ 13433 13485 rm -f $tmp/in 13434 13486 if test x"$ac_file" != x-; then 13435 13487 if cmp -s $ac_file $tmp/config.h 2>/dev/null; then 13436 13488 - { echo "$as_me:17789: $ac_file is unchanged" >&5 13437 + { echo "$as_me:182 41: $ac_file is unchanged" >&513489 + { echo "$as_me:18261: $ac_file is unchanged" >&5 13438 13490 echo "$as_me: $ac_file is unchanged" >&6;} 13439 13491 else 13440 13492 ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 13441 @@ -17873,40 +183 25,44 @@13493 @@ -17873,40 +18345,44 @@ 13442 13494 for cf_item in $cf_LIST_MODELS 13443 13495 do … … 13495 13547 cf_depsuf=$cf_suffix 13496 13548 ;; 13497 @@ -18020,40 +184 76,44 @@13549 @@ -18020,40 +18496,44 @@ 13498 13550 13499 13551 cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` … … 13551 13603 cf_depsuf=$cf_suffix 13552 13604 ;; 13553 @@ -18234,18 +18 694,28 @@13605 @@ -18234,18 +18714,28 @@ 13554 13606 install.libs uninstall.libs \\ 13555 13607 install.data uninstall.data :: … … 13580 13632 if test -f $srcdir/$tack.h; then 13581 13633 cat >> Makefile <<CF_EOF 13582 @@ -18256,6 +187 26,7 @@13634 @@ -18256,6 +18746,7 @@ 13583 13635 CF_EOF 13584 13636 fi … … 13590 13642 diff -Naur ncurses-5.7.orig/configure.in ncurses-5.7/configure.in 13591 13643 --- ncurses-5.7.orig/configure.in 2008-10-18 07:53:32.000000000 -0700 13592 +++ ncurses-5.7/configure.in 2009-0 6-05 14:01:30.000000000 -070013644 +++ ncurses-5.7/configure.in 2009-07-19 15:04:17.000000000 -0700 13593 13645 @@ -1,5 +1,5 @@ 13594 13646 dnl*************************************************************************** … … 13603 13655 dnl 13604 13656 -dnl $Id: configure.in,v 1.454 2008/10/18 14:53:32 tom Exp $ 13605 +dnl $Id: configure.in,v 1.47 0 2009/03/28 18:22:39 Charles.WilsonExp $13657 +dnl $Id: configure.in,v 1.472 2009/07/18 16:18:30 tom Exp $ 13606 13658 dnl Process this file with autoconf to produce a configure script. 13607 13659 dnl … … 13611 13663 AC_PREREQ(2.13.20020210) 13612 13664 -AC_REVISION($Revision: 1.454 $) 13613 +AC_REVISION($Revision: 1.47 0$)13665 +AC_REVISION($Revision: 1.472 $) 13614 13666 AC_INIT(ncurses/base/lib_initscr.c) 13615 13667 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) … … 13670 13722 dnl Special option for use by system-builders: the install-prefix is used to 13671 13723 dnl adjust the location into which the actual install is done, so that an 13672 @@ -807,7 +839,7 @@ 13724 @@ -797,6 +829,15 @@ 13725 [NCURSES_MMASK_T=auto]) 13726 AC_MSG_RESULT($NCURSES_MMASK_T) 13727 13728 +### use option --with-ccharw-max to override CCHARW_MAX size 13729 +AC_MSG_CHECKING(for size CCHARW_MAX) 13730 +AC_ARG_WITH(ccharw-max, 13731 + [ --with-ccharw-max=XXX override size CCHARW_MAX], 13732 + [NCURSES_CCHARW_MAX="$withval"], 13733 + [NCURSES_CCHARW_MAX=5]) 13734 +AC_MSG_RESULT($NCURSES_CCHARW_MAX) 13735 +AC_SUBST(NCURSES_CCHARW_MAX) 13736 + 13737 ### Enable compiling-in rcs id's 13738 AC_MSG_CHECKING(if RCS identifiers should be compiled-in) 13739 AC_ARG_WITH(rcs-ids, 13740 @@ -807,7 +848,7 @@ 13673 13741 test "$with_rcs_ids" = yes && AC_DEFINE(USE_RCS_IDS) 13674 13742 … … 13679 13747 ############################################################################### 13680 13748 CF_HELP_MESSAGE(Extensions:) 13681 @@ -828,10 +86 0,30 @@13749 @@ -828,10 +869,30 @@ 13682 13750 AC_DEFINE(HAVE_USE_DEFAULT_COLORS) 13683 13751 AC_DEFINE(HAVE_WRESIZE) … … 13710 13778 ### use option --enable-const to turn on use of const beyond that in XSI. 13711 13779 AC_MSG_CHECKING(for extended use of const keyword) 13712 @@ -1024,11 +10 76,11 @@13780 @@ -1024,11 +1085,11 @@ 13713 13781 cf_cv_enable_opaque="NCURSES_INTERNALS" 13714 13782 NCURSES_OPAQUE=1 … … 13727 13795 CF_NCURSES_ABI_6 13728 13796 else 13729 @@ -1042,6 +1 094,20 @@13797 @@ -1042,6 +1103,20 @@ 13730 13798 AC_SUBST(NCURSES_OPAQUE) 13731 13799 AC_SUBST(NCURSES_SIZE_T) … … 13748 13816 AC_ARG_ENABLE(safe-sprintf, 13749 13817 [ --enable-safe-sprintf compile with experimental safe-sprintf code], 13750 @@ -1165,12 +12 31,18 @@13818 @@ -1165,12 +1240,18 @@ 13751 13819 AC_SUBST(ADA_TRACE) 13752 13820 … … 13767 13835 CF_MATH_LIB(MATH_LIB,sin(x)) 13768 13836 AC_SUBST(MATH_LIB) 13769 @@ -1354,12 +14 26,12 @@13837 @@ -1354,12 +1435,12 @@ 13770 13838 CF_CPP_STATIC_CAST 13771 13839 … … 13782 13850 ;; 13783 13851 sco3.2v5*) #(vi 13784 @@ -1368,13 +144 0,13 @@13852 @@ -1368,13 +1449,13 @@ 13785 13853 solaris2*) 13786 13854 if test "$GXX" != yes ; then … … 13798 13866 cf_cxx_library=no 13799 13867 cf_cv_builtin_bool=1 13800 @@ -1552,7 +16 24,17 @@13868 @@ -1552,7 +1633,17 @@ 13801 13869 fi 13802 13870 fi … … 13817 13885 if test "$with_termlib" != no ; then 13818 13886 LIB_SUBSETS="${LIB_SUBSETS} " 13819 @@ -1561,6 +16 43,7 @@13887 @@ -1561,6 +1652,7 @@ 13820 13888 fi 13821 13889 … … 13825 13893 test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" 13826 13894 13827 @@ -1656,6 +17 39,8 @@13895 @@ -1656,6 +1748,8 @@ 13828 13896 TEST_ARGS="${TEST_DEPS}" 13829 13897 TEST_ARG2="${TEST_DEP2}" … … 13834 13902 TEST_ARGS="-l${TINFO_ARG_SUFFIX}" 13835 13903 TEST_ARG2="-l${TINFO_ARG_SUFFIX}" 13836 @@ -1723,6 +18 08,7 @@13904 @@ -1723,6 +1817,7 @@ 13837 13905 AC_MSG_WARN(Wide-character applications must define HAVE_LIBUTF8_H to include curses.h) 13838 13906 fi … … 13842 13910 AC_SUBST(WITH_OVERWRITE) 13843 13911 AC_SUBST(TICS_LIST) 13844 @@ -1742,12 +18 28,12 @@13912 @@ -1742,12 +1837,12 @@ 13845 13913 CF_SRC_MODULES($modules_to_build) 13846 13914 … … 13857 13925 AC_DEFINE_UNQUOTED(NCURSES_VERSION_STRING, "${NCURSES_MAJOR}.${NCURSES_MINOR}.${NCURSES_PATCH}") 13858 13926 13859 @@ -1765, 8 +1851,19@@13927 @@ -1765,11 +1860,23 @@ 13860 13928 CF_SUBST_IF(["$ac_cv_header_termios_h" = yes], HAVE_TERMIOS_H, 1, 0) 13861 13929 … … 13878 13946 include/MKterm.h.awk \ 13879 13947 include/curses.head:include/curses.h.in \ 13880 @@ -1796,13 +1893,13 @@ 13948 + include/ncurses_dll.h \ 13949 include/termcap.h \ 13950 include/unctrl.h \ 13951 $SUB_MAKEFILES \ 13952 @@ -1796,13 +1903,13 @@ 13881 13953 NCURSES_PATCH="$NCURSES_PATCH" 13882 13954 SRC_SUBDIRS="$SRC_SUBDIRS" … … 13895 13967 WITH_ECHO="$with_echo" 13896 13968 WITH_OVERWRITE="$with_overwrite" 13897 @@ -1821,6 +19 18,7 @@13969 @@ -1821,6 +1928,7 @@ 13898 13970 cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix" 13899 13971 cf_cv_system_name="$cf_cv_system_name" … … 13905 13977 diff -Naur ncurses-5.7.orig/dist.mk ncurses-5.7/dist.mk 13906 13978 --- ncurses-5.7.orig/dist.mk 2008-11-01 17:58:38.000000000 -0700 13907 +++ ncurses-5.7/dist.mk 2009-0 6-05 14:01:55.000000000 -070013979 +++ ncurses-5.7/dist.mk 2009-07-19 15:04:17.000000000 -0700 13908 13980 @@ -25,7 +25,7 @@ 13909 13981 # use or other dealings in this Software without prior written # … … 13911 13983 ############################################################################## 13912 13984 -# $Id: dist.mk,v 1.671 2008/11/02 00:58:38 tom Exp $ 13913 +# $Id: dist.mk,v 1.70 2 2009/05/30 13:36:52 tom Exp $13985 +# $Id: dist.mk,v 1.709 2009/07/15 23:12:22 tom Exp $ 13914 13986 # Makefile for creating ncurses distributions. 13915 13987 # … … 13920 13992 NCURSES_MINOR = 7 13921 13993 -NCURSES_PATCH = 20081102 13922 +NCURSES_PATCH = 20090 53013994 +NCURSES_PATCH = 20090718 13923 13995 13924 13996 # We don't append the patch to the version, since this only applies to releases … … 13926 13998 diff -Naur ncurses-5.7.orig/form/fld_def.c ncurses-5.7/form/fld_def.c 13927 13999 --- ncurses-5.7.orig/form/fld_def.c 2007-10-13 12:29:58.000000000 -0700 13928 +++ ncurses-5.7/form/fld_def.c 2009-0 6-05 14:01:18.000000000 -070014000 +++ ncurses-5.7/form/fld_def.c 2009-07-19 15:02:23.000000000 -0700 13929 14001 @@ -32,7 +32,7 @@ 13930 14002 … … 13948 14020 diff -Naur ncurses-5.7.orig/form/fld_newftyp.c ncurses-5.7/form/fld_newftyp.c 13949 14021 --- ncurses-5.7.orig/form/fld_newftyp.c 2007-10-13 12:30:55.000000000 -0700 13950 +++ ncurses-5.7/form/fld_newftyp.c 2009-0 6-05 14:01:33.000000000 -070014022 +++ ncurses-5.7/form/fld_newftyp.c 2009-07-19 15:03:51.000000000 -0700 13951 14023 @@ -1,5 +1,5 @@ 13952 14024 /**************************************************************************** … … 13979 14051 diff -Naur ncurses-5.7.orig/form/form.priv.h ncurses-5.7/form/form.priv.h 13980 14052 --- ncurses-5.7.orig/form/form.priv.h 2008-09-08 13:29:05.000000000 -0700 13981 +++ ncurses-5.7/form/form.priv.h 2009-0 6-05 14:01:33.000000000 -070014053 +++ ncurses-5.7/form/form.priv.h 2009-07-19 15:03:51.000000000 -0700 13982 14054 @@ -1,5 +1,5 @@ 13983 14055 /**************************************************************************** … … 14044 14116 diff -Naur ncurses-5.7.orig/form/frm_driver.c ncurses-5.7/form/frm_driver.c 14045 14117 --- ncurses-5.7.orig/form/frm_driver.c 2008-10-18 09:25:00.000000000 -0700 14046 +++ ncurses-5.7/form/frm_driver.c 2009-0 6-05 14:00:55.000000000 -070014118 +++ ncurses-5.7/form/frm_driver.c 2009-07-19 15:02:00.000000000 -0700 14047 14119 @@ -32,7 +32,7 @@ 14048 14120 … … 14064 14136 diff -Naur ncurses-5.7.orig/form/frm_sub.c ncurses-5.7/form/frm_sub.c 14065 14137 --- ncurses-5.7.orig/form/frm_sub.c 2004-12-11 14:13:39.000000000 -0800 14066 +++ ncurses-5.7/form/frm_sub.c 2009-0 6-05 14:01:33.000000000 -070014138 +++ ncurses-5.7/form/frm_sub.c 2009-07-19 15:03:51.000000000 -0700 14067 14139 @@ -1,5 +1,5 @@ 14068 14140 /**************************************************************************** … … 14111 14183 diff -Naur ncurses-5.7.orig/form/frm_win.c ncurses-5.7/form/frm_win.c 14112 14184 --- ncurses-5.7.orig/form/frm_win.c 2004-12-11 14:15:27.000000000 -0800 14113 +++ ncurses-5.7/form/frm_win.c 2009-0 6-05 14:01:44.000000000 -070014185 +++ ncurses-5.7/form/frm_win.c 2009-07-19 15:03:53.000000000 -0700 14114 14186 @@ -1,5 +1,5 @@ 14115 14187 /**************************************************************************** … … 14170 14242 14171 14243 /* frm_win.c ends here */ 14244 diff -Naur ncurses-5.7.orig/form/fty_generic.c ncurses-5.7/form/fty_generic.c 14245 --- ncurses-5.7.orig/form/fty_generic.c 1969-12-31 16:00:00.000000000 -0800 14246 +++ ncurses-5.7/form/fty_generic.c 2009-07-19 15:04:11.000000000 -0700 14247 @@ -0,0 +1,287 @@ 14248 +/**************************************************************************** 14249 + * Copyright (c) 2008 Free Software Foundation, Inc. * 14250 + * * 14251 + * Permission is hereby granted, free of charge, to any person obtaining a * 14252 + * copy of this software and associated documentation files (the * 14253 + * "Software"), to deal in the Software without restriction, including * 14254 + * without limitation the rights to use, copy, modify, merge, publish, * 14255 + * distribute, distribute with modifications, sublicense, and/or sell * 14256 + * copies of the Software, and to permit persons to whom the Software is * 14257 + * furnished to do so, subject to the following conditions: * 14258 + * * 14259 + * The above copyright notice and this permission notice shall be included * 14260 + * in all copies or substantial portions of the Software. * 14261 + * * 14262 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * 14263 + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * 14264 + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * 14265 + * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * 14266 + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * 14267 + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * 14268 + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * 14269 + * * 14270 + * Except as contained in this notice, the name(s) of the above copyright * 14271 + * holders shall not be used in advertising or otherwise to promote the * 14272 + * sale, use or other dealings in this Software without prior written * 14273 + * authorization. * 14274 + ****************************************************************************/ 14275 + 14276 +/*************************************************************************** 14277 +* * 14278 +* Author : Juergen Pfeifer * 14279 +* * 14280 +***************************************************************************/ 14281 + 14282 +#include "form.priv.h" 14283 + 14284 +MODULE_ID("$Id: fty_generic.c,v 1.1 2008/11/18 08:50:04 juergen Exp $") 14285 + 14286 +/* 14287 + * This is not a full implementation of a field type, but adds some 14288 + * support for higher level languages with some restrictions to interop 14289 + * with C language. Especially the collection of arguments for the 14290 + * various fieldtypes is not based on the vararg C mechanism, but on a 14291 + * iterator based callback mechanism that allowes the high level language 14292 + * to provide the arguments as a structure. Most languages have mechanisms 14293 + * to layout structures so that they can be passed to C. 14294 + * The languages can register a new generic fieldtype dynamically and store 14295 + * a handle (key) to the calling object as an argument. Together with that 14296 + * it can register a freearg callback, so that the high level language 14297 + * remains in control of the memory management of the arguments they pass. 14298 + * The design idea is, that the high-level language - typically a OO 14299 + * language like C# or Java, uses it's own dispatching mechanisms 14300 + * (polymorphism) to call the proper check routines responsible for the 14301 + * argument type. So these language implement typically only one generic 14302 + * fieldtype they register with the forms library using this call. 14303 + * 14304 + * For that purpose we have extended the fieldtype struc by a new element 14305 + * that gets the arguments from a single struct passed by the caller. 14306 + * 14307 + */ 14308 + 14309 + 14310 +/*--------------------------------------------------------------------------- 14311 +| Facility : libnform 14312 +| Function : static void *Generic_This_Type( void * arg ) 14313 +| 14314 +| Description : We interpret the passed arg just as a handle the 14315 +| calling language uses to keep track of its allocated 14316 +| argument structures. We can simply copy it back. 14317 +| 14318 +| Return Values : Pointer to argument structure 14319 ++--------------------------------------------------------------------------*/ 14320 +static void * 14321 +Generic_This_Type(void *arg) 14322 +{ 14323 + return (arg); 14324 +} 14325 + 14326 +/*--------------------------------------------------------------------------- 14327 +| Facility : libnform 14328 +| Function : FIELDTYPE *_nc_generic_fieldtype( 14329 +| bool (* const field_check)(FIELD *,const void *), 14330 +| bool (* const char_check) (int, const void *), 14331 +| bool (*const next)(FORM*,FIELD*,const void*), 14332 +| bool (*const prev)(FORM*,FIELD*,const void*), 14333 +| void (*freecallback)(void*)) 14334 +| 14335 +| Description : Create a new fieldtype. The application programmer must 14336 +| write a field_check and a char_check function and give 14337 +| them as input to this call. A callback to allow the 14338 +| release of the allocated memory must also be provided. 14339 +| For generic field types, we provide some more 14340 +| information about the field as parameters. 14341 +| 14342 +| If an error occurs, errno is set to 14343 +| E_BAD_ARGUMENT - invalid arguments 14344 +| E_SYSTEM_ERROR - system error (no memory) 14345 +| 14346 +| Return Values : Fieldtype pointer or NULL if error occurred 14347 ++--------------------------------------------------------------------------*/ 14348 +NCURSES_EXPORT(FIELDTYPE *) 14349 +_nc_generic_fieldtype(bool (*const field_check) (FORM*, FIELD *, const void *), 14350 + bool (*const char_check) (int, FORM*, FIELD*, const void *), 14351 + bool (*const next)(FORM*, FIELD*,const void*), 14352 + bool (*const prev)(FORM*, FIELD*,const void*), 14353 + void (*freecallback)(void*)) 14354 +{ 14355 + int code = E_SYSTEM_ERROR; 14356 + FIELDTYPE* res = (FIELDTYPE*)0; 14357 + 14358 + T((T_CALLED("_nc_generic_fieldtype(%p,%p,%p,%p,%p)"), 14359 + field_check, char_check, next, prev, freecallback)); 14360 + 14361 + if (field_check || char_check) 14362 + { 14363 + res = typeMalloc(FIELDTYPE,1); 14364 + if (res) 14365 + { 14366 + *res = *_nc_Default_FieldType; 14367 + res->status |= (_HAS_ARGS | _GENERIC); 14368 + res->fieldcheck.gfcheck = field_check; 14369 + res->charcheck.gccheck = char_check; 14370 + res->genericarg = Generic_This_Type; 14371 + res->freearg = freecallback; 14372 + res->enum_next.gnext = next; 14373 + res->enum_prev.gprev = prev; 14374 + code = E_OK; 14375 + } 14376 + } 14377 + else 14378 + code = E_BAD_ARGUMENT; 14379 + 14380 + if (E_OK != code) 14381 + SET_ERROR(code); 14382 + 14383 + returnFieldType(res); 14384 +} 14385 + 14386 + 14387 +/*--------------------------------------------------------------------------- 14388 +| Facility : libnform 14389 +| Function : static TypeArgument *GenericArgument( 14390 +| const FIELDTYPE* typ, 14391 +| int (*argiterator)(void**), 14392 +| int* err) 14393 +| 14394 +| Description : The iterator callback must browse through all fieldtype 14395 +| parameters that have an argument associated with the 14396 +| type. The iterator returns 1 if the operation to get 14397 +| the next element was successfull, 0 otherwise. If the 14398 +| iterator could move to the next argument, it fills 14399 +| the void* pointer representing the argument into the 14400 +| location provided as argument to the iterator. 14401 +| The err reference is used to keep track of errors. 14402 +| 14403 +| Return Values : Pointer to argument structure 14404 ++--------------------------------------------------------------------------*/ 14405 +static TypeArgument* 14406 +GenericArgument(const FIELDTYPE *typ, 14407 + int (*argiterator)(void**), int *err) 14408 +{ 14409 + TypeArgument *res = (TypeArgument *)0; 14410 + 14411 + if (typ!=0 && (typ->status & _HAS_ARGS) != 0 && err!=0 && argiterator != 0) 14412 + { 14413 + if (typ->status & _LINKED_TYPE) 14414 + { 14415 + /* Composite fieldtypes keep track internally of their own memory */ 14416 + TypeArgument* p = typeMalloc(TypeArgument,1); 14417 + if (p) 14418 + { 14419 + p->left = GenericArgument(typ->left, argiterator, err); 14420 + p->right = GenericArgument(typ->right, argiterator, err); 14421 + return p; 14422 + } 14423 + else 14424 + *err += 1; 14425 + } 14426 + else 14427 + { 14428 + assert(typ->genericarg != (void*)0); 14429 + if (typ->genericarg == 0) 14430 + *err += 1; 14431 + else 14432 + { 14433 + void* argp; 14434 + int valid = argiterator(&argp); 14435 + if (valid==0 || argp==0 || 14436 + !(res = (TypeArgument*)typ->genericarg(argp))) 14437 + { 14438 + *err += 1; 14439 + } 14440 + } 14441 + } 14442 + } 14443 + return res; 14444 +} 14445 + 14446 +/*--------------------------------------------------------------------------- 14447 +| Facility : libnform 14448 +| Function : int _nc_set_generic_fieldtype( 14449 +| FIELD* field, 14450 +| FIELDTYPE* ftyp, 14451 +| int (*argiterator)(void**)) 14452 +| 14453 +| Description : Assign the fieldtype to the field and use the iterator 14454 +| mechanism to get the arguments when a check is 14455 +| performed. 14456 +| 14457 +| Return Values : E_OK if all went well 14458 +| E_SYSTEM_ERROR if an error occurred 14459 ++--------------------------------------------------------------------------*/ 14460 +NCURSES_EXPORT(int) 14461 +_nc_set_generic_fieldtype(FIELD *field, 14462 + FIELDTYPE* ftyp, 14463 + int (*argiterator)(void**)) 14464 +{ 14465 + int code = E_SYSTEM_ERROR; 14466 + int err = 0; 14467 + 14468 + if (field) 14469 + { 14470 + if (field && field->type) 14471 + _nc_Free_Type(field); 14472 + 14473 + field->type = ftyp; 14474 + if (ftyp) 14475 + { 14476 + if (argiterator) 14477 + { 14478 + /* The precondition is that the iterator is reset */ 14479 + field->arg = (void*)GenericArgument(field->type,argiterator,&err); 14480 + 14481 + if (err) 14482 + { 14483 + _nc_Free_Argument(field->type, (TypeArgument*)(field->arg)); 14484 + field->type = (FIELDTYPE*)0; 14485 + field->arg = (void*)0; 14486 + } 14487 + else 14488 + { 14489 + code = E_OK; 14490 + if (field->type) 14491 + field->type->ref++; 14492 + } 14493 + } 14494 + } 14495 + else 14496 + { 14497 + field->arg = (void*)0; 14498 + code = E_OK; 14499 + } 14500 + } 14501 + return code; 14502 +} 14503 + 14504 +/*--------------------------------------------------------------------------- 14505 +| Facility : libnform 14506 +| Function : WINDOW* _nc_form_cursor( 14507 +| FORM* form, 14508 +| int *pRow, int *pCol) 14509 +| 14510 +| Description : Get the current position of the form cursor position 14511 +| We also return the field window 14512 +| 14513 +| Return Values : The fields Window or NULL on error 14514 ++--------------------------------------------------------------------------*/ 14515 +NCURSES_EXPORT(WINDOW*) 14516 +_nc_form_cursor(const FORM* form, int* pRow, int* pCol) 14517 +{ 14518 + int code = E_SYSTEM_ERROR; 14519 + WINDOW* res = (WINDOW*)0; 14520 + 14521 + if (!(form==0 || pRow==0 || pCol==0)) 14522 + { 14523 + *pRow = form->currow; 14524 + *pCol = form->curcol; 14525 + res = form->w; 14526 + code = E_OK; 14527 + } 14528 + if (code != E_OK) 14529 + SET_ERROR(code); 14530 + return res; 14531 +} 14532 + 14533 + 14534 +/* fty_generic.c ends here */ 14172 14535 diff -Naur ncurses-5.7.orig/form/Makefile.in ncurses-5.7/form/Makefile.in 14173 14536 --- ncurses-5.7.orig/form/Makefile.in 2007-04-28 07:56:11.000000000 -0700 14174 +++ ncurses-5.7/form/Makefile.in 2009-0 6-05 14:01:30.000000000 -070014537 +++ ncurses-5.7/form/Makefile.in 2009-07-19 15:03:48.000000000 -0700 14175 14538 @@ -1,6 +1,6 @@ 14176 14539 -# $Id: Makefile.in,v 1.47 2007/04/28 14:56:11 tom Exp $ … … 14201 14564 diff -Naur ncurses-5.7.orig/include/capdefaults.c ncurses-5.7/include/capdefaults.c 14202 14565 --- ncurses-5.7.orig/include/capdefaults.c 2008-08-04 05:33:42.000000000 -0700 14203 +++ ncurses-5.7/include/capdefaults.c 2009-0 6-05 14:01:16.000000000 -070014566 +++ ncurses-5.7/include/capdefaults.c 2009-07-19 15:02:22.000000000 -0700 14204 14567 @@ -32,7 +32,7 @@ 14205 14568 * and: Thomas E. Dickey 1996-on * … … 14227 14590 diff -Naur ncurses-5.7.orig/include/curses.h.in ncurses-5.7/include/curses.h.in 14228 14591 --- ncurses-5.7.orig/include/curses.h.in 2008-08-30 13:11:29.000000000 -0700 14229 +++ ncurses-5.7/include/curses.h.in 2009-0 6-05 14:01:54.000000000 -070014592 +++ ncurses-5.7/include/curses.h.in 2009-07-19 15:04:17.000000000 -0700 14230 14593 @@ -1,5 +1,5 @@ 14231 14594 /**************************************************************************** … … 14240 14603 14241 14604 -/* $Id: curses.h.in,v 1.187 2008/08/30 20:11:29 tom Exp $ */ 14242 +/* $Id: curses.h.in,v 1.20 1 2009/05/23 21:31:35tom Exp $ */14605 +/* $Id: curses.h.in,v 1.204 2009/07/18 16:02:07 tom Exp $ */ 14243 14606 14244 14607 #ifndef __NCURSES_H … … 14257 14620 #define NCURSES_VERSION_MAJOR @NCURSES_MAJOR@ 14258 14621 #define NCURSES_VERSION_MINOR @NCURSES_MINOR@ 14259 @@ -110,6 +104, 20@@14622 @@ -110,6 +104,13 @@ 14260 14623 #endif 14261 14624 … … 14268 14631 + 14269 14632 +/* 14270 + * For reentrant code, we map the various global variables into SCREEN by14271 + * using functions to access them.14272 + */14273 +#define NCURSES_PUBLIC_VAR(name) @NCURSES_WRAP_PREFIX@##name14274 +#define NCURSES_WRAPPED_VAR(type,name) extern type NCURSES_PUBLIC_VAR(name)(void)14275 +14276 +/*14277 14633 * The internal type used for window dimensions. 14278 14634 */ 14279 14635 #undef NCURSES_SIZE_T 14280 @@ -138,7 +1 46,6 @@14636 @@ -138,7 +139,6 @@ 14281 14637 #endif 14282 14638 … … 14286 14642 #ifdef _XOPEN_SOURCE_EXTENDED 14287 14643 #include <stddef.h> /* we want wchar_t */ 14288 @@ -224,9 +2 31,9 @@14644 @@ -224,9 +224,9 @@ 14289 14645 14290 14646 /* line graphics */ … … 14298 14654 extern NCURSES_EXPORT_VAR(chtype) acs_map[]; 14299 14655 #endif 14300 @@ -511,6 +518,12 @@ 14656 @@ -344,7 +344,13 @@ 14657 typedef unsigned int wint_t@NCURSES_OK_WCHAR_T@; 14658 #endif 14659 14660 -#define CCHARW_MAX 5 14661 +/* 14662 + * cchar_t stores an array of CCHARW_MAX wide characters. The first is 14663 + * normally a spacing character. The others are non-spacing. If those 14664 + * (spacing and nonspacing) do not fill the array, a null L'\0' follows. 14665 + * Otherwise, a null is assumed to follow when extracting via getcchar(). 14666 + */ 14667 +#define CCHARW_MAX @NCURSES_CCHARW_MAX@ 14668 typedef struct 14669 { 14670 attr_t attr; 14671 @@ -511,6 +517,12 @@ 14301 14672 #endif 14302 14673 … … 14311 14682 * functions. Those marked `generated' will have sources generated from the 14312 14683 * macro definitions later in this file, in order to satisfy XPG4.2 14313 @@ -646,7 +65 9,7 @@14684 @@ -646,7 +658,7 @@ 14314 14685 extern NCURSES_EXPORT(int) mvwinnstr (WINDOW *, int, int, char *, int); /* generated */ 14315 14686 extern NCURSES_EXPORT(int) mvwinsch (WINDOW *, int, int, chtype); /* generated */ … … 14320 14691 extern NCURSES_EXPORT(int) mvwprintw (WINDOW*,int,int, const char *,...) /* implemented */ 14321 14692 GCC_PRINTFLIKE(4,5); 14322 @@ -654,9 +66 7,9 @@14693 @@ -654,9 +666,9 @@ 14323 14694 GCC_SCANFLIKE(4,5); 14324 14695 extern NCURSES_EXPORT(int) mvwvline (WINDOW *,int, int, chtype, int); /* generated */ … … 14332 14703 extern NCURSES_EXPORT(int) nocbreak (void); /* implemented */ 14333 14704 extern NCURSES_EXPORT(int) nodelay (WINDOW *,bool); /* implemented */ 14334 @@ -710,7 +72 3,7 @@14705 @@ -710,7 +722,7 @@ 14335 14706 extern NCURSES_EXPORT(int) slk_refresh (void); /* implemented */ 14336 14707 extern NCURSES_EXPORT(int) slk_restore (void); /* implemented */ … … 14341 14712 extern NCURSES_EXPORT(int) standend (void); /* generated */ 14342 14713 extern NCURSES_EXPORT(int) start_color (void); /* implemented */ 14343 @@ -727,7 +7 40,7 @@14714 @@ -727,7 +739,7 @@ 14344 14715 extern NCURSES_EXPORT(int) untouchwin (WINDOW *); /* generated */ 14345 14716 extern NCURSES_EXPORT(void) use_env (bool); /* implemented */ … … 14350 14721 extern NCURSES_EXPORT(int) vwprintw (WINDOW *, const char *,va_list); /* implemented */ 14351 14722 extern NCURSES_EXPORT(int) vw_printw (WINDOW *, const char *,va_list); /* generated */ 14723 @@ -838,6 +850,7 @@ 14724 extern NCURSES_EXPORT(const char *) curses_version (void); 14725 extern NCURSES_EXPORT(int) assume_default_colors (int, int); 14726 extern NCURSES_EXPORT(int) define_key (const char *, int); 14727 +extern NCURSES_EXPORT(int) get_escdelay (void); 14728 extern NCURSES_EXPORT(int) key_defined (const char *); 14729 extern NCURSES_EXPORT(int) keyok (int, bool); 14730 extern NCURSES_EXPORT(int) resize_term (int, int); 14352 14731 @@ -856,23 +869,133 @@ 14353 14732 * These extensions provide access to information stored in the WINDOW even … … 14519 14898 diff -Naur ncurses-5.7.orig/include/curses.tail ncurses-5.7/include/curses.tail 14520 14899 --- ncurses-5.7.orig/include/curses.tail 2008-07-05 13:20:38.000000000 -0700 14521 +++ ncurses-5.7/include/curses.tail 2009-0 6-05 14:01:54.000000000 -070014900 +++ ncurses-5.7/include/curses.tail 2009-07-19 15:04:03.000000000 -0700 14522 14901 @@ -1,4 +1,4 @@ 14523 14902 -/* $Id: curses.tail,v 1.16 2008/07/05 20:20:38 tom Exp $ */ … … 14578 14957 diff -Naur ncurses-5.7.orig/include/curses.wide ncurses-5.7/include/curses.wide 14579 14958 --- ncurses-5.7.orig/include/curses.wide 2007-03-10 09:52:23.000000000 -0800 14580 +++ ncurses-5.7/include/curses.wide 2009-0 6-05 14:01:51.000000000 -070014959 +++ ncurses-5.7/include/curses.wide 2009-07-19 15:03:59.000000000 -0700 14581 14960 @@ -1,9 +1,11 @@ 14582 14961 -/* $Id: curses.wide,v 1.34 2007/03/10 17:52:23 tom Exp $ */ … … 14616 14995 14617 14996 /* 14997 diff -Naur ncurses-5.7.orig/include/Makefile.in ncurses-5.7/include/Makefile.in 14998 --- ncurses-5.7.orig/include/Makefile.in 2001-12-08 10:50:06.000000000 -0800 14999 +++ ncurses-5.7/include/Makefile.in 2009-07-19 15:04:09.000000000 -0700 15000 @@ -1,4 +1,4 @@ 15001 -# $Id: Makefile.in,v 1.35 2001/12/08 18:50:06 tom Exp $ 15002 +# $Id: Makefile.in,v 1.36 2009/06/13 21:42:45 tom Exp $ 15003 ############################################################################## 15004 # Copyright (c) 1998,2000,2001 Free Software Foundation, Inc. # 15005 # # 15006 @@ -72,6 +72,7 @@ 15007 curses.h \ 15008 hashsize.h \ 15009 ncurses_def.h \ 15010 + ncurses_dll.h \ 15011 parametrized.h \ 15012 term.h 15013 14618 15014 diff -Naur ncurses-5.7.orig/include/MKterm.h.awk.in ncurses-5.7/include/MKterm.h.awk.in 14619 15015 --- ncurses-5.7.orig/include/MKterm.h.awk.in 2008-05-24 16:13:59.000000000 -0700 14620 +++ ncurses-5.7/include/MKterm.h.awk.in 2009-0 6-05 14:01:51.000000000 -070015016 +++ ncurses-5.7/include/MKterm.h.awk.in 2009-07-19 15:03:59.000000000 -0700 14621 15017 @@ -1,7 +1,7 @@ 14622 15018 # vile:awkmode … … 14729 15125 diff -Naur ncurses-5.7.orig/include/nc_alloc.h ncurses-5.7/include/nc_alloc.h 14730 15126 --- ncurses-5.7.orig/include/nc_alloc.h 2008-09-27 15:30:33.000000000 -0700 14731 +++ ncurses-5.7/include/nc_alloc.h 2009-0 6-05 14:01:44.000000000 -070015127 +++ ncurses-5.7/include/nc_alloc.h 2009-07-19 15:03:53.000000000 -0700 14732 15128 @@ -1,5 +1,5 @@ 14733 15129 /**************************************************************************** … … 14763 15159 #define HAVE_NC_FREEALL 0 14764 15160 #endif 15161 diff -Naur ncurses-5.7.orig/include/nc_mingw.h ncurses-5.7/include/nc_mingw.h 15162 --- ncurses-5.7.orig/include/nc_mingw.h 1969-12-31 16:00:00.000000000 -0800 15163 +++ ncurses-5.7/include/nc_mingw.h 2009-07-19 15:04:11.000000000 -0700 15164 @@ -0,0 +1,59 @@ 15165 +/**************************************************************************** 15166 + * Copyright (c) 2008,2009 Free Software Foundation, Inc. * 15167 + * * 15168 + * Permission is hereby granted, free of charge, to any person obtaining a * 15169 + * copy of this software and associated documentation files (the * 15170 + * "Software"), to deal in the Software without restriction, including * 15171 + * without limitation the rights to use, copy, modify, merge, publish, * 15172 + * distribute, distribute with modifications, sublicense, and/or sell * 15173 + * copies of the Software, and to permit persons to whom the Software is * 15174 + * furnished to do so, subject to the following conditions: * 15175 + * * 15176 + * The above copyright notice and this permission notice shall be included * 15177 + * in all copies or substantial portions of the Software. * 15178 + * * 15179 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * 15180 + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * 15181 + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * 15182 + * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * 15183 + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * 15184 + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * 15185 + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * 15186 + * * 15187 + * Except as contained in this notice, the name(s) of the above copyright * 15188 + * holders shall not be used in advertising or otherwise to promote the * 15189 + * sale, use or other dealings in this Software without prior written * 15190 + * authorization. * 15191 + ****************************************************************************/ 15192 + 15193 +/**************************************************************************** 15194 + * Author: Thomas Dickey, 2008-on * 15195 + * * 15196 + ****************************************************************************/ 15197 + 15198 +/* $Id: nc_mingw.h,v 1.1 2009/02/07 23:33:19 tom Exp $ */ 15199 + 15200 +#ifndef NC_MINGW_H 15201 +#define NC_MINGW_H 1 15202 + 15203 +#define WINVER 0x0501 15204 +#include <windows.h> 15205 + 15206 +#undef sleep 15207 +#define sleep(n) Sleep((n) * 1000) 15208 + 15209 +#undef gettimeofday 15210 +#define gettimeofday(tv,tz) _nc_gettimeofday(tv,tz) 15211 + 15212 +#include <sys/time.h> /* for struct timeval */ 15213 + 15214 +extern int _nc_gettimeofday(struct timeval *, void *); 15215 + 15216 +#undef HAVE_GETTIMEOFDAY 15217 +#define HAVE_GETTIMEOFDAY 1 15218 + 15219 +#define SIGHUP 1 15220 +#define SIGKILL 9 15221 +#define getlogin() "username" 15222 + 15223 +#endif /* NC_MINGW_H */ 14765 15224 diff -Naur ncurses-5.7.orig/include/nc_panel.h ncurses-5.7/include/nc_panel.h 14766 15225 --- ncurses-5.7.orig/include/nc_panel.h 2008-08-04 11:26:46.000000000 -0700 14767 +++ ncurses-5.7/include/nc_panel.h 2009-0 6-05 14:01:33.000000000 -070015226 +++ ncurses-5.7/include/nc_panel.h 2009-07-19 15:04:13.000000000 -0700 14768 15227 @@ -1,5 +1,5 @@ 14769 15228 /**************************************************************************** … … 14773 15232 * Permission is hereby granted, free of charge, to any person obtaining a * 14774 15233 * copy of this software and associated documentation files (the * 14775 @@ -33,7 +33,7 @@ 14776 14777 15234 @@ -31,9 +31,8 @@ 15235 * and: Thomas E. Dickey * 15236 ****************************************************************************/ 15237 15238 - 14778 15239 /* 14779 15240 - * $Id: nc_panel.h,v 1.5 2008/08/04 18:26:46 tom Exp $ 14780 + * $Id: nc_panel.h,v 1. 6 2009/04/11 21:17:57tom Exp $15241 + * $Id: nc_panel.h,v 1.7 2009/07/04 18:20:02 tom Exp $ 14781 15242 * 14782 15243 * nc_panel.h 14783 15244 * 14784 @@ -62,6 +62,10 @@ 14785 /* Retrieve the panelhook of the current screen */ 14786 extern NCURSES_EXPORT(struct panelhook*) _nc_panelhook (void); 14787 15245 @@ -45,25 +44,33 @@ 15246 #define NC_PANEL_H 1 15247 15248 #ifdef __cplusplus 15249 -extern "C" { 15250 +extern "C" 15251 +{ 15252 #endif 15253 15254 -struct panel; /* Forward Declaration */ 15255 + struct panel; /* Forward Declaration */ 15256 15257 -struct panelhook { 15258 - struct panel* top_panel; 15259 - struct panel* bottom_panel; 15260 - struct panel* stdscr_pseudo_panel; 15261 + struct panelhook 15262 + { 15263 + struct panel *top_panel; 15264 + struct panel *bottom_panel; 15265 + struct panel *stdscr_pseudo_panel; 15266 #if NO_LEAKS 15267 - int (*destroy)(struct panel *); 15268 + int (*destroy) (struct panel *); 15269 #endif 15270 -}; 15271 + }; 15272 15273 -/* Retrieve the panelhook of the current screen */ 15274 -extern NCURSES_EXPORT(struct panelhook*) _nc_panelhook (void); 15275 + struct screen; /* Forward declaration */ 15276 +/* Retrieve the panelhook of the specified screen */ 15277 + extern NCURSES_EXPORT(struct panelhook *) 15278 + _nc_panelhook (void); 14788 15279 +#if NCURSES_SP_FUNCS 14789 +extern NCURSES_EXPORT(struct panelhook*) NCURSES_SP_NAME(_nc_panelhook) (SCREEN *); 15280 + extern NCURSES_EXPORT(struct panelhook *) 15281 + NCURSES_SP_NAME(_nc_panelhook) (SCREEN *); 14790 15282 +#endif 14791 + 15283 14792 15284 #ifdef __cplusplus 14793 15285 } 14794 15286 #endif 15287 15288 -#endif /* NC_PANEL_H */ 15289 +#endif /* NC_PANEL_H */ 14795 15290 diff -Naur ncurses-5.7.orig/include/ncurses_defs ncurses-5.7/include/ncurses_defs 14796 15291 --- ncurses-5.7.orig/include/ncurses_defs 2008-09-06 08:57:41.000000000 -0700 14797 +++ ncurses-5.7/include/ncurses_defs 2009-0 6-05 14:01:49.000000000 -070015292 +++ ncurses-5.7/include/ncurses_defs 2009-07-19 15:03:58.000000000 -0700 14798 15293 @@ -1,4 +1,4 @@ 14799 15294 -# $Id: ncurses_defs,v 1.40 2008/09/06 15:57:41 tom Exp $ … … 14812 15307 diff -Naur ncurses-5.7.orig/include/ncurses_dll.h ncurses-5.7/include/ncurses_dll.h 14813 15308 --- ncurses-5.7.orig/include/ncurses_dll.h 2007-03-10 11:21:49.000000000 -0800 14814 +++ ncurses-5.7/include/ncurses_dll.h 2009-0 6-05 14:01:44.000000000 -070015309 +++ ncurses-5.7/include/ncurses_dll.h 2009-07-19 15:03:53.000000000 -0700 14815 15310 @@ -1,5 +1,5 @@ 14816 15311 /**************************************************************************** … … 14850 15345 - 14851 15346 #endif /* NCURSES_DLL_H_incl */ 15347 diff -Naur ncurses-5.7.orig/include/ncurses_dll.h.in ncurses-5.7/include/ncurses_dll.h.in 15348 --- ncurses-5.7.orig/include/ncurses_dll.h.in 1969-12-31 16:00:00.000000000 -0800 15349 +++ ncurses-5.7/include/ncurses_dll.h.in 2009-07-19 15:04:09.000000000 -0700 15350 @@ -0,0 +1,86 @@ 15351 +/**************************************************************************** 15352 + * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. * 15353 + * * 15354 + * Permission is hereby granted, free of charge, to any person obtaining a * 15355 + * copy of this software and associated documentation files (the * 15356 + * "Software"), to deal in the Software without restriction, including * 15357 + * without limitation the rights to use, copy, modify, merge, publish, * 15358 + * distribute, distribute with modifications, sublicense, and/or sell * 15359 + * copies of the Software, and to permit persons to whom the Software is * 15360 + * furnished to do so, subject to the following conditions: * 15361 + * * 15362 + * The above copyright notice and this permission notice shall be included * 15363 + * in all copies or substantial portions of the Software. * 15364 + * * 15365 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * 15366 + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * 15367 + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * 15368 + * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * 15369 + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * 15370 + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * 15371 + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * 15372 + * * 15373 + * Except as contained in this notice, the name(s) of the above copyright * 15374 + * holders shall not be used in advertising or otherwise to promote the * 15375 + * sale, use or other dealings in this Software without prior written * 15376 + * authorization. * 15377 + ****************************************************************************/ 15378 +/* $Id: ncurses_dll.h.in,v 1.8 2009/04/04 22:26:27 tom Exp $ */ 15379 + 15380 +#ifndef NCURSES_DLL_H_incl 15381 +#define NCURSES_DLL_H_incl 1 15382 + 15383 +/* 15384 + * For reentrant code, we map the various global variables into SCREEN by 15385 + * using functions to access them. 15386 + */ 15387 +#define NCURSES_PUBLIC_VAR(name) @NCURSES_WRAP_PREFIX@##name 15388 +#define NCURSES_WRAPPED_VAR(type,name) extern type NCURSES_PUBLIC_VAR(name)(void) 15389 + 15390 +/* no longer needed on cygwin or mingw, thanks to auto-import */ 15391 +/* but this structure may be useful at some point for an MSVC build */ 15392 +/* so, for now unconditionally define the important flags */ 15393 +/* "the right way" for proper static and dll+auto-import behavior */ 15394 +#undef NCURSES_DLL 15395 +#define NCURSES_STATIC 15396 + 15397 +#if defined(__CYGWIN__) || defined(__MINGW32__) 15398 +# if defined(NCURSES_DLL) 15399 +# if defined(NCURSES_STATIC) 15400 +# undef NCURSES_STATIC 15401 +# endif 15402 +# endif 15403 +# undef NCURSES_IMPEXP 15404 +# undef NCURSES_API 15405 +# undef NCURSES_EXPORT 15406 +# undef NCURSES_EXPORT_VAR 15407 +# if defined(NCURSES_DLL) 15408 +/* building a DLL */ 15409 +# define NCURSES_IMPEXP __declspec(dllexport) 15410 +# elif defined(NCURSES_STATIC) 15411 +/* building or linking to a static library */ 15412 +# define NCURSES_IMPEXP /* nothing */ 15413 +# else 15414 +/* linking to the DLL */ 15415 +# define NCURSES_IMPEXP __declspec(dllimport) 15416 +# endif 15417 +# define NCURSES_API __cdecl 15418 +# define NCURSES_EXPORT(type) NCURSES_IMPEXP type NCURSES_API 15419 +# define NCURSES_EXPORT_VAR(type) NCURSES_IMPEXP type 15420 +#endif 15421 + 15422 +/* Take care of non-cygwin platforms */ 15423 +#if !defined(NCURSES_IMPEXP) 15424 +# define NCURSES_IMPEXP /* nothing */ 15425 +#endif 15426 +#if !defined(NCURSES_API) 15427 +# define NCURSES_API /* nothing */ 15428 +#endif 15429 +#if !defined(NCURSES_EXPORT) 15430 +# define NCURSES_EXPORT(type) NCURSES_IMPEXP type NCURSES_API 15431 +#endif 15432 +#if !defined(NCURSES_EXPORT_VAR) 15433 +# define NCURSES_EXPORT_VAR(type) NCURSES_IMPEXP type 15434 +#endif 15435 + 15436 +#endif /* NCURSES_DLL_H_incl */ 15437 diff -Naur ncurses-5.7.orig/include/ncurses_mingw.h ncurses-5.7/include/ncurses_mingw.h 15438 --- ncurses-5.7.orig/include/ncurses_mingw.h 1969-12-31 16:00:00.000000000 -0800 15439 +++ ncurses-5.7/include/ncurses_mingw.h 2009-07-19 15:04:11.000000000 -0700 15440 @@ -0,0 +1,164 @@ 15441 +/**************************************************************************** 15442 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 15443 + * * 15444 + * Permission is hereby granted, free of charge, to any person obtaining a * 15445 + * copy of this software and associated documentation files (the * 15446 + * "Software"), to deal in the Software without restriction, including * 15447 + * without limitation the rights to use, copy, modify, merge, publish, * 15448 + * distribute, distribute with modifications, sublicense, and/or sell * 15449 + * copies of the Software, and to permit persons to whom the Software is * 15450 + * furnished to do so, subject to the following conditions: * 15451 + * * 15452 + * The above copyright notice and this permission notice shall be included * 15453 + * in all copies or substantial portions of the Software. * 15454 + * * 15455 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * 15456 + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * 15457 + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * 15458 + * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * 15459 + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * 15460 + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * 15461 + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * 15462 + * * 15463 + * Except as contained in this notice, the name(s) of the above copyright * 15464 + * holders shall not be used in advertising or otherwise to promote the * 15465 + * sale, use or other dealings in this Software without prior written * 15466 + * authorization. * 15467 + ****************************************************************************/ 15468 + 15469 +/**************************************************************************** 15470 + * Author: Juergen Pfeifer, 2008-on * 15471 + * * 15472 + ****************************************************************************/ 15473 + 15474 +/* $Id: ncurses_mingw.h,v 1.1 2008/12/14 19:22:16 juergen Exp $ */ 15475 + 15476 +/* 15477 + * This is a placholder up to now and describes what needs to be implemented 15478 + * to support I/O to external terminals with ncurses on the Windows OS. 15479 + */ 15480 + 15481 +#if __MINGW32__ 15482 +#ifndef _NC_MINGWH 15483 +#define _NC_MINGWH 15484 + 15485 +#define USE_CONSOLE_DRIVER 1 15486 + 15487 +#undef TERMIOS 15488 +#define TERMIOS 1 15489 + 15490 +#define InvalidHandle ((TERM_HANDLE)-1) 15491 +#define InvalidConsoleHandle(s) ((s)==InvalidHandle) 15492 + 15493 +typedef unsigned char cc_t; 15494 +typedef unsigned int speed_t; 15495 +typedef unsigned int tcflag_t; 15496 + 15497 +#define NCCS 32 15498 +struct termios 15499 +{ 15500 + tcflag_t c_iflag; /* input mode */ 15501 + tcflag_t c_oflag; /* output mode */ 15502 + tcflag_t c_cflag; /* control mode */ 15503 + tcflag_t c_lflag; /* local mode */ 15504 + cc_t c_line; /* line discipline */ 15505 + cc_t c_cc[NCCS]; /* control characters */ 15506 + speed_t c_ispeed; /* input speed */ 15507 + speed_t c_ospeed; /* c_ospeed */ 15508 +}; 15509 + 15510 +/* c_cc chars */ 15511 +#define VINTR 0 15512 +#define VQUIT 1 15513 +#define VERASE 2 15514 +#define VKILL 3 15515 +#define VEOF 4 15516 +#define VTIME 5 15517 +#define VMIN 6 15518 + 15519 +/* c_iflag bits */ 15520 +#define ISTRIP 0000040 15521 +#define INLCR 0000100 15522 +#define IGNCR 0000200 15523 +#define ICRNL 0000400 15524 +#define BRKINT 0000002 15525 +#define PARMRK 0000010 15526 +#define IXON 0002000 15527 +#define IGNBRK 0000001 15528 +#define IGNPAR 0000004 15529 +#define INPCK 0000020 15530 +#define IXOFF 0010000 15531 + 15532 +/* c_oflag bits */ 15533 +#define OPOST 0000001 15534 + 15535 +/* c_cflag bit meaning */ 15536 +#define CBAUD 0010017 15537 +#define CSIZE 0000060 15538 +#define CS8 0000060 15539 +#define B0 0000000 15540 +#define B50 0000001 15541 +#define B75 0000002 15542 +#define B110 0000003 15543 +#define B134 0000004 15544 +#define B150 0000005 15545 +#define B200 0000006 15546 +#define B300 0000007 15547 +#define B600 0000010 15548 +#define B1200 0000011 15549 +#define B1800 0000012 15550 +#define B2400 0000013 15551 +#define B4800 0000014 15552 +#define B9600 0000015 15553 +#define CLOCAL 0004000 15554 +#define CREAD 0000200 15555 +#define CSTOPB 0000100 15556 +#define HUPCL 0002000 15557 +#define PARENB 0000400 15558 +#define PARODD 0001000 15559 + 15560 +/* c_lflag bits */ 15561 +#define ECHO 0000010 15562 +#define ECHONL 0000100 15563 +#define ISIG 0000001 15564 +#define IEXTEN 0100000 15565 +#define ICANON 0000002 15566 +#define NOFLSH 0000200 15567 +#define ECHOE 0000020 15568 +#define ECHOK 0000040 15569 + 15570 +/* tcflush() */ 15571 +#define TCIFLUSH 0 15572 + 15573 +/* tcsetattr uses these */ 15574 +#define TCSADRAIN 1 15575 + 15576 +/* ioctls */ 15577 +#define TCGETA 0x5405 15578 +#define TCFLSH 0x540B 15579 +#define TIOCGWINSZ 0x5413 15580 + 15581 +extern int _nc_mingw_ioctl(int fd, long int request, struct termios* arg); 15582 +extern void _nc_set_term_driver(void* term); 15583 + 15584 +#ifndef cfgetospeed 15585 +#define cfgetospeed(t) ((t)->c_cflag & CBAUD) 15586 +#endif 15587 + 15588 +#ifndef tcsetattr 15589 +#define tcsetattr(fd, cmd, arg) _nc_mingw_ioctl(fd, cmd, arg) 15590 +#endif 15591 + 15592 +#ifndef tcgetattr 15593 +#define tcgetattr(fd, arg) _nc_mingw_ioctl(fd, TCGETA, arg) 15594 +#endif 15595 + 15596 +#ifndef tcflush 15597 +#define tcflush(fd, arg) _nc_mingw_ioctl(fd, TCFLSH, arg) 15598 +#endif 15599 + 15600 +#undef ttyname 15601 +#define ttyname(fd) NULL 15602 + 15603 +#endif 15604 +#endif 14852 15605 diff -Naur ncurses-5.7.orig/include/term_entry.h ncurses-5.7/include/term_entry.h 14853 15606 --- ncurses-5.7.orig/include/term_entry.h 2008-08-16 09:16:03.000000000 -0700 14854 +++ ncurses-5.7/include/term_entry.h 2009-06-05 14:01:33.000000000 -0700 15607 +++ ncurses-5.7/include/term_entry.h 2009-07-19 15:04:15.000000000 -0700 15608 @@ -1,5 +1,5 @@ 15609 /**************************************************************************** 15610 - * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc. * 15611 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 15612 * * 15613 * Permission is hereby granted, free of charge, to any person obtaining a * 15614 * copy of this software and associated documentation files (the * 14855 15615 @@ -32,7 +32,7 @@ 14856 15616 * and: Thomas E. Dickey 1998-on * … … 14858 15618 14859 15619 -/* $Id: term_entry.h,v 1.35 2008/08/16 16:16:03 tom Exp $ */ 14860 +/* $Id: term_entry.h,v 1.3 6 2008/11/16 00:19:59 juergenExp $ */15620 +/* $Id: term_entry.h,v 1.37 2009/07/11 16:52:29 tom Exp $ */ 14861 15621 14862 15622 /* 14863 15623 * term_entry.h -- interface to entry-manipulation code 14864 @@ -81, 7 +81,7@@15624 @@ -81,12 +81,18 @@ 14865 15625 #define EXT_NAMES(tp,i,limit,index,table) table[i] 14866 15626 #endif … … 14871 15631 #define for_each_boolean(n,tp) for(n = 0; n < NUM_BOOLEANS(tp); n++) 14872 15632 #define for_each_number(n,tp) for(n = 0; n < NUM_NUMBERS(tp); n++) 15633 #define for_each_string(n,tp) for(n = 0; n < NUM_STRINGS(tp); n++) 15634 15635 +#if NCURSES_XNAMES 15636 +#define for_each_ext_boolean(n,tp) for(n = BOOLCOUNT; n < NUM_BOOLEANS(tp); n++) 15637 +#define for_each_ext_number(n,tp) for(n = NUMCOUNT; n < NUM_NUMBERS(tp); n++) 15638 +#define for_each_ext_string(n,tp) for(n = STRCOUNT; n < NUM_STRINGS(tp); n++) 15639 +#endif 15640 + 15641 #define ExtBoolname(tp,i,names) EXT_NAMES(tp, i, BOOLCOUNT, (i - (tp->num_Booleans - tp->ext_Booleans)), names) 15642 #define ExtNumname(tp,i,names) EXT_NAMES(tp, i, NUMCOUNT, (i - (tp->num_Numbers - tp->ext_Numbers)) + tp->ext_Booleans, names) 15643 #define ExtStrname(tp,i,names) EXT_NAMES(tp, i, STRCOUNT, (i - (tp->num_Strings - tp->ext_Strings)) + (tp->ext_Numbers + tp->ext_Booleans), names) 15644 diff -Naur ncurses-5.7.orig/include/tic.h ncurses-5.7/include/tic.h 15645 --- ncurses-5.7.orig/include/tic.h 2007-08-11 09:12:43.000000000 -0700 15646 +++ ncurses-5.7/include/tic.h 2009-07-19 15:04:15.000000000 -0700 15647 @@ -1,5 +1,5 @@ 15648 /**************************************************************************** 15649 - * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. * 15650 + * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. * 15651 * * 15652 * Permission is hereby granted, free of charge, to any person obtaining a * 15653 * copy of this software and associated documentation files (the * 15654 @@ -33,7 +33,7 @@ 15655 ****************************************************************************/ 15656 15657 /* 15658 - * $Id: tic.h,v 1.62 2007/08/11 16:12:43 tom Exp $ 15659 + * $Id: tic.h,v 1.63 2009/07/11 18:11:15 tom Exp $ 15660 * tic.h - Global variables and structures for the terminfo 15661 * compiler. 15662 */ 15663 @@ -246,7 +246,7 @@ 15664 extern NCURSES_EXPORT(struct name_table_entry const *) _nc_find_entry 15665 (const char *, const short *); 15666 extern NCURSES_EXPORT(struct name_table_entry const *) _nc_find_type_entry 15667 - (const char *, int, const struct name_table_entry *); 15668 + (const char *, int, bool); 15669 15670 /* comp_scan.c: lexical analysis */ 15671 extern NCURSES_EXPORT(int) _nc_get_token (bool); 14873 15672 diff -Naur ncurses-5.7.orig/include/unctrl.h.in ncurses-5.7/include/unctrl.h.in 14874 15673 --- ncurses-5.7.orig/include/unctrl.h.in 2001-03-24 13:53:25.000000000 -0800 14875 +++ ncurses-5.7/include/unctrl.h.in 2009-0 6-05 14:01:44.000000000 -070015674 +++ ncurses-5.7/include/unctrl.h.in 2009-07-19 15:03:53.000000000 -0700 14876 15675 @@ -1,5 +1,5 @@ 14877 15676 /**************************************************************************** … … 14903 15702 diff -Naur ncurses-5.7.orig/INSTALL ncurses-5.7/INSTALL 14904 15703 --- ncurses-5.7.orig/INSTALL 2008-11-02 13:13:51.000000000 -0800 14905 +++ ncurses-5.7/INSTALL 2009-0 6-05 14:01:24.000000000 -070015704 +++ ncurses-5.7/INSTALL 2009-07-19 15:04:17.000000000 -0700 14906 15705 @@ -1,5 +1,5 @@ 14907 15706 ------------------------------------------------------------------------------- … … 14916 15715 ------------------------------------------------------------------------------- 14917 15716 --- $Id: INSTALL,v 1.135 2008/11/02 21:13:51 tom Exp $ 14918 +-- $Id: INSTALL,v 1.13 8 2009/03/21 20:23:29tom Exp $15717 +-- $Id: INSTALL,v 1.139 2009/07/18 20:50:08 tom Exp $ 14919 15718 --------------------------------------------------------------------- 14920 15719 How to install Ncurses/Terminfo on your system … … 14932 15731 Compile experimental configuration which improves reentrant use of the 14933 15732 library by reducing global and static variables. This option is also 14934 @@ -850,6 +855,9 @@ 15733 @@ -682,6 +687,10 @@ 15734 to use a terminfo database which is compatible with the native 15735 applications. 15736 15737 + --with-ccharw-max=XXX 15738 + Override the size of the wide-character array in cchar_t structures. 15739 + Changing this will alter the binary interface. This defaults to 5. 15740 + 15741 --with-chtype=TYPE 15742 Override type of chtype, which stores the video attributes and (if 15743 --enable-widec is not given) a character. Prior to ncurses 5.5, this 15744 @@ -850,6 +859,9 @@ 14935 15745 those using termcap, do not use the higher speeds. Your application 14936 15746 (or system, in general) may or may not. … … 14942 15752 Generate profile-libraries These are named by adding "_p" to the root, 14943 15753 e.g., libncurses_p.a 14944 @@ -946,6 +95 4,17 @@15754 @@ -946,6 +958,17 @@ 14945 15755 For testing, compile with debug option. 14946 15756 This also sets the --disable-leaks option. … … 14960 15770 Suppress the configure script's check for Ada95, do not build the 14961 15771 Ada95 binding and related demo. 14962 @@ -975,6 +99 4,9 @@15772 @@ -975,6 +998,9 @@ 14963 15773 --without-dlsym 14964 15774 Do not use dlsym() to load GPM dynamically. … … 14970 15780 Tell the configure script to suppress the build of ncurses' application 14971 15781 programs (e.g., tic). The test applications will still be built if you 15782 diff -Naur ncurses-5.7.orig/Makefile.in ncurses-5.7/Makefile.in 15783 --- ncurses-5.7.orig/Makefile.in 2005-01-29 11:30:06.000000000 -0800 15784 +++ ncurses-5.7/Makefile.in 2009-07-19 15:04:11.000000000 -0700 15785 @@ -1,4 +1,4 @@ 15786 -# $Id: Makefile.in,v 1.24 2005/01/29 19:30:06 tom Exp $ 15787 +# $Id: Makefile.in,v 1.25 2008/11/16 00:19:59 juergen Exp $ 15788 ############################################################################## 15789 # Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. # 15790 # # 15791 @@ -83,6 +83,9 @@ 15792 fgrep NCURSES_VERSION $(includedir)/curses.h >/dev/null || \ 15793 echo '** Will overwrite non-ncurses curses.h' 15794 15795 +dlls: libs 15796 + sh mk-dlls.sh 15797 + 15798 # Put the common rules here so that we can easily construct the list of 15799 # directories to visit. 15800 all \ 15801 @@ -95,3 +98,4 @@ 15802 tags \ 15803 uninstall \ 15804 install :: 15805 + 14972 15806 diff -Naur ncurses-5.7.orig/man/curs_color.3x ncurses-5.7/man/curs_color.3x 14973 15807 --- ncurses-5.7.orig/man/curs_color.3x 2005-12-17 16:00:37.000000000 -0800 14974 +++ ncurses-5.7/man/curs_color.3x 2009-0 6-05 14:01:11.000000000 -070015808 +++ ncurses-5.7/man/curs_color.3x 2009-07-19 15:02:16.000000000 -0700 14975 15809 @@ -1,5 +1,5 @@ 14976 15810 .\"*************************************************************************** … … 15001 15835 - 15002 15836 The value of the second and 15837 diff -Naur ncurses-5.7.orig/man/curs_getcchar.3x ncurses-5.7/man/curs_getcchar.3x 15838 --- ncurses-5.7.orig/man/curs_getcchar.3x 2008-05-17 12:37:05.000000000 -0700 15839 +++ ncurses-5.7/man/curs_getcchar.3x 2009-07-19 15:04:17.000000000 -0700 15840 @@ -1,5 +1,5 @@ 15841 .\"*************************************************************************** 15842 -.\" Copyright (c) 2001-2006,2008 Free Software Foundation, Inc. * 15843 +.\" Copyright (c) 2001-2008,2009 Free Software Foundation, Inc. * 15844 .\" * 15845 .\" Permission is hereby granted, free of charge, to any person obtaining a * 15846 .\" copy of this software and associated documentation files (the * 15847 @@ -26,7 +26,7 @@ 15848 .\" authorization. * 15849 .\"*************************************************************************** 15850 .\" 15851 -.\" $Id: curs_getcchar.3x,v 1.11 2008/05/17 19:37:05 tom Exp $ 15852 +.\" $Id: curs_getcchar.3x,v 1.12 2009/07/18 16:10:56 tom Exp $ 15853 .TH curs_getcchar 3X "" 15854 .SH NAME 15855 \fBgetcchar\fP, 15856 @@ -126,7 +126,8 @@ 15857 .PP 15858 When \fIwch\fP is a null pointer, 15859 \fBgetcchar\fP returns the number of wide characters referenced by 15860 -\fIwcval\fP. 15861 +\fIwcval\fP, 15862 +including one for a trailing null. 15863 .PP 15864 When \fIwch\fP is not a null pointer, 15865 \fBgetcchar\fP returns \fBOK\fP upon successful completion, 15003 15866 diff -Naur ncurses-5.7.orig/man/curs_mouse.3x ncurses-5.7/man/curs_mouse.3x 15004 15867 --- ncurses-5.7.orig/man/curs_mouse.3x 2006-12-30 15:43:34.000000000 -0800 15005 +++ ncurses-5.7/man/curs_mouse.3x 2009-0 6-05 14:00:52.000000000 -070015868 +++ ncurses-5.7/man/curs_mouse.3x 2009-07-19 15:01:57.000000000 -0700 15006 15869 @@ -1,6 +1,6 @@ 15007 15870 '\" t … … 15049 15912 diff -Naur ncurses-5.7.orig/man/form_field_validation.3x ncurses-5.7/man/form_field_validation.3x 15050 15913 --- ncurses-5.7.orig/man/form_field_validation.3x 2006-12-24 08:08:08.000000000 -0800 15051 +++ ncurses-5.7/man/form_field_validation.3x 2009-0 6-05 14:01:33.000000000 -070015914 +++ ncurses-5.7/man/form_field_validation.3x 2009-07-19 15:03:51.000000000 -0700 15052 15915 @@ -26,7 +26,7 @@ 15053 15916 .\" authorization. * … … 15072 15935 diff -Naur ncurses-5.7.orig/man/keybound.3x ncurses-5.7/man/keybound.3x 15073 15936 --- ncurses-5.7.orig/man/keybound.3x 2006-02-25 13:47:06.000000000 -0800 15074 +++ ncurses-5.7/man/keybound.3x 2009-0 6-05 14:00:57.000000000 -070015937 +++ ncurses-5.7/man/keybound.3x 2009-07-19 15:02:02.000000000 -0700 15075 15938 @@ -1,5 +1,5 @@ 15076 15939 .\"*************************************************************************** … … 15093 15956 diff -Naur ncurses-5.7.orig/man/tabs.1 ncurses-5.7/man/tabs.1 15094 15957 --- ncurses-5.7.orig/man/tabs.1 1969-12-31 16:00:00.000000000 -0800 15095 +++ ncurses-5.7/man/tabs.1 2009-0 6-05 14:00:50.000000000 -070015958 +++ ncurses-5.7/man/tabs.1 2009-07-19 15:01:56.000000000 -0700 15096 15959 @@ -0,0 +1,143 @@ 15097 15960 +.\"*************************************************************************** … … 15240 16103 diff -Naur ncurses-5.7.orig/man/tset.1 ncurses-5.7/man/tset.1 15241 16104 --- ncurses-5.7.orig/man/tset.1 2006-12-24 07:00:30.000000000 -0800 15242 +++ ncurses-5.7/man/tset.1 2009-0 6-05 14:00:50.000000000 -070016105 +++ ncurses-5.7/man/tset.1 2009-07-19 15:01:56.000000000 -0700 15243 16106 @@ -1,5 +1,5 @@ 15244 16107 .\"*************************************************************************** … … 15261 16124 diff -Naur ncurses-5.7.orig/MANIFEST ncurses-5.7/MANIFEST 15262 16125 --- ncurses-5.7.orig/MANIFEST 2008-10-25 16:47:24.000000000 -0700 15263 +++ ncurses-5.7/MANIFEST 2009-06-05 14:01:21.000000000 -0700 15264 @@ -640,6 +640,7 @@ 16126 +++ ncurses-5.7/MANIFEST 2009-07-19 15:04:15.000000000 -0700 16127 @@ -172,6 +172,7 @@ 16128 ./Makefile.os2 16129 ./NEWS 16130 ./README 16131 +./README.MinGW 16132 ./README.emx 16133 ./TO-DO 16134 ./aclocal.m4 16135 @@ -479,6 +480,7 @@ 16136 ./form/fty_alnum.c 16137 ./form/fty_alpha.c 16138 ./form/fty_enum.c 16139 +./form/fty_generic.c 16140 ./form/fty_int.c 16141 ./form/fty_ipv4.c 16142 ./form/fty_num.c 16143 @@ -507,11 +509,13 @@ 16144 ./include/hashed_db.h 16145 ./include/headers 16146 ./include/nc_alloc.h 16147 +./include/nc_mingw.h 16148 ./include/nc_panel.h 16149 ./include/nc_tparm.h 16150 ./include/ncurses_cfg.hin 16151 ./include/ncurses_defs 16152 -./include/ncurses_dll.h 16153 +./include/ncurses_dll.h.in 16154 +./include/ncurses_mingw.h 16155 ./include/term_entry.h 16156 ./include/termcap.h.in 16157 ./include/tic.h 16158 @@ -640,6 +644,7 @@ 15265 16159 ./man/ncurses.3x 15266 16160 ./man/panel.3x … … 15270 16164 ./man/term.7 15271 16165 ./man/terminfo.head 15272 @@ -694,6 +69 5,7 @@16166 @@ -694,6 +699,7 @@ 15273 16167 ./misc/emx.src 15274 16168 ./misc/form.def … … 15278 16172 ./misc/jpf-indent 15279 16173 ./misc/makedef.cmd 15280 @@ -947,9 +949,11 @@ 16174 @@ -718,6 +724,7 @@ 16175 ./mk-0th.awk 16176 ./mk-1st.awk 16177 ./mk-2nd.awk 16178 +./mk-dlls.sh 16179 ./mk-hdr.awk 16180 ./mkdirs.sh 16181 ./ncurses/Makefile.in 16182 @@ -748,6 +755,7 @@ 16183 ./ncurses/base/lib_delch.c 16184 ./ncurses/base/lib_delwin.c 16185 ./ncurses/base/lib_dft_fgbg.c 16186 +./ncurses/base/lib_driver.c 16187 ./ncurses/base/lib_echo.c 16188 ./ncurses/base/lib_endwin.c 16189 ./ncurses/base/lib_erase.c 16190 @@ -817,6 +825,7 @@ 16191 ./ncurses/fifo_defs.h 16192 ./ncurses/llib-lncurses 16193 ./ncurses/llib-lncursest 16194 +./ncurses/llib-lncursestw 16195 ./ncurses/llib-lncursesw 16196 ./ncurses/modules 16197 ./ncurses/tinfo/MKcaptab.awk 16198 @@ -870,6 +879,7 @@ 16199 ./ncurses/tinfo/read_termcap.c 16200 ./ncurses/tinfo/setbuf.c 16201 ./ncurses/tinfo/strings.c 16202 +./ncurses/tinfo/tinfo_driver.c 16203 ./ncurses/tinfo/trim_sgr0.c 16204 ./ncurses/tinfo/use_screen.c 16205 ./ncurses/tinfo/write_entry.c 16206 @@ -915,6 +925,8 @@ 16207 ./ncurses/widechar/lib_vline_set.c 16208 ./ncurses/widechar/lib_wacs.c 16209 ./ncurses/widechar/lib_wunctrl.c 16210 +./ncurses/win32con/gettimeofday.c 16211 +./ncurses/win32con/win_driver.c 16212 ./panel/Makefile.in 16213 ./panel/headers 16214 ./panel/llib-lpanel 16215 @@ -947,9 +959,11 @@ 15281 16216 ./progs/infocmp.c 15282 16217 ./progs/modules … … 15290 16225 ./tar-copy.sh 15291 16226 ./test/Makefile.in 15292 @@ -963,6 +9 67,7 @@16227 @@ -963,6 +977,7 @@ 15293 16228 ./test/cardfile.c 15294 16229 ./test/cardfile.dat … … 15298 16233 ./test/configure 15299 16234 ./test/configure.in 15300 @@ -990,6 +995,7 @@ 16235 @@ -973,6 +988,7 @@ 16236 ./test/demo_menus.c 16237 ./test/demo_panels.c 16238 ./test/demo_termcap.c 16239 +./test/demo_terminfo.c 16240 ./test/ditto.c 16241 ./test/dots.c 16242 ./test/dots_mvcur.c 16243 @@ -990,6 +1006,7 @@ 15301 16244 ./test/inch_wide.c 15302 16245 ./test/inchs.c … … 15308 16251 diff -Naur ncurses-5.7.orig/menu/Makefile.in ncurses-5.7/menu/Makefile.in 15309 16252 --- ncurses-5.7.orig/menu/Makefile.in 2007-04-28 07:56:11.000000000 -0700 15310 +++ ncurses-5.7/menu/Makefile.in 2009-0 6-05 14:01:30.000000000 -070016253 +++ ncurses-5.7/menu/Makefile.in 2009-07-19 15:03:48.000000000 -0700 15311 16254 @@ -1,6 +1,6 @@ 15312 16255 -# $Id: Makefile.in,v 1.48 2007/04/28 14:56:11 tom Exp $ … … 15337 16280 diff -Naur ncurses-5.7.orig/menu/m_attribs.c ncurses-5.7/menu/m_attribs.c 15338 16281 --- ncurses-5.7.orig/menu/m_attribs.c 2004-12-11 15:29:12.000000000 -0800 15339 +++ ncurses-5.7/menu/m_attribs.c 2009-0 6-05 14:01:33.000000000 -070016282 +++ ncurses-5.7/menu/m_attribs.c 2009-07-19 15:03:51.000000000 -0700 15340 16283 @@ -37,7 +37,7 @@ 15341 16284 … … 15367 16310 diff -Naur ncurses-5.7.orig/menu/m_cursor.c ncurses-5.7/menu/m_cursor.c 15368 16311 --- ncurses-5.7.orig/menu/m_cursor.c 2005-10-22 16:03:32.000000000 -0700 15369 +++ ncurses-5.7/menu/m_cursor.c 2009-0 6-05 14:01:18.000000000 -070016312 +++ ncurses-5.7/menu/m_cursor.c 2009-07-19 15:02:23.000000000 -0700 15370 16313 @@ -1,5 +1,5 @@ 15371 16314 /**************************************************************************** … … 15395 16338 diff -Naur ncurses-5.7.orig/menu/m_driver.c ncurses-5.7/menu/m_driver.c 15396 16339 --- ncurses-5.7.orig/menu/m_driver.c 2008-08-03 15:08:22.000000000 -0700 15397 +++ ncurses-5.7/menu/m_driver.c 2009-0 6-05 14:01:18.000000000 -070016340 +++ ncurses-5.7/menu/m_driver.c 2009-07-19 15:02:23.000000000 -0700 15398 16341 @@ -1,5 +1,5 @@ 15399 16342 /**************************************************************************** … … 15423 16366 diff -Naur ncurses-5.7.orig/menu/menu.h ncurses-5.7/menu/menu.h 15424 16367 --- ncurses-5.7.orig/menu/menu.h 2007-02-24 09:32:13.000000000 -0800 15425 +++ ncurses-5.7/menu/menu.h 2009-0 6-05 14:01:33.000000000 -070016368 +++ ncurses-5.7/menu/menu.h 2009-07-19 15:03:51.000000000 -0700 15426 16369 @@ -1,5 +1,5 @@ 15427 16370 /**************************************************************************** … … 15453 16396 diff -Naur ncurses-5.7.orig/menu/menu.priv.h ncurses-5.7/menu/menu.priv.h 15454 16397 --- ncurses-5.7.orig/menu/menu.priv.h 2005-01-15 17:02:23.000000000 -0800 15455 +++ ncurses-5.7/menu/menu.priv.h 2009-0 6-05 14:01:18.000000000 -070016398 +++ ncurses-5.7/menu/menu.priv.h 2009-07-19 15:02:23.000000000 -0700 15456 16399 @@ -1,5 +1,5 @@ 15457 16400 /**************************************************************************** … … 15486 16429 diff -Naur ncurses-5.7.orig/menu/m_global.c ncurses-5.7/menu/m_global.c 15487 16430 --- ncurses-5.7.orig/menu/m_global.c 2005-12-31 13:51:52.000000000 -0800 15488 +++ ncurses-5.7/menu/m_global.c 2009-0 6-05 14:01:18.000000000 -070016431 +++ ncurses-5.7/menu/m_global.c 2009-07-19 15:02:23.000000000 -0700 15489 16432 @@ -1,5 +1,5 @@ 15490 16433 /**************************************************************************** … … 15527 16470 diff -Naur ncurses-5.7.orig/menu/m_new.c ncurses-5.7/menu/m_new.c 15528 16471 --- ncurses-5.7.orig/menu/m_new.c 2006-11-04 11:04:06.000000000 -0800 15529 +++ ncurses-5.7/menu/m_new.c 2009-0 6-05 14:01:33.000000000 -070016472 +++ ncurses-5.7/menu/m_new.c 2009-07-19 15:03:51.000000000 -0700 15530 16473 @@ -1,5 +1,5 @@ 15531 16474 /**************************************************************************** … … 15614 16557 diff -Naur ncurses-5.7.orig/menu/m_pad.c ncurses-5.7/menu/m_pad.c 15615 16558 --- ncurses-5.7.orig/menu/m_pad.c 2004-12-25 13:40:58.000000000 -0800 15616 +++ ncurses-5.7/menu/m_pad.c 2009-0 6-05 14:01:33.000000000 -070016559 +++ ncurses-5.7/menu/m_pad.c 2009-07-19 15:03:51.000000000 -0700 15617 16560 @@ -37,19 +37,19 @@ 15618 16561 … … 15640 16583 diff -Naur ncurses-5.7.orig/menu/m_post.c ncurses-5.7/menu/m_post.c 15641 16584 --- ncurses-5.7.orig/menu/m_post.c 2004-12-25 15:57:04.000000000 -0800 15642 +++ ncurses-5.7/menu/m_post.c 2009-0 6-05 14:01:18.000000000 -070016585 +++ ncurses-5.7/menu/m_post.c 2009-07-19 15:02:23.000000000 -0700 15643 16586 @@ -1,5 +1,5 @@ 15644 16587 /**************************************************************************** … … 15677 16620 diff -Naur ncurses-5.7.orig/menu/m_sub.c ncurses-5.7/menu/m_sub.c 15678 16621 --- ncurses-5.7.orig/menu/m_sub.c 2004-12-25 13:38:31.000000000 -0800 15679 +++ ncurses-5.7/menu/m_sub.c 2009-0 6-05 14:01:33.000000000 -070016622 +++ ncurses-5.7/menu/m_sub.c 2009-07-19 15:03:51.000000000 -0700 15680 16623 @@ -37,7 +37,7 @@ 15681 16624 … … 15723 16666 diff -Naur ncurses-5.7.orig/menu/m_win.c ncurses-5.7/menu/m_win.c 15724 16667 --- ncurses-5.7.orig/menu/m_win.c 2004-12-25 13:39:20.000000000 -0800 15725 +++ ncurses-5.7/menu/m_win.c 2009-0 6-05 14:01:33.000000000 -070016668 +++ ncurses-5.7/menu/m_win.c 2009-07-19 15:03:51.000000000 -0700 15726 16669 @@ -37,7 +37,7 @@ 15727 16670 … … 15778 16721 diff -Naur ncurses-5.7.orig/misc/gen-pkgconfig.in ncurses-5.7/misc/gen-pkgconfig.in 15779 16722 --- ncurses-5.7.orig/misc/gen-pkgconfig.in 1969-12-31 16:00:00.000000000 -0800 15780 +++ ncurses-5.7/misc/gen-pkgconfig.in 2009-0 6-05 14:01:21.000000000 -070016723 +++ ncurses-5.7/misc/gen-pkgconfig.in 2009-07-19 15:03:43.000000000 -0700 15781 16724 @@ -0,0 +1,140 @@ 15782 16725 +#!@SHELL@ … … 15922 16865 diff -Naur ncurses-5.7.orig/misc/Makefile.in ncurses-5.7/misc/Makefile.in 15923 16866 --- ncurses-5.7.orig/misc/Makefile.in 2007-03-31 08:54:17.000000000 -0700 15924 +++ ncurses-5.7/misc/Makefile.in 2009-0 6-05 14:01:12.000000000 -070016867 +++ ncurses-5.7/misc/Makefile.in 2009-07-19 15:02:18.000000000 -0700 15925 16868 @@ -1,6 +1,6 @@ 15926 16869 -# $Id: Makefile.in,v 1.43 2007/03/31 15:54:17 tom Exp $ … … 16005 16948 diff -Naur ncurses-5.7.orig/misc/ncu-indent ncurses-5.7/misc/ncu-indent 16006 16949 --- ncurses-5.7.orig/misc/ncu-indent 2008-08-03 08:46:44.000000000 -0700 16007 +++ ncurses-5.7/misc/ncu-indent 2009-0 6-05 14:01:18.000000000 -070016950 +++ ncurses-5.7/misc/ncu-indent 2009-07-19 15:02:23.000000000 -0700 16008 16951 @@ -26,7 +26,7 @@ 16009 16952 #* sale, use or other dealings in this Software without prior written * … … 16054 16997 diff -Naur ncurses-5.7.orig/misc/ncurses-config.in ncurses-5.7/misc/ncurses-config.in 16055 16998 --- ncurses-5.7.orig/misc/ncurses-config.in 2007-03-17 13:02:19.000000000 -0700 16056 +++ ncurses-5.7/misc/ncurses-config.in 2009-0 6-05 14:01:21.000000000 -070016999 +++ ncurses-5.7/misc/ncurses-config.in 2009-07-19 15:03:43.000000000 -0700 16057 17000 @@ -1,7 +1,7 @@ 16058 17001 #!@SHELL@ … … 16189 17132 diff -Naur ncurses-5.7.orig/misc/terminfo.src ncurses-5.7/misc/terminfo.src 16190 17133 --- ncurses-5.7.orig/misc/terminfo.src 2008-10-12 16:03:54.000000000 -0700 16191 +++ ncurses-5.7/misc/terminfo.src 2009-0 6-05 14:01:49.000000000 -070017134 +++ ncurses-5.7/misc/terminfo.src 2009-07-19 15:03:58.000000000 -0700 16192 17135 @@ -6,8 +6,8 @@ 16193 17136 # Report bugs and new terminal descriptions to … … 16489 17432 diff -Naur ncurses-5.7.orig/mk-1st.awk ncurses-5.7/mk-1st.awk 16490 17433 --- ncurses-5.7.orig/mk-1st.awk 2007-03-24 15:10:55.000000000 -0700 16491 +++ ncurses-5.7/mk-1st.awk 2009-0 6-05 14:01:30.000000000 -070017434 +++ ncurses-5.7/mk-1st.awk 2009-07-19 15:03:48.000000000 -0700 16492 17435 @@ -1,6 +1,6 @@ 16493 17436 -# $Id: mk-1st.awk,v 1.78 2007/03/24 22:10:55 tom Exp $ … … 16532 17475 if ( host == "vxworks" ) 16533 17476 { 17477 diff -Naur ncurses-5.7.orig/mk-dlls.sh ncurses-5.7/mk-dlls.sh 17478 --- ncurses-5.7.orig/mk-dlls.sh 1969-12-31 16:00:00.000000000 -0800 17479 +++ ncurses-5.7/mk-dlls.sh 2009-07-19 15:04:11.000000000 -0700 17480 @@ -0,0 +1,93 @@ 17481 +#!/bin/sh 17482 +# $Id: mk-dlls.sh,v 1.1 2008/11/18 08:50:04 juergen Exp $ 17483 +############################################################################## 17484 +# Copyright (c) 2008 Free Software Foundation, Inc. # 17485 +# # 17486 +# Permission is hereby granted, free of charge, to any person obtaining a # 17487 +# copy of this software and associated documentation files (the "Software"), # 17488 +# to deal in the Software without restriction, including without limitation # 17489 +# the rights to use, copy, modify, merge, publish, distribute, distribute # 17490 +# with modifications, sublicense, and/or sell copies of the Software, and to # 17491 +# permit persons to whom the Software is furnished to do so, subject to the # 17492 +# following conditions: # 17493 +# # 17494 +# The above copyright notice and this permission notice shall be included in # 17495 +# all copies or substantial portions of the Software. # 17496 +# # 17497 +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # 17498 +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # 17499 +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL # 17500 +# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER # 17501 +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING # 17502 +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # 17503 +# DEALINGS IN THE SOFTWARE. # 17504 +# # 17505 +# Except as contained in this notice, the name(s) of the above copyright # 17506 +# holders shall not be used in advertising or otherwise to promote the sale, # 17507 +# use or other dealings in this Software without prior written # 17508 +# authorization. # 17509 +############################################################################## 17510 +# 17511 +# Author: Juergen Pfeifer 17512 +# 17513 +# Build DLLs on MinGW 17514 +# 17515 +gcc -v 2>&1 | grep specs | grep mingw 17516 +if [ $? -eq 1 ]; then 17517 + echo "$0 requires a mingw environment" >&2 17518 +else 17519 + if [ -d lib ]; then 17520 + cf="-shared" 17521 + lf="--enable-auto-import" 17522 + pushd lib 2>&1 >/dev/null 17523 + for t in "" "t" 17524 + do 17525 + for m in "" "_g" 17526 + do 17527 + if [ -f libncurses${t}${m}.a ]; then 17528 + f=libncurses${t}${m}.a 17529 + g=`basename $f .a | cut -c 4-` 17530 + gi=libw${g}.a 17531 + td=tmp-${g} 17532 + rm -rf "${td}" 17533 + mkdir "${td}" 17534 + cd "${td}" 17535 + ar x ../${f} `ar t ../${f}` 17536 + gcc $cf -o w${g}.dll -Wl,--out-implib,${gi} -Wl,--output-def,w${g}.def -Wl,$lf `ar t ../$f` 17537 + lib //NOLOGO /MACHINE:i386 /DEF:w${g}.def 17538 + rm -f `ar t ../$f` 17539 + mv w${g}.dll .. 17540 + mv w${g}.lib .. 17541 + mv libw${g}.a .. 17542 + cd .. 17543 + rm -rf "${td}" 17544 + 17545 + for l in panel menu form 17546 + do 17547 + for f in lib${l}${t}${m}.a 17548 + do 17549 + g=`basename $f .a | cut -c 4-` 17550 + td=tmp-${g} 17551 + rm -rf "${td}" 17552 + mkdir "${td}" 17553 + echo $g 17554 + cd "${td}" 17555 + ar x ../$f `ar t ../$f` 17556 + gcc $cf -o w${g}.dll -Wl,--out-implib,libw${g}.a -Wl,--output-def,w${g}.def -Wl,$lf `ar t ../$f` ../${gi} 17557 + lib //NOLOGO /MACHINE:i386 /DEF:w${g}.def 17558 + rm -f `ar t ../$f` 17559 + mv w${g}.dll .. 17560 + mv w${g}.lib .. 17561 + mv libw${g}.a .. 17562 + cd .. 17563 + rm -rf "${td}" 17564 + done 17565 + done 17566 + fi 17567 + done 17568 + done 17569 + popd 17570 + else 17571 + echo lib has not been build >&2 17572 + fi 17573 +fi 16534 17574 diff -Naur ncurses-5.7.orig/ncurses/base/define_key.c ncurses-5.7/ncurses/base/define_key.c 16535 17575 --- ncurses-5.7.orig/ncurses/base/define_key.c 2006-12-30 15:23:31.000000000 -0800 16536 +++ ncurses-5.7/ncurses/base/define_key.c 2009-0 6-05 14:01:51.000000000 -070017576 +++ ncurses-5.7/ncurses/base/define_key.c 2009-07-19 15:03:59.000000000 -0700 16537 17577 @@ -1,5 +1,5 @@ 16538 17578 /**************************************************************************** … … 16607 17647 diff -Naur ncurses-5.7.orig/ncurses/base/keybound.c ncurses-5.7/ncurses/base/keybound.c 16608 17648 --- ncurses-5.7.orig/ncurses/base/keybound.c 2006-06-17 11:19:24.000000000 -0700 16609 +++ ncurses-5.7/ncurses/base/keybound.c 2009-0 6-05 14:01:16.000000000 -070017649 +++ ncurses-5.7/ncurses/base/keybound.c 2009-07-19 15:02:22.000000000 -0700 16610 17650 @@ -1,5 +1,5 @@ 16611 17651 /**************************************************************************** … … 16658 17698 diff -Naur ncurses-5.7.orig/ncurses/base/key_defined.c ncurses-5.7/ncurses/base/key_defined.c 16659 17699 --- ncurses-5.7.orig/ncurses/base/key_defined.c 2006-12-30 15:22:55.000000000 -0800 16660 +++ ncurses-5.7/ncurses/base/key_defined.c 2009-0 6-05 14:01:16.000000000 -070017700 +++ ncurses-5.7/ncurses/base/key_defined.c 2009-07-19 15:02:22.000000000 -0700 16661 17701 @@ -1,5 +1,5 @@ 16662 17702 /**************************************************************************** … … 16704 17744 diff -Naur ncurses-5.7.orig/ncurses/base/keyok.c ncurses-5.7/ncurses/base/keyok.c 16705 17745 --- ncurses-5.7.orig/ncurses/base/keyok.c 2006-12-30 08:22:33.000000000 -0800 16706 +++ ncurses-5.7/ncurses/base/keyok.c 2009-0 6-05 14:01:14.000000000 -070017746 +++ ncurses-5.7/ncurses/base/keyok.c 2009-07-19 15:04:06.000000000 -0700 16707 17747 @@ -1,5 +1,5 @@ 16708 17748 /**************************************************************************** … … 16724 17764 16725 17765 -MODULE_ID("$Id: keyok.c,v 1.7 2006/12/30 16:22:33 tom Exp $") 16726 +MODULE_ID("$Id: keyok.c,v 1. 8 2009/02/15 00:31:38tom Exp $")17766 +MODULE_ID("$Id: keyok.c,v 1.9 2009/06/06 19:24:57 tom Exp $") 16727 17767 16728 17768 /* 16729 17769 * Enable (or disable) ncurses' interpretation of a keycode by adding (or 16730 @@ -45, 7 +46,7@@17770 @@ -45,28 +46,33 @@ 16731 17771 */ 16732 17772 … … 16736 17776 { 16737 17777 int code = ERR; 16738 int count = 0; 16739 @@ -55,18 +56,18 @@ 17778 - int count = 0; 17779 - char *s; 17780 17781 + T((T_CALLED("keyok(%p, %d,%d)"), SP_PARM, c, flag)); 17782 +#ifdef USE_TERM_DRIVER 17783 + code = CallDriver_2(sp, kyOk, c, flag); 17784 +#else 17785 T((T_CALLED("keyok(%d,%d)"), c, flag)); 16740 17786 if (c >= 0) { 17787 + int count = 0; 17788 + char *s; 16741 17789 unsigned ch = (unsigned) c; 17790 + 16742 17791 if (flag) { 16743 17792 - while ((s = _nc_expand_try(SP->_key_ok, ch, &count, 0)) != 0 … … 16762 17811 count = 0; 16763 17812 if (code != OK) 16764 @@ -76,3 +77,11 @@ 17813 @@ -74,5 +80,14 @@ 17814 } 17815 } 16765 17816 } 17817 +#endif 16766 17818 returnCode(code); 16767 17819 } … … 16776 17828 diff -Naur ncurses-5.7.orig/ncurses/base/legacy_coding.c ncurses-5.7/ncurses/base/legacy_coding.c 16777 17829 --- ncurses-5.7.orig/ncurses/base/legacy_coding.c 2005-12-17 15:38:17.000000000 -0800 16778 +++ ncurses-5.7/ncurses/base/legacy_coding.c 2009-0 6-05 14:01:16.000000000 -070017830 +++ ncurses-5.7/ncurses/base/legacy_coding.c 2009-07-19 15:02:22.000000000 -0700 16779 17831 @@ -1,5 +1,5 @@ 16780 17832 /**************************************************************************** … … 16825 17877 diff -Naur ncurses-5.7.orig/ncurses/base/lib_addch.c ncurses-5.7/ncurses/base/lib_addch.c 16826 17878 --- ncurses-5.7.orig/ncurses/base/lib_addch.c 2008-08-16 12:20:04.000000000 -0700 16827 +++ ncurses-5.7/ncurses/base/lib_addch.c 2009-0 6-05 14:01:52.000000000 -070017879 +++ ncurses-5.7/ncurses/base/lib_addch.c 2009-07-19 15:04:01.000000000 -0700 16828 17880 @@ -1,5 +1,5 @@ 16829 17881 /**************************************************************************** … … 16941 17993 diff -Naur ncurses-5.7.orig/ncurses/base/lib_beep.c ncurses-5.7/ncurses/base/lib_beep.c 16942 17994 --- ncurses-5.7.orig/ncurses/base/lib_beep.c 2005-04-09 08:20:04.000000000 -0700 16943 +++ ncurses-5.7/ncurses/base/lib_beep.c 2009-0 6-05 14:01:54.000000000 -070017995 +++ ncurses-5.7/ncurses/base/lib_beep.c 2009-07-19 15:04:03.000000000 -0700 16944 17996 @@ -1,5 +1,5 @@ 16945 17997 /**************************************************************************** … … 17009 18061 diff -Naur ncurses-5.7.orig/ncurses/base/lib_color.c ncurses-5.7/ncurses/base/lib_color.c 17010 18062 --- ncurses-5.7.orig/ncurses/base/lib_color.c 2007-04-07 10:07:28.000000000 -0700 17011 +++ ncurses-5.7/ncurses/base/lib_color.c 2009-0 6-05 14:01:51.000000000 -070018063 +++ ncurses-5.7/ncurses/base/lib_color.c 2009-07-19 15:04:06.000000000 -0700 17012 18064 @@ -1,5 +1,5 @@ 17013 18065 /**************************************************************************** … … 17031 18083 -MODULE_ID("$Id: lib_color.c,v 1.85 2007/04/07 17:07:28 tom Exp $") 17032 18084 +#ifndef CUR 17033 +#define CUR SP_TERMTYPE 18085 +#define CUR SP_TERMTYPE 17034 18086 +#endif 17035 18087 + 17036 +MODULE_ID("$Id: lib_color.c,v 1.9 1 2009/05/10 00:48:29tom Exp $")18088 +MODULE_ID("$Id: lib_color.c,v 1.92 2009/06/06 20:26:16 tom Exp $") 17037 18089 17038 18090 /* … … 17099 18151 const color_t *tp; 17100 18152 int n; 18153 @@ -179,18 +199,18 @@ 18154 tp = (hue_lightness_saturation) ? hls_palette : cga_palette; 18155 for (n = 0; n < COLORS; n++) { 18156 if (InPalette(n)) { 18157 - SP->_color_table[n] = tp[n]; 18158 + SP_PARM->_color_table[n] = tp[n]; 18159 } else { 18160 - SP->_color_table[n] = tp[n % MAX_PALETTE]; 18161 + SP_PARM->_color_table[n] = tp[n % MAX_PALETTE]; 18162 if (hue_lightness_saturation) { 18163 - SP->_color_table[n].green = 100; 18164 + SP_PARM->_color_table[n].green = 100; 18165 } else { 18166 - if (SP->_color_table[n].red) 18167 - SP->_color_table[n].red = 1000; 18168 - if (SP->_color_table[n].green) 18169 - SP->_color_table[n].green = 1000; 18170 - if (SP->_color_table[n].blue) 18171 - SP->_color_table[n].blue = 1000; 18172 + if (SP_PARM->_color_table[n].red) 18173 + SP_PARM->_color_table[n].red = 1000; 18174 + if (SP_PARM->_color_table[n].green) 18175 + SP_PARM->_color_table[n].green = 1000; 18176 + if (SP_PARM->_color_table[n].blue) 18177 + SP_PARM->_color_table[n].blue = 1000; 18178 } 18179 } 18180 } 17101 18181 @@ -200,7 +220,7 @@ 17102 18182 * Reset the color pair, e.g., to whatever color pair 0 is. … … 17108 18188 bool result = FALSE; 17109 18189 17110 @@ -220,13 +240,16 @@ 18190 @@ -218,15 +238,14 @@ 18191 * someone has changed the color definitions. 18192 */ 17111 18193 bool 17112 _nc_reset_colors(void) 17113 { 17114 +#if NCURSES_SP_FUNCS 17115 + SCREEN *sp = CURRENT_SCREEN; 17116 +#endif 18194 -_nc_reset_colors(void) 18195 -{ 18196 +NCURSES_SP_NAME(_nc_reset_colors) (NCURSES_SP_DCL0) { 17117 18197 int result = FALSE; 17118 18198 17119 18199 T((T_CALLED("_nc_reset_colors()"))); 17120 if (SP->_color_defs > 0) 17121 SP->_color_defs = -(SP->_color_defs); 18200 - if (SP->_color_defs > 0) 18201 - SP->_color_defs = -(SP->_color_defs); 18202 + if (SP_PARM->_color_defs > 0) 18203 + SP_PARM->_color_defs = -(SP_PARM->_color_defs); 17122 18204 17123 18205 - if (reset_color_pair()) … … 17126 18208 if (orig_colors != 0) { 17127 18209 TPUTS_TRACE("orig_colors"); 17128 @@ -237,45 +260,60 @@ 18210 @@ -236,46 +255,69 @@ 18211 returnBool(result); 17129 18212 } 17130 18213 18214 +#if NCURSES_SP_FUNCS 18215 +bool 18216 +_nc_reset_colors(void) 18217 +{ 18218 + return NCURSES_SP_NAME(_nc_reset_colors) (CURRENT_SCREEN); 18219 +} 18220 +#endif 18221 + 17131 18222 NCURSES_EXPORT(int) 17132 18223 -start_color(void) … … 17204 18295 } 17205 18296 } else { 17206 @@ -285,6 +32 3,14 @@18297 @@ -285,6 +327,14 @@ 17207 18298 returnCode(result); 17208 18299 } … … 17219 18310 static void 17220 18311 rgb2hls(short r, short g, short b, short *h, short *l, short *s) 17221 @@ -328,24 +37 4,72 @@18312 @@ -328,24 +378,72 @@ 17222 18313 * values. 17223 18314 */ … … 17299 18390 #endif 17300 18391 { 17301 @@ -361,8 +45 5,8 @@18392 @@ -361,8 +459,8 @@ 17302 18393 * pair colors with the new ones). 17303 18394 */ … … 17310 18401 17311 18402 for (y = 0; y <= curscr->_maxy; y++) { 17312 @@ -381,9 +47 5,9 @@18403 @@ -381,9 +479,9 @@ 17313 18404 _nc_make_oldhash(y); 17314 18405 } … … 17323 18414 if (initialize_pair && InPalette(f) && InPalette(b)) { 17324 18415 const color_t *tp = hue_lightness_saturation ? hls_palette : cga_palette; 17325 @@ -404,54 + 498,79 @@18416 @@ -404,54 +502,79 @@ 17326 18417 returnCode(OK); 17327 18418 } … … 17419 18510 T((T_CALLED("has_colors()"))); 17420 18511 returnCode((VALID_NUMERIC(max_colors) && VALID_NUMERIC(max_pairs) 17421 @@ -462,18 +58 1,27 @@18512 @@ -462,18 +585,27 @@ 17422 18513 || set_color_pair)) ? TRUE : FALSE); 17423 18514 } … … 17452 18543 if (r) 17453 18544 *r = c_r; 17454 @@ -489,18 +6 17,27 @@18545 @@ -489,18 +621,27 @@ 17455 18546 returnCode(result); 17456 18547 } … … 17484 18575 #if NCURSES_EXT_FUNCS 17485 18576 if (fg == COLOR_DEFAULT) 17486 @@ -520, 19 +657,33@@18577 @@ -520,27 +661,41 @@ 17487 18578 returnCode(result); 17488 18579 } … … 17519 18610 + 1, outc); 17520 18611 return; 17521 } else if (SP != 0) { 18612 - } else if (SP != 0) { 18613 + } else if (SP_PARM != 0) { 17522 18614 pair_content((short) pair, &fg, &bg); 17523 @@ -553,17 +704,17 @@ 17524 if (SP->_has_sgr_39_49 18615 } 18616 } 18617 18618 if (old_pair >= 0 18619 - && SP != 0 18620 + && SP_PARM != 0 18621 && pair_content(old_pair, &old_fg, &old_bg) != ERR) { 18622 if ((isDefaultColor(fg) && !isDefaultColor(old_fg)) 18623 || (isDefaultColor(bg) && !isDefaultColor(old_bg))) { 18624 @@ -550,20 +705,20 @@ 18625 * the terminal description, treat it as screen's indicator of ECMA 18626 * SGR 39 and SGR 49, and assume the two sequences are independent. 18627 */ 18628 - if (SP->_has_sgr_39_49 18629 + if (SP_PARM->_has_sgr_39_49 17525 18630 && isDefaultColor(old_bg) 17526 18631 && !isDefaultColor(old_fg)) { 17527 18632 - tputs("\033[39m", 1, outc); 18633 - } else if (SP->_has_sgr_39_49 17528 18634 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx "\033[39m", 1, outc); 17529 } else if (SP->_has_sgr_39_4918635 + } else if (SP_PARM->_has_sgr_39_49 17530 18636 && isDefaultColor(old_fg) 17531 18637 && !isDefaultColor(old_bg)) { … … 17543 18649 return; 17544 18650 } 17545 @@ -585,9 +7 36,22 @@18651 @@ -585,9 +740,22 @@ 17546 18652 fg, bg)); 17547 18653 … … 17570 18676 diff -Naur ncurses-5.7.orig/ncurses/base/lib_colorset.c ncurses-5.7/ncurses/base/lib_colorset.c 17571 18677 --- ncurses-5.7.orig/ncurses/base/lib_colorset.c 2005-01-29 13:40:51.000000000 -0800 17572 +++ ncurses-5.7/ncurses/base/lib_colorset.c 2009-0 6-05 14:01:11.000000000 -070018678 +++ ncurses-5.7/ncurses/base/lib_colorset.c 2009-07-19 15:02:16.000000000 -0700 17573 18679 @@ -1,5 +1,5 @@ 17574 18680 /**************************************************************************** … … 17618 18724 diff -Naur ncurses-5.7.orig/ncurses/base/lib_delwin.c ncurses-5.7/ncurses/base/lib_delwin.c 17619 18725 --- ncurses-5.7.orig/ncurses/base/lib_delwin.c 2008-06-07 07:10:56.000000000 -0700 17620 +++ ncurses-5.7/ncurses/base/lib_delwin.c 2009-0 6-05 14:01:54.000000000 -070018726 +++ ncurses-5.7/ncurses/base/lib_delwin.c 2009-07-19 15:04:03.000000000 -0700 17621 18727 @@ -1,5 +1,5 @@ 17622 18728 /**************************************************************************** … … 17675 18781 diff -Naur ncurses-5.7.orig/ncurses/base/lib_dft_fgbg.c ncurses-5.7/ncurses/base/lib_dft_fgbg.c 17676 18782 --- ncurses-5.7.orig/ncurses/base/lib_dft_fgbg.c 2005-11-26 12:03:38.000000000 -0800 17677 +++ ncurses-5.7/ncurses/base/lib_dft_fgbg.c 2009-0 6-05 14:01:55.000000000 -070018783 +++ ncurses-5.7/ncurses/base/lib_dft_fgbg.c 2009-07-19 15:04:04.000000000 -0700 17678 18784 @@ -1,5 +1,5 @@ 17679 18785 /**************************************************************************** … … 17780 18886 } 17781 18887 +#endif 18888 diff -Naur ncurses-5.7.orig/ncurses/base/lib_driver.c ncurses-5.7/ncurses/base/lib_driver.c 18889 --- ncurses-5.7.orig/ncurses/base/lib_driver.c 1969-12-31 16:00:00.000000000 -0800 18890 +++ ncurses-5.7/ncurses/base/lib_driver.c 2009-07-19 15:04:11.000000000 -0700 18891 @@ -0,0 +1,142 @@ 18892 +/**************************************************************************** 18893 + * Copyright (c) 2008,2009 Free Software Foundation, Inc. * 18894 + * * 18895 + * Permission is hereby granted, free of charge, to any person obtaining a * 18896 + * copy of this software and associated documentation files (the * 18897 + * "Software"), to deal in the Software without restriction, including * 18898 + * without limitation the rights to use, copy, modify, merge, publish, * 18899 + * distribute, distribute with modifications, sublicense, and/or sell * 18900 + * copies of the Software, and to permit persons to whom the Software is * 18901 + * furnished to do so, subject to the following conditions: * 18902 + * * 18903 + * The above copyright notice and this permission notice shall be included * 18904 + * in all copies or substantial portions of the Software. * 18905 + * * 18906 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * 18907 + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * 18908 + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * 18909 + * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * 18910 + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * 18911 + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * 18912 + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * 18913 + * * 18914 + * Except as contained in this notice, the name(s) of the above copyright * 18915 + * holders shall not be used in advertising or otherwise to promote the * 18916 + * sale, use or other dealings in this Software without prior written * 18917 + * authorization. * 18918 + ****************************************************************************/ 18919 + 18920 +/**************************************************************************** 18921 + * Author: Juergen Pfeifer * 18922 + * * 18923 + ****************************************************************************/ 18924 + 18925 +#include <curses.priv.h> 18926 + 18927 +MODULE_ID("$Id: lib_driver.c,v 1.1 2009/02/21 15:11:29 juergen Exp $") 18928 + 18929 +typedef struct DriverEntry { 18930 + const char *name; 18931 + TERM_DRIVER *driver; 18932 +} DRIVER_ENTRY; 18933 + 18934 +static DRIVER_ENTRY DriverTable[] = 18935 +{ 18936 +#ifdef __MINGW32__ 18937 + {"win", &_nc_WIN_DRIVER}, 18938 +#endif 18939 + {"tinfo", &_nc_TINFO_DRIVER} 18940 +}; 18941 + 18942 +#define NUM_DRIVERS (int)(sizeof(DriverTable)/sizeof(DRIVER_ENTRY)) 18943 + 18944 +NCURSES_EXPORT(int) 18945 +_nc_get_driver(TERMINAL_CONTROL_BLOCK * TCB, const char *name, int *errret) 18946 +{ 18947 + int code = ERR; 18948 + int i; 18949 + TERM_DRIVER *res = (TERM_DRIVER *) 0; 18950 + TERM_DRIVER *use = 0; 18951 + 18952 + assert(TCB != 0); 18953 + 18954 + for (i = 0; i < NUM_DRIVERS; i++) { 18955 + res = DriverTable[i].driver; 18956 + if (res->CanHandle(TCB, name, errret)) { 18957 + use = res; 18958 + break; 18959 + } 18960 + } 18961 + if (use != 0) { 18962 + TCB->drv = use; 18963 + code = OK; 18964 + } 18965 + return (code); 18966 +} 18967 + 18968 +NCURSES_EXPORT(int) 18969 +NCURSES_SP_NAME(has_key) (SCREEN *sp, int keycode) 18970 +{ 18971 + T((T_CALLED("has_key(%p, %d)"), sp, keycode)); 18972 + returnCode(IsValidTIScreen(sp) ? CallDriver_1(sp, kyExist, keycode) : FALSE); 18973 +} 18974 + 18975 +NCURSES_EXPORT(int) 18976 +has_key(int keycode) 18977 +{ 18978 + return NCURSES_SP_NAME(has_key) (CURRENT_SCREEN, keycode); 18979 +} 18980 + 18981 +NCURSES_EXPORT(int) 18982 +NCURSES_SP_NAME(_nc_mcprint) (SCREEN *sp, char *data, int len) 18983 +{ 18984 + int code = ERR; 18985 + 18986 + if (0 != TerminalOf(sp)) 18987 + code = CallDriver_2(sp, print, data, len); 18988 + return (code); 18989 +} 18990 + 18991 +NCURSES_EXPORT(int) 18992 +mcprint(char *data, int len) 18993 +{ 18994 + return NCURSES_SP_NAME(_nc_mcprint) (CURRENT_SCREEN, data, len); 18995 +} 18996 + 18997 +NCURSES_EXPORT(int) 18998 +NCURSES_SP_NAME(doupdate) (SCREEN *sp) 18999 +{ 19000 + int code = ERR; 19001 + 19002 + T((T_CALLED("doupdate(%p)"), sp)); 19003 + 19004 + if (IsValidScreen(sp)) 19005 + code = CallDriver(sp, update); 19006 + 19007 + returnCode(code); 19008 +} 19009 + 19010 +NCURSES_EXPORT(int) 19011 +doupdate(void) 19012 +{ 19013 + return NCURSES_SP_NAME(doupdate) (CURRENT_SCREEN); 19014 +} 19015 + 19016 +NCURSES_EXPORT(int) 19017 +NCURSES_SP_NAME(mvcur) (SCREEN *sp, int yold, int xold, int ynew, int xnew) 19018 +{ 19019 + int code = ERR; 19020 + TR(TRACE_CALLS | TRACE_MOVE, (T_CALLED("mvcur(%p,%d,%d,%d,%d)"), 19021 + sp, yold, xold, ynew, xnew)); 19022 + if (HasTerminal(sp)) { 19023 + code = CallDriver_4(sp, hwcur, yold, xold, ynew, xnew); 19024 + } 19025 + returnCode(code); 19026 +} 19027 + 19028 +NCURSES_EXPORT(int) 19029 +mvcur(int yold, int xold, int ynew, int xnew) 19030 +/* optimized cursor move from (yold, xold) to (ynew, xnew) */ 19031 +{ 19032 + return NCURSES_SP_NAME(mvcur) (CURRENT_SCREEN, yold, xold, ynew, xnew); 19033 +} 17782 19034 diff -Naur ncurses-5.7.orig/ncurses/base/lib_echo.c ncurses-5.7/ncurses/base/lib_echo.c 17783 19035 --- ncurses-5.7.orig/ncurses/base/lib_echo.c 2000-12-09 18:43:27.000000000 -0800 17784 +++ ncurses-5.7/ncurses/base/lib_echo.c 2009-0 6-05 14:01:16.000000000 -070019036 +++ ncurses-5.7/ncurses/base/lib_echo.c 2009-07-19 15:02:22.000000000 -0700 17785 19037 @@ -1,5 +1,5 @@ 17786 19038 /**************************************************************************** … … 17848 19100 diff -Naur ncurses-5.7.orig/ncurses/base/lib_endwin.c ncurses-5.7/ncurses/base/lib_endwin.c 17849 19101 --- ncurses-5.7.orig/ncurses/base/lib_endwin.c 2000-12-09 18:43:27.000000000 -0800 17850 +++ ncurses-5.7/ncurses/base/lib_endwin.c 2009-0 6-05 14:01:14.000000000 -070019102 +++ ncurses-5.7/ncurses/base/lib_endwin.c 2009-07-19 15:04:13.000000000 -0700 17851 19103 @@ -1,5 +1,5 @@ 17852 19104 /**************************************************************************** 17853 19105 - * Copyright (c) 1998,2000 Free Software Foundation, Inc. * 17854 + * Copyright (c) 1998-200 0,2009 Free Software Foundation, Inc. *19106 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 17855 19107 * * 17856 19108 * Permission is hereby granted, free of charge, to any person obtaining a * … … 17865 19117 17866 19118 /* 17867 @@ -41,16 +43,16 @@ 19119 @@ -39,22 +41,39 @@ 19120 */ 19121 17868 19122 #include <curses.priv.h> 17869 19123 -#include <term.h> 17870 19124 17871 19125 -MODULE_ID("$Id: lib_endwin.c,v 1.19 2000/12/10 02:43:27 tom Exp $") 17872 +MODULE_ID("$Id: lib_endwin.c,v 1.2 0 2009/02/15 00:35:00tom Exp $")19126 +MODULE_ID("$Id: lib_endwin.c,v 1.21 2009/07/04 18:35:43 tom Exp $") 17873 19127 17874 19128 NCURSES_EXPORT(int) … … 17876 19130 +NCURSES_SP_NAME(endwin) (NCURSES_SP_DCL0) 17877 19131 { 17878 T((T_CALLED("endwin()"))); 19132 - T((T_CALLED("endwin()"))); 19133 + int code = ERR; 19134 + 19135 + T((T_CALLED("endwin(%p)"), SP_PARM)); 17879 19136 17880 19137 - if (SP) { … … 17882 19139 - SP->_mouse_wrap(SP); 17883 19140 + if (SP_PARM) { 19141 +#ifdef USE_TERM_DRIVER 19142 + TERMINAL_CONTROL_BLOCK *TCB = TCBOf(SP_PARM); 19143 + 19144 + SP_PARM->_endwin = TRUE; 19145 + if (TCB && TCB->drv && TCB->drv->scexit) 19146 + TCB->drv->scexit(SP_PARM); 19147 +#else 17884 19148 + SP_PARM->_endwin = TRUE; 17885 19149 + SP_PARM->_mouse_wrap(SP_PARM); 17886 19150 _nc_screen_wrap(); 17887 19151 _nc_mvcur_wrap(); /* wrap up cursor addressing */ 17888 returnCode(reset_shell_mode()); 17889 @@ -58,3 +60,11 @@ 17890 17891 returnCode(ERR); 17892 } 19152 - returnCode(reset_shell_mode()); 19153 +#endif 19154 + code = NCURSES_SP_NAME(reset_shell_mode) (NCURSES_SP_ARG); 19155 } 19156 19157 - returnCode(ERR); 19158 + returnCode(code); 19159 +} 17893 19160 + 17894 19161 +#if NCURSES_SP_FUNCS … … 17897 19164 +{ 17898 19165 + return NCURSES_SP_NAME(endwin) (CURRENT_SCREEN); 17899 +}19166 } 17900 19167 +#endif 17901 19168 diff -Naur ncurses-5.7.orig/ncurses/base/lib_flash.c ncurses-5.7/ncurses/base/lib_flash.c 17902 19169 --- ncurses-5.7.orig/ncurses/base/lib_flash.c 2000-12-09 18:43:27.000000000 -0800 17903 +++ ncurses-5.7/ncurses/base/lib_flash.c 2009-0 6-05 14:01:54.000000000 -070019170 +++ ncurses-5.7/ncurses/base/lib_flash.c 2009-07-19 15:04:03.000000000 -0700 17904 19171 @@ -1,5 +1,5 @@ 17905 19172 /**************************************************************************** … … 17970 19237 diff -Naur ncurses-5.7.orig/ncurses/base/lib_freeall.c ncurses-5.7/ncurses/base/lib_freeall.c 17971 19238 --- ncurses-5.7.orig/ncurses/base/lib_freeall.c 2008-09-27 06:09:57.000000000 -0700 17972 +++ ncurses-5.7/ncurses/base/lib_freeall.c 2009-0 6-05 14:01:51.000000000 -070019239 +++ ncurses-5.7/ncurses/base/lib_freeall.c 2009-07-19 15:03:59.000000000 -0700 17973 19240 @@ -1,5 +1,5 @@ 17974 19241 /**************************************************************************** … … 18096 19363 diff -Naur ncurses-5.7.orig/ncurses/base/lib_getch.c ncurses-5.7/ncurses/base/lib_getch.c 18097 19364 --- ncurses-5.7.orig/ncurses/base/lib_getch.c 2008-09-20 12:46:13.000000000 -0700 18098 +++ ncurses-5.7/ncurses/base/lib_getch.c 2009-0 6-05 14:01:55.000000000 -070019365 +++ ncurses-5.7/ncurses/base/lib_getch.c 2009-07-19 15:04:13.000000000 -0700 18099 19366 @@ -1,5 +1,5 @@ 18100 19367 /**************************************************************************** … … 18112 19379 18113 19380 /* 18114 @@ -41,40 +42, 54@@19381 @@ -41,40 +42,80 @@ 18115 19382 18116 19383 #include <curses.priv.h> 18117 19384 18118 19385 -MODULE_ID("$Id: lib_getch.c,v 1.99 2008/09/20 19:46:13 tom Exp $") 18119 +MODULE_ID("$Id: lib_getch.c,v 1.10 3 2009/05/30 15:50:47tom Exp $")19386 +MODULE_ID("$Id: lib_getch.c,v 1.104 2009/07/04 20:41:13 tom Exp $") 18120 19387 18121 19388 #include <fifo_defs.h> 18122 19389 18123 19390 #if USE_REENTRANT 18124 #define GetEscdelay(sp) (sp)->_ESCDELAY 19391 -#define GetEscdelay(sp) (sp)->_ESCDELAY 19392 +#define GetEscdelay(sp) *_nc_ptr_Escdelay(sp) 18125 19393 +NCURSES_EXPORT(int *) 18126 19394 +_nc_ptr_Escdelay(SCREEN *sp) … … 18132 19400 { 18133 19401 - return SP ? GetEscdelay(SP) : 1000; 18134 + return * _nc_ptr_Escdelay(CURRENT_SCREEN);19402 + return *(_nc_ptr_Escdelay(CURRENT_SCREEN)); 18135 19403 } 18136 19404 #else … … 18152 19420 - SP->_ESCDELAY = value; 18153 19421 + if (SP_PARM) { 18154 + S P_PARM->_ESCDELAY = value;19422 + SET_ESCDELAY(value); 18155 19423 } else { 18156 19424 code = ERR; … … 18167 19435 +set_escdelay(int value) 18168 19436 +{ 18169 + return NCURSES_SP_NAME(set_escdelay) (CURRENT_SCREEN, value); 19437 + int code; 19438 +#if USE_REENTRANT 19439 + code = NCURSES_SP_NAME(set_escdelay) (CURRENT_SCREEN, value); 19440 +#else 19441 + ESCDELAY = value; 19442 + code = OK; 19443 +#endif 19444 + return code; 19445 +} 19446 +#endif 19447 +#endif /* NCURSES_EXT_FUNCS */ 19448 + 19449 +#if NCURSES_EXT_FUNCS 19450 +NCURSES_EXPORT(int) 19451 +NCURSES_SP_NAME(get_escdelay) (NCURSES_SP_DCL0) 19452 +{ 19453 +#if !USE_REENTRANT 19454 + (void) SP_PARM; 19455 +#endif 19456 + return GetEscdelay(SP_PARM); 19457 +} 19458 + 19459 +#if NCURSES_SP_FUNCS 19460 +NCURSES_EXPORT(int) 19461 +get_escdelay (void) 19462 +{ 19463 + return NCURSES_SP_NAME(get_escdelay)(CURRENT_SCREEN); 18170 19464 +} 18171 19465 #endif … … 18174 19468 static int 18175 19469 _nc_use_meta(WINDOW *win) 18176 @@ -84,9 + 99,9 @@19470 @@ -84,9 +125,9 @@ 18177 19471 } 18178 19472 … … 18186 19480 18187 19481 /* 18188 @@ -109,7 +124,7 @@ 19482 @@ -100,16 +141,28 @@ 19483 #if USE_SYSMOUSE 19484 if ((sp->_mouse_type == M_SYSMOUSE) 19485 && (sp->_sysmouse_head < sp->_sysmouse_tail)) { 19486 - return 2; 19487 + return TW_MOUSE; 19488 } 19489 #endif 19490 - rc = _nc_timed_wait(sp, TWAIT_MASK, delay, (int *) 0 EVENTLIST_2nd(evl)); 19491 +#ifdef USE_TERM_DRIVER 19492 + rc = TCBOf(sp)->drv->twait(TCBOf(sp), 19493 + TWAIT_MASK, 19494 + delay, 19495 + (int *) 0 19496 + EVENTLIST_2nd(evl)); 19497 +#else 19498 + rc = _nc_timed_wait(sp, 19499 + TWAIT_MASK, 19500 + delay, 19501 + (int *) 0 19502 + EVENTLIST_2nd(evl)); 19503 +#endif 19504 #if USE_SYSMOUSE 19505 if ((sp->_mouse_type == M_SYSMOUSE) 18189 19506 && (sp->_sysmouse_head < sp->_sysmouse_tail) 18190 19507 && (rc == 0) … … 18195 19512 #endif 18196 19513 return rc; 18197 @@ -173,9 + 188,9 @@19514 @@ -173,9 +226,9 @@ 18198 19515 } else 18199 19516 mask = 0; … … 18207 19524 } 18208 19525 #elif USE_GPM_SUPPORT || USE_EMX_MOUSE || USE_SYSMOUSE 18209 @@ -185,7 +2 00,7 @@19526 @@ -185,7 +238,7 @@ 18210 19527 #endif 18211 19528 … … 18216 19533 ch = KEY_MOUSE; 18217 19534 n = 1; 18218 @@ -260,12 +275,12 @@ 19535 @@ -205,9 +258,15 @@ 19536 } else 19537 #endif 19538 { /* Can block... */ 19539 +#ifdef USE_TERM_DRIVER 19540 + int buf; 19541 + n = CallDriver_1(sp, read, &buf); 19542 + ch = buf; 19543 +#else 19544 unsigned char c2 = 0; 19545 n = read(sp->_ifd, &c2, 1); 19546 ch = c2; 19547 +#endif 19548 } 19549 19550 #ifdef HIDE_EINTR 19551 @@ -260,12 +319,12 @@ 18219 19552 { 18220 19553 #ifdef USE_PTHREADS … … 18231 19564 recur_wrefresh(win); 18232 19565 _nc_set_screen(save_SP); 18233 @@ -286,12 +3 01,12 @@19566 @@ -286,12 +345,12 @@ 18234 19567 18235 19568 if (sp != 0) { … … 18246 19579 rc = recur_wgetnstr(win, buf); 18247 19580 _nc_set_screen(save_SP); 18248 @@ -362,9 + 377,9 @@19581 @@ -362,9 +421,9 @@ 18249 19582 #ifdef NCURSES_WGETCH_EVENTS 18250 19583 if (rc != KEY_EVENT) … … 18258 19591 #ifdef NCURSES_WGETCH_EVENTS 18259 19592 /* Return it first */ 18260 @@ -402,7 +4 17,7 @@19593 @@ -402,7 +461,7 @@ 18261 19594 rc = check_mouse_activity(sp, delay EVENTLIST_2nd(evl)); 18262 19595 … … 18267 19600 returnCode(KEY_CODE_YES); 18268 19601 } 18269 @@ -427,7 +4 42,7 @@19602 @@ -427,7 +486,7 @@ 18270 19603 * increase the wait with mouseinterval(). 18271 19604 */ … … 18276 19609 do { 18277 19610 ch = kgetch(sp EVENTLIST_2nd(evl)); 18278 @@ -442,11 + 457,11 @@19611 @@ -442,11 +501,11 @@ 18279 19612 (ch == KEY_MOUSE 18280 19613 && (((rc = check_mouse_activity(sp, sp->_maxclick … … 18291 19624 } 18292 19625 #endif 18293 @@ -454,12 + 469,12 @@19626 @@ -454,12 +513,12 @@ 18294 19627 #ifdef NCURSES_WGETCH_EVENTS 18295 19628 /* mouse event sequence ended by an event, report event */ … … 18306 19639 } 18307 19640 } 18308 @@ -645,7 + 660,7 @@19641 @@ -645,7 +704,7 @@ 18309 19642 TR(TRACE_IEVENT, ("waiting for rest of sequence")); 18310 19643 rc = check_mouse_activity(sp, timeleft EVENTLIST_2nd(evl)); … … 18317 19650 diff -Naur ncurses-5.7.orig/ncurses/base/lib_getstr.c ncurses-5.7/ncurses/base/lib_getstr.c 18318 19651 --- ncurses-5.7.orig/ncurses/base/lib_getstr.c 2008-08-16 12:20:04.000000000 -0700 18319 +++ ncurses-5.7/ncurses/base/lib_getstr.c 2009-0 6-05 14:01:51.000000000 -070019652 +++ ncurses-5.7/ncurses/base/lib_getstr.c 2009-07-19 15:03:59.000000000 -0700 18320 19653 @@ -1,5 +1,5 @@ 18321 19654 /**************************************************************************** … … 18383 19716 diff -Naur ncurses-5.7.orig/ncurses/base/lib_initscr.c ncurses-5.7/ncurses/base/lib_initscr.c 18384 19717 --- ncurses-5.7.orig/ncurses/base/lib_initscr.c 2008-08-16 14:20:48.000000000 -0700 18385 +++ ncurses-5.7/ncurses/base/lib_initscr.c 2009-0 6-05 14:01:33.000000000 -070019718 +++ ncurses-5.7/ncurses/base/lib_initscr.c 2009-07-19 15:03:51.000000000 -0700 18386 19719 @@ -1,5 +1,5 @@ 18387 19720 /**************************************************************************** … … 18414 19747 diff -Naur ncurses-5.7.orig/ncurses/base/lib_insch.c ncurses-5.7/ncurses/base/lib_insch.c 18415 19748 --- ncurses-5.7.orig/ncurses/base/lib_insch.c 2008-02-02 16:14:37.000000000 -0800 18416 +++ ncurses-5.7/ncurses/base/lib_insch.c 2009-0 6-05 14:01:55.000000000 -070019749 +++ ncurses-5.7/ncurses/base/lib_insch.c 2009-07-19 15:04:04.000000000 -0700 18417 19750 @@ -1,5 +1,5 @@ 18418 19751 /**************************************************************************** … … 18516 19849 diff -Naur ncurses-5.7.orig/ncurses/base/lib_insnstr.c ncurses-5.7/ncurses/base/lib_insnstr.c 18517 19850 --- ncurses-5.7.orig/ncurses/base/lib_insnstr.c 2004-02-28 15:44:56.000000000 -0800 18518 +++ ncurses-5.7/ncurses/base/lib_insnstr.c 2009-0 6-05 14:01:55.000000000 -070019851 +++ ncurses-5.7/ncurses/base/lib_insnstr.c 2009-07-19 15:04:04.000000000 -0700 18519 19852 @@ -1,5 +1,5 @@ 18520 19853 /**************************************************************************** … … 18549 19882 diff -Naur ncurses-5.7.orig/ncurses/base/lib_isendwin.c ncurses-5.7/ncurses/base/lib_isendwin.c 18550 19883 --- ncurses-5.7.orig/ncurses/base/lib_isendwin.c 2000-12-09 18:43:27.000000000 -0800 18551 +++ ncurses-5.7/ncurses/base/lib_isendwin.c 2009-0 6-05 14:01:14.000000000 -070019884 +++ ncurses-5.7/ncurses/base/lib_isendwin.c 2009-07-19 15:02:20.000000000 -0700 18552 19885 @@ -1,5 +1,5 @@ 18553 19886 /**************************************************************************** … … 18593 19926 diff -Naur ncurses-5.7.orig/ncurses/base/lib_mouse.c ncurses-5.7/ncurses/base/lib_mouse.c 18594 19927 --- ncurses-5.7.orig/ncurses/base/lib_mouse.c 2008-10-18 14:48:55.000000000 -0700 18595 +++ ncurses-5.7/ncurses/base/lib_mouse.c 2009-0 6-05 14:01:51.000000000 -070019928 +++ ncurses-5.7/ncurses/base/lib_mouse.c 2009-07-19 15:04:13.000000000 -0700 18596 19929 @@ -1,5 +1,5 @@ 18597 19930 /**************************************************************************** … … 18601 19934 * Permission is hereby granted, free of charge, to any person obtaining a * 18602 19935 * copy of this software and associated documentation files (the * 18603 @@ -79,9 +79,12 @@ 19936 @@ -30,6 +30,7 @@ 19937 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 19938 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 19939 * and: Thomas E. Dickey 1996-on * 19940 + * and: Juergen Pfeifer 2008 * 19941 ****************************************************************************/ 19942 19943 /* 19944 @@ -79,9 +80,12 @@ 18604 19945 18605 19946 #include <curses.priv.h> … … 18607 19948 -MODULE_ID("$Id: lib_mouse.c,v 1.102 2008/10/18 21:48:55 tom Exp $") 18608 19949 +#ifndef CUR 18609 +#define CUR SP_TERMTYPE 19950 +#define CUR SP_TERMTYPE 18610 19951 +#endif 18611 19952 + 18612 +MODULE_ID("$Id: lib_mouse.c,v 1.10 7 2009/05/10 00:48:29tom Exp $")19953 +MODULE_ID("$Id: lib_mouse.c,v 1.108 2009/07/04 19:51:08 tom Exp $") 18613 19954 18614 19955 -#include <term.h> … … 18616 19957 18617 19958 #if USE_GPM_SUPPORT 18618 @@ -150,7 +15 3,7 @@19959 @@ -150,7 +154,7 @@ 18619 19960 #define LIBGPM_SONAME "libgpm.so" 18620 19961 #endif 18621 19962 18622 19963 -#define GET_DLSYM(name) (my_##name = (TYPE_##name) dlsym(SP->_dlopen_gpm, #name)) 18623 +#define GET_DLSYM(name) (my_##name = (TYPE_##name) dlsym( SP_PARM->_dlopen_gpm, #name))19964 +#define GET_DLSYM(name) (my_##name = (TYPE_##name) dlsym(sp->_dlopen_gpm, #name)) 18624 19965 18625 19966 #endif /* USE_GPM_SUPPORT */ 18626 19967 18627 @@ -164,13 +16 7,13 @@19968 @@ -164,13 +168,13 @@ 18628 19969 #define LastEV(sp) ((sp)->_mouse_events + EV_MAX - 1) 18629 19970 … … 18643 19984 18644 19985 #define IndexEV(sp, ep) (ep - FirstEV(sp)) 18645 @@ -340, 7 +343,7@@19986 @@ -340,10 +344,13 @@ 18646 19987 static void 18647 19988 handle_sysmouse(int sig GCC_UNUSED) … … 18652 19993 #endif /* USE_SYSMOUSE */ 18653 19994 18654 @@ -359,7 +362,9 @@ 19995 +#ifndef USE_TERM_DRIVER 19996 +#define xterm_kmous "\033[M" 19997 + 19998 static void 19999 init_xterm_mouse(SCREEN *sp) 20000 { 20001 @@ -352,6 +359,7 @@ 20002 if (!VALID_STRING(sp->_mouse_xtermcap)) 20003 sp->_mouse_xtermcap = "\033[?1000%?%p1%{1}%=%th%el%;"; 20004 } 20005 +#endif 20006 20007 static void 20008 enable_xterm_mouse(SCREEN *sp, int enable) 20009 @@ -359,7 +367,9 @@ 18655 20010 #if USE_EMX_MOUSE 18656 20011 sp->_emxmouse_activated = enable; … … 18663 20018 sp->_mouse_active = enable; 18664 20019 } 18665 @@ -398,7 +40 3,7 @@20020 @@ -398,7 +408,7 @@ 18666 20021 static void 18667 20022 unload_gpm_library(SCREEN *sp) … … 18672 20027 sp->_mouse_gpm_loaded = FALSE; 18673 20028 sp->_mouse_fd = -1; 18674 @@ -694,11 +699,16 @@ 20029 @@ -478,8 +488,6 @@ 20030 } 20031 #endif /* USE_GPM_SUPPORT */ 20032 20033 -#define xterm_kmous "\033[M" 20034 - 20035 static void 20036 initialize_mousetype(SCREEN *sp) 20037 { 20038 @@ -514,7 +522,7 @@ 20039 /* OS/2 VIO */ 20040 #if USE_EMX_MOUSE 20041 if (!sp->_emxmouse_thread 20042 - && strstr(cur_term->type.term_names, "xterm") == 0 20043 + && strstr(TerminalOf(sp)->type.term_names, "xterm") == 0 20044 && key_mouse) { 20045 int handles[2]; 20046 20047 @@ -621,16 +629,21 @@ 20048 } 20049 #endif /* USE_SYSMOUSE */ 20050 20051 +#ifdef USE_TERM_DRIVER 20052 + CallDriver(sp, initmouse); 20053 +#else 20054 /* we know how to recognize mouse events under "xterm" */ 20055 if (key_mouse != 0) { 20056 if (!strcmp(key_mouse, xterm_kmous) 20057 - || strstr(cur_term->type.term_names, "xterm") != 0) { 20058 + || strstr(TerminalOf(sp)->type.term_names, "xterm") != 0) { 20059 init_xterm_mouse(sp); 20060 } 20061 - } else if (strstr(cur_term->type.term_names, "xterm") != 0) { 20062 + } else if (strstr(TerminalOf(sp)->type.term_names, "xterm") != 0) { 20063 if (_nc_add_to_try(&(sp->_keytry), xterm_kmous, KEY_MOUSE) == OK) 20064 init_xterm_mouse(sp); 20065 } 20066 +#endif 20067 + 20068 returnVoid; 20069 } 20070 20071 @@ -694,11 +707,16 @@ 18675 20072 18676 20073 #if USE_GPM_SUPPORT … … 18691 20088 eventp->id = NORMAL_EVENT; 18692 20089 18693 @@ -731,6 +74 1,7 @@20090 @@ -731,6 +749,7 @@ 18694 20091 /* bump the next-free pointer into the circular list */ 18695 20092 sp->_mouse_eventp = eventp = NEXT(eventp); … … 18699 20096 } 18700 20097 break; 18701 @@ -937,7 +9 48,7 @@20098 @@ -937,7 +956,7 @@ 18702 20099 switch (sp->_mouse_type) { 18703 20100 case M_XTERM: … … 18708 20105 TPUTS_TRACE("xterm mouse initialization"); 18709 20106 enable_xterm_mouse(sp, 1); 18710 @@ -989,7 +100 0,7 @@20107 @@ -989,7 +1008,7 @@ 18711 20108 return; 18712 20109 } … … 18717 20114 18718 20115 /************************************************************************** 18719 @@ -1264,13 +12 75,13 @@20116 @@ -1264,13 +1283,13 @@ 18720 20117 * 18721 20118 **************************************************************************/ … … 18736 20133 MEVENT *prev = PREV(eventp); 18737 20134 18738 @@ -1278,8 +12 89,8 @@20135 @@ -1278,8 +1297,8 @@ 18739 20136 *aevent = *prev; 18740 20137 … … 18747 20144 prev->id = INVALID_EVENT; /* so the queue slot becomes free */ 18748 20145 returnCode(OK); 18749 @@ -1287,57 +1 298,61 @@20146 @@ -1287,57 +1306,61 @@ 18750 20147 returnCode(ERR); 18751 20148 } … … 18825 20222 (REPORT_MOUSE_POSITION 18826 20223 | BUTTON_ALT 18827 @@ -1349,15 +13 64,23 @@20224 @@ -1349,15 +1372,23 @@ 18828 20225 | BUTTON_DOUBLE_CLICKED 18829 20226 | BUTTON_TRIPLE_CLICKED); … … 18851 20248 wenclose(const WINDOW *win, int y, int x) 18852 20249 /* check to see if given window encloses given screen location */ 18853 @@ -1377,17 +140 0,17 @@20250 @@ -1377,17 +1408,17 @@ 18854 20251 } 18855 20252 … … 18874 20271 oldval = DEFAULT_MAXCLICK; 18875 20272 } 18876 @@ -1395,1 5 +1418,37@@20273 @@ -1395,14 +1426,36 @@ 18877 20274 returnCode(oldval); 18878 20275 } … … 18892 20289 +NCURSES_EXPORT(bool) 18893 20290 +_nc_has_mouse(SCREEN *sp) 20291 +{ 20292 + return (((0 == sp) || (sp->_mouse_type == M_NONE)) ? FALSE : TRUE); 20293 +} 20294 + 20295 +NCURSES_EXPORT(bool) 20296 +NCURSES_SP_NAME(has_mouse) (NCURSES_SP_DCL0) 18894 20297 { 18895 20298 - return (SP->_mouse_type == M_NONE ? 0 : 1); 18896 + return (((0 == sp) || (sp->_mouse_type == M_NONE)) ? FALSE : TRUE);20299 + return _nc_has_mouse(SP_PARM); 18897 20300 } 18898 20301 18899 NCURSES_EXPORT(bool)18900 +NCURSES_SP_NAME(has_mouse) (NCURSES_SP_DCL0)18901 +{18902 + return _nc_has_mouse(SP_PARM);18903 +}18904 +18905 20302 +#if NCURSES_SP_FUNCS 18906 20303 +NCURSES_EXPORT(bool) … … 18911 20308 +#endif 18912 20309 + 18913 +NCURSES_EXPORT(bool)20310 NCURSES_EXPORT(bool) 18914 20311 wmouse_trafo(const WINDOW *win, int *pY, int *pX, bool to_screen) 18915 20312 { 18916 bool result = FALSE;18917 20313 diff -Naur ncurses-5.7.orig/ncurses/base/lib_mvwin.c ncurses-5.7/ncurses/base/lib_mvwin.c 18918 20314 --- ncurses-5.7.orig/ncurses/base/lib_mvwin.c 2006-02-25 14:53:46.000000000 -0800 18919 +++ ncurses-5.7/ncurses/base/lib_mvwin.c 2009-0 6-05 14:01:44.000000000 -070020315 +++ ncurses-5.7/ncurses/base/lib_mvwin.c 2009-07-19 15:04:06.000000000 -0700 18920 20316 @@ -1,5 +1,5 @@ 18921 20317 /**************************************************************************** … … 18925 20321 * Permission is hereby granted, free of charge, to any person obtaining a * 18926 20322 * copy of this software and associated documentation files (the * 18927 @@ -40,7 +40,7 @@ 20323 @@ -29,6 +29,8 @@ 20324 /**************************************************************************** 20325 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 20326 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 20327 + * and: Thomas E. Dickey 1996-on * 20328 + * and: Juergen Pfeifer * 20329 ****************************************************************************/ 20330 20331 /* 20332 @@ -40,11 +42,15 @@ 18928 20333 18929 20334 #include <curses.priv.h> 18930 20335 18931 20336 -MODULE_ID("$Id: lib_mvwin.c,v 1.14 2006/02/25 22:53:46 tom Exp $") 18932 +MODULE_ID("$Id: lib_mvwin.c,v 1.1 5 2009/04/18 18:25:37 tom Exp $")20337 +MODULE_ID("$Id: lib_mvwin.c,v 1.16 2009/06/06 20:25:07 tom Exp $") 18933 20338 18934 20339 NCURSES_EXPORT(int) 18935 20340 mvwin(WINDOW *win, int by, int bx) 18936 @@ -96,8 +96,8 @@ 20341 { 20342 +#if NCURSES_SP_FUNCS 20343 + SCREEN *sp = _nc_screen_of(win); 20344 +#endif 20345 + 20346 T((T_CALLED("mvwin(%p,%d,%d)"), win, by, bx)); 20347 20348 if (!win || (win->_flags & _ISPAD)) 20349 @@ -96,8 +102,8 @@ 18937 20350 } 18938 20351 #endif … … 18940 20353 - if (by + win->_maxy > screen_lines - 1 18941 20354 - || bx + win->_maxx > screen_columns - 1 18942 + if (by + win->_maxy > screen_lines( CURRENT_SCREEN) - 118943 + || bx + win->_maxx > screen_columns( CURRENT_SCREEN) - 120355 + if (by + win->_maxy > screen_lines(SP_PARM) - 1 20356 + || bx + win->_maxx > screen_columns(SP_PARM) - 1 18944 20357 || by < 0 18945 20358 || bx < 0) … … 18947 20360 diff -Naur ncurses-5.7.orig/ncurses/base/lib_newterm.c ncurses-5.7/ncurses/base/lib_newterm.c 18948 20361 --- ncurses-5.7.orig/ncurses/base/lib_newterm.c 2008-08-16 14:20:48.000000000 -0700 18949 +++ ncurses-5.7/ncurses/base/lib_newterm.c 2009-0 6-05 14:01:51.000000000 -070020362 +++ ncurses-5.7/ncurses/base/lib_newterm.c 2009-07-19 15:03:59.000000000 -0700 18950 20363 @@ -1,5 +1,5 @@ 18951 20364 /**************************************************************************** … … 19067 20480 diff -Naur ncurses-5.7.orig/ncurses/base/lib_newwin.c ncurses-5.7/ncurses/base/lib_newwin.c 19068 20481 --- ncurses-5.7.orig/ncurses/base/lib_newwin.c 2008-06-07 06:58:09.000000000 -0700 19069 +++ ncurses-5.7/ncurses/base/lib_newwin.c 2009-0 6-05 14:01:51.000000000 -070020482 +++ ncurses-5.7/ncurses/base/lib_newwin.c 2009-07-19 15:04:06.000000000 -0700 19070 20483 @@ -1,5 +1,5 @@ 19071 20484 /**************************************************************************** … … 19088 20501 19089 20502 -MODULE_ID("$Id: lib_newwin.c,v 1.52 2008/06/07 13:58:09 tom Exp $") 19090 +MODULE_ID("$Id: lib_newwin.c,v 1.5 7 2009/05/09 23:40:03tom Exp $")20503 +MODULE_ID("$Id: lib_newwin.c,v 1.58 2009/06/06 17:53:11 tom Exp $") 19091 20504 19092 20505 #define window_is(name) ((sp)->_##name == win) … … 19241 20654 T((T_CREATE("window %p"), win)); 19242 20655 19243 @@ -320, 6 +347,16@@20656 @@ -320,19 +347,37 @@ 19244 20657 returnWin(win); 19245 20658 } … … 19258 20671 * wgetch() and other functions with a WINDOW* parameter may use a SCREEN* 19259 20672 * internally, and it is useful to allow those to be invoked without switching 19260 @@ -336,3 +373,23 @@ 19261 } 19262 return (sp); 19263 } 19264 + 20673 * SCREEN's, e.g., for multi-threaded applications. 20674 */ 20675 -NCURSES_EXPORT(SCREEN *) 20676 -_nc_screen_of(WINDOW *win) 19265 20677 +#if NCURSES_SP_FUNCS 19266 20678 +NCURSES_EXPORT(WINDOW *) 19267 20679 +_nc_curscr_of(SCREEN *sp) 19268 +{ 20680 { 20681 - SCREEN *sp = 0; 19269 20682 + return sp == 0 ? 0 : sp->_curscr; 19270 20683 +} 19271 + 20684 20685 - if (win != 0) { 20686 - WINDOWLIST *wp = (WINDOWLIST *) win; 20687 - sp = wp->screen; 20688 - } 20689 - return (sp); 19272 20690 +NCURSES_EXPORT(WINDOW *) 19273 20691 +_nc_newscr_of(SCREEN *sp) … … 19280 20698 +{ 19281 20699 + return sp == 0 ? 0 : sp->_stdscr; 19282 +}20700 } 19283 20701 +#endif 19284 20702 diff -Naur ncurses-5.7.orig/ncurses/base/lib_nl.c ncurses-5.7/ncurses/base/lib_nl.c 19285 20703 --- ncurses-5.7.orig/ncurses/base/lib_nl.c 2000-12-09 18:43:27.000000000 -0800 19286 +++ ncurses-5.7/ncurses/base/lib_nl.c 2009-0 6-05 14:01:16.000000000 -070020704 +++ ncurses-5.7/ncurses/base/lib_nl.c 2009-07-19 15:04:13.000000000 -0700 19287 20705 @@ -1,5 +1,5 @@ 19288 20706 /**************************************************************************** … … 19306 20724 19307 20725 -MODULE_ID("$Id: lib_nl.c,v 1.8 2000/12/10 02:43:27 tom Exp $") 19308 +MODULE_ID("$Id: lib_nl.c,v 1.1 0 2009/02/21 20:58:21tom Exp $")20726 +MODULE_ID("$Id: lib_nl.c,v 1.11 2009/07/04 00:25:53 tom Exp $") 19309 20727 19310 20728 #ifdef __EMX__ … … 19326 20744 #ifdef __EMX__ 19327 20745 _nc_flush(); 19328 _fsetmode(NC_OUTPUT, "t"); 20746 - _fsetmode(NC_OUTPUT, "t"); 20747 + _fsetmode(NC_OUTPUT(SP_PARM), "t"); 19329 20748 #endif 19330 20749 - … … 19353 20772 #ifdef __EMX__ 19354 20773 _nc_flush(); 19355 _fsetmode(NC_OUTPUT, "b"); 20774 - _fsetmode(NC_OUTPUT, "b"); 20775 + _fsetmode(NC_OUTPUT(SP_PARM), "b"); 19356 20776 #endif 19357 20777 - … … 19368 20788 diff -Naur ncurses-5.7.orig/ncurses/base/lib_pad.c ncurses-5.7/ncurses/base/lib_pad.c 19369 20789 --- ncurses-5.7.orig/ncurses/base/lib_pad.c 2006-10-14 13:47:13.000000000 -0700 19370 +++ ncurses-5.7/ncurses/base/lib_pad.c 2009-0 6-05 14:01:44.000000000 -070020790 +++ ncurses-5.7/ncurses/base/lib_pad.c 2009-07-19 15:04:13.000000000 -0700 19371 20791 @@ -1,5 +1,5 @@ 19372 20792 /**************************************************************************** … … 19385 20805 19386 20806 /* 19387 @@ -40, 10 +42,10@@20807 @@ -40,21 +42,22 @@ 19388 20808 19389 20809 #include <curses.priv.h> 19390 20810 19391 20811 -MODULE_ID("$Id: lib_pad.c,v 1.41 2006/10/14 20:47:13 tom Exp $") 19392 +MODULE_ID("$Id: lib_pad.c,v 1.4 3 2009/04/18 18:25:37tom Exp $")20812 +MODULE_ID("$Id: lib_pad.c,v 1.44 2009/07/04 19:45:20 tom Exp $") 19393 20813 19394 20814 NCURSES_EXPORT(WINDOW *) … … 19398 20818 WINDOW *win; 19399 20819 NCURSES_CH_T *ptr; 19400 @@ -70,6 +72,14 @@ 20820 int i; 20821 20822 - T((T_CALLED("newpad(%d, %d)"), l, c)); 20823 + T((T_CALLED("newpad(%p,%d, %d)"), SP_PARM, l, c)); 20824 20825 if (l <= 0 || c <= 0) 20826 returnWin(0); 20827 20828 - if ((win = _nc_makenew(l, c, 0, 0, _ISPAD)) == NULL) 20829 + win = NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_ARGx l, c, 0, 0, _ISPAD); 20830 + if (win == NULL) 20831 returnWin(0); 20832 20833 for (i = 0; i < l; i++) { 20834 @@ -70,6 +73,14 @@ 19401 20835 returnWin(win); 19402 20836 } … … 19413 20847 subpad(WINDOW *orig, int l, int c, int begy, int begx) 19414 20848 { 19415 @@ -162,8 +172,8 @@ 20849 @@ -94,10 +105,14 @@ 20850 int smaxrow, 20851 int smaxcol) 20852 { 20853 +#if NCURSES_SP_FUNCS 20854 + SCREEN *sp = _nc_screen_of(win); 20855 +#endif 20856 + 20857 T((T_CALLED("prefresh()"))); 20858 if (pnoutrefresh(win, pminrow, pmincol, sminrow, smincol, smaxrow, 20859 smaxcol) != ERR 20860 - && doupdate() != ERR) { 20861 + && NCURSES_SP_NAME(doupdate) (NCURSES_SP_ARG) != ERR) { 20862 returnCode(OK); 20863 } 20864 returnCode(ERR); 20865 @@ -116,6 +131,7 @@ 20866 NCURSES_SIZE_T m, n; 20867 NCURSES_SIZE_T pmaxrow; 20868 NCURSES_SIZE_T pmaxcol; 20869 + SCREEN *sp; 20870 20871 #if USE_SCROLL_HINTS 20872 const int my_len = 2; /* parameterize the threshold for hardscroll */ 20873 @@ -132,6 +148,8 @@ 20874 if (!(win->_flags & _ISPAD)) 20875 returnCode(ERR); 20876 20877 + sp = _nc_screen_of(win); 20878 + 20879 /* negative values are interpreted as zero */ 20880 if (pminrow < 0) 20881 pminrow = 0; 20882 @@ -162,8 +180,8 @@ 19416 20883 pmaxcol = pmincol + smaxcol - smincol; 19417 20884 } … … 19419 20886 - if (smaxrow >= screen_lines 19420 20887 - || smaxcol >= screen_columns 19421 + if (smaxrow >= screen_lines( CURRENT_SCREEN)19422 + || smaxcol >= screen_columns( CURRENT_SCREEN)20888 + if (smaxrow >= screen_lines(sp) 20889 + || smaxcol >= screen_columns(sp) 19423 20890 || sminrow > smaxrow 19424 20891 || smincol > smaxcol) 19425 20892 returnCode(ERR); 20893 @@ -194,13 +212,13 @@ 20894 * merely change the costs of various update cases. 20895 */ 20896 #if USE_SCROLL_HINTS 20897 - wide = (smincol < my_len && smaxcol > (newscr->_maxx - my_len)); 20898 + wide = (smincol < my_len && smaxcol > (NewScreen(sp)->_maxx - my_len)); 20899 #endif 20900 20901 for (i = pminrow, m = sminrow + win->_yoffset; 20902 - i <= pmaxrow && m <= newscr->_maxy; 20903 + i <= pmaxrow && m <= NewScreen(sp)->_maxy; 20904 i++, m++) { 20905 - register struct ldat *nline = &newscr->_line[m]; 20906 + register struct ldat *nline = &NewScreen(sp)->_line[m]; 20907 register struct ldat *oline = &win->_line[i]; 20908 for (j = pmincol, n = smincol; j <= pmaxcol; j++, n++) { 20909 NCURSES_CH_T ch = oline->text[j]; 20910 @@ -229,9 +247,9 @@ 20911 || nind > smaxrow) { 20912 nind = _NEWINDEX; 20913 } else if (displaced) { 20914 - register struct ldat *pline = &curscr->_line[nind]; 20915 + register struct ldat *pline = &CurScreen(sp)->_line[nind]; 20916 for (j = 0; j <= my_len; j++) { 20917 - int k = newscr->_maxx - j; 20918 + int k = NewScreen(sp)->_maxx - j; 20919 if (pline->text[j] != nline->text[j] 20920 || pline->text[k] != nline->text[k]) { 20921 nind = _NEWINDEX; 20922 @@ -266,7 +284,7 @@ 20923 20924 if (win->_clear) { 20925 win->_clear = FALSE; 20926 - newscr->_clear = TRUE; 20927 + NewScreen(sp)->_clear = TRUE; 20928 } 20929 20930 /* 20931 @@ -278,10 +296,10 @@ 20932 && win->_curx >= pmincol 20933 && win->_cury <= pmaxrow 20934 && win->_curx <= pmaxcol) { 20935 - newscr->_cury = win->_cury - pminrow + win->_begy + win->_yoffset; 20936 - newscr->_curx = win->_curx - pmincol + win->_begx; 20937 + NewScreen(sp)->_cury = win->_cury - pminrow + win->_begy + win->_yoffset; 20938 + NewScreen(sp)->_curx = win->_curx - pmincol + win->_begx; 20939 } 20940 - newscr->_leaveok = win->_leaveok; 20941 + NewScreen(sp)->_leaveok = win->_leaveok; 20942 win->_flags &= ~_HASMOVED; 20943 20944 /* 19426 20945 diff -Naur ncurses-5.7.orig/ncurses/base/lib_printw.c ncurses-5.7/ncurses/base/lib_printw.c 19427 20946 --- ncurses-5.7.orig/ncurses/base/lib_printw.c 2006-12-17 11:21:39.000000000 -0800 19428 +++ ncurses-5.7/ncurses/base/lib_printw.c 2009-0 6-05 14:01:44.000000000 -070020947 +++ ncurses-5.7/ncurses/base/lib_printw.c 2009-07-19 15:03:53.000000000 -0700 19429 20948 @@ -1,5 +1,5 @@ 19430 20949 /**************************************************************************** … … 19461 20980 diff -Naur ncurses-5.7.orig/ncurses/base/lib_redrawln.c ncurses-5.7/ncurses/base/lib_redrawln.c 19462 20981 --- ncurses-5.7.orig/ncurses/base/lib_redrawln.c 2007-10-13 13:08:56.000000000 -0700 19463 +++ ncurses-5.7/ncurses/base/lib_redrawln.c 2009-0 6-05 14:01:44.000000000 -070020982 +++ ncurses-5.7/ncurses/base/lib_redrawln.c 2009-07-19 15:03:53.000000000 -0700 19464 20983 @@ -1,5 +1,5 @@ 19465 20984 /**************************************************************************** … … 19527 21046 19528 21047 returnCode(OK); 21048 diff -Naur ncurses-5.7.orig/ncurses/base/lib_refresh.c ncurses-5.7/ncurses/base/lib_refresh.c 21049 --- ncurses-5.7.orig/ncurses/base/lib_refresh.c 2007-09-29 13:39:34.000000000 -0700 21050 +++ ncurses-5.7/ncurses/base/lib_refresh.c 2009-07-19 15:04:06.000000000 -0700 21051 @@ -1,5 +1,5 @@ 21052 /**************************************************************************** 21053 - * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. * 21054 + * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. * 21055 * * 21056 * Permission is hereby granted, free of charge, to any person obtaining a * 21057 * copy of this software and associated documentation files (the * 21058 @@ -30,6 +30,7 @@ 21059 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 21060 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 21061 * and: Thomas E. Dickey 1996-on * 21062 + * and: Juergen Pfeifer * 21063 ****************************************************************************/ 21064 21065 /* 21066 @@ -41,24 +42,27 @@ 21067 21068 #include <curses.priv.h> 21069 21070 -MODULE_ID("$Id: lib_refresh.c,v 1.41 2007/09/29 20:39:34 tom Exp $") 21071 +MODULE_ID("$Id: lib_refresh.c,v 1.42 2009/06/06 20:27:39 tom Exp $") 21072 21073 NCURSES_EXPORT(int) 21074 wrefresh(WINDOW *win) 21075 { 21076 int code; 21077 +#if NCURSES_SP_FUNCS 21078 + SCREEN *SP_PARM = _nc_screen_of(win); 21079 +#endif 21080 21081 T((T_CALLED("wrefresh(%p)"), win)); 21082 21083 if (win == 0) { 21084 code = ERR; 21085 - } else if (win == curscr) { 21086 - curscr->_clear = TRUE; 21087 - code = doupdate(); 21088 + } else if (win == CurScreen(SP_PARM)) { 21089 + CurScreen(SP_PARM)->_clear = TRUE; 21090 + code = NCURSES_SP_NAME(doupdate) (NCURSES_SP_ARG); 21091 } else if ((code = wnoutrefresh(win)) == OK) { 21092 if (win->_clear) 21093 - newscr->_clear = TRUE; 21094 - code = doupdate(); 21095 + NewScreen(SP_PARM)->_clear = TRUE; 21096 + code = NCURSES_SP_NAME(doupdate) (NCURSES_SP_ARG); 21097 /* 21098 * Reset the clearok() flag in case it was set for the special 21099 * case in hardscroll.c (if we don't reset it here, we'll get 2 21100 @@ -81,6 +85,9 @@ 21101 #if USE_SCROLL_HINTS 21102 bool wide; 21103 #endif 21104 +#if NCURSES_SP_FUNCS 21105 + SCREEN *SP_PARM = _nc_screen_of(win); 21106 +#endif 21107 21108 T((T_CALLED("wnoutrefresh(%p)"), win)); 21109 #ifdef TRACE 21110 @@ -101,8 +108,8 @@ 21111 begx = win->_begx; 21112 begy = win->_begy; 21113 21114 - newscr->_nc_bkgd = win->_nc_bkgd; 21115 - WINDOW_ATTRS(newscr) = WINDOW_ATTRS(win); 21116 + NewScreen(SP_PARM)->_nc_bkgd = win->_nc_bkgd; 21117 + WINDOW_ATTRS(NewScreen(SP_PARM)) = WINDOW_ATTRS(win); 21118 21119 /* merge in change information from all subwindows of this window */ 21120 wsyncdown(win); 21121 @@ -122,7 +129,7 @@ 21122 * windows). Note that changing this formula will not break any code, 21123 * merely change the costs of various update cases. 21124 */ 21125 - wide = (begx <= 1 && win->_maxx >= (newscr->_maxx - 1)); 21126 + wide = (begx <= 1 && win->_maxx >= (NewScreen(SP_PARM)->_maxx - 1)); 21127 #endif 21128 21129 win->_flags &= ~_HASMOVED; 21130 @@ -137,13 +144,13 @@ 21131 /* limit(dst_col) */ 21132 limit_x = win->_maxx; 21133 /* limit(src_col) */ 21134 - if (limit_x > newscr->_maxx - begx) 21135 - limit_x = newscr->_maxx - begx; 21136 + if (limit_x > NewScreen(SP_PARM)->_maxx - begx) 21137 + limit_x = NewScreen(SP_PARM)->_maxx - begx; 21138 21139 for (src_row = 0, dst_row = begy + win->_yoffset; 21140 - src_row <= win->_maxy && dst_row <= newscr->_maxy; 21141 + src_row <= win->_maxy && dst_row <= NewScreen(SP_PARM)->_maxy; 21142 src_row++, dst_row++) { 21143 - register struct ldat *nline = &newscr->_line[dst_row]; 21144 + register struct ldat *nline = &(NewScreen(SP_PARM)->_line[dst_row]); 21145 register struct ldat *oline = &win->_line[src_row]; 21146 21147 if (oline->firstchar != _NOCHANGE) { 21148 @@ -225,7 +232,8 @@ 21149 * this character. Find the end of the character. 21150 */ 21151 ++j; 21152 - while (j <= newscr->_maxx && isWidecExt(nline->text[j])) { 21153 + while (j <= NewScreen(SP_PARM)->_maxx && 21154 + isWidecExt(nline->text[j])) { 21155 fix_right = j++; 21156 } 21157 } 21158 @@ -269,18 +277,18 @@ 21159 21160 if (win->_clear) { 21161 win->_clear = FALSE; 21162 - newscr->_clear = TRUE; 21163 + NewScreen(SP_PARM)->_clear = TRUE; 21164 } 21165 21166 if (!win->_leaveok) { 21167 - newscr->_cury = win->_cury + win->_begy + win->_yoffset; 21168 - newscr->_curx = win->_curx + win->_begx; 21169 + NewScreen(SP_PARM)->_cury = win->_cury + win->_begy + win->_yoffset; 21170 + NewScreen(SP_PARM)->_curx = win->_curx + win->_begx; 21171 } 21172 - newscr->_leaveok = win->_leaveok; 21173 + NewScreen(SP_PARM)->_leaveok = win->_leaveok; 21174 21175 #ifdef TRACE 21176 if (USE_TRACEF(TRACE_UPDATE)) { 21177 - _tracedump("newscr", newscr); 21178 + _tracedump("newscr", NewScreen(SP_PARM)); 21179 _nc_unlock_global(tracef); 21180 } 21181 #endif /* TRACE */ 19529 21182 diff -Naur ncurses-5.7.orig/ncurses/base/lib_restart.c ncurses-5.7/ncurses/base/lib_restart.c 19530 21183 --- ncurses-5.7.orig/ncurses/base/lib_restart.c 2008-06-21 10:31:22.000000000 -0700 19531 +++ ncurses-5.7/ncurses/base/lib_restart.c 2009-0 6-05 14:01:49.000000000 -070021184 +++ ncurses-5.7/ncurses/base/lib_restart.c 2009-07-19 15:03:58.000000000 -0700 19532 21185 @@ -1,5 +1,5 @@ 19533 21186 /**************************************************************************** … … 19639 21292 diff -Naur ncurses-5.7.orig/ncurses/base/lib_screen.c ncurses-5.7/ncurses/base/lib_screen.c 19640 21293 --- ncurses-5.7.orig/ncurses/base/lib_screen.c 2008-08-16 12:05:37.000000000 -0700 19641 +++ ncurses-5.7/ncurses/base/lib_screen.c 2009-0 6-05 14:01:51.000000000 -070021294 +++ ncurses-5.7/ncurses/base/lib_screen.c 2009-07-19 15:04:06.000000000 -0700 19642 21295 @@ -1,5 +1,5 @@ 19643 21296 /**************************************************************************** … … 19647 21300 * Permission is hereby granted, free of charge, to any person obtaining a * 19648 21301 * copy of this software and associated documentation files (the * 19649 @@ -30,1 1 +30,16@@21302 @@ -30,16 +30,21 @@ 19650 21303 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 19651 21304 * and: Eric S. Raymond <esr@snark.thyrsus.com> * … … 19658 21311 -MODULE_ID("$Id: lib_screen.c,v 1.31 2008/08/16 19:05:37 tom Exp $") 19659 21312 +#ifndef CUR 19660 +#define CUR SP_TERMTYPE 21313 +#define CUR SP_TERMTYPE 19661 21314 +#endif 19662 21315 + 19663 +MODULE_ID("$Id: lib_screen.c,v 1.3 4 2009/05/10 00:48:29tom Exp $")21316 +MODULE_ID("$Id: lib_screen.c,v 1.35 2009/06/06 20:26:17 tom Exp $") 19664 21317 19665 21318 #define MAX_SIZE 0x3fff /* 16k is big enough for a window or pad */ 19666 21319 19667 @@ -141,7 +146,7 @@ 21320 NCURSES_EXPORT(WINDOW *) 21321 -getwin(FILE *filep) 21322 +NCURSES_SP_NAME(getwin) (NCURSES_SP_DCLx FILE *filep) 21323 { 21324 WINDOW tmp, *nwin; 21325 int n; 21326 @@ -56,9 +61,12 @@ 21327 returnWin(0); 21328 21329 if (tmp._flags & _ISPAD) { 21330 - nwin = newpad(tmp._maxy + 1, tmp._maxx + 1); 21331 + nwin = NCURSES_SP_NAME(newpad) (NCURSES_SP_ARGx 21332 + tmp._maxy + 1, tmp._maxx + 1); 21333 } else { 21334 - nwin = newwin(tmp._maxy + 1, tmp._maxx + 1, 0, 0); 21335 + nwin = NCURSES_SP_NAME(newwin) (NCURSES_SP_ARGx 21336 + tmp._maxy + 1, 21337 + tmp._maxx + 1, 0, 0); 21338 } 21339 21340 /* 21341 @@ -112,6 +120,14 @@ 21342 returnWin(nwin); 21343 } 21344 21345 +#if NCURSES_SP_FUNCS 21346 +NCURSES_EXPORT(WINDOW *) 21347 +getwin(FILE *filep) 21348 +{ 21349 + return NCURSES_SP_NAME(getwin) (CURRENT_SCREEN, filep); 21350 +} 21351 +#endif 21352 + 21353 NCURSES_EXPORT(int) 21354 putwin(WINDOW *win, FILE *filep) 21355 { 21356 @@ -141,26 +157,34 @@ 19668 21357 } 19669 21358 … … 19674 21363 FILE *fp = 0; 19675 21364 19676 @@ -152,15 +157,23 @@ 21365 - T((T_CALLED("scr_restore(%s)"), _nc_visbuf(file))); 21366 + T((T_CALLED("scr_restore(%p,%s)"), SP_PARM, _nc_visbuf(file))); 21367 21368 if (_nc_access(file, R_OK) < 0 21369 || (fp = fopen(file, "rb")) == 0) { 19677 21370 returnCode(ERR); 19678 21371 } else { 19679 21372 - delwin(newscr); 19680 21373 - SP->_newscr = getwin(fp); 19681 + SP_PARM->_newscr = getwin(fp); 21374 + delwin(NewScreen(SP_PARM)); 21375 + NewScreen(SP_PARM) = getwin(fp); 19682 21376 #if !USE_REENTRANT 19683 21377 - newscr = SP->_newscr; 19684 + newscr = SP_PARM->_newscr;21378 + newscr = NewScreen(SP_PARM); 19685 21379 #endif 19686 21380 (void) fclose(fp); … … 19700 21394 scr_dump(const char *file) 19701 21395 { 19702 @@ -179, 7 +192,7@@21396 @@ -179,42 +203,63 @@ 19703 21397 } 19704 21398 … … 19708 21402 { 19709 21403 FILE *fp = 0; 19710 19711 @@ -193,17 +206,25 @@ 19712 returnCode(ERR); 19713 } else { 19714 delwin(curscr); 21404 + int code = ERR; 21405 21406 - T((T_CALLED("scr_init(%s)"), _nc_visbuf(file))); 21407 + T((T_CALLED("scr_init(%p,%s)"), SP_PARM, _nc_visbuf(file))); 21408 21409 - if (exit_ca_mode && non_rev_rmcup) 21410 - returnCode(ERR); 21411 - 21412 - if (_nc_access(file, R_OK) < 0 21413 - || (fp = fopen(file, "rb")) == 0) { 21414 - returnCode(ERR); 21415 - } else { 21416 - delwin(curscr); 19715 21417 - SP->_curscr = getwin(fp); 19716 + SP_PARM->_curscr = getwin(fp); 21418 + if (SP_PARM != 0 && 21419 +#ifdef USE_TERM_DRIVER 21420 + InfoOf(SP_PARM).caninit 21421 +#else 21422 + !(exit_ca_mode && non_rev_rmcup) 21423 +#endif 21424 + ) { 21425 + if (_nc_access(file, R_OK) >= 0 21426 + && (fp = fopen(file, "rb")) != 0) { 21427 + delwin(CurScreen(SP_PARM)); 21428 + CurScreen(SP_PARM) = getwin(fp); 19717 21429 #if !USE_REENTRANT 19718 21430 - curscr = SP->_curscr; 19719 + curscr = SP_PARM->_curscr;21431 + curscr = CurScreen(SP_PARM); 19720 21432 #endif 19721 (void) fclose(fp); 19722 returnCode(OK); 21433 - (void) fclose(fp); 21434 - returnCode(OK); 21435 + (void) fclose(fp); 21436 + code = OK; 21437 + } 19723 21438 } 21439 + returnCode(code); 19724 21440 } 19725 21441 … … 19728 21444 -scr_set(const char *file) 19729 21445 +scr_init(const char *file) 19730 +{ 21446 { 21447 - T((T_CALLED("scr_set(%s)"), _nc_visbuf(file))); 19731 21448 + return NCURSES_SP_NAME(scr_init) (CURRENT_SCREEN, file); 19732 21449 +} 19733 21450 +#endif 19734 + 21451 21452 - if (scr_init(file) == ERR) { 19735 21453 +NCURSES_EXPORT(int) 19736 21454 +NCURSES_SP_NAME(scr_set) (NCURSES_SP_DCLx const char *file) 19737 19738 T((T_CALLED("scr_set(%s)"), _nc_visbuf(file)));19739 19740 @@ -211,10 +232,18 @@ 21455 +{ 21456 + T((T_CALLED("scr_set(%p,%s)"), SP_PARM, _nc_visbuf(file))); 21457 + 21458 + if (NCURSES_SP_NAME(scr_init) (NCURSES_SP_ARGx file) == ERR) { 19741 21459 returnCode(ERR); 19742 21460 } else { 19743 21461 - delwin(newscr); 19744 21462 - SP->_newscr = dupwin(curscr); 19745 + SP_PARM->_newscr = dupwin(curscr); 21463 + delwin(NewScreen(SP_PARM)); 21464 + NewScreen(SP_PARM) = dupwin(curscr); 19746 21465 #if !USE_REENTRANT 19747 21466 - newscr = SP->_newscr; 19748 + newscr = SP_PARM->_newscr;21467 + newscr = NewScreen(SP_PARM); 19749 21468 #endif 19750 21469 returnCode(OK); … … 19761 21480 diff -Naur ncurses-5.7.orig/ncurses/base/lib_set_term.c ncurses-5.7/ncurses/base/lib_set_term.c 19762 21481 --- ncurses-5.7.orig/ncurses/base/lib_set_term.c 2008-08-04 11:11:12.000000000 -0700 19763 +++ ncurses-5.7/ncurses/base/lib_set_term.c 2009-0 6-05 14:01:51.000000000 -070021482 +++ ncurses-5.7/ncurses/base/lib_set_term.c 2009-07-19 15:04:11.000000000 -0700 19764 21483 @@ -1,5 +1,5 @@ 19765 21484 /**************************************************************************** … … 19783 21502 -MODULE_ID("$Id: lib_set_term.c,v 1.117 2008/08/04 18:11:12 tom Exp $") 19784 21503 +#ifndef CUR 19785 +#define CUR SP_TERMTYPE 21504 +#define CUR SP_TERMTYPE 19786 21505 +#endif 19787 21506 + 19788 +MODULE_ID("$Id: lib_set_term.c,v 1.12 2 2009/05/10 00:48:29tom Exp $")21507 +MODULE_ID("$Id: lib_set_term.c,v 1.124 2009/06/27 21:36:14 tom Exp $") 19789 21508 19790 21509 NCURSES_EXPORT(SCREEN *) … … 19800 21519 int bottom_stolen = 0; 19801 21520 bool support_cookies = USE_XMC_SUPPORT; 19802 @@ -555,8 +563,8 @@ 21521 @@ -272,6 +280,9 @@ 21522 } 21523 21524 T(("created SP %p", SP)); 21525 +#if NCURSES_SP_FUNCS 21526 + sp = SP; /* fixup so SET_LINES and SET_COLS works */ 21527 +#endif 21528 SP->_next_screen = _nc_screen_chain; 21529 _nc_screen_chain = SP; 21530 21531 @@ -546,7 +557,7 @@ 21532 curscr = SP->_curscr; 21533 #endif 21534 #if USE_SIZECHANGE 21535 - SP->_resize = resizeterm; 21536 + SP->_resize = NCURSES_SP_NAME(resizeterm); 21537 #endif 21538 21539 newscr->_clear = TRUE; 21540 @@ -555,8 +566,8 @@ 19803 21541 def_shell_mode(); 19804 21542 def_prog_mode(); … … 19811 21549 19812 21550 /* If we must simulate soft labels, grab off the line to be used. 19813 @@ -595,7 +60 3,7 @@21551 @@ -595,7 +606,7 @@ 19814 21552 } 19815 21553 } … … 19820 21558 T(("creating stdscr")); 19821 21559 assert((SP->_lines_avail + SP->_topstolen + bottom_stolen) == slines); 19822 @@ -615,27 +62 3,39 @@21560 @@ -615,27 +626,39 @@ 19823 21561 * off from the top or bottom. 19824 21562 */ … … 19868 21606 START_TRACE(); 19869 21607 T((T_CALLED("ripoffline(%d,%p)"), line, init)); 19870 @@ -643,5 +66 3,15 @@21608 @@ -643,5 +666,15 @@ 19871 21609 if (line == 0) 19872 21610 returnCode(OK); … … 19876 21614 + (line < 0) ? -1 : 1, 19877 21615 + init)); 19878 +}21616 } 19879 21617 + 19880 21618 +#if NCURSES_SP_FUNCS … … 19883 21621 +{ 19884 21622 + return NCURSES_SP_NAME(ripoffline) (CURRENT_SCREEN, line, init); 19885 21623 +} 19886 21624 +#endif 19887 21625 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatrof.c ncurses-5.7/ncurses/base/lib_slkatrof.c 19888 21626 --- ncurses-5.7.orig/ncurses/base/lib_slkatrof.c 2005-01-08 15:01:32.000000000 -0800 19889 +++ ncurses-5.7/ncurses/base/lib_slkatrof.c 2009-0 6-05 14:01:16.000000000 -070021627 +++ ncurses-5.7/ncurses/base/lib_slkatrof.c 2009-07-19 15:02:22.000000000 -0700 19890 21628 @@ -1,5 +1,5 @@ 19891 21629 /**************************************************************************** … … 19935 21673 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatron.c ncurses-5.7/ncurses/base/lib_slkatron.c 19936 21674 --- ncurses-5.7.orig/ncurses/base/lib_slkatron.c 2005-01-08 15:02:01.000000000 -0800 19937 +++ ncurses-5.7/ncurses/base/lib_slkatron.c 2009-0 6-05 14:01:16.000000000 -070021675 +++ ncurses-5.7/ncurses/base/lib_slkatron.c 2009-07-19 15:02:22.000000000 -0700 19938 21676 @@ -1,5 +1,5 @@ 19939 21677 /**************************************************************************** … … 19983 21721 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatr_set.c ncurses-5.7/ncurses/base/lib_slkatr_set.c 19984 21722 --- ncurses-5.7.orig/ncurses/base/lib_slkatr_set.c 2005-01-28 13:11:53.000000000 -0800 19985 +++ ncurses-5.7/ncurses/base/lib_slkatr_set.c 2009-0 6-05 14:01:16.000000000 -070021723 +++ ncurses-5.7/ncurses/base/lib_slkatr_set.c 2009-07-19 15:02:22.000000000 -0700 19986 21724 @@ -1,5 +1,5 @@ 19987 21725 /**************************************************************************** … … 20054 21792 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatrset.c ncurses-5.7/ncurses/base/lib_slkatrset.c 20055 21793 --- ncurses-5.7.orig/ncurses/base/lib_slkatrset.c 2005-01-08 13:46:47.000000000 -0800 20056 +++ ncurses-5.7/ncurses/base/lib_slkatrset.c 2009-0 6-05 14:01:16.000000000 -070021794 +++ ncurses-5.7/ncurses/base/lib_slkatrset.c 2009-07-19 15:02:22.000000000 -0700 20057 21795 @@ -1,5 +1,5 @@ 20058 21796 /**************************************************************************** … … 20094 21832 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkattr.c ncurses-5.7/ncurses/base/lib_slkattr.c 20095 21833 --- ncurses-5.7.orig/ncurses/base/lib_slkattr.c 2005-01-08 13:44:28.000000000 -0800 20096 +++ ncurses-5.7/ncurses/base/lib_slkattr.c 2009-0 6-05 14:01:16.000000000 -070021834 +++ ncurses-5.7/ncurses/base/lib_slkattr.c 2009-07-19 15:02:22.000000000 -0700 20097 21835 @@ -1,5 +1,5 @@ 20098 21836 /**************************************************************************** … … 20138 21876 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slk.c ncurses-5.7/ncurses/base/lib_slk.c 20139 21877 --- ncurses-5.7.orig/ncurses/base/lib_slk.c 2008-09-27 07:07:33.000000000 -0700 20140 +++ ncurses-5.7/ncurses/base/lib_slk.c 2009-0 6-05 14:01:51.000000000 -070021878 +++ ncurses-5.7/ncurses/base/lib_slk.c 2009-07-19 15:04:17.000000000 -0700 20141 21879 @@ -1,5 +1,5 @@ 20142 21880 /**************************************************************************** … … 20146 21884 * Permission is hereby granted, free of charge, to any person obtaining a * 20147 21885 * copy of this software and associated documentation files (the * 20148 @@ -45,7 +45,11 @@ 21886 @@ -41,26 +41,81 @@ 21887 */ 21888 21889 #include <curses.priv.h> 21890 - 20149 21891 #include <ctype.h> 20150 21892 -#include <term.h> /* num_labels, label_*, plab_norm */ 20151 21893 20152 21894 -MODULE_ID("$Id: lib_slk.c,v 1.35 2008/09/27 14:07:33 juergen Exp $") 20153 21895 +#ifndef CUR 20154 +#define CUR SP_TERMTYPE 21896 +#define CUR SP_TERMTYPE 20155 21897 +#endif 20156 21898 + 20157 +MODULE_ID("$Id: lib_slk.c,v 1. 38 2009/05/10 00:48:29tom Exp $")21899 +MODULE_ID("$Id: lib_slk.c,v 1.40 2009/07/19 00:34:07 tom Exp $") 20158 21900 20159 21901 /* 20160 21902 * Free any memory related to soft labels, return an error. 20161 @@ -68,6 +72,9 @@ 21903 */ 21904 static int 21905 -slk_failed(void) 21906 +slk_failed(NCURSES_SP_DCL0) 21907 { 21908 - if (SP->_slk) { 21909 - FreeIfNeeded(SP->_slk->ent); 21910 - free(SP->_slk); 21911 - SP->_slk = (SLK *) 0; 21912 + if ((0 != SP_PARM) && SP_PARM->_slk) { 21913 + FreeIfNeeded(SP_PARM->_slk->ent); 21914 + free(SP_PARM->_slk); 21915 + SP_PARM->_slk = (SLK *) 0; 21916 } 21917 return ERR; 21918 } 21919 21920 +NCURSES_EXPORT(int) 21921 +_nc_format_slks(NCURSES_SP_DCLx int cols) 21922 +{ 21923 + int gap, i, x; 21924 + unsigned max_length; 21925 + 21926 + if (!SP_PARM || !SP_PARM->_slk) 21927 + return ERR; 21928 + 21929 + max_length = SP_PARM->_slk->maxlen; 21930 + if (SP_PARM->slk_format >= 3) { /* PC style */ 21931 + gap = (cols - 3 * (3 + 4 * max_length)) / 2; 21932 + 21933 + if (gap < 1) 21934 + gap = 1; 21935 + 21936 + for (i = x = 0; i < SP_PARM->_slk->maxlab; i++) { 21937 + SP_PARM->_slk->ent[i].ent_x = x; 21938 + x += max_length; 21939 + x += (i == 3 || i == 7) ? gap : 1; 21940 + } 21941 + } else { 21942 + if (SP_PARM->slk_format == 2) { /* 4-4 */ 21943 + gap = cols - (SP_PARM->_slk->maxlab * max_length) - 6; 21944 + 21945 + if (gap < 1) 21946 + gap = 1; 21947 + for (i = x = 0; i < SP_PARM->_slk->maxlab; i++) { 21948 + SP_PARM->_slk->ent[i].ent_x = x; 21949 + x += max_length; 21950 + x += (i == 3) ? gap : 1; 21951 + } 21952 + } else { 21953 + if (SP_PARM->slk_format == 1) { /* 1 -> 3-2-3 */ 21954 + gap = (cols - (SP_PARM->_slk->maxlab * max_length) - 5) 21955 + / 2; 21956 + 21957 + if (gap < 1) 21958 + gap = 1; 21959 + for (i = x = 0; i < SP_PARM->_slk->maxlab; i++) { 21960 + SP_PARM->_slk->ent[i].ent_x = x; 21961 + x += max_length; 21962 + x += (i == 2 || i == 4) ? gap : 1; 21963 + } 21964 + } else 21965 + returnCode(slk_failed(NCURSES_SP_ARG)); 21966 + } 21967 + } 21968 + SP_PARM->_slk->dirty = TRUE; 21969 + 21970 + return OK; 21971 +} 21972 + 21973 /* 21974 * Initialize soft labels. 21975 * Called from newterm() 21976 @@ -68,108 +123,91 @@ 20162 21977 NCURSES_EXPORT(int) 20163 21978 _nc_slk_initialize(WINDOW *stwin, int cols) 20164 21979 { 20165 +#if NCURSES_SP_FUNCS 20166 + SCREEN *sp = CURRENT_SCREEN; 20167 +#endif 20168 int i, x; 21980 - int i, x; 21981 + int i; 20169 21982 int res = OK; 20170 21983 unsigned max_length; 20171 @@ -178,14 +185,22 @@ 21984 + SCREEN *sp; 21985 + TERMINAL *term; 21986 + int numlab; 21987 21988 T((T_CALLED("_nc_slk_initialize()"))); 21989 21990 - if (SP->_slk) { /* we did this already, so simply return */ 21991 + assert(stwin); 21992 + 21993 + sp = _nc_screen_of(stwin); 21994 + if (0 == sp) 21995 + returnCode(ERR); 21996 + 21997 + term = TerminalOf(SP_PARM); 21998 + assert(term); 21999 + 22000 + numlab = InfoOf(SP_PARM).numlabels; 22001 + 22002 + if (SP_PARM->_slk) { /* we did this already, so simply return */ 22003 returnCode(OK); 22004 - } else if ((SP->_slk = typeCalloc(SLK, 1)) == 0) 22005 + } else if ((SP_PARM->_slk = typeCalloc(SLK, 1)) == 0) 22006 returnCode(ERR); 22007 22008 - SP->_slk->ent = NULL; 22009 + SP_PARM->_slk->hidden = TRUE; 22010 + SP_PARM->_slk->ent = NULL; 22011 + if (!SP_PARM->slk_format) 22012 + SP_PARM->slk_format = _nc_globals.slk_format; 22013 22014 /* 22015 * If we use colors, vidputs() will suppress video attributes that conflict 22016 * with colors. In that case, we're still guaranteed that "reverse" would 22017 * work. 22018 */ 22019 - if ((no_color_video & 1) == 0) 22020 - SetAttr(SP->_slk->attr, A_STANDOUT); 22021 + if ((InfoOf(SP_PARM).nocolorvideo & 1) == 0) 22022 + SetAttr(SP_PARM->_slk->attr, A_STANDOUT); 22023 else 22024 - SetAttr(SP->_slk->attr, A_REVERSE); 22025 + SetAttr(SP_PARM->_slk->attr, A_REVERSE); 22026 22027 - SP->_slk->maxlab = ((num_labels > 0) 22028 - ? num_labels 22029 - : MAX_SKEY(_nc_globals.slk_format)); 22030 - SP->_slk->maxlen = ((num_labels > 0) 22031 - ? label_width * label_height 22032 - : MAX_SKEY_LEN(_nc_globals.slk_format)); 22033 - SP->_slk->labcnt = ((SP->_slk->maxlab < MAX_SKEY(_nc_globals.slk_format)) 22034 - ? MAX_SKEY(_nc_globals.slk_format) 22035 - : SP->_slk->maxlab); 22036 - 22037 - if (SP->_slk->maxlen <= 0 22038 - || SP->_slk->labcnt <= 0 22039 - || (SP->_slk->ent = typeCalloc(slk_ent, 22040 - (unsigned) SP->_slk->labcnt)) == NULL) 22041 - returnCode(slk_failed()); 22042 + SP_PARM->_slk->maxlab = ((numlab > 0) 22043 + ? numlab 22044 + : MAX_SKEY(SP_PARM->slk_format)); 22045 + SP_PARM->_slk->maxlen = ((numlab > 0) 22046 + ? InfoOf(SP_PARM).labelwidth * InfoOf(SP_PARM).labelheight 22047 + : MAX_SKEY_LEN(SP_PARM->slk_format)); 22048 + SP_PARM->_slk->labcnt = ((SP_PARM->_slk->maxlab < MAX_SKEY(SP_PARM->slk_format)) 22049 + ? MAX_SKEY(SP_PARM->slk_format) 22050 + : SP_PARM->_slk->maxlab); 22051 + 22052 + if (SP_PARM->_slk->maxlen <= 0 22053 + || SP_PARM->_slk->labcnt <= 0 22054 + || (SP_PARM->_slk->ent = typeCalloc(slk_ent, 22055 + (unsigned) SP_PARM->_slk->labcnt)) 22056 + == NULL) 22057 + returnCode(slk_failed(NCURSES_SP_ARG)); 22058 22059 - max_length = SP->_slk->maxlen; 22060 - for (i = 0; i < SP->_slk->labcnt; i++) { 22061 + max_length = SP_PARM->_slk->maxlen; 22062 + for (i = 0; i < SP_PARM->_slk->labcnt; i++) { 22063 size_t used = max_length + 1; 22064 22065 - if ((SP->_slk->ent[i].ent_text = (char *) _nc_doalloc(0, used)) == 0) 22066 - returnCode(slk_failed()); 22067 - memset(SP->_slk->ent[i].ent_text, 0, used); 22068 - 22069 - if ((SP->_slk->ent[i].form_text = (char *) _nc_doalloc(0, used)) == 0) 22070 - returnCode(slk_failed()); 22071 - memset(SP->_slk->ent[i].form_text, 0, used); 22072 + SP_PARM->_slk->ent[i].ent_text = (char *) _nc_doalloc(0, used); 22073 + if (SP_PARM->_slk->ent[i].ent_text == 0) 22074 + returnCode(slk_failed(NCURSES_SP_ARG)); 22075 + memset(SP_PARM->_slk->ent[i].ent_text, 0, used); 22076 + 22077 + SP_PARM->_slk->ent[i].form_text = (char *) _nc_doalloc(0, used); 22078 + if (SP_PARM->_slk->ent[i].form_text == 0) 22079 + returnCode(slk_failed(NCURSES_SP_ARG)); 22080 + memset(SP_PARM->_slk->ent[i].form_text, 0, used); 22081 22082 - memset(SP->_slk->ent[i].form_text, ' ', max_length); 22083 - SP->_slk->ent[i].visible = (char) (i < SP->_slk->maxlab); 22084 + memset(SP_PARM->_slk->ent[i].form_text, ' ', max_length); 22085 + SP_PARM->_slk->ent[i].visible = (char) (i < SP_PARM->_slk->maxlab); 22086 } 22087 - if (_nc_globals.slk_format >= 3) { /* PC style */ 22088 - int gap = (cols - 3 * (3 + 4 * max_length)) / 2; 22089 22090 - if (gap < 1) 22091 - gap = 1; 22092 - 22093 - for (i = x = 0; i < SP->_slk->maxlab; i++) { 22094 - SP->_slk->ent[i].ent_x = x; 22095 - x += max_length; 22096 - x += (i == 3 || i == 7) ? gap : 1; 22097 - } 22098 - } else { 22099 - if (_nc_globals.slk_format == 2) { /* 4-4 */ 22100 - int gap = cols - (SP->_slk->maxlab * max_length) - 6; 22101 - 22102 - if (gap < 1) 22103 - gap = 1; 22104 - for (i = x = 0; i < SP->_slk->maxlab; i++) { 22105 - SP->_slk->ent[i].ent_x = x; 22106 - x += max_length; 22107 - x += (i == 3) ? gap : 1; 22108 - } 22109 - } else { 22110 - if (_nc_globals.slk_format == 1) { /* 1 -> 3-2-3 */ 22111 - int gap = (cols - (SP->_slk->maxlab * max_length) - 5) 22112 - / 2; 22113 + res = _nc_format_slks(NCURSES_SP_ARGx cols); 22114 22115 - if (gap < 1) 22116 - gap = 1; 22117 - for (i = x = 0; i < SP->_slk->maxlab; i++) { 22118 - SP->_slk->ent[i].ent_x = x; 22119 - x += max_length; 22120 - x += (i == 2 || i == 4) ? gap : 1; 22121 - } 22122 - } else 22123 - returnCode(slk_failed()); 22124 - } 22125 - } 22126 - SP->_slk->dirty = TRUE; 22127 - if ((SP->_slk->win = stwin) == NULL) { 22128 - returnCode(slk_failed()); 22129 + if ((SP_PARM->_slk->win = stwin) == NULL) { 22130 + returnCode(slk_failed(NCURSES_SP_ARG)); 22131 } 22132 22133 /* We now reset the format so that the next newterm has again 22134 * per default no SLK keys and may call slk_init again to 22135 * define a new layout. (juergen 03-Mar-1999) 22136 */ 22137 - SP->slk_format = _nc_globals.slk_format; 22138 _nc_globals.slk_format = 0; 22139 returnCode(res); 22140 } 22141 @@ -178,14 +216,24 @@ 20172 22142 * Restore the soft labels on the screen. 20173 22143 */ … … 20176 22146 +NCURSES_SP_NAME(slk_restore) (NCURSES_SP_DCL0) 20177 22147 { 20178 T((T_CALLED("slk_restore()"))); 22148 - T((T_CALLED("slk_restore()"))); 22149 + T((T_CALLED("slk_restore(%p)"), SP_PARM)); 22150 + 22151 + if (0 == SP_PARM) 22152 + returnCode(ERR); 22153 + if (SP_PARM->_slk == NULL) 22154 + returnCode(ERR); 22155 + SP_PARM->_slk->hidden = FALSE; 22156 + SP_PARM->_slk->dirty = TRUE; 20179 22157 20180 22158 - if (SP->_slk == NULL) 20181 + if (SP_PARM->_slk == NULL) 20182 return (ERR); 22159 - return (ERR); 20183 22160 - SP->_slk->hidden = FALSE; 20184 22161 - SP->_slk->dirty = TRUE; 20185 + SP_PARM->_slk->hidden = FALSE; 20186 + SP_PARM->_slk->dirty = TRUE; 20187 20188 returnCode(slk_refresh()); 20189 } 20190 + 22162 + returnCode(NCURSES_SP_NAME(slk_refresh) (NCURSES_SP_ARG)); 22163 +} 22164 22165 - returnCode(slk_refresh()); 20191 22166 +#if NCURSES_SP_FUNCS 20192 22167 +NCURSES_EXPORT(int) … … 20194 22169 +{ 20195 22170 + return NCURSES_SP_NAME(slk_restore) (CURRENT_SCREEN); 20196 +}22171 } 20197 22172 +#endif 20198 22173 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkclear.c ncurses-5.7/ncurses/base/lib_slkclear.c 20199 22174 --- ncurses-5.7.orig/ncurses/base/lib_slkclear.c 2007-12-29 09:51:47.000000000 -0800 20200 +++ ncurses-5.7/ncurses/base/lib_slkclear.c 2009-0 6-05 14:01:16.000000000 -070022175 +++ ncurses-5.7/ncurses/base/lib_slkclear.c 2009-07-19 15:02:22.000000000 -0700 20201 22176 @@ -1,5 +1,5 @@ 20202 22177 /**************************************************************************** … … 20254 22229 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkcolor.c ncurses-5.7/ncurses/base/lib_slkcolor.c 20255 22230 --- ncurses-5.7.orig/ncurses/base/lib_slkcolor.c 2005-01-28 13:11:53.000000000 -0800 20256 +++ ncurses-5.7/ncurses/base/lib_slkcolor.c 2009-0 6-05 14:01:16.000000000 -070022231 +++ ncurses-5.7/ncurses/base/lib_slkcolor.c 2009-07-19 15:02:22.000000000 -0700 20257 22232 @@ -1,5 +1,5 @@ 20258 22233 /**************************************************************************** … … 20318 22293 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkinit.c ncurses-5.7/ncurses/base/lib_slkinit.c 20319 22294 --- ncurses-5.7.orig/ncurses/base/lib_slkinit.c 2008-01-12 12:23:39.000000000 -0800 20320 +++ ncurses-5.7/ncurses/base/lib_slkinit.c 2009-0 6-05 14:01:54.000000000 -070022295 +++ ncurses-5.7/ncurses/base/lib_slkinit.c 2009-07-19 15:04:03.000000000 -0700 20321 22296 @@ -1,5 +1,5 @@ 20322 22297 /**************************************************************************** … … 20383 22358 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slklab.c ncurses-5.7/ncurses/base/lib_slklab.c 20384 22359 --- ncurses-5.7.orig/ncurses/base/lib_slklab.c 2003-03-29 14:53:48.000000000 -0800 20385 +++ ncurses-5.7/ncurses/base/lib_slklab.c 2009-0 6-05 14:01:16.000000000 -070022360 +++ ncurses-5.7/ncurses/base/lib_slklab.c 2009-07-19 15:02:22.000000000 -0700 20386 22361 @@ -1,5 +1,5 @@ 20387 22362 /**************************************************************************** … … 20430 22405 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkrefr.c ncurses-5.7/ncurses/base/lib_slkrefr.c 20431 22406 --- ncurses-5.7.orig/ncurses/base/lib_slkrefr.c 2008-09-27 07:07:53.000000000 -0700 20432 +++ ncurses-5.7/ncurses/base/lib_slkrefr.c 2009-0 6-05 14:01:51.000000000 -070022407 +++ ncurses-5.7/ncurses/base/lib_slkrefr.c 2009-07-19 15:04:06.000000000 -0700 20433 22408 @@ -1,5 +1,5 @@ 20434 22409 /**************************************************************************** … … 20438 22413 * Permission is hereby granted, free of charge, to any person obtaining a * 20439 22414 * copy of this software and associated documentation files (the * 20440 @@ -40,7 +40,11 @@ 22415 @@ -38,9 +38,12 @@ 22416 * Write SLK window to the (virtual) screen. 22417 */ 20441 22418 #include <curses.priv.h> 20442 22419 -#include <term.h> /* num_labels, label_*, plab_norm */ 20443 22420 20444 22421 -MODULE_ID("$Id: lib_slkrefr.c,v 1.17 2008/09/27 14:07:53 juergen Exp $") 20445 22422 +#ifndef CUR 20446 +#define CUR SP_TERMTYPE 22423 +#define CUR SP_TERMTYPE 20447 22424 +#endif 20448 22425 + 20449 +MODULE_ID("$Id: lib_slkrefr.c,v 1.2 0 2009/05/10 00:48:29tom Exp $")22426 +MODULE_ID("$Id: lib_slkrefr.c,v 1.21 2009/06/06 20:26:17 tom Exp $") 20450 22427 20451 22428 /* 20452 22429 * Paint the info line for the PC style SLK emulation. 20453 @@ -68,6 +72,9 @@ 22430 @@ -66,31 +69,47 @@ 22431 * Write the soft labels to the soft-key window. 22432 */ 20454 22433 static void 20455 slk_intern_refresh(SLK * slk) 22434 -slk_intern_refresh(SLK * slk) 22435 +slk_intern_refresh(SCREEN *sp) 20456 22436 { 20457 +#if NCURSES_SP_FUNCS 20458 + SCREEN *sp = CURRENT_SCREEN; 22437 int i; 22438 - int fmt = SP->slk_format; 22439 + int fmt; 22440 + SLK *slk; 22441 + int numlab; 22442 + 22443 + if (sp == 0) 22444 + return; 22445 + 22446 + slk = sp->_slk; 22447 + fmt = sp->slk_format; 22448 + numlab = InfoOf(sp).numlabels; 22449 + 22450 + if (slk->hidden) 22451 + return; 22452 22453 for (i = 0; i < slk->labcnt; i++) { 22454 if (slk->dirty || slk->ent[i].dirty) { 22455 if (slk->ent[i].visible) { 22456 - if (num_labels > 0 && SLK_STDFMT(fmt)) { 22457 + if (numlab > 0 && SLK_STDFMT(fmt)) { 22458 +#ifdef USE_TERM_DRIVER 22459 + CallDriver_2(sp, hwlabel, i + 1, slk->ent[i].form_text); 22460 +#else 22461 if (i < num_labels) { 22462 TPUTS_TRACE("plab_norm"); 22463 putp(TPARM_2(plab_norm, i + 1, slk->ent[i].form_text)); 22464 } 20459 22465 +#endif 20460 int i; 20461 int fmt = SP->slk_format; 20462 20463 @@ -113,32 +120,48 @@ 22466 } else { 22467 if (fmt == 4) 22468 slk_paint_info(slk->win); 22469 wmove(slk->win, SLK_LINES(fmt) - 1, slk->ent[i].ent_x); 22470 - if (SP->_slk) { 22471 - wattrset(slk->win, AttrOf(SP->_slk->attr)); 22472 + if (sp->_slk) { 22473 + wattrset(slk->win, AttrOf(sp->_slk->attr)); 22474 } 22475 waddstr(slk->win, slk->ent[i].form_text); 22476 /* if we simulate SLK's, it's looking much more 22477 natural to use the current ATTRIBUTE also 22478 for the label window */ 22479 - wattrset(slk->win, WINDOW_ATTRS(stdscr)); 22480 + wattrset(slk->win, WINDOW_ATTRS(StdScreen(sp))); 22481 } 22482 } 22483 slk->ent[i].dirty = FALSE; 22484 @@ -98,7 +117,10 @@ 22485 } 22486 slk->dirty = FALSE; 22487 22488 - if (num_labels > 0) { 22489 + if (numlab > 0) { 22490 +#ifdef USE_TERM_DRIVER 22491 + CallDriver_1(sp, hwlabelOnOff, slk->hidden ? FALSE : TRUE); 22492 +#else 22493 if (slk->hidden) { 22494 TPUTS_TRACE("label_off"); 22495 putp(label_off); 22496 @@ -106,6 +128,7 @@ 22497 TPUTS_TRACE("label_on"); 22498 putp(label_on); 22499 } 22500 +#endif 22501 } 22502 } 22503 22504 @@ -113,32 +136,48 @@ 20464 22505 * Refresh the soft labels. 20465 22506 */ … … 20468 22509 +NCURSES_SP_NAME(slk_noutrefresh) (NCURSES_SP_DCL0) 20469 22510 { 20470 T((T_CALLED("slk_noutrefresh()"))); 22511 - T((T_CALLED("slk_noutrefresh()"))); 22512 + T((T_CALLED("slk_noutrefresh(%p)"), SP_PARM)); 20471 22513 20472 22514 - if (SP == NULL || SP->_slk == NULL) 20473 + if (SP_PARM == NULL || SP_PARM->_slk == NULL)22515 + if (SP_PARM == 0 || SP_PARM->_slk == 0) 20474 22516 returnCode(ERR); 20475 22517 - if (SP->_slk->hidden) … … 20477 22519 returnCode(OK); 20478 22520 - slk_intern_refresh(SP->_slk); 20479 + slk_intern_refresh(SP_PARM->_slk); 20480 + 22521 + slk_intern_refresh(SP_PARM); 22522 22523 - returnCode(wnoutrefresh(SP->_slk->win)); 20481 22524 + returnCode(wnoutrefresh(SP_PARM->_slk->win)); 20482 22525 +} 20483 20484 - returnCode(wnoutrefresh(SP->_slk->win)); 22526 + 20485 22527 +#if NCURSES_SP_FUNCS 20486 22528 +NCURSES_EXPORT(int) … … 20498 22540 +NCURSES_SP_NAME(slk_refresh) (NCURSES_SP_DCL0) 20499 22541 { 20500 T((T_CALLED("slk_refresh()"))); 22542 - T((T_CALLED("slk_refresh()"))); 22543 + T((T_CALLED("slk_refresh(%p)"), SP_PARM)); 20501 22544 20502 22545 - if (SP == NULL || SP->_slk == NULL) 20503 + if (SP_PARM == NULL || SP_PARM->_slk == NULL)22546 + if (SP_PARM == 0 || SP_PARM->_slk == 0) 20504 22547 returnCode(ERR); 20505 22548 - if (SP->_slk->hidden) … … 20507 22550 returnCode(OK); 20508 22551 - slk_intern_refresh(SP->_slk); 20509 + slk_intern_refresh(SP_PARM ->_slk);22552 + slk_intern_refresh(SP_PARM); 20510 22553 + 20511 22554 + returnCode(wrefresh(SP_PARM->_slk->win)); … … 20522 22565 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkset.c ncurses-5.7/ncurses/base/lib_slkset.c 20523 22566 --- ncurses-5.7.orig/ncurses/base/lib_slkset.c 2007-10-13 13:08:46.000000000 -0700 20524 +++ ncurses-5.7/ncurses/base/lib_slkset.c 2009-0 6-05 14:01:16.000000000 -070022567 +++ ncurses-5.7/ncurses/base/lib_slkset.c 2009-07-19 15:02:22.000000000 -0700 20525 22568 @@ -1,5 +1,5 @@ 20526 22569 /**************************************************************************** … … 20583 22626 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slktouch.c ncurses-5.7/ncurses/base/lib_slktouch.c 20584 22627 --- ncurses-5.7.orig/ncurses/base/lib_slktouch.c 2000-12-09 18:43:27.000000000 -0800 20585 +++ ncurses-5.7/ncurses/base/lib_slktouch.c 2009-0 6-05 14:01:16.000000000 -070022628 +++ ncurses-5.7/ncurses/base/lib_slktouch.c 2009-07-19 15:02:22.000000000 -0700 20586 22629 @@ -1,5 +1,5 @@ 20587 22630 /**************************************************************************** … … 20634 22677 diff -Naur ncurses-5.7.orig/ncurses/base/lib_ungetch.c ncurses-5.7/ncurses/base/lib_ungetch.c 20635 22678 --- ncurses-5.7.orig/ncurses/base/lib_ungetch.c 2008-05-31 09:44:54.000000000 -0700 20636 +++ ncurses-5.7/ncurses/base/lib_ungetch.c 2009-0 6-05 14:01:44.000000000 -070022679 +++ ncurses-5.7/ncurses/base/lib_ungetch.c 2009-07-19 15:03:53.000000000 -0700 20637 22680 @@ -1,5 +1,5 @@ 20638 22681 /**************************************************************************** … … 20690 22733 diff -Naur ncurses-5.7.orig/ncurses/base/lib_winch.c ncurses-5.7/ncurses/base/lib_winch.c 20691 22734 --- ncurses-5.7.orig/ncurses/base/lib_winch.c 2001-06-02 16:42:08.000000000 -0700 20692 +++ ncurses-5.7/ncurses/base/lib_winch.c 2009-0 6-05 14:01:16.000000000 -070022735 +++ ncurses-5.7/ncurses/base/lib_winch.c 2009-07-19 15:02:22.000000000 -0700 20693 22736 @@ -39,16 +39,16 @@ 20694 22737 … … 20714 22757 diff -Naur ncurses-5.7.orig/ncurses/base/lib_window.c ncurses-5.7/ncurses/base/lib_window.c 20715 22758 --- ncurses-5.7.orig/ncurses/base/lib_window.c 2008-06-07 07:12:56.000000000 -0700 20716 +++ ncurses-5.7/ncurses/base/lib_window.c 2009-0 6-05 14:01:44.000000000 -070022759 +++ ncurses-5.7/ncurses/base/lib_window.c 2009-07-19 15:03:53.000000000 -0700 20717 22760 @@ -1,5 +1,5 @@ 20718 22761 /**************************************************************************** … … 20761 22804 diff -Naur ncurses-5.7.orig/ncurses/base/MKkeyname.awk ncurses-5.7/ncurses/base/MKkeyname.awk 20762 22805 --- ncurses-5.7.orig/ncurses/base/MKkeyname.awk 2008-07-12 11:40:00.000000000 -0700 20763 +++ ncurses-5.7/ncurses/base/MKkeyname.awk 2009-0 6-05 14:01:51.000000000 -070022806 +++ ncurses-5.7/ncurses/base/MKkeyname.awk 2009-07-19 15:03:59.000000000 -0700 20764 22807 @@ -1,6 +1,6 @@ 20765 22808 -# $Id: MKkeyname.awk,v 1.40 2008/07/12 18:40:00 tom Exp $ … … 20814 22857 diff -Naur ncurses-5.7.orig/ncurses/base/MKlib_gen.sh ncurses-5.7/ncurses/base/MKlib_gen.sh 20815 22858 --- ncurses-5.7.orig/ncurses/base/MKlib_gen.sh 2008-08-30 12:20:50.000000000 -0700 20816 +++ ncurses-5.7/ncurses/base/MKlib_gen.sh 2009-0 6-05 14:01:16.000000000 -070022859 +++ ncurses-5.7/ncurses/base/MKlib_gen.sh 2009-07-19 15:02:22.000000000 -0700 20817 22860 @@ -2,7 +2,7 @@ 20818 22861 # … … 20835 22878 diff -Naur ncurses-5.7.orig/ncurses/base/MKunctrl.awk ncurses-5.7/ncurses/base/MKunctrl.awk 20836 22879 --- ncurses-5.7.orig/ncurses/base/MKunctrl.awk 2008-10-04 14:40:24.000000000 -0700 20837 +++ ncurses-5.7/ncurses/base/MKunctrl.awk 2009-0 6-05 14:01:44.000000000 -070022880 +++ ncurses-5.7/ncurses/base/MKunctrl.awk 2009-07-19 15:04:13.000000000 -0700 20838 22881 @@ -1,6 +1,6 @@ 20839 22882 -# $Id: MKunctrl.awk,v 1.23 2008/10/04 21:40:24 tom Exp $ 20840 +# $Id: MKunctrl.awk,v 1.2 5 2009/04/18 23:43:49 tomExp $22883 +# $Id: MKunctrl.awk,v 1.26 2009/07/04 22:05:15 Clemens.Ladisch Exp $ 20841 22884 ############################################################################## 20842 22885 -# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. # … … 20845 22888 # Permission is hereby granted, free of charge, to any person obtaining a # 20846 22889 # copy of this software and associated documentation files (the "Software"), # 20847 @@ -46,9 +46,8 @@ 22890 @@ -36,19 +36,12 @@ 22891 print "#include <curses.priv.h>" 22892 print "#include <ctype.h>" 22893 print "" 22894 - print "#if USE_WIDEC_SUPPORT" 22895 - print "#if HAVE_WCTYPE_H" 22896 - print "#include <wctype.h>" 22897 - print "#endif" 22898 - print "#endif" 22899 - print "" 22900 print "#undef unctrl" 20848 22901 print "" 20849 22902 } … … 20856 22909 offset=0 20857 22910 if (bigstrings) { 20858 @@ -187,6 +186,6 @@ 22911 @@ -158,16 +151,6 @@ 22912 print "\t\t && (check < 160))" 22913 printf "\t\t\tresult = %s_c1[check - 128];\n", stringname; 22914 print "\t\telse" 22915 - print "#if USE_WIDEC_SUPPORT" 22916 - print "\t\tif ((check >= 160)" 22917 - print "\t\t && (check < 256)" 22918 - print "\t\t && ((sp != 0)" 22919 - print "\t\t && ((sp->_legacy_coding > 0)" 22920 - print "\t\t || (sp->_legacy_coding == 0" 22921 - print "\t\t && (isprint(check) || iswprint(check))))))" 22922 - printf "\t\t\tresult = %s_c1[check - 128];\n", stringname; 22923 - print "\t\telse" 22924 - print "#else" 22925 print "\t\tif ((check >= 160)" 22926 print "\t\t && (check < 256)" 22927 print "\t\t && ((sp != 0)" 22928 @@ -176,7 +159,6 @@ 22929 print "\t\t && isprint(check)))))" 22930 printf "\t\t\tresult = %s_c1[check - 128];\n", stringname; 22931 print "\t\telse" 22932 - print "#endif /* USE_WIDEC_SUPPORT */" 22933 print "#endif /* NCURSES_EXT_FUNCS */" 22934 printf "\t\t\tresult = %s_table[check];\n", stringname; 22935 print "\t} else {" 22936 @@ -187,6 +169,6 @@ 20859 22937 print "" 20860 22938 print "NCURSES_EXPORT(NCURSES_CONST char *) unctrl (chtype ch)" … … 20866 22944 diff -Naur ncurses-5.7.orig/ncurses/base/nc_panel.c ncurses-5.7/ncurses/base/nc_panel.c 20867 22945 --- ncurses-5.7.orig/ncurses/base/nc_panel.c 2000-12-09 18:43:28.000000000 -0800 20868 +++ ncurses-5.7/ncurses/base/nc_panel.c 2009-0 6-05 14:01:33.000000000 -070022946 +++ ncurses-5.7/ncurses/base/nc_panel.c 2009-07-19 15:03:51.000000000 -0700 20869 22947 @@ -1,5 +1,5 @@ 20870 22948 /**************************************************************************** … … 20901 22979 diff -Naur ncurses-5.7.orig/ncurses/base/resizeterm.c ncurses-5.7/ncurses/base/resizeterm.c 20902 22980 --- ncurses-5.7.orig/ncurses/base/resizeterm.c 2008-06-07 06:58:40.000000000 -0700 20903 +++ ncurses-5.7/ncurses/base/resizeterm.c 2009-0 6-05 14:01:51.000000000 -070022981 +++ ncurses-5.7/ncurses/base/resizeterm.c 2009-07-19 15:04:13.000000000 -0700 20904 22982 @@ -1,5 +1,5 @@ 20905 22983 /**************************************************************************** … … 20909 22987 * Permission is hereby granted, free of charge, to any person obtaining a * 20910 22988 * copy of this software and associated documentation files (the * 20911 @@ -41,7 +41,11 @@ 22989 @@ -28,6 +28,7 @@ 22990 22991 /**************************************************************************** 22992 * Author: Thomas E. Dickey * 22993 + * and: Juergen Pfeifer * 22994 ****************************************************************************/ 22995 22996 /* 22997 @@ -39,11 +40,12 @@ 22998 */ 22999 20912 23000 #include <curses.priv.h> 20913 23001 -#include <term.h> 20914 23002 20915 23003 -MODULE_ID("$Id: resizeterm.c,v 1.34 2008/06/07 13:58:40 tom Exp $") 20916 23004 +#ifndef CUR 20917 +#define CUR SP_TERMTYPE 23005 +#define CUR SP_TERMTYPE 20918 23006 +#endif 20919 + 20920 +MODULE_ID("$Id: resizeterm.c,v 1.39 2009/05/10 00:48:29 tom Exp $") 20921 20922 #define stolen_lines (screen_lines - SP->_lines_avail) 20923 20924 @@ -64,18 +68,23 @@ 23007 23008 -#define stolen_lines (screen_lines - SP->_lines_avail) 23009 +MODULE_ID("$Id: resizeterm.c,v 1.40 2009/07/04 18:38:49 tom Exp $") 23010 23011 /* 23012 * If we're trying to be reentrant, do not want any local statics. 23013 @@ -64,18 +66,23 @@ 20925 23014 static void 20926 23015 show_window_sizes(const char *name) … … 20955 23044 _nc_unlock_global(curses); 20956 23045 } 20957 @@ -86,15 +9 5,23 @@23046 @@ -86,15 +93,23 @@ 20958 23047 * structure's size. 20959 23048 */ … … 20983 23072 */ 20984 23073 static ripoff_t * 20985 @@ -104,6 +1 21,9 @@23074 @@ -104,6 +119,9 @@ 20986 23075 ripoff_t *rop; 20987 23076 20988 23077 if (win != 0) { 20989 +#if NCURSES_SP_FUNCS23078 +#ifdef USE_SP_RIPOFF 20990 23079 + SCREEN *sp = _nc_screen_of(win); 20991 23080 +#endif … … 20993 23082 if (rop->win == win && rop->line != 0) { 20994 23083 result = rop; 20995 @@ -125,6 +14 5,9 @@23084 @@ -125,6 +143,9 @@ 20996 23085 ripoff_t *rop; 20997 23086 20998 23087 if (win != 0) { 20999 +#if NCURSES_SP_FUNCS23088 +#ifdef USE_SP_RIPOFF 21000 23089 + SCREEN *sp = _nc_screen_of(win); 21001 23090 +#endif … … 21003 23092 if (rop->line < 0) { 21004 23093 result -= rop->line; 21005 @@ -146,9 +16 9,12 @@23094 @@ -146,9 +167,12 @@ 21006 23095 int depth = 0; 21007 23096 21008 23097 if (cmp != 0) { 21009 +#if NCURSES_SP_FUNCS23098 +#ifdef USE_SP_WINDOWLIST 21010 23099 + SCREEN *sp = _nc_screen_of(cmp); 21011 23100 +#endif … … 21017 23106 if (tst->_parent == cmp) { 21018 23107 depth = 1 + child_depth(tst); 21019 @@ -184,7 +2 10,7 @@23108 @@ -184,7 +208,7 @@ 21020 23109 adjust_window(WINDOW *win, int ToLines, int ToCols, int stolen EXTRA_DCLS) 21021 23110 { … … 21026 23115 int myCols = win->_maxx + 1; 21027 23116 ripoff_t *rop = ripped_window(win); 21028 @@ -239,19 +265,19 @@ 23117 @@ -203,6 +227,12 @@ 23118 * move it to the same relative position. 23119 */ 23120 win->_begy = ToLines - ripped_bottom(win) - 0 - win->_yoffset; 23121 + if (rop->hook == _nc_slk_initialize) 23122 + _nc_format_slks( 23123 +#if NCURSES_SP_FUNCS 23124 + _nc_screen_of(win), 23125 +#endif 23126 + ToCols); 23127 } else if (win->_begy >= bottom) { 23128 /* 23129 * If it is below the bottom of the new screen, move up by the same 23130 @@ -239,19 +269,19 @@ 21029 23131 * children, decrease those to fit, then decrease the containing window, etc. 21030 23132 */ … … 21049 23151 21050 23152 if (!(win->_flags & _ISPAD)) { 21051 @@ -273,19 + 299,19 @@23153 @@ -273,19 +303,19 @@ 21052 23154 * parent, increase those to fit, then increase the contained window, etc. 21053 23155 */ … … 21072 23174 21073 23175 if (!(win->_flags & _ISPAD)) { 21074 @@ -307,25 +33 3,26 @@23176 @@ -307,25 +337,26 @@ 21075 23177 * such as ungetch(). 21076 23178 */ … … 21108 23210 #ifdef TRACE 21109 23211 if (USE_TRACEF(TRACE_UPDATE)) { 21110 @@ -333,33 +36 0,35@@23212 @@ -333,33 +364,42 @@ 21111 23213 _nc_unlock_global(tracef); 21112 23214 } … … 21138 23240 - screen_lines = lines = ToLines; 21139 23241 - screen_columns = columns = ToCols; 21140 + screen_lines(SP_PARM) = lines = ToLines; 21141 + screen_columns(SP_PARM) = columns = ToCols; 23242 + screen_lines(SP_PARM) = ToLines; 23243 + screen_columns(SP_PARM) = ToCols; 23244 + 23245 +#ifdef USE_TERM_DRIVER 23246 + CallDriver_2(SP_PARM, setsize, ToLines, ToCols); 23247 +#else 23248 + lines = ToLines; 23249 + columns = ToCols; 23250 +#endif 21142 23251 21143 23252 - SP->_lines_avail = lines - was_stolen; 21144 + SP_PARM->_lines_avail = lines - was_stolen;23253 + SP_PARM->_lines_avail = ToLines - was_stolen; 21145 23254 21146 23255 - if (SP->oldhash) { … … 21156 23265 #ifdef TRACE 21157 23266 if (USE_TRACEF(TRACE_UPDATE)) { 21158 @@ -383,6 +4 12,18 @@23267 @@ -383,6 +423,18 @@ 21159 23268 returnCode(result); 21160 23269 } … … 21175 23284 * This function reallocates NCURSES window structures. It is invoked in 21176 23285 * response to a SIGWINCH interrupt. Other user-defined windows may also need 21177 @@ -392,34 +4 33,34 @@23286 @@ -392,34 +444,34 @@ 21178 23287 * invoked directly from the signal handler. 21179 23288 */ … … 21223 23332 /* ripped-off lines are a special case: if we did not lengthen 21224 23333 * them, we haven't moved them either. repaint them, too. 21225 @@ -429,7 +4 70,7 @@23334 @@ -429,7 +481,7 @@ 21226 23335 * not know which are really on top. 21227 23336 */ … … 21232 23341 && rop->line < 0) { 21233 23342 21234 @@ -442,10 +4 83,9 @@23343 @@ -442,10 +494,9 @@ 21235 23344 21236 23345 /* soft-keys are a special case: we _know_ how to repaint them */ … … 21246 23355 #endif 21247 23356 } 21248 @@ -453,3 + 493,11 @@23357 @@ -453,3 +504,11 @@ 21249 23358 21250 23359 returnCode(result); … … 21260 23369 diff -Naur ncurses-5.7.orig/ncurses/base/safe_sprintf.c ncurses-5.7/ncurses/base/safe_sprintf.c 21261 23370 --- ncurses-5.7.orig/ncurses/base/safe_sprintf.c 2007-04-21 15:28:06.000000000 -0700 21262 +++ ncurses-5.7/ncurses/base/safe_sprintf.c 2009-0 6-05 14:01:44.000000000 -070023371 +++ ncurses-5.7/ncurses/base/safe_sprintf.c 2009-07-19 15:03:53.000000000 -0700 21263 23372 @@ -1,5 +1,5 @@ 21264 23373 /**************************************************************************** … … 21328 23437 diff -Naur ncurses-5.7.orig/ncurses/base/tries.c ncurses-5.7/ncurses/base/tries.c 21329 23438 --- ncurses-5.7.orig/ncurses/base/tries.c 2008-08-16 12:22:55.000000000 -0700 21330 +++ ncurses-5.7/ncurses/base/tries.c 2009-0 6-05 14:01:16.000000000 -070023439 +++ ncurses-5.7/ncurses/base/tries.c 2009-07-19 15:02:22.000000000 -0700 21331 23440 @@ -39,7 +39,7 @@ 21332 23441 … … 21351 23460 diff -Naur ncurses-5.7.orig/ncurses/base/wresize.c ncurses-5.7/ncurses/base/wresize.c 21352 23461 --- ncurses-5.7.orig/ncurses/base/wresize.c 2008-06-07 06:59:01.000000000 -0700 21353 +++ ncurses-5.7/ncurses/base/wresize.c 2009-0 6-05 14:01:54.000000000 -070023462 +++ ncurses-5.7/ncurses/base/wresize.c 2009-07-19 15:04:03.000000000 -0700 21354 23463 @@ -1,5 +1,5 @@ 21355 23464 /**************************************************************************** … … 21392 23501 diff -Naur ncurses-5.7.orig/ncurses/curses.priv.h ncurses-5.7/ncurses/curses.priv.h 21393 23502 --- ncurses-5.7.orig/ncurses/curses.priv.h 2008-10-04 14:37:45.000000000 -0700 21394 +++ ncurses-5.7/ncurses/curses.priv.h 2009-0 6-05 14:01:55.000000000 -070023503 +++ ncurses-5.7/ncurses/curses.priv.h 2009-07-19 15:04:13.000000000 -0700 21395 23504 @@ -1,5 +1,5 @@ 21396 23505 /**************************************************************************** … … 21410 23519 /* 21411 23520 - * $Id: curses.priv.h,v 1.394 2008/10/04 21:37:45 tom Exp $ 21412 + * $Id: curses.priv.h,v 1.4 20 2009/05/30 15:53:46tom Exp $23521 + * $Id: curses.priv.h,v 1.430 2009/07/04 20:40:42 tom Exp $ 21413 23522 * 21414 23523 * curses.priv.h … … 21500 23609 21501 23610 #if NCURSES_EXT_COLORS && USE_WIDEC_SUPPORT 21502 @@ -272,8 +332,1 4@@23611 @@ -272,8 +332,15 @@ 21503 23612 #define GET_WINDOW_PAIR(w) (w)->_color 21504 23613 #define SET_WINDOW_PAIR(w,p) (w)->_color = (p) … … 21513 23622 + 21514 23623 +#else /* !(NCURSES_EXT_COLORS && USE_WIDEC_SUPPORT) */ 23624 + 21515 23625 #define if_EXT_COLORS(stmt) /* nothing */ 21516 23626 #define SetPair(value,p) RemAttr(value, A_COLOR), \ 21517 23627 SetAttr(value, AttrOf(value) | (A_COLOR & COLOR_PAIR(p))) 21518 @@ -283,13 +3 49,19 @@23628 @@ -283,13 +350,19 @@ 21519 23629 #define SET_WINDOW_PAIR(w,p) WINDOW_ATTRS(w) &= ALL_BUT_COLOR, \ 21520 23630 WINDOW_ATTRS(w) |= (A_COLOR & COLOR_PAIR(p)) … … 21538 23648 #define GetNoPadding(sp) FALSE 21539 23649 #define SetNoPadding(sp) /*nothing*/ 21540 @@ -302,17 +37 4,31@@23650 @@ -302,17 +375,34 @@ 21541 23651 #define SET_SCREEN_PAIR(s,p) SetPair(SCREEN_ATTRS(s), p) 21542 23652 … … 21573 23683 +#define ptrLines(sp) &LINES 21574 23684 +#define ptrCols(sp) &COLS 23685 +#define ptrTabsize(sp) &TABSIZE 23686 +#define ptrEscdelay(sp) &ESCDELAY 23687 + 21575 23688 +#define SET_LINES(value) LINES = value 21576 23689 +#define SET_COLS(value) COLS = value … … 21581 23694 21582 23695 #define TR_MUTEX(data) _tracef("%s@%d: me:%08lX COUNT:%2u/%2d/%6d/%2d/%s%9u: " #data, \ 21583 @@ -404,6 +49 0,8 @@23696 @@ -404,6 +494,8 @@ 21584 23697 #define C_SHIFT 9 /* we need more bits than there are colors */ 21585 23698 #define C_MASK ((1 << C_SHIFT) - 1) … … 21590 23703 21591 23704 #define COLOR_DEFAULT C_MASK 21592 @@ -464,13 +55 2,13 @@23705 @@ -464,13 +556,13 @@ 21593 23706 } slk_ent; 21594 23707 … … 21610 23723 } SLK; 21611 23724 21612 @@ -493,10 +58 1,10 @@23725 @@ -493,10 +585,10 @@ 21613 23726 typedef int (*TYPE_Gpm_Close) (void); 21614 23727 typedef int (*TYPE_Gpm_GetEvent) (Gpm_Event *); … … 21625 23738 /* link statically to GPM */ 21626 23739 #define my_gpm_fd &gpm_fd 21627 @@ -609,8 + 697,10 @@23740 @@ -609,8 +701,10 @@ 21628 23741 int tgetent_index; 21629 23742 long tgetent_sequence; … … 21637 23750 #if USE_HOME_TERMINFO 21638 23751 char *home_terminfo; 21639 @@ -644,7 +73 4,9 @@23752 @@ -644,7 +738,9 @@ 21640 23753 char traceatr_color_buf[2][80]; 21641 23754 int traceatr_color_sel; … … 21648 23761 21649 23762 #ifdef USE_PTHREADS 21650 @@ -669,8 +76 1,10 @@23763 @@ -669,8 +765,10 @@ 21651 23764 bool use_env; 21652 23765 bool filter_mode; … … 21659 23772 TTY *saved_tty; /* savetty/resetty information */ 21660 23773 #if NCURSES_NO_PADDING 21661 @@ -680,6 +77 4,8 @@23774 @@ -680,6 +778,8 @@ 21662 23775 chtype *real_acs_map; 21663 23776 int _LINES; … … 21668 23781 #ifdef TRACE 21669 23782 long _outchars; 21670 @@ -688,8 +78 4,16 @@23783 @@ -688,8 +788,16 @@ 21671 23784 #endif 21672 23785 } NCURSES_PRESCREEN; … … 21687 23800 extern NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen; 21688 23801 21689 @@ -703,6 +8 07,8 @@23802 @@ -703,6 +811,8 @@ 21690 23803 char *_setbuf; /* buffered I/O for output */ 21691 23804 bool _filtered; /* filter() was called */ … … 21696 23809 TERMINAL *_term; /* terminal type information */ 21697 23810 TTY _saved_tty; /* savetty/resetty information */ 21698 @@ -716,6 +82 2,10 @@23811 @@ -716,6 +826,10 @@ 21699 23812 WINDOW *_newscr; /* virtual screen to be updated to */ 21700 23813 WINDOW *_stdscr; /* screen's full-window context */ … … 21707 23820 TRIES *_key_ok; /* Disabled keys via keyok(,FALSE) */ 21708 23821 bool _tried; /* keypad mode was initialized */ 21709 @@ -794,11 +90 4,13 @@23822 @@ -794,11 +908,13 @@ 21710 23823 int _color_count; /* count of colors in palette */ 21711 23824 colorpair_t *_color_pairs; /* screen's color pair list */ … … 21721 23834 chtype _ok_attributes; /* valid attributes for terminal */ 21722 23835 chtype _xmc_suppress; /* attributes to suppress if xmc */ 21723 @@ -895,7 +1007,7 @@ 23836 @@ -820,8 +936,9 @@ 23837 */ 23838 bool _nc_sp_idlok; 23839 bool _nc_sp_idcok; 23840 -#define _nc_idlok SP->_nc_sp_idlok 23841 -#define _nc_idcok SP->_nc_sp_idcok 23842 + 23843 +#define _nc_idlok SP_PARM->_nc_sp_idlok 23844 +#define _nc_idcok SP_PARM->_nc_sp_idcok 23845 23846 /* 23847 * These are the data that support the mouse interface. 23848 @@ -875,7 +992,7 @@ 23849 * This supports automatic resizing 23850 */ 23851 #if USE_SIZECHANGE 23852 - int (*_resize)(int,int); 23853 + int (*_resize)(NCURSES_SP_DCLx int y, int x); 23854 #endif 23855 23856 /* 23857 @@ -895,7 +1012,7 @@ 21724 23858 int _oldnum_size; 21725 23859 … … 21730 23864 int _legacy_coding; /* see use_legacy_coding() */ 21731 23865 21732 @@ -915,6 +10 27,15 @@23866 @@ -915,6 +1032,15 @@ 21733 23867 char tracechr_buf[40]; 21734 23868 char tracemse_buf[TRACEMSE_MAX]; … … 21746 23880 * ncurses/ncursesw are the same up to this point. 21747 23881 */ 21748 @@ -943,6 +106 4,20 @@23882 @@ -943,6 +1069,20 @@ 21749 23883 21750 23884 #define WINDOW_EXT(win,field) (((WINDOWLIST *)(win))->field) … … 21767 23901 #ifndef UCHAR_MAX 21768 23902 #define UCHAR_MAX 255 21769 @@ -1112,7 +12 47,7 @@23903 @@ -1112,7 +1252,7 @@ 21770 23904 AttrOf(dst) |= (ext + 1) 21771 23905 … … 21776 23910 || (!isWidecExt(ch) && \ 21777 23911 (ch).chars[1] == L'\0' && \ 21778 @@ -1214,8 +13 49,8 @@23912 @@ -1214,8 +1354,8 @@ 21779 23913 * Standardize/simplify common loops 21780 23914 */ … … 21787 23921 /* 21788 23922 * Prefixes for call/return points of library function traces. We use these to 21789 @@ -1263,7 +1 398,7 @@23923 @@ -1263,7 +1403,7 @@ 21790 23924 #define returnBool(code) TRACE_RETURN(code,bool) 21791 23925 #define returnCPtr(code) TRACE_RETURN(code,cptr) … … 21796 23930 #define returnPtr(code) TRACE_RETURN(code,ptr) 21797 23931 #define returnSP(code) TRACE_RETURN(code,sp) 21798 @@ -1322,7 +14 57,7 @@23932 @@ -1322,7 +1462,7 @@ 21799 23933 #define returnBool(code) return code 21800 23934 #define returnCPtr(code) return code … … 21805 23939 #define returnPtr(code) return code 21806 23940 #define returnSP(code) return code 21807 @@ -1348,7 +148 3,7 @@23941 @@ -1348,7 +1488,7 @@ 21808 23942 21809 23943 #define ALL_BUT_COLOR ((chtype)~(A_COLOR)) … … 21814 23948 #define toggle_attr_on(S,at) {\ 21815 23949 if (PAIR_NUMBER(at) > 0) {\ 21816 @@ -1367,38 +150 2,38 @@23950 @@ -1367,38 +1507,38 @@ 21817 23951 }\ 21818 23952 TR(TRACE_ATTRS, ("new attribute is %s", _traceattr((S))));} … … 21869 24003 21870 24004 /* 21871 @@ -1483,8 +1618,8 @@ 24005 @@ -1425,16 +1565,28 @@ 24006 extern NCURSES_EXPORT(void) _nc_toggle_attr_off (attr_t *, attr_t); 24007 24008 #undef DelCharCost 24009 -#define DelCharCost(count) _nc_DelCharCost(count) 24010 -extern NCURSES_EXPORT(int) _nc_DelCharCost (int); 24011 +#define DelCharCost(sp, count) NCURSES_SP_NAME(_nc_DelCharCost)(NCURSES_SP_ARGx count) 24012 24013 #undef InsCharCost 24014 -#define InsCharCost(count) _nc_InsCharCost(count) 24015 -extern NCURSES_EXPORT(int) _nc_InsCharCost (int); 24016 +#define InsCharCost(sp, count) NCURSES_SP_NAME(_nc_InsCharCost)(NCURSES_SP_ARGx count) 24017 + 24018 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_DelCharCost) (NCURSES_SP_DCLx int _c); 24019 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_InsCharCost) (NCURSES_SP_DCLx int _c); 24020 24021 #undef UpdateAttrs 24022 -#define UpdateAttrs(c) _nc_UpdateAttrs(c) 24023 -extern NCURSES_EXPORT(void) _nc_UpdateAttrs (NCURSES_CH_T); 24024 +#define UpdateAttrs(sp,c) NCURSES_SP_NAME(_nc_UpdateAttrs)(NCURSES_SP_ARGx CHREF(c)) 24025 + 24026 +#if defined(NEED_NCURSES_CH_T) 24027 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_UpdateAttrs) (NCURSES_SP_DCLx CARG_CH_T _c); 24028 +#else 24029 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_UpdateAttrs) (NCURSES_SP_DCLx chtype c); 24030 +#endif 24031 + 24032 +#if NCURSES_SP_FUNCS 24033 +extern NCURSES_EXPORT(int) _nc_DelCharCost (int); 24034 +extern NCURSES_EXPORT(int) _nc_InsCharCost (int); 24035 +extern NCURSES_EXPORT(void) _nc_UpdateAttrs (CARG_CH_T); 24036 +#endif /* NCURSES_SP_FUNCS */ 24037 24038 #else 24039 24040 @@ -1483,8 +1635,8 @@ 21872 24041 #endif 21873 24042 … … 21880 24049 /* lib_addch.c */ 21881 24050 #if USE_WIDEC_SUPPORT 21882 @@ -1503,7 +16 38,7 @@24051 @@ -1503,7 +1655,7 @@ 21883 24052 extern NCURSES_EXPORT(int) _nc_wgetch(WINDOW *, unsigned long *, int EVENTLIST_2nd(_nc_eventlist *)); 21884 24053 … … 21889 24058 /* lib_mvcur.c */ 21890 24059 #define INFINITY 1000000 /* cost: too high to use */ 21891 @@ -1519,7 +16 54,7 @@24060 @@ -1519,7 +1671,7 @@ 21892 24061 extern NCURSES_EXPORT(void) _nc_screen_wrap (void); 21893 24062 … … 21898 24067 /* lib_mvcur.c */ 21899 24068 #define INFINITY 1000000 /* cost: too high to use */ 21900 @@ -1527,10 +16 62,13 @@24069 @@ -1527,10 +1679,13 @@ 21901 24070 21902 24071 /* lib_setup.c */ … … 21916 24085 /* lib_tstp.c */ 21917 24086 #if USE_SIGWINCH 21918 @@ -1539,9 +16 77,6 @@24087 @@ -1539,9 +1694,6 @@ 21919 24088 #define _nc_handle_sigwinch(a) /* nothing */ 21920 24089 #endif … … 21926 24095 #if USE_WIDEC_SUPPORT 21927 24096 extern NCURSES_EXPORT(void) _nc_init_wacs(void); 21928 @@ -1577,8 +17 12,6 @@24097 @@ -1577,8 +1729,6 @@ 21929 24098 21930 24099 /* elsewhere ... */ … … 21935 24104 extern NCURSES_EXPORT(WINDOW *) _nc_makenew (int, int, int, int, int); 21936 24105 extern NCURSES_EXPORT(char *) _nc_trace_buf (int, size_t); 21937 @@ -1592,12 +17 25,14 @@24106 @@ -1592,12 +1742,14 @@ 21938 24107 extern NCURSES_EXPORT(int) _nc_keypad (SCREEN *, bool); 21939 24108 extern NCURSES_EXPORT(int) _nc_ospeed (int); … … 21952 24121 extern NCURSES_EXPORT(void) _nc_freeall (void); 21953 24122 extern NCURSES_EXPORT(void) _nc_hash_map (void); 21954 @@ -1661, 9 +1796,9@@24123 @@ -1661,24 +1813,33 @@ 21955 24124 21956 24125 #define USE_SETBUF_0 0 … … 21964 24133 /* 21965 24134 * On systems with a broken linker, define 'SP' as a function to force the 21966 @@ -1672,13 +1807,21 @@ 24135 * linker to pull in the data-only module with 'SP'. 24136 */ 24137 +#define _nc_alloc_screen_sp() typeCalloc(SCREEN, 1) 24138 + 21967 24139 #if BROKEN_LINKER 21968 24140 -#define SP _nc_screen() 21969 24141 extern NCURSES_EXPORT(SCREEN *) _nc_screen (void); 21970 24142 -extern NCURSES_EXPORT(int) _nc_alloc_screen (void); … … 21979 24151 -#define _nc_set_screen(sp) SP = sp 21980 24152 +#define CURRENT_SCREEN SP 21981 +#define _nc_alloc_screen() ((SP = typeCalloc(SCREEN, 1)) != 0)24153 +#define _nc_alloc_screen() ((SP = _nc_alloc_screen_sp()) != 0) 21982 24154 +#define _nc_set_screen(sp) SP = sp 21983 24155 +#endif … … 21990 24162 21991 24163 /* 21992 @@ -1686,10 +18 29,11 @@24164 @@ -1686,10 +1847,11 @@ 21993 24165 * if the application is running multiple screens under X, it's quite possible 21994 24166 * they could all have type xterm but have different sizes! So... … … 22000 24172 22001 24173 extern NCURSES_EXPORT(int) _nc_slk_initialize (WINDOW *, int); 22002 +extern NCURSES_EXPORT(int) _nc_format_slks ( SCREEN *, int);24174 +extern NCURSES_EXPORT(int) _nc_format_slks (NCURSES_SP_DCLx int _c); 22003 24175 22004 24176 /* 22005 24177 * Some constants related to SLK's 22006 @@ -1707,14 +18 51,243@@24178 @@ -1707,14 +1869,240 @@ 22007 24179 #define MAX_SKEY(fmt) (SLK_STDFMT(fmt)? MAX_SKEY_OLD : MAX_SKEY_PC) 22008 24180 #define MAX_SKEY_LEN(fmt) (SLK_STDFMT(fmt)? MAX_SKEY_LEN_OLD : MAX_SKEY_LEN_PC) … … 22171 24343 + * part of the API up to now 22172 24344 + */ 22173 +extern NCURSES_EXPORT(SCREEN*) _nc_SP(void);22174 +22175 +extern NCURSES_EXPORT(TERMINAL*) NCURSES_SP_NAME(_nc_set_curterm)(SCREEN*,TERMINAL*);22176 24345 +extern NCURSES_EXPORT(TERMINAL*) NCURSES_SP_NAME(cur_term)(SCREEN *sp); 22177 24346 +extern NCURSES_EXPORT(WINDOW *) NCURSES_SP_NAME(_nc_makenew) (SCREEN*, int, int, int, int, int); … … 22250 24419 } 22251 24420 #endif 24421 diff -Naur ncurses-5.7.orig/ncurses/llib-lncurses ncurses-5.7/ncurses/llib-lncurses 24422 --- ncurses-5.7.orig/ncurses/llib-lncurses 2008-10-11 13:57:29.000000000 -0700 24423 +++ ncurses-5.7/ncurses/llib-lncurses 2009-07-19 15:04:11.000000000 -0700 24424 @@ -1,5 +1,5 @@ 24425 /**************************************************************************** 24426 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 24427 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 24428 * * 24429 * Permission is hereby granted, free of charge, to any person obtaining a * 24430 * copy of this software and associated documentation files (the * 24431 @@ -27,7 +27,7 @@ 24432 ****************************************************************************/ 24433 24434 /**************************************************************************** 24435 - * Author: Thomas E. Dickey 1996-2008 * 24436 + * Author: Thomas E. Dickey 1996-2009 * 24437 ****************************************************************************/ 24438 /* LINTLIBRARY */ 24439 24440 @@ -38,27 +38,54 @@ 24441 #undef _nc_oldnums 24442 int *_nc_oldnums; 24443 24444 +#undef _nc_scroll_optimize_sp 24445 +void _nc_scroll_optimize_sp( 24446 + SCREEN *sp) 24447 + { /* void */ } 24448 + 24449 #undef _nc_scroll_optimize 24450 void _nc_scroll_optimize(void) 24451 { /* void */ } 24452 24453 +#undef _nc_linedump_sp 24454 +void _nc_linedump_sp( 24455 + SCREEN *sp) 24456 + { /* void */ } 24457 + 24458 #undef _nc_linedump 24459 void _nc_linedump(void) 24460 { /* void */ } 24461 24462 /* ./tty/hashmap.c */ 24463 24464 -#include <term.h> 24465 +#undef _nc_hash_map_sp 24466 +void _nc_hash_map_sp( 24467 + SCREEN *sp) 24468 + { /* void */ } 24469 24470 #undef _nc_hash_map 24471 void _nc_hash_map(void) 24472 { /* void */ } 24473 24474 +#undef _nc_make_oldhash_sp 24475 +void _nc_make_oldhash_sp( 24476 + SCREEN *sp, 24477 + int i) 24478 + { /* void */ } 24479 + 24480 #undef _nc_make_oldhash 24481 void _nc_make_oldhash( 24482 int i) 24483 { /* void */ } 24484 24485 +#undef _nc_scroll_oldhash_sp 24486 +void _nc_scroll_oldhash_sp( 24487 + SCREEN *sp, 24488 + int n, 24489 + int top, 24490 + int bot) 24491 + { /* void */ } 24492 + 24493 #undef _nc_scroll_oldhash 24494 void _nc_scroll_oldhash( 24495 int n, 24496 @@ -112,6 +139,11 @@ 24497 24498 /* ./base/lib_beep.c */ 24499 24500 +#undef beep_sp 24501 +int beep_sp( 24502 + SCREEN *sp) 24503 + { return(*(int *)0); } 24504 + 24505 #undef beep 24506 int beep(void) 24507 { return(*(int *)0); } 24508 @@ -187,6 +219,7 @@ 24509 24510 /* ./base/lib_color.c */ 24511 24512 +#include <term.h> 24513 #include <tic.h> 24514 24515 #undef COLOR_PAIRS 24516 @@ -194,14 +227,32 @@ 24517 #undef COLORS 24518 int COLORS; 24519 24520 +#undef _nc_reset_colors_sp 24521 +NCURSES_BOOL _nc_reset_colors_sp( 24522 + SCREEN *sp) 24523 + { return(*(NCURSES_BOOL *)0); } 24524 + 24525 #undef _nc_reset_colors 24526 NCURSES_BOOL _nc_reset_colors(void) 24527 { return(*(NCURSES_BOOL *)0); } 24528 24529 +#undef start_color_sp 24530 +int start_color_sp( 24531 + SCREEN *sp) 24532 + { return(*(int *)0); } 24533 + 24534 #undef start_color 24535 int start_color(void) 24536 { return(*(int *)0); } 24537 24538 +#undef init_pair_sp 24539 +int init_pair_sp( 24540 + SCREEN *sp, 24541 + short pair, 24542 + short f, 24543 + short b) 24544 + { return(*(int *)0); } 24545 + 24546 #undef init_pair 24547 int init_pair( 24548 short pair, 24549 @@ -209,6 +260,15 @@ 24550 short b) 24551 { return(*(int *)0); } 24552 24553 +#undef init_color_sp 24554 +int init_color_sp( 24555 + SCREEN *sp, 24556 + short color, 24557 + short r, 24558 + short g, 24559 + short b) 24560 + { return(*(int *)0); } 24561 + 24562 #undef init_color 24563 int init_color( 24564 short color, 24565 @@ -217,14 +277,33 @@ 24566 short b) 24567 { return(*(int *)0); } 24568 24569 +#undef can_change_color_sp 24570 +NCURSES_BOOL can_change_color_sp( 24571 + SCREEN *sp) 24572 + { return(*(NCURSES_BOOL *)0); } 24573 + 24574 #undef can_change_color 24575 NCURSES_BOOL can_change_color(void) 24576 { return(*(NCURSES_BOOL *)0); } 24577 24578 +#undef has_colors_sp 24579 +NCURSES_BOOL has_colors_sp( 24580 + SCREEN *sp) 24581 + { return(*(NCURSES_BOOL *)0); } 24582 + 24583 #undef has_colors 24584 NCURSES_BOOL has_colors(void) 24585 { return(*(NCURSES_BOOL *)0); } 24586 24587 +#undef color_content_sp 24588 +int color_content_sp( 24589 + SCREEN *sp, 24590 + short color, 24591 + short *r, 24592 + short *g, 24593 + short *b) 24594 + { return(*(int *)0); } 24595 + 24596 #undef color_content 24597 int color_content( 24598 short color, 24599 @@ -233,6 +312,14 @@ 24600 short *b) 24601 { return(*(int *)0); } 24602 24603 +#undef pair_content_sp 24604 +int pair_content_sp( 24605 + SCREEN *sp, 24606 + short pair, 24607 + short *f, 24608 + short *b) 24609 + { return(*(int *)0); } 24610 + 24611 #undef pair_content 24612 int pair_content( 24613 short pair, 24614 @@ -240,13 +327,21 @@ 24615 short *b) 24616 { return(*(int *)0); } 24617 24618 +#undef _nc_do_color_sp 24619 +void _nc_do_color_sp( 24620 + SCREEN *sp, 24621 + short old_pair, 24622 + short pair, 24623 + NCURSES_BOOL reverse, 24624 + NCURSES_OUTC_sp outc) 24625 + { /* void */ } 24626 + 24627 #undef _nc_do_color 24628 void _nc_do_color( 24629 short old_pair, 24630 short pair, 24631 NCURSES_BOOL reverse, 24632 - int (*outc)( 24633 - int p1)) 24634 + NCURSES_OUTC outc) 24635 { /* void */ } 24636 24637 /* ./base/lib_colorset.c */ 24638 @@ -274,16 +369,31 @@ 24639 24640 /* ./base/lib_echo.c */ 24641 24642 +#undef echo_sp 24643 +int echo_sp( 24644 + SCREEN *sp) 24645 + { return(*(int *)0); } 24646 + 24647 #undef echo 24648 int echo(void) 24649 { return(*(int *)0); } 24650 24651 +#undef noecho_sp 24652 +int noecho_sp( 24653 + SCREEN *sp) 24654 + { return(*(int *)0); } 24655 + 24656 #undef noecho 24657 int noecho(void) 24658 { return(*(int *)0); } 24659 24660 /* ./base/lib_endwin.c */ 24661 24662 +#undef endwin_sp 24663 +int endwin_sp( 24664 + SCREEN *sp) 24665 + { return(*(int *)0); } 24666 + 24667 #undef endwin 24668 int endwin(void) 24669 { return(*(int *)0); } 24670 @@ -297,6 +407,11 @@ 24671 24672 /* ./base/lib_flash.c */ 24673 24674 +#undef flash_sp 24675 +int flash_sp( 24676 + SCREEN *sp) 24677 + { return(*(int *)0); } 24678 + 24679 #undef flash 24680 int flash(void) 24681 { return(*(int *)0); } 24682 @@ -1138,6 +1253,12 @@ 24683 #undef ESCDELAY 24684 int ESCDELAY; 24685 24686 +#undef set_escdelay_sp 24687 +int set_escdelay_sp( 24688 + SCREEN *sp, 24689 + int value) 24690 + { return(*(int *)0); } 24691 + 24692 #undef set_escdelay 24693 int set_escdelay( 24694 int value) 24695 @@ -1200,6 +1321,7 @@ 24696 24697 #undef _nc_insert_ch 24698 int _nc_insert_ch( 24699 + SCREEN *sp, 24700 WINDOW *win, 24701 chtype ch) 24702 { return(*(int *)0); } 24703 @@ -1238,6 +1360,11 @@ 24704 24705 /* ./base/lib_isendwin.c */ 24706 24707 +#undef isendwin_sp 24708 +NCURSES_BOOL isendwin_sp( 24709 + SCREEN *sp) 24710 + { return(*(NCURSES_BOOL *)0); } 24711 + 24712 #undef isendwin 24713 NCURSES_BOOL isendwin(void) 24714 { return(*(NCURSES_BOOL *)0); } 24715 @@ -1252,16 +1379,35 @@ 24716 24717 /* ./base/lib_mouse.c */ 24718 24719 +#undef getmouse_sp 24720 +int getmouse_sp( 24721 + SCREEN *sp, 24722 + MEVENT *aevent) 24723 + { return(*(int *)0); } 24724 + 24725 #undef getmouse 24726 int getmouse( 24727 MEVENT *aevent) 24728 { return(*(int *)0); } 24729 24730 +#undef ungetmouse_sp 24731 +int ungetmouse_sp( 24732 + SCREEN *sp, 24733 + MEVENT *aevent) 24734 + { return(*(int *)0); } 24735 + 24736 #undef ungetmouse 24737 int ungetmouse( 24738 MEVENT *aevent) 24739 { return(*(int *)0); } 24740 24741 +#undef mousemask_sp 24742 +mmask_t mousemask_sp( 24743 + SCREEN *sp, 24744 + mmask_t newmask, 24745 + mmask_t *oldmask) 24746 + { return(*(mmask_t *)0); } 24747 + 24748 #undef mousemask 24749 mmask_t mousemask( 24750 mmask_t newmask, 24751 @@ -1275,14 +1421,30 @@ 24752 int x) 24753 { return(*(NCURSES_BOOL *)0); } 24754 24755 +#undef mouseinterval_sp 24756 +int mouseinterval_sp( 24757 + SCREEN *sp, 24758 + int maxclick) 24759 + { return(*(int *)0); } 24760 + 24761 #undef mouseinterval 24762 int mouseinterval( 24763 int maxclick) 24764 { return(*(int *)0); } 24765 24766 #undef _nc_has_mouse 24767 -int _nc_has_mouse(void) 24768 - { return(*(int *)0); } 24769 +NCURSES_BOOL _nc_has_mouse( 24770 + SCREEN *sp) 24771 + { return(*(NCURSES_BOOL *)0); } 24772 + 24773 +#undef has_mouse_sp 24774 +NCURSES_BOOL has_mouse_sp( 24775 + SCREEN *sp) 24776 + { return(*(NCURSES_BOOL *)0); } 24777 + 24778 +#undef has_mouse 24779 +NCURSES_BOOL has_mouse(void) 24780 + { return(*(NCURSES_BOOL *)0); } 24781 24782 #undef wmouse_trafo 24783 NCURSES_BOOL wmouse_trafo( 24784 @@ -1303,24 +1465,55 @@ 24785 24786 /* ./tty/lib_mvcur.c */ 24787 24788 +#undef _nc_msec_cost_sp 24789 +int _nc_msec_cost_sp( 24790 + SCREEN *sp, 24791 + const char *const cap, 24792 + int affcnt) 24793 + { return(*(int *)0); } 24794 + 24795 #undef _nc_msec_cost 24796 int _nc_msec_cost( 24797 const char *const cap, 24798 int affcnt) 24799 { return(*(int *)0); } 24800 24801 +#undef _nc_mvcur_resume_sp 24802 +void _nc_mvcur_resume_sp( 24803 + SCREEN *sp) 24804 + { /* void */ } 24805 + 24806 #undef _nc_mvcur_resume 24807 void _nc_mvcur_resume(void) 24808 { /* void */ } 24809 24810 +#undef _nc_mvcur_init_sp 24811 +void _nc_mvcur_init_sp( 24812 + SCREEN *sp) 24813 + { /* void */ } 24814 + 24815 #undef _nc_mvcur_init 24816 void _nc_mvcur_init(void) 24817 { /* void */ } 24818 24819 +#undef _nc_mvcur_wrap_sp 24820 +void _nc_mvcur_wrap_sp( 24821 + SCREEN *sp) 24822 + { /* void */ } 24823 + 24824 #undef _nc_mvcur_wrap 24825 void _nc_mvcur_wrap(void) 24826 { /* void */ } 24827 24828 +#undef mvcur_sp 24829 +int mvcur_sp( 24830 + SCREEN *sp, 24831 + int yold, 24832 + int xold, 24833 + int ynew, 24834 + int xnew) 24835 + { return(*(int *)0); } 24836 + 24837 #undef mvcur 24838 int mvcur( 24839 int yold, 24840 @@ -1343,14 +1536,32 @@ 24841 24842 /* ./base/lib_newterm.c */ 24843 24844 +#undef filter_sp 24845 +void filter_sp( 24846 + SCREEN *sp) 24847 + { /* void */ } 24848 + 24849 #undef filter 24850 void filter(void) 24851 { /* void */ } 24852 24853 +#undef nofilter_sp 24854 +void nofilter_sp( 24855 + SCREEN *sp) 24856 + { /* void */ } 24857 + 24858 #undef nofilter 24859 void nofilter(void) 24860 { /* void */ } 24861 24862 +#undef newterm_sp 24863 +SCREEN *newterm_sp( 24864 + SCREEN *sp, 24865 + char *name, 24866 + FILE *ofp, 24867 + FILE *ifp) 24868 + { return(*(SCREEN **)0); } 24869 + 24870 #undef newterm 24871 SCREEN *newterm( 24872 char *name, 24873 @@ -1365,6 +1576,15 @@ 24874 WINDOW *win) 24875 { return(*(int *)0); } 24876 24877 +#undef newwin_sp 24878 +WINDOW *newwin_sp( 24879 + SCREEN *sp, 24880 + int num_lines, 24881 + int num_columns, 24882 + int begy, 24883 + int begx) 24884 + { return(*(WINDOW **)0); } 24885 + 24886 #undef newwin 24887 WINDOW *newwin( 24888 int num_lines, 24889 @@ -1391,6 +1611,16 @@ 24890 int x) 24891 { return(*(WINDOW **)0); } 24892 24893 +#undef _nc_makenew_sp 24894 +WINDOW *_nc_makenew_sp( 24895 + SCREEN *sp, 24896 + int num_lines, 24897 + int num_columns, 24898 + int begy, 24899 + int begx, 24900 + int flags) 24901 + { return(*(WINDOW **)0); } 24902 + 24903 #undef _nc_makenew 24904 WINDOW *_nc_makenew( 24905 int num_lines, 24906 @@ -1400,17 +1630,37 @@ 24907 int flags) 24908 { return(*(WINDOW **)0); } 24909 24910 -#undef _nc_screen_of 24911 -SCREEN *_nc_screen_of( 24912 - WINDOW *win) 24913 - { return(*(SCREEN **)0); } 24914 +#undef _nc_curscr_of 24915 +WINDOW *_nc_curscr_of( 24916 + SCREEN *sp) 24917 + { return(*(WINDOW **)0); } 24918 + 24919 +#undef _nc_newscr_of 24920 +WINDOW *_nc_newscr_of( 24921 + SCREEN *sp) 24922 + { return(*(WINDOW **)0); } 24923 + 24924 +#undef _nc_stdscr_of 24925 +WINDOW *_nc_stdscr_of( 24926 + SCREEN *sp) 24927 + { return(*(WINDOW **)0); } 24928 24929 /* ./base/lib_nl.c */ 24930 24931 +#undef nl_sp 24932 +int nl_sp( 24933 + SCREEN *sp) 24934 + { return(*(int *)0); } 24935 + 24936 #undef nl 24937 int nl(void) 24938 { return(*(int *)0); } 24939 24940 +#undef nonl_sp 24941 +int nonl_sp( 24942 + SCREEN *sp) 24943 + { return(*(int *)0); } 24944 + 24945 #undef nonl 24946 int nonl(void) 24947 { return(*(int *)0); } 24948 @@ -1444,6 +1694,13 @@ 24949 24950 /* ./base/lib_pad.c */ 24951 24952 +#undef newpad_sp 24953 +WINDOW *newpad_sp( 24954 + SCREEN *sp, 24955 + int l, 24956 + int c) 24957 + { return(*(WINDOW **)0); } 24958 + 24959 #undef newpad 24960 WINDOW *newpad( 24961 int l, 24962 @@ -1549,6 +1806,14 @@ 24963 24964 /* ./base/lib_restart.c */ 24965 24966 +#undef restartterm_sp 24967 +int restartterm_sp( 24968 + SCREEN *sp, 24969 + char *termp, 24970 + int filenum, 24971 + int *errret) 24972 + { return(*(int *)0); } 24973 + 24974 #undef restartterm 24975 int restartterm( 24976 char *termp, 24977 @@ -1597,6 +1862,12 @@ 24978 24979 /* ./base/lib_screen.c */ 24980 24981 +#undef getwin_sp 24982 +WINDOW *getwin_sp( 24983 + SCREEN *sp, 24984 + FILE *filep) 24985 + { return(*(WINDOW **)0); } 24986 + 24987 #undef getwin 24988 WINDOW *getwin( 24989 FILE *filep) 24990 @@ -1608,6 +1879,12 @@ 24991 FILE *filep) 24992 { return(*(int *)0); } 24993 24994 +#undef scr_restore_sp 24995 +int scr_restore_sp( 24996 + SCREEN *sp, 24997 + const char *file) 24998 + { return(*(int *)0); } 24999 + 25000 #undef scr_restore 25001 int scr_restore( 25002 const char *file) 25003 @@ -1618,11 +1895,23 @@ 25004 const char *file) 25005 { return(*(int *)0); } 25006 25007 +#undef scr_init_sp 25008 +int scr_init_sp( 25009 + SCREEN *sp, 25010 + const char *file) 25011 + { return(*(int *)0); } 25012 + 25013 #undef scr_init 25014 int scr_init( 25015 const char *file) 25016 { return(*(int *)0); } 25017 25018 +#undef scr_set_sp 25019 +int scr_set_sp( 25020 + SCREEN *sp, 25021 + const char *file) 25022 + { return(*(int *)0); } 25023 + 25024 #undef scr_set 25025 int scr_set( 25026 const char *file) 25027 @@ -1683,6 +1972,15 @@ 25028 int slk_format) 25029 { return(*(int *)0); } 25030 25031 +#undef _nc_ripoffline_sp 25032 +int _nc_ripoffline_sp( 25033 + SCREEN *sp, 25034 + int line, 25035 + int (*init)( 25036 + WINDOW *p1, 25037 + int p2)) 25038 + { return(*(int *)0); } 25039 + 25040 #undef _nc_ripoffline 25041 int _nc_ripoffline( 25042 int line, 25043 @@ -1691,6 +1989,15 @@ 25044 int p2)) 25045 { return(*(int *)0); } 25046 25047 +#undef ripoffline_sp 25048 +int ripoffline_sp( 25049 + SCREEN *sp, 25050 + int line, 25051 + int (*init)( 25052 + WINDOW *p1, 25053 + int p2)) 25054 + { return(*(int *)0); } 25055 + 25056 #undef ripoffline 25057 int ripoffline( 25058 int line, 25059 @@ -1707,12 +2014,25 @@ 25060 int cols) 25061 { return(*(int *)0); } 25062 25063 +#undef slk_restore_sp 25064 +int slk_restore_sp( 25065 + SCREEN *sp) 25066 + { return(*(int *)0); } 25067 + 25068 #undef slk_restore 25069 int slk_restore(void) 25070 { return(*(int *)0); } 25071 25072 /* ./base/lib_slkatr_set.c */ 25073 25074 +#undef slk_attr_set_sp 25075 +int slk_attr_set_sp( 25076 + SCREEN *sp, 25077 + const attr_t attr, 25078 + short color_pair_number, 25079 + void *opts) 25080 + { return(*(int *)0); } 25081 + 25082 #undef slk_attr_set 25083 int slk_attr_set( 25084 const attr_t attr, 25085 @@ -1722,6 +2042,12 @@ 25086 25087 /* ./base/lib_slkatrof.c */ 25088 25089 +#undef slk_attroff_sp 25090 +int slk_attroff_sp( 25091 + SCREEN *sp, 25092 + const chtype attr) 25093 + { return(*(int *)0); } 25094 + 25095 #undef slk_attroff 25096 int slk_attroff( 25097 const chtype attr) 25098 @@ -1729,6 +2055,12 @@ 25099 25100 /* ./base/lib_slkatron.c */ 25101 25102 +#undef slk_attron_sp 25103 +int slk_attron_sp( 25104 + SCREEN *sp, 25105 + const chtype attr) 25106 + { return(*(int *)0); } 25107 + 25108 #undef slk_attron 25109 int slk_attron( 25110 const chtype attr) 25111 @@ -1736,6 +2068,12 @@ 25112 25113 /* ./base/lib_slkatrset.c */ 25114 25115 +#undef slk_attrset_sp 25116 +int slk_attrset_sp( 25117 + SCREEN *sp, 25118 + const chtype attr) 25119 + { return(*(int *)0); } 25120 + 25121 #undef slk_attrset 25122 int slk_attrset( 25123 const chtype attr) 25124 @@ -1743,18 +2081,34 @@ 25125 25126 /* ./base/lib_slkattr.c */ 25127 25128 +#undef slk_attr_sp 25129 +attr_t slk_attr_sp( 25130 + SCREEN *sp) 25131 + { return(*(attr_t *)0); } 25132 + 25133 #undef slk_attr 25134 attr_t slk_attr(void) 25135 { return(*(attr_t *)0); } 25136 25137 /* ./base/lib_slkclear.c */ 25138 25139 +#undef slk_clear_sp 25140 +int slk_clear_sp( 25141 + SCREEN *sp) 25142 + { return(*(int *)0); } 25143 + 25144 #undef slk_clear 25145 int slk_clear(void) 25146 { return(*(int *)0); } 25147 25148 /* ./base/lib_slkcolor.c */ 25149 25150 +#undef slk_color_sp 25151 +int slk_color_sp( 25152 + SCREEN *sp, 25153 + short color_pair_number) 25154 + { return(*(int *)0); } 25155 + 25156 #undef slk_color 25157 int slk_color( 25158 short color_pair_number) 25159 @@ -1762,6 +2116,12 @@ 25160 25161 /* ./base/lib_slkinit.c */ 25162 25163 +#undef slk_init_sp 25164 +int slk_init_sp( 25165 + SCREEN *sp, 25166 + int format) 25167 + { return(*(int *)0); } 25168 + 25169 #undef slk_init 25170 int slk_init( 25171 int format) 25172 @@ -1769,6 +2129,12 @@ 25173 25174 /* ./base/lib_slklab.c */ 25175 25176 +#undef slk_label_sp 25177 +char *slk_label_sp( 25178 + SCREEN *sp, 25179 + int n) 25180 + { return(*(char **)0); } 25181 + 25182 #undef slk_label 25183 char *slk_label( 25184 int n) 25185 @@ -1776,16 +2142,34 @@ 25186 25187 /* ./base/lib_slkrefr.c */ 25188 25189 +#undef slk_noutrefresh_sp 25190 +int slk_noutrefresh_sp( 25191 + SCREEN *sp) 25192 + { return(*(int *)0); } 25193 + 25194 #undef slk_noutrefresh 25195 int slk_noutrefresh(void) 25196 { return(*(int *)0); } 25197 25198 +#undef slk_refresh_sp 25199 +int slk_refresh_sp( 25200 + SCREEN *sp) 25201 + { return(*(int *)0); } 25202 + 25203 #undef slk_refresh 25204 int slk_refresh(void) 25205 { return(*(int *)0); } 25206 25207 /* ./base/lib_slkset.c */ 25208 25209 +#undef slk_set_sp 25210 +int slk_set_sp( 25211 + SCREEN *sp, 25212 + int i, 25213 + const char *astr, 25214 + int format) 25215 + { return(*(int *)0); } 25216 + 25217 #undef slk_set 25218 int slk_set( 25219 int i, 25220 @@ -1795,6 +2179,11 @@ 25221 25222 /* ./base/lib_slktouch.c */ 25223 25224 +#undef slk_touch_sp 25225 +int slk_touch_sp( 25226 + SCREEN *sp) 25227 + { return(*(int *)0); } 25228 + 25229 #undef slk_touch 25230 int slk_touch(void) 25231 { return(*(int *)0); } 25232 @@ -1857,8 +2246,8 @@ 25233 SCREEN *sp) 25234 { /* void */ } 25235 25236 -#undef _nc_ungetch 25237 -int _nc_ungetch( 25238 +#undef ungetch_sp 25239 +int ungetch_sp( 25240 SCREEN *sp, 25241 int ch) 25242 { return(*(int *)0); } 25243 @@ -1870,11 +2259,23 @@ 25244 25245 /* ./tty/lib_vidattr.c */ 25246 25247 +#undef vidputs_sp 25248 +int vidputs_sp( 25249 + SCREEN *sp, 25250 + chtype newmode, 25251 + NCURSES_OUTC_sp outc) 25252 + { return(*(int *)0); } 25253 + 25254 #undef vidputs 25255 int vidputs( 25256 chtype newmode, 25257 - int (*outc)( 25258 - int p1)) 25259 + NCURSES_OUTC outc) 25260 + { return(*(int *)0); } 25261 + 25262 +#undef vidattr_sp 25263 +int vidattr_sp( 25264 + SCREEN *sp, 25265 + chtype newmode) 25266 { return(*(int *)0); } 25267 25268 #undef vidattr 25269 @@ -1882,6 +2283,11 @@ 25270 chtype newmode) 25271 { return(*(int *)0); } 25272 25273 +#undef termattrs_sp 25274 +chtype termattrs_sp( 25275 + SCREEN *sp) 25276 + { return(*(chtype *)0); } 25277 + 25278 #undef termattrs 25279 chtype termattrs(void) 25280 { return(*(chtype *)0); } 25281 @@ -1962,12 +2368,24 @@ 25282 25283 /* ./base/nc_panel.c */ 25284 25285 +#undef _nc_panelhook_sp 25286 +struct panelhook *_nc_panelhook_sp( 25287 + SCREEN *sp) 25288 + { return(*(struct panelhook **)0); } 25289 + 25290 #undef _nc_panelhook 25291 struct panelhook *_nc_panelhook(void) 25292 { return(*(struct panelhook **)0); } 25293 25294 /* ./base/safe_sprintf.c */ 25295 25296 +#undef _nc_printf_string_sp 25297 +char *_nc_printf_string_sp( 25298 + SCREEN *sp, 25299 + const char *fmt, 25300 + va_list ap) 25301 + { return(*(char **)0); } 25302 + 25303 #undef _nc_printf_string 25304 char *_nc_printf_string( 25305 const char *fmt, 25306 @@ -1979,10 +2397,24 @@ 25307 #include <sys/time.h> 25308 #include <sys/times.h> 25309 25310 +#undef doupdate_sp 25311 +int doupdate_sp( 25312 + SCREEN *sp) 25313 + { return(*(int *)0); } 25314 + 25315 #undef doupdate 25316 int doupdate(void) 25317 { return(*(int *)0); } 25318 25319 +#undef _nc_scrolln_sp 25320 +int _nc_scrolln_sp( 25321 + SCREEN *sp, 25322 + int n, 25323 + int top, 25324 + int bot, 25325 + int maxy) 25326 + { return(*(int *)0); } 25327 + 25328 #undef _nc_scrolln 25329 int _nc_scrolln( 25330 int n, 25331 @@ -1991,18 +2423,39 @@ 25332 int maxy) 25333 { return(*(int *)0); } 25334 25335 +#undef _nc_screen_resume_sp 25336 +void _nc_screen_resume_sp( 25337 + SCREEN *sp) 25338 + { /* void */ } 25339 + 25340 #undef _nc_screen_resume 25341 void _nc_screen_resume(void) 25342 { /* void */ } 25343 25344 +#undef _nc_screen_init_sp 25345 +void _nc_screen_init_sp( 25346 + SCREEN *sp) 25347 + { /* void */ } 25348 + 25349 #undef _nc_screen_init 25350 void _nc_screen_init(void) 25351 { /* void */ } 25352 25353 +#undef _nc_screen_wrap_sp 25354 +void _nc_screen_wrap_sp( 25355 + SCREEN *sp) 25356 + { /* void */ } 25357 + 25358 #undef _nc_screen_wrap 25359 void _nc_screen_wrap(void) 25360 { /* void */ } 25361 25362 +#undef _nc_do_xmc_glitch_sp 25363 +void _nc_do_xmc_glitch_sp( 25364 + SCREEN *sp, 25365 + attr_t previous) 25366 + { /* void */ } 25367 + 25368 #undef _nc_do_xmc_glitch 25369 void _nc_do_xmc_glitch( 25370 attr_t previous) 25371 @@ -2040,6 +2493,12 @@ 25372 void _nc_freeall(void) 25373 { /* void */ } 25374 25375 +#undef _nc_free_and_exit_sp 25376 +void _nc_free_and_exit_sp( 25377 + SCREEN *sp, 25378 + int code) 25379 + { /* void */ } 25380 + 25381 #undef _nc_free_and_exit 25382 void _nc_free_and_exit( 25383 int code) 25384 @@ -2059,6 +2518,24 @@ 25385 attr_t at) 25386 { /* void */ } 25387 25388 +#undef _nc_DelCharCost_sp 25389 +int _nc_DelCharCost_sp( 25390 + SCREEN *sp, 25391 + int count) 25392 + { return(*(int *)0); } 25393 + 25394 +#undef _nc_InsCharCost_sp 25395 +int _nc_InsCharCost_sp( 25396 + SCREEN *sp, 25397 + int count) 25398 + { return(*(int *)0); } 25399 + 25400 +#undef _nc_UpdateAttrs_sp 25401 +void _nc_UpdateAttrs_sp( 25402 + SCREEN *sp, 25403 + chtype c) 25404 + { /* void */ } 25405 + 25406 #undef _nc_DelCharCost 25407 int _nc_DelCharCost( 25408 int count) 25409 @@ -2076,6 +2553,12 @@ 25410 25411 /* ./base/legacy_coding.c */ 25412 25413 +#undef use_legacy_coding_sp 25414 +int use_legacy_coding_sp( 25415 + SCREEN *sp, 25416 + int level) 25417 + { return(*(int *)0); } 25418 + 25419 #undef use_legacy_coding 25420 int use_legacy_coding( 25421 int level) 25422 @@ -2083,10 +2566,22 @@ 25423 25424 /* ./base/lib_dft_fgbg.c */ 25425 25426 +#undef use_default_colors_sp 25427 +int use_default_colors_sp( 25428 + SCREEN *sp) 25429 + { return(*(int *)0); } 25430 + 25431 #undef use_default_colors 25432 int use_default_colors(void) 25433 { return(*(int *)0); } 25434 25435 +#undef assume_default_colors_sp 25436 +int assume_default_colors_sp( 25437 + SCREEN *sp, 25438 + int fg, 25439 + int bg) 25440 + { return(*(int *)0); } 25441 + 25442 #undef assume_default_colors 25443 int assume_default_colors( 25444 int fg, 25445 @@ -2095,6 +2590,13 @@ 25446 25447 /* ./tinfo/lib_print.c */ 25448 25449 +#undef mcprint_sp 25450 +int mcprint_sp( 25451 + SCREEN *sp, 25452 + char *data, 25453 + int len) 25454 + { return(*(int *)0); } 25455 + 25456 #undef mcprint 25457 int mcprint( 25458 char *data, 25459 @@ -2103,18 +2605,39 @@ 25460 25461 /* ./base/resizeterm.c */ 25462 25463 +#undef is_term_resized_sp 25464 +NCURSES_BOOL is_term_resized_sp( 25465 + SCREEN *sp, 25466 + int ToLines, 25467 + int ToCols) 25468 + { return(*(NCURSES_BOOL *)0); } 25469 + 25470 #undef is_term_resized 25471 NCURSES_BOOL is_term_resized( 25472 int ToLines, 25473 int ToCols) 25474 { return(*(NCURSES_BOOL *)0); } 25475 25476 +#undef resize_term_sp 25477 +int resize_term_sp( 25478 + SCREEN *sp, 25479 + int ToLines, 25480 + int ToCols) 25481 + { return(*(int *)0); } 25482 + 25483 #undef resize_term 25484 int resize_term( 25485 int ToLines, 25486 int ToCols) 25487 { return(*(int *)0); } 25488 25489 +#undef resizeterm_sp 25490 +int resizeterm_sp( 25491 + SCREEN *sp, 25492 + int ToLines, 25493 + int ToCols) 25494 + { return(*(int *)0); } 25495 + 25496 #undef resizeterm 25497 int resizeterm( 25498 int ToLines, 25499 @@ -2397,6 +2920,11 @@ 25500 #undef acs_map 25501 chtype acs_map[128]; 25502 25503 +#undef _nc_init_acs_sp 25504 +void _nc_init_acs_sp( 25505 + SCREEN *sp) 25506 + { /* void */ } 25507 + 25508 #undef _nc_init_acs 25509 void _nc_init_acs(void) 25510 { /* void */ } 25511 @@ -2420,6 +2948,11 @@ 25512 int BaudRate) 25513 { return(*(int *)0); } 25514 25515 +#undef baudrate_sp 25516 +int baudrate_sp( 25517 + SCREEN *sp) 25518 + { return(*(int *)0); } 25519 + 25520 #undef baudrate 25521 int baudrate(void) 25522 { return(*(int *)0); } 25523 @@ -2434,6 +2967,12 @@ 25524 TERMINAL *termp) 25525 { return(*(TERMINAL **)0); } 25526 25527 +#undef del_curterm_sp 25528 +int del_curterm_sp( 25529 + SCREEN *sp, 25530 + TERMINAL *termp) 25531 + { return(*(int *)0); } 25532 + 25533 #undef del_curterm 25534 int del_curterm( 25535 TERMINAL *termp) 25536 @@ -2456,26 +2995,56 @@ 25537 #undef _nc_prescreen 25538 NCURSES_PRESCREEN _nc_prescreen; 25539 25540 +#undef _nc_screen_of 25541 +SCREEN *_nc_screen_of( 25542 + WINDOW *win) 25543 + { return(*(SCREEN **)0); } 25544 + 25545 /* ./tinfo/lib_has_cap.c */ 25546 25547 +#undef has_ic_sp 25548 +NCURSES_BOOL has_ic_sp( 25549 + SCREEN *sp) 25550 + { return(*(NCURSES_BOOL *)0); } 25551 + 25552 #undef has_ic 25553 NCURSES_BOOL has_ic(void) 25554 { return(*(NCURSES_BOOL *)0); } 25555 25556 +#undef has_il_sp 25557 +NCURSES_BOOL has_il_sp( 25558 + SCREEN *sp) 25559 + { return(*(NCURSES_BOOL *)0); } 25560 + 25561 #undef has_il 25562 NCURSES_BOOL has_il(void) 25563 { return(*(NCURSES_BOOL *)0); } 25564 25565 /* ./tinfo/lib_kernel.c */ 25566 25567 +#undef erasechar_sp 25568 +char erasechar_sp( 25569 + SCREEN *sp) 25570 + { return(*(char *)0); } 25571 + 25572 #undef erasechar 25573 char erasechar(void) 25574 { return(*(char *)0); } 25575 25576 +#undef killchar_sp 25577 +char killchar_sp( 25578 + SCREEN *sp) 25579 + { return(*(char *)0); } 25580 + 25581 #undef killchar 25582 char killchar(void) 25583 { return(*(char *)0); } 25584 25585 +#undef flushinp_sp 25586 +int flushinp_sp( 25587 + SCREEN *sp) 25588 + { return(*(int *)0); } 25589 + 25590 #undef flushinp 25591 int flushinp(void) 25592 { return(*(int *)0); } 25593 @@ -2484,8 +3053,8 @@ 25594 25595 struct kn { short offset; int code; }; 25596 25597 -#undef _nc_keyname 25598 -char *_nc_keyname( 25599 +#undef keyname_sp 25600 +char *keyname_sp( 25601 SCREEN *sp, 25602 int c) 25603 { return(*(char **)0); } 25604 @@ -2505,6 +3074,12 @@ 25605 25606 #include <time.h> 25607 25608 +#undef napms_sp 25609 +int napms_sp( 25610 + SCREEN *sp, 25611 + int ms) 25612 + { return(*(int *)0); } 25613 + 25614 #undef napms 25615 int napms( 25616 int ms) 25617 @@ -2524,6 +3099,12 @@ 25618 NCURSES_BOOL flag) 25619 { /* void */ } 25620 25621 +#undef halfdelay_sp 25622 +int halfdelay_sp( 25623 + SCREEN *sp, 25624 + int t) 25625 + { return(*(int *)0); } 25626 + 25627 #undef halfdelay 25628 int halfdelay( 25629 int t) 25630 @@ -2559,21 +3140,52 @@ 25631 NCURSES_BOOL flag) 25632 { return(*(int *)0); } 25633 25634 +#undef curs_set_sp 25635 +int curs_set_sp( 25636 + SCREEN *sp, 25637 + int vis) 25638 + { return(*(int *)0); } 25639 + 25640 #undef curs_set 25641 int curs_set( 25642 int vis) 25643 { return(*(int *)0); } 25644 25645 +#undef typeahead_sp 25646 +int typeahead_sp( 25647 + SCREEN *sp, 25648 + int fd) 25649 + { return(*(int *)0); } 25650 + 25651 #undef typeahead 25652 int typeahead( 25653 int fd) 25654 { return(*(int *)0); } 25655 25656 +#undef has_key_sp 25657 +int has_key_sp( 25658 + SCREEN *sp, 25659 + int keycode) 25660 + { return(*(int *)0); } 25661 + 25662 #undef has_key 25663 int has_key( 25664 int keycode) 25665 { return(*(int *)0); } 25666 25667 +#undef _nc_putp_flush_sp 25668 +int _nc_putp_flush_sp( 25669 + SCREEN *sp, 25670 + const char *name, 25671 + const char *value) 25672 + { return(*(int *)0); } 25673 + 25674 +#undef _nc_putp_flush 25675 +int _nc_putp_flush( 25676 + const char *name, 25677 + const char *value) 25678 + { return(*(int *)0); } 25679 + 25680 #undef _nc_keypad 25681 int _nc_keypad( 25682 SCREEN *sp, 25683 @@ -2582,30 +3194,67 @@ 25684 25685 /* ./tinfo/lib_raw.c */ 25686 25687 +#undef raw_sp 25688 +int raw_sp( 25689 + SCREEN *sp) 25690 + { return(*(int *)0); } 25691 + 25692 #undef raw 25693 int raw(void) 25694 { return(*(int *)0); } 25695 25696 +#undef cbreak_sp 25697 +int cbreak_sp( 25698 + SCREEN *sp) 25699 + { return(*(int *)0); } 25700 + 25701 #undef cbreak 25702 int cbreak(void) 25703 { return(*(int *)0); } 25704 25705 +#undef qiflush_sp 25706 +void qiflush_sp( 25707 + SCREEN *sp) 25708 + { /* void */ } 25709 + 25710 #undef qiflush 25711 void qiflush(void) 25712 { /* void */ } 25713 25714 +#undef noraw_sp 25715 +int noraw_sp( 25716 + SCREEN *sp) 25717 + { return(*(int *)0); } 25718 + 25719 #undef noraw 25720 int noraw(void) 25721 { return(*(int *)0); } 25722 25723 +#undef nocbreak_sp 25724 +int nocbreak_sp( 25725 + SCREEN *sp) 25726 + { return(*(int *)0); } 25727 + 25728 #undef nocbreak 25729 int nocbreak(void) 25730 { return(*(int *)0); } 25731 25732 +#undef noqiflush_sp 25733 +void noqiflush_sp( 25734 + SCREEN *sp) 25735 + { /* void */ } 25736 + 25737 #undef noqiflush 25738 void noqiflush(void) 25739 { /* void */ } 25740 25741 +#undef intrflush_sp 25742 +int intrflush_sp( 25743 + SCREEN *sp, 25744 + WINDOW *win, 25745 + NCURSES_BOOL flag) 25746 + { return(*(int *)0); } 25747 + 25748 #undef intrflush 25749 int intrflush( 25750 WINDOW *win, 25751 @@ -2627,6 +3276,12 @@ 25752 #undef TABSIZE 25753 int TABSIZE; 25754 25755 +#undef set_tabsize_sp 25756 +int set_tabsize_sp( 25757 + SCREEN *sp, 25758 + int value) 25759 + { return(*(int *)0); } 25760 + 25761 #undef set_tabsize 25762 int set_tabsize( 25763 int value) 25764 @@ -2637,6 +3292,12 @@ 25765 SCREEN *sp) 25766 { return(*(int *)0); } 25767 25768 +#undef use_env_sp 25769 +void use_env_sp( 25770 + SCREEN *sp, 25771 + NCURSES_BOOL f) 25772 + { /* void */ } 25773 + 25774 #undef use_env 25775 void use_env( 25776 NCURSES_BOOL f) 25777 @@ -2689,8 +3350,9 @@ 25778 #undef BC 25779 char *BC; 25780 25781 -#undef tgetent 25782 -int tgetent( 25783 +#undef tgetent_sp 25784 +int tgetent_sp( 25785 + SCREEN *sp, 25786 char *bufp, 25787 const char *name) 25788 { return(*(int *)0); } 25789 @@ -2701,16 +3363,41 @@ 25790 25791 #endif 25792 25793 +#undef tgetent 25794 +int tgetent( 25795 + char *bufp, 25796 + const char *name) 25797 + { return(*(int *)0); } 25798 + 25799 +#undef tgetflag_sp 25800 +int tgetflag_sp( 25801 + SCREEN *sp, 25802 + char *id) 25803 + { return(*(int *)0); } 25804 + 25805 #undef tgetflag 25806 int tgetflag( 25807 char *id) 25808 { return(*(int *)0); } 25809 25810 +#undef tgetnum_sp 25811 +int tgetnum_sp( 25812 + SCREEN *sp, 25813 + char *id) 25814 + { return(*(int *)0); } 25815 + 25816 #undef tgetnum 25817 int tgetnum( 25818 char *id) 25819 { return(*(int *)0); } 25820 25821 +#undef tgetstr_sp 25822 +char *tgetstr_sp( 25823 + SCREEN *sp, 25824 + char *id, 25825 + char **area) 25826 + { return(*(char **)0); } 25827 + 25828 #undef tgetstr 25829 char *tgetstr( 25830 char *id, 25831 @@ -2719,6 +3406,11 @@ 25832 25833 /* ./tinfo/lib_termname.c */ 25834 25835 +#undef termname_sp 25836 +char *termname_sp( 25837 + SCREEN *sp) 25838 + { return(*(char **)0); } 25839 + 25840 #undef termname 25841 char *termname(void) 25842 { return(*(char **)0); } 25843 @@ -2734,16 +3426,34 @@ 25844 25845 /* ./tinfo/lib_ti.c */ 25846 25847 +#undef tigetflag_sp 25848 +int tigetflag_sp( 25849 + SCREEN *sp, 25850 + char *str) 25851 + { return(*(int *)0); } 25852 + 25853 #undef tigetflag 25854 int tigetflag( 25855 char *str) 25856 { return(*(int *)0); } 25857 25858 +#undef tigetnum_sp 25859 +int tigetnum_sp( 25860 + SCREEN *sp, 25861 + char *str) 25862 + { return(*(int *)0); } 25863 + 25864 #undef tigetnum 25865 int tigetnum( 25866 char *str) 25867 { return(*(int *)0); } 25868 25869 +#undef tigetstr_sp 25870 +char *tigetstr_sp( 25871 + SCREEN *sp, 25872 + char *str) 25873 + { return(*(char **)0); } 25874 + 25875 #undef tigetstr 25876 char *tigetstr( 25877 char *str) 25878 @@ -2781,25 +3491,75 @@ 25879 SCREEN *sp) 25880 { /* void */ } 25881 25882 +#undef delay_output_sp 25883 +int delay_output_sp( 25884 + SCREEN *sp, 25885 + int ms) 25886 + { return(*(int *)0); } 25887 + 25888 #undef delay_output 25889 int delay_output( 25890 int ms) 25891 { return(*(int *)0); } 25892 25893 +#undef _nc_flush_sp 25894 +void _nc_flush_sp( 25895 + SCREEN *sp) 25896 + { /* void */ } 25897 + 25898 #undef _nc_flush 25899 void _nc_flush(void) 25900 { /* void */ } 25901 25902 +#undef _nc_outch_sp 25903 +int _nc_outch_sp( 25904 + SCREEN *sp, 25905 + int ch) 25906 + { return(*(int *)0); } 25907 + 25908 #undef _nc_outch 25909 int _nc_outch( 25910 int ch) 25911 { return(*(int *)0); } 25912 25913 +#undef putp_sp 25914 +int putp_sp( 25915 + SCREEN *sp, 25916 + const char *string) 25917 + { return(*(int *)0); } 25918 + 25919 +#undef _nc_putp_sp 25920 +int _nc_putp_sp( 25921 + SCREEN *sp, 25922 + const char *name, 25923 + const char *string) 25924 + { return(*(int *)0); } 25925 + 25926 #undef putp 25927 int putp( 25928 const char *string) 25929 { return(*(int *)0); } 25930 25931 +#undef _nc_putp 25932 +int _nc_putp( 25933 + const char *name, 25934 + const char *string) 25935 + { return(*(int *)0); } 25936 + 25937 +#undef tputs_sp 25938 +int tputs_sp( 25939 + SCREEN *sp, 25940 + const char *string, 25941 + int affcnt, 25942 + NCURSES_OUTC_sp outc) 25943 + { return(*(int *)0); } 25944 + 25945 +#undef _nc_outc_wrapper 25946 +int _nc_outc_wrapper( 25947 + SCREEN *sp, 25948 + int c) 25949 + { return(*(int *)0); } 25950 + 25951 #undef tputs 25952 int tputs( 25953 const char *string, 25954 @@ -2944,36 +3704,78 @@ 25955 25956 /* ./tinfo/lib_ttyflags.c */ 25957 25958 +#undef _nc_get_tty_mode_sp 25959 +int _nc_get_tty_mode_sp( 25960 + SCREEN *sp, 25961 + struct termios *buf) 25962 + { return(*(int *)0); } 25963 + 25964 #undef _nc_get_tty_mode 25965 int _nc_get_tty_mode( 25966 struct termios *buf) 25967 { return(*(int *)0); } 25968 25969 +#undef _nc_set_tty_mode_sp 25970 +int _nc_set_tty_mode_sp( 25971 + SCREEN *sp, 25972 + struct termios *buf) 25973 + { return(*(int *)0); } 25974 + 25975 #undef _nc_set_tty_mode 25976 int _nc_set_tty_mode( 25977 struct termios *buf) 25978 { return(*(int *)0); } 25979 25980 +#undef def_shell_mode_sp 25981 +int def_shell_mode_sp( 25982 + SCREEN *sp) 25983 + { return(*(int *)0); } 25984 + 25985 #undef def_shell_mode 25986 int def_shell_mode(void) 25987 { return(*(int *)0); } 25988 25989 +#undef def_prog_mode_sp 25990 +int def_prog_mode_sp( 25991 + SCREEN *sp) 25992 + { return(*(int *)0); } 25993 + 25994 #undef def_prog_mode 25995 int def_prog_mode(void) 25996 { return(*(int *)0); } 25997 25998 +#undef reset_prog_mode_sp 25999 +int reset_prog_mode_sp( 26000 + SCREEN *sp) 26001 + { return(*(int *)0); } 26002 + 26003 #undef reset_prog_mode 26004 int reset_prog_mode(void) 26005 { return(*(int *)0); } 26006 26007 +#undef reset_shell_mode_sp 26008 +int reset_shell_mode_sp( 26009 + SCREEN *sp) 26010 + { return(*(int *)0); } 26011 + 26012 #undef reset_shell_mode 26013 int reset_shell_mode(void) 26014 { return(*(int *)0); } 26015 26016 +#undef savetty_sp 26017 +int savetty_sp( 26018 + SCREEN *sp) 26019 + { return(*(int *)0); } 26020 + 26021 #undef savetty 26022 int savetty(void) 26023 { return(*(int *)0); } 26024 26025 +#undef resetty_sp 26026 +int resetty_sp( 26027 + SCREEN *sp) 26028 + { return(*(int *)0); } 26029 + 26030 #undef resetty 26031 int resetty(void) 26032 { return(*(int *)0); } 26033 @@ -3053,6 +3855,13 @@ 26034 26035 /* ./tinfo/setbuf.c */ 26036 26037 +#undef _nc_set_buffer_sp 26038 +void _nc_set_buffer_sp( 26039 + SCREEN *sp, 26040 + FILE *ofp, 26041 + NCURSES_BOOL buffered) 26042 + { /* void */ } 26043 + 26044 #undef _nc_set_buffer 26045 void _nc_set_buffer( 26046 FILE *ofp, 26047 @@ -3144,8 +3953,8 @@ 26048 26049 /* ./unctrl.c */ 26050 26051 -#undef _nc_unctrl 26052 -char *_nc_unctrl( 26053 +#undef unctrl_sp 26054 +char *unctrl_sp( 26055 SCREEN *sp, 26056 chtype ch) 26057 { return(*(char **)0); } 26058 @@ -3394,6 +4203,13 @@ 26059 26060 /* ./base/define_key.c */ 26061 26062 +#undef define_key_sp 26063 +int define_key_sp( 26064 + SCREEN *sp, 26065 + const char *str, 26066 + int keycode) 26067 + { return(*(int *)0); } 26068 + 26069 #undef define_key 26070 int define_key( 26071 const char *str, 26072 @@ -3408,6 +4224,12 @@ 26073 26074 /* ./base/key_defined.c */ 26075 26076 +#undef key_defined_sp 26077 +int key_defined_sp( 26078 + SCREEN *sp, 26079 + const char *str) 26080 + { return(*(int *)0); } 26081 + 26082 #undef key_defined 26083 int key_defined( 26084 const char *str) 26085 @@ -3415,6 +4237,13 @@ 26086 26087 /* ./base/keybound.c */ 26088 26089 +#undef keybound_sp 26090 +char *keybound_sp( 26091 + SCREEN *sp, 26092 + int code, 26093 + int count) 26094 + { return(*(char **)0); } 26095 + 26096 #undef keybound 26097 char *keybound( 26098 int code, 26099 @@ -3423,6 +4252,13 @@ 26100 26101 /* ./base/keyok.c */ 26102 26103 +#undef keyok_sp 26104 +int keyok_sp( 26105 + SCREEN *sp, 26106 + int c, 26107 + NCURSES_BOOL flag) 26108 + { return(*(int *)0); } 26109 + 26110 #undef keyok 26111 int keyok( 26112 int c, 26113 diff -Naur ncurses-5.7.orig/ncurses/llib-lncursest ncurses-5.7/ncurses/llib-lncursest 26114 --- ncurses-5.7.orig/ncurses/llib-lncursest 2008-10-11 14:13:13.000000000 -0700 26115 +++ ncurses-5.7/ncurses/llib-lncursest 2009-07-19 15:04:11.000000000 -0700 26116 @@ -1,5 +1,5 @@ 26117 /**************************************************************************** 26118 - * Copyright (c) 2008 Free Software Foundation, Inc. * 26119 + * Copyright (c) 2008,2009 Free Software Foundation, Inc. * 26120 * * 26121 * Permission is hereby granted, free of charge, to any person obtaining a * 26122 * copy of this software and associated documentation files (the * 26123 @@ -27,7 +27,7 @@ 26124 ****************************************************************************/ 26125 26126 /**************************************************************************** 26127 - * Author: Thomas E. Dickey 2008 * 26128 + * Author: Thomas E. Dickey 2008-on * 26129 ****************************************************************************/ 26130 /* LINTLIBRARY */ 26131 26132 @@ -38,27 +38,54 @@ 26133 #undef _nc_oldnums 26134 int *_nc_oldnums; 26135 26136 +#undef _nc_scroll_optimize_sp 26137 +void _nc_scroll_optimize_sp( 26138 + SCREEN *sp) 26139 + { /* void */ } 26140 + 26141 #undef _nc_scroll_optimize 26142 void _nc_scroll_optimize(void) 26143 { /* void */ } 26144 26145 +#undef _nc_linedump_sp 26146 +void _nc_linedump_sp( 26147 + SCREEN *sp) 26148 + { /* void */ } 26149 + 26150 #undef _nc_linedump 26151 void _nc_linedump(void) 26152 { /* void */ } 26153 26154 /* ./tty/hashmap.c */ 26155 26156 -#include <term.h> 26157 +#undef _nc_hash_map_sp 26158 +void _nc_hash_map_sp( 26159 + SCREEN *sp) 26160 + { /* void */ } 26161 26162 #undef _nc_hash_map 26163 void _nc_hash_map(void) 26164 { /* void */ } 26165 26166 +#undef _nc_make_oldhash_sp 26167 +void _nc_make_oldhash_sp( 26168 + SCREEN *sp, 26169 + int i) 26170 + { /* void */ } 26171 + 26172 #undef _nc_make_oldhash 26173 void _nc_make_oldhash( 26174 int i) 26175 { /* void */ } 26176 26177 +#undef _nc_scroll_oldhash_sp 26178 +void _nc_scroll_oldhash_sp( 26179 + SCREEN *sp, 26180 + int n, 26181 + int top, 26182 + int bot) 26183 + { /* void */ } 26184 + 26185 #undef _nc_scroll_oldhash 26186 void _nc_scroll_oldhash( 26187 int n, 26188 @@ -112,6 +139,11 @@ 26189 26190 /* ./base/lib_beep.c */ 26191 26192 +#undef beep_sp 26193 +int beep_sp( 26194 + SCREEN *sp) 26195 + { return(*(int *)0); } 26196 + 26197 #undef beep 26198 int beep(void) 26199 { return(*(int *)0); } 26200 @@ -187,6 +219,7 @@ 26201 26202 /* ./base/lib_color.c */ 26203 26204 +#include <term.h> 26205 #include <tic.h> 26206 26207 #undef _nc_COLOR_PAIRS 26208 @@ -197,14 +230,32 @@ 26209 int _nc_COLORS(void) 26210 { return(*(int *)0); } 26211 26212 +#undef _nc_reset_colors_sp 26213 +NCURSES_BOOL _nc_reset_colors_sp( 26214 + SCREEN *sp) 26215 + { return(*(NCURSES_BOOL *)0); } 26216 + 26217 #undef _nc_reset_colors 26218 NCURSES_BOOL _nc_reset_colors(void) 26219 { return(*(NCURSES_BOOL *)0); } 26220 26221 +#undef start_color_sp 26222 +int start_color_sp( 26223 + SCREEN *sp) 26224 + { return(*(int *)0); } 26225 + 26226 #undef start_color 26227 int start_color(void) 26228 { return(*(int *)0); } 26229 26230 +#undef init_pair_sp 26231 +int init_pair_sp( 26232 + SCREEN *sp, 26233 + short pair, 26234 + short f, 26235 + short b) 26236 + { return(*(int *)0); } 26237 + 26238 #undef init_pair 26239 int init_pair( 26240 short pair, 26241 @@ -212,6 +263,15 @@ 26242 short b) 26243 { return(*(int *)0); } 26244 26245 +#undef init_color_sp 26246 +int init_color_sp( 26247 + SCREEN *sp, 26248 + short color, 26249 + short r, 26250 + short g, 26251 + short b) 26252 + { return(*(int *)0); } 26253 + 26254 #undef init_color 26255 int init_color( 26256 short color, 26257 @@ -220,14 +280,33 @@ 26258 short b) 26259 { return(*(int *)0); } 26260 26261 +#undef can_change_color_sp 26262 +NCURSES_BOOL can_change_color_sp( 26263 + SCREEN *sp) 26264 + { return(*(NCURSES_BOOL *)0); } 26265 + 26266 #undef can_change_color 26267 NCURSES_BOOL can_change_color(void) 26268 { return(*(NCURSES_BOOL *)0); } 26269 26270 +#undef has_colors_sp 26271 +NCURSES_BOOL has_colors_sp( 26272 + SCREEN *sp) 26273 + { return(*(NCURSES_BOOL *)0); } 26274 + 26275 #undef has_colors 26276 NCURSES_BOOL has_colors(void) 26277 { return(*(NCURSES_BOOL *)0); } 26278 26279 +#undef color_content_sp 26280 +int color_content_sp( 26281 + SCREEN *sp, 26282 + short color, 26283 + short *r, 26284 + short *g, 26285 + short *b) 26286 + { return(*(int *)0); } 26287 + 26288 #undef color_content 26289 int color_content( 26290 short color, 26291 @@ -236,6 +315,14 @@ 26292 short *b) 26293 { return(*(int *)0); } 26294 26295 +#undef pair_content_sp 26296 +int pair_content_sp( 26297 + SCREEN *sp, 26298 + short pair, 26299 + short *f, 26300 + short *b) 26301 + { return(*(int *)0); } 26302 + 26303 #undef pair_content 26304 int pair_content( 26305 short pair, 26306 @@ -243,13 +330,21 @@ 26307 short *b) 26308 { return(*(int *)0); } 26309 26310 +#undef _nc_do_color_sp 26311 +void _nc_do_color_sp( 26312 + SCREEN *sp, 26313 + short old_pair, 26314 + short pair, 26315 + NCURSES_BOOL reverse, 26316 + NCURSES_OUTC_sp outc) 26317 + { /* void */ } 26318 + 26319 #undef _nc_do_color 26320 void _nc_do_color( 26321 short old_pair, 26322 short pair, 26323 NCURSES_BOOL reverse, 26324 - int (*outc)( 26325 - int p1)) 26326 + NCURSES_OUTC outc) 26327 { /* void */ } 26328 26329 /* ./base/lib_colorset.c */ 26330 @@ -277,16 +372,31 @@ 26331 26332 /* ./base/lib_echo.c */ 26333 26334 +#undef echo_sp 26335 +int echo_sp( 26336 + SCREEN *sp) 26337 + { return(*(int *)0); } 26338 + 26339 #undef echo 26340 int echo(void) 26341 { return(*(int *)0); } 26342 26343 +#undef noecho_sp 26344 +int noecho_sp( 26345 + SCREEN *sp) 26346 + { return(*(int *)0); } 26347 + 26348 #undef noecho 26349 int noecho(void) 26350 { return(*(int *)0); } 26351 26352 /* ./base/lib_endwin.c */ 26353 26354 +#undef endwin_sp 26355 +int endwin_sp( 26356 + SCREEN *sp) 26357 + { return(*(int *)0); } 26358 + 26359 #undef endwin 26360 int endwin(void) 26361 { return(*(int *)0); } 26362 @@ -300,6 +410,11 @@ 26363 26364 /* ./base/lib_flash.c */ 26365 26366 +#undef flash_sp 26367 +int flash_sp( 26368 + SCREEN *sp) 26369 + { return(*(int *)0); } 26370 + 26371 #undef flash 26372 int flash(void) 26373 { return(*(int *)0); } 26374 @@ -1138,10 +1253,21 @@ 26375 26376 #include <fifo_defs.h> 26377 26378 +#undef _nc_ptr_Escdelay 26379 +int *_nc_ptr_Escdelay( 26380 + SCREEN *sp) 26381 + { return(*(int **)0); } 26382 + 26383 #undef _nc_ESCDELAY 26384 int _nc_ESCDELAY(void) 26385 { return(*(int *)0); } 26386 26387 +#undef set_escdelay_sp 26388 +int set_escdelay_sp( 26389 + SCREEN *sp, 26390 + int value) 26391 + { return(*(int *)0); } 26392 + 26393 #undef set_escdelay 26394 int set_escdelay( 26395 int value) 26396 @@ -1204,6 +1330,7 @@ 26397 26398 #undef _nc_insert_ch 26399 int _nc_insert_ch( 26400 + SCREEN *sp, 26401 WINDOW *win, 26402 chtype ch) 26403 { return(*(int *)0); } 26404 @@ -1242,6 +1369,11 @@ 26405 26406 /* ./base/lib_isendwin.c */ 26407 26408 +#undef isendwin_sp 26409 +NCURSES_BOOL isendwin_sp( 26410 + SCREEN *sp) 26411 + { return(*(NCURSES_BOOL *)0); } 26412 + 26413 #undef isendwin 26414 NCURSES_BOOL isendwin(void) 26415 { return(*(NCURSES_BOOL *)0); } 26416 @@ -1256,16 +1388,35 @@ 26417 26418 /* ./base/lib_mouse.c */ 26419 26420 +#undef getmouse_sp 26421 +int getmouse_sp( 26422 + SCREEN *sp, 26423 + MEVENT *aevent) 26424 + { return(*(int *)0); } 26425 + 26426 #undef getmouse 26427 int getmouse( 26428 MEVENT *aevent) 26429 { return(*(int *)0); } 26430 26431 +#undef ungetmouse_sp 26432 +int ungetmouse_sp( 26433 + SCREEN *sp, 26434 + MEVENT *aevent) 26435 + { return(*(int *)0); } 26436 + 26437 #undef ungetmouse 26438 int ungetmouse( 26439 MEVENT *aevent) 26440 { return(*(int *)0); } 26441 26442 +#undef mousemask_sp 26443 +mmask_t mousemask_sp( 26444 + SCREEN *sp, 26445 + mmask_t newmask, 26446 + mmask_t *oldmask) 26447 + { return(*(mmask_t *)0); } 26448 + 26449 #undef mousemask 26450 mmask_t mousemask( 26451 mmask_t newmask, 26452 @@ -1279,14 +1430,30 @@ 26453 int x) 26454 { return(*(NCURSES_BOOL *)0); } 26455 26456 +#undef mouseinterval_sp 26457 +int mouseinterval_sp( 26458 + SCREEN *sp, 26459 + int maxclick) 26460 + { return(*(int *)0); } 26461 + 26462 #undef mouseinterval 26463 int mouseinterval( 26464 int maxclick) 26465 { return(*(int *)0); } 26466 26467 #undef _nc_has_mouse 26468 -int _nc_has_mouse(void) 26469 - { return(*(int *)0); } 26470 +NCURSES_BOOL _nc_has_mouse( 26471 + SCREEN *sp) 26472 + { return(*(NCURSES_BOOL *)0); } 26473 + 26474 +#undef has_mouse_sp 26475 +NCURSES_BOOL has_mouse_sp( 26476 + SCREEN *sp) 26477 + { return(*(NCURSES_BOOL *)0); } 26478 + 26479 +#undef has_mouse 26480 +NCURSES_BOOL has_mouse(void) 26481 + { return(*(NCURSES_BOOL *)0); } 26482 26483 #undef wmouse_trafo 26484 NCURSES_BOOL wmouse_trafo( 26485 @@ -1307,24 +1474,55 @@ 26486 26487 /* ./tty/lib_mvcur.c */ 26488 26489 +#undef _nc_msec_cost_sp 26490 +int _nc_msec_cost_sp( 26491 + SCREEN *sp, 26492 + const char *const cap, 26493 + int affcnt) 26494 + { return(*(int *)0); } 26495 + 26496 #undef _nc_msec_cost 26497 int _nc_msec_cost( 26498 const char *const cap, 26499 int affcnt) 26500 { return(*(int *)0); } 26501 26502 +#undef _nc_mvcur_resume_sp 26503 +void _nc_mvcur_resume_sp( 26504 + SCREEN *sp) 26505 + { /* void */ } 26506 + 26507 #undef _nc_mvcur_resume 26508 void _nc_mvcur_resume(void) 26509 { /* void */ } 26510 26511 +#undef _nc_mvcur_init_sp 26512 +void _nc_mvcur_init_sp( 26513 + SCREEN *sp) 26514 + { /* void */ } 26515 + 26516 #undef _nc_mvcur_init 26517 void _nc_mvcur_init(void) 26518 { /* void */ } 26519 26520 +#undef _nc_mvcur_wrap_sp 26521 +void _nc_mvcur_wrap_sp( 26522 + SCREEN *sp) 26523 + { /* void */ } 26524 + 26525 #undef _nc_mvcur_wrap 26526 void _nc_mvcur_wrap(void) 26527 { /* void */ } 26528 26529 +#undef mvcur_sp 26530 +int mvcur_sp( 26531 + SCREEN *sp, 26532 + int yold, 26533 + int xold, 26534 + int ynew, 26535 + int xnew) 26536 + { return(*(int *)0); } 26537 + 26538 #undef mvcur 26539 int mvcur( 26540 int yold, 26541 @@ -1347,14 +1545,32 @@ 26542 26543 /* ./base/lib_newterm.c */ 26544 26545 +#undef filter_sp 26546 +void filter_sp( 26547 + SCREEN *sp) 26548 + { /* void */ } 26549 + 26550 #undef filter 26551 void filter(void) 26552 { /* void */ } 26553 26554 +#undef nofilter_sp 26555 +void nofilter_sp( 26556 + SCREEN *sp) 26557 + { /* void */ } 26558 + 26559 #undef nofilter 26560 void nofilter(void) 26561 { /* void */ } 26562 26563 +#undef newterm_sp 26564 +SCREEN *newterm_sp( 26565 + SCREEN *sp, 26566 + char *name, 26567 + FILE *ofp, 26568 + FILE *ifp) 26569 + { return(*(SCREEN **)0); } 26570 + 26571 #undef newterm 26572 SCREEN *newterm( 26573 char *name, 26574 @@ -1369,6 +1585,15 @@ 26575 WINDOW *win) 26576 { return(*(int *)0); } 26577 26578 +#undef newwin_sp 26579 +WINDOW *newwin_sp( 26580 + SCREEN *sp, 26581 + int num_lines, 26582 + int num_columns, 26583 + int begy, 26584 + int begx) 26585 + { return(*(WINDOW **)0); } 26586 + 26587 #undef newwin 26588 WINDOW *newwin( 26589 int num_lines, 26590 @@ -1395,6 +1620,16 @@ 26591 int x) 26592 { return(*(WINDOW **)0); } 26593 26594 +#undef _nc_makenew_sp 26595 +WINDOW *_nc_makenew_sp( 26596 + SCREEN *sp, 26597 + int num_lines, 26598 + int num_columns, 26599 + int begy, 26600 + int begx, 26601 + int flags) 26602 + { return(*(WINDOW **)0); } 26603 + 26604 #undef _nc_makenew 26605 WINDOW *_nc_makenew( 26606 int num_lines, 26607 @@ -1404,17 +1639,37 @@ 26608 int flags) 26609 { return(*(WINDOW **)0); } 26610 26611 -#undef _nc_screen_of 26612 -SCREEN *_nc_screen_of( 26613 - WINDOW *win) 26614 - { return(*(SCREEN **)0); } 26615 +#undef _nc_curscr_of 26616 +WINDOW *_nc_curscr_of( 26617 + SCREEN *sp) 26618 + { return(*(WINDOW **)0); } 26619 + 26620 +#undef _nc_newscr_of 26621 +WINDOW *_nc_newscr_of( 26622 + SCREEN *sp) 26623 + { return(*(WINDOW **)0); } 26624 + 26625 +#undef _nc_stdscr_of 26626 +WINDOW *_nc_stdscr_of( 26627 + SCREEN *sp) 26628 + { return(*(WINDOW **)0); } 26629 26630 /* ./base/lib_nl.c */ 26631 26632 +#undef nl_sp 26633 +int nl_sp( 26634 + SCREEN *sp) 26635 + { return(*(int *)0); } 26636 + 26637 #undef nl 26638 int nl(void) 26639 { return(*(int *)0); } 26640 26641 +#undef nonl_sp 26642 +int nonl_sp( 26643 + SCREEN *sp) 26644 + { return(*(int *)0); } 26645 + 26646 #undef nonl 26647 int nonl(void) 26648 { return(*(int *)0); } 26649 @@ -1448,6 +1703,13 @@ 26650 26651 /* ./base/lib_pad.c */ 26652 26653 +#undef newpad_sp 26654 +WINDOW *newpad_sp( 26655 + SCREEN *sp, 26656 + int l, 26657 + int c) 26658 + { return(*(WINDOW **)0); } 26659 + 26660 #undef newpad 26661 WINDOW *newpad( 26662 int l, 26663 @@ -1553,6 +1815,14 @@ 26664 26665 /* ./base/lib_restart.c */ 26666 26667 +#undef restartterm_sp 26668 +int restartterm_sp( 26669 + SCREEN *sp, 26670 + char *termp, 26671 + int filenum, 26672 + int *errret) 26673 + { return(*(int *)0); } 26674 + 26675 #undef restartterm 26676 int restartterm( 26677 char *termp, 26678 @@ -1601,6 +1871,12 @@ 26679 26680 /* ./base/lib_screen.c */ 26681 26682 +#undef getwin_sp 26683 +WINDOW *getwin_sp( 26684 + SCREEN *sp, 26685 + FILE *filep) 26686 + { return(*(WINDOW **)0); } 26687 + 26688 #undef getwin 26689 WINDOW *getwin( 26690 FILE *filep) 26691 @@ -1612,6 +1888,12 @@ 26692 FILE *filep) 26693 { return(*(int *)0); } 26694 26695 +#undef scr_restore_sp 26696 +int scr_restore_sp( 26697 + SCREEN *sp, 26698 + const char *file) 26699 + { return(*(int *)0); } 26700 + 26701 #undef scr_restore 26702 int scr_restore( 26703 const char *file) 26704 @@ -1622,11 +1904,23 @@ 26705 const char *file) 26706 { return(*(int *)0); } 26707 26708 +#undef scr_init_sp 26709 +int scr_init_sp( 26710 + SCREEN *sp, 26711 + const char *file) 26712 + { return(*(int *)0); } 26713 + 26714 #undef scr_init 26715 int scr_init( 26716 const char *file) 26717 { return(*(int *)0); } 26718 26719 +#undef scr_set_sp 26720 +int scr_set_sp( 26721 + SCREEN *sp, 26722 + const char *file) 26723 + { return(*(int *)0); } 26724 + 26725 #undef scr_set 26726 int scr_set( 26727 const char *file) 26728 @@ -1687,6 +1981,15 @@ 26729 int slk_format) 26730 { return(*(int *)0); } 26731 26732 +#undef _nc_ripoffline_sp 26733 +int _nc_ripoffline_sp( 26734 + SCREEN *sp, 26735 + int line, 26736 + int (*init)( 26737 + WINDOW *p1, 26738 + int p2)) 26739 + { return(*(int *)0); } 26740 + 26741 #undef _nc_ripoffline 26742 int _nc_ripoffline( 26743 int line, 26744 @@ -1695,6 +1998,15 @@ 26745 int p2)) 26746 { return(*(int *)0); } 26747 26748 +#undef ripoffline_sp 26749 +int ripoffline_sp( 26750 + SCREEN *sp, 26751 + int line, 26752 + int (*init)( 26753 + WINDOW *p1, 26754 + int p2)) 26755 + { return(*(int *)0); } 26756 + 26757 #undef ripoffline 26758 int ripoffline( 26759 int line, 26760 @@ -1711,12 +2023,25 @@ 26761 int cols) 26762 { return(*(int *)0); } 26763 26764 +#undef slk_restore_sp 26765 +int slk_restore_sp( 26766 + SCREEN *sp) 26767 + { return(*(int *)0); } 26768 + 26769 #undef slk_restore 26770 int slk_restore(void) 26771 { return(*(int *)0); } 26772 26773 /* ./base/lib_slkatr_set.c */ 26774 26775 +#undef slk_attr_set_sp 26776 +int slk_attr_set_sp( 26777 + SCREEN *sp, 26778 + const attr_t attr, 26779 + short color_pair_number, 26780 + void *opts) 26781 + { return(*(int *)0); } 26782 + 26783 #undef slk_attr_set 26784 int slk_attr_set( 26785 const attr_t attr, 26786 @@ -1726,6 +2051,12 @@ 26787 26788 /* ./base/lib_slkatrof.c */ 26789 26790 +#undef slk_attroff_sp 26791 +int slk_attroff_sp( 26792 + SCREEN *sp, 26793 + const chtype attr) 26794 + { return(*(int *)0); } 26795 + 26796 #undef slk_attroff 26797 int slk_attroff( 26798 const chtype attr) 26799 @@ -1733,6 +2064,12 @@ 26800 26801 /* ./base/lib_slkatron.c */ 26802 26803 +#undef slk_attron_sp 26804 +int slk_attron_sp( 26805 + SCREEN *sp, 26806 + const chtype attr) 26807 + { return(*(int *)0); } 26808 + 26809 #undef slk_attron 26810 int slk_attron( 26811 const chtype attr) 26812 @@ -1740,6 +2077,12 @@ 26813 26814 /* ./base/lib_slkatrset.c */ 26815 26816 +#undef slk_attrset_sp 26817 +int slk_attrset_sp( 26818 + SCREEN *sp, 26819 + const chtype attr) 26820 + { return(*(int *)0); } 26821 + 26822 #undef slk_attrset 26823 int slk_attrset( 26824 const chtype attr) 26825 @@ -1747,18 +2090,34 @@ 26826 26827 /* ./base/lib_slkattr.c */ 26828 26829 +#undef slk_attr_sp 26830 +attr_t slk_attr_sp( 26831 + SCREEN *sp) 26832 + { return(*(attr_t *)0); } 26833 + 26834 #undef slk_attr 26835 attr_t slk_attr(void) 26836 { return(*(attr_t *)0); } 26837 26838 /* ./base/lib_slkclear.c */ 26839 26840 +#undef slk_clear_sp 26841 +int slk_clear_sp( 26842 + SCREEN *sp) 26843 + { return(*(int *)0); } 26844 + 26845 #undef slk_clear 26846 int slk_clear(void) 26847 { return(*(int *)0); } 26848 26849 /* ./base/lib_slkcolor.c */ 26850 26851 +#undef slk_color_sp 26852 +int slk_color_sp( 26853 + SCREEN *sp, 26854 + short color_pair_number) 26855 + { return(*(int *)0); } 26856 + 26857 #undef slk_color 26858 int slk_color( 26859 short color_pair_number) 26860 @@ -1766,13 +2125,25 @@ 26861 26862 /* ./base/lib_slkinit.c */ 26863 26864 -#undef slk_init 26865 +#undef slk_init_sp 26866 +int slk_init_sp( 26867 + SCREEN *sp, 26868 + int format) 26869 + { return(*(int *)0); } 26870 + 26871 +#undef slk_init 26872 int slk_init( 26873 int format) 26874 { return(*(int *)0); } 26875 26876 /* ./base/lib_slklab.c */ 26877 26878 +#undef slk_label_sp 26879 +char *slk_label_sp( 26880 + SCREEN *sp, 26881 + int n) 26882 + { return(*(char **)0); } 26883 + 26884 #undef slk_label 26885 char *slk_label( 26886 int n) 26887 @@ -1780,16 +2151,34 @@ 26888 26889 /* ./base/lib_slkrefr.c */ 26890 26891 +#undef slk_noutrefresh_sp 26892 +int slk_noutrefresh_sp( 26893 + SCREEN *sp) 26894 + { return(*(int *)0); } 26895 + 26896 #undef slk_noutrefresh 26897 int slk_noutrefresh(void) 26898 { return(*(int *)0); } 26899 26900 +#undef slk_refresh_sp 26901 +int slk_refresh_sp( 26902 + SCREEN *sp) 26903 + { return(*(int *)0); } 26904 + 26905 #undef slk_refresh 26906 int slk_refresh(void) 26907 { return(*(int *)0); } 26908 26909 /* ./base/lib_slkset.c */ 26910 26911 +#undef slk_set_sp 26912 +int slk_set_sp( 26913 + SCREEN *sp, 26914 + int i, 26915 + const char *astr, 26916 + int format) 26917 + { return(*(int *)0); } 26918 + 26919 #undef slk_set 26920 int slk_set( 26921 int i, 26922 @@ -1799,6 +2188,11 @@ 26923 26924 /* ./base/lib_slktouch.c */ 26925 26926 +#undef slk_touch_sp 26927 +int slk_touch_sp( 26928 + SCREEN *sp) 26929 + { return(*(int *)0); } 26930 + 26931 #undef slk_touch 26932 int slk_touch(void) 26933 { return(*(int *)0); } 26934 @@ -1861,8 +2255,8 @@ 26935 SCREEN *sp) 26936 { /* void */ } 26937 26938 -#undef _nc_ungetch 26939 -int _nc_ungetch( 26940 +#undef ungetch_sp 26941 +int ungetch_sp( 26942 SCREEN *sp, 26943 int ch) 26944 { return(*(int *)0); } 26945 @@ -1874,11 +2268,23 @@ 26946 26947 /* ./tty/lib_vidattr.c */ 26948 26949 +#undef vidputs_sp 26950 +int vidputs_sp( 26951 + SCREEN *sp, 26952 + chtype newmode, 26953 + NCURSES_OUTC_sp outc) 26954 + { return(*(int *)0); } 26955 + 26956 #undef vidputs 26957 int vidputs( 26958 chtype newmode, 26959 - int (*outc)( 26960 - int p1)) 26961 + NCURSES_OUTC outc) 26962 + { return(*(int *)0); } 26963 + 26964 +#undef vidattr_sp 26965 +int vidattr_sp( 26966 + SCREEN *sp, 26967 + chtype newmode) 26968 { return(*(int *)0); } 26969 26970 #undef vidattr 26971 @@ -1886,6 +2292,11 @@ 26972 chtype newmode) 26973 { return(*(int *)0); } 26974 26975 +#undef termattrs_sp 26976 +chtype termattrs_sp( 26977 + SCREEN *sp) 26978 + { return(*(chtype *)0); } 26979 + 26980 #undef termattrs 26981 chtype termattrs(void) 26982 { return(*(chtype *)0); } 26983 @@ -1966,12 +2377,24 @@ 26984 26985 /* ./base/nc_panel.c */ 26986 26987 +#undef _nc_panelhook_sp 26988 +struct panelhook *_nc_panelhook_sp( 26989 + SCREEN *sp) 26990 + { return(*(struct panelhook **)0); } 26991 + 26992 #undef _nc_panelhook 26993 struct panelhook *_nc_panelhook(void) 26994 { return(*(struct panelhook **)0); } 26995 26996 /* ./base/safe_sprintf.c */ 26997 26998 +#undef _nc_printf_string_sp 26999 +char *_nc_printf_string_sp( 27000 + SCREEN *sp, 27001 + const char *fmt, 27002 + va_list ap) 27003 + { return(*(char **)0); } 27004 + 27005 #undef _nc_printf_string 27006 char *_nc_printf_string( 27007 const char *fmt, 27008 @@ -1983,10 +2406,24 @@ 27009 #include <sys/time.h> 27010 #include <sys/times.h> 27011 27012 +#undef doupdate_sp 27013 +int doupdate_sp( 27014 + SCREEN *sp) 27015 + { return(*(int *)0); } 27016 + 27017 #undef doupdate 27018 int doupdate(void) 27019 { return(*(int *)0); } 27020 27021 +#undef _nc_scrolln_sp 27022 +int _nc_scrolln_sp( 27023 + SCREEN *sp, 27024 + int n, 27025 + int top, 27026 + int bot, 27027 + int maxy) 27028 + { return(*(int *)0); } 27029 + 27030 #undef _nc_scrolln 27031 int _nc_scrolln( 27032 int n, 27033 @@ -1995,18 +2432,39 @@ 27034 int maxy) 27035 { return(*(int *)0); } 27036 27037 +#undef _nc_screen_resume_sp 27038 +void _nc_screen_resume_sp( 27039 + SCREEN *sp) 27040 + { /* void */ } 27041 + 27042 #undef _nc_screen_resume 27043 void _nc_screen_resume(void) 27044 { /* void */ } 27045 27046 +#undef _nc_screen_init_sp 27047 +void _nc_screen_init_sp( 27048 + SCREEN *sp) 27049 + { /* void */ } 27050 + 27051 #undef _nc_screen_init 27052 void _nc_screen_init(void) 27053 { /* void */ } 27054 27055 +#undef _nc_screen_wrap_sp 27056 +void _nc_screen_wrap_sp( 27057 + SCREEN *sp) 27058 + { /* void */ } 27059 + 27060 #undef _nc_screen_wrap 27061 void _nc_screen_wrap(void) 27062 { /* void */ } 27063 27064 +#undef _nc_do_xmc_glitch_sp 27065 +void _nc_do_xmc_glitch_sp( 27066 + SCREEN *sp, 27067 + attr_t previous) 27068 + { /* void */ } 27069 + 27070 #undef _nc_do_xmc_glitch 27071 void _nc_do_xmc_glitch( 27072 attr_t previous) 27073 @@ -2044,6 +2502,12 @@ 27074 void _nc_freeall(void) 27075 { /* void */ } 27076 27077 +#undef _nc_free_and_exit_sp 27078 +void _nc_free_and_exit_sp( 27079 + SCREEN *sp, 27080 + int code) 27081 + { /* void */ } 27082 + 27083 #undef _nc_free_and_exit 27084 void _nc_free_and_exit( 27085 int code) 27086 @@ -2063,6 +2527,24 @@ 27087 attr_t at) 27088 { /* void */ } 27089 27090 +#undef _nc_DelCharCost_sp 27091 +int _nc_DelCharCost_sp( 27092 + SCREEN *sp, 27093 + int count) 27094 + { return(*(int *)0); } 27095 + 27096 +#undef _nc_InsCharCost_sp 27097 +int _nc_InsCharCost_sp( 27098 + SCREEN *sp, 27099 + int count) 27100 + { return(*(int *)0); } 27101 + 27102 +#undef _nc_UpdateAttrs_sp 27103 +void _nc_UpdateAttrs_sp( 27104 + SCREEN *sp, 27105 + chtype c) 27106 + { /* void */ } 27107 + 27108 #undef _nc_DelCharCost 27109 int _nc_DelCharCost( 27110 int count) 27111 @@ -2080,6 +2562,12 @@ 27112 27113 /* ./base/legacy_coding.c */ 27114 27115 +#undef use_legacy_coding_sp 27116 +int use_legacy_coding_sp( 27117 + SCREEN *sp, 27118 + int level) 27119 + { return(*(int *)0); } 27120 + 27121 #undef use_legacy_coding 27122 int use_legacy_coding( 27123 int level) 27124 @@ -2087,10 +2575,22 @@ 27125 27126 /* ./base/lib_dft_fgbg.c */ 27127 27128 +#undef use_default_colors_sp 27129 +int use_default_colors_sp( 27130 + SCREEN *sp) 27131 + { return(*(int *)0); } 27132 + 27133 #undef use_default_colors 27134 int use_default_colors(void) 27135 { return(*(int *)0); } 27136 27137 +#undef assume_default_colors_sp 27138 +int assume_default_colors_sp( 27139 + SCREEN *sp, 27140 + int fg, 27141 + int bg) 27142 + { return(*(int *)0); } 27143 + 27144 #undef assume_default_colors 27145 int assume_default_colors( 27146 int fg, 27147 @@ -2099,6 +2599,13 @@ 27148 27149 /* ./tinfo/lib_print.c */ 27150 27151 +#undef mcprint_sp 27152 +int mcprint_sp( 27153 + SCREEN *sp, 27154 + char *data, 27155 + int len) 27156 + { return(*(int *)0); } 27157 + 27158 #undef mcprint 27159 int mcprint( 27160 char *data, 27161 @@ -2107,18 +2614,39 @@ 27162 27163 /* ./base/resizeterm.c */ 27164 27165 +#undef is_term_resized_sp 27166 +NCURSES_BOOL is_term_resized_sp( 27167 + SCREEN *sp, 27168 + int ToLines, 27169 + int ToCols) 27170 + { return(*(NCURSES_BOOL *)0); } 27171 + 27172 #undef is_term_resized 27173 NCURSES_BOOL is_term_resized( 27174 int ToLines, 27175 int ToCols) 27176 { return(*(NCURSES_BOOL *)0); } 27177 27178 +#undef resize_term_sp 27179 +int resize_term_sp( 27180 + SCREEN *sp, 27181 + int ToLines, 27182 + int ToCols) 27183 + { return(*(int *)0); } 27184 + 27185 #undef resize_term 27186 int resize_term( 27187 int ToLines, 27188 int ToCols) 27189 { return(*(int *)0); } 27190 27191 +#undef resizeterm_sp 27192 +int resizeterm_sp( 27193 + SCREEN *sp, 27194 + int ToLines, 27195 + int ToCols) 27196 + { return(*(int *)0); } 27197 + 27198 #undef resizeterm 27199 int resizeterm( 27200 int ToLines, 27201 @@ -2408,6 +2936,11 @@ 27202 chtype *_nc_acs_map(void) 27203 { return(*(chtype **)0); } 27204 27205 +#undef _nc_init_acs_sp 27206 +void _nc_init_acs_sp( 27207 + SCREEN *sp) 27208 + { /* void */ } 27209 + 27210 #undef _nc_init_acs 27211 void _nc_init_acs(void) 27212 { /* void */ } 27213 @@ -2431,6 +2964,11 @@ 27214 int BaudRate) 27215 { return(*(int *)0); } 27216 27217 +#undef baudrate_sp 27218 +int baudrate_sp( 27219 + SCREEN *sp) 27220 + { return(*(int *)0); } 27221 + 27222 #undef baudrate 27223 int baudrate(void) 27224 { return(*(int *)0); } 27225 @@ -2446,6 +2984,12 @@ 27226 TERMINAL *termp) 27227 { return(*(TERMINAL **)0); } 27228 27229 +#undef del_curterm_sp 27230 +int del_curterm_sp( 27231 + SCREEN *sp, 27232 + TERMINAL *termp) 27233 + { return(*(int *)0); } 27234 + 27235 #undef del_curterm 27236 int del_curterm( 27237 TERMINAL *termp) 27238 @@ -2474,6 +3018,11 @@ 27239 #undef _nc_prescreen 27240 NCURSES_PRESCREEN _nc_prescreen; 27241 27242 +#undef _nc_screen_of 27243 +SCREEN *_nc_screen_of( 27244 + WINDOW *win) 27245 + { return(*(SCREEN **)0); } 27246 + 27247 #undef _nc_init_pthreads 27248 void _nc_init_pthreads(void) 27249 { /* void */ } 27250 @@ -2500,24 +3049,49 @@ 27251 27252 /* ./tinfo/lib_has_cap.c */ 27253 27254 +#undef has_ic_sp 27255 +NCURSES_BOOL has_ic_sp( 27256 + SCREEN *sp) 27257 + { return(*(NCURSES_BOOL *)0); } 27258 + 27259 #undef has_ic 27260 NCURSES_BOOL has_ic(void) 27261 { return(*(NCURSES_BOOL *)0); } 27262 27263 +#undef has_il_sp 27264 +NCURSES_BOOL has_il_sp( 27265 + SCREEN *sp) 27266 + { return(*(NCURSES_BOOL *)0); } 27267 + 27268 #undef has_il 27269 NCURSES_BOOL has_il(void) 27270 { return(*(NCURSES_BOOL *)0); } 27271 27272 /* ./tinfo/lib_kernel.c */ 27273 27274 +#undef erasechar_sp 27275 +char erasechar_sp( 27276 + SCREEN *sp) 27277 + { return(*(char *)0); } 27278 + 27279 #undef erasechar 27280 char erasechar(void) 27281 { return(*(char *)0); } 27282 27283 +#undef killchar_sp 27284 +char killchar_sp( 27285 + SCREEN *sp) 27286 + { return(*(char *)0); } 27287 + 27288 #undef killchar 27289 char killchar(void) 27290 { return(*(char *)0); } 27291 27292 +#undef flushinp_sp 27293 +int flushinp_sp( 27294 + SCREEN *sp) 27295 + { return(*(int *)0); } 27296 + 27297 #undef flushinp 27298 int flushinp(void) 27299 { return(*(int *)0); } 27300 @@ -2526,8 +3100,8 @@ 27301 27302 struct kn { short offset; int code; }; 27303 27304 -#undef _nc_keyname 27305 -char *_nc_keyname( 27306 +#undef keyname_sp 27307 +char *keyname_sp( 27308 SCREEN *sp, 27309 int c) 27310 { return(*(char **)0); } 27311 @@ -2539,12 +3113,23 @@ 27312 27313 /* ./tinfo/lib_longname.c */ 27314 27315 +#undef longname_sp 27316 +char *longname_sp( 27317 + SCREEN *sp) 27318 + { return(*(char **)0); } 27319 + 27320 #undef longname 27321 char *longname(void) 27322 { return(*(char **)0); } 27323 27324 /* ./tinfo/lib_napms.c */ 27325 27326 +#undef napms_sp 27327 +int napms_sp( 27328 + SCREEN *sp, 27329 + int ms) 27330 + { return(*(int *)0); } 27331 + 27332 #undef napms 27333 int napms( 27334 int ms) 27335 @@ -2564,6 +3149,12 @@ 27336 NCURSES_BOOL flag) 27337 { /* void */ } 27338 27339 +#undef halfdelay_sp 27340 +int halfdelay_sp( 27341 + SCREEN *sp, 27342 + int t) 27343 + { return(*(int *)0); } 27344 + 27345 #undef halfdelay 27346 int halfdelay( 27347 int t) 27348 @@ -2599,21 +3190,52 @@ 27349 NCURSES_BOOL flag) 27350 { return(*(int *)0); } 27351 27352 +#undef curs_set_sp 27353 +int curs_set_sp( 27354 + SCREEN *sp, 27355 + int vis) 27356 + { return(*(int *)0); } 27357 + 27358 #undef curs_set 27359 int curs_set( 27360 int vis) 27361 { return(*(int *)0); } 27362 27363 +#undef typeahead_sp 27364 +int typeahead_sp( 27365 + SCREEN *sp, 27366 + int fd) 27367 + { return(*(int *)0); } 27368 + 27369 #undef typeahead 27370 int typeahead( 27371 int fd) 27372 { return(*(int *)0); } 27373 27374 +#undef has_key_sp 27375 +int has_key_sp( 27376 + SCREEN *sp, 27377 + int keycode) 27378 + { return(*(int *)0); } 27379 + 27380 #undef has_key 27381 int has_key( 27382 int keycode) 27383 { return(*(int *)0); } 27384 27385 +#undef _nc_putp_flush_sp 27386 +int _nc_putp_flush_sp( 27387 + SCREEN *sp, 27388 + const char *name, 27389 + const char *value) 27390 + { return(*(int *)0); } 27391 + 27392 +#undef _nc_putp_flush 27393 +int _nc_putp_flush( 27394 + const char *name, 27395 + const char *value) 27396 + { return(*(int *)0); } 27397 + 27398 #undef _nc_keypad 27399 int _nc_keypad( 27400 SCREEN *sp, 27401 @@ -2622,30 +3244,67 @@ 27402 27403 /* ./tinfo/lib_raw.c */ 27404 27405 +#undef raw_sp 27406 +int raw_sp( 27407 + SCREEN *sp) 27408 + { return(*(int *)0); } 27409 + 27410 #undef raw 27411 int raw(void) 27412 { return(*(int *)0); } 27413 27414 +#undef cbreak_sp 27415 +int cbreak_sp( 27416 + SCREEN *sp) 27417 + { return(*(int *)0); } 27418 + 27419 #undef cbreak 27420 int cbreak(void) 27421 { return(*(int *)0); } 27422 27423 +#undef qiflush_sp 27424 +void qiflush_sp( 27425 + SCREEN *sp) 27426 + { /* void */ } 27427 + 27428 #undef qiflush 27429 void qiflush(void) 27430 { /* void */ } 27431 27432 +#undef noraw_sp 27433 +int noraw_sp( 27434 + SCREEN *sp) 27435 + { return(*(int *)0); } 27436 + 27437 #undef noraw 27438 int noraw(void) 27439 { return(*(int *)0); } 27440 27441 +#undef nocbreak_sp 27442 +int nocbreak_sp( 27443 + SCREEN *sp) 27444 + { return(*(int *)0); } 27445 + 27446 #undef nocbreak 27447 int nocbreak(void) 27448 { return(*(int *)0); } 27449 27450 +#undef noqiflush_sp 27451 +void noqiflush_sp( 27452 + SCREEN *sp) 27453 + { /* void */ } 27454 + 27455 #undef noqiflush 27456 void noqiflush(void) 27457 { /* void */ } 27458 27459 +#undef intrflush_sp 27460 +int intrflush_sp( 27461 + SCREEN *sp, 27462 + WINDOW *win, 27463 + NCURSES_BOOL flag) 27464 + { return(*(int *)0); } 27465 + 27466 #undef intrflush 27467 int intrflush( 27468 WINDOW *win, 27469 @@ -2663,7 +3322,8 @@ 27470 { return(*(char **)0); } 27471 27472 #undef _nc_ptr_Lines 27473 -int *_nc_ptr_Lines(void) 27474 +int *_nc_ptr_Lines( 27475 + SCREEN *sp) 27476 { return(*(int **)0); } 27477 27478 #undef _nc_LINES 27479 @@ -2671,17 +3331,29 @@ 27480 { return(*(int *)0); } 27481 27482 #undef _nc_ptr_Cols 27483 -int *_nc_ptr_Cols(void) 27484 +int *_nc_ptr_Cols( 27485 + SCREEN *sp) 27486 { return(*(int **)0); } 27487 27488 #undef _nc_COLS 27489 int _nc_COLS(void) 27490 { return(*(int *)0); } 27491 27492 +#undef _nc_ptr_Tabsize 27493 +int *_nc_ptr_Tabsize( 27494 + SCREEN *sp) 27495 + { return(*(int **)0); } 27496 + 27497 #undef _nc_TABSIZE 27498 int _nc_TABSIZE(void) 27499 { return(*(int *)0); } 27500 27501 +#undef set_tabsize_sp 27502 +int set_tabsize_sp( 27503 + SCREEN *sp, 27504 + int value) 27505 + { return(*(int *)0); } 27506 + 27507 #undef set_tabsize 27508 int set_tabsize( 27509 int value) 27510 @@ -2692,6 +3364,12 @@ 27511 SCREEN *sp) 27512 { return(*(int *)0); } 27513 27514 +#undef use_env_sp 27515 +void use_env_sp( 27516 + SCREEN *sp, 27517 + NCURSES_BOOL f) 27518 + { /* void */ } 27519 + 27520 #undef use_env 27521 void use_env( 27522 NCURSES_BOOL f) 27523 @@ -2744,8 +3422,9 @@ 27524 #undef BC 27525 char *BC; 27526 27527 -#undef tgetent 27528 -int tgetent( 27529 +#undef tgetent_sp 27530 +int tgetent_sp( 27531 + SCREEN *sp, 27532 char *bufp, 27533 const char *name) 27534 { return(*(int *)0); } 27535 @@ -2756,16 +3435,41 @@ 27536 27537 #endif 27538 27539 +#undef tgetent 27540 +int tgetent( 27541 + char *bufp, 27542 + const char *name) 27543 + { return(*(int *)0); } 27544 + 27545 +#undef tgetflag_sp 27546 +int tgetflag_sp( 27547 + SCREEN *sp, 27548 + char *id) 27549 + { return(*(int *)0); } 27550 + 27551 #undef tgetflag 27552 int tgetflag( 27553 char *id) 27554 { return(*(int *)0); } 27555 27556 +#undef tgetnum_sp 27557 +int tgetnum_sp( 27558 + SCREEN *sp, 27559 + char *id) 27560 + { return(*(int *)0); } 27561 + 27562 #undef tgetnum 27563 int tgetnum( 27564 char *id) 27565 { return(*(int *)0); } 27566 27567 +#undef tgetstr_sp 27568 +char *tgetstr_sp( 27569 + SCREEN *sp, 27570 + char *id, 27571 + char **area) 27572 + { return(*(char **)0); } 27573 + 27574 #undef tgetstr 27575 char *tgetstr( 27576 char *id, 27577 @@ -2774,6 +3478,11 @@ 27578 27579 /* ./tinfo/lib_termname.c */ 27580 27581 +#undef termname_sp 27582 +char *termname_sp( 27583 + SCREEN *sp) 27584 + { return(*(char **)0); } 27585 + 27586 #undef termname 27587 char *termname(void) 27588 { return(*(char **)0); } 27589 @@ -2789,16 +3498,34 @@ 27590 27591 /* ./tinfo/lib_ti.c */ 27592 27593 +#undef tigetflag_sp 27594 +int tigetflag_sp( 27595 + SCREEN *sp, 27596 + char *str) 27597 + { return(*(int *)0); } 27598 + 27599 #undef tigetflag 27600 int tigetflag( 27601 char *str) 27602 { return(*(int *)0); } 27603 27604 +#undef tigetnum_sp 27605 +int tigetnum_sp( 27606 + SCREEN *sp, 27607 + char *str) 27608 + { return(*(int *)0); } 27609 + 27610 #undef tigetnum 27611 int tigetnum( 27612 char *str) 27613 { return(*(int *)0); } 27614 27615 +#undef tigetstr_sp 27616 +char *tigetstr_sp( 27617 + SCREEN *sp, 27618 + char *str) 27619 + { return(*(char **)0); } 27620 + 27621 #undef tigetstr 27622 char *tigetstr( 27623 char *str) 27624 @@ -2836,25 +3563,75 @@ 27625 SCREEN *sp) 27626 { /* void */ } 27627 27628 +#undef delay_output_sp 27629 +int delay_output_sp( 27630 + SCREEN *sp, 27631 + int ms) 27632 + { return(*(int *)0); } 27633 + 27634 #undef delay_output 27635 int delay_output( 27636 int ms) 27637 { return(*(int *)0); } 27638 27639 +#undef _nc_flush_sp 27640 +void _nc_flush_sp( 27641 + SCREEN *sp) 27642 + { /* void */ } 27643 + 27644 #undef _nc_flush 27645 void _nc_flush(void) 27646 { /* void */ } 27647 27648 +#undef _nc_outch_sp 27649 +int _nc_outch_sp( 27650 + SCREEN *sp, 27651 + int ch) 27652 + { return(*(int *)0); } 27653 + 27654 #undef _nc_outch 27655 int _nc_outch( 27656 int ch) 27657 { return(*(int *)0); } 27658 27659 +#undef putp_sp 27660 +int putp_sp( 27661 + SCREEN *sp, 27662 + const char *string) 27663 + { return(*(int *)0); } 27664 + 27665 +#undef _nc_putp_sp 27666 +int _nc_putp_sp( 27667 + SCREEN *sp, 27668 + const char *name, 27669 + const char *string) 27670 + { return(*(int *)0); } 27671 + 27672 #undef putp 27673 int putp( 27674 const char *string) 27675 { return(*(int *)0); } 27676 27677 +#undef _nc_putp 27678 +int _nc_putp( 27679 + const char *name, 27680 + const char *string) 27681 + { return(*(int *)0); } 27682 + 27683 +#undef tputs_sp 27684 +int tputs_sp( 27685 + SCREEN *sp, 27686 + const char *string, 27687 + int affcnt, 27688 + NCURSES_OUTC_sp outc) 27689 + { return(*(int *)0); } 27690 + 27691 +#undef _nc_outc_wrapper 27692 +int _nc_outc_wrapper( 27693 + SCREEN *sp, 27694 + int c) 27695 + { return(*(int *)0); } 27696 + 27697 #undef tputs 27698 int tputs( 27699 const char *string, 27700 @@ -3024,36 +3801,78 @@ 27701 27702 /* ./tinfo/lib_ttyflags.c */ 27703 27704 +#undef _nc_get_tty_mode_sp 27705 +int _nc_get_tty_mode_sp( 27706 + SCREEN *sp, 27707 + struct termios *buf) 27708 + { return(*(int *)0); } 27709 + 27710 #undef _nc_get_tty_mode 27711 int _nc_get_tty_mode( 27712 struct termios *buf) 27713 { return(*(int *)0); } 27714 27715 +#undef _nc_set_tty_mode_sp 27716 +int _nc_set_tty_mode_sp( 27717 + SCREEN *sp, 27718 + struct termios *buf) 27719 + { return(*(int *)0); } 27720 + 27721 #undef _nc_set_tty_mode 27722 int _nc_set_tty_mode( 27723 struct termios *buf) 27724 { return(*(int *)0); } 27725 27726 +#undef def_shell_mode_sp 27727 +int def_shell_mode_sp( 27728 + SCREEN *sp) 27729 + { return(*(int *)0); } 27730 + 27731 #undef def_shell_mode 27732 int def_shell_mode(void) 27733 { return(*(int *)0); } 27734 27735 +#undef def_prog_mode_sp 27736 +int def_prog_mode_sp( 27737 + SCREEN *sp) 27738 + { return(*(int *)0); } 27739 + 27740 #undef def_prog_mode 27741 int def_prog_mode(void) 27742 { return(*(int *)0); } 27743 27744 +#undef reset_prog_mode_sp 27745 +int reset_prog_mode_sp( 27746 + SCREEN *sp) 27747 + { return(*(int *)0); } 27748 + 27749 #undef reset_prog_mode 27750 int reset_prog_mode(void) 27751 { return(*(int *)0); } 27752 27753 +#undef reset_shell_mode_sp 27754 +int reset_shell_mode_sp( 27755 + SCREEN *sp) 27756 + { return(*(int *)0); } 27757 + 27758 #undef reset_shell_mode 27759 int reset_shell_mode(void) 27760 { return(*(int *)0); } 27761 27762 +#undef savetty_sp 27763 +int savetty_sp( 27764 + SCREEN *sp) 27765 + { return(*(int *)0); } 27766 + 27767 #undef savetty 27768 int savetty(void) 27769 { return(*(int *)0); } 27770 27771 +#undef resetty_sp 27772 +int resetty_sp( 27773 + SCREEN *sp) 27774 + { return(*(int *)0); } 27775 + 27776 #undef resetty 27777 int resetty(void) 27778 { return(*(int *)0); } 27779 @@ -3144,6 +3963,13 @@ 27780 27781 /* ./tinfo/setbuf.c */ 27782 27783 +#undef _nc_set_buffer_sp 27784 +void _nc_set_buffer_sp( 27785 + SCREEN *sp, 27786 + FILE *ofp, 27787 + NCURSES_BOOL buffered) 27788 + { /* void */ } 27789 + 27790 #undef _nc_set_buffer 27791 void _nc_set_buffer( 27792 FILE *ofp, 27793 @@ -3235,8 +4061,8 @@ 27794 27795 /* ./unctrl.c */ 27796 27797 -#undef _nc_unctrl 27798 -char *_nc_unctrl( 27799 +#undef unctrl_sp 27800 +char *unctrl_sp( 27801 SCREEN *sp, 27802 chtype ch) 27803 { return(*(char **)0); } 27804 @@ -3485,6 +4311,13 @@ 27805 27806 /* ./base/define_key.c */ 27807 27808 +#undef define_key_sp 27809 +int define_key_sp( 27810 + SCREEN *sp, 27811 + const char *str, 27812 + int keycode) 27813 + { return(*(int *)0); } 27814 + 27815 #undef define_key 27816 int define_key( 27817 const char *str, 27818 @@ -3499,6 +4332,12 @@ 27819 27820 /* ./base/key_defined.c */ 27821 27822 +#undef key_defined_sp 27823 +int key_defined_sp( 27824 + SCREEN *sp, 27825 + const char *str) 27826 + { return(*(int *)0); } 27827 + 27828 #undef key_defined 27829 int key_defined( 27830 const char *str) 27831 @@ -3506,6 +4345,13 @@ 27832 27833 /* ./base/keybound.c */ 27834 27835 +#undef keybound_sp 27836 +char *keybound_sp( 27837 + SCREEN *sp, 27838 + int code, 27839 + int count) 27840 + { return(*(char **)0); } 27841 + 27842 #undef keybound 27843 char *keybound( 27844 int code, 27845 @@ -3514,6 +4360,13 @@ 27846 27847 /* ./base/keyok.c */ 27848 27849 +#undef keyok_sp 27850 +int keyok_sp( 27851 + SCREEN *sp, 27852 + int c, 27853 + NCURSES_BOOL flag) 27854 + { return(*(int *)0); } 27855 + 27856 #undef keyok 27857 int keyok( 27858 int c, 27859 diff -Naur ncurses-5.7.orig/ncurses/llib-lncursestw ncurses-5.7/ncurses/llib-lncursestw 27860 --- ncurses-5.7.orig/ncurses/llib-lncursestw 1969-12-31 16:00:00.000000000 -0800 27861 +++ ncurses-5.7/ncurses/llib-lncursestw 2009-07-19 15:04:11.000000000 -0700 27862 @@ -0,0 +1,5192 @@ 27863 +/**************************************************************************** 27864 + * Copyright (c) 2008 Free Software Foundation, Inc. * 27865 + * * 27866 + * Permission is hereby granted, free of charge, to any person obtaining a * 27867 + * copy of this software and associated documentation files (the * 27868 + * "Software"), to deal in the Software without restriction, including * 27869 + * without limitation the rights to use, copy, modify, merge, publish, * 27870 + * distribute, distribute with modifications, sublicense, and/or sell * 27871 + * copies of the Software, and to permit persons to whom the Software is * 27872 + * furnished to do so, subject to the following conditions: * 27873 + * * 27874 + * The above copyright notice and this permission notice shall be included * 27875 + * in all copies or substantial portions of the Software. * 27876 + * * 27877 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * 27878 + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * 27879 + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * 27880 + * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * 27881 + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * 27882 + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * 27883 + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * 27884 + * * 27885 + * Except as contained in this notice, the name(s) of the above copyright * 27886 + * holders shall not be used in advertising or otherwise to promote the * 27887 + * sale, use or other dealings in this Software without prior written * 27888 + * authorization. * 27889 + ****************************************************************************/ 27890 + 27891 +/**************************************************************************** 27892 + * Author: Thomas E. Dickey 2008 * 27893 + ****************************************************************************/ 27894 +/* LINTLIBRARY */ 27895 + 27896 +/* ./tty/hardscroll.c */ 27897 + 27898 +#include <curses.priv.h> 27899 + 27900 +#undef _nc_oldnums 27901 +int *_nc_oldnums; 27902 + 27903 +#undef _nc_scroll_optimize_sp 27904 +void _nc_scroll_optimize_sp( 27905 + SCREEN *sp) 27906 + { /* void */ } 27907 + 27908 +#undef _nc_scroll_optimize 27909 +void _nc_scroll_optimize(void) 27910 + { /* void */ } 27911 + 27912 +#undef _nc_linedump_sp 27913 +void _nc_linedump_sp( 27914 + SCREEN *sp) 27915 + { /* void */ } 27916 + 27917 +#undef _nc_linedump 27918 +void _nc_linedump(void) 27919 + { /* void */ } 27920 + 27921 +/* ./tty/hashmap.c */ 27922 + 27923 +#undef _nc_hash_map_sp 27924 +void _nc_hash_map_sp( 27925 + SCREEN *sp) 27926 + { /* void */ } 27927 + 27928 +#undef _nc_hash_map 27929 +void _nc_hash_map(void) 27930 + { /* void */ } 27931 + 27932 +#undef _nc_make_oldhash_sp 27933 +void _nc_make_oldhash_sp( 27934 + SCREEN *sp, 27935 + int i) 27936 + { /* void */ } 27937 + 27938 +#undef _nc_make_oldhash 27939 +void _nc_make_oldhash( 27940 + int i) 27941 + { /* void */ } 27942 + 27943 +#undef _nc_scroll_oldhash_sp 27944 +void _nc_scroll_oldhash_sp( 27945 + SCREEN *sp, 27946 + int n, 27947 + int top, 27948 + int bot) 27949 + { /* void */ } 27950 + 27951 +#undef _nc_scroll_oldhash 27952 +void _nc_scroll_oldhash( 27953 + int n, 27954 + int top, 27955 + int bot) 27956 + { /* void */ } 27957 + 27958 +/* ./base/lib_addch.c */ 27959 + 27960 +#include <ctype.h> 27961 + 27962 +#undef _nc_render 27963 +cchar_t _nc_render( 27964 + WINDOW *win, 27965 + cchar_t ch) 27966 + { return(*(cchar_t *)0); } 27967 + 27968 +#undef _nc_build_wch 27969 +int _nc_build_wch( 27970 + WINDOW *win, 27971 + cchar_t *ch) 27972 + { return(*(int *)0); } 27973 + 27974 +#undef _nc_waddch_nosync 27975 +int _nc_waddch_nosync( 27976 + WINDOW *win, 27977 + const cchar_t c) 27978 + { return(*(int *)0); } 27979 + 27980 +#undef waddch 27981 +int waddch( 27982 + WINDOW *win, 27983 + const chtype ch) 27984 + { return(*(int *)0); } 27985 + 27986 +#undef wechochar 27987 +int wechochar( 27988 + WINDOW *win, 27989 + const chtype ch) 27990 + { return(*(int *)0); } 27991 + 27992 +/* ./base/lib_addstr.c */ 27993 + 27994 +#undef waddnstr 27995 +int waddnstr( 27996 + WINDOW *win, 27997 + const char *astr, 27998 + int n) 27999 + { return(*(int *)0); } 28000 + 28001 +#undef waddchnstr 28002 +int waddchnstr( 28003 + WINDOW *win, 28004 + const chtype *astr, 28005 + int n) 28006 + { return(*(int *)0); } 28007 + 28008 +#undef _nc_wchstrlen 28009 +int _nc_wchstrlen( 28010 + const cchar_t *s) 28011 + { return(*(int *)0); } 28012 + 28013 +#undef wadd_wchnstr 28014 +int wadd_wchnstr( 28015 + WINDOW *win, 28016 + const cchar_t *astr, 28017 + int n) 28018 + { return(*(int *)0); } 28019 + 28020 +#undef waddnwstr 28021 +int waddnwstr( 28022 + WINDOW *win, 28023 + const wchar_t *str, 28024 + int n) 28025 + { return(*(int *)0); } 28026 + 28027 +/* ./base/lib_beep.c */ 28028 + 28029 +#undef beep_sp 28030 +int beep_sp( 28031 + SCREEN *sp) 28032 + { return(*(int *)0); } 28033 + 28034 +#undef beep 28035 +int beep(void) 28036 + { return(*(int *)0); } 28037 + 28038 +/* ./base/lib_bkgd.c */ 28039 + 28040 +#undef wbkgrndset 28041 +void wbkgrndset( 28042 + WINDOW *win, 28043 + const cchar_t *ch) 28044 + { /* void */ } 28045 + 28046 +#undef wbkgdset 28047 +void wbkgdset( 28048 + WINDOW *win, 28049 + chtype ch) 28050 + { /* void */ } 28051 + 28052 +#undef wbkgrnd 28053 +int wbkgrnd( 28054 + WINDOW *win, 28055 + const cchar_t *ch) 28056 + { return(*(int *)0); } 28057 + 28058 +#undef wbkgd 28059 +int wbkgd( 28060 + WINDOW *win, 28061 + chtype ch) 28062 + { return(*(int *)0); } 28063 + 28064 +/* ./base/lib_box.c */ 28065 + 28066 +#undef wborder 28067 +int wborder( 28068 + WINDOW *win, 28069 + chtype ls, 28070 + chtype rs, 28071 + chtype ts, 28072 + chtype bs, 28073 + chtype tl, 28074 + chtype tr, 28075 + chtype bl, 28076 + chtype br) 28077 + { return(*(int *)0); } 28078 + 28079 +/* ./base/lib_chgat.c */ 28080 + 28081 +#undef wchgat 28082 +int wchgat( 28083 + WINDOW *win, 28084 + int n, 28085 + attr_t attr, 28086 + short color, 28087 + const void *opts) 28088 + { return(*(int *)0); } 28089 + 28090 +/* ./base/lib_clear.c */ 28091 + 28092 +#undef wclear 28093 +int wclear( 28094 + WINDOW *win) 28095 + { return(*(int *)0); } 28096 + 28097 +/* ./base/lib_clearok.c */ 28098 + 28099 +#undef clearok 28100 +int clearok( 28101 + WINDOW *win, 28102 + NCURSES_BOOL flag) 28103 + { return(*(int *)0); } 28104 + 28105 +/* ./base/lib_clrbot.c */ 28106 + 28107 +#undef wclrtobot 28108 +int wclrtobot( 28109 + WINDOW *win) 28110 + { return(*(int *)0); } 28111 + 28112 +/* ./base/lib_clreol.c */ 28113 + 28114 +#undef wclrtoeol 28115 +int wclrtoeol( 28116 + WINDOW *win) 28117 + { return(*(int *)0); } 28118 + 28119 +/* ./base/lib_color.c */ 28120 + 28121 +#include <term.h> 28122 +#include <tic.h> 28123 + 28124 +#undef _nc_COLOR_PAIRS 28125 +int _nc_COLOR_PAIRS(void) 28126 + { return(*(int *)0); } 28127 + 28128 +#undef _nc_COLORS 28129 +int _nc_COLORS(void) 28130 + { return(*(int *)0); } 28131 + 28132 +#undef _nc_reset_colors_sp 28133 +NCURSES_BOOL _nc_reset_colors_sp( 28134 + SCREEN *sp) 28135 + { return(*(NCURSES_BOOL *)0); } 28136 + 28137 +#undef _nc_reset_colors 28138 +NCURSES_BOOL _nc_reset_colors(void) 28139 + { return(*(NCURSES_BOOL *)0); } 28140 + 28141 +#undef start_color_sp 28142 +int start_color_sp( 28143 + SCREEN *sp) 28144 + { return(*(int *)0); } 28145 + 28146 +#undef start_color 28147 +int start_color(void) 28148 + { return(*(int *)0); } 28149 + 28150 +#undef init_pair_sp 28151 +int init_pair_sp( 28152 + SCREEN *sp, 28153 + short pair, 28154 + short f, 28155 + short b) 28156 + { return(*(int *)0); } 28157 + 28158 +#undef init_pair 28159 +int init_pair( 28160 + short pair, 28161 + short f, 28162 + short b) 28163 + { return(*(int *)0); } 28164 + 28165 +#undef init_color_sp 28166 +int init_color_sp( 28167 + SCREEN *sp, 28168 + short color, 28169 + short r, 28170 + short g, 28171 + short b) 28172 + { return(*(int *)0); } 28173 + 28174 +#undef init_color 28175 +int init_color( 28176 + short color, 28177 + short r, 28178 + short g, 28179 + short b) 28180 + { return(*(int *)0); } 28181 + 28182 +#undef can_change_color_sp 28183 +NCURSES_BOOL can_change_color_sp( 28184 + SCREEN *sp) 28185 + { return(*(NCURSES_BOOL *)0); } 28186 + 28187 +#undef can_change_color 28188 +NCURSES_BOOL can_change_color(void) 28189 + { return(*(NCURSES_BOOL *)0); } 28190 + 28191 +#undef has_colors_sp 28192 +NCURSES_BOOL has_colors_sp( 28193 + SCREEN *sp) 28194 + { return(*(NCURSES_BOOL *)0); } 28195 + 28196 +#undef has_colors 28197 +NCURSES_BOOL has_colors(void) 28198 + { return(*(NCURSES_BOOL *)0); } 28199 + 28200 +#undef color_content_sp 28201 +int color_content_sp( 28202 + SCREEN *sp, 28203 + short color, 28204 + short *r, 28205 + short *g, 28206 + short *b) 28207 + { return(*(int *)0); } 28208 + 28209 +#undef color_content 28210 +int color_content( 28211 + short color, 28212 + short *r, 28213 + short *g, 28214 + short *b) 28215 + { return(*(int *)0); } 28216 + 28217 +#undef pair_content_sp 28218 +int pair_content_sp( 28219 + SCREEN *sp, 28220 + short pair, 28221 + short *f, 28222 + short *b) 28223 + { return(*(int *)0); } 28224 + 28225 +#undef pair_content 28226 +int pair_content( 28227 + short pair, 28228 + short *f, 28229 + short *b) 28230 + { return(*(int *)0); } 28231 + 28232 +#undef _nc_do_color_sp 28233 +void _nc_do_color_sp( 28234 + SCREEN *sp, 28235 + short old_pair, 28236 + short pair, 28237 + NCURSES_BOOL reverse, 28238 + NCURSES_OUTC_sp outc) 28239 + { /* void */ } 28240 + 28241 +#undef _nc_do_color 28242 +void _nc_do_color( 28243 + short old_pair, 28244 + short pair, 28245 + NCURSES_BOOL reverse, 28246 + NCURSES_OUTC outc) 28247 + { /* void */ } 28248 + 28249 +/* ./base/lib_colorset.c */ 28250 + 28251 +#undef wcolor_set 28252 +int wcolor_set( 28253 + WINDOW *win, 28254 + short color_pair_number, 28255 + void *opts) 28256 + { return(*(int *)0); } 28257 + 28258 +/* ./base/lib_delch.c */ 28259 + 28260 +#undef wdelch 28261 +int wdelch( 28262 + WINDOW *win) 28263 + { return(*(int *)0); } 28264 + 28265 +/* ./base/lib_delwin.c */ 28266 + 28267 +#undef delwin 28268 +int delwin( 28269 + WINDOW *win) 28270 + { return(*(int *)0); } 28271 + 28272 +/* ./base/lib_echo.c */ 28273 + 28274 +#undef echo_sp 28275 +int echo_sp( 28276 + SCREEN *sp) 28277 + { return(*(int *)0); } 28278 + 28279 +#undef echo 28280 +int echo(void) 28281 + { return(*(int *)0); } 28282 + 28283 +#undef noecho_sp 28284 +int noecho_sp( 28285 + SCREEN *sp) 28286 + { return(*(int *)0); } 28287 + 28288 +#undef noecho 28289 +int noecho(void) 28290 + { return(*(int *)0); } 28291 + 28292 +/* ./base/lib_endwin.c */ 28293 + 28294 +#undef endwin_sp 28295 +int endwin_sp( 28296 + SCREEN *sp) 28297 + { return(*(int *)0); } 28298 + 28299 +#undef endwin 28300 +int endwin(void) 28301 + { return(*(int *)0); } 28302 + 28303 +/* ./base/lib_erase.c */ 28304 + 28305 +#undef werase 28306 +int werase( 28307 + WINDOW *win) 28308 + { return(*(int *)0); } 28309 + 28310 +/* ./base/lib_flash.c */ 28311 + 28312 +#undef flash_sp 28313 +int flash_sp( 28314 + SCREEN *sp) 28315 + { return(*(int *)0); } 28316 + 28317 +#undef flash 28318 +int flash(void) 28319 + { return(*(int *)0); } 28320 + 28321 +/* ./lib_gen.c */ 28322 + 28323 +#undef addch 28324 +int addch( 28325 + const chtype z) 28326 + { return(*(int *)0); } 28327 + 28328 +#undef addchnstr 28329 +int addchnstr( 28330 + const chtype *a1, 28331 + int z) 28332 + { return(*(int *)0); } 28333 + 28334 +#undef addchstr 28335 +int addchstr( 28336 + const chtype *z) 28337 + { return(*(int *)0); } 28338 + 28339 +#undef addnstr 28340 +int addnstr( 28341 + const char *a1, 28342 + int z) 28343 + { return(*(int *)0); } 28344 + 28345 +#undef addstr 28346 +int addstr( 28347 + const char *z) 28348 + { return(*(int *)0); } 28349 + 28350 +#undef attroff 28351 +int attroff( 28352 + NCURSES_ATTR_T z) 28353 + { return(*(int *)0); } 28354 + 28355 +#undef attron 28356 +int attron( 28357 + NCURSES_ATTR_T z) 28358 + { return(*(int *)0); } 28359 + 28360 +#undef attrset 28361 +int attrset( 28362 + NCURSES_ATTR_T z) 28363 + { return(*(int *)0); } 28364 + 28365 +#undef attr_get 28366 +int attr_get( 28367 + attr_t *a1, 28368 + short *a2, 28369 + void *z) 28370 + { return(*(int *)0); } 28371 + 28372 +#undef attr_off 28373 +int attr_off( 28374 + attr_t a1, 28375 + void *z) 28376 + { return(*(int *)0); } 28377 + 28378 +#undef attr_on 28379 +int attr_on( 28380 + attr_t a1, 28381 + void *z) 28382 + { return(*(int *)0); } 28383 + 28384 +#undef attr_set 28385 +int attr_set( 28386 + attr_t a1, 28387 + short a2, 28388 + void *z) 28389 + { return(*(int *)0); } 28390 + 28391 +#undef bkgd 28392 +int bkgd( 28393 + chtype z) 28394 + { return(*(int *)0); } 28395 + 28396 +#undef bkgdset 28397 +void bkgdset( 28398 + chtype z) 28399 + { /* void */ } 28400 + 28401 +#undef border 28402 +int border( 28403 + chtype a1, 28404 + chtype a2, 28405 + chtype a3, 28406 + chtype a4, 28407 + chtype a5, 28408 + chtype a6, 28409 + chtype a7, 28410 + chtype z) 28411 + { return(*(int *)0); } 28412 + 28413 +#undef box 28414 +int box( 28415 + WINDOW *a1, 28416 + chtype a2, 28417 + chtype z) 28418 + { return(*(int *)0); } 28419 + 28420 +#undef chgat 28421 +int chgat( 28422 + int a1, 28423 + attr_t a2, 28424 + short a3, 28425 + const void *z) 28426 + { return(*(int *)0); } 28427 + 28428 +#undef clear 28429 +int clear(void) 28430 + { return(*(int *)0); } 28431 + 28432 +#undef clrtobot 28433 +int clrtobot(void) 28434 + { return(*(int *)0); } 28435 + 28436 +#undef clrtoeol 28437 +int clrtoeol(void) 28438 + { return(*(int *)0); } 28439 + 28440 +#undef color_set 28441 +int color_set( 28442 + short a1, 28443 + void *z) 28444 + { return(*(int *)0); } 28445 + 28446 +#undef COLOR_PAIR 28447 +int COLOR_PAIR( 28448 + int z) 28449 + { return(*(int *)0); } 28450 + 28451 +#undef delch 28452 +int delch(void) 28453 + { return(*(int *)0); } 28454 + 28455 +#undef deleteln 28456 +int deleteln(void) 28457 + { return(*(int *)0); } 28458 + 28459 +#undef echochar 28460 +int echochar( 28461 + const chtype z) 28462 + { return(*(int *)0); } 28463 + 28464 +#undef erase 28465 +int erase(void) 28466 + { return(*(int *)0); } 28467 + 28468 +#undef getbkgd 28469 +chtype getbkgd( 28470 + WINDOW *z) 28471 + { return(*(chtype *)0); } 28472 + 28473 +#undef getch 28474 +int getch(void) 28475 + { return(*(int *)0); } 28476 + 28477 +#undef getnstr 28478 +int getnstr( 28479 + char *a1, 28480 + int z) 28481 + { return(*(int *)0); } 28482 + 28483 +#undef getstr 28484 +int getstr( 28485 + char *z) 28486 + { return(*(int *)0); } 28487 + 28488 +#undef hline 28489 +int hline( 28490 + chtype a1, 28491 + int z) 28492 + { return(*(int *)0); } 28493 + 28494 +#undef inch 28495 +chtype inch(void) 28496 + { return(*(chtype *)0); } 28497 + 28498 +#undef inchnstr 28499 +int inchnstr( 28500 + chtype *a1, 28501 + int z) 28502 + { return(*(int *)0); } 28503 + 28504 +#undef inchstr 28505 +int inchstr( 28506 + chtype *z) 28507 + { return(*(int *)0); } 28508 + 28509 +#undef innstr 28510 +int innstr( 28511 + char *a1, 28512 + int z) 28513 + { return(*(int *)0); } 28514 + 28515 +#undef insch 28516 +int insch( 28517 + chtype z) 28518 + { return(*(int *)0); } 28519 + 28520 +#undef insdelln 28521 +int insdelln( 28522 + int z) 28523 + { return(*(int *)0); } 28524 + 28525 +#undef insertln 28526 +int insertln(void) 28527 + { return(*(int *)0); } 28528 + 28529 +#undef insnstr 28530 +int insnstr( 28531 + const char *a1, 28532 + int z) 28533 + { return(*(int *)0); } 28534 + 28535 +#undef insstr 28536 +int insstr( 28537 + const char *z) 28538 + { return(*(int *)0); } 28539 + 28540 +#undef instr 28541 +int instr( 28542 + char *z) 28543 + { return(*(int *)0); } 28544 + 28545 +#undef move 28546 +int move( 28547 + int a1, 28548 + int z) 28549 + { return(*(int *)0); } 28550 + 28551 +#undef mvaddch 28552 +int mvaddch( 28553 + int a1, 28554 + int a2, 28555 + const chtype z) 28556 + { return(*(int *)0); } 28557 + 28558 +#undef mvaddchnstr 28559 +int mvaddchnstr( 28560 + int a1, 28561 + int a2, 28562 + const chtype *a3, 28563 + int z) 28564 + { return(*(int *)0); } 28565 + 28566 +#undef mvaddchstr 28567 +int mvaddchstr( 28568 + int a1, 28569 + int a2, 28570 + const chtype *z) 28571 + { return(*(int *)0); } 28572 + 28573 +#undef mvaddnstr 28574 +int mvaddnstr( 28575 + int a1, 28576 + int a2, 28577 + const char *a3, 28578 + int z) 28579 + { return(*(int *)0); } 28580 + 28581 +#undef mvaddstr 28582 +int mvaddstr( 28583 + int a1, 28584 + int a2, 28585 + const char *z) 28586 + { return(*(int *)0); } 28587 + 28588 +#undef mvchgat 28589 +int mvchgat( 28590 + int a1, 28591 + int a2, 28592 + int a3, 28593 + attr_t a4, 28594 + short a5, 28595 + const void *z) 28596 + { return(*(int *)0); } 28597 + 28598 +#undef mvdelch 28599 +int mvdelch( 28600 + int a1, 28601 + int z) 28602 + { return(*(int *)0); } 28603 + 28604 +#undef mvgetch 28605 +int mvgetch( 28606 + int a1, 28607 + int z) 28608 + { return(*(int *)0); } 28609 + 28610 +#undef mvgetnstr 28611 +int mvgetnstr( 28612 + int a1, 28613 + int a2, 28614 + char *a3, 28615 + int z) 28616 + { return(*(int *)0); } 28617 + 28618 +#undef mvgetstr 28619 +int mvgetstr( 28620 + int a1, 28621 + int a2, 28622 + char *z) 28623 + { return(*(int *)0); } 28624 + 28625 +#undef mvhline 28626 +int mvhline( 28627 + int a1, 28628 + int a2, 28629 + chtype a3, 28630 + int z) 28631 + { return(*(int *)0); } 28632 + 28633 +#undef mvinch 28634 +chtype mvinch( 28635 + int a1, 28636 + int z) 28637 + { return(*(chtype *)0); } 28638 + 28639 +#undef mvinchnstr 28640 +int mvinchnstr( 28641 + int a1, 28642 + int a2, 28643 + chtype *a3, 28644 + int z) 28645 + { return(*(int *)0); } 28646 + 28647 +#undef mvinchstr 28648 +int mvinchstr( 28649 + int a1, 28650 + int a2, 28651 + chtype *z) 28652 + { return(*(int *)0); } 28653 + 28654 +#undef mvinnstr 28655 +int mvinnstr( 28656 + int a1, 28657 + int a2, 28658 + char *a3, 28659 + int z) 28660 + { return(*(int *)0); } 28661 + 28662 +#undef mvinsch 28663 +int mvinsch( 28664 + int a1, 28665 + int a2, 28666 + chtype z) 28667 + { return(*(int *)0); } 28668 + 28669 +#undef mvinsnstr 28670 +int mvinsnstr( 28671 + int a1, 28672 + int a2, 28673 + const char *a3, 28674 + int z) 28675 + { return(*(int *)0); } 28676 + 28677 +#undef mvinsstr 28678 +int mvinsstr( 28679 + int a1, 28680 + int a2, 28681 + const char *z) 28682 + { return(*(int *)0); } 28683 + 28684 +#undef mvinstr 28685 +int mvinstr( 28686 + int a1, 28687 + int a2, 28688 + char *z) 28689 + { return(*(int *)0); } 28690 + 28691 +#undef mvvline 28692 +int mvvline( 28693 + int a1, 28694 + int a2, 28695 + chtype a3, 28696 + int z) 28697 + { return(*(int *)0); } 28698 + 28699 +#undef mvwaddch 28700 +int mvwaddch( 28701 + WINDOW *a1, 28702 + int a2, 28703 + int a3, 28704 + const chtype z) 28705 + { return(*(int *)0); } 28706 + 28707 +#undef mvwaddchnstr 28708 +int mvwaddchnstr( 28709 + WINDOW *a1, 28710 + int a2, 28711 + int a3, 28712 + const chtype *a4, 28713 + int z) 28714 + { return(*(int *)0); } 28715 + 28716 +#undef mvwaddchstr 28717 +int mvwaddchstr( 28718 + WINDOW *a1, 28719 + int a2, 28720 + int a3, 28721 + const chtype *z) 28722 + { return(*(int *)0); } 28723 + 28724 +#undef mvwaddnstr 28725 +int mvwaddnstr( 28726 + WINDOW *a1, 28727 + int a2, 28728 + int a3, 28729 + const char *a4, 28730 + int z) 28731 + { return(*(int *)0); } 28732 + 28733 +#undef mvwaddstr 28734 +int mvwaddstr( 28735 + WINDOW *a1, 28736 + int a2, 28737 + int a3, 28738 + const char *z) 28739 + { return(*(int *)0); } 28740 + 28741 +#undef mvwchgat 28742 +int mvwchgat( 28743 + WINDOW *a1, 28744 + int a2, 28745 + int a3, 28746 + int a4, 28747 + attr_t a5, 28748 + short a6, 28749 + const void *z) 28750 + { return(*(int *)0); } 28751 + 28752 +#undef mvwdelch 28753 +int mvwdelch( 28754 + WINDOW *a1, 28755 + int a2, 28756 + int z) 28757 + { return(*(int *)0); } 28758 + 28759 +#undef mvwgetch 28760 +int mvwgetch( 28761 + WINDOW *a1, 28762 + int a2, 28763 + int z) 28764 + { return(*(int *)0); } 28765 + 28766 +#undef mvwgetnstr 28767 +int mvwgetnstr( 28768 + WINDOW *a1, 28769 + int a2, 28770 + int a3, 28771 + char *a4, 28772 + int z) 28773 + { return(*(int *)0); } 28774 + 28775 +#undef mvwgetstr 28776 +int mvwgetstr( 28777 + WINDOW *a1, 28778 + int a2, 28779 + int a3, 28780 + char *z) 28781 + { return(*(int *)0); } 28782 + 28783 +#undef mvwhline 28784 +int mvwhline( 28785 + WINDOW *a1, 28786 + int a2, 28787 + int a3, 28788 + chtype a4, 28789 + int z) 28790 + { return(*(int *)0); } 28791 + 28792 +#undef mvwinch 28793 +chtype mvwinch( 28794 + WINDOW *a1, 28795 + int a2, 28796 + int z) 28797 + { return(*(chtype *)0); } 28798 + 28799 +#undef mvwinchnstr 28800 +int mvwinchnstr( 28801 + WINDOW *a1, 28802 + int a2, 28803 + int a3, 28804 + chtype *a4, 28805 + int z) 28806 + { return(*(int *)0); } 28807 + 28808 +#undef mvwinchstr 28809 +int mvwinchstr( 28810 + WINDOW *a1, 28811 + int a2, 28812 + int a3, 28813 + chtype *z) 28814 + { return(*(int *)0); } 28815 + 28816 +#undef mvwinnstr 28817 +int mvwinnstr( 28818 + WINDOW *a1, 28819 + int a2, 28820 + int a3, 28821 + char *a4, 28822 + int z) 28823 + { return(*(int *)0); } 28824 + 28825 +#undef mvwinsch 28826 +int mvwinsch( 28827 + WINDOW *a1, 28828 + int a2, 28829 + int a3, 28830 + chtype z) 28831 + { return(*(int *)0); } 28832 + 28833 +#undef mvwinsnstr 28834 +int mvwinsnstr( 28835 + WINDOW *a1, 28836 + int a2, 28837 + int a3, 28838 + const char *a4, 28839 + int z) 28840 + { return(*(int *)0); } 28841 + 28842 +#undef mvwinsstr 28843 +int mvwinsstr( 28844 + WINDOW *a1, 28845 + int a2, 28846 + int a3, 28847 + const char *z) 28848 + { return(*(int *)0); } 28849 + 28850 +#undef mvwinstr 28851 +int mvwinstr( 28852 + WINDOW *a1, 28853 + int a2, 28854 + int a3, 28855 + char *z) 28856 + { return(*(int *)0); } 28857 + 28858 +#undef mvwvline 28859 +int mvwvline( 28860 + WINDOW *a1, 28861 + int a2, 28862 + int a3, 28863 + chtype a4, 28864 + int z) 28865 + { return(*(int *)0); } 28866 + 28867 +#undef PAIR_NUMBER 28868 +int PAIR_NUMBER( 28869 + int z) 28870 + { return(*(int *)0); } 28871 + 28872 +#undef redrawwin 28873 +int redrawwin( 28874 + WINDOW *z) 28875 + { return(*(int *)0); } 28876 + 28877 +#undef refresh 28878 +int refresh(void) 28879 + { return(*(int *)0); } 28880 + 28881 +#undef scrl 28882 +int scrl( 28883 + int z) 28884 + { return(*(int *)0); } 28885 + 28886 +#undef scroll 28887 +int scroll( 28888 + WINDOW *z) 28889 + { return(*(int *)0); } 28890 + 28891 +#undef setscrreg 28892 +int setscrreg( 28893 + int a1, 28894 + int z) 28895 + { return(*(int *)0); } 28896 + 28897 +#undef slk_attr_off 28898 +int slk_attr_off( 28899 + const attr_t a1, 28900 + void *z) 28901 + { return(*(int *)0); } 28902 + 28903 +#undef slk_attr_on 28904 +int slk_attr_on( 28905 + attr_t a1, 28906 + void *z) 28907 + { return(*(int *)0); } 28908 + 28909 +#undef standout 28910 +int standout(void) 28911 + { return(*(int *)0); } 28912 + 28913 +#undef standend 28914 +int standend(void) 28915 + { return(*(int *)0); } 28916 + 28917 +#undef timeout 28918 +void timeout( 28919 + int z) 28920 + { /* void */ } 28921 + 28922 +#undef touchline 28923 +int touchline( 28924 + WINDOW *a1, 28925 + int a2, 28926 + int z) 28927 + { return(*(int *)0); } 28928 + 28929 +#undef touchwin 28930 +int touchwin( 28931 + WINDOW *z) 28932 + { return(*(int *)0); } 28933 + 28934 +#undef untouchwin 28935 +int untouchwin( 28936 + WINDOW *z) 28937 + { return(*(int *)0); } 28938 + 28939 +#undef vline 28940 +int vline( 28941 + chtype a1, 28942 + int z) 28943 + { return(*(int *)0); } 28944 + 28945 +#undef vw_printw 28946 +int vw_printw( 28947 + WINDOW *a1, 28948 + const char *a2, 28949 + va_list z) 28950 + { return(*(int *)0); } 28951 + 28952 +#undef vw_scanw 28953 +int vw_scanw( 28954 + WINDOW *a1, 28955 + char *a2, 28956 + va_list z) 28957 + { return(*(int *)0); } 28958 + 28959 +#undef waddchstr 28960 +int waddchstr( 28961 + WINDOW *a1, 28962 + const chtype *z) 28963 + { return(*(int *)0); } 28964 + 28965 +#undef waddstr 28966 +int waddstr( 28967 + WINDOW *a1, 28968 + const char *z) 28969 + { return(*(int *)0); } 28970 + 28971 +#undef wattron 28972 +int wattron( 28973 + WINDOW *a1, 28974 + int z) 28975 + { return(*(int *)0); } 28976 + 28977 +#undef wattroff 28978 +int wattroff( 28979 + WINDOW *a1, 28980 + int z) 28981 + { return(*(int *)0); } 28982 + 28983 +#undef wattrset 28984 +int wattrset( 28985 + WINDOW *a1, 28986 + int z) 28987 + { return(*(int *)0); } 28988 + 28989 +#undef wattr_get 28990 +int wattr_get( 28991 + WINDOW *a1, 28992 + attr_t *a2, 28993 + short *a3, 28994 + void *z) 28995 + { return(*(int *)0); } 28996 + 28997 +#undef wattr_set 28998 +int wattr_set( 28999 + WINDOW *a1, 29000 + attr_t a2, 29001 + short a3, 29002 + void *z) 29003 + { return(*(int *)0); } 29004 + 29005 +#undef wdeleteln 29006 +int wdeleteln( 29007 + WINDOW *z) 29008 + { return(*(int *)0); } 29009 + 29010 +#undef wgetstr 29011 +int wgetstr( 29012 + WINDOW *a1, 29013 + char *z) 29014 + { return(*(int *)0); } 29015 + 29016 +#undef winchstr 29017 +int winchstr( 29018 + WINDOW *a1, 29019 + chtype *z) 29020 + { return(*(int *)0); } 29021 + 29022 +#undef winsertln 29023 +int winsertln( 29024 + WINDOW *z) 29025 + { return(*(int *)0); } 29026 + 29027 +#undef winsstr 29028 +int winsstr( 29029 + WINDOW *a1, 29030 + const char *z) 29031 + { return(*(int *)0); } 29032 + 29033 +#undef winstr 29034 +int winstr( 29035 + WINDOW *a1, 29036 + char *z) 29037 + { return(*(int *)0); } 29038 + 29039 +#undef wstandout 29040 +int wstandout( 29041 + WINDOW *z) 29042 + { return(*(int *)0); } 29043 + 29044 +#undef wstandend 29045 +int wstandend( 29046 + WINDOW *z) 29047 + { return(*(int *)0); } 29048 + 29049 +#undef getattrs 29050 +int getattrs( 29051 + const WINDOW *z) 29052 + { return(*(int *)0); } 29053 + 29054 +#undef getcurx 29055 +int getcurx( 29056 + const WINDOW *z) 29057 + { return(*(int *)0); } 29058 + 29059 +#undef getcury 29060 +int getcury( 29061 + const WINDOW *z) 29062 + { return(*(int *)0); } 29063 + 29064 +#undef getbegx 29065 +int getbegx( 29066 + const WINDOW *z) 29067 + { return(*(int *)0); } 29068 + 29069 +#undef getbegy 29070 +int getbegy( 29071 + const WINDOW *z) 29072 + { return(*(int *)0); } 29073 + 29074 +#undef getmaxx 29075 +int getmaxx( 29076 + const WINDOW *z) 29077 + { return(*(int *)0); } 29078 + 29079 +#undef getmaxy 29080 +int getmaxy( 29081 + const WINDOW *z) 29082 + { return(*(int *)0); } 29083 + 29084 +#undef getparx 29085 +int getparx( 29086 + const WINDOW *z) 29087 + { return(*(int *)0); } 29088 + 29089 +#undef getpary 29090 +int getpary( 29091 + const WINDOW *z) 29092 + { return(*(int *)0); } 29093 + 29094 +#undef wgetparent 29095 +WINDOW *wgetparent( 29096 + const WINDOW *z) 29097 + { return(*(WINDOW **)0); } 29098 + 29099 +#undef is_cleared 29100 +NCURSES_BOOL is_cleared( 29101 + const WINDOW *z) 29102 + { return(*(NCURSES_BOOL *)0); } 29103 + 29104 +#undef is_idcok 29105 +NCURSES_BOOL is_idcok( 29106 + const WINDOW *z) 29107 + { return(*(NCURSES_BOOL *)0); } 29108 + 29109 +#undef is_idlok 29110 +NCURSES_BOOL is_idlok( 29111 + const WINDOW *z) 29112 + { return(*(NCURSES_BOOL *)0); } 29113 + 29114 +#undef is_immedok 29115 +NCURSES_BOOL is_immedok( 29116 + const WINDOW *z) 29117 + { return(*(NCURSES_BOOL *)0); } 29118 + 29119 +#undef is_keypad 29120 +NCURSES_BOOL is_keypad( 29121 + const WINDOW *z) 29122 + { return(*(NCURSES_BOOL *)0); } 29123 + 29124 +#undef is_leaveok 29125 +NCURSES_BOOL is_leaveok( 29126 + const WINDOW *z) 29127 + { return(*(NCURSES_BOOL *)0); } 29128 + 29129 +#undef is_nodelay 29130 +NCURSES_BOOL is_nodelay( 29131 + const WINDOW *z) 29132 + { return(*(NCURSES_BOOL *)0); } 29133 + 29134 +#undef is_notimeout 29135 +NCURSES_BOOL is_notimeout( 29136 + const WINDOW *z) 29137 + { return(*(NCURSES_BOOL *)0); } 29138 + 29139 +#undef is_scrollok 29140 +NCURSES_BOOL is_scrollok( 29141 + const WINDOW *z) 29142 + { return(*(NCURSES_BOOL *)0); } 29143 + 29144 +#undef is_syncok 29145 +NCURSES_BOOL is_syncok( 29146 + const WINDOW *z) 29147 + { return(*(NCURSES_BOOL *)0); } 29148 + 29149 +#undef wgetscrreg 29150 +int wgetscrreg( 29151 + const WINDOW *a1, 29152 + int *a2, 29153 + int *z) 29154 + { return(*(int *)0); } 29155 + 29156 +#undef add_wch 29157 +int add_wch( 29158 + const cchar_t *z) 29159 + { return(*(int *)0); } 29160 + 29161 +#undef add_wchnstr 29162 +int add_wchnstr( 29163 + const cchar_t *a1, 29164 + int z) 29165 + { return(*(int *)0); } 29166 + 29167 +#undef add_wchstr 29168 +int add_wchstr( 29169 + const cchar_t *z) 29170 + { return(*(int *)0); } 29171 + 29172 +#undef addnwstr 29173 +int addnwstr( 29174 + const wchar_t *a1, 29175 + int z) 29176 + { return(*(int *)0); } 29177 + 29178 +#undef addwstr 29179 +int addwstr( 29180 + const wchar_t *z) 29181 + { return(*(int *)0); } 29182 + 29183 +#undef bkgrnd 29184 +int bkgrnd( 29185 + const cchar_t *z) 29186 + { return(*(int *)0); } 29187 + 29188 +#undef bkgrndset 29189 +void bkgrndset( 29190 + const cchar_t *z) 29191 + { /* void */ } 29192 + 29193 +#undef border_set 29194 +int border_set( 29195 + const cchar_t *a1, 29196 + const cchar_t *a2, 29197 + const cchar_t *a3, 29198 + const cchar_t *a4, 29199 + const cchar_t *a5, 29200 + const cchar_t *a6, 29201 + const cchar_t *a7, 29202 + const cchar_t *z) 29203 + { return(*(int *)0); } 29204 + 29205 +#undef box_set 29206 +int box_set( 29207 + WINDOW *a1, 29208 + const cchar_t *a2, 29209 + const cchar_t *z) 29210 + { return(*(int *)0); } 29211 + 29212 +#undef echo_wchar 29213 +int echo_wchar( 29214 + const cchar_t *z) 29215 + { return(*(int *)0); } 29216 + 29217 +#undef get_wch 29218 +int get_wch( 29219 + wint_t *z) 29220 + { return(*(int *)0); } 29221 + 29222 +#undef get_wstr 29223 +int get_wstr( 29224 + wint_t *z) 29225 + { return(*(int *)0); } 29226 + 29227 +#undef getbkgrnd 29228 +int getbkgrnd( 29229 + cchar_t *z) 29230 + { return(*(int *)0); } 29231 + 29232 +#undef getn_wstr 29233 +int getn_wstr( 29234 + wint_t *a1, 29235 + int z) 29236 + { return(*(int *)0); } 29237 + 29238 +#undef hline_set 29239 +int hline_set( 29240 + const cchar_t *a1, 29241 + int z) 29242 + { return(*(int *)0); } 29243 + 29244 +#undef in_wch 29245 +int in_wch( 29246 + cchar_t *z) 29247 + { return(*(int *)0); } 29248 + 29249 +#undef in_wchnstr 29250 +int in_wchnstr( 29251 + cchar_t *a1, 29252 + int z) 29253 + { return(*(int *)0); } 29254 + 29255 +#undef in_wchstr 29256 +int in_wchstr( 29257 + cchar_t *z) 29258 + { return(*(int *)0); } 29259 + 29260 +#undef innwstr 29261 +int innwstr( 29262 + wchar_t *a1, 29263 + int z) 29264 + { return(*(int *)0); } 29265 + 29266 +#undef ins_nwstr 29267 +int ins_nwstr( 29268 + const wchar_t *a1, 29269 + int z) 29270 + { return(*(int *)0); } 29271 + 29272 +#undef ins_wch 29273 +int ins_wch( 29274 + const cchar_t *z) 29275 + { return(*(int *)0); } 29276 + 29277 +#undef ins_wstr 29278 +int ins_wstr( 29279 + const wchar_t *z) 29280 + { return(*(int *)0); } 29281 + 29282 +#undef inwstr 29283 +int inwstr( 29284 + wchar_t *z) 29285 + { return(*(int *)0); } 29286 + 29287 +#undef mvadd_wch 29288 +int mvadd_wch( 29289 + int a1, 29290 + int a2, 29291 + const cchar_t *z) 29292 + { return(*(int *)0); } 29293 + 29294 +#undef mvadd_wchnstr 29295 +int mvadd_wchnstr( 29296 + int a1, 29297 + int a2, 29298 + const cchar_t *a3, 29299 + int z) 29300 + { return(*(int *)0); } 29301 + 29302 +#undef mvadd_wchstr 29303 +int mvadd_wchstr( 29304 + int a1, 29305 + int a2, 29306 + const cchar_t *z) 29307 + { return(*(int *)0); } 29308 + 29309 +#undef mvaddnwstr 29310 +int mvaddnwstr( 29311 + int a1, 29312 + int a2, 29313 + const wchar_t *a3, 29314 + int z) 29315 + { return(*(int *)0); } 29316 + 29317 +#undef mvaddwstr 29318 +int mvaddwstr( 29319 + int a1, 29320 + int a2, 29321 + const wchar_t *z) 29322 + { return(*(int *)0); } 29323 + 29324 +#undef mvget_wch 29325 +int mvget_wch( 29326 + int a1, 29327 + int a2, 29328 + wint_t *z) 29329 + { return(*(int *)0); } 29330 + 29331 +#undef mvget_wstr 29332 +int mvget_wstr( 29333 + int a1, 29334 + int a2, 29335 + wint_t *z) 29336 + { return(*(int *)0); } 29337 + 29338 +#undef mvgetn_wstr 29339 +int mvgetn_wstr( 29340 + int a1, 29341 + int a2, 29342 + wint_t *a3, 29343 + int z) 29344 + { return(*(int *)0); } 29345 + 29346 +#undef mvhline_set 29347 +int mvhline_set( 29348 + int a1, 29349 + int a2, 29350 + const cchar_t *a3, 29351 + int z) 29352 + { return(*(int *)0); } 29353 + 29354 +#undef mvin_wch 29355 +int mvin_wch( 29356 + int a1, 29357 + int a2, 29358 + cchar_t *z) 29359 + { return(*(int *)0); } 29360 + 29361 +#undef mvin_wchnstr 29362 +int mvin_wchnstr( 29363 + int a1, 29364 + int a2, 29365 + cchar_t *a3, 29366 + int z) 29367 + { return(*(int *)0); } 29368 + 29369 +#undef mvin_wchstr 29370 +int mvin_wchstr( 29371 + int a1, 29372 + int a2, 29373 + cchar_t *z) 29374 + { return(*(int *)0); } 29375 + 29376 +#undef mvinnwstr 29377 +int mvinnwstr( 29378 + int a1, 29379 + int a2, 29380 + wchar_t *a3, 29381 + int z) 29382 + { return(*(int *)0); } 29383 + 29384 +#undef mvins_nwstr 29385 +int mvins_nwstr( 29386 + int a1, 29387 + int a2, 29388 + const wchar_t *a3, 29389 + int z) 29390 + { return(*(int *)0); } 29391 + 29392 +#undef mvins_wch 29393 +int mvins_wch( 29394 + int a1, 29395 + int a2, 29396 + const cchar_t *z) 29397 + { return(*(int *)0); } 29398 + 29399 +#undef mvins_wstr 29400 +int mvins_wstr( 29401 + int a1, 29402 + int a2, 29403 + const wchar_t *z) 29404 + { return(*(int *)0); } 29405 + 29406 +#undef mvinwstr 29407 +int mvinwstr( 29408 + int a1, 29409 + int a2, 29410 + wchar_t *z) 29411 + { return(*(int *)0); } 29412 + 29413 +#undef mvvline_set 29414 +int mvvline_set( 29415 + int a1, 29416 + int a2, 29417 + const cchar_t *a3, 29418 + int z) 29419 + { return(*(int *)0); } 29420 + 29421 +#undef mvwadd_wch 29422 +int mvwadd_wch( 29423 + WINDOW *a1, 29424 + int a2, 29425 + int a3, 29426 + const cchar_t *z) 29427 + { return(*(int *)0); } 29428 + 29429 +#undef mvwadd_wchnstr 29430 +int mvwadd_wchnstr( 29431 + WINDOW *a1, 29432 + int a2, 29433 + int a3, 29434 + const cchar_t *a4, 29435 + int z) 29436 + { return(*(int *)0); } 29437 + 29438 +#undef mvwadd_wchstr 29439 +int mvwadd_wchstr( 29440 + WINDOW *a1, 29441 + int a2, 29442 + int a3, 29443 + const cchar_t *z) 29444 + { return(*(int *)0); } 29445 + 29446 +#undef mvwaddnwstr 29447 +int mvwaddnwstr( 29448 + WINDOW *a1, 29449 + int a2, 29450 + int a3, 29451 + const wchar_t *a4, 29452 + int z) 29453 + { return(*(int *)0); } 29454 + 29455 +#undef mvwaddwstr 29456 +int mvwaddwstr( 29457 + WINDOW *a1, 29458 + int a2, 29459 + int a3, 29460 + const wchar_t *z) 29461 + { return(*(int *)0); } 29462 + 29463 +#undef mvwget_wch 29464 +int mvwget_wch( 29465 + WINDOW *a1, 29466 + int a2, 29467 + int a3, 29468 + wint_t *z) 29469 + { return(*(int *)0); } 29470 + 29471 +#undef mvwget_wstr 29472 +int mvwget_wstr( 29473 + WINDOW *a1, 29474 + int a2, 29475 + int a3, 29476 + wint_t *z) 29477 + { return(*(int *)0); } 29478 + 29479 +#undef mvwgetn_wstr 29480 +int mvwgetn_wstr( 29481 + WINDOW *a1, 29482 + int a2, 29483 + int a3, 29484 + wint_t *a4, 29485 + int z) 29486 + { return(*(int *)0); } 29487 + 29488 +#undef mvwhline_set 29489 +int mvwhline_set( 29490 + WINDOW *a1, 29491 + int a2, 29492 + int a3, 29493 + const cchar_t *a4, 29494 + int z) 29495 + { return(*(int *)0); } 29496 + 29497 +#undef mvwin_wch 29498 +int mvwin_wch( 29499 + WINDOW *a1, 29500 + int a2, 29501 + int a3, 29502 + cchar_t *z) 29503 + { return(*(int *)0); } 29504 + 29505 +#undef mvwin_wchnstr 29506 +int mvwin_wchnstr( 29507 + WINDOW *a1, 29508 + int a2, 29509 + int a3, 29510 + cchar_t *a4, 29511 + int z) 29512 + { return(*(int *)0); } 29513 + 29514 +#undef mvwin_wchstr 29515 +int mvwin_wchstr( 29516 + WINDOW *a1, 29517 + int a2, 29518 + int a3, 29519 + cchar_t *z) 29520 + { return(*(int *)0); } 29521 + 29522 +#undef mvwinnwstr 29523 +int mvwinnwstr( 29524 + WINDOW *a1, 29525 + int a2, 29526 + int a3, 29527 + wchar_t *a4, 29528 + int z) 29529 + { return(*(int *)0); } 29530 + 29531 +#undef mvwins_nwstr 29532 +int mvwins_nwstr( 29533 + WINDOW *a1, 29534 + int a2, 29535 + int a3, 29536 + const wchar_t *a4, 29537 + int z) 29538 + { return(*(int *)0); } 29539 + 29540 +#undef mvwins_wch 29541 +int mvwins_wch( 29542 + WINDOW *a1, 29543 + int a2, 29544 + int a3, 29545 + const cchar_t *z) 29546 + { return(*(int *)0); } 29547 + 29548 +#undef mvwins_wstr 29549 +int mvwins_wstr( 29550 + WINDOW *a1, 29551 + int a2, 29552 + int a3, 29553 + const wchar_t *z) 29554 + { return(*(int *)0); } 29555 + 29556 +#undef mvwinwstr 29557 +int mvwinwstr( 29558 + WINDOW *a1, 29559 + int a2, 29560 + int a3, 29561 + wchar_t *z) 29562 + { return(*(int *)0); } 29563 + 29564 +#undef mvwvline_set 29565 +int mvwvline_set( 29566 + WINDOW *a1, 29567 + int a2, 29568 + int a3, 29569 + const cchar_t *a4, 29570 + int z) 29571 + { return(*(int *)0); } 29572 + 29573 +#undef vline_set 29574 +int vline_set( 29575 + const cchar_t *a1, 29576 + int z) 29577 + { return(*(int *)0); } 29578 + 29579 +#undef wadd_wchstr 29580 +int wadd_wchstr( 29581 + WINDOW *a1, 29582 + const cchar_t *z) 29583 + { return(*(int *)0); } 29584 + 29585 +#undef waddwstr 29586 +int waddwstr( 29587 + WINDOW *a1, 29588 + const wchar_t *z) 29589 + { return(*(int *)0); } 29590 + 29591 +#undef wget_wstr 29592 +int wget_wstr( 29593 + WINDOW *a1, 29594 + wint_t *z) 29595 + { return(*(int *)0); } 29596 + 29597 +#undef wgetbkgrnd 29598 +int wgetbkgrnd( 29599 + WINDOW *a1, 29600 + cchar_t *z) 29601 + { return(*(int *)0); } 29602 + 29603 +#undef win_wchstr 29604 +int win_wchstr( 29605 + WINDOW *a1, 29606 + cchar_t *z) 29607 + { return(*(int *)0); } 29608 + 29609 +#undef wins_wstr 29610 +int wins_wstr( 29611 + WINDOW *a1, 29612 + const wchar_t *z) 29613 + { return(*(int *)0); } 29614 + 29615 +#undef mouse_trafo 29616 +NCURSES_BOOL mouse_trafo( 29617 + int *a1, 29618 + int *a2, 29619 + NCURSES_BOOL z) 29620 + { return(*(NCURSES_BOOL *)0); } 29621 + 29622 +/* ./base/lib_getch.c */ 29623 + 29624 +#include <fifo_defs.h> 29625 + 29626 +#undef _nc_ptr_Escdelay 29627 +int *_nc_ptr_Escdelay( 29628 + SCREEN *sp) 29629 + { return(*(int **)0); } 29630 + 29631 +#undef _nc_ESCDELAY 29632 +int _nc_ESCDELAY(void) 29633 + { return(*(int *)0); } 29634 + 29635 +#undef set_escdelay_sp 29636 +int set_escdelay_sp( 29637 + SCREEN *sp, 29638 + int value) 29639 + { return(*(int *)0); } 29640 + 29641 +#undef set_escdelay 29642 +int set_escdelay( 29643 + int value) 29644 + { return(*(int *)0); } 29645 + 29646 +#undef _nc_wgetch 29647 +int _nc_wgetch( 29648 + WINDOW *win, 29649 + unsigned long *result, 29650 + int use_meta) 29651 + { return(*(int *)0); } 29652 + 29653 +#undef wgetch 29654 +int wgetch( 29655 + WINDOW *win) 29656 + { return(*(int *)0); } 29657 + 29658 +/* ./base/lib_getstr.c */ 29659 + 29660 +#undef wgetnstr 29661 +int wgetnstr( 29662 + WINDOW *win, 29663 + char *str, 29664 + int maxlen) 29665 + { return(*(int *)0); } 29666 + 29667 +/* ./base/lib_hline.c */ 29668 + 29669 +#undef whline 29670 +int whline( 29671 + WINDOW *win, 29672 + chtype ch, 29673 + int n) 29674 + { return(*(int *)0); } 29675 + 29676 +/* ./base/lib_immedok.c */ 29677 + 29678 +#undef immedok 29679 +void immedok( 29680 + WINDOW *win, 29681 + NCURSES_BOOL flag) 29682 + { /* void */ } 29683 + 29684 +/* ./base/lib_inchstr.c */ 29685 + 29686 +#undef winchnstr 29687 +int winchnstr( 29688 + WINDOW *win, 29689 + chtype *str, 29690 + int n) 29691 + { return(*(int *)0); } 29692 + 29693 +/* ./base/lib_initscr.c */ 29694 + 29695 +#undef initscr 29696 +WINDOW *initscr(void) 29697 + { return(*(WINDOW **)0); } 29698 + 29699 +/* ./base/lib_insch.c */ 29700 + 29701 +#undef _nc_insert_ch 29702 +int _nc_insert_ch( 29703 + SCREEN *sp, 29704 + WINDOW *win, 29705 + chtype ch) 29706 + { return(*(int *)0); } 29707 + 29708 +#undef winsch 29709 +int winsch( 29710 + WINDOW *win, 29711 + chtype c) 29712 + { return(*(int *)0); } 29713 + 29714 +/* ./base/lib_insdel.c */ 29715 + 29716 +#undef winsdelln 29717 +int winsdelln( 29718 + WINDOW *win, 29719 + int n) 29720 + { return(*(int *)0); } 29721 + 29722 +/* ./base/lib_insnstr.c */ 29723 + 29724 +#undef winsnstr 29725 +int winsnstr( 29726 + WINDOW *win, 29727 + const char *s, 29728 + int n) 29729 + { return(*(int *)0); } 29730 + 29731 +/* ./base/lib_instr.c */ 29732 + 29733 +#undef winnstr 29734 +int winnstr( 29735 + WINDOW *win, 29736 + char *str, 29737 + int n) 29738 + { return(*(int *)0); } 29739 + 29740 +/* ./base/lib_isendwin.c */ 29741 + 29742 +#undef isendwin_sp 29743 +NCURSES_BOOL isendwin_sp( 29744 + SCREEN *sp) 29745 + { return(*(NCURSES_BOOL *)0); } 29746 + 29747 +#undef isendwin 29748 +NCURSES_BOOL isendwin(void) 29749 + { return(*(NCURSES_BOOL *)0); } 29750 + 29751 +/* ./base/lib_leaveok.c */ 29752 + 29753 +#undef leaveok 29754 +int leaveok( 29755 + WINDOW *win, 29756 + NCURSES_BOOL flag) 29757 + { return(*(int *)0); } 29758 + 29759 +/* ./base/lib_mouse.c */ 29760 + 29761 +#undef getmouse_sp 29762 +int getmouse_sp( 29763 + SCREEN *sp, 29764 + MEVENT *aevent) 29765 + { return(*(int *)0); } 29766 + 29767 +#undef getmouse 29768 +int getmouse( 29769 + MEVENT *aevent) 29770 + { return(*(int *)0); } 29771 + 29772 +#undef ungetmouse_sp 29773 +int ungetmouse_sp( 29774 + SCREEN *sp, 29775 + MEVENT *aevent) 29776 + { return(*(int *)0); } 29777 + 29778 +#undef ungetmouse 29779 +int ungetmouse( 29780 + MEVENT *aevent) 29781 + { return(*(int *)0); } 29782 + 29783 +#undef mousemask_sp 29784 +mmask_t mousemask_sp( 29785 + SCREEN *sp, 29786 + mmask_t newmask, 29787 + mmask_t *oldmask) 29788 + { return(*(mmask_t *)0); } 29789 + 29790 +#undef mousemask 29791 +mmask_t mousemask( 29792 + mmask_t newmask, 29793 + mmask_t *oldmask) 29794 + { return(*(mmask_t *)0); } 29795 + 29796 +#undef wenclose 29797 +NCURSES_BOOL wenclose( 29798 + const WINDOW *win, 29799 + int y, 29800 + int x) 29801 + { return(*(NCURSES_BOOL *)0); } 29802 + 29803 +#undef mouseinterval_sp 29804 +int mouseinterval_sp( 29805 + SCREEN *sp, 29806 + int maxclick) 29807 + { return(*(int *)0); } 29808 + 29809 +#undef mouseinterval 29810 +int mouseinterval( 29811 + int maxclick) 29812 + { return(*(int *)0); } 29813 + 29814 +#undef _nc_has_mouse 29815 +NCURSES_BOOL _nc_has_mouse( 29816 + SCREEN *sp) 29817 + { return(*(NCURSES_BOOL *)0); } 29818 + 29819 +#undef has_mouse_sp 29820 +NCURSES_BOOL has_mouse_sp( 29821 + SCREEN *sp) 29822 + { return(*(NCURSES_BOOL *)0); } 29823 + 29824 +#undef has_mouse 29825 +NCURSES_BOOL has_mouse(void) 29826 + { return(*(NCURSES_BOOL *)0); } 29827 + 29828 +#undef wmouse_trafo 29829 +NCURSES_BOOL wmouse_trafo( 29830 + const WINDOW *win, 29831 + int *pY, 29832 + int *pX, 29833 + NCURSES_BOOL to_screen) 29834 + { return(*(NCURSES_BOOL *)0); } 29835 + 29836 +/* ./base/lib_move.c */ 29837 + 29838 +#undef wmove 29839 +int wmove( 29840 + WINDOW *win, 29841 + int y, 29842 + int x) 29843 + { return(*(int *)0); } 29844 + 29845 +/* ./tty/lib_mvcur.c */ 29846 + 29847 +#undef _nc_msec_cost_sp 29848 +int _nc_msec_cost_sp( 29849 + SCREEN *sp, 29850 + const char *const cap, 29851 + int affcnt) 29852 + { return(*(int *)0); } 29853 + 29854 +#undef _nc_msec_cost 29855 +int _nc_msec_cost( 29856 + const char *const cap, 29857 + int affcnt) 29858 + { return(*(int *)0); } 29859 + 29860 +#undef _nc_mvcur_resume_sp 29861 +void _nc_mvcur_resume_sp( 29862 + SCREEN *sp) 29863 + { /* void */ } 29864 + 29865 +#undef _nc_mvcur_resume 29866 +void _nc_mvcur_resume(void) 29867 + { /* void */ } 29868 + 29869 +#undef _nc_mvcur_init_sp 29870 +void _nc_mvcur_init_sp( 29871 + SCREEN *sp) 29872 + { /* void */ } 29873 + 29874 +#undef _nc_mvcur_init 29875 +void _nc_mvcur_init(void) 29876 + { /* void */ } 29877 + 29878 +#undef _nc_mvcur_wrap_sp 29879 +void _nc_mvcur_wrap_sp( 29880 + SCREEN *sp) 29881 + { /* void */ } 29882 + 29883 +#undef _nc_mvcur_wrap 29884 +void _nc_mvcur_wrap(void) 29885 + { /* void */ } 29886 + 29887 +#undef mvcur_sp 29888 +int mvcur_sp( 29889 + SCREEN *sp, 29890 + int yold, 29891 + int xold, 29892 + int ynew, 29893 + int xnew) 29894 + { return(*(int *)0); } 29895 + 29896 +#undef mvcur 29897 +int mvcur( 29898 + int yold, 29899 + int xold, 29900 + int ynew, 29901 + int xnew) 29902 + { return(*(int *)0); } 29903 + 29904 +#undef _nc_optimize_enable 29905 +int _nc_optimize_enable; 29906 + 29907 +/* ./base/lib_mvwin.c */ 29908 + 29909 +#undef mvwin 29910 +int mvwin( 29911 + WINDOW *win, 29912 + int by, 29913 + int bx) 29914 + { return(*(int *)0); } 29915 + 29916 +/* ./base/lib_newterm.c */ 29917 + 29918 +#undef filter_sp 29919 +void filter_sp( 29920 + SCREEN *sp) 29921 + { /* void */ } 29922 + 29923 +#undef filter 29924 +void filter(void) 29925 + { /* void */ } 29926 + 29927 +#undef nofilter_sp 29928 +void nofilter_sp( 29929 + SCREEN *sp) 29930 + { /* void */ } 29931 + 29932 +#undef nofilter 29933 +void nofilter(void) 29934 + { /* void */ } 29935 + 29936 +#undef newterm_sp 29937 +SCREEN *newterm_sp( 29938 + SCREEN *sp, 29939 + char *name, 29940 + FILE *ofp, 29941 + FILE *ifp) 29942 + { return(*(SCREEN **)0); } 29943 + 29944 +#undef newterm 29945 +SCREEN *newterm( 29946 + char *name, 29947 + FILE *ofp, 29948 + FILE *ifp) 29949 + { return(*(SCREEN **)0); } 29950 + 29951 +/* ./base/lib_newwin.c */ 29952 + 29953 +#undef _nc_freewin 29954 +int _nc_freewin( 29955 + WINDOW *win) 29956 + { return(*(int *)0); } 29957 + 29958 +#undef newwin_sp 29959 +WINDOW *newwin_sp( 29960 + SCREEN *sp, 29961 + int num_lines, 29962 + int num_columns, 29963 + int begy, 29964 + int begx) 29965 + { return(*(WINDOW **)0); } 29966 + 29967 +#undef newwin 29968 +WINDOW *newwin( 29969 + int num_lines, 29970 + int num_columns, 29971 + int begy, 29972 + int begx) 29973 + { return(*(WINDOW **)0); } 29974 + 29975 +#undef derwin 29976 +WINDOW *derwin( 29977 + WINDOW *orig, 29978 + int num_lines, 29979 + int num_columns, 29980 + int begy, 29981 + int begx) 29982 + { return(*(WINDOW **)0); } 29983 + 29984 +#undef subwin 29985 +WINDOW *subwin( 29986 + WINDOW *w, 29987 + int l, 29988 + int c, 29989 + int y, 29990 + int x) 29991 + { return(*(WINDOW **)0); } 29992 + 29993 +#undef _nc_makenew_sp 29994 +WINDOW *_nc_makenew_sp( 29995 + SCREEN *sp, 29996 + int num_lines, 29997 + int num_columns, 29998 + int begy, 29999 + int begx, 30000 + int flags) 30001 + { return(*(WINDOW **)0); } 30002 + 30003 +#undef _nc_makenew 30004 +WINDOW *_nc_makenew( 30005 + int num_lines, 30006 + int num_columns, 30007 + int begy, 30008 + int begx, 30009 + int flags) 30010 + { return(*(WINDOW **)0); } 30011 + 30012 +#undef _nc_curscr_of 30013 +WINDOW *_nc_curscr_of( 30014 + SCREEN *sp) 30015 + { return(*(WINDOW **)0); } 30016 + 30017 +#undef _nc_newscr_of 30018 +WINDOW *_nc_newscr_of( 30019 + SCREEN *sp) 30020 + { return(*(WINDOW **)0); } 30021 + 30022 +#undef _nc_stdscr_of 30023 +WINDOW *_nc_stdscr_of( 30024 + SCREEN *sp) 30025 + { return(*(WINDOW **)0); } 30026 + 30027 +/* ./base/lib_nl.c */ 30028 + 30029 +#undef nl_sp 30030 +int nl_sp( 30031 + SCREEN *sp) 30032 + { return(*(int *)0); } 30033 + 30034 +#undef nl 30035 +int nl(void) 30036 + { return(*(int *)0); } 30037 + 30038 +#undef nonl_sp 30039 +int nonl_sp( 30040 + SCREEN *sp) 30041 + { return(*(int *)0); } 30042 + 30043 +#undef nonl 30044 +int nonl(void) 30045 + { return(*(int *)0); } 30046 + 30047 +/* ./base/lib_overlay.c */ 30048 + 30049 +#undef overlay 30050 +int overlay( 30051 + const WINDOW *win1, 30052 + WINDOW *win2) 30053 + { return(*(int *)0); } 30054 + 30055 +#undef overwrite 30056 +int overwrite( 30057 + const WINDOW *win1, 30058 + WINDOW *win2) 30059 + { return(*(int *)0); } 30060 + 30061 +#undef copywin 30062 +int copywin( 30063 + const WINDOW *src, 30064 + WINDOW *dst, 30065 + int sminrow, 30066 + int smincol, 30067 + int dminrow, 30068 + int dmincol, 30069 + int dmaxrow, 30070 + int dmaxcol, 30071 + int over) 30072 + { return(*(int *)0); } 30073 + 30074 +/* ./base/lib_pad.c */ 30075 + 30076 +#undef newpad_sp 30077 +WINDOW *newpad_sp( 30078 + SCREEN *sp, 30079 + int l, 30080 + int c) 30081 + { return(*(WINDOW **)0); } 30082 + 30083 +#undef newpad 30084 +WINDOW *newpad( 30085 + int l, 30086 + int c) 30087 + { return(*(WINDOW **)0); } 30088 + 30089 +#undef subpad 30090 +WINDOW *subpad( 30091 + WINDOW *orig, 30092 + int l, 30093 + int c, 30094 + int begy, 30095 + int begx) 30096 + { return(*(WINDOW **)0); } 30097 + 30098 +#undef prefresh 30099 +int prefresh( 30100 + WINDOW *win, 30101 + int pminrow, 30102 + int pmincol, 30103 + int sminrow, 30104 + int smincol, 30105 + int smaxrow, 30106 + int smaxcol) 30107 + { return(*(int *)0); } 30108 + 30109 +#undef pnoutrefresh 30110 +int pnoutrefresh( 30111 + WINDOW *win, 30112 + int pminrow, 30113 + int pmincol, 30114 + int sminrow, 30115 + int smincol, 30116 + int smaxrow, 30117 + int smaxcol) 30118 + { return(*(int *)0); } 30119 + 30120 +#undef pechochar 30121 +int pechochar( 30122 + WINDOW *pad, 30123 + const chtype ch) 30124 + { return(*(int *)0); } 30125 + 30126 +/* ./base/lib_printw.c */ 30127 + 30128 +#undef printw 30129 +int printw( 30130 + const char *fmt, 30131 + ...) 30132 + { return(*(int *)0); } 30133 + 30134 +#undef wprintw 30135 +int wprintw( 30136 + WINDOW *win, 30137 + const char *fmt, 30138 + ...) 30139 + { return(*(int *)0); } 30140 + 30141 +#undef mvprintw 30142 +int mvprintw( 30143 + int y, 30144 + int x, 30145 + const char *fmt, 30146 + ...) 30147 + { return(*(int *)0); } 30148 + 30149 +#undef mvwprintw 30150 +int mvwprintw( 30151 + WINDOW *win, 30152 + int y, 30153 + int x, 30154 + const char *fmt, 30155 + ...) 30156 + { return(*(int *)0); } 30157 + 30158 +#undef vwprintw 30159 +int vwprintw( 30160 + WINDOW *win, 30161 + const char *fmt, 30162 + va_list argp) 30163 + { return(*(int *)0); } 30164 + 30165 +/* ./base/lib_redrawln.c */ 30166 + 30167 +#undef wredrawln 30168 +int wredrawln( 30169 + WINDOW *win, 30170 + int beg, 30171 + int num) 30172 + { return(*(int *)0); } 30173 + 30174 +/* ./base/lib_refresh.c */ 30175 + 30176 +#undef wrefresh 30177 +int wrefresh( 30178 + WINDOW *win) 30179 + { return(*(int *)0); } 30180 + 30181 +#undef wnoutrefresh 30182 +int wnoutrefresh( 30183 + WINDOW *win) 30184 + { return(*(int *)0); } 30185 + 30186 +/* ./base/lib_restart.c */ 30187 + 30188 +#undef restartterm_sp 30189 +int restartterm_sp( 30190 + SCREEN *sp, 30191 + char *termp, 30192 + int filenum, 30193 + int *errret) 30194 + { return(*(int *)0); } 30195 + 30196 +#undef restartterm 30197 +int restartterm( 30198 + char *termp, 30199 + int filenum, 30200 + int *errret) 30201 + { return(*(int *)0); } 30202 + 30203 +/* ./base/lib_scanw.c */ 30204 + 30205 +#undef vwscanw 30206 +int vwscanw( 30207 + WINDOW *win, 30208 + char *fmt, 30209 + va_list argp) 30210 + { return(*(int *)0); } 30211 + 30212 +#undef scanw 30213 +int scanw( 30214 + char *fmt, 30215 + ...) 30216 + { return(*(int *)0); } 30217 + 30218 +#undef wscanw 30219 +int wscanw( 30220 + WINDOW *win, 30221 + char *fmt, 30222 + ...) 30223 + { return(*(int *)0); } 30224 + 30225 +#undef mvscanw 30226 +int mvscanw( 30227 + int y, 30228 + int x, 30229 + char *fmt, 30230 + ...) 30231 + { return(*(int *)0); } 30232 + 30233 +#undef mvwscanw 30234 +int mvwscanw( 30235 + WINDOW *win, 30236 + int y, 30237 + int x, 30238 + char *fmt, 30239 + ...) 30240 + { return(*(int *)0); } 30241 + 30242 +/* ./base/lib_screen.c */ 30243 + 30244 +#undef getwin_sp 30245 +WINDOW *getwin_sp( 30246 + SCREEN *sp, 30247 + FILE *filep) 30248 + { return(*(WINDOW **)0); } 30249 + 30250 +#undef getwin 30251 +WINDOW *getwin( 30252 + FILE *filep) 30253 + { return(*(WINDOW **)0); } 30254 + 30255 +#undef putwin 30256 +int putwin( 30257 + WINDOW *win, 30258 + FILE *filep) 30259 + { return(*(int *)0); } 30260 + 30261 +#undef scr_restore_sp 30262 +int scr_restore_sp( 30263 + SCREEN *sp, 30264 + const char *file) 30265 + { return(*(int *)0); } 30266 + 30267 +#undef scr_restore 30268 +int scr_restore( 30269 + const char *file) 30270 + { return(*(int *)0); } 30271 + 30272 +#undef scr_dump 30273 +int scr_dump( 30274 + const char *file) 30275 + { return(*(int *)0); } 30276 + 30277 +#undef scr_init_sp 30278 +int scr_init_sp( 30279 + SCREEN *sp, 30280 + const char *file) 30281 + { return(*(int *)0); } 30282 + 30283 +#undef scr_init 30284 +int scr_init( 30285 + const char *file) 30286 + { return(*(int *)0); } 30287 + 30288 +#undef scr_set_sp 30289 +int scr_set_sp( 30290 + SCREEN *sp, 30291 + const char *file) 30292 + { return(*(int *)0); } 30293 + 30294 +#undef scr_set 30295 +int scr_set( 30296 + const char *file) 30297 + { return(*(int *)0); } 30298 + 30299 +/* ./base/lib_scroll.c */ 30300 + 30301 +#undef _nc_scroll_window 30302 +void _nc_scroll_window( 30303 + WINDOW *win, 30304 + int const n, 30305 + int const top, 30306 + int const bottom, 30307 + cchar_t blank) 30308 + { /* void */ } 30309 + 30310 +#undef wscrl 30311 +int wscrl( 30312 + WINDOW *win, 30313 + int n) 30314 + { return(*(int *)0); } 30315 + 30316 +/* ./base/lib_scrollok.c */ 30317 + 30318 +#undef scrollok 30319 +int scrollok( 30320 + WINDOW *win, 30321 + NCURSES_BOOL flag) 30322 + { return(*(int *)0); } 30323 + 30324 +/* ./base/lib_scrreg.c */ 30325 + 30326 +#undef wsetscrreg 30327 +int wsetscrreg( 30328 + WINDOW *win, 30329 + int top, 30330 + int bottom) 30331 + { return(*(int *)0); } 30332 + 30333 +/* ./base/lib_set_term.c */ 30334 + 30335 +#undef set_term 30336 +SCREEN *set_term( 30337 + SCREEN *screenp) 30338 + { return(*(SCREEN **)0); } 30339 + 30340 +#undef delscreen 30341 +void delscreen( 30342 + SCREEN *sp) 30343 + { /* void */ } 30344 + 30345 +#undef _nc_setupscreen 30346 +int _nc_setupscreen( 30347 + int slines, 30348 + int scolumns, 30349 + FILE *output, 30350 + NCURSES_BOOL filtered, 30351 + int slk_format) 30352 + { return(*(int *)0); } 30353 + 30354 +#undef _nc_ripoffline_sp 30355 +int _nc_ripoffline_sp( 30356 + SCREEN *sp, 30357 + int line, 30358 + int (*init)( 30359 + WINDOW *p1, 30360 + int p2)) 30361 + { return(*(int *)0); } 30362 + 30363 +#undef _nc_ripoffline 30364 +int _nc_ripoffline( 30365 + int line, 30366 + int (*init)( 30367 + WINDOW *p1, 30368 + int p2)) 30369 + { return(*(int *)0); } 30370 + 30371 +#undef ripoffline_sp 30372 +int ripoffline_sp( 30373 + SCREEN *sp, 30374 + int line, 30375 + int (*init)( 30376 + WINDOW *p1, 30377 + int p2)) 30378 + { return(*(int *)0); } 30379 + 30380 +#undef ripoffline 30381 +int ripoffline( 30382 + int line, 30383 + int (*init)( 30384 + WINDOW *p1, 30385 + int p2)) 30386 + { return(*(int *)0); } 30387 + 30388 +/* ./base/lib_slk.c */ 30389 + 30390 +#undef _nc_slk_initialize 30391 +int _nc_slk_initialize( 30392 + WINDOW *stwin, 30393 + int cols) 30394 + { return(*(int *)0); } 30395 + 30396 +#undef slk_restore_sp 30397 +int slk_restore_sp( 30398 + SCREEN *sp) 30399 + { return(*(int *)0); } 30400 + 30401 +#undef slk_restore 30402 +int slk_restore(void) 30403 + { return(*(int *)0); } 30404 + 30405 +/* ./base/lib_slkatr_set.c */ 30406 + 30407 +#undef slk_attr_set_sp 30408 +int slk_attr_set_sp( 30409 + SCREEN *sp, 30410 + const attr_t attr, 30411 + short color_pair_number, 30412 + void *opts) 30413 + { return(*(int *)0); } 30414 + 30415 +#undef slk_attr_set 30416 +int slk_attr_set( 30417 + const attr_t attr, 30418 + short color_pair_number, 30419 + void *opts) 30420 + { return(*(int *)0); } 30421 + 30422 +/* ./base/lib_slkatrof.c */ 30423 + 30424 +#undef slk_attroff_sp 30425 +int slk_attroff_sp( 30426 + SCREEN *sp, 30427 + const chtype attr) 30428 + { return(*(int *)0); } 30429 + 30430 +#undef slk_attroff 30431 +int slk_attroff( 30432 + const chtype attr) 30433 + { return(*(int *)0); } 30434 + 30435 +/* ./base/lib_slkatron.c */ 30436 + 30437 +#undef slk_attron_sp 30438 +int slk_attron_sp( 30439 + SCREEN *sp, 30440 + const chtype attr) 30441 + { return(*(int *)0); } 30442 + 30443 +#undef slk_attron 30444 +int slk_attron( 30445 + const chtype attr) 30446 + { return(*(int *)0); } 30447 + 30448 +/* ./base/lib_slkatrset.c */ 30449 + 30450 +#undef slk_attrset_sp 30451 +int slk_attrset_sp( 30452 + SCREEN *sp, 30453 + const chtype attr) 30454 + { return(*(int *)0); } 30455 + 30456 +#undef slk_attrset 30457 +int slk_attrset( 30458 + const chtype attr) 30459 + { return(*(int *)0); } 30460 + 30461 +/* ./base/lib_slkattr.c */ 30462 + 30463 +#undef slk_attr_sp 30464 +attr_t slk_attr_sp( 30465 + SCREEN *sp) 30466 + { return(*(attr_t *)0); } 30467 + 30468 +#undef slk_attr 30469 +attr_t slk_attr(void) 30470 + { return(*(attr_t *)0); } 30471 + 30472 +/* ./base/lib_slkclear.c */ 30473 + 30474 +#undef slk_clear_sp 30475 +int slk_clear_sp( 30476 + SCREEN *sp) 30477 + { return(*(int *)0); } 30478 + 30479 +#undef slk_clear 30480 +int slk_clear(void) 30481 + { return(*(int *)0); } 30482 + 30483 +/* ./base/lib_slkcolor.c */ 30484 + 30485 +#undef slk_color_sp 30486 +int slk_color_sp( 30487 + SCREEN *sp, 30488 + short color_pair_number) 30489 + { return(*(int *)0); } 30490 + 30491 +#undef slk_color 30492 +int slk_color( 30493 + short color_pair_number) 30494 + { return(*(int *)0); } 30495 + 30496 +/* ./base/lib_slkinit.c */ 30497 + 30498 +#undef slk_init_sp 30499 +int slk_init_sp( 30500 + SCREEN *sp, 30501 + int format) 30502 + { return(*(int *)0); } 30503 + 30504 +#undef slk_init 30505 +int slk_init( 30506 + int format) 30507 + { return(*(int *)0); } 30508 + 30509 +/* ./base/lib_slklab.c */ 30510 + 30511 +#undef slk_label_sp 30512 +char *slk_label_sp( 30513 + SCREEN *sp, 30514 + int n) 30515 + { return(*(char **)0); } 30516 + 30517 +#undef slk_label 30518 +char *slk_label( 30519 + int n) 30520 + { return(*(char **)0); } 30521 + 30522 +/* ./base/lib_slkrefr.c */ 30523 + 30524 +#undef slk_noutrefresh_sp 30525 +int slk_noutrefresh_sp( 30526 + SCREEN *sp) 30527 + { return(*(int *)0); } 30528 + 30529 +#undef slk_noutrefresh 30530 +int slk_noutrefresh(void) 30531 + { return(*(int *)0); } 30532 + 30533 +#undef slk_refresh_sp 30534 +int slk_refresh_sp( 30535 + SCREEN *sp) 30536 + { return(*(int *)0); } 30537 + 30538 +#undef slk_refresh 30539 +int slk_refresh(void) 30540 + { return(*(int *)0); } 30541 + 30542 +/* ./base/lib_slkset.c */ 30543 + 30544 +#include <wctype.h> 30545 + 30546 +#undef slk_set_sp 30547 +int slk_set_sp( 30548 + SCREEN *sp, 30549 + int i, 30550 + const char *astr, 30551 + int format) 30552 + { return(*(int *)0); } 30553 + 30554 +#undef slk_set 30555 +int slk_set( 30556 + int i, 30557 + const char *astr, 30558 + int format) 30559 + { return(*(int *)0); } 30560 + 30561 +/* ./base/lib_slktouch.c */ 30562 + 30563 +#undef slk_touch_sp 30564 +int slk_touch_sp( 30565 + SCREEN *sp) 30566 + { return(*(int *)0); } 30567 + 30568 +#undef slk_touch 30569 +int slk_touch(void) 30570 + { return(*(int *)0); } 30571 + 30572 +/* ./base/lib_touch.c */ 30573 + 30574 +#undef is_linetouched 30575 +NCURSES_BOOL is_linetouched( 30576 + WINDOW *win, 30577 + int line) 30578 + { return(*(NCURSES_BOOL *)0); } 30579 + 30580 +#undef is_wintouched 30581 +NCURSES_BOOL is_wintouched( 30582 + WINDOW *win) 30583 + { return(*(NCURSES_BOOL *)0); } 30584 + 30585 +#undef wtouchln 30586 +int wtouchln( 30587 + WINDOW *win, 30588 + int y, 30589 + int n, 30590 + int changed) 30591 + { return(*(int *)0); } 30592 + 30593 +/* ./trace/lib_tracedmp.c */ 30594 + 30595 +#undef _tracedump 30596 +void _tracedump( 30597 + const char *name, 30598 + WINDOW *win) 30599 + { /* void */ } 30600 + 30601 +/* ./trace/lib_tracemse.c */ 30602 + 30603 +#undef _nc_tracemouse 30604 +char *_nc_tracemouse( 30605 + SCREEN *sp, 30606 + MEVENT const *ep) 30607 + { return(*(char **)0); } 30608 + 30609 +#undef _tracemouse 30610 +char *_tracemouse( 30611 + MEVENT const *ep) 30612 + { return(*(char **)0); } 30613 + 30614 +/* ./tty/lib_tstp.c */ 30615 + 30616 +#include <SigAction.h> 30617 + 30618 +#undef _nc_signal_handler 30619 +void _nc_signal_handler( 30620 + NCURSES_BOOL enable) 30621 + { /* void */ } 30622 + 30623 +/* ./base/lib_ungetch.c */ 30624 + 30625 +#undef _nc_fifo_dump 30626 +void _nc_fifo_dump( 30627 + SCREEN *sp) 30628 + { /* void */ } 30629 + 30630 +#undef ungetch_sp 30631 +int ungetch_sp( 30632 + SCREEN *sp, 30633 + int ch) 30634 + { return(*(int *)0); } 30635 + 30636 +#undef ungetch 30637 +int ungetch( 30638 + int ch) 30639 + { return(*(int *)0); } 30640 + 30641 +/* ./tty/lib_vidattr.c */ 30642 + 30643 +#undef vidputs_sp 30644 +int vidputs_sp( 30645 + SCREEN *sp, 30646 + chtype newmode, 30647 + NCURSES_OUTC_sp outc) 30648 + { return(*(int *)0); } 30649 + 30650 +#undef vidputs 30651 +int vidputs( 30652 + chtype newmode, 30653 + NCURSES_OUTC outc) 30654 + { return(*(int *)0); } 30655 + 30656 +#undef vidattr_sp 30657 +int vidattr_sp( 30658 + SCREEN *sp, 30659 + chtype newmode) 30660 + { return(*(int *)0); } 30661 + 30662 +#undef vidattr 30663 +int vidattr( 30664 + chtype newmode) 30665 + { return(*(int *)0); } 30666 + 30667 +#undef termattrs_sp 30668 +chtype termattrs_sp( 30669 + SCREEN *sp) 30670 + { return(*(chtype *)0); } 30671 + 30672 +#undef termattrs 30673 +chtype termattrs(void) 30674 + { return(*(chtype *)0); } 30675 + 30676 +/* ./base/lib_vline.c */ 30677 + 30678 +#undef wvline 30679 +int wvline( 30680 + WINDOW *win, 30681 + chtype ch, 30682 + int n) 30683 + { return(*(int *)0); } 30684 + 30685 +/* ./base/lib_wattroff.c */ 30686 + 30687 +#undef wattr_off 30688 +int wattr_off( 30689 + WINDOW *win, 30690 + attr_t at, 30691 + void *opts) 30692 + { return(*(int *)0); } 30693 + 30694 +/* ./base/lib_wattron.c */ 30695 + 30696 +#undef wattr_on 30697 +int wattr_on( 30698 + WINDOW *win, 30699 + attr_t at, 30700 + void *opts) 30701 + { return(*(int *)0); } 30702 + 30703 +/* ./base/lib_winch.c */ 30704 + 30705 +#undef winch 30706 +chtype winch( 30707 + WINDOW *win) 30708 + { return(*(chtype *)0); } 30709 + 30710 +/* ./base/lib_window.c */ 30711 + 30712 +#undef _nc_synchook 30713 +void _nc_synchook( 30714 + WINDOW *win) 30715 + { /* void */ } 30716 + 30717 +#undef mvderwin 30718 +int mvderwin( 30719 + WINDOW *win, 30720 + int y, 30721 + int x) 30722 + { return(*(int *)0); } 30723 + 30724 +#undef syncok 30725 +int syncok( 30726 + WINDOW *win, 30727 + NCURSES_BOOL bf) 30728 + { return(*(int *)0); } 30729 + 30730 +#undef wsyncup 30731 +void wsyncup( 30732 + WINDOW *win) 30733 + { /* void */ } 30734 + 30735 +#undef wsyncdown 30736 +void wsyncdown( 30737 + WINDOW *win) 30738 + { /* void */ } 30739 + 30740 +#undef wcursyncup 30741 +void wcursyncup( 30742 + WINDOW *win) 30743 + { /* void */ } 30744 + 30745 +#undef dupwin 30746 +WINDOW *dupwin( 30747 + WINDOW *win) 30748 + { return(*(WINDOW **)0); } 30749 + 30750 +/* ./base/nc_panel.c */ 30751 + 30752 +#undef _nc_panelhook_sp 30753 +struct panelhook *_nc_panelhook_sp( 30754 + SCREEN *sp) 30755 + { return(*(struct panelhook **)0); } 30756 + 30757 +#undef _nc_panelhook 30758 +struct panelhook *_nc_panelhook(void) 30759 + { return(*(struct panelhook **)0); } 30760 + 30761 +/* ./base/safe_sprintf.c */ 30762 + 30763 +#undef _nc_printf_string_sp 30764 +char *_nc_printf_string_sp( 30765 + SCREEN *sp, 30766 + const char *fmt, 30767 + va_list ap) 30768 + { return(*(char **)0); } 30769 + 30770 +#undef _nc_printf_string 30771 +char *_nc_printf_string( 30772 + const char *fmt, 30773 + va_list ap) 30774 + { return(*(char **)0); } 30775 + 30776 +/* ./tty/tty_update.c */ 30777 + 30778 +#include <sys/time.h> 30779 +#include <sys/times.h> 30780 + 30781 +#undef doupdate_sp 30782 +int doupdate_sp( 30783 + SCREEN *sp) 30784 + { return(*(int *)0); } 30785 + 30786 +#undef doupdate 30787 +int doupdate(void) 30788 + { return(*(int *)0); } 30789 + 30790 +#undef _nc_scrolln_sp 30791 +int _nc_scrolln_sp( 30792 + SCREEN *sp, 30793 + int n, 30794 + int top, 30795 + int bot, 30796 + int maxy) 30797 + { return(*(int *)0); } 30798 + 30799 +#undef _nc_scrolln 30800 +int _nc_scrolln( 30801 + int n, 30802 + int top, 30803 + int bot, 30804 + int maxy) 30805 + { return(*(int *)0); } 30806 + 30807 +#undef _nc_screen_resume_sp 30808 +void _nc_screen_resume_sp( 30809 + SCREEN *sp) 30810 + { /* void */ } 30811 + 30812 +#undef _nc_screen_resume 30813 +void _nc_screen_resume(void) 30814 + { /* void */ } 30815 + 30816 +#undef _nc_screen_init_sp 30817 +void _nc_screen_init_sp( 30818 + SCREEN *sp) 30819 + { /* void */ } 30820 + 30821 +#undef _nc_screen_init 30822 +void _nc_screen_init(void) 30823 + { /* void */ } 30824 + 30825 +#undef _nc_screen_wrap_sp 30826 +void _nc_screen_wrap_sp( 30827 + SCREEN *sp) 30828 + { /* void */ } 30829 + 30830 +#undef _nc_screen_wrap 30831 +void _nc_screen_wrap(void) 30832 + { /* void */ } 30833 + 30834 +#undef _nc_do_xmc_glitch_sp 30835 +void _nc_do_xmc_glitch_sp( 30836 + SCREEN *sp, 30837 + attr_t previous) 30838 + { /* void */ } 30839 + 30840 +#undef _nc_do_xmc_glitch 30841 +void _nc_do_xmc_glitch( 30842 + attr_t previous) 30843 + { /* void */ } 30844 + 30845 +/* ./trace/varargs.c */ 30846 + 30847 +typedef enum { 30848 + atUnknown = 0, atInteger, atFloat, atPoint, atString 30849 +} ARGTYPE; 30850 + 30851 +#undef _nc_varargs 30852 +char *_nc_varargs( 30853 + const char *fmt, 30854 + va_list ap) 30855 + { return(*(char **)0); } 30856 + 30857 +/* ./base/memmove.c */ 30858 + 30859 +#undef _nc_memmove 30860 +void _nc_memmove(void) 30861 + { /* void */ } 30862 + 30863 +/* ./base/vsscanf.c */ 30864 + 30865 +#undef _nc_vsscanf 30866 +void _nc_vsscanf(void) 30867 + { /* void */ } 30868 + 30869 +/* ./base/lib_freeall.c */ 30870 + 30871 +#include <term_entry.h> 30872 + 30873 +#undef _nc_freeall 30874 +void _nc_freeall(void) 30875 + { /* void */ } 30876 + 30877 +#undef _nc_free_and_exit_sp 30878 +void _nc_free_and_exit_sp( 30879 + SCREEN *sp, 30880 + int code) 30881 + { /* void */ } 30882 + 30883 +#undef _nc_free_and_exit 30884 +void _nc_free_and_exit( 30885 + int code) 30886 + { /* void */ } 30887 + 30888 +/* ./widechar/charable.c */ 30889 + 30890 +#undef _nc_is_charable 30891 +NCURSES_BOOL _nc_is_charable( 30892 + wchar_t ch) 30893 + { return(*(NCURSES_BOOL *)0); } 30894 + 30895 +#undef _nc_to_char 30896 +int _nc_to_char( 30897 + wint_t ch) 30898 + { return(*(int *)0); } 30899 + 30900 +#undef _nc_to_widechar 30901 +wint_t _nc_to_widechar( 30902 + int ch) 30903 + { return(*(wint_t *)0); } 30904 + 30905 +/* ./widechar/lib_add_wch.c */ 30906 + 30907 +#undef wadd_wch 30908 +int wadd_wch( 30909 + WINDOW *win, 30910 + const cchar_t *wch) 30911 + { return(*(int *)0); } 30912 + 30913 +#undef wecho_wchar 30914 +int wecho_wchar( 30915 + WINDOW *win, 30916 + const cchar_t *wch) 30917 + { return(*(int *)0); } 30918 + 30919 +/* ./widechar/lib_box_set.c */ 30920 + 30921 +#undef wborder_set 30922 +int wborder_set( 30923 + WINDOW *win, 30924 + const cchar_t *ls, 30925 + const cchar_t *rs, 30926 + const cchar_t *ts, 30927 + const cchar_t *bs, 30928 + const cchar_t *tl, 30929 + const cchar_t *tr, 30930 + const cchar_t *bl, 30931 + const cchar_t *br) 30932 + { return(*(int *)0); } 30933 + 30934 +/* ./widechar/lib_cchar.c */ 30935 + 30936 +#undef setcchar 30937 +int setcchar( 30938 + cchar_t *wcval, 30939 + const wchar_t *wch, 30940 + const attr_t attrs, 30941 + short color_pair, 30942 + const void *opts) 30943 + { return(*(int *)0); } 30944 + 30945 +#undef getcchar 30946 +int getcchar( 30947 + const cchar_t *wcval, 30948 + wchar_t *wch, 30949 + attr_t *attrs, 30950 + short *color_pair, 30951 + void *opts) 30952 + { return(*(int *)0); } 30953 + 30954 +/* ./widechar/lib_erasewchar.c */ 30955 + 30956 +#undef erasewchar 30957 +int erasewchar( 30958 + wchar_t *wch) 30959 + { return(*(int *)0); } 30960 + 30961 +#undef killwchar 30962 +int killwchar( 30963 + wchar_t *wch) 30964 + { return(*(int *)0); } 30965 + 30966 +/* ./widechar/lib_get_wch.c */ 30967 + 30968 +#undef wget_wch 30969 +int wget_wch( 30970 + WINDOW *win, 30971 + wint_t *result) 30972 + { return(*(int *)0); } 30973 + 30974 +/* ./widechar/lib_get_wstr.c */ 30975 + 30976 +#undef wgetn_wstr 30977 +int wgetn_wstr( 30978 + WINDOW *win, 30979 + wint_t *str, 30980 + int maxlen) 30981 + { return(*(int *)0); } 30982 + 30983 +/* ./widechar/lib_hline_set.c */ 30984 + 30985 +#undef whline_set 30986 +int whline_set( 30987 + WINDOW *win, 30988 + const cchar_t *ch, 30989 + int n) 30990 + { return(*(int *)0); } 30991 + 30992 +/* ./widechar/lib_in_wch.c */ 30993 + 30994 +#undef win_wch 30995 +int win_wch( 30996 + WINDOW *win, 30997 + cchar_t *wcval) 30998 + { return(*(int *)0); } 30999 + 31000 +/* ./widechar/lib_in_wchnstr.c */ 31001 + 31002 +#undef win_wchnstr 31003 +int win_wchnstr( 31004 + WINDOW *win, 31005 + cchar_t *wchstr, 31006 + int n) 31007 + { return(*(int *)0); } 31008 + 31009 +/* ./widechar/lib_ins_wch.c */ 31010 + 31011 +#undef wins_wch 31012 +int wins_wch( 31013 + WINDOW *win, 31014 + const cchar_t *wch) 31015 + { return(*(int *)0); } 31016 + 31017 +#undef wins_nwstr 31018 +int wins_nwstr( 31019 + WINDOW *win, 31020 + const wchar_t *wstr, 31021 + int n) 31022 + { return(*(int *)0); } 31023 + 31024 +/* ./widechar/lib_inwstr.c */ 31025 + 31026 +#undef winnwstr 31027 +int winnwstr( 31028 + WINDOW *win, 31029 + wchar_t *wstr, 31030 + int n) 31031 + { return(*(int *)0); } 31032 + 31033 +#undef winwstr 31034 +int winwstr( 31035 + WINDOW *win, 31036 + wchar_t *wstr) 31037 + { return(*(int *)0); } 31038 + 31039 +/* ./widechar/lib_key_name.c */ 31040 + 31041 +#undef key_name 31042 +char *key_name( 31043 + wchar_t c) 31044 + { return(*(char **)0); } 31045 + 31046 +/* ./widechar/lib_pecho_wchar.c */ 31047 + 31048 +#undef pecho_wchar 31049 +int pecho_wchar( 31050 + WINDOW *pad, 31051 + const cchar_t *wch) 31052 + { return(*(int *)0); } 31053 + 31054 +/* ./widechar/lib_slk_wset.c */ 31055 + 31056 +#undef slk_wset 31057 +int slk_wset( 31058 + int i, 31059 + const wchar_t *astr, 31060 + int format) 31061 + { return(*(int *)0); } 31062 + 31063 +/* ./widechar/lib_unget_wch.c */ 31064 + 31065 +#undef _nc_wcrtomb 31066 +size_t _nc_wcrtomb( 31067 + char *target, 31068 + wchar_t source, 31069 + mbstate_t *state) 31070 + { return(*(size_t *)0); } 31071 + 31072 +#undef unget_wch_sp 31073 +int unget_wch_sp( 31074 + SCREEN *sp, 31075 + const wchar_t wch) 31076 + { return(*(int *)0); } 31077 + 31078 +#undef unget_wch 31079 +int unget_wch( 31080 + const wchar_t wch) 31081 + { return(*(int *)0); } 31082 + 31083 +/* ./widechar/lib_vid_attr.c */ 31084 + 31085 +#undef vid_puts_sp 31086 +int vid_puts_sp( 31087 + SCREEN *sp, 31088 + attr_t newmode, 31089 + short pair, 31090 + void *opts, 31091 + NCURSES_OUTC_sp outc) 31092 + { return(*(int *)0); } 31093 + 31094 +#undef vid_puts 31095 +int vid_puts( 31096 + attr_t newmode, 31097 + short pair, 31098 + void *opts, 31099 + NCURSES_OUTC outc) 31100 + { return(*(int *)0); } 31101 + 31102 +#undef vid_attr_sp 31103 +int vid_attr_sp( 31104 + SCREEN *sp, 31105 + attr_t newmode, 31106 + short pair, 31107 + void *opts) 31108 + { return(*(int *)0); } 31109 + 31110 +#undef vid_attr 31111 +int vid_attr( 31112 + attr_t newmode, 31113 + short pair, 31114 + void *opts) 31115 + { return(*(int *)0); } 31116 + 31117 +#undef term_attrs_sp 31118 +attr_t term_attrs_sp( 31119 + SCREEN *sp) 31120 + { return(*(attr_t *)0); } 31121 + 31122 +#undef term_attrs 31123 +attr_t term_attrs(void) 31124 + { return(*(attr_t *)0); } 31125 + 31126 +/* ./widechar/lib_vline_set.c */ 31127 + 31128 +#undef wvline_set 31129 +int wvline_set( 31130 + WINDOW *win, 31131 + const cchar_t *ch, 31132 + int n) 31133 + { return(*(int *)0); } 31134 + 31135 +/* ./widechar/lib_wacs.c */ 31136 + 31137 +#undef _nc_wacs 31138 +cchar_t *_nc_wacs; 31139 + 31140 +#undef _nc_init_wacs 31141 +void _nc_init_wacs(void) 31142 + { /* void */ } 31143 + 31144 +/* ./widechar/lib_wunctrl.c */ 31145 + 31146 +#undef wunctrl_sp 31147 +wchar_t *wunctrl_sp( 31148 + SCREEN *sp, 31149 + cchar_t *wc) 31150 + { return(*(wchar_t **)0); } 31151 + 31152 +#undef wunctrl 31153 +wchar_t *wunctrl( 31154 + cchar_t *wc) 31155 + { return(*(wchar_t **)0); } 31156 + 31157 +/* ./expanded.c */ 31158 + 31159 +#undef _nc_toggle_attr_on 31160 +void _nc_toggle_attr_on( 31161 + attr_t *S, 31162 + attr_t at) 31163 + { /* void */ } 31164 + 31165 +#undef _nc_toggle_attr_off 31166 +void _nc_toggle_attr_off( 31167 + attr_t *S, 31168 + attr_t at) 31169 + { /* void */ } 31170 + 31171 +#undef _nc_DelCharCost_sp 31172 +int _nc_DelCharCost_sp( 31173 + SCREEN *sp, 31174 + int count) 31175 + { return(*(int *)0); } 31176 + 31177 +#undef _nc_InsCharCost_sp 31178 +int _nc_InsCharCost_sp( 31179 + SCREEN *sp, 31180 + int count) 31181 + { return(*(int *)0); } 31182 + 31183 +#undef _nc_UpdateAttrs_sp 31184 +void _nc_UpdateAttrs_sp( 31185 + SCREEN *sp, 31186 + const cchar_t *c) 31187 + { /* void */ } 31188 + 31189 +#undef _nc_DelCharCost 31190 +int _nc_DelCharCost( 31191 + int count) 31192 + { return(*(int *)0); } 31193 + 31194 +#undef _nc_InsCharCost 31195 +int _nc_InsCharCost( 31196 + int count) 31197 + { return(*(int *)0); } 31198 + 31199 +#undef _nc_UpdateAttrs 31200 +void _nc_UpdateAttrs( 31201 + const cchar_t *c) 31202 + { /* void */ } 31203 + 31204 +/* ./base/legacy_coding.c */ 31205 + 31206 +#undef use_legacy_coding_sp 31207 +int use_legacy_coding_sp( 31208 + SCREEN *sp, 31209 + int level) 31210 + { return(*(int *)0); } 31211 + 31212 +#undef use_legacy_coding 31213 +int use_legacy_coding( 31214 + int level) 31215 + { return(*(int *)0); } 31216 + 31217 +/* ./base/lib_dft_fgbg.c */ 31218 + 31219 +#undef use_default_colors_sp 31220 +int use_default_colors_sp( 31221 + SCREEN *sp) 31222 + { return(*(int *)0); } 31223 + 31224 +#undef use_default_colors 31225 +int use_default_colors(void) 31226 + { return(*(int *)0); } 31227 + 31228 +#undef assume_default_colors_sp 31229 +int assume_default_colors_sp( 31230 + SCREEN *sp, 31231 + int fg, 31232 + int bg) 31233 + { return(*(int *)0); } 31234 + 31235 +#undef assume_default_colors 31236 +int assume_default_colors( 31237 + int fg, 31238 + int bg) 31239 + { return(*(int *)0); } 31240 + 31241 +/* ./tinfo/lib_print.c */ 31242 + 31243 +#undef mcprint_sp 31244 +int mcprint_sp( 31245 + SCREEN *sp, 31246 + char *data, 31247 + int len) 31248 + { return(*(int *)0); } 31249 + 31250 +#undef mcprint 31251 +int mcprint( 31252 + char *data, 31253 + int len) 31254 + { return(*(int *)0); } 31255 + 31256 +/* ./base/resizeterm.c */ 31257 + 31258 +#undef is_term_resized_sp 31259 +NCURSES_BOOL is_term_resized_sp( 31260 + SCREEN *sp, 31261 + int ToLines, 31262 + int ToCols) 31263 + { return(*(NCURSES_BOOL *)0); } 31264 + 31265 +#undef is_term_resized 31266 +NCURSES_BOOL is_term_resized( 31267 + int ToLines, 31268 + int ToCols) 31269 + { return(*(NCURSES_BOOL *)0); } 31270 + 31271 +#undef resize_term_sp 31272 +int resize_term_sp( 31273 + SCREEN *sp, 31274 + int ToLines, 31275 + int ToCols) 31276 + { return(*(int *)0); } 31277 + 31278 +#undef resize_term 31279 +int resize_term( 31280 + int ToLines, 31281 + int ToCols) 31282 + { return(*(int *)0); } 31283 + 31284 +#undef resizeterm_sp 31285 +int resizeterm_sp( 31286 + SCREEN *sp, 31287 + int ToLines, 31288 + int ToCols) 31289 + { return(*(int *)0); } 31290 + 31291 +#undef resizeterm 31292 +int resizeterm( 31293 + int ToLines, 31294 + int ToCols) 31295 + { return(*(int *)0); } 31296 + 31297 +/* ./trace/trace_xnames.c */ 31298 + 31299 +#undef _nc_trace_xnames 31300 +void _nc_trace_xnames( 31301 + TERMTYPE *tp) 31302 + { /* void */ } 31303 + 31304 +/* ./tinfo/use_screen.c */ 31305 + 31306 +#undef use_screen 31307 +int use_screen( 31308 + SCREEN *screen, 31309 + NCURSES_SCREEN_CB func, 31310 + void *data) 31311 + { return(*(int *)0); } 31312 + 31313 +/* ./base/use_window.c */ 31314 + 31315 +#undef use_window 31316 +int use_window( 31317 + WINDOW *win, 31318 + NCURSES_WINDOW_CB func, 31319 + void *data) 31320 + { return(*(int *)0); } 31321 + 31322 +/* ./base/wresize.c */ 31323 + 31324 +#undef wresize 31325 +int wresize( 31326 + WINDOW *win, 31327 + int ToLines, 31328 + int ToCols) 31329 + { return(*(int *)0); } 31330 + 31331 +/* ./tinfo/access.c */ 31332 + 31333 +#include <sys/stat.h> 31334 +#include <nc_alloc.h> 31335 + 31336 +#undef _nc_rootname 31337 +char *_nc_rootname( 31338 + char *path) 31339 + { return(*(char **)0); } 31340 + 31341 +#undef _nc_is_abs_path 31342 +NCURSES_BOOL _nc_is_abs_path( 31343 + const char *path) 31344 + { return(*(NCURSES_BOOL *)0); } 31345 + 31346 +#undef _nc_pathlast 31347 +unsigned _nc_pathlast( 31348 + const char *path) 31349 + { return(*(unsigned *)0); } 31350 + 31351 +#undef _nc_basename 31352 +char *_nc_basename( 31353 + char *path) 31354 + { return(*(char **)0); } 31355 + 31356 +#undef _nc_access 31357 +int _nc_access( 31358 + const char *path, 31359 + int mode) 31360 + { return(*(int *)0); } 31361 + 31362 +#undef _nc_is_dir_path 31363 +NCURSES_BOOL _nc_is_dir_path( 31364 + const char *path) 31365 + { return(*(NCURSES_BOOL *)0); } 31366 + 31367 +#undef _nc_is_file_path 31368 +NCURSES_BOOL _nc_is_file_path( 31369 + const char *path) 31370 + { return(*(NCURSES_BOOL *)0); } 31371 + 31372 +#undef _nc_env_access 31373 +int _nc_env_access(void) 31374 + { return(*(int *)0); } 31375 + 31376 +/* ./tinfo/add_tries.c */ 31377 + 31378 +#undef _nc_add_to_try 31379 +int _nc_add_to_try( 31380 + TRIES **tree, 31381 + const char *str, 31382 + unsigned code) 31383 + { return(*(int *)0); } 31384 + 31385 +/* ./tinfo/alloc_ttype.c */ 31386 + 31387 +#undef _nc_align_termtype 31388 +void _nc_align_termtype( 31389 + TERMTYPE *to, 31390 + TERMTYPE *from) 31391 + { /* void */ } 31392 + 31393 +#undef _nc_copy_termtype 31394 +void _nc_copy_termtype( 31395 + TERMTYPE *dst, 31396 + TERMTYPE *src) 31397 + { /* void */ } 31398 + 31399 +/* ./codes.c */ 31400 + 31401 +#undef _nc_boolcodes 31402 +char *const *_nc_boolcodes(void) 31403 + { return(*(char **)0); } 31404 + 31405 +#undef _nc_numcodes 31406 +char *const *_nc_numcodes(void) 31407 + { return(*(char **)0); } 31408 + 31409 +#undef _nc_strcodes 31410 +char *const *_nc_strcodes(void) 31411 + { return(*(char **)0); } 31412 + 31413 +/* ./tinfo/comp_error.c */ 31414 + 31415 +#undef _nc_suppress_warnings 31416 +NCURSES_BOOL _nc_suppress_warnings; 31417 +#undef _nc_curr_line 31418 +int _nc_curr_line; 31419 +#undef _nc_curr_col 31420 +int _nc_curr_col; 31421 + 31422 +#undef _nc_get_source 31423 +const char *_nc_get_source(void) 31424 + { return(*(const char **)0); } 31425 + 31426 +#undef _nc_set_source 31427 +void _nc_set_source( 31428 + const char *const name) 31429 + { /* void */ } 31430 + 31431 +#undef _nc_set_type 31432 +void _nc_set_type( 31433 + const char *const name) 31434 + { /* void */ } 31435 + 31436 +#undef _nc_get_type 31437 +void _nc_get_type( 31438 + char *name) 31439 + { /* void */ } 31440 + 31441 +#undef _nc_warning 31442 +void _nc_warning( 31443 + const char *const fmt, 31444 + ...) 31445 + { /* void */ } 31446 + 31447 +#undef _nc_err_abort 31448 +void _nc_err_abort( 31449 + const char *const fmt, 31450 + ...) 31451 + { /* void */ } 31452 + 31453 +#undef _nc_syserr_abort 31454 +void _nc_syserr_abort( 31455 + const char *const fmt, 31456 + ...) 31457 + { /* void */ } 31458 + 31459 +/* ./tinfo/db_iterator.c */ 31460 + 31461 +#undef _nc_tic_dir 31462 +const char *_nc_tic_dir( 31463 + const char *path) 31464 + { return(*(const char **)0); } 31465 + 31466 +#undef _nc_keep_tic_dir 31467 +void _nc_keep_tic_dir( 31468 + const char *path) 31469 + { /* void */ } 31470 + 31471 +#undef _nc_last_db 31472 +void _nc_last_db(void) 31473 + { /* void */ } 31474 + 31475 +#undef _nc_next_db 31476 +const char *_nc_next_db( 31477 + DBDIRS *state, 31478 + int *offset) 31479 + { return(*(const char **)0); } 31480 + 31481 +#undef _nc_first_db 31482 +void _nc_first_db( 31483 + DBDIRS *state, 31484 + int *offset) 31485 + { /* void */ } 31486 + 31487 +/* ./tinfo/doalloc.c */ 31488 + 31489 +#undef _nc_doalloc 31490 +void *_nc_doalloc( 31491 + void *oldp, 31492 + size_t amount) 31493 + { return(*(void **)0); } 31494 + 31495 +/* ./tinfo/entries.c */ 31496 + 31497 +#undef _nc_head 31498 +ENTRY *_nc_head; 31499 +#undef _nc_tail 31500 +ENTRY *_nc_tail; 31501 + 31502 +#undef _nc_free_entry 31503 +void _nc_free_entry( 31504 + ENTRY *headp, 31505 + TERMTYPE *tterm) 31506 + { /* void */ } 31507 + 31508 +#undef _nc_free_entries 31509 +void _nc_free_entries( 31510 + ENTRY *headp) 31511 + { /* void */ } 31512 + 31513 +#undef _nc_delink_entry 31514 +ENTRY *_nc_delink_entry( 31515 + ENTRY *headp, 31516 + TERMTYPE *tterm) 31517 + { return(*(ENTRY **)0); } 31518 + 31519 +#undef _nc_leaks_tinfo 31520 +void _nc_leaks_tinfo(void) 31521 + { /* void */ } 31522 + 31523 +/* ./fallback.c */ 31524 + 31525 +#undef _nc_fallback 31526 +const TERMTYPE *_nc_fallback( 31527 + const char *name) 31528 + { return(*(const TERMTYPE **)0); } 31529 + 31530 +/* ./tinfo/free_ttype.c */ 31531 + 31532 +#undef _nc_free_termtype 31533 +void _nc_free_termtype( 31534 + TERMTYPE *ptr) 31535 + { /* void */ } 31536 + 31537 +#undef _nc_user_definable 31538 +NCURSES_BOOL _nc_user_definable; 31539 + 31540 +#undef use_extended_names 31541 +int use_extended_names( 31542 + NCURSES_BOOL flag) 31543 + { return(*(int *)0); } 31544 + 31545 +/* ./tinfo/getenv_num.c */ 31546 + 31547 +#undef _nc_getenv_num 31548 +int _nc_getenv_num( 31549 + const char *name) 31550 + { return(*(int *)0); } 31551 + 31552 +/* ./tinfo/home_terminfo.c */ 31553 + 31554 +#undef _nc_home_terminfo 31555 +char *_nc_home_terminfo(void) 31556 + { return(*(char **)0); } 31557 + 31558 +/* ./tinfo/init_keytry.c */ 31559 + 31560 +#if 0 31561 + 31562 +#include <init_keytry.h> 31563 + 31564 +#undef _nc_tinfo_fkeys 31565 +const struct tinfo_fkeys _nc_tinfo_fkeys[] = {0}; 31566 + 31567 +#endif 31568 + 31569 +#undef _nc_init_keytry 31570 +void _nc_init_keytry( 31571 + SCREEN *sp) 31572 + { /* void */ } 31573 + 31574 +/* ./tinfo/lib_acs.c */ 31575 + 31576 +#undef _nc_acs_map 31577 +chtype *_nc_acs_map(void) 31578 + { return(*(chtype **)0); } 31579 + 31580 +#undef _nc_init_acs_sp 31581 +void _nc_init_acs_sp( 31582 + SCREEN *sp) 31583 + { /* void */ } 31584 + 31585 +#undef _nc_init_acs 31586 +void _nc_init_acs(void) 31587 + { /* void */ } 31588 + 31589 +/* ./tinfo/lib_baudrate.c */ 31590 + 31591 +#include <termcap.h> 31592 + 31593 +struct speed { 31594 + int s; 31595 + int sp; 31596 +}; 31597 + 31598 +#undef _nc_baudrate 31599 +int _nc_baudrate( 31600 + int OSpeed) 31601 + { return(*(int *)0); } 31602 + 31603 +#undef _nc_ospeed 31604 +int _nc_ospeed( 31605 + int BaudRate) 31606 + { return(*(int *)0); } 31607 + 31608 +#undef baudrate_sp 31609 +int baudrate_sp( 31610 + SCREEN *sp) 31611 + { return(*(int *)0); } 31612 + 31613 +#undef baudrate 31614 +int baudrate(void) 31615 + { return(*(int *)0); } 31616 + 31617 +/* ./tinfo/lib_cur_term.c */ 31618 + 31619 +#undef _nc_cur_term 31620 +TERMINAL *_nc_cur_term(void) 31621 + { return(*(TERMINAL **)0); } 31622 + 31623 +#undef set_curterm 31624 +TERMINAL *set_curterm( 31625 + TERMINAL *termp) 31626 + { return(*(TERMINAL **)0); } 31627 + 31628 +#undef del_curterm_sp 31629 +int del_curterm_sp( 31630 + SCREEN *sp, 31631 + TERMINAL *termp) 31632 + { return(*(int *)0); } 31633 + 31634 +#undef del_curterm 31635 +int del_curterm( 31636 + TERMINAL *termp) 31637 + { return(*(int *)0); } 31638 + 31639 +/* ./tinfo/lib_data.c */ 31640 + 31641 +#undef _nc_stdscr 31642 +WINDOW *_nc_stdscr(void) 31643 + { return(*(WINDOW **)0); } 31644 + 31645 +#undef _nc_curscr 31646 +WINDOW *_nc_curscr(void) 31647 + { return(*(WINDOW **)0); } 31648 + 31649 +#undef _nc_newscr 31650 +WINDOW *_nc_newscr(void) 31651 + { return(*(WINDOW **)0); } 31652 + 31653 +#undef _nc_screen_chain 31654 +SCREEN *_nc_screen_chain; 31655 +#undef SP 31656 +SCREEN *SP; 31657 +#undef _nc_globals 31658 +NCURSES_GLOBALS _nc_globals; 31659 +#undef _nc_prescreen 31660 +NCURSES_PRESCREEN _nc_prescreen; 31661 + 31662 +#undef _nc_screen_of 31663 +SCREEN *_nc_screen_of( 31664 + WINDOW *win) 31665 + { return(*(SCREEN **)0); } 31666 + 31667 +#undef _nc_init_pthreads 31668 +void _nc_init_pthreads(void) 31669 + { /* void */ } 31670 + 31671 +#undef _nc_mutex_init 31672 +void _nc_mutex_init( 31673 + pthread_mutex_t *obj) 31674 + { /* void */ } 31675 + 31676 +#undef _nc_mutex_lock 31677 +int _nc_mutex_lock( 31678 + pthread_mutex_t *obj) 31679 + { return(*(int *)0); } 31680 + 31681 +#undef _nc_mutex_trylock 31682 +int _nc_mutex_trylock( 31683 + pthread_mutex_t *obj) 31684 + { return(*(int *)0); } 31685 + 31686 +#undef _nc_mutex_unlock 31687 +int _nc_mutex_unlock( 31688 + pthread_mutex_t *obj) 31689 + { return(*(int *)0); } 31690 + 31691 +/* ./tinfo/lib_has_cap.c */ 31692 + 31693 +#undef has_ic_sp 31694 +NCURSES_BOOL has_ic_sp( 31695 + SCREEN *sp) 31696 + { return(*(NCURSES_BOOL *)0); } 31697 + 31698 +#undef has_ic 31699 +NCURSES_BOOL has_ic(void) 31700 + { return(*(NCURSES_BOOL *)0); } 31701 + 31702 +#undef has_il_sp 31703 +NCURSES_BOOL has_il_sp( 31704 + SCREEN *sp) 31705 + { return(*(NCURSES_BOOL *)0); } 31706 + 31707 +#undef has_il 31708 +NCURSES_BOOL has_il(void) 31709 + { return(*(NCURSES_BOOL *)0); } 31710 + 31711 +/* ./tinfo/lib_kernel.c */ 31712 + 31713 +#undef erasechar_sp 31714 +char erasechar_sp( 31715 + SCREEN *sp) 31716 + { return(*(char *)0); } 31717 + 31718 +#undef erasechar 31719 +char erasechar(void) 31720 + { return(*(char *)0); } 31721 + 31722 +#undef killchar_sp 31723 +char killchar_sp( 31724 + SCREEN *sp) 31725 + { return(*(char *)0); } 31726 + 31727 +#undef killchar 31728 +char killchar(void) 31729 + { return(*(char *)0); } 31730 + 31731 +#undef flushinp_sp 31732 +int flushinp_sp( 31733 + SCREEN *sp) 31734 + { return(*(int *)0); } 31735 + 31736 +#undef flushinp 31737 +int flushinp(void) 31738 + { return(*(int *)0); } 31739 + 31740 +/* ./lib_keyname.c */ 31741 + 31742 +struct kn { short offset; int code; }; 31743 + 31744 +#undef keyname_sp 31745 +char *keyname_sp( 31746 + SCREEN *sp, 31747 + int c) 31748 + { return(*(char **)0); } 31749 + 31750 +#undef keyname 31751 +char *keyname( 31752 + int c) 31753 + { return(*(char **)0); } 31754 + 31755 +/* ./tinfo/lib_longname.c */ 31756 + 31757 +#undef longname_sp 31758 +char *longname_sp( 31759 + SCREEN *sp) 31760 + { return(*(char **)0); } 31761 + 31762 +#undef longname 31763 +char *longname(void) 31764 + { return(*(char **)0); } 31765 + 31766 +/* ./tinfo/lib_napms.c */ 31767 + 31768 +#undef napms_sp 31769 +int napms_sp( 31770 + SCREEN *sp, 31771 + int ms) 31772 + { return(*(int *)0); } 31773 + 31774 +#undef napms 31775 +int napms( 31776 + int ms) 31777 + { return(*(int *)0); } 31778 + 31779 +/* ./tinfo/lib_options.c */ 31780 + 31781 +#undef idlok 31782 +int idlok( 31783 + WINDOW *win, 31784 + NCURSES_BOOL flag) 31785 + { return(*(int *)0); } 31786 + 31787 +#undef idcok 31788 +void idcok( 31789 + WINDOW *win, 31790 + NCURSES_BOOL flag) 31791 + { /* void */ } 31792 + 31793 +#undef halfdelay_sp 31794 +int halfdelay_sp( 31795 + SCREEN *sp, 31796 + int t) 31797 + { return(*(int *)0); } 31798 + 31799 +#undef halfdelay 31800 +int halfdelay( 31801 + int t) 31802 + { return(*(int *)0); } 31803 + 31804 +#undef nodelay 31805 +int nodelay( 31806 + WINDOW *win, 31807 + NCURSES_BOOL flag) 31808 + { return(*(int *)0); } 31809 + 31810 +#undef notimeout 31811 +int notimeout( 31812 + WINDOW *win, 31813 + NCURSES_BOOL f) 31814 + { return(*(int *)0); } 31815 + 31816 +#undef wtimeout 31817 +void wtimeout( 31818 + WINDOW *win, 31819 + int delay) 31820 + { /* void */ } 31821 + 31822 +#undef keypad 31823 +int keypad( 31824 + WINDOW *win, 31825 + NCURSES_BOOL flag) 31826 + { return(*(int *)0); } 31827 + 31828 +#undef meta 31829 +int meta( 31830 + WINDOW *win, 31831 + NCURSES_BOOL flag) 31832 + { return(*(int *)0); } 31833 + 31834 +#undef curs_set_sp 31835 +int curs_set_sp( 31836 + SCREEN *sp, 31837 + int vis) 31838 + { return(*(int *)0); } 31839 + 31840 +#undef curs_set 31841 +int curs_set( 31842 + int vis) 31843 + { return(*(int *)0); } 31844 + 31845 +#undef typeahead_sp 31846 +int typeahead_sp( 31847 + SCREEN *sp, 31848 + int fd) 31849 + { return(*(int *)0); } 31850 + 31851 +#undef typeahead 31852 +int typeahead( 31853 + int fd) 31854 + { return(*(int *)0); } 31855 + 31856 +#undef has_key_sp 31857 +int has_key_sp( 31858 + SCREEN *sp, 31859 + int keycode) 31860 + { return(*(int *)0); } 31861 + 31862 +#undef has_key 31863 +int has_key( 31864 + int keycode) 31865 + { return(*(int *)0); } 31866 + 31867 +#undef _nc_putp_flush_sp 31868 +int _nc_putp_flush_sp( 31869 + SCREEN *sp, 31870 + const char *name, 31871 + const char *value) 31872 + { return(*(int *)0); } 31873 + 31874 +#undef _nc_putp_flush 31875 +int _nc_putp_flush( 31876 + const char *name, 31877 + const char *value) 31878 + { return(*(int *)0); } 31879 + 31880 +#undef _nc_keypad 31881 +int _nc_keypad( 31882 + SCREEN *sp, 31883 + NCURSES_BOOL flag) 31884 + { return(*(int *)0); } 31885 + 31886 +/* ./tinfo/lib_raw.c */ 31887 + 31888 +#undef raw_sp 31889 +int raw_sp( 31890 + SCREEN *sp) 31891 + { return(*(int *)0); } 31892 + 31893 +#undef raw 31894 +int raw(void) 31895 + { return(*(int *)0); } 31896 + 31897 +#undef cbreak_sp 31898 +int cbreak_sp( 31899 + SCREEN *sp) 31900 + { return(*(int *)0); } 31901 + 31902 +#undef cbreak 31903 +int cbreak(void) 31904 + { return(*(int *)0); } 31905 + 31906 +#undef qiflush_sp 31907 +void qiflush_sp( 31908 + SCREEN *sp) 31909 + { /* void */ } 31910 + 31911 +#undef qiflush 31912 +void qiflush(void) 31913 + { /* void */ } 31914 + 31915 +#undef noraw_sp 31916 +int noraw_sp( 31917 + SCREEN *sp) 31918 + { return(*(int *)0); } 31919 + 31920 +#undef noraw 31921 +int noraw(void) 31922 + { return(*(int *)0); } 31923 + 31924 +#undef nocbreak_sp 31925 +int nocbreak_sp( 31926 + SCREEN *sp) 31927 + { return(*(int *)0); } 31928 + 31929 +#undef nocbreak 31930 +int nocbreak(void) 31931 + { return(*(int *)0); } 31932 + 31933 +#undef noqiflush_sp 31934 +void noqiflush_sp( 31935 + SCREEN *sp) 31936 + { /* void */ } 31937 + 31938 +#undef noqiflush 31939 +void noqiflush(void) 31940 + { /* void */ } 31941 + 31942 +#undef intrflush_sp 31943 +int intrflush_sp( 31944 + SCREEN *sp, 31945 + WINDOW *win, 31946 + NCURSES_BOOL flag) 31947 + { return(*(int *)0); } 31948 + 31949 +#undef intrflush 31950 +int intrflush( 31951 + WINDOW *win, 31952 + NCURSES_BOOL flag) 31953 + { return(*(int *)0); } 31954 + 31955 +/* ./tinfo/lib_setup.c */ 31956 + 31957 +#include <locale.h> 31958 +#include <sys/ioctl.h> 31959 +#include <langinfo.h> 31960 + 31961 +#undef _nc_ttytype 31962 +char *_nc_ttytype(void) 31963 + { return(*(char **)0); } 31964 + 31965 +#undef _nc_ptr_Lines 31966 +int *_nc_ptr_Lines( 31967 + SCREEN *sp) 31968 + { return(*(int **)0); } 31969 + 31970 +#undef _nc_LINES 31971 +int _nc_LINES(void) 31972 + { return(*(int *)0); } 31973 + 31974 +#undef _nc_ptr_Cols 31975 +int *_nc_ptr_Cols( 31976 + SCREEN *sp) 31977 + { return(*(int **)0); } 31978 + 31979 +#undef _nc_COLS 31980 +int _nc_COLS(void) 31981 + { return(*(int *)0); } 31982 + 31983 +#undef _nc_ptr_Tabsize 31984 +int *_nc_ptr_Tabsize( 31985 + SCREEN *sp) 31986 + { return(*(int **)0); } 31987 + 31988 +#undef _nc_TABSIZE 31989 +int _nc_TABSIZE(void) 31990 + { return(*(int *)0); } 31991 + 31992 +#undef set_tabsize_sp 31993 +int set_tabsize_sp( 31994 + SCREEN *sp, 31995 + int value) 31996 + { return(*(int *)0); } 31997 + 31998 +#undef set_tabsize 31999 +int set_tabsize( 32000 + int value) 32001 + { return(*(int *)0); } 32002 + 32003 +#undef _nc_handle_sigwinch 32004 +int _nc_handle_sigwinch( 32005 + SCREEN *sp) 32006 + { return(*(int *)0); } 32007 + 32008 +#undef use_env_sp 32009 +void use_env_sp( 32010 + SCREEN *sp, 32011 + NCURSES_BOOL f) 32012 + { /* void */ } 32013 + 32014 +#undef use_env 32015 +void use_env( 32016 + NCURSES_BOOL f) 32017 + { /* void */ } 32018 + 32019 +#undef _nc_get_screensize 32020 +void _nc_get_screensize( 32021 + SCREEN *sp, 32022 + int *linep, 32023 + int *colp) 32024 + { /* void */ } 32025 + 32026 +#undef _nc_update_screensize 32027 +void _nc_update_screensize( 32028 + SCREEN *sp) 32029 + { /* void */ } 32030 + 32031 +#undef _nc_get_locale 32032 +char *_nc_get_locale(void) 32033 + { return(*(char **)0); } 32034 + 32035 +#undef _nc_unicode_locale 32036 +int _nc_unicode_locale(void) 32037 + { return(*(int *)0); } 32038 + 32039 +#undef _nc_locale_breaks_acs 32040 +int _nc_locale_breaks_acs( 32041 + TERMINAL *termp) 32042 + { return(*(int *)0); } 32043 + 32044 +#undef _nc_setupterm 32045 +int _nc_setupterm( 32046 + char *tname, 32047 + int Filedes, 32048 + int *errret, 32049 + NCURSES_BOOL reuse) 32050 + { return(*(int *)0); } 32051 + 32052 +#undef setupterm 32053 +int setupterm( 32054 + char *tname, 32055 + int Filedes, 32056 + int *errret) 32057 + { return(*(int *)0); } 32058 + 32059 +/* ./tinfo/lib_termcap.c */ 32060 + 32061 +#undef UP 32062 +char *UP; 32063 +#undef BC 32064 +char *BC; 32065 + 32066 +#undef tgetent_sp 32067 +int tgetent_sp( 32068 + SCREEN *sp, 32069 + char *bufp, 32070 + const char *name) 32071 + { return(*(int *)0); } 32072 + 32073 +#if 0 32074 + 32075 +#include <capdefaults.c> 32076 + 32077 +#endif 32078 + 32079 +#undef tgetent 32080 +int tgetent( 32081 + char *bufp, 32082 + const char *name) 32083 + { return(*(int *)0); } 32084 + 32085 +#undef tgetflag_sp 32086 +int tgetflag_sp( 32087 + SCREEN *sp, 32088 + char *id) 32089 + { return(*(int *)0); } 32090 + 32091 +#undef tgetflag 32092 +int tgetflag( 32093 + char *id) 32094 + { return(*(int *)0); } 32095 + 32096 +#undef tgetnum_sp 32097 +int tgetnum_sp( 32098 + SCREEN *sp, 32099 + char *id) 32100 + { return(*(int *)0); } 32101 + 32102 +#undef tgetnum 32103 +int tgetnum( 32104 + char *id) 32105 + { return(*(int *)0); } 32106 + 32107 +#undef tgetstr_sp 32108 +char *tgetstr_sp( 32109 + SCREEN *sp, 32110 + char *id, 32111 + char **area) 32112 + { return(*(char **)0); } 32113 + 32114 +#undef tgetstr 32115 +char *tgetstr( 32116 + char *id, 32117 + char **area) 32118 + { return(*(char **)0); } 32119 + 32120 +/* ./tinfo/lib_termname.c */ 32121 + 32122 +#undef termname_sp 32123 +char *termname_sp( 32124 + SCREEN *sp) 32125 + { return(*(char **)0); } 32126 + 32127 +#undef termname 32128 +char *termname(void) 32129 + { return(*(char **)0); } 32130 + 32131 +/* ./tinfo/lib_tgoto.c */ 32132 + 32133 +#undef tgoto 32134 +char *tgoto( 32135 + const char *string, 32136 + int x, 32137 + int y) 32138 + { return(*(char **)0); } 32139 + 32140 +/* ./tinfo/lib_ti.c */ 32141 + 32142 +#undef tigetflag_sp 32143 +int tigetflag_sp( 32144 + SCREEN *sp, 32145 + char *str) 32146 + { return(*(int *)0); } 32147 + 32148 +#undef tigetflag 32149 +int tigetflag( 32150 + char *str) 32151 + { return(*(int *)0); } 32152 + 32153 +#undef tigetnum_sp 32154 +int tigetnum_sp( 32155 + SCREEN *sp, 32156 + char *str) 32157 + { return(*(int *)0); } 32158 + 32159 +#undef tigetnum 32160 +int tigetnum( 32161 + char *str) 32162 + { return(*(int *)0); } 32163 + 32164 +#undef tigetstr_sp 32165 +char *tigetstr_sp( 32166 + SCREEN *sp, 32167 + char *str) 32168 + { return(*(char **)0); } 32169 + 32170 +#undef tigetstr 32171 +char *tigetstr( 32172 + char *str) 32173 + { return(*(char **)0); } 32174 + 32175 +/* ./tinfo/lib_tparm.c */ 32176 + 32177 +#undef _nc_tparm_err 32178 +int _nc_tparm_err; 32179 + 32180 +#undef _nc_tparm_analyze 32181 +int _nc_tparm_analyze( 32182 + const char *string, 32183 + char *p_is_s[9], 32184 + int *popcount) 32185 + { return(*(int *)0); } 32186 + 32187 +#undef tparm 32188 +char *tparm( 32189 + char *string, 32190 + ...) 32191 + { return(*(char **)0); } 32192 + 32193 +/* ./tinfo/lib_tputs.c */ 32194 + 32195 +#undef PC 32196 +char PC; 32197 +#undef ospeed 32198 +NCURSES_OSPEED ospeed; 32199 +#undef _nc_nulls_sent 32200 +int _nc_nulls_sent; 32201 + 32202 +#undef _nc_set_no_padding 32203 +void _nc_set_no_padding( 32204 + SCREEN *sp) 32205 + { /* void */ } 32206 + 32207 +#undef delay_output_sp 32208 +int delay_output_sp( 32209 + SCREEN *sp, 32210 + int ms) 32211 + { return(*(int *)0); } 32212 + 32213 +#undef delay_output 32214 +int delay_output( 32215 + int ms) 32216 + { return(*(int *)0); } 32217 + 32218 +#undef _nc_flush_sp 32219 +void _nc_flush_sp( 32220 + SCREEN *sp) 32221 + { /* void */ } 32222 + 32223 +#undef _nc_flush 32224 +void _nc_flush(void) 32225 + { /* void */ } 32226 + 32227 +#undef _nc_outch_sp 32228 +int _nc_outch_sp( 32229 + SCREEN *sp, 32230 + int ch) 32231 + { return(*(int *)0); } 32232 + 32233 +#undef _nc_outch 32234 +int _nc_outch( 32235 + int ch) 32236 + { return(*(int *)0); } 32237 + 32238 +#undef putp_sp 32239 +int putp_sp( 32240 + SCREEN *sp, 32241 + const char *string) 32242 + { return(*(int *)0); } 32243 + 32244 +#undef _nc_putp_sp 32245 +int _nc_putp_sp( 32246 + SCREEN *sp, 32247 + const char *name, 32248 + const char *string) 32249 + { return(*(int *)0); } 32250 + 32251 +#undef putp 32252 +int putp( 32253 + const char *string) 32254 + { return(*(int *)0); } 32255 + 32256 +#undef _nc_putp 32257 +int _nc_putp( 32258 + const char *name, 32259 + const char *string) 32260 + { return(*(int *)0); } 32261 + 32262 +#undef tputs_sp 32263 +int tputs_sp( 32264 + SCREEN *sp, 32265 + const char *string, 32266 + int affcnt, 32267 + NCURSES_OUTC_sp outc) 32268 + { return(*(int *)0); } 32269 + 32270 +#undef _nc_outc_wrapper 32271 +int _nc_outc_wrapper( 32272 + SCREEN *sp, 32273 + int c) 32274 + { return(*(int *)0); } 32275 + 32276 +#undef tputs 32277 +int tputs( 32278 + const char *string, 32279 + int affcnt, 32280 + int (*outc)( 32281 + int p1)) 32282 + { return(*(int *)0); } 32283 + 32284 +/* ./trace/lib_trace.c */ 32285 + 32286 +#undef _nc_tracing 32287 +unsigned _nc_tracing; 32288 + 32289 +#undef _nc__nc_tputs_trace 32290 +const char *_nc__nc_tputs_trace(void) 32291 + { return(*(const char **)0); } 32292 + 32293 +#undef _nc__nc_outchars 32294 +long _nc__nc_outchars(void) 32295 + { return(*(long *)0); } 32296 + 32297 +#undef _nc_set_tputs_trace 32298 +void _nc_set_tputs_trace( 32299 + const char *s) 32300 + { /* void */ } 32301 + 32302 +#undef _nc_count_outchars 32303 +void _nc_count_outchars( 32304 + long increment) 32305 + { /* void */ } 32306 + 32307 +#undef trace 32308 +void trace( 32309 + const unsigned int tracelevel) 32310 + { /* void */ } 32311 + 32312 +#undef _tracef 32313 +void _tracef( 32314 + const char *fmt, 32315 + ...) 32316 + { /* void */ } 32317 + 32318 +#undef _nc_retrace_bool 32319 +NCURSES_BOOL _nc_retrace_bool( 32320 + NCURSES_BOOL code) 32321 + { return(*(NCURSES_BOOL *)0); } 32322 + 32323 +#undef _nc_retrace_int 32324 +int _nc_retrace_int( 32325 + int code) 32326 + { return(*(int *)0); } 32327 + 32328 +#undef _nc_retrace_unsigned 32329 +unsigned _nc_retrace_unsigned( 32330 + unsigned code) 32331 + { return(*(unsigned *)0); } 32332 + 32333 +#undef _nc_retrace_ptr 32334 +char *_nc_retrace_ptr( 32335 + char *code) 32336 + { return(*(char **)0); } 32337 + 32338 +#undef _nc_retrace_cptr 32339 +const char *_nc_retrace_cptr( 32340 + const char *code) 32341 + { return(*(const char **)0); } 32342 + 32343 +#undef _nc_retrace_cvoid_ptr 32344 +void *_nc_retrace_cvoid_ptr( 32345 + void *code) 32346 + { return(*(void **)0); } 32347 + 32348 +#undef _nc_retrace_void_ptr 32349 +void *_nc_retrace_void_ptr( 32350 + void *code) 32351 + { return(*(void **)0); } 32352 + 32353 +#undef _nc_retrace_sp 32354 +SCREEN *_nc_retrace_sp( 32355 + SCREEN *code) 32356 + { return(*(SCREEN **)0); } 32357 + 32358 +#undef _nc_retrace_win 32359 +WINDOW *_nc_retrace_win( 32360 + WINDOW *code) 32361 + { return(*(WINDOW **)0); } 32362 + 32363 +#undef _nc_use_tracef 32364 +int _nc_use_tracef( 32365 + unsigned mask) 32366 + { return(*(int *)0); } 32367 + 32368 +#undef _nc_locked_tracef 32369 +void _nc_locked_tracef( 32370 + const char *fmt, 32371 + ...) 32372 + { /* void */ } 32373 + 32374 +/* ./trace/lib_traceatr.c */ 32375 + 32376 +#undef _traceattr2 32377 +char *_traceattr2( 32378 + int bufnum, 32379 + chtype newmode) 32380 + { return(*(char **)0); } 32381 + 32382 +#undef _traceattr 32383 +char *_traceattr( 32384 + attr_t newmode) 32385 + { return(*(char **)0); } 32386 + 32387 +#undef _nc_retrace_attr_t 32388 +attr_t _nc_retrace_attr_t( 32389 + attr_t code) 32390 + { return(*(attr_t *)0); } 32391 + 32392 +#undef _nc_altcharset_name 32393 +const char *_nc_altcharset_name( 32394 + attr_t attr, 32395 + chtype ch) 32396 + { return(*(const char **)0); } 32397 + 32398 +#undef _tracechtype2 32399 +char *_tracechtype2( 32400 + int bufnum, 32401 + chtype ch) 32402 + { return(*(char **)0); } 32403 + 32404 +#undef _tracechtype 32405 +char *_tracechtype( 32406 + chtype ch) 32407 + { return(*(char **)0); } 32408 + 32409 +#undef _nc_retrace_chtype 32410 +chtype _nc_retrace_chtype( 32411 + chtype code) 32412 + { return(*(chtype *)0); } 32413 + 32414 +#undef _tracecchar_t2 32415 +char *_tracecchar_t2( 32416 + int bufnum, 32417 + const cchar_t *ch) 32418 + { return(*(char **)0); } 32419 + 32420 +#undef _tracecchar_t 32421 +char *_tracecchar_t( 32422 + const cchar_t *ch) 32423 + { return(*(char **)0); } 32424 + 32425 +/* ./trace/lib_tracebits.c */ 32426 + 32427 +typedef struct { 32428 + unsigned int val; 32429 + const char *name; 32430 +} BITNAMES; 32431 + 32432 +#undef _nc_trace_ttymode 32433 +char *_nc_trace_ttymode( 32434 + struct termios *tty) 32435 + { return(*(char **)0); } 32436 + 32437 +#undef _nc_tracebits 32438 +char *_nc_tracebits(void) 32439 + { return(*(char **)0); } 32440 + 32441 +/* ./trace/lib_tracechr.c */ 32442 + 32443 +#undef _nc_tracechar 32444 +char *_nc_tracechar( 32445 + SCREEN *sp, 32446 + int ch) 32447 + { return(*(char **)0); } 32448 + 32449 +#undef _tracechar 32450 +char *_tracechar( 32451 + int ch) 32452 + { return(*(char **)0); } 32453 + 32454 +/* ./tinfo/lib_ttyflags.c */ 32455 + 32456 +#undef _nc_get_tty_mode_sp 32457 +int _nc_get_tty_mode_sp( 32458 + SCREEN *sp, 32459 + struct termios *buf) 32460 + { return(*(int *)0); } 32461 + 32462 +#undef _nc_get_tty_mode 32463 +int _nc_get_tty_mode( 32464 + struct termios *buf) 32465 + { return(*(int *)0); } 32466 + 32467 +#undef _nc_set_tty_mode_sp 32468 +int _nc_set_tty_mode_sp( 32469 + SCREEN *sp, 32470 + struct termios *buf) 32471 + { return(*(int *)0); } 32472 + 32473 +#undef _nc_set_tty_mode 32474 +int _nc_set_tty_mode( 32475 + struct termios *buf) 32476 + { return(*(int *)0); } 32477 + 32478 +#undef def_shell_mode_sp 32479 +int def_shell_mode_sp( 32480 + SCREEN *sp) 32481 + { return(*(int *)0); } 32482 + 32483 +#undef def_shell_mode 32484 +int def_shell_mode(void) 32485 + { return(*(int *)0); } 32486 + 32487 +#undef def_prog_mode_sp 32488 +int def_prog_mode_sp( 32489 + SCREEN *sp) 32490 + { return(*(int *)0); } 32491 + 32492 +#undef def_prog_mode 32493 +int def_prog_mode(void) 32494 + { return(*(int *)0); } 32495 + 32496 +#undef reset_prog_mode_sp 32497 +int reset_prog_mode_sp( 32498 + SCREEN *sp) 32499 + { return(*(int *)0); } 32500 + 32501 +#undef reset_prog_mode 32502 +int reset_prog_mode(void) 32503 + { return(*(int *)0); } 32504 + 32505 +#undef reset_shell_mode_sp 32506 +int reset_shell_mode_sp( 32507 + SCREEN *sp) 32508 + { return(*(int *)0); } 32509 + 32510 +#undef reset_shell_mode 32511 +int reset_shell_mode(void) 32512 + { return(*(int *)0); } 32513 + 32514 +#undef savetty_sp 32515 +int savetty_sp( 32516 + SCREEN *sp) 32517 + { return(*(int *)0); } 32518 + 32519 +#undef savetty 32520 +int savetty(void) 32521 + { return(*(int *)0); } 32522 + 32523 +#undef resetty_sp 32524 +int resetty_sp( 32525 + SCREEN *sp) 32526 + { return(*(int *)0); } 32527 + 32528 +#undef resetty 32529 +int resetty(void) 32530 + { return(*(int *)0); } 32531 + 32532 +/* ./tty/lib_twait.c */ 32533 + 32534 +#undef _nc_timed_wait 32535 +int _nc_timed_wait( 32536 + SCREEN *sp, 32537 + int mode, 32538 + int milliseconds, 32539 + int *timeleft) 32540 + { return(*(int *)0); } 32541 + 32542 +/* ./tinfo/name_match.c */ 32543 + 32544 +#undef _nc_first_name 32545 +char *_nc_first_name( 32546 + const char *const sp) 32547 + { return(*(char **)0); } 32548 + 32549 +#undef _nc_name_match 32550 +int _nc_name_match( 32551 + const char *const namelst, 32552 + const char *const name, 32553 + const char *const delim) 32554 + { return(*(int *)0); } 32555 + 32556 +/* ./names.c */ 32557 + 32558 +#undef _nc_boolnames 32559 +char *const *_nc_boolnames(void) 32560 + { return(*(char **)0); } 32561 + 32562 +#undef _nc_boolfnames 32563 +char *const *_nc_boolfnames(void) 32564 + { return(*(char **)0); } 32565 + 32566 +#undef _nc_numnames 32567 +char *const *_nc_numnames(void) 32568 + { return(*(char **)0); } 32569 + 32570 +#undef _nc_numfnames 32571 +char *const *_nc_numfnames(void) 32572 + { return(*(char **)0); } 32573 + 32574 +#undef _nc_strnames 32575 +char *const *_nc_strnames(void) 32576 + { return(*(char **)0); } 32577 + 32578 +#undef _nc_strfnames 32579 +char *const *_nc_strfnames(void) 32580 + { return(*(char **)0); } 32581 + 32582 +/* ./tinfo/read_entry.c */ 32583 + 32584 +#include <hashed_db.h> 32585 + 32586 +#undef _nc_read_termtype 32587 +int _nc_read_termtype( 32588 + TERMTYPE *ptr, 32589 + char *buffer, 32590 + int limit) 32591 + { return(*(int *)0); } 32592 + 32593 +#undef _nc_read_file_entry 32594 +int _nc_read_file_entry( 32595 + const char *const filename, 32596 + TERMTYPE *ptr) 32597 + { return(*(int *)0); } 32598 + 32599 +#undef _nc_read_entry 32600 +int _nc_read_entry( 32601 + const char *const name, 32602 + char *const filename, 32603 + TERMTYPE *const tp) 32604 + { return(*(int *)0); } 32605 + 32606 +/* ./tinfo/read_termcap.c */ 32607 + 32608 +#include <sys/types.h> 32609 + 32610 +#undef _nc_read_termcap_entry 32611 +int _nc_read_termcap_entry( 32612 + const char *const tn, 32613 + TERMTYPE *const tp) 32614 + { return(*(int *)0); } 32615 + 32616 +/* ./tinfo/setbuf.c */ 32617 + 32618 +#undef _nc_set_buffer_sp 32619 +void _nc_set_buffer_sp( 32620 + SCREEN *sp, 32621 + FILE *ofp, 32622 + NCURSES_BOOL buffered) 32623 + { /* void */ } 32624 + 32625 +#undef _nc_set_buffer 32626 +void _nc_set_buffer( 32627 + FILE *ofp, 32628 + NCURSES_BOOL buffered) 32629 + { /* void */ } 32630 + 32631 +/* ./tinfo/strings.c */ 32632 + 32633 +#undef _nc_str_init 32634 +string_desc *_nc_str_init( 32635 + string_desc *dst, 32636 + char *src, 32637 + size_t len) 32638 + { return(*(string_desc **)0); } 32639 + 32640 +#undef _nc_str_null 32641 +string_desc *_nc_str_null( 32642 + string_desc *dst, 32643 + size_t len) 32644 + { return(*(string_desc **)0); } 32645 + 32646 +#undef _nc_str_copy 32647 +string_desc *_nc_str_copy( 32648 + string_desc *dst, 32649 + string_desc *src) 32650 + { return(*(string_desc **)0); } 32651 + 32652 +#undef _nc_safe_strcat 32653 +NCURSES_BOOL _nc_safe_strcat( 32654 + string_desc *dst, 32655 + const char *src) 32656 + { return(*(NCURSES_BOOL *)0); } 32657 + 32658 +#undef _nc_safe_strcpy 32659 +NCURSES_BOOL _nc_safe_strcpy( 32660 + string_desc *dst, 32661 + const char *src) 32662 + { return(*(NCURSES_BOOL *)0); } 32663 + 32664 +/* ./trace/trace_buf.c */ 32665 + 32666 +#undef _nc_trace_buf 32667 +char *_nc_trace_buf( 32668 + int bufnum, 32669 + size_t want) 32670 + { return(*(char **)0); } 32671 + 32672 +#undef _nc_trace_bufcat 32673 +char *_nc_trace_bufcat( 32674 + int bufnum, 32675 + const char *value) 32676 + { return(*(char **)0); } 32677 + 32678 +/* ./trace/trace_tries.c */ 32679 + 32680 +#undef _nc_trace_tries 32681 +void _nc_trace_tries( 32682 + TRIES *tree) 32683 + { /* void */ } 32684 + 32685 +/* ./base/tries.c */ 32686 + 32687 +#undef _nc_expand_try 32688 +char *_nc_expand_try( 32689 + TRIES *tree, 32690 + unsigned code, 32691 + int *count, 32692 + size_t len) 32693 + { return(*(char **)0); } 32694 + 32695 +#undef _nc_remove_key 32696 +int _nc_remove_key( 32697 + TRIES **tree, 32698 + unsigned code) 32699 + { return(*(int *)0); } 32700 + 32701 +#undef _nc_remove_string 32702 +int _nc_remove_string( 32703 + TRIES **tree, 32704 + const char *string) 32705 + { return(*(int *)0); } 32706 + 32707 +/* ./tinfo/trim_sgr0.c */ 32708 + 32709 +#undef _nc_trim_sgr0 32710 +char *_nc_trim_sgr0( 32711 + TERMTYPE *tp) 32712 + { return(*(char **)0); } 32713 + 32714 +/* ./unctrl.c */ 32715 + 32716 +#undef unctrl_sp 32717 +char *unctrl_sp( 32718 + SCREEN *sp, 32719 + chtype ch) 32720 + { return(*(char **)0); } 32721 + 32722 +#undef unctrl 32723 +char *unctrl( 32724 + chtype ch) 32725 + { return(*(char **)0); } 32726 + 32727 +/* ./trace/visbuf.c */ 32728 + 32729 +#undef _nc_visbuf2 32730 +const char *_nc_visbuf2( 32731 + int bufnum, 32732 + const char *buf) 32733 + { return(*(const char **)0); } 32734 + 32735 +#undef _nc_visbuf 32736 +const char *_nc_visbuf( 32737 + const char *buf) 32738 + { return(*(const char **)0); } 32739 + 32740 +#undef _nc_visbufn 32741 +const char *_nc_visbufn( 32742 + const char *buf, 32743 + int len) 32744 + { return(*(const char **)0); } 32745 + 32746 +#undef _nc_viswbuf2 32747 +const char *_nc_viswbuf2( 32748 + int bufnum, 32749 + const wchar_t *buf) 32750 + { return(*(const char **)0); } 32751 + 32752 +#undef _nc_viswbuf 32753 +const char *_nc_viswbuf( 32754 + const wchar_t *buf) 32755 + { return(*(const char **)0); } 32756 + 32757 +#undef _nc_viswbufn 32758 +const char *_nc_viswbufn( 32759 + const wchar_t *buf, 32760 + int len) 32761 + { return(*(const char **)0); } 32762 + 32763 +#undef _nc_viswibuf 32764 +const char *_nc_viswibuf( 32765 + const wint_t *buf) 32766 + { return(*(const char **)0); } 32767 + 32768 +#undef _nc_viscbuf2 32769 +const char *_nc_viscbuf2( 32770 + int bufnum, 32771 + const cchar_t *buf, 32772 + int len) 32773 + { return(*(const char **)0); } 32774 + 32775 +#undef _nc_viscbuf 32776 +const char *_nc_viscbuf( 32777 + const cchar_t *buf, 32778 + int len) 32779 + { return(*(const char **)0); } 32780 + 32781 +/* ./tinfo/alloc_entry.c */ 32782 + 32783 +#undef _nc_init_entry 32784 +void _nc_init_entry( 32785 + TERMTYPE *const tp) 32786 + { /* void */ } 32787 + 32788 +#undef _nc_copy_entry 32789 +ENTRY *_nc_copy_entry( 32790 + ENTRY *oldp) 32791 + { return(*(ENTRY **)0); } 32792 + 32793 +#undef _nc_save_str 32794 +char *_nc_save_str( 32795 + const char *const string) 32796 + { return(*(char **)0); } 32797 + 32798 +#undef _nc_wrap_entry 32799 +void _nc_wrap_entry( 32800 + ENTRY *const ep, 32801 + NCURSES_BOOL copy_strings) 32802 + { /* void */ } 32803 + 32804 +#undef _nc_merge_entry 32805 +void _nc_merge_entry( 32806 + TERMTYPE *const to, 32807 + TERMTYPE *const from) 32808 + { /* void */ } 32809 + 32810 +/* ./tinfo/captoinfo.c */ 32811 + 32812 +#undef _nc_captoinfo 32813 +char *_nc_captoinfo( 32814 + const char *cap, 32815 + const char *s, 32816 + int const parameterized) 32817 + { return(*(char **)0); } 32818 + 32819 +#undef _nc_infotocap 32820 +char *_nc_infotocap( 32821 + const char *cap, 32822 + const char *str, 32823 + int const parameterized) 32824 + { return(*(char **)0); } 32825 + 32826 +/* ./comp_captab.c */ 32827 + 32828 +#include <hashsize.h> 32829 + 32830 +#undef _nc_get_table 32831 +const struct name_table_entry *_nc_get_table( 32832 + NCURSES_BOOL termcap) 32833 + { return(*(const struct name_table_entry **)0); } 32834 + 32835 +#undef _nc_get_hash_table 32836 +const short *_nc_get_hash_table( 32837 + NCURSES_BOOL termcap) 32838 + { return(*(const short **)0); } 32839 + 32840 +#undef _nc_get_alias_table 32841 +const struct alias *_nc_get_alias_table( 32842 + NCURSES_BOOL termcap) 32843 + { return(*(const struct alias **)0); } 32844 + 32845 +/* ./tinfo/comp_expand.c */ 32846 + 32847 +#undef _nc_tic_expand 32848 +char *_nc_tic_expand( 32849 + const char *srcp, 32850 + NCURSES_BOOL tic_format, 32851 + int numbers) 32852 + { return(*(char **)0); } 32853 + 32854 +/* ./tinfo/comp_hash.c */ 32855 + 32856 +#undef _nc_find_entry 32857 +struct name_table_entry const *_nc_find_entry( 32858 + const char *string, 32859 + const short *hash_table) 32860 + { return(*(struct name_table_entry const **)0); } 32861 + 32862 +#undef _nc_find_type_entry 32863 +struct name_table_entry const *_nc_find_type_entry( 32864 + const char *string, 32865 + int type, 32866 + const struct name_table_entry *table) 32867 + { return(*(struct name_table_entry const **)0); } 32868 + 32869 +/* ./tinfo/comp_parse.c */ 32870 + 32871 +#undef _nc_check_termtype2 32872 +void (*_nc_check_termtype2)( 32873 + TERMTYPE *p1, 32874 + NCURSES_BOOL p2); 32875 +#undef _nc_check_termtype 32876 +void (*_nc_check_termtype)( 32877 + TERMTYPE *p1); 32878 + 32879 +#undef _nc_entry_match 32880 +NCURSES_BOOL _nc_entry_match( 32881 + char *n1, 32882 + char *n2) 32883 + { return(*(NCURSES_BOOL *)0); } 32884 + 32885 +#undef _nc_read_entry_source 32886 +void _nc_read_entry_source( 32887 + FILE *fp, 32888 + char *buf, 32889 + int literal, 32890 + NCURSES_BOOL silent, 32891 + NCURSES_BOOL (*hook)( 32892 + ENTRY *p1)) 32893 + { /* void */ } 32894 + 32895 +#undef _nc_resolve_uses2 32896 +int _nc_resolve_uses2( 32897 + NCURSES_BOOL fullresolve, 32898 + NCURSES_BOOL literal) 32899 + { return(*(int *)0); } 32900 + 32901 +#undef _nc_resolve_uses 32902 +int _nc_resolve_uses( 32903 + NCURSES_BOOL fullresolve) 32904 + { return(*(int *)0); } 32905 + 32906 +/* ./tinfo/comp_scan.c */ 32907 + 32908 +#undef _nc_syntax 32909 +int _nc_syntax; 32910 +#undef _nc_curr_file_pos 32911 +long _nc_curr_file_pos; 32912 +#undef _nc_comment_start 32913 +long _nc_comment_start; 32914 +#undef _nc_comment_end 32915 +long _nc_comment_end; 32916 +#undef _nc_start_line 32917 +long _nc_start_line; 32918 +#undef _nc_curr_token 32919 +struct token _nc_curr_token; 32920 +#undef _nc_disable_period 32921 +NCURSES_BOOL _nc_disable_period; 32922 + 32923 +#undef _nc_reset_input 32924 +void _nc_reset_input( 32925 + FILE *fp, 32926 + char *buf) 32927 + { /* void */ } 32928 + 32929 +#undef _nc_get_token 32930 +int _nc_get_token( 32931 + NCURSES_BOOL silent) 32932 + { return(*(int *)0); } 32933 + 32934 +#undef _nc_trans_string 32935 +int _nc_trans_string( 32936 + char *ptr, 32937 + char *last) 32938 + { return(*(int *)0); } 32939 + 32940 +#undef _nc_push_token 32941 +void _nc_push_token( 32942 + int tokclass) 32943 + { /* void */ } 32944 + 32945 +#undef _nc_panic_mode 32946 +void _nc_panic_mode( 32947 + char ch) 32948 + { /* void */ } 32949 + 32950 +/* ./tinfo/parse_entry.c */ 32951 + 32952 +#undef _nc_parse_entry 32953 +int _nc_parse_entry( 32954 + struct entry *entryp, 32955 + int literal, 32956 + NCURSES_BOOL silent) 32957 + { return(*(int *)0); } 32958 + 32959 +#undef _nc_capcmp 32960 +int _nc_capcmp( 32961 + const char *s, 32962 + const char *t) 32963 + { return(*(int *)0); } 32964 + 32965 +typedef struct { 32966 + const char *from; 32967 + const char *to; 32968 +} assoc; 32969 + 32970 +/* ./tinfo/write_entry.c */ 32971 + 32972 +#undef _nc_set_writedir 32973 +void _nc_set_writedir( 32974 + char *dir) 32975 + { /* void */ } 32976 + 32977 +#undef _nc_write_entry 32978 +void _nc_write_entry( 32979 + TERMTYPE *const tp) 32980 + { /* void */ } 32981 + 32982 +#undef _nc_tic_written 32983 +int _nc_tic_written(void) 32984 + { return(*(int *)0); } 32985 + 32986 +/* ./base/define_key.c */ 32987 + 32988 +#undef define_key_sp 32989 +int define_key_sp( 32990 + SCREEN *sp, 32991 + const char *str, 32992 + int keycode) 32993 + { return(*(int *)0); } 32994 + 32995 +#undef define_key 32996 +int define_key( 32997 + const char *str, 32998 + int keycode) 32999 + { return(*(int *)0); } 33000 + 33001 +/* ./tinfo/hashed_db.c */ 33002 + 33003 +#undef _nc_hashed_db 33004 +void _nc_hashed_db(void) 33005 + { /* void */ } 33006 + 33007 +/* ./base/key_defined.c */ 33008 + 33009 +#undef key_defined_sp 33010 +int key_defined_sp( 33011 + SCREEN *sp, 33012 + const char *str) 33013 + { return(*(int *)0); } 33014 + 33015 +#undef key_defined 33016 +int key_defined( 33017 + const char *str) 33018 + { return(*(int *)0); } 33019 + 33020 +/* ./base/keybound.c */ 33021 + 33022 +#undef keybound_sp 33023 +char *keybound_sp( 33024 + SCREEN *sp, 33025 + int code, 33026 + int count) 33027 + { return(*(char **)0); } 33028 + 33029 +#undef keybound 33030 +char *keybound( 33031 + int code, 33032 + int count) 33033 + { return(*(char **)0); } 33034 + 33035 +/* ./base/keyok.c */ 33036 + 33037 +#undef keyok_sp 33038 +int keyok_sp( 33039 + SCREEN *sp, 33040 + int c, 33041 + NCURSES_BOOL flag) 33042 + { return(*(int *)0); } 33043 + 33044 +#undef keyok 33045 +int keyok( 33046 + int c, 33047 + NCURSES_BOOL flag) 33048 + { return(*(int *)0); } 33049 + 33050 +/* ./base/version.c */ 33051 + 33052 +#undef curses_version 33053 +const char *curses_version(void) 33054 + { return(*(const char **)0); } 33055 diff -Naur ncurses-5.7.orig/ncurses/llib-lncursesw ncurses-5.7/ncurses/llib-lncursesw 33056 --- ncurses-5.7.orig/ncurses/llib-lncursesw 2008-10-11 14:03:02.000000000 -0700 33057 +++ ncurses-5.7/ncurses/llib-lncursesw 2009-07-19 15:04:11.000000000 -0700 33058 @@ -1,5 +1,5 @@ 33059 /**************************************************************************** 33060 - * Copyright (c) 2001-2007,2008 Free Software Foundation, Inc. * 33061 + * Copyright (c) 2001-2008,2009 Free Software Foundation, Inc. * 33062 * * 33063 * Permission is hereby granted, free of charge, to any person obtaining a * 33064 * copy of this software and associated documentation files (the * 33065 @@ -27,7 +27,7 @@ 33066 ****************************************************************************/ 33067 33068 /**************************************************************************** 33069 - * Author: Thomas E. Dickey 2001-2008 * 33070 + * Author: Thomas E. Dickey 2001-2009 * 33071 ****************************************************************************/ 33072 /* LINTLIBRARY */ 33073 33074 @@ -38,27 +38,54 @@ 33075 #undef _nc_oldnums 33076 int *_nc_oldnums; 33077 33078 +#undef _nc_scroll_optimize_sp 33079 +void _nc_scroll_optimize_sp( 33080 + SCREEN *sp) 33081 + { /* void */ } 33082 + 33083 #undef _nc_scroll_optimize 33084 void _nc_scroll_optimize(void) 33085 { /* void */ } 33086 33087 +#undef _nc_linedump_sp 33088 +void _nc_linedump_sp( 33089 + SCREEN *sp) 33090 + { /* void */ } 33091 + 33092 #undef _nc_linedump 33093 void _nc_linedump(void) 33094 { /* void */ } 33095 33096 /* ./tty/hashmap.c */ 33097 33098 -#include <term.h> 33099 +#undef _nc_hash_map_sp 33100 +void _nc_hash_map_sp( 33101 + SCREEN *sp) 33102 + { /* void */ } 33103 33104 #undef _nc_hash_map 33105 void _nc_hash_map(void) 33106 { /* void */ } 33107 33108 +#undef _nc_make_oldhash_sp 33109 +void _nc_make_oldhash_sp( 33110 + SCREEN *sp, 33111 + int i) 33112 + { /* void */ } 33113 + 33114 #undef _nc_make_oldhash 33115 void _nc_make_oldhash( 33116 int i) 33117 { /* void */ } 33118 33119 +#undef _nc_scroll_oldhash_sp 33120 +void _nc_scroll_oldhash_sp( 33121 + SCREEN *sp, 33122 + int n, 33123 + int top, 33124 + int bot) 33125 + { /* void */ } 33126 + 33127 #undef _nc_scroll_oldhash 33128 void _nc_scroll_oldhash( 33129 int n, 33130 @@ -137,6 +164,11 @@ 33131 33132 /* ./base/lib_beep.c */ 33133 33134 +#undef beep_sp 33135 +int beep_sp( 33136 + SCREEN *sp) 33137 + { return(*(int *)0); } 33138 + 33139 #undef beep 33140 int beep(void) 33141 { return(*(int *)0); } 33142 @@ -224,6 +256,7 @@ 33143 33144 /* ./base/lib_color.c */ 33145 33146 +#include <term.h> 33147 #include <tic.h> 33148 33149 #undef COLOR_PAIRS 33150 @@ -231,14 +264,32 @@ 33151 #undef COLORS 33152 int COLORS; 33153 33154 +#undef _nc_reset_colors_sp 33155 +NCURSES_BOOL _nc_reset_colors_sp( 33156 + SCREEN *sp) 33157 + { return(*(NCURSES_BOOL *)0); } 33158 + 33159 #undef _nc_reset_colors 33160 NCURSES_BOOL _nc_reset_colors(void) 33161 { return(*(NCURSES_BOOL *)0); } 33162 33163 +#undef start_color_sp 33164 +int start_color_sp( 33165 + SCREEN *sp) 33166 + { return(*(int *)0); } 33167 + 33168 #undef start_color 33169 int start_color(void) 33170 { return(*(int *)0); } 33171 33172 +#undef init_pair_sp 33173 +int init_pair_sp( 33174 + SCREEN *sp, 33175 + short pair, 33176 + short f, 33177 + short b) 33178 + { return(*(int *)0); } 33179 + 33180 #undef init_pair 33181 int init_pair( 33182 short pair, 33183 @@ -246,6 +297,15 @@ 33184 short b) 33185 { return(*(int *)0); } 33186 33187 +#undef init_color_sp 33188 +int init_color_sp( 33189 + SCREEN *sp, 33190 + short color, 33191 + short r, 33192 + short g, 33193 + short b) 33194 + { return(*(int *)0); } 33195 + 33196 #undef init_color 33197 int init_color( 33198 short color, 33199 @@ -254,14 +314,33 @@ 33200 short b) 33201 { return(*(int *)0); } 33202 33203 +#undef can_change_color_sp 33204 +NCURSES_BOOL can_change_color_sp( 33205 + SCREEN *sp) 33206 + { return(*(NCURSES_BOOL *)0); } 33207 + 33208 #undef can_change_color 33209 NCURSES_BOOL can_change_color(void) 33210 { return(*(NCURSES_BOOL *)0); } 33211 33212 +#undef has_colors_sp 33213 +NCURSES_BOOL has_colors_sp( 33214 + SCREEN *sp) 33215 + { return(*(NCURSES_BOOL *)0); } 33216 + 33217 #undef has_colors 33218 NCURSES_BOOL has_colors(void) 33219 { return(*(NCURSES_BOOL *)0); } 33220 33221 +#undef color_content_sp 33222 +int color_content_sp( 33223 + SCREEN *sp, 33224 + short color, 33225 + short *r, 33226 + short *g, 33227 + short *b) 33228 + { return(*(int *)0); } 33229 + 33230 #undef color_content 33231 int color_content( 33232 short color, 33233 @@ -270,6 +349,14 @@ 33234 short *b) 33235 { return(*(int *)0); } 33236 33237 +#undef pair_content_sp 33238 +int pair_content_sp( 33239 + SCREEN *sp, 33240 + short pair, 33241 + short *f, 33242 + short *b) 33243 + { return(*(int *)0); } 33244 + 33245 #undef pair_content 33246 int pair_content( 33247 short pair, 33248 @@ -277,13 +364,21 @@ 33249 short *b) 33250 { return(*(int *)0); } 33251 33252 +#undef _nc_do_color_sp 33253 +void _nc_do_color_sp( 33254 + SCREEN *sp, 33255 + short old_pair, 33256 + short pair, 33257 + NCURSES_BOOL reverse, 33258 + NCURSES_OUTC_sp outc) 33259 + { /* void */ } 33260 + 33261 #undef _nc_do_color 33262 void _nc_do_color( 33263 short old_pair, 33264 short pair, 33265 NCURSES_BOOL reverse, 33266 - int (*outc)( 33267 - int p1)) 33268 + NCURSES_OUTC outc) 33269 { /* void */ } 33270 33271 /* ./base/lib_colorset.c */ 33272 @@ -311,16 +406,31 @@ 33273 33274 /* ./base/lib_echo.c */ 33275 33276 +#undef echo_sp 33277 +int echo_sp( 33278 + SCREEN *sp) 33279 + { return(*(int *)0); } 33280 + 33281 #undef echo 33282 int echo(void) 33283 { return(*(int *)0); } 33284 33285 +#undef noecho_sp 33286 +int noecho_sp( 33287 + SCREEN *sp) 33288 + { return(*(int *)0); } 33289 + 33290 #undef noecho 33291 int noecho(void) 33292 { return(*(int *)0); } 33293 33294 /* ./base/lib_endwin.c */ 33295 33296 +#undef endwin_sp 33297 +int endwin_sp( 33298 + SCREEN *sp) 33299 + { return(*(int *)0); } 33300 + 33301 #undef endwin 33302 int endwin(void) 33303 { return(*(int *)0); } 33304 @@ -334,6 +444,11 @@ 33305 33306 /* ./base/lib_flash.c */ 33307 33308 +#undef flash_sp 33309 +int flash_sp( 33310 + SCREEN *sp) 33311 + { return(*(int *)0); } 33312 + 33313 #undef flash 33314 int flash(void) 33315 { return(*(int *)0); } 33316 @@ -1646,6 +1761,12 @@ 33317 #undef ESCDELAY 33318 int ESCDELAY; 33319 33320 +#undef set_escdelay_sp 33321 +int set_escdelay_sp( 33322 + SCREEN *sp, 33323 + int value) 33324 + { return(*(int *)0); } 33325 + 33326 #undef set_escdelay 33327 int set_escdelay( 33328 int value) 33329 @@ -1708,6 +1829,7 @@ 33330 33331 #undef _nc_insert_ch 33332 int _nc_insert_ch( 33333 + SCREEN *sp, 33334 WINDOW *win, 33335 chtype ch) 33336 { return(*(int *)0); } 33337 @@ -1746,6 +1868,11 @@ 33338 33339 /* ./base/lib_isendwin.c */ 33340 33341 +#undef isendwin_sp 33342 +NCURSES_BOOL isendwin_sp( 33343 + SCREEN *sp) 33344 + { return(*(NCURSES_BOOL *)0); } 33345 + 33346 #undef isendwin 33347 NCURSES_BOOL isendwin(void) 33348 { return(*(NCURSES_BOOL *)0); } 33349 @@ -1760,16 +1887,35 @@ 33350 33351 /* ./base/lib_mouse.c */ 33352 33353 +#undef getmouse_sp 33354 +int getmouse_sp( 33355 + SCREEN *sp, 33356 + MEVENT *aevent) 33357 + { return(*(int *)0); } 33358 + 33359 #undef getmouse 33360 int getmouse( 33361 MEVENT *aevent) 33362 { return(*(int *)0); } 33363 33364 +#undef ungetmouse_sp 33365 +int ungetmouse_sp( 33366 + SCREEN *sp, 33367 + MEVENT *aevent) 33368 + { return(*(int *)0); } 33369 + 33370 #undef ungetmouse 33371 int ungetmouse( 33372 MEVENT *aevent) 33373 { return(*(int *)0); } 33374 33375 +#undef mousemask_sp 33376 +mmask_t mousemask_sp( 33377 + SCREEN *sp, 33378 + mmask_t newmask, 33379 + mmask_t *oldmask) 33380 + { return(*(mmask_t *)0); } 33381 + 33382 #undef mousemask 33383 mmask_t mousemask( 33384 mmask_t newmask, 33385 @@ -1783,14 +1929,30 @@ 33386 int x) 33387 { return(*(NCURSES_BOOL *)0); } 33388 33389 +#undef mouseinterval_sp 33390 +int mouseinterval_sp( 33391 + SCREEN *sp, 33392 + int maxclick) 33393 + { return(*(int *)0); } 33394 + 33395 #undef mouseinterval 33396 int mouseinterval( 33397 int maxclick) 33398 { return(*(int *)0); } 33399 33400 #undef _nc_has_mouse 33401 -int _nc_has_mouse(void) 33402 - { return(*(int *)0); } 33403 +NCURSES_BOOL _nc_has_mouse( 33404 + SCREEN *sp) 33405 + { return(*(NCURSES_BOOL *)0); } 33406 + 33407 +#undef has_mouse_sp 33408 +NCURSES_BOOL has_mouse_sp( 33409 + SCREEN *sp) 33410 + { return(*(NCURSES_BOOL *)0); } 33411 + 33412 +#undef has_mouse 33413 +NCURSES_BOOL has_mouse(void) 33414 + { return(*(NCURSES_BOOL *)0); } 33415 33416 #undef wmouse_trafo 33417 NCURSES_BOOL wmouse_trafo( 33418 @@ -1811,24 +1973,55 @@ 33419 33420 /* ./tty/lib_mvcur.c */ 33421 33422 +#undef _nc_msec_cost_sp 33423 +int _nc_msec_cost_sp( 33424 + SCREEN *sp, 33425 + const char *const cap, 33426 + int affcnt) 33427 + { return(*(int *)0); } 33428 + 33429 #undef _nc_msec_cost 33430 int _nc_msec_cost( 33431 const char *const cap, 33432 int affcnt) 33433 { return(*(int *)0); } 33434 33435 +#undef _nc_mvcur_resume_sp 33436 +void _nc_mvcur_resume_sp( 33437 + SCREEN *sp) 33438 + { /* void */ } 33439 + 33440 #undef _nc_mvcur_resume 33441 void _nc_mvcur_resume(void) 33442 { /* void */ } 33443 33444 +#undef _nc_mvcur_init_sp 33445 +void _nc_mvcur_init_sp( 33446 + SCREEN *sp) 33447 + { /* void */ } 33448 + 33449 #undef _nc_mvcur_init 33450 void _nc_mvcur_init(void) 33451 { /* void */ } 33452 33453 +#undef _nc_mvcur_wrap_sp 33454 +void _nc_mvcur_wrap_sp( 33455 + SCREEN *sp) 33456 + { /* void */ } 33457 + 33458 #undef _nc_mvcur_wrap 33459 void _nc_mvcur_wrap(void) 33460 { /* void */ } 33461 33462 +#undef mvcur_sp 33463 +int mvcur_sp( 33464 + SCREEN *sp, 33465 + int yold, 33466 + int xold, 33467 + int ynew, 33468 + int xnew) 33469 + { return(*(int *)0); } 33470 + 33471 #undef mvcur 33472 int mvcur( 33473 int yold, 33474 @@ -1851,14 +2044,32 @@ 33475 33476 /* ./base/lib_newterm.c */ 33477 33478 +#undef filter_sp 33479 +void filter_sp( 33480 + SCREEN *sp) 33481 + { /* void */ } 33482 + 33483 #undef filter 33484 void filter(void) 33485 { /* void */ } 33486 33487 +#undef nofilter_sp 33488 +void nofilter_sp( 33489 + SCREEN *sp) 33490 + { /* void */ } 33491 + 33492 #undef nofilter 33493 void nofilter(void) 33494 { /* void */ } 33495 33496 +#undef newterm_sp 33497 +SCREEN *newterm_sp( 33498 + SCREEN *sp, 33499 + char *name, 33500 + FILE *ofp, 33501 + FILE *ifp) 33502 + { return(*(SCREEN **)0); } 33503 + 33504 #undef newterm 33505 SCREEN *newterm( 33506 char *name, 33507 @@ -1873,6 +2084,15 @@ 33508 WINDOW *win) 33509 { return(*(int *)0); } 33510 33511 +#undef newwin_sp 33512 +WINDOW *newwin_sp( 33513 + SCREEN *sp, 33514 + int num_lines, 33515 + int num_columns, 33516 + int begy, 33517 + int begx) 33518 + { return(*(WINDOW **)0); } 33519 + 33520 #undef newwin 33521 WINDOW *newwin( 33522 int num_lines, 33523 @@ -1899,6 +2119,16 @@ 33524 int x) 33525 { return(*(WINDOW **)0); } 33526 33527 +#undef _nc_makenew_sp 33528 +WINDOW *_nc_makenew_sp( 33529 + SCREEN *sp, 33530 + int num_lines, 33531 + int num_columns, 33532 + int begy, 33533 + int begx, 33534 + int flags) 33535 + { return(*(WINDOW **)0); } 33536 + 33537 #undef _nc_makenew 33538 WINDOW *_nc_makenew( 33539 int num_lines, 33540 @@ -1908,17 +2138,37 @@ 33541 int flags) 33542 { return(*(WINDOW **)0); } 33543 33544 -#undef _nc_screen_of 33545 -SCREEN *_nc_screen_of( 33546 - WINDOW *win) 33547 - { return(*(SCREEN **)0); } 33548 +#undef _nc_curscr_of 33549 +WINDOW *_nc_curscr_of( 33550 + SCREEN *sp) 33551 + { return(*(WINDOW **)0); } 33552 + 33553 +#undef _nc_newscr_of 33554 +WINDOW *_nc_newscr_of( 33555 + SCREEN *sp) 33556 + { return(*(WINDOW **)0); } 33557 + 33558 +#undef _nc_stdscr_of 33559 +WINDOW *_nc_stdscr_of( 33560 + SCREEN *sp) 33561 + { return(*(WINDOW **)0); } 33562 33563 /* ./base/lib_nl.c */ 33564 33565 +#undef nl_sp 33566 +int nl_sp( 33567 + SCREEN *sp) 33568 + { return(*(int *)0); } 33569 + 33570 #undef nl 33571 int nl(void) 33572 { return(*(int *)0); } 33573 33574 +#undef nonl_sp 33575 +int nonl_sp( 33576 + SCREEN *sp) 33577 + { return(*(int *)0); } 33578 + 33579 #undef nonl 33580 int nonl(void) 33581 { return(*(int *)0); } 33582 @@ -1952,6 +2202,13 @@ 33583 33584 /* ./base/lib_pad.c */ 33585 33586 +#undef newpad_sp 33587 +WINDOW *newpad_sp( 33588 + SCREEN *sp, 33589 + int l, 33590 + int c) 33591 + { return(*(WINDOW **)0); } 33592 + 33593 #undef newpad 33594 WINDOW *newpad( 33595 int l, 33596 @@ -2057,6 +2314,14 @@ 33597 33598 /* ./base/lib_restart.c */ 33599 33600 +#undef restartterm_sp 33601 +int restartterm_sp( 33602 + SCREEN *sp, 33603 + char *termp, 33604 + int filenum, 33605 + int *errret) 33606 + { return(*(int *)0); } 33607 + 33608 #undef restartterm 33609 int restartterm( 33610 char *termp, 33611 @@ -2105,6 +2370,12 @@ 33612 33613 /* ./base/lib_screen.c */ 33614 33615 +#undef getwin_sp 33616 +WINDOW *getwin_sp( 33617 + SCREEN *sp, 33618 + FILE *filep) 33619 + { return(*(WINDOW **)0); } 33620 + 33621 #undef getwin 33622 WINDOW *getwin( 33623 FILE *filep) 33624 @@ -2116,6 +2387,12 @@ 33625 FILE *filep) 33626 { return(*(int *)0); } 33627 33628 +#undef scr_restore_sp 33629 +int scr_restore_sp( 33630 + SCREEN *sp, 33631 + const char *file) 33632 + { return(*(int *)0); } 33633 + 33634 #undef scr_restore 33635 int scr_restore( 33636 const char *file) 33637 @@ -2126,11 +2403,23 @@ 33638 const char *file) 33639 { return(*(int *)0); } 33640 33641 +#undef scr_init_sp 33642 +int scr_init_sp( 33643 + SCREEN *sp, 33644 + const char *file) 33645 + { return(*(int *)0); } 33646 + 33647 #undef scr_init 33648 int scr_init( 33649 const char *file) 33650 { return(*(int *)0); } 33651 33652 +#undef scr_set_sp 33653 +int scr_set_sp( 33654 + SCREEN *sp, 33655 + const char *file) 33656 + { return(*(int *)0); } 33657 + 33658 #undef scr_set 33659 int scr_set( 33660 const char *file) 33661 @@ -2191,6 +2480,15 @@ 33662 int slk_format) 33663 { return(*(int *)0); } 33664 33665 +#undef _nc_ripoffline_sp 33666 +int _nc_ripoffline_sp( 33667 + SCREEN *sp, 33668 + int line, 33669 + int (*init)( 33670 + WINDOW *p1, 33671 + int p2)) 33672 + { return(*(int *)0); } 33673 + 33674 #undef _nc_ripoffline 33675 int _nc_ripoffline( 33676 int line, 33677 @@ -2199,6 +2497,15 @@ 33678 int p2)) 33679 { return(*(int *)0); } 33680 33681 +#undef ripoffline_sp 33682 +int ripoffline_sp( 33683 + SCREEN *sp, 33684 + int line, 33685 + int (*init)( 33686 + WINDOW *p1, 33687 + int p2)) 33688 + { return(*(int *)0); } 33689 + 33690 #undef ripoffline 33691 int ripoffline( 33692 int line, 33693 @@ -2215,12 +2522,25 @@ 33694 int cols) 33695 { return(*(int *)0); } 33696 33697 +#undef slk_restore_sp 33698 +int slk_restore_sp( 33699 + SCREEN *sp) 33700 + { return(*(int *)0); } 33701 + 33702 #undef slk_restore 33703 int slk_restore(void) 33704 { return(*(int *)0); } 33705 33706 /* ./base/lib_slkatr_set.c */ 33707 33708 +#undef slk_attr_set_sp 33709 +int slk_attr_set_sp( 33710 + SCREEN *sp, 33711 + const attr_t attr, 33712 + short color_pair_number, 33713 + void *opts) 33714 + { return(*(int *)0); } 33715 + 33716 #undef slk_attr_set 33717 int slk_attr_set( 33718 const attr_t attr, 33719 @@ -2230,6 +2550,12 @@ 33720 33721 /* ./base/lib_slkatrof.c */ 33722 33723 +#undef slk_attroff_sp 33724 +int slk_attroff_sp( 33725 + SCREEN *sp, 33726 + const chtype attr) 33727 + { return(*(int *)0); } 33728 + 33729 #undef slk_attroff 33730 int slk_attroff( 33731 const chtype attr) 33732 @@ -2237,6 +2563,12 @@ 33733 33734 /* ./base/lib_slkatron.c */ 33735 33736 +#undef slk_attron_sp 33737 +int slk_attron_sp( 33738 + SCREEN *sp, 33739 + const chtype attr) 33740 + { return(*(int *)0); } 33741 + 33742 #undef slk_attron 33743 int slk_attron( 33744 const chtype attr) 33745 @@ -2244,6 +2576,12 @@ 33746 33747 /* ./base/lib_slkatrset.c */ 33748 33749 +#undef slk_attrset_sp 33750 +int slk_attrset_sp( 33751 + SCREEN *sp, 33752 + const chtype attr) 33753 + { return(*(int *)0); } 33754 + 33755 #undef slk_attrset 33756 int slk_attrset( 33757 const chtype attr) 33758 @@ -2251,18 +2589,34 @@ 33759 33760 /* ./base/lib_slkattr.c */ 33761 33762 +#undef slk_attr_sp 33763 +attr_t slk_attr_sp( 33764 + SCREEN *sp) 33765 + { return(*(attr_t *)0); } 33766 + 33767 #undef slk_attr 33768 attr_t slk_attr(void) 33769 { return(*(attr_t *)0); } 33770 33771 /* ./base/lib_slkclear.c */ 33772 33773 +#undef slk_clear_sp 33774 +int slk_clear_sp( 33775 + SCREEN *sp) 33776 + { return(*(int *)0); } 33777 + 33778 #undef slk_clear 33779 int slk_clear(void) 33780 { return(*(int *)0); } 33781 33782 /* ./base/lib_slkcolor.c */ 33783 33784 +#undef slk_color_sp 33785 +int slk_color_sp( 33786 + SCREEN *sp, 33787 + short color_pair_number) 33788 + { return(*(int *)0); } 33789 + 33790 #undef slk_color 33791 int slk_color( 33792 short color_pair_number) 33793 @@ -2270,6 +2624,12 @@ 33794 33795 /* ./base/lib_slkinit.c */ 33796 33797 +#undef slk_init_sp 33798 +int slk_init_sp( 33799 + SCREEN *sp, 33800 + int format) 33801 + { return(*(int *)0); } 33802 + 33803 #undef slk_init 33804 int slk_init( 33805 int format) 33806 @@ -2277,6 +2637,12 @@ 33807 33808 /* ./base/lib_slklab.c */ 33809 33810 +#undef slk_label_sp 33811 +char *slk_label_sp( 33812 + SCREEN *sp, 33813 + int n) 33814 + { return(*(char **)0); } 33815 + 33816 #undef slk_label 33817 char *slk_label( 33818 int n) 33819 @@ -2284,10 +2650,20 @@ 33820 33821 /* ./base/lib_slkrefr.c */ 33822 33823 +#undef slk_noutrefresh_sp 33824 +int slk_noutrefresh_sp( 33825 + SCREEN *sp) 33826 + { return(*(int *)0); } 33827 + 33828 #undef slk_noutrefresh 33829 int slk_noutrefresh(void) 33830 { return(*(int *)0); } 33831 33832 +#undef slk_refresh_sp 33833 +int slk_refresh_sp( 33834 + SCREEN *sp) 33835 + { return(*(int *)0); } 33836 + 33837 #undef slk_refresh 33838 int slk_refresh(void) 33839 { return(*(int *)0); } 33840 @@ -2296,6 +2672,14 @@ 33841 33842 #include <wctype.h> 33843 33844 +#undef slk_set_sp 33845 +int slk_set_sp( 33846 + SCREEN *sp, 33847 + int i, 33848 + const char *astr, 33849 + int format) 33850 + { return(*(int *)0); } 33851 + 33852 #undef slk_set 33853 int slk_set( 33854 int i, 33855 @@ -2305,6 +2689,11 @@ 33856 33857 /* ./base/lib_slktouch.c */ 33858 33859 +#undef slk_touch_sp 33860 +int slk_touch_sp( 33861 + SCREEN *sp) 33862 + { return(*(int *)0); } 33863 + 33864 #undef slk_touch 33865 int slk_touch(void) 33866 { return(*(int *)0); } 33867 @@ -2367,8 +2756,8 @@ 33868 SCREEN *sp) 33869 { /* void */ } 33870 33871 -#undef _nc_ungetch 33872 -int _nc_ungetch( 33873 +#undef ungetch_sp 33874 +int ungetch_sp( 33875 SCREEN *sp, 33876 int ch) 33877 { return(*(int *)0); } 33878 @@ -2380,11 +2769,23 @@ 33879 33880 /* ./tty/lib_vidattr.c */ 33881 33882 +#undef vidputs_sp 33883 +int vidputs_sp( 33884 + SCREEN *sp, 33885 + chtype newmode, 33886 + NCURSES_OUTC_sp outc) 33887 + { return(*(int *)0); } 33888 + 33889 #undef vidputs 33890 int vidputs( 33891 chtype newmode, 33892 - int (*outc)( 33893 - int p1)) 33894 + NCURSES_OUTC outc) 33895 + { return(*(int *)0); } 33896 + 33897 +#undef vidattr_sp 33898 +int vidattr_sp( 33899 + SCREEN *sp, 33900 + chtype newmode) 33901 { return(*(int *)0); } 33902 33903 #undef vidattr 33904 @@ -2392,6 +2793,11 @@ 33905 chtype newmode) 33906 { return(*(int *)0); } 33907 33908 +#undef termattrs_sp 33909 +chtype termattrs_sp( 33910 + SCREEN *sp) 33911 + { return(*(chtype *)0); } 33912 + 33913 #undef termattrs 33914 chtype termattrs(void) 33915 { return(*(chtype *)0); } 33916 @@ -2472,12 +2878,24 @@ 33917 33918 /* ./base/nc_panel.c */ 33919 33920 +#undef _nc_panelhook_sp 33921 +struct panelhook *_nc_panelhook_sp( 33922 + SCREEN *sp) 33923 + { return(*(struct panelhook **)0); } 33924 + 33925 #undef _nc_panelhook 33926 struct panelhook *_nc_panelhook(void) 33927 { return(*(struct panelhook **)0); } 33928 33929 /* ./base/safe_sprintf.c */ 33930 33931 +#undef _nc_printf_string_sp 33932 +char *_nc_printf_string_sp( 33933 + SCREEN *sp, 33934 + const char *fmt, 33935 + va_list ap) 33936 + { return(*(char **)0); } 33937 + 33938 #undef _nc_printf_string 33939 char *_nc_printf_string( 33940 const char *fmt, 33941 @@ -2489,10 +2907,24 @@ 33942 #include <sys/time.h> 33943 #include <sys/times.h> 33944 33945 +#undef doupdate_sp 33946 +int doupdate_sp( 33947 + SCREEN *sp) 33948 + { return(*(int *)0); } 33949 + 33950 #undef doupdate 33951 int doupdate(void) 33952 { return(*(int *)0); } 33953 33954 +#undef _nc_scrolln_sp 33955 +int _nc_scrolln_sp( 33956 + SCREEN *sp, 33957 + int n, 33958 + int top, 33959 + int bot, 33960 + int maxy) 33961 + { return(*(int *)0); } 33962 + 33963 #undef _nc_scrolln 33964 int _nc_scrolln( 33965 int n, 33966 @@ -2501,18 +2933,39 @@ 33967 int maxy) 33968 { return(*(int *)0); } 33969 33970 +#undef _nc_screen_resume_sp 33971 +void _nc_screen_resume_sp( 33972 + SCREEN *sp) 33973 + { /* void */ } 33974 + 33975 #undef _nc_screen_resume 33976 void _nc_screen_resume(void) 33977 { /* void */ } 33978 33979 +#undef _nc_screen_init_sp 33980 +void _nc_screen_init_sp( 33981 + SCREEN *sp) 33982 + { /* void */ } 33983 + 33984 #undef _nc_screen_init 33985 void _nc_screen_init(void) 33986 { /* void */ } 33987 33988 +#undef _nc_screen_wrap_sp 33989 +void _nc_screen_wrap_sp( 33990 + SCREEN *sp) 33991 + { /* void */ } 33992 + 33993 #undef _nc_screen_wrap 33994 void _nc_screen_wrap(void) 33995 { /* void */ } 33996 33997 +#undef _nc_do_xmc_glitch_sp 33998 +void _nc_do_xmc_glitch_sp( 33999 + SCREEN *sp, 34000 + attr_t previous) 34001 + { /* void */ } 34002 + 34003 #undef _nc_do_xmc_glitch 34004 void _nc_do_xmc_glitch( 34005 attr_t previous) 34006 @@ -2550,6 +3003,12 @@ 34007 void _nc_freeall(void) 34008 { /* void */ } 34009 34010 +#undef _nc_free_and_exit_sp 34011 +void _nc_free_and_exit_sp( 34012 + SCREEN *sp, 34013 + int code) 34014 + { /* void */ } 34015 + 34016 #undef _nc_free_and_exit 34017 void _nc_free_and_exit( 34018 int code) 34019 @@ -2739,6 +3198,12 @@ 34020 mbstate_t *state) 34021 { return(*(size_t *)0); } 34022 34023 +#undef unget_wch_sp 34024 +int unget_wch_sp( 34025 + SCREEN *sp, 34026 + const wchar_t wch) 34027 + { return(*(int *)0); } 34028 + 34029 #undef unget_wch 34030 int unget_wch( 34031 const wchar_t wch) 34032 @@ -2746,13 +3211,29 @@ 34033 34034 /* ./widechar/lib_vid_attr.c */ 34035 34036 +#undef vid_puts_sp 34037 +int vid_puts_sp( 34038 + SCREEN *sp, 34039 + attr_t newmode, 34040 + short pair, 34041 + void *opts, 34042 + NCURSES_OUTC_sp outc) 34043 + { return(*(int *)0); } 34044 + 34045 #undef vid_puts 34046 int vid_puts( 34047 attr_t newmode, 34048 short pair, 34049 void *opts, 34050 - int (*outc)( 34051 - int p1)) 34052 + NCURSES_OUTC outc) 34053 + { return(*(int *)0); } 34054 + 34055 +#undef vid_attr_sp 34056 +int vid_attr_sp( 34057 + SCREEN *sp, 34058 + attr_t newmode, 34059 + short pair, 34060 + void *opts) 34061 { return(*(int *)0); } 34062 34063 #undef vid_attr 34064 @@ -2762,6 +3243,11 @@ 34065 void *opts) 34066 { return(*(int *)0); } 34067 34068 +#undef term_attrs_sp 34069 +attr_t term_attrs_sp( 34070 + SCREEN *sp) 34071 + { return(*(attr_t *)0); } 34072 + 34073 #undef term_attrs 34074 attr_t term_attrs(void) 34075 { return(*(attr_t *)0); } 34076 @@ -2786,6 +3272,12 @@ 34077 34078 /* ./widechar/lib_wunctrl.c */ 34079 34080 +#undef wunctrl_sp 34081 +wchar_t *wunctrl_sp( 34082 + SCREEN *sp, 34083 + cchar_t *wc) 34084 + { return(*(wchar_t **)0); } 34085 + 34086 #undef wunctrl 34087 wchar_t *wunctrl( 34088 cchar_t *wc) 34089 @@ -2805,6 +3297,24 @@ 34090 attr_t at) 34091 { /* void */ } 34092 34093 +#undef _nc_DelCharCost_sp 34094 +int _nc_DelCharCost_sp( 34095 + SCREEN *sp, 34096 + int count) 34097 + { return(*(int *)0); } 34098 + 34099 +#undef _nc_InsCharCost_sp 34100 +int _nc_InsCharCost_sp( 34101 + SCREEN *sp, 34102 + int count) 34103 + { return(*(int *)0); } 34104 + 34105 +#undef _nc_UpdateAttrs_sp 34106 +void _nc_UpdateAttrs_sp( 34107 + SCREEN *sp, 34108 + const cchar_t *c) 34109 + { /* void */ } 34110 + 34111 #undef _nc_DelCharCost 34112 int _nc_DelCharCost( 34113 int count) 34114 @@ -2817,11 +3327,17 @@ 34115 34116 #undef _nc_UpdateAttrs 34117 void _nc_UpdateAttrs( 34118 - cchar_t c) 34119 + const cchar_t *c) 34120 { /* void */ } 34121 34122 /* ./base/legacy_coding.c */ 34123 34124 +#undef use_legacy_coding_sp 34125 +int use_legacy_coding_sp( 34126 + SCREEN *sp, 34127 + int level) 34128 + { return(*(int *)0); } 34129 + 34130 #undef use_legacy_coding 34131 int use_legacy_coding( 34132 int level) 34133 @@ -2829,10 +3345,22 @@ 34134 34135 /* ./base/lib_dft_fgbg.c */ 34136 34137 +#undef use_default_colors_sp 34138 +int use_default_colors_sp( 34139 + SCREEN *sp) 34140 + { return(*(int *)0); } 34141 + 34142 #undef use_default_colors 34143 int use_default_colors(void) 34144 { return(*(int *)0); } 34145 34146 +#undef assume_default_colors_sp 34147 +int assume_default_colors_sp( 34148 + SCREEN *sp, 34149 + int fg, 34150 + int bg) 34151 + { return(*(int *)0); } 34152 + 34153 #undef assume_default_colors 34154 int assume_default_colors( 34155 int fg, 34156 @@ -2841,6 +3369,13 @@ 34157 34158 /* ./tinfo/lib_print.c */ 34159 34160 +#undef mcprint_sp 34161 +int mcprint_sp( 34162 + SCREEN *sp, 34163 + char *data, 34164 + int len) 34165 + { return(*(int *)0); } 34166 + 34167 #undef mcprint 34168 int mcprint( 34169 char *data, 34170 @@ -2849,18 +3384,39 @@ 34171 34172 /* ./base/resizeterm.c */ 34173 34174 +#undef is_term_resized_sp 34175 +NCURSES_BOOL is_term_resized_sp( 34176 + SCREEN *sp, 34177 + int ToLines, 34178 + int ToCols) 34179 + { return(*(NCURSES_BOOL *)0); } 34180 + 34181 #undef is_term_resized 34182 NCURSES_BOOL is_term_resized( 34183 int ToLines, 34184 int ToCols) 34185 { return(*(NCURSES_BOOL *)0); } 34186 34187 +#undef resize_term_sp 34188 +int resize_term_sp( 34189 + SCREEN *sp, 34190 + int ToLines, 34191 + int ToCols) 34192 + { return(*(int *)0); } 34193 + 34194 #undef resize_term 34195 int resize_term( 34196 int ToLines, 34197 int ToCols) 34198 { return(*(int *)0); } 34199 34200 +#undef resizeterm_sp 34201 +int resizeterm_sp( 34202 + SCREEN *sp, 34203 + int ToLines, 34204 + int ToCols) 34205 + { return(*(int *)0); } 34206 + 34207 #undef resizeterm 34208 int resizeterm( 34209 int ToLines, 34210 @@ -3143,6 +3699,11 @@ 34211 #undef acs_map 34212 chtype acs_map[128]; 34213 34214 +#undef _nc_init_acs_sp 34215 +void _nc_init_acs_sp( 34216 + SCREEN *sp) 34217 + { /* void */ } 34218 + 34219 #undef _nc_init_acs 34220 void _nc_init_acs(void) 34221 { /* void */ } 34222 @@ -3166,6 +3727,11 @@ 34223 int BaudRate) 34224 { return(*(int *)0); } 34225 34226 +#undef baudrate_sp 34227 +int baudrate_sp( 34228 + SCREEN *sp) 34229 + { return(*(int *)0); } 34230 + 34231 #undef baudrate 34232 int baudrate(void) 34233 { return(*(int *)0); } 34234 @@ -3180,6 +3746,12 @@ 34235 TERMINAL *termp) 34236 { return(*(TERMINAL **)0); } 34237 34238 +#undef del_curterm_sp 34239 +int del_curterm_sp( 34240 + SCREEN *sp, 34241 + TERMINAL *termp) 34242 + { return(*(int *)0); } 34243 + 34244 #undef del_curterm 34245 int del_curterm( 34246 TERMINAL *termp) 34247 @@ -3202,26 +3774,56 @@ 34248 #undef _nc_prescreen 34249 NCURSES_PRESCREEN _nc_prescreen; 34250 34251 +#undef _nc_screen_of 34252 +SCREEN *_nc_screen_of( 34253 + WINDOW *win) 34254 + { return(*(SCREEN **)0); } 34255 + 34256 /* ./tinfo/lib_has_cap.c */ 34257 34258 +#undef has_ic_sp 34259 +NCURSES_BOOL has_ic_sp( 34260 + SCREEN *sp) 34261 + { return(*(NCURSES_BOOL *)0); } 34262 + 34263 #undef has_ic 34264 NCURSES_BOOL has_ic(void) 34265 { return(*(NCURSES_BOOL *)0); } 34266 34267 +#undef has_il_sp 34268 +NCURSES_BOOL has_il_sp( 34269 + SCREEN *sp) 34270 + { return(*(NCURSES_BOOL *)0); } 34271 + 34272 #undef has_il 34273 NCURSES_BOOL has_il(void) 34274 { return(*(NCURSES_BOOL *)0); } 34275 34276 /* ./tinfo/lib_kernel.c */ 34277 34278 +#undef erasechar_sp 34279 +char erasechar_sp( 34280 + SCREEN *sp) 34281 + { return(*(char *)0); } 34282 + 34283 #undef erasechar 34284 char erasechar(void) 34285 { return(*(char *)0); } 34286 34287 +#undef killchar_sp 34288 +char killchar_sp( 34289 + SCREEN *sp) 34290 + { return(*(char *)0); } 34291 + 34292 #undef killchar 34293 char killchar(void) 34294 { return(*(char *)0); } 34295 34296 +#undef flushinp_sp 34297 +int flushinp_sp( 34298 + SCREEN *sp) 34299 + { return(*(int *)0); } 34300 + 34301 #undef flushinp 34302 int flushinp(void) 34303 { return(*(int *)0); } 34304 @@ -3230,8 +3832,8 @@ 34305 34306 struct kn { short offset; int code; }; 34307 34308 -#undef _nc_keyname 34309 -char *_nc_keyname( 34310 +#undef keyname_sp 34311 +char *keyname_sp( 34312 SCREEN *sp, 34313 int c) 34314 { return(*(char **)0); } 34315 @@ -3251,6 +3853,12 @@ 34316 34317 #include <time.h> 34318 34319 +#undef napms_sp 34320 +int napms_sp( 34321 + SCREEN *sp, 34322 + int ms) 34323 + { return(*(int *)0); } 34324 + 34325 #undef napms 34326 int napms( 34327 int ms) 34328 @@ -3270,6 +3878,12 @@ 34329 NCURSES_BOOL flag) 34330 { /* void */ } 34331 34332 +#undef halfdelay_sp 34333 +int halfdelay_sp( 34334 + SCREEN *sp, 34335 + int t) 34336 + { return(*(int *)0); } 34337 + 34338 #undef halfdelay 34339 int halfdelay( 34340 int t) 34341 @@ -3305,21 +3919,52 @@ 34342 NCURSES_BOOL flag) 34343 { return(*(int *)0); } 34344 34345 +#undef curs_set_sp 34346 +int curs_set_sp( 34347 + SCREEN *sp, 34348 + int vis) 34349 + { return(*(int *)0); } 34350 + 34351 #undef curs_set 34352 int curs_set( 34353 int vis) 34354 { return(*(int *)0); } 34355 34356 +#undef typeahead_sp 34357 +int typeahead_sp( 34358 + SCREEN *sp, 34359 + int fd) 34360 + { return(*(int *)0); } 34361 + 34362 #undef typeahead 34363 int typeahead( 34364 int fd) 34365 { return(*(int *)0); } 34366 34367 +#undef has_key_sp 34368 +int has_key_sp( 34369 + SCREEN *sp, 34370 + int keycode) 34371 + { return(*(int *)0); } 34372 + 34373 #undef has_key 34374 int has_key( 34375 int keycode) 34376 { return(*(int *)0); } 34377 34378 +#undef _nc_putp_flush_sp 34379 +int _nc_putp_flush_sp( 34380 + SCREEN *sp, 34381 + const char *name, 34382 + const char *value) 34383 + { return(*(int *)0); } 34384 + 34385 +#undef _nc_putp_flush 34386 +int _nc_putp_flush( 34387 + const char *name, 34388 + const char *value) 34389 + { return(*(int *)0); } 34390 + 34391 #undef _nc_keypad 34392 int _nc_keypad( 34393 SCREEN *sp, 34394 @@ -3328,30 +3973,67 @@ 34395 34396 /* ./tinfo/lib_raw.c */ 34397 34398 +#undef raw_sp 34399 +int raw_sp( 34400 + SCREEN *sp) 34401 + { return(*(int *)0); } 34402 + 34403 #undef raw 34404 int raw(void) 34405 { return(*(int *)0); } 34406 34407 +#undef cbreak_sp 34408 +int cbreak_sp( 34409 + SCREEN *sp) 34410 + { return(*(int *)0); } 34411 + 34412 #undef cbreak 34413 int cbreak(void) 34414 { return(*(int *)0); } 34415 34416 +#undef qiflush_sp 34417 +void qiflush_sp( 34418 + SCREEN *sp) 34419 + { /* void */ } 34420 + 34421 #undef qiflush 34422 void qiflush(void) 34423 { /* void */ } 34424 34425 +#undef noraw_sp 34426 +int noraw_sp( 34427 + SCREEN *sp) 34428 + { return(*(int *)0); } 34429 + 34430 #undef noraw 34431 int noraw(void) 34432 { return(*(int *)0); } 34433 34434 +#undef nocbreak_sp 34435 +int nocbreak_sp( 34436 + SCREEN *sp) 34437 + { return(*(int *)0); } 34438 + 34439 #undef nocbreak 34440 int nocbreak(void) 34441 { return(*(int *)0); } 34442 34443 +#undef noqiflush_sp 34444 +void noqiflush_sp( 34445 + SCREEN *sp) 34446 + { /* void */ } 34447 + 34448 #undef noqiflush 34449 void noqiflush(void) 34450 { /* void */ } 34451 34452 +#undef intrflush_sp 34453 +int intrflush_sp( 34454 + SCREEN *sp, 34455 + WINDOW *win, 34456 + NCURSES_BOOL flag) 34457 + { return(*(int *)0); } 34458 + 34459 #undef intrflush 34460 int intrflush( 34461 WINDOW *win, 34462 @@ -3373,6 +4055,12 @@ 34463 #undef TABSIZE 34464 int TABSIZE; 34465 34466 +#undef set_tabsize_sp 34467 +int set_tabsize_sp( 34468 + SCREEN *sp, 34469 + int value) 34470 + { return(*(int *)0); } 34471 + 34472 #undef set_tabsize 34473 int set_tabsize( 34474 int value) 34475 @@ -3383,6 +4071,12 @@ 34476 SCREEN *sp) 34477 { return(*(int *)0); } 34478 34479 +#undef use_env_sp 34480 +void use_env_sp( 34481 + SCREEN *sp, 34482 + NCURSES_BOOL f) 34483 + { /* void */ } 34484 + 34485 #undef use_env 34486 void use_env( 34487 NCURSES_BOOL f) 34488 @@ -3435,8 +4129,9 @@ 34489 #undef BC 34490 char *BC; 34491 34492 -#undef tgetent 34493 -int tgetent( 34494 +#undef tgetent_sp 34495 +int tgetent_sp( 34496 + SCREEN *sp, 34497 char *bufp, 34498 const char *name) 34499 { return(*(int *)0); } 34500 @@ -3447,16 +4142,41 @@ 34501 34502 #endif 34503 34504 +#undef tgetent 34505 +int tgetent( 34506 + char *bufp, 34507 + const char *name) 34508 + { return(*(int *)0); } 34509 + 34510 +#undef tgetflag_sp 34511 +int tgetflag_sp( 34512 + SCREEN *sp, 34513 + char *id) 34514 + { return(*(int *)0); } 34515 + 34516 #undef tgetflag 34517 int tgetflag( 34518 char *id) 34519 { return(*(int *)0); } 34520 34521 +#undef tgetnum_sp 34522 +int tgetnum_sp( 34523 + SCREEN *sp, 34524 + char *id) 34525 + { return(*(int *)0); } 34526 + 34527 #undef tgetnum 34528 int tgetnum( 34529 char *id) 34530 { return(*(int *)0); } 34531 34532 +#undef tgetstr_sp 34533 +char *tgetstr_sp( 34534 + SCREEN *sp, 34535 + char *id, 34536 + char **area) 34537 + { return(*(char **)0); } 34538 + 34539 #undef tgetstr 34540 char *tgetstr( 34541 char *id, 34542 @@ -3465,6 +4185,11 @@ 34543 34544 /* ./tinfo/lib_termname.c */ 34545 34546 +#undef termname_sp 34547 +char *termname_sp( 34548 + SCREEN *sp) 34549 + { return(*(char **)0); } 34550 + 34551 #undef termname 34552 char *termname(void) 34553 { return(*(char **)0); } 34554 @@ -3480,16 +4205,34 @@ 34555 34556 /* ./tinfo/lib_ti.c */ 34557 34558 +#undef tigetflag_sp 34559 +int tigetflag_sp( 34560 + SCREEN *sp, 34561 + char *str) 34562 + { return(*(int *)0); } 34563 + 34564 #undef tigetflag 34565 int tigetflag( 34566 char *str) 34567 { return(*(int *)0); } 34568 34569 +#undef tigetnum_sp 34570 +int tigetnum_sp( 34571 + SCREEN *sp, 34572 + char *str) 34573 + { return(*(int *)0); } 34574 + 34575 #undef tigetnum 34576 int tigetnum( 34577 char *str) 34578 { return(*(int *)0); } 34579 34580 +#undef tigetstr_sp 34581 +char *tigetstr_sp( 34582 + SCREEN *sp, 34583 + char *str) 34584 + { return(*(char **)0); } 34585 + 34586 #undef tigetstr 34587 char *tigetstr( 34588 char *str) 34589 @@ -3527,25 +4270,75 @@ 34590 SCREEN *sp) 34591 { /* void */ } 34592 34593 +#undef delay_output_sp 34594 +int delay_output_sp( 34595 + SCREEN *sp, 34596 + int ms) 34597 + { return(*(int *)0); } 34598 + 34599 #undef delay_output 34600 int delay_output( 34601 int ms) 34602 { return(*(int *)0); } 34603 34604 +#undef _nc_flush_sp 34605 +void _nc_flush_sp( 34606 + SCREEN *sp) 34607 + { /* void */ } 34608 + 34609 #undef _nc_flush 34610 void _nc_flush(void) 34611 { /* void */ } 34612 34613 +#undef _nc_outch_sp 34614 +int _nc_outch_sp( 34615 + SCREEN *sp, 34616 + int ch) 34617 + { return(*(int *)0); } 34618 + 34619 #undef _nc_outch 34620 int _nc_outch( 34621 int ch) 34622 { return(*(int *)0); } 34623 34624 +#undef putp_sp 34625 +int putp_sp( 34626 + SCREEN *sp, 34627 + const char *string) 34628 + { return(*(int *)0); } 34629 + 34630 +#undef _nc_putp_sp 34631 +int _nc_putp_sp( 34632 + SCREEN *sp, 34633 + const char *name, 34634 + const char *string) 34635 + { return(*(int *)0); } 34636 + 34637 #undef putp 34638 int putp( 34639 const char *string) 34640 { return(*(int *)0); } 34641 34642 +#undef _nc_putp 34643 +int _nc_putp( 34644 + const char *name, 34645 + const char *string) 34646 + { return(*(int *)0); } 34647 + 34648 +#undef tputs_sp 34649 +int tputs_sp( 34650 + SCREEN *sp, 34651 + const char *string, 34652 + int affcnt, 34653 + NCURSES_OUTC_sp outc) 34654 + { return(*(int *)0); } 34655 + 34656 +#undef _nc_outc_wrapper 34657 +int _nc_outc_wrapper( 34658 + SCREEN *sp, 34659 + int c) 34660 + { return(*(int *)0); } 34661 + 34662 #undef tputs 34663 int tputs( 34664 const char *string, 34665 @@ -3701,36 +4494,78 @@ 34666 34667 /* ./tinfo/lib_ttyflags.c */ 34668 34669 +#undef _nc_get_tty_mode_sp 34670 +int _nc_get_tty_mode_sp( 34671 + SCREEN *sp, 34672 + struct termios *buf) 34673 + { return(*(int *)0); } 34674 + 34675 #undef _nc_get_tty_mode 34676 int _nc_get_tty_mode( 34677 struct termios *buf) 34678 { return(*(int *)0); } 34679 34680 +#undef _nc_set_tty_mode_sp 34681 +int _nc_set_tty_mode_sp( 34682 + SCREEN *sp, 34683 + struct termios *buf) 34684 + { return(*(int *)0); } 34685 + 34686 #undef _nc_set_tty_mode 34687 int _nc_set_tty_mode( 34688 struct termios *buf) 34689 { return(*(int *)0); } 34690 34691 +#undef def_shell_mode_sp 34692 +int def_shell_mode_sp( 34693 + SCREEN *sp) 34694 + { return(*(int *)0); } 34695 + 34696 #undef def_shell_mode 34697 int def_shell_mode(void) 34698 { return(*(int *)0); } 34699 34700 +#undef def_prog_mode_sp 34701 +int def_prog_mode_sp( 34702 + SCREEN *sp) 34703 + { return(*(int *)0); } 34704 + 34705 #undef def_prog_mode 34706 int def_prog_mode(void) 34707 { return(*(int *)0); } 34708 34709 +#undef reset_prog_mode_sp 34710 +int reset_prog_mode_sp( 34711 + SCREEN *sp) 34712 + { return(*(int *)0); } 34713 + 34714 #undef reset_prog_mode 34715 int reset_prog_mode(void) 34716 { return(*(int *)0); } 34717 34718 +#undef reset_shell_mode_sp 34719 +int reset_shell_mode_sp( 34720 + SCREEN *sp) 34721 + { return(*(int *)0); } 34722 + 34723 #undef reset_shell_mode 34724 int reset_shell_mode(void) 34725 { return(*(int *)0); } 34726 34727 +#undef savetty_sp 34728 +int savetty_sp( 34729 + SCREEN *sp) 34730 + { return(*(int *)0); } 34731 + 34732 #undef savetty 34733 int savetty(void) 34734 { return(*(int *)0); } 34735 34736 +#undef resetty_sp 34737 +int resetty_sp( 34738 + SCREEN *sp) 34739 + { return(*(int *)0); } 34740 + 34741 #undef resetty 34742 int resetty(void) 34743 { return(*(int *)0); } 34744 @@ -3810,6 +4645,13 @@ 34745 34746 /* ./tinfo/setbuf.c */ 34747 34748 +#undef _nc_set_buffer_sp 34749 +void _nc_set_buffer_sp( 34750 + SCREEN *sp, 34751 + FILE *ofp, 34752 + NCURSES_BOOL buffered) 34753 + { /* void */ } 34754 + 34755 #undef _nc_set_buffer 34756 void _nc_set_buffer( 34757 FILE *ofp, 34758 @@ -3901,8 +4743,8 @@ 34759 34760 /* ./unctrl.c */ 34761 34762 -#undef _nc_unctrl 34763 -char *_nc_unctrl( 34764 +#undef unctrl_sp 34765 +char *unctrl_sp( 34766 SCREEN *sp, 34767 chtype ch) 34768 { return(*(char **)0); } 34769 @@ -4173,6 +5015,13 @@ 34770 34771 /* ./base/define_key.c */ 34772 34773 +#undef define_key_sp 34774 +int define_key_sp( 34775 + SCREEN *sp, 34776 + const char *str, 34777 + int keycode) 34778 + { return(*(int *)0); } 34779 + 34780 #undef define_key 34781 int define_key( 34782 const char *str, 34783 @@ -4187,6 +5036,12 @@ 34784 34785 /* ./base/key_defined.c */ 34786 34787 +#undef key_defined_sp 34788 +int key_defined_sp( 34789 + SCREEN *sp, 34790 + const char *str) 34791 + { return(*(int *)0); } 34792 + 34793 #undef key_defined 34794 int key_defined( 34795 const char *str) 34796 @@ -4194,6 +5049,13 @@ 34797 34798 /* ./base/keybound.c */ 34799 34800 +#undef keybound_sp 34801 +char *keybound_sp( 34802 + SCREEN *sp, 34803 + int code, 34804 + int count) 34805 + { return(*(char **)0); } 34806 + 34807 #undef keybound 34808 char *keybound( 34809 int code, 34810 @@ -4202,6 +5064,13 @@ 34811 34812 /* ./base/keyok.c */ 34813 34814 +#undef keyok_sp 34815 +int keyok_sp( 34816 + SCREEN *sp, 34817 + int c, 34818 + NCURSES_BOOL flag) 34819 + { return(*(int *)0); } 34820 + 34821 #undef keyok 34822 int keyok( 34823 int c, 22252 34824 diff -Naur ncurses-5.7.orig/ncurses/Makefile.in ncurses-5.7/ncurses/Makefile.in 22253 34825 --- ncurses-5.7.orig/ncurses/Makefile.in 2008-10-18 07:11:54.000000000 -0700 22254 +++ ncurses-5.7/ncurses/Makefile.in 2009-0 6-05 14:01:30.000000000 -070034826 +++ ncurses-5.7/ncurses/Makefile.in 2009-07-19 15:04:13.000000000 -0700 22255 34827 @@ -1,6 +1,6 @@ 22256 34828 -# $Id: Makefile.in,v 1.113 2008/10/18 14:11:54 tom Exp $ 22257 +# $Id: Makefile.in,v 1.11 5 2009/03/28 18:22:39 Charles.WilsonExp $34829 +# $Id: Makefile.in,v 1.117 2009/07/04 16:36:11 tom Exp $ 22258 34830 ############################################################################## 22259 34831 -# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. # … … 22279 34851 LD = @LD@ 22280 34852 LN_S = @LN_S@ 34853 @@ -164,11 +165,12 @@ 34854 hashmap$x \ 34855 lib_mvcur$x 34856 34857 -base = $(srcdir)/base 34858 -serial = $(srcdir)/tty 34859 -tinfo = $(srcdir)/tinfo 34860 -trace = $(srcdir)/trace 34861 -wide = $(srcdir)/widechar 34862 +base = $(srcdir)/base 34863 +serial = $(srcdir)/tty 34864 +tinfo = $(srcdir)/tinfo 34865 +trace = $(srcdir)/trace 34866 +wide = $(srcdir)/widechar 34867 +win32con = $(srcdir)/win32con 34868 34869 ################################################################################ 34870 all \ 34871 @@ -204,7 +206,7 @@ 34872 ../include/hashsize.h 34873 $(BUILD_CC) -o $@ $(BUILD_CCFLAGS) -DMAIN_PROGRAM $(tinfo)/comp_hash.c $(BUILD_LDFLAGS) $(BUILD_LIBS) 34874 34875 -./expanded.c : $(serial)/MKexpanded.sh 34876 +./expanded.c : curses.priv.h $(serial)/MKexpanded.sh 34877 sh -e $(serial)/MKexpanded.sh "$(CPP)" $(CPPFLAGS) > $@ 34878 34879 ./comp_captab.c: \ 34880 diff -Naur ncurses-5.7.orig/ncurses/modules ncurses-5.7/ncurses/modules 34881 --- ncurses-5.7.orig/ncurses/modules 2007-09-08 15:03:34.000000000 -0700 34882 +++ ncurses-5.7/ncurses/modules 2009-07-19 15:04:15.000000000 -0700 34883 @@ -1,6 +1,6 @@ 34884 -# $Id: modules,v 1.112 2007/09/08 22:03:34 tom Exp $ 34885 +# $Id: modules,v 1.113 2009/07/11 17:45:32 tom Exp $ 34886 ############################################################################## 34887 -# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. # 34888 +# Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. # 34889 # # 34890 # Permission is hereby granted, free of charge, to any person obtaining a # 34891 # copy of this software and associated documentation files (the "Software"), # 34892 @@ -162,7 +162,9 @@ 34893 add_tries lib $(tinfo) 34894 alloc_ttype lib $(tinfo) ../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h 34895 codes lib . 34896 +comp_captab lib . $(INCDIR)/tic.h ../include/term.h ../include/hashsize.h 34897 comp_error lib $(tinfo) $(INCDIR)/tic.h 34898 +comp_hash lib $(tinfo) ../include/term.h $(INCDIR)/tic.h ../include/hashsize.h 34899 db_iterator lib $(tinfo) $(INCDIR)/tic.h 34900 doalloc lib $(tinfo) 34901 entries lib $(tinfo) ../include/term.h $(INCDIR)/tic.h 34902 @@ -212,9 +214,7 @@ 34903 @ ticlib 34904 alloc_entry lib $(tinfo) ../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h 34905 captoinfo lib $(tinfo) $(INCDIR)/tic.h 34906 -comp_captab lib . $(INCDIR)/tic.h ../include/term.h ../include/hashsize.h 34907 comp_expand lib $(tinfo) $(INCDIR)/tic.h 34908 -comp_hash lib $(tinfo) ../include/term.h $(INCDIR)/tic.h ../include/hashsize.h 34909 comp_parse lib $(tinfo) ../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h 34910 comp_scan lib $(tinfo) $(INCDIR)/tic.h 34911 parse_entry lib $(tinfo) ../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h ../include/parametrized.h $(INCDIR)/capdefaults.c 34912 diff -Naur ncurses-5.7.orig/ncurses/README ncurses-5.7/ncurses/README 34913 --- ncurses-5.7.orig/ncurses/README 2006-04-22 15:19:37.000000000 -0700 34914 +++ ncurses-5.7/ncurses/README 2009-07-19 15:04:11.000000000 -0700 34915 @@ -1,5 +1,5 @@ 34916 ------------------------------------------------------------------------------- 34917 --- Copyright (c) 1998-2000,2006 Free Software Foundation, Inc. -- 34918 +-- Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. -- 34919 -- -- 34920 -- Permission is hereby granted, free of charge, to any person obtaining a -- 34921 -- copy of this software and associated documentation files (the -- 34922 @@ -25,7 +25,26 @@ 34923 -- sale, use or other dealings in this Software without prior written -- 34924 -- authorization. -- 34925 ------------------------------------------------------------------------------- 34926 --- $Id: README,v 1.9 2006/04/22 22:19:37 tom Exp $ 34927 +-- $Id: README,v 1.10 2009/06/27 14:44:30 tom Exp $ 34928 ------------------------------------------------------------------------------- 34929 For discussion of the package internals, see hackguide.html in the doc/html 34930 directory. 34931 + 34932 +------------------------------------------------------------------------------- 34933 +The llib-lXXXX files could be used as lint-library sources (and were, at one 34934 +time). However, they are actually used as a documentation aid to keep track 34935 +of changes to the public/private interfaces in ncurses. Most of the text in 34936 +these files is generated using cproto; some manual cleanup and adjustment of 34937 +types (to reflect #define's in curses.h) is needed. The functions listed in 34938 +the llib-lXXXX files do not correspond to the default configure options; some 34939 +additional ones are added to include "all" of the entrypoints for each of the 34940 +major configurations (normal, wide-character, threaded): 34941 + 34942 + --disable-macros 34943 + --disable-root-environ 34944 + --enable-expanded 34945 + --enable-getcap 34946 + --enable-getcap-cache 34947 + --enable-sp-funcs 34948 + --enable-termcap 34949 + --with-develop 22281 34950 diff -Naur ncurses-5.7.orig/ncurses/tinfo/access.c ncurses-5.7/ncurses/tinfo/access.c 22282 34951 --- ncurses-5.7.orig/ncurses/tinfo/access.c 2007-11-17 16:57:53.000000000 -0800 22283 +++ ncurses-5.7/ncurses/tinfo/access.c 2009-0 6-05 14:01:33.000000000 -070034952 +++ ncurses-5.7/ncurses/tinfo/access.c 2009-07-19 15:03:51.000000000 -0700 22284 34953 @@ -1,5 +1,5 @@ 22285 34954 /**************************************************************************** … … 22309 34978 diff -Naur ncurses-5.7.orig/ncurses/tinfo/alloc_ttype.c ncurses-5.7/ncurses/tinfo/alloc_ttype.c 22310 34979 --- ncurses-5.7.orig/ncurses/tinfo/alloc_ttype.c 2008-10-12 09:12:00.000000000 -0700 22311 +++ ncurses-5.7/ncurses/tinfo/alloc_ttype.c 2009-0 6-05 14:01:44.000000000 -070034980 +++ ncurses-5.7/ncurses/tinfo/alloc_ttype.c 2009-07-19 15:03:53.000000000 -0700 22312 34981 @@ -1,5 +1,5 @@ 22313 34982 /**************************************************************************** … … 22456 35125 diff -Naur ncurses-5.7.orig/ncurses/tinfo/captoinfo.c ncurses-5.7/ncurses/tinfo/captoinfo.c 22457 35126 --- ncurses-5.7.orig/ncurses/tinfo/captoinfo.c 2008-08-16 12:24:51.000000000 -0700 22458 +++ ncurses-5.7/ncurses/tinfo/captoinfo.c 2009-0 6-05 14:01:30.000000000 -070035127 +++ ncurses-5.7/ncurses/tinfo/captoinfo.c 2009-07-19 15:03:48.000000000 -0700 22459 35128 @@ -1,5 +1,5 @@ 22460 35129 /**************************************************************************** … … 22482 35151 _nc_err_abort(MSG_NO_MEMORY); 22483 35152 d = my_string + have; 35153 diff -Naur ncurses-5.7.orig/ncurses/tinfo/comp_hash.c ncurses-5.7/ncurses/tinfo/comp_hash.c 35154 --- ncurses-5.7.orig/ncurses/tinfo/comp_hash.c 2008-08-16 10:06:53.000000000 -0700 35155 +++ ncurses-5.7/ncurses/tinfo/comp_hash.c 2009-07-19 15:04:17.000000000 -0700 35156 @@ -1,5 +1,5 @@ 35157 /**************************************************************************** 35158 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 35159 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 35160 * * 35161 * Permission is hereby granted, free of charge, to any person obtaining a * 35162 * copy of this software and associated documentation files (the * 35163 @@ -50,7 +50,7 @@ 35164 #define DEBUG(level, params) /*nothing */ 35165 #endif 35166 35167 -MODULE_ID("$Id: comp_hash.c,v 1.36 2008/08/16 17:06:53 tom Exp $") 35168 +MODULE_ID("$Id: comp_hash.c,v 1.45 2009/07/18 20:30:21 tom Exp $") 35169 35170 static int hash_function(const char *); 35171 35172 @@ -91,8 +91,7 @@ 35173 hash_table[hashvalue] = i; 35174 } 35175 35176 - DEBUG(4, ("Hash table complete: %d collisions out of %d entries", 35177 - collisions, CAPTABSIZE)); 35178 + printf("/* %d collisions out of %d entries */\n", collisions, CAPTABSIZE); 35179 } 35180 #endif 35181 35182 @@ -121,16 +120,24 @@ 35183 return (int) (sum % HASHTABSIZE); 35184 } 35185 35186 +#ifndef MAIN_PROGRAM 35187 + 35188 +#define SameName(a,b,termcap) (termcap ? !strncmp(a,b,2) : !strcmp(a,b)) 35189 +#if 0 35190 +static bool 35191 +same_name(const char *a, const char *b, bool termcap) 35192 +{ 35193 + fprintf(stderr, "compare(%s,%s)\n", a, b); 35194 + return SameName(a, b, termcap); 35195 +} 35196 +#else 35197 +#define same_name(a,b,termcap) SameName(a,b,termcap) 35198 +#endif 35199 + 35200 /* 35201 - * struct name_table_entry * 35202 - * find_entry(string) 35203 - * 35204 - * Finds the entry for the given string in the hash table if present. 35205 - * Returns a pointer to the entry in the table or 0 if not found. 35206 - * 35207 + * Finds the entry for the given string in the hash table if present. 35208 + * Returns a pointer to the entry in the table or 0 if not found. 35209 */ 35210 - 35211 -#ifndef MAIN_PROGRAM 35212 NCURSES_EXPORT(struct name_table_entry const *) 35213 _nc_find_entry(const char *string, 35214 const short *hash_table) 35215 @@ -142,11 +149,15 @@ 35216 hashvalue = hash_function(string); 35217 35218 if (hash_table[hashvalue] >= 0) { 35219 - real_table = _nc_get_table(hash_table != _nc_get_hash_table(FALSE)); 35220 + bool termcap = (hash_table != _nc_get_hash_table(FALSE)); 35221 + 35222 + real_table = _nc_get_table(termcap); 35223 ptr = real_table + hash_table[hashvalue]; 35224 - while (strcmp(ptr->nte_name, string) != 0) { 35225 - if (ptr->nte_link < 0) 35226 - return 0; 35227 + while (!same_name(ptr->nte_name, string, termcap)) { 35228 + if (ptr->nte_link < 0) { 35229 + ptr = 0; 35230 + break; 35231 + } 35232 ptr = real_table + (ptr->nte_link + hash_table[HASHTABSIZE]); 35233 } 35234 } 35235 @@ -155,29 +166,36 @@ 35236 } 35237 35238 /* 35239 - * struct name_table_entry * 35240 - * find_type_entry(string, type, table) 35241 + * Finds the entry for the given name with the given type in the given table if 35242 + * present (as distinct from _nc_find_entry, which finds the last entry 35243 + * regardless of type). 35244 * 35245 - * Finds the first entry for the given name with the given type in the 35246 - * given table if present (as distinct from find_entry, which finds the 35247 - * the last entry regardless of type). You can use this if you detect 35248 - * a name clash. It's slower, though. Returns a pointer to the entry 35249 - * in the table or 0 if not found. 35250 + * Returns a pointer to the entry in the table or 0 if not found. 35251 */ 35252 - 35253 NCURSES_EXPORT(struct name_table_entry const *) 35254 _nc_find_type_entry(const char *string, 35255 int type, 35256 - const struct name_table_entry *table) 35257 + bool termcap) 35258 { 35259 - struct name_table_entry const *ptr; 35260 + struct name_table_entry const *ptr = NULL; 35261 + const short *hash_table = _nc_get_hash_table(termcap); 35262 + int hashvalue = hash_function(string); 35263 35264 - for (ptr = table; ptr < table + CAPTABSIZE; ptr++) { 35265 - if (ptr->nte_type == type && strcmp(string, ptr->nte_name) == 0) 35266 - return (ptr); 35267 + if (hash_table[hashvalue] >= 0) { 35268 + const struct name_table_entry *const table = _nc_get_table(termcap); 35269 + 35270 + ptr = table + hash_table[hashvalue]; 35271 + while (ptr->nte_type != type 35272 + || !same_name(ptr->nte_name, string, termcap)) { 35273 + if (ptr->nte_link < 0) { 35274 + ptr = 0; 35275 + break; 35276 + } 35277 + ptr = table + (ptr->nte_link + hash_table[HASHTABSIZE]); 35278 + } 35279 } 35280 35281 - return ((struct name_table_entry *) NULL); 35282 + return ptr; 35283 } 35284 #endif 35285 35286 diff -Naur ncurses-5.7.orig/ncurses/tinfo/comp_parse.c ncurses-5.7/ncurses/tinfo/comp_parse.c 35287 --- ncurses-5.7.orig/ncurses/tinfo/comp_parse.c 2008-08-16 14:58:16.000000000 -0700 35288 +++ ncurses-5.7/ncurses/tinfo/comp_parse.c 2009-07-19 15:04:17.000000000 -0700 35289 @@ -1,5 +1,5 @@ 35290 /**************************************************************************** 35291 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 35292 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 35293 * * 35294 * Permission is hereby granted, free of charge, to any person obtaining a * 35295 * copy of this software and associated documentation files (the * 35296 @@ -53,7 +53,7 @@ 35297 #include <tic.h> 35298 #include <term_entry.h> 35299 35300 -MODULE_ID("$Id: comp_parse.c,v 1.69 2008/08/16 21:58:16 tom Exp $") 35301 +MODULE_ID("$Id: comp_parse.c,v 1.70 2009/07/18 20:38:52 tom Exp $") 35302 35303 static void sanity_check2(TERMTYPE *, bool); 35304 NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype2) (TERMTYPE *, bool) = sanity_check2; 35305 @@ -92,16 +92,18 @@ 35306 } 35307 return src; 35308 } 35309 +#define ForceBar(dst, src) ((strchr(src, '|') == 0) ? force_bar(dst, src) : src) 35310 35311 NCURSES_EXPORT(bool) 35312 _nc_entry_match(char *n1, char *n2) 35313 /* do any of the aliases in a pair of terminal names match? */ 35314 { 35315 char *pstart, *qstart, *pend, *qend; 35316 - char nc1[MAX_NAME_SIZE + 2], nc2[MAX_NAME_SIZE + 2]; 35317 + char nc1[MAX_NAME_SIZE + 2]; 35318 + char nc2[MAX_NAME_SIZE + 2]; 35319 35320 - n1 = force_bar(nc1, n1); 35321 - n2 = force_bar(nc2, n2); 35322 + n1 = ForceBar(nc1, n1); 35323 + n2 = ForceBar(nc2, n2); 35324 35325 for (pstart = n1; (pend = strchr(pstart, '|')); pstart = pend + 1) 35326 for (qstart = n2; (qend = strchr(qstart, '|')); qstart = qend + 1) 22484 35327 diff -Naur ncurses-5.7.orig/ncurses/tinfo/comp_scan.c ncurses-5.7/ncurses/tinfo/comp_scan.c 22485 35328 --- ncurses-5.7.orig/ncurses/tinfo/comp_scan.c 2008-08-16 12:22:55.000000000 -0700 22486 +++ ncurses-5.7/ncurses/tinfo/comp_scan.c 2009-0 6-05 14:01:51.000000000 -070035329 +++ ncurses-5.7/ncurses/tinfo/comp_scan.c 2009-07-19 15:03:59.000000000 -0700 22487 35330 @@ -51,7 +51,7 @@ 22488 35331 #include <term_entry.h> … … 22542 35385 diff -Naur ncurses-5.7.orig/ncurses/tinfo/entries.c ncurses-5.7/ncurses/tinfo/entries.c 22543 35386 --- ncurses-5.7.orig/ncurses/tinfo/entries.c 2008-09-27 06:11:10.000000000 -0700 22544 +++ ncurses-5.7/ncurses/tinfo/entries.c 2009-0 6-05 14:01:21.000000000 -070035387 +++ ncurses-5.7/ncurses/tinfo/entries.c 2009-07-19 15:04:15.000000000 -0700 22545 35388 @@ -1,5 +1,5 @@ 22546 35389 /**************************************************************************** … … 22550 35393 * Permission is hereby granted, free of charge, to any person obtaining a * 22551 35394 * copy of this software and associated documentation files (the * 22552 @@ -37,7 +37,7 @@ 35395 @@ -28,6 +28,7 @@ 35396 35397 /**************************************************************************** 35398 * Author: Thomas E. Dickey * 35399 + * and: Juergen Pfeifer * 35400 ****************************************************************************/ 35401 35402 #include <curses.priv.h> 35403 @@ -37,7 +38,7 @@ 22553 35404 #include <tic.h> 22554 35405 #include <term_entry.h> 22555 35406 22556 35407 -MODULE_ID("$Id: entries.c,v 1.8 2008/09/27 13:11:10 tom Exp $") 22557 +MODULE_ID("$Id: entries.c,v 1.1 1 2009/03/14 15:22:37tom Exp $")35408 +MODULE_ID("$Id: entries.c,v 1.15 2009/07/11 14:42:42 tom Exp $") 22558 35409 22559 35410 /**************************************************************************** 22560 35411 * 22561 @@ -119,6 +1 19,10@@35412 @@ -119,6 +120,11 @@ 22562 35413 #if NO_LEAKS 22563 35414 _nc_free_tparm(); 22564 35415 _nc_tgetent_leaks(); 22565 35416 + 22566 + if (cur_term != 0) 22567 + del_curterm(cur_term); 35417 + if (TerminalOf(CURRENT_SCREEN) != 0) { 35418 + del_curterm(TerminalOf(CURRENT_SCREEN)); 35419 + } 22568 35420 + 22569 35421 _nc_free_entries(_nc_head); 22570 35422 _nc_get_type(0); 22571 35423 _nc_first_name(0); 35424 @@ -131,6 +137,12 @@ 35425 35426 if ((s = _nc_home_terminfo()) != 0) 35427 free(s); 35428 + 35429 +#ifdef TRACE 35430 + trace(0); 35431 + _nc_trace_buf(-1, 0); 35432 +#endif 35433 + 35434 #endif /* NO_LEAKS */ 35435 returnVoid; 35436 } 22572 35437 diff -Naur ncurses-5.7.orig/ncurses/tinfo/hashed_db.c ncurses-5.7/ncurses/tinfo/hashed_db.c 22573 35438 --- ncurses-5.7.orig/ncurses/tinfo/hashed_db.c 2006-08-19 12:48:38.000000000 -0700 22574 +++ ncurses-5.7/ncurses/tinfo/hashed_db.c 2009-0 6-05 14:00:57.000000000 -070035439 +++ ncurses-5.7/ncurses/tinfo/hashed_db.c 2009-07-19 15:02:02.000000000 -0700 22575 35440 @@ -1,5 +1,5 @@ 22576 35441 /**************************************************************************** … … 22678 35543 diff -Naur ncurses-5.7.orig/ncurses/tinfo/init_keytry.c ncurses-5.7/ncurses/tinfo/init_keytry.c 22679 35544 --- ncurses-5.7.orig/ncurses/tinfo/init_keytry.c 2008-05-24 14:44:51.000000000 -0700 22680 +++ ncurses-5.7/ncurses/tinfo/init_keytry.c 2009-0 6-05 14:01:51.000000000 -070035545 +++ ncurses-5.7/ncurses/tinfo/init_keytry.c 2009-07-19 15:03:59.000000000 -0700 22681 35546 @@ -1,5 +1,5 @@ 22682 35547 /**************************************************************************** … … 22725 35590 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_acs.c ncurses-5.7/ncurses/tinfo/lib_acs.c 22726 35591 --- ncurses-5.7.orig/ncurses/tinfo/lib_acs.c 2008-08-16 12:22:55.000000000 -0700 22727 +++ ncurses-5.7/ncurses/tinfo/lib_acs.c 2009-0 6-05 14:01:51.000000000 -070035592 +++ ncurses-5.7/ncurses/tinfo/lib_acs.c 2009-07-19 15:04:06.000000000 -0700 22728 35593 @@ -1,5 +1,5 @@ 22729 35594 /**************************************************************************** … … 22733 35598 * Permission is hereby granted, free of charge, to any person obtaining a * 22734 35599 * copy of this software and associated documentation files (the * 22735 @@ -35,12 +35,16 @@ 35600 @@ -30,17 +30,21 @@ 35601 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 35602 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 35603 * and: Thomas E. Dickey 1996-on * 35604 + * and: Juergen Pfeifer 2008 * 35605 ****************************************************************************/ 35606 22736 35607 #include <curses.priv.h> 22737 35608 -#include <term.h> /* ena_acs, acs_chars */ 22738 35609 22739 35610 -MODULE_ID("$Id: lib_acs.c,v 1.36 2008/08/16 19:22:55 tom Exp $") 22740 35611 +#ifndef CUR 22741 +#define CUR SP_TERMTYPE 35612 +#define CUR SP_TERMTYPE 22742 35613 +#endif 22743 35614 + 22744 +MODULE_ID("$Id: lib_acs.c,v 1. 39 2009/05/10 00:48:29tom Exp $")35615 +MODULE_ID("$Id: lib_acs.c,v 1.40 2009/06/06 18:08:04 tom Exp $") 22745 35616 22746 35617 #if BROKEN_LINKER || USE_REENTRANT … … 22753 35624 if (MyBuffer == 0) 22754 35625 MyBuffer = typeCalloc(chtype, ACS_LEN); 22755 @@ -48, 7 +52,7@@35626 @@ -48,17 +52,35 @@ 22756 35627 } 22757 35628 #undef MyBuffer … … 22762 35633 0 22763 35634 }; 22764 @@ -57,6 +61,9 @@ 35635 #endif 35636 35637 +#ifdef USE_TERM_DRIVER 35638 +NCURSES_EXPORT(chtype) 35639 +NCURSES_SP_NAME(_nc_acs_char) (NCURSES_SP_DCLx int c) 35640 +{ 35641 + chtype *map; 35642 + if (c < 0 || c >= ACS_LEN) 35643 + return (chtype) 0; 35644 + map = (SP_PARM != 0) ? SP_PARM->_acs_map : 35645 +#if BROKEN_LINKER || USE_REENTRANT 35646 + _nc_prescreen.real_acs_map 35647 +#else 35648 + acs_map 35649 +#endif 35650 + ; 35651 + return map[c]; 35652 +} 35653 +#endif /* USE_TERM_DRIVER */ 35654 + 22765 35655 NCURSES_EXPORT(void) 22766 _nc_init_acs(void) 35656 -_nc_init_acs(void) 35657 +NCURSES_SP_NAME(_nc_init_acs) (NCURSES_SP_DCL0) 22767 35658 { 35659 chtype *fake_map = acs_map; 35660 - chtype *real_map = SP != 0 ? SP->_acs_map : fake_map; 35661 + chtype *real_map = SP_PARM != 0 ? SP_PARM->_acs_map : fake_map; 35662 int j; 35663 35664 T(("initializing ACS map")); 35665 @@ -72,8 +94,8 @@ 35666 for (j = 1; j < ACS_LEN; ++j) { 35667 real_map[j] = 0; 35668 fake_map[j] = A_ALTCHARSET | j; 35669 - if (SP) 35670 - SP->_screen_acs_map[j] = FALSE; 35671 + if (SP_PARM) 35672 + SP_PARM->_screen_acs_map[j] = FALSE; 35673 } 35674 } else { 35675 for (j = 1; j < ACS_LEN; ++j) { 35676 @@ -119,6 +141,9 @@ 35677 real_map['|'] = '!'; /* should be not-equal */ 35678 real_map['}'] = 'f'; /* should be pound-sterling symbol */ 35679 35680 +#ifdef USE_TERM_DRIVER 35681 + CallDriver_2(SP_PARM, initacs, real_map, fake_map); 35682 +#else 35683 if (ena_acs != NULL) { 35684 TPUTS_TRACE("ena_acs"); 35685 putp(ena_acs); 35686 @@ -191,4 +216,13 @@ 35687 _nc_unlock_global(tracef); 35688 } 35689 #endif /* TRACE */ 35690 +#endif 35691 +} 35692 + 22768 35693 +#if NCURSES_SP_FUNCS 22769 + SCREEN *sp = CURRENT_SCREEN; 35694 +NCURSES_EXPORT(void) 35695 +_nc_init_acs(void) 35696 +{ 35697 + NCURSES_SP_NAME(_nc_init_acs) (CURRENT_SCREEN); 35698 } 22770 35699 +#endif 22771 chtype *fake_map = acs_map;22772 chtype *real_map = SP != 0 ? SP->_acs_map : fake_map;22773 int j;22774 35700 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_baudrate.c ncurses-5.7/ncurses/tinfo/lib_baudrate.c 22775 35701 --- ncurses-5.7.orig/ncurses/tinfo/lib_baudrate.c 2008-06-28 08:19:24.000000000 -0700 22776 +++ ncurses-5.7/ncurses/tinfo/lib_baudrate.c 2009-0 6-05 14:01:51.000000000 -070035702 +++ ncurses-5.7/ncurses/tinfo/lib_baudrate.c 2009-07-19 15:03:59.000000000 -0700 22777 35703 @@ -1,5 +1,5 @@ 22778 35704 /**************************************************************************** … … 22861 35787 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_cur_term.c ncurses-5.7/ncurses/tinfo/lib_cur_term.c 22862 35788 --- ncurses-5.7.orig/ncurses/tinfo/lib_cur_term.c 2008-08-16 12:22:55.000000000 -0700 22863 +++ ncurses-5.7/ncurses/tinfo/lib_cur_term.c 2009-0 6-05 14:01:55.000000000 -070035789 +++ ncurses-5.7/ncurses/tinfo/lib_cur_term.c 2009-07-19 15:04:04.000000000 -0700 22864 35790 @@ -1,5 +1,5 @@ 22865 35791 /**************************************************************************** … … 22933 35859 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_data.c ncurses-5.7/ncurses/tinfo/lib_data.c 22934 35860 --- ncurses-5.7.orig/ncurses/tinfo/lib_data.c 2008-08-23 15:16:15.000000000 -0700 22935 +++ ncurses-5.7/ncurses/tinfo/lib_data.c 2009-0 6-05 14:01:55.000000000 -070035861 +++ ncurses-5.7/ncurses/tinfo/lib_data.c 2009-07-19 15:04:09.000000000 -0700 22936 35862 @@ -1,5 +1,5 @@ 22937 35863 /**************************************************************************** … … 22941 35867 * Permission is hereby granted, free of charge, to any person obtaining a * 22942 35868 * copy of this software and associated documentation files (the * 22943 @@ -41,7 +41,7 @@ 35869 @@ -30,6 +30,7 @@ 35870 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 35871 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 35872 * and: Thomas E. Dickey 1996-on * 35873 + * and: Juergen Pfeifer * 35874 ****************************************************************************/ 35875 35876 /* 35877 @@ -41,7 +42,7 @@ 22944 35878 22945 35879 #include <curses.priv.h> 22946 35880 22947 35881 -MODULE_ID("$Id: lib_data.c,v 1.52 2008/08/23 22:16:15 tom Exp $") 22948 +MODULE_ID("$Id: lib_data.c,v 1.5 3 2009/05/30 15:59:25 tom Exp $")35882 +MODULE_ID("$Id: lib_data.c,v 1.55 2009/06/07 14:48:25 tom Exp $") 22949 35883 22950 35884 /* 22951 35885 * OS/2's native linker complains if we don't initialize public data when 22952 @@ -225,6 +225,8 @@ 35886 @@ -51,17 +52,17 @@ 35887 NCURSES_EXPORT(WINDOW *) 35888 NCURSES_PUBLIC_VAR(stdscr) (void) 35889 { 35890 - return SP ? SP->_stdscr : 0; 35891 + return CURRENT_SCREEN ? StdScreen(CURRENT_SCREEN) : 0; 35892 } 35893 NCURSES_EXPORT(WINDOW *) 35894 NCURSES_PUBLIC_VAR(curscr) (void) 35895 { 35896 - return SP ? SP->_curscr : 0; 35897 + return CURRENT_SCREEN ? CurScreen(CURRENT_SCREEN) : 0; 35898 } 35899 NCURSES_EXPORT(WINDOW *) 35900 NCURSES_PUBLIC_VAR(newscr) (void) 35901 { 35902 - return SP ? SP->_newscr : 0; 35903 + return CURRENT_SCREEN ? NewScreen(CURRENT_SCREEN) : 0; 35904 } 35905 #else 35906 NCURSES_EXPORT_VAR(WINDOW *) stdscr = 0; 35907 @@ -93,7 +94,7 @@ 35908 NCURSES_EXPORT(int) 35909 _nc_alloc_screen(void) 35910 { 35911 - return ((my_screen = typeCalloc(SCREEN, 1)) != 0); 35912 + return ((my_screen = _nc_alloc_screen_sp()) != 0); 35913 } 35914 35915 NCURSES_EXPORT(void) 35916 @@ -103,6 +104,7 @@ 35917 } 35918 35919 #else 35920 + 35921 NCURSES_EXPORT_VAR(SCREEN *) SP = NULL; /* Some linkers require initialized data... */ 35922 #endif 35923 /* *INDENT-OFF* */ 35924 @@ -140,7 +142,9 @@ 35925 0, /* tgetent_index */ 35926 0, /* tgetent_sequence */ 35927 35928 +#ifndef USE_SP_WINDOWLIST 35929 0, /* _nc_windowlist */ 35930 +#endif 35931 35932 #if USE_HOME_TERMINFO 35933 NULL, /* home_terminfo */ 35934 @@ -174,7 +178,9 @@ 35935 { CHARS_0s, CHARS_0s }, /* traceatr_color_buf */ 35936 0, /* traceatr_color_sel */ 35937 -1, /* traceatr_color_last */ 35938 - 35939 +#if !defined(USE_PTHREADS) && USE_REENTRANT 35940 + 0, /* nested_tracef */ 35941 +#endif 35942 #endif /* TRACE */ 35943 #ifdef USE_PTHREADS 35944 PTHREAD_MUTEX_INITIALIZER, /* mutex_curses */ 35945 @@ -196,8 +202,10 @@ 35946 TRUE, /* use_env */ 35947 FALSE, /* filter_mode */ 35948 A_NORMAL, /* previous_attr */ 35949 +#ifndef USE_SP_RIPOFF 35950 RIPOFF_0s, /* ripoff */ 35951 NULL, /* rsp */ 35952 +#endif 35953 { /* tparm_state */ 35954 #ifdef TRACE 35955 NULL, /* tname */ 35956 @@ -225,6 +233,8 @@ 22953 35957 NULL, /* real_acs_map */ 22954 35958 0, /* LINES */ … … 22959 35963 #ifdef TRACE 22960 35964 0L, /* _outchars */ 35965 @@ -234,6 +244,23 @@ 35966 }; 35967 /* *INDENT-ON* */ 35968 35969 +/* 35970 + * wgetch() and other functions with a WINDOW* parameter may use a SCREEN* 35971 + * internally, and it is useful to allow those to be invoked without switching 35972 + * SCREEN's, e.g., for multi-threaded applications. 35973 + */ 35974 +NCURSES_EXPORT(SCREEN *) 35975 +_nc_screen_of(WINDOW *win) 35976 +{ 35977 + SCREEN *sp = 0; 35978 + 35979 + if (win != 0) { 35980 + WINDOWLIST *wp = (WINDOWLIST *) win; 35981 + sp = wp->screen; 35982 + } 35983 + return (sp); 35984 +} 35985 + 35986 /******************************************************************************/ 35987 #ifdef USE_PTHREADS 35988 static void 22961 35989 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_has_cap.c ncurses-5.7/ncurses/tinfo/lib_has_cap.c 22962 35990 --- ncurses-5.7.orig/ncurses/tinfo/lib_has_cap.c 2003-10-25 12:43:55.000000000 -0700 22963 +++ ncurses-5.7/ncurses/tinfo/lib_has_cap.c 2009-0 6-05 14:01:51.000000000 -070035991 +++ ncurses-5.7/ncurses/tinfo/lib_has_cap.c 2009-07-19 15:03:59.000000000 -0700 22964 35992 @@ -1,5 +1,5 @@ 22965 35993 /**************************************************************************** … … 23044 36072 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_kernel.c ncurses-5.7/ncurses/tinfo/lib_kernel.c 23045 36073 --- ncurses-5.7.orig/ncurses/tinfo/lib_kernel.c 2004-05-08 10:11:21.000000000 -0700 23046 +++ ncurses-5.7/ncurses/tinfo/lib_kernel.c 2009-0 6-05 14:01:14.000000000 -070036074 +++ ncurses-5.7/ncurses/tinfo/lib_kernel.c 2009-07-19 15:04:06.000000000 -0700 23047 36075 @@ -1,5 +1,5 @@ 23048 36076 /**************************************************************************** … … 23062 36090 23063 36091 /* 23064 @@ -48,7 +49,7 @@ 36092 @@ -46,9 +47,8 @@ 36093 */ 36094 23065 36095 #include <curses.priv.h> 23066 36096 -#include <term.h> /* cur_term */ 23067 36097 23068 36098 -MODULE_ID("$Id: lib_kernel.c,v 1.24 2004/05/08 17:11:21 tom Exp $") 23069 +MODULE_ID("$Id: lib_kernel.c,v 1.2 5 2009/02/15 00:47:52tom Exp $")36099 +MODULE_ID("$Id: lib_kernel.c,v 1.27 2009/06/06 21:25:50 tom Exp $") 23070 36100 23071 36101 static int 23072 36102 _nc_vdisable(void) 23073 @@ -79, 7 +80,7@@36103 @@ -79,23 +79,33 @@ 23074 36104 */ 23075 36105 … … 23079 36109 { 23080 36110 int result = ERR; 23081 T((T_CALLED("erasechar()"))); 23082 @@ -96,6 +97,14 @@ 36111 - T((T_CALLED("erasechar()"))); 36112 + TERMINAL *termp = TerminalOf(SP_PARM); 36113 + 36114 + T((T_CALLED("erasechar(%p)"), SP_PARM)); 36115 36116 - if (cur_term != 0) { 36117 + if (termp != 0) { 36118 #ifdef TERMIOS 36119 - result = cur_term->Ottyb.c_cc[VERASE]; 36120 + result = termp->Ottyb.c_cc[VERASE]; 36121 if (result == _nc_vdisable()) 36122 result = ERR; 36123 #else 36124 - result = cur_term->Ottyb.sg_erase; 36125 + result = termp->Ottyb.sg_erase; 36126 #endif 36127 } 23083 36128 returnCode(result); 23084 36129 } … … 23095 36140 * killchar() 23096 36141 * 23097 @@ -104, 7 +113,7@@36142 @@ -104,23 +114,33 @@ 23098 36143 */ 23099 36144 … … 23103 36148 { 23104 36149 int result = ERR; 23105 T((T_CALLED("killchar()"))); 23106 @@ -121,6 +130,14 @@ 36150 - T((T_CALLED("killchar()"))); 36151 + TERMINAL *termp = TerminalOf(SP_PARM); 36152 36153 - if (cur_term != 0) { 36154 + T((T_CALLED("killchar(%p)"), SP_PARM)); 36155 + 36156 + if (termp != 0) { 36157 #ifdef TERMIOS 36158 - result = cur_term->Ottyb.c_cc[VKILL]; 36159 + result = termp->Ottyb.c_cc[VKILL]; 36160 if (result == _nc_vdisable()) 36161 result = ERR; 36162 #else 36163 - result = cur_term->Ottyb.sg_kill; 36164 + result = termp->Ottyb.sg_kill; 36165 #endif 36166 } 23107 36167 returnCode(result); 23108 36168 } … … 23119 36179 * flushinp() 23120 36180 * 23121 @@ -129, 7 +146,7@@36181 @@ -129,26 +149,36 @@ 23122 36182 */ 23123 36183 … … 23126 36186 +NCURSES_SP_NAME(flushinp) (NCURSES_SP_DCL0) 23127 36187 { 23128 T((T_CALLED("flushinp()"))); 23129 23130 @@ -143,12 +160,20 @@ 36188 - T((T_CALLED("flushinp()"))); 36189 + TERMINAL *termp = TerminalOf(SP_PARM); 36190 + 36191 + T((T_CALLED("flushinp(%p)"), SP_PARM)); 36192 36193 - if (cur_term != 0) { 36194 + if (termp != 0) { 36195 #ifdef TERMIOS 36196 - tcflush(cur_term->Filedes, TCIFLUSH); 36197 + tcflush(termp->Filedes, TCIFLUSH); 36198 #else 36199 errno = 0; 36200 do { 36201 - ioctl(cur_term->Filedes, TIOCFLUSH, 0); 36202 + ioctl(termp->Filedes, TIOCFLUSH, 0); 23131 36203 } while 23132 36204 (errno == EINTR); … … 23155 36227 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_longname.c ncurses-5.7/ncurses/tinfo/lib_longname.c 23156 36228 --- ncurses-5.7.orig/ncurses/tinfo/lib_longname.c 2000-12-09 18:55:07.000000000 -0800 23157 +++ ncurses-5.7/ncurses/tinfo/lib_longname.c 2009-0 6-05 14:01:51.000000000 -070036229 +++ ncurses-5.7/ncurses/tinfo/lib_longname.c 2009-07-19 15:03:59.000000000 -0700 23158 36230 @@ -1,5 +1,5 @@ 23159 36231 /**************************************************************************** … … 23228 36300 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_napms.c ncurses-5.7/ncurses/tinfo/lib_napms.c 23229 36301 --- ncurses-5.7.orig/ncurses/tinfo/lib_napms.c 2008-05-03 14:34:13.000000000 -0700 23230 +++ ncurses-5.7/ncurses/tinfo/lib_napms.c 2009-0 6-05 14:01:14.000000000 -070036302 +++ ncurses-5.7/ncurses/tinfo/lib_napms.c 2009-07-19 15:04:06.000000000 -0700 23231 36303 @@ -1,5 +1,5 @@ 23232 36304 /**************************************************************************** … … 23245 36317 23246 36318 /* 23247 @@ -49,1 0 +51,10@@36319 @@ -49,13 +51,16 @@ 23248 36320 #endif 23249 36321 #endif 23250 36322 23251 36323 -MODULE_ID("$Id: lib_napms.c,v 1.17 2008/05/03 21:34:13 tom Exp $") 23252 +MODULE_ID("$Id: lib_napms.c,v 1.1 8 2009/02/15 00:48:27tom Exp $")36324 +MODULE_ID("$Id: lib_napms.c,v 1.19 2009/06/06 18:50:30 tom Exp $") 23253 36325 23254 36326 NCURSES_EXPORT(int) … … 23258 36330 T((T_CALLED("napms(%d)"), ms)); 23259 36331 23260 @@ -72,3 +74,11 @@ 36332 +#ifdef USE_TERM_DRIVER 36333 + CallDriver_1(sp, nap, ms); 36334 +#else /* !USE_TERM_DRIVER */ 36335 #if HAVE_NANOSLEEP 36336 { 36337 struct timespec request, remaining; 36338 @@ -69,6 +74,15 @@ 36339 #else 36340 _nc_timed_wait(0, 0, ms, (int *) 0 EVENTLIST_2nd(0)); 36341 #endif 36342 +#endif /* !USE_TERM_DRIVER */ 23261 36343 23262 36344 returnCode(OK); … … 23272 36354 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_options.c ncurses-5.7/ncurses/tinfo/lib_options.c 23273 36355 --- ncurses-5.7.orig/ncurses/tinfo/lib_options.c 2008-08-16 14:20:48.000000000 -0700 23274 +++ ncurses-5.7/ncurses/tinfo/lib_options.c 2009-0 6-05 14:01:54.000000000 -070036356 +++ ncurses-5.7/ncurses/tinfo/lib_options.c 2009-07-19 15:04:13.000000000 -0700 23275 36357 @@ -1,5 +1,5 @@ 23276 36358 /**************************************************************************** … … 23297 36379 +#endif 23298 36380 + 23299 +MODULE_ID("$Id: lib_options.c,v 1.6 4 2009/05/23 23:58:07tom Exp $")36381 +MODULE_ID("$Id: lib_options.c,v 1.65 2009/07/04 18:14:31 tom Exp $") 23300 36382 23301 36383 -static int _nc_curs_set(SCREEN *, int); … … 23311 36393 23312 36394 if (win) { 23313 @@ -72,18 +79,26 @@ 36395 @@ -63,6 +70,9 @@ 36396 NCURSES_EXPORT(void) 36397 idcok(WINDOW *win, bool flag) 36398 { 36399 +#if NCURSES_SP_FUNCS 36400 + SCREEN *sp = CURRENT_SCREEN; 36401 +#endif 36402 T((T_CALLED("idcok(%p,%d)"), win, flag)); 36403 36404 if (win) 36405 @@ -72,18 +82,26 @@ 23314 36406 } 23315 36407 … … 23341 36433 nodelay(WINDOW *win, bool flag) 23342 36434 { 23343 @@ -148,27 +16 3,64 @@36435 @@ -148,27 +166,64 @@ 23344 36436 /* curs_set() moved here to narrow the kernel interface */ 23345 36437 … … 23413 36505 ** has_key() 23414 36506 ** 23415 @@ -190,11 +24 2,19 @@36507 @@ -190,11 +245,19 @@ 23416 36508 } 23417 36509 … … 23435 36527 23436 36528 /* 23437 @@ -202,29 +26 2,26 @@36529 @@ -202,29 +265,26 @@ 23438 36530 * than cur_term. 23439 36531 */ … … 23476 36568 /* Turn the keypad on/off 23477 36569 * 23478 @@ -245,12 +30 2,12 @@36570 @@ -245,12 +305,12 @@ 23479 36571 * has wgetch() reading in more than one thread. putp() and below 23480 36572 * may use SP explicitly. … … 23491 36583 rc = _nc_keypad(sp, flag); 23492 36584 _nc_set_screen(save_sp); 23493 @@ -276,45 +33 3,14 @@36585 @@ -276,45 +336,14 @@ 23494 36586 } 23495 36587 … … 23541 36633 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_print.c ncurses-5.7/ncurses/tinfo/lib_print.c 23542 36634 --- ncurses-5.7.orig/ncurses/tinfo/lib_print.c 2006-11-25 16:26:34.000000000 -0800 23543 +++ ncurses-5.7/ncurses/tinfo/lib_print.c 2009-0 6-05 14:01:51.000000000 -070036635 +++ ncurses-5.7/ncurses/tinfo/lib_print.c 2009-07-19 15:04:06.000000000 -0700 23544 36636 @@ -1,5 +1,5 @@ 23545 36637 /**************************************************************************** … … 23549 36641 * Permission is hereby granted, free of charge, to any person obtaining a * 23550 36642 * copy of this software and associated documentation files (the * 23551 @@ -35,12 +35,19 @@ 23552 23553 #include <term.h> 36643 @@ -29,23 +29,27 @@ 36644 /**************************************************************************** 36645 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 36646 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 36647 + * and: Thomas E. Dickey 1996-on * 36648 + * and: Juergen Pfeifer * 36649 ****************************************************************************/ 36650 36651 #include <curses.priv.h> 36652 36653 -#include <term.h> 36654 +#ifndef CUR 36655 +#define CUR SP_TERMTYPE 36656 +#endif 23554 36657 23555 36658 -MODULE_ID("$Id: lib_print.c,v 1.16 2006/11/26 00:26:34 tom Exp $") 23556 +#ifndef CUR 23557 +#define CUR SP_TERMTYPE 23558 +#endif 23559 + 23560 +MODULE_ID("$Id: lib_print.c,v 1.18 2009/05/10 00:48:29 tom Exp $") 36659 +MODULE_ID("$Id: lib_print.c,v 1.19 2009/06/06 20:26:17 tom Exp $") 23561 36660 23562 36661 NCURSES_EXPORT(int) 23563 mcprint(char *data, int len) 36662 -mcprint(char *data, int len) 36663 +NCURSES_SP_NAME(mcprint) (NCURSES_SP_DCLx char *data, int len) 23564 36664 /* ship binary character data to the printer via mc4/mc5/mc5p */ 23565 36665 { 23566 +#if NCURSES_SP_FUNCS23567 + SCREEN *sp = CURRENT_SCREEN;23568 +#endif23569 36666 char *mybuf, *switchon; 23570 36667 size_t onsize, offsize, res; 23571 36668 36669 errno = 0; 36670 - if (!cur_term || (!prtr_non && (!prtr_on || !prtr_off))) { 36671 + if (!HasTInfoTerminal(SP_PARM) || (!prtr_non && (!prtr_on || !prtr_off))) { 36672 errno = ENODEV; 36673 return (ERR); 36674 } 36675 @@ -78,15 +82,24 @@ 36676 * data has actually been shipped to the terminal. If the write(2) 36677 * operation is truly atomic we're protected from this. 36678 */ 36679 - res = write(cur_term->Filedes, mybuf, onsize + len + offsize); 36680 + res = write(TerminalOf(SP_PARM)->Filedes, mybuf, onsize + len + offsize); 36681 36682 /* 36683 * By giving up our scheduler slot here we increase the odds that the 36684 * kernel will ship the contiguous clist items from the last write 36685 * immediately. 36686 */ 36687 +#ifndef __MINGW32__ 36688 (void) sleep(0); 36689 - 36690 +#endif 36691 free(mybuf); 36692 return (res); 36693 } 36694 + 36695 +#if NCURSES_SP_FUNCS && !defined(USE_TERM_DRIVER) 36696 +NCURSES_EXPORT(int) 36697 +mcprint(char *data, int len) 36698 +{ 36699 + return NCURSES_SP_NAME(mcprint) (CURRENT_SCREEN, data, len); 36700 +} 36701 +#endif 23572 36702 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_raw.c ncurses-5.7/ncurses/tinfo/lib_raw.c 23573 36703 --- ncurses-5.7.orig/ncurses/tinfo/lib_raw.c 2007-09-29 14:50:22.000000000 -0700 23574 +++ ncurses-5.7/ncurses/tinfo/lib_raw.c 2009-0 6-05 14:01:14.000000000 -070036704 +++ ncurses-5.7/ncurses/tinfo/lib_raw.c 2009-07-19 15:02:20.000000000 -0700 23575 36705 @@ -1,5 +1,5 @@ 23576 36706 /**************************************************************************** … … 23821 36951 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_setup.c ncurses-5.7/ncurses/tinfo/lib_setup.c 23822 36952 --- ncurses-5.7.orig/ncurses/tinfo/lib_setup.c 2008-08-03 15:42:33.000000000 -0700 23823 +++ ncurses-5.7/ncurses/tinfo/lib_setup.c 2009-0 6-05 14:01:55.000000000 -070036953 +++ ncurses-5.7/ncurses/tinfo/lib_setup.c 2009-07-19 15:04:06.000000000 -0700 23824 36954 @@ -1,5 +1,5 @@ 23825 36955 /**************************************************************************** … … 23842 36972 23843 36973 -MODULE_ID("$Id: lib_setup.c,v 1.111 2008/08/03 22:42:33 tom Exp $") 23844 +MODULE_ID("$Id: lib_setup.c,v 1.11 6 2009/05/30 20:39:21 tom Exp $")36974 +MODULE_ID("$Id: lib_setup.c,v 1.117 2009/06/06 17:56:31 tom Exp $") 23845 36975 23846 36976 /**************************************************************************** … … 23954 37084 _nc_get_screensize(SCREEN *sp, int *linep, int *colp) 23955 37085 /* Obtain lines/columns values from the environment and/or terminfo entry */ 37086 @@ -320,7 +347,7 @@ 37087 if (sp != 0 37088 && sp->_resize != 0) { 37089 if ((new_lines != old_lines) || (new_cols != old_cols)) 37090 - sp->_resize(new_lines, new_cols); 37091 + sp->_resize(NCURSES_SP_ARGx new_lines, new_cols); 37092 sp->_sig_winch = FALSE; 37093 } 37094 } 23956 37095 @@ -604,7 +631,7 @@ 23957 37096 /* … … 23965 37104 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_termcap.c ncurses-5.7/ncurses/tinfo/lib_termcap.c 23966 37105 --- ncurses-5.7.orig/ncurses/tinfo/lib_termcap.c 2008-08-16 12:22:55.000000000 -0700 23967 +++ ncurses-5.7/ncurses/tinfo/lib_termcap.c 2009-0 6-05 14:01:54.000000000 -070037106 +++ ncurses-5.7/ncurses/tinfo/lib_termcap.c 2009-07-19 15:04:15.000000000 -0700 23968 37107 @@ -1,5 +1,5 @@ 23969 37108 /**************************************************************************** … … 23990 37129 +#endif 23991 37130 + 23992 +MODULE_ID("$Id: lib_termcap.c,v 1.6 6 2009/05/23 23:47:34tom Exp $")37131 +MODULE_ID("$Id: lib_termcap.c,v 1.69 2009/07/11 18:14:21 tom Exp $") 23993 37132 23994 37133 NCURSES_EXPORT_VAR(char *) UP = 0; 23995 37134 NCURSES_EXPORT_VAR(char *) BC = 0; 23996 @@ -76, 7 +81,7@@37135 @@ -76,16 +81,28 @@ 23997 37136 ***************************************************************************/ 23998 37137 … … 24001 37140 +NCURSES_SP_NAME(tgetent) (NCURSES_SP_DCLx char *bufp, const char *name) 24002 37141 { 24003 int errcode; 37142 - int errcode; 37143 + int errcode = ERR; 24004 37144 int n; 24005 @@ -111,7 +116,7 @@ 37145 bool found_cache = FALSE; 37146 +#ifdef USE_TERM_DRIVER 37147 + TERMINAL *termp = 0; 37148 +#endif 37149 37150 START_TRACE(); 37151 T((T_CALLED("tgetent()"))); 37152 37153 +#ifdef USE_TERM_DRIVER 37154 + _nc_setupterm_ex(&termp, (NCURSES_CONST char *) name, 37155 + STDOUT_FILENO, &errcode, TRUE); 37156 + 37157 + if (termp == 0 || 37158 + !((TERMINAL_CONTROL_BLOCK *) termp)->drv->isTerminfo) 37159 + return (errcode); 37160 +#else 37161 _nc_setupterm((NCURSES_CONST char *) name, STDOUT_FILENO, &errcode, TRUE); 37162 +#endif 37163 37164 /* 37165 * In general we cannot tell if the fixed sgr0 is still used by the 37166 @@ -109,9 +126,9 @@ 37167 /* 37168 * Also free the terminfo data that we loaded (much bigger leak). 24006 37169 */ 24007 if (LAST_TRM != 0 && LAST_TRM != cur_term) { 37170 - if (LAST_TRM != 0 && LAST_TRM != cur_term) { 37171 + if (LAST_TRM != 0 && LAST_TRM != TerminalOf(SP_PARM)) { 24008 37172 TERMINAL *trm = LAST_TRM; 24009 37173 - del_curterm(LAST_TRM); … … 24012 37176 if (LAST_TRM == trm) 24013 37177 LAST_TRM = 0; 24014 @@ -164,8 +169,8 @@ 37178 @@ -131,7 +148,7 @@ 37179 } 37180 CacheInx = best; 37181 } 37182 - LAST_TRM = cur_term; 37183 + LAST_TRM = TerminalOf(SP_PARM); 37184 LAST_SEQ = ++CacheSeq; 37185 37186 PC = 0; 37187 @@ -153,7 +170,7 @@ 37188 if (backspace_if_not_bs != NULL) 37189 BC = backspace_if_not_bs; 37190 37191 - if ((FIX_SGR0 = _nc_trim_sgr0(&(cur_term->type))) != 0) { 37192 + if ((FIX_SGR0 = _nc_trim_sgr0(&(TerminalOf(SP_PARM)->type))) != 0) { 37193 if (!strcmp(FIX_SGR0, exit_attribute_mode)) { 37194 if (FIX_SGR0 != exit_attribute_mode) { 37195 free(FIX_SGR0); 37196 @@ -164,8 +181,8 @@ 24015 37197 LAST_BUF = bufp; 24016 37198 LAST_USE = TRUE; … … 24023 37205 /* LINT_PREPRO 24024 37206 #if 0*/ 24025 @@ -177,6 +1 82,14@@37207 @@ -177,6 +194,25 @@ 24026 37208 returnCode(errcode); 24027 37209 } … … 24035 37217 +#endif 24036 37218 + 37219 +#if 0 37220 +static bool 37221 +same_tcname(const char *a, const char *b) 37222 +{ 37223 + fprintf(stderr, "compare(%s,%s)\n", a, b); 37224 + return !strncmp(a, b, 2); 37225 +} 37226 +#else 37227 +#define same_tcname(a,b) !strncmp(a,b,2) 37228 +#endif 37229 + 24037 37230 /*************************************************************************** 24038 37231 * 24039 37232 * tgetflag(str) 24040 @@ -187, 7 +200,7 @@37233 @@ -187,23 +223,47 @@ 24041 37234 ***************************************************************************/ 24042 37235 … … 24045 37238 +NCURSES_SP_NAME(tgetflag) (NCURSES_SP_DCLx NCURSES_CONST char *id) 24046 37239 { 24047 unsigned i; 24048 24049 @@ -205,6 +218,14 @@ 24050 returnCode(0); /* Solaris does this */ 24051 } 24052 37240 - unsigned i; 37241 + int result = 0; /* Solaris returns zero for missing flag */ 37242 + int i, j; 37243 37244 - T((T_CALLED("tgetflag(%s)"), id)); 37245 - if (cur_term != 0) { 37246 - TERMTYPE *tp = &(cur_term->type); 37247 - for_each_boolean(i, tp) { 37248 - const char *capname = ExtBoolname(tp, i, boolcodes); 37249 - if (!strncmp(id, capname, 2)) { 37250 - /* setupterm forces invalid booleans to false */ 37251 - returnCode(tp->Booleans[i]); 37252 + T((T_CALLED("tgetflag(%p, %s)"), SP_PARM, id)); 37253 + if (HasTInfoTerminal(SP_PARM)) { 37254 + TERMTYPE *tp = &(TerminalOf(SP_PARM)->type); 37255 + struct name_table_entry const *entry_ptr; 37256 + 37257 + entry_ptr = _nc_find_type_entry(id, BOOLEAN, TRUE); 37258 + if (entry_ptr != 0) { 37259 + j = entry_ptr->nte_index; 37260 + } 37261 +#if NCURSES_XNAMES 37262 + else { 37263 + j = -1; 37264 + for_each_ext_boolean(i, tp) { 37265 + const char *capname = ExtBoolname(tp, i, boolcodes); 37266 + if (same_tcname(id, capname)) { 37267 + j = i; 37268 + break; 37269 + } 37270 } 37271 } 37272 +#endif 37273 + if (j >= 0) { 37274 + /* note: setupterm forces invalid booleans to false */ 37275 + result = tp->Booleans[j]; 37276 + } 37277 } 37278 - returnCode(0); /* Solaris does this */ 37279 + returnCode(result); 37280 +} 37281 + 24053 37282 +#if NCURSES_SP_FUNCS 24054 37283 +NCURSES_EXPORT(int) … … 24056 37285 +{ 24057 37286 + return NCURSES_SP_NAME(tgetflag) (CURRENT_SCREEN, id); 24058 +}37287 } 24059 37288 +#endif 24060 + 37289 24061 37290 /*************************************************************************** 24062 37291 * 24063 * tgetnum(str) 24064 @@ -215,7 +236,7 @@ 37292 @@ -215,25 +275,48 @@ 24065 37293 ***************************************************************************/ 24066 37294 … … 24069 37297 +NCURSES_SP_NAME(tgetnum) (NCURSES_SP_DCLx NCURSES_CONST char *id) 24070 37298 { 24071 unsigned i; 24072 24073 @@ -234,6 +255,14 @@ 24074 returnCode(ABSENT_NUMERIC); 37299 - unsigned i; 37300 + int result = ABSENT_NUMERIC; 37301 + int i, j; 37302 37303 - T((T_CALLED("tgetnum(%s)"), id)); 37304 - if (cur_term != 0) { 37305 - TERMTYPE *tp = &(cur_term->type); 37306 - for_each_number(i, tp) { 37307 - const char *capname = ExtNumname(tp, i, numcodes); 37308 - if (!strncmp(id, capname, 2)) { 37309 - if (!VALID_NUMERIC(tp->Numbers[i])) 37310 - returnCode(ABSENT_NUMERIC); 37311 - returnCode(tp->Numbers[i]); 37312 + T((T_CALLED("tgetnum(%p, %s)"), SP_PARM, id)); 37313 + if (HasTInfoTerminal(SP_PARM)) { 37314 + TERMTYPE *tp = &(TerminalOf(SP_PARM)->type); 37315 + struct name_table_entry const *entry_ptr; 37316 + 37317 + entry_ptr = _nc_find_type_entry(id, NUMBER, TRUE); 37318 + if (entry_ptr != 0) { 37319 + j = entry_ptr->nte_index; 37320 + } 37321 +#if NCURSES_XNAMES 37322 + else { 37323 + j = -1; 37324 + for_each_ext_number(i, tp) { 37325 + const char *capname = ExtNumname(tp, i, numcodes); 37326 + if (same_tcname(id, capname)) { 37327 + j = i; 37328 + break; 37329 + } 37330 } 37331 } 37332 +#endif 37333 + if (j >= 0) { 37334 + if (VALID_NUMERIC(tp->Numbers[j])) 37335 + result = tp->Numbers[j]; 37336 + } 37337 } 37338 - returnCode(ABSENT_NUMERIC); 37339 + returnCode(result); 24075 37340 } 24076 37341 … … 24086 37351 * 24087 37352 * tgetstr(str, area) 24088 @@ -244, 7 +273,7@@37353 @@ -244,40 +327,62 @@ 24089 37354 ***************************************************************************/ 24090 37355 … … 24093 37358 +NCURSES_SP_NAME(tgetstr) (NCURSES_SP_DCLx NCURSES_CONST char *id, char **area) 24094 37359 { 24095 37360 - unsigned i; 24096 37361 char *result = NULL; 24097 @@ -278,6 +307,14 @@ 37362 + int i, j; 37363 37364 T((T_CALLED("tgetstr(%s,%p)"), id, area)); 37365 - if (cur_term != 0) { 37366 - TERMTYPE *tp = &(cur_term->type); 37367 - for_each_string(i, tp) { 37368 - const char *capname = ExtStrname(tp, i, strcodes); 37369 - if (!strncmp(id, capname, 2)) { 37370 - result = tp->Strings[i]; 37371 - TR(TRACE_DATABASE, ("found match : %s", _nc_visbuf(result))); 37372 - /* setupterm forces canceled strings to null */ 37373 - if (VALID_STRING(result)) { 37374 - if (result == exit_attribute_mode 37375 - && FIX_SGR0 != 0) { 37376 - result = FIX_SGR0; 37377 - TR(TRACE_DATABASE, ("altered to : %s", _nc_visbuf(result))); 37378 - } 37379 - if (area != 0 37380 - && *area != 0) { 37381 - (void) strcpy(*area, result); 37382 - result = *area; 37383 - *area += strlen(*area) + 1; 37384 - } 37385 + if (HasTInfoTerminal(SP_PARM)) { 37386 + TERMTYPE *tp = &(TerminalOf(SP_PARM)->type); 37387 + struct name_table_entry const *entry_ptr; 37388 + 37389 + entry_ptr = _nc_find_type_entry(id, STRING, TRUE); 37390 + if (entry_ptr != 0) { 37391 + j = entry_ptr->nte_index; 37392 + } 37393 +#if NCURSES_XNAMES 37394 + else { 37395 + j = -1; 37396 + for_each_ext_string(i, tp) { 37397 + const char *capname = ExtStrname(tp, i, strcodes); 37398 + if (same_tcname(id, capname)) { 37399 + j = i; 37400 + break; 37401 + } 37402 + } 37403 + } 37404 +#endif 37405 + if (j >= 0) { 37406 + result = tp->Strings[j]; 37407 + TR(TRACE_DATABASE, ("found match : %s", _nc_visbuf(result))); 37408 + /* setupterm forces canceled strings to null */ 37409 + if (VALID_STRING(result)) { 37410 + if (result == exit_attribute_mode 37411 + && FIX_SGR0 != 0) { 37412 + result = FIX_SGR0; 37413 + TR(TRACE_DATABASE, ("altered to : %s", _nc_visbuf(result))); 37414 + } 37415 + if (area != 0 37416 + && *area != 0) { 37417 + (void) strcpy(*area, result); 37418 + result = *area; 37419 + *area += strlen(*area) + 1; 37420 } 37421 - break; 37422 } 37423 } 37424 } 24098 37425 returnPtr(result); 24099 37426 } … … 24112 37439 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_termname.c ncurses-5.7/ncurses/tinfo/lib_termname.c 24113 37440 --- ncurses-5.7.orig/ncurses/tinfo/lib_termname.c 2003-12-27 10:23:01.000000000 -0800 24114 +++ ncurses-5.7/ncurses/tinfo/lib_termname.c 2009-0 6-05 14:01:16.000000000 -070037441 +++ ncurses-5.7/ncurses/tinfo/lib_termname.c 2009-07-19 15:02:22.000000000 -0700 24115 37442 @@ -1,5 +1,5 @@ 24116 37443 /**************************************************************************** … … 24157 37484 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_ti.c ncurses-5.7/ncurses/tinfo/lib_ti.c 24158 37485 --- ncurses-5.7.orig/ncurses/tinfo/lib_ti.c 2003-05-24 14:10:28.000000000 -0700 24159 +++ ncurses-5.7/ncurses/tinfo/lib_ti.c 2009-0 6-05 14:01:51.000000000 -070037486 +++ ncurses-5.7/ncurses/tinfo/lib_ti.c 2009-07-19 15:04:15.000000000 -0700 24160 37487 @@ -1,5 +1,5 @@ 24161 37488 /**************************************************************************** … … 24165 37492 * Permission is hereby granted, free of charge, to any person obtaining a * 24166 37493 * copy of this software and associated documentation files (the * 24167 @@ -36,17 +36,17 @@ 37494 @@ -29,6 +29,7 @@ 37495 /**************************************************************************** 37496 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 37497 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 37498 + * and: Thomas E. Dickey 1996-on * 37499 ****************************************************************************/ 37500 37501 #include <curses.priv.h> 37502 @@ -36,68 +37,150 @@ 24168 37503 #include <term_entry.h> 24169 37504 #include <tic.h> 24170 37505 24171 37506 -MODULE_ID("$Id: lib_ti.c,v 1.23 2003/05/24 21:10:28 tom Exp $") 24172 +MODULE_ID("$Id: lib_ti.c,v 1.24 2009/04/18 17:37:50 tom Exp $") 37507 +MODULE_ID("$Id: lib_ti.c,v 1.26 2009/07/11 18:14:21 tom Exp $") 37508 + 37509 +#if 0 37510 +static bool 37511 +same_name(const char *a, const char *b) 37512 +{ 37513 + fprintf(stderr, "compare(%s,%s)\n", a, b); 37514 + return !strcmp(a, b); 37515 +} 37516 +#else 37517 +#define same_name(a,b) !strcmp(a,b) 37518 +#endif 24173 37519 24174 37520 NCURSES_EXPORT(int) … … 24176 37522 +NCURSES_SP_NAME(tigetflag) (NCURSES_SP_DCLx NCURSES_CONST char *str) 24177 37523 { 24178 unsigned i; 37524 - unsigned i; 37525 + int result = ABSENT_BOOLEAN; 37526 + int i, j; 24179 37527 24180 37528 - T((T_CALLED("tigetflag(%s)"), str)); … … 24183 37531 - if (cur_term != 0) { 24184 37532 - TERMTYPE *tp = &(cur_term->type); 37533 - for_each_boolean(i, tp) { 37534 - const char *capname = ExtBoolname(tp, i, boolnames); 37535 - if (!strcmp(str, capname)) { 37536 - /* setupterm forces invalid booleans to false */ 37537 - returnCode(tp->Booleans[i]); 24185 37538 + if (HasTInfoTerminal(SP_PARM)) { 24186 37539 + TERMTYPE *tp = &(TerminalOf(SP_PARM)->type); 24187 for_each_boolean(i, tp) { 24188 const char *capname = ExtBoolname(tp, i, boolnames); 24189 if (!strcmp(str, capname)) { 24190 @@ -59,15 +59,23 @@ 24191 returnCode(ABSENT_BOOLEAN); 37540 + struct name_table_entry const *entry_ptr; 37541 + 37542 + entry_ptr = _nc_find_type_entry(str, BOOLEAN, FALSE); 37543 + if (entry_ptr != 0) { 37544 + j = entry_ptr->nte_index; 37545 + } 37546 +#if NCURSES_XNAMES 37547 + else { 37548 + j = -1; 37549 + for_each_ext_boolean(i, tp) { 37550 + const char *capname = ExtBoolname(tp, i, boolnames); 37551 + if (same_name(str, capname)) { 37552 + j = i; 37553 + break; 37554 + } 37555 } 37556 } 37557 +#endif 37558 + if (j >= 0) { 37559 + /* note: setupterm forces invalid booleans to false */ 37560 + result = tp->Booleans[j]; 37561 + } 37562 } 37563 37564 - returnCode(ABSENT_BOOLEAN); 37565 + returnCode(result); 24192 37566 } 24193 37567 … … 24204 37578 +NCURSES_SP_NAME(tigetnum) (NCURSES_SP_DCLx NCURSES_CONST char *str) 24205 37579 { 24206 unsigned i; 37580 - unsigned i; 37581 + int i, j; 37582 + int result = CANCELLED_NUMERIC; /* Solaris returns a -1 on error */ 24207 37583 24208 37584 - T((T_CALLED("tigetnum(%s)"), str)); … … 24211 37587 - if (cur_term != 0) { 24212 37588 - TERMTYPE *tp = &(cur_term->type); 37589 - for_each_number(i, tp) { 37590 - const char *capname = ExtNumname(tp, i, numnames); 37591 - if (!strcmp(str, capname)) { 37592 - if (!VALID_NUMERIC(tp->Numbers[i])) 37593 - returnCode(ABSENT_NUMERIC); 37594 - returnCode(tp->Numbers[i]); 24213 37595 + if (HasTInfoTerminal(SP_PARM)) { 24214 37596 + TERMTYPE *tp = &(TerminalOf(SP_PARM)->type); 24215 for_each_number(i, tp) { 24216 const char *capname = ExtNumname(tp, i, numnames); 24217 if (!strcmp(str, capname)) { 24218 @@ -81,15 +89,23 @@ 24219 returnCode(CANCELLED_NUMERIC); /* Solaris returns a -1 instead */ 37597 + struct name_table_entry const *entry_ptr; 37598 + 37599 + entry_ptr = _nc_find_type_entry(str, NUMBER, FALSE); 37600 + if (entry_ptr != 0) { 37601 + j = entry_ptr->nte_index; 37602 + } 37603 +#if NCURSES_XNAMES 37604 + else { 37605 + j = -1; 37606 + for_each_ext_number(i, tp) { 37607 + const char *capname = ExtNumname(tp, i, numnames); 37608 + if (same_name(str, capname)) { 37609 + j = i; 37610 + break; 37611 + } 37612 } 37613 } 37614 +#endif 37615 + if (j >= 0 && VALID_NUMERIC(tp->Numbers[j])) 37616 + result = tp->Numbers[j]; 37617 + else 37618 + result = ABSENT_NUMERIC; 37619 } 37620 37621 - returnCode(CANCELLED_NUMERIC); /* Solaris returns a -1 instead */ 37622 + returnCode(result); 24220 37623 } 24221 37624 … … 24232 37635 +NCURSES_SP_NAME(tigetstr) (NCURSES_SP_DCLx NCURSES_CONST char *str) 24233 37636 { 24234 unsigned i; 37637 - unsigned i; 37638 + char *result = CANCELLED_STRING; 37639 + int i, j; 24235 37640 24236 37641 - T((T_CALLED("tigetstr(%s)"), str)); … … 24239 37644 - if (cur_term != 0) { 24240 37645 - TERMTYPE *tp = &(cur_term->type); 37646 - for_each_string(i, tp) { 37647 - const char *capname = ExtStrname(tp, i, strnames); 37648 - if (!strcmp(str, capname)) { 37649 - /* setupterm forces cancelled strings to null */ 37650 - returnPtr(tp->Strings[i]); 24241 37651 + if (HasTInfoTerminal(SP_PARM)) { 24242 37652 + TERMTYPE *tp = &(TerminalOf(SP_PARM)->type); 24243 for_each_string(i, tp) { 24244 const char *capname = ExtStrname(tp, i, strnames); 24245 if (!strcmp(str, capname)) { 24246 @@ -101,3 +117,11 @@ 24247 24248 returnPtr(CANCELLED_STRING); 24249 } 37653 + struct name_table_entry const *entry_ptr; 37654 + 37655 + entry_ptr = _nc_find_type_entry(str, STRING, FALSE); 37656 + if (entry_ptr != 0) { 37657 + j = entry_ptr->nte_index; 37658 + } 37659 +#if NCURSES_XNAMES 37660 + else { 37661 + j = -1; 37662 + for_each_ext_string(i, tp) { 37663 + const char *capname = ExtStrname(tp, i, strnames); 37664 + if (same_name(str, capname)) { 37665 + j = i; 37666 + break; 37667 + } 37668 } 37669 } 37670 +#endif 37671 + if (j >= 0) { 37672 + /* note: setupterm forces cancelled strings to null */ 37673 + result = tp->Strings[j]; 37674 + } 37675 } 37676 37677 - returnPtr(CANCELLED_STRING); 37678 + returnPtr(result); 37679 +} 24250 37680 + 24251 37681 +#if NCURSES_SP_FUNCS … … 24254 37684 +{ 24255 37685 + return NCURSES_SP_NAME(tigetstr) (CURRENT_SCREEN, str); 24256 +}37686 } 24257 37687 +#endif 24258 37688 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_tparm.c ncurses-5.7/ncurses/tinfo/lib_tparm.c 24259 37689 --- ncurses-5.7.orig/ncurses/tinfo/lib_tparm.c 2008-08-16 12:22:55.000000000 -0700 24260 +++ ncurses-5.7/ncurses/tinfo/lib_tparm.c 2009-0 6-05 14:01:16.000000000 -070037690 +++ ncurses-5.7/ncurses/tinfo/lib_tparm.c 2009-07-19 15:02:22.000000000 -0700 24261 37691 @@ -40,10 +40,9 @@ 24262 37692 #include <curses.priv.h> … … 24273 37703 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_tputs.c ncurses-5.7/ncurses/tinfo/lib_tputs.c 24274 37704 --- ncurses-5.7.orig/ncurses/tinfo/lib_tputs.c 2008-06-28 06:12:15.000000000 -0700 24275 +++ ncurses-5.7/ncurses/tinfo/lib_tputs.c 2009-0 6-05 14:01:54.000000000 -070037705 +++ ncurses-5.7/ncurses/tinfo/lib_tputs.c 2009-07-19 15:04:07.000000000 -0700 24276 37706 @@ -1,5 +1,5 @@ 24277 37707 /**************************************************************************** … … 24304 37734 24305 37735 -MODULE_ID("$Id: lib_tputs.c,v 1.66 2008/06/28 13:12:15 tom Exp $") 24306 +MODULE_ID("$Id: lib_tputs.c,v 1.7 4 2009/05/23 23:56:23tom Exp $")37736 +MODULE_ID("$Id: lib_tputs.c,v 1.77 2009/06/07 13:59:11 tom Exp $") 24307 37737 24308 37738 NCURSES_EXPORT_VAR(char) PC = 0; /* used by termcap library */ 24309 37739 NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0; /* used by termcap library */ 24310 @@ -69,62 +74,12 2@@37740 @@ -69,62 +74,126 @@ 24311 37741 } 24312 37742 #endif … … 24325 37755 - T((T_CALLED("delay_output(%d)"), ms)); 24326 37756 + T((T_CALLED("delay_output(%p,%d)"), SP_PARM, ms)); 37757 + 37758 + if (!HasTInfoTerminal(SP_PARM)) 37759 + returnCode(ERR); 24327 37760 24328 37761 if (no_pad_char) { … … 24377 37810 - if (SP != 0 24378 37811 - && SP->_cleanup) { 24379 + if (SP_PARM != 0 37812 + if (HasTInfoTerminal(SP_PARM) 37813 + && SP_PARM != 0 24380 37814 + && SP_PARM->_cleanup) { 24381 37815 char tmp = ch; … … 24446 37880 bool always_delay; 24447 37881 bool normal_delay; 24448 @@ -137,7 +20 2,7 @@37882 @@ -137,7 +206,7 @@ 24449 37883 char addrbuf[32]; 24450 37884 … … 24455 37889 else 24456 37890 (void) sprintf(addrbuf, "%p", outc); 24457 @@ -164,7 +229,7 @@ 37891 @@ -152,10 +221,19 @@ 37892 } 37893 #endif /* TRACE */ 37894 37895 + if (SP_PARM != 0 && !HasTInfoTerminal(SP_PARM)) 37896 + return ERR; 37897 + 37898 if (!VALID_STRING(string)) 37899 return ERR; 37900 37901 - if (cur_term == 0) { 37902 + if ( 37903 +#if NCURSES_SP_FUNCS 37904 + (SP_PARM != 0 && SP_PARM->_term == 0) 37905 +#else 37906 + cur_term == 0 37907 +#endif 37908 + ) { 37909 always_delay = FALSE; 37910 normal_delay = TRUE; 37911 } else { 37912 @@ -164,7 +242,7 @@ 24458 37913 !xon_xoff 24459 37914 && padding_baud_rate … … 24464 37919 && (_nc_baudrate(ospeed) >= padding_baud_rate); 24465 37920 } 24466 @@ -201,21 +2 66,21 @@37921 @@ -201,21 +279,21 @@ 24467 37922 my_outch = outc; /* redirect delay_output() */ 24468 37923 while (*string) { … … 24491 37946 } 24492 37947 24493 @@ -250,7 +3 15,7 @@37948 @@ -250,7 +328,7 @@ 24494 37949 && (always_delay 24495 37950 || normal_delay … … 24500 37955 } /* endelse (*string == '<') */ 24501 37956 } /* endelse (*string == '$') */ 24502 @@ -270,6 +3 35,25 @@37957 @@ -270,6 +348,25 @@ 24503 37958 delay_output(trailpad / 10); 24504 37959 #endif /* BSD_TPUTS */ … … 24529 37984 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_ttyflags.c ncurses-5.7/ncurses/tinfo/lib_ttyflags.c 24530 37985 --- ncurses-5.7.orig/ncurses/tinfo/lib_ttyflags.c 2008-08-03 15:10:44.000000000 -0700 24531 +++ ncurses-5.7/ncurses/tinfo/lib_ttyflags.c 2009-0 6-05 14:01:51.000000000 -070037986 +++ ncurses-5.7/ncurses/tinfo/lib_ttyflags.c 2009-07-19 15:04:06.000000000 -0700 24532 37987 @@ -1,5 +1,5 @@ 24533 37988 /**************************************************************************** … … 24537 37992 * Permission is hereby granted, free of charge, to any person obtaining a * 24538 37993 * copy of this software and associated documentation files (the * 24539 @@ -38,10 +38,14 @@ 37994 @@ -36,159 +36,246 @@ 37995 */ 37996 24540 37997 #include <curses.priv.h> 24541 37998 -#include <term.h> /* cur_term */ 24542 37999 24543 38000 -MODULE_ID("$Id: lib_ttyflags.c,v 1.18 2008/08/03 22:10:44 tom Exp $") 24544 38001 +#ifndef CUR 24545 +#define CUR SP_TERMTYPE 38002 +#define CUR SP_TERMTYPE 24546 38003 +#endif 24547 38004 + 24548 +MODULE_ID("$Id: lib_ttyflags.c,v 1.2 4 2009/05/10 00:48:29tom Exp $")38005 +MODULE_ID("$Id: lib_ttyflags.c,v 1.25 2009/06/06 19:10:05 tom Exp $") 24549 38006 24550 38007 NCURSES_EXPORT(int) … … 24554 38011 int result = OK; 24555 38012 24556 @@ -71,8 +75,16 @@ 38013 - if (buf == 0) { 38014 + if (buf == 0 || SP_PARM == 0) { 38015 result = ERR; 38016 } else { 38017 - if (cur_term == 0) { 38018 + TERMINAL *termp = TerminalOf(SP_PARM); 38019 + 38020 + if (0 == termp) { 38021 result = ERR; 38022 } else { 38023 +#ifdef USE_TERM_DRIVER 38024 + result = CallDriver_2(SP_PARM, sgmode, FALSE, buf); 38025 +#else 38026 for (;;) { 38027 - if (GET_TTY(cur_term->Filedes, buf) != 0) { 38028 + if (GET_TTY(termp->Filedes, buf) != 0) { 38029 if (errno == EINTR) 38030 continue; 38031 result = ERR; 38032 } 38033 break; 38034 } 38035 +#endif 38036 } 38037 38038 if (result == ERR) 38039 memset(buf, 0, sizeof(*buf)); 38040 38041 TR(TRACE_BITS, ("_nc_get_tty_mode(%d): %s", 38042 - cur_term ? cur_term->Filedes : -1, 38043 + termp ? termp->Filedes : -1, 38044 _nc_trace_ttymode(buf))); 38045 } 24557 38046 return (result); 24558 38047 } … … 24572 38061 int result = OK; 24573 38062 24574 @@ -86,8 +98,8 @@ 24575 if (SET_TTY(cur_term->Filedes, buf) != 0) { 38063 - if (buf == 0) { 38064 + if (buf == 0 || SP_PARM == 0) { 38065 result = ERR; 38066 } else { 38067 - if (cur_term == 0) { 38068 + TERMINAL *termp = TerminalOf(SP_PARM); 38069 + 38070 + if (0 == termp) { 38071 result = ERR; 38072 } else { 38073 +#ifdef USE_TERM_DRIVER 38074 + result = CallDriver_2(SP_PARM, sgmode, TRUE, buf); 38075 +#else 38076 for (;;) { 38077 - if (SET_TTY(cur_term->Filedes, buf) != 0) { 38078 + if (SET_TTY(termp->Filedes, buf) != 0) { 24576 38079 if (errno == EINTR) 24577 38080 continue; … … 24583 38086 } 24584 38087 break; 24585 @@ -100,8 +112,16 @@ 38088 } 38089 +#endif 38090 } 38091 TR(TRACE_BITS, ("_nc_set_tty_mode(%d): %s", 38092 - cur_term ? cur_term->Filedes : -1, 38093 + termp ? termp->Filedes : -1, 38094 _nc_trace_ttymode(buf))); 38095 } 24586 38096 return (result); 24587 38097 } … … 24600 38110 { 24601 38111 int rc = ERR; 24602 24603 @@ -125,8 +145,16 @@ 38112 + TERMINAL *termp = TerminalOf(SP_PARM); 38113 38114 - T((T_CALLED("def_shell_mode()"))); 38115 + T((T_CALLED("def_shell_mode(%p)"), SP_PARM)); 38116 38117 - if (cur_term != 0) { 38118 + if (termp != 0) { 38119 +#ifdef USE_TERM_DRIVER 38120 + rc = CallDriver_2(SP_PARM, mode, FALSE, TRUE); 38121 +#else 38122 /* 38123 * If XTABS was on, remove the tab and backtab capabilities. 38124 */ 38125 - if (_nc_get_tty_mode(&cur_term->Ottyb) == OK) { 38126 + if (_nc_get_tty_mode(&termp->Ottyb) == OK) { 38127 #ifdef TERMIOS 38128 - if (cur_term->Ottyb.c_oflag & OFLAGS_TABS) 38129 + if (termp->Ottyb.c_oflag & OFLAGS_TABS) 38130 tab = back_tab = NULL; 38131 #else 38132 - if (cur_term->Ottyb.sg_flags & XTABS) 38133 + if (termp->Ottyb.sg_flags & XTABS) 38134 tab = back_tab = NULL; 38135 #endif 38136 rc = OK; 38137 } 38138 +#endif 38139 } 24604 38140 returnCode(rc); 24605 38141 } … … 24618 38154 { 24619 38155 int rc = ERR; 24620 24621 @@ -148,17 +176,25 @@ 38156 + TERMINAL *termp = TerminalOf(SP_PARM); 38157 38158 - T((T_CALLED("def_prog_mode()"))); 38159 + T((T_CALLED("def_prog_mode(%p)"), SP_PARM)); 38160 38161 - if (cur_term != 0) { 38162 + if (termp != 0) { 38163 +#ifdef USE_TERM_DRIVER 38164 + rc = CallDriver_2(SP_PARM, mode, TRUE, TRUE); 38165 +#else 38166 /* 38167 * Turn off the XTABS bit in the tty structure if it was on. 38168 */ 38169 - if (_nc_get_tty_mode(&cur_term->Nttyb) == OK) { 38170 + if (_nc_get_tty_mode(&termp->Nttyb) == OK) { 38171 #ifdef TERMIOS 38172 - cur_term->Nttyb.c_oflag &= ~OFLAGS_TABS; 38173 + termp->Nttyb.c_oflag &= ~OFLAGS_TABS; 38174 #else 38175 - cur_term->Nttyb.sg_flags &= ~XTABS; 38176 + termp->Nttyb.sg_flags &= ~XTABS; 38177 #endif 38178 rc = OK; 38179 } 38180 +#endif 38181 } 24622 38182 returnCode(rc); 24623 38183 } … … 24627 38187 -reset_prog_mode(void) 24628 38188 +def_prog_mode(void) 24629 +{ 38189 { 38190 - T((T_CALLED("reset_prog_mode()"))); 24630 38191 + return NCURSES_SP_NAME(def_prog_mode) (CURRENT_SCREEN); 24631 38192 +} 24632 38193 +#endif 24633 + 24634 +NCURSES_EXPORT(int) 24635 +NCURSES_SP_NAME(reset_prog_mode) (NCURSES_SP_DCL0) 24636 { 24637 T((T_CALLED("reset_prog_mode()"))); 24638 24639 if (cur_term != 0) { 24640 if (_nc_set_tty_mode(&cur_term->Nttyb) == OK) { 38194 38195 - if (cur_term != 0) { 38196 - if (_nc_set_tty_mode(&cur_term->Nttyb) == OK) { 24641 38197 - if (SP) { 24642 38198 - if (SP->_keypad_on) 24643 38199 - _nc_keypad(SP, TRUE); 24644 38200 - NC_BUFFERED(TRUE); 38201 +NCURSES_EXPORT(int) 38202 +NCURSES_SP_NAME(reset_prog_mode) (NCURSES_SP_DCL0) 38203 +{ 38204 + int rc = ERR; 38205 + TERMINAL *termp = TerminalOf(SP_PARM); 38206 + 38207 + T((T_CALLED("reset_prog_mode(%p)"), SP_PARM)); 38208 + 38209 + if (termp != 0) { 38210 +#ifdef USE_TERM_DRIVER 38211 + rc = CallDriver_2(SP_PARM, mode, TRUE, FALSE); 38212 +#else 38213 + if (_nc_set_tty_mode(&termp->Nttyb) == OK) { 24645 38214 + if (SP_PARM) { 24646 38215 + if (SP_PARM->_keypad_on) … … 24648 38217 + NC_BUFFERED(SP_PARM, TRUE); 24649 38218 } 24650 returnCode(OK); 38219 - returnCode(OK); 38220 + rc = OK; 24651 38221 } 24652 @@ -166,22 +202,38 @@ 24653 returnCode(ERR); 38222 +#endif 38223 } 38224 - returnCode(ERR); 38225 + returnCode(rc); 24654 38226 } 24655 38227 … … 24658 38230 -reset_shell_mode(void) 24659 38231 +reset_prog_mode(void) 24660 +{ 38232 { 38233 - T((T_CALLED("reset_shell_mode()"))); 24661 38234 + return NCURSES_SP_NAME(reset_prog_mode) (CURRENT_SCREEN); 24662 38235 +} 24663 38236 +#endif 24664 + 38237 38238 - if (cur_term != 0) { 38239 - if (SP) { 38240 - _nc_keypad(SP, FALSE); 24665 38241 +NCURSES_EXPORT(int) 24666 38242 +NCURSES_SP_NAME(reset_shell_mode) (NCURSES_SP_DCL0) 24667 { 24668 T((T_CALLED("reset_shell_mode()"))); 24669 24670 if (cur_term != 0) { 24671 - if (SP) { 24672 - _nc_keypad(SP, FALSE); 38243 +{ 38244 + int rc = ERR; 38245 + TERMINAL *termp = TerminalOf(SP_PARM); 38246 + 38247 + T((T_CALLED("reset_shell_mode(%p)"), SP_PARM)); 38248 + 38249 + if (termp != 0) { 38250 +#ifdef USE_TERM_DRIVER 38251 + rc = CallDriver_2(SP_PARM, mode, FALSE, FALSE); 38252 +#else 24673 38253 + if (SP_PARM) { 24674 38254 + _nc_keypad(SP_PARM, FALSE); … … 24677 38257 + NC_BUFFERED(SP_PARM, FALSE); 24678 38258 } 24679 returnCode(_nc_set_tty_mode(&cur_term->Ottyb)); 38259 - returnCode(_nc_set_tty_mode(&cur_term->Ottyb)); 38260 + rc = _nc_set_tty_mode(&termp->Ottyb); 38261 +#endif 24680 38262 } 24681 returnCode(ERR); 38263 - returnCode(ERR); 38264 + returnCode(rc); 24682 38265 } 24683 38266 … … 24691 38274 + 24692 38275 static TTY * 24693 saved_tty(void) 38276 -saved_tty(void) 38277 +saved_tty(NCURSES_SP_DCL0) 24694 38278 { 38279 TTY *result = 0; 38280 38281 - if (SP != 0) { 38282 - result = &(SP->_saved_tty); 38283 + if (SP_PARM != 0) { 38284 + result = (TTY *) & (SP_PARM->_saved_tty); 38285 } else { 38286 if (_nc_prescreen.saved_tty == 0) { 38287 _nc_prescreen.saved_tty = typeCalloc(TTY, 1); 38288 @@ -204,17 +291,31 @@ 38289 */ 38290 38291 NCURSES_EXPORT(int) 38292 +NCURSES_SP_NAME(savetty) (NCURSES_SP_DCL0) 38293 +{ 38294 + T((T_CALLED("savetty(%p)"), SP_PARM)); 38295 + returnCode(NCURSES_SP_NAME(_nc_get_tty_mode) (NCURSES_SP_ARGx saved_tty(NCURSES_SP_ARG))); 38296 +} 38297 + 38298 +#if NCURSES_SP_FUNCS 38299 +NCURSES_EXPORT(int) 38300 savetty(void) 38301 { 38302 - T((T_CALLED("savetty()"))); 38303 + return NCURSES_SP_NAME(savetty) (CURRENT_SCREEN); 38304 +} 38305 +#endif 38306 38307 - returnCode(_nc_get_tty_mode(saved_tty())); 38308 +NCURSES_EXPORT(int) 38309 +NCURSES_SP_NAME(resetty) (NCURSES_SP_DCL0) 38310 +{ 38311 + T((T_CALLED("resetty(%p)"), SP_PARM)); 38312 + returnCode(NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_ARGx saved_tty(NCURSES_SP_ARG))); 38313 } 38314 38315 +#if NCURSES_SP_FUNCS 38316 NCURSES_EXPORT(int) 38317 resetty(void) 38318 { 38319 - T((T_CALLED("resetty()"))); 38320 - 38321 - returnCode(_nc_set_tty_mode(saved_tty())); 38322 + return NCURSES_SP_NAME(resetty) (CURRENT_SCREEN); 38323 } 38324 +#endif 24695 38325 diff -Naur ncurses-5.7.orig/ncurses/tinfo/make_keys.c ncurses-5.7/ncurses/tinfo/make_keys.c 24696 38326 --- ncurses-5.7.orig/ncurses/tinfo/make_keys.c 2008-08-03 14:57:22.000000000 -0700 24697 +++ ncurses-5.7/ncurses/tinfo/make_keys.c 2009-0 6-05 14:01:16.000000000 -070038327 +++ ncurses-5.7/ncurses/tinfo/make_keys.c 2009-07-19 15:02:22.000000000 -0700 24698 38328 @@ -39,16 +39,16 @@ 24699 38329 #define USE_TERMLIB 1 … … 24740 38370 diff -Naur ncurses-5.7.orig/ncurses/tinfo/MKcodes.awk ncurses-5.7/ncurses/tinfo/MKcodes.awk 24741 38371 --- ncurses-5.7.orig/ncurses/tinfo/MKcodes.awk 2008-06-28 16:13:25.000000000 -0700 24742 +++ ncurses-5.7/ncurses/tinfo/MKcodes.awk 2009-0 6-05 14:01:54.000000000 -070038372 +++ ncurses-5.7/ncurses/tinfo/MKcodes.awk 2009-07-19 15:04:03.000000000 -0700 24743 38373 @@ -1,5 +1,5 @@ 24744 38374 ############################################################################## … … 24802 38432 diff -Naur ncurses-5.7.orig/ncurses/tinfo/MKfallback.sh ncurses-5.7/ncurses/tinfo/MKfallback.sh 24803 38433 --- ncurses-5.7.orig/ncurses/tinfo/MKfallback.sh 2006-07-15 09:54:20.000000000 -0700 24804 +++ ncurses-5.7/ncurses/tinfo/MKfallback.sh 2009-0 6-05 14:01:44.000000000 -070038434 +++ ncurses-5.7/ncurses/tinfo/MKfallback.sh 2009-07-19 15:03:53.000000000 -0700 24805 38435 @@ -1,6 +1,6 @@ 24806 38436 #!/bin/sh … … 24830 38460 diff -Naur ncurses-5.7.orig/ncurses/tinfo/MKnames.awk ncurses-5.7/ncurses/tinfo/MKnames.awk 24831 38461 --- ncurses-5.7.orig/ncurses/tinfo/MKnames.awk 2008-10-11 14:07:56.000000000 -0700 24832 +++ ncurses-5.7/ncurses/tinfo/MKnames.awk 2009-0 6-05 14:01:24.000000000 -070038462 +++ ncurses-5.7/ncurses/tinfo/MKnames.awk 2009-07-19 15:03:45.000000000 -0700 24833 38463 @@ -1,5 +1,5 @@ 24834 38464 ############################################################################## … … 24901 38531 diff -Naur ncurses-5.7.orig/ncurses/tinfo/name_match.c ncurses-5.7/ncurses/tinfo/name_match.c 24902 38532 --- ncurses-5.7.orig/ncurses/tinfo/name_match.c 2008-08-03 12:49:33.000000000 -0700 24903 +++ ncurses-5.7/ncurses/tinfo/name_match.c 2009-0 6-05 14:01:16.000000000 -070038533 +++ ncurses-5.7/ncurses/tinfo/name_match.c 2009-07-19 15:02:22.000000000 -0700 24904 38534 @@ -31,10 +31,9 @@ 24905 38535 ****************************************************************************/ … … 24916 38546 diff -Naur ncurses-5.7.orig/ncurses/tinfo/parse_entry.c ncurses-5.7/ncurses/tinfo/parse_entry.c 24917 38547 --- ncurses-5.7.orig/ncurses/tinfo/parse_entry.c 2008-08-16 14:52:03.000000000 -0700 24918 +++ ncurses-5.7/ncurses/tinfo/parse_entry.c 2009-0 6-05 14:01:44.000000000 -070038548 +++ ncurses-5.7/ncurses/tinfo/parse_entry.c 2009-07-19 15:04:15.000000000 -0700 24919 38549 @@ -1,5 +1,5 @@ 24920 38550 /**************************************************************************** … … 24929 38559 24930 38560 -MODULE_ID("$Id: parse_entry.c,v 1.69 2008/08/16 21:52:03 tom Exp $") 24931 +MODULE_ID("$Id: parse_entry.c,v 1.7 0 2009/04/18 21:01:38tom Exp $")38561 +MODULE_ID("$Id: parse_entry.c,v 1.71 2009/07/11 18:14:21 tom Exp $") 24932 38562 24933 38563 #ifdef LINT … … 25000 38630 25001 38631 return &temp; 25002 @@ -444,7 +448,7 @@ 38632 @@ -379,16 +383,14 @@ 38633 && !strcmp("ma", _nc_curr_token.tk_name)) { 38634 /* tell max_attributes from arrow_key_map */ 38635 entry_ptr = _nc_find_type_entry("ma", NUMBER, 38636 - _nc_get_table(_nc_syntax 38637 - != 0)); 38638 + _nc_syntax != 0); 38639 assert(entry_ptr != 0); 38640 38641 } else if (token_type == STRING 38642 && !strcmp("MT", _nc_curr_token.tk_name)) { 38643 /* map terminfo's string MT to MT */ 38644 entry_ptr = _nc_find_type_entry("MT", STRING, 38645 - _nc_get_table(_nc_syntax 38646 - != 0)); 38647 + _nc_syntax != 0); 38648 assert(entry_ptr != 0); 38649 38650 } else if (token_type == BOOLEAN 38651 @@ -444,7 +446,7 @@ 25003 38652 25004 38653 case NUMBER: … … 25009 38658 25010 38659 case STRING: 25011 @@ -788,7 +79 2,7 @@38660 @@ -788,7 +790,7 @@ 25012 38661 for (base = other_non_function_keys; 25013 38662 (cp = strchr(base, ',')) != 0; … … 25020 38669 diff -Naur ncurses-5.7.orig/ncurses/tinfo/setbuf.c ncurses-5.7/ncurses/tinfo/setbuf.c 25021 38670 --- ncurses-5.7.orig/ncurses/tinfo/setbuf.c 2007-05-12 12:04:02.000000000 -0700 25022 +++ ncurses-5.7/ncurses/tinfo/setbuf.c 2009-0 6-05 14:01:51.000000000 -070038671 +++ ncurses-5.7/ncurses/tinfo/setbuf.c 2009-07-19 15:03:59.000000000 -0700 25023 38672 @@ -1,5 +1,5 @@ 25024 38673 /**************************************************************************** … … 25090 38739 +} 25091 38740 +#endif 38741 diff -Naur ncurses-5.7.orig/ncurses/tinfo/tinfo_driver.c ncurses-5.7/ncurses/tinfo/tinfo_driver.c 38742 --- ncurses-5.7.orig/ncurses/tinfo/tinfo_driver.c 1969-12-31 16:00:00.000000000 -0800 38743 +++ ncurses-5.7/ncurses/tinfo/tinfo_driver.c 2009-07-19 15:04:11.000000000 -0700 38744 @@ -0,0 +1,1389 @@ 38745 +/**************************************************************************** 38746 + * Copyright (c) 2008,2009 Free Software Foundation, Inc. * 38747 + * * 38748 + * Permission is hereby granted, free of charge, to any person obtaining a * 38749 + * copy of this software and associated documentation files (the * 38750 + * "Software"), to deal in the Software without restriction, including * 38751 + * without limitation the rights to use, copy, modify, merge, publish, * 38752 + * distribute, distribute with modifications, sublicense, and/or sell * 38753 + * copies of the Software, and to permit persons to whom the Software is * 38754 + * furnished to do so, subject to the following conditions: * 38755 + * * 38756 + * The above copyright notice and this permission notice shall be included * 38757 + * in all copies or substantial portions of the Software. * 38758 + * * 38759 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * 38760 + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * 38761 + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * 38762 + * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * 38763 + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * 38764 + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * 38765 + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * 38766 + * * 38767 + * Except as contained in this notice, the name(s) of the above copyright * 38768 + * holders shall not be used in advertising or otherwise to promote the * 38769 + * sale, use or other dealings in this Software without prior written * 38770 + * authorization. * 38771 + ****************************************************************************/ 38772 + 38773 +/**************************************************************************** 38774 + * Author: Juergen Pfeifer * 38775 + * * 38776 + ****************************************************************************/ 38777 + 38778 +#include <curses.priv.h> 38779 +#define CUR ((TERMINAL*)TCB)->type. 38780 +#include <tic.h> 38781 + 38782 +#if HAVE_NANOSLEEP 38783 +#include <time.h> 38784 +#if HAVE_SYS_TIME_H 38785 +#include <sys/time.h> /* needed for MacOS X DP3 */ 38786 +#endif 38787 +#endif 38788 + 38789 +MODULE_ID("$Id: tinfo_driver.c,v 1.1 2009/05/23 22:40:30 juergen Exp $") 38790 + 38791 +/* 38792 + * SCO defines TIOCGSIZE and the corresponding struct. Other systems (SunOS, 38793 + * Solaris, IRIX) define TIOCGWINSZ and struct winsize. 38794 + */ 38795 +#ifdef TIOCGSIZE 38796 +# define IOCTL_WINSIZE TIOCGSIZE 38797 +# define STRUCT_WINSIZE struct ttysize 38798 +# define WINSIZE_ROWS(n) (int)n.ts_lines 38799 +# define WINSIZE_COLS(n) (int)n.ts_cols 38800 +#else 38801 +# ifdef TIOCGWINSZ 38802 +# define IOCTL_WINSIZE TIOCGWINSZ 38803 +# define STRUCT_WINSIZE struct winsize 38804 +# define WINSIZE_ROWS(n) (int)n.ws_row 38805 +# define WINSIZE_COLS(n) (int)n.ws_col 38806 +# endif 38807 +#endif 38808 + 38809 +/* 38810 + * These should be screen structure members. They need to be globals for 38811 + * historical reasons. So we assign them in start_color() and also in 38812 + * set_term()'s screen-switching logic. 38813 + */ 38814 +#if USE_REENTRANT 38815 +NCURSES_EXPORT(int) 38816 +NCURSES_PUBLIC_VAR(COLOR_PAIRS) (void) 38817 +{ 38818 + return CURRENT_SCREEN ? CURRENT_SCREEN->_pair_count : -1; 38819 +} 38820 +NCURSES_EXPORT(int) 38821 +NCURSES_PUBLIC_VAR(COLORS) (void) 38822 +{ 38823 + return CURRENT_SCREEN ? CURRENT_SCREEN->_color_count : -1; 38824 +} 38825 +#else 38826 +NCURSES_EXPORT_VAR(int) COLOR_PAIRS = 0; 38827 +NCURSES_EXPORT_VAR(int) COLORS = 0; 38828 +#endif 38829 + 38830 +static bool drv_CanHandle(TERMINAL_CONTROL_BLOCK * TCB, const char *tname, int *); 38831 +static void drv_init(TERMINAL_CONTROL_BLOCK *); 38832 +static void drv_release(TERMINAL_CONTROL_BLOCK *); 38833 +static int drv_size(TERMINAL_CONTROL_BLOCK *, int *, int *); 38834 +static int drv_sgmode(TERMINAL_CONTROL_BLOCK * TCB, bool setFlag, TTY * buf); 38835 +static chtype drv_conattr(TERMINAL_CONTROL_BLOCK * TCB); 38836 +static int drv_mvcur(TERMINAL_CONTROL_BLOCK * TCB, int yold, int xold, int 38837 + ynew, int xnew); 38838 +static int drv_mode(TERMINAL_CONTROL_BLOCK * TCB, bool progFlag, bool defFlag); 38839 +static bool drv_rescol(TERMINAL_CONTROL_BLOCK * TCB); 38840 +static bool drv_rescolors(TERMINAL_CONTROL_BLOCK * TCB); 38841 +static void drv_setcolor(TERMINAL_CONTROL_BLOCK * TCB, bool fore, int color, int 38842 + (*outc) (SCREEN *, int)); 38843 +static int drv_dobeepflash(TERMINAL_CONTROL_BLOCK * TCB, bool beepFlag); 38844 +static void drv_initpair(TERMINAL_CONTROL_BLOCK * TCB, short pair, short f, short b); 38845 +static void drv_initcolor(TERMINAL_CONTROL_BLOCK * TCB, short color, short 38846 + r, short g, short b); 38847 +static void drv_do_color(TERMINAL_CONTROL_BLOCK * TCB, short old_pair, short 38848 + pair, bool reverse, 38849 + int (*outc) (SCREEN *, int)); 38850 +static void drv_initmouse(TERMINAL_CONTROL_BLOCK * TCB); 38851 +static void drv_setfilter(TERMINAL_CONTROL_BLOCK * TCB); 38852 +static void drv_hwlabel(TERMINAL_CONTROL_BLOCK * TCB, int labnum, char *text); 38853 +static void drv_hwlabelOnOff(TERMINAL_CONTROL_BLOCK * TCB, bool OnFlag); 38854 +static int drv_doupdate(TERMINAL_CONTROL_BLOCK * TCB); 38855 +static int drv_defaultcolors(TERMINAL_CONTROL_BLOCK * TCB, int fg, int bg); 38856 +static int drv_print(TERMINAL_CONTROL_BLOCK * TCB, char *data, int len); 38857 +static int drv_getsize(TERMINAL_CONTROL_BLOCK *, int *, int *); 38858 +static int drv_setsize(TERMINAL_CONTROL_BLOCK * TCB, int l, int c); 38859 +static void drv_initacs(TERMINAL_CONTROL_BLOCK * TCB, chtype *, chtype *); 38860 +static void drv_wrap(SCREEN *); 38861 +static void drv_screen_init(SCREEN *); 38862 +static int drv_twait(TERMINAL_CONTROL_BLOCK *, int, int, int 38863 + *EVENTLIST_2nd(_nc_eventlist 38864 + *)); 38865 +static int drv_read(TERMINAL_CONTROL_BLOCK * TCB, int *buf); 38866 +static int drv_nap(TERMINAL_CONTROL_BLOCK * TCB GCC_UNUSED, int ms); 38867 +static int drv_kpad(TERMINAL_CONTROL_BLOCK * TCB, bool); 38868 +static int drv_keyok(TERMINAL_CONTROL_BLOCK * TCB, int, bool); 38869 +static bool drv_kyExist(TERMINAL_CONTROL_BLOCK * TCB, int); 38870 + 38871 +NCURSES_EXPORT_VAR (TERM_DRIVER) _nc_TINFO_DRIVER = { 38872 + TRUE, 38873 + drv_CanHandle, /* CanHandle */ 38874 + drv_init, /* init */ 38875 + drv_release, /* release */ 38876 + drv_size, /* size */ 38877 + drv_sgmode, /* sgmode */ 38878 + drv_conattr, /* conattr */ 38879 + drv_mvcur, /* hwcur */ 38880 + drv_mode, /* mode */ 38881 + drv_rescol, /* rescol */ 38882 + drv_rescolors, /* rescolors */ 38883 + drv_setcolor, /* color */ 38884 + drv_dobeepflash, /* doBeepOrFlash */ 38885 + drv_initpair, /* initpair */ 38886 + drv_initcolor, /* initcolor */ 38887 + drv_do_color, /* docolor */ 38888 + drv_initmouse, /* initmouse */ 38889 + drv_setfilter, /* setfilter */ 38890 + drv_hwlabel, /* hwlabel */ 38891 + drv_hwlabelOnOff, /* hwlabelOnOff */ 38892 + drv_doupdate, /* update */ 38893 + drv_defaultcolors, /* defaultcolors */ 38894 + drv_print, /* print */ 38895 + drv_getsize, /* getsize */ 38896 + drv_setsize, /* setsize */ 38897 + drv_initacs, /* initacs */ 38898 + drv_screen_init, /* scinit */ 38899 + drv_wrap, /* scexit */ 38900 + drv_twait, /* twait */ 38901 + drv_read, /* read */ 38902 + drv_nap, /* nap */ 38903 + drv_kpad, /* kpad */ 38904 + drv_keyok, /* kyOk */ 38905 + drv_kyExist /* kyExist */ 38906 +}; 38907 + 38908 +#define TCBMAGIC NCDRV_MAGIC(NCDRV_TINFO) 38909 +#define AssertTCB() assert(TCB!=0 && TCB->magic==TCBMAGIC) 38910 +#define SetSP() assert(TCB->csp!=0); sp = TCB->csp 38911 + 38912 +/* 38913 + * This routine needs to do all the work to make curscr look 38914 + * like newscr. 38915 + */ 38916 +static int 38917 +drv_doupdate(TERMINAL_CONTROL_BLOCK * TCB) 38918 +{ 38919 + AssertTCB(); 38920 + return _nc_tinfo_doupdate(TCB->csp); 38921 +} 38922 + 38923 +/* 38924 +** do_prototype() 38925 +** 38926 +** Take the real command character out of the CC environment variable 38927 +** and substitute it in for the prototype given in 'command_character'. 38928 +*/ 38929 +static void 38930 +do_prototype(TERMINAL * termp) 38931 +{ 38932 + unsigned i; 38933 + char CC; 38934 + char proto; 38935 + char *tmp; 38936 + TERMINAL_CONTROL_BLOCK *TCB = (TERMINAL_CONTROL_BLOCK *) termp; 38937 + 38938 + if ((tmp = getenv("CC")) != 0) { 38939 + if ((CC = *tmp) != 0) { 38940 + proto = *command_character; 38941 + 38942 + for_each_string(i, &(termp->type)) { 38943 + for (tmp = termp->type.Strings[i]; *tmp; tmp++) { 38944 + if (*tmp == proto) 38945 + *tmp = CC; 38946 + } 38947 + } 38948 + } 38949 + } 38950 +} 38951 + 38952 +#define ret_error(code, fmt, arg) if (errret) {\ 38953 + *errret = code;\ 38954 + return(FALSE); \ 38955 + } else {\ 38956 + fprintf(stderr, fmt, arg);\ 38957 + exit(EXIT_FAILURE);\ 38958 + } 38959 + 38960 +#define ret_error0(code, msg) if (errret) {\ 38961 + *errret = code;\ 38962 + return(FALSE);\ 38963 + } else {\ 38964 + fprintf(stderr, msg);\ 38965 + exit(EXIT_FAILURE);\ 38966 + } 38967 + 38968 +#if USE_DATABASE || USE_TERMCAP 38969 +/* 38970 + * Return 1 if entry found, 0 if not found, -1 if database not accessible, 38971 + * just like tgetent(). 38972 + */ 38973 +static int 38974 +grab_entry(const char *const tn, TERMTYPE *const tp) 38975 +{ 38976 + char filename[PATH_MAX]; 38977 + int status = _nc_read_entry(tn, filename, tp); 38978 + 38979 + /* 38980 + * If we have an entry, force all of the cancelled strings to null 38981 + * pointers so we don't have to test them in the rest of the library. 38982 + * (The terminfo compiler bypasses this logic, since it must know if 38983 + * a string is cancelled, for merging entries). 38984 + */ 38985 + if (status == TGETENT_YES) { 38986 + unsigned n; 38987 + for_each_boolean(n, tp) { 38988 + if (!VALID_BOOLEAN(tp->Booleans[n])) 38989 + tp->Booleans[n] = FALSE; 38990 + } 38991 + for_each_string(n, tp) { 38992 + if (tp->Strings[n] == CANCELLED_STRING) 38993 + tp->Strings[n] = ABSENT_STRING; 38994 + } 38995 + } 38996 + return (status); 38997 +} 38998 +#endif 38999 + 39000 +static bool 39001 +drv_CanHandle(TERMINAL_CONTROL_BLOCK * TCB, const char *tname, int *errret) 39002 +{ 39003 + bool result = FALSE; 39004 + int status; 39005 + TERMINAL *termp; 39006 + SCREEN *sp; 39007 + 39008 + assert(TCB != 0 && tname != 0); 39009 + termp = (TERMINAL *) TCB; 39010 + sp = TCB->csp; 39011 + TCB->magic = TCBMAGIC; 39012 + 39013 +#if (USE_DATABASE || USE_TERMCAP) 39014 + status = grab_entry(tname, &termp->type); 39015 +#else 39016 + status = TGETENT_NO; 39017 +#endif 39018 + 39019 + /* try fallback list if entry on disk */ 39020 + if (status != TGETENT_YES) { 39021 + const TERMTYPE *fallback = _nc_fallback(tname); 39022 + 39023 + if (fallback) { 39024 + termp->type = *fallback; 39025 + status = TGETENT_YES; 39026 + } 39027 + } 39028 + 39029 + if (status != TGETENT_YES) { 39030 + NCURSES_SP_NAME(del_curterm) (NCURSES_SP_ARGx termp); 39031 + if (status == TGETENT_ERR) { 39032 + ret_error0(status, "terminals database is inaccessible\n"); 39033 + } else if (status == TGETENT_NO) { 39034 + ret_error(status, "'%s': unknown terminal type.\n", tname); 39035 + } 39036 + } 39037 + result = TRUE; 39038 +#if !USE_REENTRANT 39039 + strncpy(ttytype, termp->type.term_names, NAMESIZE - 1); 39040 + ttytype[NAMESIZE - 1] = '\0'; 39041 +#endif 39042 + 39043 + if (command_character && getenv("CC")) 39044 + do_prototype(termp); 39045 + 39046 + if (generic_type) { 39047 + ret_error(TGETENT_NO, "'%s': I need something more specific.\n", tname); 39048 + } 39049 + if (hard_copy) { 39050 + ret_error(TGETENT_YES, "'%s': I can't handle hardcopy terminals.\n", tname); 39051 + } 39052 + 39053 + return result; 39054 +} 39055 + 39056 +static int 39057 +drv_dobeepflash(TERMINAL_CONTROL_BLOCK * TCB, bool beepFlag) 39058 +{ 39059 + SCREEN *sp; 39060 + int res = ERR; 39061 + 39062 + AssertTCB(); 39063 + SetSP(); 39064 + 39065 + /* FIXME: should make sure that we are not in altchar mode */ 39066 + if (beepFlag) { 39067 + if (bell) { 39068 + res = NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx "bell", bell); 39069 + NCURSES_SP_NAME(_nc_flush) (sp); 39070 + } else if (flash_screen) { 39071 + res = NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx 39072 + "flash_screen", 39073 + flash_screen); 39074 + NCURSES_SP_NAME(_nc_flush) (sp); 39075 + } 39076 + } else { 39077 + if (flash_screen) { 39078 + res = NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx 39079 + "flash_screen", 39080 + flash_screen); 39081 + NCURSES_SP_NAME(_nc_flush) (sp); 39082 + } else if (bell) { 39083 + res = NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx "bell", bell); 39084 + NCURSES_SP_NAME(_nc_flush) (sp); 39085 + } 39086 + } 39087 + return res; 39088 +} 39089 + 39090 +/* 39091 + * SVr4 curses is known to interchange color codes (1,4) and (3,6), possibly 39092 + * to maintain compatibility with a pre-ANSI scheme. The same scheme is 39093 + * also used in the FreeBSD syscons. 39094 + */ 39095 +static int 39096 +toggled_colors(int c) 39097 +{ 39098 + if (c < 16) { 39099 + static const int table[] = 39100 + {0, 4, 2, 6, 1, 5, 3, 7, 39101 + 8, 12, 10, 14, 9, 13, 11, 15}; 39102 + c = table[c]; 39103 + } 39104 + return c; 39105 +} 39106 + 39107 +static int 39108 +drv_print(TERMINAL_CONTROL_BLOCK * TCB, char *data, int len) 39109 +{ 39110 + SCREEN *sp; 39111 + 39112 + AssertTCB(); 39113 + SetSP(); 39114 +#if NCURSES_EXT_FUNCS 39115 + return NCURSES_SP_NAME(mcprint) (TCB->csp, data, len); 39116 +#else 39117 + return ERR; 39118 +#endif 39119 +} 39120 + 39121 +static int 39122 +drv_defaultcolors(TERMINAL_CONTROL_BLOCK * TCB, int fg, int bg) 39123 +{ 39124 + SCREEN *sp; 39125 + int code = ERR; 39126 + 39127 + AssertTCB(); 39128 + SetSP(); 39129 + 39130 + if (sp != 0 && orig_pair && orig_colors && (initialize_pair != 0)) { 39131 +#if NCURSES_EXT_FUNCS 39132 + sp->_default_color = isDefaultColor(fg) || isDefaultColor(bg); 39133 + sp->_has_sgr_39_49 = (NCURSES_SP_NAME(tigetflag) (NCURSES_SP_ARGx 39134 + "AX") 39135 + == TRUE); 39136 + sp->_default_fg = isDefaultColor(fg) ? COLOR_DEFAULT : (fg & C_MASK); 39137 + sp->_default_bg = isDefaultColor(bg) ? COLOR_DEFAULT : (bg & C_MASK); 39138 + if (sp->_color_pairs != 0) { 39139 + bool save = sp->_default_color; 39140 + sp->_default_color = TRUE; 39141 + NCURSES_SP_NAME(init_pair) (NCURSES_SP_ARGx 39142 + 0, 39143 + (short)fg, 39144 + (short)bg); 39145 + sp->_default_color = save; 39146 + } 39147 +#endif 39148 + code = OK; 39149 + } 39150 + return (code); 39151 +} 39152 + 39153 +static void 39154 +drv_setcolor(TERMINAL_CONTROL_BLOCK * TCB, bool fore, int color, int (*outc) 39155 + (SCREEN *, int)) 39156 +{ 39157 + SCREEN *sp; 39158 + 39159 + AssertTCB(); 39160 + SetSP(); 39161 + 39162 + if (fore) { 39163 + if (set_a_foreground) { 39164 + TPUTS_TRACE("set_a_foreground"); 39165 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx 39166 + TPARM_1(set_a_foreground, color), 1, outc); 39167 + } else { 39168 + TPUTS_TRACE("set_foreground"); 39169 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx 39170 + TPARM_1(set_foreground, 39171 + toggled_colors(color)), 1, outc); 39172 + } 39173 + } else { 39174 + if (set_a_background) { 39175 + TPUTS_TRACE("set_a_background"); 39176 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx 39177 + TPARM_1(set_a_background, color), 1, outc); 39178 + } else { 39179 + TPUTS_TRACE("set_background"); 39180 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx 39181 + TPARM_1(set_background, 39182 + toggled_colors(color)), 1, outc); 39183 + } 39184 + } 39185 +} 39186 + 39187 +static bool 39188 +drv_rescol(TERMINAL_CONTROL_BLOCK * TCB) 39189 +{ 39190 + bool result = FALSE; 39191 + SCREEN *sp; 39192 + 39193 + AssertTCB(); 39194 + SetSP(); 39195 + 39196 + if (orig_pair != 0) { 39197 + NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx "orig_pair", orig_pair); 39198 + result = TRUE; 39199 + } 39200 + return result; 39201 +} 39202 + 39203 +static bool 39204 +drv_rescolors(TERMINAL_CONTROL_BLOCK * TCB) 39205 +{ 39206 + int result = FALSE; 39207 + SCREEN *sp; 39208 + 39209 + AssertTCB(); 39210 + SetSP(); 39211 + 39212 + if (orig_colors != 0) { 39213 + NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx "orig_colors", orig_colors); 39214 + result = TRUE; 39215 + } 39216 + return result; 39217 +} 39218 + 39219 +static int 39220 +drv_size(TERMINAL_CONTROL_BLOCK * TCB, int *linep, int *colp) 39221 +{ 39222 + SCREEN *sp; 39223 + bool useEnv = TRUE; 39224 + 39225 + AssertTCB(); 39226 + sp = TCB->csp; /* can be null here */ 39227 + 39228 + if (sp) { 39229 + useEnv = sp->_use_env; 39230 + } else 39231 + useEnv = _nc_prescreen.use_env; 39232 + 39233 + /* figure out the size of the screen */ 39234 + T(("screen size: terminfo lines = %d columns = %d", lines, columns)); 39235 + 39236 + if (!useEnv) { 39237 + *linep = (int) lines; 39238 + *colp = (int) columns; 39239 + } else { /* usually want to query LINES and COLUMNS from environment */ 39240 + int value; 39241 + 39242 + *linep = *colp = 0; 39243 + 39244 + /* first, look for environment variables */ 39245 + if ((value = _nc_getenv_num("LINES")) > 0) { 39246 + *linep = value; 39247 + } 39248 + if ((value = _nc_getenv_num("COLUMNS")) > 0) { 39249 + *colp = value; 39250 + } 39251 + T(("screen size: environment LINES = %d COLUMNS = %d", *linep, *colp)); 39252 + 39253 +#ifdef __EMX__ 39254 + if (*linep <= 0 || *colp <= 0) { 39255 + int screendata[2]; 39256 + _scrsize(screendata); 39257 + *colp = screendata[0]; 39258 + *linep = screendata[1]; 39259 + T(("EMX screen size: environment LINES = %d COLUMNS = %d", 39260 + *linep, *colp)); 39261 + } 39262 +#endif 39263 +#if HAVE_SIZECHANGE 39264 + /* if that didn't work, maybe we can try asking the OS */ 39265 + if (*linep <= 0 || *colp <= 0) { 39266 + TERMINAL *termp = (TERMINAL *) TCB; 39267 + if (isatty(termp->Filedes)) { 39268 + STRUCT_WINSIZE size; 39269 + 39270 + errno = 0; 39271 + do { 39272 + if (ioctl(termp->Filedes, IOCTL_WINSIZE, &size) < 0 39273 + && errno != EINTR) 39274 + goto failure; 39275 + } while 39276 + (errno == EINTR); 39277 + 39278 + /* 39279 + * Solaris lets users override either dimension with an 39280 + * environment variable. 39281 + */ 39282 + if (*linep <= 0) 39283 + *linep = (sp != 0 && sp->_filtered) ? 1 : WINSIZE_ROWS(size); 39284 + if (*colp <= 0) 39285 + *colp = WINSIZE_COLS(size); 39286 + } 39287 + /* FALLTHRU */ 39288 + failure:; 39289 + } 39290 +#endif /* HAVE_SIZECHANGE */ 39291 + 39292 + /* if we can't get dynamic info about the size, use static */ 39293 + if (*linep <= 0) { 39294 + *linep = (int) lines; 39295 + } 39296 + if (*colp <= 0) { 39297 + *colp = (int) columns; 39298 + } 39299 + 39300 + /* the ultimate fallback, assume fixed 24x80 size */ 39301 + if (*linep <= 0) { 39302 + *linep = 24; 39303 + } 39304 + if (*colp <= 0) { 39305 + *colp = 80; 39306 + } 39307 + 39308 + /* 39309 + * Put the derived values back in the screen-size caps, so 39310 + * tigetnum() and tgetnum() will do the right thing. 39311 + */ 39312 + lines = (short) (*linep); 39313 + columns = (short) (*colp); 39314 + } 39315 + 39316 + T(("screen size is %dx%d", *linep, *colp)); 39317 + return OK; 39318 +} 39319 + 39320 +static int 39321 +drv_getsize(TERMINAL_CONTROL_BLOCK * TCB, int *l, int *c) 39322 +{ 39323 + AssertTCB(); 39324 + assert(l != 0 && c != 0); 39325 + *l = lines; 39326 + *c = columns; 39327 + return OK; 39328 +} 39329 + 39330 +static int 39331 +drv_setsize(TERMINAL_CONTROL_BLOCK * TCB, int l, int c) 39332 +{ 39333 + AssertTCB(); 39334 + lines = l; 39335 + columns = c; 39336 + return OK; 39337 +} 39338 + 39339 +static int 39340 +drv_mode(TERMINAL_CONTROL_BLOCK * TCB, bool progFlag, bool defFlag) 39341 +{ 39342 + SCREEN *sp; 39343 + TERMINAL *_term = (TERMINAL *) TCB; 39344 + int code = ERR; 39345 + 39346 + AssertTCB(); 39347 + sp = TCB->csp; 39348 + 39349 + if (progFlag) /* prog mode */ 39350 + { 39351 + if (defFlag) { 39352 + /* def_prog_mode */ 39353 + /* 39354 + * Turn off the XTABS bit in the tty structure if it was on. 39355 + */ 39356 + if ((drv_sgmode(TCB, FALSE, &(_term->Nttyb)) == OK)) { 39357 +#ifdef TERMIOS 39358 + _term->Nttyb.c_oflag &= ~OFLAGS_TABS; 39359 +#else 39360 + _term->Nttyb.sg_flags &= ~XTABS; 39361 +#endif 39362 + code = OK; 39363 + } 39364 + } else { 39365 + /* reset_prog_mode */ 39366 + if (drv_sgmode(TCB, TRUE, &(_term->Nttyb)) == OK) { 39367 + if (sp) { 39368 + if (sp->_keypad_on) 39369 + _nc_keypad(sp, TRUE); 39370 + NC_BUFFERED(sp, TRUE); 39371 + } 39372 + code = OK; 39373 + } 39374 + } 39375 + } else { /* shell mode */ 39376 + if (defFlag) { 39377 + /* def_shell_mode */ 39378 + /* 39379 + * If XTABS was on, remove the tab and backtab capabilities. 39380 + */ 39381 + if (drv_sgmode(TCB, FALSE, &(_term->Ottyb)) == OK) { 39382 +#ifdef TERMIOS 39383 + if (_term->Ottyb.c_oflag & OFLAGS_TABS) 39384 + tab = back_tab = NULL; 39385 +#else 39386 + if (_term->Ottyb.sg_flags & XTABS) 39387 + tab = back_tab = NULL; 39388 +#endif 39389 + code = OK; 39390 + } 39391 + } else { 39392 + /* reset_shell_mode */ 39393 + if (sp) { 39394 + _nc_keypad(sp, FALSE); 39395 + NCURSES_SP_NAME(_nc_flush) (sp); 39396 + NC_BUFFERED(sp, FALSE); 39397 + } 39398 + code = drv_sgmode(TCB, TRUE, &(_term->Ottyb)); 39399 + } 39400 + } 39401 + return (code); 39402 +} 39403 + 39404 +static void 39405 +drv_wrap(SCREEN *sp) 39406 +{ 39407 + if (sp) { 39408 + sp->_mouse_wrap(sp); 39409 + NCURSES_SP_NAME(_nc_screen_wrap) (sp); 39410 + NCURSES_SP_NAME(_nc_mvcur_wrap) (sp); /* wrap up cursor addressing */ 39411 + } 39412 +} 39413 + 39414 +static void 39415 +drv_release(TERMINAL_CONTROL_BLOCK * TCB GCC_UNUSED) 39416 +{ 39417 +} 39418 + 39419 +# define SGR0_TEST(mode) (mode != 0) && (exit_attribute_mode == 0 || strcmp(mode, exit_attribute_mode)) 39420 + 39421 +void 39422 +drv_screen_init(SCREEN *sp) 39423 +{ 39424 + TERMINAL_CONTROL_BLOCK *TCB = TCBOf(sp); 39425 + 39426 + AssertTCB(); 39427 + 39428 + /* 39429 + * Check for mismatched graphic-rendition capabilities. Most SVr4 39430 + * terminfo trees contain entries that have rmul or rmso equated to 39431 + * sgr0 (Solaris curses copes with those entries). We do this only 39432 + * for curses, since many termcap applications assume that 39433 + * smso/rmso and smul/rmul are paired, and will not function 39434 + * properly if we remove rmso or rmul. Curses applications 39435 + * shouldn't be looking at this detail. 39436 + */ 39437 + sp->_use_rmso = SGR0_TEST(exit_standout_mode); 39438 + sp->_use_rmul = SGR0_TEST(exit_underline_mode); 39439 + 39440 + /* 39441 + * Check whether we can optimize scrolling under dumb terminals in 39442 + * case we do not have any of these capabilities, scrolling 39443 + * optimization will be useless. 39444 + */ 39445 + sp->_scrolling = ((scroll_forward && scroll_reverse) || 39446 + ((parm_rindex || 39447 + parm_insert_line || 39448 + insert_line) && 39449 + (parm_index || 39450 + parm_delete_line || 39451 + delete_line))); 39452 + 39453 + NCURSES_SP_NAME(baudrate) (sp); 39454 + 39455 + NCURSES_SP_NAME(_nc_mvcur_init) (sp); 39456 + /* initialize terminal to a sane state */ 39457 + NCURSES_SP_NAME(_nc_screen_init) (sp); 39458 +} 39459 + 39460 +static void 39461 +drv_init(TERMINAL_CONTROL_BLOCK * TCB) 39462 +{ 39463 + SCREEN *sp; 39464 + TERMINAL *trm; 39465 + 39466 + AssertTCB(); 39467 + 39468 + trm = (TERMINAL *) TCB; 39469 + sp = TCB->csp; 39470 + 39471 + TCB->info.initcolor = initialize_color; 39472 + TCB->info.canchange = can_change; 39473 + TCB->info.hascolor = ((VALID_NUMERIC(max_colors) && VALID_NUMERIC(max_pairs) 39474 + && (((set_foreground != NULL) 39475 + && (set_background != NULL)) 39476 + || ((set_a_foreground != NULL) 39477 + && (set_a_background != NULL)) 39478 + || set_color_pair)) ? TRUE : FALSE); 39479 + 39480 + TCB->info.caninit = !(exit_ca_mode && non_rev_rmcup); 39481 + 39482 + TCB->info.maxpairs = VALID_NUMERIC(max_pairs) ? max_pairs : 0; 39483 + TCB->info.maxcolors = VALID_NUMERIC(max_colors) ? max_colors : 0; 39484 + TCB->info.numlabels = VALID_NUMERIC(num_labels) ? num_labels : 0; 39485 + TCB->info.labelwidth = VALID_NUMERIC(label_width) ? label_width : 0; 39486 + TCB->info.labelheight = VALID_NUMERIC(label_height) ? label_height : 0; 39487 + TCB->info.nocolorvideo = VALID_NUMERIC(no_color_video) ? no_color_video 39488 + : 0; 39489 + TCB->info.tabsize = VALID_NUMERIC(init_tabs) ? (int) init_tabs : 8; 39490 + 39491 + TCB->info.defaultPalette = hue_lightness_saturation ? _nc_hls_palette : _nc_cga_palette; 39492 + 39493 + /* 39494 + * If an application calls setupterm() rather than initscr() or 39495 + * newterm(), we will not have the def_prog_mode() call in 39496 + * _nc_setupscreen(). Do it now anyway, so we can initialize the 39497 + * baudrate. 39498 + */ 39499 + if (isatty(trm->Filedes)) { 39500 + TCB->drv->mode(TCB, TRUE, TRUE); 39501 + } 39502 +} 39503 + 39504 +#define MAX_PALETTE 8 39505 +#define InPalette(n) ((n) >= 0 && (n) < MAX_PALETTE) 39506 + 39507 +static void 39508 +drv_initpair(TERMINAL_CONTROL_BLOCK * TCB, short pair, short f, short b) 39509 +{ 39510 + SCREEN *sp; 39511 + 39512 + AssertTCB(); 39513 + SetSP(); 39514 + 39515 + if ((initialize_pair != NULL) && InPalette(f) && InPalette(b)) { 39516 + const color_t *tp = InfoOf(sp).defaultPalette; 39517 + 39518 + TR(TRACE_ATTRS, 39519 + ("initializing pair: pair = %d, fg=(%d,%d,%d), bg=(%d,%d,%d)", 39520 + pair, 39521 + tp[f].red, tp[f].green, tp[f].blue, 39522 + tp[b].red, tp[b].green, tp[b].blue)); 39523 + 39524 + NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx 39525 + "initialize_pair", 39526 + TPARM_7(initialize_pair, 39527 + pair, 39528 + tp[f].red, tp[f].green, tp[f].blue, 39529 + tp[b].red, tp[b].green, tp[b].blue)); 39530 + } 39531 +} 39532 + 39533 +static int 39534 +default_fg(SCREEN *sp) 39535 +{ 39536 +#if NCURSES_EXT_FUNCS 39537 + return (sp != 0) ? sp->_default_fg : COLOR_WHITE; 39538 +#else 39539 + return COLOR_WHITE; 39540 +#endif 39541 +} 39542 + 39543 +static int 39544 +default_bg(SCREEN *sp) 39545 +{ 39546 +#if NCURSES_EXT_FUNCS 39547 + return sp != 0 ? sp->_default_bg : COLOR_BLACK; 39548 +#else 39549 + return COLOR_BLACK; 39550 +#endif 39551 +} 39552 + 39553 +static void 39554 +drv_initcolor(TERMINAL_CONTROL_BLOCK * TCB, 39555 + short color, short r, short g, short b) 39556 +{ 39557 + SCREEN *sp = TCB->csp; 39558 + 39559 + AssertTCB(); 39560 + if (initialize_color != NULL) { 39561 + NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx 39562 + "initialize_color", 39563 + TPARM_4(initialize_color, color, r, g, b)); 39564 + } 39565 +} 39566 + 39567 +static void 39568 +drv_do_color(TERMINAL_CONTROL_BLOCK * TCB, 39569 + short old_pair, 39570 + short pair, 39571 + bool reverse, 39572 + NCURSES_SP_OUTC outc) 39573 +{ 39574 + SCREEN *sp = TCB->csp; 39575 + NCURSES_COLOR_T fg = COLOR_DEFAULT; 39576 + NCURSES_COLOR_T bg = COLOR_DEFAULT; 39577 + NCURSES_COLOR_T old_fg, old_bg; 39578 + 39579 + AssertTCB(); 39580 + if (sp == 0) 39581 + return; 39582 + 39583 + if (pair < 0 || pair >= COLOR_PAIRS) { 39584 + return; 39585 + } else if (pair != 0) { 39586 + if (set_color_pair) { 39587 + TPUTS_TRACE("set_color_pair"); 39588 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx 39589 + TPARM_1(set_color_pair, pair), 1, outc); 39590 + return; 39591 + } else if (sp != 0) { 39592 + NCURSES_SP_NAME(pair_content) (NCURSES_SP_ARGx 39593 + (short) pair, 39594 + &fg, 39595 + &bg); 39596 + } 39597 + } 39598 + 39599 + if (old_pair >= 0 39600 + && sp != 0 39601 + && NCURSES_SP_NAME(pair_content) (NCURSES_SP_ARGx 39602 + old_pair, 39603 + &old_fg, 39604 + &old_bg) !=ERR) { 39605 + if ((isDefaultColor(fg) && !isDefaultColor(old_fg)) 39606 + || (isDefaultColor(bg) && !isDefaultColor(old_bg))) { 39607 +#if NCURSES_EXT_FUNCS 39608 + /* 39609 + * A minor optimization - but extension. If "AX" is specified in 39610 + * the terminal description, treat it as screen's indicator of ECMA 39611 + * SGR 39 and SGR 49, and assume the two sequences are independent. 39612 + */ 39613 + if (sp->_has_sgr_39_49 39614 + && isDefaultColor(old_bg) 39615 + && !isDefaultColor(old_fg)) { 39616 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx "\033[39m", 1, outc); 39617 + } else if (sp->_has_sgr_39_49 39618 + && isDefaultColor(old_fg) 39619 + && !isDefaultColor(old_bg)) { 39620 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx "\033[49m", 1, outc); 39621 + } else 39622 +#endif 39623 + drv_rescol(TCB); 39624 + } 39625 + } else { 39626 + drv_rescol(TCB); 39627 + if (old_pair < 0) 39628 + return; 39629 + } 39630 + 39631 +#if NCURSES_EXT_FUNCS 39632 + if (isDefaultColor(fg)) 39633 + fg = default_fg(sp); 39634 + if (isDefaultColor(bg)) 39635 + bg = default_bg(sp); 39636 +#endif 39637 + 39638 + if (reverse) { 39639 + NCURSES_COLOR_T xx = fg; 39640 + fg = bg; 39641 + bg = xx; 39642 + } 39643 + 39644 + TR(TRACE_ATTRS, ("setting colors: pair = %d, fg = %d, bg = %d", pair, 39645 + fg, bg)); 39646 + 39647 + if (!isDefaultColor(fg)) { 39648 + drv_setcolor(TCB, TRUE, fg, outc); 39649 + } 39650 + if (!isDefaultColor(bg)) { 39651 + drv_setcolor(TCB, FALSE, bg, outc); 39652 + } 39653 +} 39654 + 39655 +#define xterm_kmous "\033[M" 39656 +static void 39657 +init_xterm_mouse(SCREEN *sp) 39658 +{ 39659 + sp->_mouse_type = M_XTERM; 39660 + sp->_mouse_xtermcap = NCURSES_SP_NAME(tigetstr) (NCURSES_SP_ARGx "XM"); 39661 + if (!VALID_STRING(sp->_mouse_xtermcap)) 39662 + sp->_mouse_xtermcap = "\033[?1000%?%p1%{1}%=%th%el%;"; 39663 +} 39664 + 39665 +static void 39666 +drv_initmouse(TERMINAL_CONTROL_BLOCK * TCB) 39667 +{ 39668 + SCREEN *sp; 39669 + 39670 + AssertTCB(); 39671 + SetSP(); 39672 + 39673 + /* we know how to recognize mouse events under "xterm" */ 39674 + if (sp != 0) { 39675 + if (key_mouse != 0) { 39676 + if (!strcmp(key_mouse, xterm_kmous) 39677 + || strstr(TerminalOf(sp)->type.term_names, "xterm") != 0) { 39678 + init_xterm_mouse(sp); 39679 + } 39680 + } else if (strstr(TerminalOf(sp)->type.term_names, "xterm") != 0) { 39681 + if (_nc_add_to_try(&(sp->_keytry), xterm_kmous, KEY_MOUSE) == OK) 39682 + init_xterm_mouse(sp); 39683 + } 39684 + } 39685 +} 39686 + 39687 +static int 39688 +drv_mvcur(TERMINAL_CONTROL_BLOCK * TCB, int yold, int xold, int ynew, int xnew) 39689 +{ 39690 + SCREEN *sp = TCB->csp; 39691 + AssertTCB(); 39692 + return _nc_tinfo_mvcur(sp, yold, xold, ynew, xnew); 39693 +} 39694 + 39695 +static void 39696 +drv_hwlabel(TERMINAL_CONTROL_BLOCK * TCB, int labnum, char *text) 39697 +{ 39698 + SCREEN *sp = TCB->csp; 39699 + 39700 + AssertTCB(); 39701 + if (labnum > 0 && labnum <= num_labels) { 39702 + NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx 39703 + "plab_norm", 39704 + TPARM_2(plab_norm, labnum, text)); 39705 + } 39706 +} 39707 + 39708 +static void 39709 +drv_hwlabelOnOff(TERMINAL_CONTROL_BLOCK * TCB, bool OnFlag) 39710 +{ 39711 + SCREEN *sp = TCB->csp; 39712 + 39713 + AssertTCB(); 39714 + if (OnFlag) { 39715 + NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx "label_on", label_on); 39716 + } else { 39717 + NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx "label_off", label_off); 39718 + } 39719 +} 39720 + 39721 +static chtype 39722 +drv_conattr(TERMINAL_CONTROL_BLOCK * TCB) 39723 +{ 39724 + SCREEN *sp = TCB->csp; 39725 + chtype attrs = A_NORMAL; 39726 + 39727 + AssertTCB(); 39728 + if (enter_alt_charset_mode) 39729 + attrs |= A_ALTCHARSET; 39730 + 39731 + if (enter_blink_mode) 39732 + attrs |= A_BLINK; 39733 + 39734 + if (enter_bold_mode) 39735 + attrs |= A_BOLD; 39736 + 39737 + if (enter_dim_mode) 39738 + attrs |= A_DIM; 39739 + 39740 + if (enter_reverse_mode) 39741 + attrs |= A_REVERSE; 39742 + 39743 + if (enter_standout_mode) 39744 + attrs |= A_STANDOUT; 39745 + 39746 + if (enter_protected_mode) 39747 + attrs |= A_PROTECT; 39748 + 39749 + if (enter_secure_mode) 39750 + attrs |= A_INVIS; 39751 + 39752 + if (enter_underline_mode) 39753 + attrs |= A_UNDERLINE; 39754 + 39755 + if (sp && sp->_coloron) 39756 + attrs |= A_COLOR; 39757 + 39758 + return (attrs); 39759 +} 39760 + 39761 +static void 39762 +drv_setfilter(TERMINAL_CONTROL_BLOCK * TCB) 39763 +{ 39764 + AssertTCB(); 39765 + 39766 + clear_screen = 0; 39767 + cursor_down = parm_down_cursor = 0; 39768 + cursor_address = 0; 39769 + cursor_up = parm_up_cursor = 0; 39770 + row_address = 0; 39771 + cursor_home = carriage_return; 39772 +} 39773 + 39774 +static int 39775 +drv_sgmode(TERMINAL_CONTROL_BLOCK * TCB, bool setFlag, TTY * buf) 39776 +{ 39777 + SCREEN *sp = TCB->csp; 39778 + TERMINAL *_term = (TERMINAL *) TCB; 39779 + int result = OK; 39780 + 39781 + AssertTCB(); 39782 + if (setFlag) { 39783 + for (;;) { 39784 + if (SET_TTY(_term->Filedes, buf) != 0) { 39785 + if (errno == EINTR) 39786 + continue; 39787 + if (errno == ENOTTY) { 39788 + if (sp) 39789 + sp->_notty = TRUE; 39790 + } 39791 + result = ERR; 39792 + } 39793 + break; 39794 + } 39795 + } else { 39796 + for (;;) { 39797 + if (GET_TTY(_term->Filedes, buf) != 0) { 39798 + if (errno == EINTR) 39799 + continue; 39800 + result = ERR; 39801 + } 39802 + break; 39803 + } 39804 + } 39805 + return result; 39806 +} 39807 + 39808 +static void 39809 +drv_initacs(TERMINAL_CONTROL_BLOCK * TCB, chtype *real_map, chtype *fake_map) 39810 +{ 39811 + SCREEN *sp = TCB->csp; 39812 + 39813 + AssertTCB(); 39814 + assert(sp != 0); 39815 + if (ena_acs != NULL) { 39816 + NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx "ena_acs", ena_acs); 39817 + } 39818 +#if NCURSES_EXT_FUNCS 39819 + /* 39820 + * Linux console "supports" the "PC ROM" character set by the coincidence 39821 + * that smpch/rmpch and smacs/rmacs have the same values. ncurses has 39822 + * no codepage support (see SCO Merge for an example). Outside of the 39823 + * values defined in acsc, there are no definitions for the "PC ROM" 39824 + * character set (assumed by some applications to be codepage 437), but we 39825 + * allow those applications to use those codepoints. 39826 + * 39827 + * test/blue.c uses this feature. 39828 + */ 39829 +#define PCH_KLUDGE(a,b) (a != 0 && b != 0 && !strcmp(a,b)) 39830 + if (PCH_KLUDGE(enter_pc_charset_mode, enter_alt_charset_mode) && 39831 + PCH_KLUDGE(exit_pc_charset_mode, exit_alt_charset_mode)) { 39832 + size_t i; 39833 + for (i = 1; i < ACS_LEN; ++i) { 39834 + if (real_map[i] == 0) { 39835 + real_map[i] = i; 39836 + if (real_map != fake_map) { 39837 + if (sp != 0) 39838 + sp->_screen_acs_map[i] = TRUE; 39839 + } 39840 + } 39841 + } 39842 + } 39843 +#endif 39844 + 39845 + if (acs_chars != NULL) { 39846 + size_t i = 0; 39847 + size_t length = strlen(acs_chars); 39848 + 39849 + while (i + 1 < length) { 39850 + if (acs_chars[i] != 0 && UChar(acs_chars[i]) < ACS_LEN) { 39851 + real_map[UChar(acs_chars[i])] = UChar(acs_chars[i + 1]) | A_ALTCHARSET; 39852 + if (sp != 0) 39853 + sp->_screen_acs_map[UChar(acs_chars[i])] = TRUE; 39854 + } 39855 + i += 2; 39856 + } 39857 + } 39858 +#ifdef TRACE 39859 + /* Show the equivalent mapping, noting if it does not match the 39860 + * given attribute, whether by re-ordering or duplication. 39861 + */ 39862 + if (USE_TRACEF(TRACE_CALLS)) { 39863 + size_t n, m; 39864 + char show[ACS_LEN * 2 + 1]; 39865 + for (n = 1, m = 0; n < ACS_LEN; n++) { 39866 + if (real_map[n] != 0) { 39867 + show[m++] = (char) n; 39868 + show[m++] = (char) ChCharOf(real_map[n]); 39869 + } 39870 + } 39871 + show[m] = 0; 39872 + if (acs_chars == NULL || strcmp(acs_chars, show)) 39873 + _tracef("%s acs_chars %s", 39874 + (acs_chars == NULL) ? "NULL" : "READ", 39875 + _nc_visbuf(acs_chars)); 39876 + _tracef("%s acs_chars %s", 39877 + (acs_chars == NULL) 39878 + ? "NULL" 39879 + : (strcmp(acs_chars, show) 39880 + ? "DIFF" 39881 + : "SAME"), 39882 + _nc_visbuf(show)); 39883 + 39884 + _nc_unlock_global(tracef); 39885 + } 39886 +#endif /* TRACE */ 39887 +} 39888 + 39889 +#define ENSURE_TINFO(sp) (TCBOf(sp)->drv->isTerminfo) 39890 + 39891 +NCURSES_EXPORT(void) 39892 +_nc_cookie_init(SCREEN *sp) 39893 +{ 39894 + bool support_cookies = USE_XMC_SUPPORT; 39895 + TERMINAL_CONTROL_BLOCK *TCB = (TERMINAL_CONTROL_BLOCK *) (sp->_term); 39896 + 39897 + if (sp == 0 || !ENSURE_TINFO(sp)) 39898 + return; 39899 + 39900 +#if USE_XMC_SUPPORT 39901 + /* 39902 + * If we have no magic-cookie support compiled-in, or if it is suppressed 39903 + * in the environment, reset the support-flag. 39904 + */ 39905 + if (magic_cookie_glitch >= 0) { 39906 + if (getenv("NCURSES_NO_MAGIC_COOKIE") != 0) { 39907 + support_cookies = FALSE; 39908 + } 39909 + } 39910 +#endif 39911 + 39912 + if (!support_cookies && magic_cookie_glitch >= 0) { 39913 + T(("will disable attributes to work w/o magic cookies")); 39914 + } 39915 + 39916 + if (magic_cookie_glitch > 0) { /* tvi, wyse */ 39917 + 39918 + sp->_xmc_triggers = sp->_ok_attributes & ( 39919 + A_STANDOUT | 39920 + A_UNDERLINE | 39921 + A_REVERSE | 39922 + A_BLINK | 39923 + A_DIM | 39924 + A_BOLD | 39925 + A_INVIS | 39926 + A_PROTECT 39927 + ); 39928 +#if 0 39929 + /* 39930 + * We "should" treat colors as an attribute. The wyse350 (and its 39931 + * clones) appear to be the only ones that have both colors and magic 39932 + * cookies. 39933 + */ 39934 + if (has_colors()) { 39935 + sp->_xmc_triggers |= A_COLOR; 39936 + } 39937 +#endif 39938 + sp->_xmc_suppress = sp->_xmc_triggers & (chtype) ~(A_BOLD); 39939 + 39940 + T(("magic cookie attributes %s", _traceattr(sp->_xmc_suppress))); 39941 + /* 39942 + * Supporting line-drawing may be possible. But make the regular 39943 + * video attributes work first. 39944 + */ 39945 + acs_chars = ABSENT_STRING; 39946 + ena_acs = ABSENT_STRING; 39947 + enter_alt_charset_mode = ABSENT_STRING; 39948 + exit_alt_charset_mode = ABSENT_STRING; 39949 +#if USE_XMC_SUPPORT 39950 + /* 39951 + * To keep the cookie support simple, suppress all of the optimization 39952 + * hooks except for clear_screen and the cursor addressing. 39953 + */ 39954 + if (support_cookies) { 39955 + clr_eol = ABSENT_STRING; 39956 + clr_eos = ABSENT_STRING; 39957 + set_attributes = ABSENT_STRING; 39958 + } 39959 +#endif 39960 + } else if (magic_cookie_glitch == 0) { /* hpterm */ 39961 + } 39962 + 39963 + /* 39964 + * If magic cookies are not supported, cancel the strings that set 39965 + * video attributes. 39966 + */ 39967 + if (!support_cookies && magic_cookie_glitch >= 0) { 39968 + magic_cookie_glitch = ABSENT_NUMERIC; 39969 + set_attributes = ABSENT_STRING; 39970 + enter_blink_mode = ABSENT_STRING; 39971 + enter_bold_mode = ABSENT_STRING; 39972 + enter_dim_mode = ABSENT_STRING; 39973 + enter_reverse_mode = ABSENT_STRING; 39974 + enter_standout_mode = ABSENT_STRING; 39975 + enter_underline_mode = ABSENT_STRING; 39976 + } 39977 + 39978 + /* initialize normal acs before wide, since we use mapping in the latter */ 39979 +#if !USE_WIDEC_SUPPORT 39980 + if (_nc_unicode_locale() && _nc_locale_breaks_acs(sp->_term)) { 39981 + acs_chars = NULL; 39982 + ena_acs = NULL; 39983 + enter_alt_charset_mode = NULL; 39984 + exit_alt_charset_mode = NULL; 39985 + set_attributes = NULL; 39986 + } 39987 +#endif 39988 +} 39989 + 39990 +static int 39991 +drv_twait(TERMINAL_CONTROL_BLOCK * TCB, 39992 + int mode, 39993 + int milliseconds, 39994 + int *timeleft 39995 + EVENTLIST_2nd(_nc_eventlist * evl)) 39996 +{ 39997 + SCREEN *sp; 39998 + 39999 + AssertTCB(); 40000 + SetSP(); 40001 + 40002 + return _nc_timed_wait(sp, mode, milliseconds, timeleft EVENTLIST_2nd(evl)); 40003 +} 40004 + 40005 +static int 40006 +drv_read(TERMINAL_CONTROL_BLOCK * TCB, int *buf) 40007 +{ 40008 + SCREEN *sp; 40009 + unsigned char c2 = 0; 40010 + int n; 40011 + 40012 + AssertTCB(); 40013 + assert(buf); 40014 + SetSP(); 40015 + 40016 + n = read(sp->_ifd, &c2, 1); 40017 + *buf = (int) c2; 40018 + return n; 40019 +} 40020 + 40021 +static int 40022 +drv_nap(TERMINAL_CONTROL_BLOCK * TCB GCC_UNUSED, int ms) 40023 +{ 40024 +#if HAVE_NANOSLEEP 40025 + { 40026 + struct timespec request, remaining; 40027 + request.tv_sec = ms / 1000; 40028 + request.tv_nsec = (ms % 1000) * 1000000; 40029 + while (nanosleep(&request, &remaining) == -1 40030 + && errno == EINTR) { 40031 + request = remaining; 40032 + } 40033 + } 40034 +#else 40035 + _nc_timed_wait(0, 0, ms, (int *) 0 EVENTLIST_2nd(0)); 40036 +#endif 40037 + return OK; 40038 +} 40039 + 40040 +static int 40041 +__nc_putp(SCREEN *sp, const char *name GCC_UNUSED, const char *value) 40042 +{ 40043 + int rc = ERR; 40044 + 40045 + if (value) { 40046 + rc = NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx name, value); 40047 + } 40048 + return rc; 40049 +} 40050 + 40051 +static int 40052 +__nc_putp_flush(SCREEN *sp, const char *name, const char *value) 40053 +{ 40054 + int rc = __nc_putp(sp, name, value); 40055 + if (rc != ERR) { 40056 + NCURSES_SP_NAME(_nc_flush) (sp); 40057 + } 40058 + return rc; 40059 +} 40060 + 40061 +static int 40062 +drv_kpad(TERMINAL_CONTROL_BLOCK * TCB, bool flag) 40063 +{ 40064 + int ret = ERR; 40065 + SCREEN *sp; 40066 + 40067 + AssertTCB(); 40068 + 40069 + sp = TCB->csp; 40070 + 40071 + if (sp) { 40072 + if (flag) { 40073 + (void) __nc_putp_flush(sp, "keypad_xmit", keypad_xmit); 40074 + } else if (!flag && keypad_local) { 40075 + (void) __nc_putp_flush(sp, "keypad_local", keypad_local); 40076 + } 40077 + if (flag && !sp->_tried) { 40078 + _nc_init_keytry(sp); 40079 + sp->_tried = TRUE; 40080 + } 40081 + ret = OK; 40082 + } 40083 + 40084 + return ret; 40085 +} 40086 + 40087 +static int 40088 +drv_keyok(TERMINAL_CONTROL_BLOCK * TCB, int c, bool flag) 40089 +{ 40090 + SCREEN *sp; 40091 + int code = ERR; 40092 + int count = 0; 40093 + char *s; 40094 + 40095 + AssertTCB(); 40096 + SetSP(); 40097 + 40098 + if (c >= 0) { 40099 + unsigned ch = (unsigned) c; 40100 + if (flag) { 40101 + while ((s = _nc_expand_try(sp->_key_ok, ch, &count, 0)) != 0 40102 + && _nc_remove_key(&(sp->_key_ok), ch)) { 40103 + code = _nc_add_to_try(&(sp->_keytry), s, ch); 40104 + free(s); 40105 + count = 0; 40106 + if (code != OK) 40107 + break; 40108 + } 40109 + } else { 40110 + while ((s = _nc_expand_try(sp->_keytry, ch, &count, 0)) != 0 40111 + && _nc_remove_key(&(sp->_keytry), ch)) { 40112 + code = _nc_add_to_try(&(sp->_key_ok), s, ch); 40113 + free(s); 40114 + count = 0; 40115 + if (code != OK) 40116 + break; 40117 + } 40118 + } 40119 + } 40120 + return (code); 40121 +} 40122 + 40123 +static bool 40124 +drv_kyExist(TERMINAL_CONTROL_BLOCK * TCB, int key) 40125 +{ 40126 + bool res = FALSE; 40127 + 40128 + AssertTCB(); 40129 + if (TCB->csp) 40130 + res = _nc_tinfo_has_key(TCB->csp, key) == 0 ? FALSE : TRUE; 40131 + 40132 + return res; 40133 +} 25092 40134 diff -Naur ncurses-5.7.orig/ncurses/tinfo/use_screen.c ncurses-5.7/ncurses/tinfo/use_screen.c 25093 40135 --- ncurses-5.7.orig/ncurses/tinfo/use_screen.c 2008-06-07 12:16:56.000000000 -0700 25094 +++ ncurses-5.7/ncurses/tinfo/use_screen.c 2009-0 6-05 14:01:16.000000000 -070040136 +++ ncurses-5.7/ncurses/tinfo/use_screen.c 2009-07-19 15:02:22.000000000 -0700 25095 40137 @@ -32,7 +32,7 @@ 25096 40138 … … 25113 40155 diff -Naur ncurses-5.7.orig/ncurses/tinfo/write_entry.c ncurses-5.7/ncurses/tinfo/write_entry.c 25114 40156 --- ncurses-5.7.orig/ncurses/tinfo/write_entry.c 2008-08-03 12:24:00.000000000 -0700 25115 +++ ncurses-5.7/ncurses/tinfo/write_entry.c 2009-0 6-05 14:01:44.000000000 -070040157 +++ ncurses-5.7/ncurses/tinfo/write_entry.c 2009-07-19 15:03:53.000000000 -0700 25116 40158 @@ -1,5 +1,5 @@ 25117 40159 /**************************************************************************** … … 25252 40294 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_traceatr.c ncurses-5.7/ncurses/trace/lib_traceatr.c 25253 40295 --- ncurses-5.7.orig/ncurses/trace/lib_traceatr.c 2008-08-03 09:24:53.000000000 -0700 25254 +++ ncurses-5.7/ncurses/trace/lib_traceatr.c 2009-0 6-05 14:01:51.000000000 -070040296 +++ ncurses-5.7/ncurses/trace/lib_traceatr.c 2009-07-19 15:03:59.000000000 -0700 25255 40297 @@ -1,5 +1,5 @@ 25256 40298 /**************************************************************************** … … 25346 40388 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_tracebits.c ncurses-5.7/ncurses/trace/lib_tracebits.c 25347 40389 --- ncurses-5.7.orig/ncurses/trace/lib_tracebits.c 2008-08-03 09:09:26.000000000 -0700 25348 +++ ncurses-5.7/ncurses/trace/lib_tracebits.c 2009-0 6-05 14:01:16.000000000 -070040390 +++ ncurses-5.7/ncurses/trace/lib_tracebits.c 2009-07-19 15:02:22.000000000 -0700 25349 40391 @@ -33,9 +33,8 @@ 25350 40392 ****************************************************************************/ … … 25360 40402 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_trace.c ncurses-5.7/ncurses/trace/lib_trace.c 25361 40403 --- ncurses-5.7.orig/ncurses/trace/lib_trace.c 2008-08-23 11:04:29.000000000 -0700 25362 +++ ncurses-5.7/ncurses/trace/lib_trace.c 2009-0 6-05 14:01:18.000000000 -070040404 +++ ncurses-5.7/ncurses/trace/lib_trace.c 2009-07-19 15:02:23.000000000 -0700 25363 40405 @@ -1,5 +1,5 @@ 25364 40406 /**************************************************************************** … … 25420 40462 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_tracechr.c ncurses-5.7/ncurses/trace/lib_tracechr.c 25421 40463 --- ncurses-5.7.orig/ncurses/trace/lib_tracechr.c 2008-08-03 08:39:29.000000000 -0700 25422 +++ ncurses-5.7/ncurses/trace/lib_tracechr.c 2009-0 6-05 14:01:44.000000000 -070040464 +++ ncurses-5.7/ncurses/trace/lib_tracechr.c 2009-07-19 15:03:53.000000000 -0700 25423 40465 @@ -1,5 +1,5 @@ 25424 40466 /**************************************************************************** … … 25466 40508 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_tracedmp.c ncurses-5.7/ncurses/trace/lib_tracedmp.c 25467 40509 --- ncurses-5.7.orig/ncurses/trace/lib_tracedmp.c 2008-08-16 12:30:56.000000000 -0700 25468 +++ ncurses-5.7/ncurses/trace/lib_tracedmp.c 2009-0 6-05 14:01:44.000000000 -070040510 +++ ncurses-5.7/ncurses/trace/lib_tracedmp.c 2009-07-19 15:03:53.000000000 -0700 25469 40511 @@ -1,5 +1,5 @@ 25470 40512 /**************************************************************************** … … 25521 40563 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_tracemse.c ncurses-5.7/ncurses/trace/lib_tracemse.c 25522 40564 --- ncurses-5.7.orig/ncurses/trace/lib_tracemse.c 2008-08-03 08:39:29.000000000 -0700 25523 +++ ncurses-5.7/ncurses/trace/lib_tracemse.c 2009-0 6-05 14:01:16.000000000 -070040565 +++ ncurses-5.7/ncurses/trace/lib_tracemse.c 2009-07-19 15:02:22.000000000 -0700 25524 40566 @@ -38,7 +38,7 @@ 25525 40567 … … 25542 40584 diff -Naur ncurses-5.7.orig/ncurses/trace/trace_tries.c ncurses-5.7/ncurses/trace/trace_tries.c 25543 40585 --- ncurses-5.7.orig/ncurses/trace/trace_tries.c 2008-08-03 08:43:30.000000000 -0700 25544 +++ ncurses-5.7/ncurses/trace/trace_tries.c 2009-0 6-05 14:01:30.000000000 -070040586 +++ ncurses-5.7/ncurses/trace/trace_tries.c 2009-07-19 15:03:48.000000000 -0700 25545 40587 @@ -1,5 +1,5 @@ 25546 40588 /**************************************************************************** … … 25570 40612 diff -Naur ncurses-5.7.orig/ncurses/trace/varargs.c ncurses-5.7/ncurses/trace/varargs.c 25571 40613 --- ncurses-5.7.orig/ncurses/trace/varargs.c 2008-08-03 08:42:49.000000000 -0700 25572 +++ ncurses-5.7/ncurses/trace/varargs.c 2009-0 6-05 14:01:16.000000000 -070040614 +++ ncurses-5.7/ncurses/trace/varargs.c 2009-07-19 15:02:22.000000000 -0700 25573 40615 @@ -34,7 +34,7 @@ 25574 40616 … … 25589 40631 #define VA_PTR(type) pval = (char *)va_arg(ap, type) 25590 40632 #define VA_STR(type) sval = va_arg(ap, type) 40633 diff -Naur ncurses-5.7.orig/ncurses/trace/visbuf.c ncurses-5.7/ncurses/trace/visbuf.c 40634 --- ncurses-5.7.orig/ncurses/trace/visbuf.c 2008-08-04 16:07:39.000000000 -0700 40635 +++ ncurses-5.7/ncurses/trace/visbuf.c 2009-07-19 15:04:15.000000000 -0700 40636 @@ -1,5 +1,5 @@ 40637 /**************************************************************************** 40638 - * Copyright (c) 2001-2007,2008 Free Software Foundation, Inc. * 40639 + * Copyright (c) 2001-2008,2009 Free Software Foundation, Inc. * 40640 * * 40641 * Permission is hereby granted, free of charge, to any person obtaining a * 40642 * copy of this software and associated documentation files (the * 40643 @@ -42,7 +42,9 @@ 40644 #include <tic.h> 40645 #include <ctype.h> 40646 40647 -MODULE_ID("$Id: visbuf.c,v 1.32 2008/08/04 23:07:39 tom Exp $") 40648 +MODULE_ID("$Id: visbuf.c,v 1.33 2009/07/11 14:44:20 tom Exp $") 40649 + 40650 +#define NUM_VISBUFS 4 40651 40652 #define NormalLen(len) (size_t) (((size_t)(len) + 1) * 4) 40653 #define WideLen(len) (size_t) (((size_t)(len) + 1) * 4 * MB_CUR_MAX) 40654 @@ -108,9 +110,16 @@ 40655 vbuf = tp = _nc_trace_buf(bufnum, NormalLen(len)); 40656 #else 40657 { 40658 - static char *mybuf[4]; 40659 - mybuf[bufnum] = typeRealloc(char, NormalLen(len), mybuf[bufnum]); 40660 - vbuf = tp = mybuf[bufnum]; 40661 + static char *mybuf[NUM_VISBUFS]; 40662 + if (bufnum < 0) { 40663 + for (c = 0; c < NUM_VISBUFS; ++c) { 40664 + FreeAndNull(mybuf[c]); 40665 + } 40666 + tp = 0; 40667 + } else { 40668 + mybuf[bufnum] = typeRealloc(char, NormalLen(len), mybuf[bufnum]); 40669 + vbuf = tp = mybuf[bufnum]; 40670 + } 40671 } 40672 #endif 40673 if (tp != 0) { 40674 @@ -177,7 +186,7 @@ 40675 vbuf = tp = _nc_trace_buf(bufnum, WideLen(len)); 40676 #else 40677 { 40678 - static char *mybuf[2]; 40679 + static char *mybuf[NUM_VISBUFS]; 40680 mybuf[bufnum] = typeRealloc(char, WideLen(len), mybuf[bufnum]); 40681 vbuf = tp = mybuf[bufnum]; 40682 } 40683 @@ -293,7 +302,8 @@ 40684 PUTC_ch = buf[j].chars[PUTC_i]; 40685 if (PUTC_ch == L'\0') 40686 break; 40687 - PUTC_n = (int) wcrtomb(PUTC_buf, buf[j].chars[PUTC_i], &PUT_st); 40688 + PUTC_n = (int) wcrtomb(PUTC_buf, 40689 + buf[j].chars[PUTC_i], &PUT_st); 40690 if (PUTC_n <= 0) 40691 break; 40692 for (k = 0; k < PUTC_n; k++) { 25591 40693 diff -Naur ncurses-5.7.orig/ncurses/tty/hardscroll.c ncurses-5.7/ncurses/tty/hardscroll.c 25592 40694 --- ncurses-5.7.orig/ncurses/tty/hardscroll.c 2008-08-03 16:49:30.000000000 -0700 25593 +++ ncurses-5.7/ncurses/tty/hardscroll.c 2009-0 6-05 14:01:44.000000000 -070040695 +++ ncurses-5.7/ncurses/tty/hardscroll.c 2009-07-19 15:03:53.000000000 -0700 25594 40696 @@ -1,5 +1,5 @@ 25595 40697 /**************************************************************************** … … 25810 40912 diff -Naur ncurses-5.7.orig/ncurses/tty/hashmap.c ncurses-5.7/ncurses/tty/hashmap.c 25811 40913 --- ncurses-5.7.orig/ncurses/tty/hashmap.c 2007-10-13 11:47:25.000000000 -0700 25812 +++ ncurses-5.7/ncurses/tty/hashmap.c 2009-0 6-05 14:01:51.000000000 -070040914 +++ ncurses-5.7/ncurses/tty/hashmap.c 2009-07-19 15:03:59.000000000 -0700 25813 40915 @@ -1,5 +1,5 @@ 25814 40916 /**************************************************************************** … … 26275 41377 diff -Naur ncurses-5.7.orig/ncurses/tty/lib_mvcur.c ncurses-5.7/ncurses/tty/lib_mvcur.c 26276 41378 --- ncurses-5.7.orig/ncurses/tty/lib_mvcur.c 2008-08-16 12:30:58.000000000 -0700 26277 +++ ncurses-5.7/ncurses/tty/lib_mvcur.c 2009-0 6-05 14:01:51.000000000 -070041379 +++ ncurses-5.7/ncurses/tty/lib_mvcur.c 2009-07-19 15:03:59.000000000 -0700 26278 41380 @@ -1,5 +1,5 @@ 26279 41381 /**************************************************************************** … … 27196 42298 diff -Naur ncurses-5.7.orig/ncurses/tty/lib_tstp.c ncurses-5.7/ncurses/tty/lib_tstp.c 27197 42299 --- ncurses-5.7.orig/ncurses/tty/lib_tstp.c 2008-05-03 09:24:56.000000000 -0700 27198 +++ ncurses-5.7/ncurses/tty/lib_tstp.c 2009-0 6-05 14:01:51.000000000 -070042300 +++ ncurses-5.7/ncurses/tty/lib_tstp.c 2009-07-19 15:03:59.000000000 -0700 27199 42301 @@ -1,5 +1,5 @@ 27200 42302 /**************************************************************************** … … 27338 42440 diff -Naur ncurses-5.7.orig/ncurses/tty/lib_twait.c ncurses-5.7/ncurses/tty/lib_twait.c 27339 42441 --- ncurses-5.7.orig/ncurses/tty/lib_twait.c 2008-08-30 13:08:19.000000000 -0700 27340 +++ ncurses-5.7/ncurses/tty/lib_twait.c 2009-0 6-05 14:01:44.000000000 -070042442 +++ ncurses-5.7/ncurses/tty/lib_twait.c 2009-07-19 15:03:53.000000000 -0700 27341 42443 @@ -1,5 +1,5 @@ 27342 42444 /**************************************************************************** … … 27545 42647 diff -Naur ncurses-5.7.orig/ncurses/tty/lib_vidattr.c ncurses-5.7/ncurses/tty/lib_vidattr.c 27546 42648 --- ncurses-5.7.orig/ncurses/tty/lib_vidattr.c 2007-06-30 14:58:04.000000000 -0700 27547 +++ ncurses-5.7/ncurses/tty/lib_vidattr.c 2009-0 6-05 14:01:51.000000000 -070042649 +++ ncurses-5.7/ncurses/tty/lib_vidattr.c 2009-07-19 15:04:09.000000000 -0700 27548 42650 @@ -1,5 +1,5 @@ 27549 42651 /**************************************************************************** … … 27563 42665 27564 42666 /* 27565 @@ -65,9 +66,15 @@ 42667 @@ -63,11 +64,16 @@ 42668 */ 42669 27566 42670 #include <curses.priv.h> 27567 42671 -#include <term.h> 27568 42672 27569 42673 -MODULE_ID("$Id: lib_vidattr.c,v 1.49 2007/06/30 21:58:04 tom Exp $") 27570 42674 +#ifndef CUR 27571 +#define CUR SP_TERMTYPE 42675 +#define CUR SP_TERMTYPE 27572 42676 +#endif 27573 42677 + 27574 +MODULE_ID("$Id: lib_vidattr.c,v 1.5 6 2009/05/10 00:48:29tom Exp $")42678 +MODULE_ID("$Id: lib_vidattr.c,v 1.57 2009/05/23 20:46:28 tom Exp $") 27575 42679 27576 42680 -#define doPut(mode) TPUTS_TRACE(#mode); tputs(mode, 1, outc) … … 27581 42685 #define TurnOn(mask,mode) \ 27582 42686 if ((turn_on & mask) && mode) { doPut(mode); } 27583 @@ -83, 21 +90,24@@42687 @@ -83,35 +89,42 @@ 27584 42688 if ((pair != old_pair) \ 27585 42689 || (fix_pair0 && (pair == 0)) \ 27586 42690 || (reverse ^ ((old_attr & A_REVERSE) != 0))) { \ 27587 42691 - _nc_do_color(old_pair, pair, reverse, outc); \ 27588 + NCURSES_SP_NAME(_nc_do_color) 27589 + 42692 + NCURSES_SP_NAME(_nc_do_color)(NCURSES_SP_ARGx \ 42693 + old_pair, pair, reverse, outc); \ 27590 42694 } \ 27591 42695 } … … 27610 42714 #define fix_pair0 FALSE 27611 42715 #endif 27612 @@ -106,12 +116,12 @@ 27613 T((T_CALLED("vidputs(%s)"), _traceattr(newmode))); 42716 42717 newmode &= A_ATTRIBUTES; 42718 - T((T_CALLED("vidputs(%s)"), _traceattr(newmode))); 42719 + 42720 + T((T_CALLED("vidputs(%p,%s)"), SP_PARM, _traceattr(newmode))); 42721 + 42722 + if (!IsTermInfo(SP_PARM)) 42723 + returnCode(ERR); 27614 42724 27615 42725 /* this allows us to go on whether or not newterm() has been called */ … … 27626 42736 #if USE_XMC_SUPPORT 27627 42737 static const chtype table[] = 27628 @@ -135,7 +14 5,7 @@42738 @@ -135,7 +148,7 @@ 27629 42739 * the terminfo max_attributes value. 27630 42740 */ … … 27635 42745 } else if ((table[n] & newmode) != 0) { 27636 42746 if (used++ >= limit) { 27637 @@ -148,7 +1 58,7 @@42747 @@ -148,7 +161,7 @@ 27638 42748 } 27639 42749 } … … 27644 42754 TR(TRACE_ATTRS, ("suppressed attribute is %s", _traceattr(newmode))); 27645 42755 } 27646 @@ -208,10 +2 18,10 @@42756 @@ -208,10 +221,10 @@ 27647 42757 if (exit_attribute_mode) { 27648 42758 doPut(exit_attribute_mode); … … 27657 42767 } 27658 42768 } 27659 @@ -222,16 +23 2,18 @@42769 @@ -222,16 +235,18 @@ 27660 42770 } else if (set_attributes) { 27661 42771 if (turn_on || turn_off) { … … 27686 42796 } 27687 42797 SetColorsIf((pair != 0) || fix_pair0, PreviousAttr); 27688 @@ -241,11 +25 3,11 @@42798 @@ -241,11 +256,11 @@ 27689 42799 27690 42800 TurnOff(A_ALTCHARSET, exit_alt_charset_mode); … … 27700 42810 } 27701 42811 27702 @@ -282, 8 +294,8@@42812 @@ -282,27 +297,53 @@ 27703 42813 if (reverse) 27704 42814 newmode |= A_REVERSE; … … 27711 42821 PreviousAttr = newmode; 27712 42822 27713 @@ -291,15 +303,33 @@ 42823 returnCode(OK); 27714 42824 } 27715 42825 42826 +#if NCURSES_SP_FUNCS 27716 42827 NCURSES_EXPORT(int) 27717 +NCURSES_SP_NAME(vidattr) (NCURSES_SP_DCLx 27718 + chtype newmode) 42828 -vidattr(chtype newmode) 42829 +vidputs(chtype newmode, NCURSES_OUTC outc) 42830 { 42831 - T((T_CALLED("vidattr(%s)"), _traceattr(newmode))); 42832 + SetSafeOutcWrapper(outc); 42833 + return NCURSES_SP_NAME(vidputs) (CURRENT_SCREEN, 42834 + newmode, 42835 + _nc_outc_wrapper); 42836 +} 42837 +#endif 42838 42839 - returnCode(vidputs(newmode, _nc_outch)); 42840 +NCURSES_EXPORT(int) 42841 +NCURSES_SP_NAME(vidattr) (NCURSES_SP_DCLx chtype newmode) 27719 42842 +{ 27720 + return NCURSES_SP_NAME(vidputs) (NCURSES_SP_ARGx 27721 + newmode, 27722 + NCURSES_SP_NAME(_nc_outch)); 27723 +} 27724 + 42843 + T((T_CALLED("vidattr(%p,%s)"), SP_PARM, _traceattr(newmode))); 42844 + returnCode(NCURSES_SP_NAME(vidputs) (NCURSES_SP_ARGx 42845 + newmode, 42846 + NCURSES_SP_NAME(_nc_outch))); 42847 } 42848 27725 42849 +#if NCURSES_SP_FUNCS 27726 42850 +NCURSES_EXPORT(int) 27727 +vid puts(chtype newmode, NCURSES_OUTC outc)42851 +vidattr(chtype newmode) 27728 42852 +{ 27729 + SetSafeOutcWrapper(outc); 27730 + return NCURSES_SP_NAME(vidputs) (CURRENT_SCREEN, newmode, _nc_outc_wrapper); 42853 + return NCURSES_SP_NAME(vidattr) (CURRENT_SCREEN, newmode); 27731 42854 +} 27732 +27733 +NCURSES_EXPORT(int)27734 vidattr(chtype newmode)27735 {27736 T((T_CALLED("vidattr(%s)"), _traceattr(newmode)));27737 27738 returnCode(vidputs(newmode, _nc_outch));27739 }27740 42855 +#endif 27741 42856 + 27742 42857 NCURSES_EXPORT(chtype) 27743 42858 -termattrs(void) … … 27746 42861 chtype attrs = A_NORMAL; 27747 42862 27748 @@ -331,8 +361,16 @@ 42863 + T((T_CALLED("termattrs(%p)"), SP_PARM)); 42864 +#ifdef USE_TERM_DRIVER 42865 + if (HasTerminal(SP_PARM)) 42866 + attrs = CallDriver(SP_PARM, conattr); 42867 +#else 42868 + 42869 T((T_CALLED("termattrs()"))); 42870 if (enter_alt_charset_mode) 42871 attrs |= A_ALTCHARSET; 42872 @@ -331,8 +372,17 @@ 27749 42873 if (enter_underline_mode) 27750 42874 attrs |= A_UNDERLINE; … … 27755 42879 27756 42880 - returnChar(attrs); 42881 +#endif 27757 42882 + returnChtype(attrs); 27758 42883 +} 27759 42884 + 27760 42885 +#if NCURSES_SP_FUNCS … … 27763 42888 +{ 27764 42889 + return NCURSES_SP_NAME(termattrs) (CURRENT_SCREEN); 42890 } 42891 +#endif 42892 diff -Naur ncurses-5.7.orig/ncurses/tty/MKexpanded.sh ncurses-5.7/ncurses/tty/MKexpanded.sh 42893 --- ncurses-5.7.orig/ncurses/tty/MKexpanded.sh 2005-01-01 17:06:40.000000000 -0800 42894 +++ ncurses-5.7/ncurses/tty/MKexpanded.sh 2009-07-19 15:04:13.000000000 -0700 42895 @@ -1,6 +1,6 @@ 42896 #! /bin/sh 42897 ############################################################################## 42898 -# Copyright (c) 1998-2000,2005 Free Software Foundation, Inc. # 42899 +# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. # 42900 # # 42901 # Permission is hereby granted, free of charge, to any person obtaining a # 42902 # copy of this software and associated documentation files (the "Software"), # 42903 @@ -27,9 +27,9 @@ 42904 # authorization. # 42905 ############################################################################## 42906 # 42907 -# Author: Thomas E. Dickey <dickey@clark.net> 1997 42908 +# Author: Thomas E. Dickey, 1997-on 42909 # 42910 -# $Id: MKexpanded.sh,v 1.11 2005/01/02 01:06:40 tom Exp $ 42911 +# $Id: MKexpanded.sh,v 1.16 2009/07/04 16:45:03 tom Exp $ 42912 # 42913 # Script to generate 'expanded.c', a dummy source that contains functions 42914 # corresponding to complex macros used in this library. By making functions, 42915 @@ -52,8 +52,14 @@ 42916 42917 cat <<EOF 42918 /* generated by MKexpanded.sh */ 42919 +#define NEED_NCURSES_CH_T 1 42920 #include <curses.priv.h> 42921 #include <term.h> 42922 + 42923 +#ifndef CUR 42924 +#define CUR SP_TERMTYPE 42925 +#endif 42926 + 42927 #if NCURSES_EXPANDED 42928 EOF 42929 42930 @@ -68,29 +74,59 @@ 42931 #undef FALSE 42932 /* this is a marker */ 42933 IGNORE 42934 -NCURSES_EXPORT(void) _nc_toggle_attr_on (attr_t *S, attr_t at) 42935 +NCURSES_EXPORT(void) 42936 +_nc_toggle_attr_on (attr_t *S, attr_t at) 42937 { 42938 toggle_attr_on(*S,at); 42939 } 42940 -NCURSES_EXPORT(void) _nc_toggle_attr_off (attr_t *S, attr_t at) 42941 + 42942 +NCURSES_EXPORT(void) 42943 +_nc_toggle_attr_off (attr_t *S, attr_t at) 42944 { 42945 toggle_attr_off(*S,at); 42946 } 42947 -NCURSES_EXPORT(int) _nc_DelCharCost (int count) 42948 + 42949 +NCURSES_EXPORT(int) 42950 +NCURSES_SP_NAME(_nc_DelCharCost) (NCURSES_SP_DCLx int count) 42951 +{ 42952 + return DelCharCost(SP_PARM, count); 27765 42953 +} 27766 +#endif 42954 + 42955 +NCURSES_EXPORT(int) 42956 +NCURSES_SP_NAME(_nc_InsCharCost) (NCURSES_SP_DCLx int count) 42957 { 42958 - return DelCharCost(count); 42959 + return InsCharCost(SP_PARM, count); 42960 } 42961 -NCURSES_EXPORT(int) _nc_InsCharCost (int count) 42962 + 42963 +NCURSES_EXPORT(void) 42964 +NCURSES_SP_NAME(_nc_UpdateAttrs) (NCURSES_SP_DCLx CARG_CH_T c) 42965 { 42966 - return InsCharCost(count); 42967 + UpdateAttrs(SP_PARM, CHDEREF(c)); 42968 } 42969 -NCURSES_EXPORT(void) _nc_UpdateAttrs (NCURSES_CH_T c) 42970 + 42971 +@if_NCURSES_SP_FUNCS 42972 +NCURSES_EXPORT(int) 42973 +_nc_DelCharCost (int count) 42974 +{ 42975 + return NCURSES_SP_NAME(_nc_DelCharCost) (CURRENT_SCREEN, count); 42976 +} 42977 + 42978 +NCURSES_EXPORT(int) 42979 +_nc_InsCharCost (int count) 42980 +{ 42981 + return NCURSES_SP_NAME(_nc_InsCharCost)(CURRENT_SCREEN, count); 42982 +} 42983 + 42984 +NCURSES_EXPORT(void) 42985 +_nc_UpdateAttrs (CARG_CH_T c) 42986 { 42987 - UpdateAttrs(c); 42988 + NCURSES_SP_NAME(_nc_UpdateAttrs)(CURRENT_SCREEN,c); 42989 } 42990 +@endif 42991 EOF 42992 42993 -$preprocessor $TMP 2>/dev/null | sed -e '1,/^IGNORE$/d' 42994 +$preprocessor $TMP 2>/dev/null | \ 42995 + sed -e '1,/^IGNORE$/d' -e 's/^@/#/' -e 's/^#if_/#if /' 42996 42997 cat <<EOF 42998 #else /* ! NCURSES_EXPANDED */ 27767 42999 diff -Naur ncurses-5.7.orig/ncurses/tty/tty_update.c ncurses-5.7/ncurses/tty/tty_update.c 27768 43000 --- ncurses-5.7.orig/ncurses/tty/tty_update.c 2008-08-30 13:08:19.000000000 -0700 27769 +++ ncurses-5.7/ncurses/tty/tty_update.c 2009-0 6-05 14:01:52.000000000 -070043001 +++ ncurses-5.7/ncurses/tty/tty_update.c 2009-07-19 15:04:11.000000000 -0700 27770 43002 @@ -1,5 +1,5 @@ 27771 43003 /**************************************************************************** … … 27783 43015 27784 43016 /*----------------------------------------------------------------- 27785 @@ -38,12 +39,1 6@@43017 @@ -38,12 +39,17 @@ 27786 43018 * 27787 43019 * The routine doupdate() and its dependents. … … 27792 43024 *-----------------------------------------------------------------*/ 27793 43025 43026 +#define NEED_NCURSES_CH_T 1 27794 43027 #include <curses.priv.h> 27795 43028 … … 27801 43034 #undef __BEOS__ 27802 43035 #endif 27803 @@ -76,9 +8 1,8 @@43036 @@ -76,9 +82,8 @@ 27804 43037 #endif 27805 43038 … … 27808 43041 27809 43042 -MODULE_ID("$Id: tty_update.c,v 1.246 2008/08/30 20:08:19 tom Exp $") 27810 +MODULE_ID("$Id: tty_update.c,v 1.25 6 2009/05/17 00:13:49tom Exp $")43043 +MODULE_ID("$Id: tty_update.c,v 1.258 2009/06/27 19:16:17 tom Exp $") 27811 43044 27812 43045 /* 27813 43046 * This define controls the line-breakout optimization. Every once in a 27814 @@ -91,7 +9 5,7 @@43047 @@ -91,7 +96,7 @@ 27815 43048 */ 27816 43049 #define CHECK_INTERVAL 5 … … 27821 43054 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT); 27822 43055 static NCURSES_CH_T normal = NewChar(BLANK_TEXT); 27823 @@ -103,13 +10 7,23 @@43056 @@ -103,13 +108,23 @@ 27824 43057 */ 27825 43058 /* #define POSITION_DEBUG */ … … 27846 43079 #ifdef POSITION_DEBUG 27847 43080 /**************************************************************************** 27848 @@ -119,7 +13 3,7 @@43081 @@ -119,7 +134,7 @@ 27849 43082 ****************************************************************************/ 27850 43083 … … 27855 43088 { 27856 43089 char buf[20]; 27857 @@ -129,10 +14 3,10 @@43090 @@ -129,10 +144,10 @@ 27858 43091 if (!_nc_tracing || (expected_y < 0 && expected_x < 0)) 27859 43092 return; … … 27869 43102 do { 27870 43103 int ask = sizeof(buf) - 1 - (s - buf); 27871 @@ -152,8 +16 6,12 @@43104 @@ -152,8 +167,12 @@ 27872 43105 if (expected_y < 0) 27873 43106 expected_y = y - 1; … … 27884 43117 y - 1, x - 1, expected_y, expected_x, legend); 27885 43118 } else { 27886 @@ -162,7 +18 0,7 @@43119 @@ -162,7 +181,7 @@ 27887 43120 } 27888 43121 } … … 27893 43126 27894 43127 /**************************************************************************** 27895 @@ -172,19 +19 0,19@@43128 @@ -172,19 +191,20 @@ 27896 43129 ****************************************************************************/ 27897 43130 … … 27900 43133 +GoTo(NCURSES_SP_DCLx int const row, int const col) 27901 43134 { 27902 43135 - TR(TRACE_MOVE, ("GoTo(%d, %d) from (%d, %d)", 27903 43136 - row, col, SP->_cursrow, SP->_curscol)); 27904 + row, col, SP_PARM->_cursrow, SP_PARM->_curscol)); 43137 + TR(TRACE_MOVE, ("GoTo(%p, %d, %d) from (%d, %d)", 43138 + SP_PARM, row, col, SP_PARM->_cursrow, SP_PARM->_curscol)); 27905 43139 27906 43140 - position_check(SP->_cursrow, SP->_curscol, "GoTo"); … … 27909 43143 - mvcur(SP->_cursrow, SP->_curscol, row, col); 27910 43144 - position_check(SP->_cursrow, SP->_curscol, "GoTo2"); 27911 + mvcur(SP_PARM->_cursrow, SP_PARM->_curscol, row, col); 43145 + NCURSES_SP_NAME(mvcur) (NCURSES_SP_ARGx SP_PARM->_cursrow, 43146 + SP_PARM->_curscol, row, col); 27912 43147 + position_check(SP_PARM, SP_PARM->_cursrow, SP_PARM->_curscol, "GoTo2"); 27913 43148 } … … 27919 43154 int chlen = 1; 27920 43155 NCURSES_CH_T my_ch; 27921 @@ -194,7 +21 2,7 @@43156 @@ -194,7 +214,7 @@ 27922 43157 27923 43158 TR(TRACE_CHARPUT, ("PutAttrChar(%s) at (%d, %d)", … … 27928 43163 /* 27929 43164 * If this is not a valid character, there is nothing more to do. 27930 @@ -224,12 +24 2,12 @@43165 @@ -224,12 +244,12 @@ 27931 43166 */ 27932 43167 if (is8bits(CharOf(CHDEREF(ch))) … … 27945 43180 ; 27946 43181 } else { 27947 @@ -241,7 +2 59,7 @@43182 @@ -241,7 +261,7 @@ 27948 43183 #endif 27949 43184 … … 27954 43189 my_ch = CHDEREF(ch); /* work around const param */ 27955 43190 #if USE_WIDEC_SUPPORT 27956 @@ -251,8 +2 69,8 @@43191 @@ -251,8 +271,8 @@ 27957 43192 * character, and uses the wide-character mapping when we expect the 27958 43193 * normal one to be broken (by mis-design ;-). … … 27965 43200 my_ch = _nc_wacs[CharOf(my_ch)]; 27966 43201 } 27967 @@ -265,9 +28 3,9 @@43202 @@ -265,9 +285,9 @@ 27968 43203 */ 27969 43204 if (AttrOf(attr) & A_ALTCHARSET) { … … 27977 43212 if (temp == 0) 27978 43213 temp = ' '; 27979 @@ -282,28 +30 0,28 @@43214 @@ -282,28 +302,28 @@ 27980 43215 ch = CHREF(tilde); 27981 43216 } … … 28013 43248 { 28014 43249 bool have_pending = FALSE; 28015 @@ -313,13 +33 1,13 @@43250 @@ -313,13 +333,13 @@ 28016 43251 * have the refreshing slow down drastically (or stop) if there's an 28017 43252 * unread character available. … … 28030 43265 if (poll(fds, 1, 0) > 0) { 28031 43266 have_pending = TRUE; 28032 @@ -347,43 +36 5,52 @@43267 @@ -347,43 +367,52 @@ 28033 43268 ktimeout.tv_usec = 0; 28034 43269 … … 28098 43333 } 28099 43334 28100 @@ -391,7 +4 18,7 @@43335 @@ -391,7 +420,7 @@ 28101 43336 * Wrap the cursor position, i.e., advance to the beginning of the next line. 28102 43337 */ … … 28107 43342 if (eat_newline_glitch) { 28108 43343 /* 28109 @@ -407,40 +43 4,45 @@43344 @@ -407,40 +436,45 @@ 28110 43345 * it's safe to just tell the code that the cursor is in hyperspace and 28111 43346 * let the next mvcur() call straighten things out. … … 28171 43406 28172 43407 /* 28173 @@ -450,19 +48 2,19 @@43408 @@ -450,19 +484,19 @@ 28174 43409 * or can be output by clearing (A_COLOR in case of bce-terminal) are excluded. 28175 43410 */ … … 28196 43431 return FALSE; 28197 43432 } 28198 @@ -488,7 +52 0,7 @@43433 @@ -488,7 +522,7 @@ 28199 43434 * This code is optimized using ech and rep. 28200 43435 */ … … 28205 43440 int i; 28206 43441 28207 @@ -500,13 +53 2,13 @@43442 @@ -500,13 +534,13 @@ 28208 43443 NCURSES_CH_T ntext0; 28209 43444 … … 28221 43456 } 28222 43457 runcount = 2; 28223 @@ -523,10 +55 5,10@@43458 @@ -523,10 +557,11 @@ 28224 43459 * which it would be marginally advantageous. 28225 43460 */ … … 28232 43467 + && can_clear_with(NCURSES_SP_ARGx CHREF(ntext0))) { 28233 43468 + UpdateAttrs(SP_PARM, ntext0); 28234 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx TPARM_1(erase_chars, runcount)); 43469 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx 43470 + TPARM_1(erase_chars, runcount)); 28235 43471 28236 43472 /* 28237 43473 * If this is the last part of the given interval, 28238 @@ -534,27 +56 6,34 @@43474 @@ -534,27 +569,34 @@ 28239 43475 * last update on the line. 28240 43476 */ … … 28280 43516 ntext += runcount; 28281 43517 num -= runcount; 28282 @@ -563,7 +60 2,7 @@43518 @@ -563,7 +605,7 @@ 28283 43519 } 28284 43520 … … 28289 43525 } 28290 43526 28291 @@ -576,39 +61 5,40 @@43527 @@ -576,39 +618,40 @@ 28292 43528 * Returns: same as EmitRange 28293 43529 */ … … 28339 43575 28340 43576 /* leave unbracketed here so 'indent' works */ 28341 @@ -618,7 +6 58,7 @@43577 @@ -618,7 +661,7 @@ 28342 43578 if_USE_SCROLL_HINTS(win->_line[row].oldindex = row) 28343 43579 … … 28348 43584 int i; 28349 43585 int nonempty; 28350 @@ -628,28 +668,47 @@ 28351 28352 T((T_CALLED("doupdate()"))); 28353 28354 - if (curscr == 0 28355 - || newscr == 0) 43586 @@ -626,30 +669,49 @@ 43587 struct tms before, after; 43588 #endif /* USE_TRACE_TIMES */ 43589 43590 - T((T_CALLED("doupdate()"))); 43591 + T((T_CALLED("_nc_tinfo:doupdate(%p)"), SP_PARM)); 43592 + 28356 43593 +#if !USE_REENTRANT 28357 43594 + /* … … 28371 43608 + SyncScreens(StdScreen(SP_PARM), stdscr); 28372 43609 +#endif 28373 + 43610 43611 - if (curscr == 0 43612 - || newscr == 0) 28374 43613 + if (CurScreen(SP_PARM) == 0 28375 43614 + || NewScreen(SP_PARM) == 0 … … 28404 43643 * This is a transparent extension: XSI does not address it, 28405 43644 * and applications need not know that ncurses can do it. 28406 @@ -658,20 +7 17,20 @@43645 @@ -658,20 +720,20 @@ 28407 43646 * (this can happen in an xterm, for example), and resize the 28408 43647 * ncurses data structures accordingly. … … 28432 43671 #if USE_TRACE_TIMES 28433 43672 /* zero the metering machinery */ 28434 @@ -695,11 +75 4,11 @@43673 @@ -695,11 +757,11 @@ 28435 43674 int j, k; 28436 43675 attr_t rattr = A_NORMAL; … … 28448 43687 28449 43688 /* is an attribute turned on here? */ 28450 @@ -717,8 +77 6,8 @@43689 @@ -717,8 +779,8 @@ 28451 43690 * there's enough room to set the attribute before the first 28452 43691 * non-blank in the run. … … 28459 43698 continue; 28460 43699 } 28461 @@ -727,14 +78 6,14 @@43700 @@ -727,14 +789,14 @@ 28462 43701 for (k = 1; k <= magic_cookie_glitch; k++) { 28463 43702 if (j - k < 0 … … 28476 43715 : ":unsafe"))); 28477 43716 break; 28478 @@ -745,10 +80 4,12@@43717 @@ -745,10 +807,11 @@ 28479 43718 int m, n = j; 28480 43719 … … 28486 43725 + for (m = i; m < screen_lines(SP_PARM); m++) { 28487 43726 + for (; n < screen_columns(SP_PARM); n++) { 28488 + attr_t testattr 28489 + = AttrOf(NewScreen(SP_PARM)->_line[m].text[n]); 28490 + 43727 + attr_t testattr = 43728 + AttrOf(NewScreen(SP_PARM)->_line[m].text[n]); 28491 43729 + if ((testattr & SP_PARM->_xmc_triggers) == rattr) { 28492 43730 end_onscreen = TRUE; 28493 43731 TR(TRACE_ATTRS, 28494 43732 ("Range attributed with %s ends at (%d, %d)", 28495 @@ -764,7 +82 5,8 @@43733 @@ -764,7 +827,8 @@ 28496 43734 foundit:; 28497 43735 … … 28503 43741 /* 28504 43742 * If there are safely-attributed blanks at the end of 28505 @@ -773,15 +83 5,15 @@43743 @@ -773,15 +837,15 @@ 28506 43744 */ 28507 43745 while (n >= 0 … … 28522 43760 TR(TRACE_ATTRS, 28523 43761 ("No room at end in %d,%d%s%s", 28524 @@ -789,7 +85 1,7 @@43762 @@ -789,7 +853,7 @@ 28525 43763 (ISBLANK(lastline[n + k]) 28526 43764 ? "" … … 28531 43769 : ":unsafe"))); 28532 43770 break; 28533 @@ -806,12 +8 68,13@@43771 @@ -806,12 +870,12 @@ 28534 43772 _traceattr(turnon), i, j)); 28535 43773 … … 28537 43775 - for (p = i; p < screen_lines; p++) { 28538 43776 - for (; q < screen_columns; q++) { 28539 - attr_t testattr = AttrOf(newscr->_line[p].text[q]);28540 - if ((testattr & SP->_xmc_triggers) == rattr)28541 43777 + for (p = i; p < screen_lines(SP_PARM); p++) { 28542 43778 + for (; q < screen_columns(SP_PARM); q++) { 28543 + attr_t testattr = 28544 + AttrOf(NewScreen(SP_PARM)->_line[p].text[q]); 43779 attr_t testattr = AttrOf(newscr->_line[p].text[q]); 43780 - if ((testattr & SP->_xmc_triggers) == rattr) 28545 43781 + if ((testattr & SP_PARM->_xmc_triggers) == rattr) 28546 43782 goto foundend; … … 28550 43786 q = 0; 28551 43787 } 28552 @@ -837,7 +90 0,7 @@43788 @@ -837,7 +901,7 @@ 28553 43789 /* show altered highlights after magic-cookie check */ 28554 43790 if (USE_TRACEF(TRACE_UPDATE)) { … … 28559 43795 } 28560 43796 #endif /* TRACE */ 28561 @@ -845,23 +90 8,23 @@43797 @@ -845,23 +909,23 @@ 28562 43798 #endif /* USE_XMC_SUPPORT */ 28563 43799 … … 28582 43818 28583 43819 - if (SP->_scrolling) { 43820 - _nc_scroll_optimize(); 28584 43821 + if (SP_PARM->_scrolling) { 28585 _nc_scroll_optimize();43822 + NCURSES_SP_NAME(_nc_scroll_optimize) (NCURSES_SP_ARG); 28586 43823 } 28587 43824 … … 28591 43828 TR(TRACE_UPDATE, ("Transforming lines, nonempty %d", nonempty)); 28592 43829 for (i = 0; i < nonempty; i++) { 28593 @@ -869, 46 +932,46@@43830 @@ -869,7 +933,7 @@ 28594 43831 * Here is our line-breakout optimization. 28595 43832 */ … … 28600 43837 changedlines = 0; 28601 43838 } 28602 28603 /* 28604 - * newscr->line[i].firstchar is normally set 28605 - * by wnoutrefresh. curscr->line[i].firstchar 28606 + * newscr.line[i].firstchar is normally set 28607 + * by wnoutrefresh. curscr.line[i].firstchar 43839 @@ -880,35 +944,35 @@ 28608 43840 * is normally set by _nc_scroll_window in the 28609 43841 * vertical-movement optimization code, … … 28656 43888 28657 43889 cleanup: 28658 @@ -921,10 +98 4,10 @@43890 @@ -921,10 +985,10 @@ 28659 43891 #if USE_XMC_SUPPORT 28660 43892 if (magic_cookie_glitch != 0) … … 28670 43902 #if USE_TRACE_TIMES 28671 43903 (void) times(&after); 28672 @@ -940,6 +100 3,14 @@43904 @@ -940,6 +1004,14 @@ 28673 43905 returnCode(OK); 28674 43906 } … … 28685 43917 * ClrBlank(win) 28686 43918 * 28687 @@ -951,1 0 +1022,10@@43919 @@ -951,14 +1023,14 @@ 28688 43920 * in the wbkgd() call. Assume 'stdscr' for this case. 28689 43921 */ 28690 43922 #define BCE_ATTRS (A_NORMAL|A_COLOR) 28691 43923 -#define BCE_BKGD(win) (((win) == curscr ? stdscr : (win))->_nc_bkgd) 28692 +#define BCE_BKGD( win) (((win) == CurScreen(SP_PARM) ? StdScreen(SP_PARM) : (win))->_nc_bkgd)43924 +#define BCE_BKGD(sp,win) (((win) == CurScreen(sp) ? StdScreen(sp) : (win))->_nc_bkgd) 28693 43925 28694 43926 static NCURSES_INLINE NCURSES_CH_T … … 28698 43930 NCURSES_CH_T blank = blankchar; 28699 43931 if (back_color_erase) 28700 @@ -970,23 +1041,24 @@ 43932 - AddAttr(blank, (AttrOf(BCE_BKGD(win)) & BCE_ATTRS)); 43933 + AddAttr(blank, (AttrOf(BCE_BKGD(SP_PARM, win)) & BCE_ATTRS)); 43934 return blank; 43935 } 43936 43937 @@ -970,23 +1042,24 @@ 28701 43938 */ 28702 43939 … … 28717 43954 28718 43955 - ClearScreen(blank); 43956 - 43957 - TR(TRACE_UPDATE, ("updating screen from scratch")); 28719 43958 + ClearScreen(NCURSES_SP_ARGx blank); 28720 43959 28721 - TR(TRACE_UPDATE, ("updating screen from scratch"));43960 - nonempty = ClrBottom(nonempty); 28722 43961 + TR(TRACE_UPDATE, ("updating screen from scratch")); 28723 43962 28724 - nonempty = ClrBottom(nonempty);28725 -28726 43963 - for (i = 0; i < nonempty; i++) 28727 43964 - TransformLine(i); … … 28734 43971 } 28735 43972 28736 @@ -997,15 +10 69,16 @@43973 @@ -997,15 +1070,16 @@ 28737 43974 */ 28738 43975 … … 28746 43983 - && SP->_cursrow >= 0) { 28747 43984 - for (j = SP->_curscol; j < screen_columns; j++) { 28748 + if ( CurScreen(SP_PARM) != 043985 + if (SP_PARM != 0 && CurScreen(SP_PARM) != 0 28749 43986 + && SP_PARM->_cursrow >= 0) { 28750 43987 + for (j = SP_PARM->_curscol; j < screen_columns(SP_PARM); j++) { … … 28756 43993 if (!CharEq(*cp, blank)) { 28757 43994 *cp = blank; 28758 @@ -1018,14 +109 1,14 @@43995 @@ -1018,14 +1092,14 @@ 28759 43996 } 28760 43997 … … 28776 44013 } 28777 44014 } 28778 @@ -1037,23 +111 0,29 @@44015 @@ -1037,23 +1111,29 @@ 28779 44016 */ 28780 44017 … … 28818 44055 } 28819 44056 28820 @@ -1065,26 +114 4,26 @@44057 @@ -1065,26 +1145,26 @@ 28821 44058 * screen, checking if each is blank, and one or more are changed. 28822 44059 */ … … 28851 44088 if (!ok) 28852 44089 top = row; 28853 @@ -1092,11 +117 1,11 @@44090 @@ -1092,11 +1172,11 @@ 28854 44091 28855 44092 /* don't use clr_eos for just one line if clr_eol available */ … … 28868 44105 } 28869 44106 } 28870 @@ -1105,15 +118 4,15 @@44107 @@ -1105,15 +1185,15 @@ 28871 44108 28872 44109 #if USE_XMC_SUPPORT … … 28885 44122 -#define xmc_new(r,c) newscr->_line[r].text[c] 28886 44123 -#define xmc_turn_off(a,b) xmc_turn_on(b,a) 28887 +#define xmc_new(sp,r,c) NewScreen( SP_PARM)->_line[r].text[c]44124 +#define xmc_new(sp,r,c) NewScreen(sp)->_line[r].text[c] 28888 44125 +#define xmc_turn_off(sp,a,b) xmc_turn_on(sp,b,a) 28889 44126 #endif /* USE_XMC_SUPPORT */ 28890 44127 28891 44128 /* 28892 @@ -1135,19 +121 4,19 @@44129 @@ -1135,19 +1215,19 @@ 28893 44130 */ 28894 44131 … … 28916 44153 /* 28917 44154 * If we have colors, there is the possibility of having two color pairs 28918 @@ -1155,19 +123 4,20 @@44155 @@ -1155,19 +1235,20 @@ 28919 44156 * for this case, and update the old line with the new line's colors when 28920 44157 * they are equivalent. … … 28942 44179 } 28943 44180 } 28944 @@ -1177,7 +125 7,7 @@44181 @@ -1177,7 +1258,7 @@ 28945 44182 28946 44183 if (ceol_standout_glitch && clr_eol) { … … 28951 44188 attrchanged = TRUE; 28952 44189 break; 28953 @@ -1189,9 +12 69,13 @@44190 @@ -1189,9 +1270,13 @@ 28954 44191 firstChar = 0; 28955 44192 … … 28960 44197 + GoTo(NCURSES_SP_ARGx lineno, firstChar); 28961 44198 + ClrToEOL(NCURSES_SP_ARGx 28962 + ClrBlank(NCURSES_SP_ARGx CurScreen(SP_PARM)),28963 + FALSE);44199 + ClrBlank(NCURSES_SP_ARGx 44200 + CurScreen(SP_PARM)), FALSE); 28964 44201 + PutRange(NCURSES_SP_ARGx 28965 44202 + oldLine, newLine, lineno, 0, … … 28968 44205 28969 44206 /* 28970 @@ -1206,8 +129 0,8 @@44207 @@ -1206,8 +1291,8 @@ 28971 44208 * following operation. 28972 44209 */ … … 28979 44216 28980 44217 /* check for turn-on: 28981 @@ -1216,26 +130 0,30 @@44218 @@ -1216,26 +1301,30 @@ 28982 44219 */ 28983 44220 if (ISBLANK(newLine[n]) … … 29018 44255 } 29019 44256 29020 @@ -1246,38 +133 4,42 @@44257 @@ -1246,38 +1335,42 @@ 29021 44258 29022 44259 /* it may be cheap to clear leading whitespace with clr_bol */ … … 29074 44311 29075 44312 while (firstChar < nFirstChar) 29076 @@ -1286,29 +137 8,34 @@44313 @@ -1286,29 +1379,34 @@ 29077 44314 } 29078 44315 } else { … … 29116 44353 newLine + firstChar, 29117 44354 (nLastChar - firstChar + 1) * sizeof(NCURSES_CH_T)); 29118 @@ -1318,32 +141 5,43@@44355 @@ -1318,32 +1416,44 @@ 29119 44356 } 29120 44357 … … 29143 44380 } else if ((nLastChar != oLastChar) 29144 44381 && (!CharEq(newLine[nLastChar], oldLine[oLastChar]) 29145 44382 - || !(_nc_idcok && has_ic()))) { 29146 44383 - GoTo(lineno, firstChar); 29147 44384 - if ((oLastChar - nLastChar) > SP->_el_cost) { … … 29149 44386 - GoTo(lineno, nLastChar + 1); 29150 44387 - ClrToEOL(blank, FALSE); 44388 + || !(SP_PARM->_nc_sp_idcok 44389 + && NCURSES_SP_NAME(has_ic) (NCURSES_SP_ARG)))) { 29151 44390 + GoTo(NCURSES_SP_ARGx lineno, firstChar); 29152 44391 + if ((oLastChar - nLastChar) > SP_PARM->_el_cost) { … … 29172 44411 } else { 29173 44412 int nLastNonblank = nLastChar; 29174 @@ -1364,8 +147 2,13 @@44413 @@ -1364,8 +1474,13 @@ 29175 44414 29176 44415 n = min(oLastChar, nLastChar); … … 29188 44427 29189 44428 if (oLastChar < nLastChar) { 29190 @@ -1376,21 +14 89,26 @@44429 @@ -1376,21 +1491,26 @@ 29191 44430 --oLastChar; 29192 44431 } … … 29225 44464 /* 29226 44465 * The delete-char sequence will 29227 @@ -1400,18 +15 18,18 @@44466 @@ -1400,18 +1520,18 @@ 29228 44467 * setting the video attributes from 29229 44468 * the last character on the row. … … 29248 44487 return; 29249 44488 } 29250 @@ -1424,7 +154 2,7 @@44489 @@ -1424,7 +1544,7 @@ 29251 44490 */ 29252 44491 … … 29257 44496 int i, j; 29258 44497 bool fast_clear = (clear_screen || clr_eos || clr_eol); 29259 @@ -1432,9 +155 0,13 @@44498 @@ -1432,9 +1552,13 @@ 29260 44499 TR(TRACE_UPDATE, ("ClearScreen() called")); 29261 44500 … … 29274 44513 fast_clear = FALSE; 29275 44514 } 29276 @@ -1443,42 +156 5,48@@44515 @@ -1443,42 +1567,46 @@ 29277 44516 29278 44517 if (fast_clear) { … … 29293 44532 - SP->_cursrow = SP->_curscol = -1; 29294 44533 - GoTo(0, 0); 44534 - 44535 - UpdateAttrs(blank); 29295 44536 + SP_PARM->_cursrow = SP_PARM->_curscol = -1; 29296 44537 + GoTo(NCURSES_SP_ARGx 0, 0); 29297 29298 - UpdateAttrs(blank);29299 44538 + UpdateAttrs(SP_PARM, blank); 29300 44539 TPUTS_TRACE("clr_eos"); … … 29306 44545 } else if (clr_eol) { 29307 44546 - SP->_cursrow = SP->_curscol = -1; 29308 + SP_PARM->_cursrow = SP_PARM->_curscol = -1; 29309 44547 - 29310 44548 - UpdateAttrs(blank); 29311 44549 - for (i = 0; i < screen_lines; i++) { 29312 44550 - GoTo(i, 0); 44551 + SP_PARM->_cursrow = SP_PARM->_curscol = -1; 29313 44552 + UpdateAttrs(SP_PARM, blank); 29314 44553 + for (i = 0; i < screen_lines(SP_PARM); i++) { … … 29683 44922 } 29684 44923 29685 @@ -1763,1 0 +1926,14 @@44924 @@ -1763,15 +1926,24 @@ 29686 44925 * save/restore cursor capabilities if the terminal has them. 29687 44926 */ … … 29696 44935 { 29697 44936 - NCURSES_CH_T blank = ClrBlank(stdscr); 29698 + NCURSES_CH_T blank = ClrBlank(NCURSES_SP_ARGx StdScreen(SP_PARM));44937 + NCURSES_CH_T blank; 29699 44938 int i; 29700 44939 bool cursor_saved = FALSE; 29701 44940 int res; 29702 @@ -1787,34 +1954,36 @@ 44941 44942 - TR(TRACE_MOVE, ("mvcur_scrolln(%d, %d, %d, %d)", n, top, bot, maxy)); 44943 + TR(TRACE_MOVE, ("_nc_scrolln(%p, %d, %d, %d, %d)", SP_PARM, n, top, bot, maxy)); 44944 + 44945 + if (!IsValidScreen(SP_PARM)) 44946 + return (ERR); 44947 + 44948 + blank = ClrBlank(NCURSES_SP_ARGx StdScreen(SP_PARM)); 44949 44950 #if USE_XMC_SUPPORT 44951 /* 44952 @@ -1787,34 +1959,36 @@ 29703 44953 * Explicitly clear if stuff pushed off top of region might 29704 44954 * be saved by the terminal. … … 29741 44991 } 29742 44992 29743 44993 - if (res == ERR && _nc_idlok) 29744 44994 - res = scroll_idl(n, top, bot - n + 1, blank); 44995 + if (res == ERR && SP_PARM->_nc_sp_idlok) 29745 44996 + res = scroll_idl(NCURSES_SP_ARGx n, top, bot - n + 1, blank); 29746 44997 29747 44998 /* 29748 44999 * Clear the newly shifted-in text. 29749 @@ -1823,44 +199 2,49 @@45000 @@ -1823,44 +1997,49 @@ 29750 45001 && (non_dest_scroll_region || (memory_below && bot == maxy))) { 29751 45002 static const NCURSES_CH_T blank2 = NewChar(BLANK_TEXT); … … 29805 45056 } 29806 45057 29807 45058 - if (res == ERR && _nc_idlok) 29808 45059 - res = scroll_idl(-n, bot + n + 1, top, blank); 45060 + if (res == ERR && SP_PARM->_nc_sp_idlok) 29809 45061 + res = scroll_idl(NCURSES_SP_ARGx -n, bot + n + 1, top, blank); 29810 45062 29811 45063 /* 29812 45064 * Clear the newly shifted-in text. 29813 @@ -1869,8 +204 3,8 @@45065 @@ -1869,8 +2048,8 @@ 29814 45066 && (non_dest_scroll_region || (memory_above && top == 0))) { 29815 45067 static const NCURSES_CH_T blank2 = NewChar(BLANK_TEXT); … … 29822 45074 } 29823 45075 } 29824 @@ -1878,99 +205 2,156@@45076 @@ -1878,99 +2057,159 @@ 29825 45077 if (res == ERR) 29826 45078 return (ERR); … … 29858 45110 /* reset color pairs and definitions */ 29859 45111 - if (SP->_coloron || SP->_color_defs) 45112 - _nc_reset_colors(); 29860 45113 + if (SP_PARM->_coloron || SP_PARM->_color_defs) 29861 _nc_reset_colors();45114 + NCURSES_SP_NAME(_nc_reset_colors) (NCURSES_SP_ARG); 29862 45115 29863 45116 /* restore user-defined colors, if any */ … … 29907 45160 + ? enter_am_mode 29908 45161 + : exit_am_mode)); 29909 29910 45162 +} 45163 + 29911 45164 +#if NCURSES_SP_FUNCS 29912 45165 +NCURSES_EXPORT(void) … … 29914 45167 +{ 29915 45168 + NCURSES_SP_NAME(_nc_screen_resume) (CURRENT_SCREEN); 29916 +}45169 } 29917 45170 +#endif 29918 + 29919 +NCURSES_EXPORT(void)45171 45172 NCURSES_EXPORT(void) 29920 45173 +NCURSES_SP_NAME(_nc_screen_init) (NCURSES_SP_DCL0) 29921 45174 +{ … … 29924 45177 + 29925 45178 +#if NCURSES_SP_FUNCS 29926 45179 +NCURSES_EXPORT(void) 29927 45180 _nc_screen_init(void) 29928 45181 { … … 29953 45206 + SP_PARM->_default_color = TRUE; 29954 45207 + NCURSES_SP_NAME(_nc_do_color) (NCURSES_SP_ARGx 29955 + -1, 0, 45208 + -1, 45209 + 0, 29956 45210 + FALSE, 29957 45211 + NCURSES_SP_NAME(_nc_outch)); … … 29959 45213 29960 45214 - mvcur(SP->_cursrow, SP->_curscol, screen_lines - 1, 0); 29961 + mvcur(SP_PARM->_cursrow, 29962 + SP_PARM->_curscol, 29963 + screen_lines(SP_PARM) - 1, 0); 45215 + NCURSES_SP_NAME(mvcur) (NCURSES_SP_ARGx 45216 + SP_PARM->_cursrow, 45217 + SP_PARM->_curscol, 45218 + screen_lines(SP_PARM) - 1, 45219 + 0); 29964 45220 29965 45221 - ClrToEOL(blank, TRUE); … … 29968 45224 #endif 29969 45225 - if (SP->_color_defs) { 45226 - _nc_reset_colors(); 29970 45227 + if (SP_PARM->_color_defs) { 29971 _nc_reset_colors();45228 + NCURSES_SP_NAME(_nc_reset_colors) (NCURSES_SP_ARG); 29972 45229 } 29973 45230 } … … 30019 45276 + 30020 45277 #endif /* USE_XMC_SUPPORT */ 45278 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_add_wch.c ncurses-5.7/ncurses/widechar/lib_add_wch.c 45279 --- ncurses-5.7.orig/ncurses/widechar/lib_add_wch.c 2006-12-02 13:19:17.000000000 -0800 45280 +++ ncurses-5.7/ncurses/widechar/lib_add_wch.c 2009-07-19 15:04:13.000000000 -0700 45281 @@ -1,5 +1,5 @@ 45282 /**************************************************************************** 45283 - * Copyright (c) 2004,2006 Free Software Foundation, Inc. * 45284 + * Copyright (c) 2004-2006,2009 Free Software Foundation, Inc. * 45285 * * 45286 * Permission is hereby granted, free of charge, to any person obtaining a * 45287 * copy of this software and associated documentation files (the * 45288 @@ -35,39 +35,389 @@ 45289 45290 #include <curses.priv.h> 45291 45292 -MODULE_ID("$Id: lib_add_wch.c,v 1.6 2006/12/02 21:19:17 tom Exp $") 45293 +#if HAVE_WCTYPE_H 45294 +#include <wctype.h> 45295 +#endif 45296 45297 -NCURSES_EXPORT(int) 45298 -wadd_wch(WINDOW *win, const cchar_t *wch) 45299 +MODULE_ID("$Id: lib_add_wch.c,v 1.7 2009/07/04 21:59:25 tom Exp $") 45300 + 45301 +/* clone/adapt lib_addch.c */ 45302 +static const cchar_t blankchar = NewChar(BLANK_TEXT); 45303 + 45304 +/* 45305 + * Ugly microtweaking alert. Everything from here to end of module is 45306 + * likely to be speed-critical -- profiling data sure says it is! 45307 + * Most of the important screen-painting functions are shells around 45308 + * wadd_wch(). So we make every effort to reduce function-call overhead 45309 + * by inlining stuff, even at the cost of making wrapped copies for 45310 + * export. Also we supply some internal versions that don't call the 45311 + * window sync hook, for use by string-put functions. 45312 + */ 45313 + 45314 +/* Return bit mask for clearing color pair number if given ch has color */ 45315 +#define COLOR_MASK(ch) (~(attr_t)((ch) & A_COLOR ? A_COLOR : 0)) 45316 + 45317 +static NCURSES_INLINE cchar_t 45318 +render_char(WINDOW *win, cchar_t ch) 45319 +/* compute a rendition of the given char correct for the current context */ 45320 { 45321 - PUTC_DATA; 45322 - int n; 45323 - int code = ERR; 45324 + attr_t a = WINDOW_ATTRS(win); 45325 + int pair = GetPair(ch); 45326 45327 - TR(TRACE_VIRTPUT | TRACE_CCALLS, (T_CALLED("wadd_wch(%p, %s)"), win, 45328 - _tracech_t(wch))); 45329 + if (ISBLANK(ch) 45330 + && AttrOf(ch) == A_NORMAL 45331 + && pair == 0) { 45332 + /* color/pair in attrs has precedence over bkgrnd */ 45333 + ch = win->_nc_bkgd; 45334 + SetAttr(ch, a | AttrOf(win->_nc_bkgd)); 45335 + if ((pair = GET_WINDOW_PAIR(win)) == 0) 45336 + pair = GetPair(win->_nc_bkgd); 45337 + SetPair(ch, pair); 45338 + } else { 45339 + /* color in attrs has precedence over bkgrnd */ 45340 + a |= AttrOf(win->_nc_bkgd) & COLOR_MASK(a); 45341 + /* color in ch has precedence */ 45342 + if (pair == 0) { 45343 + if ((pair = GET_WINDOW_PAIR(win)) == 0) 45344 + pair = GetPair(win->_nc_bkgd); 45345 + } 45346 +#if 0 45347 + if (pair > 255) { 45348 + cchar_t fixme = ch; 45349 + SetPair(fixme, pair); 45350 + } 45351 +#endif 45352 + AddAttr(ch, (a & COLOR_MASK(AttrOf(ch)))); 45353 + SetPair(ch, pair); 45354 + } 45355 + 45356 + TR(TRACE_VIRTPUT, 45357 + ("render_char bkg %s (%d), attrs %s (%d) -> ch %s (%d)", 45358 + _tracech_t2(1, CHREF(win->_nc_bkgd)), 45359 + GetPair(win->_nc_bkgd), 45360 + _traceattr(WINDOW_ATTRS(win)), 45361 + GET_WINDOW_PAIR(win), 45362 + _tracech_t2(3, CHREF(ch)), 45363 + GetPair(ch))); 45364 45365 - if (win != 0) { 45366 - PUTC_INIT; 45367 - for (PUTC_i = 0; PUTC_i < CCHARW_MAX; ++PUTC_i) { 45368 - attr_t attrs = (wch->attr & A_ATTRIBUTES); 45369 - 45370 - if ((PUTC_ch = wch->chars[PUTC_i]) == L'\0') 45371 - break; 45372 - if ((PUTC_n = wcrtomb(PUTC_buf, PUTC_ch, &PUT_st)) <= 0) { 45373 - code = ERR; 45374 - if (is8bits(PUTC_ch)) 45375 - code = waddch(win, UChar(PUTC_ch) | attrs); 45376 - break; 45377 + return (ch); 45378 +} 45379 + 45380 +/* check if position is legal; if not, return error */ 45381 +#ifndef NDEBUG /* treat this like an assertion */ 45382 +#define CHECK_POSITION(win, x, y) \ 45383 + if (y > win->_maxy \ 45384 + || x > win->_maxx \ 45385 + || y < 0 \ 45386 + || x < 0) { \ 45387 + TR(TRACE_VIRTPUT, ("Alert! Win=%p _curx = %d, _cury = %d " \ 45388 + "(_maxx = %d, _maxy = %d)", win, x, y, \ 45389 + win->_maxx, win->_maxy)); \ 45390 + return(ERR); \ 45391 + } 45392 +#else 45393 +#define CHECK_POSITION(win, x, y) /* nothing */ 45394 +#endif 45395 + 45396 +static bool 45397 +newline_forces_scroll(WINDOW *win, NCURSES_SIZE_T * ypos) 45398 +{ 45399 + bool result = FALSE; 45400 + 45401 + if (*ypos >= win->_regtop && *ypos == win->_regbottom) { 45402 + *ypos = win->_regbottom; 45403 + result = TRUE; 45404 + } else { 45405 + *ypos += 1; 45406 + } 45407 + return result; 45408 +} 45409 + 45410 +/* 45411 + * The _WRAPPED flag is useful only for telling an application that we've just 45412 + * wrapped the cursor. We don't do anything with this flag except set it when 45413 + * wrapping, and clear it whenever we move the cursor. If we try to wrap at 45414 + * the lower-right corner of a window, we cannot move the cursor (since that 45415 + * wouldn't be legal). So we return an error (which is what SVr4 does). 45416 + * Unlike SVr4, we can successfully add a character to the lower-right corner 45417 + * (Solaris 2.6 does this also, however). 45418 + */ 45419 +static int 45420 +wrap_to_next_line(WINDOW *win) 45421 +{ 45422 + win->_flags |= _WRAPPED; 45423 + if (newline_forces_scroll(win, &(win->_cury))) { 45424 + win->_curx = win->_maxx; 45425 + if (!win->_scroll) 45426 + return (ERR); 45427 + scroll(win); 45428 + } 45429 + win->_curx = 0; 45430 + return (OK); 45431 +} 45432 + 45433 +static int wadd_wch_literal(WINDOW *, cchar_t); 45434 +/* 45435 + * Fill the given number of cells with blanks using the current background 45436 + * rendition. This saves/restores the current x-position. 45437 + */ 45438 +static void 45439 +fill_cells(WINDOW *win, int count) 45440 +{ 45441 + cchar_t blank = blankchar; 45442 + int save_x = win->_curx; 45443 + int save_y = win->_cury; 45444 + 45445 + while (count-- > 0) { 45446 + if (wadd_wch_literal(win, blank) == ERR) 45447 + break; 45448 + } 45449 + win->_curx = save_x; 45450 + win->_cury = save_y; 45451 +} 45452 + 45453 +static int 45454 +wadd_wch_literal(WINDOW *win, cchar_t ch) 45455 +{ 45456 + int x; 45457 + int y; 45458 + struct ldat *line; 45459 + 45460 + x = win->_curx; 45461 + y = win->_cury; 45462 + 45463 + CHECK_POSITION(win, x, y); 45464 + 45465 + ch = render_char(win, ch); 45466 + 45467 + line = win->_line + y; 45468 + 45469 + CHANGED_CELL(line, x); 45470 + 45471 + /* 45472 + * Non-spacing characters are added to the current cell. 45473 + * 45474 + * Spacing characters that are wider than one column require some display 45475 + * adjustments. 45476 + */ 45477 + { 45478 + int len = wcwidth(CharOf(ch)); 45479 + int i; 45480 + int j; 45481 + wchar_t *chars; 45482 + 45483 + if (len == 0) { /* non-spacing */ 45484 + if ((x > 0 && y >= 0) 45485 + || (win->_maxx >= 0 && win->_cury >= 1)) { 45486 + if (x > 0 && y >= 0) 45487 + chars = (win->_line[y].text[x - 1].chars); 45488 + else 45489 + chars = (win->_line[y - 1].text[win->_maxx].chars); 45490 + for (i = 0; i < CCHARW_MAX; ++i) { 45491 + if (chars[i] == 0) { 45492 + TR(TRACE_VIRTPUT, 45493 + ("added non-spacing %d: %x", 45494 + x, (int) CharOf(ch))); 45495 + chars[i] = CharOf(ch); 45496 + break; 45497 + } 45498 + } 45499 + } 45500 + goto testwrapping; 45501 + } else if (len > 1) { /* multi-column characters */ 45502 + /* 45503 + * Check if the character will fit on the current line. If it does 45504 + * not fit, fill in the remainder of the line with blanks. and 45505 + * move to the next line. 45506 + */ 45507 + if (len > win->_maxx + 1) { 45508 + TR(TRACE_VIRTPUT, ("character will not fit")); 45509 + return ERR; 45510 + } else if (x + len > win->_maxx + 1) { 45511 + int count = win->_maxx + 1 - x; 45512 + TR(TRACE_VIRTPUT, ("fill %d remaining cells", count)); 45513 + fill_cells(win, count); 45514 + if (wrap_to_next_line(win) == ERR) 45515 + return ERR; 45516 + x = win->_curx; 45517 + y = win->_cury; 45518 + line = win->_line + y; 45519 } 45520 - for (n = 0; n < PUTC_n; n++) { 45521 - if ((code = waddch(win, UChar(PUTC_buf[n]) | attrs)) == ERR) { 45522 + /* 45523 + * Check for cells which are orphaned by adding this character, set 45524 + * those to blanks. 45525 + * 45526 + * FIXME: this actually could fill j-i cells, more complicated to 45527 + * setup though. 45528 + */ 45529 + for (i = 0; i < len; ++i) { 45530 + if (isWidecBase(win->_line[y].text[x + i])) { 45531 break; 45532 + } else if (isWidecExt(win->_line[y].text[x + i])) { 45533 + for (j = i; x + j <= win->_maxx; ++j) { 45534 + if (!isWidecExt(win->_line[y].text[x + j])) { 45535 + TR(TRACE_VIRTPUT, ("fill %d orphan cells", j)); 45536 + fill_cells(win, j); 45537 + break; 45538 + } 45539 + } 45540 + break; 45541 + } 45542 + } 45543 + /* 45544 + * Finally, add the cells for this character. 45545 + */ 45546 + for (i = 0; i < len; ++i) { 45547 + cchar_t value = ch; 45548 + SetWidecExt(value, i); 45549 + TR(TRACE_VIRTPUT, ("multicolumn %d:%d (%d,%d)", 45550 + i + 1, len, 45551 + win->_begy + y, win->_begx + x)); 45552 + line->text[x] = value; 45553 + CHANGED_CELL(line, x); 45554 + ++x; 45555 + } 45556 + goto testwrapping; 45557 + } 45558 + } 45559 + 45560 + /* 45561 + * Single-column characters. 45562 + */ 45563 + line->text[x++] = ch; 45564 + /* 45565 + * This label is used only for wide-characters. 45566 + */ 45567 + testwrapping: 45568 + 45569 + TR(TRACE_VIRTPUT, ("cell (%ld, %ld..%d) = %s", 45570 + (long) win->_cury, (long) win->_curx, x - 1, 45571 + _tracech_t(CHREF(ch)))); 45572 + 45573 + if (x > win->_maxx) { 45574 + return wrap_to_next_line(win); 45575 + } 45576 + win->_curx = x; 45577 + return OK; 45578 +} 45579 + 45580 +static NCURSES_INLINE int 45581 +wadd_wch_nosync(WINDOW *win, cchar_t ch) 45582 +/* the workhorse function -- add a character to the given window */ 45583 +{ 45584 + NCURSES_SIZE_T x, y; 45585 + wchar_t *s; 45586 + int tabsize = 8; 45587 + 45588 + /* 45589 + * If we are using the alternate character set, forget about locale. 45590 + * Otherwise, if the locale * claims the code is printable, treat it that 45591 + * way. 45592 + */ 45593 + if ((AttrOf(ch) & A_ALTCHARSET) 45594 + || iswprint(CharOf(ch))) 45595 + return wadd_wch_literal(win, ch); 45596 + 45597 + /* 45598 + * Handle carriage control and other codes that are not printable, or are 45599 + * known to expand to more than one character according to unctrl(). 45600 + */ 45601 + x = win->_curx; 45602 + y = win->_cury; 45603 + 45604 + switch (CharOf(ch)) { 45605 + case '\t': 45606 +#if USE_REENTRANT 45607 + tabsize = sp->_TABSIZE; 45608 +#else 45609 + tabsize = TABSIZE; 45610 +#endif 45611 + x += (tabsize - (x % tabsize)); 45612 + /* 45613 + * Space-fill the tab on the bottom line so that we'll get the 45614 + * "correct" cursor position. 45615 + */ 45616 + if ((!win->_scroll && (y == win->_regbottom)) 45617 + || (x <= win->_maxx)) { 45618 + cchar_t blank = blankchar; 45619 + AddAttr(blank, AttrOf(ch)); 45620 + while (win->_curx < x) { 45621 + if (wadd_wch_literal(win, blank) == ERR) 45622 + return (ERR); 45623 + } 45624 + break; 45625 + } else { 45626 + wclrtoeol(win); 45627 + win->_flags |= _WRAPPED; 45628 + if (newline_forces_scroll(win, &y)) { 45629 + x = win->_maxx; 45630 + if (win->_scroll) { 45631 + scroll(win); 45632 + x = 0; 45633 } 45634 + } else { 45635 + x = 0; 45636 + } 45637 + } 45638 + break; 45639 + case '\n': 45640 + wclrtoeol(win); 45641 + if (newline_forces_scroll(win, &y)) { 45642 + if (win->_scroll) 45643 + scroll(win); 45644 + else 45645 + return (ERR); 45646 + } 45647 + /* FALLTHRU */ 45648 + case '\r': 45649 + x = 0; 45650 + win->_flags &= ~_WRAPPED; 45651 + break; 45652 + case '\b': 45653 + if (x == 0) 45654 + return (OK); 45655 + x--; 45656 + win->_flags &= ~_WRAPPED; 45657 + break; 45658 + default: 45659 + if ((s = wunctrl(&ch)) != 0) { 45660 + while (*s) { 45661 + cchar_t sch; 45662 + SetChar(sch, *s++, AttrOf(ch)); 45663 + if_EXT_COLORS(SetPair(sch, GetPair(ch))); 45664 + if (wadd_wch_literal(win, sch) == ERR) 45665 + return ERR; 45666 } 45667 - if (code == ERR) 45668 - break; 45669 + return OK; 45670 } 45671 + return ERR; 45672 + } 45673 + 45674 + win->_curx = x; 45675 + win->_cury = y; 45676 + 45677 + return OK; 45678 +} 45679 + 45680 +/* 45681 + * The versions below call _nc_synchook(). We wanted to avoid this in the 45682 + * version exported for string puts; they'll call _nc_synchook once at end 45683 + * of run. 45684 + */ 45685 + 45686 +/* These are actual entry points */ 45687 + 45688 +NCURSES_EXPORT(int) 45689 +wadd_wch(WINDOW *win, const cchar_t *wch) 45690 +{ 45691 + int code = ERR; 45692 + 45693 + TR(TRACE_VIRTPUT | TRACE_CCALLS, (T_CALLED("wadd_wch(%p, %s)"), win, 45694 + _tracecchar_t(wch))); 45695 + 45696 + if (win && (wadd_wch_nosync(win, *wch) != ERR)) { 45697 + _nc_synchook(win); 45698 + code = OK; 45699 } 45700 45701 TR(TRACE_VIRTPUT | TRACE_CCALLS, (T_RETURN("%d"), code)); 45702 @@ -77,37 +427,18 @@ 45703 NCURSES_EXPORT(int) 45704 wecho_wchar(WINDOW *win, const cchar_t *wch) 45705 { 45706 - PUTC_DATA; 45707 - int n; 45708 int code = ERR; 45709 45710 - TR(TRACE_VIRTPUT | TRACE_CCALLS, (T_CALLED("wecho_wchar(%p, %s)"), win, 45711 - _tracech_t(wch))); 45712 + TR(TRACE_VIRTPUT | TRACE_CCALLS, (T_CALLED("wechochar(%p, %s)"), win, 45713 + _tracecchar_t(wch))); 45714 45715 - if (win != 0) { 45716 - PUTC_INIT; 45717 - for (PUTC_i = 0; PUTC_i < CCHARW_MAX; ++PUTC_i) { 45718 - attr_t attrs = (wch->attr & A_ATTRIBUTES); 45719 - 45720 - if ((PUTC_ch = wch->chars[PUTC_i]) == L'\0') 45721 - break; 45722 - if ((PUTC_n = wcrtomb(PUTC_buf, PUTC_ch, &PUT_st)) <= 0) { 45723 - code = ERR; 45724 - if (is8bits(PUTC_ch)) 45725 - code = waddch(win, UChar(PUTC_ch) | attrs); 45726 - break; 45727 - } 45728 - for (n = 0; n < PUTC_n; n++) { 45729 - if ((code = waddch(win, UChar(PUTC_buf[n]) | attrs)) == ERR) { 45730 - break; 45731 - } 45732 - } 45733 - if (code == ERR) 45734 - break; 45735 - } 45736 - wrefresh(win); 45737 + if (win && (wadd_wch_nosync(win, *wch) != ERR)) { 45738 + bool save_immed = win->_immed; 45739 + win->_immed = TRUE; 45740 + _nc_synchook(win); 45741 + win->_immed = save_immed; 45742 + code = OK; 45743 } 45744 - 45745 TR(TRACE_VIRTPUT | TRACE_CCALLS, (T_RETURN("%d"), code)); 45746 return (code); 45747 } 30021 45748 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_cchar.c ncurses-5.7/ncurses/widechar/lib_cchar.c 30022 45749 --- ncurses-5.7.orig/ncurses/widechar/lib_cchar.c 2007-05-12 12:03:06.000000000 -0700 30023 +++ ncurses-5.7/ncurses/widechar/lib_cchar.c 2009-0 6-05 14:01:16.000000000 -070045750 +++ ncurses-5.7/ncurses/widechar/lib_cchar.c 2009-07-19 15:04:17.000000000 -0700 30024 45751 @@ -1,5 +1,5 @@ 30025 45752 /**************************************************************************** 30026 45753 - * Copyright (c) 2001-2005,2007 Free Software Foundation, Inc. * 30027 + * Copyright (c) 2001-200 7,2008Free Software Foundation, Inc. *45754 + * Copyright (c) 2001-2008,2009 Free Software Foundation, Inc. * 30028 45755 * * 30029 45756 * Permission is hereby granted, free of charge, to any person obtaining a * … … 30034 45761 30035 45762 -MODULE_ID("$Id: lib_cchar.c,v 1.12 2007/05/12 19:03:06 tom Exp $") 30036 +MODULE_ID("$Id: lib_cchar.c,v 1.1 3 2008/11/16 00:19:59 juergenExp $")45763 +MODULE_ID("$Id: lib_cchar.c,v 1.14 2009/07/18 15:20:42 tom Exp $") 30037 45764 30038 45765 /* … … 30049 45776 30050 45777 TR(TRACE_CCALLS, (T_CALLED("setcchar(%p,%s,%lu,%d,%p)"), 45778 @@ -112,7 +112,11 @@ 45779 : CCHARW_MAX; 45780 45781 if (wch == NULL) { 45782 - code = len; 45783 + /* 45784 + * If the value is a null, set the length to 1. 45785 + * If the value is not a null, return the length plus 1 for null. 45786 + */ 45787 + code = (len < CCHARW_MAX) ? (len + 1) : CCHARW_MAX; 45788 } else if (attrs == 0 || color_pair == 0) { 45789 code = ERR; 45790 } else if (len >= 0) { 30051 45791 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_get_wch.c ncurses-5.7/ncurses/widechar/lib_get_wch.c 30052 45792 --- ncurses-5.7.orig/ncurses/widechar/lib_get_wch.c 2008-08-16 12:22:55.000000000 -0700 30053 +++ ncurses-5.7/ncurses/widechar/lib_get_wch.c 2009-0 6-05 14:01:44.000000000 -070045793 +++ ncurses-5.7/ncurses/widechar/lib_get_wch.c 2009-07-19 15:03:53.000000000 -0700 30054 45794 @@ -1,5 +1,5 @@ 30055 45795 /**************************************************************************** … … 30094 45834 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_get_wstr.c ncurses-5.7/ncurses/widechar/lib_get_wstr.c 30095 45835 --- ncurses-5.7.orig/ncurses/widechar/lib_get_wstr.c 2008-08-16 12:25:33.000000000 -0700 30096 +++ ncurses-5.7/ncurses/widechar/lib_get_wstr.c 2009-0 6-05 14:01:16.000000000 -070045836 +++ ncurses-5.7/ncurses/widechar/lib_get_wstr.c 2009-07-19 15:02:22.000000000 -0700 30097 45837 @@ -38,9 +38,8 @@ 30098 45838 */ … … 30108 45848 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_ins_wch.c ncurses-5.7/ncurses/widechar/lib_ins_wch.c 30109 45849 --- ncurses-5.7.orig/ncurses/widechar/lib_ins_wch.c 2005-12-03 12:24:19.000000000 -0800 30110 +++ ncurses-5.7/ncurses/widechar/lib_ins_wch.c 2009-0 6-05 14:01:55.000000000 -070045850 +++ ncurses-5.7/ncurses/widechar/lib_ins_wch.c 2009-07-19 15:04:04.000000000 -0700 30111 45851 @@ -1,5 +1,5 @@ 30112 45852 /**************************************************************************** … … 30145 45885 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_unget_wch.c ncurses-5.7/ncurses/widechar/lib_unget_wch.c 30146 45886 --- ncurses-5.7.orig/ncurses/widechar/lib_unget_wch.c 2008-06-07 07:50:37.000000000 -0700 30147 +++ ncurses-5.7/ncurses/widechar/lib_unget_wch.c 2009-0 6-05 14:01:44.000000000 -070045887 +++ ncurses-5.7/ncurses/widechar/lib_unget_wch.c 2009-07-19 15:03:53.000000000 -0700 30148 45888 @@ -1,5 +1,5 @@ 30149 45889 /**************************************************************************** … … 30202 45942 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_vid_attr.c ncurses-5.7/ncurses/widechar/lib_vid_attr.c 30203 45943 --- ncurses-5.7.orig/ncurses/widechar/lib_vid_attr.c 2007-06-30 15:03:02.000000000 -0700 30204 +++ ncurses-5.7/ncurses/widechar/lib_vid_attr.c 2009-0 6-05 14:01:51.000000000 -070045944 +++ ncurses-5.7/ncurses/widechar/lib_vid_attr.c 2009-07-19 15:04:00.000000000 -0700 30205 45945 @@ -1,5 +1,5 @@ 30206 45946 /**************************************************************************** … … 30434 46174 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_wacs.c ncurses-5.7/ncurses/widechar/lib_wacs.c 30435 46175 --- ncurses-5.7.orig/ncurses/widechar/lib_wacs.c 2006-12-17 07:16:17.000000000 -0800 30436 +++ ncurses-5.7/ncurses/widechar/lib_wacs.c 2009-0 6-05 14:01:16.000000000 -070046176 +++ ncurses-5.7/ncurses/widechar/lib_wacs.c 2009-07-19 15:02:22.000000000 -0700 30437 46177 @@ -31,9 +31,8 @@ 30438 46178 ****************************************************************************/ … … 30448 46188 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_wunctrl.c ncurses-5.7/ncurses/widechar/lib_wunctrl.c 30449 46189 --- ncurses-5.7.orig/ncurses/widechar/lib_wunctrl.c 2007-06-12 13:22:32.000000000 -0700 30450 +++ ncurses-5.7/ncurses/widechar/lib_wunctrl.c 2009-0 6-05 14:01:44.000000000 -070046190 +++ ncurses-5.7/ncurses/widechar/lib_wunctrl.c 2009-07-19 15:03:53.000000000 -0700 30451 46191 @@ -1,5 +1,5 @@ 30452 46192 /**************************************************************************** … … 30495 46235 +} 30496 46236 +#endif 46237 diff -Naur ncurses-5.7.orig/ncurses/win32con/gettimeofday.c ncurses-5.7/ncurses/win32con/gettimeofday.c 46238 --- ncurses-5.7.orig/ncurses/win32con/gettimeofday.c 1969-12-31 16:00:00.000000000 -0800 46239 +++ ncurses-5.7/ncurses/win32con/gettimeofday.c 2009-07-19 15:04:11.000000000 -0700 46240 @@ -0,0 +1,51 @@ 46241 +/**************************************************************************** 46242 + * Copyright (c) 2008 Free Software Foundation, Inc. * 46243 + * * 46244 + * Permission is hereby granted, free of charge, to any person obtaining a * 46245 + * copy of this software and associated documentation files (the * 46246 + * "Software"), to deal in the Software without restriction, including * 46247 + * without limitation the rights to use, copy, modify, merge, publish, * 46248 + * distribute, distribute with modifications, sublicense, and/or sell * 46249 + * copies of the Software, and to permit persons to whom the Software is * 46250 + * furnished to do so, subject to the following conditions: * 46251 + * * 46252 + * The above copyright notice and this permission notice shall be included * 46253 + * in all copies or substantial portions of the Software. * 46254 + * * 46255 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * 46256 + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * 46257 + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * 46258 + * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * 46259 + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * 46260 + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * 46261 + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * 46262 + * * 46263 + * Except as contained in this notice, the name(s) of the above copyright * 46264 + * holders shall not be used in advertising or otherwise to promote the * 46265 + * sale, use or other dealings in this Software without prior written * 46266 + * authorization. * 46267 + ****************************************************************************/ 46268 + 46269 +#define WINVER 0x0501 46270 + 46271 +#include <curses.priv.h> 46272 + 46273 +#include <windows.h> 46274 + 46275 +MODULE_ID("$Id: gettimeofday.c,v 1.1 2008/12/07 02:07:39 juergen Exp $") 46276 + 46277 +#define JAN1970 116444736000000000LL /* the value for 01/01/1970 00:00 */ 46278 + 46279 +int 46280 +gettimeofday(struct timeval *tv, void *tz) 46281 +{ 46282 + union { 46283 + FILETIME ft; 46284 + long long since1601; /* time since 1 Jan 1601 in 100ns units */ 46285 + } data; 46286 + 46287 + GetSystemTimeAsFileTime(&data.ft); 46288 + tv->tv_usec = (long) ((data.since1601 / 10LL) % 1000000LL); 46289 + tv->tv_sec = (long) ((data.since1601 - JAN1970) / 10000000LL); 46290 + return (0); 46291 +} 46292 diff -Naur ncurses-5.7.orig/ncurses/win32con/win_driver.c ncurses-5.7/ncurses/win32con/win_driver.c 46293 --- ncurses-5.7.orig/ncurses/win32con/win_driver.c 1969-12-31 16:00:00.000000000 -0800 46294 +++ ncurses-5.7/ncurses/win32con/win_driver.c 2009-07-19 15:04:11.000000000 -0700 46295 @@ -0,0 +1,1085 @@ 46296 +/**************************************************************************** 46297 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 46298 + * * 46299 + * Permission is hereby granted, free of charge, to any person obtaining a * 46300 + * copy of this software and associated documentation files (the * 46301 + * "Software"), to deal in the Software without restriction, including * 46302 + * without limitation the rights to use, copy, modify, merge, publish, * 46303 + * distribute, distribute with modifications, sublicense, and/or sell * 46304 + * copies of the Software, and to permit persons to whom the Software is * 46305 + * furnished to do so, subject to the following conditions: * 46306 + * * 46307 + * The above copyright notice and this permission notice shall be included * 46308 + * in all copies or substantial portions of the Software. * 46309 + * * 46310 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * 46311 + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * 46312 + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * 46313 + * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * 46314 + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * 46315 + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * 46316 + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * 46317 + * * 46318 + * Except as contained in this notice, the name(s) of the above copyright * 46319 + * holders shall not be used in advertising or otherwise to promote the * 46320 + * sale, use or other dealings in this Software without prior written * 46321 + * authorization. * 46322 + ****************************************************************************/ 46323 + 46324 +/**************************************************************************** 46325 + * Author: Juergen Pfeifer * 46326 + * * 46327 + ****************************************************************************/ 46328 + 46329 +#include <curses.priv.h> 46330 + 46331 +MODULE_ID("$Id: win_driver.c,v 1.1 2009/02/21 15:11:29 juergen Exp $") 46332 + 46333 +static bool drv_CanHandle(TERMINAL_CONTROL_BLOCK * TCB, const char *tname, int *); 46334 +static void drv_init(TERMINAL_CONTROL_BLOCK *); 46335 +static void drv_release(TERMINAL_CONTROL_BLOCK *); 46336 +static int drv_size(TERMINAL_CONTROL_BLOCK *, int *, int *); 46337 +static int drv_sgmode(TERMINAL_CONTROL_BLOCK * TCB, 46338 + bool setFlag, 46339 + TTY * buf); 46340 +static chtype drv_conattr(TERMINAL_CONTROL_BLOCK * TCB); 46341 + 46342 +static int drv_mvcur(TERMINAL_CONTROL_BLOCK * TCB, 46343 + int yold, int xold, int ynew, int xnew); 46344 +static int drv_mode(TERMINAL_CONTROL_BLOCK * TCB, 46345 + bool progFlag, bool defFlag); 46346 +static bool drv_rescol(TERMINAL_CONTROL_BLOCK * TCB); 46347 +static bool drv_rescolors(TERMINAL_CONTROL_BLOCK * TCB); 46348 +static void drv_setcolor(TERMINAL_CONTROL_BLOCK * TCB, 46349 + bool fore, 46350 + int color, 46351 + int (*outc) (SCREEN *, int)); 46352 +static int drv_dobeepflash(TERMINAL_CONTROL_BLOCK * TCB, bool); 46353 +static void drv_initpair(TERMINAL_CONTROL_BLOCK * TCB, 46354 + short pair, 46355 + short f, 46356 + short b); 46357 +static void drv_initcolor(TERMINAL_CONTROL_BLOCK * TCB, 46358 + short color, 46359 + short r, 46360 + short g, 46361 + short b); 46362 +static void drv_do_color(TERMINAL_CONTROL_BLOCK * TCB, 46363 + short old_pair, 46364 + short pair, 46365 + bool reverse, 46366 + int (*outc) (SCREEN *, int)); 46367 +static void drv_initmouse(TERMINAL_CONTROL_BLOCK * TCB); 46368 +static void drv_setfilter(TERMINAL_CONTROL_BLOCK * TCB); 46369 +static void drv_hwlabel(TERMINAL_CONTROL_BLOCK * TCB, 46370 + int labnum, 46371 + char *text); 46372 +static void drv_hwlabelOnOff(TERMINAL_CONTROL_BLOCK * TCB, 46373 + bool OnFlag); 46374 +static int drv_doupdate(TERMINAL_CONTROL_BLOCK * TCB); 46375 + 46376 +static int drv_defaultcolors(TERMINAL_CONTROL_BLOCK * TCB, 46377 + int fg, 46378 + int bg); 46379 +static int drv_print(TERMINAL_CONTROL_BLOCK * TCB, 46380 + char *data, 46381 + int len); 46382 +/*static int _getsize(TERMINAL_CONTROL_BLOCK*,int *, int *);*/ 46383 +static int drv_setsize(TERMINAL_CONTROL_BLOCK * TCB, int l, int c); 46384 +static void drv_initacs(TERMINAL_CONTROL_BLOCK * TCB, chtype *, chtype *); 46385 +static void drv_wrap(SCREEN *); 46386 +static void drv_screen_init(SCREEN *); 46387 +static int drv_twait(TERMINAL_CONTROL_BLOCK *, 46388 + int, 46389 + int, 46390 + int *EVENTLIST_2nd(_nc_eventlist *)); 46391 +static int drv_read(TERMINAL_CONTROL_BLOCK * TCB, int *buf); 46392 +static int drv_nap(TERMINAL_CONTROL_BLOCK * TCB GCC_UNUSED, int ms); 46393 +static int drv_kpad(TERMINAL_CONTROL_BLOCK * TCB, bool); 46394 +static int drv_keyok(TERMINAL_CONTROL_BLOCK * TCB, int, bool); 46395 +static bool drv_kyExist(TERMINAL_CONTROL_BLOCK * TCB, int); 46396 + 46397 +NCURSES_EXPORT_VAR (TERM_DRIVER) _nc_WIN_DRIVER = { 46398 + FALSE, 46399 + drv_CanHandle, /* CanHandle */ 46400 + drv_init, /* init */ 46401 + drv_release, /* release */ 46402 + drv_size, /* size */ 46403 + drv_sgmode, /* sgmode */ 46404 + drv_conattr, /* conattr */ 46405 + drv_mvcur, /* hwcur */ 46406 + drv_mode, /* mode */ 46407 + drv_rescol, /* rescol */ 46408 + drv_rescolors, /* rescolors */ 46409 + drv_setcolor, /* color */ 46410 + drv_dobeepflash, /* DoBeepFlash */ 46411 + drv_initpair, /* initpair */ 46412 + drv_initcolor, /* initcolor */ 46413 + drv_do_color, /* docolor */ 46414 + drv_initmouse, /* initmouse */ 46415 + drv_setfilter, /* setfilter */ 46416 + drv_hwlabel, /* hwlabel */ 46417 + drv_hwlabelOnOff, /* hwlabelOnOff */ 46418 + drv_doupdate, /* update */ 46419 + drv_defaultcolors, /* defaultcolors */ 46420 + drv_print, /* print */ 46421 + drv_size, /* getsize */ 46422 + drv_setsize, /* setsize */ 46423 + drv_initacs, /* initacs */ 46424 + drv_screen_init, /* scinit */ 46425 + drv_wrap, /* scexit */ 46426 + drv_twait, /* twait */ 46427 + drv_read, /* read */ 46428 + drv_nap, /* nap */ 46429 + drv_kpad, /* kpad */ 46430 + drv_keyok, /* kyOk */ 46431 + drv_kyExist /* kyExist */ 46432 +}; 46433 + 46434 +#define WINMAGIC NCDRV_MAGIC(NCDRV_WINCONSOLE) 46435 + 46436 +#define AssertTCB() assert(TCB!=0 && TCB->magic==WINMAGIC) 46437 +#define SetSP() assert(TCB->csp!=0); sp = TCB->csp 46438 + 46439 +#define GenMap(vKey,key) MAKELONG(key, vKey) 46440 + 46441 +static const LONG keylist[] = 46442 +{ 46443 + GenMap(VK_PRIOR, KEY_PPAGE), 46444 + GenMap(VK_NEXT, KEY_NPAGE), 46445 + GenMap(VK_END, KEY_END), 46446 + GenMap(VK_HOME, KEY_HOME), 46447 + GenMap(VK_LEFT, KEY_LEFT), 46448 + GenMap(VK_UP, KEY_UP), 46449 + GenMap(VK_RIGHT, KEY_RIGHT), 46450 + GenMap(VK_DOWN, KEY_DOWN), 46451 + GenMap(VK_DELETE, KEY_DC), 46452 + GenMap(VK_INSERT, KEY_IC) 46453 +}; 46454 +#define N_INI ((int)(sizeof(keylist)/sizeof(keylist[0]))) 46455 +#define FKEYS 24 46456 +#define MAPSIZE (FKEYS + N_INI) 46457 +#define NUMPAIRS 64 46458 + 46459 +typedef struct props { 46460 + CONSOLE_SCREEN_BUFFER_INFO SBI; 46461 + bool progMode; 46462 + DWORD map[MAPSIZE]; 46463 + DWORD rmap[MAPSIZE]; 46464 + WORD pairs[NUMPAIRS]; 46465 +} Properties; 46466 + 46467 +#define PropOf(TCB) ((Properties*)TCB->prop) 46468 + 46469 +int 46470 +_nc_mingw_ioctl(int fd GCC_UNUSED, 46471 + long int request GCC_UNUSED, 46472 + struct termios *arg GCC_UNUSED) 46473 +{ 46474 + return 0; 46475 + endwin(); 46476 + fprintf(stderr, "TERMINFO currently not supported on Windows.\n"); 46477 + exit(1); 46478 +} 46479 + 46480 +static WORD 46481 +MapColor(bool fore, int color) 46482 +{ 46483 + static const int _cmap[] = 46484 + {0, 4, 2, 6, 1, 5, 3, 7}; 46485 + int a; 46486 + if (color < 0 || color > 7) 46487 + a = fore ? 7 : 0; 46488 + else 46489 + a = _cmap[color]; 46490 + if (!fore) 46491 + a = a << 4; 46492 + return (WORD) a; 46493 +} 46494 + 46495 +static WORD 46496 +MapAttr(TERMINAL_CONTROL_BLOCK * TCB, WORD res, chtype ch) 46497 +{ 46498 + if (ch & A_COLOR) { 46499 + int p; 46500 + SCREEN *sp; 46501 + 46502 + AssertTCB(); 46503 + SetSP(); 46504 + p = PAIR_NUMBER(ch); 46505 + if (p > 0 && p < NUMPAIRS && TCB != 0 && sp != 0) { 46506 + WORD a; 46507 + a = PropOf(TCB)->pairs[p]; 46508 + res = (res & 0xff00) | a; 46509 + } 46510 + } 46511 + 46512 + if (ch & A_REVERSE) 46513 + res = ((res & 0xff00) | (((res & 0x07) << 4) | ((res & 0x70) >> 4))); 46514 + 46515 + if (ch & A_STANDOUT) 46516 + res = ((res & 0xff00) | (((res & 0x07) << 4) | ((res & 0x70) >> 4)) 46517 + | BACKGROUND_INTENSITY); 46518 + 46519 + if (ch & A_BOLD) 46520 + res |= FOREGROUND_INTENSITY; 46521 + 46522 + if (ch & A_DIM) 46523 + res |= BACKGROUND_INTENSITY; 46524 + 46525 + return res; 46526 +} 46527 + 46528 +static BOOL 46529 +con_write(TERMINAL_CONTROL_BLOCK * TCB, int y, int x, chtype *str, int n) 46530 +{ 46531 + CHAR_INFO ci[n]; 46532 + COORD loc, siz; 46533 + SMALL_RECT rec; 46534 + int i; 46535 + chtype ch; 46536 + SCREEN *sp; 46537 + 46538 + AssertTCB(); 46539 + 46540 + if (TCB == 0 || InvalidConsoleHandle(TCB->hdl)) 46541 + return FALSE; 46542 + 46543 + SetSP(); 46544 + 46545 + for (i = 0; i < n; i++) { 46546 + ch = str[i]; 46547 + ci[i].Char.AsciiChar = ChCharOf(ch); 46548 + ci[i].Attributes = MapAttr(TCB, 46549 + PropOf(TCB)->SBI.wAttributes, 46550 + ChAttrOf(ch)); 46551 + if (ChAttrOf(ch) & A_ALTCHARSET) { 46552 + if (sp->_acs_map) 46553 + ci[i].Char.AsciiChar = 46554 + ChCharOf(NCURSES_SP_NAME(_nc_acs_char) (sp, ChCharOf(ch))); 46555 + } 46556 + } 46557 + 46558 + loc.X = (short) 0; 46559 + loc.Y = (short) 0; 46560 + siz.X = (short) n; 46561 + siz.Y = 1; 46562 + 46563 + rec.Left = (short) x; 46564 + rec.Top = (short) y; 46565 + rec.Right = (short) (x + n - 1); 46566 + rec.Bottom = rec.Top; 46567 + 46568 + return WriteConsoleOutput(TCB->hdl, ci, siz, loc, &rec); 46569 +} 46570 + 46571 +#define MARK_NOCHANGE(win,row) \ 46572 + win->_line[row].firstchar = _NOCHANGE; \ 46573 + win->_line[row].lastchar = _NOCHANGE 46574 + 46575 +static int 46576 +drv_doupdate(TERMINAL_CONTROL_BLOCK * TCB) 46577 +{ 46578 + int y, nonempty, n, x0, x1, Width, Height; 46579 + SCREEN *sp; 46580 + 46581 + AssertTCB(); 46582 + SetSP(); 46583 + 46584 + Width = screen_columns(sp); 46585 + Height = screen_lines(sp); 46586 + nonempty = min(Height, sp->_newscr->_maxy + 1); 46587 + 46588 + if ((sp->_curscr->_clear || sp->_newscr->_clear)) { 46589 + int x; 46590 + chtype empty[Width]; 46591 + 46592 + for (x = 0; x < Width; x++) 46593 + empty[x] = ' '; 46594 + 46595 + for (y = 0; y < nonempty; y++) { 46596 + con_write(TCB, y, 0, empty, Width); 46597 + memcpy(empty, 46598 + sp->_curscr->_line[y].text, 46599 + Width * sizeof(chtype)); 46600 + } 46601 + sp->_curscr->_clear = FALSE; 46602 + sp->_newscr->_clear = FALSE; 46603 + touchwin(sp->_newscr); 46604 + } 46605 + 46606 + for (y = 0; y < nonempty; y++) { 46607 + x0 = sp->_newscr->_line[y].firstchar; 46608 + if (x0 != _NOCHANGE) { 46609 + x1 = sp->_newscr->_line[y].lastchar; 46610 + n = x1 - x0 + 1; 46611 + if (n > 0) { 46612 + memcpy(sp->_curscr->_line[y].text + x0, 46613 + sp->_newscr->_line[y].text + x0, 46614 + n * sizeof(chtype)); 46615 + con_write(TCB, 46616 + y, 46617 + x0, 46618 + ((chtype *) sp->_curscr->_line[y].text) + x0, n); 46619 + 46620 + /* mark line changed successfully */ 46621 + if (y <= sp->_newscr->_maxy) { 46622 + MARK_NOCHANGE(sp->_newscr, y); 46623 + } 46624 + if (y <= sp->_curscr->_maxy) { 46625 + MARK_NOCHANGE(sp->_curscr, y); 46626 + } 46627 + } 46628 + } 46629 + } 46630 + 46631 + /* put everything back in sync */ 46632 + for (y = nonempty; y <= sp->_newscr->_maxy; y++) { 46633 + MARK_NOCHANGE(sp->_newscr, y); 46634 + } 46635 + for (y = nonempty; y <= sp->_curscr->_maxy; y++) { 46636 + MARK_NOCHANGE(sp->_curscr, y); 46637 + } 46638 + 46639 + if (!sp->_newscr->_leaveok) { 46640 + sp->_curscr->_curx = sp->_newscr->_curx; 46641 + sp->_curscr->_cury = sp->_newscr->_cury; 46642 + 46643 + TCB->drv->hwcur(TCB, 0, 0, sp->_curscr->_cury, sp->_curscr->_curx); 46644 + } 46645 + SetConsoleActiveScreenBuffer(TCB->hdl); 46646 + return OK; 46647 +} 46648 + 46649 +static bool 46650 +drv_CanHandle(TERMINAL_CONTROL_BLOCK * TCB, 46651 + const char *tname, 46652 + int *errret GCC_UNUSED) 46653 +{ 46654 + assert(TCB != 0); 46655 + assert(tname != 0); 46656 + TCB->magic = WINMAGIC; 46657 + if (*tname == 0 || *tname == 0 || strcmp(tname, "unknown") == 0) { 46658 + return TRUE; 46659 + } else 46660 + return FALSE; 46661 +} 46662 + 46663 +static int 46664 +drv_dobeepflash(TERMINAL_CONTROL_BLOCK * TCB, 46665 + bool beepFlag GCC_UNUSED) 46666 +{ 46667 + SCREEN *sp; 46668 + int res = ERR; 46669 + 46670 + AssertTCB(); 46671 + SetSP(); 46672 + 46673 + return res; 46674 +} 46675 + 46676 +static int 46677 +drv_print(TERMINAL_CONTROL_BLOCK * TCB, 46678 + char *data GCC_UNUSED, 46679 + int len GCC_UNUSED) 46680 +{ 46681 + SCREEN *sp; 46682 + 46683 + AssertTCB(); 46684 + SetSP(); 46685 + 46686 + return ERR; 46687 +} 46688 + 46689 +static int 46690 +drv_defaultcolors(TERMINAL_CONTROL_BLOCK * TCB, 46691 + int fg GCC_UNUSED, 46692 + int bg GCC_UNUSED) 46693 +{ 46694 + SCREEN *sp; 46695 + int code = ERR; 46696 + 46697 + AssertTCB(); 46698 + SetSP(); 46699 + 46700 + return (code); 46701 +} 46702 + 46703 +static void 46704 +drv_setcolor(TERMINAL_CONTROL_BLOCK * TCB, 46705 + bool fore, 46706 + int color, 46707 + int (*outc) (SCREEN *, int) GCC_UNUSED) 46708 +{ 46709 + AssertTCB(); 46710 + 46711 + if (TCB && !InvalidConsoleHandle(TCB->hdl)) { 46712 + WORD a = MapColor(fore, color); 46713 + a = ((PropOf(TCB)->SBI.wAttributes) & (fore ? 0xfff8 : 0xff8f)) | a; 46714 + SetConsoleTextAttribute(TCB->hdl, a); 46715 + GetConsoleScreenBufferInfo(TCB->hdl, &(PropOf(TCB)->SBI)); 46716 + } 46717 +} 46718 + 46719 +static bool 46720 +drv_rescol(TERMINAL_CONTROL_BLOCK * TCB) 46721 +{ 46722 + bool res = FALSE; 46723 + 46724 + AssertTCB(); 46725 + if (TCB && !InvalidConsoleHandle(TCB->hdl)) { 46726 + WORD a = FOREGROUND_BLUE | FOREGROUND_RED | FOREGROUND_GREEN; 46727 + SetConsoleTextAttribute(TCB->hdl, a); 46728 + GetConsoleScreenBufferInfo(TCB->hdl, &(PropOf(TCB)->SBI)); 46729 + res = TRUE; 46730 + } 46731 + return res; 46732 +} 46733 + 46734 +static bool 46735 +drv_rescolors(TERMINAL_CONTROL_BLOCK * TCB) 46736 +{ 46737 + int result = FALSE; 46738 + SCREEN *sp; 46739 + 46740 + AssertTCB(); 46741 + SetSP(); 46742 + 46743 + return result; 46744 +} 46745 + 46746 +static int 46747 +drv_size(TERMINAL_CONTROL_BLOCK * TCB, int *Lines, int *Cols) 46748 +{ 46749 + AssertTCB(); 46750 + 46751 + if (TCB == NULL || Lines == NULL || Cols == NULL || InvalidConsoleHandle(TCB->hdl)) 46752 + return ERR; 46753 + 46754 + *Lines = (int) (PropOf(TCB)->SBI.dwSize.Y); 46755 + *Cols = (int) (PropOf(TCB)->SBI.dwSize.X); 46756 + return OK; 46757 +} 46758 + 46759 +static int 46760 +drv_setsize(TERMINAL_CONTROL_BLOCK * TCB GCC_UNUSED, 46761 + int l GCC_UNUSED, 46762 + int c GCC_UNUSED) 46763 +{ 46764 + AssertTCB(); 46765 + return ERR; 46766 +} 46767 + 46768 +static int 46769 +drv_mode(TERMINAL_CONTROL_BLOCK * TCB, bool progFlag, bool defFlag) 46770 +{ 46771 + SCREEN *sp; 46772 + TERMINAL *_term = (TERMINAL *) TCB; 46773 + int code = ERR; 46774 + 46775 + AssertTCB(); 46776 + sp = TCB->csp; 46777 + 46778 + PropOf(TCB)->progMode = progFlag; 46779 + SetConsoleActiveScreenBuffer(progFlag ? TCB->hdl : TCB->out); 46780 + 46781 + if (progFlag) /* prog mode */ { 46782 + if (defFlag) { 46783 + if ((drv_sgmode(TCB, FALSE, &(_term->Nttyb)) == OK)) { 46784 + _term->Nttyb.c_oflag &= ~OFLAGS_TABS; 46785 + code = OK; 46786 + } 46787 + } else { 46788 + /* reset_prog_mode */ 46789 + if (drv_sgmode(TCB, TRUE, &(_term->Nttyb)) == OK) { 46790 + if (sp) { 46791 + if (sp->_keypad_on) 46792 + _nc_keypad(sp, TRUE); 46793 + NC_BUFFERED(sp, TRUE); 46794 + } 46795 + code = OK; 46796 + } 46797 + } 46798 + } else { /* shell mode */ 46799 + if (defFlag) { 46800 + /* def_shell_mode */ 46801 + if (drv_sgmode(TCB, FALSE, &(_term->Ottyb)) == OK) { 46802 + code = OK; 46803 + } 46804 + } else { 46805 + /* reset_shell_mode */ 46806 + if (sp) { 46807 + _nc_keypad(sp, FALSE); 46808 + NCURSES_SP_NAME(_nc_flush) (sp); 46809 + NC_BUFFERED(sp, FALSE); 46810 + } 46811 + code = drv_sgmode(TCB, TRUE, &(_term->Ottyb)); 46812 + } 46813 + } 46814 + 46815 + return (code); 46816 +} 46817 + 46818 +static void 46819 +drv_screen_init(SCREEN *sp GCC_UNUSED) 46820 +{ 46821 +} 46822 + 46823 +static void 46824 +drv_wrap(SCREEN *sp GCC_UNUSED) 46825 +{ 46826 +} 46827 + 46828 +static int 46829 +rkeycompare(const void *el1, const void *el2) 46830 +{ 46831 + WORD key1 = (LOWORD((*((const LONG *) el1)))) & 0x7fff; 46832 + WORD key2 = (LOWORD((*((const LONG *) el2)))) & 0x7fff; 46833 + 46834 + return ((key1 < key2) ? -1 : ((key1 == key2) ? 0 : 1)); 46835 +} 46836 + 46837 +static int 46838 +keycompare(const void *el1, const void *el2) 46839 +{ 46840 + WORD key1 = HIWORD((*((const LONG *) el1))); 46841 + WORD key2 = HIWORD((*((const LONG *) el2))); 46842 + 46843 + return ((key1 < key2) ? -1 : ((key1 == key2) ? 0 : 1)); 46844 +} 46845 + 46846 +static int 46847 +MapKey(TERMINAL_CONTROL_BLOCK * TCB, WORD vKey) 46848 +{ 46849 + WORD nKey = 0; 46850 + void *res; 46851 + LONG key = GenMap(vKey, 0); 46852 + int code = -1; 46853 + 46854 + AssertTCB(); 46855 + 46856 + res = bsearch(&key, 46857 + PropOf(TCB)->map, 46858 + (size_t) (N_INI + FKEYS), 46859 + sizeof(keylist[0]), 46860 + keycompare); 46861 + if (res) { 46862 + key = *((LONG *) res); 46863 + nKey = LOWORD(key); 46864 + code = (int) (nKey & 0x7fff); 46865 + if (nKey & 0x8000) 46866 + code = -code; 46867 + } 46868 + return code; 46869 +} 46870 + 46871 +static void 46872 +drv_release(TERMINAL_CONTROL_BLOCK * TCB) 46873 +{ 46874 + AssertTCB(); 46875 + if (TCB->prop) 46876 + free(TCB->prop); 46877 +} 46878 + 46879 +static void 46880 +drv_init(TERMINAL_CONTROL_BLOCK * TCB) 46881 +{ 46882 + AssertTCB(); 46883 + 46884 + if (TCB) { 46885 + BOOL b = AllocConsole(); 46886 + WORD a; 46887 + int i; 46888 + 46889 + if (!b) 46890 + b = AttachConsole(ATTACH_PARENT_PROCESS); 46891 + 46892 + TCB->inp = GetStdHandle(STD_INPUT_HANDLE); 46893 + TCB->out = GetStdHandle(STD_OUTPUT_HANDLE); 46894 + 46895 + if (getenv("NCGDB")) 46896 + TCB->hdl = TCB->out; 46897 + else 46898 + TCB->hdl = CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE, 46899 + 0, 46900 + NULL, 46901 + CONSOLE_TEXTMODE_BUFFER, 46902 + NULL); 46903 + 46904 + if (!InvalidConsoleHandle(TCB->hdl)) { 46905 + TCB->prop = typeCalloc(Properties, 1); 46906 + GetConsoleScreenBufferInfo(TCB->hdl, &(PropOf(TCB)->SBI)); 46907 + } 46908 + 46909 + TCB->info.initcolor = TRUE; 46910 + TCB->info.canchange = FALSE; 46911 + TCB->info.hascolor = TRUE; 46912 + TCB->info.caninit = TRUE; 46913 + 46914 + TCB->info.maxpairs = NUMPAIRS; 46915 + TCB->info.maxcolors = 8; 46916 + TCB->info.numlabels = 0; 46917 + TCB->info.labelwidth = 0; 46918 + TCB->info.labelheight = 0; 46919 + TCB->info.nocolorvideo = 1; 46920 + TCB->info.tabsize = 8; 46921 + 46922 + TCB->info.defaultPalette = _nc_cga_palette; 46923 + 46924 + for (i = 0; i < (N_INI + FKEYS); i++) { 46925 + if (i < N_INI) 46926 + PropOf(TCB)->rmap[i] = PropOf(TCB)->map[i] = keylist[i]; 46927 + else 46928 + PropOf(TCB)->rmap[i] = PropOf(TCB)->map[i] = 46929 + GenMap((VK_F1 + (i - N_INI)), (KEY_F(1) + (i - N_INI))); 46930 + } 46931 + qsort(PropOf(TCB)->map, 46932 + (size_t) (MAPSIZE), 46933 + sizeof(keylist[0]), 46934 + keycompare); 46935 + qsort(PropOf(TCB)->rmap, 46936 + (size_t) (MAPSIZE), 46937 + sizeof(keylist[0]), 46938 + rkeycompare); 46939 + 46940 + a = MapColor(true, COLOR_WHITE) | MapColor(false, COLOR_BLACK); 46941 + for (i = 0; i < NUMPAIRS; i++) 46942 + PropOf(TCB)->pairs[i] = a; 46943 + } 46944 +} 46945 + 46946 +static void 46947 +drv_initpair(TERMINAL_CONTROL_BLOCK * TCB, 46948 + short pair, 46949 + short f, 46950 + short b) 46951 +{ 46952 + SCREEN *sp; 46953 + 46954 + AssertTCB(); 46955 + SetSP(); 46956 + 46957 + if ((pair > 0) && (pair < NUMPAIRS) && (f >= 0) && (f < 8) 46958 + && (b >= 0) && (b < 8)) { 46959 + PropOf(TCB)->pairs[pair] = MapColor(true, f) | MapColor(false, b); 46960 + } 46961 +} 46962 + 46963 +static void 46964 +drv_initcolor(TERMINAL_CONTROL_BLOCK * TCB, 46965 + short color GCC_UNUSED, 46966 + short r GCC_UNUSED, 46967 + short g GCC_UNUSED, 46968 + short b GCC_UNUSED) 46969 +{ 46970 + SCREEN *sp; 46971 + 46972 + AssertTCB(); 46973 + SetSP(); 46974 +} 46975 + 46976 +static void 46977 +drv_do_color(TERMINAL_CONTROL_BLOCK * TCB, 46978 + short old_pair GCC_UNUSED, 46979 + short pair GCC_UNUSED, 46980 + bool reverse GCC_UNUSED, 46981 + int (*outc) (SCREEN *, int) GCC_UNUSED 46982 +) 46983 +{ 46984 + SCREEN *sp; 46985 + 46986 + AssertTCB(); 46987 + SetSP(); 46988 +} 46989 + 46990 +static void 46991 +drv_initmouse(TERMINAL_CONTROL_BLOCK * TCB) 46992 +{ 46993 + SCREEN *sp; 46994 + 46995 + AssertTCB(); 46996 + SetSP(); 46997 +} 46998 + 46999 +static int 47000 +drv_mvcur(TERMINAL_CONTROL_BLOCK * TCB, 47001 + int yold GCC_UNUSED, int xold GCC_UNUSED, 47002 + int y, int x) 47003 +{ 47004 + int ret = ERR; 47005 + if (TCB && !InvalidConsoleHandle(TCB->hdl)) { 47006 + COORD loc; 47007 + loc.X = (short) x; 47008 + loc.Y = (short) y; 47009 + SetConsoleCursorPosition(TCB->hdl, loc); 47010 + ret = OK; 47011 + } 47012 + return ret; 47013 +} 47014 + 47015 +static void 47016 +drv_hwlabel(TERMINAL_CONTROL_BLOCK * TCB, 47017 + int labnum GCC_UNUSED, 47018 + char *text GCC_UNUSED) 47019 +{ 47020 + SCREEN *sp; 47021 + 47022 + AssertTCB(); 47023 + SetSP(); 47024 +} 47025 + 47026 +static void 47027 +drv_hwlabelOnOff(TERMINAL_CONTROL_BLOCK * TCB, 47028 + bool OnFlag GCC_UNUSED) 47029 +{ 47030 + SCREEN *sp; 47031 + 47032 + AssertTCB(); 47033 + SetSP(); 47034 +} 47035 + 47036 +static chtype 47037 +drv_conattr(TERMINAL_CONTROL_BLOCK * TCB GCC_UNUSED) 47038 +{ 47039 + chtype res = A_NORMAL; 47040 + res |= (A_BOLD | A_DIM | A_REVERSE | A_STANDOUT | A_COLOR); 47041 + return res; 47042 +} 47043 + 47044 +static void 47045 +drv_setfilter(TERMINAL_CONTROL_BLOCK * TCB) 47046 +{ 47047 + SCREEN *sp; 47048 + 47049 + AssertTCB(); 47050 + SetSP(); 47051 +} 47052 + 47053 +static int 47054 +drv_sgmode(TERMINAL_CONTROL_BLOCK * TCB, bool setFlag, TTY * buf) 47055 +{ 47056 + DWORD dwFlag = 0; 47057 + tcflag_t iflag; 47058 + tcflag_t lflag; 47059 + 47060 + AssertTCB(); 47061 + 47062 + if (TCB == 0 || buf == NULL) 47063 + return ERR; 47064 + 47065 + if (setFlag) { 47066 + iflag = buf->c_iflag; 47067 + lflag = buf->c_lflag; 47068 + 47069 + GetConsoleMode(TCB->inp, &dwFlag); 47070 + 47071 + if (lflag & ICANON) 47072 + dwFlag |= ENABLE_LINE_INPUT; 47073 + else 47074 + dwFlag &= ~ENABLE_LINE_INPUT; 47075 + 47076 + if (lflag & ECHO) 47077 + dwFlag |= ENABLE_ECHO_INPUT; 47078 + else 47079 + dwFlag &= ~ENABLE_ECHO_INPUT; 47080 + 47081 + if (iflag & BRKINT) 47082 + dwFlag |= ENABLE_PROCESSED_INPUT; 47083 + else 47084 + dwFlag &= ~ENABLE_PROCESSED_INPUT; 47085 + 47086 + /* we disable that for now to focus on keyboard. */ 47087 + dwFlag &= ~ENABLE_MOUSE_INPUT; 47088 + 47089 + buf->c_iflag = iflag; 47090 + buf->c_lflag = lflag; 47091 + SetConsoleMode(TCB->inp, dwFlag); 47092 + TCB->term.Nttyb = *buf; 47093 + } else { 47094 + iflag = TCB->term.Nttyb.c_iflag; 47095 + lflag = TCB->term.Nttyb.c_lflag; 47096 + GetConsoleMode(TCB->inp, &dwFlag); 47097 + 47098 + if (dwFlag & ENABLE_LINE_INPUT) 47099 + lflag |= ICANON; 47100 + else 47101 + lflag &= ~ICANON; 47102 + 47103 + if (dwFlag & ENABLE_ECHO_INPUT) 47104 + lflag |= ECHO; 47105 + else 47106 + lflag &= ~ECHO; 47107 + 47108 + if (dwFlag & ENABLE_PROCESSED_INPUT) 47109 + iflag |= BRKINT; 47110 + else 47111 + iflag &= ~BRKINT; 47112 + 47113 + TCB->term.Nttyb.c_iflag = iflag; 47114 + TCB->term.Nttyb.c_lflag = lflag; 47115 + 47116 + *buf = TCB->term.Nttyb; 47117 + } 47118 + return OK; 47119 +} 47120 + 47121 +static void 47122 +drv_initacs(TERMINAL_CONTROL_BLOCK * TCB, 47123 + chtype *real_map GCC_UNUSED, 47124 + chtype *fake_map GCC_UNUSED) 47125 +{ 47126 + SCREEN *sp; 47127 + AssertTCB(); 47128 + SetSP(); 47129 +} 47130 + 47131 +static ULONGLONG 47132 +tdiff(FILETIME fstart, FILETIME fend) 47133 +{ 47134 + ULARGE_INTEGER ustart; 47135 + ULARGE_INTEGER uend; 47136 + ULONGLONG diff; 47137 + 47138 + ustart.LowPart = fstart.dwLowDateTime; 47139 + ustart.HighPart = fstart.dwHighDateTime; 47140 + uend.LowPart = fend.dwLowDateTime; 47141 + uend.HighPart = fend.dwHighDateTime; 47142 + 47143 + diff = (uend.QuadPart - ustart.QuadPart) / 10000; 47144 + return diff; 47145 +} 47146 + 47147 +static int 47148 +Adjust(int milliseconds, int diff) 47149 +{ 47150 + if (milliseconds == INFINITY) 47151 + return milliseconds; 47152 + milliseconds -= diff; 47153 + if (milliseconds < 0) 47154 + milliseconds = 0; 47155 + return milliseconds; 47156 +} 47157 + 47158 +static int 47159 +drv_twait(TERMINAL_CONTROL_BLOCK * TCB, 47160 + int mode, 47161 + int milliseconds, 47162 + int *timeleft 47163 + EVENTLIST_2nd(_nc_eventlist * evl)) 47164 +{ 47165 + SCREEN *sp; 47166 + INPUT_RECORD inp; 47167 + BOOL b; 47168 + DWORD nRead = 0, rc = -1; 47169 + int code = 0; 47170 + FILETIME fstart; 47171 + FILETIME fend; 47172 + int diff; 47173 + bool isImmed = (milliseconds == 0); 47174 + 47175 +#define CONSUME() ReadConsoleInput(TCB->inp,&inp,1,&nRead) 47176 + 47177 + AssertTCB(); 47178 + SetSP(); 47179 + 47180 + if (milliseconds < 0) 47181 + milliseconds = INFINITY; 47182 + 47183 + memset(&inp, 0, sizeof(inp)); 47184 + 47185 + while (true) { 47186 + GetSystemTimeAsFileTime(&fstart); 47187 + rc = WaitForSingleObject(TCB->inp, milliseconds); 47188 + GetSystemTimeAsFileTime(&fend); 47189 + diff = (int) tdiff(fstart, fend); 47190 + milliseconds = Adjust(milliseconds, diff); 47191 + 47192 + if (!isImmed && milliseconds == 0) 47193 + break; 47194 + 47195 + if (rc == WAIT_OBJECT_0) { 47196 + if (mode) { 47197 + b = GetNumberOfConsoleInputEvents(TCB->inp, &nRead); 47198 + if (b && nRead > 0) { 47199 + b = PeekConsoleInput(TCB->inp, &inp, 1, &nRead); 47200 + if (b && nRead > 0) { 47201 + switch (inp.EventType) { 47202 + case KEY_EVENT: 47203 + if (mode & TW_INPUT) { 47204 + WORD vk = inp.Event.KeyEvent.wVirtualKeyCode; 47205 + char ch = inp.Event.KeyEvent.uChar.AsciiChar; 47206 + 47207 + if (inp.Event.KeyEvent.bKeyDown) { 47208 + if (0 == ch) { 47209 + int nKey = MapKey(TCB, vk); 47210 + if ((nKey < 0) || FALSE == sp->_keypad_on) { 47211 + CONSUME(); 47212 + continue; 47213 + } 47214 + } 47215 + code = TW_INPUT; 47216 + goto end; 47217 + } else { 47218 + CONSUME(); 47219 + } 47220 + } 47221 + continue; 47222 + case MOUSE_EVENT: 47223 + if (0 && mode & TW_MOUSE) { 47224 + code = TW_MOUSE; 47225 + goto end; 47226 + } else 47227 + continue; 47228 + default: 47229 + SetConsoleActiveScreenBuffer(!PropOf(TCB)->progMode ? 47230 + TCB->hdl : TCB->out); 47231 + continue; 47232 + } 47233 + } 47234 + } 47235 + } 47236 + continue; 47237 + } else { 47238 + if (rc != WAIT_TIMEOUT) { 47239 + code = -1; 47240 + break; 47241 + } else { 47242 + code = 0; 47243 + break; 47244 + } 47245 + } 47246 + } 47247 + end: 47248 + if (timeleft) 47249 + *timeleft = milliseconds; 47250 + 47251 + return code; 47252 +} 47253 + 47254 +static int 47255 +drv_read(TERMINAL_CONTROL_BLOCK * TCB, int *buf) 47256 +{ 47257 + SCREEN *sp; 47258 + int n = 1; 47259 + INPUT_RECORD inp; 47260 + BOOL b; 47261 + DWORD nRead; 47262 + WORD vk; 47263 + WORD sc; 47264 + 47265 + AssertTCB(); 47266 + assert(buf); 47267 + SetSP(); 47268 + 47269 + memset(&inp, 0, sizeof(inp)); 47270 + 47271 + while ((b = ReadConsoleInput(TCB->inp, &inp, 1, &nRead))) { 47272 + if (b && nRead > 0) { 47273 + if (inp.EventType == KEY_EVENT) { 47274 + if (!inp.Event.KeyEvent.bKeyDown) 47275 + continue; 47276 + *buf = (int) inp.Event.KeyEvent.uChar.AsciiChar; 47277 + vk = inp.Event.KeyEvent.wVirtualKeyCode; 47278 + sc = inp.Event.KeyEvent.wVirtualScanCode; 47279 + if (*buf == 0) { 47280 + if (sp->_keypad_on) { 47281 + *buf = MapKey(TCB, vk); 47282 + if (0 > (*buf)) 47283 + continue; 47284 + else 47285 + break; 47286 + } else 47287 + continue; 47288 + } else { /* *buf != 0 */ 47289 + break; 47290 + } 47291 + } else if (0 && inp.EventType == MOUSE_EVENT) { 47292 + *buf = KEY_MOUSE; 47293 + break; 47294 + } 47295 + continue; 47296 + } 47297 + } 47298 + return n; 47299 +} 47300 + 47301 +static int 47302 +drv_nap(TERMINAL_CONTROL_BLOCK * TCB GCC_UNUSED, int ms) 47303 +{ 47304 + Sleep(ms); 47305 + return OK; 47306 +} 47307 + 47308 +static bool 47309 +drv_kyExist(TERMINAL_CONTROL_BLOCK * TCB, int keycode) 47310 +{ 47311 + SCREEN *sp; 47312 + WORD nKey; 47313 + void *res; 47314 + bool found = FALSE; 47315 + LONG key = GenMap(0, (WORD) keycode); 47316 + 47317 + AssertTCB(); 47318 + SetSP(); 47319 + 47320 + AssertTCB(); 47321 + 47322 + res = bsearch(&key, 47323 + PropOf(TCB)->rmap, 47324 + (size_t) (N_INI + FKEYS), 47325 + sizeof(keylist[0]), 47326 + rkeycompare); 47327 + if (res) { 47328 + key = *((LONG *) res); 47329 + nKey = LOWORD(key); 47330 + if (!(nKey & 0x8000)) 47331 + found = TRUE; 47332 + } 47333 + return found; 47334 +} 47335 + 47336 +static int 47337 +drv_kpad(TERMINAL_CONTROL_BLOCK * TCB, bool flag GCC_UNUSED) 47338 +{ 47339 + SCREEN *sp; 47340 + int code = ERR; 47341 + 47342 + AssertTCB(); 47343 + sp = TCB->csp; 47344 + 47345 + if (sp) { 47346 + code = OK; 47347 + } 47348 + return code; 47349 +} 47350 + 47351 +static int 47352 +drv_keyok(TERMINAL_CONTROL_BLOCK * TCB, int keycode, bool flag) 47353 +{ 47354 + int code = ERR; 47355 + SCREEN *sp; 47356 + WORD nKey; 47357 + WORD vKey; 47358 + void *res; 47359 + LONG key = GenMap(0, (WORD) keycode); 47360 + 47361 + AssertTCB(); 47362 + SetSP(); 47363 + 47364 + if (sp) { 47365 + res = bsearch(&key, 47366 + PropOf(TCB)->rmap, 47367 + (size_t) (N_INI + FKEYS), 47368 + sizeof(keylist[0]), 47369 + rkeycompare); 47370 + if (res) { 47371 + key = *((LONG *) res); 47372 + vKey = HIWORD(key); 47373 + nKey = (LOWORD(key)) & 0x7fff; 47374 + if (!flag) 47375 + nKey |= 0x8000; 47376 + *(LONG *) res = GenMap(vKey, nKey); 47377 + } 47378 + } 47379 + return code; 47380 +} 30497 47381 diff -Naur ncurses-5.7.orig/NEWS ncurses-5.7/NEWS 30498 47382 --- ncurses-5.7.orig/NEWS 2008-11-01 17:56:22.000000000 -0700 30499 +++ ncurses-5.7/NEWS 2009-0 6-05 14:01:55.000000000 -070047383 +++ ncurses-5.7/NEWS 2009-07-19 15:04:17.000000000 -0700 30500 47384 @@ -1,5 +1,5 @@ 30501 47385 ------------------------------------------------------------------------------- … … 30510 47394 ------------------------------------------------------------------------------- 30511 47395 --- $Id: NEWS,v 1.1320 2008/11/02 00:56:22 tom Exp $ 30512 +-- $Id: NEWS,v 1.1 392 2009/05/30 19:19:59tom Exp $47396 +-- $Id: NEWS,v 1.1409 2009/07/19 00:09:05 tom Exp $ 30513 47397 ------------------------------------------------------------------------------- 30514 47398 30515 47399 This is a log of changes that ncurses has gone through since Zeyd started 30516 @@ -45,6 +45, 257@@47400 @@ -45,6 +45,300 @@ 30517 47401 Changes through 1.9.9e did not credit all contributions; 30518 47402 it is not possible to add this information. 30519 47403 47404 +20090718 47405 + + fix a null-pointer check in _nc_format_slks() in lib_slk.c, from 47406 + 20070704 changes. 47407 + + modify _nc_find_type_entry() to use hashing. 47408 + + make CCHARW_MAX value configurable, noting that changing this would 47409 + change the size of cchar_t, and would be ABI-incompatible. 47410 + + modify test-programs, e.g,. test/view.c, to address subtle 47411 + differences between Tru64/Solaris and HPUX/AIX getcchar() return 47412 + values. 47413 + + modify length returned by getcchar() to count the trailing null 47414 + which is documented in X/Open (cf: 20020427). 47415 + + fixes for test programs to build/work on HPUX and AIX, etc. 47416 + 47417 +20090711 47418 + + improve performance of tigetstr, etc., by using hashing code from tic. 47419 + + minor fixes for memory-leak checking. 47420 + + add test/demo_terminfo, for comparison with demo_termcap 47421 + 47422 +20090704 47423 + + remove wide-character checks from unctrl() (patch by Clemens Ladisch). 47424 + + revise wadd_wch() and wecho_wchar() to eliminate dependency on 47425 + unctrl(). 47426 + + continue integrating "sp-funcs" by Juergen Pfeifer (incomplete). 47427 + 47428 +20090627 47429 + + update llib-lncurses[wt] to use sp-funcs. 47430 + + various code-fixes to build/work with --disable-macros configure 47431 + option. 47432 + + add several new files from Juergen Pfeifer which will be used when 47433 + integration of "sp-funcs" is complete. This includes a port to 47434 + MinGW. 47435 + 47436 +20090613 47437 + + move definition for NCURSES_WRAPPED_VAR back to ncurses_dll.h, to 47438 + make includes of term.h without curses.h work (report by "Nix"). 47439 + + continue integrating "sp-funcs" by Juergen Pfeifer (incomplete). 47440 + 47441 +20090607 47442 + + fix a regression in lib_tputs.c, from ongoing merges. 47443 + 47444 +20090606 47445 + + continue integrating "sp-funcs" by Juergen Pfeifer (incomplete). 47446 + 30520 47447 +20090530 30521 47448 + + fix an infinite recursion when adding a legacy-coding 8-bit value … … 30774 47701 diff -Naur ncurses-5.7.orig/panel/Makefile.in ncurses-5.7/panel/Makefile.in 30775 47702 --- ncurses-5.7.orig/panel/Makefile.in 2007-04-28 07:56:11.000000000 -0700 30776 +++ ncurses-5.7/panel/Makefile.in 2009-0 6-05 14:01:30.000000000 -070047703 +++ ncurses-5.7/panel/Makefile.in 2009-07-19 15:03:48.000000000 -0700 30777 47704 @@ -1,6 +1,6 @@ 30778 47705 -# $Id: Makefile.in,v 1.52 2007/04/28 14:56:11 tom Exp $ … … 30803 47730 diff -Naur ncurses-5.7.orig/panel/p_above.c ncurses-5.7/panel/p_above.c 30804 47731 --- ncurses-5.7.orig/panel/p_above.c 2005-02-19 08:44:57.000000000 -0800 30805 +++ ncurses-5.7/panel/p_above.c 2009-0 6-05 14:01:33.000000000 -070047732 +++ ncurses-5.7/panel/p_above.c 2009-07-19 15:03:51.000000000 -0700 30806 47733 @@ -1,5 +1,5 @@ 30807 47734 /**************************************************************************** … … 30875 47802 diff -Naur ncurses-5.7.orig/panel/panel.c ncurses-5.7/panel/panel.c 30876 47803 --- ncurses-5.7.orig/panel/panel.c 2005-02-19 10:04:31.000000000 -0800 30877 +++ ncurses-5.7/panel/panel.c 2009-0 6-05 14:01:33.000000000 -070047804 +++ ncurses-5.7/panel/panel.c 2009-07-19 15:03:51.000000000 -0700 30878 47805 @@ -1,5 +1,5 @@ 30879 47806 /**************************************************************************** … … 30910 47837 diff -Naur ncurses-5.7.orig/panel/panel.h ncurses-5.7/panel/panel.h 30911 47838 --- ncurses-5.7.orig/panel/panel.h 2006-05-27 12:49:40.000000000 -0700 30912 +++ ncurses-5.7/panel/panel.h 2009-0 6-05 14:01:33.000000000 -070047839 +++ ncurses-5.7/panel/panel.h 2009-07-19 15:03:51.000000000 -0700 30913 47840 @@ -1,5 +1,5 @@ 30914 47841 /**************************************************************************** … … 30946 47873 diff -Naur ncurses-5.7.orig/panel/panel.priv.h ncurses-5.7/panel/panel.priv.h 30947 47874 --- ncurses-5.7.orig/panel/panel.priv.h 2008-09-27 15:36:11.000000000 -0700 30948 +++ ncurses-5.7/panel/panel.priv.h 2009-0 6-05 14:01:33.000000000 -070047875 +++ ncurses-5.7/panel/panel.priv.h 2009-07-19 15:03:51.000000000 -0700 30949 47876 @@ -1,5 +1,5 @@ 30950 47877 /**************************************************************************** … … 31059 47986 diff -Naur ncurses-5.7.orig/panel/p_below.c ncurses-5.7/panel/p_below.c 31060 47987 --- ncurses-5.7.orig/panel/p_below.c 2005-02-19 08:45:10.000000000 -0800 31061 +++ ncurses-5.7/panel/p_below.c 2009-0 6-05 14:01:33.000000000 -070047988 +++ ncurses-5.7/panel/p_below.c 2009-07-19 15:03:51.000000000 -0700 31062 47989 @@ -1,5 +1,5 @@ 31063 47990 /**************************************************************************** … … 31132 48059 diff -Naur ncurses-5.7.orig/panel/p_bottom.c ncurses-5.7/panel/p_bottom.c 31133 48060 --- ncurses-5.7.orig/panel/p_bottom.c 2005-02-19 08:38:16.000000000 -0800 31134 +++ ncurses-5.7/panel/p_bottom.c 2009-0 6-05 14:01:33.000000000 -070048061 +++ ncurses-5.7/panel/p_bottom.c 2009-07-19 15:03:51.000000000 -0700 31135 48062 @@ -1,5 +1,5 @@ 31136 48063 /**************************************************************************** … … 31167 48094 diff -Naur ncurses-5.7.orig/panel/p_delete.c ncurses-5.7/panel/p_delete.c 31168 48095 --- ncurses-5.7.orig/panel/p_delete.c 2005-02-19 08:38:45.000000000 -0800 31169 +++ ncurses-5.7/panel/p_delete.c 2009-0 6-05 14:01:33.000000000 -070048096 +++ ncurses-5.7/panel/p_delete.c 2009-07-19 15:03:51.000000000 -0700 31170 48097 @@ -1,5 +1,5 @@ 31171 48098 /**************************************************************************** … … 31208 48135 diff -Naur ncurses-5.7.orig/panel/p_hidden.c ncurses-5.7/panel/p_hidden.c 31209 48136 --- ncurses-5.7.orig/panel/p_hidden.c 2005-02-19 08:39:17.000000000 -0800 31210 +++ ncurses-5.7/panel/p_hidden.c 2009-0 6-05 14:01:33.000000000 -070048137 +++ ncurses-5.7/panel/p_hidden.c 2009-07-19 15:03:51.000000000 -0700 31211 48138 @@ -1,5 +1,5 @@ 31212 48139 /**************************************************************************** … … 31249 48176 diff -Naur ncurses-5.7.orig/panel/p_hide.c ncurses-5.7/panel/p_hide.c 31250 48177 --- ncurses-5.7.orig/panel/p_hide.c 2005-02-19 08:39:41.000000000 -0800 31251 +++ ncurses-5.7/panel/p_hide.c 2009-0 6-05 14:01:33.000000000 -070048178 +++ ncurses-5.7/panel/p_hide.c 2009-07-19 15:03:51.000000000 -0700 31252 48179 @@ -36,23 +36,27 @@ 31253 48180 */ … … 31288 48215 diff -Naur ncurses-5.7.orig/panel/p_move.c ncurses-5.7/panel/p_move.c 31289 48216 --- ncurses-5.7.orig/panel/p_move.c 2005-02-19 08:46:49.000000000 -0800 31290 +++ ncurses-5.7/panel/p_move.c 2009-0 6-05 14:01:33.000000000 -070048217 +++ ncurses-5.7/panel/p_move.c 2009-07-19 15:03:51.000000000 -0700 31291 48218 @@ -1,5 +1,5 @@ 31292 48219 /**************************************************************************** … … 31340 48267 diff -Naur ncurses-5.7.orig/panel/p_new.c ncurses-5.7/panel/p_new.c 31341 48268 --- ncurses-5.7.orig/panel/p_new.c 2008-08-04 11:25:48.000000000 -0700 31342 +++ ncurses-5.7/panel/p_new.c 2009-0 6-05 14:01:33.000000000 -070048269 +++ ncurses-5.7/panel/p_new.c 2009-07-19 15:03:51.000000000 -0700 31343 48270 @@ -1,5 +1,5 @@ 31344 48271 /**************************************************************************** … … 31408 48335 diff -Naur ncurses-5.7.orig/panel/p_replace.c ncurses-5.7/panel/p_replace.c 31409 48336 --- ncurses-5.7.orig/panel/p_replace.c 2005-02-19 08:41:31.000000000 -0800 31410 +++ ncurses-5.7/panel/p_replace.c 2009-0 6-05 14:01:33.000000000 -070048337 +++ ncurses-5.7/panel/p_replace.c 2009-07-19 15:03:51.000000000 -0700 31411 48338 @@ -36,23 +36,25 @@ 31412 48339 */ … … 31448 48375 diff -Naur ncurses-5.7.orig/panel/p_show.c ncurses-5.7/panel/p_show.c 31449 48376 --- ncurses-5.7.orig/panel/p_show.c 2005-02-19 08:42:02.000000000 -0800 31450 +++ ncurses-5.7/panel/p_show.c 2009-0 6-05 14:01:33.000000000 -070048377 +++ ncurses-5.7/panel/p_show.c 2009-07-19 15:03:51.000000000 -0700 31451 48378 @@ -36,34 +36,37 @@ 31452 48379 */ … … 31505 48432 diff -Naur ncurses-5.7.orig/panel/p_update.c ncurses-5.7/panel/p_update.c 31506 48433 --- ncurses-5.7.orig/panel/p_update.c 2005-02-19 08:49:47.000000000 -0800 31507 +++ ncurses-5.7/panel/p_update.c 2009-0 6-05 14:01:33.000000000 -070048434 +++ ncurses-5.7/panel/p_update.c 2009-07-19 15:03:51.000000000 -0700 31508 48435 @@ -1,5 +1,5 @@ 31509 48436 /**************************************************************************** … … 31579 48506 diff -Naur ncurses-5.7.orig/progs/Makefile.in ncurses-5.7/progs/Makefile.in 31580 48507 --- ncurses-5.7.orig/progs/Makefile.in 2008-09-07 06:58:55.000000000 -0700 31581 +++ ncurses-5.7/progs/Makefile.in 2009-0 6-05 14:01:30.000000000 -070048508 +++ ncurses-5.7/progs/Makefile.in 2009-07-19 15:03:48.000000000 -0700 31582 48509 @@ -1,6 +1,6 @@ 31583 48510 -# $Id: Makefile.in,v 1.79 2008/09/07 13:58:55 tom Exp $ … … 31690 48617 diff -Naur ncurses-5.7.orig/progs/modules ncurses-5.7/progs/modules 31691 48618 --- ncurses-5.7.orig/progs/modules 2006-12-23 16:53:21.000000000 -0800 31692 +++ ncurses-5.7/progs/modules 2009-0 6-05 14:01:21.000000000 -070048619 +++ ncurses-5.7/progs/modules 2009-07-19 15:03:43.000000000 -0700 31693 48620 @@ -1,7 +1,7 @@ 31694 48621 -# $Id: modules,v 1.13 2006/12/24 00:53:21 tom Exp $ … … 31713 48640 diff -Naur ncurses-5.7.orig/progs/tabs.c ncurses-5.7/progs/tabs.c 31714 48641 --- ncurses-5.7.orig/progs/tabs.c 1969-12-31 16:00:00.000000000 -0800 31715 +++ ncurses-5.7/progs/tabs.c 2009-0 6-05 14:00:52.000000000 -070048642 +++ ncurses-5.7/progs/tabs.c 2009-07-19 15:01:57.000000000 -0700 31716 48643 @@ -0,0 +1,506 @@ 31717 48644 +/**************************************************************************** … … 32223 49150 diff -Naur ncurses-5.7.orig/progs/tic.c ncurses-5.7/progs/tic.c 32224 49151 --- ncurses-5.7.orig/progs/tic.c 2008-09-13 09:59:24.000000000 -0700 32225 +++ ncurses-5.7/progs/tic.c 2009-0 6-05 14:01:21.000000000 -070049152 +++ ncurses-5.7/progs/tic.c 2009-07-19 15:03:43.000000000 -0700 32226 49153 @@ -1,5 +1,5 @@ 32227 49154 /**************************************************************************** … … 32256 49183 diff -Naur ncurses-5.7.orig/progs/tput.c ncurses-5.7/progs/tput.c 32257 49184 --- ncurses-5.7.orig/progs/tput.c 2008-07-13 04:05:12.000000000 -0700 32258 +++ ncurses-5.7/progs/tput.c 2009-0 6-05 14:01:21.000000000 -070049185 +++ ncurses-5.7/progs/tput.c 2009-07-19 15:03:43.000000000 -0700 32259 49186 @@ -1,5 +1,5 @@ 32260 49187 /**************************************************************************** … … 32286 49213 diff -Naur ncurses-5.7.orig/progs/transform.c ncurses-5.7/progs/transform.c 32287 49214 --- ncurses-5.7.orig/progs/transform.c 1969-12-31 16:00:00.000000000 -0800 32288 +++ ncurses-5.7/progs/transform.c 2009-0 6-05 14:01:21.000000000 -070049215 +++ ncurses-5.7/progs/transform.c 2009-07-19 15:03:43.000000000 -0700 32289 49216 @@ -0,0 +1,79 @@ 32290 49217 +/**************************************************************************** … … 32369 49296 diff -Naur ncurses-5.7.orig/progs/tset.c ncurses-5.7/progs/tset.c 32370 49297 --- ncurses-5.7.orig/progs/tset.c 2008-10-11 12:26:19.000000000 -0700 32371 +++ ncurses-5.7/progs/tset.c 2009-0 6-05 14:01:21.000000000 -070049298 +++ ncurses-5.7/progs/tset.c 2009-07-19 15:03:43.000000000 -0700 32372 49299 @@ -1,5 +1,5 @@ 32373 49300 /**************************************************************************** … … 32395 49322 reset_mode(); 32396 49323 } 49324 diff -Naur ncurses-5.7.orig/README.MinGW ncurses-5.7/README.MinGW 49325 --- ncurses-5.7.orig/README.MinGW 1969-12-31 16:00:00.000000000 -0800 49326 +++ ncurses-5.7/README.MinGW 2009-07-19 15:04:11.000000000 -0700 49327 @@ -0,0 +1,79 @@ 49328 +------------------------------------------------------------------------------- 49329 +-- Copyright (c) 2008 Free Software Foundation, Inc. -- 49330 +-- -- 49331 +-- Permission is hereby granted, free of charge, to any person obtaining a -- 49332 +-- copy of this software and associated documentation files (the -- 49333 +-- "Software"), to deal in the Software without restriction, including -- 49334 +-- without limitation the rights to use, copy, modify, merge, publish, -- 49335 +-- distribute, distribute with modifications, sublicense, and/or sell copies -- 49336 +-- of the Software, and to permit persons to whom the Software is furnished -- 49337 +-- to do so, subject to the following conditions: -- 49338 +-- -- 49339 +-- The above copyright notice and this permission notice shall be included -- 49340 +-- in all copies or substantial portions of the Software. -- 49341 +-- -- 49342 +-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -- 49343 +-- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -- 49344 +-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -- 49345 +-- NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -- 49346 +-- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -- 49347 +-- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -- 49348 +-- USE OR OTHER DEALINGS IN THE SOFTWARE. -- 49349 +-- -- 49350 +-- Except as contained in this notice, the name(s) of the above copyright -- 49351 +-- holders shall not be used in advertising or otherwise to promote the -- 49352 +-- sale, use or other dealings in this Software without prior written -- 49353 +-- authorization. -- 49354 +------------------------------------------------------------------------------- 49355 +-- $Id: README.MinGW,v 1.1 2008/12/14 19:22:16 juergen Exp $ 49356 +-- Author: Juergen Pfeifer 49357 +------------------------------------------------------------------------------- 49358 + 49359 +This is work in progress, but it's in an state where one can see it 49360 +works at least on the Windows Console. 49361 + 49362 +To build ncurses for native Windows, you need the MinGW toolchain from 49363 +http://www.mingw.org 49364 + 49365 +You should install also the MSYS package, so that you've a shell environment 49366 +that allows you to run the scripts, especially configure etc. 49367 + 49368 +Using MinGW is a pragmatic decision, it's the easiest way to port this 49369 +heavily UNIX based sourcebase to native Windows. The goal is of course 49370 +to provide the includes, libraries and DLLs to be used with the more 49371 +common traditional development environments on Windows, mainly with 49372 +Microsoft Visual Studio. 49373 + 49374 +If you start a bash from the MSYS environment, please make sure that the 49375 +Microsoft Development tools are in your PATH right after the MinGW 49376 +tools. The LIB.EXE tool is the only one needed. You need this only if 49377 +you want to build DLLs that work with native Windows programs. If you 49378 +don't have any Microsoft Development tools on your machine, consider 49379 +at least to get the free "Visual C++ 2008 Express Edition". 49380 +It contains the LIB.EXE tool. You may also use this compiler to test 49381 +writing native Windows programs using the ncurses DLLs without using 49382 +MinGW then for writing apps. 49383 + 49384 +Please unset the TERM environment variable, so that the Console driver 49385 +gets activated. 49386 + 49387 +This code requires WindowsNT 5.1 or better, which means on the client 49388 +Windows XP or better, on the server Windows Server 2003 or better. 49389 + 49390 +In order to build the DLLs, you must call 49391 + 49392 + make dlls 49393 + 49394 +A lot is still TODO, e.g.: 49395 + 49396 + - Mouse support for the Console 49397 + - Wide Character support 49398 + The Win32Con driver should actually only use Unicode in the 49399 + future. 49400 + - Thread support (locking) 49401 + - A GUI console driver 49402 + - Support for Terminals attached via a serial port (via terminfo) 49403 + - Support for networked Terminal connections (via terminfo) 49404 + 49405 +To support terminfo, we need to have an ioctl() simulation for the 49406 +serial and networked Terminals. 32397 49407 diff -Naur ncurses-5.7.orig/test/aclocal.m4 ncurses-5.7/test/aclocal.m4 32398 49408 --- ncurses-5.7.orig/test/aclocal.m4 2008-02-09 10:22:17.000000000 -0800 32399 +++ ncurses-5.7/test/aclocal.m4 2009-0 6-05 14:01:30.000000000 -070049409 +++ ncurses-5.7/test/aclocal.m4 2009-07-19 15:04:17.000000000 -0700 32400 49410 @@ -1,5 +1,5 @@ 32401 49411 dnl*************************************************************************** … … 32410 49420 dnl 32411 49421 -dnl $Id: aclocal.m4,v 1.22 2008/02/09 18:22:17 tom Exp $ 32412 +dnl $Id: aclocal.m4,v 1.2 5 2009/03/28 20:09:37tom Exp $49422 +dnl $Id: aclocal.m4,v 1.29 2009/07/17 01:07:50 tom Exp $ 32413 49423 dnl 32414 49424 dnl Author: Thomas E. Dickey … … 32538 49548 AC_TRY_LINK([ 32539 49549 #include <${cf_cv_ncurses_header-curses.h}> 32540 @@ -441,7 +442,7 @@ 49550 @@ -419,6 +420,37 @@ 49551 test "$cf_cv_curses_acs_map" != unknown && AC_DEFINE_UNQUOTED(CURSES_ACS_ARRAY,$cf_cv_curses_acs_map) 49552 ]) 49553 dnl --------------------------------------------------------------------------- 49554 +dnl CF_CURSES_CHECK_DATA version: 2 updated: 2009/07/16 21:03:10 49555 +dnl -------------------- 49556 +dnl Check if curses.h defines the given data/variable. 49557 +dnl Use this after CF_NCURSES_CONFIG or CF_CURSES_CONFIG. 49558 +AC_DEFUN([CF_CURSES_CHECK_DATA], 49559 +[ 49560 +AC_MSG_CHECKING(for data $1 declaration in ${cf_cv_ncurses_header-curses.h}) 49561 +AC_TRY_COMPILE(CF__CURSES_HEAD,[ 49562 +void *foo = &($1) 49563 +],cf_result=yes,cf_result=no) 49564 +AC_MSG_RESULT($cf_result) 49565 +if test $cf_result = yes ; then 49566 + CF_UPPER(cf_result,have_curses_data_$1) 49567 + AC_DEFINE_UNQUOTED($cf_result) 49568 +else 49569 + AC_MSG_CHECKING(for data $1 in library) 49570 + AC_TRY_LINK(CF__CURSES_HEAD 49571 +[extern char $1;],[ 49572 + do { 49573 + void *foo = &($1); 49574 + ${cf_cv_main_return-return}(foo == 0); 49575 + } while (0) 49576 +],[cf_result=yes],[cf_result=no]) 49577 + AC_MSG_RESULT($cf_result) 49578 + if test $cf_result = yes ; then 49579 + CF_UPPER(cf_result,decl_curses_data_$1) 49580 + AC_DEFINE_UNQUOTED($cf_result) 49581 + fi 49582 +fi 49583 +])dnl 49584 +dnl --------------------------------------------------------------------------- 49585 dnl CF_CURSES_CHECK_TYPE version: 2 updated: 2003/03/01 23:40:33 49586 dnl -------------------- 49587 dnl Check if curses.h defines the given type 49588 @@ -441,7 +473,19 @@ 32541 49589 fi 32542 49590 ])dnl 32543 49591 dnl --------------------------------------------------------------------------- 32544 49592 -dnl CF_CURSES_CPPFLAGS version: 9 updated: 2006/02/04 19:44:43 49593 +dnl CF_CURSES_CONFIG version: 2 updated: 2006/10/29 11:06:27 49594 +dnl ---------------- 49595 +dnl Tie together the configure-script macros for curses. It may be ncurses, 49596 +dnl but unless asked, we do not make a special search for ncurses. However, 49597 +dnl still check for the ncurses version number, for use in other macros. 49598 +AC_DEFUN([CF_CURSES_CONFIG], 49599 +[ 49600 +CF_CURSES_CPPFLAGS 49601 +CF_NCURSES_VERSION 49602 +CF_CURSES_LIBS 49603 +])dnl 49604 +dnl --------------------------------------------------------------------------- 32545 49605 +dnl CF_CURSES_CPPFLAGS version: 10 updated: 2009/01/06 19:34:11 32546 49606 dnl ------------------ 32547 49607 dnl Look for the curses headers. 32548 49608 AC_DEFUN([CF_CURSES_CPPFLAGS],[ 32549 @@ -460, 7 +461,7@@49609 @@ -460,13 +504,13 @@ 32550 49610 ;; 32551 49611 esac … … 32556 49616 CF_CURSES_HEADER 32557 49617 CF_TERM_HEADER 32558 @@ -549,7 +550,7 @@ 49618 ])dnl 49619 dnl --------------------------------------------------------------------------- 49620 -dnl CF_CURSES_FUNCS version: 13 updated: 2007/04/28 09:15:55 49621 +dnl CF_CURSES_FUNCS version: 14 updated: 2009/07/16 19:34:55 49622 dnl --------------- 49623 dnl Curses-functions are a little complicated, since a lot of them are macros. 49624 AC_DEFUN([CF_CURSES_FUNCS], 49625 @@ -482,24 +526,7 @@ 49626 AC_CACHE_VAL(cf_cv_func_$cf_func,[ 49627 eval cf_result='$ac_cv_func_'$cf_func 49628 if test ".$cf_result" != ".no"; then 49629 - AC_TRY_LINK([ 49630 -#ifdef HAVE_XCURSES 49631 -#include <xcurses.h> 49632 -char * XCursesProgramName = "test"; 49633 -#else 49634 -#include <${cf_cv_ncurses_header-curses.h}> 49635 -#if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H) 49636 -#include <ncursesw/term.h> 49637 -#else 49638 -#if defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H) 49639 -#include <ncurses/term.h> 49640 -#else 49641 -#ifdef HAVE_TERM_H 49642 -#include <term.h> 49643 -#endif 49644 -#endif 49645 -#endif 49646 -#endif], 49647 + AC_TRY_LINK(CF__CURSES_HEAD, 49648 [ 49649 #ifndef ${cf_func} 49650 long foo = (long)(&${cf_func}); 49651 @@ -549,7 +576,7 @@ 32559 49652 AC_CHECK_HEADERS($cf_cv_ncurses_header) 32560 49653 ])dnl … … 32565 49658 dnl Look for the curses libraries. Older curses implementations may require 32566 49659 dnl termcap/termlib to be linked as well. Call CF_CURSES_CPPFLAGS first. 32567 @@ -576,7 + 577,7 @@49660 @@ -576,7 +603,7 @@ 32568 49661 AC_CHECK_LIB(Hcurses,initscr,[ 32569 49662 # HP's header uses __HP_CURSES, but user claims _HP_CURSES. … … 32574 49667 ])]) 32575 49668 ;; 32576 @@ -615,11 +6 16,11 @@49669 @@ -615,11 +642,11 @@ 32577 49670 32578 49671 # Check for library containing initscr … … 32588 49681 LIBS="-l$cf_curs_lib $cf_save_LIBS" 32589 49682 if test "$cf_term_lib" = unknown ; then 32590 @@ -629,7 +6 30,7 @@49683 @@ -629,7 +656,7 @@ 32591 49684 [cf_result=yes], 32592 49685 [cf_result=no]) … … 32597 49690 : 32598 49691 elif test "$cf_term_lib" != predefined ; then 32599 @@ -772,7 +7 73,7 @@49692 @@ -772,7 +799,7 @@ 32600 49693 fi 32601 49694 ])dnl … … 32606 49699 dnl Look for a non-standard library, given parameters for AC_TRY_LINK. We 32607 49700 dnl prefer a standard location, and use -L options only if we do not find the 32608 @@ -817,11 +8 18,124 @@49701 @@ -817,11 +844,124 @@ 32609 49702 eval 'cf_found_library=[$]cf_cv_have_lib_'$1 32610 49703 ifelse($6,,[ … … 32732 49825 dnl ---------------------- 32733 49826 dnl Solaris has a data item 'curses_version', which confuses AC_CHECK_FUNCS. 32734 @@ -933,7 +10 47,7 @@49827 @@ -933,7 +1073,7 @@ 32735 49828 fi 32736 49829 ])dnl … … 32741 49834 dnl Check if the compiler supports useful warning options. There's a few that 32742 49835 dnl we don't use, simply because they're too noisy: 32743 @@ -966,7 +1 080,6 @@49836 @@ -966,7 +1106,6 @@ 32744 49837 then 32745 49838 # The "-wdXXX" options suppress warnings: … … 32749 49842 # remark #1684: conversion from pointer to same-sized integral type (potential portability problem) 32750 49843 # remark #193: zero used for undefined preprocessing identifier 32751 @@ -974,19 +1 087,18 @@49844 @@ -974,19 +1113,18 @@ 32752 49845 # remark #810: conversion from "int" to "Dimension={unsigned short}" may lose significant bits 32753 49846 # remark #869: parameter "tw" was never referenced … … 32771 49864 wd869 \ 32772 49865 wd981 32773 @@ -1028,7 +11 40,7 @@49866 @@ -1028,7 +1166,7 @@ 32774 49867 ;; 32775 49868 Winline) #(vi … … 32780 49873 continue;; 32781 49874 esac 32782 @@ -1074,11 +1 186,31 @@49875 @@ -1074,11 +1212,31 @@ 32783 49876 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" 32784 49877 ])dnl … … 32815 49908 test "$includedir" != "/usr/include" && \ 32816 49909 test -d "$includedir" && { 32817 @@ -1093,6 +12 25,7 @@49910 @@ -1093,6 +1251,7 @@ 32818 49911 test -d $oldincludedir/$2 && $1="[$]$1 $oldincludedir/$2" 32819 49912 } … … 32823 49916 dnl --------------------------------------------------------------------------- 32824 49917 dnl CF_INHERIT_SCRIPT version: 2 updated: 2003/03/01 23:50:42 32825 @@ -1140,11 +12 73,33@@49918 @@ -1140,11 +1299,64 @@ 32826 49919 fi 32827 49920 ])dnl … … 32857 49950 +$1="$cf_library_path_list [$]$1" 32858 49951 +])dnl 49952 +dnl --------------------------------------------------------------------------- 49953 +dnl CF_MIN_GETCCHAR version: 2 updated: 2009/07/16 21:03:10 49954 +dnl --------------- 49955 +dnl CF_MIN_GETCCHAR 49956 +dnl Check whether getcchar's return value counts the trailing null in a wchar_t 49957 +dnl string, or not. X/Open says it does, but Tru64 and Solaris do not do this. 49958 +AC_DEFUN([CF_MIN_GETCCHAR],[ 49959 +AC_CACHE_CHECK(if getcchar counts trailing null,cf_cv_min_getcchar,[ 49960 +AC_TRY_RUN([ 49961 +#include <stdlib.h> 49962 +#include <stdarg.h> 49963 +#include <${cf_cv_ncurses_header-curses.h}> 49964 + 49965 +int main() 49966 +{ 49967 + wchar_t data[2]; 49968 + cchar_t temp[2]; 49969 + int count; 49970 + data[0] = L'\0'; 49971 + setcchar(temp, data, 0, 0, (void *)0); 49972 + count = getcchar(temp, (wchar_t *)0, (attr_t *)0, (short *)0, (void *)0); 49973 + ${cf_cv_main_return-return}(count != 0); 49974 +}], 49975 + [cf_cv_min_getcchar=no], 49976 + [cf_cv_min_getcchar=yes], 49977 + [cf_cv_min_getcchar=yes]) 49978 +]) 49979 +if test "$cf_cv_min_getcchar" = yes ; then 49980 + AC_DEFINE(MIN_GETCCHAR,1) 49981 +fi 49982 +])dnl 32859 49983 dnl --------------------------------------------------------------------------- 32860 49984 dnl CF_MSG_LOG version: 4 updated: 2007/07/29 09:55:12 32861 49985 dnl ---------- 32862 @@ -1187,6 +13 42,45 @@49986 @@ -1187,6 +1399,45 @@ 32863 49987 ,[$1=no]) 32864 49988 ])dnl … … 32906 50030 dnl ------------------- 32907 50031 dnl Look for the SVr4 curses clone 'ncurses' in the standard places, adjusting 32908 @@ -1238,7 +14 32,7 @@50032 @@ -1238,7 +1489,7 @@ 32909 50033 CF_NCURSES_VERSION 32910 50034 ])dnl … … 32915 50039 dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common 32916 50040 dnl variations of ncurses' installs. 32917 @@ -1273,7 +1 467,7 @@50041 @@ -1273,7 +1524,7 @@ 32918 50042 CPPFLAGS="$cf_save2_CPPFLAGS" 32919 50043 test "$cf_cv_ncurses_h2" != no && break … … 32924 50048 32925 50049 CF_DIRNAME(cf_1st_incdir,$cf_cv_ncurses_h2) 32926 @@ -1435,7 +16 29,23 @@50050 @@ -1435,7 +1686,23 @@ 32927 50051 test "$cf_cv_ncurses_version" = no || AC_DEFINE(NCURSES) 32928 50052 ])dnl … … 32949 50073 dnl Check the argument to see that it looks like a pathname. Rewrite it if it 32950 50074 dnl begins with one of the prefix/exec_prefix variables, and then again if the 32951 @@ -1467,12 +1 677,12 @@50075 @@ -1467,12 +1734,12 @@ 32952 50076 $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%` 32953 50077 ;; … … 32964 50088 dnl Configure for PDCurses' X11 library 32965 50089 AC_DEFUN([CF_PDCURSES_X11],[ 32966 @@ -1482,7 +1 692,7 @@50090 @@ -1482,7 +1749,7 @@ 32967 50091 32968 50092 if test "$XCURSES_CONFIG" != none ; then … … 32973 50097 32974 50098 cf_cv_lib_XCurses=yes 32975 @@ -1511,7 +17 21,7 @@50099 @@ -1511,7 +1778,7 @@ 32976 50100 AC_DEFINE(XCURSES) 32977 50101 AC_DEFINE(HAVE_XCURSES) … … 32982 50106 ])dnl 32983 50107 dnl --------------------------------------------------------------------------- 32984 @@ -1790,7 +20 00,7 @@50108 @@ -1790,7 +2057,7 @@ 32985 50109 $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 32986 50110 ])dnl … … 32991 50115 dnl Check for multibyte support, and if not found, utf8 compatibility library 32992 50116 AC_DEFUN([CF_UTF8_LIB], 32993 @@ -1800,18 +20 10,18 @@50117 @@ -1800,18 +2067,18 @@ 32994 50118 AC_TRY_LINK([ 32995 50119 #include <stdlib.h>],[putwc(0,0);], … … 33014 50138 fi 33015 50139 ])dnl 33016 @@ -1866,7 +2076,7 @@ 50140 @@ -1824,6 +2091,56 @@ 50141 CF_MSG_LOG([$1]) 50142 ])dnl 50143 dnl --------------------------------------------------------------------------- 50144 +dnl CF_WCHAR_TYPE version: 2 updated: 2004/01/17 19:18:20 50145 +dnl ------------- 50146 +dnl Check if type wide-character type $1 is declared, and if so, which header 50147 +dnl file is needed. The second parameter is used to set a shell variable when 50148 +dnl the type is not found. The first parameter sets a shell variable for the 50149 +dnl opposite sense. 50150 +AC_DEFUN([CF_WCHAR_TYPE], 50151 +[ 50152 +# This is needed on Tru64 5.0 to declare $1 50153 +AC_CACHE_CHECK(if we must include wchar.h to declare $1,cf_cv_$1,[ 50154 +AC_TRY_COMPILE([ 50155 +#include <stdlib.h> 50156 +#include <stdarg.h> 50157 +#include <stdio.h> 50158 +#ifdef HAVE_LIBUTF8_H 50159 +#include <libutf8.h> 50160 +#endif], 50161 + [$1 state], 50162 + [cf_cv_$1=no], 50163 + [AC_TRY_COMPILE([ 50164 +#include <stdlib.h> 50165 +#include <stdarg.h> 50166 +#include <stdio.h> 50167 +#include <wchar.h> 50168 +#ifdef HAVE_LIBUTF8_H 50169 +#include <libutf8.h> 50170 +#endif], 50171 + [$1 value], 50172 + [cf_cv_$1=yes], 50173 + [cf_cv_$1=unknown])])]) 50174 + 50175 +if test "$cf_cv_$1" = yes ; then 50176 + AC_DEFINE(NEED_WCHAR_H) 50177 + NEED_WCHAR_H=1 50178 +fi 50179 + 50180 +ifelse($2,,,[ 50181 +# if we do not find $1 in either place, use substitution to provide a fallback. 50182 +if test "$cf_cv_$1" = unknown ; then 50183 + $2=1 50184 +fi 50185 +]) 50186 +ifelse($3,,,[ 50187 +# if we find $1 in either place, use substitution to provide a fallback. 50188 +if test "$cf_cv_$1" != unknown ; then 50189 + $3=1 50190 +fi 50191 +]) 50192 +])dnl 50193 +dnl --------------------------------------------------------------------------- 50194 dnl CF_WITH_CURSES_DIR version: 2 updated: 2002/11/10 14:46:59 50195 dnl ------------------ 50196 dnl Wrapper for AC_ARG_WITH to specify directory under which to look for curses 50197 @@ -1866,7 +2183,7 @@ 33017 50198 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" 33018 50199 ])dnl 33019 50200 dnl --------------------------------------------------------------------------- 33020 50201 -dnl CF_XOPEN_SOURCE version: 25 updated: 2007/01/29 18:36:38 33021 +dnl CF_XOPEN_SOURCE version: 2 8 updated: 2008/12/27 12:30:0350202 +dnl CF_XOPEN_SOURCE version: 29 updated: 2009/07/16 21:07:04 33022 50203 dnl --------------- 33023 50204 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, 33024 50205 dnl or adapt to the vendor's definitions to get equivalent functionality, 33025 @@ -1883,10 +2 093,10 @@50206 @@ -1883,10 +2200,10 @@ 33026 50207 cf_POSIX_C_SOURCE=ifelse($2,,199506L,$2) 33027 50208 … … 33036 50217 # _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L 33037 50218 # _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L 33038 @@ -1900,7 +2110,7 @@ 50219 @@ -1894,13 +2211,16 @@ 50220 cf_XOPEN_SOURCE=600 50221 CPPFLAGS="$CPPFLAGS -D_BSD_TYPES -D__BSD_VISIBLE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" 50222 ;; 50223 +hpux11*) #(vi 50224 + CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE=500" 50225 + ;; 50226 hpux*) #(vi 50227 CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE" 50228 ;; 33039 50229 irix[[56]].*) #(vi 33040 50230 CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE" … … 33045 50235 ;; 33046 50236 mirbsd*) #(vi 33047 @@ -2005,7 +2 215,7 @@50237 @@ -2005,7 +2325,7 @@ 33048 50238 CF_X_ATHENA_LIBS($cf_x_athena) 33049 50239 ])dnl … … 33054 50244 dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of 33055 50245 dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw. 33056 @@ -2024,7 +2 234,7 @@50246 @@ -2024,7 +2344,7 @@ 33057 50247 cf_save="$CPPFLAGS" 33058 50248 cf_test=X11/$cf_x_athena_root/SimpleMenu.h … … 33063 50253 else 33064 50254 AC_MSG_CHECKING(for $cf_test) 33065 @@ -2052,7 +2 262,7 @@50255 @@ -2052,7 +2372,7 @@ 33066 50256 fi 33067 50257 ]) … … 33072 50262 dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of 33073 50263 dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw. 33074 @@ -2096,7 +2 306,7 @@50264 @@ -2096,7 +2416,7 @@ 33075 50265 done 33076 50266 … … 33081 50271 fi 33082 50272 33083 @@ -2104,7 +2 314,7 @@50273 @@ -2104,7 +2424,7 @@ 33084 50274 AC_DEFINE_UNQUOTED($cf_x_athena_LIBS) 33085 50275 ]) … … 33090 50280 dnl Check for X Toolkit libraries 33091 50281 dnl 33092 @@ -2133, 7 +2343,7@@50282 @@ -2133,9 +2453,29 @@ 33093 50283 [$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])]) 33094 50284 … … 33099 50289 test program. You will have to check and add the proper libraries by hand 33100 50290 to makefile.]) 50291 fi 50292 ])dnl 50293 +dnl --------------------------------------------------------------------------- 50294 +dnl CF__CURSES_HEAD version: 1 updated: 2009/07/16 19:32:31 50295 +dnl --------------- 50296 +dnl Define a reusable chunk which includes <curses.h> and <term.h> when they 50297 +dnl are both available. 50298 +define([CF__CURSES_HEAD],[ 50299 +#ifdef HAVE_XCURSES 50300 +#include <xcurses.h> 50301 +char * XCursesProgramName = "test"; 50302 +#else 50303 +#include <${cf_cv_ncurses_header-curses.h}> 50304 +#if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H) 50305 +#include <ncursesw/term.h> 50306 +#elif defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H) 50307 +#include <ncurses/term.h> 50308 +#elif defined(HAVE_TERM_H) 50309 +#include <term.h> 50310 +#endif 50311 +#endif 50312 +]) 50313 diff -Naur ncurses-5.7.orig/test/chgat.c ncurses-5.7/test/chgat.c 50314 --- ncurses-5.7.orig/test/chgat.c 2008-02-09 15:19:13.000000000 -0800 50315 +++ ncurses-5.7/test/chgat.c 2009-07-19 15:04:17.000000000 -0700 50316 @@ -1,5 +1,5 @@ 50317 /**************************************************************************** 50318 - * Copyright (c) 2006-2007,2008 Free Software Foundation, Inc. * 50319 + * Copyright (c) 2006-2008,2009 Free Software Foundation, Inc. * 50320 * * 50321 * Permission is hereby granted, free of charge, to any person obtaining a * 50322 * copy of this software and associated documentation files (the * 50323 @@ -26,7 +26,7 @@ 50324 * authorization. * 50325 ****************************************************************************/ 50326 /* 50327 - * $Id: chgat.c,v 1.8 2008/02/09 23:19:13 tom Exp $ 50328 + * $Id: chgat.c,v 1.9 2009/07/15 23:21:04 tom Exp $ 50329 * 50330 * test-driver for chgat/wchgat/mvchgat/mvwchgat 50331 */ 50332 @@ -124,10 +124,17 @@ 50333 fill_window(WINDOW *win) 50334 { 50335 int y, x; 50336 + int y0 = -1, x0 = -1; 50337 50338 getyx(win, y, x); 50339 wmove(win, 0, 0); 50340 while (waddstr(win, "0123456789 abcdefghijklmnopqrstuvwxyz ") != ERR) { 50341 + int y1, x1; 50342 + getyx(win, y1, x1); 50343 + if (y1 == y0 && x1 == x0) 50344 + break; 50345 + x0 = x1; 50346 + y0 = y1; 50347 } 50348 wmove(win, y, x); 50349 } 33101 50350 diff -Naur ncurses-5.7.orig/test/clip_printw.c ncurses-5.7/test/clip_printw.c 33102 50351 --- ncurses-5.7.orig/test/clip_printw.c 1969-12-31 16:00:00.000000000 -0800 33103 +++ ncurses-5.7/test/clip_printw.c 2009-0 6-05 14:00:59.000000000 -070033104 @@ -0,0 +1,3 60@@50352 +++ ncurses-5.7/test/clip_printw.c 2009-07-19 15:04:17.000000000 -0700 50353 @@ -0,0 +1,377 @@ 33105 50354 +/**************************************************************************** 33106 + * Copyright (c) 2008 Free Software Foundation, Inc.*50355 + * Copyright (c) 2008,2009 Free Software Foundation, Inc. * 33107 50356 + * * 33108 50357 + * Permission is hereby granted, free of charge, to any person obtaining a * … … 33131 50380 + ****************************************************************************/ 33132 50381 +/* 33133 + * $Id: clip_printw.c,v 1. 1 2008/12/20 21:03:06tom Exp $50382 + * $Id: clip_printw.c,v 1.3 2009/07/17 09:28:52 tom Exp $ 33134 50383 + * 33135 50384 + * demonstrate how to use printw without wrapping. … … 33137 50386 + 33138 50387 +#include <test.priv.h> 50388 + 50389 +#ifdef HAVE_VW_PRINTW 33139 50390 + 33140 50391 +#define SHOW(n) ((n) == ERR ? "ERR" : "OK") … … 33158 50409 + 33159 50410 +static int 33160 +clip_wprintw(WINDOW *win, constchar *fmt,...)50411 +clip_wprintw(WINDOW *win, NCURSES_CONST char *fmt,...) 33161 50412 +{ 33162 50413 + int y0, x0, y1, x1, width; … … 33255 50506 +{ 33256 50507 + int y, x; 50508 + int y0 = -1, x0 = -1; 33257 50509 + 33258 50510 + getyx(win, y, x); 33259 50511 + wmove(win, 0, 0); 33260 50512 + while (waddstr(win, "0123456789 abcdefghijklmnopqrstuvwxyz ") != ERR) { 50513 + int y1, x1; 50514 + getyx(win, y1, x1); 50515 + if (y1 == y0 && x1 == x0) 50516 + break; 50517 + x0 = x1; 50518 + y0 = y1; 33261 50519 + } 33262 50520 + wmove(win, y, x); … … 33463 50721 + ExitProgram(EXIT_SUCCESS); 33464 50722 +} 50723 +#else 50724 +int 50725 +main(void) 50726 +{ 50727 + printf("This program requires the curses vw_printw function\n"); 50728 + ExitProgram(EXIT_FAILURE); 50729 +} 50730 +#endif 33465 50731 diff -Naur ncurses-5.7.orig/test/configure ncurses-5.7/test/configure 33466 50732 --- ncurses-5.7.orig/test/configure 2008-09-06 15:11:48.000000000 -0700 33467 +++ ncurses-5.7/test/configure 2009-0 6-05 14:01:30.000000000 -070050733 +++ ncurses-5.7/test/configure 2009-07-19 15:04:17.000000000 -0700 33468 50734 @@ -194,6 +194,7 @@ 33469 50735 --with-Xaw3d link with Xaw 3d library … … 33870 51136 # _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L 33871 51137 # _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L 33872 @@ -1724,16 +1725,16 @@ 51138 @@ -1718,22 +1719,25 @@ 51139 cf_XOPEN_SOURCE=600 51140 CPPFLAGS="$CPPFLAGS -D_BSD_TYPES -D__BSD_VISIBLE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" 51141 ;; 51142 +hpux11*) #(vi 51143 + CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE=500" 51144 + ;; 51145 hpux*) #(vi 51146 CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE" 51147 ;; 33873 51148 irix[56].*) #(vi 33874 51149 CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE" … … 33879 51154 echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6 33880 51155 -echo "configure:1731: checking if we must define _GNU_SOURCE" >&5 33881 +echo "configure:173 2: checking if we must define _GNU_SOURCE" >&551156 +echo "configure:1735: checking if we must define _GNU_SOURCE" >&5 33882 51157 if eval "test \"`echo '$''{'cf_cv_gnu_source'+set}'`\" = set"; then 33883 51158 echo $ac_n "(cached) $ac_c" 1>&6 … … 33886 51161 cat > conftest.$ac_ext <<EOF 33887 51162 -#line 1737 "configure" 33888 +#line 17 38"configure"51163 +#line 1741 "configure" 33889 51164 #include "confdefs.h" 33890 51165 #include <sys/types.h> 33891 51166 int main() { 33892 @@ -1743,7 +174 4,7 @@51167 @@ -1743,7 +1747,7 @@ 33893 51168 #endif 33894 51169 ; return 0; } 33895 51170 EOF 33896 51171 -if { (eval echo configure:1747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33897 +if { (eval echo configure:17 48: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then51172 +if { (eval echo configure:1751: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33898 51173 rm -rf conftest* 33899 51174 cf_cv_gnu_source=no 33900 51175 else 33901 @@ -1753,7 +175 4,7 @@51176 @@ -1753,7 +1757,7 @@ 33902 51177 cf_save="$CPPFLAGS" 33903 51178 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" 33904 51179 cat > conftest.$ac_ext <<EOF 33905 51180 -#line 1757 "configure" 33906 +#line 17 58"configure"51181 +#line 1761 "configure" 33907 51182 #include "confdefs.h" 33908 51183 #include <sys/types.h> 33909 51184 int main() { 33910 @@ -1763,7 +176 4,7 @@51185 @@ -1763,7 +1767,7 @@ 33911 51186 #endif 33912 51187 ; return 0; } 33913 51188 EOF 33914 51189 -if { (eval echo configure:1767: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33915 +if { (eval echo configure:17 68: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then51190 +if { (eval echo configure:1771: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33916 51191 rm -rf conftest* 33917 51192 cf_cv_gnu_source=no 33918 51193 else 33919 @@ -1807,13 +18 08,13 @@51194 @@ -1807,13 +1811,13 @@ 33920 51195 ;; 33921 51196 *) 33922 51197 echo $ac_n "checking if we should define _XOPEN_SOURCE""... $ac_c" 1>&6 33923 51198 -echo "configure:1811: checking if we should define _XOPEN_SOURCE" >&5 33924 +echo "configure:181 2: checking if we should define _XOPEN_SOURCE" >&551199 +echo "configure:1815: checking if we should define _XOPEN_SOURCE" >&5 33925 51200 if eval "test \"`echo '$''{'cf_cv_xopen_source'+set}'`\" = set"; then 33926 51201 echo $ac_n "(cached) $ac_c" 1>&6 … … 33929 51204 cat > conftest.$ac_ext <<EOF 33930 51205 -#line 1817 "configure" 33931 +#line 18 18"configure"51206 +#line 1821 "configure" 33932 51207 #include "confdefs.h" 33933 51208 #include <sys/types.h> 33934 51209 int main() { 33935 @@ -1823,7 +182 4,7 @@51210 @@ -1823,7 +1827,7 @@ 33936 51211 #endif 33937 51212 ; return 0; } 33938 51213 EOF 33939 51214 -if { (eval echo configure:1827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33940 +if { (eval echo configure:18 28: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then51215 +if { (eval echo configure:1831: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33941 51216 rm -rf conftest* 33942 51217 cf_cv_xopen_source=no 33943 51218 else 33944 @@ -1833,7 +183 4,7 @@51219 @@ -1833,7 +1837,7 @@ 33945 51220 cf_save="$CPPFLAGS" 33946 51221 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" 33947 51222 cat > conftest.$ac_ext <<EOF 33948 51223 -#line 1837 "configure" 33949 +#line 18 38"configure"51224 +#line 1841 "configure" 33950 51225 #include "confdefs.h" 33951 51226 #include <sys/types.h> 33952 51227 int main() { 33953 @@ -1843,7 +184 4,7 @@51228 @@ -1843,7 +1847,7 @@ 33954 51229 #endif 33955 51230 ; return 0; } 33956 51231 EOF 33957 51232 -if { (eval echo configure:1847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33958 +if { (eval echo configure:18 48: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then51233 +if { (eval echo configure:1851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33959 51234 rm -rf conftest* 33960 51235 cf_cv_xopen_source=no 33961 51236 else 33962 @@ -1898,16 +1 899,16 @@51237 @@ -1898,16 +1902,16 @@ 33963 51238 33964 51239 33965 51240 echo $ac_n "checking if we should define _POSIX_C_SOURCE""... $ac_c" 1>&6 33966 51241 -echo "configure:1902: checking if we should define _POSIX_C_SOURCE" >&5 33967 +echo "configure:190 3: checking if we should define _POSIX_C_SOURCE" >&551242 +echo "configure:1906: checking if we should define _POSIX_C_SOURCE" >&5 33968 51243 if eval "test \"`echo '$''{'cf_cv_posix_c_source'+set}'`\" = set"; then 33969 51244 echo $ac_n "(cached) $ac_c" 1>&6 … … 33972 51247 33973 51248 -echo "${as_me-configure}:1908: testing if the symbol is already defined go no further ..." 1>&5 33974 +echo "${as_me-configure}:19 09: testing if the symbol is already defined go no further ..." 1>&551249 +echo "${as_me-configure}:1912: testing if the symbol is already defined go no further ..." 1>&5 33975 51250 33976 51251 cat > conftest.$ac_ext <<EOF 33977 51252 -#line 1911 "configure" 33978 +#line 191 2"configure"51253 +#line 1915 "configure" 33979 51254 #include "confdefs.h" 33980 51255 #include <sys/types.h> 33981 51256 int main() { 33982 @@ -1917,7 +19 18,7 @@51257 @@ -1917,7 +1921,7 @@ 33983 51258 #endif 33984 51259 ; return 0; } 33985 51260 EOF 33986 51261 -if { (eval echo configure:1921: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33987 +if { (eval echo configure:192 2: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then51262 +if { (eval echo configure:1925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33988 51263 rm -rf conftest* 33989 51264 cf_cv_posix_c_source=no 33990 51265 else 33991 @@ -1939,7 +194 0,7 @@51266 @@ -1939,7 +1943,7 @@ 33992 51267 esac 33993 51268 if test "$cf_want_posix_source" = yes ; then 33994 51269 cat > conftest.$ac_ext <<EOF 33995 51270 -#line 1943 "configure" 33996 +#line 194 4"configure"51271 +#line 1947 "configure" 33997 51272 #include "confdefs.h" 33998 51273 #include <sys/types.h> 33999 51274 int main() { 34000 @@ -1949,7 +195 0,7 @@51275 @@ -1949,7 +1953,7 @@ 34001 51276 #endif 34002 51277 ; return 0; } 34003 51278 EOF 34004 51279 -if { (eval echo configure:1953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34005 +if { (eval echo configure:195 4: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then51280 +if { (eval echo configure:1957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34006 51281 : 34007 51282 else 34008 51283 echo "configure: failed program was:" >&5 34009 @@ -1960,15 +196 1,15 @@51284 @@ -1960,15 +1964,15 @@ 34010 51285 rm -f conftest* 34011 51286 fi 34012 51287 34013 51288 -echo "${as_me-configure}:1964: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 34014 +echo "${as_me-configure}:196 5: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&551289 +echo "${as_me-configure}:1968: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 34015 51290 34016 51291 CFLAGS="$cf_trim_CFLAGS" … … 34018 51293 34019 51294 -echo "${as_me-configure}:1969: testing if the second compile does not leave our definition intact error ..." 1>&5 34020 +echo "${as_me-configure}:197 0: testing if the second compile does not leave our definition intact error ..." 1>&551295 +echo "${as_me-configure}:1973: testing if the second compile does not leave our definition intact error ..." 1>&5 34021 51296 34022 51297 cat > conftest.$ac_ext <<EOF 34023 51298 -#line 1972 "configure" 34024 +#line 197 3"configure"51299 +#line 1976 "configure" 34025 51300 #include "confdefs.h" 34026 51301 #include <sys/types.h> 34027 51302 int main() { 34028 @@ -1978,7 +19 79,7 @@51303 @@ -1978,7 +1982,7 @@ 34029 51304 #endif 34030 51305 ; return 0; } 34031 51306 EOF 34032 51307 -if { (eval echo configure:1982: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34033 +if { (eval echo configure:198 3: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then51308 +if { (eval echo configure:1986: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34034 51309 : 34035 51310 else 34036 51311 echo "configure: failed program was:" >&5 34037 @@ -2013,12 +201 4,12 @@51312 @@ -2013,12 +2017,12 @@ 34038 51313 esac 34039 51314 34040 51315 echo $ac_n "checking for working const""... $ac_c" 1>&6 34041 51316 -echo "configure:2017: checking for working const" >&5 34042 +echo "configure:20 18: checking for working const" >&551317 +echo "configure:2021: checking for working const" >&5 34043 51318 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then 34044 51319 echo $ac_n "(cached) $ac_c" 1>&6 … … 34046 51321 cat > conftest.$ac_ext <<EOF 34047 51322 -#line 2022 "configure" 34048 +#line 202 3"configure"51323 +#line 2026 "configure" 34049 51324 #include "confdefs.h" 34050 51325 34051 51326 int main() { 34052 @@ -2067,7 +20 68,7 @@51327 @@ -2067,7 +2071,7 @@ 34053 51328 34054 51329 ; return 0; } 34055 51330 EOF 34056 51331 -if { (eval echo configure:2071: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34057 +if { (eval echo configure:207 2: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then51332 +if { (eval echo configure:2075: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34058 51333 rm -rf conftest* 34059 51334 ac_cv_c_const=yes 34060 51335 else 34061 @@ -2089,7 +209 0,7 @@51336 @@ -2089,7 +2093,7 @@ 34062 51337 34063 51338 34064 51339 echo $ac_n "checking for signal global datatype""... $ac_c" 1>&6 34065 51340 -echo "configure:2093: checking for signal global datatype" >&5 34066 +echo "configure:209 4: checking for signal global datatype" >&551341 +echo "configure:2097: checking for signal global datatype" >&5 34067 51342 if eval "test \"`echo '$''{'cf_cv_sig_atomic_t'+set}'`\" = set"; then 34068 51343 echo $ac_n "(cached) $ac_c" 1>&6 34069 51344 else 34070 @@ -2100,7 +210 1,7 @@51345 @@ -2100,7 +2104,7 @@ 34071 51346 "int" 34072 51347 do 34073 51348 cat > conftest.$ac_ext <<EOF 34074 51349 -#line 2104 "configure" 34075 +#line 210 5"configure"51350 +#line 2108 "configure" 34076 51351 #include "confdefs.h" 34077 51352 34078 51353 #include <sys/types.h> 34079 @@ -2118,7 +21 19,7 @@51354 @@ -2118,7 +2122,7 @@ 34080 51355 x = 1 34081 51356 ; return 0; } 34082 51357 EOF 34083 51358 -if { (eval echo configure:2122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34084 +if { (eval echo configure:212 3: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then51359 +if { (eval echo configure:2126: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34085 51360 rm -rf conftest* 34086 51361 cf_cv_sig_atomic_t=$cf_type 34087 51362 else 34088 @@ -2142,7 +214 3,7 @@51363 @@ -2142,7 +2146,7 @@ 34089 51364 34090 51365 34091 51366 echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6 34092 51367 -echo "configure:2146: checking if you want to see long compiling messages" >&5 34093 +echo "configure:21 47: checking if you want to see long compiling messages" >&551368 +echo "configure:2150: checking if you want to see long compiling messages" >&5 34094 51369 34095 51370 # Check whether --enable-echo or --disable-echo was given. 34096 51371 if test "${enable_echo+set}" = set; then 34097 @@ -2189,7 +219 0,7 @@51372 @@ -2189,7 +2193,7 @@ 34098 51373 GCC_VERSION=none 34099 51374 if test "$GCC" = yes ; then 34100 51375 echo $ac_n "checking version of $CC""... $ac_c" 1>&6 34101 51376 -echo "configure:2193: checking version of $CC" >&5 34102 +echo "configure:219 4: checking version of $CC" >&551377 +echo "configure:2197: checking version of $CC" >&5 34103 51378 GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" 34104 51379 test -z "$GCC_VERSION" && GCC_VERSION=unknown 34105 51380 echo "$ac_t""$GCC_VERSION" 1>&6 34106 @@ -2199,7 +220 0,7 @@51381 @@ -2199,7 +2203,7 @@ 34107 51382 if ( test "$GCC" = yes || test "$GXX" = yes ) 34108 51383 then 34109 51384 echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6 34110 51385 -echo "configure:2203: checking if you want to turn on gcc warnings" >&5 34111 +echo "configure:220 4: checking if you want to turn on gcc warnings" >&551386 +echo "configure:2207: checking if you want to turn on gcc warnings" >&5 34112 51387 34113 51388 # Check whether --enable-warnings or --disable-warnings was given. 34114 51389 if test "${enable_warnings+set}" = set; then 34115 @@ -2228,11 +22 29,11 @@51390 @@ -2228,11 +2232,11 @@ 34116 51391 case $host_os in 34117 51392 linux*|gnu*) 34118 51393 echo $ac_n "checking if this is really Intel C compiler""... $ac_c" 1>&6 34119 51394 -echo "configure:2232: checking if this is really Intel C compiler" >&5 34120 +echo "configure:223 3: checking if this is really Intel C compiler" >&551395 +echo "configure:2236: checking if this is really Intel C compiler" >&5 34121 51396 cf_save_CFLAGS="$CFLAGS" 34122 51397 CFLAGS="$CFLAGS -no-gcc" 34123 51398 cat > conftest.$ac_ext <<EOF 34124 51399 -#line 2236 "configure" 34125 +#line 22 37"configure"51400 +#line 2240 "configure" 34126 51401 #include "confdefs.h" 34127 51402 34128 51403 int main() { 34129 @@ -2244,7 +224 5,7 @@51404 @@ -2244,7 +2248,7 @@ 34130 51405 34131 51406 ; return 0; } 34132 51407 EOF 34133 51408 -if { (eval echo configure:2248: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34134 +if { (eval echo configure:22 49: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then51409 +if { (eval echo configure:2252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34135 51410 rm -rf conftest* 34136 51411 INTEL_COMPILER=yes 34137 51412 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" 34138 @@ -2262,7 +226 3,7 @@51413 @@ -2262,7 +2266,7 @@ 34139 51414 34140 51415 34141 51416 cat > conftest.$ac_ext <<EOF 34142 51417 -#line 2266 "${as_me-configure}" 34143 +#line 22 67"${as_me-configure}"51418 +#line 2270 "${as_me-configure}" 34144 51419 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } 34145 51420 EOF 34146 51421 34147 @@ -2270,7 +227 1,6 @@51422 @@ -2270,7 +2274,6 @@ 34148 51423 then 34149 51424 # The "-wdXXX" options suppress warnings: … … 34153 51428 # remark #1684: conversion from pointer to same-sized integral type (potential portability problem) 34154 51429 # remark #193: zero used for undefined preprocessing identifier 34155 @@ -2278, 7 +2278,7@@51430 @@ -2278,26 +2281,25 @@ 34156 51431 # remark #810: conversion from "int" to "Dimension={unsigned short}" may lose significant bits 34157 51432 # remark #869: parameter "tw" was never referenced … … 34161 51436 34162 51437 echo "checking for $CC warning options" 1>&6 34163 echo "configure:2285: checking for $CC warning options" >&5 34164 @@ -2286,18 +2286,17 @@ 51438 -echo "configure:2285: checking for $CC warning options" >&5 51439 +echo "configure:2288: checking for $CC warning options" >&5 51440 cf_save_CFLAGS="$CFLAGS" 34165 51441 EXTRA_CFLAGS="-Wall" 34166 51442 for cf_opt in \ … … 34179 51455 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" 34180 51456 - if { (eval echo configure:2301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34181 + if { (eval echo configure:230 0: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then51457 + if { (eval echo configure:2303: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34182 51458 test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6 34183 51459 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" 34184 51460 fi 34185 @@ -2307,7 +230 6,7 @@51461 @@ -2307,7 +2309,7 @@ 34186 51462 elif test "$GCC" = yes 34187 51463 then 34188 51464 echo "checking for $CC warning options" 1>&6 34189 51465 -echo "configure:2311: checking for $CC warning options" >&5 34190 +echo "configure:231 0: checking for $CC warning options" >&551466 +echo "configure:2313: checking for $CC warning options" >&5 34191 51467 cf_save_CFLAGS="$CFLAGS" 34192 51468 EXTRA_CFLAGS="-W -Wall" 34193 51469 cf_warn_CONST="" 34194 @@ -2326,7 +232 5,7 @@51470 @@ -2326,7 +2328,7 @@ 34195 51471 Wundef $cf_warn_CONST 34196 51472 do 34197 51473 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" 34198 51474 - if { (eval echo configure:2330: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34199 + if { (eval echo configure:23 29: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then51475 + if { (eval echo configure:2332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34200 51476 test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6 34201 51477 case $cf_opt in #(vi 34202 51478 Wcast-qual) #(vi 34203 @@ -2334,10 +233 3,10 @@51479 @@ -2334,10 +2336,10 @@ 34204 51480 ;; 34205 51481 Winline) #(vi … … 34210 51486 34211 51487 -echo "${as_me-configure}:2341: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 34212 +echo "${as_me-configure}:234 0: testing feature is broken in gcc $GCC_VERSION ..." 1>&551488 +echo "${as_me-configure}:2343: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 34213 51489 34214 51490 34215 51491 continue;; 34216 @@ -2441,7 +2440,7 @@ 51492 @@ -2440,8 +2442,9 @@ 51493 curses) 34217 51494 34218 51495 51496 + 34219 51497 echo $ac_n "checking for extra include directories""... $ac_c" 1>&6 34220 51498 -echo "configure:2445: checking for extra include directories" >&5 34221 +echo "configure:244 4: checking for extra include directories" >&551499 +echo "configure:2448: checking for extra include directories" >&5 34222 51500 if eval "test \"`echo '$''{'cf_cv_curses_incdir'+set}'`\" = set"; then 34223 51501 echo $ac_n "(cached) $ac_c" 1>&6 34224 51502 else 34225 @@ -2462,11 +246 1,11 @@51503 @@ -2462,11 +2465,11 @@ 34226 51504 fi 34227 51505 … … 34233 51511 echo $ac_n "checking if we have identified curses headers""... $ac_c" 1>&6 34234 51512 -echo "configure:2470: checking if we have identified curses headers" >&5 34235 +echo "configure:24 69: checking if we have identified curses headers" >&551513 +echo "configure:2473: checking if we have identified curses headers" >&5 34236 51514 if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then 34237 51515 echo $ac_n "(cached) $ac_c" 1>&6 34238 51516 else 34239 @@ -2479,14 +24 78,14 @@51517 @@ -2479,14 +2482,14 @@ 34240 51518 ncurses/ncurses.h 34241 51519 do 34242 51520 cat > conftest.$ac_ext <<EOF 34243 51521 -#line 2483 "configure" 34244 +#line 248 2"configure"51522 +#line 2486 "configure" 34245 51523 #include "confdefs.h" 34246 51524 #include <${cf_header}> … … 34250 51528 EOF 34251 51529 -if { (eval echo configure:2490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34252 +if { (eval echo configure:24 89: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then51530 +if { (eval echo configure:2493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34253 51531 rm -rf conftest* 34254 51532 cf_cv_ncurses_header=$cf_header; break 34255 51533 else 34256 @@ -2509,17 +25 08,17 @@51534 @@ -2509,17 +2512,17 @@ 34257 51535 do 34258 51536 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 34259 51537 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 34260 51538 -echo "configure:2513: checking for $ac_hdr" >&5 34261 +echo "configure:251 2: checking for $ac_hdr" >&551539 +echo "configure:2516: checking for $ac_hdr" >&5 34262 51540 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 34263 51541 echo $ac_n "(cached) $ac_c" 1>&6 … … 34265 51543 cat > conftest.$ac_ext <<EOF 34266 51544 -#line 2518 "configure" 34267 +#line 25 17"configure"51545 +#line 2521 "configure" 34268 51546 #include "confdefs.h" 34269 51547 #include <$ac_hdr> … … 34271 51549 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 34272 51550 -{ (eval echo configure:2523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 34273 +{ (eval echo configure:252 2: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }51551 +{ (eval echo configure:2526: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 34274 51552 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 34275 51553 if test -z "$ac_err"; then 34276 51554 rm -rf conftest* 34277 @@ -2548,7 +25 47,7 @@51555 @@ -2548,7 +2551,7 @@ 34278 51556 34279 51557 34280 51558 echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 34281 51559 -echo "configure:2552: checking for terminfo header" >&5 34282 +echo "configure:255 1: checking for terminfo header" >&551560 +echo "configure:2555: checking for terminfo header" >&5 34283 51561 if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then 34284 51562 echo $ac_n "(cached) $ac_c" 1>&6 34285 51563 else 34286 @@ -2565,7 +256 4,7 @@51564 @@ -2565,7 +2568,7 @@ 34287 51565 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" 34288 51566 do 34289 51567 cat > conftest.$ac_ext <<EOF 34290 51568 -#line 2569 "configure" 34291 +#line 25 68"configure"51569 +#line 2572 "configure" 34292 51570 #include "confdefs.h" 34293 51571 #include <stdio.h> 34294 51572 #include <${cf_cv_ncurses_header-curses.h}> 34295 @@ -2575,7 +257 4,7 @@51573 @@ -2575,7 +2578,7 @@ 34296 51574 int x = auto_left_margin 34297 51575 ; return 0; } 34298 51576 EOF 34299 51577 -if { (eval echo configure:2579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34300 +if { (eval echo configure:25 78: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then51578 +if { (eval echo configure:2582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34301 51579 rm -rf conftest* 34302 51580 34303 51581 cf_cv_term_header="$cf_test" 34304 @@ -2624,7 +2623,7 @@ 34305 34306 51582 @@ -2622,9 +2625,9 @@ 51583 esac 51584 51585 51586 - 51587 + 34307 51588 echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 34308 51589 -echo "configure:2628: checking for ncurses version" >&5 34309 +echo "configure:26 27: checking for ncurses version" >&551590 +echo "configure:2631: checking for ncurses version" >&5 34310 51591 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then 34311 51592 echo $ac_n "(cached) $ac_c" 1>&6 34312 51593 else 34313 @@ -2650,7 +26 49,7 @@51594 @@ -2650,7 +2653,7 @@ 34314 51595 #endif 34315 51596 EOF 34316 51597 cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" 34317 51598 - { (eval echo configure:2654: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } 34318 + { (eval echo configure:265 3: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }51599 + { (eval echo configure:2657: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } 34319 51600 if test -f conftest.out ; then 34320 51601 cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` 34321 51602 test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" 34322 @@ -2659,7 +26 58,7 @@51603 @@ -2659,7 +2662,7 @@ 34323 51604 34324 51605 else 34325 51606 cat > conftest.$ac_ext <<EOF 34326 51607 -#line 2663 "configure" 34327 +#line 266 2"configure"51608 +#line 2666 "configure" 34328 51609 #include "confdefs.h" 34329 51610 34330 51611 #include <${cf_cv_ncurses_header-curses.h}> 34331 @@ -2683,7 +268 2,7 @@51612 @@ -2683,7 +2686,7 @@ 34332 51613 ${cf_cv_main_return-return}(0); 34333 51614 } 34334 51615 EOF 34335 51616 -if { (eval echo configure:2687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 34336 +if { (eval echo configure:26 86: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null51617 +if { (eval echo configure:2690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 34337 51618 then 34338 51619 34339 51620 cf_cv_ncurses_version=`cat $cf_tempfile` 34340 @@ -2707,16 +2706,16 @@ 34341 51621 @@ -2704,19 +2707,19 @@ 51622 EOF 51623 51624 51625 - 51626 + 34342 51627 34343 51628 echo $ac_n "checking if we have identified curses libraries""... $ac_c" 1>&6 34344 51629 -echo "configure:2711: checking if we have identified curses libraries" >&5 34345 +echo "configure:271 0: checking if we have identified curses libraries" >&551630 +echo "configure:2714: checking if we have identified curses libraries" >&5 34346 51631 cat > conftest.$ac_ext <<EOF 34347 51632 -#line 2713 "configure" 34348 +#line 271 2"configure"51633 +#line 2716 "configure" 34349 51634 #include "confdefs.h" 34350 51635 #include <${cf_cv_ncurses_header-curses.h}> … … 34354 51639 EOF 34355 51640 -if { (eval echo configure:2720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34356 +if { (eval echo configure:27 19: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then51641 +if { (eval echo configure:2723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34357 51642 rm -rf conftest* 34358 51643 cf_result=yes 34359 51644 else 34360 @@ -2732,7 +273 1,7 @@51645 @@ -2732,7 +2735,7 @@ 34361 51646 case $host_os in #(vi 34362 51647 freebsd*) #(vi 34363 51648 echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 34364 51649 -echo "configure:2736: checking for tgoto in -lmytinfo" >&5 34365 +echo "configure:273 5: checking for tgoto in -lmytinfo" >&551650 +echo "configure:2739: checking for tgoto in -lmytinfo" >&5 34366 51651 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` 34367 51652 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 34368 51653 echo $ac_n "(cached) $ac_c" 1>&6 34369 @@ -2740,7 +27 39,7 @@51654 @@ -2740,7 +2743,7 @@ 34370 51655 ac_save_LIBS="$LIBS" 34371 51656 LIBS="-lmytinfo $LIBS" 34372 51657 cat > conftest.$ac_ext <<EOF 34373 51658 -#line 2744 "configure" 34374 +#line 274 3"configure"51659 +#line 2747 "configure" 34375 51660 #include "confdefs.h" 34376 51661 /* Override any gcc2 internal prototype to avoid an error. */ 34377 51662 /* We use char because int might match the return type of a gcc2 34378 @@ -2751,7 +275 0,7 @@51663 @@ -2751,7 +2754,7 @@ 34379 51664 tgoto() 34380 51665 ; return 0; } 34381 51666 EOF 34382 51667 -if { (eval echo configure:2755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34383 +if { (eval echo configure:275 4: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then51668 +if { (eval echo configure:2758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34384 51669 rm -rf conftest* 34385 51670 eval "ac_cv_lib_$ac_lib_var=yes" 34386 51671 else 34387 @@ -2774,7 +277 3,7 @@51672 @@ -2774,7 +2777,7 @@ 34388 51673 ;; 34389 51674 hpux10.*) #(vi 34390 51675 echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6 34391 51676 -echo "configure:2778: checking for initscr in -lcur_colr" >&5 34392 +echo "configure:27 77: checking for initscr in -lcur_colr" >&551677 +echo "configure:2781: checking for initscr in -lcur_colr" >&5 34393 51678 ac_lib_var=`echo cur_colr'_'initscr | sed 'y%./+-%__p_%'` 34394 51679 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 34395 51680 echo $ac_n "(cached) $ac_c" 1>&6 34396 @@ -2782,7 +278 1,7 @@51681 @@ -2782,7 +2785,7 @@ 34397 51682 ac_save_LIBS="$LIBS" 34398 51683 LIBS="-lcur_colr $LIBS" 34399 51684 cat > conftest.$ac_ext <<EOF 34400 51685 -#line 2786 "configure" 34401 +#line 278 5"configure"51686 +#line 2789 "configure" 34402 51687 #include "confdefs.h" 34403 51688 /* Override any gcc2 internal prototype to avoid an error. */ 34404 51689 /* We use char because int might match the return type of a gcc2 34405 @@ -2793,7 +279 2,7 @@51690 @@ -2793,7 +2796,7 @@ 34406 51691 initscr() 34407 51692 ; return 0; } 34408 51693 EOF 34409 51694 -if { (eval echo configure:2797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34410 +if { (eval echo configure:2 796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then51695 +if { (eval echo configure:2800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34411 51696 rm -rf conftest* 34412 51697 eval "ac_cv_lib_$ac_lib_var=yes" 34413 51698 else 34414 @@ -2816,7 +281 5,7 @@51699 @@ -2816,7 +2819,7 @@ 34415 51700 echo "$ac_t""no" 1>&6 34416 51701 34417 51702 echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6 34418 51703 -echo "configure:2820: checking for initscr in -lHcurses" >&5 34419 +echo "configure:28 19: checking for initscr in -lHcurses" >&551704 +echo "configure:2823: checking for initscr in -lHcurses" >&5 34420 51705 ac_lib_var=`echo Hcurses'_'initscr | sed 'y%./+-%__p_%'` 34421 51706 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 34422 51707 echo $ac_n "(cached) $ac_c" 1>&6 34423 @@ -2824,7 +282 3,7 @@51708 @@ -2824,7 +2827,7 @@ 34424 51709 ac_save_LIBS="$LIBS" 34425 51710 LIBS="-lHcurses $LIBS" 34426 51711 cat > conftest.$ac_ext <<EOF 34427 51712 -#line 2828 "configure" 34428 +#line 28 27"configure"51713 +#line 2831 "configure" 34429 51714 #include "confdefs.h" 34430 51715 /* Override any gcc2 internal prototype to avoid an error. */ 34431 51716 /* We use char because int might match the return type of a gcc2 34432 @@ -2835,7 +283 4,7 @@51717 @@ -2835,7 +2838,7 @@ 34433 51718 initscr() 34434 51719 ; return 0; } 34435 51720 EOF 34436 51721 -if { (eval echo configure:2839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34437 +if { (eval echo configure:28 38: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then51722 +if { (eval echo configure:2842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34438 51723 rm -rf conftest* 34439 51724 eval "ac_cv_lib_$ac_lib_var=yes" 34440 51725 else 34441 @@ -2853,7 +285 2,7 @@51726 @@ -2853,7 +2856,7 @@ 34442 51727 34443 51728 # HP's header uses __HP_CURSES, but user claims _HP_CURSES. … … 34448 51733 34449 51734 else 34450 @@ -2884,7 +288 3,7 @@51735 @@ -2884,7 +2887,7 @@ 34451 51736 if test "$cf_have_libdir" = no ; then 34452 51737 test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 34453 51738 34454 51739 -echo "${as_me-configure}:2888: testing adding $cf_add_libdir to library-path ..." 1>&5 34455 +echo "${as_me-configure}:28 87: testing adding $cf_add_libdir to library-path ..." 1>&551740 +echo "${as_me-configure}:2891: testing adding $cf_add_libdir to library-path ..." 1>&5 34456 51741 34457 51742 34458 51743 LDFLAGS="-L$cf_add_libdir $LDFLAGS" 34459 @@ -2916,7 +291 5,7 @@51744 @@ -2916,7 +2919,7 @@ 34460 51745 if test "$cf_have_libdir" = no ; then 34461 51746 test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 34462 51747 34463 51748 -echo "${as_me-configure}:2920: testing adding $cf_add_libdir to library-path ..." 1>&5 34464 +echo "${as_me-configure}:29 19: testing adding $cf_add_libdir to library-path ..." 1>&551749 +echo "${as_me-configure}:2923: testing adding $cf_add_libdir to library-path ..." 1>&5 34465 51750 34466 51751 34467 51752 LDFLAGS="-L$cf_add_libdir $LDFLAGS" 34468 @@ -2946,12 +294 5,12 @@51753 @@ -2946,12 +2949,12 @@ 34469 51754 # Check for library containing tgoto. Do this before curses library 34470 51755 # because it may be needed to link the test-case for initscr. 34471 51756 echo $ac_n "checking for tgoto""... $ac_c" 1>&6 34472 51757 -echo "configure:2950: checking for tgoto" >&5 34473 +echo "configure:29 49: checking for tgoto" >&551758 +echo "configure:2953: checking for tgoto" >&5 34474 51759 if eval "test \"`echo '$''{'ac_cv_func_tgoto'+set}'`\" = set"; then 34475 51760 echo $ac_n "(cached) $ac_c" 1>&6 … … 34477 51762 cat > conftest.$ac_ext <<EOF 34478 51763 -#line 2955 "configure" 34479 +#line 295 4"configure"51764 +#line 2958 "configure" 34480 51765 #include "confdefs.h" 34481 51766 /* System header to define __stub macros and hopefully few prototypes, 34482 51767 which can conflict with char tgoto(); below. */ 34483 @@ -2974,7 +297 3,7 @@51768 @@ -2974,7 +2977,7 @@ 34484 51769 34485 51770 ; return 0; } 34486 51771 EOF 34487 51772 -if { (eval echo configure:2978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34488 +if { (eval echo configure:29 77: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then51773 +if { (eval echo configure:2981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34489 51774 rm -rf conftest* 34490 51775 eval "ac_cv_func_tgoto=yes" 34491 51776 else 34492 @@ -2995,7 +299 4,7 @@51777 @@ -2995,7 +2998,7 @@ 34493 51778 for cf_term_lib in $cf_check_list termcap termlib unknown 34494 51779 do 34495 51780 echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6 34496 51781 -echo "configure:2999: checking for tgoto in -l$cf_term_lib" >&5 34497 +echo "configure: 2998: checking for tgoto in -l$cf_term_lib" >&551782 +echo "configure:3002: checking for tgoto in -l$cf_term_lib" >&5 34498 51783 ac_lib_var=`echo $cf_term_lib'_'tgoto | sed 'y%./+-%__p_%'` 34499 51784 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 34500 51785 echo $ac_n "(cached) $ac_c" 1>&6 34501 @@ -3003,7 +300 2,7 @@51786 @@ -3003,7 +3006,7 @@ 34502 51787 ac_save_LIBS="$LIBS" 34503 51788 LIBS="-l$cf_term_lib $LIBS" 34504 51789 cat > conftest.$ac_ext <<EOF 34505 51790 -#line 3007 "configure" 34506 +#line 30 06"configure"51791 +#line 3010 "configure" 34507 51792 #include "confdefs.h" 34508 51793 /* Override any gcc2 internal prototype to avoid an error. */ 34509 51794 /* We use char because int might match the return type of a gcc2 34510 @@ -3014,7 +301 3,7 @@51795 @@ -3014,7 +3017,7 @@ 34511 51796 tgoto() 34512 51797 ; return 0; } 34513 51798 EOF 34514 51799 -if { (eval echo configure:3018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34515 +if { (eval echo configure:30 17: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then51800 +if { (eval echo configure:3021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34516 51801 rm -rf conftest* 34517 51802 eval "ac_cv_lib_$ac_lib_var=yes" 34518 51803 else 34519 @@ -3041,10 +304 0,10 @@51804 @@ -3041,10 +3044,10 @@ 34520 51805 34521 51806 # Check for library containing initscr … … 34526 51811 echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6 34527 51812 -echo "configure:3048: checking for initscr in -l$cf_curs_lib" >&5 34528 +echo "configure:30 47: checking for initscr in -l$cf_curs_lib" >&551813 +echo "configure:3051: checking for initscr in -l$cf_curs_lib" >&5 34529 51814 ac_lib_var=`echo $cf_curs_lib'_'initscr | sed 'y%./+-%__p_%'` 34530 51815 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 34531 51816 echo $ac_n "(cached) $ac_c" 1>&6 34532 @@ -3052,7 +305 1,7 @@51817 @@ -3052,7 +3055,7 @@ 34533 51818 ac_save_LIBS="$LIBS" 34534 51819 LIBS="-l$cf_curs_lib $LIBS" 34535 51820 cat > conftest.$ac_ext <<EOF 34536 51821 -#line 3056 "configure" 34537 +#line 305 5"configure"51822 +#line 3059 "configure" 34538 51823 #include "confdefs.h" 34539 51824 /* Override any gcc2 internal prototype to avoid an error. */ 34540 51825 /* We use char because int might match the return type of a gcc2 34541 @@ -3063,7 +306 2,7 @@51826 @@ -3063,7 +3066,7 @@ 34542 51827 initscr() 34543 51828 ; return 0; } 34544 51829 EOF 34545 51830 -if { (eval echo configure:3067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34546 +if { (eval echo configure:30 66: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then51831 +if { (eval echo configure:3070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34547 51832 rm -rf conftest* 34548 51833 eval "ac_cv_lib_$ac_lib_var=yes" 34549 51834 else 34550 @@ -3089,16 +30 88,16 @@51835 @@ -3089,16 +3092,16 @@ 34551 51836 LIBS="-l$cf_curs_lib $cf_save_LIBS" 34552 51837 if test "$cf_term_lib" = unknown ; then 34553 51838 echo $ac_n "checking if we can link with $cf_curs_lib library""... $ac_c" 1>&6 34554 51839 -echo "configure:3093: checking if we can link with $cf_curs_lib library" >&5 34555 +echo "configure:309 2: checking if we can link with $cf_curs_lib library" >&551840 +echo "configure:3096: checking if we can link with $cf_curs_lib library" >&5 34556 51841 cat > conftest.$ac_ext <<EOF 34557 51842 -#line 3095 "configure" 34558 +#line 309 4"configure"51843 +#line 3098 "configure" 34559 51844 #include "confdefs.h" 34560 51845 #include <${cf_cv_ncurses_header-curses.h}> … … 34564 51849 EOF 34565 51850 -if { (eval echo configure:3102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34566 +if { (eval echo configure:310 1: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then51851 +if { (eval echo configure:3105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34567 51852 rm -rf conftest* 34568 51853 cf_result=yes 34569 51854 else 34570 @@ -3114,16 +311 3,16 @@51855 @@ -3114,16 +3117,16 @@ 34571 51856 : 34572 51857 elif test "$cf_term_lib" != predefined ; then 34573 51858 echo $ac_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries""... $ac_c" 1>&6 34574 51859 -echo "configure:3118: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 34575 +echo "configure:31 17: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&551860 +echo "configure:3121: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 34576 51861 cat > conftest.$ac_ext <<EOF 34577 51862 -#line 3120 "configure" 34578 +#line 31 19"configure"51863 +#line 3123 "configure" 34579 51864 #include "confdefs.h" 34580 51865 #include <${cf_cv_ncurses_header-curses.h}> … … 34584 51869 EOF 34585 51870 -if { (eval echo configure:3127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34586 +if { (eval echo configure:31 26: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then51871 +if { (eval echo configure:3130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34587 51872 rm -rf conftest* 34588 51873 cf_result=no 34589 51874 else 34590 @@ -3133,14 +313 2,14 @@51875 @@ -3133,14 +3136,14 @@ 34591 51876 34592 51877 LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" 34593 51878 cat > conftest.$ac_ext <<EOF 34594 51879 -#line 3137 "configure" 34595 +#line 31 36"configure"51880 +#line 3140 "configure" 34596 51881 #include "confdefs.h" 34597 51882 #include <${cf_cv_ncurses_header-curses.h}> … … 34601 51886 EOF 34602 51887 -if { (eval echo configure:3144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34603 +if { (eval echo configure:314 3: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then51888 +if { (eval echo configure:3147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34604 51889 rm -rf conftest* 34605 51890 cf_result=yes 34606 51891 else 34607 @@ -3162,6 +3161,76 @@ 51892 @@ -3159,9 +3162,80 @@ 51893 fi 51894 51895 51896 + 34608 51897 ;; 34609 51898 ncurses) … … 34617 51906 +set dummy $ac_prog; ac_word=$2 34618 51907 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 34619 +echo "configure:317 3: checking for $ac_word" >&551908 +echo "configure:3178: checking for $ac_word" >&5 34620 51909 +if eval "test \"`echo '$''{'ac_cv_path_NCURSES_CONFIG'+set}'`\" = set"; then 34621 51910 + echo $ac_n "(cached) $ac_c" 1>&6 … … 34682 51971 cf_ncuhdr_root=ncurses 34683 51972 34684 @@ -3186,20 +32 55,20 @@51973 @@ -3186,20 +3260,20 @@ 34685 51974 fi 34686 51975 … … 34694 51983 cat > conftest.$ac_ext <<EOF 34695 51984 -#line 3196 "configure" 34696 +#line 32 65"configure"51985 +#line 3270 "configure" 34697 51986 #include "confdefs.h" 34698 51987 #include <stdio.h> … … 34702 51991 EOF 34703 51992 -if { (eval echo configure:3203: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34704 +if { (eval echo configure:327 2: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then51993 +if { (eval echo configure:3277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34705 51994 : 34706 51995 else 34707 51996 echo "configure: failed program was:" >&5 34708 @@ -3216,14 +32 85,14 @@51997 @@ -3216,14 +3290,14 @@ 34709 51998 if test "$cf_have_incdir" = no ; then 34710 51999 test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 34711 52000 34712 52001 -echo "${as_me-configure}:3220: testing adding $cf_add_incdir to include-path ..." 1>&5 34713 +echo "${as_me-configure}:32 89: testing adding $cf_add_incdir to include-path ..." 1>&552002 +echo "${as_me-configure}:3294: testing adding $cf_add_incdir to include-path ..." 1>&5 34714 52003 34715 52004 … … 34726 52015 break 34727 52016 fi 34728 @@ -3235,7 +330 4,7 @@52017 @@ -3235,7 +3309,7 @@ 34729 52018 } 34730 52019 34731 52020 echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6 34732 52021 -echo "configure:3239: checking for $cf_ncuhdr_root header in include-path" >&5 34733 +echo "configure:33 08: checking for $cf_ncuhdr_root header in include-path" >&552022 +echo "configure:3313: checking for $cf_ncuhdr_root header in include-path" >&5 34734 52023 if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then 34735 52024 echo $ac_n "(cached) $ac_c" 1>&6 34736 52025 else 34737 @@ -3246,7 +33 15,7 @@52026 @@ -3246,7 +3320,7 @@ 34738 52027 do 34739 52028 34740 52029 cat > conftest.$ac_ext <<EOF 34741 52030 -#line 3250 "configure" 34742 +#line 33 19"configure"52031 +#line 3324 "configure" 34743 52032 #include "confdefs.h" 34744 52033 34745 52034 34746 @@ -3267,7 +33 36,7 @@52035 @@ -3267,7 +3341,7 @@ 34747 52036 34748 52037 ; return 0; } 34749 52038 EOF 34750 52039 -if { (eval echo configure:3271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34751 +if { (eval echo configure:334 0: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then52040 +if { (eval echo configure:3345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34752 52041 rm -rf conftest* 34753 52042 cf_cv_ncurses_h=$cf_header 34754 52043 34755 @@ -3293,13 +336 2,39 @@52044 @@ -3293,13 +3367,39 @@ 34756 52045 else 34757 52046 34758 52047 echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6 34759 52048 -echo "configure:3297: checking for $cf_ncuhdr_root include-path" >&5 34760 +echo "configure:33 66: checking for $cf_ncuhdr_root include-path" >&552049 +echo "configure:3371: checking for $cf_ncuhdr_root include-path" >&5 34761 52050 if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then 34762 52051 echo $ac_n "(cached) $ac_c" 1>&6 … … 34795 52084 34796 52085 test "/usr" != "$prefix" && \ 34797 @@ -3362,6 +34 57,7 @@52086 @@ -3362,6 +3462,7 @@ 34798 52087 } 34799 52088 … … 34803 52092 test "$includedir" != "/usr/include" && \ 34804 52093 test -d "$includedir" && { 34805 @@ -3376,6 +347 2,7 @@52094 @@ -3376,6 +3477,7 @@ 34806 52095 test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root" 34807 52096 } … … 34811 52100 test -n "$verbose" && echo search path $cf_search 34812 52101 cf_save2_CPPFLAGS="$CPPFLAGS" 34813 @@ -3400,20 +3 497,20 @@52102 @@ -3400,20 +3502,20 @@ 34814 52103 fi 34815 52104 … … 34823 52112 cat > conftest.$ac_ext <<EOF 34824 52113 -#line 3410 "configure" 34825 +#line 35 07"configure"52114 +#line 3512 "configure" 34826 52115 #include "confdefs.h" 34827 52116 #include <stdio.h> … … 34831 52120 EOF 34832 52121 -if { (eval echo configure:3417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34833 +if { (eval echo configure:351 4: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then52122 +if { (eval echo configure:3519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34834 52123 : 34835 52124 else 34836 52125 echo "configure: failed program was:" >&5 34837 @@ -3430,14 +35 27,14 @@52126 @@ -3430,14 +3532,14 @@ 34838 52127 if test "$cf_have_incdir" = no ; then 34839 52128 test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 34840 52129 34841 52130 -echo "${as_me-configure}:3434: testing adding $cf_add_incdir to include-path ..." 1>&5 34842 +echo "${as_me-configure}:353 1: testing adding $cf_add_incdir to include-path ..." 1>&552131 +echo "${as_me-configure}:3536: testing adding $cf_add_incdir to include-path ..." 1>&5 34843 52132 34844 52133 … … 34855 52144 break 34856 52145 fi 34857 @@ -3452,7 +35 49,7 @@52146 @@ -3452,7 +3554,7 @@ 34858 52147 do 34859 52148 34860 52149 cat > conftest.$ac_ext <<EOF 34861 52150 -#line 3456 "configure" 34862 +#line 355 3"configure"52151 +#line 3558 "configure" 34863 52152 #include "confdefs.h" 34864 52153 34865 52154 34866 @@ -3473,7 +357 0,7 @@52155 @@ -3473,7 +3575,7 @@ 34867 52156 34868 52157 ; return 0; } 34869 52158 EOF 34870 52159 -if { (eval echo configure:3477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34871 +if { (eval echo configure:357 4: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then52160 +if { (eval echo configure:3579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34872 52161 rm -rf conftest* 34873 52162 cf_cv_ncurses_h2=$cf_header 34874 52163 34875 @@ -3525,20 +362 2,20 @@52164 @@ -3525,20 +3627,20 @@ 34876 52165 fi 34877 52166 … … 34885 52174 cat > conftest.$ac_ext <<EOF 34886 52175 -#line 3535 "configure" 34887 +#line 363 2"configure"52176 +#line 3637 "configure" 34888 52177 #include "confdefs.h" 34889 52178 #include <stdio.h> … … 34893 52182 EOF 34894 52183 -if { (eval echo configure:3542: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34895 +if { (eval echo configure:36 39: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then52184 +if { (eval echo configure:3644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34896 52185 : 34897 52186 else 34898 52187 echo "configure: failed program was:" >&5 34899 @@ -3555,14 +365 2,14 @@52188 @@ -3555,14 +3657,14 @@ 34900 52189 if test "$cf_have_incdir" = no ; then 34901 52190 test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 34902 52191 34903 52192 -echo "${as_me-configure}:3559: testing adding $cf_add_incdir to include-path ..." 1>&5 34904 +echo "${as_me-configure}:36 56: testing adding $cf_add_incdir to include-path ..." 1>&552193 +echo "${as_me-configure}:3661: testing adding $cf_add_incdir to include-path ..." 1>&5 34905 52194 34906 52195 … … 34917 52206 break 34918 52207 fi 34919 @@ -3603,7 +370 0,7 @@52208 @@ -3603,7 +3705,7 @@ 34920 52209 34921 52210 34922 52211 echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 34923 52212 -echo "configure:3607: checking for terminfo header" >&5 34924 +echo "configure:370 4: checking for terminfo header" >&552213 +echo "configure:3709: checking for terminfo header" >&5 34925 52214 if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then 34926 52215 echo $ac_n "(cached) $ac_c" 1>&6 34927 52216 else 34928 @@ -3620,7 +37 17,7 @@52217 @@ -3620,7 +3722,7 @@ 34929 52218 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" 34930 52219 do 34931 52220 cat > conftest.$ac_ext <<EOF 34932 52221 -#line 3624 "configure" 34933 +#line 372 1"configure"52222 +#line 3726 "configure" 34934 52223 #include "confdefs.h" 34935 52224 #include <stdio.h> 34936 52225 #include <${cf_cv_ncurses_header-curses.h}> 34937 @@ -3630,7 +37 27,7 @@52226 @@ -3630,7 +3732,7 @@ 34938 52227 int x = auto_left_margin 34939 52228 ; return 0; } 34940 52229 EOF 34941 52230 -if { (eval echo configure:3634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34942 +if { (eval echo configure:373 1: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then52231 +if { (eval echo configure:3736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34943 52232 rm -rf conftest* 34944 52233 34945 52234 cf_cv_term_header="$cf_test" 34946 @@ -3685,7 +378 2,7 @@52235 @@ -3685,7 +3787,7 @@ 34947 52236 34948 52237 34949 52238 echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 34950 52239 -echo "configure:3689: checking for ncurses version" >&5 34951 +echo "configure:37 86: checking for ncurses version" >&552240 +echo "configure:3791: checking for ncurses version" >&5 34952 52241 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then 34953 52242 echo $ac_n "(cached) $ac_c" 1>&6 34954 52243 else 34955 @@ -3711,7 +38 08,7 @@52244 @@ -3711,7 +3813,7 @@ 34956 52245 #endif 34957 52246 EOF 34958 52247 cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" 34959 52248 - { (eval echo configure:3715: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } 34960 + { (eval echo configure:381 2: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }52249 + { (eval echo configure:3817: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } 34961 52250 if test -f conftest.out ; then 34962 52251 cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` 34963 52252 test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" 34964 @@ -3720,7 +38 17,7 @@52253 @@ -3720,7 +3822,7 @@ 34965 52254 34966 52255 else 34967 52256 cat > conftest.$ac_ext <<EOF 34968 52257 -#line 3724 "configure" 34969 +#line 382 1"configure"52258 +#line 3826 "configure" 34970 52259 #include "confdefs.h" 34971 52260 34972 52261 #include <${cf_cv_ncurses_header-curses.h}> 34973 @@ -3744,7 +384 1,7 @@52262 @@ -3744,7 +3846,7 @@ 34974 52263 ${cf_cv_main_return-return}(0); 34975 52264 } 34976 52265 EOF 34977 52266 -if { (eval echo configure:3748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 34978 +if { (eval echo configure:38 45: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null52267 +if { (eval echo configure:3850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 34979 52268 then 34980 52269 34981 52270 cf_cv_ncurses_version=`cat $cf_tempfile` 34982 @@ -3766,7 +386 3,7 @@52271 @@ -3766,7 +3868,7 @@ 34983 52272 34984 52273 … … 34989 52278 cf_nculib_root=ncurses 34990 52279 # This works, except for the special case where we find gpm, but 34991 @@ -3775,7 +387 2,7 @@52280 @@ -3775,7 +3877,7 @@ 34992 52281 cf_ncurses_LIBS="" 34993 52282 cf_ncurses_SAVE="$LIBS" 34994 52283 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 34995 52284 -echo "configure:3779: checking for Gpm_Open in -lgpm" >&5 34996 +echo "configure:38 76: checking for Gpm_Open in -lgpm" >&552285 +echo "configure:3881: checking for Gpm_Open in -lgpm" >&5 34997 52286 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` 34998 52287 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 34999 52288 echo $ac_n "(cached) $ac_c" 1>&6 35000 @@ -3783,7 +388 0,7 @@52289 @@ -3783,7 +3885,7 @@ 35001 52290 ac_save_LIBS="$LIBS" 35002 52291 LIBS="-lgpm $LIBS" 35003 52292 cat > conftest.$ac_ext <<EOF 35004 52293 -#line 3787 "configure" 35005 +#line 388 4"configure"52294 +#line 3889 "configure" 35006 52295 #include "confdefs.h" 35007 52296 /* Override any gcc2 internal prototype to avoid an error. */ 35008 52297 /* We use char because int might match the return type of a gcc2 35009 @@ -3794,7 +389 1,7 @@52298 @@ -3794,7 +3896,7 @@ 35010 52299 Gpm_Open() 35011 52300 ; return 0; } 35012 52301 EOF 35013 52302 -if { (eval echo configure:3798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35014 +if { (eval echo configure:3 895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then52303 +if { (eval echo configure:3900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35015 52304 rm -rf conftest* 35016 52305 eval "ac_cv_lib_$ac_lib_var=yes" 35017 52306 else 35018 @@ -3810,7 +39 07,7 @@52307 @@ -3810,7 +3912,7 @@ 35019 52308 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 35020 52309 echo "$ac_t""yes" 1>&6 35021 52310 echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6 35022 52311 -echo "configure:3814: checking for initscr in -lgpm" >&5 35023 +echo "configure:391 1: checking for initscr in -lgpm" >&552312 +echo "configure:3916: checking for initscr in -lgpm" >&5 35024 52313 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'` 35025 52314 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 35026 52315 echo $ac_n "(cached) $ac_c" 1>&6 35027 @@ -3818,7 +39 15,7 @@52316 @@ -3818,7 +3920,7 @@ 35028 52317 ac_save_LIBS="$LIBS" 35029 52318 LIBS="-lgpm $LIBS" 35030 52319 cat > conftest.$ac_ext <<EOF 35031 52320 -#line 3822 "configure" 35032 +#line 39 19"configure"52321 +#line 3924 "configure" 35033 52322 #include "confdefs.h" 35034 52323 /* Override any gcc2 internal prototype to avoid an error. */ 35035 52324 /* We use char because int might match the return type of a gcc2 35036 @@ -3829,7 +39 26,7 @@52325 @@ -3829,7 +3931,7 @@ 35037 52326 initscr() 35038 52327 ; return 0; } 35039 52328 EOF 35040 52329 -if { (eval echo configure:3833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35041 +if { (eval echo configure:393 0: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then52330 +if { (eval echo configure:3935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35042 52331 rm -rf conftest* 35043 52332 eval "ac_cv_lib_$ac_lib_var=yes" 35044 52333 else 35045 @@ -3861,7 +39 58,7 @@52334 @@ -3861,7 +3963,7 @@ 35046 52335 # version of ncurses (but it should do no harm, since it's static). 35047 52336 if test "$cf_nculib_root" = ncurses ; then 35048 52337 echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 35049 52338 -echo "configure:3865: checking for tgoto in -lmytinfo" >&5 35050 +echo "configure:396 2: checking for tgoto in -lmytinfo" >&552339 +echo "configure:3967: checking for tgoto in -lmytinfo" >&5 35051 52340 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` 35052 52341 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 35053 52342 echo $ac_n "(cached) $ac_c" 1>&6 35054 @@ -3869,7 +39 66,7 @@52343 @@ -3869,7 +3971,7 @@ 35055 52344 ac_save_LIBS="$LIBS" 35056 52345 LIBS="-lmytinfo $LIBS" 35057 52346 cat > conftest.$ac_ext <<EOF 35058 52347 -#line 3873 "configure" 35059 +#line 397 0"configure"52348 +#line 3975 "configure" 35060 52349 #include "confdefs.h" 35061 52350 /* Override any gcc2 internal prototype to avoid an error. */ 35062 52351 /* We use char because int might match the return type of a gcc2 35063 @@ -3880,7 +39 77,7 @@52352 @@ -3880,7 +3982,7 @@ 35064 52353 tgoto() 35065 52354 ; return 0; } 35066 52355 EOF 35067 52356 -if { (eval echo configure:3884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35068 +if { (eval echo configure:398 1: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then52357 +if { (eval echo configure:3986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35069 52358 rm -rf conftest* 35070 52359 eval "ac_cv_lib_$ac_lib_var=yes" 35071 52360 else 35072 @@ -3928,7 +40 25,7 @@52361 @@ -3928,7 +4030,7 @@ 35073 52362 if test "$cf_have_libdir" = no ; then 35074 52363 test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 35075 52364 35076 52365 -echo "${as_me-configure}:3932: testing adding $cf_add_libdir to library-path ..." 1>&5 35077 +echo "${as_me-configure}:40 29: testing adding $cf_add_libdir to library-path ..." 1>&552366 +echo "${as_me-configure}:4034: testing adding $cf_add_libdir to library-path ..." 1>&5 35078 52367 35079 52368 35080 52369 LDFLAGS="-L$cf_add_libdir $LDFLAGS" 35081 @@ -3943,12 +404 0,12 @@52370 @@ -3943,12 +4045,12 @@ 35082 52371 eval 'cf_cv_have_lib_'$cf_nculib_root'=no' 35083 52372 cf_libdir="" 35084 52373 echo $ac_n "checking for initscr""... $ac_c" 1>&6 35085 52374 -echo "configure:3947: checking for initscr" >&5 35086 +echo "configure:404 4: checking for initscr" >&552375 +echo "configure:4049: checking for initscr" >&5 35087 52376 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then 35088 52377 echo $ac_n "(cached) $ac_c" 1>&6 … … 35090 52379 cat > conftest.$ac_ext <<EOF 35091 52380 -#line 3952 "configure" 35092 +#line 40 49"configure"52381 +#line 4054 "configure" 35093 52382 #include "confdefs.h" 35094 52383 /* System header to define __stub macros and hopefully few prototypes, 35095 52384 which can conflict with char initscr(); below. */ 35096 @@ -3971,7 +40 68,7 @@52385 @@ -3971,7 +4073,7 @@ 35097 52386 35098 52387 ; return 0; } 35099 52388 EOF 35100 52389 -if { (eval echo configure:3975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35101 +if { (eval echo configure:407 2: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then52390 +if { (eval echo configure:4077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35102 52391 rm -rf conftest* 35103 52392 eval "ac_cv_func_initscr=yes" 35104 52393 else 35105 @@ -3991,17 +40 88,17 @@52394 @@ -3991,17 +4093,17 @@ 35106 52395 35107 52396 cf_save_LIBS="$LIBS" 35108 52397 echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 35109 52398 -echo "configure:3995: checking for initscr in -l$cf_nculib_root" >&5 35110 +echo "configure:409 2: checking for initscr in -l$cf_nculib_root" >&552399 +echo "configure:4097: checking for initscr in -l$cf_nculib_root" >&5 35111 52400 LIBS="-l$cf_nculib_root $LIBS" 35112 52401 cat > conftest.$ac_ext <<EOF 35113 52402 -#line 3998 "configure" 35114 +#line 4 095"configure"52403 +#line 4100 "configure" 35115 52404 #include "confdefs.h" 35116 52405 #include <${cf_cv_ncurses_header-curses.h}> … … 35120 52409 EOF 35121 52410 -if { (eval echo configure:4005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35122 +if { (eval echo configure:410 2: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then52411 +if { (eval echo configure:4107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35123 52412 rm -rf conftest* 35124 52413 echo "$ac_t""yes" 1>&6 35125 52414 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' 35126 @@ -4011,7 +41 08,33 @@52415 @@ -4011,7 +4113,33 @@ 35127 52416 cat conftest.$ac_ext >&5 35128 52417 rm -rf conftest* … … 35159 52448 35160 52449 test "/usr" != "$prefix" && \ 35161 @@ -4074,20 +4 197,23 @@52450 @@ -4074,20 +4202,23 @@ 35162 52451 } 35163 52452 … … 35170 52459 echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6 35171 52460 -echo "configure:4081: checking for -l$cf_nculib_root in $cf_libdir" >&5 35172 +echo "configure:42 07: checking for -l$cf_nculib_root in $cf_libdir" >&552461 +echo "configure:4212: checking for -l$cf_nculib_root in $cf_libdir" >&5 35173 52462 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" 35174 52463 cat > conftest.$ac_ext <<EOF 35175 52464 -#line 4084 "configure" 35176 +#line 421 0"configure"52465 +#line 4215 "configure" 35177 52466 #include "confdefs.h" 35178 52467 #include <${cf_cv_ncurses_header-curses.h}> … … 35182 52471 EOF 35183 52472 -if { (eval echo configure:4091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35184 +if { (eval echo configure:42 17: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then52473 +if { (eval echo configure:4222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35185 52474 rm -rf conftest* 35186 52475 echo "$ac_t""yes" 1>&6 35187 52476 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' 35188 @@ -4118,7 +424 4,7 @@52477 @@ -4118,7 +4249,7 @@ 35189 52478 35190 52479 if test -n "$cf_ncurses_LIBS" ; then 35191 52480 echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6 35192 52481 -echo "configure:4122: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 35193 +echo "configure:42 48: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&552482 +echo "configure:4253: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 35194 52483 cf_ncurses_SAVE="$LIBS" 35195 52484 for p in $cf_ncurses_LIBS ; do 35196 52485 q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` 35197 @@ -4127,14 +425 3,14 @@52486 @@ -4127,14 +4258,14 @@ 35198 52487 fi 35199 52488 done 35200 52489 cat > conftest.$ac_ext <<EOF 35201 52490 -#line 4131 "configure" 35202 +#line 42 57"configure"52491 +#line 4262 "configure" 35203 52492 #include "confdefs.h" 35204 52493 #include <${cf_cv_ncurses_header-curses.h}> … … 35208 52497 EOF 35209 52498 -if { (eval echo configure:4138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35210 +if { (eval echo configure:426 4: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then52499 +if { (eval echo configure:4269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35211 52500 rm -rf conftest* 35212 52501 echo "$ac_t""yes" 1>&6 35213 52502 else 35214 @@ -4155,19 +428 1,22 @@52503 @@ -4155,19 +4286,22 @@ 35215 52504 EOF 35216 52505 … … 35225 52514 echo $ac_n "checking for multibyte character support""... $ac_c" 1>&6 35226 52515 -echo "configure:4164: checking for multibyte character support" >&5 35227 +echo "configure:429 3: checking for multibyte character support" >&552516 +echo "configure:4298: checking for multibyte character support" >&5 35228 52517 if eval "test \"`echo '$''{'cf_cv_utf8_lib'+set}'`\" = set"; then 35229 52518 echo $ac_n "(cached) $ac_c" 1>&6 … … 35233 52522 cat > conftest.$ac_ext <<EOF 35234 52523 -#line 4171 "configure" 35235 +#line 430 0"configure"52524 +#line 4305 "configure" 35236 52525 #include "confdefs.h" 35237 52526 35238 52527 #include <stdlib.h> 35239 @@ -4175,1 6 +4304,26@@52528 @@ -4175,198 +4309,82 @@ 35240 52529 putwc(0,0); 35241 52530 ; return 0; } 35242 52531 EOF 35243 52532 -if { (eval echo configure:4179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35244 +if { (eval echo configure:43 08: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then52533 +if { (eval echo configure:4313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35245 52534 rm -rf conftest* 35246 52535 cf_cv_utf8_lib=yes … … 35252 52541 - cat > conftest.$ac_ext <<EOF 35253 52542 -#line 4188 "configure" 52543 -#include "confdefs.h" 52544 - 52545 -#include <libutf8.h> 52546 -int main() { 52547 -putwc(0,0); 52548 -; return 0; } 52549 -EOF 52550 -if { (eval echo configure:4196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 52551 - rm -rf conftest* 52552 - cf_cv_utf8_lib=add-on 52553 -else 52554 - echo "configure: failed program was:" >&5 52555 - cat conftest.$ac_ext >&5 52556 - rm -rf conftest* 52557 - cf_cv_utf8_lib=no 52558 -fi 52559 -rm -f conftest* 52560 - LIBS="$cf_save_LIBS" 52561 - 52562 -fi 52563 -rm -f conftest* 52564 -fi 52565 - 52566 -echo "$ac_t""$cf_cv_utf8_lib" 1>&6 52567 - 52568 -# HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between 52569 -# ncurses/ncursesw: 52570 -if test "$cf_cv_utf8_lib" = "add-on" ; then 52571 - cat >> confdefs.h <<\EOF 52572 -#define HAVE_LIBUTF8_H 1 52573 -EOF 35254 52574 + 35255 + 52575 52576 - LIBS="-lutf8 $LIBS" 52577 -fi 35256 52578 +# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these 35257 52579 +# will be set on completion of the AC_TRY_LINK below. 35258 52580 +cf_cv_header_path_utf8= 35259 52581 +cf_cv_library_path_utf8= 35260 + 35261 + 35262 +echo "${as_me-configure}:4323: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 35263 + 35264 + 52582 52583 - 52584 52585 -cf_ncuhdr_root=ncursesw 52586 +echo "${as_me-configure}:4328: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 52587 52588 -test -n "$cf_cv_curses_dir" && \ 52589 -test "$cf_cv_curses_dir" != "no" && { \ 52590 - 52591 -if test -n "$cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then 52592 - for cf_add_incdir in $cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root 52593 - do 52594 - while test $cf_add_incdir != /usr/include 52595 - do 52596 - if test -d $cf_add_incdir 52597 - then 52598 - cf_have_incdir=no 52599 - if test -n "$CFLAGS$CPPFLAGS" ; then 52600 - # a loop is needed to ensure we can add subdirs of existing dirs 52601 - for cf_test_incdir in $CFLAGS $CPPFLAGS ; do 52602 - if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then 52603 - cf_have_incdir=yes; break 52604 - fi 52605 - done 52606 - fi 52607 52608 - if test "$cf_have_incdir" = no ; then 52609 - if test "$cf_add_incdir" = /usr/local/include ; then 52610 - if test "$GCC" = yes 52611 - then 52612 - cf_save_CPPFLAGS=$CPPFLAGS 52613 - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 52614 - cat > conftest.$ac_ext <<EOF 52615 -#line 4255 "configure" 35265 52616 +cat > conftest.$ac_ext <<EOF 35266 +#line 43 27"configure"52617 +#line 4332 "configure" 35267 52618 #include "confdefs.h" 35268 35269 #include <libutf8.h> 35270 @@ -4192,17 +4331,341 @@ 35271 putwc(0,0); 52619 -#include <stdio.h> 52620 + 52621 +#include <libutf8.h> 52622 int main() { 52623 -printf("Hello") 52624 +putwc(0,0); 35272 52625 ; return 0; } 35273 52626 EOF 35274 -if { (eval echo configure:4 196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then35275 +if { (eval echo configure:4335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35276 rm -rf conftest* 35277 - cf_cv_utf8_lib=add-on 52627 -if { (eval echo configure:4262: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 52628 - : 52629 +if { (eval echo configure:4340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 52630 + rm -rf conftest* 35278 52631 + cf_cv_find_linkage_utf8=yes 35279 52632 else … … 35281 52634 cat conftest.$ac_ext >&5 35282 52635 rm -rf conftest* 35283 - cf_cv_utf8_lib=no 52636 - cf_have_incdir=yes 52637 -fi 52638 -rm -f conftest* 52639 - CPPFLAGS=$cf_save_CPPFLAGS 52640 - fi 52641 - fi 52642 - fi 35284 52643 + 35285 52644 + cf_cv_find_linkage_utf8=no 35286 + 52645 52646 - if test "$cf_have_incdir" = no ; then 52647 - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 35287 52648 + test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 35288 + 35289 +echo "${as_me-configure}:4347: testing find linkage for utf8 library ..." 1>&5 35290 + 35291 + 52649 52650 -echo "${as_me-configure}:4279: testing adding $cf_add_incdir to include-path ..." 1>&5 52651 +echo "${as_me-configure}:4352: testing find linkage for utf8 library ..." 1>&5 52652 52653 52654 - CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" 35292 52655 + 35293 +echo "${as_me-configure}:4351: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 35294 + 35295 + 52656 +echo "${as_me-configure}:4356: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 52657 52658 - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 52659 - test "$cf_top_incdir" = "$cf_add_incdir" && break 52660 - cf_add_incdir="$cf_top_incdir" 52661 - else 52662 - break 52663 - fi 52664 - fi 52665 - done 52666 - done 52667 -fi 52668 52669 -} 35296 52670 + cf_save_CPPFLAGS="$CPPFLAGS" 35297 52671 + cf_test_CPPFLAGS="$CPPFLAGS" 35298 + 52672 52673 -echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6 52674 -echo "configure:4298: checking for $cf_ncuhdr_root header in include-path" >&5 52675 -if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then 52676 - echo $ac_n "(cached) $ac_c" 1>&6 52677 -else 52678 - 52679 - cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h" 52680 - ( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h" 52681 - for cf_header in $cf_header_list 35299 52682 + 35300 52683 +cf_header_path_list="" 35301 52684 +if test -n "${CFLAGS}${CPPFLAGS}" ; then 35302 52685 + for cf_header_path in $CPPFLAGS $CFLAGS 35303 + do 52686 do 52687 - 52688 - cat > conftest.$ac_ext <<EOF 52689 -#line 4309 "configure" 52690 -#include "confdefs.h" 52691 - 52692 - 52693 -#define _XOPEN_SOURCE_EXTENDED 52694 -#undef HAVE_LIBUTF8_H /* in case we used CF_UTF8_LIB */ 52695 -#define HAVE_LIBUTF8_H /* to force ncurses' header file to use cchar_t */ 52696 - 52697 -#include <$cf_header> 52698 -int main() { 52699 - 52700 -#ifdef NCURSES_VERSION 52701 - 52702 -#ifndef WACS_BSSB 52703 - make an error 52704 -#endif 52705 - 52706 -printf("%s\n", NCURSES_VERSION); 52707 -#else 52708 -#ifdef __NCURSES_H 52709 -printf("old\n"); 52710 -#else 52711 - make an error 52712 -#endif 52713 -#endif 52714 - 52715 - 52716 -; return 0; } 52717 -EOF 52718 -if { (eval echo configure:4338: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 52719 - rm -rf conftest* 52720 - cf_cv_ncurses_h=$cf_header 52721 - 52722 -else 52723 - echo "configure: failed program was:" >&5 52724 - cat conftest.$ac_ext >&5 52725 - rm -rf conftest* 52726 - cf_cv_ncurses_h=no 52727 -fi 52728 -rm -f conftest* 35304 52729 + case $cf_header_path in #(vi 35305 52730 + -I*) … … 35316 52741 + test -d $cf_header_path/utf8/include/utf8 && cf_search="$cf_search $cf_header_path/utf8/include/utf8" 35317 52742 +} 35318 + 52743 52744 - test "$cf_cv_ncurses_h" != no && break 35319 52745 + cf_header_path_list="$cf_header_path_list $cf_search" 35320 52746 + ;; 35321 52747 + esac 35322 + done 35323 +fi 35324 + 52748 done 52749 - 52750 fi 52751 52752 -echo "$ac_t""$cf_cv_ncurses_h" 1>&6 52753 - 52754 - 52755 - 52756 -if test "$cf_cv_ncurses_h" != no ; then 52757 - cf_cv_ncurses_header=$cf_cv_ncurses_h 52758 -else 52759 - 52760 -echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6 52761 -echo "configure:4364: checking for $cf_ncuhdr_root include-path" >&5 52762 -if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then 52763 - echo $ac_n "(cached) $ac_c" 1>&6 52764 -else 52765 - 52766 - test -n "$verbose" && echo 52767 - cf_search="" 35325 52768 +cf_search="" 35326 + 35327 + 35328 +test "/usr" != "$prefix" && \ 35329 +test -d "/usr" && \ 35330 +(test $prefix = NONE || test -d $prefix) && { 35331 + test -n "$verbose" && echo " ... testing for include-directories under /usr" 35332 + test -d /usr/include && cf_search="$cf_search /usr/include" 52769 52770 52771 test "/usr" != "$prefix" && \ 52772 @@ -4374,10 +4392,10 @@ 52773 (test $prefix = NONE || test -d $prefix) && { 52774 test -n "$verbose" && echo " ... testing for include-directories under /usr" 52775 test -d /usr/include && cf_search="$cf_search /usr/include" 52776 - test -d /usr/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/include/$cf_ncuhdr_root" 52777 - test -d /usr/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/include/$cf_ncuhdr_root/include" 52778 - test -d /usr/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/$cf_ncuhdr_root/include" 52779 - test -d /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 35333 52780 + test -d /usr/include/utf8 && cf_search="$cf_search /usr/include/utf8" 35334 52781 + test -d /usr/include/utf8/include && cf_search="$cf_search /usr/include/utf8/include" 35335 52782 + test -d /usr/utf8/include && cf_search="$cf_search /usr/utf8/include" 35336 52783 + test -d /usr/utf8/include/utf8 && cf_search="$cf_search /usr/utf8/include/utf8" 35337 +} 35338 + 35339 + 35340 +test "$prefix" != "NONE" && \ 35341 +test -d "$prefix" && \ 35342 + { 35343 + test -n "$verbose" && echo " ... testing for include-directories under $prefix" 35344 + test -d $prefix/include && cf_search="$cf_search $prefix/include" 52784 } 52785 52786 52787 @@ -4386,10 +4404,10 @@ 52788 { 52789 test -n "$verbose" && echo " ... testing for include-directories under $prefix" 52790 test -d $prefix/include && cf_search="$cf_search $prefix/include" 52791 - test -d $prefix/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root" 52792 - test -d $prefix/include/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include" 52793 - test -d $prefix/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include" 52794 - test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 35345 52795 + test -d $prefix/include/utf8 && cf_search="$cf_search $prefix/include/utf8" 35346 52796 + test -d $prefix/include/utf8/include && cf_search="$cf_search $prefix/include/utf8/include" 35347 52797 + test -d $prefix/utf8/include && cf_search="$cf_search $prefix/utf8/include" 35348 52798 + test -d $prefix/utf8/include/utf8 && cf_search="$cf_search $prefix/utf8/include/utf8" 35349 +} 35350 + 35351 + 35352 +test "/usr/local" != "$prefix" && \ 35353 +test -d "/usr/local" && \ 35354 +(test $prefix = NONE || test -d $prefix) && { 35355 + test -n "$verbose" && echo " ... testing for include-directories under /usr/local" 35356 + test -d /usr/local/include && cf_search="$cf_search /usr/local/include" 52799 } 52800 52801 52802 @@ -4398,10 +4416,10 @@ 52803 (test $prefix = NONE || test -d $prefix) && { 52804 test -n "$verbose" && echo " ... testing for include-directories under /usr/local" 52805 test -d /usr/local/include && cf_search="$cf_search /usr/local/include" 52806 - test -d /usr/local/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root" 52807 - test -d /usr/local/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include" 52808 - test -d /usr/local/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include" 52809 - test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 35357 52810 + test -d /usr/local/include/utf8 && cf_search="$cf_search /usr/local/include/utf8" 35358 52811 + test -d /usr/local/include/utf8/include && cf_search="$cf_search /usr/local/include/utf8/include" 35359 52812 + test -d /usr/local/utf8/include && cf_search="$cf_search /usr/local/utf8/include" 35360 52813 + test -d /usr/local/utf8/include/utf8 && cf_search="$cf_search /usr/local/utf8/include/utf8" 35361 +} 35362 + 35363 + 35364 +test "/opt" != "$prefix" && \ 35365 +test -d "/opt" && \ 35366 +(test $prefix = NONE || test -d $prefix) && { 35367 + test -n "$verbose" && echo " ... testing for include-directories under /opt" 35368 + test -d /opt/include && cf_search="$cf_search /opt/include" 52814 } 52815 52816 52817 @@ -4410,10 +4428,10 @@ 52818 (test $prefix = NONE || test -d $prefix) && { 52819 test -n "$verbose" && echo " ... testing for include-directories under /opt" 52820 test -d /opt/include && cf_search="$cf_search /opt/include" 52821 - test -d /opt/include/$cf_ncuhdr_root && cf_search="$cf_search /opt/include/$cf_ncuhdr_root" 52822 - test -d /opt/include/$cf_ncuhdr_root/include && cf_search="$cf_search /opt/include/$cf_ncuhdr_root/include" 52823 - test -d /opt/$cf_ncuhdr_root/include && cf_search="$cf_search /opt/$cf_ncuhdr_root/include" 52824 - test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 35369 52825 + test -d /opt/include/utf8 && cf_search="$cf_search /opt/include/utf8" 35370 52826 + test -d /opt/include/utf8/include && cf_search="$cf_search /opt/include/utf8/include" 35371 52827 + test -d /opt/utf8/include && cf_search="$cf_search /opt/utf8/include" 35372 52828 + test -d /opt/utf8/include/utf8 && cf_search="$cf_search /opt/utf8/include/utf8" 35373 +} 35374 + 35375 + 35376 +test "$HOME" != "$prefix" && \ 35377 +test -d "$HOME" && \ 35378 +(test $prefix = NONE || test -d $prefix) && { 35379 + test -n "$verbose" && echo " ... testing for include-directories under $HOME" 35380 + test -d $HOME/include && cf_search="$cf_search $HOME/include" 52829 } 52830 52831 52832 @@ -4422,160 +4440,254 @@ 52833 (test $prefix = NONE || test -d $prefix) && { 52834 test -n "$verbose" && echo " ... testing for include-directories under $HOME" 52835 test -d $HOME/include && cf_search="$cf_search $HOME/include" 52836 - test -d $HOME/include/$cf_ncuhdr_root && cf_search="$cf_search $HOME/include/$cf_ncuhdr_root" 52837 - test -d $HOME/include/$cf_ncuhdr_root/include && cf_search="$cf_search $HOME/include/$cf_ncuhdr_root/include" 52838 - test -d $HOME/$cf_ncuhdr_root/include && cf_search="$cf_search $HOME/$cf_ncuhdr_root/include" 52839 - test -d $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 35381 52840 + test -d $HOME/include/utf8 && cf_search="$cf_search $HOME/include/utf8" 35382 52841 + test -d $HOME/include/utf8/include && cf_search="$cf_search $HOME/include/utf8/include" 35383 52842 + test -d $HOME/utf8/include && cf_search="$cf_search $HOME/utf8/include" 35384 52843 + test -d $HOME/utf8/include/utf8 && cf_search="$cf_search $HOME/utf8/include/utf8" 35385 +} 35386 + 35387 + 35388 + 35389 +test "$includedir" != NONE && \ 35390 +test "$includedir" != "/usr/include" && \ 35391 +test -d "$includedir" && { 35392 + test -d $includedir && cf_search="$cf_search $includedir" 52844 } 52845 52846 52847 + 52848 test "$includedir" != NONE && \ 52849 test "$includedir" != "/usr/include" && \ 52850 test -d "$includedir" && { 52851 test -d $includedir && cf_search="$cf_search $includedir" 52852 - test -d $includedir/$cf_ncuhdr_root && cf_search="$cf_search $includedir/$cf_ncuhdr_root" 35393 52853 + test -d $includedir/utf8 && cf_search="$cf_search $includedir/utf8" 35394 +} 35395 + 35396 +test "$oldincludedir" != NONE && \ 35397 +test "$oldincludedir" != "/usr/include" && \ 35398 +test -d "$oldincludedir" && { 35399 + test -d $oldincludedir && cf_search="$cf_search $oldincludedir" 52854 } 52855 52856 test "$oldincludedir" != NONE && \ 52857 test "$oldincludedir" != "/usr/include" && \ 52858 test -d "$oldincludedir" && { 52859 test -d $oldincludedir && cf_search="$cf_search $oldincludedir" 52860 - test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root" 35400 52861 + test -d $oldincludedir/utf8 && cf_search="$cf_search $oldincludedir/utf8" 35401 +}35402 + 52862 } 52863 35403 52864 +cf_search="$cf_header_path_list $cf_search" 35404 + 52865 52866 - test -n "$verbose" && echo search path $cf_search 52867 - cf_save2_CPPFLAGS="$CPPFLAGS" 52868 - for cf_incdir in $cf_search 52869 - do 52870 - 52871 -if test -n "$cf_incdir" ; then 52872 - for cf_add_incdir in $cf_incdir 52873 - do 52874 - while test $cf_add_incdir != /usr/include 52875 - do 52876 - if test -d $cf_add_incdir 52877 - then 52878 - cf_have_incdir=no 52879 - if test -n "$CFLAGS$CPPFLAGS" ; then 52880 - # a loop is needed to ensure we can add subdirs of existing dirs 52881 - for cf_test_incdir in $CFLAGS $CPPFLAGS ; do 52882 - if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then 52883 - cf_have_incdir=yes; break 52884 - fi 52885 - done 52886 - fi 35405 52887 + for cf_cv_header_path_utf8 in $cf_search 35406 52888 + do 35407 52889 + if test -d $cf_cv_header_path_utf8 ; then 35408 52890 + test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 35409 + 35410 +echo "${as_me-configure}:4468: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 52891 52892 - if test "$cf_have_incdir" = no ; then 52893 - if test "$cf_add_incdir" = /usr/local/include ; then 52894 - if test "$GCC" = yes 52895 - then 52896 - cf_save_CPPFLAGS=$CPPFLAGS 52897 - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 52898 - cat > conftest.$ac_ext <<EOF 52899 -#line 4477 "configure" 52900 +echo "${as_me-configure}:4473: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 35411 52901 + 35412 52902 + 35413 52903 + CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8" 35414 52904 + cat > conftest.$ac_ext <<EOF 35415 +#line 4473 "configure" 35416 +#include "confdefs.h" 52905 +#line 4478 "configure" 52906 #include "confdefs.h" 52907 -#include <stdio.h> 35417 52908 + 35418 52909 +#include <libutf8.h> 35419 +int main() { 52910 int main() { 52911 -printf("Hello") 35420 52912 +putwc(0,0); 35421 +; return 0; } 35422 +EOF 35423 +if { (eval echo configure:4481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 52913 ; return 0; } 52914 EOF 52915 -if { (eval echo configure:4484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 52916 - : 52917 +if { (eval echo configure:4486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 35424 52918 + rm -rf conftest* 35425 52919 + 35426 52920 + test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 35427 52921 + 35428 +echo "${as_me-configure}:44 86: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&552922 +echo "${as_me-configure}:4491: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 35429 52923 + 35430 52924 + … … 35432 52926 + cf_test_CPPFLAGS="$CPPFLAGS" 35433 52927 + break 35434 +else 35435 + echo "configure: failed program was:" >&5 35436 + cat conftest.$ac_ext >&5 35437 + rm -rf conftest* 52928 else 52929 echo "configure: failed program was:" >&5 52930 cat conftest.$ac_ext >&5 52931 rm -rf conftest* 52932 - cf_have_incdir=yes 35438 52933 + 35439 52934 + CPPFLAGS="$cf_save_CPPFLAGS" … … 35441 52936 fi 35442 52937 rm -f conftest* 35443 - LIBS="$cf_save_LIBS" 52938 - CPPFLAGS=$cf_save_CPPFLAGS 52939 - fi 52940 - fi 52941 - fi 35444 52942 + fi 35445 52943 + done 35446 + 52944 52945 - if test "$cf_have_incdir" = no ; then 52946 - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 35447 52947 + if test "$cf_cv_find_linkage_utf8" = maybe ; then 35448 + 52948 52949 -echo "${as_me-configure}:4501: testing adding $cf_add_incdir to include-path ..." 1>&5 35449 52950 + 35450 +echo "${as_me-configure}:4507: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 35451 + 35452 + 52951 +echo "${as_me-configure}:4512: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 52952 52953 52954 - CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" 35453 52955 + cf_save_LIBS="$LIBS" 35454 52956 + cf_save_LDFLAGS="$LDFLAGS" 35455 + 52957 52958 - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 52959 - test "$cf_top_incdir" = "$cf_add_incdir" && break 52960 - cf_add_incdir="$cf_top_incdir" 52961 - else 52962 - break 52963 - fi 52964 - fi 35456 52965 + 35457 52966 + … … 35480 52989 + ;; 35481 52990 + esac 35482 + done 35483 +fi 35484 + 52991 done 52992 - done 52993 fi 52994 52995 - for cf_header in \ 52996 - ncurses.h \ 52997 - curses.h 52998 - do 52999 - 53000 - cat > conftest.$ac_ext <<EOF 53001 -#line 4523 "configure" 53002 -#include "confdefs.h" 35485 53003 +cf_search="" 35486 + 35487 + 53004 53005 53006 -#include <$cf_header> 53007 -int main() { 35488 53008 +test "/usr" != "$prefix" && \ 35489 53009 +test -d "/usr" && \ … … 35496 53016 + test -d /usr/utf8/lib/utf8 && cf_search="$cf_search /usr/utf8/lib/utf8" 35497 53017 +} 35498 + 35499 + 53018 53019 -#ifdef NCURSES_VERSION 53020 53021 -printf("%s\n", NCURSES_VERSION); 53022 -#else 53023 -#ifdef __NCURSES_H 53024 -printf("old\n"); 53025 -#else 53026 - make an error 53027 -#endif 53028 -#endif 53029 - 53030 - 35500 53031 +test "$prefix" != "NONE" && \ 35501 53032 +test -d "$prefix" && \ … … 35554 53085 + test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 35555 53086 + 35556 +echo "${as_me-configure}:461 3: testing ... testing $cf_cv_library_path_utf8 ..." 1>&553087 +echo "${as_me-configure}:4618: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 35557 53088 + 35558 53089 + … … 35561 53092 + LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8" 35562 53093 + cat > conftest.$ac_ext <<EOF 35563 +#line 462 0"configure"53094 +#line 4625 "configure" 35564 53095 +#include "confdefs.h" 35565 53096 + … … 35567 53098 +int main() { 35568 53099 +putwc(0,0); 35569 +; return 0; } 35570 +EOF 35571 +if { (eval echo configure:4628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35572 + rm -rf conftest* 53100 ; return 0; } 53101 EOF 53102 -if { (eval echo configure:4544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 53103 +if { (eval echo configure:4633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 53104 rm -rf conftest* 53105 - cf_cv_ncurses_h2=$cf_header 53106 - 35573 53107 + 35574 53108 + test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 35575 53109 + 35576 +echo "${as_me-configure}:463 3: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&553110 +echo "${as_me-configure}:4638: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 35577 53111 + 35578 53112 + … … 35580 53114 + cf_cv_library_file_utf8="-lutf8" 35581 53115 + break 35582 +else 35583 + echo "configure: failed program was:" >&5 35584 + cat conftest.$ac_ext >&5 35585 + rm -rf conftest* 53116 else 53117 echo "configure: failed program was:" >&5 53118 cat conftest.$ac_ext >&5 53119 rm -rf conftest* 53120 - cf_cv_ncurses_h2=no 35586 53121 + 35587 53122 + CPPFLAGS="$cf_save_CPPFLAGS" … … 35602 53137 + fi 35603 53138 + 35604 +fi 35605 +rm -f conftest* 35606 + 53139 fi 53140 rm -f conftest* 53141 53142 - if test "$cf_cv_ncurses_h2" != no ; then 53143 - cf_cv_ncurses_h2=$cf_incdir/$cf_header 53144 - test -n "$verbose" && echo $ac_n " ... found $ac_c" 1>&6 53145 - break 53146 - fi 53147 - test -n "$verbose" && echo " ... tested $cf_incdir/$cf_header" 1>&6 53148 - done 53149 - CPPFLAGS="$cf_save2_CPPFLAGS" 53150 - test "$cf_cv_ncurses_h2" != no && break 53151 - done 53152 - test "$cf_cv_ncurses_h2" = no && { echo "configure: error: not found" 1>&2; exit 1; } 53153 - 35607 53154 +if test "$cf_cv_find_linkage_utf8" = yes ; then 35608 53155 +cf_cv_utf8_lib=add-on 35609 53156 +else 35610 53157 +cf_cv_utf8_lib=no 53158 fi 53159 53160 -echo "$ac_t""$cf_cv_ncurses_h2" 1>&6 53161 53162 - cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` 53163 - cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2` 53164 - if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then 53165 - cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header 53166 - fi 35611 53167 +fi 35612 + 35613 35614 fi 35615 rm -f conftest* 35616 @@ -4217,10 +4680,174 @@ 35617 #define HAVE_LIBUTF8_H 1 35618 EOF 35619 35620 + 53168 +rm -f conftest* 53169 +fi 53170 + 53171 +echo "$ac_t""$cf_cv_utf8_lib" 1>&6 53172 + 53173 +# HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between 53174 +# ncurses/ncursesw: 53175 +if test "$cf_cv_utf8_lib" = "add-on" ; then 53176 + cat >> confdefs.h <<\EOF 53177 +#define HAVE_LIBUTF8_H 1 53178 +EOF 53179 + 53180 53181 -if test -n "$cf_1st_incdir" ; then 53182 - for cf_add_incdir in $cf_1st_incdir 35621 53183 +if test -n "$cf_cv_header_path_utf8" ; then 35622 53184 + for cf_add_incdir in $cf_cv_header_path_utf8 35623 + do 35624 + while test $cf_add_incdir != /usr/include 35625 + do 35626 + if test -d $cf_add_incdir 35627 + then 35628 + cf_have_incdir=no 35629 + if test -n "$CFLAGS$CPPFLAGS" ; then 35630 + # a loop is needed to ensure we can add subdirs of existing dirs 35631 + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do 35632 + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then 35633 + cf_have_incdir=yes; break 35634 + fi 35635 + done 35636 + fi 35637 + 35638 + if test "$cf_have_incdir" = no ; then 53185 do 53186 while test $cf_add_incdir != /usr/include 53187 do 53188 @@ -4592,20 +4704,20 @@ 53189 fi 53190 53191 if test "$cf_have_incdir" = no ; then 53192 - if test "$cf_add_incdir" = /usr/local/include ; then 35639 53193 + if test "$cf_add_incdir" = /usr/local/include ; then 35640 + if test "$GCC" = yes 35641 + then 35642 + cf_save_CPPFLAGS=$CPPFLAGS 35643 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 35644 + cat > conftest.$ac_ext <<EOF 35645 +#line 4709 "configure" 35646 +#include "confdefs.h" 35647 +#include <stdio.h> 35648 +int main() { 35649 +printf("Hello") 35650 +; return 0; } 35651 +EOF 35652 +if { (eval echo configure:4716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 35653 + : 35654 +else 35655 + echo "configure: failed program was:" >&5 35656 + cat conftest.$ac_ext >&5 35657 + rm -rf conftest* 35658 + cf_have_incdir=yes 35659 +fi 35660 +rm -f conftest* 35661 + CPPFLAGS=$cf_save_CPPFLAGS 35662 + fi 35663 + fi 35664 + fi 35665 + 35666 + if test "$cf_have_incdir" = no ; then 35667 + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 35668 + 35669 +echo "${as_me-configure}:4733: testing adding $cf_add_incdir to include-path ..." 1>&5 35670 + 35671 + 53194 if test "$GCC" = yes 53195 then 53196 cf_save_CPPFLAGS=$CPPFLAGS 53197 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 53198 cat > conftest.$ac_ext <<EOF 53199 -#line 4602 "configure" 53200 +#line 4714 "configure" 53201 #include "confdefs.h" 53202 #include <stdio.h> 53203 int main() { 53204 printf("Hello") 53205 ; return 0; } 53206 EOF 53207 -if { (eval echo configure:4609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 53208 +if { (eval echo configure:4721: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 53209 : 53210 else 53211 echo "configure: failed program was:" >&5 53212 @@ -4622,14 +4734,14 @@ 53213 if test "$cf_have_incdir" = no ; then 53214 test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 53215 53216 -echo "${as_me-configure}:4626: testing adding $cf_add_incdir to include-path ..." 1>&5 53217 +echo "${as_me-configure}:4738: testing adding $cf_add_incdir to include-path ..." 1>&5 53218 53219 53220 - CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" 35672 53221 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 35673 + 53222 53223 - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 53224 - test "$cf_top_incdir" = "$cf_add_incdir" && break 53225 - cf_add_incdir="$cf_top_incdir" 35674 53226 + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 35675 53227 + test "$cf_top_incdir" = "$cf_add_incdir" && break 35676 53228 + cf_add_incdir="$cf_top_incdir" 35677 + else 35678 + break 35679 + fi 35680 + fi 35681 + done 35682 + done 35683 +fi 35684 + 53229 else 53230 break 53231 fi 53232 @@ -4638,738 +4750,778 @@ 53233 done 53234 fi 53235 35685 53236 + 35686 53237 +if test -n "$cf_cv_library_path_utf8" ; then … … 35702 53253 + if test "$cf_have_libdir" = no ; then 35703 53254 + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 35704 + 35705 +echo "${as_me-configure}:4769: testing adding $cf_add_libdir to library-path ..." 1>&5 35706 + 35707 + 53255 53256 -fi 53257 - 53258 -# Set definitions to allow ifdef'ing for ncurses.h 53259 - 53260 -case $cf_cv_ncurses_header in # (vi 53261 -*ncurses.h) 53262 - cat >> confdefs.h <<\EOF 53263 -#define HAVE_NCURSES_H 1 53264 -EOF 53265 - 53266 - ;; 53267 -esac 53268 - 53269 -case $cf_cv_ncurses_header in # (vi 53270 -ncurses/curses.h|ncurses/ncurses.h) 53271 - cat >> confdefs.h <<\EOF 53272 -#define HAVE_NCURSES_NCURSES_H 1 53273 -EOF 53274 +echo "${as_me-configure}:4774: testing adding $cf_add_libdir to library-path ..." 1>&5 53275 53276 - ;; 53277 -ncursesw/curses.h|ncursesw/ncurses.h) 53278 - cat >> confdefs.h <<\EOF 53279 -#define HAVE_NCURSESW_NCURSES_H 1 53280 -EOF 53281 53282 - ;; 53283 -esac 35708 53284 + LDFLAGS="-L$cf_add_libdir $LDFLAGS" 35709 53285 + fi … … 35711 53287 + done 35712 53288 +fi 35713 + 35714 35715 35716 35717 53289 53290 + LIBS="-lutf8 $LIBS" 53291 +fi 53292 53293 + 35718 53294 +cf_ncuconfig_root=ncursesw 35719 + 53295 53296 -echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 53297 -echo "configure:4674: checking for terminfo header" >&5 53298 -if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then 53299 - echo $ac_n "(cached) $ac_c" 1>&6 53300 -else 53301 - 53302 -case ${cf_cv_ncurses_header} in #(vi 53303 -*/ncurses.h|*/ncursesw.h) #(vi 53304 - cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'` 53305 - ;; 53306 -*) 53307 - cf_term_header=term.h 53308 - ;; 53309 -esac 53310 - 53311 -for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" 35720 53312 +echo "Looking for ${cf_ncuconfig_root}-config" 35721 53313 +for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config 35722 +do 53314 do 53315 -cat > conftest.$ac_ext <<EOF 53316 -#line 4691 "configure" 53317 -#include "confdefs.h" 53318 -#include <stdio.h> 53319 -#include <${cf_cv_ncurses_header-curses.h}> 53320 -#include <$cf_test> 53321 - 53322 -int main() { 53323 -int x = auto_left_margin 53324 -; return 0; } 53325 -EOF 53326 -if { (eval echo configure:4701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 53327 - rm -rf conftest* 53328 - 53329 - cf_cv_term_header="$cf_test" 35723 53330 +# Extract the first word of "$ac_prog", so it can be a program name with args. 35724 53331 +set dummy $ac_prog; ac_word=$2 35725 53332 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 35726 +echo "configure:479 0: checking for $ac_word" >&553333 +echo "configure:4795: checking for $ac_word" >&5 35727 53334 +if eval "test \"`echo '$''{'ac_cv_path_NCURSES_CONFIG'+set}'`\" = set"; then 35728 53335 + echo $ac_n "(cached) $ac_c" 1>&6 35729 +else 53336 else 53337 - echo "configure: failed program was:" >&5 53338 - cat conftest.$ac_ext >&5 53339 - rm -rf conftest* 53340 - 53341 - cf_cv_term_header=unknown 53342 - 35730 53343 + case "$NCURSES_CONFIG" in 35731 53344 + /*) … … 35748 53361 + ;; 35749 53362 +esac 35750 +fi 53363 fi 53364 -rm -f conftest* 53365 - test "$cf_cv_term_header" != unknown && break 53366 -done 53367 - 35751 53368 +NCURSES_CONFIG="$ac_cv_path_NCURSES_CONFIG" 35752 53369 +if test -n "$NCURSES_CONFIG"; then … … 35754 53371 +else 35755 53372 + echo "$ac_t""no" 1>&6 35756 +fi 35757 + 53373 fi 53374 53375 -echo "$ac_t""$cf_cv_term_header" 1>&6 35758 53376 +test -n "$NCURSES_CONFIG" && break 35759 53377 +done 35760 53378 +test -n "$NCURSES_CONFIG" || NCURSES_CONFIG="none" 35761 + 35762 + 53379 53380 -# Set definitions to allow ifdef'ing to accommodate subdirectories 53381 53382 -case $cf_cv_term_header in # (vi 53383 -*term.h) 53384 - cat >> confdefs.h <<\EOF 53385 -#define HAVE_TERM_H 1 53386 -EOF 35763 53387 +if test "$NCURSES_CONFIG" != none ; then 35764 + 53388 53389 - ;; 53390 -esac 35765 53391 +cf_cv_ncurses_header=curses.h 35766 + 53392 53393 -case $cf_cv_term_header in # (vi 53394 -ncurses/term.h) #(vi 53395 - cat >> confdefs.h <<\EOF 53396 -#define HAVE_NCURSES_TERM_H 1 53397 -EOF 35767 53398 +CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" 35768 53399 +LIBS="`$NCURSES_CONFIG --libs` $LIBS" 35769 + 53400 53401 - ;; 53402 -ncursesw/term.h) 53403 - cat >> confdefs.h <<\EOF 53404 -#define HAVE_NCURSESW_TERM_H 1 35770 53405 +cat >> confdefs.h <<\EOF 35771 53406 +#define NCURSES 1 35772 +EOF 35773 + 35774 + 35775 + 53407 EOF 53408 53409 - ;; 53410 -esac 53411 53412 53413 -# some applications need this, but should check for NCURSES_VERSION 53414 -cat >> confdefs.h <<\EOF 53415 -#define NCURSES 1 35776 53416 +cf_nculib_ROOT=`echo "HAVE_LIB$cf_ncuconfig_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 35777 53417 + 35778 53418 +cat >> confdefs.h <<EOF 35779 53419 +#define $cf_nculib_ROOT 1 35780 +EOF35781 + 35782 + 53420 EOF 53421 53422 35783 53423 +cf_cv_ncurses_version=`$NCURSES_CONFIG --version` 35784 + 35785 +else 35786 + 35787 + 35788 35789 cf_ncuhdr_root=ncursesw 35790 35791 @@ -4245,20 +4872,20 @@ 35792 fi 35793 35794 if test "$cf_have_incdir" = no ; then 35795 - if test "$cf_add_incdir" = /usr/local/include ; then 53424 53425 -echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 53426 -echo "configure:4756: checking for ncurses version" >&5 53427 -if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then 53428 - echo $ac_n "(cached) $ac_c" 1>&6 53429 else 53430 - 53431 - cf_cv_ncurses_version=no 53432 - cf_tempfile=out$$ 53433 - rm -f $cf_tempfile 53434 - if test "$cross_compiling" = yes; then 53435 - 53436 53437 - # This will not work if the preprocessor splits the line after the 53438 - # Autoconf token. The 'unproto' program does that. 53439 - cat > conftest.$ac_ext <<EOF 53440 -#include <${cf_cv_ncurses_header-curses.h}> 53441 -#undef Autoconf 53442 -#ifdef NCURSES_VERSION 53443 -Autoconf NCURSES_VERSION 53444 -#else 53445 -#ifdef __NCURSES_H 53446 -Autoconf "old" 53447 -#endif 53448 -; 53449 -#endif 53450 -EOF 53451 - cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" 53452 - { (eval echo configure:4782: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } 53453 - if test -f conftest.out ; then 53454 - cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` 53455 - test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" 53456 - rm -f conftest.out 53457 - fi 53458 53459 -else 53460 - cat > conftest.$ac_ext <<EOF 53461 -#line 4791 "configure" 53462 -#include "confdefs.h" 53463 53464 -#include <${cf_cv_ncurses_header-curses.h}> 53465 +cf_ncuhdr_root=ncursesw 53466 + 53467 +test -n "$cf_cv_curses_dir" && \ 53468 +test "$cf_cv_curses_dir" != "no" && { \ 53469 + 53470 +if test -n "$cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then 53471 + for cf_add_incdir in $cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root 53472 + do 53473 + while test $cf_add_incdir != /usr/include 53474 + do 53475 + if test -d $cf_add_incdir 53476 + then 53477 + cf_have_incdir=no 53478 + if test -n "$CFLAGS$CPPFLAGS" ; then 53479 + # a loop is needed to ensure we can add subdirs of existing dirs 53480 + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do 53481 + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then 53482 + cf_have_incdir=yes; break 53483 + fi 53484 + done 53485 + fi 53486 + 53487 + if test "$cf_have_incdir" = no ; then 35796 53488 + if test "$cf_add_incdir" = /usr/local/include ; then 35797 if test "$GCC" = yes 35798 then 35799 cf_save_CPPFLAGS=$CPPFLAGS 35800 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 35801 cat > conftest.$ac_ext <<EOF 35802 -#line 4255 "configure" 35803 +#line 4882 "configure" 35804 #include "confdefs.h" 53489 + if test "$GCC" = yes 53490 + then 53491 + cf_save_CPPFLAGS=$CPPFLAGS 53492 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 53493 + cat > conftest.$ac_ext <<EOF 53494 +#line 4887 "configure" 53495 +#include "confdefs.h" 35805 53496 #include <stdio.h> 35806 int main() { 35807 printf("Hello") 35808 ; return 0; } 53497 -int main() 53498 -{ 53499 - FILE *fp = fopen("$cf_tempfile", "w"); 53500 -#ifdef NCURSES_VERSION 53501 -# ifdef NCURSES_VERSION_PATCH 53502 - fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH); 53503 -# else 53504 - fprintf(fp, "%s\n", NCURSES_VERSION); 53505 -# endif 53506 -#else 53507 -# ifdef __NCURSES_H 53508 - fprintf(fp, "old\n"); 53509 -# else 53510 - make an error 53511 -# endif 53512 -#endif 53513 - ${cf_cv_main_return-return}(0); 53514 -} 53515 +int main() { 53516 +printf("Hello") 53517 +; return 0; } 35809 53518 EOF 35810 -if { (eval echo configure:4262: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 35811 +if { (eval echo configure:4889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 35812 : 53519 -if { (eval echo configure:4815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 53520 -then 53521 - 53522 - cf_cv_ncurses_version=`cat $cf_tempfile` 53523 +if { (eval echo configure:4894: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 53524 + : 35813 53525 else 35814 53526 echo "configure: failed program was:" >&5 35815 @@ -4275,14 +4902,14 @@ 35816 if test "$cf_have_incdir" = no ; then 35817 test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 35818 35819 -echo "${as_me-configure}:4279: testing adding $cf_add_incdir to include-path ..." 1>&5 35820 +echo "${as_me-configure}:4906: testing adding $cf_add_incdir to include-path ..." 1>&5 35821 35822 35823 - CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" 53527 cat conftest.$ac_ext >&5 53528 + rm -rf conftest* 53529 + cf_have_incdir=yes 53530 fi 53531 -rm -fr conftest* 53532 -fi 53533 +rm -f conftest* 53534 + CPPFLAGS=$cf_save_CPPFLAGS 53535 + fi 53536 + fi 53537 + fi 53538 53539 - rm -f $cf_tempfile 53540 + if test "$cf_have_incdir" = no ; then 53541 + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 53542 53543 -fi 53544 +echo "${as_me-configure}:4911: testing adding $cf_add_incdir to include-path ..." 1>&5 53545 53546 -echo "$ac_t""$cf_cv_ncurses_version" 1>&6 53547 -test "$cf_cv_ncurses_version" = no || cat >> confdefs.h <<\EOF 53548 -#define NCURSES 1 53549 -EOF 53550 35824 53551 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 35825 53552 35826 - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`35827 - test "$cf_top_incdir" = "$cf_add_incdir" && break35828 - cf_add_incdir="$cf_top_incdir"35829 53553 + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 35830 53554 + test "$cf_top_incdir" = "$cf_add_incdir" && break 35831 53555 + cf_add_incdir="$cf_top_incdir" 35832 else 35833 break 35834 fi 35835 @@ -4294,7 +4921,7 @@ 35836 } 35837 35838 echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6 35839 -echo "configure:4298: checking for $cf_ncuhdr_root header in include-path" >&5 35840 +echo "configure:4925: checking for $cf_ncuhdr_root header in include-path" >&5 35841 if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then 53556 + else 53557 + break 53558 + fi 53559 + fi 53560 + done 53561 + done 53562 +fi 53563 53564 - 53565 +} 53566 53567 -cf_nculib_root=ncursesw 53568 - # This works, except for the special case where we find gpm, but 53569 - # ncurses is in a nonstandard location via $LIBS, and we really want 53570 - # to link gpm. 53571 -cf_ncurses_LIBS="" 53572 -cf_ncurses_SAVE="$LIBS" 53573 -echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 53574 -echo "configure:4846: checking for Gpm_Open in -lgpm" >&5 53575 -ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` 53576 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 53577 +echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6 53578 +echo "configure:4930: checking for $cf_ncuhdr_root header in include-path" >&5 53579 +if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then 35842 53580 echo $ac_n "(cached) $ac_c" 1>&6 35843 53581 else 35844 @@ -4305,7 +4932,7 @@ 35845 do 35846 35847 cat > conftest.$ac_ext <<EOF 35848 -#line 4309 "configure" 35849 +#line 4936 "configure" 53582 - ac_save_LIBS="$LIBS" 53583 -LIBS="-lgpm $LIBS" 53584 -cat > conftest.$ac_ext <<EOF 53585 -#line 4854 "configure" 53586 + 53587 + cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h" 53588 + ( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h" 53589 + for cf_header in $cf_header_list 53590 + do 53591 + 53592 + cat > conftest.$ac_ext <<EOF 53593 +#line 4941 "configure" 35850 53594 #include "confdefs.h" 35851 35852 35853 @@ -4334,7 +4961,7 @@ 35854 53595 -/* Override any gcc2 internal prototype to avoid an error. */ 53596 -/* We use char because int might match the return type of a gcc2 53597 - builtin and then its argument prototype would still apply. */ 53598 -char Gpm_Open(); 53599 53600 + 53601 +#define _XOPEN_SOURCE_EXTENDED 53602 +#undef HAVE_LIBUTF8_H /* in case we used CF_UTF8_LIB */ 53603 +#define HAVE_LIBUTF8_H /* to force ncurses' header file to use cchar_t */ 53604 + 53605 +#include <$cf_header> 53606 int main() { 53607 -Gpm_Open() 53608 + 53609 +#ifdef NCURSES_VERSION 53610 + 53611 +#ifndef WACS_BSSB 53612 + make an error 53613 +#endif 53614 + 53615 +printf("%s\n", NCURSES_VERSION); 53616 +#else 53617 +#ifdef __NCURSES_H 53618 +printf("old\n"); 53619 +#else 53620 + make an error 53621 +#endif 53622 +#endif 53623 + 53624 + 35855 53625 ; return 0; } 35856 53626 EOF 35857 -if { (eval echo configure:4 338: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5;}; then35858 +if { (eval echo configure:49 65: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then53627 -if { (eval echo configure:4865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 53628 +if { (eval echo configure:4970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 35859 53629 rm -rf conftest* 35860 cf_cv_ncurses_h=$cf_header 35861 35862 @@ -4360,13 +4987,39 @@ 53630 - eval "ac_cv_lib_$ac_lib_var=yes" 53631 + cf_cv_ncurses_h=$cf_header 53632 + 35863 53633 else 35864 35865 echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6 35866 -echo "configure:4364: checking for $cf_ncuhdr_root include-path" >&5 35867 +echo "configure:4991: checking for $cf_ncuhdr_root include-path" >&5 35868 if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then 53634 echo "configure: failed program was:" >&5 53635 cat conftest.$ac_ext >&5 53636 rm -rf conftest* 53637 - eval "ac_cv_lib_$ac_lib_var=no" 53638 + cf_cv_ncurses_h=no 53639 fi 53640 rm -f conftest* 53641 -LIBS="$ac_save_LIBS" 53642 + 53643 + test "$cf_cv_ncurses_h" != no && break 53644 + done 53645 53646 fi 53647 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 53648 - echo "$ac_t""yes" 1>&6 53649 - echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6 53650 -echo "configure:4881: checking for initscr in -lgpm" >&5 53651 -ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'` 53652 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 53653 - echo $ac_n "(cached) $ac_c" 1>&6 53654 -else 53655 - ac_save_LIBS="$LIBS" 53656 -LIBS="-lgpm $LIBS" 53657 -cat > conftest.$ac_ext <<EOF 53658 -#line 4889 "configure" 53659 -#include "confdefs.h" 53660 -/* Override any gcc2 internal prototype to avoid an error. */ 53661 -/* We use char because int might match the return type of a gcc2 53662 - builtin and then its argument prototype would still apply. */ 53663 -char initscr(); 53664 - 53665 -int main() { 53666 -initscr() 53667 -; return 0; } 53668 -EOF 53669 -if { (eval echo configure:4900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 53670 - rm -rf conftest* 53671 - eval "ac_cv_lib_$ac_lib_var=yes" 53672 -else 53673 - echo "configure: failed program was:" >&5 53674 - cat conftest.$ac_ext >&5 53675 - rm -rf conftest* 53676 - eval "ac_cv_lib_$ac_lib_var=no" 53677 -fi 53678 -rm -f conftest* 53679 -LIBS="$ac_save_LIBS" 53680 - 53681 -fi 53682 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 53683 - echo "$ac_t""yes" 1>&6 53684 - LIBS="$cf_ncurses_SAVE" 53685 -else 53686 - echo "$ac_t""no" 1>&6 53687 -cf_ncurses_LIBS="-lgpm" 53688 -fi 53689 - 53690 -else 53691 - echo "$ac_t""no" 1>&6 53692 -fi 53693 53694 +echo "$ac_t""$cf_cv_ncurses_h" 1>&6 53695 53696 -case $host_os in #(vi 53697 -freebsd*) 53698 - # This is only necessary if you are linking against an obsolete 53699 - # version of ncurses (but it should do no harm, since it's static). 53700 - if test "$cf_nculib_root" = ncurses ; then 53701 - echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 53702 -echo "configure:4932: checking for tgoto in -lmytinfo" >&5 53703 -ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` 53704 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 53705 - echo $ac_n "(cached) $ac_c" 1>&6 53706 -else 53707 - ac_save_LIBS="$LIBS" 53708 -LIBS="-lmytinfo $LIBS" 53709 -cat > conftest.$ac_ext <<EOF 53710 -#line 4940 "configure" 53711 -#include "confdefs.h" 53712 -/* Override any gcc2 internal prototype to avoid an error. */ 53713 -/* We use char because int might match the return type of a gcc2 53714 - builtin and then its argument prototype would still apply. */ 53715 -char tgoto(); 53716 53717 -int main() { 53718 -tgoto() 53719 -; return 0; } 53720 -EOF 53721 -if { (eval echo configure:4951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 53722 - rm -rf conftest* 53723 - eval "ac_cv_lib_$ac_lib_var=yes" 53724 -else 53725 - echo "configure: failed program was:" >&5 53726 - cat conftest.$ac_ext >&5 53727 - rm -rf conftest* 53728 - eval "ac_cv_lib_$ac_lib_var=no" 53729 -fi 53730 -rm -f conftest* 53731 -LIBS="$ac_save_LIBS" 53732 53733 -fi 53734 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 53735 - echo "$ac_t""yes" 1>&6 53736 - cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" 53737 +if test "$cf_cv_ncurses_h" != no ; then 53738 + cf_cv_ncurses_header=$cf_cv_ncurses_h 53739 else 53740 - echo "$ac_t""no" 1>&6 53741 -fi 53742 - 53743 - fi 53744 - ;; 53745 -esac 53746 - 53747 -LIBS="$cf_ncurses_LIBS $LIBS" 53748 - 53749 -if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) 53750 -then 53751 - 53752 -if test -n "$cf_cv_curses_dir/lib" ; then 53753 - for cf_add_libdir in $cf_cv_curses_dir/lib 53754 - do 53755 - if test $cf_add_libdir = /usr/lib ; then 53756 - : 53757 - elif test -d $cf_add_libdir 53758 - then 53759 - cf_have_libdir=no 53760 - if test -n "$LDFLAGS$LIBS" ; then 53761 - # a loop is needed to ensure we can add subdirs of existing dirs 53762 - for cf_test_libdir in $LDFLAGS $LIBS ; do 53763 - if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then 53764 - cf_have_libdir=yes; break 53765 - fi 53766 - done 53767 - fi 53768 - if test "$cf_have_libdir" = no ; then 53769 - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 53770 53771 -echo "${as_me-configure}:4999: testing adding $cf_add_libdir to library-path ..." 1>&5 53772 - 53773 - 53774 - LDFLAGS="-L$cf_add_libdir $LDFLAGS" 53775 - fi 53776 - fi 53777 - done 53778 -fi 53779 - 53780 - LIBS="-l$cf_nculib_root $LIBS" 53781 -else 53782 - 53783 - eval 'cf_cv_have_lib_'$cf_nculib_root'=no' 53784 - cf_libdir="" 53785 - echo $ac_n "checking for initscr""... $ac_c" 1>&6 53786 -echo "configure:5014: checking for initscr" >&5 53787 -if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then 53788 +echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6 53789 +echo "configure:4996: checking for $cf_ncuhdr_root include-path" >&5 53790 +if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then 35869 53791 echo $ac_n "(cached) $ac_c" 1>&6 35870 53792 else 35871 35872 test -n "$verbose" && echo 35873 - cf_search="" 53793 - cat > conftest.$ac_ext <<EOF 53794 -#line 5019 "configure" 53795 -#include "confdefs.h" 53796 -/* System header to define __stub macros and hopefully few prototypes, 53797 - which can conflict with char initscr(); below. */ 53798 -#include <assert.h> 53799 -/* Override any gcc2 internal prototype to avoid an error. */ 53800 -/* We use char because int might match the return type of a gcc2 53801 - builtin and then its argument prototype would still apply. */ 53802 -char initscr(); 53803 - 53804 -int main() { 53805 - 53806 -/* The GNU C library defines this for functions which it implements 53807 - to always fail with ENOSYS. Some functions are actually named 53808 - something starting with __ and the normal name is an alias. */ 53809 -#if defined (__stub_initscr) || defined (__stub___initscr) 53810 -choke me 53811 -#else 53812 -initscr(); 53813 -#endif 53814 + 53815 + test -n "$verbose" && echo 35874 53816 + 35875 53817 +cf_header_path_list="" … … 35891 53833 + test -d $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 35892 53834 +} 35893 + 53835 53836 -; return 0; } 53837 -EOF 53838 -if { (eval echo configure:5042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 53839 - rm -rf conftest* 53840 - eval "ac_cv_func_initscr=yes" 53841 -else 53842 - echo "configure: failed program was:" >&5 53843 - cat conftest.$ac_ext >&5 53844 - rm -rf conftest* 53845 - eval "ac_cv_func_initscr=no" 53846 -fi 53847 -rm -f conftest* 35894 53848 + cf_header_path_list="$cf_header_path_list $cf_search" 35895 53849 + ;; 35896 53850 + esac 35897 53851 + done 35898 +fi 35899 + 53852 fi 53853 53854 -if eval "test \"`echo '$ac_cv_func_'initscr`\" = yes"; then 53855 - echo "$ac_t""yes" 1>&6 53856 - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' 53857 -else 53858 - echo "$ac_t""no" 1>&6 53859 - 53860 - cf_save_LIBS="$LIBS" 53861 - echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 53862 -echo "configure:5062: checking for initscr in -l$cf_nculib_root" >&5 53863 - LIBS="-l$cf_nculib_root $LIBS" 53864 - cat > conftest.$ac_ext <<EOF 53865 -#line 5065 "configure" 53866 -#include "confdefs.h" 53867 -#include <${cf_cv_ncurses_header-curses.h}> 53868 -int main() { 53869 -initscr() 53870 -; return 0; } 53871 -EOF 53872 -if { (eval echo configure:5072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 53873 - rm -rf conftest* 53874 - echo "$ac_t""yes" 1>&6 53875 - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' 53876 - 53877 -else 53878 - echo "configure: failed program was:" >&5 53879 - cat conftest.$ac_ext >&5 53880 - rm -rf conftest* 53881 - echo "$ac_t""no" 1>&6 53882 - cf_search="" 35900 53883 +cf_search="" 35901 53884 35902 53885 35903 53886 test "/usr" != "$prefix" && \ 35904 @@ -4429,6 +5082,7 @@ 53887 test -d "/usr" && \ 53888 (test $prefix = NONE || test -d $prefix) && { 53889 - test -n "$verbose" && echo " ... testing for lib-directories under /usr" 53890 - test -d /usr/lib && cf_search="$cf_search /usr/lib" 53891 - test -d /usr/lib/$cf_nculib_root && cf_search="$cf_search /usr/lib/$cf_nculib_root" 53892 - test -d /usr/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/lib/$cf_nculib_root/lib" 53893 - test -d /usr/$cf_nculib_root/lib && cf_search="$cf_search /usr/$cf_nculib_root/lib" 53894 - test -d /usr/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/$cf_nculib_root/lib/$cf_nculib_root" 53895 + test -n "$verbose" && echo " ... testing for include-directories under /usr" 53896 + test -d /usr/include && cf_search="$cf_search /usr/include" 53897 + test -d /usr/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/include/$cf_ncuhdr_root" 53898 + test -d /usr/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/include/$cf_ncuhdr_root/include" 53899 + test -d /usr/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/$cf_ncuhdr_root/include" 53900 + test -d /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 35905 53901 } 35906 53902 35907 53903 35908 + 35909 test "$includedir" != NONE && \ 35910 test "$includedir" != "/usr/include" && \ 35911 test -d "$includedir" && { 35912 @@ -4443,6 +5097,7 @@ 35913 test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root" 53904 test "$prefix" != "NONE" && \ 53905 test -d "$prefix" && \ 53906 { 53907 - test -n "$verbose" && echo " ... testing for lib-directories under $prefix" 53908 - test -d $prefix/lib && cf_search="$cf_search $prefix/lib" 53909 - test -d $prefix/lib/$cf_nculib_root && cf_search="$cf_search $prefix/lib/$cf_nculib_root" 53910 - test -d $prefix/lib/$cf_nculib_root/lib && cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib" 53911 - test -d $prefix/$cf_nculib_root/lib && cf_search="$cf_search $prefix/$cf_nculib_root/lib" 53912 - test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root" 53913 + test -n "$verbose" && echo " ... testing for include-directories under $prefix" 53914 + test -d $prefix/include && cf_search="$cf_search $prefix/include" 53915 + test -d $prefix/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root" 53916 + test -d $prefix/include/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include" 53917 + test -d $prefix/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include" 53918 + test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 35914 53919 } 35915 53920 53921 53922 test "/usr/local" != "$prefix" && \ 53923 test -d "/usr/local" && \ 53924 (test $prefix = NONE || test -d $prefix) && { 53925 - test -n "$verbose" && echo " ... testing for lib-directories under /usr/local" 53926 - test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib" 53927 - test -d /usr/local/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/lib/$cf_nculib_root" 53928 - test -d /usr/local/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib" 53929 - test -d /usr/local/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/$cf_nculib_root/lib" 53930 - test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root" 53931 + test -n "$verbose" && echo " ... testing for include-directories under /usr/local" 53932 + test -d /usr/local/include && cf_search="$cf_search /usr/local/include" 53933 + test -d /usr/local/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root" 53934 + test -d /usr/local/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include" 53935 + test -d /usr/local/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include" 53936 + test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 53937 } 53938 53939 53940 test "/opt" != "$prefix" && \ 53941 test -d "/opt" && \ 53942 (test $prefix = NONE || test -d $prefix) && { 53943 - test -n "$verbose" && echo " ... testing for lib-directories under /opt" 53944 - test -d /opt/lib && cf_search="$cf_search /opt/lib" 53945 - test -d /opt/lib/$cf_nculib_root && cf_search="$cf_search /opt/lib/$cf_nculib_root" 53946 - test -d /opt/lib/$cf_nculib_root/lib && cf_search="$cf_search /opt/lib/$cf_nculib_root/lib" 53947 - test -d /opt/$cf_nculib_root/lib && cf_search="$cf_search /opt/$cf_nculib_root/lib" 53948 - test -d /opt/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root" 53949 + test -n "$verbose" && echo " ... testing for include-directories under /opt" 53950 + test -d /opt/include && cf_search="$cf_search /opt/include" 53951 + test -d /opt/include/$cf_ncuhdr_root && cf_search="$cf_search /opt/include/$cf_ncuhdr_root" 53952 + test -d /opt/include/$cf_ncuhdr_root/include && cf_search="$cf_search /opt/include/$cf_ncuhdr_root/include" 53953 + test -d /opt/$cf_ncuhdr_root/include && cf_search="$cf_search /opt/$cf_ncuhdr_root/include" 53954 + test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 53955 } 53956 53957 53958 test "$HOME" != "$prefix" && \ 53959 test -d "$HOME" && \ 53960 (test $prefix = NONE || test -d $prefix) && { 53961 - test -n "$verbose" && echo " ... testing for lib-directories under $HOME" 53962 - test -d $HOME/lib && cf_search="$cf_search $HOME/lib" 53963 - test -d $HOME/lib/$cf_nculib_root && cf_search="$cf_search $HOME/lib/$cf_nculib_root" 53964 - test -d $HOME/lib/$cf_nculib_root/lib && cf_search="$cf_search $HOME/lib/$cf_nculib_root/lib" 53965 - test -d $HOME/$cf_nculib_root/lib && cf_search="$cf_search $HOME/$cf_nculib_root/lib" 53966 - test -d $HOME/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root" 53967 + test -n "$verbose" && echo " ... testing for include-directories under $HOME" 53968 + test -d $HOME/include && cf_search="$cf_search $HOME/include" 53969 + test -d $HOME/include/$cf_ncuhdr_root && cf_search="$cf_search $HOME/include/$cf_ncuhdr_root" 53970 + test -d $HOME/include/$cf_ncuhdr_root/include && cf_search="$cf_search $HOME/include/$cf_ncuhdr_root/include" 53971 + test -d $HOME/$cf_ncuhdr_root/include && cf_search="$cf_search $HOME/$cf_ncuhdr_root/include" 53972 + test -d $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 53973 } 53974 53975 53976 - for cf_libdir in $cf_search 53977 - do 53978 - echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6 53979 -echo "configure:5148: checking for -l$cf_nculib_root in $cf_libdir" >&5 53980 - LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" 53981 - cat > conftest.$ac_ext <<EOF 53982 -#line 5151 "configure" 53983 + 53984 +test "$includedir" != NONE && \ 53985 +test "$includedir" != "/usr/include" && \ 53986 +test -d "$includedir" && { 53987 + test -d $includedir && cf_search="$cf_search $includedir" 53988 + test -d $includedir/$cf_ncuhdr_root && cf_search="$cf_search $includedir/$cf_ncuhdr_root" 53989 +} 53990 + 53991 +test "$oldincludedir" != NONE && \ 53992 +test "$oldincludedir" != "/usr/include" && \ 53993 +test -d "$oldincludedir" && { 53994 + test -d $oldincludedir && cf_search="$cf_search $oldincludedir" 53995 + test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root" 53996 +} 53997 + 35916 53998 +cf_search="$cf_header_path_list $cf_search" 35917 35918 test -n "$verbose" && echo search path $cf_search 35919 cf_save2_CPPFLAGS="$CPPFLAGS" 35920 @@ -4467,20 +5122,20 @@ 35921 fi 35922 35923 if test "$cf_have_incdir" = no ; then 35924 - if test "$cf_add_incdir" = /usr/local/include ; then 53999 + 54000 + test -n "$verbose" && echo search path $cf_search 54001 + cf_save2_CPPFLAGS="$CPPFLAGS" 54002 + for cf_incdir in $cf_search 54003 + do 54004 + 54005 +if test -n "$cf_incdir" ; then 54006 + for cf_add_incdir in $cf_incdir 54007 + do 54008 + while test $cf_add_incdir != /usr/include 54009 + do 54010 + if test -d $cf_add_incdir 54011 + then 54012 + cf_have_incdir=no 54013 + if test -n "$CFLAGS$CPPFLAGS" ; then 54014 + # a loop is needed to ensure we can add subdirs of existing dirs 54015 + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do 54016 + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then 54017 + cf_have_incdir=yes; break 54018 + fi 54019 + done 54020 + fi 54021 + 54022 + if test "$cf_have_incdir" = no ; then 35925 54023 + if test "$cf_add_incdir" = /usr/local/include ; then 35926 if test "$GCC" = yes 35927 then 35928 cf_save_CPPFLAGS=$CPPFLAGS 35929 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 35930 cat > conftest.$ac_ext <<EOF 35931 -#line 4477 "configure" 35932 +#line 5132 "configure" 54024 + if test "$GCC" = yes 54025 + then 54026 + cf_save_CPPFLAGS=$CPPFLAGS 54027 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 54028 + cat > conftest.$ac_ext <<EOF 54029 +#line 5137 "configure" 35933 54030 #include "confdefs.h" 35934 #include <stdio.h> 54031 -#include <${cf_cv_ncurses_header-curses.h}> 54032 +#include <stdio.h> 35935 54033 int main() { 35936 printf("Hello") 54034 -initscr() 54035 +printf("Hello") 35937 54036 ; return 0; } 35938 54037 EOF 35939 -if { (eval echo configure:4484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 35940 +if { (eval echo configure:5139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 35941 : 54038 -if { (eval echo configure:5158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 54039 - rm -rf conftest* 54040 - echo "$ac_t""yes" 1>&6 54041 - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' 54042 - break 54043 +if { (eval echo configure:5144: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 54044 + : 35942 54045 else 35943 54046 echo "configure: failed program was:" >&5 35944 @@ -4497,14 +5152,14 @@ 35945 if test "$cf_have_incdir" = no ; then 35946 test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 35947 35948 -echo "${as_me-configure}:4501: testing adding $cf_add_incdir to include-path ..." 1>&5 35949 +echo "${as_me-configure}:5156: testing adding $cf_add_incdir to include-path ..." 1>&5 35950 35951 35952 - CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" 54047 cat conftest.$ac_ext >&5 54048 rm -rf conftest* 54049 - echo "$ac_t""no" 1>&6 54050 - LIBS="$cf_save_LIBS" 54051 -fi 54052 -rm -f conftest* 54053 - done 54054 - 54055 + cf_have_incdir=yes 54056 fi 54057 rm -f conftest* 54058 - 54059 -fi 54060 + CPPFLAGS=$cf_save_CPPFLAGS 54061 + fi 54062 + fi 54063 + fi 54064 54065 -eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root 54066 + if test "$cf_have_incdir" = no ; then 54067 + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 54068 54069 -if test $cf_found_library = no ; then 54070 - { echo "configure: error: Cannot link $cf_nculib_root library" 1>&2; exit 1; } 54071 -fi 54072 +echo "${as_me-configure}:5161: testing adding $cf_add_incdir to include-path ..." 1>&5 54073 54074 54075 -fi 35953 54076 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 35954 54077 35955 - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 35956 - test "$cf_top_incdir" = "$cf_add_incdir" && break 35957 - cf_add_incdir="$cf_top_incdir" 54078 -if test -n "$cf_ncurses_LIBS" ; then 54079 - echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6 54080 -echo "configure:5189: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 54081 - cf_ncurses_SAVE="$LIBS" 54082 - for p in $cf_ncurses_LIBS ; do 54083 - q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` 54084 - if test "$q" != "$LIBS" ; then 54085 - LIBS="$q" 35958 54086 + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 35959 54087 + test "$cf_top_incdir" = "$cf_add_incdir" && break 35960 54088 + cf_add_incdir="$cf_top_incdir" 35961 35962 54089 + else 54090 + break 35963 54091 fi 35964 @@ -4519,7 +5174,7 @@ 35965 do 35966 54092 + fi 54093 done 54094 + done 54095 +fi 54096 + 54097 + for cf_header in \ 54098 + ncurses.h \ 54099 + curses.h 54100 + do 54101 + 35967 54102 cat > conftest.$ac_ext <<EOF 35968 -#line 4523"configure"35969 +#line 51 78"configure"54103 -#line 5198 "configure" 54104 +#line 5183 "configure" 35970 54105 #include "confdefs.h" 35971 35972 35973 @@ -4540,7 +5195,7 @@ 35974 54106 -#include <${cf_cv_ncurses_header-curses.h}> 54107 + 54108 + 54109 +#include <$cf_header> 54110 int main() { 54111 -initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); 54112 + 54113 +#ifdef NCURSES_VERSION 54114 + 54115 +printf("%s\n", NCURSES_VERSION); 54116 +#else 54117 +#ifdef __NCURSES_H 54118 +printf("old\n"); 54119 +#else 54120 + make an error 54121 +#endif 54122 +#endif 54123 + 54124 + 35975 54125 ; return 0; } 35976 54126 EOF 35977 -if { (eval echo configure: 4544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5;}; then35978 +if { (eval echo configure:5 199: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then54127 -if { (eval echo configure:5205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 54128 +if { (eval echo configure:5204: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 35979 54129 rm -rf conftest* 35980 cf_cv_ncurses_h2=$cf_header 35981 35982 @@ -4592,20 +5247,20 @@ 35983 fi 35984 35985 if test "$cf_have_incdir" = no ; then 35986 - if test "$cf_add_incdir" = /usr/local/include ; then 54130 - echo "$ac_t""yes" 1>&6 54131 + cf_cv_ncurses_h2=$cf_header 54132 + 54133 else 54134 echo "configure: failed program was:" >&5 54135 cat conftest.$ac_ext >&5 54136 rm -rf conftest* 54137 - echo "$ac_t""no" 1>&6 54138 - LIBS="$cf_ncurses_SAVE" 54139 + cf_cv_ncurses_h2=no 54140 fi 54141 rm -f conftest* 54142 -fi 54143 - 54144 - 54145 -cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 54146 - 54147 -cat >> confdefs.h <<EOF 54148 -#define $cf_nculib_ROOT 1 54149 -EOF 54150 54151 + if test "$cf_cv_ncurses_h2" != no ; then 54152 + cf_cv_ncurses_h2=$cf_incdir/$cf_header 54153 + test -n "$verbose" && echo $ac_n " ... found $ac_c" 1>&6 54154 + break 54155 + fi 54156 + test -n "$verbose" && echo " ... tested $cf_incdir/$cf_header" 1>&6 54157 + done 54158 + CPPFLAGS="$cf_save2_CPPFLAGS" 54159 + test "$cf_cv_ncurses_h2" != no && break 54160 + done 54161 + test "$cf_cv_ncurses_h2" = no && { echo "configure: error: not found" 1>&2; exit 1; } 54162 + 54163 +fi 54164 54165 - ;; 54166 -pdcurses) #(vi 54167 - if test "$no_x" = yes; then 54168 - # Not all programs may use this symbol, but it does not hurt to define it. 54169 - cat >> confdefs.h <<\EOF 54170 -#define X_DISPLAY_MISSING 1 54171 -EOF 54172 +echo "$ac_t""$cf_cv_ncurses_h2" 1>&6 54173 54174 - X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= 54175 -else 54176 - if test -n "$x_includes"; then 54177 - X_CFLAGS="$X_CFLAGS -I$x_includes" 54178 - fi 54179 + cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` 54180 + cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2` 54181 + if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then 54182 + cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header 54183 + fi 54184 + 54185 +if test -n "$cf_1st_incdir" ; then 54186 + for cf_add_incdir in $cf_1st_incdir 54187 + do 54188 + while test $cf_add_incdir != /usr/include 54189 + do 54190 + if test -d $cf_add_incdir 54191 + then 54192 + cf_have_incdir=no 54193 + if test -n "$CFLAGS$CPPFLAGS" ; then 54194 + # a loop is needed to ensure we can add subdirs of existing dirs 54195 + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do 54196 + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then 54197 + cf_have_incdir=yes; break 54198 + fi 54199 + done 54200 + fi 54201 54202 - # It would also be nice to do this for all -L options, not just this one. 54203 - if test -n "$x_libraries"; then 54204 - X_LIBS="$X_LIBS -L$x_libraries" 54205 - # For Solaris; some versions of Sun CC require a space after -R and 54206 - # others require no space. Words are not sufficient . . . . 54207 - case "`(uname -sr) 2>/dev/null`" in 54208 - "SunOS 5"*) 54209 - echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 54210 -echo "configure:5248: checking whether -R must be followed by a space" >&5 54211 - ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" 54212 - cat > conftest.$ac_ext <<EOF 54213 -#line 5251 "configure" 54214 + if test "$cf_have_incdir" = no ; then 35987 54215 + if test "$cf_add_incdir" = /usr/local/include ; then 35988 if test "$GCC" = yes 35989 then 35990 cf_save_CPPFLAGS=$CPPFLAGS 35991 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 35992 cat > conftest.$ac_ext <<EOF 35993 -#line 4602 "configure" 35994 +#line 5257 "configure" 54216 + if test "$GCC" = yes 54217 + then 54218 + cf_save_CPPFLAGS=$CPPFLAGS 54219 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 54220 + cat > conftest.$ac_ext <<EOF 54221 +#line 5262 "configure" 35995 54222 #include "confdefs.h" 35996 #include <stdio.h> 54223 - 54224 +#include <stdio.h> 35997 54225 int main() { 35998 printf("Hello") 54226 - 54227 +printf("Hello") 35999 54228 ; return 0; } 36000 54229 EOF 36001 -if { (eval echo configure:4609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 36002 +if { (eval echo configure:5264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 36003 : 54230 -if { (eval echo configure:5258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 54231 - rm -rf conftest* 54232 - ac_R_nospace=yes 54233 +if { (eval echo configure:5269: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 54234 + : 36004 54235 else 36005 54236 echo "configure: failed program was:" >&5 36006 @@ -4622,14 +5277,14 @@ 36007 if test "$cf_have_incdir" = no ; then 36008 test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 36009 36010 -echo "${as_me-configure}:4626: testing adding $cf_add_incdir to include-path ..." 1>&5 36011 +echo "${as_me-configure}:5281: testing adding $cf_add_incdir to include-path ..." 1>&5 36012 36013 36014 - CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" 54237 cat conftest.$ac_ext >&5 54238 rm -rf conftest* 54239 - ac_R_nospace=no 54240 + cf_have_incdir=yes 54241 fi 54242 rm -f conftest* 54243 - if test $ac_R_nospace = yes; then 54244 - echo "$ac_t""no" 1>&6 54245 - X_LIBS="$X_LIBS -R$x_libraries" 54246 - else 54247 - LIBS="$ac_xsave_LIBS -R $x_libraries" 54248 - cat > conftest.$ac_ext <<EOF 54249 -#line 5274 "configure" 54250 -#include "confdefs.h" 54251 + CPPFLAGS=$cf_save_CPPFLAGS 54252 + fi 54253 + fi 54254 + fi 54255 54256 -int main() { 54257 + if test "$cf_have_incdir" = no ; then 54258 + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 54259 54260 -; return 0; } 54261 -EOF 54262 -if { (eval echo configure:5281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 54263 - rm -rf conftest* 54264 - ac_R_space=yes 54265 -else 54266 - echo "configure: failed program was:" >&5 54267 - cat conftest.$ac_ext >&5 54268 - rm -rf conftest* 54269 - ac_R_space=no 54270 +echo "${as_me-configure}:5286: testing adding $cf_add_incdir to include-path ..." 1>&5 54271 + 54272 + 36015 54273 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 36016 36017 - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 36018 - test "$cf_top_incdir" = "$cf_add_incdir" && break 36019 - cf_add_incdir="$cf_top_incdir" 54274 + 36020 54275 + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 36021 54276 + test "$cf_top_incdir" = "$cf_add_incdir" && break 36022 54277 + cf_add_incdir="$cf_top_incdir" 36023 else 36024 break 36025 fi 36026 @@ -4670,7 +5325,7 @@ 36027 36028 36029 echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 36030 -echo "configure:4674: checking for terminfo header" >&5 36031 +echo "configure:5329: checking for terminfo header" >&5 36032 if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then 54278 + else 54279 + break 54280 + fi 54281 + fi 54282 + done 54283 + done 54284 fi 54285 -rm -f conftest* 54286 - if test $ac_R_space = yes; then 54287 - echo "$ac_t""yes" 1>&6 54288 - X_LIBS="$X_LIBS -R $x_libraries" 54289 - else 54290 - echo "$ac_t""neither works" 1>&6 54291 - fi 54292 - fi 54293 - LIBS="$ac_xsave_LIBS" 54294 - esac 54295 - fi 54296 54297 - # Check for system-dependent libraries X programs must link with. 54298 - # Do this before checking for the system-independent R6 libraries 54299 - # (-lICE), since we may need -lsocket or whatever for X linking. 54300 54301 - if test "$ISC" = yes; then 54302 - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" 54303 - else 54304 - # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X 54305 - # libraries were built with DECnet support. And karl@cs.umb.edu says 54306 - # the Alpha needs dnet_stub (dnet does not exist). 54307 - echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 54308 -echo "configure:5313: checking for dnet_ntoa in -ldnet" >&5 54309 -ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` 54310 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 54311 - echo $ac_n "(cached) $ac_c" 1>&6 54312 +fi 54313 + 54314 +# Set definitions to allow ifdef'ing for ncurses.h 54315 + 54316 +case $cf_cv_ncurses_header in # (vi 54317 +*ncurses.h) 54318 + cat >> confdefs.h <<\EOF 54319 +#define HAVE_NCURSES_H 1 54320 +EOF 54321 + 54322 + ;; 54323 +esac 54324 + 54325 +case $cf_cv_ncurses_header in # (vi 54326 +ncurses/curses.h|ncurses/ncurses.h) 54327 + cat >> confdefs.h <<\EOF 54328 +#define HAVE_NCURSES_NCURSES_H 1 54329 +EOF 54330 + 54331 + ;; 54332 +ncursesw/curses.h|ncursesw/ncurses.h) 54333 + cat >> confdefs.h <<\EOF 54334 +#define HAVE_NCURSESW_NCURSES_H 1 54335 +EOF 54336 + 54337 + ;; 54338 +esac 54339 + 54340 + 54341 + 54342 +echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 54343 +echo "configure:5334: checking for terminfo header" >&5 54344 +if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then 54345 + echo $ac_n "(cached) $ac_c" 1>&6 54346 else 54347 - ac_save_LIBS="$LIBS" 54348 -LIBS="-ldnet $LIBS" 54349 + 54350 +case ${cf_cv_ncurses_header} in #(vi 54351 +*/ncurses.h|*/ncursesw.h) #(vi 54352 + cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'` 54353 + ;; 54354 +*) 54355 + cf_term_header=term.h 54356 + ;; 54357 +esac 54358 + 54359 +for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" 54360 +do 54361 cat > conftest.$ac_ext <<EOF 54362 -#line 5321 "configure" 54363 +#line 5351 "configure" 54364 #include "confdefs.h" 54365 -/* Override any gcc2 internal prototype to avoid an error. */ 54366 -/* We use char because int might match the return type of a gcc2 54367 - builtin and then its argument prototype would still apply. */ 54368 -char dnet_ntoa(); 54369 +#include <stdio.h> 54370 +#include <${cf_cv_ncurses_header-curses.h}> 54371 +#include <$cf_test> 54372 54373 int main() { 54374 -dnet_ntoa() 54375 +int x = auto_left_margin 54376 ; return 0; } 54377 EOF 54378 -if { (eval echo configure:5332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 54379 +if { (eval echo configure:5361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 54380 rm -rf conftest* 54381 - eval "ac_cv_lib_$ac_lib_var=yes" 54382 + 54383 + cf_cv_term_header="$cf_test" 54384 else 54385 echo "configure: failed program was:" >&5 54386 cat conftest.$ac_ext >&5 54387 rm -rf conftest* 54388 - eval "ac_cv_lib_$ac_lib_var=no" 54389 + 54390 + cf_cv_term_header=unknown 54391 + 54392 fi 54393 rm -f conftest* 54394 -LIBS="$ac_save_LIBS" 54395 + test "$cf_cv_term_header" != unknown && break 54396 +done 54397 54398 fi 54399 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 54400 - echo "$ac_t""yes" 1>&6 54401 - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" 54402 + 54403 +echo "$ac_t""$cf_cv_term_header" 1>&6 54404 + 54405 +# Set definitions to allow ifdef'ing to accommodate subdirectories 54406 + 54407 +case $cf_cv_term_header in # (vi 54408 +*term.h) 54409 + cat >> confdefs.h <<\EOF 54410 +#define HAVE_TERM_H 1 54411 +EOF 54412 + 54413 + ;; 54414 +esac 54415 + 54416 +case $cf_cv_term_header in # (vi 54417 +ncurses/term.h) #(vi 54418 + cat >> confdefs.h <<\EOF 54419 +#define HAVE_NCURSES_TERM_H 1 54420 +EOF 54421 + 54422 + ;; 54423 +ncursesw/term.h) 54424 + cat >> confdefs.h <<\EOF 54425 +#define HAVE_NCURSESW_TERM_H 1 54426 +EOF 54427 + 54428 + ;; 54429 +esac 54430 + 54431 + 54432 +# some applications need this, but should check for NCURSES_VERSION 54433 +cat >> confdefs.h <<\EOF 54434 +#define NCURSES 1 54435 +EOF 54436 + 54437 + 54438 + 54439 +echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 54440 +echo "configure:5416: checking for ncurses version" >&5 54441 +if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then 54442 + echo $ac_n "(cached) $ac_c" 1>&6 54443 else 54444 - echo "$ac_t""no" 1>&6 54445 + 54446 + cf_cv_ncurses_version=no 54447 + cf_tempfile=out$$ 54448 + rm -f $cf_tempfile 54449 + if test "$cross_compiling" = yes; then 54450 + 54451 + 54452 + # This will not work if the preprocessor splits the line after the 54453 + # Autoconf token. The 'unproto' program does that. 54454 + cat > conftest.$ac_ext <<EOF 54455 +#include <${cf_cv_ncurses_header-curses.h}> 54456 +#undef Autoconf 54457 +#ifdef NCURSES_VERSION 54458 +Autoconf NCURSES_VERSION 54459 +#else 54460 +#ifdef __NCURSES_H 54461 +Autoconf "old" 54462 +#endif 54463 +; 54464 +#endif 54465 +EOF 54466 + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" 54467 + { (eval echo configure:5442: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } 54468 + if test -f conftest.out ; then 54469 + cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` 54470 + test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" 54471 + rm -f conftest.out 54472 + fi 54473 + 54474 +else 54475 + cat > conftest.$ac_ext <<EOF 54476 +#line 5451 "configure" 54477 +#include "confdefs.h" 54478 + 54479 +#include <${cf_cv_ncurses_header-curses.h}> 54480 +#include <stdio.h> 54481 +int main() 54482 +{ 54483 + FILE *fp = fopen("$cf_tempfile", "w"); 54484 +#ifdef NCURSES_VERSION 54485 +# ifdef NCURSES_VERSION_PATCH 54486 + fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH); 54487 +# else 54488 + fprintf(fp, "%s\n", NCURSES_VERSION); 54489 +# endif 54490 +#else 54491 +# ifdef __NCURSES_H 54492 + fprintf(fp, "old\n"); 54493 +# else 54494 + make an error 54495 +# endif 54496 +#endif 54497 + ${cf_cv_main_return-return}(0); 54498 +} 54499 +EOF 54500 +if { (eval echo configure:5475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 54501 +then 54502 + 54503 + cf_cv_ncurses_version=`cat $cf_tempfile` 54504 +else 54505 + echo "configure: failed program was:" >&5 54506 + cat conftest.$ac_ext >&5 54507 +fi 54508 +rm -fr conftest* 54509 fi 54510 54511 - if test $ac_cv_lib_dnet_dnet_ntoa = no; then 54512 - echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 54513 -echo "configure:5354: checking for dnet_ntoa in -ldnet_stub" >&5 54514 -ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` 54515 + rm -f $cf_tempfile 54516 + 54517 +fi 54518 + 54519 +echo "$ac_t""$cf_cv_ncurses_version" 1>&6 54520 +test "$cf_cv_ncurses_version" = no || cat >> confdefs.h <<\EOF 54521 +#define NCURSES 1 54522 +EOF 54523 + 54524 + 54525 + 54526 + 54527 + 54528 +cf_nculib_root=ncursesw 54529 + # This works, except for the special case where we find gpm, but 54530 + # ncurses is in a nonstandard location via $LIBS, and we really want 54531 + # to link gpm. 54532 +cf_ncurses_LIBS="" 54533 +cf_ncurses_SAVE="$LIBS" 54534 +echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 54535 +echo "configure:5506: checking for Gpm_Open in -lgpm" >&5 54536 +ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` 54537 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 36033 54538 echo $ac_n "(cached) $ac_c" 1>&6 36034 54539 else 36035 @@ -4687,7 +5342,7 @@ 36036 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"36037 do 54540 ac_save_LIBS="$LIBS" 54541 -LIBS="-ldnet_stub $LIBS" 54542 +LIBS="-lgpm $LIBS" 36038 54543 cat > conftest.$ac_ext <<EOF 36039 -#line 4691 "configure" 36040 +#line 5346 "configure" 36041 #include "confdefs.h" 36042 #include <stdio.h> 36043 #include <${cf_cv_ncurses_header-curses.h}> 36044 @@ -4697,7 +5352,7 @@ 36045 int x = auto_left_margin 36046 ; return 0; } 36047 EOF 36048 -if { (eval echo configure:4701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 36049 +if { (eval echo configure:5356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 36050 rm -rf conftest* 36051 36052 cf_cv_term_header="$cf_test" 36053 @@ -4752,7 +5407,7 @@ 36054 36055 36056 echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 36057 -echo "configure:4756: checking for ncurses version" >&5 36058 +echo "configure:5411: checking for ncurses version" >&5 36059 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then 36060 echo $ac_n "(cached) $ac_c" 1>&6 36061 else 36062 @@ -4778,7 +5433,7 @@ 36063 #endif 36064 EOF 36065 cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" 36066 - { (eval echo configure:4782: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } 36067 + { (eval echo configure:5437: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } 36068 if test -f conftest.out ; then 36069 cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` 36070 test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" 36071 @@ -4787,7 +5442,7 @@ 36072 36073 else 36074 cat > conftest.$ac_ext <<EOF 36075 -#line 4791 "configure" 36076 +#line 5446 "configure" 36077 #include "confdefs.h" 36078 36079 #include <${cf_cv_ncurses_header-curses.h}> 36080 @@ -4811,7 +5466,7 @@ 36081 ${cf_cv_main_return-return}(0); 36082 } 36083 EOF 36084 -if { (eval echo configure:4815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 36085 +if { (eval echo configure:5470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 36086 then 36087 36088 cf_cv_ncurses_version=`cat $cf_tempfile` 36089 @@ -4833,7 +5488,7 @@ 36090 36091 36092 36093 - 36094 + 36095 36096 cf_nculib_root=ncursesw 36097 # This works, except for the special case where we find gpm, but 36098 @@ -4842,7 +5497,7 @@ 36099 cf_ncurses_LIBS="" 36100 cf_ncurses_SAVE="$LIBS" 36101 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 36102 -echo "configure:4846: checking for Gpm_Open in -lgpm" >&5 36103 +echo "configure:5501: checking for Gpm_Open in -lgpm" >&5 36104 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` 36105 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 36106 echo $ac_n "(cached) $ac_c" 1>&6 36107 @@ -4850,7 +5505,7 @@ 36108 ac_save_LIBS="$LIBS" 36109 LIBS="-lgpm $LIBS" 36110 cat > conftest.$ac_ext <<EOF 36111 -#line 4854 "configure" 36112 +#line 5509 "configure" 54544 -#line 5362 "configure" 54545 +#line 5514 "configure" 36113 54546 #include "confdefs.h" 36114 54547 /* Override any gcc2 internal prototype to avoid an error. */ 36115 54548 /* We use char because int might match the return type of a gcc2 36116 @@ -4861,7 +5516,7 @@ 36117 Gpm_Open() 54549 builtin and then its argument prototype would still apply. */ 54550 -char dnet_ntoa(); 54551 +char Gpm_Open(); 54552 54553 int main() { 54554 -dnet_ntoa() 54555 +Gpm_Open() 36118 54556 ; return 0; } 36119 54557 EOF 36120 -if { (eval echo configure: 4865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then36121 +if { (eval echo configure:552 0: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then54558 -if { (eval echo configure:5373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 54559 +if { (eval echo configure:5525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36122 54560 rm -rf conftest* 36123 54561 eval "ac_cv_lib_$ac_lib_var=yes" 36124 54562 else 36125 @@ -4877,7 +5532,7 @@ 54563 @@ -5384,89 +5536,78 @@ 54564 fi 36126 54565 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 36127 54566 echo "$ac_t""yes" 1>&6 36128 echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6 36129 -echo "configure:4881: checking for initscr in -lgpm" >&5 36130 +echo "configure:5536: checking for initscr in -lgpm" >&5 36131 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'` 36132 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 54567 - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" 54568 -else 54569 - echo "$ac_t""no" 1>&6 54570 -fi 54571 - 54572 - fi 54573 - 54574 - # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, 54575 - # to get the SysV transport functions. 54576 - # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4) 54577 - # needs -lnsl. 54578 - # The nsl library prevents programs from opening the X display 54579 - # on Irix 5.2, according to dickey@clark.net. 54580 - echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 54581 -echo "configure:5402: checking for gethostbyname" >&5 54582 -if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then 54583 + echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6 54584 +echo "configure:5541: checking for initscr in -lgpm" >&5 54585 +ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'` 54586 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 36133 54587 echo $ac_n "(cached) $ac_c" 1>&6 36134 @@ -4885,7 +5540,7 @@ 54588 else 54589 - cat > conftest.$ac_ext <<EOF 54590 -#line 5407 "configure" 54591 + ac_save_LIBS="$LIBS" 54592 +LIBS="-lgpm $LIBS" 54593 +cat > conftest.$ac_ext <<EOF 54594 +#line 5549 "configure" 54595 #include "confdefs.h" 54596 -/* System header to define __stub macros and hopefully few prototypes, 54597 - which can conflict with char gethostbyname(); below. */ 54598 -#include <assert.h> 54599 /* Override any gcc2 internal prototype to avoid an error. */ 54600 /* We use char because int might match the return type of a gcc2 54601 builtin and then its argument prototype would still apply. */ 54602 -char gethostbyname(); 54603 +char initscr(); 54604 54605 int main() { 54606 - 54607 -/* The GNU C library defines this for functions which it implements 54608 - to always fail with ENOSYS. Some functions are actually named 54609 - something starting with __ and the normal name is an alias. */ 54610 -#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) 54611 -choke me 54612 -#else 54613 -gethostbyname(); 54614 -#endif 54615 - 54616 +initscr() 54617 ; return 0; } 54618 EOF 54619 -if { (eval echo configure:5430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 54620 +if { (eval echo configure:5560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 54621 rm -rf conftest* 54622 - eval "ac_cv_func_gethostbyname=yes" 54623 + eval "ac_cv_lib_$ac_lib_var=yes" 54624 else 54625 echo "configure: failed program was:" >&5 54626 cat conftest.$ac_ext >&5 54627 rm -rf conftest* 54628 - eval "ac_cv_func_gethostbyname=no" 54629 + eval "ac_cv_lib_$ac_lib_var=no" 54630 fi 54631 rm -f conftest* 54632 -fi 54633 +LIBS="$ac_save_LIBS" 54634 54635 -if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then 54636 +fi 54637 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 54638 echo "$ac_t""yes" 1>&6 54639 - : 54640 + LIBS="$cf_ncurses_SAVE" 54641 else 54642 echo "$ac_t""no" 1>&6 54643 +cf_ncurses_LIBS="-lgpm" 54644 fi 54645 54646 - if test $ac_cv_func_gethostbyname = no; then 54647 - echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 54648 -echo "configure:5451: checking for gethostbyname in -lnsl" >&5 54649 -ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` 54650 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 54651 - echo $ac_n "(cached) $ac_c" 1>&6 54652 +else 54653 + echo "$ac_t""no" 1>&6 54654 +fi 54655 + 54656 + 54657 +case $host_os in #(vi 54658 +freebsd*) 54659 + # This is only necessary if you are linking against an obsolete 54660 + # version of ncurses (but it should do no harm, since it's static). 54661 + if test "$cf_nculib_root" = ncurses ; then 54662 + echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 54663 +echo "configure:5592: checking for tgoto in -lmytinfo" >&5 54664 +ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` 54665 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 54666 + echo $ac_n "(cached) $ac_c" 1>&6 54667 else 36135 54668 ac_save_LIBS="$LIBS" 36136 LIBS="-lgpm $LIBS" 54669 -LIBS="-lnsl $LIBS" 54670 +LIBS="-lmytinfo $LIBS" 36137 54671 cat > conftest.$ac_ext <<EOF 36138 -#line 4889 "configure"36139 +#line 5 544"configure"54672 -#line 5459 "configure" 54673 +#line 5600 "configure" 36140 54674 #include "confdefs.h" 36141 54675 /* Override any gcc2 internal prototype to avoid an error. */ 36142 54676 /* We use char because int might match the return type of a gcc2 36143 @@ -4896,7 +5551,7 @@ 36144 initscr() 54677 builtin and then its argument prototype would still apply. */ 54678 -char gethostbyname(); 54679 +char tgoto(); 54680 54681 int main() { 54682 -gethostbyname() 54683 +tgoto() 36145 54684 ; return 0; } 36146 54685 EOF 36147 -if { (eval echo configure: 4900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then36148 +if { (eval echo configure:5 555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then54686 -if { (eval echo configure:5470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 54687 +if { (eval echo configure:5611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36149 54688 rm -rf conftest* 36150 54689 eval "ac_cv_lib_$ac_lib_var=yes" 36151 54690 else 36152 @@ -4928,7 +5583,7 @@ 36153 # version of ncurses (but it should do no harm, since it's static). 36154 if test "$cf_nculib_root" = ncurses ; then 36155 echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 36156 -echo "configure:4932: checking for tgoto in -lmytinfo" >&5 36157 +echo "configure:5587: checking for tgoto in -lmytinfo" >&5 36158 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` 36159 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 36160 echo $ac_n "(cached) $ac_c" 1>&6 36161 @@ -4936,7 +5591,7 @@ 36162 ac_save_LIBS="$LIBS" 36163 LIBS="-lmytinfo $LIBS" 36164 cat > conftest.$ac_ext <<EOF 36165 -#line 4940 "configure" 36166 +#line 5595 "configure" 36167 #include "confdefs.h" 36168 /* Override any gcc2 internal prototype to avoid an error. */ 36169 /* We use char because int might match the return type of a gcc2 36170 @@ -4947,7 +5602,7 @@ 36171 tgoto() 36172 ; return 0; } 36173 EOF 36174 -if { (eval echo configure:4951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36175 +if { (eval echo configure:5606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36176 rm -rf conftest* 36177 eval "ac_cv_lib_$ac_lib_var=yes" 54691 @@ -5481,182 +5622,405 @@ 54692 fi 54693 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 54694 echo "$ac_t""yes" 1>&6 54695 - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" 54696 + cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" 36178 54697 else 36179 @@ -4995,7 +5650,7 @@ 36180 if test "$cf_have_libdir" = no ; then 36181 test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 36182 36183 -echo "${as_me-configure}:4999: testing adding $cf_add_libdir to library-path ..." 1>&5 36184 +echo "${as_me-configure}:5654: testing adding $cf_add_libdir to library-path ..." 1>&5 36185 36186 36187 LDFLAGS="-L$cf_add_libdir $LDFLAGS" 36188 @@ -5010,12 +5665,12 @@ 36189 eval 'cf_cv_have_lib_'$cf_nculib_root'=no' 36190 cf_libdir="" 36191 echo $ac_n "checking for initscr""... $ac_c" 1>&6 36192 -echo "configure:5014: checking for initscr" >&5 36193 +echo "configure:5669: checking for initscr" >&5 36194 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then 54698 echo "$ac_t""no" 1>&6 54699 fi 54700 54701 + fi 54702 + ;; 54703 +esac 54704 + 54705 +LIBS="$cf_ncurses_LIBS $LIBS" 54706 + 54707 +if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) 54708 +then 54709 + 54710 +if test -n "$cf_cv_curses_dir/lib" ; then 54711 + for cf_add_libdir in $cf_cv_curses_dir/lib 54712 + do 54713 + if test $cf_add_libdir = /usr/lib ; then 54714 + : 54715 + elif test -d $cf_add_libdir 54716 + then 54717 + cf_have_libdir=no 54718 + if test -n "$LDFLAGS$LIBS" ; then 54719 + # a loop is needed to ensure we can add subdirs of existing dirs 54720 + for cf_test_libdir in $LDFLAGS $LIBS ; do 54721 + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then 54722 + cf_have_libdir=yes; break 54723 + fi 54724 + done 54725 + fi 54726 + if test "$cf_have_libdir" = no ; then 54727 + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 54728 + 54729 +echo "${as_me-configure}:5659: testing adding $cf_add_libdir to library-path ..." 1>&5 54730 + 54731 + 54732 + LDFLAGS="-L$cf_add_libdir $LDFLAGS" 54733 + fi 54734 fi 54735 + done 54736 +fi 54737 54738 - # lieder@skyler.mavd.honeywell.com says without -lsocket, 54739 - # socket/setsockopt and other routines are undefined under SCO ODT 54740 - # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary 54741 - # on later versions), says simon@lia.di.epfl.ch: it contains 54742 - # gethostby* variants that don't use the nameserver (or something). 54743 - # -lsocket must be given before -lnsl if both are needed. 54744 - # We assume that if connect needs -lnsl, so does gethostbyname. 54745 - echo $ac_n "checking for connect""... $ac_c" 1>&6 54746 -echo "configure:5500: checking for connect" >&5 54747 -if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then 54748 + LIBS="-l$cf_nculib_root $LIBS" 54749 +else 54750 + 54751 + eval 'cf_cv_have_lib_'$cf_nculib_root'=no' 54752 + cf_libdir="" 54753 + echo $ac_n "checking for initscr""... $ac_c" 1>&6 54754 +echo "configure:5674: checking for initscr" >&5 54755 +if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then 36195 54756 echo $ac_n "(cached) $ac_c" 1>&6 36196 54757 else 36197 54758 cat > conftest.$ac_ext <<EOF 36198 -#line 5 019"configure"36199 +#line 567 4"configure"54759 -#line 5505 "configure" 54760 +#line 5679 "configure" 36200 54761 #include "confdefs.h" 36201 54762 /* System header to define __stub macros and hopefully few prototypes, 36202 which can conflict with char initscr(); below. */ 36203 @@ -5038,7 +5693,7 @@ 54763 - which can conflict with char connect(); below. */ 54764 + which can conflict with char initscr(); below. */ 54765 #include <assert.h> 54766 /* Override any gcc2 internal prototype to avoid an error. */ 54767 /* We use char because int might match the return type of a gcc2 54768 builtin and then its argument prototype would still apply. */ 54769 -char connect(); 54770 +char initscr(); 54771 54772 int main() { 54773 54774 /* The GNU C library defines this for functions which it implements 54775 to always fail with ENOSYS. Some functions are actually named 54776 something starting with __ and the normal name is an alias. */ 54777 -#if defined (__stub_connect) || defined (__stub___connect) 54778 +#if defined (__stub_initscr) || defined (__stub___initscr) 54779 choke me 54780 #else 54781 -connect(); 54782 +initscr(); 54783 #endif 36204 54784 36205 54785 ; return 0; } 36206 54786 EOF 36207 -if { (eval echo configure:5 042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then36208 +if { (eval echo configure:5 697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then54787 -if { (eval echo configure:5528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 54788 +if { (eval echo configure:5702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36209 54789 rm -rf conftest* 36210 eval "ac_cv_func_initscr=yes" 54790 - eval "ac_cv_func_connect=yes" 54791 + eval "ac_cv_func_initscr=yes" 36211 54792 else 36212 @@ -5058,17 +5713,17 @@ 36213 36214 cf_save_LIBS="$LIBS" 36215 echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 36216 -echo "configure:5062: checking for initscr in -l$cf_nculib_root" >&5 36217 +echo "configure:5717: checking for initscr in -l$cf_nculib_root" >&5 36218 LIBS="-l$cf_nculib_root $LIBS" 36219 cat > conftest.$ac_ext <<EOF 36220 -#line 5065 "configure" 36221 +#line 5720 "configure" 54793 echo "configure: failed program was:" >&5 54794 cat conftest.$ac_ext >&5 54795 rm -rf conftest* 54796 - eval "ac_cv_func_connect=no" 54797 + eval "ac_cv_func_initscr=no" 54798 fi 54799 rm -f conftest* 54800 fi 54801 54802 -if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then 54803 +if eval "test \"`echo '$ac_cv_func_'initscr`\" = yes"; then 54804 echo "$ac_t""yes" 1>&6 54805 - : 54806 + eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' 54807 else 54808 echo "$ac_t""no" 1>&6 54809 -fi 54810 54811 - if test $ac_cv_func_connect = no; then 54812 - echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 54813 -echo "configure:5549: checking for connect in -lsocket" >&5 54814 -ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` 54815 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 54816 - echo $ac_n "(cached) $ac_c" 1>&6 54817 -else 54818 - ac_save_LIBS="$LIBS" 54819 -LIBS="-lsocket $X_EXTRA_LIBS $LIBS" 54820 -cat > conftest.$ac_ext <<EOF 54821 -#line 5557 "configure" 54822 + cf_save_LIBS="$LIBS" 54823 + echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 54824 +echo "configure:5722: checking for initscr in -l$cf_nculib_root" >&5 54825 + LIBS="-l$cf_nculib_root $LIBS" 54826 + cat > conftest.$ac_ext <<EOF 54827 +#line 5725 "configure" 36222 54828 #include "confdefs.h" 36223 #include <${cf_cv_ncurses_header-curses.h}> 54829 -/* Override any gcc2 internal prototype to avoid an error. */ 54830 -/* We use char because int might match the return type of a gcc2 54831 - builtin and then its argument prototype would still apply. */ 54832 -char connect(); 54833 - 54834 +#include <${cf_cv_ncurses_header-curses.h}> 36224 54835 int main() { 36225 initscr() 54836 -connect() 54837 +initscr() 36226 54838 ; return 0; } 36227 54839 EOF 36228 -if { (eval echo configure:5 072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then36229 +if { (eval echo configure:57 27: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then54840 -if { (eval echo configure:5568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 54841 +if { (eval echo configure:5732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36230 54842 rm -rf conftest* 36231 echo "$ac_t""yes" 1>&6 36232 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' 36233 @@ -5078,7 +5733,33 @@ 54843 - eval "ac_cv_lib_$ac_lib_var=yes" 54844 + echo "$ac_t""yes" 1>&6 54845 + eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' 54846 + 54847 else 54848 echo "configure: failed program was:" >&5 36234 54849 cat conftest.$ac_ext >&5 36235 54850 rm -rf conftest* 54851 - eval "ac_cv_lib_$ac_lib_var=no" 54852 -fi 54853 -rm -f conftest* 54854 -LIBS="$ac_save_LIBS" 54855 - 54856 -fi 54857 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 54858 - echo "$ac_t""yes" 1>&6 54859 - X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" 54860 -else 36236 54861 echo "$ac_t""no" 1>&6 36237 - cf_search=""36238 54862 + 36239 54863 +cf_library_path_list="" … … 36260 54884 + esac 36261 54885 + done 36262 +fi 36263 + 54886 fi 54887 54888 - fi 36264 54889 +cf_search="" 36265 54890 36266 36267 test "/usr" != "$prefix" && \ 36268 @@ -5141,20 +5822,23 @@ 36269 } 36270 36271 36272 + 54891 - # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. 54892 - echo $ac_n "checking for remove""... $ac_c" 1>&6 54893 -echo "configure:5592: checking for remove" >&5 54894 -if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then 54895 - echo $ac_n "(cached) $ac_c" 1>&6 54896 -else 54897 - cat > conftest.$ac_ext <<EOF 54898 -#line 5597 "configure" 54899 -#include "confdefs.h" 54900 -/* System header to define __stub macros and hopefully few prototypes, 54901 - which can conflict with char remove(); below. */ 54902 -#include <assert.h> 54903 -/* Override any gcc2 internal prototype to avoid an error. */ 54904 -/* We use char because int might match the return type of a gcc2 54905 - builtin and then its argument prototype would still apply. */ 54906 -char remove(); 54907 54908 -int main() { 54909 +test "/usr" != "$prefix" && \ 54910 +test -d "/usr" && \ 54911 +(test $prefix = NONE || test -d $prefix) && { 54912 + test -n "$verbose" && echo " ... testing for lib-directories under /usr" 54913 + test -d /usr/lib && cf_search="$cf_search /usr/lib" 54914 + test -d /usr/lib/$cf_nculib_root && cf_search="$cf_search /usr/lib/$cf_nculib_root" 54915 + test -d /usr/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/lib/$cf_nculib_root/lib" 54916 + test -d /usr/$cf_nculib_root/lib && cf_search="$cf_search /usr/$cf_nculib_root/lib" 54917 + test -d /usr/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/$cf_nculib_root/lib/$cf_nculib_root" 54918 +} 54919 + 54920 + 54921 +test "$prefix" != "NONE" && \ 54922 +test -d "$prefix" && \ 54923 + { 54924 + test -n "$verbose" && echo " ... testing for lib-directories under $prefix" 54925 + test -d $prefix/lib && cf_search="$cf_search $prefix/lib" 54926 + test -d $prefix/lib/$cf_nculib_root && cf_search="$cf_search $prefix/lib/$cf_nculib_root" 54927 + test -d $prefix/lib/$cf_nculib_root/lib && cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib" 54928 + test -d $prefix/$cf_nculib_root/lib && cf_search="$cf_search $prefix/$cf_nculib_root/lib" 54929 + test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root" 54930 +} 54931 + 54932 + 54933 +test "/usr/local" != "$prefix" && \ 54934 +test -d "/usr/local" && \ 54935 +(test $prefix = NONE || test -d $prefix) && { 54936 + test -n "$verbose" && echo " ... testing for lib-directories under /usr/local" 54937 + test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib" 54938 + test -d /usr/local/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/lib/$cf_nculib_root" 54939 + test -d /usr/local/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib" 54940 + test -d /usr/local/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/$cf_nculib_root/lib" 54941 + test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root" 54942 +} 54943 + 54944 + 54945 +test "/opt" != "$prefix" && \ 54946 +test -d "/opt" && \ 54947 +(test $prefix = NONE || test -d $prefix) && { 54948 + test -n "$verbose" && echo " ... testing for lib-directories under /opt" 54949 + test -d /opt/lib && cf_search="$cf_search /opt/lib" 54950 + test -d /opt/lib/$cf_nculib_root && cf_search="$cf_search /opt/lib/$cf_nculib_root" 54951 + test -d /opt/lib/$cf_nculib_root/lib && cf_search="$cf_search /opt/lib/$cf_nculib_root/lib" 54952 + test -d /opt/$cf_nculib_root/lib && cf_search="$cf_search /opt/$cf_nculib_root/lib" 54953 + test -d /opt/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root" 54954 +} 54955 + 54956 + 54957 +test "$HOME" != "$prefix" && \ 54958 +test -d "$HOME" && \ 54959 +(test $prefix = NONE || test -d $prefix) && { 54960 + test -n "$verbose" && echo " ... testing for lib-directories under $HOME" 54961 + test -d $HOME/lib && cf_search="$cf_search $HOME/lib" 54962 + test -d $HOME/lib/$cf_nculib_root && cf_search="$cf_search $HOME/lib/$cf_nculib_root" 54963 + test -d $HOME/lib/$cf_nculib_root/lib && cf_search="$cf_search $HOME/lib/$cf_nculib_root/lib" 54964 + test -d $HOME/$cf_nculib_root/lib && cf_search="$cf_search $HOME/$cf_nculib_root/lib" 54965 + test -d $HOME/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root" 54966 +} 54967 + 54968 54969 -/* The GNU C library defines this for functions which it implements 54970 - to always fail with ENOSYS. Some functions are actually named 54971 - something starting with __ and the normal name is an alias. */ 54972 -#if defined (__stub_remove) || defined (__stub___remove) 54973 -choke me 54974 -#else 54975 -remove(); 54976 -#endif 54977 36273 54978 +cf_search="$cf_library_path_list $cf_search" 36274 54979 + 36275 for cf_libdir in $cf_search 36276 do 36277 echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6 36278 -echo "configure:5148: checking for -l$cf_nculib_root in $cf_libdir" >&5 36279 +echo "configure:5832: checking for -l$cf_nculib_root in $cf_libdir" >&5 36280 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" 36281 cat > conftest.$ac_ext <<EOF 36282 -#line 5151 "configure" 36283 +#line 5835 "configure" 36284 #include "confdefs.h" 36285 #include <${cf_cv_ncurses_header-curses.h}> 36286 int main() { 36287 initscr() 54980 + for cf_libdir in $cf_search 54981 + do 54982 + echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6 54983 +echo "configure:5837: checking for -l$cf_nculib_root in $cf_libdir" >&5 54984 + LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" 54985 + cat > conftest.$ac_ext <<EOF 54986 +#line 5840 "configure" 54987 +#include "confdefs.h" 54988 +#include <${cf_cv_ncurses_header-curses.h}> 54989 +int main() { 54990 +initscr() 36288 54991 ; return 0; } 36289 54992 EOF 36290 -if { (eval echo configure:5 158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then36291 +if { (eval echo configure:584 2: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then54993 -if { (eval echo configure:5620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 54994 +if { (eval echo configure:5847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36292 54995 rm -rf conftest* 36293 echo "$ac_t""yes" 1>&6 36294 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' 36295 @@ -5185,7 +5869,7 @@ 36296 36297 if test -n "$cf_ncurses_LIBS" ; then 36298 echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6 36299 -echo "configure:5189: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 36300 +echo "configure:5873: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 36301 cf_ncurses_SAVE="$LIBS" 36302 for p in $cf_ncurses_LIBS ; do 36303 q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` 36304 @@ -5194,14 +5878,14 @@ 36305 fi 36306 done 36307 cat > conftest.$ac_ext <<EOF 36308 -#line 5198 "configure" 36309 +#line 5882 "configure" 36310 #include "confdefs.h" 36311 #include <${cf_cv_ncurses_header-curses.h}> 36312 int main() { 36313 initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); 36314 ; return 0; } 36315 EOF 36316 -if { (eval echo configure:5205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36317 +if { (eval echo configure:5889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 54996 - eval "ac_cv_func_remove=yes" 54997 + echo "$ac_t""yes" 1>&6 54998 + eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' 54999 + break 55000 else 55001 echo "configure: failed program was:" >&5 55002 cat conftest.$ac_ext >&5 36318 55003 rm -rf conftest* 36319 echo "$ac_t""yes" 1>&6 36320 else 36321 @@ -5222,6 +5906,9 @@ 36322 EOF 36323 36324 36325 + 55004 - eval "ac_cv_func_remove=no" 55005 + echo "$ac_t""no" 1>&6 55006 + LIBS="$cf_save_LIBS" 36326 55007 +fi 36327 + 36328 ;; 36329 pdcurses) #(vi 36330 if test "$no_x" = yes; then 36331 @@ -5244,17 +5931,17 @@ 36332 case "`(uname -sr) 2>/dev/null`" in 36333 "SunOS 5"*) 36334 echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 36335 -echo "configure:5248: checking whether -R must be followed by a space" >&5 36336 +echo "configure:5935: checking whether -R must be followed by a space" >&5 36337 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" 36338 cat > conftest.$ac_ext <<EOF 36339 -#line 5251 "configure" 36340 +#line 5938 "configure" 36341 #include "confdefs.h" 36342 36343 int main() { 36344 36345 ; return 0; } 36346 EOF 36347 -if { (eval echo configure:5258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36348 +if { (eval echo configure:5945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36349 rm -rf conftest* 36350 ac_R_nospace=yes 36351 else 36352 @@ -5270,14 +5957,14 @@ 36353 else 36354 LIBS="$ac_xsave_LIBS -R $x_libraries" 36355 cat > conftest.$ac_ext <<EOF 36356 -#line 5274 "configure" 36357 +#line 5961 "configure" 36358 #include "confdefs.h" 36359 36360 int main() { 36361 36362 ; return 0; } 36363 EOF 36364 -if { (eval echo configure:5281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36365 +if { (eval echo configure:5968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36366 rm -rf conftest* 36367 ac_R_space=yes 36368 else 36369 @@ -5309,7 +5996,7 @@ 36370 # libraries were built with DECnet support. And karl@cs.umb.edu says 36371 # the Alpha needs dnet_stub (dnet does not exist). 36372 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 36373 -echo "configure:5313: checking for dnet_ntoa in -ldnet" >&5 36374 +echo "configure:6000: checking for dnet_ntoa in -ldnet" >&5 36375 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` 36376 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 36377 echo $ac_n "(cached) $ac_c" 1>&6 36378 @@ -5317,7 +6004,7 @@ 36379 ac_save_LIBS="$LIBS" 36380 LIBS="-ldnet $LIBS" 36381 cat > conftest.$ac_ext <<EOF 36382 -#line 5321 "configure" 36383 +#line 6008 "configure" 55008 +rm -f conftest* 55009 + done 55010 + 55011 fi 55012 rm -f conftest* 55013 + 55014 fi 55015 55016 -if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then 55017 - echo "$ac_t""yes" 1>&6 55018 - : 55019 -else 55020 - echo "$ac_t""no" 1>&6 55021 +eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root 55022 + 55023 +if test $cf_found_library = no ; then 55024 + { echo "configure: error: Cannot link $cf_nculib_root library" 1>&2; exit 1; } 55025 fi 55026 55027 - if test $ac_cv_func_remove = no; then 55028 - echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 55029 -echo "configure:5641: checking for remove in -lposix" >&5 55030 -ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` 55031 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 55032 - echo $ac_n "(cached) $ac_c" 1>&6 55033 -else 55034 - ac_save_LIBS="$LIBS" 55035 -LIBS="-lposix $LIBS" 55036 -cat > conftest.$ac_ext <<EOF 55037 -#line 5649 "configure" 55038 + 55039 +fi 55040 + 55041 +if test -n "$cf_ncurses_LIBS" ; then 55042 + echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6 55043 +echo "configure:5878: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 55044 + cf_ncurses_SAVE="$LIBS" 55045 + for p in $cf_ncurses_LIBS ; do 55046 + q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` 55047 + if test "$q" != "$LIBS" ; then 55048 + LIBS="$q" 55049 + fi 55050 + done 55051 + cat > conftest.$ac_ext <<EOF 55052 +#line 5887 "configure" 55053 +#include "confdefs.h" 55054 +#include <${cf_cv_ncurses_header-curses.h}> 55055 +int main() { 55056 +initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); 55057 +; return 0; } 55058 +EOF 55059 +if { (eval echo configure:5894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 55060 + rm -rf conftest* 55061 + echo "$ac_t""yes" 1>&6 55062 +else 55063 + echo "configure: failed program was:" >&5 55064 + cat conftest.$ac_ext >&5 55065 + rm -rf conftest* 55066 + echo "$ac_t""no" 1>&6 55067 + LIBS="$cf_ncurses_SAVE" 55068 +fi 55069 +rm -f conftest* 55070 +fi 55071 + 55072 + 55073 +cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 55074 + 55075 +cat >> confdefs.h <<EOF 55076 +#define $cf_nculib_ROOT 1 55077 +EOF 55078 + 55079 + 55080 + 55081 +fi 55082 + 55083 + ;; 55084 +pdcurses) #(vi 55085 + if test "$no_x" = yes; then 55086 + # Not all programs may use this symbol, but it does not hurt to define it. 55087 + cat >> confdefs.h <<\EOF 55088 +#define X_DISPLAY_MISSING 1 55089 +EOF 55090 + 55091 + X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= 55092 +else 55093 + if test -n "$x_includes"; then 55094 + X_CFLAGS="$X_CFLAGS -I$x_includes" 55095 + fi 55096 + 55097 + # It would also be nice to do this for all -L options, not just this one. 55098 + if test -n "$x_libraries"; then 55099 + X_LIBS="$X_LIBS -L$x_libraries" 55100 + # For Solaris; some versions of Sun CC require a space after -R and 55101 + # others require no space. Words are not sufficient . . . . 55102 + case "`(uname -sr) 2>/dev/null`" in 55103 + "SunOS 5"*) 55104 + echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 55105 +echo "configure:5940: checking whether -R must be followed by a space" >&5 55106 + ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" 55107 + cat > conftest.$ac_ext <<EOF 55108 +#line 5943 "configure" 55109 +#include "confdefs.h" 55110 + 55111 +int main() { 55112 + 55113 +; return 0; } 55114 +EOF 55115 +if { (eval echo configure:5950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 55116 + rm -rf conftest* 55117 + ac_R_nospace=yes 55118 +else 55119 + echo "configure: failed program was:" >&5 55120 + cat conftest.$ac_ext >&5 55121 + rm -rf conftest* 55122 + ac_R_nospace=no 55123 +fi 55124 +rm -f conftest* 55125 + if test $ac_R_nospace = yes; then 55126 + echo "$ac_t""no" 1>&6 55127 + X_LIBS="$X_LIBS -R$x_libraries" 55128 + else 55129 + LIBS="$ac_xsave_LIBS -R $x_libraries" 55130 + cat > conftest.$ac_ext <<EOF 55131 +#line 5966 "configure" 55132 +#include "confdefs.h" 55133 + 55134 +int main() { 55135 + 55136 +; return 0; } 55137 +EOF 55138 +if { (eval echo configure:5973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 55139 + rm -rf conftest* 55140 + ac_R_space=yes 55141 +else 55142 + echo "configure: failed program was:" >&5 55143 + cat conftest.$ac_ext >&5 55144 + rm -rf conftest* 55145 + ac_R_space=no 55146 +fi 55147 +rm -f conftest* 55148 + if test $ac_R_space = yes; then 55149 + echo "$ac_t""yes" 1>&6 55150 + X_LIBS="$X_LIBS -R $x_libraries" 55151 + else 55152 + echo "$ac_t""neither works" 1>&6 55153 + fi 55154 + fi 55155 + LIBS="$ac_xsave_LIBS" 55156 + esac 55157 + fi 55158 + 55159 + # Check for system-dependent libraries X programs must link with. 55160 + # Do this before checking for the system-independent R6 libraries 55161 + # (-lICE), since we may need -lsocket or whatever for X linking. 55162 + 55163 + if test "$ISC" = yes; then 55164 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" 55165 + else 55166 + # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X 55167 + # libraries were built with DECnet support. And karl@cs.umb.edu says 55168 + # the Alpha needs dnet_stub (dnet does not exist). 55169 + echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 55170 +echo "configure:6005: checking for dnet_ntoa in -ldnet" >&5 55171 +ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` 55172 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 55173 + echo $ac_n "(cached) $ac_c" 1>&6 55174 +else 55175 + ac_save_LIBS="$LIBS" 55176 +LIBS="-ldnet $LIBS" 55177 +cat > conftest.$ac_ext <<EOF 55178 +#line 6013 "configure" 36384 55179 #include "confdefs.h" 36385 55180 /* Override any gcc2 internal prototype to avoid an error. */ 36386 55181 /* We use char because int might match the return type of a gcc2 36387 @@ -5328,7 +6015,7 @@ 36388 dnet_ntoa() 55182 builtin and then its argument prototype would still apply. */ 55183 -char remove(); 55184 +char dnet_ntoa(); 55185 55186 int main() { 55187 -remove() 55188 +dnet_ntoa() 36389 55189 ; return 0; } 36390 55190 EOF 36391 -if { (eval echo configure:5 332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then36392 +if { (eval echo configure:60 19: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then55191 -if { (eval echo configure:5660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 55192 +if { (eval echo configure:6024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36393 55193 rm -rf conftest* 36394 55194 eval "ac_cv_lib_$ac_lib_var=yes" 36395 55195 else 36396 @@ -5350,7 +6037,7 @@ 36397 36398 if test $ac_cv_lib_dnet_dnet_ntoa = no; then 36399 echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 36400 -echo "configure:5354: checking for dnet_ntoa in -ldnet_stub" >&5 36401 +echo "configure:6041: checking for dnet_ntoa in -ldnet_stub" >&5 36402 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` 36403 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 36404 echo $ac_n "(cached) $ac_c" 1>&6 36405 @@ -5358,7 +6045,7 @@ 36406 ac_save_LIBS="$LIBS" 36407 LIBS="-ldnet_stub $LIBS" 36408 cat > conftest.$ac_ext <<EOF 36409 -#line 5362 "configure" 36410 +#line 6049 "configure" 36411 #include "confdefs.h" 36412 /* Override any gcc2 internal prototype to avoid an error. */ 36413 /* We use char because int might match the return type of a gcc2 36414 @@ -5369,7 +6056,7 @@ 36415 dnet_ntoa() 36416 ; return 0; } 36417 EOF 36418 -if { (eval echo configure:5373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36419 +if { (eval echo configure:6060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36420 rm -rf conftest* 36421 eval "ac_cv_lib_$ac_lib_var=yes" 55196 @@ -5671,84 +6035,130 @@ 55197 fi 55198 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 55199 echo "$ac_t""yes" 1>&6 55200 - X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" 55201 + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" 55202 +else 55203 + echo "$ac_t""no" 1>&6 55204 +fi 55205 + 55206 + if test $ac_cv_lib_dnet_dnet_ntoa = no; then 55207 + echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 55208 +echo "configure:6046: checking for dnet_ntoa in -ldnet_stub" >&5 55209 +ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` 55210 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 55211 + echo $ac_n "(cached) $ac_c" 1>&6 55212 +else 55213 + ac_save_LIBS="$LIBS" 55214 +LIBS="-ldnet_stub $LIBS" 55215 +cat > conftest.$ac_ext <<EOF 55216 +#line 6054 "configure" 55217 +#include "confdefs.h" 55218 +/* Override any gcc2 internal prototype to avoid an error. */ 55219 +/* We use char because int might match the return type of a gcc2 55220 + builtin and then its argument prototype would still apply. */ 55221 +char dnet_ntoa(); 55222 + 55223 +int main() { 55224 +dnet_ntoa() 55225 +; return 0; } 55226 +EOF 55227 +if { (eval echo configure:6065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 55228 + rm -rf conftest* 55229 + eval "ac_cv_lib_$ac_lib_var=yes" 55230 +else 55231 + echo "configure: failed program was:" >&5 55232 + cat conftest.$ac_ext >&5 55233 + rm -rf conftest* 55234 + eval "ac_cv_lib_$ac_lib_var=no" 55235 +fi 55236 +rm -f conftest* 55237 +LIBS="$ac_save_LIBS" 55238 + 55239 +fi 55240 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 55241 + echo "$ac_t""yes" 1>&6 55242 + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" 36422 55243 else 36423 @@ -5398,12 +6085,12 @@ 36424 # The nsl library prevents programs from opening the X display 36425 # on Irix 5.2, according to dickey@clark.net. 36426 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 36427 -echo "configure:5402: checking for gethostbyname" >&5 36428 +echo "configure:6089: checking for gethostbyname" >&5 36429 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then 36430 echo $ac_n "(cached) $ac_c" 1>&6 36431 else 36432 cat > conftest.$ac_ext <<EOF 36433 -#line 5407 "configure" 36434 +#line 6094 "configure" 36435 #include "confdefs.h" 36436 /* System header to define __stub macros and hopefully few prototypes, 36437 which can conflict with char gethostbyname(); below. */ 36438 @@ -5426,7 +6113,7 @@ 36439 36440 ; return 0; } 36441 EOF 36442 -if { (eval echo configure:5430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36443 +if { (eval echo configure:6117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36444 rm -rf conftest* 36445 eval "ac_cv_func_gethostbyname=yes" 36446 else 36447 @@ -5447,7 +6134,7 @@ 36448 36449 if test $ac_cv_func_gethostbyname = no; then 36450 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 36451 -echo "configure:5451: checking for gethostbyname in -lnsl" >&5 36452 +echo "configure:6138: checking for gethostbyname in -lnsl" >&5 36453 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` 36454 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 36455 echo $ac_n "(cached) $ac_c" 1>&6 36456 @@ -5455,7 +6142,7 @@ 36457 ac_save_LIBS="$LIBS" 36458 LIBS="-lnsl $LIBS" 36459 cat > conftest.$ac_ext <<EOF 36460 -#line 5459 "configure" 36461 +#line 6146 "configure" 36462 #include "confdefs.h" 36463 /* Override any gcc2 internal prototype to avoid an error. */ 36464 /* We use char because int might match the return type of a gcc2 36465 @@ -5466,7 +6153,7 @@ 36466 gethostbyname() 36467 ; return 0; } 36468 EOF 36469 -if { (eval echo configure:5470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36470 +if { (eval echo configure:6157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36471 rm -rf conftest* 36472 eval "ac_cv_lib_$ac_lib_var=yes" 36473 else 36474 @@ -5496,12 +6183,12 @@ 36475 # -lsocket must be given before -lnsl if both are needed. 36476 # We assume that if connect needs -lnsl, so does gethostbyname. 36477 echo $ac_n "checking for connect""... $ac_c" 1>&6 36478 -echo "configure:5500: checking for connect" >&5 36479 +echo "configure:6187: checking for connect" >&5 36480 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then 36481 echo $ac_n "(cached) $ac_c" 1>&6 36482 else 36483 cat > conftest.$ac_ext <<EOF 36484 -#line 5505 "configure" 36485 +#line 6192 "configure" 36486 #include "confdefs.h" 36487 /* System header to define __stub macros and hopefully few prototypes, 36488 which can conflict with char connect(); below. */ 36489 @@ -5524,7 +6211,7 @@ 36490 36491 ; return 0; } 36492 EOF 36493 -if { (eval echo configure:5528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36494 +if { (eval echo configure:6215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36495 rm -rf conftest* 36496 eval "ac_cv_func_connect=yes" 36497 else 36498 @@ -5545,7 +6232,7 @@ 36499 36500 if test $ac_cv_func_connect = no; then 36501 echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 36502 -echo "configure:5549: checking for connect in -lsocket" >&5 36503 +echo "configure:6236: checking for connect in -lsocket" >&5 36504 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` 36505 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 36506 echo $ac_n "(cached) $ac_c" 1>&6 36507 @@ -5553,7 +6240,7 @@ 36508 ac_save_LIBS="$LIBS" 36509 LIBS="-lsocket $X_EXTRA_LIBS $LIBS" 36510 cat > conftest.$ac_ext <<EOF 36511 -#line 5557 "configure" 36512 +#line 6244 "configure" 36513 #include "confdefs.h" 36514 /* Override any gcc2 internal prototype to avoid an error. */ 36515 /* We use char because int might match the return type of a gcc2 36516 @@ -5564,7 +6251,7 @@ 36517 connect() 36518 ; return 0; } 36519 EOF 36520 -if { (eval echo configure:5568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36521 +if { (eval echo configure:6255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36522 rm -rf conftest* 36523 eval "ac_cv_lib_$ac_lib_var=yes" 36524 else 36525 @@ -5588,12 +6275,12 @@ 36526 36527 # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. 36528 echo $ac_n "checking for remove""... $ac_c" 1>&6 36529 -echo "configure:5592: checking for remove" >&5 36530 +echo "configure:6279: checking for remove" >&5 36531 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then 36532 echo $ac_n "(cached) $ac_c" 1>&6 36533 else 36534 cat > conftest.$ac_ext <<EOF 36535 -#line 5597 "configure" 36536 +#line 6284 "configure" 36537 #include "confdefs.h" 36538 /* System header to define __stub macros and hopefully few prototypes, 36539 which can conflict with char remove(); below. */ 36540 @@ -5616,7 +6303,7 @@ 36541 36542 ; return 0; } 36543 EOF 36544 -if { (eval echo configure:5620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36545 +if { (eval echo configure:6307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36546 rm -rf conftest* 36547 eval "ac_cv_func_remove=yes" 36548 else 36549 @@ -5637,7 +6324,7 @@ 36550 36551 if test $ac_cv_func_remove = no; then 36552 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 36553 -echo "configure:5641: checking for remove in -lposix" >&5 36554 +echo "configure:6328: checking for remove in -lposix" >&5 36555 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` 36556 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 36557 echo $ac_n "(cached) $ac_c" 1>&6 36558 @@ -5645,7 +6332,7 @@ 36559 ac_save_LIBS="$LIBS" 36560 LIBS="-lposix $LIBS" 36561 cat > conftest.$ac_ext <<EOF 36562 -#line 5649 "configure" 36563 +#line 6336 "configure" 36564 #include "confdefs.h" 36565 /* Override any gcc2 internal prototype to avoid an error. */ 36566 /* We use char because int might match the return type of a gcc2 36567 @@ -5656,7 +6343,7 @@ 36568 remove() 36569 ; return 0; } 36570 EOF 36571 -if { (eval echo configure:5660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36572 +if { (eval echo configure:6347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36573 rm -rf conftest* 36574 eval "ac_cv_lib_$ac_lib_var=yes" 36575 else 36576 @@ -5680,12 +6367,12 @@ 36577 36578 # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. 36579 echo $ac_n "checking for shmat""... $ac_c" 1>&6 55244 echo "$ac_t""no" 1>&6 55245 fi 55246 55247 fi 55248 55249 - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. 55250 - echo $ac_n "checking for shmat""... $ac_c" 1>&6 36580 55251 -echo "configure:5684: checking for shmat" >&5 36581 +echo "configure:6371: checking for shmat" >&5 36582 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then 55252 -if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then 55253 + # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, 55254 + # to get the SysV transport functions. 55255 + # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4) 55256 + # needs -lnsl. 55257 + # The nsl library prevents programs from opening the X display 55258 + # on Irix 5.2, according to dickey@clark.net. 55259 + echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 55260 +echo "configure:6094: checking for gethostbyname" >&5 55261 +if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then 36583 55262 echo $ac_n "(cached) $ac_c" 1>&6 36584 55263 else 36585 55264 cat > conftest.$ac_ext <<EOF 36586 55265 -#line 5689 "configure" 36587 +#line 6 376"configure"55266 +#line 6099 "configure" 36588 55267 #include "confdefs.h" 36589 55268 /* System header to define __stub macros and hopefully few prototypes, 36590 which can conflict with char shmat(); below. */ 36591 @@ -5708,7 +6395,7 @@ 55269 - which can conflict with char shmat(); below. */ 55270 + which can conflict with char gethostbyname(); below. */ 55271 #include <assert.h> 55272 /* Override any gcc2 internal prototype to avoid an error. */ 55273 /* We use char because int might match the return type of a gcc2 55274 builtin and then its argument prototype would still apply. */ 55275 -char shmat(); 55276 +char gethostbyname(); 55277 55278 int main() { 55279 55280 /* The GNU C library defines this for functions which it implements 55281 to always fail with ENOSYS. Some functions are actually named 55282 something starting with __ and the normal name is an alias. */ 55283 -#if defined (__stub_shmat) || defined (__stub___shmat) 55284 +#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) 55285 choke me 55286 #else 55287 -shmat(); 55288 +gethostbyname(); 55289 #endif 36592 55290 36593 55291 ; return 0; } 36594 55292 EOF 36595 55293 -if { (eval echo configure:5712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36596 +if { (eval echo configure:6 399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then55294 +if { (eval echo configure:6122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36597 55295 rm -rf conftest* 36598 eval "ac_cv_func_shmat=yes" 55296 - eval "ac_cv_func_shmat=yes" 55297 + eval "ac_cv_func_gethostbyname=yes" 36599 55298 else 36600 @@ -5729,7 +6416,7 @@ 36601 36602 if test $ac_cv_func_shmat = no; then 36603 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 55299 echo "configure: failed program was:" >&5 55300 cat conftest.$ac_ext >&5 55301 rm -rf conftest* 55302 - eval "ac_cv_func_shmat=no" 55303 + eval "ac_cv_func_gethostbyname=no" 55304 fi 55305 rm -f conftest* 55306 fi 55307 55308 -if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then 55309 +if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then 55310 echo "$ac_t""yes" 1>&6 55311 : 55312 else 55313 echo "$ac_t""no" 1>&6 55314 fi 55315 55316 - if test $ac_cv_func_shmat = no; then 55317 - echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 36604 55318 -echo "configure:5733: checking for shmat in -lipc" >&5 36605 +echo "configure:6420: checking for shmat in -lipc" >&5 36606 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` 55319 -ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` 55320 + if test $ac_cv_func_gethostbyname = no; then 55321 + echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 55322 +echo "configure:6143: checking for gethostbyname in -lnsl" >&5 55323 +ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` 36607 55324 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 36608 55325 echo $ac_n "(cached) $ac_c" 1>&6 36609 @@ -5737,7 +6424,7 @@ 55326 else 36610 55327 ac_save_LIBS="$LIBS" 36611 LIBS="-lipc $LIBS" 55328 -LIBS="-lipc $LIBS" 55329 +LIBS="-lnsl $LIBS" 36612 55330 cat > conftest.$ac_ext <<EOF 36613 55331 -#line 5741 "configure" 36614 +#line 6 428"configure"55332 +#line 6151 "configure" 36615 55333 #include "confdefs.h" 36616 55334 /* Override any gcc2 internal prototype to avoid an error. */ 36617 55335 /* We use char because int might match the return type of a gcc2 36618 @@ -5748,7 +6435,7 @@ 36619 shmat() 55336 builtin and then its argument prototype would still apply. */ 55337 -char shmat(); 55338 +char gethostbyname(); 55339 55340 int main() { 55341 -shmat() 55342 +gethostbyname() 36620 55343 ; return 0; } 36621 55344 EOF 36622 55345 -if { (eval echo configure:5752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36623 +if { (eval echo configure:6 439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then55346 +if { (eval echo configure:6162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36624 55347 rm -rf conftest* 36625 55348 eval "ac_cv_lib_$ac_lib_var=yes" 36626 55349 else 36627 @@ -5781,7 +6468,7 @@ 36628 # libraries we check for below, so use a different variable. 36629 # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. 36630 echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 55350 @@ -5763,269 +6173,182 @@ 55351 fi 55352 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 55353 echo "$ac_t""yes" 1>&6 55354 - X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" 55355 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" 55356 else 55357 echo "$ac_t""no" 1>&6 55358 fi 55359 55360 fi 55361 - fi 55362 55363 - # Check for libraries that X11R6 Xt/Xaw programs need. 55364 - ac_save_LDFLAGS="$LDFLAGS" 55365 - test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" 55366 - # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to 55367 - # check for ICE first), but we must link in the order -lSM -lICE or 55368 - # we get undefined symbols. So assume we have SM if we have ICE. 55369 - # These have to be linked with before -lX11, unlike the other 55370 - # libraries we check for below, so use a different variable. 55371 - # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. 55372 - echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 36631 55373 -echo "configure:5785: checking for IceConnectionNumber in -lICE" >&5 36632 +echo "configure:6472: checking for IceConnectionNumber in -lICE" >&5 36633 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` 36634 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 55374 -ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` 55375 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 55376 + # lieder@skyler.mavd.honeywell.com says without -lsocket, 55377 + # socket/setsockopt and other routines are undefined under SCO ODT 55378 + # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary 55379 + # on later versions), says simon@lia.di.epfl.ch: it contains 55380 + # gethostby* variants that don't use the nameserver (or something). 55381 + # -lsocket must be given before -lnsl if both are needed. 55382 + # We assume that if connect needs -lnsl, so does gethostbyname. 55383 + echo $ac_n "checking for connect""... $ac_c" 1>&6 55384 +echo "configure:6192: checking for connect" >&5 55385 +if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then 36635 55386 echo $ac_n "(cached) $ac_c" 1>&6 36636 @@ -5789,7 +6476,7 @@ 36637 36638 36639 55387 else 55388 - ac_save_LIBS="$LIBS" 55389 -LIBS="-lICE $X_EXTRA_LIBS $LIBS" 55390 -cat > conftest.$ac_ext <<EOF 36640 55391 -#line 5793 "configure" 36641 +#line 6480 "configure" 55392 + cat > conftest.$ac_ext <<EOF 55393 +#line 6197 "configure" 36642 55394 #include "confdefs.h" 55395 +/* System header to define __stub macros and hopefully few prototypes, 55396 + which can conflict with char connect(); below. */ 55397 +#include <assert.h> 36643 55398 /* Override any gcc2 internal prototype to avoid an error. */ 36644 55399 /* We use char because int might match the return type of a gcc2 36645 @@ -5800,7 +6487,7 @@ 36646 IceConnectionNumber() 55400 builtin and then its argument prototype would still apply. */ 55401 -char IceConnectionNumber(); 55402 +char connect(); 55403 55404 int main() { 55405 -IceConnectionNumber() 55406 + 55407 +/* The GNU C library defines this for functions which it implements 55408 + to always fail with ENOSYS. Some functions are actually named 55409 + something starting with __ and the normal name is an alias. */ 55410 +#if defined (__stub_connect) || defined (__stub___connect) 55411 +choke me 55412 +#else 55413 +connect(); 55414 +#endif 55415 + 36647 55416 ; return 0; } 36648 55417 EOF 36649 55418 -if { (eval echo configure:5804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36650 +if { (eval echo configure:6 491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then55419 +if { (eval echo configure:6220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36651 55420 rm -rf conftest* 36652 eval "ac_cv_lib_$ac_lib_var=yes" 55421 - eval "ac_cv_lib_$ac_lib_var=yes" 55422 + eval "ac_cv_func_connect=yes" 36653 55423 else 36654 @@ -5836,7 +6523,7 @@ 36655 36656 test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 36657 55424 echo "configure: failed program was:" >&5 55425 cat conftest.$ac_ext >&5 55426 rm -rf conftest* 55427 - eval "ac_cv_lib_$ac_lib_var=no" 55428 + eval "ac_cv_func_connect=no" 55429 fi 55430 rm -f conftest* 55431 -LIBS="$ac_save_LIBS" 55432 - 55433 fi 55434 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 55435 + 55436 +if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then 55437 echo "$ac_t""yes" 1>&6 55438 - X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" 55439 + : 55440 else 55441 echo "$ac_t""no" 1>&6 55442 fi 55443 55444 - LDFLAGS="$ac_save_LDFLAGS" 55445 - 55446 -fi 55447 - 55448 - 55449 - 55450 - 55451 - 55452 -# SYSTEM_NAME=`echo "$cf_cv_system_name"|tr ' ' -` 55453 - 55454 -cf_have_X_LIBS=no 55455 - 55456 -LDFLAGS="$X_LIBS $LDFLAGS" 55457 - 55458 -test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 55459 - 36658 55460 -echo "${as_me-configure}:5840: testing checking additions to CFLAGS ..." 1>&5 36659 +echo "${as_me-configure}:6527: testing checking additions to CFLAGS ..." 1>&5 36660 36661 36662 cf_check_cflags="$CFLAGS" 36663 @@ -5898,7 +6585,7 @@ 36664 if test -n "$cf_new_cflags" ; then 36665 test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 36666 55461 - 55462 - 55463 -cf_check_cflags="$CFLAGS" 55464 -cf_check_cppflags="$CPPFLAGS" 55465 - 55466 -cf_fix_cppflags=no 55467 -cf_new_cflags= 55468 -cf_new_cppflags= 55469 -cf_new_extra_cppflags= 55470 - 55471 -for cf_add_cflags in $X_CFLAGS 55472 -do 55473 -case $cf_fix_cppflags in 55474 -no) 55475 - case $cf_add_cflags in #(vi 55476 - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi 55477 - case $cf_add_cflags in 55478 - -D*) 55479 - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` 55480 - 55481 - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ 55482 - && test -z "${cf_tst_cflags}" \ 55483 - && cf_fix_cppflags=yes 55484 - 55485 - if test $cf_fix_cppflags = yes ; then 55486 - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" 55487 - continue 55488 - elif test "${cf_tst_cflags}" = "\"'" ; then 55489 - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" 55490 - continue 55491 - fi 55492 - ;; 55493 - esac 55494 - case "$CPPFLAGS" in 55495 - *$cf_add_cflags) #(vi 55496 - ;; 55497 - *) #(vi 55498 - cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" 55499 - ;; 55500 - esac 55501 - ;; 55502 - *) 55503 - cf_new_cflags="$cf_new_cflags $cf_add_cflags" 55504 - ;; 55505 - esac 55506 - ;; 55507 -yes) 55508 - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" 55509 - 55510 - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` 55511 - 55512 - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ 55513 - && test -z "${cf_tst_cflags}" \ 55514 - && cf_fix_cppflags=no 55515 - ;; 55516 -esac 55517 -done 55518 - 55519 -if test -n "$cf_new_cflags" ; then 55520 - test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 55521 - 36667 55522 -echo "${as_me-configure}:5902: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 36668 +echo "${as_me-configure}:6589: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 36669 36670 36671 CFLAGS="$CFLAGS $cf_new_cflags" 36672 @@ -5907,16 +6594,16 @@ 36673 36674 36675 55523 - 55524 - 55525 - CFLAGS="$CFLAGS $cf_new_cflags" 55526 -fi 55527 - 55528 -if test -n "$cf_new_cppflags" ; then 55529 - test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 55530 - 36676 55531 -echo "${as_me-configure}:5911: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 36677 +echo "${as_me-configure}:6598: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 36678 36679 55532 - 55533 - 36680 55534 - CPPFLAGS="$cf_new_cppflags $CPPFLAGS" 36681 + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" 36682 fi 36683 36684 if test -n "$cf_new_extra_cppflags" ; then 36685 test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 36686 55535 -fi 55536 - 55537 -if test -n "$cf_new_extra_cppflags" ; then 55538 - test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 55539 - 36687 55540 -echo "${as_me-configure}:5920: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 36688 +echo "${as_me-configure}:6607: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 36689 36690 36691 EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" 36692 @@ -5927,14 +6614,14 @@ 36693 36694 if test "$cf_check_cflags" != "$CFLAGS" ; then 55541 - 55542 - 55543 - EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" 55544 -fi 55545 - 55546 - 55547 - 55548 - 55549 -if test "$cf_check_cflags" != "$CFLAGS" ; then 55550 + if test $ac_cv_func_connect = no; then 55551 + echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 55552 +echo "configure:6241: checking for connect in -lsocket" >&5 55553 +ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` 55554 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 55555 + echo $ac_n "(cached) $ac_c" 1>&6 55556 +else 55557 + ac_save_LIBS="$LIBS" 55558 +LIBS="-lsocket $X_EXTRA_LIBS $LIBS" 36695 55559 cat > conftest.$ac_ext <<EOF 36696 55560 -#line 5931 "configure" 36697 +#line 6 618"configure"55561 +#line 6249 "configure" 36698 55562 #include "confdefs.h" 36699 #include <stdio.h> 55563 -#include <stdio.h> 55564 +/* Override any gcc2 internal prototype to avoid an error. */ 55565 +/* We use char because int might match the return type of a gcc2 55566 + builtin and then its argument prototype would still apply. */ 55567 +char connect(); 55568 + 36700 55569 int main() { 36701 printf("Hello world"); 55570 -printf("Hello world"); 55571 +connect() 36702 55572 ; return 0; } 36703 55573 EOF 36704 55574 -if { (eval echo configure:5938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36705 +if { (eval echo configure:6625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36706 : 55575 - : 55576 +if { (eval echo configure:6260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 55577 + rm -rf conftest* 55578 + eval "ac_cv_lib_$ac_lib_var=yes" 36707 55579 else 36708 55580 echo "configure: failed program was:" >&5 36709 @@ -5942,13 +6629,13 @@ 55581 cat conftest.$ac_ext >&5 36710 55582 rm -rf conftest* 36711 36712 55583 - test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 55584 - 36713 55585 -echo "${as_me-configure}:5946: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 36714 +echo "${as_me-configure}:6633: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 36715 36716 36717 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then 36718 test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 36719 55586 - 55587 - 55588 - if test "$cf_check_cppflags" != "$CPPFLAGS" ; then 55589 - test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 55590 - 36720 55591 -echo "${as_me-configure}:5952: testing but keeping change to \$CPPFLAGS ..." 1>&5 36721 +echo "${as_me-configure}:6639: testing but keeping change to \$CPPFLAGS ..." 1>&5 36722 36723 36724 fi 36725 @@ -5959,12 +6646,12 @@ 36726 36727 36728 echo $ac_n "checking for XOpenDisplay""... $ac_c" 1>&6 55592 - 55593 - 55594 - fi 55595 - CFLAGS="$cf_check_flags" 55596 + eval "ac_cv_lib_$ac_lib_var=no" 55597 fi 55598 rm -f conftest* 55599 +LIBS="$ac_save_LIBS" 55600 + 55601 +fi 55602 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 55603 + echo "$ac_t""yes" 1>&6 55604 + X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" 55605 +else 55606 + echo "$ac_t""no" 1>&6 55607 fi 55608 55609 + fi 55610 55611 -echo $ac_n "checking for XOpenDisplay""... $ac_c" 1>&6 36729 55612 -echo "configure:5963: checking for XOpenDisplay" >&5 36730 +echo "configure:6650: checking for XOpenDisplay" >&5 36731 if eval "test \"`echo '$''{'ac_cv_func_XOpenDisplay'+set}'`\" = set"; then 55613 -if eval "test \"`echo '$''{'ac_cv_func_XOpenDisplay'+set}'`\" = set"; then 55614 + # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. 55615 + echo $ac_n "checking for remove""... $ac_c" 1>&6 55616 +echo "configure:6284: checking for remove" >&5 55617 +if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then 36732 55618 echo $ac_n "(cached) $ac_c" 1>&6 36733 55619 else 36734 55620 cat > conftest.$ac_ext <<EOF 36735 55621 -#line 5968 "configure" 36736 +#line 6 655"configure"55622 +#line 6289 "configure" 36737 55623 #include "confdefs.h" 36738 55624 /* System header to define __stub macros and hopefully few prototypes, 36739 which can conflict with char XOpenDisplay(); below. */ 36740 @@ -5987,7 +6674,7 @@ 55625 - which can conflict with char XOpenDisplay(); below. */ 55626 + which can conflict with char remove(); below. */ 55627 #include <assert.h> 55628 /* Override any gcc2 internal prototype to avoid an error. */ 55629 /* We use char because int might match the return type of a gcc2 55630 builtin and then its argument prototype would still apply. */ 55631 -char XOpenDisplay(); 55632 +char remove(); 55633 55634 int main() { 55635 55636 /* The GNU C library defines this for functions which it implements 55637 to always fail with ENOSYS. Some functions are actually named 55638 something starting with __ and the normal name is an alias. */ 55639 -#if defined (__stub_XOpenDisplay) || defined (__stub___XOpenDisplay) 55640 +#if defined (__stub_remove) || defined (__stub___remove) 55641 choke me 55642 #else 55643 -XOpenDisplay(); 55644 +remove(); 55645 #endif 36741 55646 36742 55647 ; return 0; } 36743 55648 EOF 36744 55649 -if { (eval echo configure:5991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36745 +if { (eval echo configure:6 678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then55650 +if { (eval echo configure:6312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36746 55651 rm -rf conftest* 36747 eval "ac_cv_func_XOpenDisplay=yes" 55652 - eval "ac_cv_func_XOpenDisplay=yes" 55653 + eval "ac_cv_func_remove=yes" 36748 55654 else 36749 @@ -6006,7 +6693,7 @@ 55655 echo "configure: failed program was:" >&5 55656 cat conftest.$ac_ext >&5 55657 rm -rf conftest* 55658 - eval "ac_cv_func_XOpenDisplay=no" 55659 + eval "ac_cv_func_remove=no" 55660 fi 55661 rm -f conftest* 55662 fi 55663 55664 -if eval "test \"`echo '$ac_cv_func_'XOpenDisplay`\" = yes"; then 55665 +if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then 55666 echo "$ac_t""yes" 1>&6 55667 : 55668 else 36750 55669 echo "$ac_t""no" 1>&6 36751 36752 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 55670 +fi 55671 55672 -echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 36753 55673 -echo "configure:6010: checking for XOpenDisplay in -lX11" >&5 36754 +echo "configure:6697: checking for XOpenDisplay in -lX11" >&5 36755 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` 55674 -ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` 55675 + if test $ac_cv_func_remove = no; then 55676 + echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 55677 +echo "configure:6333: checking for remove in -lposix" >&5 55678 +ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` 36756 55679 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 36757 55680 echo $ac_n "(cached) $ac_c" 1>&6 36758 @@ -6014,7 +6701,7 @@ 55681 else 36759 55682 ac_save_LIBS="$LIBS" 36760 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" 55683 -LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" 55684 +LIBS="-lposix $LIBS" 36761 55685 cat > conftest.$ac_ext <<EOF 36762 55686 -#line 6018 "configure" 36763 +#line 6 705"configure"55687 +#line 6341 "configure" 36764 55688 #include "confdefs.h" 36765 55689 /* Override any gcc2 internal prototype to avoid an error. */ 36766 55690 /* We use char because int might match the return type of a gcc2 36767 @@ -6025,7 +6712,7 @@ 36768 XOpenDisplay() 55691 builtin and then its argument prototype would still apply. */ 55692 -char XOpenDisplay(); 55693 +char remove(); 55694 55695 int main() { 55696 -XOpenDisplay() 55697 +remove() 36769 55698 ; return 0; } 36770 55699 EOF 36771 55700 -if { (eval echo configure:6029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36772 +if { (eval echo configure:6 716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then55701 +if { (eval echo configure:6352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36773 55702 rm -rf conftest* 36774 55703 eval "ac_cv_lib_$ac_lib_var=yes" 36775 55704 else 36776 @@ -6049,12 +6736,12 @@ 36777 36778 36779 echo $ac_n "checking for XtAppInitialize""... $ac_c" 1>&6 55705 @@ -6040,82 +6363,84 @@ 55706 fi 55707 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 55708 echo "$ac_t""yes" 1>&6 55709 - LIBS="-lX11 $LIBS" 55710 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" 55711 else 55712 echo "$ac_t""no" 1>&6 55713 fi 55714 55715 -fi 55716 - 55717 + fi 55718 55719 -echo $ac_n "checking for XtAppInitialize""... $ac_c" 1>&6 36780 55720 -echo "configure:6053: checking for XtAppInitialize" >&5 36781 +echo "configure:6740: checking for XtAppInitialize" >&5 36782 if eval "test \"`echo '$''{'ac_cv_func_XtAppInitialize'+set}'`\" = set"; then 55721 -if eval "test \"`echo '$''{'ac_cv_func_XtAppInitialize'+set}'`\" = set"; then 55722 + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. 55723 + echo $ac_n "checking for shmat""... $ac_c" 1>&6 55724 +echo "configure:6376: checking for shmat" >&5 55725 +if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then 36783 55726 echo $ac_n "(cached) $ac_c" 1>&6 36784 55727 else 36785 55728 cat > conftest.$ac_ext <<EOF 36786 55729 -#line 6058 "configure" 36787 +#line 6 745"configure"55730 +#line 6381 "configure" 36788 55731 #include "confdefs.h" 36789 55732 /* System header to define __stub macros and hopefully few prototypes, 36790 which can conflict with char XtAppInitialize(); below. */ 36791 @@ -6077,7 +6764,7 @@ 55733 - which can conflict with char XtAppInitialize(); below. */ 55734 + which can conflict with char shmat(); below. */ 55735 #include <assert.h> 55736 /* Override any gcc2 internal prototype to avoid an error. */ 55737 /* We use char because int might match the return type of a gcc2 55738 builtin and then its argument prototype would still apply. */ 55739 -char XtAppInitialize(); 55740 +char shmat(); 55741 55742 int main() { 55743 55744 /* The GNU C library defines this for functions which it implements 55745 to always fail with ENOSYS. Some functions are actually named 55746 something starting with __ and the normal name is an alias. */ 55747 -#if defined (__stub_XtAppInitialize) || defined (__stub___XtAppInitialize) 55748 +#if defined (__stub_shmat) || defined (__stub___shmat) 55749 choke me 55750 #else 55751 -XtAppInitialize(); 55752 +shmat(); 55753 #endif 36792 55754 36793 55755 ; return 0; } 36794 55756 EOF 36795 55757 -if { (eval echo configure:6081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36796 +if { (eval echo configure:6 768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then55758 +if { (eval echo configure:6404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36797 55759 rm -rf conftest* 36798 eval "ac_cv_func_XtAppInitialize=yes" 55760 - eval "ac_cv_func_XtAppInitialize=yes" 55761 + eval "ac_cv_func_shmat=yes" 36799 55762 else 36800 @@ -6096,7 +6783,7 @@ 55763 echo "configure: failed program was:" >&5 55764 cat conftest.$ac_ext >&5 55765 rm -rf conftest* 55766 - eval "ac_cv_func_XtAppInitialize=no" 55767 + eval "ac_cv_func_shmat=no" 55768 fi 55769 rm -f conftest* 55770 fi 55771 55772 -if eval "test \"`echo '$ac_cv_func_'XtAppInitialize`\" = yes"; then 55773 +if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then 55774 echo "$ac_t""yes" 1>&6 55775 : 55776 else 36801 55777 echo "$ac_t""no" 1>&6 36802 36803 echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6 55778 +fi 55779 55780 -echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6 36804 55781 -echo "configure:6100: checking for XtAppInitialize in -lXt" >&5 36805 +echo "configure:6787: checking for XtAppInitialize in -lXt" >&5 36806 ac_lib_var=`echo Xt'_'XtAppInitialize | sed 'y%./+-%__p_%'` 55782 -ac_lib_var=`echo Xt'_'XtAppInitialize | sed 'y%./+-%__p_%'` 55783 + if test $ac_cv_func_shmat = no; then 55784 + echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 55785 +echo "configure:6425: checking for shmat in -lipc" >&5 55786 +ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` 36807 55787 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 36808 55788 echo $ac_n "(cached) $ac_c" 1>&6 36809 @@ -6104,7 +6791,7 @@ 55789 else 36810 55790 ac_save_LIBS="$LIBS" 36811 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" 55791 -LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" 55792 +LIBS="-lipc $LIBS" 36812 55793 cat > conftest.$ac_ext <<EOF 36813 55794 -#line 6108 "configure" 36814 +#line 6 795"configure"55795 +#line 6433 "configure" 36815 55796 #include "confdefs.h" 36816 55797 /* Override any gcc2 internal prototype to avoid an error. */ 36817 55798 /* We use char because int might match the return type of a gcc2 36818 @@ -6115,7 +6802,7 @@ 36819 XtAppInitialize() 55799 builtin and then its argument prototype would still apply. */ 55800 -char XtAppInitialize(); 55801 +char shmat(); 55802 55803 int main() { 55804 -XtAppInitialize() 55805 +shmat() 36820 55806 ; return 0; } 36821 55807 EOF 36822 55808 -if { (eval echo configure:6119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36823 +if { (eval echo configure:6 806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then55809 +if { (eval echo configure:6444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36824 55810 rm -rf conftest* 36825 55811 eval "ac_cv_lib_$ac_lib_var=yes" 36826 55812 else 36827 @@ -6153,7 +6840,7 @@ 36828 cf_x_athena=${cf_x_athena-Xaw} 36829 36830 echo $ac_n "checking if you want to link with Xaw 3d library""... $ac_c" 1>&6 55813 @@ -6130,100 +6455,44 @@ 55814 fi 55815 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 55816 echo "$ac_t""yes" 1>&6 55817 - cat >> confdefs.h <<\EOF 55818 -#define HAVE_LIBXT 1 55819 -EOF 55820 - 55821 - cf_have_X_LIBS=Xt 55822 - LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS" 55823 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" 55824 else 55825 echo "$ac_t""no" 1>&6 55826 fi 55827 55828 -fi 55829 + fi 55830 + fi 55831 55832 - 55833 -if test $cf_have_X_LIBS = no ; then 55834 - echo "configure: warning: Unable to successfully link X Toolkit library (-lXt) with 55835 -test program. You will have to check and add the proper libraries by hand 55836 -to makefile." 1>&2 55837 -fi 55838 - 55839 - 55840 -cf_x_athena=${cf_x_athena-Xaw} 55841 - 55842 -echo $ac_n "checking if you want to link with Xaw 3d library""... $ac_c" 1>&6 36831 55843 -echo "configure:6157: checking if you want to link with Xaw 3d library" >&5 36832 +echo "configure:6844: checking if you want to link with Xaw 3d library" >&5 36833 withval= 36834 36835 # Check whether --with-Xaw3d or --without-Xaw3d was given. 36836 @@ -6170,7 +6857,7 @@ 36837 fi 36838 36839 echo $ac_n "checking if you want to link with neXT Athena library""... $ac_c" 1>&6 55844 -withval= 55845 - 55846 -# Check whether --with-Xaw3d or --without-Xaw3d was given. 55847 -if test "${with_Xaw3d+set}" = set; then 55848 - withval="$with_Xaw3d" 55849 - : 55850 -fi 55851 - 55852 -if test "$withval" = yes ; then 55853 - cf_x_athena=Xaw3d 55854 - echo "$ac_t""yes" 1>&6 55855 -else 55856 - echo "$ac_t""no" 1>&6 55857 -fi 55858 - 55859 -echo $ac_n "checking if you want to link with neXT Athena library""... $ac_c" 1>&6 36840 55860 -echo "configure:6174: checking if you want to link with neXT Athena library" >&5 36841 +echo "configure:6861: checking if you want to link with neXT Athena library" >&5 36842 withval= 36843 36844 # Check whether --with-neXtaw or --without-neXtaw was given. 36845 @@ -6187,7 +6874,7 @@ 36846 fi 36847 36848 echo $ac_n "checking if you want to link with Athena-Plus library""... $ac_c" 1>&6 55861 -withval= 55862 - 55863 -# Check whether --with-neXtaw or --without-neXtaw was given. 55864 -if test "${with_neXtaw+set}" = set; then 55865 - withval="$with_neXtaw" 55866 - : 55867 -fi 55868 - 55869 -if test "$withval" = yes ; then 55870 - cf_x_athena=neXtaw 55871 - echo "$ac_t""yes" 1>&6 55872 -else 55873 - echo "$ac_t""no" 1>&6 55874 -fi 55875 - 55876 -echo $ac_n "checking if you want to link with Athena-Plus library""... $ac_c" 1>&6 36849 55877 -echo "configure:6191: checking if you want to link with Athena-Plus library" >&5 36850 +echo "configure:6878: checking if you want to link with Athena-Plus library" >&5 36851 withval= 36852 36853 # Check whether --with-XawPlus or --without-XawPlus was given. 36854 @@ -6204,7 +6891,7 @@ 36855 fi 36856 36857 echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 55878 -withval= 55879 - 55880 -# Check whether --with-XawPlus or --without-XawPlus was given. 55881 -if test "${with_XawPlus+set}" = set; then 55882 - withval="$with_XawPlus" 55883 - : 55884 -fi 55885 - 55886 -if test "$withval" = yes ; then 55887 - cf_x_athena=XawPlus 55888 - echo "$ac_t""yes" 1>&6 55889 -else 55890 - echo "$ac_t""no" 1>&6 55891 -fi 55892 - 55893 -echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 36858 55894 -echo "configure:6208: checking for XextCreateExtension in -lXext" >&5 36859 +echo "configure:6895: checking for XextCreateExtension in -lXext" >&5 36860 ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'` 36861 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 36862 echo $ac_n "(cached) $ac_c" 1>&6 36863 @@ -6212,7 +6899,7 @@ 36864 ac_save_LIBS="$LIBS" 36865 LIBS="-lXext $LIBS" 36866 cat > conftest.$ac_ext <<EOF 55895 -ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'` 55896 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 55897 - echo $ac_n "(cached) $ac_c" 1>&6 55898 -else 55899 - ac_save_LIBS="$LIBS" 55900 -LIBS="-lXext $LIBS" 55901 -cat > conftest.$ac_ext <<EOF 36867 55902 -#line 6216 "configure" 36868 +#line 6903 "configure" 36869 #include "confdefs.h" 36870 /* Override any gcc2 internal prototype to avoid an error. */ 36871 /* We use char because int might match the return type of a gcc2 36872 @@ -6223,7 +6910,7 @@ 36873 XextCreateExtension() 55903 -#include "confdefs.h" 55904 -/* Override any gcc2 internal prototype to avoid an error. */ 55905 -/* We use char because int might match the return type of a gcc2 55906 - builtin and then its argument prototype would still apply. */ 55907 -char XextCreateExtension(); 55908 + # Check for libraries that X11R6 Xt/Xaw programs need. 55909 + ac_save_LDFLAGS="$LDFLAGS" 55910 + test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" 55911 + # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to 55912 + # check for ICE first), but we must link in the order -lSM -lICE or 55913 + # we get undefined symbols. So assume we have SM if we have ICE. 55914 + # These have to be linked with before -lX11, unlike the other 55915 + # libraries we check for below, so use a different variable. 55916 + # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. 55917 + echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 55918 +echo "configure:6477: checking for IceConnectionNumber in -lICE" >&5 55919 +ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` 55920 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 55921 + echo $ac_n "(cached) $ac_c" 1>&6 55922 +else 55923 + ac_save_LIBS="$LIBS" 55924 +LIBS="-lICE $X_EXTRA_LIBS $LIBS" 55925 +cat > conftest.$ac_ext <<EOF 55926 +#line 6485 "configure" 55927 +#include "confdefs.h" 55928 +/* Override any gcc2 internal prototype to avoid an error. */ 55929 +/* We use char because int might match the return type of a gcc2 55930 + builtin and then its argument prototype would still apply. */ 55931 +char IceConnectionNumber(); 55932 55933 int main() { 55934 -XextCreateExtension() 55935 +IceConnectionNumber() 36874 55936 ; return 0; } 36875 55937 EOF 36876 55938 -if { (eval echo configure:6227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36877 +if { (eval echo configure:6 914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then55939 +if { (eval echo configure:6496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36878 55940 rm -rf conftest* 36879 55941 eval "ac_cv_lib_$ac_lib_var=yes" 36880 55942 else 36881 @@ -6260,15 +6947,15 @@ 36882 cf_save="$CPPFLAGS" 36883 cf_test=X11/$cf_x_athena_root/SimpleMenu.h 36884 if test $cf_path != default ; then 55943 @@ -6238,198 +6507,28 @@ 55944 fi 55945 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 55946 echo "$ac_t""yes" 1>&6 55947 - LIBS="-lXext $LIBS" 55948 + X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" 55949 else 55950 echo "$ac_t""no" 1>&6 55951 fi 55952 55953 + LDFLAGS="$ac_save_LDFLAGS" 55954 55955 -cf_x_athena_lib="" 55956 - 55957 - 55958 -cf_x_athena_root=$cf_x_athena 55959 -cf_x_athena_include="" 55960 - 55961 -for cf_path in default \ 55962 - /usr/contrib/X11R6 \ 55963 - /usr/contrib/X11R5 \ 55964 - /usr/lib/X11R5 \ 55965 - /usr/local 55966 -do 55967 - if test -z "$cf_x_athena_include" ; then 55968 - cf_save="$CPPFLAGS" 55969 - cf_test=X11/$cf_x_athena_root/SimpleMenu.h 55970 - if test $cf_path != default ; then 36885 55971 - CPPFLAGS="-I$cf_path/include $cf_save" 36886 + CPPFLAGS="$cf_save -I$cf_path/include" 36887 echo $ac_n "checking for $cf_test in $cf_path""... $ac_c" 1>&6 55972 - echo $ac_n "checking for $cf_test in $cf_path""... $ac_c" 1>&6 36888 55973 -echo "configure:6266: checking for $cf_test in $cf_path" >&5 36889 +echo "configure:6953: checking for $cf_test in $cf_path" >&5 36890 else 36891 echo $ac_n "checking for $cf_test""... $ac_c" 1>&6 55974 - else 55975 - echo $ac_n "checking for $cf_test""... $ac_c" 1>&6 36892 55976 -echo "configure:6269: checking for $cf_test" >&5 36893 +echo "configure:6956: checking for $cf_test" >&5 36894 fi 36895 cat > conftest.$ac_ext <<EOF 55977 - fi 55978 - cat > conftest.$ac_ext <<EOF 36896 55979 -#line 6272 "configure" 36897 +#line 6959 "configure"36898 #include "confdefs.h" 36899 36900 #include <X11/Intrinsic.h>36901 @@ -6277,7 +6964,7 @@ 36902 36903 36904 55980 -#include "confdefs.h" 55981 - 55982 -#include <X11/Intrinsic.h> 55983 -#include <$cf_test> 55984 -int main() { 55985 - 55986 -; return 0; } 55987 -EOF 36905 55988 -if { (eval echo configure:6281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 36906 +if { (eval echo configure:6968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 36907 rm -rf conftest* 36908 cf_result=yes 36909 else 36910 @@ -6324,21 +7011,21 @@ 36911 if test $cf_path != default ; then 36912 LIBS="-L$cf_path/lib $cf_lib $LIBS" 36913 echo $ac_n "checking for $cf_lib in $cf_path""... $ac_c" 1>&6 55989 - rm -rf conftest* 55990 - cf_result=yes 55991 -else 55992 - echo "configure: failed program was:" >&5 55993 - cat conftest.$ac_ext >&5 55994 - rm -rf conftest* 55995 - cf_result=no 55996 -fi 55997 -rm -f conftest* 55998 - echo "$ac_t""$cf_result" 1>&6 55999 - if test "$cf_result" = yes ; then 56000 - cf_x_athena_include=$cf_path 56001 - break 56002 - else 56003 - CPPFLAGS="$cf_save" 56004 - fi 56005 - fi 56006 -done 56007 - 56008 -if test -z "$cf_x_athena_include" ; then 56009 - echo "configure: warning: Unable to successfully find Athena header files with test program" 1>&2 56010 -elif test "$cf_x_athena_include" != default ; then 56011 - CPPFLAGS="$CPPFLAGS -I$cf_x_athena_include" 56012 -fi 56013 - 56014 - 56015 -cf_x_athena_root=$cf_x_athena 56016 -cf_x_athena_lib="" 56017 - 56018 -for cf_path in default \ 56019 - /usr/contrib/X11R6 \ 56020 - /usr/contrib/X11R5 \ 56021 - /usr/lib/X11R5 \ 56022 - /usr/local 56023 -do 56024 - for cf_lib in \ 56025 - "-l$cf_x_athena_root -lXmu" \ 56026 - "-l$cf_x_athena_root -lXpm -lXmu" \ 56027 - "-l${cf_x_athena_root}_s -lXmu_s" 56028 - do 56029 - if test -z "$cf_x_athena_lib" ; then 56030 - cf_save="$LIBS" 56031 - cf_test=XawSimpleMenuAddGlobalActions 56032 - if test $cf_path != default ; then 56033 - LIBS="-L$cf_path/lib $cf_lib $LIBS" 56034 - echo $ac_n "checking for $cf_lib in $cf_path""... $ac_c" 1>&6 36914 56035 -echo "configure:6328: checking for $cf_lib in $cf_path" >&5 36915 +echo "configure:7015: checking for $cf_lib in $cf_path" >&5 36916 else 36917 LIBS="$cf_lib $LIBS" 36918 echo $ac_n "checking for $cf_test in $cf_lib""... $ac_c" 1>&6 56036 - else 56037 - LIBS="$cf_lib $LIBS" 56038 - echo $ac_n "checking for $cf_test in $cf_lib""... $ac_c" 1>&6 36919 56039 -echo "configure:6332: checking for $cf_test in $cf_lib" >&5 36920 +echo "configure:7019: checking for $cf_test in $cf_lib" >&5 36921 fi 36922 cat > conftest.$ac_ext <<EOF 56040 - fi 56041 - cat > conftest.$ac_ext <<EOF 36923 56042 -#line 6335 "configure" 36924 +#line 7022 "configure" 36925 #include "confdefs.h" 36926 36927 int main() { 36928 $cf_test() 36929 ; return 0; } 36930 EOF 56043 -#include "confdefs.h" 56044 - 56045 -int main() { 56046 -$cf_test() 56047 -; return 0; } 56048 -EOF 36931 56049 -if { (eval echo configure:6342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36932 +if { (eval echo configure:7029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36933 rm -rf conftest* 36934 cf_result=yes 36935 else 36936 @@ -6379,7 +7066,7 @@ 36937 # Extract the first word of "$ac_prog", so it can be a program name with args. 36938 set dummy $ac_prog; ac_word=$2 36939 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 56050 - rm -rf conftest* 56051 - cf_result=yes 56052 -else 56053 - echo "configure: failed program was:" >&5 56054 - cat conftest.$ac_ext >&5 56055 - rm -rf conftest* 56056 - cf_result=no 56057 -fi 56058 -rm -f conftest* 56059 - echo "$ac_t""$cf_result" 1>&6 56060 - if test "$cf_result" = yes ; then 56061 - cf_x_athena_lib="$cf_lib" 56062 - break 56063 - fi 56064 - LIBS="$cf_save" 56065 - fi 56066 - done 56067 -done 56068 - 56069 -if test -z "$cf_x_athena_lib" ; then 56070 - { echo "configure: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" 1>&2; exit 1; } 56071 -fi 56072 - 56073 - 56074 -cf_x_athena_LIBS=`echo "HAVE_LIB_$cf_x_athena" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 56075 - 56076 -cat >> confdefs.h <<EOF 56077 -#define $cf_x_athena_LIBS 1 56078 -EOF 56079 - 56080 - 56081 - 56082 - 56083 - 56084 - 56085 -for ac_prog in xcurses-config 56086 -do 56087 -# Extract the first word of "$ac_prog", so it can be a program name with args. 56088 -set dummy $ac_prog; ac_word=$2 56089 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 36940 56090 -echo "configure:6383: checking for $ac_word" >&5 36941 +echo "configure:7070: checking for $ac_word" >&5 36942 if eval "test \"`echo '$''{'ac_cv_path_XCURSES_CONFIG'+set}'`\" = set"; then 36943 echo $ac_n "(cached) $ac_c" 1>&6 36944 else 36945 @@ -6418,7 +7105,7 @@ 36946 36947 if test "$XCURSES_CONFIG" != none ; then 56091 -if eval "test \"`echo '$''{'ac_cv_path_XCURSES_CONFIG'+set}'`\" = set"; then 56092 - echo $ac_n "(cached) $ac_c" 1>&6 56093 -else 56094 - case "$XCURSES_CONFIG" in 56095 - /*) 56096 - ac_cv_path_XCURSES_CONFIG="$XCURSES_CONFIG" # Let the user override the test with a path. 56097 - ;; 56098 - ?:/*) 56099 - ac_cv_path_XCURSES_CONFIG="$XCURSES_CONFIG" # Let the user override the test with a dos path. 56100 - ;; 56101 - *) 56102 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 56103 - ac_dummy="$PATH" 56104 - for ac_dir in $ac_dummy; do 56105 - test -z "$ac_dir" && ac_dir=. 56106 - if test -f $ac_dir/$ac_word; then 56107 - ac_cv_path_XCURSES_CONFIG="$ac_dir/$ac_word" 56108 - break 56109 - fi 56110 - done 56111 - IFS="$ac_save_ifs" 56112 - ;; 56113 -esac 56114 -fi 56115 -XCURSES_CONFIG="$ac_cv_path_XCURSES_CONFIG" 56116 -if test -n "$XCURSES_CONFIG"; then 56117 - echo "$ac_t""$XCURSES_CONFIG" 1>&6 56118 -else 56119 - echo "$ac_t""no" 1>&6 56120 fi 56121 56122 -test -n "$XCURSES_CONFIG" && break 56123 -done 56124 -test -n "$XCURSES_CONFIG" || XCURSES_CONFIG="none" 56125 56126 56127 -if test "$XCURSES_CONFIG" != none ; then 36948 56128 36949 56129 -CPPFLAGS="`$XCURSES_CONFIG --cflags` $CPPFLAGS" 36950 +CPPFLAGS="$CPPFLAGS `$XCURSES_CONFIG --cflags`" 36951 LIBS="`$XCURSES_CONFIG --libs` $LIBS" 36952 36953 cf_cv_lib_XCurses=yes 36954 @@ -6429,7 +7116,7 @@ 56130 -LIBS="`$XCURSES_CONFIG --libs` $LIBS" 56131 56132 -cf_cv_lib_XCurses=yes 56133 +# SYSTEM_NAME=`echo "$cf_cv_system_name"|tr ' ' -` 56134 56135 -else 56136 +cf_have_X_LIBS=no 56137 56138 -LDFLAGS="$LDFLAGS $X_LIBS" 56139 +LDFLAGS="$X_LIBS $LDFLAGS" 36955 56140 36956 56141 test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 36957 56142 36958 56143 -echo "${as_me-configure}:6433: testing checking additions to CFLAGS ..." 1>&5 36959 +echo "${as_me-configure}: 7120: testing checking additions to CFLAGS ..." 1>&556144 +echo "${as_me-configure}:6532: testing checking additions to CFLAGS ..." 1>&5 36960 56145 36961 56146 36962 56147 cf_check_cflags="$CFLAGS" 36963 @@ -6491,7 + 7178,7 @@56148 @@ -6491,7 +6590,7 @@ 36964 56149 if test -n "$cf_new_cflags" ; then 36965 56150 test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 36966 56151 36967 56152 -echo "${as_me-configure}:6495: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 36968 +echo "${as_me-configure}: 7182: testing add to \$CFLAGS $cf_new_cflags ..." 1>&556153 +echo "${as_me-configure}:6594: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 36969 56154 36970 56155 36971 56156 CFLAGS="$CFLAGS $cf_new_cflags" 36972 @@ -6500,1 6 +7187,16@@56157 @@ -6500,1148 +6599,2291 @@ 36973 56158 if test -n "$cf_new_cppflags" ; then 36974 56159 test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 36975 56160 36976 56161 -echo "${as_me-configure}:6504: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 36977 +echo "${as_me-configure}:7191: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 56162 +echo "${as_me-configure}:6603: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 56163 + 56164 + 56165 + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" 56166 +fi 56167 + 56168 +if test -n "$cf_new_extra_cppflags" ; then 56169 + test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 56170 + 56171 +echo "${as_me-configure}:6612: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 56172 + 56173 + 56174 + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" 56175 +fi 56176 + 56177 + 36978 56178 36979 56179 36980 56180 - CPPFLAGS="$cf_new_cppflags $CPPFLAGS" 56181 +if test "$cf_check_cflags" != "$CFLAGS" ; then 56182 +cat > conftest.$ac_ext <<EOF 56183 +#line 6623 "configure" 56184 +#include "confdefs.h" 56185 +#include <stdio.h> 56186 +int main() { 56187 +printf("Hello world"); 56188 +; return 0; } 56189 +EOF 56190 +if { (eval echo configure:6630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 56191 + : 56192 +else 56193 + echo "configure: failed program was:" >&5 56194 + cat conftest.$ac_ext >&5 56195 + rm -rf conftest* 56196 + test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 56197 + 56198 +echo "${as_me-configure}:6638: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 56199 + 56200 + 56201 + if test "$cf_check_cppflags" != "$CPPFLAGS" ; then 56202 + test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 56203 + 56204 +echo "${as_me-configure}:6644: testing but keeping change to \$CPPFLAGS ..." 1>&5 56205 + 56206 + 56207 + fi 56208 + CFLAGS="$cf_check_flags" 56209 +fi 56210 +rm -f conftest* 56211 +fi 56212 + 56213 + 56214 +echo $ac_n "checking for XOpenDisplay""... $ac_c" 1>&6 56215 +echo "configure:6655: checking for XOpenDisplay" >&5 56216 +if eval "test \"`echo '$''{'ac_cv_func_XOpenDisplay'+set}'`\" = set"; then 56217 + echo $ac_n "(cached) $ac_c" 1>&6 56218 +else 56219 + cat > conftest.$ac_ext <<EOF 56220 +#line 6660 "configure" 56221 +#include "confdefs.h" 56222 +/* System header to define __stub macros and hopefully few prototypes, 56223 + which can conflict with char XOpenDisplay(); below. */ 56224 +#include <assert.h> 56225 +/* Override any gcc2 internal prototype to avoid an error. */ 56226 +/* We use char because int might match the return type of a gcc2 56227 + builtin and then its argument prototype would still apply. */ 56228 +char XOpenDisplay(); 56229 + 56230 +int main() { 56231 + 56232 +/* The GNU C library defines this for functions which it implements 56233 + to always fail with ENOSYS. Some functions are actually named 56234 + something starting with __ and the normal name is an alias. */ 56235 +#if defined (__stub_XOpenDisplay) || defined (__stub___XOpenDisplay) 56236 +choke me 56237 +#else 56238 +XOpenDisplay(); 56239 +#endif 56240 + 56241 +; return 0; } 56242 +EOF 56243 +if { (eval echo configure:6683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 56244 + rm -rf conftest* 56245 + eval "ac_cv_func_XOpenDisplay=yes" 56246 +else 56247 + echo "configure: failed program was:" >&5 56248 + cat conftest.$ac_ext >&5 56249 + rm -rf conftest* 56250 + eval "ac_cv_func_XOpenDisplay=no" 56251 +fi 56252 +rm -f conftest* 56253 +fi 56254 + 56255 +if eval "test \"`echo '$ac_cv_func_'XOpenDisplay`\" = yes"; then 56256 + echo "$ac_t""yes" 1>&6 56257 + : 56258 +else 56259 + echo "$ac_t""no" 1>&6 56260 + 56261 +echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 56262 +echo "configure:6702: checking for XOpenDisplay in -lX11" >&5 56263 +ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` 56264 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 56265 + echo $ac_n "(cached) $ac_c" 1>&6 56266 +else 56267 + ac_save_LIBS="$LIBS" 56268 +LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" 56269 +cat > conftest.$ac_ext <<EOF 56270 +#line 6710 "configure" 56271 +#include "confdefs.h" 56272 +/* Override any gcc2 internal prototype to avoid an error. */ 56273 +/* We use char because int might match the return type of a gcc2 56274 + builtin and then its argument prototype would still apply. */ 56275 +char XOpenDisplay(); 56276 + 56277 +int main() { 56278 +XOpenDisplay() 56279 +; return 0; } 56280 +EOF 56281 +if { (eval echo configure:6721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 56282 + rm -rf conftest* 56283 + eval "ac_cv_lib_$ac_lib_var=yes" 56284 +else 56285 + echo "configure: failed program was:" >&5 56286 + cat conftest.$ac_ext >&5 56287 + rm -rf conftest* 56288 + eval "ac_cv_lib_$ac_lib_var=no" 56289 +fi 56290 +rm -f conftest* 56291 +LIBS="$ac_save_LIBS" 56292 + 56293 +fi 56294 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 56295 + echo "$ac_t""yes" 1>&6 56296 + LIBS="-lX11 $LIBS" 56297 +else 56298 + echo "$ac_t""no" 1>&6 56299 +fi 56300 + 56301 +fi 56302 + 56303 + 56304 +echo $ac_n "checking for XtAppInitialize""... $ac_c" 1>&6 56305 +echo "configure:6745: checking for XtAppInitialize" >&5 56306 +if eval "test \"`echo '$''{'ac_cv_func_XtAppInitialize'+set}'`\" = set"; then 56307 + echo $ac_n "(cached) $ac_c" 1>&6 56308 +else 56309 + cat > conftest.$ac_ext <<EOF 56310 +#line 6750 "configure" 56311 +#include "confdefs.h" 56312 +/* System header to define __stub macros and hopefully few prototypes, 56313 + which can conflict with char XtAppInitialize(); below. */ 56314 +#include <assert.h> 56315 +/* Override any gcc2 internal prototype to avoid an error. */ 56316 +/* We use char because int might match the return type of a gcc2 56317 + builtin and then its argument prototype would still apply. */ 56318 +char XtAppInitialize(); 56319 + 56320 +int main() { 56321 + 56322 +/* The GNU C library defines this for functions which it implements 56323 + to always fail with ENOSYS. Some functions are actually named 56324 + something starting with __ and the normal name is an alias. */ 56325 +#if defined (__stub_XtAppInitialize) || defined (__stub___XtAppInitialize) 56326 +choke me 56327 +#else 56328 +XtAppInitialize(); 56329 +#endif 56330 + 56331 +; return 0; } 56332 +EOF 56333 +if { (eval echo configure:6773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 56334 + rm -rf conftest* 56335 + eval "ac_cv_func_XtAppInitialize=yes" 56336 +else 56337 + echo "configure: failed program was:" >&5 56338 + cat conftest.$ac_ext >&5 56339 + rm -rf conftest* 56340 + eval "ac_cv_func_XtAppInitialize=no" 56341 +fi 56342 +rm -f conftest* 56343 +fi 56344 + 56345 +if eval "test \"`echo '$ac_cv_func_'XtAppInitialize`\" = yes"; then 56346 + echo "$ac_t""yes" 1>&6 56347 + : 56348 +else 56349 + echo "$ac_t""no" 1>&6 56350 + 56351 +echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6 56352 +echo "configure:6792: checking for XtAppInitialize in -lXt" >&5 56353 +ac_lib_var=`echo Xt'_'XtAppInitialize | sed 'y%./+-%__p_%'` 56354 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 56355 + echo $ac_n "(cached) $ac_c" 1>&6 56356 +else 56357 + ac_save_LIBS="$LIBS" 56358 +LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" 56359 +cat > conftest.$ac_ext <<EOF 56360 +#line 6800 "configure" 56361 +#include "confdefs.h" 56362 +/* Override any gcc2 internal prototype to avoid an error. */ 56363 +/* We use char because int might match the return type of a gcc2 56364 + builtin and then its argument prototype would still apply. */ 56365 +char XtAppInitialize(); 56366 + 56367 +int main() { 56368 +XtAppInitialize() 56369 +; return 0; } 56370 +EOF 56371 +if { (eval echo configure:6811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 56372 + rm -rf conftest* 56373 + eval "ac_cv_lib_$ac_lib_var=yes" 56374 +else 56375 + echo "configure: failed program was:" >&5 56376 + cat conftest.$ac_ext >&5 56377 + rm -rf conftest* 56378 + eval "ac_cv_lib_$ac_lib_var=no" 56379 +fi 56380 +rm -f conftest* 56381 +LIBS="$ac_save_LIBS" 56382 + 56383 +fi 56384 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 56385 + echo "$ac_t""yes" 1>&6 56386 + cat >> confdefs.h <<\EOF 56387 +#define HAVE_LIBXT 1 56388 +EOF 56389 + 56390 + cf_have_X_LIBS=Xt 56391 + LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS" 56392 +else 56393 + echo "$ac_t""no" 1>&6 56394 +fi 56395 + 56396 +fi 56397 + 56398 + 56399 +if test $cf_have_X_LIBS = no ; then 56400 + echo "configure: warning: Unable to successfully link X Toolkit library (-lXt) with 56401 +test program. You will have to check and add the proper libraries by hand 56402 +to makefile." 1>&2 56403 +fi 56404 + 56405 + 56406 +cf_x_athena=${cf_x_athena-Xaw} 56407 + 56408 +echo $ac_n "checking if you want to link with Xaw 3d library""... $ac_c" 1>&6 56409 +echo "configure:6849: checking if you want to link with Xaw 3d library" >&5 56410 +withval= 56411 + 56412 +# Check whether --with-Xaw3d or --without-Xaw3d was given. 56413 +if test "${with_Xaw3d+set}" = set; then 56414 + withval="$with_Xaw3d" 56415 + : 56416 +fi 56417 + 56418 +if test "$withval" = yes ; then 56419 + cf_x_athena=Xaw3d 56420 + echo "$ac_t""yes" 1>&6 56421 +else 56422 + echo "$ac_t""no" 1>&6 56423 +fi 56424 + 56425 +echo $ac_n "checking if you want to link with neXT Athena library""... $ac_c" 1>&6 56426 +echo "configure:6866: checking if you want to link with neXT Athena library" >&5 56427 +withval= 56428 + 56429 +# Check whether --with-neXtaw or --without-neXtaw was given. 56430 +if test "${with_neXtaw+set}" = set; then 56431 + withval="$with_neXtaw" 56432 + : 56433 +fi 56434 + 56435 +if test "$withval" = yes ; then 56436 + cf_x_athena=neXtaw 56437 + echo "$ac_t""yes" 1>&6 56438 +else 56439 + echo "$ac_t""no" 1>&6 56440 +fi 56441 + 56442 +echo $ac_n "checking if you want to link with Athena-Plus library""... $ac_c" 1>&6 56443 +echo "configure:6883: checking if you want to link with Athena-Plus library" >&5 56444 +withval= 56445 + 56446 +# Check whether --with-XawPlus or --without-XawPlus was given. 56447 +if test "${with_XawPlus+set}" = set; then 56448 + withval="$with_XawPlus" 56449 + : 56450 +fi 56451 + 56452 +if test "$withval" = yes ; then 56453 + cf_x_athena=XawPlus 56454 + echo "$ac_t""yes" 1>&6 56455 +else 56456 + echo "$ac_t""no" 1>&6 56457 +fi 56458 + 56459 +echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 56460 +echo "configure:6900: checking for XextCreateExtension in -lXext" >&5 56461 +ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'` 56462 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 56463 + echo $ac_n "(cached) $ac_c" 1>&6 56464 +else 56465 + ac_save_LIBS="$LIBS" 56466 +LIBS="-lXext $LIBS" 56467 +cat > conftest.$ac_ext <<EOF 56468 +#line 6908 "configure" 56469 +#include "confdefs.h" 56470 +/* Override any gcc2 internal prototype to avoid an error. */ 56471 +/* We use char because int might match the return type of a gcc2 56472 + builtin and then its argument prototype would still apply. */ 56473 +char XextCreateExtension(); 56474 + 56475 +int main() { 56476 +XextCreateExtension() 56477 +; return 0; } 56478 +EOF 56479 +if { (eval echo configure:6919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 56480 + rm -rf conftest* 56481 + eval "ac_cv_lib_$ac_lib_var=yes" 56482 +else 56483 + echo "configure: failed program was:" >&5 56484 + cat conftest.$ac_ext >&5 56485 + rm -rf conftest* 56486 + eval "ac_cv_lib_$ac_lib_var=no" 56487 +fi 56488 +rm -f conftest* 56489 +LIBS="$ac_save_LIBS" 56490 + 56491 +fi 56492 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 56493 + echo "$ac_t""yes" 1>&6 56494 + LIBS="-lXext $LIBS" 56495 +else 56496 + echo "$ac_t""no" 1>&6 56497 +fi 56498 + 56499 + 56500 +cf_x_athena_lib="" 56501 + 56502 + 56503 +cf_x_athena_root=$cf_x_athena 56504 +cf_x_athena_include="" 56505 + 56506 +for cf_path in default \ 56507 + /usr/contrib/X11R6 \ 56508 + /usr/contrib/X11R5 \ 56509 + /usr/lib/X11R5 \ 56510 + /usr/local 56511 +do 56512 + if test -z "$cf_x_athena_include" ; then 56513 + cf_save="$CPPFLAGS" 56514 + cf_test=X11/$cf_x_athena_root/SimpleMenu.h 56515 + if test $cf_path != default ; then 56516 + CPPFLAGS="$cf_save -I$cf_path/include" 56517 + echo $ac_n "checking for $cf_test in $cf_path""... $ac_c" 1>&6 56518 +echo "configure:6958: checking for $cf_test in $cf_path" >&5 56519 + else 56520 + echo $ac_n "checking for $cf_test""... $ac_c" 1>&6 56521 +echo "configure:6961: checking for $cf_test" >&5 56522 + fi 56523 + cat > conftest.$ac_ext <<EOF 56524 +#line 6964 "configure" 56525 +#include "confdefs.h" 56526 + 56527 +#include <X11/Intrinsic.h> 56528 +#include <$cf_test> 56529 +int main() { 56530 + 56531 +; return 0; } 56532 +EOF 56533 +if { (eval echo configure:6973: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 56534 + rm -rf conftest* 56535 + cf_result=yes 56536 +else 56537 + echo "configure: failed program was:" >&5 56538 + cat conftest.$ac_ext >&5 56539 + rm -rf conftest* 56540 + cf_result=no 56541 +fi 56542 +rm -f conftest* 56543 + echo "$ac_t""$cf_result" 1>&6 56544 + if test "$cf_result" = yes ; then 56545 + cf_x_athena_include=$cf_path 56546 + break 56547 + else 56548 + CPPFLAGS="$cf_save" 56549 + fi 56550 + fi 56551 +done 56552 + 56553 +if test -z "$cf_x_athena_include" ; then 56554 + echo "configure: warning: Unable to successfully find Athena header files with test program" 1>&2 56555 +elif test "$cf_x_athena_include" != default ; then 56556 + CPPFLAGS="$CPPFLAGS -I$cf_x_athena_include" 56557 +fi 56558 + 56559 + 56560 +cf_x_athena_root=$cf_x_athena 56561 +cf_x_athena_lib="" 56562 + 56563 +for cf_path in default \ 56564 + /usr/contrib/X11R6 \ 56565 + /usr/contrib/X11R5 \ 56566 + /usr/lib/X11R5 \ 56567 + /usr/local 56568 +do 56569 + for cf_lib in \ 56570 + "-l$cf_x_athena_root -lXmu" \ 56571 + "-l$cf_x_athena_root -lXpm -lXmu" \ 56572 + "-l${cf_x_athena_root}_s -lXmu_s" 56573 + do 56574 + if test -z "$cf_x_athena_lib" ; then 56575 + cf_save="$LIBS" 56576 + cf_test=XawSimpleMenuAddGlobalActions 56577 + if test $cf_path != default ; then 56578 + LIBS="-L$cf_path/lib $cf_lib $LIBS" 56579 + echo $ac_n "checking for $cf_lib in $cf_path""... $ac_c" 1>&6 56580 +echo "configure:7020: checking for $cf_lib in $cf_path" >&5 56581 + else 56582 + LIBS="$cf_lib $LIBS" 56583 + echo $ac_n "checking for $cf_test in $cf_lib""... $ac_c" 1>&6 56584 +echo "configure:7024: checking for $cf_test in $cf_lib" >&5 56585 + fi 56586 + cat > conftest.$ac_ext <<EOF 56587 +#line 7027 "configure" 56588 +#include "confdefs.h" 56589 + 56590 +int main() { 56591 +$cf_test() 56592 +; return 0; } 56593 +EOF 56594 +if { (eval echo configure:7034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 56595 + rm -rf conftest* 56596 + cf_result=yes 56597 +else 56598 + echo "configure: failed program was:" >&5 56599 + cat conftest.$ac_ext >&5 56600 + rm -rf conftest* 56601 + cf_result=no 56602 +fi 56603 +rm -f conftest* 56604 + echo "$ac_t""$cf_result" 1>&6 56605 + if test "$cf_result" = yes ; then 56606 + cf_x_athena_lib="$cf_lib" 56607 + break 56608 + fi 56609 + LIBS="$cf_save" 56610 + fi 56611 + done 56612 +done 56613 + 56614 +if test -z "$cf_x_athena_lib" ; then 56615 + { echo "configure: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" 1>&2; exit 1; } 56616 +fi 56617 + 56618 + 56619 +cf_x_athena_LIBS=`echo "HAVE_LIB_$cf_x_athena" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 56620 + 56621 +cat >> confdefs.h <<EOF 56622 +#define $cf_x_athena_LIBS 1 56623 +EOF 56624 + 56625 + 56626 + 56627 + 56628 + 56629 + 56630 +for ac_prog in xcurses-config 56631 +do 56632 +# Extract the first word of "$ac_prog", so it can be a program name with args. 56633 +set dummy $ac_prog; ac_word=$2 56634 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 56635 +echo "configure:7075: checking for $ac_word" >&5 56636 +if eval "test \"`echo '$''{'ac_cv_path_XCURSES_CONFIG'+set}'`\" = set"; then 56637 + echo $ac_n "(cached) $ac_c" 1>&6 56638 +else 56639 + case "$XCURSES_CONFIG" in 56640 + /*) 56641 + ac_cv_path_XCURSES_CONFIG="$XCURSES_CONFIG" # Let the user override the test with a path. 56642 + ;; 56643 + ?:/*) 56644 + ac_cv_path_XCURSES_CONFIG="$XCURSES_CONFIG" # Let the user override the test with a dos path. 56645 + ;; 56646 + *) 56647 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 56648 + ac_dummy="$PATH" 56649 + for ac_dir in $ac_dummy; do 56650 + test -z "$ac_dir" && ac_dir=. 56651 + if test -f $ac_dir/$ac_word; then 56652 + ac_cv_path_XCURSES_CONFIG="$ac_dir/$ac_word" 56653 + break 56654 + fi 56655 + done 56656 + IFS="$ac_save_ifs" 56657 + ;; 56658 +esac 56659 +fi 56660 +XCURSES_CONFIG="$ac_cv_path_XCURSES_CONFIG" 56661 +if test -n "$XCURSES_CONFIG"; then 56662 + echo "$ac_t""$XCURSES_CONFIG" 1>&6 56663 +else 56664 + echo "$ac_t""no" 1>&6 56665 +fi 56666 + 56667 +test -n "$XCURSES_CONFIG" && break 56668 +done 56669 +test -n "$XCURSES_CONFIG" || XCURSES_CONFIG="none" 56670 + 56671 + 56672 +if test "$XCURSES_CONFIG" != none ; then 56673 + 56674 +CPPFLAGS="$CPPFLAGS `$XCURSES_CONFIG --cflags`" 56675 +LIBS="`$XCURSES_CONFIG --libs` $LIBS" 56676 + 56677 +cf_cv_lib_XCurses=yes 56678 + 56679 +else 56680 + 56681 +LDFLAGS="$LDFLAGS $X_LIBS" 56682 + 56683 +test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 56684 + 56685 +echo "${as_me-configure}:7125: testing checking additions to CFLAGS ..." 1>&5 56686 + 56687 + 56688 +cf_check_cflags="$CFLAGS" 56689 +cf_check_cppflags="$CPPFLAGS" 56690 + 56691 +cf_fix_cppflags=no 56692 +cf_new_cflags= 56693 +cf_new_cppflags= 56694 +cf_new_extra_cppflags= 56695 + 56696 +for cf_add_cflags in $X_CFLAGS 56697 +do 56698 +case $cf_fix_cppflags in 56699 +no) 56700 + case $cf_add_cflags in #(vi 56701 + -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi 56702 + case $cf_add_cflags in 56703 + -D*) 56704 + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` 56705 + 56706 + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ 56707 + && test -z "${cf_tst_cflags}" \ 56708 + && cf_fix_cppflags=yes 56709 + 56710 + if test $cf_fix_cppflags = yes ; then 56711 + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" 56712 + continue 56713 + elif test "${cf_tst_cflags}" = "\"'" ; then 56714 + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" 56715 + continue 56716 + fi 56717 + ;; 56718 + esac 56719 + case "$CPPFLAGS" in 56720 + *$cf_add_cflags) #(vi 56721 + ;; 56722 + *) #(vi 56723 + cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" 56724 + ;; 56725 + esac 56726 + ;; 56727 + *) 56728 + cf_new_cflags="$cf_new_cflags $cf_add_cflags" 56729 + ;; 56730 + esac 56731 + ;; 56732 +yes) 56733 + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" 56734 + 56735 + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` 56736 + 56737 + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ 56738 + && test -z "${cf_tst_cflags}" \ 56739 + && cf_fix_cppflags=no 56740 + ;; 56741 +esac 56742 +done 56743 + 56744 +if test -n "$cf_new_cflags" ; then 56745 + test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 56746 + 56747 +echo "${as_me-configure}:7187: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 56748 + 56749 + 56750 + CFLAGS="$CFLAGS $cf_new_cflags" 56751 +fi 56752 + 56753 +if test -n "$cf_new_cppflags" ; then 56754 + test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 56755 + 56756 +echo "${as_me-configure}:7196: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 56757 + 56758 + 36981 56759 + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" 56760 +fi 56761 + 56762 +if test -n "$cf_new_extra_cppflags" ; then 56763 + test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 56764 + 56765 +echo "${as_me-configure}:7205: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 56766 + 56767 + 56768 + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" 56769 +fi 56770 + 56771 + 56772 + 56773 + 56774 +if test "$cf_check_cflags" != "$CFLAGS" ; then 56775 +cat > conftest.$ac_ext <<EOF 56776 +#line 7216 "configure" 56777 +#include "confdefs.h" 56778 +#include <stdio.h> 56779 +int main() { 56780 +printf("Hello world"); 56781 +; return 0; } 56782 +EOF 56783 +if { (eval echo configure:7223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 56784 + : 56785 +else 56786 + echo "configure: failed program was:" >&5 56787 + cat conftest.$ac_ext >&5 56788 + rm -rf conftest* 56789 + test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 56790 + 56791 +echo "${as_me-configure}:7231: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 56792 + 56793 + 56794 + if test "$cf_check_cppflags" != "$CPPFLAGS" ; then 56795 + test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 56796 + 56797 +echo "${as_me-configure}:7237: testing but keeping change to \$CPPFLAGS ..." 1>&5 56798 + 56799 + 56800 + fi 56801 + CFLAGS="$cf_check_flags" 56802 +fi 56803 +rm -f conftest* 56804 +fi 56805 + 56806 +echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 56807 +echo "configure:7247: checking for XOpenDisplay in -lX11" >&5 56808 +ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` 56809 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 56810 + echo $ac_n "(cached) $ac_c" 1>&6 56811 +else 56812 + ac_save_LIBS="$LIBS" 56813 +LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" 56814 +cat > conftest.$ac_ext <<EOF 56815 +#line 7255 "configure" 56816 +#include "confdefs.h" 56817 +/* Override any gcc2 internal prototype to avoid an error. */ 56818 +/* We use char because int might match the return type of a gcc2 56819 + builtin and then its argument prototype would still apply. */ 56820 +char XOpenDisplay(); 56821 + 56822 +int main() { 56823 +XOpenDisplay() 56824 +; return 0; } 56825 +EOF 56826 +if { (eval echo configure:7266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 56827 + rm -rf conftest* 56828 + eval "ac_cv_lib_$ac_lib_var=yes" 56829 +else 56830 + echo "configure: failed program was:" >&5 56831 + cat conftest.$ac_ext >&5 56832 + rm -rf conftest* 56833 + eval "ac_cv_lib_$ac_lib_var=no" 56834 +fi 56835 +rm -f conftest* 56836 +LIBS="$ac_save_LIBS" 56837 + 56838 +fi 56839 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 56840 + echo "$ac_t""yes" 1>&6 56841 + LIBS="-lX11 $LIBS" 56842 +else 56843 + echo "$ac_t""no" 1>&6 56844 +fi 56845 + 56846 +echo $ac_n "checking for XCurses library""... $ac_c" 1>&6 56847 +echo "configure:7287: checking for XCurses library" >&5 56848 +if eval "test \"`echo '$''{'cf_cv_lib_XCurses'+set}'`\" = set"; then 56849 + echo $ac_n "(cached) $ac_c" 1>&6 56850 +else 56851 + 56852 +LIBS="-lXCurses $LIBS" 56853 +cat > conftest.$ac_ext <<EOF 56854 +#line 7294 "configure" 56855 +#include "confdefs.h" 56856 + 56857 +#include <xcurses.h> 56858 +char *XCursesProgramName = "test"; 56859 + 56860 +int main() { 56861 +XCursesExit(); 56862 +; return 0; } 56863 +EOF 56864 +if { (eval echo configure:7304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 56865 + rm -rf conftest* 56866 + cf_cv_lib_XCurses=yes 56867 +else 56868 + echo "configure: failed program was:" >&5 56869 + cat conftest.$ac_ext >&5 56870 + rm -rf conftest* 56871 + cf_cv_lib_XCurses=no 56872 +fi 56873 +rm -f conftest* 56874 + 56875 +fi 56876 + 56877 +echo "$ac_t""$cf_cv_lib_XCurses" 1>&6 56878 + 56879 +fi 56880 + 56881 +if test $cf_cv_lib_XCurses = yes ; then 56882 + cat >> confdefs.h <<\EOF 56883 +#define UNIX 1 56884 +EOF 56885 + 56886 + cat >> confdefs.h <<\EOF 56887 +#define XCURSES 1 56888 +EOF 56889 + 56890 + cat >> confdefs.h <<\EOF 56891 +#define HAVE_XCURSES 1 56892 +EOF 56893 + 56894 +else 56895 + { echo "configure: error: Cannot link with XCurses" 1>&2; exit 1; } 56896 +fi 56897 + 56898 + ;; 56899 +esac 56900 + 56901 + 56902 + 56903 +case $cf_cv_screen in #(vi 56904 +pdcurses) #(vi 56905 + ;; 56906 +*) 56907 + # look for curses-related libraries 56908 + echo $ac_n "checking for new_panel in -lpanel$cf_cv_libtype""... $ac_c" 1>&6 56909 +echo "configure:7349: checking for new_panel in -lpanel$cf_cv_libtype" >&5 56910 +ac_lib_var=`echo panel$cf_cv_libtype'_'new_panel | sed 'y%./+-%__p_%'` 56911 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 56912 + echo $ac_n "(cached) $ac_c" 1>&6 56913 +else 56914 + ac_save_LIBS="$LIBS" 56915 +LIBS="-lpanel$cf_cv_libtype $LIBS" 56916 +cat > conftest.$ac_ext <<EOF 56917 +#line 7357 "configure" 56918 +#include "confdefs.h" 56919 +/* Override any gcc2 internal prototype to avoid an error. */ 56920 +/* We use char because int might match the return type of a gcc2 56921 + builtin and then its argument prototype would still apply. */ 56922 +char new_panel(); 56923 + 56924 +int main() { 56925 +new_panel() 56926 +; return 0; } 56927 +EOF 56928 +if { (eval echo configure:7368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 56929 + rm -rf conftest* 56930 + eval "ac_cv_lib_$ac_lib_var=yes" 56931 +else 56932 + echo "configure: failed program was:" >&5 56933 + cat conftest.$ac_ext >&5 56934 + rm -rf conftest* 56935 + eval "ac_cv_lib_$ac_lib_var=no" 56936 +fi 56937 +rm -f conftest* 56938 +LIBS="$ac_save_LIBS" 56939 + 56940 +fi 56941 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 56942 + echo "$ac_t""yes" 1>&6 56943 + ac_tr_lib=HAVE_LIB`echo panel$cf_cv_libtype | sed -e 's/[^a-zA-Z0-9_]/_/g' \ 56944 + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` 56945 + cat >> confdefs.h <<EOF 56946 +#define $ac_tr_lib 1 56947 +EOF 56948 + 56949 + LIBS="-lpanel$cf_cv_libtype $LIBS" 56950 + 56951 +else 56952 + echo "$ac_t""no" 1>&6 56953 +fi 56954 + 56955 + echo $ac_n "checking for menu_driver in -lmenu$cf_cv_libtype""... $ac_c" 1>&6 56956 +echo "configure:7396: checking for menu_driver in -lmenu$cf_cv_libtype" >&5 56957 +ac_lib_var=`echo menu$cf_cv_libtype'_'menu_driver | sed 'y%./+-%__p_%'` 56958 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 56959 + echo $ac_n "(cached) $ac_c" 1>&6 56960 +else 56961 + ac_save_LIBS="$LIBS" 56962 +LIBS="-lmenu$cf_cv_libtype $LIBS" 56963 +cat > conftest.$ac_ext <<EOF 56964 +#line 7404 "configure" 56965 +#include "confdefs.h" 56966 +/* Override any gcc2 internal prototype to avoid an error. */ 56967 +/* We use char because int might match the return type of a gcc2 56968 + builtin and then its argument prototype would still apply. */ 56969 +char menu_driver(); 56970 + 56971 +int main() { 56972 +menu_driver() 56973 +; return 0; } 56974 +EOF 56975 +if { (eval echo configure:7415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 56976 + rm -rf conftest* 56977 + eval "ac_cv_lib_$ac_lib_var=yes" 56978 +else 56979 + echo "configure: failed program was:" >&5 56980 + cat conftest.$ac_ext >&5 56981 + rm -rf conftest* 56982 + eval "ac_cv_lib_$ac_lib_var=no" 56983 +fi 56984 +rm -f conftest* 56985 +LIBS="$ac_save_LIBS" 56986 + 56987 +fi 56988 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 56989 + echo "$ac_t""yes" 1>&6 56990 + ac_tr_lib=HAVE_LIB`echo menu$cf_cv_libtype | sed -e 's/[^a-zA-Z0-9_]/_/g' \ 56991 + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` 56992 + cat >> confdefs.h <<EOF 56993 +#define $ac_tr_lib 1 56994 +EOF 56995 + 56996 + LIBS="-lmenu$cf_cv_libtype $LIBS" 56997 + 56998 +else 56999 + echo "$ac_t""no" 1>&6 57000 +fi 57001 + 57002 + echo $ac_n "checking for form_driver in -lform$cf_cv_libtype""... $ac_c" 1>&6 57003 +echo "configure:7443: checking for form_driver in -lform$cf_cv_libtype" >&5 57004 +ac_lib_var=`echo form$cf_cv_libtype'_'form_driver | sed 'y%./+-%__p_%'` 57005 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 57006 + echo $ac_n "(cached) $ac_c" 1>&6 57007 +else 57008 + ac_save_LIBS="$LIBS" 57009 +LIBS="-lform$cf_cv_libtype $LIBS" 57010 +cat > conftest.$ac_ext <<EOF 57011 +#line 7451 "configure" 57012 +#include "confdefs.h" 57013 +/* Override any gcc2 internal prototype to avoid an error. */ 57014 +/* We use char because int might match the return type of a gcc2 57015 + builtin and then its argument prototype would still apply. */ 57016 +char form_driver(); 57017 + 57018 +int main() { 57019 +form_driver() 57020 +; return 0; } 57021 +EOF 57022 +if { (eval echo configure:7462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 57023 + rm -rf conftest* 57024 + eval "ac_cv_lib_$ac_lib_var=yes" 57025 +else 57026 + echo "configure: failed program was:" >&5 57027 + cat conftest.$ac_ext >&5 57028 + rm -rf conftest* 57029 + eval "ac_cv_lib_$ac_lib_var=no" 57030 +fi 57031 +rm -f conftest* 57032 +LIBS="$ac_save_LIBS" 57033 + 57034 +fi 57035 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 57036 + echo "$ac_t""yes" 1>&6 57037 + ac_tr_lib=HAVE_LIB`echo form$cf_cv_libtype | sed -e 's/[^a-zA-Z0-9_]/_/g' \ 57038 + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` 57039 + cat >> confdefs.h <<EOF 57040 +#define $ac_tr_lib 1 57041 +EOF 57042 + 57043 + LIBS="-lform$cf_cv_libtype $LIBS" 57044 + 57045 +else 57046 + echo "$ac_t""no" 1>&6 57047 +fi 57048 + 57049 + 57050 + # look for curses-related headers 57051 + for ac_hdr in \ 57052 + nc_alloc.h \ 57053 + nomacros.h \ 57054 + form.h \ 57055 + menu.h \ 57056 + panel.h \ 57057 + 57058 +do 57059 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 57060 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 57061 +echo "configure:7501: checking for $ac_hdr" >&5 57062 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 57063 + echo $ac_n "(cached) $ac_c" 1>&6 57064 +else 57065 + cat > conftest.$ac_ext <<EOF 57066 +#line 7506 "configure" 57067 +#include "confdefs.h" 57068 +#include <$ac_hdr> 57069 +EOF 57070 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 57071 +{ (eval echo configure:7511: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 57072 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 57073 +if test -z "$ac_err"; then 57074 + rm -rf conftest* 57075 + eval "ac_cv_header_$ac_safe=yes" 57076 +else 57077 + echo "$ac_err" >&5 57078 + echo "configure: failed program was:" >&5 57079 + cat conftest.$ac_ext >&5 57080 + rm -rf conftest* 57081 + eval "ac_cv_header_$ac_safe=no" 57082 +fi 57083 +rm -f conftest* 57084 +fi 57085 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 57086 + echo "$ac_t""yes" 1>&6 57087 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 57088 + cat >> confdefs.h <<EOF 57089 +#define $ac_tr_hdr 1 57090 +EOF 57091 + 57092 +else 57093 + echo "$ac_t""no" 1>&6 57094 +fi 57095 +done 57096 + 57097 + ;; 57098 +esac 57099 + 57100 +echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 57101 +echo "configure:7541: checking return type of signal handlers" >&5 57102 +if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then 57103 + echo $ac_n "(cached) $ac_c" 1>&6 57104 +else 57105 + cat > conftest.$ac_ext <<EOF 57106 +#line 7546 "configure" 57107 +#include "confdefs.h" 57108 +#include <sys/types.h> 57109 +#include <signal.h> 57110 +#ifdef signal 57111 +#undef signal 57112 +#endif 57113 +#ifdef __cplusplus 57114 +extern "C" void (*signal (int, void (*)(int)))(int); 57115 +#else 57116 +void (*signal ()) (); 57117 +#endif 57118 + 57119 +int main() { 57120 +int i; 57121 +; return 0; } 57122 +EOF 57123 +if { (eval echo configure:7563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 57124 + rm -rf conftest* 57125 + ac_cv_type_signal=void 57126 +else 57127 + echo "configure: failed program was:" >&5 57128 + cat conftest.$ac_ext >&5 57129 + rm -rf conftest* 57130 + ac_cv_type_signal=int 57131 +fi 57132 +rm -f conftest* 57133 +fi 57134 + 57135 +echo "$ac_t""$ac_cv_type_signal" 1>&6 57136 +cat >> confdefs.h <<EOF 57137 +#define RETSIGTYPE $ac_cv_type_signal 57138 +EOF 57139 + 57140 + 57141 + 57142 +echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 57143 +echo "configure:7583: checking for ANSI C header files" >&5 57144 +if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then 57145 + echo $ac_n "(cached) $ac_c" 1>&6 57146 +else 57147 + cat > conftest.$ac_ext <<EOF 57148 +#line 7588 "configure" 57149 +#include "confdefs.h" 57150 +#include <stdlib.h> 57151 +#include <stdarg.h> 57152 +#include <string.h> 57153 +#include <float.h> 57154 +EOF 57155 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 57156 +{ (eval echo configure:7596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 57157 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 57158 +if test -z "$ac_err"; then 57159 + rm -rf conftest* 57160 + ac_cv_header_stdc=yes 57161 +else 57162 + echo "$ac_err" >&5 57163 + echo "configure: failed program was:" >&5 57164 + cat conftest.$ac_ext >&5 57165 + rm -rf conftest* 57166 + ac_cv_header_stdc=no 57167 +fi 57168 +rm -f conftest* 57169 + 57170 +if test $ac_cv_header_stdc = yes; then 57171 + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 57172 +cat > conftest.$ac_ext <<EOF 57173 +#line 7613 "configure" 57174 +#include "confdefs.h" 57175 +#include <string.h> 57176 +EOF 57177 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 57178 + egrep "memchr" >/dev/null 2>&1; then 57179 + : 57180 +else 57181 + rm -rf conftest* 57182 + ac_cv_header_stdc=no 57183 +fi 57184 +rm -f conftest* 57185 + 57186 +fi 57187 + 57188 +if test $ac_cv_header_stdc = yes; then 57189 + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 57190 +cat > conftest.$ac_ext <<EOF 57191 +#line 7631 "configure" 57192 +#include "confdefs.h" 57193 +#include <stdlib.h> 57194 +EOF 57195 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 57196 + egrep "free" >/dev/null 2>&1; then 57197 + : 57198 +else 57199 + rm -rf conftest* 57200 + ac_cv_header_stdc=no 36982 57201 fi 36983 36984 if test -n "$cf_new_extra_cppflags" ; then 36985 test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 36986 57202 +rm -f conftest* 57203 57204 -if test -n "$cf_new_extra_cppflags" ; then 57205 - test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 57206 - 36987 57207 -echo "${as_me-configure}:6513: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 36988 +echo "${as_me-configure}:7200: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 36989 36990 36991 EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" 36992 @@ -6520,14 +7207,14 @@ 36993 36994 if test "$cf_check_cflags" != "$CFLAGS" ; then 36995 cat > conftest.$ac_ext <<EOF 57208 +fi 57209 57210 +if test $ac_cv_header_stdc = yes; then 57211 + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. 57212 +if test "$cross_compiling" = yes; then 57213 + : 57214 +else 57215 + cat > conftest.$ac_ext <<EOF 57216 +#line 7652 "configure" 57217 +#include "confdefs.h" 57218 +#include <ctype.h> 57219 +#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') 57220 +#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) 57221 +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) 57222 +int main () { int i; for (i = 0; i < 256; i++) 57223 +if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); 57224 +exit (0); } 57225 57226 - EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" 57227 +EOF 57228 +if { (eval echo configure:7663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 57229 +then 57230 + : 57231 +else 57232 + echo "configure: failed program was:" >&5 57233 + cat conftest.$ac_ext >&5 57234 + rm -fr conftest* 57235 + ac_cv_header_stdc=no 57236 +fi 57237 +rm -fr conftest* 57238 fi 57239 57240 +fi 57241 +fi 57242 57243 +echo "$ac_t""$ac_cv_header_stdc" 1>&6 57244 +if test $ac_cv_header_stdc = yes; then 57245 + cat >> confdefs.h <<\EOF 57246 +#define STDC_HEADERS 1 57247 +EOF 57248 57249 +fi 57250 57251 -if test "$cf_check_cflags" != "$CFLAGS" ; then 57252 -cat > conftest.$ac_ext <<EOF 36996 57253 -#line 6524 "configure" 36997 +#line 7211 "configure" 57254 +echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 57255 +echo "configure:7687: checking whether time.h and sys/time.h may both be included" >&5 57256 +if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then 57257 + echo $ac_n "(cached) $ac_c" 1>&6 57258 +else 57259 + cat > conftest.$ac_ext <<EOF 57260 +#line 7692 "configure" 36998 57261 #include "confdefs.h" 36999 #include <stdio.h> 57262 -#include <stdio.h> 57263 +#include <sys/types.h> 57264 +#include <sys/time.h> 57265 +#include <time.h> 37000 57266 int main() { 37001 printf("Hello world"); 57267 -printf("Hello world"); 57268 +struct tm *tp; 37002 57269 ; return 0; } 37003 57270 EOF 37004 57271 -if { (eval echo configure:6531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37005 +if { (eval echo configure:7218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37006 : 57272 - : 57273 +if { (eval echo configure:7701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 57274 + rm -rf conftest* 57275 + ac_cv_header_time=yes 37007 57276 else 37008 57277 echo "configure: failed program was:" >&5 37009 @@ -6535,13 +7222,13 @@ 57278 cat conftest.$ac_ext >&5 37010 57279 rm -rf conftest* 37011 37012 57280 - test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 57281 - 37013 57282 -echo "${as_me-configure}:6539: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 37014 +echo "${as_me-configure}:7226: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 37015 37016 37017 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then 37018 test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 37019 57283 - 57284 - 57285 - if test "$cf_check_cppflags" != "$CPPFLAGS" ; then 57286 - test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 57287 - 37020 57288 -echo "${as_me-configure}:6545: testing but keeping change to \$CPPFLAGS ..." 1>&5 37021 +echo "${as_me-configure}:7232: testing but keeping change to \$CPPFLAGS ..." 1>&5 37022 37023 37024 fi 37025 @@ -6551,7 +7238,7 @@ 57289 - 57290 - 57291 - fi 57292 - CFLAGS="$cf_check_flags" 57293 + ac_cv_header_time=no 37026 57294 fi 37027 37028 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 57295 rm -f conftest* 57296 fi 57297 57298 -echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 37029 57299 -echo "configure:6555: checking for XOpenDisplay in -lX11" >&5 37030 +echo "configure:7242: checking for XOpenDisplay in -lX11" >&5 37031 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` 37032 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 57300 -ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` 57301 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 57302 +echo "$ac_t""$ac_cv_header_time" 1>&6 57303 +if test $ac_cv_header_time = yes; then 57304 + cat >> confdefs.h <<\EOF 57305 +#define TIME_WITH_SYS_TIME 1 57306 +EOF 57307 + 57308 +fi 57309 + 57310 +for ac_hdr in \ 57311 +getopt.h \ 57312 +locale.h \ 57313 +stdarg.h \ 57314 +sys/ioctl.h \ 57315 +sys/select.h \ 57316 +sys/time.h \ 57317 +termios.h \ 57318 +unistd.h \ 57319 + 57320 +do 57321 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 57322 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 57323 +echo "configure:7734: checking for $ac_hdr" >&5 57324 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 37033 57325 echo $ac_n "(cached) $ac_c" 1>&6 37034 @@ -6559,7 +7246,7 @@ 37035 37036 37037 57326 else 57327 - ac_save_LIBS="$LIBS" 57328 -LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" 57329 -cat > conftest.$ac_ext <<EOF 37038 57330 -#line 6563 "configure" 37039 +#line 7250 "configure" 57331 + cat > conftest.$ac_ext <<EOF 57332 +#line 7739 "configure" 37040 57333 #include "confdefs.h" 37041 /* Override any gcc2 internal prototype to avoid an error. */ 37042 /* We use char because int might match the return type of a gcc2 37043 @@ -6570,7 +7257,7 @@ 37044 XOpenDisplay() 37045 ; return 0; } 57334 -/* Override any gcc2 internal prototype to avoid an error. */ 57335 -/* We use char because int might match the return type of a gcc2 57336 - builtin and then its argument prototype would still apply. */ 57337 -char XOpenDisplay(); 57338 - 57339 -int main() { 57340 -XOpenDisplay() 57341 -; return 0; } 57342 +#include <$ac_hdr> 37046 57343 EOF 37047 57344 -if { (eval echo configure:6574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37048 +if { (eval echo configure:7261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 57345 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 57346 +{ (eval echo configure:7744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 57347 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 57348 +if test -z "$ac_err"; then 37049 57349 rm -rf conftest* 37050 eval "ac_cv_lib_$ac_lib_var=yes" 57350 - eval "ac_cv_lib_$ac_lib_var=yes" 57351 + eval "ac_cv_header_$ac_safe=yes" 37051 57352 else 37052 @@ -6591,14 +7278,14 @@ 57353 + echo "$ac_err" >&5 57354 echo "configure: failed program was:" >&5 57355 cat conftest.$ac_ext >&5 57356 rm -rf conftest* 57357 - eval "ac_cv_lib_$ac_lib_var=no" 57358 + eval "ac_cv_header_$ac_safe=no" 37053 57359 fi 37054 37055 echo $ac_n "checking for XCurses library""... $ac_c" 1>&6 57360 rm -f conftest* 57361 -LIBS="$ac_save_LIBS" 57362 - 57363 fi 57364 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 57365 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 57366 echo "$ac_t""yes" 1>&6 57367 - LIBS="-lX11 $LIBS" 57368 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 57369 + cat >> confdefs.h <<EOF 57370 +#define $ac_tr_hdr 1 57371 +EOF 57372 + 57373 else 57374 echo "$ac_t""no" 1>&6 57375 fi 57376 +done 57377 57378 -echo $ac_n "checking for XCurses library""... $ac_c" 1>&6 37056 57379 -echo "configure:6595: checking for XCurses library" >&5 37057 +echo "configure:7282: checking for XCurses library" >&5 37058 if eval "test \"`echo '$''{'cf_cv_lib_XCurses'+set}'`\" = set"; then 57380 -if eval "test \"`echo '$''{'cf_cv_lib_XCurses'+set}'`\" = set"; then 57381 + 57382 +for ac_func in \ 57383 +gettimeofday \ 57384 +mblen \ 57385 +mbrlen \ 57386 +mbrtowc \ 57387 +mbsrtowcs \ 57388 +mbstowcs \ 57389 +mbtowc \ 57390 +strdup \ 57391 +wcsrtombs \ 57392 +wcstombs \ 57393 + 57394 +do 57395 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 57396 +echo "configure:7785: checking for $ac_func" >&5 57397 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 37059 57398 echo $ac_n "(cached) $ac_c" 1>&6 37060 57399 else 37061 37062 37063 57400 - 57401 -LIBS="-lXCurses $LIBS" 57402 -cat > conftest.$ac_ext <<EOF 37064 57403 -#line 6602 "configure" 37065 +#line 7289 "configure" 57404 + cat > conftest.$ac_ext <<EOF 57405 +#line 7790 "configure" 37066 57406 #include "confdefs.h" 37067 37068 #include <xcurses.h> 37069 @@ -6608,7 +7295,7 @@ 37070 XCursesExit(); 57407 - 57408 -#include <xcurses.h> 57409 -char *XCursesProgramName = "test"; 57410 +/* System header to define __stub macros and hopefully few prototypes, 57411 + which can conflict with char $ac_func(); below. */ 57412 +#include <assert.h> 57413 +/* Override any gcc2 internal prototype to avoid an error. */ 57414 +/* We use char because int might match the return type of a gcc2 57415 + builtin and then its argument prototype would still apply. */ 57416 +char $ac_func(); 57417 57418 int main() { 57419 -XCursesExit(); 57420 + 57421 +/* The GNU C library defines this for functions which it implements 57422 + to always fail with ENOSYS. Some functions are actually named 57423 + something starting with __ and the normal name is an alias. */ 57424 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) 57425 +choke me 57426 +#else 57427 +$ac_func(); 57428 +#endif 57429 + 37071 57430 ; return 0; } 37072 57431 EOF 37073 57432 -if { (eval echo configure:6612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37074 +if { (eval echo configure:7 299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then57433 +if { (eval echo configure:7813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37075 57434 rm -rf conftest* 37076 cf_cv_lib_XCurses=yes 57435 - cf_cv_lib_XCurses=yes 57436 + eval "ac_cv_func_$ac_func=yes" 37077 57437 else 37078 @@ -6653,7 +7340,7 @@ 37079 *) 37080 # look for curses-related libraries 37081 echo $ac_n "checking for new_panel in -lpanel$cf_cv_libtype""... $ac_c" 1>&6 57438 echo "configure: failed program was:" >&5 57439 cat conftest.$ac_ext >&5 57440 rm -rf conftest* 57441 - cf_cv_lib_XCurses=no 57442 + eval "ac_cv_func_$ac_func=no" 57443 fi 57444 rm -f conftest* 57445 - 57446 -fi 57447 - 57448 -echo "$ac_t""$cf_cv_lib_XCurses" 1>&6 57449 - 57450 fi 57451 57452 -if test $cf_cv_lib_XCurses = yes ; then 57453 - cat >> confdefs.h <<\EOF 57454 -#define UNIX 1 57455 -EOF 57456 - 57457 - cat >> confdefs.h <<\EOF 57458 -#define XCURSES 1 57459 -EOF 57460 - 57461 - cat >> confdefs.h <<\EOF 57462 -#define HAVE_XCURSES 1 57463 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 57464 + echo "$ac_t""yes" 1>&6 57465 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 57466 + cat >> confdefs.h <<EOF 57467 +#define $ac_tr_func 1 57468 EOF 57469 - 57470 + 57471 else 57472 - { echo "configure: error: Cannot link with XCurses" 1>&2; exit 1; } 57473 + echo "$ac_t""no" 1>&6 57474 fi 57475 - 57476 - ;; 57477 -esac 57478 +done 57479 57480 57481 57482 -case $cf_cv_screen in #(vi 57483 -pdcurses) #(vi 57484 - ;; 57485 -*) 57486 - # look for curses-related libraries 57487 - echo $ac_n "checking for new_panel in -lpanel$cf_cv_libtype""... $ac_c" 1>&6 37082 57488 -echo "configure:6657: checking for new_panel in -lpanel$cf_cv_libtype" >&5 37083 +echo "configure:7344: checking for new_panel in -lpanel$cf_cv_libtype" >&5 37084 ac_lib_var=`echo panel$cf_cv_libtype'_'new_panel | sed 'y%./+-%__p_%'` 37085 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 57489 -ac_lib_var=`echo panel$cf_cv_libtype'_'new_panel | sed 'y%./+-%__p_%'` 57490 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 57491 +echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6 57492 +echo "configure:7840: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 57493 +if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then 37086 57494 echo $ac_n "(cached) $ac_c" 1>&6 37087 @@ -6661,7 +7348,7 @@ 37088 ac_save_LIBS="$LIBS" 37089 LIBS="-lpanel$cf_cv_libtype $LIBS" 57495 else 57496 - ac_save_LIBS="$LIBS" 57497 -LIBS="-lpanel$cf_cv_libtype $LIBS" 57498 + 37090 57499 cat > conftest.$ac_ext <<EOF 37091 57500 -#line 6665 "configure" 37092 +#line 7 352"configure"57501 +#line 7846 "configure" 37093 57502 #include "confdefs.h" 37094 /* Override any gcc2 internal prototype to avoid an error. */ 37095 /* We use char because int might match the return type of a gcc2 37096 @@ -6672,7 +7359,7 @@ 37097 new_panel() 57503 -/* Override any gcc2 internal prototype to avoid an error. */ 57504 -/* We use char because int might match the return type of a gcc2 57505 - builtin and then its argument prototype would still apply. */ 57506 -char new_panel(); 57507 57508 +#include <stdlib.h> 57509 +#include <${cf_cv_ncurses_header-curses.h}> 57510 int main() { 57511 -new_panel() 57512 + 57513 + long x = winnstr(stdscr, "", 0); 57514 + int x1, y1; 57515 + getbegyx(stdscr, y1, x1) 37098 57516 ; return 0; } 37099 57517 EOF 37100 57518 -if { (eval echo configure:6676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37101 +if { (eval echo configure:7 363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then57519 +if { (eval echo configure:7858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37102 57520 rm -rf conftest* 37103 eval "ac_cv_lib_$ac_lib_var=yes" 57521 - eval "ac_cv_lib_$ac_lib_var=yes" 57522 + cf_cv_need_xopen_extension=no 37104 57523 else 37105 @@ -6700,7 +7387,7 @@ 37106 fi 37107 37108 echo $ac_n "checking for menu_driver in -lmenu$cf_cv_libtype""... $ac_c" 1>&6 57524 echo "configure: failed program was:" >&5 57525 cat conftest.$ac_ext >&5 57526 rm -rf conftest* 57527 - eval "ac_cv_lib_$ac_lib_var=no" 57528 -fi 57529 -rm -f conftest* 57530 -LIBS="$ac_save_LIBS" 57531 + cat > conftest.$ac_ext <<EOF 57532 +#line 7866 "configure" 57533 +#include "confdefs.h" 57534 57535 -fi 57536 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 57537 - echo "$ac_t""yes" 1>&6 57538 - ac_tr_lib=HAVE_LIB`echo panel$cf_cv_libtype | sed -e 's/[^a-zA-Z0-9_]/_/g' \ 57539 - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` 57540 - cat >> confdefs.h <<EOF 57541 -#define $ac_tr_lib 1 57542 +#define _XOPEN_SOURCE_EXTENDED 57543 +#include <stdlib.h> 57544 +#include <${cf_cv_ncurses_header-curses.h}> 57545 +int main() { 57546 + 57547 + long x = winnstr(stdscr, "", 0); 57548 + int x1, y1; 57549 + getbegyx(stdscr, y1, x1) 57550 +; return 0; } 57551 EOF 57552 +if { (eval echo configure:7879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 57553 + rm -rf conftest* 57554 + cf_cv_need_xopen_extension=yes 57555 +else 57556 + echo "configure: failed program was:" >&5 57557 + cat conftest.$ac_ext >&5 57558 + rm -rf conftest* 57559 + cf_cv_need_xopen_extension=unknown 57560 +fi 57561 +rm -f conftest* 57562 +fi 57563 +rm -f conftest* 57564 +fi 57565 57566 - LIBS="-lpanel$cf_cv_libtype $LIBS" 57567 +echo "$ac_t""$cf_cv_need_xopen_extension" 1>&6 57568 +test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" 57569 57570 -else 57571 - echo "$ac_t""no" 1>&6 57572 -fi 57573 57574 - echo $ac_n "checking for menu_driver in -lmenu$cf_cv_libtype""... $ac_c" 1>&6 37109 57575 -echo "configure:6704: checking for menu_driver in -lmenu$cf_cv_libtype" >&5 37110 +echo "configure:7391: checking for menu_driver in -lmenu$cf_cv_libtype" >&5 37111 ac_lib_var=`echo menu$cf_cv_libtype'_'menu_driver | sed 'y%./+-%__p_%'` 37112 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 57576 -ac_lib_var=`echo menu$cf_cv_libtype'_'menu_driver | sed 'y%./+-%__p_%'` 57577 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 57578 +echo $ac_n "checking for term.h""... $ac_c" 1>&6 57579 +echo "configure:7898: checking for term.h" >&5 57580 +if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then 37113 57581 echo $ac_n "(cached) $ac_c" 1>&6 37114 @@ -6708,7 +7395,7 @@ 37115 37116 37117 57582 else 57583 - ac_save_LIBS="$LIBS" 57584 -LIBS="-lmenu$cf_cv_libtype $LIBS" 57585 -cat > conftest.$ac_ext <<EOF 37118 57586 -#line 6712 "configure" 37119 +#line 7399 "configure" 57587 + 57588 + 57589 +# If we found <ncurses/curses.h>, look for <ncurses/term.h>, but always look 57590 +# for <term.h> if we do not find the variant. 57591 +for cf_header in \ 57592 + `echo ${cf_cv_ncurses_header-curses.h} | sed -e 's%/.*%/%'`term.h \ 57593 + term.h 57594 +do 57595 + cat > conftest.$ac_ext <<EOF 57596 +#line 7911 "configure" 37120 57597 #include "confdefs.h" 37121 /* Override any gcc2 internal prototype to avoid an error. */ 37122 /* We use char because int might match the return type of a gcc2 37123 @@ -6719,7 +7406,7 @@ 37124 menu_driver() 57598 -/* Override any gcc2 internal prototype to avoid an error. */ 57599 -/* We use char because int might match the return type of a gcc2 57600 - builtin and then its argument prototype would still apply. */ 57601 -char menu_driver(); 57602 57603 +#include <${cf_cv_ncurses_header-curses.h}> 57604 +#include <${cf_header}> 57605 int main() { 57606 -menu_driver() 57607 +WINDOW *x 37125 57608 ; return 0; } 37126 57609 EOF 37127 57610 -if { (eval echo configure:6723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37128 +if { (eval echo configure:7 410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then57611 +if { (eval echo configure:7920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 37129 57612 rm -rf conftest* 37130 eval "ac_cv_lib_$ac_lib_var=yes" 57613 - eval "ac_cv_lib_$ac_lib_var=yes" 57614 + cf_cv_term_header=$cf_header 57615 + break 37131 57616 else 37132 @@ -6747,7 +7434,7 @@ 57617 echo "configure: failed program was:" >&5 57618 cat conftest.$ac_ext >&5 57619 rm -rf conftest* 57620 - eval "ac_cv_lib_$ac_lib_var=no" 57621 + cf_cv_term_header=no 37133 57622 fi 37134 37135 echo $ac_n "checking for form_driver in -lform$cf_cv_libtype""... $ac_c" 1>&6 57623 rm -f conftest* 57624 -LIBS="$ac_save_LIBS" 57625 +done 57626 57627 fi 57628 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 57629 - echo "$ac_t""yes" 1>&6 57630 - ac_tr_lib=HAVE_LIB`echo menu$cf_cv_libtype | sed -e 's/[^a-zA-Z0-9_]/_/g' \ 57631 - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` 57632 - cat >> confdefs.h <<EOF 57633 -#define $ac_tr_lib 1 57634 + 57635 +echo "$ac_t""$cf_cv_term_header" 1>&6 57636 + 57637 +case $cf_cv_term_header in #(vi 57638 +term.h) #(vi 57639 + cat >> confdefs.h <<\EOF 57640 +#define HAVE_TERM_H 1 57641 EOF 57642 57643 - LIBS="-lmenu$cf_cv_libtype $LIBS" 57644 + ;; 57645 +ncurses/term.h) 57646 + cat >> confdefs.h <<\EOF 57647 +#define HAVE_NCURSES_TERM_H 1 57648 +EOF 57649 57650 -else 57651 - echo "$ac_t""no" 1>&6 57652 -fi 57653 + ;; 57654 +ncursesw/term.h) 57655 + cat >> confdefs.h <<\EOF 57656 +#define HAVE_NCURSESW_TERM_H 1 57657 +EOF 57658 57659 - echo $ac_n "checking for form_driver in -lform$cf_cv_libtype""... $ac_c" 1>&6 37136 57660 -echo "configure:6751: checking for form_driver in -lform$cf_cv_libtype" >&5 37137 +echo "configure:7438: checking for form_driver in -lform$cf_cv_libtype" >&5 37138 ac_lib_var=`echo form$cf_cv_libtype'_'form_driver | sed 'y%./+-%__p_%'` 37139 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 57661 -ac_lib_var=`echo form$cf_cv_libtype'_'form_driver | sed 'y%./+-%__p_%'` 57662 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 57663 + ;; 57664 +esac 57665 + 57666 + 57667 + 57668 + 57669 +for cf_func in \ 57670 +chgat \ 57671 +color_set \ 57672 +filter \ 57673 +getbegx \ 57674 +getcurx \ 57675 +getmaxx \ 57676 +getnstr \ 57677 +getparx \ 57678 +getwin \ 57679 +mvvline \ 57680 +mvwvline \ 57681 +napms \ 57682 +putwin \ 57683 +resize_term \ 57684 +resizeterm \ 57685 +ripoffline \ 57686 +setupterm \ 57687 +slk_color \ 57688 +slk_init \ 57689 +termattrs \ 57690 +tgetent \ 57691 +tigetnum \ 57692 +tigetstr \ 57693 +typeahead \ 57694 +use_default_colors \ 57695 +vw_printw \ 57696 +vsscanf \ 57697 +wchgat \ 57698 +winsstr \ 57699 +wresize \ 57700 + 57701 +do 57702 + 57703 +cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 57704 + 57705 + echo $ac_n "checking for ${cf_func}""... $ac_c" 1>&6 57706 +echo "configure:7998: checking for ${cf_func}" >&5 57707 + 57708 +echo "${as_me-configure}:8000: testing ${cf_func} ..." 1>&5 57709 + 57710 + if eval "test \"`echo '$''{'cf_cv_func_$cf_func'+set}'`\" = set"; then 37140 57711 echo $ac_n "(cached) $ac_c" 1>&6 37141 @@ -6755,7 +7442,7 @@ 37142 37143 37144 57712 else 57713 - ac_save_LIBS="$LIBS" 57714 -LIBS="-lform$cf_cv_libtype $LIBS" 57715 -cat > conftest.$ac_ext <<EOF 37145 57716 -#line 6759 "configure" 37146 +#line 7446 "configure" 57717 + 57718 + eval cf_result='$ac_cv_func_'$cf_func 57719 + if test ".$cf_result" != ".no"; then 57720 + cat > conftest.$ac_ext <<EOF 57721 +#line 8009 "configure" 37147 57722 #include "confdefs.h" 37148 /* Override any gcc2 internal prototype to avoid an error. */ 37149 /* We use char because int might match the return type of a gcc2 37150 @@ -6766,7 +7453,7 @@ 37151 form_driver() 57723 -/* Override any gcc2 internal prototype to avoid an error. */ 57724 -/* We use char because int might match the return type of a gcc2 57725 - builtin and then its argument prototype would still apply. */ 57726 -char form_driver(); 57727 + 57728 +#ifdef HAVE_XCURSES 57729 +#include <xcurses.h> 57730 +char * XCursesProgramName = "test"; 57731 +#else 57732 +#include <${cf_cv_ncurses_header-curses.h}> 57733 +#if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H) 57734 +#include <ncursesw/term.h> 57735 +#elif defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H) 57736 +#include <ncurses/term.h> 57737 +#elif defined(HAVE_TERM_H) 57738 +#include <term.h> 57739 +#endif 57740 +#endif 57741 57742 int main() { 57743 -form_driver() 57744 + 57745 +#ifndef ${cf_func} 57746 +long foo = (long)(&${cf_func}); 57747 +${cf_cv_main_return-return}(foo == 0); 57748 +#endif 57749 + 37152 57750 ; return 0; } 37153 57751 EOF 37154 57752 -if { (eval echo configure:6770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37155 +if { (eval echo configure: 7457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then57753 +if { (eval echo configure:8035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37156 57754 rm -rf conftest* 37157 eval "ac_cv_lib_$ac_lib_var=yes" 57755 - eval "ac_cv_lib_$ac_lib_var=yes" 57756 + cf_result=yes 37158 57757 else 37159 @@ -6805,17 +7492,17 @@ 37160 do 37161 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 37162 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 57758 echo "configure: failed program was:" >&5 57759 cat conftest.$ac_ext >&5 57760 rm -rf conftest* 57761 - eval "ac_cv_lib_$ac_lib_var=no" 57762 + cf_result=no 57763 fi 57764 rm -f conftest* 57765 -LIBS="$ac_save_LIBS" 57766 - 57767 + fi 57768 + eval 'cf_cv_func_'$cf_func'=$cf_result' 57769 + 57770 fi 57771 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 57772 - echo "$ac_t""yes" 1>&6 57773 - ac_tr_lib=HAVE_LIB`echo form$cf_cv_libtype | sed -e 's/[^a-zA-Z0-9_]/_/g' \ 57774 - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` 57775 - cat >> confdefs.h <<EOF 57776 -#define $ac_tr_lib 1 57777 -EOF 57778 57779 - LIBS="-lform$cf_cv_libtype $LIBS" 57780 + # use the computed/retrieved cache-value: 57781 + eval 'cf_result=$cf_cv_func_'$cf_func 57782 + echo "$ac_t""$cf_result" 1>&6 57783 + if test $cf_result != no; then 57784 + cat >> confdefs.h <<EOF 57785 +#define HAVE_${cf_tr_func} 1 57786 +EOF 57787 57788 -else 57789 - echo "$ac_t""no" 1>&6 57790 -fi 57791 + fi 57792 +done 57793 57794 57795 - # look for curses-related headers 57796 - for ac_hdr in \ 57797 - nc_alloc.h \ 57798 - nomacros.h \ 57799 - form.h \ 57800 - menu.h \ 57801 - panel.h \ 57802 - 57803 -do 57804 -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 57805 -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 37163 57806 -echo "configure:6809: checking for $ac_hdr" >&5 37164 +echo "configure:7496: checking for $ac_hdr" >&5 37165 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 57807 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 57808 +echo $ac_n "checking for ncurses extended functions""... $ac_c" 1>&6 57809 +echo "configure:8063: checking for ncurses extended functions" >&5 57810 +if eval "test \"`echo '$''{'cf_cv_ncurses_ext_funcs'+set}'`\" = set"; then 37166 57811 echo $ac_n "(cached) $ac_c" 1>&6 37167 57812 else 37168 57813 - cat > conftest.$ac_ext <<EOF 37169 57814 -#line 6814 "configure" 37170 +#line 7501 "configure" 57815 + 57816 +cat > conftest.$ac_ext <<EOF 57817 +#line 8069 "configure" 37171 57818 #include "confdefs.h" 37172 #include <$ac_hdr> 57819 -#include <$ac_hdr> 57820 + 57821 +#include <${cf_cv_ncurses_header-curses.h}> 57822 +int main() { 57823 + 57824 + (void) assume_default_colors (0, 0); 57825 + (void) curses_version (); 57826 + (void) define_key (0, 0); 57827 + (void) is_term_resized (0, 0); 57828 + (void) key_defined (0); 57829 + (void) keybound (0, 0); 57830 + (void) keyok (0, 0); 57831 + (void) resize_term (0, 0); 57832 + (void) resizeterm (0, 0); 57833 + (void) use_default_colors (); 57834 + (void) use_extended_names (0); 57835 + (void) wresize (0, 0, 0); 57836 +; return 0; } 37173 57837 EOF 37174 57838 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 37175 57839 -{ (eval echo configure:6819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 37176 +{ (eval echo configure:7506: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 37177 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 37178 if test -z "$ac_err"; then57840 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 57841 -if test -z "$ac_err"; then 57842 +if { (eval echo configure:8089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37179 57843 rm -rf conftest* 37180 @@ -6845,12 +7532,12 @@ 37181 esac 37182 37183 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 57844 - eval "ac_cv_header_$ac_safe=yes" 57845 + cf_cv_ncurses_ext_funcs=yes 57846 else 57847 - echo "$ac_err" >&5 57848 echo "configure: failed program was:" >&5 57849 cat conftest.$ac_ext >&5 57850 rm -rf conftest* 57851 - eval "ac_cv_header_$ac_safe=no" 57852 + cf_cv_ncurses_ext_funcs=no 57853 fi 57854 rm -f conftest* 57855 + 57856 fi 57857 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 57858 - echo "$ac_t""yes" 1>&6 57859 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 57860 - cat >> confdefs.h <<EOF 57861 -#define $ac_tr_hdr 1 57862 + 57863 +echo "$ac_t""$cf_cv_ncurses_ext_funcs" 1>&6 57864 +test "$cf_cv_ncurses_ext_funcs" != no && cat >> confdefs.h <<\EOF 57865 +#define NCURSES_EXT_FUNCS 1 57866 EOF 57867 - 57868 -else 57869 - echo "$ac_t""no" 1>&6 57870 -fi 57871 -done 57872 57873 - ;; 57874 -esac 57875 57876 -echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 37184 57877 -echo "configure:6849: checking return type of signal handlers" >&5 37185 +echo "configure:7536: checking return type of signal handlers" >&5 37186 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then 57878 -if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then 57879 +echo $ac_n "checking for wide-character functions""... $ac_c" 1>&6 57880 +echo "configure:8109: checking for wide-character functions" >&5 57881 +if eval "test \"`echo '$''{'cf_cv_widechar_funcs'+set}'`\" = set"; then 37187 57882 echo $ac_n "(cached) $ac_c" 1>&6 37188 57883 else 37189 57884 - cat > conftest.$ac_ext <<EOF 37190 57885 -#line 6854 "configure" 37191 +#line 7541 "configure" 37192 #include "confdefs.h" 37193 #include <sys/types.h> 37194 #include <signal.h> 37195 @@ -6867,7 +7554,7 @@ 37196 int i; 57886 -#include "confdefs.h" 57887 -#include <sys/types.h> 57888 -#include <signal.h> 57889 -#ifdef signal 57890 -#undef signal 57891 -#endif 57892 -#ifdef __cplusplus 57893 -extern "C" void (*signal (int, void (*)(int)))(int); 57894 -#else 57895 -void (*signal ()) (); 57896 -#endif 57897 + 57898 +cat > conftest.$ac_ext <<EOF 57899 +#line 8115 "configure" 57900 +#include "confdefs.h" 57901 57902 +#include <${cf_cv_ncurses_header-curses.h}> 57903 int main() { 57904 -int i; 57905 + 57906 + static wchar_t src_wchar[2]; 57907 + static cchar_t dst_cchar; 57908 + setcchar(&dst_cchar, src_wchar, A_NORMAL, 0, (void *) 0); 57909 + 37197 57910 ; return 0; } 37198 57911 EOF 37199 57912 -if { (eval echo configure:6871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 37200 +if { (eval echo configure: 7558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5;}; then57913 +if { (eval echo configure:8127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37201 57914 rm -rf conftest* 37202 ac_cv_type_signal=void 57915 - ac_cv_type_signal=void 57916 + cf_cv_widechar_funcs=yes 37203 57917 else 37204 @@ -6887,12 +7574,12 @@ 37205 37206 37207 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 57918 echo "configure: failed program was:" >&5 57919 cat conftest.$ac_ext >&5 57920 rm -rf conftest* 57921 - ac_cv_type_signal=int 57922 + cf_cv_widechar_funcs=no 57923 fi 57924 rm -f conftest* 57925 + 57926 fi 57927 57928 -echo "$ac_t""$ac_cv_type_signal" 1>&6 57929 -cat >> confdefs.h <<EOF 57930 -#define RETSIGTYPE $ac_cv_type_signal 57931 +echo "$ac_t""$cf_cv_widechar_funcs" 1>&6 57932 +if test "$cf_cv_widechar_funcs" != no ; then 57933 + cat >> confdefs.h <<\EOF 57934 +#define USE_WIDEC_SUPPORT 1 57935 +EOF 57936 + 57937 +else 57938 + cat >> confdefs.h <<\EOF 57939 +#define USE_WIDEC_SUPPORT 0 57940 EOF 57941 57942 +fi 57943 57944 57945 -echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 37208 57946 -echo "configure:6891: checking for ANSI C header files" >&5 37209 +echo "configure:7578: checking for ANSI C header files" >&5 37210 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then 57947 -if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then 57948 +echo $ac_n "checking if sys/time.h works with sys/select.h""... $ac_c" 1>&6 57949 +echo "configure:8155: checking if sys/time.h works with sys/select.h" >&5 57950 +if eval "test \"`echo '$''{'cf_cv_sys_time_select'+set}'`\" = set"; then 37211 57951 echo $ac_n "(cached) $ac_c" 1>&6 37212 57952 else 37213 57953 - cat > conftest.$ac_ext <<EOF 37214 57954 -#line 6896 "configure" 37215 +#line 7583 "configure" 57955 + 57956 +cat > conftest.$ac_ext <<EOF 57957 +#line 8161 "configure" 37216 57958 #include "confdefs.h" 37217 #include <stdlib.h> 37218 #include <stdarg.h> 37219 @@ -6900,7 +7587,7 @@ 37220 #include <float.h> 57959 -#include <stdlib.h> 57960 -#include <stdarg.h> 57961 -#include <string.h> 57962 -#include <float.h> 57963 + 57964 +#include <sys/types.h> 57965 +#ifdef HAVE_SYS_TIME_H 57966 +#include <sys/time.h> 57967 +#endif 57968 +#ifdef HAVE_SYS_SELECT_H 57969 +#include <sys/select.h> 57970 +#endif 57971 + 57972 +int main() { 57973 + 57974 +; return 0; } 37221 57975 EOF 37222 57976 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 37223 57977 -{ (eval echo configure:6904: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 37224 +{ (eval echo configure:7591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 37225 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 37226 if test -z "$ac_err"; then57978 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 57979 -if test -z "$ac_err"; then 57980 +if { (eval echo configure:8176: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 37227 57981 rm -rf conftest* 37228 @@ -6917,7 +7604,7 @@ 37229 if test $ac_cv_header_stdc = yes; then 37230 # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 37231 cat > conftest.$ac_ext <<EOF 57982 - ac_cv_header_stdc=yes 57983 + cf_cv_sys_time_select=yes 57984 else 57985 - echo "$ac_err" >&5 57986 echo "configure: failed program was:" >&5 57987 cat conftest.$ac_ext >&5 57988 rm -rf conftest* 57989 - ac_cv_header_stdc=no 57990 -fi 57991 -rm -f conftest* 57992 - 57993 -if test $ac_cv_header_stdc = yes; then 57994 - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 57995 -cat > conftest.$ac_ext <<EOF 37232 57996 -#line 6921 "configure" 37233 +#line 7608 "configure" 37234 #include "confdefs.h" 37235 #include <string.h> 57997 -#include "confdefs.h" 57998 -#include <string.h> 57999 -EOF 58000 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 58001 - egrep "memchr" >/dev/null 2>&1; then 58002 - : 58003 -else 58004 - rm -rf conftest* 58005 - ac_cv_header_stdc=no 58006 + cf_cv_sys_time_select=no 58007 fi 58008 rm -f conftest* 58009 - 58010 + 58011 fi 58012 58013 -if test $ac_cv_header_stdc = yes; then 58014 - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 58015 -cat > conftest.$ac_ext <<EOF 58016 -#line 6939 "configure" 58017 -#include "confdefs.h" 58018 -#include <stdlib.h> 58019 +echo "$ac_t""$cf_cv_sys_time_select" 1>&6 58020 +test "$cf_cv_sys_time_select" = yes && cat >> confdefs.h <<\EOF 58021 +#define HAVE_SYS_TIME_SELECT 1 37236 58022 EOF 37237 @@ -6935,7 +7622,7 @@ 37238 if test $ac_cv_header_stdc = yes; then 37239 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 37240 cat > conftest.$ac_ext <<EOF 37241 -#line 6939 "configure" 37242 +#line 7626 "configure" 37243 #include "confdefs.h" 37244 #include <stdlib.h> 37245 EOF 37246 @@ -6956,7 +7643,7 @@ 37247 : 58023 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 58024 - egrep "free" >/dev/null 2>&1; then 58025 - : 58026 -else 58027 - rm -rf conftest* 58028 - ac_cv_header_stdc=no 58029 -fi 58030 -rm -f conftest* 58031 58032 -fi 58033 58034 -if test $ac_cv_header_stdc = yes; then 58035 - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. 58036 + 58037 +echo $ac_n "checking for function curses_version""... $ac_c" 1>&6 58038 +echo "configure:8197: checking for function curses_version" >&5 58039 +if eval "test \"`echo '$''{'cf_cv_func_curses_version'+set}'`\" = set"; then 58040 + echo $ac_n "(cached) $ac_c" 1>&6 58041 +else 58042 + 58043 if test "$cross_compiling" = yes; then 58044 - : 58045 + cf_cv_func_curses_version=unknown 37248 58046 else 37249 58047 cat > conftest.$ac_ext <<EOF 37250 58048 -#line 6960 "configure" 37251 +#line 7647"configure"58049 +#line 8206 "configure" 37252 58050 #include "confdefs.h" 37253 #include <ctype.h> 37254 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') 37255 @@ -6967,7 +7654,7 @@ 37256 exit (0); } 58051 -#include <ctype.h> 58052 -#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') 58053 -#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) 58054 -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) 58055 -int main () { int i; for (i = 0; i < 256; i++) 58056 -if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); 58057 -exit (0); } 58058 + 58059 +#include <${cf_cv_ncurses_header-curses.h}> 58060 +int main() 58061 +{ 58062 + char temp[1024]; 58063 + sprintf(temp, "%s\n", curses_version()); 58064 + ${cf_cv_main_return-return}(0); 58065 +} 37257 58066 37258 58067 EOF 37259 58068 -if { (eval echo configure:6971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 37260 +if { (eval echo configure: 7658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null58069 +if { (eval echo configure:8218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 37261 58070 then 37262 : 58071 - : 58072 + cf_cv_func_curses_version=yes 58073 + 37263 58074 else 37264 @@ -6991,12 +7678,12 @@ 58075 echo "configure: failed program was:" >&5 58076 cat conftest.$ac_ext >&5 58077 rm -fr conftest* 58078 - ac_cv_header_stdc=no 58079 + cf_cv_func_curses_version=no 58080 + 37265 58081 fi 37266 37267 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 37268 -echo "configure:6995: checking whether time.h and sys/time.h may both be included" >&5 37269 +echo "configure:7682: checking whether time.h and sys/time.h may both be included" >&5 37270 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then 37271 echo $ac_n "(cached) $ac_c" 1>&6 37272 else 37273 cat > conftest.$ac_ext <<EOF 37274 -#line 7000 "configure" 37275 +#line 7687 "configure" 37276 #include "confdefs.h" 37277 #include <sys/types.h> 37278 #include <sys/time.h> 37279 @@ -7005,7 +7692,7 @@ 37280 struct tm *tp; 37281 ; return 0; } 58082 rm -fr conftest* 58083 fi 58084 58085 -fi 58086 +rm -f core 58087 fi 58088 58089 -echo "$ac_t""$ac_cv_header_stdc" 1>&6 58090 -if test $ac_cv_header_stdc = yes; then 58091 - cat >> confdefs.h <<\EOF 58092 -#define STDC_HEADERS 1 58093 +echo "$ac_t""$cf_cv_func_curses_version" 1>&6 58094 +test "$cf_cv_func_curses_version" = yes && cat >> confdefs.h <<\EOF 58095 +#define HAVE_CURSES_VERSION 1 37282 58096 EOF 37283 -if { (eval echo configure:7009: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 37284 +if { (eval echo configure:7696: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 37285 rm -rf conftest* 37286 ac_cv_header_time=yes 37287 else 37288 @@ -7038,17 +7725,17 @@ 37289 do 37290 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 37291 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 37292 -echo "configure:7042: checking for $ac_hdr" >&5 37293 +echo "configure:7729: checking for $ac_hdr" >&5 37294 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 37295 echo $ac_n "(cached) $ac_c" 1>&6 37296 else 37297 cat > conftest.$ac_ext <<EOF 37298 -#line 7047 "configure" 37299 +#line 7734 "configure" 37300 #include "confdefs.h" 37301 #include <$ac_hdr> 37302 EOF 37303 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 37304 -{ (eval echo configure:7052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 37305 +{ (eval echo configure:7739: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 37306 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 37307 if test -z "$ac_err"; then 37308 rm -rf conftest* 37309 @@ -7089,12 +7776,12 @@ 37310 37311 do 37312 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 37313 -echo "configure:7093: checking for $ac_func" >&5 37314 +echo "configure:7780: checking for $ac_func" >&5 37315 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 37316 echo $ac_n "(cached) $ac_c" 1>&6 37317 else 37318 cat > conftest.$ac_ext <<EOF 37319 -#line 7098 "configure" 37320 +#line 7785 "configure" 37321 #include "confdefs.h" 37322 /* System header to define __stub macros and hopefully few prototypes, 37323 which can conflict with char $ac_func(); below. */ 37324 @@ -7117,7 +7804,7 @@ 37325 37326 ; return 0; } 37327 EOF 37328 -if { (eval echo configure:7121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37329 +if { (eval echo configure:7808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37330 rm -rf conftest* 37331 eval "ac_cv_func_$ac_func=yes" 37332 else 37333 @@ -7144,13 +7831,13 @@ 37334 37335 37336 echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6 37337 -echo "configure:7148: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 37338 +echo "configure:7835: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 37339 if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then 37340 echo $ac_n "(cached) $ac_c" 1>&6 37341 else 37342 37343 cat > conftest.$ac_ext <<EOF 37344 -#line 7154 "configure" 37345 +#line 7841 "configure" 37346 #include "confdefs.h" 37347 37348 #include <stdlib.h> 37349 @@ -7162,7 +7849,7 @@ 37350 getbegyx(stdscr, y1, x1) 37351 ; return 0; } 37352 EOF 37353 -if { (eval echo configure:7166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37354 +if { (eval echo configure:7853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37355 rm -rf conftest* 37356 cf_cv_need_xopen_extension=no 37357 else 37358 @@ -7170,7 +7857,7 @@ 37359 cat conftest.$ac_ext >&5 37360 rm -rf conftest* 37361 cat > conftest.$ac_ext <<EOF 37362 -#line 7174 "configure" 37363 +#line 7861 "configure" 37364 #include "confdefs.h" 37365 37366 #define _XOPEN_SOURCE_EXTENDED 37367 @@ -7183,7 +7870,7 @@ 37368 getbegyx(stdscr, y1, x1) 37369 ; return 0; } 37370 EOF 37371 -if { (eval echo configure:7187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37372 +if { (eval echo configure:7874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37373 rm -rf conftest* 37374 cf_cv_need_xopen_extension=yes 37375 else 37376 @@ -7202,7 +7889,7 @@ 37377 37378 37379 echo $ac_n "checking for term.h""... $ac_c" 1>&6 37380 -echo "configure:7206: checking for term.h" >&5 37381 +echo "configure:7893: checking for term.h" >&5 37382 if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then 37383 echo $ac_n "(cached) $ac_c" 1>&6 37384 else 37385 @@ -7215,7 +7902,7 @@ 37386 term.h 37387 do 37388 cat > conftest.$ac_ext <<EOF 37389 -#line 7219 "configure" 37390 +#line 7906 "configure" 37391 #include "confdefs.h" 37392 37393 #include <${cf_cv_ncurses_header-curses.h}> 37394 @@ -7224,7 +7911,7 @@ 37395 WINDOW *x 37396 ; return 0; } 37397 EOF 37398 -if { (eval echo configure:7228: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 37399 +if { (eval echo configure:7915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 37400 rm -rf conftest* 37401 cf_cv_term_header=$cf_header 37402 break 37403 @@ -7301,9 +7988,9 @@ 37404 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 37405 37406 echo $ac_n "checking for ${cf_func}""... $ac_c" 1>&6 37407 -echo "configure:7305: checking for ${cf_func}" >&5 37408 +echo "configure:7992: checking for ${cf_func}" >&5 37409 37410 -echo "${as_me-configure}:7307: testing ${cf_func} ..." 1>&5 37411 +echo "${as_me-configure}:7994: testing ${cf_func} ..." 1>&5 37412 37413 if eval "test \"`echo '$''{'cf_cv_func_$cf_func'+set}'`\" = set"; then 37414 echo $ac_n "(cached) $ac_c" 1>&6 37415 @@ -7312,7 +7999,7 @@ 37416 eval cf_result='$ac_cv_func_'$cf_func 37417 if test ".$cf_result" != ".no"; then 37418 cat > conftest.$ac_ext <<EOF 37419 -#line 7316 "configure" 37420 +#line 8003 "configure" 37421 #include "confdefs.h" 37422 37423 #ifdef HAVE_XCURSES 37424 @@ -7341,7 +8028,7 @@ 37425 37426 ; return 0; } 37427 EOF 37428 -if { (eval echo configure:7345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37429 +if { (eval echo configure:8032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37430 rm -rf conftest* 37431 cf_result=yes 37432 else 37433 @@ -7369,13 +8056,13 @@ 37434 37435 37436 echo $ac_n "checking for ncurses extended functions""... $ac_c" 1>&6 37437 -echo "configure:7373: checking for ncurses extended functions" >&5 37438 +echo "configure:8060: checking for ncurses extended functions" >&5 37439 if eval "test \"`echo '$''{'cf_cv_ncurses_ext_funcs'+set}'`\" = set"; then 37440 echo $ac_n "(cached) $ac_c" 1>&6 37441 else 37442 37443 cat > conftest.$ac_ext <<EOF 37444 -#line 7379 "configure" 37445 +#line 8066 "configure" 37446 #include "confdefs.h" 37447 37448 #include <${cf_cv_ncurses_header-curses.h}> 37449 @@ -7395,7 +8082,7 @@ 37450 (void) wresize (0, 0, 0); 37451 ; return 0; } 37452 EOF 37453 -if { (eval echo configure:7399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37454 +if { (eval echo configure:8086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37455 rm -rf conftest* 37456 cf_cv_ncurses_ext_funcs=yes 37457 else 37458 @@ -7415,13 +8102,13 @@ 37459 37460 37461 echo $ac_n "checking for wide-character functions""... $ac_c" 1>&6 37462 -echo "configure:7419: checking for wide-character functions" >&5 37463 +echo "configure:8106: checking for wide-character functions" >&5 37464 if eval "test \"`echo '$''{'cf_cv_widechar_funcs'+set}'`\" = set"; then 37465 echo $ac_n "(cached) $ac_c" 1>&6 37466 else 37467 37468 cat > conftest.$ac_ext <<EOF 37469 -#line 7425 "configure" 37470 +#line 8112 "configure" 37471 #include "confdefs.h" 37472 37473 #include <${cf_cv_ncurses_header-curses.h}> 37474 @@ -7433,7 +8120,7 @@ 37475 37476 ; return 0; } 37477 EOF 37478 -if { (eval echo configure:7437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37479 +if { (eval echo configure:8124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37480 rm -rf conftest* 37481 cf_cv_widechar_funcs=yes 37482 else 37483 @@ -7461,13 +8148,13 @@ 37484 37485 37486 echo $ac_n "checking if sys/time.h works with sys/select.h""... $ac_c" 1>&6 37487 -echo "configure:7465: checking if sys/time.h works with sys/select.h" >&5 37488 +echo "configure:8152: checking if sys/time.h works with sys/select.h" >&5 37489 if eval "test \"`echo '$''{'cf_cv_sys_time_select'+set}'`\" = set"; then 37490 echo $ac_n "(cached) $ac_c" 1>&6 37491 else 37492 37493 cat > conftest.$ac_ext <<EOF 37494 -#line 7471 "configure" 37495 +#line 8158 "configure" 37496 #include "confdefs.h" 37497 37498 #include <sys/types.h> 37499 @@ -7482,7 +8169,7 @@ 37500 37501 ; return 0; } 37502 EOF 37503 -if { (eval echo configure:7486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 37504 +if { (eval echo configure:8173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 37505 rm -rf conftest* 37506 cf_cv_sys_time_select=yes 37507 else 37508 @@ -7503,7 +8190,7 @@ 37509 37510 37511 echo $ac_n "checking for function curses_version""... $ac_c" 1>&6 37512 -echo "configure:7507: checking for function curses_version" >&5 37513 +echo "configure:8194: checking for function curses_version" >&5 37514 if eval "test \"`echo '$''{'cf_cv_func_curses_version'+set}'`\" = set"; then 37515 echo $ac_n "(cached) $ac_c" 1>&6 37516 else 37517 @@ -7512,7 +8199,7 @@ 37518 cf_cv_func_curses_version=unknown 37519 else 37520 cat > conftest.$ac_ext <<EOF 37521 -#line 7516 "configure" 37522 +#line 8203 "configure" 37523 #include "confdefs.h" 37524 37525 #include <${cf_cv_ncurses_header-curses.h}> 37526 @@ -7524,7 +8211,7 @@ 37527 } 37528 37529 EOF 37530 -if { (eval echo configure:7528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 37531 +if { (eval echo configure:8215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 37532 then 37533 cf_cv_func_curses_version=yes 37534 37535 @@ -7548,17 +8235,33 @@ 37536 37537 37538 58097 58098 + 58099 + 37539 58100 +echo $ac_n "checking for ncurses wrap-prefix""... $ac_c" 1>&6 37540 +echo "configure:824 0: checking for ncurses wrap-prefix" >&558101 +echo "configure:8243: checking for ncurses wrap-prefix" >&5 37541 58102 + 37542 58103 +# Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given. … … 37546 58107 +else 37547 58108 + NCURSES_WRAP_PREFIX=_nc_ 37548 +fi 37549 + 58109 fi 58110 58111 -echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 58112 -echo "configure:6995: checking whether time.h and sys/time.h may both be included" >&5 58113 -if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then 37550 58114 +echo "$ac_t""$NCURSES_WRAP_PREFIX" 1>&6 37551 58115 + … … 37553 58117 + 37554 58118 + 37555 echo $ac_n "checking for alternate character set array""... $ac_c" 1>&6 37556 -echo "configure:7553: checking for alternate character set array" >&5 37557 +echo "configure:8256: checking for alternate character set array" >&5 37558 if eval "test \"`echo '$''{'cf_cv_curses_acs_map'+set}'`\" = set"; then 58119 +echo $ac_n "checking for alternate character set array""... $ac_c" 1>&6 58120 +echo "configure:8259: checking for alternate character set array" >&5 58121 +if eval "test \"`echo '$''{'cf_cv_curses_acs_map'+set}'`\" = set"; then 58122 echo $ac_n "(cached) $ac_c" 1>&6 58123 else 58124 - cat > conftest.$ac_ext <<EOF 58125 -#line 7000 "configure" 58126 + 58127 +cf_cv_curses_acs_map=unknown 58128 +for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map 58129 +do 58130 +cat > conftest.$ac_ext <<EOF 58131 +#line 8268 "configure" 58132 #include "confdefs.h" 58133 -#include <sys/types.h> 58134 -#include <sys/time.h> 58135 -#include <time.h> 58136 + 58137 +#include <${cf_cv_ncurses_header-curses.h}> 58138 + 58139 int main() { 58140 -struct tm *tp; 58141 + 58142 +$name['k'] = ACS_PLUS 58143 + 58144 ; return 0; } 58145 EOF 58146 -if { (eval echo configure:7009: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 58147 +if { (eval echo configure:8279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 58148 rm -rf conftest* 58149 - ac_cv_header_time=yes 58150 + cf_cv_curses_acs_map=$name; break 58151 else 58152 echo "configure: failed program was:" >&5 58153 cat conftest.$ac_ext >&5 58154 - rm -rf conftest* 58155 - ac_cv_header_time=no 58156 fi 58157 rm -f conftest* 58158 +done 58159 + 58160 fi 58161 58162 -echo "$ac_t""$ac_cv_header_time" 1>&6 58163 -if test $ac_cv_header_time = yes; then 58164 - cat >> confdefs.h <<\EOF 58165 -#define TIME_WITH_SYS_TIME 1 58166 +echo "$ac_t""$cf_cv_curses_acs_map" 1>&6 58167 + 58168 +test "$cf_cv_curses_acs_map" != unknown && cat >> confdefs.h <<EOF 58169 +#define CURSES_ACS_ARRAY $cf_cv_curses_acs_map 58170 EOF 58171 58172 -fi 58173 58174 -for ac_hdr in \ 58175 -getopt.h \ 58176 -locale.h \ 58177 -stdarg.h \ 58178 -sys/ioctl.h \ 58179 -sys/select.h \ 58180 -sys/time.h \ 58181 -termios.h \ 58182 -unistd.h \ 58183 58184 -do 58185 -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 58186 -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 58187 -echo "configure:7042: checking for $ac_hdr" >&5 58188 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 58189 +echo $ac_n "checking for wide alternate character set array""... $ac_c" 1>&6 58190 +echo "configure:8300: checking for wide alternate character set array" >&5 58191 +if eval "test \"`echo '$''{'cf_cv_curses_wacs_map'+set}'`\" = set"; then 58192 echo $ac_n "(cached) $ac_c" 1>&6 58193 else 58194 - cat > conftest.$ac_ext <<EOF 58195 -#line 7047 "configure" 58196 + 58197 + cf_cv_curses_wacs_map=unknown 58198 + for name in wacs_map _wacs_map __wacs_map _nc_wacs 58199 + do 58200 + cat > conftest.$ac_ext <<EOF 58201 +#line 8309 "configure" 58202 #include "confdefs.h" 58203 -#include <$ac_hdr> 58204 + 58205 +#ifndef _XOPEN_SOURCE_EXTENDED 58206 +#define _XOPEN_SOURCE_EXTENDED 58207 +#endif 58208 +#include <${cf_cv_ncurses_header-curses.h}> 58209 +int main() { 58210 +$name['k'] = *WACS_PLUS 58211 +; return 0; } 58212 EOF 58213 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 58214 -{ (eval echo configure:7052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 58215 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 58216 -if test -z "$ac_err"; then 58217 +if { (eval echo configure:8320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 58218 rm -rf conftest* 58219 - eval "ac_cv_header_$ac_safe=yes" 58220 + cf_cv_curses_wacs_map=$name 58221 + break 58222 else 58223 - echo "$ac_err" >&5 58224 echo "configure: failed program was:" >&5 58225 cat conftest.$ac_ext >&5 58226 - rm -rf conftest* 58227 - eval "ac_cv_header_$ac_safe=no" 58228 fi 58229 rm -f conftest* 58230 + done 58231 fi 58232 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 58233 - echo "$ac_t""yes" 1>&6 58234 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 58235 - cat >> confdefs.h <<EOF 58236 -#define $ac_tr_hdr 1 58237 -EOF 58238 - 58239 -else 58240 - echo "$ac_t""no" 1>&6 58241 -fi 58242 -done 58243 58244 +echo "$ac_t""$cf_cv_curses_wacs_map" 1>&6 58245 58246 -for ac_func in \ 58247 -gettimeofday \ 58248 -mblen \ 58249 -mbrlen \ 58250 -mbrtowc \ 58251 -mbsrtowcs \ 58252 -mbstowcs \ 58253 -mbtowc \ 58254 -strdup \ 58255 -wcsrtombs \ 58256 -wcstombs \ 58257 58258 -do 58259 -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 58260 -echo "configure:7093: checking for $ac_func" >&5 58261 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 58262 - echo $ac_n "(cached) $ac_c" 1>&6 58263 -else 58264 - cat > conftest.$ac_ext <<EOF 58265 -#line 7098 "configure" 58266 + 58267 +echo $ac_n "checking for type attr_t in ${cf_cv_ncurses_header-curses.h}""... $ac_c" 1>&6 58268 +echo "configure:8337: checking for type attr_t in ${cf_cv_ncurses_header-curses.h}" >&5 58269 +cat > conftest.$ac_ext <<EOF 58270 +#line 8339 "configure" 58271 #include "confdefs.h" 58272 -/* System header to define __stub macros and hopefully few prototypes, 58273 - which can conflict with char $ac_func(); below. */ 58274 -#include <assert.h> 58275 -/* Override any gcc2 internal prototype to avoid an error. */ 58276 -/* We use char because int might match the return type of a gcc2 58277 - builtin and then its argument prototype would still apply. */ 58278 -char $ac_func(); 58279 58280 +#ifndef _XOPEN_SOURCE_EXTENDED 58281 +#define _XOPEN_SOURCE_EXTENDED 58282 +#endif 58283 +#include <${cf_cv_ncurses_header-curses.h}> 58284 int main() { 58285 58286 -/* The GNU C library defines this for functions which it implements 58287 - to always fail with ENOSYS. Some functions are actually named 58288 - something starting with __ and the normal name is an alias. */ 58289 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) 58290 -choke me 58291 -#else 58292 -$ac_func(); 58293 -#endif 58294 +attr_t foo 58295 58296 ; return 0; } 58297 EOF 58298 -if { (eval echo configure:7121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 58299 +if { (eval echo configure:8352: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 58300 rm -rf conftest* 58301 - eval "ac_cv_func_$ac_func=yes" 58302 + cf_result=yes 58303 else 58304 echo "configure: failed program was:" >&5 58305 cat conftest.$ac_ext >&5 58306 rm -rf conftest* 58307 - eval "ac_cv_func_$ac_func=no" 58308 + cf_result=no 58309 fi 58310 rm -f conftest* 58311 -fi 58312 +echo "$ac_t""$cf_result" 1>&6 58313 +if test $cf_result = yes ; then 58314 + 58315 +cf_result=`echo "have_type_attr_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 58316 58317 -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 58318 - echo "$ac_t""yes" 1>&6 58319 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 58320 - cat >> confdefs.h <<EOF 58321 -#define $ac_tr_func 1 58322 + cat >> confdefs.h <<EOF 58323 +#define $cf_result 1 58324 EOF 58325 - 58326 + 58327 else 58328 - echo "$ac_t""no" 1>&6 58329 + cat >> confdefs.h <<EOF 58330 +#define attr_t long 58331 +EOF 58332 + 58333 fi 58334 -done 58335 58336 58337 58338 -echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6 58339 -echo "configure:7148: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 58340 -if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then 58341 +# This is needed on Tru64 5.0 to declare mbstate_t 58342 +echo $ac_n "checking if we must include wchar.h to declare mbstate_t""... $ac_c" 1>&6 58343 +echo "configure:8382: checking if we must include wchar.h to declare mbstate_t" >&5 58344 +if eval "test \"`echo '$''{'cf_cv_mbstate_t'+set}'`\" = set"; then 37559 58345 echo $ac_n "(cached) $ac_c" 1>&6 37560 58346 else 37561 58347 37562 cf_cv_curses_acs_map=unknown 58348 cat > conftest.$ac_ext <<EOF 58349 -#line 7154 "configure" 58350 +#line 8388 "configure" 58351 #include "confdefs.h" 58352 58353 #include <stdlib.h> 58354 -#include <${cf_cv_ncurses_header-curses.h}> 58355 +#include <stdarg.h> 58356 +#include <stdio.h> 58357 +#ifdef HAVE_LIBUTF8_H 58358 +#include <libutf8.h> 58359 +#endif 58360 int main() { 58361 - 58362 - long x = winnstr(stdscr, "", 0); 58363 - int x1, y1; 58364 - getbegyx(stdscr, y1, x1) 58365 +mbstate_t state 58366 ; return 0; } 58367 EOF 58368 -if { (eval echo configure:7166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 58369 +if { (eval echo configure:8401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 58370 rm -rf conftest* 58371 - cf_cv_need_xopen_extension=no 58372 + cf_cv_mbstate_t=no 58373 else 58374 echo "configure: failed program was:" >&5 58375 cat conftest.$ac_ext >&5 58376 rm -rf conftest* 58377 cat > conftest.$ac_ext <<EOF 58378 -#line 7174 "configure" 58379 +#line 8409 "configure" 58380 #include "confdefs.h" 58381 58382 -#define _XOPEN_SOURCE_EXTENDED 58383 #include <stdlib.h> 58384 -#include <${cf_cv_ncurses_header-curses.h}> 58385 +#include <stdarg.h> 58386 +#include <stdio.h> 58387 +#include <wchar.h> 58388 +#ifdef HAVE_LIBUTF8_H 58389 +#include <libutf8.h> 58390 +#endif 58391 int main() { 58392 - 58393 - long x = winnstr(stdscr, "", 0); 58394 - int x1, y1; 58395 - getbegyx(stdscr, y1, x1) 58396 +mbstate_t value 58397 ; return 0; } 58398 EOF 58399 -if { (eval echo configure:7187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 58400 +if { (eval echo configure:8423: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 58401 rm -rf conftest* 58402 - cf_cv_need_xopen_extension=yes 58403 + cf_cv_mbstate_t=yes 58404 else 58405 echo "configure: failed program was:" >&5 58406 cat conftest.$ac_ext >&5 58407 rm -rf conftest* 58408 - cf_cv_need_xopen_extension=unknown 58409 + cf_cv_mbstate_t=unknown 58410 fi 58411 rm -f conftest* 58412 fi 58413 rm -f conftest* 58414 fi 58415 58416 -echo "$ac_t""$cf_cv_need_xopen_extension" 1>&6 58417 -test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" 58418 +echo "$ac_t""$cf_cv_mbstate_t" 1>&6 58419 58420 +if test "$cf_cv_mbstate_t" = yes ; then 58421 + cat >> confdefs.h <<\EOF 58422 +#define NEED_WCHAR_H 1 58423 +EOF 58424 58425 -echo $ac_n "checking for term.h""... $ac_c" 1>&6 58426 -echo "configure:7206: checking for term.h" >&5 58427 -if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then 58428 + NEED_WCHAR_H=1 58429 +fi 58430 + 58431 + 58432 +# if we do not find mbstate_t in either place, use substitution to provide a fallback. 58433 +if test "$cf_cv_mbstate_t" = unknown ; then 58434 + NCURSES_MBSTATE_T=1 58435 +fi 58436 + 58437 + 58438 +# if we find mbstate_t in either place, use substitution to provide a fallback. 58439 +if test "$cf_cv_mbstate_t" != unknown ; then 58440 + NCURSES_OK_MBSTATE_T=1 58441 +fi 58442 + 58443 + 58444 + 58445 +# This is needed on Tru64 5.0 to declare wchar_t 58446 +echo $ac_n "checking if we must include wchar.h to declare wchar_t""... $ac_c" 1>&6 58447 +echo "configure:8463: checking if we must include wchar.h to declare wchar_t" >&5 58448 +if eval "test \"`echo '$''{'cf_cv_wchar_t'+set}'`\" = set"; then 58449 echo $ac_n "(cached) $ac_c" 1>&6 58450 else 58451 58452 +cat > conftest.$ac_ext <<EOF 58453 +#line 8469 "configure" 58454 +#include "confdefs.h" 58455 58456 -# If we found <ncurses/curses.h>, look for <ncurses/term.h>, but always look 58457 -# for <term.h> if we do not find the variant. 58458 -for cf_header in \ 58459 - `echo ${cf_cv_ncurses_header-curses.h} | sed -e 's%/.*%/%'`term.h \ 58460 - term.h 58461 -do 58462 - cat > conftest.$ac_ext <<EOF 58463 -#line 7219 "configure" 58464 +#include <stdlib.h> 58465 +#include <stdarg.h> 58466 +#include <stdio.h> 58467 +#ifdef HAVE_LIBUTF8_H 58468 +#include <libutf8.h> 58469 +#endif 58470 +int main() { 58471 +wchar_t state 58472 +; return 0; } 58473 +EOF 58474 +if { (eval echo configure:8482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 58475 + rm -rf conftest* 58476 + cf_cv_wchar_t=no 58477 +else 58478 + echo "configure: failed program was:" >&5 58479 + cat conftest.$ac_ext >&5 58480 + rm -rf conftest* 58481 + cat > conftest.$ac_ext <<EOF 58482 +#line 8490 "configure" 58483 #include "confdefs.h" 58484 58485 -#include <${cf_cv_ncurses_header-curses.h}> 58486 -#include <${cf_header}> 58487 +#include <stdlib.h> 58488 +#include <stdarg.h> 58489 +#include <stdio.h> 58490 +#include <wchar.h> 58491 +#ifdef HAVE_LIBUTF8_H 58492 +#include <libutf8.h> 58493 +#endif 58494 int main() { 58495 -WINDOW *x 58496 +wchar_t value 58497 ; return 0; } 58498 EOF 58499 -if { (eval echo configure:7228: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 58500 +if { (eval echo configure:8504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 58501 rm -rf conftest* 58502 - cf_cv_term_header=$cf_header 58503 - break 58504 + cf_cv_wchar_t=yes 58505 else 58506 echo "configure: failed program was:" >&5 58507 cat conftest.$ac_ext >&5 58508 rm -rf conftest* 58509 - cf_cv_term_header=no 58510 + cf_cv_wchar_t=unknown 58511 +fi 58512 +rm -f conftest* 58513 fi 58514 rm -f conftest* 58515 -done 58516 - 58517 fi 58518 58519 -echo "$ac_t""$cf_cv_term_header" 1>&6 58520 - 58521 -case $cf_cv_term_header in #(vi 58522 -term.h) #(vi 58523 - cat >> confdefs.h <<\EOF 58524 -#define HAVE_TERM_H 1 58525 -EOF 58526 - 58527 - ;; 58528 -ncurses/term.h) 58529 - cat >> confdefs.h <<\EOF 58530 -#define HAVE_NCURSES_TERM_H 1 58531 -EOF 58532 +echo "$ac_t""$cf_cv_wchar_t" 1>&6 58533 58534 - ;; 58535 -ncursesw/term.h) 58536 +if test "$cf_cv_wchar_t" = yes ; then 58537 cat >> confdefs.h <<\EOF 58538 -#define HAVE_NCURSESW_TERM_H 1 58539 +#define NEED_WCHAR_H 1 58540 EOF 58541 58542 - ;; 58543 -esac 58544 + NEED_WCHAR_H=1 58545 +fi 58546 58547 58548 +# if we do not find wchar_t in either place, use substitution to provide a fallback. 58549 +if test "$cf_cv_wchar_t" = unknown ; then 58550 + NCURSES_WCHAR_T=1 58551 +fi 58552 58553 58554 -for cf_func in \ 58555 -chgat \ 58556 -color_set \ 58557 -filter \ 58558 -getbegx \ 58559 -getcurx \ 58560 -getmaxx \ 58561 -getnstr \ 58562 -getparx \ 58563 -getwin \ 58564 -mvvline \ 58565 -mvwvline \ 58566 -napms \ 58567 -putwin \ 58568 -resize_term \ 58569 -resizeterm \ 58570 -ripoffline \ 58571 -setupterm \ 58572 -slk_color \ 58573 -slk_init \ 58574 -termattrs \ 58575 -tgetent \ 58576 -tigetnum \ 58577 -tigetstr \ 58578 -typeahead \ 58579 -use_default_colors \ 58580 -vsscanf \ 58581 -wchgat \ 58582 -winsstr \ 58583 -wresize \ 58584 +# if we find wchar_t in either place, use substitution to provide a fallback. 58585 +if test "$cf_cv_wchar_t" != unknown ; then 58586 + NCURSES_OK_WCHAR_T=1 58587 +fi 58588 58589 -do 58590 - 58591 -cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 58592 58593 - echo $ac_n "checking for ${cf_func}""... $ac_c" 1>&6 58594 -echo "configure:7305: checking for ${cf_func}" >&5 58595 - 58596 -echo "${as_me-configure}:7307: testing ${cf_func} ..." 1>&5 58597 58598 - if eval "test \"`echo '$''{'cf_cv_func_$cf_func'+set}'`\" = set"; then 58599 +# This is needed on Tru64 5.0 to declare wint_t 58600 +echo $ac_n "checking if we must include wchar.h to declare wint_t""... $ac_c" 1>&6 58601 +echo "configure:8544: checking if we must include wchar.h to declare wint_t" >&5 58602 +if eval "test \"`echo '$''{'cf_cv_wint_t'+set}'`\" = set"; then 58603 echo $ac_n "(cached) $ac_c" 1>&6 58604 else 58605 58606 - eval cf_result='$ac_cv_func_'$cf_func 58607 - if test ".$cf_result" != ".no"; then 58608 - cat > conftest.$ac_ext <<EOF 58609 -#line 7316 "configure" 58610 +cat > conftest.$ac_ext <<EOF 58611 +#line 8550 "configure" 58612 #include "confdefs.h" 58613 58614 -#ifdef HAVE_XCURSES 58615 -#include <xcurses.h> 58616 -char * XCursesProgramName = "test"; 58617 -#else 58618 -#include <${cf_cv_ncurses_header-curses.h}> 58619 -#if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H) 58620 -#include <ncursesw/term.h> 58621 -#else 58622 -#if defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H) 58623 -#include <ncurses/term.h> 58624 -#else 58625 -#ifdef HAVE_TERM_H 58626 -#include <term.h> 58627 -#endif 58628 -#endif 58629 -#endif 58630 +#include <stdlib.h> 58631 +#include <stdarg.h> 58632 +#include <stdio.h> 58633 +#ifdef HAVE_LIBUTF8_H 58634 +#include <libutf8.h> 58635 #endif 58636 int main() { 58637 +wint_t state 58638 +; return 0; } 58639 +EOF 58640 +if { (eval echo configure:8563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 58641 + rm -rf conftest* 58642 + cf_cv_wint_t=no 58643 +else 58644 + echo "configure: failed program was:" >&5 58645 + cat conftest.$ac_ext >&5 58646 + rm -rf conftest* 58647 + cat > conftest.$ac_ext <<EOF 58648 +#line 8571 "configure" 58649 +#include "confdefs.h" 58650 58651 -#ifndef ${cf_func} 58652 -long foo = (long)(&${cf_func}); 58653 -${cf_cv_main_return-return}(foo == 0); 58654 +#include <stdlib.h> 58655 +#include <stdarg.h> 58656 +#include <stdio.h> 58657 +#include <wchar.h> 58658 +#ifdef HAVE_LIBUTF8_H 58659 +#include <libutf8.h> 58660 #endif 58661 - 58662 +int main() { 58663 +wint_t value 58664 ; return 0; } 58665 EOF 58666 -if { (eval echo configure:7345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 58667 +if { (eval echo configure:8585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 58668 rm -rf conftest* 58669 - cf_result=yes 58670 + cf_cv_wint_t=yes 58671 else 58672 echo "configure: failed program was:" >&5 58673 cat conftest.$ac_ext >&5 58674 rm -rf conftest* 58675 - cf_result=no 58676 + cf_cv_wint_t=unknown 58677 +fi 58678 +rm -f conftest* 58679 fi 58680 rm -f conftest* 58681 - fi 58682 - eval 'cf_cv_func_'$cf_func'=$cf_result' 58683 - 58684 fi 58685 58686 - # use the computed/retrieved cache-value: 58687 - eval 'cf_result=$cf_cv_func_'$cf_func 58688 - echo "$ac_t""$cf_result" 1>&6 58689 - if test $cf_result != no; then 58690 - cat >> confdefs.h <<EOF 58691 -#define HAVE_${cf_tr_func} 1 58692 +echo "$ac_t""$cf_cv_wint_t" 1>&6 58693 + 58694 +if test "$cf_cv_wint_t" = yes ; then 58695 + cat >> confdefs.h <<\EOF 58696 +#define NEED_WCHAR_H 1 58697 EOF 58698 58699 - fi 58700 -done 58701 + NEED_WCHAR_H=1 58702 +fi 58703 58704 58705 -echo $ac_n "checking for ncurses extended functions""... $ac_c" 1>&6 58706 -echo "configure:7373: checking for ncurses extended functions" >&5 58707 -if eval "test \"`echo '$''{'cf_cv_ncurses_ext_funcs'+set}'`\" = set"; then 58708 - echo $ac_n "(cached) $ac_c" 1>&6 58709 -else 58710 - 58711 +# if we do not find wint_t in either place, use substitution to provide a fallback. 58712 +if test "$cf_cv_wint_t" = unknown ; then 58713 + NCURSES_WINT_T=1 58714 +fi 58715 + 58716 + 58717 +# if we find wint_t in either place, use substitution to provide a fallback. 58718 +if test "$cf_cv_wint_t" != unknown ; then 58719 + NCURSES_OK_WINT_T=1 58720 +fi 58721 + 58722 + 58723 + 58724 +if test "$NCURSES_OK_MBSTATE_T" = 0 ; then 58725 + 58726 +echo $ac_n "checking for type mbstate_t in ${cf_cv_ncurses_header-curses.h}""... $ac_c" 1>&6 58727 +echo "configure:8626: checking for type mbstate_t in ${cf_cv_ncurses_header-curses.h}" >&5 58728 cat > conftest.$ac_ext <<EOF 58729 -#line 7379 "configure" 58730 +#line 8628 "configure" 58731 #include "confdefs.h" 58732 58733 +#ifndef _XOPEN_SOURCE_EXTENDED 58734 +#define _XOPEN_SOURCE_EXTENDED 58735 +#endif 58736 #include <${cf_cv_ncurses_header-curses.h}> 58737 int main() { 58738 58739 - (void) assume_default_colors (0, 0); 58740 - (void) curses_version (); 58741 - (void) define_key (0, 0); 58742 - (void) is_term_resized (0, 0); 58743 - (void) key_defined (0); 58744 - (void) keybound (0, 0); 58745 - (void) keyok (0, 0); 58746 - (void) resize_term (0, 0); 58747 - (void) resizeterm (0, 0); 58748 - (void) use_default_colors (); 58749 - (void) use_extended_names (0); 58750 - (void) wresize (0, 0, 0); 58751 +mbstate_t foo 58752 + 58753 ; return 0; } 58754 EOF 58755 -if { (eval echo configure:7399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 58756 +if { (eval echo configure:8641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 58757 rm -rf conftest* 58758 - cf_cv_ncurses_ext_funcs=yes 58759 + cf_result=yes 58760 else 58761 echo "configure: failed program was:" >&5 58762 cat conftest.$ac_ext >&5 58763 rm -rf conftest* 58764 - cf_cv_ncurses_ext_funcs=no 58765 + cf_result=no 58766 fi 58767 rm -f conftest* 58768 +echo "$ac_t""$cf_result" 1>&6 58769 +if test $cf_result = yes ; then 58770 + 58771 +cf_result=`echo "have_type_mbstate_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 58772 58773 -fi 58774 + cat >> confdefs.h <<EOF 58775 +#define $cf_result 1 58776 +EOF 58777 58778 -echo "$ac_t""$cf_cv_ncurses_ext_funcs" 1>&6 58779 -test "$cf_cv_ncurses_ext_funcs" != no && cat >> confdefs.h <<\EOF 58780 -#define NCURSES_EXT_FUNCS 1 58781 +else 58782 + cat >> confdefs.h <<EOF 58783 +#define mbstate_t long 58784 EOF 58785 58786 +fi 58787 58788 -echo $ac_n "checking for wide-character functions""... $ac_c" 1>&6 58789 -echo "configure:7419: checking for wide-character functions" >&5 58790 -if eval "test \"`echo '$''{'cf_cv_widechar_funcs'+set}'`\" = set"; then 58791 - echo $ac_n "(cached) $ac_c" 1>&6 58792 -else 58793 - 58794 +fi 58795 + 58796 +if test "$NCURSES_OK_WCHAR_T" = 0 ; then 58797 + 58798 +echo $ac_n "checking for type wchar_t in ${cf_cv_ncurses_header-curses.h}""... $ac_c" 1>&6 58799 +echo "configure:8672: checking for type wchar_t in ${cf_cv_ncurses_header-curses.h}" >&5 58800 cat > conftest.$ac_ext <<EOF 58801 -#line 7425 "configure" 58802 +#line 8674 "configure" 58803 #include "confdefs.h" 58804 58805 +#ifndef _XOPEN_SOURCE_EXTENDED 58806 +#define _XOPEN_SOURCE_EXTENDED 58807 +#endif 58808 #include <${cf_cv_ncurses_header-curses.h}> 58809 int main() { 58810 58811 - static wchar_t src_wchar[2]; 58812 - static cchar_t dst_cchar; 58813 - setcchar(&dst_cchar, src_wchar, A_NORMAL, 0, (void *) 0); 58814 - 58815 +wchar_t foo 58816 + 58817 ; return 0; } 58818 EOF 58819 -if { (eval echo configure:7437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 58820 +if { (eval echo configure:8687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 58821 rm -rf conftest* 58822 - cf_cv_widechar_funcs=yes 58823 + cf_result=yes 58824 else 58825 echo "configure: failed program was:" >&5 58826 cat conftest.$ac_ext >&5 58827 rm -rf conftest* 58828 - cf_cv_widechar_funcs=no 58829 + cf_result=no 58830 fi 58831 rm -f conftest* 58832 +echo "$ac_t""$cf_result" 1>&6 58833 +if test $cf_result = yes ; then 58834 + 58835 +cf_result=`echo "have_type_wchar_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 58836 58837 -fi 58838 - 58839 -echo "$ac_t""$cf_cv_widechar_funcs" 1>&6 58840 -if test "$cf_cv_widechar_funcs" != no ; then 58841 - cat >> confdefs.h <<\EOF 58842 -#define USE_WIDEC_SUPPORT 1 58843 + cat >> confdefs.h <<EOF 58844 +#define $cf_result 1 58845 EOF 58846 58847 else 58848 - cat >> confdefs.h <<\EOF 58849 -#define USE_WIDEC_SUPPORT 0 58850 + cat >> confdefs.h <<EOF 58851 +#define wchar_t long 58852 EOF 58853 58854 fi 58855 58856 +fi 58857 58858 -echo $ac_n "checking if sys/time.h works with sys/select.h""... $ac_c" 1>&6 58859 -echo "configure:7465: checking if sys/time.h works with sys/select.h" >&5 58860 -if eval "test \"`echo '$''{'cf_cv_sys_time_select'+set}'`\" = set"; then 58861 - echo $ac_n "(cached) $ac_c" 1>&6 58862 -else 58863 - 58864 +if test "$NCURSES_OK_WINT_T" = 0 ; then 58865 + 58866 +echo $ac_n "checking for type wint_t in ${cf_cv_ncurses_header-curses.h}""... $ac_c" 1>&6 58867 +echo "configure:8718: checking for type wint_t in ${cf_cv_ncurses_header-curses.h}" >&5 58868 cat > conftest.$ac_ext <<EOF 58869 -#line 7471 "configure" 58870 +#line 8720 "configure" 58871 #include "confdefs.h" 58872 58873 -#include <sys/types.h> 58874 -#ifdef HAVE_SYS_TIME_H 58875 -#include <sys/time.h> 58876 -#endif 58877 -#ifdef HAVE_SYS_SELECT_H 58878 -#include <sys/select.h> 58879 +#ifndef _XOPEN_SOURCE_EXTENDED 58880 +#define _XOPEN_SOURCE_EXTENDED 58881 #endif 58882 - 58883 +#include <${cf_cv_ncurses_header-curses.h}> 58884 int main() { 58885 58886 +wint_t foo 58887 + 58888 ; return 0; } 58889 EOF 58890 -if { (eval echo configure:7486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 58891 +if { (eval echo configure:8733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 58892 rm -rf conftest* 58893 - cf_cv_sys_time_select=yes 58894 + cf_result=yes 58895 else 58896 echo "configure: failed program was:" >&5 58897 cat conftest.$ac_ext >&5 58898 rm -rf conftest* 58899 - cf_cv_sys_time_select=no 58900 + cf_result=no 58901 fi 58902 rm -f conftest* 58903 - 58904 -fi 58905 +echo "$ac_t""$cf_result" 1>&6 58906 +if test $cf_result = yes ; then 58907 + 58908 +cf_result=`echo "have_type_wint_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 58909 58910 -echo "$ac_t""$cf_cv_sys_time_select" 1>&6 58911 -test "$cf_cv_sys_time_select" = yes && cat >> confdefs.h <<\EOF 58912 -#define HAVE_SYS_TIME_SELECT 1 58913 + cat >> confdefs.h <<EOF 58914 +#define $cf_result 1 58915 EOF 58916 58917 - 58918 - 58919 -echo $ac_n "checking for function curses_version""... $ac_c" 1>&6 58920 -echo "configure:7507: checking for function curses_version" >&5 58921 -if eval "test \"`echo '$''{'cf_cv_func_curses_version'+set}'`\" = set"; then 58922 - echo $ac_n "(cached) $ac_c" 1>&6 58923 -else 58924 - 58925 -if test "$cross_compiling" = yes; then 58926 - cf_cv_func_curses_version=unknown 58927 else 58928 - cat > conftest.$ac_ext <<EOF 58929 -#line 7516 "configure" 58930 -#include "confdefs.h" 58931 - 58932 -#include <${cf_cv_ncurses_header-curses.h}> 58933 -int main() 58934 -{ 58935 - char temp[1024]; 58936 - sprintf(temp, "%s\n", curses_version()); 58937 - ${cf_cv_main_return-return}(0); 58938 -} 58939 - 58940 + cat >> confdefs.h <<EOF 58941 +#define wint_t long 58942 EOF 58943 -if { (eval echo configure:7528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 58944 -then 58945 - cf_cv_func_curses_version=yes 58946 - 58947 -else 58948 - echo "configure: failed program was:" >&5 58949 - cat conftest.$ac_ext >&5 58950 - rm -fr conftest* 58951 - cf_cv_func_curses_version=no 58952 58953 fi 58954 -rm -fr conftest* 58955 -fi 58956 58957 -rm -f core 58958 fi 58959 58960 -echo "$ac_t""$cf_cv_func_curses_version" 1>&6 58961 -test "$cf_cv_func_curses_version" = yes && cat >> confdefs.h <<\EOF 58962 -#define HAVE_CURSES_VERSION 1 58963 -EOF 58964 - 58965 - 58966 58967 -echo $ac_n "checking for alternate character set array""... $ac_c" 1>&6 58968 -echo "configure:7553: checking for alternate character set array" >&5 58969 -if eval "test \"`echo '$''{'cf_cv_curses_acs_map'+set}'`\" = set"; then 58970 - echo $ac_n "(cached) $ac_c" 1>&6 58971 -else 58972 - 58973 -cf_cv_curses_acs_map=unknown 37563 58974 -for name in acs_map _acs_map __acs_map _nc_acs_map 37564 +for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map 37565 do 58975 -do 58976 +echo $ac_n "checking for data boolnames declaration in ${cf_cv_ncurses_header-curses.h}""... $ac_c" 1>&6 58977 +echo "configure:8763: checking for data boolnames declaration in ${cf_cv_ncurses_header-curses.h}" >&5 37566 58978 cat > conftest.$ac_ext <<EOF 37567 58979 -#line 7562 "configure" 37568 +#line 8 265 "configure"58980 +#line 8765 "configure" 37569 58981 #include "confdefs.h" 37570 58982 58983 +#ifdef HAVE_XCURSES 58984 +#include <xcurses.h> 58985 +char * XCursesProgramName = "test"; 58986 +#else 37571 58987 #include <${cf_cv_ncurses_header-curses.h}> 37572 @@ -7569,7 +8272,7 @@ 58988 +#if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H) 58989 +#include <ncursesw/term.h> 58990 +#elif defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H) 58991 +#include <ncurses/term.h> 58992 +#elif defined(HAVE_TERM_H) 58993 +#include <term.h> 58994 +#endif 58995 +#endif 58996 58997 int main() { 58998 58999 -$name['k'] = ACS_PLUS 59000 +void *foo = &(boolnames) 37573 59001 37574 59002 ; return 0; } 37575 59003 EOF 37576 59004 -if { (eval echo configure:7573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37577 +if { (eval echo configure:8 276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then59005 +if { (eval echo configure:8788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 37578 59006 rm -rf conftest* 37579 cf_cv_curses_acs_map=$name; break 59007 - cf_cv_curses_acs_map=$name; break 59008 + cf_result=yes 37580 59009 else 37581 @@ -7590,7 +8293,7 @@ 37582 37583 37584 echo $ac_n "checking for wide alternate character set array""... $ac_c" 1>&6 59010 echo "configure: failed program was:" >&5 59011 cat conftest.$ac_ext >&5 59012 + rm -rf conftest* 59013 + cf_result=no 59014 fi 59015 rm -f conftest* 59016 -done 59017 - 59018 -fi 59019 - 59020 -echo "$ac_t""$cf_cv_curses_acs_map" 1>&6 59021 +echo "$ac_t""$cf_result" 1>&6 59022 +if test $cf_result = yes ; then 59023 + 59024 +cf_result=`echo "have_curses_data_boolnames" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 59025 59026 -test "$cf_cv_curses_acs_map" != unknown && cat >> confdefs.h <<EOF 59027 -#define CURSES_ACS_ARRAY $cf_cv_curses_acs_map 59028 + cat >> confdefs.h <<EOF 59029 +#define $cf_result 1 59030 EOF 59031 59032 - 59033 - 59034 -echo $ac_n "checking for wide alternate character set array""... $ac_c" 1>&6 37585 59035 -echo "configure:7594: checking for wide alternate character set array" >&5 37586 +echo "configure:8297: checking for wide alternate character set array" >&5 37587 if eval "test \"`echo '$''{'cf_cv_curses_wacs_map'+set}'`\" = set"; then 37588 echo $ac_n "(cached) $ac_c" 1>&6 59036 -if eval "test \"`echo '$''{'cf_cv_curses_wacs_map'+set}'`\" = set"; then 59037 - echo $ac_n "(cached) $ac_c" 1>&6 37589 59038 else 37590 @@ -7599,7 +8302,7 @@ 37591 for name in wacs_map _wacs_map __wacs_map _nc_wacs 37592 do 59039 - 59040 - cf_cv_curses_wacs_map=unknown 59041 - for name in wacs_map _wacs_map __wacs_map _nc_wacs 59042 - do 59043 + echo $ac_n "checking for data boolnames in library""... $ac_c" 1>&6 59044 +echo "configure:8809: checking for data boolnames in library" >&5 37593 59045 cat > conftest.$ac_ext <<EOF 37594 59046 -#line 7603 "configure" 37595 +#line 8 306"configure"59047 +#line 8811 "configure" 37596 59048 #include "confdefs.h" 37597 59049 37598 #ifndef _XOPEN_SOURCE_EXTENDED 37599 @@ -7610,7 +8313,7 @@ 37600 $name['k'] = *WACS_PLUS 59050 -#ifndef _XOPEN_SOURCE_EXTENDED 59051 -#define _XOPEN_SOURCE_EXTENDED 59052 -#endif 59053 +#ifdef HAVE_XCURSES 59054 +#include <xcurses.h> 59055 +char * XCursesProgramName = "test"; 59056 +#else 59057 #include <${cf_cv_ncurses_header-curses.h}> 59058 +#if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H) 59059 +#include <ncursesw/term.h> 59060 +#elif defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H) 59061 +#include <ncurses/term.h> 59062 +#elif defined(HAVE_TERM_H) 59063 +#include <term.h> 59064 +#endif 59065 +#endif 59066 + 59067 +extern char boolnames; 59068 int main() { 59069 -$name['k'] = *WACS_PLUS 59070 + 59071 + do { 59072 + void *foo = &(boolnames); 59073 + ${cf_cv_main_return-return}(foo == 0); 59074 + } while (0) 59075 + 37601 59076 ; return 0; } 37602 59077 EOF 37603 59078 -if { (eval echo configure:7614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37604 +if { (eval echo configure:8 317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then59079 +if { (eval echo configure:8838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37605 59080 rm -rf conftest* 37606 cf_cv_curses_wacs_map=$name 37607 break 37608 @@ -7626,9 +8329,9 @@ 37609 37610 37611 echo $ac_n "checking for type attr_t in ${cf_cv_ncurses_header-curses.h}""... $ac_c" 1>&6 59081 - cf_cv_curses_wacs_map=$name 59082 - break 59083 + cf_result=yes 59084 else 59085 echo "configure: failed program was:" >&5 59086 cat conftest.$ac_ext >&5 59087 + rm -rf conftest* 59088 + cf_result=no 59089 fi 59090 rm -f conftest* 59091 - done 59092 -fi 59093 + echo "$ac_t""$cf_result" 1>&6 59094 + if test $cf_result = yes ; then 59095 + 59096 +cf_result=`echo "decl_curses_data_boolnames" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 59097 59098 -echo "$ac_t""$cf_cv_curses_wacs_map" 1>&6 59099 + cat >> confdefs.h <<EOF 59100 +#define $cf_result 1 59101 +EOF 59102 59103 + fi 59104 +fi 59105 59106 -echo $ac_n "checking for type attr_t in ${cf_cv_ncurses_header-curses.h}""... $ac_c" 1>&6 37612 59107 -echo "configure:7630: checking for type attr_t in ${cf_cv_ncurses_header-curses.h}" >&5 37613 +echo "configure:8333: checking for type attr_t in ${cf_cv_ncurses_header-curses.h}" >&5 59108 + 59109 +echo $ac_n "checking for data boolfnames declaration in ${cf_cv_ncurses_header-curses.h}""... $ac_c" 1>&6 59110 +echo "configure:8862: checking for data boolfnames declaration in ${cf_cv_ncurses_header-curses.h}" >&5 37614 59111 cat > conftest.$ac_ext <<EOF 37615 59112 -#line 7632 "configure" 37616 +#line 8 335"configure"59113 +#line 8864 "configure" 37617 59114 #include "confdefs.h" 37618 59115 37619 #ifndef _XOPEN_SOURCE_EXTENDED 37620 @@ -7641,7 +8344,7 @@ 59116 -#ifndef _XOPEN_SOURCE_EXTENDED 59117 -#define _XOPEN_SOURCE_EXTENDED 59118 -#endif 59119 +#ifdef HAVE_XCURSES 59120 +#include <xcurses.h> 59121 +char * XCursesProgramName = "test"; 59122 +#else 59123 #include <${cf_cv_ncurses_header-curses.h}> 59124 +#if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H) 59125 +#include <ncursesw/term.h> 59126 +#elif defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H) 59127 +#include <ncurses/term.h> 59128 +#elif defined(HAVE_TERM_H) 59129 +#include <term.h> 59130 +#endif 59131 +#endif 59132 + 59133 int main() { 59134 59135 -attr_t foo 59136 +void *foo = &(boolfnames) 37621 59137 37622 59138 ; return 0; } 37623 59139 EOF 37624 59140 -if { (eval echo configure:7645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 37625 +if { (eval echo configure:8 348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then59141 +if { (eval echo configure:8887: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 37626 59142 rm -rf conftest* 37627 59143 cf_result=yes 37628 59144 else 37629 @@ -7669,9 +8372,9 @@ 37630 37631 37632 echo $ac_n "checking for type mbstate_t in ${cf_cv_ncurses_header-curses.h}""... $ac_c" 1>&6 59145 @@ -7654,37 +8896,44 @@ 59146 echo "$ac_t""$cf_result" 1>&6 59147 if test $cf_result = yes ; then 59148 59149 -cf_result=`echo "have_type_attr_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 59150 +cf_result=`echo "have_curses_data_boolfnames" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 59151 59152 cat >> confdefs.h <<EOF 59153 #define $cf_result 1 59154 EOF 59155 59156 else 59157 - cat >> confdefs.h <<EOF 59158 -#define attr_t long 59159 -EOF 59160 - 59161 -fi 59162 - 59163 - 59164 -echo $ac_n "checking for type mbstate_t in ${cf_cv_ncurses_header-curses.h}""... $ac_c" 1>&6 37633 59165 -echo "configure:7673: checking for type mbstate_t in ${cf_cv_ncurses_header-curses.h}" >&5 37634 +echo "configure:8376: checking for type mbstate_t in ${cf_cv_ncurses_header-curses.h}" >&5 37635 cat > conftest.$ac_ext <<EOF 59166 -cat > conftest.$ac_ext <<EOF 37636 59167 -#line 7675 "configure" 37637 +#line 8378 "configure" 59168 + echo $ac_n "checking for data boolfnames in library""... $ac_c" 1>&6 59169 +echo "configure:8908: checking for data boolfnames in library" >&5 59170 + cat > conftest.$ac_ext <<EOF 59171 +#line 8910 "configure" 37638 59172 #include "confdefs.h" 37639 59173 37640 #ifndef _XOPEN_SOURCE_EXTENDED 37641 @@ -7684,7 +8387,7 @@ 59174 -#ifndef _XOPEN_SOURCE_EXTENDED 59175 -#define _XOPEN_SOURCE_EXTENDED 59176 -#endif 59177 +#ifdef HAVE_XCURSES 59178 +#include <xcurses.h> 59179 +char * XCursesProgramName = "test"; 59180 +#else 59181 #include <${cf_cv_ncurses_header-curses.h}> 59182 +#if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H) 59183 +#include <ncursesw/term.h> 59184 +#elif defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H) 59185 +#include <ncurses/term.h> 59186 +#elif defined(HAVE_TERM_H) 59187 +#include <term.h> 59188 +#endif 59189 +#endif 59190 + 59191 +extern char boolfnames; 59192 int main() { 59193 59194 -mbstate_t foo 59195 + do { 59196 + void *foo = &(boolfnames); 59197 + ${cf_cv_main_return-return}(foo == 0); 59198 + } while (0) 37642 59199 37643 59200 ; return 0; } 37644 59201 EOF 37645 59202 -if { (eval echo configure:7688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 37646 +if { (eval echo configure:8 391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5;}; then59203 +if { (eval echo configure:8937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37647 59204 rm -rf conftest* 37648 59205 cf_result=yes 37649 59206 else 37650 @@ -7891,11 +8594,13 @@ 59207 @@ -7694,20 +8943,16 @@ 59208 cf_result=no 59209 fi 59210 rm -f conftest* 59211 -echo "$ac_t""$cf_result" 1>&6 59212 -if test $cf_result = yes ; then 59213 - 59214 -cf_result=`echo "have_type_mbstate_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 59215 + echo "$ac_t""$cf_result" 1>&6 59216 + if test $cf_result = yes ; then 59217 + 59218 +cf_result=`echo "decl_curses_data_boolfnames" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 59219 59220 - cat >> confdefs.h <<EOF 59221 + cat >> confdefs.h <<EOF 59222 #define $cf_result 1 59223 EOF 59224 59225 -else 59226 - cat >> confdefs.h <<EOF 59227 -#define mbstate_t long 59228 -EOF 59229 - 59230 + fi 59231 fi 59232 59233 59234 @@ -7891,11 +9136,13 @@ 37651 59235 s%@SHOW_CC@%$SHOW_CC%g 37652 59236 s%@ECHO_CC@%$ECHO_CC%g … … 37664 59248 diff -Naur ncurses-5.7.orig/test/configure.in ncurses-5.7/test/configure.in 37665 59249 --- ncurses-5.7.orig/test/configure.in 2008-09-06 15:10:23.000000000 -0700 37666 +++ ncurses-5.7/test/configure.in 2009-06-05 14:01:30.000000000 -0700 59250 +++ ncurses-5.7/test/configure.in 2009-07-19 15:04:17.000000000 -0700 59251 @@ -1,5 +1,5 @@ 59252 dnl*************************************************************************** 59253 -dnl Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 59254 +dnl Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 59255 dnl * 59256 dnl Permission is hereby granted, free of charge, to any person obtaining a * 59257 dnl copy of this software and associated documentation files (the * 37667 59258 @@ -28,7 +28,7 @@ 37668 59259 dnl … … 37670 59261 dnl 37671 59262 -dnl $Id: configure.in,v 1.67 2008/09/06 22:10:23 tom Exp $ 37672 +dnl $Id: configure.in,v 1. 68 2009/03/28 19:49:55tom Exp $59263 +dnl $Id: configure.in,v 1.74 2009/07/18 20:52:09 tom Exp $ 37673 59264 dnl This is a simple configuration-script for the ncurses test programs that 37674 59265 dnl allows the test-directory to be separately configured against a reference 37675 59266 dnl system (i.e., sysvr4 curses) 37676 @@ -125,14 +125,12 @@ 37677 CF_CURSES_LIBS 59267 @@ -120,19 +120,15 @@ 59268 59269 case $cf_cv_screen in 59270 curses) 59271 - CF_CURSES_CPPFLAGS 59272 - CF_NCURSES_VERSION 59273 - CF_CURSES_LIBS 59274 + CF_CURSES_CONFIG 37678 59275 ;; 37679 59276 ncurses) … … 37691 59288 pdcurses) #(vi 37692 59289 CF_PDCURSES_X11 59290 @@ -218,6 +214,7 @@ 59291 tigetstr \ 59292 typeahead \ 59293 use_default_colors \ 59294 +vw_printw \ 59295 vsscanf \ 59296 wchgat \ 59297 winsstr \ 59298 @@ -266,8 +263,27 @@ 59299 CF_FUNC_CURSES_VERSION 59300 CF_CURSES_ACS_MAP 59301 CF_CURSES_WACS_MAP 59302 + 59303 CF_CURSES_CHECK_TYPE(attr_t,long) 59304 -CF_CURSES_CHECK_TYPE(mbstate_t,long) 59305 + 59306 +CF_WCHAR_TYPE(mbstate_t, NCURSES_MBSTATE_T, NCURSES_OK_MBSTATE_T) 59307 +CF_WCHAR_TYPE(wchar_t, NCURSES_WCHAR_T, NCURSES_OK_WCHAR_T) 59308 +CF_WCHAR_TYPE(wint_t, NCURSES_WINT_T, NCURSES_OK_WINT_T) 59309 + 59310 +if test "$NCURSES_OK_MBSTATE_T" = 0 ; then 59311 + CF_CURSES_CHECK_TYPE(mbstate_t,long) 59312 +fi 59313 + 59314 +if test "$NCURSES_OK_WCHAR_T" = 0 ; then 59315 + CF_CURSES_CHECK_TYPE(wchar_t,long) 59316 +fi 59317 + 59318 +if test "$NCURSES_OK_WINT_T" = 0 ; then 59319 + CF_CURSES_CHECK_TYPE(wint_t,long) 59320 +fi 59321 + 59322 +CF_CURSES_CHECK_DATA(boolnames) 59323 +CF_CURSES_CHECK_DATA(boolfnames) 59324 59325 TEST_ARGS="$LIBS" 59326 LIBS= 37693 59327 diff -Naur ncurses-5.7.orig/test/demo_forms.c ncurses-5.7/test/demo_forms.c 37694 59328 --- ncurses-5.7.orig/test/demo_forms.c 2008-10-18 13:38:20.000000000 -0700 37695 +++ ncurses-5.7/test/demo_forms.c 2009-0 6-05 14:01:55.000000000 -070059329 +++ ncurses-5.7/test/demo_forms.c 2009-07-19 15:04:04.000000000 -0700 37696 59330 @@ -1,5 +1,5 @@ 37697 59331 /**************************************************************************** … … 37746 59380 nl(); 37747 59381 59382 diff -Naur ncurses-5.7.orig/test/demo_terminfo.c ncurses-5.7/test/demo_terminfo.c 59383 --- ncurses-5.7.orig/test/demo_terminfo.c 1969-12-31 16:00:00.000000000 -0800 59384 +++ ncurses-5.7/test/demo_terminfo.c 2009-07-19 15:04:17.000000000 -0700 59385 @@ -0,0 +1,304 @@ 59386 +/**************************************************************************** 59387 + * Copyright (c) 2009 Free Software Foundation, Inc. * 59388 + * * 59389 + * Permission is hereby granted, free of charge, to any person obtaining a * 59390 + * copy of this software and associated documentation files (the * 59391 + * "Software"), to deal in the Software without restriction, including * 59392 + * without limitation the rights to use, copy, modify, merge, publish, * 59393 + * distribute, distribute with modifications, sublicense, and/or sell * 59394 + * copies of the Software, and to permit persons to whom the Software is * 59395 + * furnished to do so, subject to the following conditions: * 59396 + * * 59397 + * The above copyright notice and this permission notice shall be included * 59398 + * in all copies or substantial portions of the Software. * 59399 + * * 59400 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * 59401 + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * 59402 + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * 59403 + * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * 59404 + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * 59405 + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * 59406 + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * 59407 + * * 59408 + * Except as contained in this notice, the name(s) of the above copyright * 59409 + * holders shall not be used in advertising or otherwise to promote the * 59410 + * sale, use or other dealings in this Software without prior written * 59411 + * authorization. * 59412 + ****************************************************************************/ 59413 + 59414 +/* 59415 + * Author: Thomas E. Dickey 59416 + * 59417 + * $Id: demo_terminfo.c,v 1.6 2009/07/17 01:02:08 tom Exp $ 59418 + * 59419 + * A simple demo of the terminfo interface. 59420 + */ 59421 +#define USE_TINFO 59422 +#include <test.priv.h> 59423 + 59424 +#ifdef NCURSES_VERSION 59425 +#if NCURSES_XNAMES 59426 +#include <term_entry.h> 59427 +#endif 59428 +#endif 59429 + 59430 +#if defined(HAVE_CURSES_DATA_BOOLNAMES) || defined(DECL_CURSES_DATA_BOOLNAMES) 59431 + 59432 +static bool b_opt = FALSE; 59433 +static bool f_opt = FALSE; 59434 +static bool n_opt = FALSE; 59435 +static bool s_opt = FALSE; 59436 +static bool x_opt = FALSE; 59437 + 59438 +#define FCOLS 8 59439 +#define FNAME(type) "%s %-*s = ", #type, FCOLS 59440 + 59441 +static void 59442 +dumpit(NCURSES_CONST char *cap) 59443 +{ 59444 + /* 59445 + * One of the limitations of the termcap interface is that the library 59446 + * cannot determine the size of the buffer passed via tgetstr(), nor the 59447 + * amount of space remaining. This demo simply reuses the whole buffer 59448 + * for each call; a normal termcap application would try to use the buffer 59449 + * to hold all of the strings extracted from the terminal entry. 59450 + */ 59451 + const char *str; 59452 + int num; 59453 + 59454 + if ((str = tigetstr(cap)) != 0 && (str != (char *) -1)) { 59455 + /* 59456 + * Note that the strings returned are mostly terminfo format, since 59457 + * ncurses does not convert except for a handful of special cases. 59458 + */ 59459 + printf(FNAME(str), cap); 59460 + while (*str != 0) { 59461 + int ch = UChar(*str++); 59462 + switch (ch) { 59463 + case '\177': 59464 + fputs("^?", stdout); 59465 + break; 59466 + case '\033': 59467 + fputs("\\E", stdout); 59468 + break; 59469 + case '\b': 59470 + fputs("\\b", stdout); 59471 + break; 59472 + case '\f': 59473 + fputs("\\f", stdout); 59474 + break; 59475 + case '\n': 59476 + fputs("\\n", stdout); 59477 + break; 59478 + case '\r': 59479 + fputs("\\r", stdout); 59480 + break; 59481 + case ' ': 59482 + fputs("\\s", stdout); 59483 + break; 59484 + case '\t': 59485 + fputs("\\t", stdout); 59486 + break; 59487 + case '^': 59488 + fputs("\\^", stdout); 59489 + break; 59490 + case ':': 59491 + fputs("\\072", stdout); 59492 + break; 59493 + case '\\': 59494 + fputs("\\\\", stdout); 59495 + break; 59496 + default: 59497 + if (isgraph(ch)) 59498 + fputc(ch, stdout); 59499 + else if (ch < 32) 59500 + printf("^%c", ch + '@'); 59501 + else 59502 + printf("\\%03o", ch); 59503 + break; 59504 + } 59505 + } 59506 + printf("\n"); 59507 + } else if ((num = tigetnum(cap)) >= 0) { 59508 + printf(FNAME(num), cap); 59509 + printf(" %d\n", num); 59510 + } else if ((num = tigetflag(cap)) >= 0) { 59511 + printf(FNAME(flg), cap); 59512 + printf("%s\n", num ? "true" : "false"); 59513 + } 59514 + fflush(stdout); 59515 +} 59516 + 59517 +static void 59518 +demo_terminfo(char *name) 59519 +{ 59520 + unsigned n; 59521 + NCURSES_CONST char *cap; 59522 + 59523 + printf("Terminal type \"%s\"\n", name); 59524 + setupterm(name, 1, (int *) 0); 59525 + 59526 + if (b_opt) { 59527 + for (n = 0;; ++n) { 59528 + cap = f_opt ? boolfnames[n] : boolnames[n]; 59529 + if (cap == 0) 59530 + break; 59531 + dumpit(cap); 59532 + } 59533 + } 59534 + 59535 + if (n_opt) { 59536 + for (n = 0;; ++n) { 59537 + cap = f_opt ? numfnames[n] : numnames[n]; 59538 + if (cap == 0) 59539 + break; 59540 + dumpit(cap); 59541 + } 59542 + } 59543 + 59544 + if (s_opt) { 59545 + for (n = 0;; ++n) { 59546 + cap = f_opt ? strfnames[n] : strnames[n]; 59547 + if (cap == 0) 59548 + break; 59549 + dumpit(cap); 59550 + } 59551 + } 59552 +#ifdef NCURSES_VERSION 59553 + if (x_opt) { 59554 + int mod; 59555 + if (f_opt) { 59556 +#if NCURSES_XNAMES 59557 + TERMTYPE *term = &(cur_term->type); 59558 + if (term != 0 59559 + && ((NUM_BOOLEANS(term) != BOOLCOUNT) 59560 + || (NUM_NUMBERS(term) != NUMCOUNT) 59561 + || (NUM_STRINGS(term) != STRCOUNT))) { 59562 + for (n = BOOLCOUNT; n < NUM_BOOLEANS(term); ++n) { 59563 + dumpit(ExtBoolname(term, n, boolnames)); 59564 + } 59565 + for (n = NUMCOUNT; n < NUM_NUMBERS(term); ++n) { 59566 + dumpit(ExtNumname(term, n, numnames)); 59567 + } 59568 + for (n = STRCOUNT; n < NUM_STRINGS(term); ++n) { 59569 + dumpit(ExtStrname(term, n, strnames)); 59570 + } 59571 + } 59572 +#endif 59573 + } else { 59574 + char temp[10]; 59575 + static const char *xterm_keys[] = 59576 + { 59577 + "kDC", "kDN", "kEND", "kHOM", "kIC", 59578 + "kLFT", "kNXT", "kPRV", "kRIT", "kUP", 59579 + }; 59580 + for (n = 0; n < SIZEOF(xterm_keys); ++n) { 59581 + for (mod = 0; mod < 8; ++mod) { 59582 + if (mod == 0) 59583 + strcpy(temp, xterm_keys[n]); 59584 + else 59585 + sprintf(temp, "%s%d", xterm_keys[n], mod); 59586 + dumpit(temp); 59587 + } 59588 + } 59589 + } 59590 + } 59591 +#endif 59592 + 59593 +} 59594 + 59595 +static void 59596 +usage(void) 59597 +{ 59598 + static const char *msg[] = 59599 + { 59600 + "Usage: demo_terminfo [options] [terminal]", 59601 + "", 59602 + "If no options are given, print all (boolean, numeric, string)", 59603 + "capabilities for the given terminal, using short names.", 59604 + "", 59605 + "Options:", 59606 + " -b print boolean-capabilities", 59607 + " -f print full names", 59608 + " -n print numeric-capabilities", 59609 + " -r COUNT repeat for given count", 59610 + " -s print string-capabilities", 59611 +#ifdef NCURSES_VERSION 59612 + " -x print extended capabilities", 59613 +#endif 59614 + }; 59615 + unsigned n; 59616 + for (n = 0; n < SIZEOF(msg); ++n) { 59617 + fprintf(stderr, "%s\n", msg[n]); 59618 + } 59619 + ExitProgram(EXIT_FAILURE); 59620 +} 59621 + 59622 +int 59623 +main(int argc, char *argv[]) 59624 +{ 59625 + int n; 59626 + int repeat; 59627 + char *name; 59628 + int r_opt = 1; 59629 + 59630 + while ((n = getopt(argc, argv, "bfnr:sx")) != -1) { 59631 + switch (n) { 59632 + case 'b': 59633 + b_opt = TRUE; 59634 + break; 59635 + case 'f': 59636 + f_opt = TRUE; 59637 + break; 59638 + case 'n': 59639 + n_opt = TRUE; 59640 + break; 59641 + case 'r': 59642 + if ((r_opt = atoi(optarg)) <= 0) 59643 + usage(); 59644 + break; 59645 + case 's': 59646 + s_opt = TRUE; 59647 + break; 59648 +#ifdef NCURSES_VERSION 59649 + case 'x': 59650 + x_opt = TRUE; 59651 + use_extended_names(TRUE); 59652 + break; 59653 +#endif 59654 + default: 59655 + usage(); 59656 + break; 59657 + } 59658 + } 59659 + 59660 + if (!(b_opt || n_opt || s_opt || x_opt)) { 59661 + b_opt = TRUE; 59662 + n_opt = TRUE; 59663 + s_opt = TRUE; 59664 + } 59665 + 59666 + for (repeat = 0; repeat < r_opt; ++repeat) { 59667 + if (optind < argc) { 59668 + for (n = optind; n < argc; ++n) { 59669 + demo_terminfo(argv[n]); 59670 + } 59671 + } else if ((name = getenv("TERM")) != 0) { 59672 + demo_terminfo(name); 59673 + } else { 59674 + static char dumb[] = "dumb"; 59675 + demo_terminfo(dumb); 59676 + } 59677 + } 59678 + 59679 + ExitProgram(EXIT_SUCCESS); 59680 +} 59681 + 59682 +#else 59683 +int 59684 +main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) 59685 +{ 59686 + printf("This program requires the terminfo arrays\n"); 59687 + ExitProgram(EXIT_FAILURE); 59688 +} 59689 +#endif 37748 59690 diff -Naur ncurses-5.7.orig/test/ditto.c ncurses-5.7/test/ditto.c 37749 59691 --- ncurses-5.7.orig/test/ditto.c 2008-08-04 06:21:41.000000000 -0700 37750 +++ ncurses-5.7/test/ditto.c 2009-0 6-05 14:01:49.000000000 -070059692 +++ ncurses-5.7/test/ditto.c 2009-07-19 15:04:17.000000000 -0700 37751 59693 @@ -29,7 +29,7 @@ 37752 59694 /* … … 37754 59696 * 37755 59697 - * $Id: ditto.c,v 1.32 2008/08/04 13:21:41 tom Exp $ 37756 + * $Id: ditto.c,v 1.3 3 2008/11/16 00:19:59 juergenExp $59698 + * $Id: ditto.c,v 1.34 2009/07/17 00:07:25 tom Exp $ 37757 59699 * 37758 59700 * The program illustrates how to set up multiple screens from a single … … 37789 59731 target->output, 37790 59732 target->input); 37791 @@ -248, 7 +253,11@@59733 @@ -248,9 +253,15 @@ 37792 59734 } 37793 59735 … … 37800 59742 + void *arg GCC_UNUSED) 37801 59743 { 59744 +#if HAVE_USE_WINDOW 37802 59745 (void) sp; 59746 +#endif 37803 59747 (void) arg; 37804 @@ -259,7 +268,11 @@ 59748 return endwin(); 59749 } 59750 @@ -259,7 +270,11 @@ 37805 59751 * Read data from the 'source' screen. 37806 59752 */ … … 37815 59761 DDATA *data = (DDATA *) arg; 37816 59762 DITTO *ditto = &(data->ditto[data->source]); 37817 @@ -278,7 +29 1,11 @@59763 @@ -278,7 +293,11 @@ 37818 59764 * Write all of the data that's in fifos for the 'target' screen. 37819 59765 */ … … 37828 59774 DDATA *data = (DDATA *) arg; 37829 59775 DITTO *ditto = &(data->ditto[data->target]); 37830 @@ -360,7 +37 7,7 @@59776 @@ -360,7 +379,7 @@ 37831 59777 37832 59778 if (argc <= 1) … … 37839 59785 diff -Naur ncurses-5.7.orig/test/edit_field.c ncurses-5.7/test/edit_field.c 37840 59786 --- ncurses-5.7.orig/test/edit_field.c 2008-10-18 13:40:20.000000000 -0700 37841 +++ ncurses-5.7/test/edit_field.c 2009-0 6-05 14:00:59.000000000 -070059787 +++ ncurses-5.7/test/edit_field.c 2009-07-19 15:02:04.000000000 -0700 37842 59788 @@ -26,7 +26,7 @@ 37843 59789 * authorization. * … … 37862 59808 diff -Naur ncurses-5.7.orig/test/edit_field.h ncurses-5.7/test/edit_field.h 37863 59809 --- ncurses-5.7.orig/test/edit_field.h 2006-06-03 09:38:57.000000000 -0700 37864 +++ ncurses-5.7/test/edit_field.h 2009-0 6-05 14:00:59.000000000 -070059810 +++ ncurses-5.7/test/edit_field.h 2009-07-19 15:02:04.000000000 -0700 37865 59811 @@ -1,5 +1,5 @@ 37866 59812 /**************************************************************************** … … 37892 59838 diff -Naur ncurses-5.7.orig/test/filter.c ncurses-5.7/test/filter.c 37893 59839 --- ncurses-5.7.orig/test/filter.c 2006-12-09 08:53:47.000000000 -0800 37894 +++ ncurses-5.7/test/filter.c 2009-0 6-05 14:00:55.000000000 -070059840 +++ ncurses-5.7/test/filter.c 2009-07-19 15:02:00.000000000 -0700 37895 59841 @@ -1,5 +1,5 @@ 37896 59842 /**************************************************************************** … … 37962 59908 keypad(stdscr, TRUE); 37963 59909 59910 diff -Naur ncurses-5.7.orig/test/firstlast.c ncurses-5.7/test/firstlast.c 59911 --- ncurses-5.7.orig/test/firstlast.c 2006-04-01 11:03:18.000000000 -0800 59912 +++ ncurses-5.7/test/firstlast.c 2009-07-19 15:04:17.000000000 -0700 59913 @@ -1,5 +1,5 @@ 59914 /**************************************************************************** 59915 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 59916 + * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. * 59917 * * 59918 * Permission is hereby granted, free of charge, to any person obtaining a * 59919 * copy of this software and associated documentation files (the * 59920 @@ -29,7 +29,7 @@ 59921 * This test was written by Alexander V. Lukyanov to demonstrate difference 59922 * between ncurses 4.1 and SVR4 curses 59923 * 59924 - * $Id: firstlast.c,v 1.5 2006/04/01 19:03:18 tom Exp $ 59925 + * $Id: firstlast.c,v 1.6 2009/07/15 23:29:46 tom Exp $ 59926 */ 59927 59928 #include <test.priv.h> 59929 @@ -38,12 +38,19 @@ 59930 fill(WINDOW *w, const char *str) 59931 { 59932 const char *s; 59933 + int x0 = -1, y0 = -1; 59934 + int x1, y1; 59935 + 59936 for (;;) { 59937 for (s = str; *s; s++) { 59938 - if (waddch(w, UChar(*s)) == ERR) { 59939 + getyx(w, y1, x1); 59940 + if (waddch(w, UChar(*s)) == ERR 59941 + || (x1 == x0 && y1 == y0)) { 59942 wmove(w, 0, 0); 59943 return; 59944 } 59945 + x0 = x1; 59946 + y0 = y1; 59947 } 59948 } 59949 } 37964 59950 diff -Naur ncurses-5.7.orig/test/insdelln.c ncurses-5.7/test/insdelln.c 37965 59951 --- ncurses-5.7.orig/test/insdelln.c 1969-12-31 16:00:00.000000000 -0800 37966 +++ ncurses-5.7/test/insdelln.c 2009-0 6-05 14:00:59.000000000 -070037967 @@ -0,0 +1,38 0@@59952 +++ ncurses-5.7/test/insdelln.c 2009-07-19 15:04:17.000000000 -0700 59953 @@ -0,0 +1,387 @@ 37968 59954 +/**************************************************************************** 37969 + * Copyright (c) 2008 Free Software Foundation, Inc.*59955 + * Copyright (c) 2008,2009 Free Software Foundation, Inc. * 37970 59956 + * * 37971 59957 + * Permission is hereby granted, free of charge, to any person obtaining a * … … 37994 59980 + ****************************************************************************/ 37995 59981 +/* 37996 + * $Id: insdelln.c,v 1. 1 2008/12/20 22:06:52tom Exp $59982 + * $Id: insdelln.c,v 1.2 2009/07/15 23:21:04 tom Exp $ 37997 59983 + * 37998 59984 + * test-driver for deleteln, wdeleteln, insdelln, winsdelln, insertln, winsertln … … 38084 60070 +{ 38085 60071 + int y, x; 60072 + int y0 = -1, x0 = -1; 38086 60073 + 38087 60074 + getyx(win, y, x); 38088 + wmove(win, 1, 0);60075 + wmove(win, 0, 0); 38089 60076 + while (waddstr(win, "0123456789 abcdefghijklmnopqrstuvwxyz ") != ERR) { 60077 + int y1, x1; 60078 + getyx(win, y1, x1); 60079 + if (y1 == y0 && x1 == x0) 60080 + break; 60081 + x0 = x1; 60082 + y0 = y1; 38090 60083 + } 38091 60084 + wmove(win, y, x); … … 38348 60341 diff -Naur ncurses-5.7.orig/test/modules ncurses-5.7/test/modules 38349 60342 --- ncurses-5.7.orig/test/modules 2007-08-18 10:57:08.000000000 -0700 38350 +++ ncurses-5.7/test/modules 2009-0 6-05 14:00:59.000000000 -070038351 @@ -1, 4 +1,4@@60343 +++ ncurses-5.7/test/modules 2009-07-19 15:04:15.000000000 -0700 60344 @@ -1,6 +1,6 @@ 38352 60345 -# $Id: modules,v 1.36 2007/08/18 17:57:08 tom Exp $ 38353 +# $Id: modules,v 1.3 7 2008/12/20 21:38:44tom Exp $60346 +# $Id: modules,v 1.38 2009/07/11 12:43:09 tom Exp $ 38354 60347 ############################################################################## 38355 # Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. # 60348 -# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. # 60349 +# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. # 38356 60350 # # 60351 # Permission is hereby granted, free of charge, to any person obtaining a # 60352 # copy of this software and associated documentation files (the "Software"), # 38357 60353 @@ -37,6 +37,7 @@ 38358 60354 bs progs $(srcdir) $(HEADER_DEPS) … … 38363 60359 demo_altkeys progs $(srcdir) $(HEADER_DEPS) 38364 60360 demo_defkey progs $(srcdir) $(HEADER_DEPS) 38365 @@ -60,6 +61,7 @@ 60361 @@ -45,6 +46,7 @@ 60362 demo_menus progs $(srcdir) $(HEADER_DEPS) ../include/menu.h 60363 demo_panels progs $(srcdir) $(HEADER_DEPS) ../include/panel.h 60364 demo_termcap progs $(srcdir) $(HEADER_DEPS) 60365 +demo_terminfo progs $(srcdir) $(HEADER_DEPS) 60366 ditto progs $(srcdir) $(HEADER_DEPS) 60367 dots progs $(srcdir) $(HEADER_DEPS) 60368 dots_mvcur progs $(srcdir) $(HEADER_DEPS) 60369 @@ -60,6 +62,7 @@ 38366 60370 inch_wide progs $(srcdir) $(HEADER_DEPS) 38367 60371 inchs progs $(srcdir) $(HEADER_DEPS) … … 38373 60377 diff -Naur ncurses-5.7.orig/test/ncurses.c ncurses-5.7/test/ncurses.c 38374 60378 --- ncurses-5.7.orig/test/ncurses.c 2008-09-27 07:34:58.000000000 -0700 38375 +++ ncurses-5.7/test/ncurses.c 2009-0 6-05 14:01:49.000000000 -070060379 +++ ncurses-5.7/test/ncurses.c 2009-07-19 15:04:17.000000000 -0700 38376 60380 @@ -1,5 +1,5 @@ 38377 60381 /**************************************************************************** … … 38386 60390 38387 60391 -$Id: ncurses.c,v 1.329 2008/09/27 14:34:58 tom Exp $ 38388 +$Id: ncurses.c,v 1.3 39 2009/04/04 22:46:11 juergenExp $60392 +$Id: ncurses.c,v 1.342 2009/07/18 11:48:42 tom Exp $ 38389 60393 38390 60394 ***************************************************************************/ 38391 60395 38392 @@ -483,7 +483,11 @@ 60396 @@ -318,6 +318,7 @@ 60397 *target = 0; 60398 } 60399 60400 +#if USE_LIBPANEL 60401 static void 60402 make_fullwidth_digit(cchar_t *target, int digit) 60403 { 60404 @@ -327,6 +328,7 @@ 60405 source[1] = 0; 60406 setcchar(target, source, A_NORMAL, 0, 0); 60407 } 60408 +#endif 60409 60410 static int 60411 wGet_wchar(WINDOW *win, wint_t *result) 60412 @@ -483,7 +485,11 @@ 38393 60413 addstr("Shelling out..."); 38394 60414 def_prog_mode(); … … 38402 60422 addstr("returned from shellout.\n"); 38403 60423 refresh(); 38404 @@ -569,8 +57 3,11 @@60424 @@ -569,8 +575,11 @@ 38405 60425 * 38406 60426 ****************************************************************************/ … … 38415 60435 keypad(win, flags['k']); /* should be redundant, but for testing */ 38416 60436 meta(win, flags['m']); /* force this to a known state */ 38417 @@ -581,7 +5 88,17 @@60437 @@ -581,7 +590,17 @@ 38418 60438 } 38419 60439 … … 38434 60454 static const char *help[] = 38435 60455 { 38436 @@ -731,13 +748,10 @@ 60456 @@ -657,7 +676,7 @@ 60457 { 60458 unsigned need = (level + 1) * 2; 60459 60460 - assert(level < COLS); 60461 + assert(level < (unsigned) COLS); 60462 60463 if (winstack == 0) { 60464 len_winstack = 20; 60465 @@ -731,13 +750,10 @@ 38437 60466 int first_y, first_x; 38438 60467 int c; … … 38450 60479 getyx(win, first_y, first_x); 38451 60480 38452 @@ -835,12 +8 49,18 @@60481 @@ -835,12 +851,18 @@ 38453 60482 } 38454 60483 #endif … … 38474 60503 } else { 38475 60504 if (isprint(c)) 38476 @@ -854,6 +87 4,9 @@60505 @@ -854,6 +876,9 @@ 38477 60506 } 38478 60507 … … 38484 60513 38485 60514 static int 38486 @@ -905,6 +9 28,7 @@60515 @@ -905,6 +930,7 @@ 38487 60516 wgetch_test(0, stdscr, delay); 38488 60517 forget_boxes(); … … 38492 60521 38493 60522 #if USE_WIDEC_SUPPORT 38494 @@ -978,15 +100 2,12 @@60523 @@ -978,15 +1004,12 @@ 38495 60524 int first_y, first_x; 38496 60525 wint_t c; … … 38510 60539 getyx(win, first_y, first_x); 38511 60540 38512 @@ -1096,14 +111 7,14 @@60541 @@ -1096,14 +1119,14 @@ 38513 60542 resize_wide_boxes(level, win); 38514 60543 } … … 38530 60559 } 38531 60560 wgetch_wrap(win, first_y); 38532 @@ -1111,6 +113 2,9 @@60561 @@ -1111,6 +1134,9 @@ 38533 60562 } 38534 60563 … … 38540 60569 38541 60570 static void 38542 @@ -1122,6 +114 6,7 @@60571 @@ -1122,6 +1148,7 @@ 38543 60572 wget_wch_test(0, stdscr, delay); 38544 60573 forget_boxes(); … … 38548 60577 #endif 38549 60578 38550 @@ -1840,6 +186 5,8 @@60579 @@ -1840,6 +1867,8 @@ 38551 60580 width = 4; 38552 60581 } else if (color >= 8) { … … 38557 60586 strcpy(temp, the_color_names[color]); 38558 60587 } 38559 @@ -1874,6 +190 1,8 @@60588 @@ -1874,6 +1903,8 @@ 38560 60589 mvwprintw(helpwin, row++, col, 38561 60590 " n/N toggle text/number on/off"); … … 38566 60595 #if USE_WIDEC_SUPPORT 38567 60596 if (wide) { 38568 @@ -1906,12 +193 5,19 @@60597 @@ -1906,12 +1937,19 @@ 38569 60598 bool done = FALSE; 38570 60599 bool opt_acsc = FALSE; … … 38589 60618 while (!done) { 38590 60619 int shown = 0; 38591 @@ -1926,12 +196 2,14 @@60620 @@ -1926,12 +1964,14 @@ 38592 60621 hello = "Hello"; 38593 60622 per_row = 8; … … 38606 60635 clrtobot(); 38607 60636 (void) mvprintw(top + 1, 0, 38608 @@ -1942,7 +198 0,7 @@60637 @@ -1942,7 +1982,7 @@ 38609 60638 38610 60639 /* show color names/numbers across the top */ … … 38615 60644 /* show a grid of colors, with color names/ numbers on the left */ 38616 60645 for (i = (short) (base_row * per_row); i < pairs_max; i++) { 38617 @@ -1950,9 +19 88,11 @@60646 @@ -1950,9 +1990,11 @@ 38618 60647 int col = (i % per_row + 1) * width; 38619 60648 short pair = i; … … 38629 60658 init_pair(pair, fg, bg); 38630 60659 attron((attr_t) COLOR_PAIR(pair)); 38631 @@ -1960,6 +200 0,8 @@60660 @@ -1960,6 +2002,8 @@ 38632 60661 attron((attr_t) A_ALTCHARSET); 38633 60662 if (opt_bold) … … 38638 60667 if (opt_nums) { 38639 60668 sprintf(numbered, "{%02X}", i); 38640 @@ -1968,8 +201 0,8 @@60669 @@ -1968,8 +2012,8 @@ 38641 60670 printw("%-*.*s", width, width, hello); 38642 60671 attrset(A_NORMAL); … … 38649 60678 ++shown; 38650 60679 } else if (shown) { 38651 @@ -1996,6 +20 38,12 @@60680 @@ -1996,6 +2040,12 @@ 38652 60681 case 'N': 38653 60682 opt_nums = TRUE; … … 38662 60691 done = TRUE; 38663 60692 continue; 38664 @@ -2073,7 +212 1,7 @@60693 @@ -2073,7 +2123,7 @@ 38665 60694 int base_row = 0; 38666 60695 int grid_top = top + 3; … … 38671 60700 int per_row; 38672 60701 char numbered[80]; 38673 @@ -2081,12 +21 29,22 @@60702 @@ -2081,12 +2131,22 @@ 38674 60703 bool done = FALSE; 38675 60704 bool opt_acsc = FALSE; … … 38694 60723 int shown = 0; 38695 60724 38696 @@ -2100,6 +21 58,8 @@60725 @@ -2100,6 +2160,8 @@ 38697 60726 hello = "Hello"; 38698 60727 per_row = 8; … … 38703 60732 make_fullwidth_text(buffer, hello); 38704 60733 width *= 2; 38705 @@ -2111,8 +217 1,9 @@60734 @@ -2111,8 +2173,9 @@ 38706 60735 row_limit = (pairs_max + per_row - 1) / per_row; 38707 60736 … … 38715 60744 clrtobot(); 38716 60745 (void) mvprintw(top + 1, 0, 38717 @@ -2123,7 +218 4,7 @@60746 @@ -2123,7 +2186,7 @@ 38718 60747 38719 60748 /* show color names/numbers across the top */ … … 38724 60753 /* show a grid of colors, with color names/ numbers on the left */ 38725 60754 for (i = (base_row * per_row); i < pairs_max; i++) { 38726 @@ -2132,12 +219 3,14 @@60755 @@ -2132,12 +2195,14 @@ 38727 60756 short pair = (short) i; 38728 60757 … … 38740 60769 if (opt_nums) { 38741 60770 sprintf(numbered, "{%02X}", i); 38742 @@ -2150,8 +221 3,8 @@60771 @@ -2150,8 +2215,8 @@ 38743 60772 addnwstr(buffer, width); 38744 60773 attr_set(A_NORMAL, 0, NULL); … … 38751 60780 ++shown; 38752 60781 } else if (shown) { 38753 @@ -2178,6 +224 1,12 @@60782 @@ -2178,6 +2243,12 @@ 38754 60783 case 'N': 38755 60784 opt_nums = TRUE; … … 38764 60793 done = TRUE; 38765 60794 continue; 38766 @@ -2802,6 +287 1,7 @@60795 @@ -2802,6 +2873,7 @@ 38767 60796 } attrs_to_cycle[] = { 38768 60797 { A_NORMAL, "normal" }, … … 38772 60801 { A_UNDERLINE, "underline" }, 38773 60802 }; 38774 @@ -2902,7 +297 2,7 @@60803 @@ -2902,7 +2974,7 @@ 38775 60804 do { 38776 60805 if (C1) … … 38781 60810 /* (yes, this _is_ crude) */ 38782 60811 while ((reply = Getchar()) != ERR) { 38783 @@ -2951,7 +302 1,7 @@60812 @@ -2951,7 +3023,7 @@ 38784 60813 */ 38785 60814 break; … … 38790 60819 } 38791 60820 } while (--count > 0); 38792 @@ -2969,15 +30 39,23 @@60821 @@ -2969,15 +3041,23 @@ 38793 60822 mvaddstr(0, 20, "Display of the ACS Line-Drawing Set"); 38794 60823 attroff(A_BOLD); … … 38822 60851 38823 60852 } 38824 @@ -3002,7 +308 0,7 @@60853 @@ -3002,7 +3082,7 @@ 38825 60854 { 38826 60855 int n; … … 38831 60860 erase(); 38832 60861 attron(A_BOLD); 38833 @@ -3212,7 +3290,7 @@ 60862 @@ -3161,21 +3241,18 @@ 60863 static cchar_t * 60864 merge_wide_attr(cchar_t *dst, const cchar_t *src, attr_t attr, short pair) 60865 { 60866 - int count = getcchar(src, NULL, NULL, NULL, 0); 60867 - wchar_t *wch = 0; 60868 - attr_t ignore_attr; 60869 - short ignore_pair; 60870 + int count; 60871 60872 *dst = *src; 60873 - if (count > 0) { 60874 - if ((wch = typeMalloc(wchar_t, (unsigned) count + 1)) != 0) { 60875 - if (getcchar(src, wch, &ignore_attr, &ignore_pair, 0) != ERR) { 60876 - attr |= (ignore_attr & A_ALTCHARSET); 60877 - setcchar(dst, wch, attr, pair, 0); 60878 - } 60879 - free(wch); 60880 - } 60881 - } 60882 + do { 60883 + TEST_CCHAR(src, count, { 60884 + attr |= (test_attrs & A_ALTCHARSET); 60885 + setcchar(dst, test_wch, attr, pair, NULL); 60886 + } 60887 + , { 60888 + ; 60889 + }); 60890 + } while (0); 60891 return dst; 60892 } 60893 60894 @@ -3212,7 +3289,7 @@ 38834 60895 * the display. 38835 60896 */ … … 38840 60901 * This could use add_wch(), but is done for comparison with the 38841 60902 * normal 'f' test (and to make a test-case for echo_wchar()). 38842 @@ -3238,7 +331 6,7 @@60903 @@ -3238,7 +3315,7 @@ 38843 60904 int col = (n / height) * COLS / 2; 38844 60905 … … 38849 60910 } 38850 60911 return n + 1; 38851 @@ -3307,12 +338 5,12 @@60912 @@ -3307,12 +3384,12 @@ 38852 60913 38853 60914 #undef MERGE_ATTR … … 38864 60925 (void) repeat; 38865 60926 erase(); 38866 @@ -3321,17 +339 9,23 @@60927 @@ -3321,17 +3398,23 @@ 38867 60928 attroff(A_BOLD); 38868 60929 refresh(); … … 38898 60959 38899 60960 } 38900 @@ -5804,7 +588 8,7 @@60961 @@ -5804,7 +5887,7 @@ 38901 60962 break; 38902 60963 case 2: … … 38909 60970 diff -Naur ncurses-5.7.orig/test/programs ncurses-5.7/test/programs 38910 60971 --- ncurses-5.7.orig/test/programs 2008-08-16 14:47:39.000000000 -0700 38911 +++ ncurses-5.7/test/programs 2009-0 6-05 14:00:59.000000000 -070038912 @@ -1, 4 +1,4@@60972 +++ ncurses-5.7/test/programs 2009-07-19 15:04:15.000000000 -0700 60973 @@ -1,6 +1,6 @@ 38913 60974 -# $Id: programs,v 1.14 2008/08/16 21:47:39 tom Exp $ 38914 +# $Id: programs,v 1.1 5 2008/12/20 21:38:44tom Exp $60975 +# $Id: programs,v 1.16 2009/07/11 12:47:15 tom Exp $ 38915 60976 ############################################################################## 38916 # Copyright (c) 2006-2007,2008 Free Software Foundation, Inc. # 60977 -# Copyright (c) 2006-2007,2008 Free Software Foundation, Inc. # 60978 +# Copyright (c) 2006-2008,2009 Free Software Foundation, Inc. # 38917 60979 # # 60980 # Permission is hereby granted, free of charge, to any person obtaining a # 60981 # copy of this software and associated documentation files (the "Software"), # 38918 60982 @@ -35,6 +35,7 @@ 38919 60983 bs $(LDFLAGS_CURSES) $(LOCAL_LIBS) bs … … 38924 60988 demo_altkeys $(LDFLAGS_CURSES) $(LOCAL_LIBS) demo_altkeys 38925 60989 demo_defkey $(LDFLAGS_CURSES) $(LOCAL_LIBS) demo_defkey 38926 @@ -57,6 +58,7 @@ 60990 @@ -43,6 +44,7 @@ 60991 demo_menus $(LDFLAGS_DEFAULT) $(LOCAL_LIBS) demo_menus 60992 demo_panels $(LDFLAGS_DEFAULT) $(LOCAL_LIBS) demo_panels 60993 demo_termcap $(LDFLAGS_TINFO) $(LOCAL_LIBS) demo_termcap 60994 +demo_terminfo $(LDFLAGS_TINFO) $(LOCAL_LIBS) demo_terminfo 60995 ditto $(LDFLAGS_THREADS) $(LOCAL_LIBS) ditto 60996 dots $(LDFLAGS_TINFO) $(LOCAL_LIBS) dots 60997 dots_mvcur $(LDFLAGS_CURSES) $(LOCAL_LIBS) dots_mvcur 60998 @@ -57,6 +59,7 @@ 38927 60999 inch_wide $(LDFLAGS_CURSES) $(LOCAL_LIBS) inch_wide 38928 61000 inchs $(LDFLAGS_CURSES) $(LOCAL_LIBS) inchs … … 38934 61006 diff -Naur ncurses-5.7.orig/test/railroad.c ncurses-5.7/test/railroad.c 38935 61007 --- ncurses-5.7.orig/test/railroad.c 2008-02-09 10:08:43.000000000 -0800 38936 +++ ncurses-5.7/test/railroad.c 2009-0 6-05 14:01:18.000000000 -070061008 +++ ncurses-5.7/test/railroad.c 2009-07-19 15:02:23.000000000 -0700 38937 61009 @@ -29,7 +29,7 @@ 38938 61010 /* … … 38981 61053 diff -Naur ncurses-5.7.orig/test/README ncurses-5.7/test/README 38982 61054 --- ncurses-5.7.orig/test/README 2008-10-18 14:02:45.000000000 -0700 38983 +++ ncurses-5.7/test/README 2009-0 6-05 14:00:59.000000000 -070061055 +++ ncurses-5.7/test/README 2009-07-19 15:04:15.000000000 -0700 38984 61056 @@ -25,7 +25,7 @@ 38985 61057 -- sale, use or other dealings in this Software without prior written -- … … 38987 61059 ------------------------------------------------------------------------------- 38988 61060 --- $Id: README,v 1.38 2008/10/18 21:02:45 tom Exp $ 38989 +-- $Id: README,v 1. 39 2008/12/20 23:38:13tom Exp $61061 +-- $Id: README,v 1.40 2009/07/11 19:09:01 tom Exp $ 38990 61062 ------------------------------------------------------------------------------- 38991 61063 … … 39000 61072 form_fields test: cardfile demo_forms 39001 61073 form_init - 39002 @@ -211, 7 +211,7@@61074 @@ -211,14 +211,14 @@ 39003 61075 ---------- 39004 61076 BC - … … 39009 61081 COLS test: cardfile demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto echochar edit_field firework foldkeys hashtest inch_wide inchs ins_wide inserts lrtest movewindow ncurses newdemo rain savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm 39010 61082 ESCDELAY test: test_opaque 39011 @@ -239,9 +239,9 @@ 61083 LINES test: cardfile demo_defkey demo_keyok demo_menus demo_panels ditto echochar edit_field firework hanoi hashtest inch_wide inchs ins_wide inserts lrtest movewindow ncurses newdemo rain savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas 61084 PAIR_NUMBER test: ncurses 61085 PC lib: ncurses 61086 -SP lib: ncurses 61087 +SP lib: menu 61088 TABSIZE test: test_opaque 61089 UP - 61090 acs_map test: gdc ins_wide inserts knight movewindow ncurses newdemo testcurs 61091 @@ -239,22 +239,22 @@ 39012 61092 attr_set test: ncurses 39013 61093 attroff test: echochar filter gdc ncurses tclock … … 39021 61101 bkgdset test: background ncurses testaddch 39022 61102 bkgrnd test: ncurses 39023 @@ -251,10 +251,10 @@ 39024 boolnames test: test_arrays progs: dump_entry infocmp 61103 bkgrndset test: ncurses 61104 boolcodes test: test_arrays progs: dump_entry 61105 -boolfnames test: test_arrays progs: dump_entry 61106 -boolnames test: test_arrays progs: dump_entry infocmp 61107 +boolfnames test: demo_terminfo test_arrays progs: dump_entry 61108 +boolnames test: demo_terminfo test_arrays progs: dump_entry infocmp 39025 61109 border - 39026 61110 border_set - … … 39039 61123 copywin test: ncurses testcurs 39040 61124 -cur_term test: dots dots_mvcur lrtest progs: clear tput tset 39041 +cur_term test: d ots dots_mvcur lrtest progs: clear tabs tput tset61125 +cur_term test: demo_terminfo dots dots_mvcur lrtest progs: clear tabs tput tset 39042 61126 curs_set test: echochar firework gdc hanoi lrtest ncurses newdemo rain savescreen tclock testcurs worm xmas 39043 61127 curscr test: demo_panels edit_field knight lrtest ncurses savescreen tclock view 39044 61128 curses_version test: ncurses progs: infocmp tic toe tput tset 39045 @@ -273, 16 +273,16 @@61129 @@ -273,35 +273,36 @@ 39046 61130 del_curterm lib: ncurses 39047 61131 delay_output test: newdemo … … 39064 61148 erasechar lib: ncurses 39065 61149 erasewchar - 39066 @@ -292,16 +292,16 @@ 61150 filter test: filter 61151 flash test: cardfile lrtest ncurses tclock testcurs 61152 flushinp test: ncurses newdemo testcurs 61153 +get_escdelay - 39067 61154 get_wch - 39068 61155 get_wstr test: test_get_wstr … … 39088 61175 getn_wstr test: test_get_wstr 39089 61176 getnstr test: filter ncurses test_getstr 39090 @@ -310,10 +31 0,11 @@61177 @@ -310,10 +311,11 @@ 39091 61178 getstr test: test_getstr 39092 61179 getwin test: ncurses … … 39101 61188 hline_set - 39102 61189 idcok test: test_opaque 39103 @@ -326,16 +32 7,16 @@61190 @@ -326,16 +328,16 @@ 39104 61191 inchnstr test: inchs 39105 61192 inchstr test: inchs … … 39122 61209 insstr test: inserts 39123 61210 instr test: test_instr 39124 @@ -360,7 +36 1,7 @@61211 @@ -360,7 +362,7 @@ 39125 61212 keybound test: demo_altkeys demo_defkey 39126 61213 keyname test: demo_altkeys demo_defkey demo_keyok demo_menus edit_field foldkeys keynames movewindow ncurses redraw testcurs view progs: tic … … 39131 61218 killwchar - 39132 61219 leaveok test: hanoi test_opaque 39133 @@ -450,7 +45 1,7 @@61220 @@ -450,7 +452,7 @@ 39134 61221 mvwinsstr test: inserts testcurs 39135 61222 mvwinstr test: test_instr … … 39140 61227 mvwvline test: ins_wide inserts movewindow 39141 61228 mvwvline_set - 39142 @@ -458,1 1 +459,11@@61229 @@ -458,19 +460,19 @@ 39143 61230 newpad test: edit_field ncurses testcurs 39144 61231 newscr lib: ncurses … … 39154 61241 nonl test: bs demo_forms hashtest movewindow ncurses view worm xmas 39155 61242 noqiflush - 39156 @@ -501,14 +502,14 @@ 61243 noraw test: demo_forms demo_menus ncurses testcurs 61244 notimeout test: test_opaque 61245 numcodes test: test_arrays progs: dump_entry 61246 -numfnames test: test_arrays progs: dump_entry 61247 -numnames test: test_arrays progs: dump_entry infocmp 61248 +numfnames test: demo_terminfo test_arrays progs: dump_entry 61249 +numnames test: demo_terminfo test_arrays progs: dump_entry infocmp 61250 ospeed progs: tset 61251 overlay test: ncurses testcurs xmas 61252 overwrite test: ncurses savescreen 61253 @@ -501,14 +503,14 @@ 39157 61254 scr_set test: savescreen 39158 61255 scrl test: view … … 39167 61264 setscrreg test: view 39168 61265 -setupterm test: dots progs: clear tput tset 39169 +setupterm test: d ots progs: clear tabs tput tset61266 +setupterm test: demo_terminfo dots progs: clear tabs tput tset 39170 61267 slk_attr - 39171 61268 slk_attr_off - 39172 61269 slk_attr_on - 39173 @@ -528, 8 +529,8@@61270 @@ -528,11 +530,11 @@ 39174 61271 slk_wset test: ncurses 39175 61272 standend test: blue gdc ncurses … … 39180 61277 +stdscr test: bs chgat clip_printw demo_altkeys demo_forms demo_menus demo_panels ditto filter firework foldkeys gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view worm xmas 39181 61278 strcodes test: test_arrays progs: dump_entry 39182 strfnames test: test_arrays progs: dump_entry 39183 strnames test: foldkeys test_arrays progs: dump_entry infocmp tic 39184 @@ -548,10 +549,10 @@ 39185 tigetnum test: ncurses progs: tput 39186 tigetstr test: blue demo_defkey foldkeys testcurs progs: tput 61279 -strfnames test: test_arrays progs: dump_entry 61280 -strnames test: foldkeys test_arrays progs: dump_entry infocmp tic 61281 +strfnames test: demo_terminfo test_arrays progs: dump_entry 61282 +strnames test: demo_terminfo foldkeys test_arrays progs: dump_entry infocmp tic 61283 subpad test: testcurs 61284 subwin test: movewindow ncurses newdemo testcurs 61285 syncok test: test_opaque 61286 @@ -544,14 +546,14 @@ 61287 tgetnum test: demo_termcap railroad 61288 tgetstr test: demo_termcap railroad 61289 tgoto test: railroad 61290 -tigetflag progs: tput 61291 -tigetnum test: ncurses progs: tput 61292 -tigetstr test: blue demo_defkey foldkeys testcurs progs: tput 61293 +tigetflag test: demo_terminfo progs: tput 61294 +tigetnum test: demo_terminfo ncurses progs: tput 61295 +tigetstr test: blue demo_defkey demo_terminfo foldkeys testcurs progs: tput 39187 61296 timeout test: rain savescreen 39188 61297 -touchline test: chgat … … 39197 61306 ttytype lib: ncurses 39198 61307 typeahead test: testcurs 39199 @@ -572,7 +573,7 @@ 61308 @@ -562,7 +564,7 @@ 61309 untouchwin lib: form 61310 use_default_colors test: filter firework gdc hanoi knight ncurses rain tclock worm xmas 61311 use_env progs: tput 61312 -use_extended_names progs: infocmp tic 61313 +use_extended_names test: demo_terminfo progs: infocmp tic 61314 use_legacy_coding - 61315 use_screen test: ditto 61316 use_window test: rain worm 61317 @@ -572,7 +574,7 @@ 39200 61318 vidputs lib: ncurses 39201 61319 vline test: gdc ncurses … … 39206 61324 vwprintw test: movewindow 39207 61325 vwscanw lib: ncurses 39208 @@ -584,7 +58 5,7 @@61326 @@ -584,7 +586,7 @@ 39209 61327 waddchstr - 39210 61328 waddnstr lib: menu … … 39215 61333 wattr_get - 39216 61334 wattr_off lib: ncurses 39217 @@ -592,21 +59 3,21 @@61335 @@ -592,21 +594,21 @@ 39218 61336 wattr_set - 39219 61337 wattroff test: demo_forms ncurses testcurs xmas … … 39242 61360 wechochar lib: ncurses 39243 61361 wenclose lib: form 39244 @@ -614,7 +61 5,7 @@61362 @@ -614,7 +616,7 @@ 39245 61363 wget_wch test: ins_wide ncurses 39246 61364 wget_wstr test: test_get_wstr … … 39251 61369 wgetnstr test: ncurses test_getstr 39252 61370 wgetparent test: test_opaque 39253 @@ -634,18 +63 5,18 @@61371 @@ -634,18 +636,18 @@ 39254 61372 wins_wch test: ins_wide 39255 61373 wins_wstr test: ins_wide … … 39275 61393 wscanw test: testcurs 39276 61394 wscrl test: ncurses testcurs 61395 diff -Naur ncurses-5.7.orig/test/test_arrays.c ncurses-5.7/test/test_arrays.c 61396 --- ncurses-5.7.orig/test/test_arrays.c 2008-02-09 10:09:43.000000000 -0800 61397 +++ ncurses-5.7/test/test_arrays.c 2009-07-19 15:04:17.000000000 -0700 61398 @@ -26,7 +26,7 @@ 61399 * authorization. * 61400 ****************************************************************************/ 61401 /* 61402 - * $Id: test_arrays.c,v 1.3 2008/02/09 18:09:43 tom Exp $ 61403 + * $Id: test_arrays.c,v 1.4 2009/07/17 00:09:00 tom Exp $ 61404 * 61405 * Author: Thomas E Dickey 61406 * 61407 @@ -47,7 +47,7 @@ 61408 #define USE_TINFO 61409 #include <test.priv.h> 61410 61411 -#if defined(NCURSES_VERSION) || !defined(_XOPEN_CURSES) 61412 +#if defined(HAVE_CURSES_DATA_BOOLNAMES) || defined(DECL_CURSES_DATA_BOOLNAMES) 61413 61414 #define DUMP(name) dump_array(#name, name) 61415 39277 61416 diff -Naur ncurses-5.7.orig/test/test.priv.h ncurses-5.7/test/test.priv.h 39278 61417 --- ncurses-5.7.orig/test/test.priv.h 2008-10-04 14:53:41.000000000 -0700 39279 +++ ncurses-5.7/test/test.priv.h 2009-06-05 14:01:49.000000000 -0700 61418 +++ ncurses-5.7/test/test.priv.h 2009-07-19 15:04:17.000000000 -0700 61419 @@ -1,5 +1,5 @@ 61420 /**************************************************************************** 61421 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 61422 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 61423 * * 61424 * Permission is hereby granted, free of charge, to any person obtaining a * 61425 * copy of this software and associated documentation files (the * 39280 61426 @@ -29,7 +29,7 @@ 39281 61427 /**************************************************************************** … … 39283 61429 ****************************************************************************/ 39284 61430 -/* $Id: test.priv.h,v 1.79 2008/10/04 21:53:41 tom Exp $ */ 39285 +/* $Id: test.priv.h,v 1. 81 2008/12/28 20:20:39 juergenExp $ */61431 +/* $Id: test.priv.h,v 1.91 2009/07/18 12:19:23 tom Exp $ */ 39286 61432 39287 61433 #ifndef __TEST_PRIV_H 39288 61434 #define __TEST_PRIV_H 1 39289 @@ -359,6 +359,9 @@ 61435 @@ -42,14 +42,17 @@ 61436 */ 61437 #ifdef HAVE_LIBFORMW 61438 #define HAVE_LIBFORMW 1 61439 +#define HAVE_LIBFORM 1 61440 #endif 61441 61442 #ifdef HAVE_LIBMENUW 61443 #define HAVE_LIBMENUW 1 61444 +#define HAVE_LIBMENU 1 61445 #endif 61446 61447 #ifdef HAVE_LIBPANELW 61448 #define HAVE_LIBPANELW 1 61449 +#define HAVE_LIBPANEL 1 61450 #endif 61451 61452 /* 61453 @@ -207,11 +210,16 @@ 61454 #define NEED_PTEM_H 0 61455 #endif 61456 61457 +#ifndef NEED_WCHAR_H 61458 +#define NEED_WCHAR_H 0 61459 +#endif 61460 + 61461 #ifndef NO_LEAKS 61462 #define NO_LEAKS 0 61463 #endif 61464 61465 #include <stdlib.h> 61466 +#include <stdarg.h> 61467 #include <string.h> 61468 #include <sys/types.h> 61469 61470 @@ -221,6 +229,13 @@ 61471 61472 #include <signal.h> /* include before curses.h to work around glibc bug */ 61473 61474 +#if NEED_WCHAR_H 61475 +#include <wchar.h> 61476 +#ifdef HAVE_LIBUTF8_H 61477 +#include <libutf8.h> 61478 +#endif 61479 +#endif 61480 + 61481 #if defined(HAVE_XCURSES) 61482 #include <xcurses.h> 61483 #elif defined(HAVE_NCURSESW_NCURSES_H) 61484 @@ -359,6 +374,15 @@ 39290 61485 #define KEY_MIN 256 /* not defined in Solaris 8 */ 39291 61486 #endif 39292 61487 61488 +#ifdef DECL_CURSES_DATA_BOOLNAMES 61489 +extern char *boolnames[], *boolcodes[], *boolfnames[], 61490 + *numnames[], *numcodes[], *numfnames[], 61491 + *strnames[], *strcodes[], *strfnames[]; 61492 +#endif 61493 + 39293 61494 +#define colored_chtype(ch, attr, pair) \ 39294 61495 + ((ch) | (attr) | COLOR_PAIR(pair)) … … 39297 61498 * Workaround for HPUX 39298 61499 */ 39299 @@ -464,6 +467,14 @@ 61500 @@ -374,6 +398,25 @@ 61501 #endif 61502 61503 /* 61504 + * Workaround in case getcchar() returns a positive value when the source 61505 + * string produces only a L'\0'. 61506 + */ 61507 +#define TEST_CCHAR(s, count, then_stmt, else_stmt) \ 61508 + if ((count = getcchar(s, NULL, NULL, NULL, NULL)) > 0) { \ 61509 + wchar_t test_wch[CCHARW_MAX + 2]; \ 61510 + attr_t test_attrs; \ 61511 + short test_pair; \ 61512 + \ 61513 + if (getcchar( s, test_wch, &test_attrs, &test_pair, NULL) == OK \ 61514 + && test_wch[0] != L'\0') { \ 61515 + then_stmt \ 61516 + } else { \ 61517 + else_stmt \ 61518 + } \ 61519 + } else { \ 61520 + else_stmt \ 61521 + } 61522 +/* 61523 * These usually are implemented as macros, but may be functions. 61524 */ 61525 #if !defined(getcurx) && !HAVE_GETCURX 61526 @@ -464,6 +507,14 @@ 39300 61527 #define EXIT_FAILURE 1 39301 61528 #endif … … 39312 61539 * curses which doesn't have const parameters declared (so far) in the places 39313 61540 * that XSI shows. 39314 @@ -560,7 +571,7 @@ 61541 @@ -521,6 +572,26 @@ 61542 #endif 61543 61544 /* 61545 + * Workaround to build with Sun's default SVr4 curses. 61546 + */ 61547 +#ifdef NCURSES_VERSION 61548 +#ifndef HAVE_VW_PRINTW 61549 +#define HAVE_VW_PRINTW 1 61550 +#endif 61551 +#endif 61552 + 61553 +/* 61554 + * ncurses provides arrays of capability names; X/Open discarded these SVr4 61555 + * features. Some implementations continue to provide them (see the test 61556 + * configure script). 61557 + */ 61558 +#ifdef NCURSES_VERSION 61559 +#ifndef HAVE_CURSES_DATA_BOOLNAMES 61560 +#define HAVE_CURSES_DATA_BOOLNAMES 1 61561 +#endif 61562 +#endif 61563 + 61564 +/* 61565 * ncurses uses const in some places where X/Open does (or did) not allow. 61566 */ 61567 #ifdef NCURSES_VERSION 61568 @@ -560,7 +631,7 @@ 39315 61569 #define USING_SCREEN(s,func,data) use_screen(s, (NCURSES_SCREEN_CB) func, data) 39316 61570 #define WANT_USE_SCREEN() extern void _nc_want_use_screen(void) … … 39323 61577 diff -Naur ncurses-5.7.orig/test/view.c ncurses-5.7/test/view.c 39324 61578 --- ncurses-5.7.orig/test/view.c 2008-09-06 15:10:50.000000000 -0700 39325 +++ ncurses-5.7/test/view.c 2009-06-05 14:01:49.000000000 -0700 61579 +++ ncurses-5.7/test/view.c 2009-07-19 15:04:17.000000000 -0700 61580 @@ -1,5 +1,5 @@ 61581 /**************************************************************************** 61582 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 61583 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 61584 * * 61585 * Permission is hereby granted, free of charge, to any person obtaining a * 61586 * copy of this software and associated documentation files (the * 39326 61587 @@ -50,7 +50,7 @@ 39327 61588 * scroll operation worked, and the refresh() code only had to do a … … 39329 61590 * 39330 61591 - * $Id: view.c,v 1.69 2008/09/06 22:10:50 tom Exp $ 39331 + * $Id: view.c,v 1.7 0 2008/11/16 00:19:59 juergenExp $61592 + * $Id: view.c,v 1.75 2009/07/19 00:34:07 tom Exp $ 39332 61593 */ 39333 61594 … … 39344 61605 #if !defined(sun) || !HAVE_TERMIOS_H 39345 61606 # if HAVE_SYS_IOCTL_H 61607 @@ -149,11 +151,19 @@ 61608 { 61609 int result = 0; 61610 #if USE_WIDEC_SUPPORT 61611 + int count; 61612 #endif 61613 61614 #if USE_WIDEC_SUPPORT 61615 - while (getcchar(src++, NULL, NULL, NULL, NULL) > 0) 61616 - result++; 61617 + for (;;) { 61618 + TEST_CCHAR(src, count, { 61619 + ++result; 61620 + ++src; 61621 + } 61622 + , { 61623 + break; 61624 + }) 61625 + } 61626 #else 61627 while (*src++) 61628 result++; 61629 @@ -281,7 +291,7 @@ 61630 if (optind + 1 != argc) 61631 usage(); 61632 61633 - if ((vec_lines = typeMalloc(NCURSES_CH_T *, MAXLINES + 2)) == 0) 61634 + if ((vec_lines = typeCalloc(NCURSES_CH_T *, MAXLINES + 2)) == 0) 61635 usage(); 61636 61637 fname = argv[optind]; 39346 61638 diff -Naur ncurses-5.7.orig/test/worm.c ncurses-5.7/test/worm.c 39347 61639 --- ncurses-5.7.orig/test/worm.c 2008-10-04 14:54:09.000000000 -0700 39348 +++ ncurses-5.7/test/worm.c 2009-0 6-05 14:01:49.000000000 -070061640 +++ ncurses-5.7/test/worm.c 2009-07-19 15:03:58.000000000 -0700 39349 61641 @@ -61,7 +61,7 @@ 39350 61642 traces will be dumped. The program stops and waits for one character of … … 39385 61677 diff -Naur ncurses-5.7.orig/TO-DO ncurses-5.7/TO-DO 39386 61678 --- ncurses-5.7.orig/TO-DO 2008-10-11 12:22:27.000000000 -0700 39387 +++ ncurses-5.7/TO-DO 2009-0 6-05 14:00:53.000000000 -070061679 +++ ncurses-5.7/TO-DO 2009-07-19 15:01:59.000000000 -0700 39388 61680 @@ -25,7 +25,7 @@ 39389 61681 -- sale, use or other dealings in this Software without prior written --
Note:
See TracChangeset
for help on using the changeset viewer.
