Changeset 8652612
- Timestamp:
- Feb 15, 2009, 11:23:09 PM (16 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- 61a83e8
- Parents:
- 104131a
- Files:
-
- 2 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
BOOK/introduction/common/changelog.xml
r104131a r8652612 36 36 </listitem> 37 37 --> 38 39 <listitem> 40 <para>February 16, 2009</para> 41 <itemizedlist> 42 <listitem> 43 <para>[Jim] - Updated Ncurses Branch Update Patch to -8.</para> 44 </listitem> 45 </itemizedlist> 46 </listitem> 38 47 39 48 <listitem> -
BOOK/patches.ent
r104131a r8652612 93 93 <!ENTITY ncurses-bashfix-patch-size "4 KB"> 94 94 95 <!ENTITY ncurses-branch_update-patch "ncurses-&ncurses-version;-branch_update- 7.patch">96 <!ENTITY ncurses-branch_update-patch-md5 " ad86e7cca9d10083ac343d4e5f1fc5e9">97 <!ENTITY ncurses-branch_update-patch-size " 596 KB">95 <!ENTITY ncurses-branch_update-patch "ncurses-&ncurses-version;-branch_update-8.patch"> 96 <!ENTITY ncurses-branch_update-patch-md5 "761a9009211e0c17b388618127b213e8"> 97 <!ENTITY ncurses-branch_update-patch-size "716 KB"> 98 98 99 99 <!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch"> -
patches/ncurses-5.7-branch_update-8.patch
r104131a r8652612 1 1 Submitted By: Jim Gifford (jim at cross-lfs dot org) 2 Date: 02- 07-20092 Date: 02-15-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-200902 07.7 rechecked periodically. This patch covers up to 5.7-20090214. 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-02- 07 22:08:38.015428971-080011 +++ ncurses-5.7/aclocal.m4 2009-02-15 23:21:19.692164827 -0800 12 12 @@ -1,5 +1,5 @@ 13 13 dnl*************************************************************************** … … 886 886 diff -Naur ncurses-5.7.orig/Ada95/gen/adacurses-config.in ncurses-5.7/Ada95/gen/adacurses-config.in 887 887 --- ncurses-5.7.orig/Ada95/gen/adacurses-config.in 2007-04-07 14:06:50.000000000 -0700 888 +++ ncurses-5.7/Ada95/gen/adacurses-config.in 2009-02- 07 22:08:33.741616148 -0800888 +++ ncurses-5.7/Ada95/gen/adacurses-config.in 2009-02-15 23:21:14.347823438 -0800 889 889 @@ -1,18 +1,47 @@ 890 890 #! /bin/sh … … 960 960 diff -Naur ncurses-5.7.orig/Ada95/gen/Makefile.in ncurses-5.7/Ada95/gen/Makefile.in 961 961 --- ncurses-5.7.orig/Ada95/gen/Makefile.in 2008-10-04 15:58:31.000000000 -0700 962 +++ ncurses-5.7/Ada95/gen/Makefile.in 2009-02- 07 22:08:33.741616148 -0800962 +++ ncurses-5.7/Ada95/gen/Makefile.in 2009-02-15 23:21:14.347823438 -0800 963 963 @@ -1,5 +1,5 @@ 964 964 ############################################################################## … … 1016 1016 diff -Naur ncurses-5.7.orig/Ada95/samples/Makefile.in ncurses-5.7/Ada95/samples/Makefile.in 1017 1017 --- ncurses-5.7.orig/Ada95/samples/Makefile.in 2006-12-17 08:45:02.000000000 -0800 1018 +++ ncurses-5.7/Ada95/samples/Makefile.in 2009-02- 07 22:08:33.741616148 -08001018 +++ ncurses-5.7/Ada95/samples/Makefile.in 2009-02-15 23:21:14.347823438 -0800 1019 1019 @@ -1,5 +1,5 @@ 1020 1020 ############################################################################## … … 1055 1055 diff -Naur ncurses-5.7.orig/Ada95/src/Makefile.in ncurses-5.7/Ada95/src/Makefile.in 1056 1056 --- ncurses-5.7.orig/Ada95/src/Makefile.in 2007-09-15 11:22:24.000000000 -0700 1057 +++ ncurses-5.7/Ada95/src/Makefile.in 2009-02- 07 22:08:33.741616148 -08001057 +++ ncurses-5.7/Ada95/src/Makefile.in 2009-02-15 23:21:14.347823438 -0800 1058 1058 @@ -1,5 +1,5 @@ 1059 1059 ############################################################################## … … 1147 1147 diff -Naur ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb 1148 1148 --- ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb 2008-07-26 11:51:11.000000000 -0700 1149 +++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb 2009-02- 07 22:08:17.954755972-08001149 +++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb 2009-02-15 23:21:00.210918563 -0800 1150 1150 @@ -35,8 +35,8 @@ 1151 1151 ------------------------------------------------------------------------------ … … 1170 1170 diff -Naur ncurses-5.7.orig/c++/cursesw.cc ncurses-5.7/c++/cursesw.cc 1171 1171 --- ncurses-5.7.orig/c++/cursesw.cc 2007-12-15 15:01:57.000000000 -0800 1172 +++ ncurses-5.7/c++/cursesw.cc 2009-02- 07 22:08:17.958857941-08001172 +++ ncurses-5.7/c++/cursesw.cc 2009-02-15 23:21:00.214919122 -0800 1173 1173 @@ -1,6 +1,6 @@ 1174 1174 // * this is for making emacs happy: -*-Mode: C++;-*- … … 1207 1207 diff -Naur ncurses-5.7.orig/c++/Makefile.in ncurses-5.7/c++/Makefile.in 1208 1208 --- ncurses-5.7.orig/c++/Makefile.in 2007-04-28 08:29:12.000000000 -0700 1209 +++ ncurses-5.7/c++/Makefile.in 2009-02- 07 22:08:29.717995810-08001209 +++ ncurses-5.7/c++/Makefile.in 2009-02-15 23:21:09.899537365 -0800 1210 1210 @@ -1,6 +1,6 @@ 1211 1211 -# $Id: Makefile.in,v 1.84 2007/04/28 15:29:12 tom Exp $ … … 1241 1241 diff -Naur ncurses-5.7.orig/config.guess ncurses-5.7/config.guess 1242 1242 --- ncurses-5.7.orig/config.guess 2008-08-30 13:25:07.000000000 -0700 1243 +++ ncurses-5.7/config.guess 2009-02- 07 22:08:29.717995810-08001243 +++ ncurses-5.7/config.guess 2009-02-15 23:21:09.899537365 -0800 1244 1244 @@ -4,7 +4,7 @@ 1245 1245 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 … … 1311 1311 diff -Naur ncurses-5.7.orig/config.sub ncurses-5.7/config.sub 1312 1312 --- ncurses-5.7.orig/config.sub 2008-08-30 13:25:02.000000000 -0700 1313 +++ ncurses-5.7/config.sub 2009-02- 07 22:08:29.722097500-08001313 +++ ncurses-5.7/config.sub 2009-02-15 23:21:09.903537644 -0800 1314 1314 @@ -4,7 +4,7 @@ 1315 1315 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 … … 1395 1395 diff -Naur ncurses-5.7.orig/configure ncurses-5.7/configure 1396 1396 --- ncurses-5.7.orig/configure 2008-10-25 17:04:38.000000000 -0700 1397 +++ ncurses-5.7/configure 2009-02- 07 22:08:38.019530661-08001397 +++ ncurses-5.7/configure 2009-02-15 23:21:24.616480793 -0800 1398 1398 @@ -1,7 +1,7 @@ 1399 1399 #! /bin/sh 1400 1400 -# From configure.in Revision: 1.454 . 1401 +# From configure.in Revision: 1.46 5.1401 +# From configure.in Revision: 1.466 . 1402 1402 # Guess values for system-dependent variables and create Makefiles. 1403 1403 -# Generated by Autoconf 2.52.20080325. … … 1418 1418 --with-install-prefix prefixes actual install-location ($DESTDIR) 1419 1419 Build-Tools Needed to Compile Temporary Applications for Cross-compiling: 1420 @@ -870,7 +873,7 @@ 1420 @@ -762,6 +765,7 @@ 1421 --with-manpage-tbl specify manpage processing with tbl 1422 Extensions: 1423 --disable-ext-funcs disable function-extensions 1424 + --enable-sp-funcs disable experimental SCREEN-extensions 1425 --enable-const compile with extra/non-standard const 1426 --enable-ext-colors compile for 256-color support 1427 --enable-ext-mouse compile for extended mouse-encoding 1428 @@ -870,7 +874,7 @@ 1421 1429 running configure, to aid debugging if configure makes a mistake. 1422 1430 … … 1427 1435 $ $0 $@ 1428 1436 1429 @@ -994,7 +99 7,7 @@1437 @@ -994,7 +998,7 @@ 1430 1438 fi 1431 1439 for ac_site_file in $CONFIG_SITE; do 1432 1440 if test -r "$ac_site_file"; then 1433 1441 - { echo "$as_me:997: loading site script $ac_site_file" >&5 1434 + { echo "$as_me:100 0: loading site script $ac_site_file" >&51442 + { echo "$as_me:1001: loading site script $ac_site_file" >&5 1435 1443 echo "$as_me: loading site script $ac_site_file" >&6;} 1436 1444 cat "$ac_site_file" >&5 1437 1445 . "$ac_site_file" 1438 @@ -1005,7 +100 8,7 @@1446 @@ -1005,7 +1009,7 @@ 1439 1447 # Some versions of bash will fail to source /dev/null (special 1440 1448 # files actually), so we avoid doing that. 1441 1449 if test -f "$cache_file"; then 1442 1450 - { echo "$as_me:1008: loading cache $cache_file" >&5 1443 + { echo "$as_me:101 1: loading cache $cache_file" >&51451 + { echo "$as_me:1012: loading cache $cache_file" >&5 1444 1452 echo "$as_me: loading cache $cache_file" >&6;} 1445 1453 case $cache_file in 1446 1454 [\\/]* | ?:[\\/]* ) . $cache_file;; 1447 @@ -1013,7 +101 6,7 @@1455 @@ -1013,7 +1017,7 @@ 1448 1456 esac 1449 1457 fi 1450 1458 else 1451 1459 - { echo "$as_me:1016: creating cache $cache_file" >&5 1452 + { echo "$as_me:10 19: creating cache $cache_file" >&51460 + { echo "$as_me:1020: creating cache $cache_file" >&5 1453 1461 echo "$as_me: creating cache $cache_file" >&6;} 1454 1462 >$cache_file 1455 1463 fi 1456 @@ -1029,21 +103 2,21 @@1464 @@ -1029,21 +1033,21 @@ 1457 1465 eval ac_new_val="\$ac_env_${ac_var}_value" 1458 1466 case $ac_old_set,$ac_new_set in 1459 1467 set,) 1460 1468 - { echo "$as_me:1032: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 1461 + { echo "$as_me:103 5: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&51469 + { echo "$as_me:1036: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 1462 1470 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} 1463 1471 ac_cache_corrupted=: ;; 1464 1472 ,set) 1465 1473 - { echo "$as_me:1036: error: \`$ac_var' was not set in the previous run" >&5 1466 + { echo "$as_me:10 39: error: \`$ac_var' was not set in the previous run" >&51474 + { echo "$as_me:1040: error: \`$ac_var' was not set in the previous run" >&5 1467 1475 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} 1468 1476 ac_cache_corrupted=: ;; … … 1471 1479 if test "x$ac_old_val" != "x$ac_new_val"; then 1472 1480 - { echo "$as_me:1042: error: \`$ac_var' has changed since the previous run:" >&5 1473 + { echo "$as_me:104 5: error: \`$ac_var' has changed since the previous run:" >&51481 + { echo "$as_me:1046: error: \`$ac_var' has changed since the previous run:" >&5 1474 1482 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} 1475 1483 - { echo "$as_me:1044: former value: $ac_old_val" >&5 1476 + { echo "$as_me:104 7: former value: $ac_old_val" >&51484 + { echo "$as_me:1048: former value: $ac_old_val" >&5 1477 1485 echo "$as_me: former value: $ac_old_val" >&2;} 1478 1486 - { echo "$as_me:1046: current value: $ac_new_val" >&5 1479 + { echo "$as_me:10 49: current value: $ac_new_val" >&51487 + { echo "$as_me:1050: current value: $ac_new_val" >&5 1480 1488 echo "$as_me: current value: $ac_new_val" >&2;} 1481 1489 ac_cache_corrupted=: 1482 1490 fi;; 1483 @@ -1062,9 +106 5,9 @@1491 @@ -1062,9 +1066,9 @@ 1484 1492 fi 1485 1493 done 1486 1494 if $ac_cache_corrupted; then 1487 1495 - { echo "$as_me:1065: error: changes in the environment can compromise the build" >&5 1488 + { echo "$as_me:106 8: error: changes in the environment can compromise the build" >&51496 + { echo "$as_me:1069: error: changes in the environment can compromise the build" >&5 1489 1497 echo "$as_me: error: changes in the environment can compromise the build" >&2;} 1490 1498 - { { echo "$as_me:1067: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 1491 + { { echo "$as_me:107 0: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&51499 + { { echo "$as_me:1071: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 1492 1500 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} 1493 1501 { (exit 1); exit 1; }; } 1494 1502 fi 1495 @@ -1085,10 +108 8,10 @@1503 @@ -1085,10 +1089,10 @@ 1496 1504 echo "#! $SHELL" >conftest.sh 1497 1505 echo "exit 0" >>conftest.sh 1498 1506 chmod +x conftest.sh 1499 1507 -if { (echo "$as_me:1088: PATH=\".;.\"; conftest.sh") >&5 1500 +if { (echo "$as_me:109 1: PATH=\".;.\"; conftest.sh") >&51508 +if { (echo "$as_me:1092: PATH=\".;.\"; conftest.sh") >&5 1501 1509 (PATH=".;."; conftest.sh) 2>&5 1502 1510 ac_status=$? 1503 1511 - echo "$as_me:1091: \$? = $ac_status" >&5 1504 + echo "$as_me:109 4: \$? = $ac_status" >&51512 + echo "$as_me:1095: \$? = $ac_status" >&5 1505 1513 (exit $ac_status); }; then 1506 1514 ac_path_separator=';' 1507 1515 else 1508 @@ -1101,7 +110 4,7 @@1516 @@ -1101,7 +1105,7 @@ 1509 1517 1510 1518 top_builddir=`pwd` 1511 1519 1512 1520 -echo "$as_me:1104: checking for egrep" >&5 1513 +echo "$as_me:110 7: checking for egrep" >&51521 +echo "$as_me:1108: checking for egrep" >&5 1514 1522 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 1515 1523 if test "${ac_cv_prog_egrep+set}" = set; then 1516 1524 echo $ECHO_N "(cached) $ECHO_C" >&6 1517 @@ -1111,11 +111 4,11 @@1525 @@ -1111,11 +1115,11 @@ 1518 1526 else ac_cv_prog_egrep='egrep' 1519 1527 fi 1520 1528 fi 1521 1529 -echo "$as_me:1114: result: $ac_cv_prog_egrep" >&5 1522 +echo "$as_me:111 7: result: $ac_cv_prog_egrep" >&51530 +echo "$as_me:1118: result: $ac_cv_prog_egrep" >&5 1523 1531 echo "${ECHO_T}$ac_cv_prog_egrep" >&6 1524 1532 EGREP=$ac_cv_prog_egrep 1525 1533 1526 1534 -test -z "$EGREP" && { { echo "$as_me:1118: error: No egrep program found" >&5 1527 +test -z "$EGREP" && { { echo "$as_me:112 1: error: No egrep program found" >&51535 +test -z "$EGREP" && { { echo "$as_me:1122: error: No egrep program found" >&5 1528 1536 echo "$as_me: error: No egrep program found" >&2;} 1529 1537 { (exit 1); exit 1; }; } 1530 1538 1531 @@ -1125,7 +112 8,7 @@1539 @@ -1125,7 +1129,7 @@ 1532 1540 cf_cv_abi_version=${NCURSES_MAJOR} 1533 1541 cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR} 1534 1542 cf_cv_timestamp=`date` 1535 1543 -echo "$as_me:1128: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 1536 +echo "$as_me:113 1: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&51544 +echo "$as_me:1132: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 1537 1545 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6 1538 1546 1539 1547 test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0 1540 @@ -1133,7 +113 6,7 @@1548 @@ -1133,7 +1137,7 @@ 1541 1549 # Check whether --with-rel-version or --without-rel-version was given. 1542 1550 if test "${with_rel_version+set}" = set; then 1543 1551 withval="$with_rel_version" 1544 1552 - { echo "$as_me:1136: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5 1545 + { echo "$as_me:11 39: WARNING: overriding release version $cf_cv_rel_version to $withval" >&51553 + { echo "$as_me:1140: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5 1546 1554 echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;} 1547 1555 cf_cv_rel_version=$withval 1548 1556 fi; 1549 @@ -1146,13 +11 49,13 @@1557 @@ -1146,13 +1150,13 @@ 1550 1558 [0-9]*) #(vi 1551 1559 ;; 1552 1560 *) 1553 1561 - { { echo "$as_me:1149: error: Release major-version is not a number: $NCURSES_MAJOR" >&5 1554 + { { echo "$as_me:115 2: error: Release major-version is not a number: $NCURSES_MAJOR" >&51562 + { { echo "$as_me:1153: error: Release major-version is not a number: $NCURSES_MAJOR" >&5 1555 1563 echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;} 1556 1564 { (exit 1); exit 1; }; } … … 1559 1567 else 1560 1568 - { { echo "$as_me:1155: error: Release major-version value is empty" >&5 1561 + { { echo "$as_me:115 8: error: Release major-version value is empty" >&51569 + { { echo "$as_me:1159: error: Release major-version value is empty" >&5 1562 1570 echo "$as_me: error: Release major-version value is empty" >&2;} 1563 1571 { (exit 1); exit 1; }; } 1564 1572 fi 1565 @@ -1162,13 +116 5,13 @@1573 @@ -1162,13 +1166,13 @@ 1566 1574 [0-9]*) #(vi 1567 1575 ;; 1568 1576 *) 1569 1577 - { { echo "$as_me:1165: error: Release minor-version is not a number: $NCURSES_MINOR" >&5 1570 + { { echo "$as_me:116 8: error: Release minor-version is not a number: $NCURSES_MINOR" >&51578 + { { echo "$as_me:1169: error: Release minor-version is not a number: $NCURSES_MINOR" >&5 1571 1579 echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;} 1572 1580 { (exit 1); exit 1; }; } … … 1575 1583 else 1576 1584 - { { echo "$as_me:1171: error: Release minor-version value is empty" >&5 1577 + { { echo "$as_me:117 4: error: Release minor-version value is empty" >&51585 + { { echo "$as_me:1175: error: Release minor-version value is empty" >&5 1578 1586 echo "$as_me: error: Release minor-version value is empty" >&2;} 1579 1587 { (exit 1); exit 1; }; } 1580 1588 fi 1581 @@ -1178,7 +118 1,7 @@1589 @@ -1178,7 +1182,7 @@ 1582 1590 # Check whether --with-abi-version or --without-abi-version was given. 1583 1591 if test "${with_abi_version+set}" = set; then 1584 1592 withval="$with_abi_version" 1585 1593 - { echo "$as_me:1181: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5 1586 + { echo "$as_me:118 4: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&51594 + { echo "$as_me:1185: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5 1587 1595 echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;} 1588 1596 cf_cv_abi_version=$withval 1589 1597 fi; 1590 @@ -1188,13 +119 1,13 @@1598 @@ -1188,13 +1192,13 @@ 1591 1599 [0-9]*) #(vi 1592 1600 ;; 1593 1601 *) 1594 1602 - { { echo "$as_me:1191: error: ABI version is not a number: $cf_cv_abi_version" >&5 1595 + { { echo "$as_me:119 4: error: ABI version is not a number: $cf_cv_abi_version" >&51603 + { { echo "$as_me:1195: error: ABI version is not a number: $cf_cv_abi_version" >&5 1596 1604 echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;} 1597 1605 { (exit 1); exit 1; }; } … … 1600 1608 else 1601 1609 - { { echo "$as_me:1197: error: ABI version value is empty" >&5 1602 + { { echo "$as_me:120 0: error: ABI version value is empty" >&51610 + { { echo "$as_me:1201: error: ABI version value is empty" >&5 1603 1611 echo "$as_me: error: ABI version value is empty" >&2;} 1604 1612 { (exit 1); exit 1; }; } 1605 1613 fi 1606 @@ -1216,7 +12 19,7 @@1614 @@ -1216,7 +1220,7 @@ 1607 1615 fi 1608 1616 done 1609 1617 if test -z "$ac_aux_dir"; then 1610 1618 - { { echo "$as_me:1219: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 1611 + { { echo "$as_me:122 2: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&51619 + { { echo "$as_me:1223: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 1612 1620 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} 1613 1621 { (exit 1); exit 1; }; } 1614 1622 fi 1615 @@ -1226,11 +12 29,11 @@1623 @@ -1226,11 +1230,11 @@ 1616 1624 1617 1625 # Make sure we can run config.sub. 1618 1626 $ac_config_sub sun4 >/dev/null 2>&1 || 1619 1627 - { { echo "$as_me:1229: error: cannot run $ac_config_sub" >&5 1620 + { { echo "$as_me:123 2: error: cannot run $ac_config_sub" >&51628 + { { echo "$as_me:1233: error: cannot run $ac_config_sub" >&5 1621 1629 echo "$as_me: error: cannot run $ac_config_sub" >&2;} 1622 1630 { (exit 1); exit 1; }; } 1623 1631 1624 1632 -echo "$as_me:1233: checking build system type" >&5 1625 +echo "$as_me:123 6: checking build system type" >&51633 +echo "$as_me:1237: checking build system type" >&5 1626 1634 echo $ECHO_N "checking build system type... $ECHO_C" >&6 1627 1635 if test "${ac_cv_build+set}" = set; then 1628 1636 echo $ECHO_N "(cached) $ECHO_C" >&6 1629 @@ -1239,23 +124 2,23 @@1637 @@ -1239,23 +1243,23 @@ 1630 1638 test -z "$ac_cv_build_alias" && 1631 1639 ac_cv_build_alias=`$ac_config_guess` 1632 1640 test -z "$ac_cv_build_alias" && 1633 1641 - { { echo "$as_me:1242: error: cannot guess build type; you must specify one" >&5 1634 + { { echo "$as_me:124 5: error: cannot guess build type; you must specify one" >&51642 + { { echo "$as_me:1246: error: cannot guess build type; you must specify one" >&5 1635 1643 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} 1636 1644 { (exit 1); exit 1; }; } 1637 1645 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || 1638 1646 - { { echo "$as_me:1246: error: $ac_config_sub $ac_cv_build_alias failed." >&5 1639 + { { echo "$as_me:12 49: error: $ac_config_sub $ac_cv_build_alias failed." >&51647 + { { echo "$as_me:1250: error: $ac_config_sub $ac_cv_build_alias failed." >&5 1640 1648 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} 1641 1649 { (exit 1); exit 1; }; } … … 1643 1651 fi 1644 1652 -echo "$as_me:1251: result: $ac_cv_build" >&5 1645 +echo "$as_me:125 4: result: $ac_cv_build" >&51653 +echo "$as_me:1255: result: $ac_cv_build" >&5 1646 1654 echo "${ECHO_T}$ac_cv_build" >&6 1647 1655 build=$ac_cv_build … … 1651 1659 1652 1660 -echo "$as_me:1258: checking host system type" >&5 1653 +echo "$as_me:126 1: checking host system type" >&51661 +echo "$as_me:1262: checking host system type" >&5 1654 1662 echo $ECHO_N "checking host system type... $ECHO_C" >&6 1655 1663 if test "${ac_cv_host+set}" = set; then 1656 1664 echo $ECHO_N "(cached) $ECHO_C" >&6 1657 @@ -1264,12 +126 7,12 @@1665 @@ -1264,12 +1268,12 @@ 1658 1666 test -z "$ac_cv_host_alias" && 1659 1667 ac_cv_host_alias=$ac_cv_build_alias 1660 1668 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || 1661 1669 - { { echo "$as_me:1267: error: $ac_config_sub $ac_cv_host_alias failed" >&5 1662 + { { echo "$as_me:127 0: error: $ac_config_sub $ac_cv_host_alias failed" >&51670 + { { echo "$as_me:1271: error: $ac_config_sub $ac_cv_host_alias failed" >&5 1663 1671 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} 1664 1672 { (exit 1); exit 1; }; } … … 1666 1674 fi 1667 1675 -echo "$as_me:1272: result: $ac_cv_host" >&5 1668 +echo "$as_me:127 5: result: $ac_cv_host" >&51676 +echo "$as_me:1276: result: $ac_cv_host" >&5 1669 1677 echo "${ECHO_T}$ac_cv_host" >&6 1670 1678 host=$ac_cv_host 1671 1679 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` 1672 @@ -1277,7 +128 0,7 @@1680 @@ -1277,7 +1281,7 @@ 1673 1681 host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` 1674 1682 1675 1683 if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then 1676 1684 - echo "$as_me:1280: checking target system type" >&5 1677 + echo "$as_me:128 3: checking target system type" >&51685 + echo "$as_me:1284: checking target system type" >&5 1678 1686 echo $ECHO_N "checking target system type... $ECHO_C" >&6 1679 1687 if test "${ac_cv_target+set}" = set; then 1680 1688 echo $ECHO_N "(cached) $ECHO_C" >&6 1681 @@ -1286,12 +12 89,12 @@1689 @@ -1286,12 +1290,12 @@ 1682 1690 test "x$ac_cv_target_alias" = "x" && 1683 1691 ac_cv_target_alias=$ac_cv_host_alias 1684 1692 ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || 1685 1693 - { { echo "$as_me:1289: error: $ac_config_sub $ac_cv_target_alias failed" >&5 1686 + { { echo "$as_me:129 2: error: $ac_config_sub $ac_cv_target_alias failed" >&51694 + { { echo "$as_me:1293: error: $ac_config_sub $ac_cv_target_alias failed" >&5 1687 1695 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} 1688 1696 { (exit 1); exit 1; }; } … … 1690 1698 fi 1691 1699 -echo "$as_me:1294: result: $ac_cv_target" >&5 1692 +echo "$as_me:129 7: result: $ac_cv_target" >&51700 +echo "$as_me:1298: result: $ac_cv_target" >&5 1693 1701 echo "${ECHO_T}$ac_cv_target" >&6 1694 1702 target=$ac_cv_target 1695 1703 target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` 1696 @@ -1322,13 +132 5,13 @@1704 @@ -1322,13 +1326,13 @@ 1697 1705 fi 1698 1706 1699 1707 test -z "$system_name" && system_name="$cf_cv_system_name" 1700 1708 -test -n "$cf_cv_system_name" && echo "$as_me:1325: result: Configuring for $cf_cv_system_name" >&5 1701 +test -n "$cf_cv_system_name" && echo "$as_me:132 8: result: Configuring for $cf_cv_system_name" >&51709 +test -n "$cf_cv_system_name" && echo "$as_me:1329: result: Configuring for $cf_cv_system_name" >&5 1702 1710 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 1703 1711 1704 1712 if test ".$system_name" != ".$cf_cv_system_name" ; then 1705 1713 - echo "$as_me:1329: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 1706 + echo "$as_me:133 2: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&51714 + echo "$as_me:1333: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 1707 1715 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 1708 1716 - { { echo "$as_me:1331: error: \"Please remove config.cache and try again.\"" >&5 1709 + { { echo "$as_me:133 4: error: \"Please remove config.cache and try again.\"" >&51717 + { { echo "$as_me:1335: error: \"Please remove config.cache and try again.\"" >&5 1710 1718 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} 1711 1719 { (exit 1); exit 1; }; } 1712 1720 fi 1713 @@ -1336,7 +13 39,7 @@1721 @@ -1336,7 +1340,7 @@ 1714 1722 # Check whether --with-system-type or --without-system-type was given. 1715 1723 if test "${with_system_type+set}" = set; then 1716 1724 withval="$with_system_type" 1717 1725 - { echo "$as_me:1339: WARNING: overriding system type to $withval" >&5 1718 + { echo "$as_me:134 2: WARNING: overriding system type to $withval" >&51726 + { echo "$as_me:1343: WARNING: overriding system type to $withval" >&5 1719 1727 echo "$as_me: WARNING: overriding system type to $withval" >&2;} 1720 1728 cf_cv_system_name=$withval 1721 1729 fi; 1722 @@ -1346,7 +13 49,7 @@1730 @@ -1346,7 +1350,7 @@ 1723 1731 1724 1732 ### Default install-location 1725 1733 1726 1734 -echo "$as_me:1349: checking for prefix" >&5 1727 +echo "$as_me:135 2: checking for prefix" >&51735 +echo "$as_me:1353: checking for prefix" >&5 1728 1736 echo $ECHO_N "checking for prefix... $ECHO_C" >&6 1729 1737 if test "x$prefix" = "xNONE" ; then 1730 1738 case "$cf_cv_system_name" in 1731 @@ -1358,11 +136 1,11 @@1739 @@ -1358,11 +1362,11 @@ 1732 1740 ;; 1733 1741 esac 1734 1742 fi 1735 1743 -echo "$as_me:1361: result: $prefix" >&5 1736 +echo "$as_me:136 4: result: $prefix" >&51744 +echo "$as_me:1365: result: $prefix" >&5 1737 1745 echo "${ECHO_T}$prefix" >&6 1738 1746 1739 1747 if test "x$prefix" = "xNONE" ; then 1740 1748 -echo "$as_me:1365: checking for default include-directory" >&5 1741 +echo "$as_me:136 8: checking for default include-directory" >&51749 +echo "$as_me:1369: checking for default include-directory" >&5 1742 1750 echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6 1743 1751 test -n "$verbose" && echo 1>&6 1744 1752 for cf_symbol in \ 1745 @@ -1385,7 +138 8,7 @@1753 @@ -1385,7 +1389,7 @@ 1746 1754 fi 1747 1755 test -n "$verbose" && echo " tested $cf_dir" 1>&6 1748 1756 done 1749 1757 -echo "$as_me:1388: result: $includedir" >&5 1750 +echo "$as_me:139 1: result: $includedir" >&51758 +echo "$as_me:1392: result: $includedir" >&5 1751 1759 echo "${ECHO_T}$includedir" >&6 1752 1760 fi 1753 1761 1754 @@ -1399,7 +140 2,7 @@1762 @@ -1399,7 +1403,7 @@ 1755 1763 if test -n "$ac_tool_prefix"; then 1756 1764 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. 1757 1765 set dummy ${ac_tool_prefix}gcc; ac_word=$2 1758 1766 -echo "$as_me:1402: checking for $ac_word" >&5 1759 +echo "$as_me:140 5: checking for $ac_word" >&51767 +echo "$as_me:1406: checking for $ac_word" >&5 1760 1768 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 1761 1769 if test "${ac_cv_prog_CC+set}" = set; then 1762 1770 echo $ECHO_N "(cached) $ECHO_C" >&6 1763 @@ -1414,7 +141 7,7 @@1771 @@ -1414,7 +1418,7 @@ 1764 1772 test -z "$ac_dir" && ac_dir=. 1765 1773 $as_executable_p "$ac_dir/$ac_word" || continue 1766 1774 ac_cv_prog_CC="${ac_tool_prefix}gcc" 1767 1775 -echo "$as_me:1417: found $ac_dir/$ac_word" >&5 1768 +echo "$as_me:142 0: found $ac_dir/$ac_word" >&51776 +echo "$as_me:1421: found $ac_dir/$ac_word" >&5 1769 1777 break 1770 1778 done 1771 1779 1772 @@ -1422,10 +142 5,10 @@1780 @@ -1422,10 +1426,10 @@ 1773 1781 fi 1774 1782 CC=$ac_cv_prog_CC 1775 1783 if test -n "$CC"; then 1776 1784 - echo "$as_me:1425: result: $CC" >&5 1777 + echo "$as_me:142 8: result: $CC" >&51785 + echo "$as_me:1429: result: $CC" >&5 1778 1786 echo "${ECHO_T}$CC" >&6 1779 1787 else 1780 1788 - echo "$as_me:1428: result: no" >&5 1781 + echo "$as_me:143 1: result: no" >&51789 + echo "$as_me:1432: result: no" >&5 1782 1790 echo "${ECHO_T}no" >&6 1783 1791 fi 1784 1792 1785 @@ -1434,7 +143 7,7 @@1793 @@ -1434,7 +1438,7 @@ 1786 1794 ac_ct_CC=$CC 1787 1795 # Extract the first word of "gcc", so it can be a program name with args. 1788 1796 set dummy gcc; ac_word=$2 1789 1797 -echo "$as_me:1437: checking for $ac_word" >&5 1790 +echo "$as_me:144 0: checking for $ac_word" >&51798 +echo "$as_me:1441: checking for $ac_word" >&5 1791 1799 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 1792 1800 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then 1793 1801 echo $ECHO_N "(cached) $ECHO_C" >&6 1794 @@ -1449,7 +145 2,7 @@1802 @@ -1449,7 +1453,7 @@ 1795 1803 test -z "$ac_dir" && ac_dir=. 1796 1804 $as_executable_p "$ac_dir/$ac_word" || continue 1797 1805 ac_cv_prog_ac_ct_CC="gcc" 1798 1806 -echo "$as_me:1452: found $ac_dir/$ac_word" >&5 1799 +echo "$as_me:145 5: found $ac_dir/$ac_word" >&51807 +echo "$as_me:1456: found $ac_dir/$ac_word" >&5 1800 1808 break 1801 1809 done 1802 1810 1803 @@ -1457,10 +146 0,10 @@1811 @@ -1457,10 +1461,10 @@ 1804 1812 fi 1805 1813 ac_ct_CC=$ac_cv_prog_ac_ct_CC 1806 1814 if test -n "$ac_ct_CC"; then 1807 1815 - echo "$as_me:1460: result: $ac_ct_CC" >&5 1808 + echo "$as_me:146 3: result: $ac_ct_CC" >&51816 + echo "$as_me:1464: result: $ac_ct_CC" >&5 1809 1817 echo "${ECHO_T}$ac_ct_CC" >&6 1810 1818 else 1811 1819 - echo "$as_me:1463: result: no" >&5 1812 + echo "$as_me:146 6: result: no" >&51820 + echo "$as_me:1467: result: no" >&5 1813 1821 echo "${ECHO_T}no" >&6 1814 1822 fi 1815 1823 1816 @@ -1473,7 +147 6,7 @@1824 @@ -1473,7 +1477,7 @@ 1817 1825 if test -n "$ac_tool_prefix"; then 1818 1826 # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. 1819 1827 set dummy ${ac_tool_prefix}cc; ac_word=$2 1820 1828 -echo "$as_me:1476: checking for $ac_word" >&5 1821 +echo "$as_me:14 79: checking for $ac_word" >&51829 +echo "$as_me:1480: checking for $ac_word" >&5 1822 1830 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 1823 1831 if test "${ac_cv_prog_CC+set}" = set; then 1824 1832 echo $ECHO_N "(cached) $ECHO_C" >&6 1825 @@ -1488,7 +149 1,7 @@1833 @@ -1488,7 +1492,7 @@ 1826 1834 test -z "$ac_dir" && ac_dir=. 1827 1835 $as_executable_p "$ac_dir/$ac_word" || continue 1828 1836 ac_cv_prog_CC="${ac_tool_prefix}cc" 1829 1837 -echo "$as_me:1491: found $ac_dir/$ac_word" >&5 1830 +echo "$as_me:149 4: found $ac_dir/$ac_word" >&51838 +echo "$as_me:1495: found $ac_dir/$ac_word" >&5 1831 1839 break 1832 1840 done 1833 1841 1834 @@ -1496,10 +1 499,10 @@1842 @@ -1496,10 +1500,10 @@ 1835 1843 fi 1836 1844 CC=$ac_cv_prog_CC 1837 1845 if test -n "$CC"; then 1838 1846 - echo "$as_me:1499: result: $CC" >&5 1839 + echo "$as_me:150 2: result: $CC" >&51847 + echo "$as_me:1503: result: $CC" >&5 1840 1848 echo "${ECHO_T}$CC" >&6 1841 1849 else 1842 1850 - echo "$as_me:1502: result: no" >&5 1843 + echo "$as_me:150 5: result: no" >&51851 + echo "$as_me:1506: result: no" >&5 1844 1852 echo "${ECHO_T}no" >&6 1845 1853 fi 1846 1854 1847 @@ -1508,7 +151 1,7 @@1855 @@ -1508,7 +1512,7 @@ 1848 1856 ac_ct_CC=$CC 1849 1857 # Extract the first word of "cc", so it can be a program name with args. 1850 1858 set dummy cc; ac_word=$2 1851 1859 -echo "$as_me:1511: checking for $ac_word" >&5 1852 +echo "$as_me:151 4: checking for $ac_word" >&51860 +echo "$as_me:1515: checking for $ac_word" >&5 1853 1861 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 1854 1862 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then 1855 1863 echo $ECHO_N "(cached) $ECHO_C" >&6 1856 @@ -1523,7 +152 6,7 @@1864 @@ -1523,7 +1527,7 @@ 1857 1865 test -z "$ac_dir" && ac_dir=. 1858 1866 $as_executable_p "$ac_dir/$ac_word" || continue 1859 1867 ac_cv_prog_ac_ct_CC="cc" 1860 1868 -echo "$as_me:1526: found $ac_dir/$ac_word" >&5 1861 +echo "$as_me:15 29: found $ac_dir/$ac_word" >&51869 +echo "$as_me:1530: found $ac_dir/$ac_word" >&5 1862 1870 break 1863 1871 done 1864 1872 1865 @@ -1531,10 +153 4,10 @@1873 @@ -1531,10 +1535,10 @@ 1866 1874 fi 1867 1875 ac_ct_CC=$ac_cv_prog_ac_ct_CC 1868 1876 if test -n "$ac_ct_CC"; then 1869 1877 - echo "$as_me:1534: result: $ac_ct_CC" >&5 1870 + echo "$as_me:153 7: result: $ac_ct_CC" >&51878 + echo "$as_me:1538: result: $ac_ct_CC" >&5 1871 1879 echo "${ECHO_T}$ac_ct_CC" >&6 1872 1880 else 1873 1881 - echo "$as_me:1537: result: no" >&5 1874 + echo "$as_me:154 0: result: no" >&51882 + echo "$as_me:1541: result: no" >&5 1875 1883 echo "${ECHO_T}no" >&6 1876 1884 fi 1877 1885 1878 @@ -1547,7 +155 0,7 @@1886 @@ -1547,7 +1551,7 @@ 1879 1887 if test -z "$CC"; then 1880 1888 # Extract the first word of "cc", so it can be a program name with args. 1881 1889 set dummy cc; ac_word=$2 1882 1890 -echo "$as_me:1550: checking for $ac_word" >&5 1883 +echo "$as_me:155 3: checking for $ac_word" >&51891 +echo "$as_me:1554: checking for $ac_word" >&5 1884 1892 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 1885 1893 if test "${ac_cv_prog_CC+set}" = set; then 1886 1894 echo $ECHO_N "(cached) $ECHO_C" >&6 1887 @@ -1567,7 +157 0,7 @@1895 @@ -1567,7 +1571,7 @@ 1888 1896 continue 1889 1897 fi 1890 1898 ac_cv_prog_CC="cc" 1891 1899 -echo "$as_me:1570: found $ac_dir/$ac_word" >&5 1892 +echo "$as_me:157 3: found $ac_dir/$ac_word" >&51900 +echo "$as_me:1574: found $ac_dir/$ac_word" >&5 1893 1901 break 1894 1902 done 1895 1903 1896 @@ -1589,10 +159 2,10 @@1904 @@ -1589,10 +1593,10 @@ 1897 1905 fi 1898 1906 CC=$ac_cv_prog_CC 1899 1907 if test -n "$CC"; then 1900 1908 - echo "$as_me:1592: result: $CC" >&5 1901 + echo "$as_me:159 5: result: $CC" >&51909 + echo "$as_me:1596: result: $CC" >&5 1902 1910 echo "${ECHO_T}$CC" >&6 1903 1911 else 1904 1912 - echo "$as_me:1595: result: no" >&5 1905 + echo "$as_me:159 8: result: no" >&51913 + echo "$as_me:1599: result: no" >&5 1906 1914 echo "${ECHO_T}no" >&6 1907 1915 fi 1908 1916 1909 @@ -1603,7 +160 6,7 @@1917 @@ -1603,7 +1607,7 @@ 1910 1918 do 1911 1919 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 1912 1920 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 1913 1921 -echo "$as_me:1606: checking for $ac_word" >&5 1914 +echo "$as_me:16 09: checking for $ac_word" >&51922 +echo "$as_me:1610: checking for $ac_word" >&5 1915 1923 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 1916 1924 if test "${ac_cv_prog_CC+set}" = set; then 1917 1925 echo $ECHO_N "(cached) $ECHO_C" >&6 1918 @@ -1618,7 +162 1,7 @@1926 @@ -1618,7 +1622,7 @@ 1919 1927 test -z "$ac_dir" && ac_dir=. 1920 1928 $as_executable_p "$ac_dir/$ac_word" || continue 1921 1929 ac_cv_prog_CC="$ac_tool_prefix$ac_prog" 1922 1930 -echo "$as_me:1621: found $ac_dir/$ac_word" >&5 1923 +echo "$as_me:162 4: found $ac_dir/$ac_word" >&51931 +echo "$as_me:1625: found $ac_dir/$ac_word" >&5 1924 1932 break 1925 1933 done 1926 1934 1927 @@ -1626,10 +16 29,10 @@1935 @@ -1626,10 +1630,10 @@ 1928 1936 fi 1929 1937 CC=$ac_cv_prog_CC 1930 1938 if test -n "$CC"; then 1931 1939 - echo "$as_me:1629: result: $CC" >&5 1932 + echo "$as_me:163 2: result: $CC" >&51940 + echo "$as_me:1633: result: $CC" >&5 1933 1941 echo "${ECHO_T}$CC" >&6 1934 1942 else 1935 1943 - echo "$as_me:1632: result: no" >&5 1936 + echo "$as_me:163 5: result: no" >&51944 + echo "$as_me:1636: result: no" >&5 1937 1945 echo "${ECHO_T}no" >&6 1938 1946 fi 1939 1947 1940 @@ -1642,7 +164 5,7 @@1948 @@ -1642,7 +1646,7 @@ 1941 1949 do 1942 1950 # Extract the first word of "$ac_prog", so it can be a program name with args. 1943 1951 set dummy $ac_prog; ac_word=$2 1944 1952 -echo "$as_me:1645: checking for $ac_word" >&5 1945 +echo "$as_me:164 8: checking for $ac_word" >&51953 +echo "$as_me:1649: checking for $ac_word" >&5 1946 1954 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 1947 1955 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then 1948 1956 echo $ECHO_N "(cached) $ECHO_C" >&6 1949 @@ -1657,7 +166 0,7 @@1957 @@ -1657,7 +1661,7 @@ 1950 1958 test -z "$ac_dir" && ac_dir=. 1951 1959 $as_executable_p "$ac_dir/$ac_word" || continue 1952 1960 ac_cv_prog_ac_ct_CC="$ac_prog" 1953 1961 -echo "$as_me:1660: found $ac_dir/$ac_word" >&5 1954 +echo "$as_me:166 3: found $ac_dir/$ac_word" >&51962 +echo "$as_me:1664: found $ac_dir/$ac_word" >&5 1955 1963 break 1956 1964 done 1957 1965 1958 @@ -1665,10 +166 8,10 @@1966 @@ -1665,10 +1669,10 @@ 1959 1967 fi 1960 1968 ac_ct_CC=$ac_cv_prog_ac_ct_CC 1961 1969 if test -n "$ac_ct_CC"; then 1962 1970 - echo "$as_me:1668: result: $ac_ct_CC" >&5 1963 + echo "$as_me:167 1: result: $ac_ct_CC" >&51971 + echo "$as_me:1672: result: $ac_ct_CC" >&5 1964 1972 echo "${ECHO_T}$ac_ct_CC" >&6 1965 1973 else 1966 1974 - echo "$as_me:1671: result: no" >&5 1967 + echo "$as_me:167 4: result: no" >&51975 + echo "$as_me:1675: result: no" >&5 1968 1976 echo "${ECHO_T}no" >&6 1969 1977 fi 1970 1978 1971 @@ -1680,32 +168 3,32 @@1979 @@ -1680,32 +1684,32 @@ 1972 1980 1973 1981 fi 1974 1982 1975 1983 -test -z "$CC" && { { echo "$as_me:1683: error: no acceptable cc found in \$PATH" >&5 1976 +test -z "$CC" && { { echo "$as_me:168 6: error: no acceptable cc found in \$PATH" >&51984 +test -z "$CC" && { { echo "$as_me:1687: error: no acceptable cc found in \$PATH" >&5 1977 1985 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} 1978 1986 { (exit 1); exit 1; }; } … … 1980 1988 # Provide some information about the compiler. 1981 1989 -echo "$as_me:1688:" \ 1982 +echo "$as_me:169 1:" \1990 +echo "$as_me:1692:" \ 1983 1991 "checking for C compiler version" >&5 1984 1992 ac_compiler=`set X $ac_compile; echo $2` 1985 1993 -{ (eval echo "$as_me:1691: \"$ac_compiler --version </dev/null >&5\"") >&5 1986 +{ (eval echo "$as_me:169 4: \"$ac_compiler --version </dev/null >&5\"") >&51994 +{ (eval echo "$as_me:1695: \"$ac_compiler --version </dev/null >&5\"") >&5 1987 1995 (eval $ac_compiler --version </dev/null >&5) 2>&5 1988 1996 ac_status=$? 1989 1997 - echo "$as_me:1694: \$? = $ac_status" >&5 1990 + echo "$as_me:169 7: \$? = $ac_status" >&51998 + echo "$as_me:1698: \$? = $ac_status" >&5 1991 1999 (exit $ac_status); } 1992 2000 -{ (eval echo "$as_me:1696: \"$ac_compiler -v </dev/null >&5\"") >&5 1993 +{ (eval echo "$as_me:1 699: \"$ac_compiler -v </dev/null >&5\"") >&52001 +{ (eval echo "$as_me:1700: \"$ac_compiler -v </dev/null >&5\"") >&5 1994 2002 (eval $ac_compiler -v </dev/null >&5) 2>&5 1995 2003 ac_status=$? 1996 2004 - echo "$as_me:1699: \$? = $ac_status" >&5 1997 + echo "$as_me:170 2: \$? = $ac_status" >&52005 + echo "$as_me:1703: \$? = $ac_status" >&5 1998 2006 (exit $ac_status); } 1999 2007 -{ (eval echo "$as_me:1701: \"$ac_compiler -V </dev/null >&5\"") >&5 2000 +{ (eval echo "$as_me:170 4: \"$ac_compiler -V </dev/null >&5\"") >&52008 +{ (eval echo "$as_me:1705: \"$ac_compiler -V </dev/null >&5\"") >&5 2001 2009 (eval $ac_compiler -V </dev/null >&5) 2>&5 2002 2010 ac_status=$? 2003 2011 - echo "$as_me:1704: \$? = $ac_status" >&5 2004 + echo "$as_me:170 7: \$? = $ac_status" >&52012 + echo "$as_me:1708: \$? = $ac_status" >&5 2005 2013 (exit $ac_status); } 2006 2014 2007 2015 cat >conftest.$ac_ext <<_ACEOF 2008 2016 -#line 1708 "configure" 2009 +#line 171 1"configure"2017 +#line 1712 "configure" 2010 2018 #include "confdefs.h" 2011 2019 2012 2020 int 2013 @@ -1721,13 +172 4,13 @@2021 @@ -1721,13 +1725,13 @@ 2014 2022 # Try to create an executable without -o first, disregard a.out. 2015 2023 # It will help us diagnose broken compilers, and finding out an intuition 2016 2024 # of exeext. 2017 2025 -echo "$as_me:1724: checking for C compiler default output" >&5 2018 +echo "$as_me:172 7: checking for C compiler default output" >&52026 +echo "$as_me:1728: checking for C compiler default output" >&5 2019 2027 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 2020 2028 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` 2021 2029 -if { (eval echo "$as_me:1727: \"$ac_link_default\"") >&5 2022 +if { (eval echo "$as_me:173 0: \"$ac_link_default\"") >&52030 +if { (eval echo "$as_me:1731: \"$ac_link_default\"") >&5 2023 2031 (eval $ac_link_default) 2>&5 2024 2032 ac_status=$? 2025 2033 - echo "$as_me:1730: \$? = $ac_status" >&5 2026 + echo "$as_me:173 3: \$? = $ac_status" >&52034 + echo "$as_me:1734: \$? = $ac_status" >&5 2027 2035 (exit $ac_status); }; then 2028 2036 # Find the output, starting from the most likely. This scheme is 2029 2037 # not robust to junk in `.', hence go to wildcards (a.*) only as a last 2030 @@ -1736,7 +17 39,7 @@2038 @@ -1736,7 +1740,7 @@ 2031 2039 ls a.out conftest 2>/dev/null; 2032 2040 ls a.* conftest.* 2>/dev/null`; do … … 2037 2045 # certainly right. 2038 2046 break;; 2039 @@ -1750,34 +175 3,34 @@2047 @@ -1750,34 +1754,34 @@ 2040 2048 else 2041 2049 echo "$as_me: failed program was:" >&5 2042 2050 cat conftest.$ac_ext >&5 2043 2051 -{ { echo "$as_me:1753: error: C compiler cannot create executables" >&5 2044 +{ { echo "$as_me:175 6: error: C compiler cannot create executables" >&52052 +{ { echo "$as_me:1757: error: C compiler cannot create executables" >&5 2045 2053 echo "$as_me: error: C compiler cannot create executables" >&2;} 2046 2054 { (exit 77); exit 77; }; } … … 2049 2057 ac_exeext=$ac_cv_exeext 2050 2058 -echo "$as_me:1759: result: $ac_file" >&5 2051 +echo "$as_me:176 2: result: $ac_file" >&52059 +echo "$as_me:1763: result: $ac_file" >&5 2052 2060 echo "${ECHO_T}$ac_file" >&6 2053 2061 … … 2055 2063 # the compiler is broken, or we cross compile. 2056 2064 -echo "$as_me:1764: checking whether the C compiler works" >&5 2057 +echo "$as_me:176 7: checking whether the C compiler works" >&52065 +echo "$as_me:1768: checking whether the C compiler works" >&5 2058 2066 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 2059 2067 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 … … 2062 2070 if { ac_try='./$ac_file' 2063 2071 - { (eval echo "$as_me:1770: \"$ac_try\"") >&5 2064 + { (eval echo "$as_me:177 3: \"$ac_try\"") >&52072 + { (eval echo "$as_me:1774: \"$ac_try\"") >&5 2065 2073 (eval $ac_try) 2>&5 2066 2074 ac_status=$? 2067 2075 - echo "$as_me:1773: \$? = $ac_status" >&5 2068 + echo "$as_me:177 6: \$? = $ac_status" >&52076 + echo "$as_me:1777: \$? = $ac_status" >&5 2069 2077 (exit $ac_status); }; }; then 2070 2078 cross_compiling=no … … 2074 2082 else 2075 2083 - { { echo "$as_me:1780: error: cannot run C compiled programs. 2076 + { { echo "$as_me:178 3: error: cannot run C compiled programs.2084 + { { echo "$as_me:1784: error: cannot run C compiled programs. 2077 2085 If you meant to cross compile, use \`--host'." >&5 2078 2086 echo "$as_me: error: cannot run C compiled programs. 2079 2087 If you meant to cross compile, use \`--host'." >&2;} 2080 @@ -1785,24 +178 8,24 @@2088 @@ -1785,24 +1789,24 @@ 2081 2089 fi 2082 2090 fi 2083 2091 fi 2084 2092 -echo "$as_me:1788: result: yes" >&5 2085 +echo "$as_me:179 1: result: yes" >&52093 +echo "$as_me:1792: result: yes" >&5 2086 2094 echo "${ECHO_T}yes" >&6 2087 2095 … … 2091 2099 # the compiler is broken, or we cross compile. 2092 2100 -echo "$as_me:1795: checking whether we are cross compiling" >&5 2093 +echo "$as_me:179 8: checking whether we are cross compiling" >&52101 +echo "$as_me:1799: checking whether we are cross compiling" >&5 2094 2102 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 2095 2103 -echo "$as_me:1797: result: $cross_compiling" >&5 2096 +echo "$as_me:180 0: result: $cross_compiling" >&52104 +echo "$as_me:1801: result: $cross_compiling" >&5 2097 2105 echo "${ECHO_T}$cross_compiling" >&6 2098 2106 2099 2107 -echo "$as_me:1800: checking for executable suffix" >&5 2100 +echo "$as_me:180 3: checking for executable suffix" >&52108 +echo "$as_me:1804: checking for executable suffix" >&5 2101 2109 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 2102 2110 -if { (eval echo "$as_me:1802: \"$ac_link\"") >&5 2103 +if { (eval echo "$as_me:180 5: \"$ac_link\"") >&52111 +if { (eval echo "$as_me:1806: \"$ac_link\"") >&5 2104 2112 (eval $ac_link) 2>&5 2105 2113 ac_status=$? 2106 2114 - echo "$as_me:1805: \$? = $ac_status" >&5 2107 + echo "$as_me:180 8: \$? = $ac_status" >&52115 + echo "$as_me:1809: \$? = $ac_status" >&5 2108 2116 (exit $ac_status); }; then 2109 2117 # If both `conftest.exe' and `conftest' are `present' (well, observable) 2110 2118 # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will 2111 @@ -1810,7 +181 3,7 @@2119 @@ -1810,7 +1814,7 @@ 2112 2120 # `rm'. 2113 2121 for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do … … 2118 2126 export ac_cv_exeext 2119 2127 break;; 2120 @@ -1818,25 +182 1,25 @@2128 @@ -1818,25 +1822,25 @@ 2121 2129 esac 2122 2130 done 2123 2131 else 2124 2132 - { { echo "$as_me:1821: error: cannot compute EXEEXT: cannot compile and link" >&5 2125 + { { echo "$as_me:182 4: error: cannot compute EXEEXT: cannot compile and link" >&52133 + { { echo "$as_me:1825: error: cannot compute EXEEXT: cannot compile and link" >&5 2126 2134 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} 2127 2135 { (exit 1); exit 1; }; } … … 2130 2138 rm -f conftest$ac_cv_exeext 2131 2139 -echo "$as_me:1827: result: $ac_cv_exeext" >&5 2132 +echo "$as_me:183 0: result: $ac_cv_exeext" >&52140 +echo "$as_me:1831: result: $ac_cv_exeext" >&5 2133 2141 echo "${ECHO_T}$ac_cv_exeext" >&6 2134 2142 … … 2137 2145 ac_exeext=$EXEEXT 2138 2146 -echo "$as_me:1833: checking for object suffix" >&5 2139 +echo "$as_me:183 6: checking for object suffix" >&52147 +echo "$as_me:1837: checking for object suffix" >&5 2140 2148 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 2141 2149 if test "${ac_cv_objext+set}" = set; then … … 2144 2152 cat >conftest.$ac_ext <<_ACEOF 2145 2153 -#line 1839 "configure" 2146 +#line 184 2"configure"2154 +#line 1843 "configure" 2147 2155 #include "confdefs.h" 2148 2156 2149 2157 int 2150 @@ -1848,14 +185 1,14 @@2158 @@ -1848,14 +1852,14 @@ 2151 2159 } 2152 2160 _ACEOF 2153 2161 rm -f conftest.o conftest.obj 2154 2162 -if { (eval echo "$as_me:1851: \"$ac_compile\"") >&5 2155 +if { (eval echo "$as_me:185 4: \"$ac_compile\"") >&52163 +if { (eval echo "$as_me:1855: \"$ac_compile\"") >&5 2156 2164 (eval $ac_compile) 2>&5 2157 2165 ac_status=$? 2158 2166 - echo "$as_me:1854: \$? = $ac_status" >&5 2159 + echo "$as_me:185 7: \$? = $ac_status" >&52167 + echo "$as_me:1858: \$? = $ac_status" >&5 2160 2168 (exit $ac_status); }; then 2161 2169 for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do … … 2166 2174 break;; 2167 2175 esac 2168 @@ -1863,24 +186 6,24 @@2176 @@ -1863,24 +1867,24 @@ 2169 2177 else 2170 2178 echo "$as_me: failed program was:" >&5 2171 2179 cat conftest.$ac_ext >&5 2172 2180 -{ { echo "$as_me:1866: error: cannot compute OBJEXT: cannot compile" >&5 2173 +{ { echo "$as_me:18 69: error: cannot compute OBJEXT: cannot compile" >&52181 +{ { echo "$as_me:1870: error: cannot compute OBJEXT: cannot compile" >&5 2174 2182 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} 2175 2183 { (exit 1); exit 1; }; } … … 2179 2187 fi 2180 2188 -echo "$as_me:1873: result: $ac_cv_objext" >&5 2181 +echo "$as_me:187 6: result: $ac_cv_objext" >&52189 +echo "$as_me:1877: result: $ac_cv_objext" >&5 2182 2190 echo "${ECHO_T}$ac_cv_objext" >&6 2183 2191 OBJEXT=$ac_cv_objext 2184 2192 ac_objext=$OBJEXT 2185 2193 -echo "$as_me:1877: checking whether we are using the GNU C compiler" >&5 2186 +echo "$as_me:188 0: checking whether we are using the GNU C compiler" >&52194 +echo "$as_me:1881: checking whether we are using the GNU C compiler" >&5 2187 2195 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 2188 2196 if test "${ac_cv_c_compiler_gnu+set}" = set; then … … 2191 2199 cat >conftest.$ac_ext <<_ACEOF 2192 2200 -#line 1883 "configure" 2193 +#line 188 6"configure"2201 +#line 1887 "configure" 2194 2202 #include "confdefs.h" 2195 2203 2196 2204 int 2197 @@ -1895,16 +189 8,16 @@2205 @@ -1895,16 +1899,16 @@ 2198 2206 } 2199 2207 _ACEOF 2200 2208 rm -f conftest.$ac_objext 2201 2209 -if { (eval echo "$as_me:1898: \"$ac_compile\"") >&5 2202 +if { (eval echo "$as_me:190 1: \"$ac_compile\"") >&52210 +if { (eval echo "$as_me:1902: \"$ac_compile\"") >&5 2203 2211 (eval $ac_compile) 2>&5 2204 2212 ac_status=$? 2205 2213 - echo "$as_me:1901: \$? = $ac_status" >&5 2206 + echo "$as_me:190 4: \$? = $ac_status" >&52214 + echo "$as_me:1905: \$? = $ac_status" >&5 2207 2215 (exit $ac_status); } && 2208 2216 { ac_try='test -s conftest.$ac_objext' 2209 2217 - { (eval echo "$as_me:1904: \"$ac_try\"") >&5 2210 + { (eval echo "$as_me:190 7: \"$ac_try\"") >&52218 + { (eval echo "$as_me:1908: \"$ac_try\"") >&5 2211 2219 (eval $ac_try) 2>&5 2212 2220 ac_status=$? 2213 2221 - echo "$as_me:1907: \$? = $ac_status" >&5 2214 + echo "$as_me:191 0: \$? = $ac_status" >&52222 + echo "$as_me:1911: \$? = $ac_status" >&5 2215 2223 (exit $ac_status); }; }; then 2216 2224 ac_compiler_gnu=yes 2217 2225 else 2218 @@ -1916,19 +19 19,19 @@2226 @@ -1916,19 +1920,19 @@ 2219 2227 ac_cv_c_compiler_gnu=$ac_compiler_gnu 2220 2228 2221 2229 fi 2222 2230 -echo "$as_me:1919: result: $ac_cv_c_compiler_gnu" >&5 2223 +echo "$as_me:192 2: result: $ac_cv_c_compiler_gnu" >&52231 +echo "$as_me:1923: result: $ac_cv_c_compiler_gnu" >&5 2224 2232 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 2225 2233 GCC=`test $ac_compiler_gnu = yes && echo yes` … … 2228 2236 CFLAGS="-g" 2229 2237 -echo "$as_me:1925: checking whether $CC accepts -g" >&5 2230 +echo "$as_me:192 8: checking whether $CC accepts -g" >&52238 +echo "$as_me:1929: checking whether $CC accepts -g" >&5 2231 2239 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 2232 2240 if test "${ac_cv_prog_cc_g+set}" = set; then … … 2235 2243 cat >conftest.$ac_ext <<_ACEOF 2236 2244 -#line 1931 "configure" 2237 +#line 193 4"configure"2245 +#line 1935 "configure" 2238 2246 #include "confdefs.h" 2239 2247 2240 2248 int 2241 @@ -1940,16 +194 3,16 @@2249 @@ -1940,16 +1944,16 @@ 2242 2250 } 2243 2251 _ACEOF 2244 2252 rm -f conftest.$ac_objext 2245 2253 -if { (eval echo "$as_me:1943: \"$ac_compile\"") >&5 2246 +if { (eval echo "$as_me:194 6: \"$ac_compile\"") >&52254 +if { (eval echo "$as_me:1947: \"$ac_compile\"") >&5 2247 2255 (eval $ac_compile) 2>&5 2248 2256 ac_status=$? 2249 2257 - echo "$as_me:1946: \$? = $ac_status" >&5 2250 + echo "$as_me:19 49: \$? = $ac_status" >&52258 + echo "$as_me:1950: \$? = $ac_status" >&5 2251 2259 (exit $ac_status); } && 2252 2260 { ac_try='test -s conftest.$ac_objext' 2253 2261 - { (eval echo "$as_me:1949: \"$ac_try\"") >&5 2254 + { (eval echo "$as_me:195 2: \"$ac_try\"") >&52262 + { (eval echo "$as_me:1953: \"$ac_try\"") >&5 2255 2263 (eval $ac_try) 2>&5 2256 2264 ac_status=$? 2257 2265 - echo "$as_me:1952: \$? = $ac_status" >&5 2258 + echo "$as_me:195 5: \$? = $ac_status" >&52266 + echo "$as_me:1956: \$? = $ac_status" >&5 2259 2267 (exit $ac_status); }; }; then 2260 2268 ac_cv_prog_cc_g=yes 2261 2269 else 2262 @@ -1959,7 +196 2,7 @@2270 @@ -1959,7 +1963,7 @@ 2263 2271 fi 2264 2272 rm -f conftest.$ac_objext conftest.$ac_ext 2265 2273 fi 2266 2274 -echo "$as_me:1962: result: $ac_cv_prog_cc_g" >&5 2267 +echo "$as_me:196 5: result: $ac_cv_prog_cc_g" >&52275 +echo "$as_me:1966: result: $ac_cv_prog_cc_g" >&5 2268 2276 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 2269 2277 if test "$ac_test_CFLAGS" = set; then 2270 2278 CFLAGS=$ac_save_CFLAGS 2271 @@ -1986,16 +19 89,16 @@2279 @@ -1986,16 +1990,16 @@ 2272 2280 #endif 2273 2281 _ACEOF 2274 2282 rm -f conftest.$ac_objext 2275 2283 -if { (eval echo "$as_me:1989: \"$ac_compile\"") >&5 2276 +if { (eval echo "$as_me:199 2: \"$ac_compile\"") >&52284 +if { (eval echo "$as_me:1993: \"$ac_compile\"") >&5 2277 2285 (eval $ac_compile) 2>&5 2278 2286 ac_status=$? 2279 2287 - echo "$as_me:1992: \$? = $ac_status" >&5 2280 + echo "$as_me:199 5: \$? = $ac_status" >&52288 + echo "$as_me:1996: \$? = $ac_status" >&5 2281 2289 (exit $ac_status); } && 2282 2290 { ac_try='test -s conftest.$ac_objext' 2283 2291 - { (eval echo "$as_me:1995: \"$ac_try\"") >&5 2284 + { (eval echo "$as_me:199 8: \"$ac_try\"") >&52292 + { (eval echo "$as_me:1999: \"$ac_try\"") >&5 2285 2293 (eval $ac_try) 2>&5 2286 2294 ac_status=$? 2287 2295 - echo "$as_me:1998: \$? = $ac_status" >&5 2288 + echo "$as_me:200 1: \$? = $ac_status" >&52296 + echo "$as_me:2002: \$? = $ac_status" >&5 2289 2297 (exit $ac_status); }; }; then 2290 2298 for ac_declaration in \ 2291 2299 ''\ 2292 @@ -2007,7 +201 0,7 @@2300 @@ -2007,7 +2011,7 @@ 2293 2301 'void exit (int);' 2294 2302 do 2295 2303 cat >conftest.$ac_ext <<_ACEOF 2296 2304 -#line 2010 "configure" 2297 +#line 201 3"configure"2305 +#line 2014 "configure" 2298 2306 #include "confdefs.h" 2299 2307 #include <stdlib.h> 2300 2308 $ac_declaration 2301 @@ -2020,16 +202 3,16 @@2309 @@ -2020,16 +2024,16 @@ 2302 2310 } 2303 2311 _ACEOF 2304 2312 rm -f conftest.$ac_objext 2305 2313 -if { (eval echo "$as_me:2023: \"$ac_compile\"") >&5 2306 +if { (eval echo "$as_me:202 6: \"$ac_compile\"") >&52314 +if { (eval echo "$as_me:2027: \"$ac_compile\"") >&5 2307 2315 (eval $ac_compile) 2>&5 2308 2316 ac_status=$? 2309 2317 - echo "$as_me:2026: \$? = $ac_status" >&5 2310 + echo "$as_me:20 29: \$? = $ac_status" >&52318 + echo "$as_me:2030: \$? = $ac_status" >&5 2311 2319 (exit $ac_status); } && 2312 2320 { ac_try='test -s conftest.$ac_objext' 2313 2321 - { (eval echo "$as_me:2029: \"$ac_try\"") >&5 2314 + { (eval echo "$as_me:203 2: \"$ac_try\"") >&52322 + { (eval echo "$as_me:2033: \"$ac_try\"") >&5 2315 2323 (eval $ac_try) 2>&5 2316 2324 ac_status=$? 2317 2325 - echo "$as_me:2032: \$? = $ac_status" >&5 2318 + echo "$as_me:203 5: \$? = $ac_status" >&52326 + echo "$as_me:2036: \$? = $ac_status" >&5 2319 2327 (exit $ac_status); }; }; then 2320 2328 : 2321 2329 else 2322 @@ -2039,7 +204 2,7 @@2330 @@ -2039,7 +2043,7 @@ 2323 2331 fi 2324 2332 rm -f conftest.$ac_objext conftest.$ac_ext 2325 2333 cat >conftest.$ac_ext <<_ACEOF 2326 2334 -#line 2042 "configure" 2327 +#line 204 5"configure"2335 +#line 2046 "configure" 2328 2336 #include "confdefs.h" 2329 2337 $ac_declaration 2330 2338 int 2331 @@ -2051,16 +205 4,16 @@2339 @@ -2051,16 +2055,16 @@ 2332 2340 } 2333 2341 _ACEOF 2334 2342 rm -f conftest.$ac_objext 2335 2343 -if { (eval echo "$as_me:2054: \"$ac_compile\"") >&5 2336 +if { (eval echo "$as_me:205 7: \"$ac_compile\"") >&52344 +if { (eval echo "$as_me:2058: \"$ac_compile\"") >&5 2337 2345 (eval $ac_compile) 2>&5 2338 2346 ac_status=$? 2339 2347 - echo "$as_me:2057: \$? = $ac_status" >&5 2340 + echo "$as_me:206 0: \$? = $ac_status" >&52348 + echo "$as_me:2061: \$? = $ac_status" >&5 2341 2349 (exit $ac_status); } && 2342 2350 { ac_try='test -s conftest.$ac_objext' 2343 2351 - { (eval echo "$as_me:2060: \"$ac_try\"") >&5 2344 + { (eval echo "$as_me:206 3: \"$ac_try\"") >&52352 + { (eval echo "$as_me:2064: \"$ac_try\"") >&5 2345 2353 (eval $ac_try) 2>&5 2346 2354 ac_status=$? 2347 2355 - echo "$as_me:2063: \$? = $ac_status" >&5 2348 + echo "$as_me:206 6: \$? = $ac_status" >&52356 + echo "$as_me:2067: \$? = $ac_status" >&5 2349 2357 (exit $ac_status); }; }; then 2350 2358 break 2351 2359 else 2352 @@ -2090,11 +209 3,11 @@2360 @@ -2090,11 +2094,11 @@ 2353 2361 2354 2362 GCC_VERSION=none 2355 2363 if test "$GCC" = yes ; then 2356 2364 - echo "$as_me:2093: checking version of $CC" >&5 2357 + echo "$as_me:209 6: checking version of $CC" >&52365 + echo "$as_me:2097: checking version of $CC" >&5 2358 2366 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 2359 2367 GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" 2360 2368 test -z "$GCC_VERSION" && GCC_VERSION=unknown 2361 2369 - echo "$as_me:2097: result: $GCC_VERSION" >&5 2362 + echo "$as_me:210 0: result: $GCC_VERSION" >&52370 + echo "$as_me:2101: result: $GCC_VERSION" >&5 2363 2371 echo "${ECHO_T}$GCC_VERSION" >&6 2364 2372 fi 2365 2373 2366 @@ -2104,7 +210 7,7 @@2374 @@ -2104,7 +2108,7 @@ 2367 2375 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 2368 2376 ac_compiler_gnu=$ac_cv_c_compiler_gnu 2369 2377 ac_main_return=return 2370 2378 -echo "$as_me:2107: checking how to run the C preprocessor" >&5 2371 +echo "$as_me:211 0: checking how to run the C preprocessor" >&52379 +echo "$as_me:2111: checking how to run the C preprocessor" >&5 2372 2380 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 2373 2381 # On Suns, sometimes $CPP names a directory. 2374 2382 if test -n "$CPP" && test -d "$CPP"; then 2375 @@ -2125,18 +212 8,18 @@2383 @@ -2125,18 +2129,18 @@ 2376 2384 # On the NeXT, cc -E runs the code through the compiler's parser, 2377 2385 # not just through cpp. "Syntax error" is here to catch this case. 2378 2386 cat >conftest.$ac_ext <<_ACEOF 2379 2387 -#line 2128 "configure" 2380 +#line 213 1"configure"2388 +#line 2132 "configure" 2381 2389 #include "confdefs.h" 2382 2390 #include <assert.h> … … 2384 2392 _ACEOF 2385 2393 -if { (eval echo "$as_me:2133: \"$ac_cpp conftest.$ac_ext\"") >&5 2386 +if { (eval echo "$as_me:213 6: \"$ac_cpp conftest.$ac_ext\"") >&52394 +if { (eval echo "$as_me:2137: \"$ac_cpp conftest.$ac_ext\"") >&5 2387 2395 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 2388 2396 ac_status=$? … … 2391 2399 cat conftest.err >&5 2392 2400 - echo "$as_me:2139: \$? = $ac_status" >&5 2393 + echo "$as_me:214 2: \$? = $ac_status" >&52401 + echo "$as_me:2143: \$? = $ac_status" >&5 2394 2402 (exit $ac_status); } >/dev/null; then 2395 2403 if test -s conftest.err; then 2396 2404 ac_cpp_err=$ac_c_preproc_warn_flag 2397 @@ -2159,17 +216 2,17 @@2405 @@ -2159,17 +2163,17 @@ 2398 2406 # OK, works on sane cases. Now check whether non-existent headers 2399 2407 # can be detected and how. 2400 2408 cat >conftest.$ac_ext <<_ACEOF 2401 2409 -#line 2162 "configure" 2402 +#line 216 5"configure"2410 +#line 2166 "configure" 2403 2411 #include "confdefs.h" 2404 2412 #include <ac_nonexistent.h> 2405 2413 _ACEOF 2406 2414 -if { (eval echo "$as_me:2166: \"$ac_cpp conftest.$ac_ext\"") >&5 2407 +if { (eval echo "$as_me:21 69: \"$ac_cpp conftest.$ac_ext\"") >&52415 +if { (eval echo "$as_me:2170: \"$ac_cpp conftest.$ac_ext\"") >&5 2408 2416 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 2409 2417 ac_status=$? … … 2412 2420 cat conftest.err >&5 2413 2421 - echo "$as_me:2172: \$? = $ac_status" >&5 2414 + echo "$as_me:217 5: \$? = $ac_status" >&52422 + echo "$as_me:2176: \$? = $ac_status" >&5 2415 2423 (exit $ac_status); } >/dev/null; then 2416 2424 if test -s conftest.err; then 2417 2425 ac_cpp_err=$ac_c_preproc_warn_flag 2418 @@ -2206,7 +22 09,7 @@2426 @@ -2206,7 +2210,7 @@ 2419 2427 else 2420 2428 ac_cv_prog_CPP=$CPP 2421 2429 fi 2422 2430 -echo "$as_me:2209: result: $CPP" >&5 2423 +echo "$as_me:221 2: result: $CPP" >&52431 +echo "$as_me:2213: result: $CPP" >&5 2424 2432 echo "${ECHO_T}$CPP" >&6 2425 2433 ac_preproc_ok=false 2426 2434 for ac_c_preproc_warn_flag in '' yes 2427 @@ -2216,18 +22 19,18 @@2435 @@ -2216,18 +2220,18 @@ 2428 2436 # On the NeXT, cc -E runs the code through the compiler's parser, 2429 2437 # not just through cpp. "Syntax error" is here to catch this case. 2430 2438 cat >conftest.$ac_ext <<_ACEOF 2431 2439 -#line 2219 "configure" 2432 +#line 222 2"configure"2440 +#line 2223 "configure" 2433 2441 #include "confdefs.h" 2434 2442 #include <assert.h> … … 2436 2444 _ACEOF 2437 2445 -if { (eval echo "$as_me:2224: \"$ac_cpp conftest.$ac_ext\"") >&5 2438 +if { (eval echo "$as_me:222 7: \"$ac_cpp conftest.$ac_ext\"") >&52446 +if { (eval echo "$as_me:2228: \"$ac_cpp conftest.$ac_ext\"") >&5 2439 2447 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 2440 2448 ac_status=$? … … 2443 2451 cat conftest.err >&5 2444 2452 - echo "$as_me:2230: \$? = $ac_status" >&5 2445 + echo "$as_me:223 3: \$? = $ac_status" >&52453 + echo "$as_me:2234: \$? = $ac_status" >&5 2446 2454 (exit $ac_status); } >/dev/null; then 2447 2455 if test -s conftest.err; then 2448 2456 ac_cpp_err=$ac_c_preproc_warn_flag 2449 @@ -2250,17 +225 3,17 @@2457 @@ -2250,17 +2254,17 @@ 2450 2458 # OK, works on sane cases. Now check whether non-existent headers 2451 2459 # can be detected and how. 2452 2460 cat >conftest.$ac_ext <<_ACEOF 2453 2461 -#line 2253 "configure" 2454 +#line 225 6"configure"2462 +#line 2257 "configure" 2455 2463 #include "confdefs.h" 2456 2464 #include <ac_nonexistent.h> 2457 2465 _ACEOF 2458 2466 -if { (eval echo "$as_me:2257: \"$ac_cpp conftest.$ac_ext\"") >&5 2459 +if { (eval echo "$as_me:226 0: \"$ac_cpp conftest.$ac_ext\"") >&52467 +if { (eval echo "$as_me:2261: \"$ac_cpp conftest.$ac_ext\"") >&5 2460 2468 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 2461 2469 ac_status=$? … … 2464 2472 cat conftest.err >&5 2465 2473 - echo "$as_me:2263: \$? = $ac_status" >&5 2466 + echo "$as_me:226 6: \$? = $ac_status" >&52474 + echo "$as_me:2267: \$? = $ac_status" >&5 2467 2475 (exit $ac_status); } >/dev/null; then 2468 2476 if test -s conftest.err; then 2469 2477 ac_cpp_err=$ac_c_preproc_warn_flag 2470 @@ -2288,7 +229 1,7 @@2478 @@ -2288,7 +2292,7 @@ 2471 2479 if $ac_preproc_ok; then 2472 2480 : 2473 2481 else 2474 2482 - { { echo "$as_me:2291: error: C preprocessor \"$CPP\" fails sanity check" >&5 2475 + { { echo "$as_me:229 4: error: C preprocessor \"$CPP\" fails sanity check" >&52483 + { { echo "$as_me:2295: error: C preprocessor \"$CPP\" fails sanity check" >&5 2476 2484 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} 2477 2485 { (exit 1); exit 1; }; } 2478 2486 fi 2479 @@ -2301,14 +230 4,14 @@2487 @@ -2301,14 +2305,14 @@ 2480 2488 ac_main_return=return 2481 2489 2482 2490 if test $ac_cv_c_compiler_gnu = yes; then 2483 2491 - echo "$as_me:2304: checking whether $CC needs -traditional" >&5 2484 + echo "$as_me:230 7: checking whether $CC needs -traditional" >&52492 + echo "$as_me:2308: checking whether $CC needs -traditional" >&5 2485 2493 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 2486 2494 if test "${ac_cv_prog_gcc_traditional+set}" = set; then … … 2490 2498 cat >conftest.$ac_ext <<_ACEOF 2491 2499 -#line 2311 "configure" 2492 +#line 231 4"configure"2500 +#line 2315 "configure" 2493 2501 #include "confdefs.h" 2494 2502 #include <sgtty.h> 2495 2503 int Autoconf = TIOCGETP; 2496 @@ -2323,7 +232 6,7 @@2504 @@ -2323,7 +2327,7 @@ 2497 2505 2498 2506 if test $ac_cv_prog_gcc_traditional = no; then 2499 2507 cat >conftest.$ac_ext <<_ACEOF 2500 2508 -#line 2326 "configure" 2501 +#line 23 29"configure"2509 +#line 2330 "configure" 2502 2510 #include "confdefs.h" 2503 2511 #include <termio.h> 2504 2512 int Autoconf = TCGETA; 2505 @@ -2336,14 +23 39,14 @@2513 @@ -2336,14 +2340,14 @@ 2506 2514 2507 2515 fi 2508 2516 fi 2509 2517 -echo "$as_me:2339: result: $ac_cv_prog_gcc_traditional" >&5 2510 +echo "$as_me:234 2: result: $ac_cv_prog_gcc_traditional" >&52518 +echo "$as_me:2343: result: $ac_cv_prog_gcc_traditional" >&5 2511 2519 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 2512 2520 if test $ac_cv_prog_gcc_traditional = yes; then … … 2516 2524 2517 2525 -echo "$as_me:2346: checking whether $CC understands -c and -o together" >&5 2518 +echo "$as_me:23 49: checking whether $CC understands -c and -o together" >&52526 +echo "$as_me:2350: checking whether $CC understands -c and -o together" >&5 2519 2527 echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6 2520 2528 if test "${cf_cv_prog_CC_c_o+set}" = set; then 2521 2529 echo $ECHO_N "(cached) $ECHO_C" >&6 2522 @@ -2359,15 +236 2,15 @@2530 @@ -2359,15 +2363,15 @@ 2523 2531 # We do the test twice because some compilers refuse to overwrite an 2524 2532 # existing .o file with -o, though they will create one. 2525 2533 ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' 2526 2534 -if { (eval echo "$as_me:2362: \"$ac_try\"") >&5 2527 +if { (eval echo "$as_me:236 5: \"$ac_try\"") >&52535 +if { (eval echo "$as_me:2366: \"$ac_try\"") >&5 2528 2536 (eval $ac_try) 2>&5 2529 2537 ac_status=$? 2530 2538 - echo "$as_me:2365: \$? = $ac_status" >&5 2531 + echo "$as_me:236 8: \$? = $ac_status" >&52539 + echo "$as_me:2369: \$? = $ac_status" >&5 2532 2540 (exit $ac_status); } && 2533 2541 - test -f conftest2.$ac_objext && { (eval echo "$as_me:2367: \"$ac_try\"") >&5 2534 + test -f conftest2.$ac_objext && { (eval echo "$as_me:237 0: \"$ac_try\"") >&52542 + test -f conftest2.$ac_objext && { (eval echo "$as_me:2371: \"$ac_try\"") >&5 2535 2543 (eval $ac_try) 2>&5 2536 2544 ac_status=$? 2537 2545 - echo "$as_me:2370: \$? = $ac_status" >&5 2538 + echo "$as_me:237 3: \$? = $ac_status" >&52546 + echo "$as_me:2374: \$? = $ac_status" >&5 2539 2547 (exit $ac_status); }; 2540 2548 then 2541 2549 eval cf_cv_prog_CC_c_o=yes 2542 @@ -2378,19 +238 1,19 @@2550 @@ -2378,19 +2382,19 @@ 2543 2551 2544 2552 fi 2545 2553 if test $cf_cv_prog_CC_c_o = yes; then 2546 2554 - echo "$as_me:2381: result: yes" >&5 2547 + echo "$as_me:238 4: result: yes" >&52555 + echo "$as_me:2385: result: yes" >&5 2548 2556 echo "${ECHO_T}yes" >&6 2549 2557 else 2550 2558 - echo "$as_me:2384: result: no" >&5 2551 + echo "$as_me:238 7: result: no" >&52559 + echo "$as_me:2388: result: no" >&5 2552 2560 echo "${ECHO_T}no" >&6 2553 2561 fi 2554 2562 2555 2563 -echo "$as_me:2388: checking for POSIXized ISC" >&5 2556 +echo "$as_me:239 1: checking for POSIXized ISC" >&52564 +echo "$as_me:2392: checking for POSIXized ISC" >&5 2557 2565 echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6 2558 2566 if test -d /etc/conf/kconfig.d && … … 2560 2568 then 2561 2569 - echo "$as_me:2393: result: yes" >&5 2562 + echo "$as_me:239 6: result: yes" >&52570 + echo "$as_me:2397: result: yes" >&5 2563 2571 echo "${ECHO_T}yes" >&6 2564 2572 ISC=yes # If later tests want to check for ISC. 2565 2573 2566 @@ -2404,12 +240 7,12 @@2574 @@ -2404,12 +2408,12 @@ 2567 2575 CC="$CC -Xp" 2568 2576 fi 2569 2577 else 2570 2578 - echo "$as_me:2407: result: no" >&5 2571 + echo "$as_me:241 0: result: no" >&52579 + echo "$as_me:2411: result: no" >&5 2572 2580 echo "${ECHO_T}no" >&6 2573 2581 ISC= … … 2575 2583 2576 2584 -echo "$as_me:2412: checking for ${CC-cc} option to accept ANSI C" >&5 2577 +echo "$as_me:241 5: checking for ${CC-cc} option to accept ANSI C" >&52585 +echo "$as_me:2416: checking for ${CC-cc} option to accept ANSI C" >&5 2578 2586 echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6 2579 2587 if test "${cf_cv_ansi_cc+set}" = set; then 2580 2588 echo $ECHO_N "(cached) $ECHO_C" >&6 2581 @@ -2494,7 +249 7,7 @@2589 @@ -2494,7 +2498,7 @@ 2582 2590 2583 2591 if test -n "$cf_new_cppflags" ; then … … 2588 2596 2589 2597 if test -n "$cf_new_extra_cppflags" ; then 2590 @@ -2503,7 +250 6,7 @@2598 @@ -2503,7 +2507,7 @@ 2591 2599 fi 2592 2600 2593 2601 cat >conftest.$ac_ext <<_ACEOF 2594 2602 -#line 2506 "configure" 2595 +#line 25 09"configure"2603 +#line 2510 "configure" 2596 2604 #include "confdefs.h" 2597 2605 2598 2606 #ifndef CC_HAS_PROTOS 2599 @@ -2524,16 +252 7,16 @@2607 @@ -2524,16 +2528,16 @@ 2600 2608 } 2601 2609 _ACEOF 2602 2610 rm -f conftest.$ac_objext 2603 2611 -if { (eval echo "$as_me:2527: \"$ac_compile\"") >&5 2604 +if { (eval echo "$as_me:253 0: \"$ac_compile\"") >&52612 +if { (eval echo "$as_me:2531: \"$ac_compile\"") >&5 2605 2613 (eval $ac_compile) 2>&5 2606 2614 ac_status=$? 2607 2615 - echo "$as_me:2530: \$? = $ac_status" >&5 2608 + echo "$as_me:253 3: \$? = $ac_status" >&52616 + echo "$as_me:2534: \$? = $ac_status" >&5 2609 2617 (exit $ac_status); } && 2610 2618 { ac_try='test -s conftest.$ac_objext' 2611 2619 - { (eval echo "$as_me:2533: \"$ac_try\"") >&5 2612 + { (eval echo "$as_me:253 6: \"$ac_try\"") >&52620 + { (eval echo "$as_me:2537: \"$ac_try\"") >&5 2613 2621 (eval $ac_try) 2>&5 2614 2622 ac_status=$? 2615 2623 - echo "$as_me:2536: \$? = $ac_status" >&5 2616 + echo "$as_me:25 39: \$? = $ac_status" >&52624 + echo "$as_me:2540: \$? = $ac_status" >&5 2617 2625 (exit $ac_status); }; }; then 2618 2626 cf_cv_ansi_cc="$cf_arg"; break 2619 2627 else 2620 @@ -2546,7 +25 49,7 @@2628 @@ -2546,7 +2550,7 @@ 2621 2629 CPPFLAGS="$cf_save_CPPFLAGS" 2622 2630 2623 2631 fi 2624 2632 -echo "$as_me:2549: result: $cf_cv_ansi_cc" >&5 2625 +echo "$as_me:255 2: result: $cf_cv_ansi_cc" >&52633 +echo "$as_me:2553: result: $cf_cv_ansi_cc" >&5 2626 2634 echo "${ECHO_T}$cf_cv_ansi_cc" >&6 2627 2635 2628 2636 if test "$cf_cv_ansi_cc" != "no"; then 2629 @@ -2612,7 +261 5,7 @@2637 @@ -2612,7 +2616,7 @@ 2630 2638 2631 2639 if test -n "$cf_new_cppflags" ; then … … 2636 2644 2637 2645 if test -n "$cf_new_extra_cppflags" ; then 2638 @@ -2629,7 +263 2,7 @@2646 @@ -2629,7 +2633,7 @@ 2639 2647 fi 2640 2648 2641 2649 if test "$cf_cv_ansi_cc" = "no"; then 2642 2650 - { { echo "$as_me:2632: error: Your compiler does not appear to recognize prototypes. 2643 + { { echo "$as_me:263 5: error: Your compiler does not appear to recognize prototypes.2651 + { { echo "$as_me:2636: error: Your compiler does not appear to recognize prototypes. 2644 2652 You have the following choices: 2645 2653 a. adjust your compiler options 2646 2654 b. get an up-to-date compiler 2647 @@ -2663,13 +266 6,13 @@2655 @@ -2663,13 +2667,13 @@ 2648 2656 LDCONFIG=: 2649 2657 else … … 2657 2665 set dummy ldconfig; ac_word=$2 2658 2666 -echo "$as_me:2672: checking for $ac_word" >&5 2659 +echo "$as_me:267 5: checking for $ac_word" >&52667 +echo "$as_me:2676: checking for $ac_word" >&5 2660 2668 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 2661 2669 if test "${ac_cv_path_LDCONFIG+set}" = set; then 2662 2670 echo $ECHO_N "(cached) $ECHO_C" >&6 2663 @@ -2686,7 +26 89,7 @@2671 @@ -2686,7 +2690,7 @@ 2664 2672 test -z "$ac_dir" && ac_dir=. 2665 2673 if $as_executable_p "$ac_dir/$ac_word"; then 2666 2674 ac_cv_path_LDCONFIG="$ac_dir/$ac_word" 2667 2675 - echo "$as_me:2689: found $ac_dir/$ac_word" >&5 2668 + echo "$as_me:269 2: found $ac_dir/$ac_word" >&52676 + echo "$as_me:2693: found $ac_dir/$ac_word" >&5 2669 2677 break 2670 2678 fi 2671 2679 done 2672 @@ -2697,10 +270 0,10 @@2680 @@ -2697,10 +2701,10 @@ 2673 2681 LDCONFIG=$ac_cv_path_LDCONFIG 2674 2682 2675 2683 if test -n "$LDCONFIG"; then 2676 2684 - echo "$as_me:2700: result: $LDCONFIG" >&5 2677 + echo "$as_me:270 3: result: $LDCONFIG" >&52685 + echo "$as_me:2704: result: $LDCONFIG" >&5 2678 2686 echo "${ECHO_T}$LDCONFIG" >&6 2679 2687 else 2680 2688 - echo "$as_me:2703: result: no" >&5 2681 + echo "$as_me:270 6: result: no" >&52689 + echo "$as_me:2707: result: no" >&5 2682 2690 echo "${ECHO_T}no" >&6 2683 2691 fi 2684 2692 2685 @@ -2708,7 +271 1,7 @@2693 @@ -2708,7 +2712,7 @@ 2686 2694 esac 2687 2695 fi 2688 2696 2689 2697 -echo "$as_me:2711: checking if you want to ensure bool is consistent with C++" >&5 2690 +echo "$as_me:271 4: checking if you want to ensure bool is consistent with C++" >&52698 +echo "$as_me:2715: checking if you want to ensure bool is consistent with C++" >&5 2691 2699 echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6 2692 2700 2693 2701 # Check whether --with-cxx or --without-cxx was given. 2694 @@ -2718,7 +272 1,7 @@2702 @@ -2718,7 +2722,7 @@ 2695 2703 else 2696 2704 cf_with_cxx=yes 2697 2705 fi; 2698 2706 -echo "$as_me:2721: result: $cf_with_cxx" >&5 2699 +echo "$as_me:272 4: result: $cf_with_cxx" >&52707 +echo "$as_me:2725: result: $cf_with_cxx" >&5 2700 2708 echo "${ECHO_T}$cf_with_cxx" >&6 2701 2709 if test "X$cf_with_cxx" = Xno ; then 2702 2710 CXX="" 2703 @@ -2736,7 +27 39,7 @@2711 @@ -2736,7 +2740,7 @@ 2704 2712 do 2705 2713 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 2706 2714 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 2707 2715 -echo "$as_me:2739: checking for $ac_word" >&5 2708 +echo "$as_me:274 2: checking for $ac_word" >&52716 +echo "$as_me:2743: checking for $ac_word" >&5 2709 2717 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 2710 2718 if test "${ac_cv_prog_CXX+set}" = set; then 2711 2719 echo $ECHO_N "(cached) $ECHO_C" >&6 2712 @@ -2751,7 +275 4,7 @@2720 @@ -2751,7 +2755,7 @@ 2713 2721 test -z "$ac_dir" && ac_dir=. 2714 2722 $as_executable_p "$ac_dir/$ac_word" || continue 2715 2723 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" 2716 2724 -echo "$as_me:2754: found $ac_dir/$ac_word" >&5 2717 +echo "$as_me:275 7: found $ac_dir/$ac_word" >&52725 +echo "$as_me:2758: found $ac_dir/$ac_word" >&5 2718 2726 break 2719 2727 done 2720 2728 2721 @@ -2759,10 +276 2,10 @@2729 @@ -2759,10 +2763,10 @@ 2722 2730 fi 2723 2731 CXX=$ac_cv_prog_CXX 2724 2732 if test -n "$CXX"; then 2725 2733 - echo "$as_me:2762: result: $CXX" >&5 2726 + echo "$as_me:276 5: result: $CXX" >&52734 + echo "$as_me:2766: result: $CXX" >&5 2727 2735 echo "${ECHO_T}$CXX" >&6 2728 2736 else 2729 2737 - echo "$as_me:2765: result: no" >&5 2730 + echo "$as_me:276 8: result: no" >&52738 + echo "$as_me:2769: result: no" >&5 2731 2739 echo "${ECHO_T}no" >&6 2732 2740 fi 2733 2741 2734 @@ -2775,7 +277 8,7 @@2742 @@ -2775,7 +2779,7 @@ 2735 2743 do 2736 2744 # Extract the first word of "$ac_prog", so it can be a program name with args. 2737 2745 set dummy $ac_prog; ac_word=$2 2738 2746 -echo "$as_me:2778: checking for $ac_word" >&5 2739 +echo "$as_me:278 1: checking for $ac_word" >&52747 +echo "$as_me:2782: checking for $ac_word" >&5 2740 2748 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 2741 2749 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then 2742 2750 echo $ECHO_N "(cached) $ECHO_C" >&6 2743 @@ -2790,7 +279 3,7 @@2751 @@ -2790,7 +2794,7 @@ 2744 2752 test -z "$ac_dir" && ac_dir=. 2745 2753 $as_executable_p "$ac_dir/$ac_word" || continue 2746 2754 ac_cv_prog_ac_ct_CXX="$ac_prog" 2747 2755 -echo "$as_me:2793: found $ac_dir/$ac_word" >&5 2748 +echo "$as_me:279 6: found $ac_dir/$ac_word" >&52756 +echo "$as_me:2797: found $ac_dir/$ac_word" >&5 2749 2757 break 2750 2758 done 2751 2759 2752 @@ -2798,10 +280 1,10 @@2760 @@ -2798,10 +2802,10 @@ 2753 2761 fi 2754 2762 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX 2755 2763 if test -n "$ac_ct_CXX"; then 2756 2764 - echo "$as_me:2801: result: $ac_ct_CXX" >&5 2757 + echo "$as_me:280 4: result: $ac_ct_CXX" >&52765 + echo "$as_me:2805: result: $ac_ct_CXX" >&5 2758 2766 echo "${ECHO_T}$ac_ct_CXX" >&6 2759 2767 else 2760 2768 - echo "$as_me:2804: result: no" >&5 2761 + echo "$as_me:280 7: result: no" >&52769 + echo "$as_me:2808: result: no" >&5 2762 2770 echo "${ECHO_T}no" >&6 2763 2771 fi 2764 2772 2765 @@ -2813,32 +281 6,32 @@2773 @@ -2813,32 +2817,32 @@ 2766 2774 fi 2767 2775 2768 2776 # Provide some information about the compiler. 2769 2777 -echo "$as_me:2816:" \ 2770 +echo "$as_me:28 19:" \2778 +echo "$as_me:2820:" \ 2771 2779 "checking for C++ compiler version" >&5 2772 2780 ac_compiler=`set X $ac_compile; echo $2` 2773 2781 -{ (eval echo "$as_me:2819: \"$ac_compiler --version </dev/null >&5\"") >&5 2774 +{ (eval echo "$as_me:282 2: \"$ac_compiler --version </dev/null >&5\"") >&52782 +{ (eval echo "$as_me:2823: \"$ac_compiler --version </dev/null >&5\"") >&5 2775 2783 (eval $ac_compiler --version </dev/null >&5) 2>&5 2776 2784 ac_status=$? 2777 2785 - echo "$as_me:2822: \$? = $ac_status" >&5 2778 + echo "$as_me:282 5: \$? = $ac_status" >&52786 + echo "$as_me:2826: \$? = $ac_status" >&5 2779 2787 (exit $ac_status); } 2780 2788 -{ (eval echo "$as_me:2824: \"$ac_compiler -v </dev/null >&5\"") >&5 2781 +{ (eval echo "$as_me:282 7: \"$ac_compiler -v </dev/null >&5\"") >&52789 +{ (eval echo "$as_me:2828: \"$ac_compiler -v </dev/null >&5\"") >&5 2782 2790 (eval $ac_compiler -v </dev/null >&5) 2>&5 2783 2791 ac_status=$? 2784 2792 - echo "$as_me:2827: \$? = $ac_status" >&5 2785 + echo "$as_me:283 0: \$? = $ac_status" >&52793 + echo "$as_me:2831: \$? = $ac_status" >&5 2786 2794 (exit $ac_status); } 2787 2795 -{ (eval echo "$as_me:2829: \"$ac_compiler -V </dev/null >&5\"") >&5 2788 +{ (eval echo "$as_me:283 2: \"$ac_compiler -V </dev/null >&5\"") >&52796 +{ (eval echo "$as_me:2833: \"$ac_compiler -V </dev/null >&5\"") >&5 2789 2797 (eval $ac_compiler -V </dev/null >&5) 2>&5 2790 2798 ac_status=$? 2791 2799 - echo "$as_me:2832: \$? = $ac_status" >&5 2792 + echo "$as_me:283 5: \$? = $ac_status" >&52800 + echo "$as_me:2836: \$? = $ac_status" >&5 2793 2801 (exit $ac_status); } 2794 2802 2795 2803 -echo "$as_me:2835: checking whether we are using the GNU C++ compiler" >&5 2796 +echo "$as_me:283 8: checking whether we are using the GNU C++ compiler" >&52804 +echo "$as_me:2839: checking whether we are using the GNU C++ compiler" >&5 2797 2805 echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 2798 2806 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then … … 2801 2809 cat >conftest.$ac_ext <<_ACEOF 2802 2810 -#line 2841 "configure" 2803 +#line 284 4"configure"2811 +#line 2845 "configure" 2804 2812 #include "confdefs.h" 2805 2813 2806 2814 int 2807 @@ -2853,16 +285 6,16 @@2815 @@ -2853,16 +2857,16 @@ 2808 2816 } 2809 2817 _ACEOF 2810 2818 rm -f conftest.$ac_objext 2811 2819 -if { (eval echo "$as_me:2856: \"$ac_compile\"") >&5 2812 +if { (eval echo "$as_me:28 59: \"$ac_compile\"") >&52820 +if { (eval echo "$as_me:2860: \"$ac_compile\"") >&5 2813 2821 (eval $ac_compile) 2>&5 2814 2822 ac_status=$? 2815 2823 - echo "$as_me:2859: \$? = $ac_status" >&5 2816 + echo "$as_me:286 2: \$? = $ac_status" >&52824 + echo "$as_me:2863: \$? = $ac_status" >&5 2817 2825 (exit $ac_status); } && 2818 2826 { ac_try='test -s conftest.$ac_objext' 2819 2827 - { (eval echo "$as_me:2862: \"$ac_try\"") >&5 2820 + { (eval echo "$as_me:286 5: \"$ac_try\"") >&52828 + { (eval echo "$as_me:2866: \"$ac_try\"") >&5 2821 2829 (eval $ac_try) 2>&5 2822 2830 ac_status=$? 2823 2831 - echo "$as_me:2865: \$? = $ac_status" >&5 2824 + echo "$as_me:286 8: \$? = $ac_status" >&52832 + echo "$as_me:2869: \$? = $ac_status" >&5 2825 2833 (exit $ac_status); }; }; then 2826 2834 ac_compiler_gnu=yes 2827 2835 else 2828 @@ -2874,19 +287 7,19 @@2836 @@ -2874,19 +2878,19 @@ 2829 2837 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu 2830 2838 2831 2839 fi 2832 2840 -echo "$as_me:2877: result: $ac_cv_cxx_compiler_gnu" >&5 2833 +echo "$as_me:288 0: result: $ac_cv_cxx_compiler_gnu" >&52841 +echo "$as_me:2881: result: $ac_cv_cxx_compiler_gnu" >&5 2834 2842 echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 2835 2843 GXX=`test $ac_compiler_gnu = yes && echo yes` … … 2838 2846 CXXFLAGS="-g" 2839 2847 -echo "$as_me:2883: checking whether $CXX accepts -g" >&5 2840 +echo "$as_me:288 6: checking whether $CXX accepts -g" >&52848 +echo "$as_me:2887: checking whether $CXX accepts -g" >&5 2841 2849 echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 2842 2850 if test "${ac_cv_prog_cxx_g+set}" = set; then … … 2845 2853 cat >conftest.$ac_ext <<_ACEOF 2846 2854 -#line 2889 "configure" 2847 +#line 289 2"configure"2855 +#line 2893 "configure" 2848 2856 #include "confdefs.h" 2849 2857 2850 2858 int 2851 @@ -2898,16 +290 1,16 @@2859 @@ -2898,16 +2902,16 @@ 2852 2860 } 2853 2861 _ACEOF 2854 2862 rm -f conftest.$ac_objext 2855 2863 -if { (eval echo "$as_me:2901: \"$ac_compile\"") >&5 2856 +if { (eval echo "$as_me:290 4: \"$ac_compile\"") >&52864 +if { (eval echo "$as_me:2905: \"$ac_compile\"") >&5 2857 2865 (eval $ac_compile) 2>&5 2858 2866 ac_status=$? 2859 2867 - echo "$as_me:2904: \$? = $ac_status" >&5 2860 + echo "$as_me:290 7: \$? = $ac_status" >&52868 + echo "$as_me:2908: \$? = $ac_status" >&5 2861 2869 (exit $ac_status); } && 2862 2870 { ac_try='test -s conftest.$ac_objext' 2863 2871 - { (eval echo "$as_me:2907: \"$ac_try\"") >&5 2864 + { (eval echo "$as_me:291 0: \"$ac_try\"") >&52872 + { (eval echo "$as_me:2911: \"$ac_try\"") >&5 2865 2873 (eval $ac_try) 2>&5 2866 2874 ac_status=$? 2867 2875 - echo "$as_me:2910: \$? = $ac_status" >&5 2868 + echo "$as_me:291 3: \$? = $ac_status" >&52876 + echo "$as_me:2914: \$? = $ac_status" >&5 2869 2877 (exit $ac_status); }; }; then 2870 2878 ac_cv_prog_cxx_g=yes 2871 2879 else 2872 @@ -2917,7 +292 0,7 @@2880 @@ -2917,7 +2921,7 @@ 2873 2881 fi 2874 2882 rm -f conftest.$ac_objext conftest.$ac_ext 2875 2883 fi 2876 2884 -echo "$as_me:2920: result: $ac_cv_prog_cxx_g" >&5 2877 +echo "$as_me:292 3: result: $ac_cv_prog_cxx_g" >&52885 +echo "$as_me:2924: result: $ac_cv_prog_cxx_g" >&5 2878 2886 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 2879 2887 if test "$ac_test_CXXFLAGS" = set; then 2880 2888 CXXFLAGS=$ac_save_CXXFLAGS 2881 @@ -2944,7 +294 7,7 @@2889 @@ -2944,7 +2948,7 @@ 2882 2890 'void exit (int);' 2883 2891 do 2884 2892 cat >conftest.$ac_ext <<_ACEOF 2885 2893 -#line 2947 "configure" 2886 +#line 295 0"configure"2894 +#line 2951 "configure" 2887 2895 #include "confdefs.h" 2888 2896 #include <stdlib.h> 2889 2897 $ac_declaration 2890 @@ -2957,16 +296 0,16 @@2898 @@ -2957,16 +2961,16 @@ 2891 2899 } 2892 2900 _ACEOF 2893 2901 rm -f conftest.$ac_objext 2894 2902 -if { (eval echo "$as_me:2960: \"$ac_compile\"") >&5 2895 +if { (eval echo "$as_me:296 3: \"$ac_compile\"") >&52903 +if { (eval echo "$as_me:2964: \"$ac_compile\"") >&5 2896 2904 (eval $ac_compile) 2>&5 2897 2905 ac_status=$? 2898 2906 - echo "$as_me:2963: \$? = $ac_status" >&5 2899 + echo "$as_me:296 6: \$? = $ac_status" >&52907 + echo "$as_me:2967: \$? = $ac_status" >&5 2900 2908 (exit $ac_status); } && 2901 2909 { ac_try='test -s conftest.$ac_objext' 2902 2910 - { (eval echo "$as_me:2966: \"$ac_try\"") >&5 2903 + { (eval echo "$as_me:29 69: \"$ac_try\"") >&52911 + { (eval echo "$as_me:2970: \"$ac_try\"") >&5 2904 2912 (eval $ac_try) 2>&5 2905 2913 ac_status=$? 2906 2914 - echo "$as_me:2969: \$? = $ac_status" >&5 2907 + echo "$as_me:297 2: \$? = $ac_status" >&52915 + echo "$as_me:2973: \$? = $ac_status" >&5 2908 2916 (exit $ac_status); }; }; then 2909 2917 : 2910 2918 else 2911 @@ -2976,7 +29 79,7 @@2919 @@ -2976,7 +2980,7 @@ 2912 2920 fi 2913 2921 rm -f conftest.$ac_objext conftest.$ac_ext 2914 2922 cat >conftest.$ac_ext <<_ACEOF 2915 2923 -#line 2979 "configure" 2916 +#line 298 2"configure"2924 +#line 2983 "configure" 2917 2925 #include "confdefs.h" 2918 2926 $ac_declaration 2919 2927 int 2920 @@ -2988,16 +299 1,16 @@2928 @@ -2988,16 +2992,16 @@ 2921 2929 } 2922 2930 _ACEOF 2923 2931 rm -f conftest.$ac_objext 2924 2932 -if { (eval echo "$as_me:2991: \"$ac_compile\"") >&5 2925 +if { (eval echo "$as_me:299 4: \"$ac_compile\"") >&52933 +if { (eval echo "$as_me:2995: \"$ac_compile\"") >&5 2926 2934 (eval $ac_compile) 2>&5 2927 2935 ac_status=$? 2928 2936 - echo "$as_me:2994: \$? = $ac_status" >&5 2929 + echo "$as_me:299 7: \$? = $ac_status" >&52937 + echo "$as_me:2998: \$? = $ac_status" >&5 2930 2938 (exit $ac_status); } && 2931 2939 { ac_try='test -s conftest.$ac_objext' 2932 2940 - { (eval echo "$as_me:2997: \"$ac_try\"") >&5 2933 + { (eval echo "$as_me:300 0: \"$ac_try\"") >&52941 + { (eval echo "$as_me:3001: \"$ac_try\"") >&5 2934 2942 (eval $ac_try) 2>&5 2935 2943 ac_status=$? 2936 2944 - echo "$as_me:3000: \$? = $ac_status" >&5 2937 + echo "$as_me:300 3: \$? = $ac_status" >&52945 + echo "$as_me:3004: \$? = $ac_status" >&5 2938 2946 (exit $ac_status); }; }; then 2939 2947 break 2940 2948 else 2941 @@ -3024,7 +302 7,7 @@2949 @@ -3024,7 +3028,7 @@ 2942 2950 if test "$CXX" = "g++" ; then 2943 2951 # Extract the first word of "g++", so it can be a program name with args. 2944 2952 set dummy g++; ac_word=$2 2945 2953 -echo "$as_me:3027: checking for $ac_word" >&5 2946 +echo "$as_me:303 0: checking for $ac_word" >&52954 +echo "$as_me:3031: checking for $ac_word" >&5 2947 2955 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 2948 2956 if test "${ac_cv_path_CXX+set}" = set; then 2949 2957 echo $ECHO_N "(cached) $ECHO_C" >&6 2950 @@ -3041,7 +304 4,7 @@2958 @@ -3041,7 +3045,7 @@ 2951 2959 test -z "$ac_dir" && ac_dir=. 2952 2960 if $as_executable_p "$ac_dir/$ac_word"; then 2953 2961 ac_cv_path_CXX="$ac_dir/$ac_word" 2954 2962 - echo "$as_me:3044: found $ac_dir/$ac_word" >&5 2955 + echo "$as_me:304 7: found $ac_dir/$ac_word" >&52963 + echo "$as_me:3048: found $ac_dir/$ac_word" >&5 2956 2964 break 2957 2965 fi 2958 2966 done 2959 @@ -3052,16 +305 5,16 @@2967 @@ -3052,16 +3056,16 @@ 2960 2968 CXX=$ac_cv_path_CXX 2961 2969 2962 2970 if test -n "$CXX"; then 2963 2971 - echo "$as_me:3055: result: $CXX" >&5 2964 + echo "$as_me:305 8: result: $CXX" >&52972 + echo "$as_me:3059: result: $CXX" >&5 2965 2973 echo "${ECHO_T}$CXX" >&6 2966 2974 else 2967 2975 - echo "$as_me:3058: result: no" >&5 2968 + echo "$as_me:306 1: result: no" >&52976 + echo "$as_me:3062: result: no" >&5 2969 2977 echo "${ECHO_T}no" >&6 2970 2978 fi … … 2973 2981 if test "$CXX" = "g++" ; then 2974 2982 - { echo "$as_me:3064: WARNING: ignoring hardcoded g++" >&5 2975 + { echo "$as_me:306 7: WARNING: ignoring hardcoded g++" >&52983 + { echo "$as_me:3068: WARNING: ignoring hardcoded g++" >&5 2976 2984 echo "$as_me: WARNING: ignoring hardcoded g++" >&2;} 2977 2985 cf_with_cxx=no; CXX=""; GXX=""; 2978 2986 fi 2979 @@ -3069,11 +307 2,11 @@2987 @@ -3069,11 +3073,11 @@ 2980 2988 2981 2989 GXX_VERSION=none 2982 2990 if test "$GXX" = yes; then 2983 2991 - echo "$as_me:3072: checking version of g++" >&5 2984 + echo "$as_me:307 5: checking version of g++" >&52992 + echo "$as_me:3076: checking version of g++" >&5 2985 2993 echo $ECHO_N "checking version of g++... $ECHO_C" >&6 2986 2994 GXX_VERSION="`${CXX-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" 2987 2995 test -z "$GXX_VERSION" && GXX_VERSION=unknown 2988 2996 - echo "$as_me:3076: result: $GXX_VERSION" >&5 2989 + echo "$as_me:30 79: result: $GXX_VERSION" >&52997 + echo "$as_me:3080: result: $GXX_VERSION" >&5 2990 2998 echo "${ECHO_T}$GXX_VERSION" >&6 2991 2999 fi 2992 3000 2993 @@ -3081,12 +308 4,12 @@3001 @@ -3081,12 +3085,12 @@ 2994 3002 1*|2.[0-6]*) 2995 3003 # GXX=""; CXX=""; ac_cv_prog_gxx=no 2996 3004 # cf_cxx_library=no 2997 3005 - { echo "$as_me:3084: WARNING: templates do not work" >&5 2998 + { echo "$as_me:308 7: WARNING: templates do not work" >&53006 + { echo "$as_me:3088: WARNING: templates do not work" >&5 2999 3007 echo "$as_me: WARNING: templates do not work" >&2;} 3000 3008 ;; … … 3002 3010 3003 3011 -echo "$as_me:3089: checking if you want to build C++ binding and demo" >&5 3004 +echo "$as_me:309 2: checking if you want to build C++ binding and demo" >&53012 +echo "$as_me:3093: checking if you want to build C++ binding and demo" >&5 3005 3013 echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6 3006 3014 3007 3015 # Check whether --with-cxx-binding or --without-cxx-binding was given. 3008 @@ -3096,10 +3 099,10 @@3016 @@ -3096,10 +3100,10 @@ 3009 3017 else 3010 3018 cf_with_cxx_binding=$cf_with_cxx 3011 3019 fi; 3012 3020 -echo "$as_me:3099: result: $cf_with_cxx_binding" >&5 3013 +echo "$as_me:310 2: result: $cf_with_cxx_binding" >&53021 +echo "$as_me:3103: result: $cf_with_cxx_binding" >&5 3014 3022 echo "${ECHO_T}$cf_with_cxx_binding" >&6 3015 3023 3016 3024 -echo "$as_me:3102: checking if you want to build with Ada95" >&5 3017 +echo "$as_me:310 5: checking if you want to build with Ada95" >&53025 +echo "$as_me:3106: checking if you want to build with Ada95" >&5 3018 3026 echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6 3019 3027 3020 3028 # Check whether --with-ada or --without-ada was given. 3021 @@ -3109,10 +311 2,23 @@3029 @@ -3109,10 +3113,23 @@ 3022 3030 else 3023 3031 cf_with_ada=yes 3024 3032 fi; 3025 3033 -echo "$as_me:3112: result: $cf_with_ada" >&5 3026 +echo "$as_me:311 5: result: $cf_with_ada" >&53034 +echo "$as_me:3116: result: $cf_with_ada" >&5 3027 3035 echo "${ECHO_T}$cf_with_ada" >&6 3028 3036 3029 3037 -echo "$as_me:3115: checking if you want to build programs such as tic" >&5 3030 +echo "$as_me:311 8: checking if you want to install manpages" >&53038 +echo "$as_me:3119: checking if you want to install manpages" >&5 3031 3039 +echo $ECHO_N "checking if you want to install manpages... $ECHO_C" >&6 3032 3040 + … … 3038 3046 + cf_with_manpages=yes 3039 3047 +fi; 3040 +echo "$as_me:312 8: result: $cf_with_manpages" >&53048 +echo "$as_me:3129: result: $cf_with_manpages" >&5 3041 3049 +echo "${ECHO_T}$cf_with_manpages" >&6 3042 3050 + 3043 +echo "$as_me:313 1: checking if you want to build programs such as tic" >&53051 +echo "$as_me:3132: checking if you want to build programs such as tic" >&5 3044 3052 echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6 3045 3053 3046 3054 # Check whether --with-progs or --without-progs was given. 3047 @@ -3122,10 +313 8,10 @@3055 @@ -3122,10 +3139,10 @@ 3048 3056 else 3049 3057 cf_with_progs=yes 3050 3058 fi; 3051 3059 -echo "$as_me:3125: result: $cf_with_progs" >&5 3052 +echo "$as_me:314 1: result: $cf_with_progs" >&53060 +echo "$as_me:3142: result: $cf_with_progs" >&5 3053 3061 echo "${ECHO_T}$cf_with_progs" >&6 3054 3062 3055 3063 -echo "$as_me:3128: checking if you wish to install curses.h" >&5 3056 +echo "$as_me:314 4: checking if you wish to install curses.h" >&53064 +echo "$as_me:3145: checking if you wish to install curses.h" >&5 3057 3065 echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6 3058 3066 3059 3067 # Check whether --with-curses-h or --without-curses-h was given. 3060 @@ -3135,7 +315 1,7 @@3068 @@ -3135,7 +3152,7 @@ 3061 3069 else 3062 3070 with_curses_h=yes 3063 3071 fi; 3064 3072 -echo "$as_me:3138: result: $with_curses_h" >&5 3065 +echo "$as_me:315 4: result: $with_curses_h" >&53073 +echo "$as_me:3155: result: $with_curses_h" >&5 3066 3074 echo "${ECHO_T}$with_curses_h" >&6 3067 3075 3068 3076 modules_to_build="ncurses" 3069 @@ -3161,7 +317 7,7 @@3077 @@ -3161,7 +3178,7 @@ 3070 3078 do 3071 3079 # Extract the first word of "$ac_prog", so it can be a program name with args. 3072 3080 set dummy $ac_prog; ac_word=$2 3073 3081 -echo "$as_me:3164: checking for $ac_word" >&5 3074 +echo "$as_me:318 0: checking for $ac_word" >&53082 +echo "$as_me:3181: checking for $ac_word" >&5 3075 3083 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3076 3084 if test "${ac_cv_prog_AWK+set}" = set; then 3077 3085 echo $ECHO_N "(cached) $ECHO_C" >&6 3078 @@ -3176,7 +319 2,7 @@3086 @@ -3176,7 +3193,7 @@ 3079 3087 test -z "$ac_dir" && ac_dir=. 3080 3088 $as_executable_p "$ac_dir/$ac_word" || continue 3081 3089 ac_cv_prog_AWK="$ac_prog" 3082 3090 -echo "$as_me:3179: found $ac_dir/$ac_word" >&5 3083 +echo "$as_me:319 5: found $ac_dir/$ac_word" >&53091 +echo "$as_me:3196: found $ac_dir/$ac_word" >&5 3084 3092 break 3085 3093 done 3086 3094 3087 @@ -3184,21 +320 0,21 @@3095 @@ -3184,21 +3201,21 @@ 3088 3096 fi 3089 3097 AWK=$ac_cv_prog_AWK 3090 3098 if test -n "$AWK"; then 3091 3099 - echo "$as_me:3187: result: $AWK" >&5 3092 + echo "$as_me:320 3: result: $AWK" >&53100 + echo "$as_me:3204: result: $AWK" >&5 3093 3101 echo "${ECHO_T}$AWK" >&6 3094 3102 else 3095 3103 - echo "$as_me:3190: result: no" >&5 3096 + echo "$as_me:320 6: result: no" >&53104 + echo "$as_me:3207: result: no" >&5 3097 3105 echo "${ECHO_T}no" >&6 3098 3106 fi … … 3102 3110 3103 3111 -test -z "$AWK" && { { echo "$as_me:3197: error: No awk program found" >&5 3104 +test -z "$AWK" && { { echo "$as_me:321 3: error: No awk program found" >&53112 +test -z "$AWK" && { { echo "$as_me:3214: error: No awk program found" >&5 3105 3113 echo "$as_me: error: No awk program found" >&2;} 3106 3114 { (exit 1); exit 1; }; } 3107 3115 3108 3116 -echo "$as_me:3201: checking for egrep" >&5 3109 +echo "$as_me:321 7: checking for egrep" >&53117 +echo "$as_me:3218: checking for egrep" >&5 3110 3118 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 3111 3119 if test "${ac_cv_prog_egrep+set}" = set; then 3112 3120 echo $ECHO_N "(cached) $ECHO_C" >&6 3113 @@ -3208,11 +322 4,11 @@3121 @@ -3208,11 +3225,11 @@ 3114 3122 else ac_cv_prog_egrep='egrep' 3115 3123 fi 3116 3124 fi 3117 3125 -echo "$as_me:3211: result: $ac_cv_prog_egrep" >&5 3118 +echo "$as_me:322 7: result: $ac_cv_prog_egrep" >&53126 +echo "$as_me:3228: result: $ac_cv_prog_egrep" >&5 3119 3127 echo "${ECHO_T}$ac_cv_prog_egrep" >&6 3120 3128 EGREP=$ac_cv_prog_egrep 3121 3129 3122 3130 -test -z "$EGREP" && { { echo "$as_me:3215: error: No egrep program found" >&5 3123 +test -z "$EGREP" && { { echo "$as_me:323 1: error: No egrep program found" >&53131 +test -z "$EGREP" && { { echo "$as_me:3232: error: No egrep program found" >&5 3124 3132 echo "$as_me: error: No egrep program found" >&2;} 3125 3133 { (exit 1); exit 1; }; } 3126 3134 3127 @@ -3228,7 +324 4,7 @@3135 @@ -3228,7 +3245,7 @@ 3128 3136 # AFS /usr/afsws/bin/install, which mishandles nonexistent args 3129 3137 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" 3130 3138 # ./install, which can be erroneously created by make from ./install.sh. 3131 3139 -echo "$as_me:3231: checking for a BSD compatible install" >&5 3132 +echo "$as_me:324 7: checking for a BSD compatible install" >&53140 +echo "$as_me:3248: checking for a BSD compatible install" >&5 3133 3141 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 3134 3142 if test -z "$INSTALL"; then 3135 3143 if test "${ac_cv_path_install+set}" = set; then 3136 @@ -3277,7 +329 3,7 @@3144 @@ -3277,7 +3294,7 @@ 3137 3145 INSTALL=$ac_install_sh 3138 3146 fi 3139 3147 fi 3140 3148 -echo "$as_me:3280: result: $INSTALL" >&5 3141 +echo "$as_me:329 6: result: $INSTALL" >&53149 +echo "$as_me:3297: result: $INSTALL" >&5 3142 3150 echo "${ECHO_T}$INSTALL" >&6 3143 3151 3144 3152 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. 3145 @@ -3302,7 +331 8,7 @@3153 @@ -3302,7 +3319,7 @@ 3146 3154 do 3147 3155 # Extract the first word of "$ac_prog", so it can be a program name with args. 3148 3156 set dummy $ac_prog; ac_word=$2 3149 3157 -echo "$as_me:3305: checking for $ac_word" >&5 3150 +echo "$as_me:332 1: checking for $ac_word" >&53158 +echo "$as_me:3322: checking for $ac_word" >&5 3151 3159 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3152 3160 if test "${ac_cv_prog_LINT+set}" = set; then 3153 3161 echo $ECHO_N "(cached) $ECHO_C" >&6 3154 @@ -3317,7 +333 3,7 @@3162 @@ -3317,7 +3334,7 @@ 3155 3163 test -z "$ac_dir" && ac_dir=. 3156 3164 $as_executable_p "$ac_dir/$ac_word" || continue 3157 3165 ac_cv_prog_LINT="$ac_prog" 3158 3166 -echo "$as_me:3320: found $ac_dir/$ac_word" >&5 3159 +echo "$as_me:333 6: found $ac_dir/$ac_word" >&53167 +echo "$as_me:3337: found $ac_dir/$ac_word" >&5 3160 3168 break 3161 3169 done 3162 3170 3163 @@ -3325,28 +334 1,28 @@3171 @@ -3325,28 +3342,28 @@ 3164 3172 fi 3165 3173 LINT=$ac_cv_prog_LINT 3166 3174 if test -n "$LINT"; then 3167 3175 - echo "$as_me:3328: result: $LINT" >&5 3168 + echo "$as_me:334 4: result: $LINT" >&53176 + echo "$as_me:3345: result: $LINT" >&5 3169 3177 echo "${ECHO_T}$LINT" >&6 3170 3178 else 3171 3179 - echo "$as_me:3331: result: no" >&5 3172 + echo "$as_me:334 7: result: no" >&53180 + echo "$as_me:3348: result: no" >&5 3173 3181 echo "${ECHO_T}no" >&6 3174 3182 fi … … 3178 3186 3179 3187 -echo "$as_me:3338: checking whether ln -s works" >&5 3180 +echo "$as_me:335 4: checking whether ln -s works" >&53188 +echo "$as_me:3355: checking whether ln -s works" >&5 3181 3189 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 3182 3190 LN_S=$as_ln_s 3183 3191 if test "$LN_S" = "ln -s"; then 3184 3192 - echo "$as_me:3342: result: yes" >&5 3185 + echo "$as_me:335 8: result: yes" >&53193 + echo "$as_me:3359: result: yes" >&5 3186 3194 echo "${ECHO_T}yes" >&6 3187 3195 else 3188 3196 - echo "$as_me:3345: result: no, using $LN_S" >&5 3189 + echo "$as_me:336 1: result: no, using $LN_S" >&53197 + echo "$as_me:3362: result: no, using $LN_S" >&5 3190 3198 echo "${ECHO_T}no, using $LN_S" >&6 3191 3199 fi 3192 3200 3193 3201 -echo "$as_me:3349: checking for long file names" >&5 3194 +echo "$as_me:336 5: checking for long file names" >&53202 +echo "$as_me:3366: checking for long file names" >&5 3195 3203 echo $ECHO_N "checking for long file names... $ECHO_C" >&6 3196 3204 if test "${ac_cv_sys_long_file_names+set}" = set; then 3197 3205 echo $ECHO_N "(cached) $ECHO_C" >&6 3198 @@ -3385,7 +340 1,7 @@3206 @@ -3385,7 +3402,7 @@ 3199 3207 rm -rf $ac_xdir 2>/dev/null 3200 3208 done 3201 3209 fi 3202 3210 -echo "$as_me:3388: result: $ac_cv_sys_long_file_names" >&5 3203 +echo "$as_me:340 4: result: $ac_cv_sys_long_file_names" >&53211 +echo "$as_me:3405: result: $ac_cv_sys_long_file_names" >&5 3204 3212 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 3205 3213 if test $ac_cv_sys_long_file_names = yes; then 3206 3214 3207 @@ -3395,7 +341 1,136 @@3215 @@ -3395,7 +3412,136 @@ 3208 3216 3209 3217 fi … … 3212 3220 +# if we find pkg-config, check if we should install the ".pc" files. 3213 3221 + 3214 +echo "$as_me:341 6: checking if you want to use pkg-config" >&53222 +echo "$as_me:3417: checking if you want to use pkg-config" >&5 3215 3223 +echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6 3216 3224 + … … 3222 3230 + cf_pkg_config=yes 3223 3231 +fi; 3224 +echo "$as_me:342 6: result: $cf_pkg_config" >&53232 +echo "$as_me:3427: result: $cf_pkg_config" >&5 3225 3233 +echo "${ECHO_T}$cf_pkg_config" >&6 3226 3234 + … … 3232 3240 + # Extract the first word of "pkg-config", so it can be a program name with args. 3233 3241 +set dummy pkg-config; ac_word=$2 3234 +echo "$as_me:343 6: checking for $ac_word" >&53242 +echo "$as_me:3437: checking for $ac_word" >&5 3235 3243 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3236 3244 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then … … 3249 3257 + if $as_executable_p "$ac_dir/$ac_word"; then 3250 3258 + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" 3251 + echo "$as_me:345 3: found $ac_dir/$ac_word" >&53259 + echo "$as_me:3454: found $ac_dir/$ac_word" >&5 3252 3260 + break 3253 3261 +fi … … 3261 3269 + 3262 3270 +if test -n "$PKG_CONFIG"; then 3263 + echo "$as_me:346 5: result: $PKG_CONFIG" >&53271 + echo "$as_me:3466: result: $PKG_CONFIG" >&5 3264 3272 +echo "${ECHO_T}$PKG_CONFIG" >&6 3265 3273 +else 3266 + echo "$as_me:346 8: result: no" >&53274 + echo "$as_me:3469: result: no" >&5 3267 3275 +echo "${ECHO_T}no" >&6 3268 3276 +fi … … 3302 3310 + ;; 3303 3311 +*) 3304 + { { echo "$as_me:350 6: error: expected a pathname, not \"$PKG_CONFIG\"" >&53312 + { { echo "$as_me:3507: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 3305 3313 +echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} 3306 3314 + { (exit 1); exit 1; }; } … … 3311 3319 + 3312 3320 +if test "$PKG_CONFIG" != no ; then 3313 + echo "$as_me:351 5: checking if we should install .pc files for $PKG_CONFIG" >&53321 + echo "$as_me:3516: checking if we should install .pc files for $PKG_CONFIG" >&5 3314 3322 +echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6 3315 3323 + … … 3328 3336 + enable_pc_files=no 3329 3337 +fi; 3330 + echo "$as_me:353 2: result: $enable_pc_files" >&53338 + echo "$as_me:3533: result: $enable_pc_files" >&5 3331 3339 +echo "${ECHO_T}$enable_pc_files" >&6 3332 3340 + else 3333 + echo "$as_me:353 5: result: no" >&53341 + echo "$as_me:3536: result: no" >&5 3334 3342 +echo "${ECHO_T}no" >&6 3335 + { echo "$as_me:353 7: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&53343 + { echo "$as_me:3538: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5 3336 3344 +echo "$as_me: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&2;} 3337 3345 + enable_pc_files=no … … 3339 3347 +fi 3340 3348 + 3341 +echo "$as_me:354 3: checking if we should assume mixed-case filenames" >&53349 +echo "$as_me:3544: checking if we should assume mixed-case filenames" >&5 3342 3350 echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6 3343 3351 3344 3352 # Check whether --enable-mixed-case or --disable-mixed-case was given. 3345 @@ -3405,11 +355 0,11 @@3353 @@ -3405,11 +3551,11 @@ 3346 3354 else 3347 3355 enable_mixedcase=auto 3348 3356 fi; 3349 3357 -echo "$as_me:3408: result: $enable_mixedcase" >&5 3350 +echo "$as_me:355 3: result: $enable_mixedcase" >&53358 +echo "$as_me:3554: result: $enable_mixedcase" >&5 3351 3359 echo "${ECHO_T}$enable_mixedcase" >&6 3352 3360 if test "$enable_mixedcase" = "auto" ; then 3353 3361 3354 3362 -echo "$as_me:3412: checking if filesystem supports mixed-case filenames" >&5 3355 +echo "$as_me:355 7: checking if filesystem supports mixed-case filenames" >&53363 +echo "$as_me:3558: checking if filesystem supports mixed-case filenames" >&5 3356 3364 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 3357 3365 if test "${cf_cv_mixedcase+set}" = set; then 3358 3366 echo $ECHO_N "(cached) $ECHO_C" >&6 3359 @@ -3436,7 +358 1,7 @@3367 @@ -3436,7 +3582,7 @@ 3360 3368 fi 3361 3369 3362 3370 fi 3363 3371 -echo "$as_me:3439: result: $cf_cv_mixedcase" >&5 3364 +echo "$as_me:358 4: result: $cf_cv_mixedcase" >&53372 +echo "$as_me:3585: result: $cf_cv_mixedcase" >&5 3365 3373 echo "${ECHO_T}$cf_cv_mixedcase" >&6 3366 3374 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF 3367 3375 #define MIXEDCASE_FILENAMES 1 3368 @@ -3453,7 +359 8,7 @@3376 @@ -3453,7 +3599,7 @@ 3369 3377 fi 3370 3378 3371 3379 # do this after mixed-case option (tags/TAGS is not as important as tic). 3372 3380 -echo "$as_me:3456: checking whether ${MAKE-make} sets \${MAKE}" >&5 3373 +echo "$as_me:360 1: checking whether ${MAKE-make} sets \${MAKE}" >&53381 +echo "$as_me:3602: checking whether ${MAKE-make} sets \${MAKE}" >&5 3374 3382 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 3375 3383 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` 3376 3384 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then 3377 @@ -3473,18 +361 8,18 @@3385 @@ -3473,18 +3619,18 @@ 3378 3386 rm -f conftest.make 3379 3387 fi 3380 3388 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then 3381 3389 - echo "$as_me:3476: result: yes" >&5 3382 + echo "$as_me:362 1: result: yes" >&53390 + echo "$as_me:3622: result: yes" >&5 3383 3391 echo "${ECHO_T}yes" >&6 3384 3392 SET_MAKE= 3385 3393 else 3386 3394 - echo "$as_me:3480: result: no" >&5 3387 + echo "$as_me:362 5: result: no" >&53395 + echo "$as_me:3626: result: no" >&5 3388 3396 echo "${ECHO_T}no" >&6 3389 3397 SET_MAKE="MAKE=${MAKE-make}" … … 3393 3401 set dummy ctags; ac_word=$2 3394 3402 -echo "$as_me:3487: checking for $ac_word" >&5 3395 +echo "$as_me:363 2: checking for $ac_word" >&53403 +echo "$as_me:3633: checking for $ac_word" >&5 3396 3404 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3397 3405 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then 3398 3406 echo $ECHO_N "(cached) $ECHO_C" >&6 3399 @@ -3499,7 +364 4,7 @@3407 @@ -3499,7 +3645,7 @@ 3400 3408 test -z "$ac_dir" && ac_dir=. 3401 3409 $as_executable_p "$ac_dir/$ac_word" || continue 3402 3410 ac_cv_prog_MAKE_LOWER_TAGS="yes" 3403 3411 -echo "$as_me:3502: found $ac_dir/$ac_word" >&5 3404 +echo "$as_me:364 7: found $ac_dir/$ac_word" >&53412 +echo "$as_me:3648: found $ac_dir/$ac_word" >&5 3405 3413 break 3406 3414 done 3407 3415 3408 @@ -3508,17 +365 3,17 @@3416 @@ -3508,17 +3654,17 @@ 3409 3417 fi 3410 3418 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS 3411 3419 if test -n "$MAKE_LOWER_TAGS"; then 3412 3420 - echo "$as_me:3511: result: $MAKE_LOWER_TAGS" >&5 3413 + echo "$as_me:365 6: result: $MAKE_LOWER_TAGS" >&53421 + echo "$as_me:3657: result: $MAKE_LOWER_TAGS" >&5 3414 3422 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 3415 3423 else 3416 3424 - echo "$as_me:3514: result: no" >&5 3417 + echo "$as_me:36 59: result: no" >&53425 + echo "$as_me:3660: result: no" >&5 3418 3426 echo "${ECHO_T}no" >&6 3419 3427 fi … … 3423 3431 set dummy etags; ac_word=$2 3424 3432 -echo "$as_me:3521: checking for $ac_word" >&5 3425 +echo "$as_me:366 6: checking for $ac_word" >&53433 +echo "$as_me:3667: checking for $ac_word" >&5 3426 3434 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3427 3435 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then 3428 3436 echo $ECHO_N "(cached) $ECHO_C" >&6 3429 @@ -3533,7 +367 8,7 @@3437 @@ -3533,7 +3679,7 @@ 3430 3438 test -z "$ac_dir" && ac_dir=. 3431 3439 $as_executable_p "$ac_dir/$ac_word" || continue 3432 3440 ac_cv_prog_MAKE_UPPER_TAGS="yes" 3433 3441 -echo "$as_me:3536: found $ac_dir/$ac_word" >&5 3434 +echo "$as_me:368 1: found $ac_dir/$ac_word" >&53442 +echo "$as_me:3682: found $ac_dir/$ac_word" >&5 3435 3443 break 3436 3444 done 3437 3445 3438 @@ -3542,10 +368 7,10 @@3446 @@ -3542,10 +3688,10 @@ 3439 3447 fi 3440 3448 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS 3441 3449 if test -n "$MAKE_UPPER_TAGS"; then 3442 3450 - echo "$as_me:3545: result: $MAKE_UPPER_TAGS" >&5 3443 + echo "$as_me:369 0: result: $MAKE_UPPER_TAGS" >&53451 + echo "$as_me:3691: result: $MAKE_UPPER_TAGS" >&5 3444 3452 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 3445 3453 else 3446 3454 - echo "$as_me:3548: result: no" >&5 3447 + echo "$as_me:369 3: result: no" >&53455 + echo "$as_me:3694: result: no" >&5 3448 3456 echo "${ECHO_T}no" >&6 3449 3457 fi 3450 3458 3451 @@ -3565,7 +371 0,7 @@3459 @@ -3565,7 +3711,7 @@ 3452 3460 MAKE_LOWER_TAGS="#" 3453 3461 fi 3454 3462 3455 3463 -echo "$as_me:3568: checking for makeflags variable" >&5 3456 +echo "$as_me:371 3: checking for makeflags variable" >&53464 +echo "$as_me:3714: checking for makeflags variable" >&5 3457 3465 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 3458 3466 if test "${cf_cv_makeflags+set}" = set; then 3459 3467 echo $ECHO_N "(cached) $ECHO_C" >&6 3460 @@ -3599,13 +374 4,13 @@3468 @@ -3599,13 +3745,13 @@ 3461 3469 rm -f cf_makeflags.tmp 3462 3470 3463 3471 fi 3464 3472 -echo "$as_me:3602: result: $cf_cv_makeflags" >&5 3465 +echo "$as_me:374 7: result: $cf_cv_makeflags" >&53473 +echo "$as_me:3748: result: $cf_cv_makeflags" >&5 3466 3474 echo "${ECHO_T}$cf_cv_makeflags" >&6 3467 3475 … … 3470 3478 set dummy ${ac_tool_prefix}ranlib; ac_word=$2 3471 3479 -echo "$as_me:3608: checking for $ac_word" >&5 3472 +echo "$as_me:375 3: checking for $ac_word" >&53480 +echo "$as_me:3754: checking for $ac_word" >&5 3473 3481 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3474 3482 if test "${ac_cv_prog_RANLIB+set}" = set; then 3475 3483 echo $ECHO_N "(cached) $ECHO_C" >&6 3476 @@ -3620,7 +376 5,7 @@3484 @@ -3620,7 +3766,7 @@ 3477 3485 test -z "$ac_dir" && ac_dir=. 3478 3486 $as_executable_p "$ac_dir/$ac_word" || continue 3479 3487 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" 3480 3488 -echo "$as_me:3623: found $ac_dir/$ac_word" >&5 3481 +echo "$as_me:376 8: found $ac_dir/$ac_word" >&53489 +echo "$as_me:3769: found $ac_dir/$ac_word" >&5 3482 3490 break 3483 3491 done 3484 3492 3485 @@ -3628,10 +377 3,10 @@3493 @@ -3628,10 +3774,10 @@ 3486 3494 fi 3487 3495 RANLIB=$ac_cv_prog_RANLIB 3488 3496 if test -n "$RANLIB"; then 3489 3497 - echo "$as_me:3631: result: $RANLIB" >&5 3490 + echo "$as_me:377 6: result: $RANLIB" >&53498 + echo "$as_me:3777: result: $RANLIB" >&5 3491 3499 echo "${ECHO_T}$RANLIB" >&6 3492 3500 else 3493 3501 - echo "$as_me:3634: result: no" >&5 3494 + echo "$as_me:37 79: result: no" >&53502 + echo "$as_me:3780: result: no" >&5 3495 3503 echo "${ECHO_T}no" >&6 3496 3504 fi 3497 3505 3498 @@ -3640,7 +378 5,7 @@3506 @@ -3640,7 +3786,7 @@ 3499 3507 ac_ct_RANLIB=$RANLIB 3500 3508 # Extract the first word of "ranlib", so it can be a program name with args. 3501 3509 set dummy ranlib; ac_word=$2 3502 3510 -echo "$as_me:3643: checking for $ac_word" >&5 3503 +echo "$as_me:378 8: checking for $ac_word" >&53511 +echo "$as_me:3789: checking for $ac_word" >&5 3504 3512 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3505 3513 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then 3506 3514 echo $ECHO_N "(cached) $ECHO_C" >&6 3507 @@ -3655,7 +380 0,7 @@3515 @@ -3655,7 +3801,7 @@ 3508 3516 test -z "$ac_dir" && ac_dir=. 3509 3517 $as_executable_p "$ac_dir/$ac_word" || continue 3510 3518 ac_cv_prog_ac_ct_RANLIB="ranlib" 3511 3519 -echo "$as_me:3658: found $ac_dir/$ac_word" >&5 3512 +echo "$as_me:380 3: found $ac_dir/$ac_word" >&53520 +echo "$as_me:3804: found $ac_dir/$ac_word" >&5 3513 3521 break 3514 3522 done 3515 3523 3516 @@ -3664,10 +38 09,10 @@3524 @@ -3664,10 +3810,10 @@ 3517 3525 fi 3518 3526 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB 3519 3527 if test -n "$ac_ct_RANLIB"; then 3520 3528 - echo "$as_me:3667: result: $ac_ct_RANLIB" >&5 3521 + echo "$as_me:381 2: result: $ac_ct_RANLIB" >&53529 + echo "$as_me:3813: result: $ac_ct_RANLIB" >&5 3522 3530 echo "${ECHO_T}$ac_ct_RANLIB" >&6 3523 3531 else 3524 3532 - echo "$as_me:3670: result: no" >&5 3525 + echo "$as_me:381 5: result: no" >&53533 + echo "$as_me:3816: result: no" >&5 3526 3534 echo "${ECHO_T}no" >&6 3527 3535 fi 3528 3536 3529 @@ -3679,7 +382 4,7 @@3537 @@ -3679,7 +3825,7 @@ 3530 3538 if test -n "$ac_tool_prefix"; then 3531 3539 # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. 3532 3540 set dummy ${ac_tool_prefix}ld; ac_word=$2 3533 3541 -echo "$as_me:3682: checking for $ac_word" >&5 3534 +echo "$as_me:382 7: checking for $ac_word" >&53542 +echo "$as_me:3828: checking for $ac_word" >&5 3535 3543 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3536 3544 if test "${ac_cv_prog_LD+set}" = set; then 3537 3545 echo $ECHO_N "(cached) $ECHO_C" >&6 3538 @@ -3694,7 +38 39,7 @@3546 @@ -3694,7 +3840,7 @@ 3539 3547 test -z "$ac_dir" && ac_dir=. 3540 3548 $as_executable_p "$ac_dir/$ac_word" || continue 3541 3549 ac_cv_prog_LD="${ac_tool_prefix}ld" 3542 3550 -echo "$as_me:3697: found $ac_dir/$ac_word" >&5 3543 +echo "$as_me:384 2: found $ac_dir/$ac_word" >&53551 +echo "$as_me:3843: found $ac_dir/$ac_word" >&5 3544 3552 break 3545 3553 done 3546 3554 3547 @@ -3702,10 +384 7,10 @@3555 @@ -3702,10 +3848,10 @@ 3548 3556 fi 3549 3557 LD=$ac_cv_prog_LD 3550 3558 if test -n "$LD"; then 3551 3559 - echo "$as_me:3705: result: $LD" >&5 3552 + echo "$as_me:385 0: result: $LD" >&53560 + echo "$as_me:3851: result: $LD" >&5 3553 3561 echo "${ECHO_T}$LD" >&6 3554 3562 else 3555 3563 - echo "$as_me:3708: result: no" >&5 3556 + echo "$as_me:385 3: result: no" >&53564 + echo "$as_me:3854: result: no" >&5 3557 3565 echo "${ECHO_T}no" >&6 3558 3566 fi 3559 3567 3560 @@ -3714,7 +38 59,7 @@3568 @@ -3714,7 +3860,7 @@ 3561 3569 ac_ct_LD=$LD 3562 3570 # Extract the first word of "ld", so it can be a program name with args. 3563 3571 set dummy ld; ac_word=$2 3564 3572 -echo "$as_me:3717: checking for $ac_word" >&5 3565 +echo "$as_me:386 2: checking for $ac_word" >&53573 +echo "$as_me:3863: checking for $ac_word" >&5 3566 3574 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3567 3575 if test "${ac_cv_prog_ac_ct_LD+set}" = set; then 3568 3576 echo $ECHO_N "(cached) $ECHO_C" >&6 3569 @@ -3729,7 +387 4,7 @@3577 @@ -3729,7 +3875,7 @@ 3570 3578 test -z "$ac_dir" && ac_dir=. 3571 3579 $as_executable_p "$ac_dir/$ac_word" || continue 3572 3580 ac_cv_prog_ac_ct_LD="ld" 3573 3581 -echo "$as_me:3732: found $ac_dir/$ac_word" >&5 3574 +echo "$as_me:387 7: found $ac_dir/$ac_word" >&53582 +echo "$as_me:3878: found $ac_dir/$ac_word" >&5 3575 3583 break 3576 3584 done 3577 3585 3578 @@ -3738,10 +388 3,10 @@3586 @@ -3738,10 +3884,10 @@ 3579 3587 fi 3580 3588 ac_ct_LD=$ac_cv_prog_ac_ct_LD 3581 3589 if test -n "$ac_ct_LD"; then 3582 3590 - echo "$as_me:3741: result: $ac_ct_LD" >&5 3583 + echo "$as_me:388 6: result: $ac_ct_LD" >&53591 + echo "$as_me:3887: result: $ac_ct_LD" >&5 3584 3592 echo "${ECHO_T}$ac_ct_LD" >&6 3585 3593 else 3586 3594 - echo "$as_me:3744: result: no" >&5 3587 + echo "$as_me:38 89: result: no" >&53595 + echo "$as_me:3890: result: no" >&5 3588 3596 echo "${ECHO_T}no" >&6 3589 3597 fi 3590 3598 3591 @@ -3753,7 +389 8,7 @@3599 @@ -3753,7 +3899,7 @@ 3592 3600 if test -n "$ac_tool_prefix"; then 3593 3601 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 3594 3602 set dummy ${ac_tool_prefix}ar; ac_word=$2 3595 3603 -echo "$as_me:3756: checking for $ac_word" >&5 3596 +echo "$as_me:390 1: checking for $ac_word" >&53604 +echo "$as_me:3902: checking for $ac_word" >&5 3597 3605 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3598 3606 if test "${ac_cv_prog_AR+set}" = set; then 3599 3607 echo $ECHO_N "(cached) $ECHO_C" >&6 3600 @@ -3768,7 +391 3,7 @@3608 @@ -3768,7 +3914,7 @@ 3601 3609 test -z "$ac_dir" && ac_dir=. 3602 3610 $as_executable_p "$ac_dir/$ac_word" || continue 3603 3611 ac_cv_prog_AR="${ac_tool_prefix}ar" 3604 3612 -echo "$as_me:3771: found $ac_dir/$ac_word" >&5 3605 +echo "$as_me:391 6: found $ac_dir/$ac_word" >&53613 +echo "$as_me:3917: found $ac_dir/$ac_word" >&5 3606 3614 break 3607 3615 done 3608 3616 3609 @@ -3776,10 +392 1,10 @@3617 @@ -3776,10 +3922,10 @@ 3610 3618 fi 3611 3619 AR=$ac_cv_prog_AR 3612 3620 if test -n "$AR"; then 3613 3621 - echo "$as_me:3779: result: $AR" >&5 3614 + echo "$as_me:392 4: result: $AR" >&53622 + echo "$as_me:3925: result: $AR" >&5 3615 3623 echo "${ECHO_T}$AR" >&6 3616 3624 else 3617 3625 - echo "$as_me:3782: result: no" >&5 3618 + echo "$as_me:392 7: result: no" >&53626 + echo "$as_me:3928: result: no" >&5 3619 3627 echo "${ECHO_T}no" >&6 3620 3628 fi 3621 3629 3622 @@ -3788,7 +393 3,7 @@3630 @@ -3788,7 +3934,7 @@ 3623 3631 ac_ct_AR=$AR 3624 3632 # Extract the first word of "ar", so it can be a program name with args. 3625 3633 set dummy ar; ac_word=$2 3626 3634 -echo "$as_me:3791: checking for $ac_word" >&5 3627 +echo "$as_me:393 6: checking for $ac_word" >&53635 +echo "$as_me:3937: checking for $ac_word" >&5 3628 3636 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3629 3637 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then 3630 3638 echo $ECHO_N "(cached) $ECHO_C" >&6 3631 @@ -3803,7 +394 8,7 @@3639 @@ -3803,7 +3949,7 @@ 3632 3640 test -z "$ac_dir" && ac_dir=. 3633 3641 $as_executable_p "$ac_dir/$ac_word" || continue 3634 3642 ac_cv_prog_ac_ct_AR="ar" 3635 3643 -echo "$as_me:3806: found $ac_dir/$ac_word" >&5 3636 +echo "$as_me:395 1: found $ac_dir/$ac_word" >&53644 +echo "$as_me:3952: found $ac_dir/$ac_word" >&5 3637 3645 break 3638 3646 done 3639 3647 3640 @@ -3812,10 +395 7,10 @@3648 @@ -3812,10 +3958,10 @@ 3641 3649 fi 3642 3650 ac_ct_AR=$ac_cv_prog_ac_ct_AR 3643 3651 if test -n "$ac_ct_AR"; then 3644 3652 - echo "$as_me:3815: result: $ac_ct_AR" >&5 3645 + echo "$as_me:396 0: result: $ac_ct_AR" >&53653 + echo "$as_me:3961: result: $ac_ct_AR" >&5 3646 3654 echo "${ECHO_T}$ac_ct_AR" >&6 3647 3655 else 3648 3656 - echo "$as_me:3818: result: no" >&5 3649 + echo "$as_me:396 3: result: no" >&53657 + echo "$as_me:3964: result: no" >&5 3650 3658 echo "${ECHO_T}no" >&6 3651 3659 fi 3652 3660 3653 @@ -3824,25 +39 69,123 @@3661 @@ -3824,25 +3970,123 @@ 3654 3662 AR="$ac_cv_prog_AR" 3655 3663 fi … … 3659 3667 + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 3660 3668 +set dummy ${ac_tool_prefix}ar; ac_word=$2 3661 +echo "$as_me:397 5: checking for $ac_word" >&53669 +echo "$as_me:3976: checking for $ac_word" >&5 3662 3670 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3663 3671 +if test "${ac_cv_prog_AR+set}" = set; then … … 3674 3682 + $as_executable_p "$ac_dir/$ac_word" || continue 3675 3683 +ac_cv_prog_AR="${ac_tool_prefix}ar" 3676 +echo "$as_me:399 0: found $ac_dir/$ac_word" >&53684 +echo "$as_me:3991: found $ac_dir/$ac_word" >&5 3677 3685 +break 3678 3686 +done 3679 + 3687 3688 -echo "$as_me:3831: checking for archiver options (symbol AR_OPTS)" >&5 3689 -echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6 3680 3690 +fi 3681 3691 +fi 3682 3692 +AR=$ac_cv_prog_AR 3683 3693 +if test -n "$AR"; then 3684 + echo "$as_me:399 8: result: $AR" >&53694 + echo "$as_me:3999: result: $AR" >&5 3685 3695 +echo "${ECHO_T}$AR" >&6 3686 3696 +else 3687 + echo "$as_me:400 1: result: no" >&53697 + echo "$as_me:4002: result: no" >&5 3688 3698 +echo "${ECHO_T}no" >&6 3689 3699 +fi 3690 3700 3691 - echo "$as_me:3831: checking for archiver options (symbol AR_OPTS)" >&53692 - echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&63701 -if test -z "$AR_OPTS" ; then 3702 - AR_OPTS=rv 3693 3703 +fi 3694 3704 +if test -z "$ac_cv_prog_AR"; then … … 3696 3706 + # Extract the first word of "ar", so it can be a program name with args. 3697 3707 +set dummy ar; ac_word=$2 3698 +echo "$as_me:401 0: checking for $ac_word" >&53708 +echo "$as_me:4011: checking for $ac_word" >&5 3699 3709 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3700 3710 +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then … … 3711 3721 + $as_executable_p "$ac_dir/$ac_word" || continue 3712 3722 +ac_cv_prog_ac_ct_AR="ar" 3713 +echo "$as_me:402 5: found $ac_dir/$ac_word" >&53723 +echo "$as_me:4026: found $ac_dir/$ac_word" >&5 3714 3724 +break 3715 3725 +done 3716 3726 3717 -if test -z "$AR_OPTS" ; then3718 - AR_OPTS=rv3719 3727 + test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="ar" 3720 3728 +fi 3721 +fi3729 fi 3722 3730 +ac_ct_AR=$ac_cv_prog_ac_ct_AR 3723 3731 +if test -n "$ac_ct_AR"; then 3724 + echo "$as_me:403 4: result: $ac_ct_AR" >&53732 + echo "$as_me:4035: result: $ac_ct_AR" >&5 3725 3733 +echo "${ECHO_T}$ac_ct_AR" >&6 3726 3734 +else 3727 + echo "$as_me:403 7: result: no" >&53735 + echo "$as_me:4038: result: no" >&5 3728 3736 +echo "${ECHO_T}no" >&6 3729 3737 +fi 3730 3738 + 3731 3739 + AR=$ac_ct_AR 3732 3740 +else 3733 3741 + AR="$ac_cv_prog_AR" 3734 fi 3735 3736 -cf_cv_subst_AR_OPTS=$AR_OPTS 3737 -echo "$as_me:3840: result: $AR_OPTS" >&5 3738 -echo "${ECHO_T}$AR_OPTS" >&6 3739 +echo "$as_me:4046: checking for options to update archives" >&5 3742 +fi 3743 + 3744 +echo "$as_me:4047: checking for options to update archives" >&5 3740 3745 +echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 3741 3746 +if test "${cf_cv_ar_flags+set}" = set; then 3742 3747 + echo $ECHO_N "(cached) $ECHO_C" >&6 3743 3748 +else 3744 + 3749 3750 -cf_cv_subst_AR_OPTS=$AR_OPTS 3751 -echo "$as_me:3840: result: $AR_OPTS" >&5 3752 -echo "${ECHO_T}$AR_OPTS" >&6 3745 3753 + cf_cv_ar_flags=unknown 3746 3754 + for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv … … 3750 3758 + 3751 3759 + cat >conftest.$ac_ext <<EOF 3752 +#line 40 59"configure"3760 +#line 4060 "configure" 3753 3761 +int testdata[3] = { 123, 456, 789 }; 3754 3762 +EOF 3755 + if { (eval echo "$as_me:406 2: \"$ac_compile\"") >&53763 + if { (eval echo "$as_me:4063: \"$ac_compile\"") >&5 3756 3764 + (eval $ac_compile) 2>&5 3757 3765 + ac_status=$? 3758 + echo "$as_me:406 5: \$? = $ac_status" >&53766 + echo "$as_me:4066: \$? = $ac_status" >&5 3759 3767 + (exit $ac_status); } ; then 3760 3768 + $AR $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null … … 3766 3774 + test -n "$verbose" && echo " cannot compile test-program" 1>&6 3767 3775 + 3768 +echo "${as_me-configure}:407 5: testing cannot compile test-program ..." 1>&53776 +echo "${as_me-configure}:4076: testing cannot compile test-program ..." 1>&5 3769 3777 + 3770 3778 + break … … 3774 3782 3775 3783 fi 3776 +echo "$as_me:408 3: result: $cf_cv_ar_flags" >&53784 +echo "$as_me:4084: result: $cf_cv_ar_flags" >&5 3777 3785 +echo "${ECHO_T}$cf_cv_ar_flags" >&6 3778 3786 +test -z "$ARFLAGS" && ARFLAGS=$cf_cv_ar_flags … … 3780 3788 3781 3789 -echo "$as_me:3845: checking if you have specified an install-prefix" >&5 3782 +echo "$as_me:408 8: checking if you have specified an install-prefix" >&53790 +echo "$as_me:4089: checking if you have specified an install-prefix" >&5 3783 3791 echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6 3784 3792 3785 3793 # Check whether --with-install-prefix or --without-install-prefix was given. 3786 @@ -3855,7 +409 8,7 @@3794 @@ -3855,7 +4099,7 @@ 3787 3795 ;; 3788 3796 esac 3789 3797 fi; 3790 3798 -echo "$as_me:3858: result: $DESTDIR" >&5 3791 +echo "$as_me:410 1: result: $DESTDIR" >&53799 +echo "$as_me:4102: result: $DESTDIR" >&5 3792 3800 echo "${ECHO_T}$DESTDIR" >&6 3793 3801 3794 3802 ############################################################################### 3795 @@ -3883,7 +412 6,7 @@3803 @@ -3883,7 +4127,7 @@ 3796 3804 do 3797 3805 # Extract the first word of "$ac_prog", so it can be a program name with args. 3798 3806 set dummy $ac_prog; ac_word=$2 3799 3807 -echo "$as_me:3886: checking for $ac_word" >&5 3800 +echo "$as_me:41 29: checking for $ac_word" >&53808 +echo "$as_me:4130: checking for $ac_word" >&5 3801 3809 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3802 3810 if test "${ac_cv_prog_BUILD_CC+set}" = set; then 3803 3811 echo $ECHO_N "(cached) $ECHO_C" >&6 3804 @@ -3898,7 +414 1,7 @@3812 @@ -3898,7 +4142,7 @@ 3805 3813 test -z "$ac_dir" && ac_dir=. 3806 3814 $as_executable_p "$ac_dir/$ac_word" || continue 3807 3815 ac_cv_prog_BUILD_CC="$ac_prog" 3808 3816 -echo "$as_me:3901: found $ac_dir/$ac_word" >&5 3809 +echo "$as_me:414 4: found $ac_dir/$ac_word" >&53817 +echo "$as_me:4145: found $ac_dir/$ac_word" >&5 3810 3818 break 3811 3819 done 3812 3820 3813 @@ -3906,10 +41 49,10 @@3821 @@ -3906,10 +4150,10 @@ 3814 3822 fi 3815 3823 BUILD_CC=$ac_cv_prog_BUILD_CC 3816 3824 if test -n "$BUILD_CC"; then 3817 3825 - echo "$as_me:3909: result: $BUILD_CC" >&5 3818 + echo "$as_me:415 2: result: $BUILD_CC" >&53826 + echo "$as_me:4153: result: $BUILD_CC" >&5 3819 3827 echo "${ECHO_T}$BUILD_CC" >&6 3820 3828 else 3821 3829 - echo "$as_me:3912: result: no" >&5 3822 + echo "$as_me:415 5: result: no" >&53830 + echo "$as_me:4156: result: no" >&5 3823 3831 echo "${ECHO_T}no" >&6 3824 3832 fi 3825 3833 3826 @@ -3917,12 +416 0,12 @@3834 @@ -3917,12 +4161,12 @@ 3827 3835 done 3828 3836 3829 3837 fi; 3830 3838 - echo "$as_me:3920: checking for native build C compiler" >&5 3831 + echo "$as_me:416 3: checking for native build C compiler" >&53839 + echo "$as_me:4164: checking for native build C compiler" >&5 3832 3840 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 3833 3841 - echo "$as_me:3922: result: $BUILD_CC" >&5 3834 + echo "$as_me:416 5: result: $BUILD_CC" >&53842 + echo "$as_me:4166: result: $BUILD_CC" >&5 3835 3843 echo "${ECHO_T}$BUILD_CC" >&6 3836 3844 3837 3845 - echo "$as_me:3925: checking for native build C preprocessor" >&5 3838 + echo "$as_me:416 8: checking for native build C preprocessor" >&53846 + echo "$as_me:4169: checking for native build C preprocessor" >&5 3839 3847 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6 3840 3848 3841 3849 # Check whether --with-build-cpp or --without-build-cpp was given. 3842 @@ -3932,10 +417 5,10 @@3850 @@ -3932,10 +4176,10 @@ 3843 3851 else 3844 3852 BUILD_CPP='${BUILD_CC} -E' 3845 3853 fi; 3846 3854 - echo "$as_me:3935: result: $BUILD_CPP" >&5 3847 + echo "$as_me:417 8: result: $BUILD_CPP" >&53855 + echo "$as_me:4179: result: $BUILD_CPP" >&5 3848 3856 echo "${ECHO_T}$BUILD_CPP" >&6 3849 3857 3850 3858 - echo "$as_me:3938: checking for native build C flags" >&5 3851 + echo "$as_me:418 1: checking for native build C flags" >&53859 + echo "$as_me:4182: checking for native build C flags" >&5 3852 3860 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6 3853 3861 3854 3862 # Check whether --with-build-cflags or --without-build-cflags was given. 3855 @@ -3943,10 +418 6,10 @@3863 @@ -3943,10 +4187,10 @@ 3856 3864 withval="$with_build_cflags" 3857 3865 BUILD_CFLAGS="$withval" 3858 3866 fi; 3859 3867 - echo "$as_me:3946: result: $BUILD_CFLAGS" >&5 3860 + echo "$as_me:41 89: result: $BUILD_CFLAGS" >&53868 + echo "$as_me:4190: result: $BUILD_CFLAGS" >&5 3861 3869 echo "${ECHO_T}$BUILD_CFLAGS" >&6 3862 3870 3863 3871 - echo "$as_me:3949: checking for native build C preprocessor-flags" >&5 3864 + echo "$as_me:419 2: checking for native build C preprocessor-flags" >&53872 + echo "$as_me:4193: checking for native build C preprocessor-flags" >&5 3865 3873 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6 3866 3874 3867 3875 # Check whether --with-build-cppflags or --without-build-cppflags was given. 3868 @@ -3954,10 +419 7,10 @@3876 @@ -3954,10 +4198,10 @@ 3869 3877 withval="$with_build_cppflags" 3870 3878 BUILD_CPPFLAGS="$withval" 3871 3879 fi; 3872 3880 - echo "$as_me:3957: result: $BUILD_CPPFLAGS" >&5 3873 + echo "$as_me:420 0: result: $BUILD_CPPFLAGS" >&53881 + echo "$as_me:4201: result: $BUILD_CPPFLAGS" >&5 3874 3882 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 3875 3883 3876 3884 - echo "$as_me:3960: checking for native build linker-flags" >&5 3877 + echo "$as_me:420 3: checking for native build linker-flags" >&53885 + echo "$as_me:4204: checking for native build linker-flags" >&5 3878 3886 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6 3879 3887 3880 3888 # Check whether --with-build-ldflags or --without-build-ldflags was given. 3881 @@ -3965,10 +420 8,10 @@3889 @@ -3965,10 +4209,10 @@ 3882 3890 withval="$with_build_ldflags" 3883 3891 BUILD_LDFLAGS="$withval" 3884 3892 fi; 3885 3893 - echo "$as_me:3968: result: $BUILD_LDFLAGS" >&5 3886 + echo "$as_me:421 1: result: $BUILD_LDFLAGS" >&53894 + echo "$as_me:4212: result: $BUILD_LDFLAGS" >&5 3887 3895 echo "${ECHO_T}$BUILD_LDFLAGS" >&6 3888 3896 3889 3897 - echo "$as_me:3971: checking for native build linker-libraries" >&5 3890 + echo "$as_me:421 4: checking for native build linker-libraries" >&53898 + echo "$as_me:4215: checking for native build linker-libraries" >&5 3891 3899 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6 3892 3900 3893 3901 # Check whether --with-build-libs or --without-build-libs was given. 3894 @@ -3976,7 +42 19,7 @@3902 @@ -3976,7 +4220,7 @@ 3895 3903 withval="$with_build_libs" 3896 3904 BUILD_LIBS="$withval" 3897 3905 fi; 3898 3906 - echo "$as_me:3979: result: $BUILD_LIBS" >&5 3899 + echo "$as_me:422 2: result: $BUILD_LIBS" >&53907 + echo "$as_me:4223: result: $BUILD_LIBS" >&5 3900 3908 echo "${ECHO_T}$BUILD_LIBS" >&6 3901 3909 3902 3910 # this assumes we're on Unix. 3903 @@ -3986,7 +42 29,7 @@3911 @@ -3986,7 +4230,7 @@ 3904 3912 : ${BUILD_CC:='${CC}'} 3905 3913 3906 3914 if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then 3907 3915 - { { echo "$as_me:3989: error: Cross-build requires two compilers. 3908 + { { echo "$as_me:423 2: error: Cross-build requires two compilers.3916 + { { echo "$as_me:4233: error: Cross-build requires two compilers. 3909 3917 Use --with-build-cc to specify the native compiler." >&5 3910 3918 echo "$as_me: error: Cross-build requires two compilers. 3911 3919 Use --with-build-cc to specify the native compiler." >&2;} 3912 @@ -4027,7 +427 0,7 @@3920 @@ -4027,7 +4271,7 @@ 3913 3921 LIB_INSTALL= 3914 3922 LIB_UNINSTALL= 3915 3923 3916 3924 -echo "$as_me:4030: checking if you want to build libraries with libtool" >&5 3917 +echo "$as_me:427 3: checking if you want to build libraries with libtool" >&53925 +echo "$as_me:4274: checking if you want to build libraries with libtool" >&5 3918 3926 echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6 3919 3927 3920 3928 # Check whether --with-libtool or --without-libtool was given. 3921 @@ -4037,11 +428 0,11 @@3929 @@ -4037,11 +4281,11 @@ 3922 3930 else 3923 3931 with_libtool=no 3924 3932 fi; 3925 3933 -echo "$as_me:4040: result: $with_libtool" >&5 3926 +echo "$as_me:428 3: result: $with_libtool" >&53934 +echo "$as_me:4284: result: $with_libtool" >&5 3927 3935 echo "${ECHO_T}$with_libtool" >&6 3928 3936 if test "$with_libtool" != "no"; then … … 3933 3941 if test "x$prefix" != xNONE; then 3934 3942 cf_path_syntax="$prefix" 3935 @@ -4068,7 +431 1,7 @@3943 @@ -4068,7 +4312,7 @@ 3936 3944 with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%` 3937 3945 ;; 3938 3946 *) 3939 3947 - { { echo "$as_me:4071: error: expected a pathname, not \"$with_libtool\"" >&5 3940 + { { echo "$as_me:431 4: error: expected a pathname, not \"$with_libtool\"" >&53948 + { { echo "$as_me:4315: error: expected a pathname, not \"$with_libtool\"" >&5 3941 3949 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;} 3942 3950 { (exit 1); exit 1; }; } 3943 3951 ;; 3944 @@ -4076,9 +43 19,9 @@3952 @@ -4076,9 +4320,9 @@ 3945 3953 3946 3954 LIBTOOL=$with_libtool … … 3950 3958 set dummy libtool; ac_word=$2 3951 3959 -echo "$as_me:4081: checking for $ac_word" >&5 3952 +echo "$as_me:432 4: checking for $ac_word" >&53960 +echo "$as_me:4325: checking for $ac_word" >&5 3953 3961 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3954 3962 if test "${ac_cv_path_LIBTOOL+set}" = set; then 3955 3963 echo $ECHO_N "(cached) $ECHO_C" >&6 3956 @@ -4095,7 +433 8,7 @@3964 @@ -4095,7 +4339,7 @@ 3957 3965 test -z "$ac_dir" && ac_dir=. 3958 3966 if $as_executable_p "$ac_dir/$ac_word"; then 3959 3967 ac_cv_path_LIBTOOL="$ac_dir/$ac_word" 3960 3968 - echo "$as_me:4098: found $ac_dir/$ac_word" >&5 3961 + echo "$as_me:434 1: found $ac_dir/$ac_word" >&53969 + echo "$as_me:4342: found $ac_dir/$ac_word" >&5 3962 3970 break 3963 3971 fi 3964 3972 done 3965 @@ -4106,19 +43 49,19 @@3973 @@ -4106,19 +4350,19 @@ 3966 3974 LIBTOOL=$ac_cv_path_LIBTOOL 3967 3975 3968 3976 if test -n "$LIBTOOL"; then 3969 3977 - echo "$as_me:4109: result: $LIBTOOL" >&5 3970 + echo "$as_me:435 2: result: $LIBTOOL" >&53978 + echo "$as_me:4353: result: $LIBTOOL" >&5 3971 3979 echo "${ECHO_T}$LIBTOOL" >&6 3972 3980 else 3973 3981 - echo "$as_me:4112: result: no" >&5 3974 + echo "$as_me:435 5: result: no" >&53982 + echo "$as_me:4356: result: no" >&5 3975 3983 echo "${ECHO_T}no" >&6 3976 3984 fi … … 3981 3989 + fi 3982 3990 + if test -z "$LIBTOOL" ; then 3983 + { { echo "$as_me:436 1: error: Cannot find libtool" >&53991 + { { echo "$as_me:4362: error: Cannot find libtool" >&5 3984 3992 echo "$as_me: error: Cannot find libtool" >&2;} 3985 3993 { (exit 1); exit 1; }; } … … 3989 3997 LIB_OBJECT='${OBJECTS:.o=.lo}' 3990 3998 LIB_SUFFIX=.la 3991 @@ -4130,17 +437 3,17 @@3999 @@ -4130,17 +4374,17 @@ 3992 4000 LIB_PREP=: 3993 4001 3994 4002 # Show the version of libtool 3995 4003 - echo "$as_me:4133: checking version of libtool" >&5 3996 + echo "$as_me:437 6: checking version of libtool" >&54004 + echo "$as_me:4377: checking version of libtool" >&5 3997 4005 echo $ECHO_N "checking version of libtool... $ECHO_C" >&6 3998 4006 … … 4002 4010 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.].*//'` 4003 4011 - echo "$as_me:4140: result: $cf_cv_libtool_version" >&5 4004 + echo "$as_me:438 3: result: $cf_cv_libtool_version" >&54012 + echo "$as_me:4384: result: $cf_cv_libtool_version" >&5 4005 4013 echo "${ECHO_T}$cf_cv_libtool_version" >&6 4006 4014 if test -z "$cf_cv_libtool_version" ; then 4007 4015 - { { echo "$as_me:4143: error: This is not GNU libtool" >&5 4008 + { { echo "$as_me:438 6: error: This is not GNU libtool" >&54016 + { { echo "$as_me:4387: error: This is not GNU libtool" >&5 4009 4017 echo "$as_me: error: This is not GNU libtool" >&2;} 4010 4018 { (exit 1); exit 1; }; } 4011 4019 fi 4012 @@ -4168,7 +441 1,7 @@4020 @@ -4168,7 +4412,7 @@ 4013 4021 4014 4022 else 4015 4023 4016 4024 -echo "$as_me:4171: checking if you want to build shared libraries" >&5 4017 +echo "$as_me:441 4: checking if you want to build shared libraries" >&54025 +echo "$as_me:4415: checking if you want to build shared libraries" >&5 4018 4026 echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6 4019 4027 4020 4028 # Check whether --with-shared or --without-shared was given. 4021 @@ -4178,11 +442 1,11 @@4029 @@ -4178,11 +4422,11 @@ 4022 4030 else 4023 4031 with_shared=no 4024 4032 fi; 4025 4033 -echo "$as_me:4181: result: $with_shared" >&5 4026 +echo "$as_me:442 4: result: $with_shared" >&54034 +echo "$as_me:4425: result: $with_shared" >&5 4027 4035 echo "${ECHO_T}$with_shared" >&6 4028 4036 test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared" 4029 4037 4030 4038 -echo "$as_me:4185: checking if you want to build static libraries" >&5 4031 +echo "$as_me:442 8: checking if you want to build static libraries" >&54039 +echo "$as_me:4429: checking if you want to build static libraries" >&5 4032 4040 echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6 4033 4041 4034 4042 # Check whether --with-normal or --without-normal was given. 4035 @@ -4192,11 +443 5,11 @@4043 @@ -4192,11 +4436,11 @@ 4036 4044 else 4037 4045 with_normal=yes 4038 4046 fi; 4039 4047 -echo "$as_me:4195: result: $with_normal" >&5 4040 +echo "$as_me:443 8: result: $with_normal" >&54048 +echo "$as_me:4439: result: $with_normal" >&5 4041 4049 echo "${ECHO_T}$with_normal" >&6 4042 4050 test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal" 4043 4051 4044 4052 -echo "$as_me:4199: checking if you want to build debug libraries" >&5 4045 +echo "$as_me:444 2: checking if you want to build debug libraries" >&54053 +echo "$as_me:4443: checking if you want to build debug libraries" >&5 4046 4054 echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6 4047 4055 4048 4056 # Check whether --with-debug or --without-debug was given. 4049 @@ -4206,11 +44 49,11 @@4057 @@ -4206,11 +4450,11 @@ 4050 4058 else 4051 4059 with_debug=yes 4052 4060 fi; 4053 4061 -echo "$as_me:4209: result: $with_debug" >&5 4054 +echo "$as_me:445 2: result: $with_debug" >&54062 +echo "$as_me:4453: result: $with_debug" >&5 4055 4063 echo "${ECHO_T}$with_debug" >&6 4056 4064 test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug" 4057 4065 4058 4066 -echo "$as_me:4213: checking if you want to build profiling libraries" >&5 4059 +echo "$as_me:445 6: checking if you want to build profiling libraries" >&54067 +echo "$as_me:4457: checking if you want to build profiling libraries" >&5 4060 4068 echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6 4061 4069 4062 4070 # Check whether --with-profile or --without-profile was given. 4063 @@ -4220,7 +446 3,7 @@4071 @@ -4220,7 +4464,7 @@ 4064 4072 else 4065 4073 with_profile=no 4066 4074 fi; 4067 4075 -echo "$as_me:4223: result: $with_profile" >&5 4068 +echo "$as_me:446 6: result: $with_profile" >&54076 +echo "$as_me:4467: result: $with_profile" >&5 4069 4077 echo "${ECHO_T}$with_profile" >&6 4070 4078 test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile" 4071 4079 4072 @@ -4228,19 +447 1,19 @@4080 @@ -4228,19 +4472,19 @@ 4073 4081 4074 4082 ############################################################################### 4075 4083 4076 4084 -echo "$as_me:4231: checking for specified models" >&5 4077 +echo "$as_me:447 4: checking for specified models" >&54085 +echo "$as_me:4475: checking for specified models" >&5 4078 4086 echo $ECHO_N "checking for specified models... $ECHO_C" >&6 4079 4087 test -z "$cf_list_models" && cf_list_models=normal 4080 4088 test "$with_libtool" != "no" && cf_list_models=libtool 4081 4089 -echo "$as_me:4235: result: $cf_list_models" >&5 4082 +echo "$as_me:447 8: result: $cf_list_models" >&54090 +echo "$as_me:4479: result: $cf_list_models" >&5 4083 4091 echo "${ECHO_T}$cf_list_models" >&6 4084 4092 … … 4086 4094 ### up test-applications. 4087 4095 -echo "$as_me:4240: checking for default model" >&5 4088 +echo "$as_me:448 3: checking for default model" >&54096 +echo "$as_me:4484: checking for default model" >&5 4089 4097 echo $ECHO_N "checking for default model... $ECHO_C" >&6 4090 4098 DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'` 4091 4099 -echo "$as_me:4243: result: $DFT_LWR_MODEL" >&5 4092 +echo "$as_me:448 6: result: $DFT_LWR_MODEL" >&54100 +echo "$as_me:4487: result: $DFT_LWR_MODEL" >&5 4093 4101 echo "${ECHO_T}$DFT_LWR_MODEL" >&6 4094 4102 4095 4103 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 4096 @@ -4269,7 +451 2,7 @@4104 @@ -4269,7 +4513,7 @@ 4097 4105 4098 4106 ############################################################################### 4099 4107 4100 4108 -echo "$as_me:4272: checking if you want to build a separate terminfo library" >&5 4101 +echo "$as_me:451 5: checking if you want to build a separate terminfo library" >&54109 +echo "$as_me:4516: checking if you want to build a separate terminfo library" >&5 4102 4110 echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6 4103 4111 4104 4112 # Check whether --with-termlib or --without-termlib was given. 4105 @@ -4279,10 +452 2,10 @@4113 @@ -4279,10 +4523,10 @@ 4106 4114 else 4107 4115 with_termlib=no 4108 4116 fi; 4109 4117 -echo "$as_me:4282: result: $with_termlib" >&5 4110 +echo "$as_me:452 5: result: $with_termlib" >&54118 +echo "$as_me:4526: result: $with_termlib" >&5 4111 4119 echo "${ECHO_T}$with_termlib" >&6 4112 4120 4113 4121 -echo "$as_me:4285: checking if you want to build a separate tic library" >&5 4114 +echo "$as_me:452 8: checking if you want to build a separate tic library" >&54122 +echo "$as_me:4529: checking if you want to build a separate tic library" >&5 4115 4123 echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6 4116 4124 4117 4125 # Check whether --with-ticlib or --without-ticlib was given. 4118 @@ -4292,13 +453 5,13 @@4126 @@ -4292,13 +4536,13 @@ 4119 4127 else 4120 4128 with_ticlib=no 4121 4129 fi; 4122 4130 -echo "$as_me:4295: result: $with_ticlib" >&5 4123 +echo "$as_me:453 8: result: $with_ticlib" >&54131 +echo "$as_me:4539: result: $with_ticlib" >&5 4124 4132 echo "${ECHO_T}$with_ticlib" >&6 4125 4133 … … 4128 4136 4129 4137 -echo "$as_me:4301: checking if you want to link with the GPM mouse library" >&5 4130 +echo "$as_me:454 4: checking if you want to link with the GPM mouse library" >&54138 +echo "$as_me:4545: checking if you want to link with the GPM mouse library" >&5 4131 4139 echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6 4132 4140 4133 4141 # Check whether --with-gpm or --without-gpm was given. 4134 @@ -4308,27 +455 1,27 @@4142 @@ -4308,27 +4552,27 @@ 4135 4143 else 4136 4144 with_gpm=maybe 4137 4145 fi; 4138 4146 -echo "$as_me:4311: result: $with_gpm" >&5 4139 +echo "$as_me:455 4: result: $with_gpm" >&54147 +echo "$as_me:4555: result: $with_gpm" >&5 4140 4148 echo "${ECHO_T}$with_gpm" >&6 4141 4149 4142 4150 if test "$with_gpm" != no ; then 4143 4151 - echo "$as_me:4315: checking for gpm.h" >&5 4144 + echo "$as_me:455 8: checking for gpm.h" >&54152 + echo "$as_me:4559: checking for gpm.h" >&5 4145 4153 echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6 4146 4154 if test "${ac_cv_header_gpm_h+set}" = set; then … … 4149 4157 cat >conftest.$ac_ext <<_ACEOF 4150 4158 -#line 4321 "configure" 4151 +#line 456 4"configure"4159 +#line 4565 "configure" 4152 4160 #include "confdefs.h" 4153 4161 #include <gpm.h> 4154 4162 _ACEOF 4155 4163 -if { (eval echo "$as_me:4325: \"$ac_cpp conftest.$ac_ext\"") >&5 4156 +if { (eval echo "$as_me:456 8: \"$ac_cpp conftest.$ac_ext\"") >&54164 +if { (eval echo "$as_me:4569: \"$ac_cpp conftest.$ac_ext\"") >&5 4157 4165 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 4158 4166 ac_status=$? … … 4161 4169 cat conftest.err >&5 4162 4170 - echo "$as_me:4331: \$? = $ac_status" >&5 4163 + echo "$as_me:457 4: \$? = $ac_status" >&54171 + echo "$as_me:4575: \$? = $ac_status" >&5 4164 4172 (exit $ac_status); } >/dev/null; then 4165 4173 if test -s conftest.err; then 4166 4174 ac_cpp_err=$ac_c_preproc_warn_flag 4167 @@ -4347,7 +459 0,7 @@4175 @@ -4347,7 +4591,7 @@ 4168 4176 fi 4169 4177 rm -f conftest.err conftest.$ac_ext 4170 4178 fi 4171 4179 -echo "$as_me:4350: result: $ac_cv_header_gpm_h" >&5 4172 +echo "$as_me:459 3: result: $ac_cv_header_gpm_h" >&54180 +echo "$as_me:4594: result: $ac_cv_header_gpm_h" >&5 4173 4181 echo "${ECHO_T}$ac_cv_header_gpm_h" >&6 4174 4182 if test $ac_cv_header_gpm_h = yes; then 4175 4183 4176 @@ -4358,14 +460 1,14 @@4184 @@ -4358,14 +4602,14 @@ 4177 4185 if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then 4178 4186 test -n "$verbose" && echo " assuming we really have GPM library" 1>&6 4179 4187 4180 4188 -echo "${as_me-configure}:4361: testing assuming we really have GPM library ..." 1>&5 4181 +echo "${as_me-configure}:460 4: testing assuming we really have GPM library ..." 1>&54189 +echo "${as_me-configure}:4605: testing assuming we really have GPM library ..." 1>&5 4182 4190 4183 4191 cat >>confdefs.h <<\EOF … … 4187 4195 else 4188 4196 - echo "$as_me:4368: checking for Gpm_Open in -lgpm" >&5 4189 + echo "$as_me:461 1: checking for Gpm_Open in -lgpm" >&54197 + echo "$as_me:4612: checking for Gpm_Open in -lgpm" >&5 4190 4198 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 4191 4199 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then 4192 4200 echo $ECHO_N "(cached) $ECHO_C" >&6 4193 @@ -4373,7 +461 6,7 @@4201 @@ -4373,7 +4617,7 @@ 4194 4202 ac_check_lib_save_LIBS=$LIBS 4195 4203 LIBS="-lgpm $LIBS" 4196 4204 cat >conftest.$ac_ext <<_ACEOF 4197 4205 -#line 4376 "configure" 4198 +#line 46 19"configure"4206 +#line 4620 "configure" 4199 4207 #include "confdefs.h" 4200 4208 4201 4209 /* Override any gcc2 internal prototype to avoid an error. */ 4202 @@ -4392,16 +463 5,16 @@4210 @@ -4392,16 +4636,16 @@ 4203 4211 } 4204 4212 _ACEOF 4205 4213 rm -f conftest.$ac_objext conftest$ac_exeext 4206 4214 -if { (eval echo "$as_me:4395: \"$ac_link\"") >&5 4207 +if { (eval echo "$as_me:463 8: \"$ac_link\"") >&54215 +if { (eval echo "$as_me:4639: \"$ac_link\"") >&5 4208 4216 (eval $ac_link) 2>&5 4209 4217 ac_status=$? 4210 4218 - echo "$as_me:4398: \$? = $ac_status" >&5 4211 + echo "$as_me:464 1: \$? = $ac_status" >&54219 + echo "$as_me:4642: \$? = $ac_status" >&5 4212 4220 (exit $ac_status); } && 4213 4221 { ac_try='test -s conftest$ac_exeext' 4214 4222 - { (eval echo "$as_me:4401: \"$ac_try\"") >&5 4215 + { (eval echo "$as_me:464 4: \"$ac_try\"") >&54223 + { (eval echo "$as_me:4645: \"$ac_try\"") >&5 4216 4224 (eval $ac_try) 2>&5 4217 4225 ac_status=$? 4218 4226 - echo "$as_me:4404: \$? = $ac_status" >&5 4219 + echo "$as_me:464 7: \$? = $ac_status" >&54227 + echo "$as_me:4648: \$? = $ac_status" >&5 4220 4228 (exit $ac_status); }; }; then 4221 4229 ac_cv_lib_gpm_Gpm_Open=yes 4222 4230 else 4223 @@ -4412,13 +465 5,13 @@4231 @@ -4412,13 +4656,13 @@ 4224 4232 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4225 4233 LIBS=$ac_check_lib_save_LIBS 4226 4234 fi 4227 4235 -echo "$as_me:4415: result: $ac_cv_lib_gpm_Gpm_Open" >&5 4228 +echo "$as_me:465 8: result: $ac_cv_lib_gpm_Gpm_Open" >&54236 +echo "$as_me:4659: result: $ac_cv_lib_gpm_Gpm_Open" >&5 4229 4237 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 4230 4238 if test $ac_cv_lib_gpm_Gpm_Open = yes; then … … 4233 4241 4234 4242 - { { echo "$as_me:4421: error: Cannot link with GPM library" >&5 4235 + { { echo "$as_me:466 4: error: Cannot link with GPM library" >&54243 + { { echo "$as_me:4665: error: Cannot link with GPM library" >&5 4236 4244 echo "$as_me: error: Cannot link with GPM library" >&2;} 4237 4245 { (exit 1); exit 1; }; } 4238 4246 fi 4239 @@ -4428,7 +467 1,7 @@4247 @@ -4428,7 +4672,7 @@ 4240 4248 4241 4249 else 4242 4250 4243 4251 - test "$with_gpm" != maybe && { echo "$as_me:4431: WARNING: Cannot find GPM header" >&5 4244 + test "$with_gpm" != maybe && { echo "$as_me:467 4: WARNING: Cannot find GPM header" >&54252 + test "$with_gpm" != maybe && { echo "$as_me:4675: WARNING: Cannot find GPM header" >&5 4245 4253 echo "$as_me: WARNING: Cannot find GPM header" >&2;} 4246 4254 with_gpm=no 4247 4255 4248 @@ -4437,7 +468 0,7 @@4256 @@ -4437,7 +4681,7 @@ 4249 4257 fi 4250 4258 4251 4259 if test "$with_gpm" != no ; then 4252 4260 - echo "$as_me:4440: checking if you want to load GPM dynamically" >&5 4253 + echo "$as_me:468 3: checking if you want to load GPM dynamically" >&54261 + echo "$as_me:4684: checking if you want to load GPM dynamically" >&5 4254 4262 echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6 4255 4263 4256 4264 # Check whether --with-dlsym or --without-dlsym was given. 4257 @@ -4447,18 +469 0,18 @@4265 @@ -4447,18 +4691,18 @@ 4258 4266 else 4259 4267 with_dlsym=yes 4260 4268 fi; 4261 4269 - echo "$as_me:4450: result: $with_dlsym" >&5 4262 + echo "$as_me:469 3: result: $with_dlsym" >&54270 + echo "$as_me:4694: result: $with_dlsym" >&5 4263 4271 echo "${ECHO_T}$with_dlsym" >&6 4264 4272 if test "$with_dlsym" = yes ; then … … 4266 4274 cf_have_dlsym=no 4267 4275 -echo "$as_me:4455: checking for dlsym" >&5 4268 +echo "$as_me:469 8: checking for dlsym" >&54276 +echo "$as_me:4699: checking for dlsym" >&5 4269 4277 echo $ECHO_N "checking for dlsym... $ECHO_C" >&6 4270 4278 if test "${ac_cv_func_dlsym+set}" = set; then … … 4273 4281 cat >conftest.$ac_ext <<_ACEOF 4274 4282 -#line 4461 "configure" 4275 +#line 470 4"configure"4283 +#line 4705 "configure" 4276 4284 #include "confdefs.h" 4277 4285 /* System header to define __stub macros and hopefully few prototypes, 4278 4286 which can conflict with char dlsym (); below. */ 4279 @@ -4489,16 +473 2,16 @@4287 @@ -4489,16 +4733,16 @@ 4280 4288 } 4281 4289 _ACEOF 4282 4290 rm -f conftest.$ac_objext conftest$ac_exeext 4283 4291 -if { (eval echo "$as_me:4492: \"$ac_link\"") >&5 4284 +if { (eval echo "$as_me:473 5: \"$ac_link\"") >&54292 +if { (eval echo "$as_me:4736: \"$ac_link\"") >&5 4285 4293 (eval $ac_link) 2>&5 4286 4294 ac_status=$? 4287 4295 - echo "$as_me:4495: \$? = $ac_status" >&5 4288 + echo "$as_me:473 8: \$? = $ac_status" >&54296 + echo "$as_me:4739: \$? = $ac_status" >&5 4289 4297 (exit $ac_status); } && 4290 4298 { ac_try='test -s conftest$ac_exeext' 4291 4299 - { (eval echo "$as_me:4498: \"$ac_try\"") >&5 4292 + { (eval echo "$as_me:474 1: \"$ac_try\"") >&54300 + { (eval echo "$as_me:4742: \"$ac_try\"") >&5 4293 4301 (eval $ac_try) 2>&5 4294 4302 ac_status=$? 4295 4303 - echo "$as_me:4501: \$? = $ac_status" >&5 4296 + echo "$as_me:474 4: \$? = $ac_status" >&54304 + echo "$as_me:4745: \$? = $ac_status" >&5 4297 4305 (exit $ac_status); }; }; then 4298 4306 ac_cv_func_dlsym=yes 4299 4307 else 4300 @@ -4508,14 +475 1,14 @@4308 @@ -4508,14 +4752,14 @@ 4301 4309 fi 4302 4310 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4303 4311 fi 4304 4312 -echo "$as_me:4511: result: $ac_cv_func_dlsym" >&5 4305 +echo "$as_me:475 4: result: $ac_cv_func_dlsym" >&54313 +echo "$as_me:4755: result: $ac_cv_func_dlsym" >&5 4306 4314 echo "${ECHO_T}$ac_cv_func_dlsym" >&6 4307 4315 if test $ac_cv_func_dlsym = yes; then … … 4311 4319 cf_have_libdl=no 4312 4320 -echo "$as_me:4518: checking for dlsym in -ldl" >&5 4313 +echo "$as_me:476 1: checking for dlsym in -ldl" >&54321 +echo "$as_me:4762: checking for dlsym in -ldl" >&5 4314 4322 echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6 4315 4323 if test "${ac_cv_lib_dl_dlsym+set}" = set; then 4316 4324 echo $ECHO_N "(cached) $ECHO_C" >&6 4317 @@ -4523,7 +476 6,7 @@4325 @@ -4523,7 +4767,7 @@ 4318 4326 ac_check_lib_save_LIBS=$LIBS 4319 4327 LIBS="-ldl $LIBS" 4320 4328 cat >conftest.$ac_ext <<_ACEOF 4321 4329 -#line 4526 "configure" 4322 +#line 47 69"configure"4330 +#line 4770 "configure" 4323 4331 #include "confdefs.h" 4324 4332 4325 4333 /* Override any gcc2 internal prototype to avoid an error. */ 4326 @@ -4542,16 +478 5,16 @@4334 @@ -4542,16 +4786,16 @@ 4327 4335 } 4328 4336 _ACEOF 4329 4337 rm -f conftest.$ac_objext conftest$ac_exeext 4330 4338 -if { (eval echo "$as_me:4545: \"$ac_link\"") >&5 4331 +if { (eval echo "$as_me:478 8: \"$ac_link\"") >&54339 +if { (eval echo "$as_me:4789: \"$ac_link\"") >&5 4332 4340 (eval $ac_link) 2>&5 4333 4341 ac_status=$? 4334 4342 - echo "$as_me:4548: \$? = $ac_status" >&5 4335 + echo "$as_me:479 1: \$? = $ac_status" >&54343 + echo "$as_me:4792: \$? = $ac_status" >&5 4336 4344 (exit $ac_status); } && 4337 4345 { ac_try='test -s conftest$ac_exeext' 4338 4346 - { (eval echo "$as_me:4551: \"$ac_try\"") >&5 4339 + { (eval echo "$as_me:479 4: \"$ac_try\"") >&54347 + { (eval echo "$as_me:4795: \"$ac_try\"") >&5 4340 4348 (eval $ac_try) 2>&5 4341 4349 ac_status=$? 4342 4350 - echo "$as_me:4554: \$? = $ac_status" >&5 4343 + echo "$as_me:479 7: \$? = $ac_status" >&54351 + echo "$as_me:4798: \$? = $ac_status" >&5 4344 4352 (exit $ac_status); }; }; then 4345 4353 ac_cv_lib_dl_dlsym=yes 4346 4354 else 4347 @@ -4562,7 +480 5,7 @@4355 @@ -4562,7 +4806,7 @@ 4348 4356 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4349 4357 LIBS=$ac_check_lib_save_LIBS 4350 4358 fi 4351 4359 -echo "$as_me:4565: result: $ac_cv_lib_dl_dlsym" >&5 4352 +echo "$as_me:480 8: result: $ac_cv_lib_dl_dlsym" >&54360 +echo "$as_me:4809: result: $ac_cv_lib_dl_dlsym" >&5 4353 4361 echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6 4354 4362 if test $ac_cv_lib_dl_dlsym = yes; then 4355 4363 4356 @@ -4575,10 +481 8,10 @@4364 @@ -4575,10 +4819,10 @@ 4357 4365 if test "$cf_have_dlsym" = yes ; then 4358 4366 test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS" 4359 4367 4360 4368 - echo "$as_me:4578: checking whether able to link to dl*() functions" >&5 4361 + echo "$as_me:482 1: checking whether able to link to dl*() functions" >&54369 + echo "$as_me:4822: checking whether able to link to dl*() functions" >&5 4362 4370 echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6 4363 4371 cat >conftest.$ac_ext <<_ACEOF 4364 4372 -#line 4581 "configure" 4365 +#line 482 4"configure"4373 +#line 4825 "configure" 4366 4374 #include "confdefs.h" 4367 4375 #include <dlfcn.h> 4368 4376 int 4369 @@ -4596,16 +48 39,16 @@4377 @@ -4596,16 +4840,16 @@ 4370 4378 } 4371 4379 _ACEOF 4372 4380 rm -f conftest.$ac_objext conftest$ac_exeext 4373 4381 -if { (eval echo "$as_me:4599: \"$ac_link\"") >&5 4374 +if { (eval echo "$as_me:484 2: \"$ac_link\"") >&54382 +if { (eval echo "$as_me:4843: \"$ac_link\"") >&5 4375 4383 (eval $ac_link) 2>&5 4376 4384 ac_status=$? 4377 4385 - echo "$as_me:4602: \$? = $ac_status" >&5 4378 + echo "$as_me:484 5: \$? = $ac_status" >&54386 + echo "$as_me:4846: \$? = $ac_status" >&5 4379 4387 (exit $ac_status); } && 4380 4388 { ac_try='test -s conftest$ac_exeext' 4381 4389 - { (eval echo "$as_me:4605: \"$ac_try\"") >&5 4382 + { (eval echo "$as_me:484 8: \"$ac_try\"") >&54390 + { (eval echo "$as_me:4849: \"$ac_try\"") >&5 4383 4391 (eval $ac_try) 2>&5 4384 4392 ac_status=$? 4385 4393 - echo "$as_me:4608: \$? = $ac_status" >&5 4386 + echo "$as_me:485 1: \$? = $ac_status" >&54394 + echo "$as_me:4852: \$? = $ac_status" >&5 4387 4395 (exit $ac_status); }; }; then 4388 4396 4389 4397 cat >>confdefs.h <<\EOF 4390 @@ -4616,15 +48 59,15 @@4398 @@ -4616,15 +4860,15 @@ 4391 4399 echo "$as_me: failed program was:" >&5 4392 4400 cat conftest.$ac_ext >&5 4393 4401 4394 4402 - { { echo "$as_me:4619: error: Cannot link test program for libdl" >&5 4395 + { { echo "$as_me:486 2: error: Cannot link test program for libdl" >&54403 + { { echo "$as_me:4863: error: Cannot link test program for libdl" >&5 4396 4404 echo "$as_me: error: Cannot link test program for libdl" >&2;} 4397 4405 { (exit 1); exit 1; }; } … … 4399 4407 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4400 4408 - echo "$as_me:4624: result: ok" >&5 4401 + echo "$as_me:486 7: result: ok" >&54409 + echo "$as_me:4868: result: ok" >&5 4402 4410 echo "${ECHO_T}ok" >&6 4403 4411 else 4404 4412 - { { echo "$as_me:4627: error: Cannot find dlsym function" >&5 4405 + { { echo "$as_me:487 0: error: Cannot find dlsym function" >&54413 + { { echo "$as_me:4871: error: Cannot find dlsym function" >&5 4406 4414 echo "$as_me: error: Cannot find dlsym function" >&2;} 4407 4415 { (exit 1); exit 1; }; } 4408 4416 fi 4409 @@ -4632,12 +487 5,12 @@4417 @@ -4632,12 +4876,12 @@ 4410 4418 if test "$with_gpm" != yes ; then 4411 4419 test -n "$verbose" && echo " assuming soname for gpm is $with_gpm" 1>&6 4412 4420 4413 4421 -echo "${as_me-configure}:4635: testing assuming soname for gpm is $with_gpm ..." 1>&5 4414 +echo "${as_me-configure}:487 8: testing assuming soname for gpm is $with_gpm ..." 1>&54422 +echo "${as_me-configure}:4879: testing assuming soname for gpm is $with_gpm ..." 1>&5 4415 4423 4416 4424 cf_cv_gpm_soname="$with_gpm" … … 4418 4426 4419 4427 -echo "$as_me:4640: checking for soname of gpm library" >&5 4420 +echo "$as_me:488 3: checking for soname of gpm library" >&54428 +echo "$as_me:4884: checking for soname of gpm library" >&5 4421 4429 echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6 4422 4430 if test "${cf_cv_gpm_soname+set}" = set; then 4423 4431 echo $ECHO_N "(cached) $ECHO_C" >&6 4424 @@ -4655,15 +489 8,15 @@4432 @@ -4655,15 +4899,15 @@ 4425 4433 CF_EOF 4426 4434 cf_save_LIBS="$LIBS" 4427 4435 LIBS="-lgpm $LIBS" 4428 4436 - if { (eval echo "$as_me:4658: \"$ac_compile\"") >&5 4429 + if { (eval echo "$as_me:490 1: \"$ac_compile\"") >&54437 + if { (eval echo "$as_me:4902: \"$ac_compile\"") >&5 4430 4438 (eval $ac_compile) 2>&5 4431 4439 ac_status=$? 4432 4440 - echo "$as_me:4661: \$? = $ac_status" >&5 4433 + echo "$as_me:490 4: \$? = $ac_status" >&54441 + echo "$as_me:4905: \$? = $ac_status" >&5 4434 4442 (exit $ac_status); } ; then 4435 4443 - if { (eval echo "$as_me:4663: \"$ac_link\"") >&5 4436 + if { (eval echo "$as_me:490 6: \"$ac_link\"") >&54444 + if { (eval echo "$as_me:4907: \"$ac_link\"") >&5 4437 4445 (eval $ac_link) 2>&5 4438 4446 ac_status=$? 4439 4447 - echo "$as_me:4666: \$? = $ac_status" >&5 4440 + echo "$as_me:49 09: \$? = $ac_status" >&54448 + echo "$as_me:4910: \$? = $ac_status" >&5 4441 4449 (exit $ac_status); } ; then 4442 4450 cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.` 4443 4451 test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown 4444 @@ -4674,7 +491 7,7 @@4452 @@ -4674,7 +4918,7 @@ 4445 4453 fi 4446 4454 4447 4455 fi 4448 4456 -echo "$as_me:4677: result: $cf_cv_gpm_soname" >&5 4449 +echo "$as_me:492 0: result: $cf_cv_gpm_soname" >&54457 +echo "$as_me:4921: result: $cf_cv_gpm_soname" >&5 4450 4458 echo "${ECHO_T}$cf_cv_gpm_soname" >&6 4451 4459 4452 4460 fi 4453 @@ -4690,7 +493 3,7 @@4461 @@ -4690,7 +4934,7 @@ 4454 4462 #define HAVE_LIBGPM 1 4455 4463 EOF 4456 4464 4457 4465 -echo "$as_me:4693: checking for Gpm_Wgetch in -lgpm" >&5 4458 +echo "$as_me:493 6: checking for Gpm_Wgetch in -lgpm" >&54466 +echo "$as_me:4937: checking for Gpm_Wgetch in -lgpm" >&5 4459 4467 echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6 4460 4468 if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then 4461 4469 echo $ECHO_N "(cached) $ECHO_C" >&6 4462 @@ -4698,7 +494 1,7 @@4470 @@ -4698,7 +4942,7 @@ 4463 4471 ac_check_lib_save_LIBS=$LIBS 4464 4472 LIBS="-lgpm $LIBS" 4465 4473 cat >conftest.$ac_ext <<_ACEOF 4466 4474 -#line 4701 "configure" 4467 +#line 494 4"configure"4475 +#line 4945 "configure" 4468 4476 #include "confdefs.h" 4469 4477 4470 4478 /* Override any gcc2 internal prototype to avoid an error. */ 4471 @@ -4717,16 +496 0,16 @@4479 @@ -4717,16 +4961,16 @@ 4472 4480 } 4473 4481 _ACEOF 4474 4482 rm -f conftest.$ac_objext conftest$ac_exeext 4475 4483 -if { (eval echo "$as_me:4720: \"$ac_link\"") >&5 4476 +if { (eval echo "$as_me:496 3: \"$ac_link\"") >&54484 +if { (eval echo "$as_me:4964: \"$ac_link\"") >&5 4477 4485 (eval $ac_link) 2>&5 4478 4486 ac_status=$? 4479 4487 - echo "$as_me:4723: \$? = $ac_status" >&5 4480 + echo "$as_me:496 6: \$? = $ac_status" >&54488 + echo "$as_me:4967: \$? = $ac_status" >&5 4481 4489 (exit $ac_status); } && 4482 4490 { ac_try='test -s conftest$ac_exeext' 4483 4491 - { (eval echo "$as_me:4726: \"$ac_try\"") >&5 4484 + { (eval echo "$as_me:49 69: \"$ac_try\"") >&54492 + { (eval echo "$as_me:4970: \"$ac_try\"") >&5 4485 4493 (eval $ac_try) 2>&5 4486 4494 ac_status=$? 4487 4495 - echo "$as_me:4729: \$? = $ac_status" >&5 4488 + echo "$as_me:497 2: \$? = $ac_status" >&54496 + echo "$as_me:4973: \$? = $ac_status" >&5 4489 4497 (exit $ac_status); }; }; then 4490 4498 ac_cv_lib_gpm_Gpm_Wgetch=yes 4491 4499 else 4492 @@ -4737,11 +498 0,11 @@4500 @@ -4737,11 +4981,11 @@ 4493 4501 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4494 4502 LIBS=$ac_check_lib_save_LIBS 4495 4503 fi 4496 4504 -echo "$as_me:4740: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 4497 +echo "$as_me:498 3: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&54505 +echo "$as_me:4984: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 4498 4506 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6 4499 4507 if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then 4500 4508 4501 4509 -echo "$as_me:4744: checking if GPM is weakly bound to curses library" >&5 4502 +echo "$as_me:498 7: checking if GPM is weakly bound to curses library" >&54510 +echo "$as_me:4988: checking if GPM is weakly bound to curses library" >&5 4503 4511 echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6 4504 4512 if test "${cf_cv_check_gpm_wgetch+set}" = set; then 4505 4513 echo $ECHO_N "(cached) $ECHO_C" >&6 4506 @@ -4765,15 +500 8,15 @@4514 @@ -4765,15 +5009,15 @@ 4507 4515 # to rely on the static library, noting that some packagers may not 4508 4516 # include it. 4509 4517 LIBS="-static -lgpm -dynamic $LIBS" 4510 4518 - if { (eval echo "$as_me:4768: \"$ac_compile\"") >&5 4511 + if { (eval echo "$as_me:501 1: \"$ac_compile\"") >&54519 + if { (eval echo "$as_me:5012: \"$ac_compile\"") >&5 4512 4520 (eval $ac_compile) 2>&5 4513 4521 ac_status=$? 4514 4522 - echo "$as_me:4771: \$? = $ac_status" >&5 4515 + echo "$as_me:501 4: \$? = $ac_status" >&54523 + echo "$as_me:5015: \$? = $ac_status" >&5 4516 4524 (exit $ac_status); } ; then 4517 4525 - if { (eval echo "$as_me:4773: \"$ac_link\"") >&5 4518 + if { (eval echo "$as_me:501 6: \"$ac_link\"") >&54526 + if { (eval echo "$as_me:5017: \"$ac_link\"") >&5 4519 4527 (eval $ac_link) 2>&5 4520 4528 ac_status=$? 4521 4529 - echo "$as_me:4776: \$? = $ac_status" >&5 4522 + echo "$as_me:50 19: \$? = $ac_status" >&54530 + echo "$as_me:5020: \$? = $ac_status" >&5 4523 4531 (exit $ac_status); } ; then 4524 4532 cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'` 4525 4533 test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes 4526 @@ -4785,11 +502 8,11 @@4534 @@ -4785,11 +5029,11 @@ 4527 4535 fi 4528 4536 4529 4537 fi 4530 4538 -echo "$as_me:4788: result: $cf_cv_check_gpm_wgetch" >&5 4531 +echo "$as_me:503 1: result: $cf_cv_check_gpm_wgetch" >&54539 +echo "$as_me:5032: result: $cf_cv_check_gpm_wgetch" >&5 4532 4540 echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6 4533 4541 4534 4542 if test "$cf_cv_check_gpm_wgetch" != yes ; then 4535 4543 - { echo "$as_me:4792: WARNING: GPM library is already linked with curses - read the FAQ" >&5 4536 + { echo "$as_me:503 5: WARNING: GPM library is already linked with curses - read the FAQ" >&54544 + { echo "$as_me:5036: WARNING: GPM library is already linked with curses - read the FAQ" >&5 4537 4545 echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;} 4538 4546 fi 4539 4547 4540 @@ -4799,7 +504 2,7 @@4548 @@ -4799,7 +5043,7 @@ 4541 4549 4542 4550 # not everyone has "test -c" 4543 4551 if test -c /dev/sysmouse 2>/dev/null ; then 4544 4552 -echo "$as_me:4802: checking if you want to use sysmouse" >&5 4545 +echo "$as_me:504 5: checking if you want to use sysmouse" >&54553 +echo "$as_me:5046: checking if you want to use sysmouse" >&5 4546 4554 echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6 4547 4555 4548 4556 # Check whether --with-sysmouse or --without-sysmouse was given. 4549 @@ -4811,7 +505 4,7 @@4557 @@ -4811,7 +5055,7 @@ 4550 4558 fi; 4551 4559 if test "$cf_with_sysmouse" != no ; then 4552 4560 cat >conftest.$ac_ext <<_ACEOF 4553 4561 -#line 4814 "configure" 4554 +#line 505 7"configure"4562 +#line 5058 "configure" 4555 4563 #include "confdefs.h" 4556 4564 4557 4565 #include <osreldate.h> 4558 @@ -4834,16 +507 7,16 @@4566 @@ -4834,16 +5078,16 @@ 4559 4567 } 4560 4568 _ACEOF 4561 4569 rm -f conftest.$ac_objext 4562 4570 -if { (eval echo "$as_me:4837: \"$ac_compile\"") >&5 4563 +if { (eval echo "$as_me:508 0: \"$ac_compile\"") >&54571 +if { (eval echo "$as_me:5081: \"$ac_compile\"") >&5 4564 4572 (eval $ac_compile) 2>&5 4565 4573 ac_status=$? 4566 4574 - echo "$as_me:4840: \$? = $ac_status" >&5 4567 + echo "$as_me:508 3: \$? = $ac_status" >&54575 + echo "$as_me:5084: \$? = $ac_status" >&5 4568 4576 (exit $ac_status); } && 4569 4577 { ac_try='test -s conftest.$ac_objext' 4570 4578 - { (eval echo "$as_me:4843: \"$ac_try\"") >&5 4571 + { (eval echo "$as_me:508 6: \"$ac_try\"") >&54579 + { (eval echo "$as_me:5087: \"$ac_try\"") >&5 4572 4580 (eval $ac_try) 2>&5 4573 4581 ac_status=$? 4574 4582 - echo "$as_me:4846: \$? = $ac_status" >&5 4575 + echo "$as_me:50 89: \$? = $ac_status" >&54583 + echo "$as_me:5090: \$? = $ac_status" >&5 4576 4584 (exit $ac_status); }; }; then 4577 4585 cf_with_sysmouse=yes 4578 4586 else 4579 @@ -4853,7 +509 6,7 @@4587 @@ -4853,7 +5097,7 @@ 4580 4588 fi 4581 4589 rm -f conftest.$ac_objext conftest.$ac_ext 4582 4590 fi 4583 4591 -echo "$as_me:4856: result: $cf_with_sysmouse" >&5 4584 +echo "$as_me:5 099: result: $cf_with_sysmouse" >&54592 +echo "$as_me:5100: result: $cf_with_sysmouse" >&5 4585 4593 echo "${ECHO_T}$cf_with_sysmouse" >&6 4586 4594 test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF 4587 4595 #define USE_SYSMOUSE 1 4588 @@ -4871,7 +511 4,7 @@4596 @@ -4871,7 +5115,7 @@ 4589 4597 test -n "$GXX" && test "${ac_cv_prog_cxx_g}" != yes && CXX_G_OPT='' 4590 4598 fi 4591 4599 4592 4600 -echo "$as_me:4874: checking for default loader flags" >&5 4593 +echo "$as_me:511 7: checking for default loader flags" >&54601 +echo "$as_me:5118: checking for default loader flags" >&5 4594 4602 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 4595 4603 case $DFT_LWR_MODEL in 4596 4604 libtool) LD_MODEL='' ;; 4597 @@ -4880,13 +512 3,13 @@4605 @@ -4880,13 +5124,13 @@ 4598 4606 profile) LD_MODEL='-pg';; 4599 4607 shared) LD_MODEL='' ;; 4600 4608 esac 4601 4609 -echo "$as_me:4883: result: $LD_MODEL" >&5 4602 +echo "$as_me:512 6: result: $LD_MODEL" >&54610 +echo "$as_me:5127: result: $LD_MODEL" >&5 4603 4611 echo "${ECHO_T}$LD_MODEL" >&6 4604 4612 … … 4607 4615 4608 4616 -echo "$as_me:4889: checking if rpath option should be used" >&5 4609 +echo "$as_me:513 2: checking if rpath option should be used" >&54617 +echo "$as_me:5133: checking if rpath option should be used" >&5 4610 4618 echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6 4611 4619 4612 4620 # Check whether --enable-rpath or --disable-rpath was given. 4613 @@ -4896,10 +51 39,10 @@4621 @@ -4896,10 +5140,10 @@ 4614 4622 else 4615 4623 cf_cv_ld_rpath=no 4616 4624 fi; 4617 4625 -echo "$as_me:4899: result: $cf_cv_ld_rpath" >&5 4618 +echo "$as_me:514 2: result: $cf_cv_ld_rpath" >&54626 +echo "$as_me:5143: result: $cf_cv_ld_rpath" >&5 4619 4627 echo "${ECHO_T}$cf_cv_ld_rpath" >&6 4620 4628 4621 4629 -echo "$as_me:4902: checking if shared libraries should be relinked during install" >&5 4622 +echo "$as_me:514 5: checking if shared libraries should be relinked during install" >&54630 +echo "$as_me:5146: checking if shared libraries should be relinked during install" >&5 4623 4631 echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6 4624 4632 4625 4633 # Check whether --enable-relink or --disable-relink was given. 4626 @@ -4909,19 +515 2,20 @@4634 @@ -4909,19 +5153,20 @@ 4627 4635 else 4628 4636 cf_cv_do_relink=yes 4629 4637 fi; 4630 4638 -echo "$as_me:4912: result: $cf_cv_do_relink" >&5 4631 +echo "$as_me:515 5: result: $cf_cv_do_relink" >&54639 +echo "$as_me:5156: result: $cf_cv_do_relink" >&5 4632 4640 echo "${ECHO_T}$cf_cv_do_relink" >&6 4633 4641 ;; … … 4643 4651 4644 4652 - echo "$as_me:4924: checking if release/abi version should be used for shared libs" >&5 4645 + echo "$as_me:516 8: checking if release/abi version should be used for shared libs" >&54653 + echo "$as_me:5169: checking if release/abi version should be used for shared libs" >&5 4646 4654 echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 4647 4655 4648 4656 # Check whether --with-shlib-version or --without-shlib-version was given. 4649 @@ -4936,7 +518 0,7 @@4657 @@ -4936,7 +5181,7 @@ 4650 4658 cf_cv_shlib_version=$withval 4651 4659 ;; 4652 4660 *) 4653 4661 - { { echo "$as_me:4939: error: option value must be one of: rel, abi, auto or no" >&5 4654 + { { echo "$as_me:518 3: error: option value must be one of: rel, abi, auto or no" >&54662 + { { echo "$as_me:5184: error: option value must be one of: rel, abi, auto or no" >&5 4655 4663 echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;} 4656 4664 { (exit 1); exit 1; }; } 4657 4665 ;; 4658 @@ -4945,7 +51 89,7 @@4666 @@ -4945,7 +5190,7 @@ 4659 4667 else 4660 4668 cf_cv_shlib_version=auto 4661 4669 fi; 4662 4670 - echo "$as_me:4948: result: $cf_cv_shlib_version" >&5 4663 + echo "$as_me:519 2: result: $cf_cv_shlib_version" >&54671 + echo "$as_me:5193: result: $cf_cv_shlib_version" >&5 4664 4672 echo "${ECHO_T}$cf_cv_shlib_version" >&6 4665 4673 4666 4674 cf_cv_rm_so_locs=no 4667 @@ -4954,14 +519 8,14 @@4675 @@ -4954,14 +5199,14 @@ 4668 4676 CC_SHARED_OPTS= 4669 4677 if test "$GCC" = yes 4670 4678 then 4671 4679 - echo "$as_me:4957: checking which $CC option to use" >&5 4672 + echo "$as_me:520 1: checking which $CC option to use" >&54680 + echo "$as_me:5202: checking which $CC option to use" >&5 4673 4681 echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 4674 4682 cf_save_CFLAGS="$CFLAGS" … … 4678 4686 cat >conftest.$ac_ext <<_ACEOF 4679 4687 -#line 4964 "configure" 4680 +#line 520 8"configure"4688 +#line 5209 "configure" 4681 4689 #include "confdefs.h" 4682 4690 #include <stdio.h> 4683 4691 int 4684 @@ -4973,16 +521 7,16 @@4692 @@ -4973,16 +5218,16 @@ 4685 4693 } 4686 4694 _ACEOF 4687 4695 rm -f conftest.$ac_objext 4688 4696 -if { (eval echo "$as_me:4976: \"$ac_compile\"") >&5 4689 +if { (eval echo "$as_me:522 0: \"$ac_compile\"") >&54697 +if { (eval echo "$as_me:5221: \"$ac_compile\"") >&5 4690 4698 (eval $ac_compile) 2>&5 4691 4699 ac_status=$? 4692 4700 - echo "$as_me:4979: \$? = $ac_status" >&5 4693 + echo "$as_me:522 3: \$? = $ac_status" >&54701 + echo "$as_me:5224: \$? = $ac_status" >&5 4694 4702 (exit $ac_status); } && 4695 4703 { ac_try='test -s conftest.$ac_objext' 4696 4704 - { (eval echo "$as_me:4982: \"$ac_try\"") >&5 4697 + { (eval echo "$as_me:522 6: \"$ac_try\"") >&54705 + { (eval echo "$as_me:5227: \"$ac_try\"") >&5 4698 4706 (eval $ac_try) 2>&5 4699 4707 ac_status=$? 4700 4708 - echo "$as_me:4985: \$? = $ac_status" >&5 4701 + echo "$as_me:52 29: \$? = $ac_status" >&54709 + echo "$as_me:5230: \$? = $ac_status" >&5 4702 4710 (exit $ac_status); }; }; then 4703 4711 break 4704 4712 else 4705 @@ -4991,7 +523 5,7 @@4713 @@ -4991,7 +5236,7 @@ 4706 4714 fi 4707 4715 rm -f conftest.$ac_objext conftest.$ac_ext 4708 4716 done 4709 4717 - echo "$as_me:4994: result: $CC_SHARED_OPTS" >&5 4710 + echo "$as_me:523 8: result: $CC_SHARED_OPTS" >&54718 + echo "$as_me:5239: result: $CC_SHARED_OPTS" >&5 4711 4719 echo "${ECHO_T}$CC_SHARED_OPTS" >&6 4712 4720 CFLAGS="$cf_save_CFLAGS" 4713 4721 fi 4714 @@ -4999,6 +524 3,12 @@4722 @@ -4999,6 +5244,12 @@ 4715 4723 cf_cv_shlib_version_infix=no 4716 4724 … … 4725 4733 MK_SHARED_LIB='${CC} ${CFLAGS} -o $@ -Xlinker -soname=`basename $@` -nostart -e 0' 4726 4734 ;; 4727 @@ -5027,7 +527 7,7 @@4735 @@ -5027,7 +5278,7 @@ 4728 4736 MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' 4729 4737 test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi 4730 4738 cf_cv_shlib_version_infix=yes 4731 4739 - echo "$as_me:5030: checking if ld -search_paths_first works" >&5 4732 + echo "$as_me:528 0: checking if ld -search_paths_first works" >&54740 + echo "$as_me:5281: checking if ld -search_paths_first works" >&5 4733 4741 echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 4734 4742 if test "${cf_cv_ldflags_search_paths_first+set}" = set; then 4735 4743 echo $ECHO_N "(cached) $ECHO_C" >&6 4736 @@ -5036,7 +528 6,7 @@4744 @@ -5036,7 +5287,7 @@ 4737 4745 cf_save_LDFLAGS=$LDFLAGS 4738 4746 LDFLAGS="$LDFLAGS -Wl,-search_paths_first" 4739 4747 cat >conftest.$ac_ext <<_ACEOF 4740 4748 -#line 5039 "configure" 4741 +#line 52 89"configure"4749 +#line 5290 "configure" 4742 4750 #include "confdefs.h" 4743 4751 4744 4752 int 4745 @@ -5048,16 +529 8,16 @@4753 @@ -5048,16 +5299,16 @@ 4746 4754 } 4747 4755 _ACEOF 4748 4756 rm -f conftest.$ac_objext conftest$ac_exeext 4749 4757 -if { (eval echo "$as_me:5051: \"$ac_link\"") >&5 4750 +if { (eval echo "$as_me:530 1: \"$ac_link\"") >&54758 +if { (eval echo "$as_me:5302: \"$ac_link\"") >&5 4751 4759 (eval $ac_link) 2>&5 4752 4760 ac_status=$? 4753 4761 - echo "$as_me:5054: \$? = $ac_status" >&5 4754 + echo "$as_me:530 4: \$? = $ac_status" >&54762 + echo "$as_me:5305: \$? = $ac_status" >&5 4755 4763 (exit $ac_status); } && 4756 4764 { ac_try='test -s conftest$ac_exeext' 4757 4765 - { (eval echo "$as_me:5057: \"$ac_try\"") >&5 4758 + { (eval echo "$as_me:530 7: \"$ac_try\"") >&54766 + { (eval echo "$as_me:5308: \"$ac_try\"") >&5 4759 4767 (eval $ac_try) 2>&5 4760 4768 ac_status=$? 4761 4769 - echo "$as_me:5060: \$? = $ac_status" >&5 4762 + echo "$as_me:531 0: \$? = $ac_status" >&54770 + echo "$as_me:5311: \$? = $ac_status" >&5 4763 4771 (exit $ac_status); }; }; then 4764 4772 cf_cv_ldflags_search_paths_first=yes 4765 4773 else 4766 @@ -5068,7 +531 8,7 @@4774 @@ -5068,7 +5319,7 @@ 4767 4775 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4768 4776 LDFLAGS=$cf_save_LDFLAGS 4769 4777 fi 4770 4778 -echo "$as_me:5071: result: $cf_cv_ldflags_search_paths_first" >&5 4771 +echo "$as_me:532 1: result: $cf_cv_ldflags_search_paths_first" >&54779 +echo "$as_me:5322: result: $cf_cv_ldflags_search_paths_first" >&5 4772 4780 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 4773 4781 if test $cf_cv_ldflags_search_paths_first = yes; then 4774 4782 LDFLAGS="$LDFLAGS -Wl,-search_paths_first" 4775 @@ -5090,10 +534 0,10 @@4783 @@ -5090,10 +5341,10 @@ 4776 4784 irix*) 4777 4785 if test "$cf_cv_ld_rpath" = yes ; then … … 4786 4794 fi 4787 4795 fi 4788 @@ -5112,7 +536 2,7 @@4796 @@ -5112,7 +5363,7 @@ 4789 4797 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" 4790 4798 fi … … 4795 4803 fi 4796 4804 4797 @@ -5131,7 +538 1,7 @@4805 @@ -5131,7 +5382,7 @@ 4798 4806 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" 4799 4807 fi … … 4804 4812 fi 4805 4813 CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" 4806 @@ -5143,7 +539 3,7 @@4814 @@ -5143,7 +5394,7 @@ 4807 4815 cf_cv_shared_soname='`basename $@`' 4808 4816 fi … … 4813 4821 nto-qnx*|openbsd*|freebsd[12].*) 4814 4822 CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" 4815 @@ -5155,7 +540 5,7 @@4823 @@ -5155,7 +5406,7 @@ 4816 4824 if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then 4817 4825 LOCAL_LDFLAGS="-rpath \$(LOCAL_LIBDIR)" … … 4822 4830 fi 4823 4831 4824 @@ -5166,11 +541 6,11 @@4832 @@ -5166,11 +5417,11 @@ 4825 4833 cf_cv_shared_soname='`basename $@`' 4826 4834 fi … … 4836 4844 LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)" 4837 4845 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" 4838 @@ -5192,7 +544 2,7 @@4846 @@ -5192,7 +5443,7 @@ 4839 4847 4840 4848 MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@' … … 4845 4853 ;; 4846 4854 osf*|mls+*) 4847 @@ -5211,7 +546 1,7 @@4855 @@ -5211,7 +5462,7 @@ 4848 4856 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" 4849 4857 fi … … 4854 4862 fi 4855 4863 cf_cv_rm_so_locs=yes 4856 @@ -5246,7 +549 6,7 @@4864 @@ -5246,7 +5497,7 @@ 4857 4865 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" 4858 4866 fi … … 4863 4871 fi 4864 4872 4865 @@ -5258,7 +550 8,43 @@4873 @@ -5258,7 +5509,43 @@ 4866 4874 fi 4867 4875 … … 4873 4881 + CFLAGS="$cf_shared_opts $cf_save_CFLAGS" 4874 4882 + cat >conftest.$ac_ext <<_ACEOF 4875 +#line 551 6"configure"4883 +#line 5517 "configure" 4876 4884 +#include "confdefs.h" 4877 4885 +#include <stdio.h> … … 4885 4893 +_ACEOF 4886 4894 +rm -f conftest.$ac_objext 4887 +if { (eval echo "$as_me:552 8: \"$ac_compile\"") >&54895 +if { (eval echo "$as_me:5529: \"$ac_compile\"") >&5 4888 4896 + (eval $ac_compile) 2>&5 4889 4897 + ac_status=$? 4890 + echo "$as_me:553 1: \$? = $ac_status" >&54898 + echo "$as_me:5532: \$? = $ac_status" >&5 4891 4899 + (exit $ac_status); } && 4892 4900 + { ac_try='test -s conftest.$ac_objext' 4893 + { (eval echo "$as_me:553 4: \"$ac_try\"") >&54901 + { (eval echo "$as_me:5535: \"$ac_try\"") >&5 4894 4902 + (eval $ac_try) 2>&5 4895 4903 + ac_status=$? 4896 + echo "$as_me:553 7: \$? = $ac_status" >&54904 + echo "$as_me:5538: \$? = $ac_status" >&5 4897 4905 + (exit $ac_status); }; }; then 4898 4906 + break … … 4908 4916 else 4909 4917 MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $@' 4910 @@ -5285,20 +557 1,20 @@4918 @@ -5285,20 +5572,20 @@ 4911 4919 test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes 4912 4920 ;; 4913 4921 *) 4914 4922 - { echo "$as_me:5288: WARNING: ignored --with-shlib-version" >&5 4915 + { echo "$as_me:557 4: WARNING: ignored --with-shlib-version" >&54923 + { echo "$as_me:5575: WARNING: ignored --with-shlib-version" >&5 4916 4924 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} 4917 4925 ;; … … 4923 4931 - echo "$as_me:5296: checking if we need a space after rpath option" >&5 4924 4932 + if test -n "$LD_RPATH_OPT" ; then 4925 + echo "$as_me:558 2: checking if we need a space after rpath option" >&54933 + echo "$as_me:5583: checking if we need a space after rpath option" >&5 4926 4934 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 4927 4935 cf_save_LIBS="$LIBS" … … 4930 4938 cat >conftest.$ac_ext <<_ACEOF 4931 4939 -#line 5301 "configure" 4932 +#line 558 7"configure"4940 +#line 5588 "configure" 4933 4941 #include "confdefs.h" 4934 4942 4935 4943 int 4936 @@ -5310,16 +559 6,16 @@4944 @@ -5310,16 +5597,16 @@ 4937 4945 } 4938 4946 _ACEOF 4939 4947 rm -f conftest.$ac_objext conftest$ac_exeext 4940 4948 -if { (eval echo "$as_me:5313: \"$ac_link\"") >&5 4941 +if { (eval echo "$as_me:5 599: \"$ac_link\"") >&54949 +if { (eval echo "$as_me:5600: \"$ac_link\"") >&5 4942 4950 (eval $ac_link) 2>&5 4943 4951 ac_status=$? 4944 4952 - echo "$as_me:5316: \$? = $ac_status" >&5 4945 + echo "$as_me:560 2: \$? = $ac_status" >&54953 + echo "$as_me:5603: \$? = $ac_status" >&5 4946 4954 (exit $ac_status); } && 4947 4955 { ac_try='test -s conftest$ac_exeext' 4948 4956 - { (eval echo "$as_me:5319: \"$ac_try\"") >&5 4949 + { (eval echo "$as_me:560 5: \"$ac_try\"") >&54957 + { (eval echo "$as_me:5606: \"$ac_try\"") >&5 4950 4958 (eval $ac_try) 2>&5 4951 4959 ac_status=$? 4952 4960 - echo "$as_me:5322: \$? = $ac_status" >&5 4953 + echo "$as_me:560 8: \$? = $ac_status" >&54961 + echo "$as_me:5609: \$? = $ac_status" >&5 4954 4962 (exit $ac_status); }; }; then 4955 4963 cf_rpath_space=no 4956 4964 else 4957 @@ -5329,16 +561 5,16 @@4965 @@ -5329,16 +5616,16 @@ 4958 4966 fi 4959 4967 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4960 4968 LIBS="$cf_save_LIBS" 4961 4969 - echo "$as_me:5332: result: $cf_rpath_space" >&5 4962 + echo "$as_me:561 8: result: $cf_rpath_space" >&54970 + echo "$as_me:5619: result: $cf_rpath_space" >&5 4963 4971 echo "${ECHO_T}$cf_rpath_space" >&6 4964 4972 - test "$cf_rpath_space" = yes && cf_ld_rpath_opt="$cf_ld_rpath_opt " … … 4972 4980 if test "$model" = "shared"; then 4973 4981 - { { echo "$as_me:5341: error: Shared libraries are not supported in this version" >&5 4974 + { { echo "$as_me:562 7: error: Shared libraries are not supported in this version" >&54982 + { { echo "$as_me:5628: error: Shared libraries are not supported in this version" >&5 4975 4983 echo "$as_me: error: Shared libraries are not supported in this version" >&2;} 4976 4984 { (exit 1); exit 1; }; } 4977 4985 fi 4978 @@ -5348,7 +563 4,7 @@4986 @@ -5348,7 +5635,7 @@ 4979 4987 ############################################################################### 4980 4988 4981 4989 ### use option --disable-overwrite to leave out the link to -lcurses 4982 4990 -echo "$as_me:5351: checking if you wish to install ncurses overwriting curses" >&5 4983 +echo "$as_me:563 7: checking if you wish to install ncurses overwriting curses" >&54991 +echo "$as_me:5638: checking if you wish to install ncurses overwriting curses" >&5 4984 4992 echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6 4985 4993 4986 4994 # Check whether --enable-overwrite or --disable-overwrite was given. 4987 @@ -5358,10 +564 4,10 @@4995 @@ -5358,10 +5645,10 @@ 4988 4996 else 4989 4997 if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi 4990 4998 fi; 4991 4999 -echo "$as_me:5361: result: $with_overwrite" >&5 4992 +echo "$as_me:564 7: result: $with_overwrite" >&55000 +echo "$as_me:5648: result: $with_overwrite" >&5 4993 5001 echo "${ECHO_T}$with_overwrite" >&6 4994 5002 4995 5003 -echo "$as_me:5364: checking if external terminfo-database is used" >&5 4996 +echo "$as_me:565 0: checking if external terminfo-database is used" >&55004 +echo "$as_me:5651: checking if external terminfo-database is used" >&5 4997 5005 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 4998 5006 4999 5007 # Check whether --enable-database or --disable-database was given. 5000 @@ -5371,7 +565 7,7 @@5008 @@ -5371,7 +5658,7 @@ 5001 5009 else 5002 5010 use_database=yes 5003 5011 fi; 5004 5012 -echo "$as_me:5374: result: $use_database" >&5 5005 +echo "$as_me:566 0: result: $use_database" >&55013 +echo "$as_me:5661: result: $use_database" >&5 5006 5014 echo "${ECHO_T}$use_database" >&6 5007 5015 5008 5016 case $host_os in #(vi 5009 @@ -5384,8 +567 0,8 @@5017 @@ -5384,8 +5671,8 @@ 5010 5018 esac 5011 5019 … … 5018 5026 5019 5027 if test "$use_database" != no ; then 5020 @@ -5393,7 +56 79,7 @@5028 @@ -5393,7 +5680,7 @@ 5021 5029 #define USE_DATABASE 1 5022 5030 EOF 5023 5031 5024 5032 - echo "$as_me:5396: checking which terminfo source-file will be installed" >&5 5025 + echo "$as_me:568 2: checking which terminfo source-file will be installed" >&55033 + echo "$as_me:5683: checking which terminfo source-file will be installed" >&5 5026 5034 echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6 5027 5035 5028 5036 # Check whether --enable-database or --disable-database was given. 5029 @@ -5401,10 +568 7,10 @@5037 @@ -5401,10 +5688,10 @@ 5030 5038 enableval="$enable_database" 5031 5039 TERMINFO_SRC=$withval 5032 5040 fi; 5033 5041 - echo "$as_me:5404: result: $TERMINFO_SRC" >&5 5034 + echo "$as_me:569 0: result: $TERMINFO_SRC" >&55042 + echo "$as_me:5691: result: $TERMINFO_SRC" >&5 5035 5043 echo "${ECHO_T}$TERMINFO_SRC" >&6 5036 5044 5037 5045 - echo "$as_me:5407: checking whether to use hashed database instead of directory/tree" >&5 5038 + echo "$as_me:569 3: checking whether to use hashed database instead of directory/tree" >&55046 + echo "$as_me:5694: checking whether to use hashed database instead of directory/tree" >&5 5039 5047 echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6 5040 5048 5041 5049 # Check whether --with-hashed-db or --without-hashed-db was given. 5042 @@ -5414,13 +570 0,13 @@5050 @@ -5414,13 +5701,13 @@ 5043 5051 else 5044 5052 with_hashed_db=no 5045 5053 fi; 5046 5054 - echo "$as_me:5417: result: $with_hashed_db" >&5 5047 + echo "$as_me:570 3: result: $with_hashed_db" >&55055 + echo "$as_me:5704: result: $with_hashed_db" >&5 5048 5056 echo "${ECHO_T}$with_hashed_db" >&6 5049 5057 else … … 5052 5060 5053 5061 -echo "$as_me:5423: checking for list of fallback descriptions" >&5 5054 +echo "$as_me:57 09: checking for list of fallback descriptions" >&55062 +echo "$as_me:5710: checking for list of fallback descriptions" >&5 5055 5063 echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6 5056 5064 5057 5065 # Check whether --with-fallbacks or --without-fallbacks was given. 5058 @@ -5430,11 +571 6,11 @@5066 @@ -5430,11 +5717,11 @@ 5059 5067 else 5060 5068 with_fallback= 5061 5069 fi; 5062 5070 -echo "$as_me:5433: result: $with_fallback" >&5 5063 +echo "$as_me:57 19: result: $with_fallback" >&55071 +echo "$as_me:5720: result: $with_fallback" >&5 5064 5072 echo "${ECHO_T}$with_fallback" >&6 5065 5073 FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'` 5066 5074 5067 5075 -echo "$as_me:5437: checking if you want modern xterm or antique" >&5 5068 +echo "$as_me:572 3: checking if you want modern xterm or antique" >&55076 +echo "$as_me:5724: checking if you want modern xterm or antique" >&5 5069 5077 echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6 5070 5078 5071 5079 # Check whether --with-xterm-new or --without-xterm-new was given. 5072 @@ -5448,7 +573 4,7 @@5080 @@ -5448,7 +5735,7 @@ 5073 5081 no) with_xterm_new=xterm-old;; 5074 5082 *) with_xterm_new=xterm-new;; 5075 5083 esac 5076 5084 -echo "$as_me:5451: result: $with_xterm_new" >&5 5077 +echo "$as_me:573 7: result: $with_xterm_new" >&55085 +echo "$as_me:5738: result: $with_xterm_new" >&5 5078 5086 echo "${ECHO_T}$with_xterm_new" >&6 5079 5087 WHICH_XTERM=$with_xterm_new 5080 5088 5081 @@ -5458,7 +574 4,7 @@5089 @@ -5458,7 +5745,7 @@ 5082 5090 MAKE_TERMINFO="#" 5083 5091 else 5084 5092 5085 5093 -echo "$as_me:5461: checking for list of terminfo directories" >&5 5086 +echo "$as_me:574 7: checking for list of terminfo directories" >&55094 +echo "$as_me:5748: checking for list of terminfo directories" >&5 5087 5095 echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6 5088 5096 5089 5097 # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given. 5090 @@ -5468,7 +575 4,7 @@5098 @@ -5468,7 +5755,7 @@ 5091 5099 else 5092 5100 withval=${TERMINFO_DIRS-${datadir}/terminfo} … … 5097 5105 for cf_src_path in $withval 5098 5106 do 5099 @@ -5498,7 +578 4,7 @@5107 @@ -5498,7 +5785,7 @@ 5100 5108 cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` 5101 5109 ;; 5102 5110 *) 5103 5111 - { { echo "$as_me:5501: error: expected a pathname, not \"$cf_src_path\"" >&5 5104 + { { echo "$as_me:578 7: error: expected a pathname, not \"$cf_src_path\"" >&55112 + { { echo "$as_me:5788: error: expected a pathname, not \"$cf_src_path\"" >&5 5105 5113 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} 5106 5114 { (exit 1); exit 1; }; } 5107 5115 ;; 5108 @@ -5511,13 +579 7,13 @@5116 @@ -5511,13 +5798,13 @@ 5109 5117 5110 5118 eval 'TERMINFO_DIRS="$cf_dst_path"' 5111 5119 5112 5120 -echo "$as_me:5514: result: $TERMINFO_DIRS" >&5 5113 +echo "$as_me:580 0: result: $TERMINFO_DIRS" >&55121 +echo "$as_me:5801: result: $TERMINFO_DIRS" >&5 5114 5122 echo "${ECHO_T}$TERMINFO_DIRS" >&6 5115 5123 test -n "$TERMINFO_DIRS" && cat >>confdefs.h <<EOF … … 5118 5126 5119 5127 -echo "$as_me:5520: checking for default terminfo directory" >&5 5120 +echo "$as_me:580 6: checking for default terminfo directory" >&55128 +echo "$as_me:5807: checking for default terminfo directory" >&5 5121 5129 echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6 5122 5130 5123 5131 # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given. 5124 @@ -5553,7 +58 39,7 @@5132 @@ -5553,7 +5840,7 @@ 5125 5133 withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` 5126 5134 ;; 5127 5135 *) 5128 5136 - { { echo "$as_me:5556: error: expected a pathname, not \"$withval\"" >&5 5129 + { { echo "$as_me:584 2: error: expected a pathname, not \"$withval\"" >&55137 + { { echo "$as_me:5843: error: expected a pathname, not \"$withval\"" >&5 5130 5138 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} 5131 5139 { (exit 1); exit 1; }; } 5132 5140 ;; 5133 @@ -5562,7 +584 8,7 @@5141 @@ -5562,7 +5849,7 @@ 5134 5142 fi 5135 5143 TERMINFO="$withval" 5136 5144 5137 5145 -echo "$as_me:5565: result: $TERMINFO" >&5 5138 +echo "$as_me:585 1: result: $TERMINFO" >&55146 +echo "$as_me:5852: result: $TERMINFO" >&5 5139 5147 echo "${ECHO_T}$TERMINFO" >&6 5140 5148 cat >>confdefs.h <<EOF 5141 5149 #define TERMINFO "$TERMINFO" 5142 @@ -5572,7 +585 8,7 @@5150 @@ -5572,7 +5859,7 @@ 5143 5151 5144 5152 ### use option --disable-big-core to make tic run on small machines 5145 5153 ### We need 4Mb, check if we can allocate 50% more than that. 5146 5154 -echo "$as_me:5575: checking if big-core option selected" >&5 5147 +echo "$as_me:586 1: checking if big-core option selected" >&55155 +echo "$as_me:5862: checking if big-core option selected" >&5 5148 5156 echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6 5149 5157 5150 5158 # Check whether --enable-big-core or --disable-big-core was given. 5151 @@ -5584,7 +587 0,7 @@5159 @@ -5584,7 +5871,7 @@ 5152 5160 with_big_core=no 5153 5161 else 5154 5162 cat >conftest.$ac_ext <<_ACEOF 5155 5163 -#line 5587 "configure" 5156 +#line 587 3"configure"5164 +#line 5874 "configure" 5157 5165 #include "confdefs.h" 5158 5166 5159 5167 #include <stdlib.h> 5160 @@ -5598,15 +588 4,15 @@5168 @@ -5598,15 +5885,15 @@ 5161 5169 } 5162 5170 _ACEOF 5163 5171 rm -f conftest$ac_exeext 5164 5172 -if { (eval echo "$as_me:5601: \"$ac_link\"") >&5 5165 +if { (eval echo "$as_me:588 7: \"$ac_link\"") >&55173 +if { (eval echo "$as_me:5888: \"$ac_link\"") >&5 5166 5174 (eval $ac_link) 2>&5 5167 5175 ac_status=$? 5168 5176 - echo "$as_me:5604: \$? = $ac_status" >&5 5169 + echo "$as_me:589 0: \$? = $ac_status" >&55177 + echo "$as_me:5891: \$? = $ac_status" >&5 5170 5178 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 5171 5179 - { (eval echo "$as_me:5606: \"$ac_try\"") >&5 5172 + { (eval echo "$as_me:589 2: \"$ac_try\"") >&55180 + { (eval echo "$as_me:5893: \"$ac_try\"") >&5 5173 5181 (eval $ac_try) 2>&5 5174 5182 ac_status=$? 5175 5183 - echo "$as_me:5609: \$? = $ac_status" >&5 5176 + echo "$as_me:589 5: \$? = $ac_status" >&55184 + echo "$as_me:5896: \$? = $ac_status" >&5 5177 5185 (exit $ac_status); }; }; then 5178 5186 with_big_core=yes 5179 5187 else 5180 @@ -5618,7 +590 4,7 @@5188 @@ -5618,7 +5905,7 @@ 5181 5189 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 5182 5190 fi 5183 5191 fi; 5184 5192 -echo "$as_me:5621: result: $with_big_core" >&5 5185 +echo "$as_me:590 7: result: $with_big_core" >&55193 +echo "$as_me:5908: result: $with_big_core" >&5 5186 5194 echo "${ECHO_T}$with_big_core" >&6 5187 5195 test "$with_big_core" = "yes" && cat >>confdefs.h <<\EOF 5188 5196 #define HAVE_BIG_CORE 1 5189 @@ -5627,7 +591 3,7 @@5197 @@ -5627,7 +5914,7 @@ 5190 5198 ### ISO C only guarantees 512-char strings, we have tables which load faster 5191 5199 ### when constructed using "big" strings. More than the C compiler, the awk 5192 5200 ### program is a limit on most vendor UNIX systems. Check that we can build. 5193 5201 -echo "$as_me:5630: checking if big-strings option selected" >&5 5194 +echo "$as_me:591 6: checking if big-strings option selected" >&55202 +echo "$as_me:5917: checking if big-strings option selected" >&5 5195 5203 echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6 5196 5204 5197 5205 # Check whether --enable-big-strings or --disable-big-strings was given. 5198 @@ -5636,29 +592 2,29 @@5206 @@ -5636,29 +5923,29 @@ 5199 5207 with_big_strings=$enableval 5200 5208 else … … 5229 5237 fi; 5230 5238 -echo "$as_me:5654: result: $with_big_strings" >&5 5231 +echo "$as_me:594 0: result: $with_big_strings" >&55239 +echo "$as_me:5941: result: $with_big_strings" >&5 5232 5240 echo "${ECHO_T}$with_big_strings" >&6 5233 5241 … … 5237 5245 ### use option --enable-termcap to compile in the termcap fallback support 5238 5246 -echo "$as_me:5661: checking if you want termcap-fallback support" >&5 5239 +echo "$as_me:594 7: checking if you want termcap-fallback support" >&55247 +echo "$as_me:5948: checking if you want termcap-fallback support" >&5 5240 5248 echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6 5241 5249 5242 5250 # Check whether --enable-termcap or --disable-termcap was given. 5243 @@ -5668,13 +595 4,13 @@5251 @@ -5668,13 +5955,13 @@ 5244 5252 else 5245 5253 with_termcap=no 5246 5254 fi; 5247 5255 -echo "$as_me:5671: result: $with_termcap" >&5 5248 +echo "$as_me:595 7: result: $with_termcap" >&55256 +echo "$as_me:5958: result: $with_termcap" >&5 5249 5257 echo "${ECHO_T}$with_termcap" >&6 5250 5258 … … 5253 5261 if test -z "$with_fallback" ; then 5254 5262 - { { echo "$as_me:5677: error: You have disabled the database w/o specifying fallbacks" >&5 5255 + { { echo "$as_me:596 3: error: You have disabled the database w/o specifying fallbacks" >&55263 + { { echo "$as_me:5964: error: You have disabled the database w/o specifying fallbacks" >&5 5256 5264 echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;} 5257 5265 { (exit 1); exit 1; }; } 5258 5266 fi 5259 @@ -5686,7 +597 2,7 @@5267 @@ -5686,7 +5973,7 @@ 5260 5268 else 5261 5269 5262 5270 if test "$with_ticlib" != no ; then 5263 5271 - { { echo "$as_me:5689: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 5264 + { { echo "$as_me:597 5: error: Options --with-ticlib and --enable-termcap cannot be combined" >&55272 + { { echo "$as_me:5976: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 5265 5273 echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;} 5266 5274 { (exit 1); exit 1; }; } 5267 5275 fi 5268 @@ -5695,7 +598 1,7 @@5276 @@ -5695,7 +5982,7 @@ 5269 5277 #define USE_TERMCAP 1 5270 5278 EOF 5271 5279 5272 5280 -echo "$as_me:5698: checking for list of termcap files" >&5 5273 +echo "$as_me:598 4: checking for list of termcap files" >&55281 +echo "$as_me:5985: checking for list of termcap files" >&5 5274 5282 echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6 5275 5283 5276 5284 # Check whether --with-termpath or --without-termpath was given. 5277 @@ -5705,7 +599 1,7 @@5285 @@ -5705,7 +5992,7 @@ 5278 5286 else 5279 5287 withval=${TERMPATH-/etc/termcap:/usr/share/misc/termcap} … … 5284 5292 for cf_src_path in $withval 5285 5293 do 5286 @@ -5735,7 +602 1,7 @@5294 @@ -5735,7 +6022,7 @@ 5287 5295 cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` 5288 5296 ;; 5289 5297 *) 5290 5298 - { { echo "$as_me:5738: error: expected a pathname, not \"$cf_src_path\"" >&5 5291 + { { echo "$as_me:602 4: error: expected a pathname, not \"$cf_src_path\"" >&55299 + { { echo "$as_me:6025: error: expected a pathname, not \"$cf_src_path\"" >&5 5292 5300 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} 5293 5301 { (exit 1); exit 1; }; } 5294 5302 ;; 5295 @@ -5748,14 +603 4,14 @@5303 @@ -5748,14 +6035,14 @@ 5296 5304 5297 5305 eval 'TERMPATH="$cf_dst_path"' 5298 5306 5299 5307 -echo "$as_me:5751: result: $TERMPATH" >&5 5300 +echo "$as_me:603 7: result: $TERMPATH" >&55308 +echo "$as_me:6038: result: $TERMPATH" >&5 5301 5309 echo "${ECHO_T}$TERMPATH" >&6 5302 5310 test -n "$TERMPATH" && cat >>confdefs.h <<EOF … … 5306 5314 ### use option --enable-getcap to use a hacked getcap for reading termcaps 5307 5315 -echo "$as_me:5758: checking if fast termcap-loader is needed" >&5 5308 +echo "$as_me:604 4: checking if fast termcap-loader is needed" >&55316 +echo "$as_me:6045: checking if fast termcap-loader is needed" >&5 5309 5317 echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6 5310 5318 5311 5319 # Check whether --enable-getcap or --disable-getcap was given. 5312 @@ -5765,13 +605 1,13 @@5320 @@ -5765,13 +6052,13 @@ 5313 5321 else 5314 5322 with_getcap=no 5315 5323 fi; 5316 5324 -echo "$as_me:5768: result: $with_getcap" >&5 5317 +echo "$as_me:605 4: result: $with_getcap" >&55325 +echo "$as_me:6055: result: $with_getcap" >&5 5318 5326 echo "${ECHO_T}$with_getcap" >&6 5319 5327 test "$with_getcap" = "yes" && cat >>confdefs.h <<\EOF … … 5322 5330 5323 5331 -echo "$as_me:5774: checking if translated termcaps will be cached in ~/.terminfo" >&5 5324 +echo "$as_me:606 0: checking if translated termcaps will be cached in ~/.terminfo" >&55332 +echo "$as_me:6061: checking if translated termcaps will be cached in ~/.terminfo" >&5 5325 5333 echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6 5326 5334 5327 5335 # Check whether --enable-getcap-cache or --disable-getcap-cache was given. 5328 @@ -5781,7 +606 7,7 @@5336 @@ -5781,7 +6068,7 @@ 5329 5337 else 5330 5338 with_getcap_cache=no 5331 5339 fi; 5332 5340 -echo "$as_me:5784: result: $with_getcap_cache" >&5 5333 +echo "$as_me:607 0: result: $with_getcap_cache" >&55341 +echo "$as_me:6071: result: $with_getcap_cache" >&5 5334 5342 echo "${ECHO_T}$with_getcap_cache" >&6 5335 5343 test "$with_getcap_cache" = "yes" && cat >>confdefs.h <<\EOF 5336 5344 #define USE_GETCAP_CACHE 1 5337 @@ -5790,7 +607 6,7 @@5345 @@ -5790,7 +6077,7 @@ 5338 5346 fi 5339 5347 5340 5348 ### Use option --disable-home-terminfo to completely remove ~/.terminfo 5341 5349 -echo "$as_me:5793: checking if ~/.terminfo is wanted" >&5 5342 +echo "$as_me:60 79: checking if ~/.terminfo is wanted" >&55350 +echo "$as_me:6080: checking if ~/.terminfo is wanted" >&5 5343 5351 echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6 5344 5352 5345 5353 # Check whether --enable-home-terminfo or --disable-home-terminfo was given. 5346 @@ -5800,13 +608 6,13 @@5354 @@ -5800,13 +6087,13 @@ 5347 5355 else 5348 5356 with_home_terminfo=yes 5349 5357 fi; 5350 5358 -echo "$as_me:5803: result: $with_home_terminfo" >&5 5351 +echo "$as_me:60 89: result: $with_home_terminfo" >&55359 +echo "$as_me:6090: result: $with_home_terminfo" >&5 5352 5360 echo "${ECHO_T}$with_home_terminfo" >&6 5353 5361 test "$with_home_terminfo" = "yes" && cat >>confdefs.h <<\EOF … … 5356 5364 5357 5365 -echo "$as_me:5809: checking if you want to use restricted environment when running as root" >&5 5358 +echo "$as_me:609 5: checking if you want to use restricted environment when running as root" >&55366 +echo "$as_me:6096: checking if you want to use restricted environment when running as root" >&5 5359 5367 echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6 5360 5368 5361 5369 # Check whether --enable-root-environ or --disable-root-environ was given. 5362 @@ -5816,7 +610 2,7 @@5370 @@ -5816,7 +6103,7 @@ 5363 5371 else 5364 5372 with_root_environ=yes 5365 5373 fi; 5366 5374 -echo "$as_me:5819: result: $with_root_environ" >&5 5367 +echo "$as_me:610 5: result: $with_root_environ" >&55375 +echo "$as_me:6106: result: $with_root_environ" >&5 5368 5376 echo "${ECHO_T}$with_root_environ" >&6 5369 5377 test "$with_root_environ" = yes && cat >>confdefs.h <<\EOF 5370 5378 #define USE_ROOT_ENVIRON 1 5371 @@ -5830,13 +611 6,13 @@5379 @@ -5830,13 +6117,13 @@ 5372 5380 unlink 5373 5381 do 5374 5382 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 5375 5383 -echo "$as_me:5833: checking for $ac_func" >&5 5376 +echo "$as_me:61 19: checking for $ac_func" >&55384 +echo "$as_me:6120: checking for $ac_func" >&5 5377 5385 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 5378 5386 if eval "test \"\${$as_ac_var+set}\" = set"; then … … 5381 5389 cat >conftest.$ac_ext <<_ACEOF 5382 5390 -#line 5839 "configure" 5383 +#line 612 5"configure"5391 +#line 6126 "configure" 5384 5392 #include "confdefs.h" 5385 5393 /* System header to define __stub macros and hopefully few prototypes, 5386 5394 which can conflict with char $ac_func (); below. */ 5387 @@ -5867,16 +615 3,16 @@5395 @@ -5867,16 +6154,16 @@ 5388 5396 } 5389 5397 _ACEOF 5390 5398 rm -f conftest.$ac_objext conftest$ac_exeext 5391 5399 -if { (eval echo "$as_me:5870: \"$ac_link\"") >&5 5392 +if { (eval echo "$as_me:615 6: \"$ac_link\"") >&55400 +if { (eval echo "$as_me:6157: \"$ac_link\"") >&5 5393 5401 (eval $ac_link) 2>&5 5394 5402 ac_status=$? 5395 5403 - echo "$as_me:5873: \$? = $ac_status" >&5 5396 + echo "$as_me:61 59: \$? = $ac_status" >&55404 + echo "$as_me:6160: \$? = $ac_status" >&5 5397 5405 (exit $ac_status); } && 5398 5406 { ac_try='test -s conftest$ac_exeext' 5399 5407 - { (eval echo "$as_me:5876: \"$ac_try\"") >&5 5400 + { (eval echo "$as_me:616 2: \"$ac_try\"") >&55408 + { (eval echo "$as_me:6163: \"$ac_try\"") >&5 5401 5409 (eval $ac_try) 2>&5 5402 5410 ac_status=$? 5403 5411 - echo "$as_me:5879: \$? = $ac_status" >&5 5404 + echo "$as_me:616 5: \$? = $ac_status" >&55412 + echo "$as_me:6166: \$? = $ac_status" >&5 5405 5413 (exit $ac_status); }; }; then 5406 5414 eval "$as_ac_var=yes" 5407 5415 else 5408 @@ -5886,7 +617 2,7 @@5416 @@ -5886,7 +6173,7 @@ 5409 5417 fi 5410 5418 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 5411 5419 fi 5412 5420 -echo "$as_me:5889: result: `eval echo '${'$as_ac_var'}'`" >&5 5413 +echo "$as_me:617 5: result: `eval echo '${'$as_ac_var'}'`" >&55421 +echo "$as_me:6176: result: `eval echo '${'$as_ac_var'}'`" >&5 5414 5422 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 5415 5423 if test `eval echo '${'$as_ac_var'}'` = yes; then 5416 5424 cat >>confdefs.h <<EOF 5417 @@ -5903,13 +61 89,13 @@5425 @@ -5903,13 +6190,13 @@ 5418 5426 symlink 5419 5427 do 5420 5428 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 5421 5429 -echo "$as_me:5906: checking for $ac_func" >&5 5422 +echo "$as_me:619 2: checking for $ac_func" >&55430 +echo "$as_me:6193: checking for $ac_func" >&5 5423 5431 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 5424 5432 if eval "test \"\${$as_ac_var+set}\" = set"; then … … 5427 5435 cat >conftest.$ac_ext <<_ACEOF 5428 5436 -#line 5912 "configure" 5429 +#line 619 8"configure"5437 +#line 6199 "configure" 5430 5438 #include "confdefs.h" 5431 5439 /* System header to define __stub macros and hopefully few prototypes, 5432 5440 which can conflict with char $ac_func (); below. */ 5433 @@ -5940,16 +622 6,16 @@5441 @@ -5940,16 +6227,16 @@ 5434 5442 } 5435 5443 _ACEOF 5436 5444 rm -f conftest.$ac_objext conftest$ac_exeext 5437 5445 -if { (eval echo "$as_me:5943: \"$ac_link\"") >&5 5438 +if { (eval echo "$as_me:62 29: \"$ac_link\"") >&55446 +if { (eval echo "$as_me:6230: \"$ac_link\"") >&5 5439 5447 (eval $ac_link) 2>&5 5440 5448 ac_status=$? 5441 5449 - echo "$as_me:5946: \$? = $ac_status" >&5 5442 + echo "$as_me:623 2: \$? = $ac_status" >&55450 + echo "$as_me:6233: \$? = $ac_status" >&5 5443 5451 (exit $ac_status); } && 5444 5452 { ac_try='test -s conftest$ac_exeext' 5445 5453 - { (eval echo "$as_me:5949: \"$ac_try\"") >&5 5446 + { (eval echo "$as_me:623 5: \"$ac_try\"") >&55454 + { (eval echo "$as_me:6236: \"$ac_try\"") >&5 5447 5455 (eval $ac_try) 2>&5 5448 5456 ac_status=$? 5449 5457 - echo "$as_me:5952: \$? = $ac_status" >&5 5450 + echo "$as_me:623 8: \$? = $ac_status" >&55458 + echo "$as_me:6239: \$? = $ac_status" >&5 5451 5459 (exit $ac_status); }; }; then 5452 5460 eval "$as_ac_var=yes" 5453 5461 else 5454 @@ -5959,7 +624 5,7 @@5462 @@ -5959,7 +6246,7 @@ 5455 5463 fi 5456 5464 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 5457 5465 fi 5458 5466 -echo "$as_me:5962: result: `eval echo '${'$as_ac_var'}'`" >&5 5459 +echo "$as_me:624 8: result: `eval echo '${'$as_ac_var'}'`" >&55467 +echo "$as_me:6249: result: `eval echo '${'$as_ac_var'}'`" >&5 5460 5468 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 5461 5469 if test `eval echo '${'$as_ac_var'}'` = yes; then 5462 5470 cat >>confdefs.h <<EOF 5463 @@ -5970,7 +625 6,7 @@5471 @@ -5970,7 +6257,7 @@ 5464 5472 done 5465 5473 5466 5474 else 5467 5475 - echo "$as_me:5973: checking if link/symlink functions work" >&5 5468 + echo "$as_me:62 59: checking if link/symlink functions work" >&55476 + echo "$as_me:6260: checking if link/symlink functions work" >&5 5469 5477 echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6 5470 5478 if test "${cf_cv_link_funcs+set}" = set; then 5471 5479 echo $ECHO_N "(cached) $ECHO_C" >&6 5472 @@ -5983,7 +62 69,7 @@5480 @@ -5983,7 +6270,7 @@ 5473 5481 eval 'ac_cv_func_'$cf_func'=error' 5474 5482 else 5475 5483 cat >conftest.$ac_ext <<_ACEOF 5476 5484 -#line 5986 "configure" 5477 +#line 627 2"configure"5485 +#line 6273 "configure" 5478 5486 #include "confdefs.h" 5479 5487 5480 5488 #include <sys/types.h> 5481 @@ -6013,15 +6 299,15 @@5489 @@ -6013,15 +6300,15 @@ 5482 5490 5483 5491 _ACEOF 5484 5492 rm -f conftest$ac_exeext 5485 5493 -if { (eval echo "$as_me:6016: \"$ac_link\"") >&5 5486 +if { (eval echo "$as_me:630 2: \"$ac_link\"") >&55494 +if { (eval echo "$as_me:6303: \"$ac_link\"") >&5 5487 5495 (eval $ac_link) 2>&5 5488 5496 ac_status=$? 5489 5497 - echo "$as_me:6019: \$? = $ac_status" >&5 5490 + echo "$as_me:630 5: \$? = $ac_status" >&55498 + echo "$as_me:6306: \$? = $ac_status" >&5 5491 5499 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 5492 5500 - { (eval echo "$as_me:6021: \"$ac_try\"") >&5 5493 + { (eval echo "$as_me:630 7: \"$ac_try\"") >&55501 + { (eval echo "$as_me:6308: \"$ac_try\"") >&5 5494 5502 (eval $ac_try) 2>&5 5495 5503 ac_status=$? 5496 5504 - echo "$as_me:6024: \$? = $ac_status" >&5 5497 + echo "$as_me:631 0: \$? = $ac_status" >&55505 + echo "$as_me:6311: \$? = $ac_status" >&5 5498 5506 (exit $ac_status); }; }; then 5499 5507 5500 5508 cf_cv_link_funcs="$cf_cv_link_funcs $cf_func" 5501 @@ -6039,7 +632 5,7 @@5509 @@ -6039,7 +6326,7 @@ 5502 5510 test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no 5503 5511 5504 5512 fi 5505 5513 -echo "$as_me:6042: result: $cf_cv_link_funcs" >&5 5506 +echo "$as_me:632 8: result: $cf_cv_link_funcs" >&55514 +echo "$as_me:6329: result: $cf_cv_link_funcs" >&5 5507 5515 echo "${ECHO_T}$cf_cv_link_funcs" >&6 5508 5516 test "$ac_cv_func_link" = yes && cat >>confdefs.h <<\EOF 5509 5517 #define HAVE_LINK 1 5510 @@ -6057,7 +634 3,7 @@5518 @@ -6057,7 +6344,7 @@ 5511 5519 # soft links (symbolic links) are useful for some systems where hard links do 5512 5520 # not work, or to make it simpler to copy terminfo trees around. 5513 5521 if test "$ac_cv_func_symlink" = yes ; then 5514 5522 - echo "$as_me:6060: checking if tic should use symbolic links" >&5 5515 + echo "$as_me:634 6: checking if tic should use symbolic links" >&55523 + echo "$as_me:6347: checking if tic should use symbolic links" >&5 5516 5524 echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6 5517 5525 5518 5526 # Check whether --enable-symlinks or --disable-symlinks was given. 5519 @@ -6067,21 +635 3,21 @@5527 @@ -6067,21 +6354,21 @@ 5520 5528 else 5521 5529 with_symlinks=no 5522 5530 fi; 5523 5531 - echo "$as_me:6070: result: $with_symlinks" >&5 5524 + echo "$as_me:635 6: result: $with_symlinks" >&55532 + echo "$as_me:6357: result: $with_symlinks" >&5 5525 5533 echo "${ECHO_T}$with_symlinks" >&6 5526 5534 fi … … 5530 5538 if test "$with_symlinks" = no ; then 5531 5539 - echo "$as_me:6077: checking if tic should use hard links" >&5 5532 + echo "$as_me:636 3: checking if tic should use hard links" >&55540 + echo "$as_me:6364: checking if tic should use hard links" >&5 5533 5541 echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6 5534 5542 if test "$ac_cv_func_link" = yes ; then … … 5538 5546 fi 5539 5547 - echo "$as_me:6084: result: $with_links" >&5 5540 + echo "$as_me:637 0: result: $with_links" >&55548 + echo "$as_me:6371: result: $with_links" >&5 5541 5549 echo "${ECHO_T}$with_links" >&6 5542 5550 fi 5543 5551 5544 @@ -6094,7 +638 0,7 @@5552 @@ -6094,7 +6381,7 @@ 5545 5553 EOF 5546 5554 5547 5555 ### use option --enable-broken-linker to force on use of broken-linker support 5548 5556 -echo "$as_me:6097: checking if you want broken-linker support code" >&5 5549 +echo "$as_me:638 3: checking if you want broken-linker support code" >&55557 +echo "$as_me:6384: checking if you want broken-linker support code" >&5 5550 5558 echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 5551 5559 5552 5560 # Check whether --enable-broken_linker or --disable-broken_linker was given. 5553 @@ -6104,7 +639 0,7 @@5561 @@ -6104,7 +6391,7 @@ 5554 5562 else 5555 5563 with_broken_linker=${BROKEN_LINKER-no} 5556 5564 fi; 5557 5565 -echo "$as_me:6107: result: $with_broken_linker" >&5 5558 +echo "$as_me:639 3: result: $with_broken_linker" >&55566 +echo "$as_me:6394: result: $with_broken_linker" >&5 5559 5567 echo "${ECHO_T}$with_broken_linker" >&6 5560 5568 5561 5569 BROKEN_LINKER=0 5562 @@ -6124,14 +641 0,14 @@5570 @@ -6124,14 +6411,14 @@ 5563 5571 BROKEN_LINKER=1 5564 5572 test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6 5565 5573 5566 5574 -echo "${as_me-configure}:6127: testing cygwin linker is broken anyway ..." 1>&5 5567 +echo "${as_me-configure}:641 3: testing cygwin linker is broken anyway ..." 1>&55575 +echo "${as_me-configure}:6414: testing cygwin linker is broken anyway ..." 1>&5 5568 5576 5569 5577 ;; … … 5573 5581 ### use option --enable-bsdpad to have tputs process BSD-style prefix padding 5574 5582 -echo "$as_me:6134: checking if tputs should process BSD-style prefix padding" >&5 5575 +echo "$as_me:642 0: checking if tputs should process BSD-style prefix padding" >&55583 +echo "$as_me:6421: checking if tputs should process BSD-style prefix padding" >&5 5576 5584 echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6 5577 5585 5578 5586 # Check whether --enable-bsdpad or --disable-bsdpad was given. 5579 @@ -6141,7 +642 7,7 @@5587 @@ -6141,7 +6428,7 @@ 5580 5588 else 5581 5589 with_bsdpad=no 5582 5590 fi; 5583 5591 -echo "$as_me:6144: result: $with_bsdpad" >&5 5584 +echo "$as_me:643 0: result: $with_bsdpad" >&55592 +echo "$as_me:6431: result: $with_bsdpad" >&5 5585 5593 echo "${ECHO_T}$with_bsdpad" >&6 5586 5594 test "$with_bsdpad" = yes && cat >>confdefs.h <<\EOF 5587 5595 #define BSD_TPUTS 1 5588 @@ -6158,7 +644 4,7 @@5596 @@ -6158,7 +6445,7 @@ 5589 5597 5590 5598 # Check to define _XOPEN_SOURCE "automatically" 5591 5599 5592 5600 -echo "$as_me:6161: checking if $CC -U and -D options work together" >&5 5593 +echo "$as_me:644 7: checking if $CC -U and -D options work together" >&55601 +echo "$as_me:6448: checking if $CC -U and -D options work together" >&5 5594 5602 echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6 5595 5603 if test "${cf_cv_cc_u_d_options+set}" = set; then 5596 5604 echo $ECHO_N "(cached) $ECHO_C" >&6 5597 @@ -6167,7 +645 3,7 @@5605 @@ -6167,7 +6454,7 @@ 5598 5606 cf_save_CPPFLAGS="$CPPFLAGS" 5599 5607 CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS" 5600 5608 cat >conftest.$ac_ext <<_ACEOF 5601 5609 -#line 6170 "configure" 5602 +#line 645 6"configure"5610 +#line 6457 "configure" 5603 5611 #include "confdefs.h" 5604 5612 5605 5613 int 5606 @@ -6186,16 +647 2,16 @@5614 @@ -6186,16 +6473,16 @@ 5607 5615 } 5608 5616 _ACEOF 5609 5617 rm -f conftest.$ac_objext 5610 5618 -if { (eval echo "$as_me:6189: \"$ac_compile\"") >&5 5611 +if { (eval echo "$as_me:647 5: \"$ac_compile\"") >&55619 +if { (eval echo "$as_me:6476: \"$ac_compile\"") >&5 5612 5620 (eval $ac_compile) 2>&5 5613 5621 ac_status=$? 5614 5622 - echo "$as_me:6192: \$? = $ac_status" >&5 5615 + echo "$as_me:647 8: \$? = $ac_status" >&55623 + echo "$as_me:6479: \$? = $ac_status" >&5 5616 5624 (exit $ac_status); } && 5617 5625 { ac_try='test -s conftest.$ac_objext' 5618 5626 - { (eval echo "$as_me:6195: \"$ac_try\"") >&5 5619 + { (eval echo "$as_me:648 1: \"$ac_try\"") >&55627 + { (eval echo "$as_me:6482: \"$ac_try\"") >&5 5620 5628 (eval $ac_try) 2>&5 5621 5629 ac_status=$? 5622 5630 - echo "$as_me:6198: \$? = $ac_status" >&5 5623 + echo "$as_me:648 4: \$? = $ac_status" >&55631 + echo "$as_me:6485: \$? = $ac_status" >&5 5624 5632 (exit $ac_status); }; }; then 5625 5633 5626 5634 cf_cv_cc_u_d_options=yes 5627 @@ -6209,14 +649 5,14 @@5635 @@ -6209,14 +6496,14 @@ 5628 5636 CPPFLAGS="$cf_save_CPPFLAGS" 5629 5637 5630 5638 fi 5631 5639 -echo "$as_me:6212: result: $cf_cv_cc_u_d_options" >&5 5632 +echo "$as_me:649 8: result: $cf_cv_cc_u_d_options" >&55640 +echo "$as_me:6499: result: $cf_cv_cc_u_d_options" >&5 5633 5641 echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6 5634 5642 … … 5642 5650 ;; 5643 5651 freebsd*|dragonfly*) #(vi 5644 @@ -6233,16 +65 19,16 @@5652 @@ -6233,16 +6520,16 @@ 5645 5653 irix[56].*) #(vi 5646 5654 CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE" … … 5650 5658 5651 5659 -echo "$as_me:6238: checking if we must define _GNU_SOURCE" >&5 5652 +echo "$as_me:652 4: checking if we must define _GNU_SOURCE" >&55660 +echo "$as_me:6525: checking if we must define _GNU_SOURCE" >&5 5653 5661 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 5654 5662 if test "${cf_cv_gnu_source+set}" = set; then … … 5658 5666 cat >conftest.$ac_ext <<_ACEOF 5659 5667 -#line 6245 "configure" 5660 +#line 653 1"configure"5668 +#line 6532 "configure" 5661 5669 #include "confdefs.h" 5662 5670 #include <sys/types.h> 5663 5671 int 5664 @@ -6257,16 +654 3,16 @@5672 @@ -6257,16 +6544,16 @@ 5665 5673 } 5666 5674 _ACEOF 5667 5675 rm -f conftest.$ac_objext 5668 5676 -if { (eval echo "$as_me:6260: \"$ac_compile\"") >&5 5669 +if { (eval echo "$as_me:654 6: \"$ac_compile\"") >&55677 +if { (eval echo "$as_me:6547: \"$ac_compile\"") >&5 5670 5678 (eval $ac_compile) 2>&5 5671 5679 ac_status=$? 5672 5680 - echo "$as_me:6263: \$? = $ac_status" >&5 5673 + echo "$as_me:65 49: \$? = $ac_status" >&55681 + echo "$as_me:6550: \$? = $ac_status" >&5 5674 5682 (exit $ac_status); } && 5675 5683 { ac_try='test -s conftest.$ac_objext' 5676 5684 - { (eval echo "$as_me:6266: \"$ac_try\"") >&5 5677 + { (eval echo "$as_me:655 2: \"$ac_try\"") >&55685 + { (eval echo "$as_me:6553: \"$ac_try\"") >&5 5678 5686 (eval $ac_try) 2>&5 5679 5687 ac_status=$? 5680 5688 - echo "$as_me:6269: \$? = $ac_status" >&5 5681 + echo "$as_me:655 5: \$? = $ac_status" >&55689 + echo "$as_me:6556: \$? = $ac_status" >&5 5682 5690 (exit $ac_status); }; }; then 5683 5691 cf_cv_gnu_source=no 5684 5692 else 5685 @@ -6275,7 +656 1,7 @@5693 @@ -6275,7 +6562,7 @@ 5686 5694 cf_save="$CPPFLAGS" 5687 5695 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" 5688 5696 cat >conftest.$ac_ext <<_ACEOF 5689 5697 -#line 6278 "configure" 5690 +#line 656 4"configure"5698 +#line 6565 "configure" 5691 5699 #include "confdefs.h" 5692 5700 #include <sys/types.h> 5693 5701 int 5694 @@ -6290,16 +657 6,16 @@5702 @@ -6290,16 +6577,16 @@ 5695 5703 } 5696 5704 _ACEOF 5697 5705 rm -f conftest.$ac_objext 5698 5706 -if { (eval echo "$as_me:6293: \"$ac_compile\"") >&5 5699 +if { (eval echo "$as_me:65 79: \"$ac_compile\"") >&55707 +if { (eval echo "$as_me:6580: \"$ac_compile\"") >&5 5700 5708 (eval $ac_compile) 2>&5 5701 5709 ac_status=$? 5702 5710 - echo "$as_me:6296: \$? = $ac_status" >&5 5703 + echo "$as_me:658 2: \$? = $ac_status" >&55711 + echo "$as_me:6583: \$? = $ac_status" >&5 5704 5712 (exit $ac_status); } && 5705 5713 { ac_try='test -s conftest.$ac_objext' 5706 5714 - { (eval echo "$as_me:6299: \"$ac_try\"") >&5 5707 + { (eval echo "$as_me:658 5: \"$ac_try\"") >&55715 + { (eval echo "$as_me:6586: \"$ac_try\"") >&5 5708 5716 (eval $ac_try) 2>&5 5709 5717 ac_status=$? 5710 5718 - echo "$as_me:6302: \$? = $ac_status" >&5 5711 + echo "$as_me:658 8: \$? = $ac_status" >&55719 + echo "$as_me:6589: \$? = $ac_status" >&5 5712 5720 (exit $ac_status); }; }; then 5713 5721 cf_cv_gnu_source=no 5714 5722 else 5715 @@ -6314,7 +660 0,7 @@5723 @@ -6314,7 +6601,7 @@ 5716 5724 rm -f conftest.$ac_objext conftest.$ac_ext 5717 5725 5718 5726 fi 5719 5727 -echo "$as_me:6317: result: $cf_cv_gnu_source" >&5 5720 +echo "$as_me:660 3: result: $cf_cv_gnu_source" >&55728 +echo "$as_me:6604: result: $cf_cv_gnu_source" >&5 5721 5729 echo "${ECHO_T}$cf_cv_gnu_source" >&6 5722 5730 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" 5723 5731 5724 @@ -6341,14 +662 7,14 @@5732 @@ -6341,14 +6628,14 @@ 5725 5733 CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__" 5726 5734 ;; 5727 5735 *) 5728 5736 - echo "$as_me:6344: checking if we should define _XOPEN_SOURCE" >&5 5729 + echo "$as_me:663 0: checking if we should define _XOPEN_SOURCE" >&55737 + echo "$as_me:6631: checking if we should define _XOPEN_SOURCE" >&5 5730 5738 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 5731 5739 if test "${cf_cv_xopen_source+set}" = set; then … … 5735 5743 cat >conftest.$ac_ext <<_ACEOF 5736 5744 -#line 6351 "configure" 5737 +#line 663 7"configure"5745 +#line 6638 "configure" 5738 5746 #include "confdefs.h" 5739 5747 #include <sys/types.h> 5740 5748 int 5741 @@ -6363,16 +66 49,16 @@5749 @@ -6363,16 +6650,16 @@ 5742 5750 } 5743 5751 _ACEOF 5744 5752 rm -f conftest.$ac_objext 5745 5753 -if { (eval echo "$as_me:6366: \"$ac_compile\"") >&5 5746 +if { (eval echo "$as_me:665 2: \"$ac_compile\"") >&55754 +if { (eval echo "$as_me:6653: \"$ac_compile\"") >&5 5747 5755 (eval $ac_compile) 2>&5 5748 5756 ac_status=$? 5749 5757 - echo "$as_me:6369: \$? = $ac_status" >&5 5750 + echo "$as_me:665 5: \$? = $ac_status" >&55758 + echo "$as_me:6656: \$? = $ac_status" >&5 5751 5759 (exit $ac_status); } && 5752 5760 { ac_try='test -s conftest.$ac_objext' 5753 5761 - { (eval echo "$as_me:6372: \"$ac_try\"") >&5 5754 + { (eval echo "$as_me:665 8: \"$ac_try\"") >&55762 + { (eval echo "$as_me:6659: \"$ac_try\"") >&5 5755 5763 (eval $ac_try) 2>&5 5756 5764 ac_status=$? 5757 5765 - echo "$as_me:6375: \$? = $ac_status" >&5 5758 + echo "$as_me:666 1: \$? = $ac_status" >&55766 + echo "$as_me:6662: \$? = $ac_status" >&5 5759 5767 (exit $ac_status); }; }; then 5760 5768 cf_cv_xopen_source=no 5761 5769 else 5762 @@ -6381,7 +666 7,7 @@5770 @@ -6381,7 +6668,7 @@ 5763 5771 cf_save="$CPPFLAGS" 5764 5772 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" 5765 5773 cat >conftest.$ac_ext <<_ACEOF 5766 5774 -#line 6384 "configure" 5767 +#line 667 0"configure"5775 +#line 6671 "configure" 5768 5776 #include "confdefs.h" 5769 5777 #include <sys/types.h> 5770 5778 int 5771 @@ -6396,16 +668 2,16 @@5779 @@ -6396,16 +6683,16 @@ 5772 5780 } 5773 5781 _ACEOF 5774 5782 rm -f conftest.$ac_objext 5775 5783 -if { (eval echo "$as_me:6399: \"$ac_compile\"") >&5 5776 +if { (eval echo "$as_me:668 5: \"$ac_compile\"") >&55784 +if { (eval echo "$as_me:6686: \"$ac_compile\"") >&5 5777 5785 (eval $ac_compile) 2>&5 5778 5786 ac_status=$? 5779 5787 - echo "$as_me:6402: \$? = $ac_status" >&5 5780 + echo "$as_me:668 8: \$? = $ac_status" >&55788 + echo "$as_me:6689: \$? = $ac_status" >&5 5781 5789 (exit $ac_status); } && 5782 5790 { ac_try='test -s conftest.$ac_objext' 5783 5791 - { (eval echo "$as_me:6405: \"$ac_try\"") >&5 5784 + { (eval echo "$as_me:669 1: \"$ac_try\"") >&55792 + { (eval echo "$as_me:6692: \"$ac_try\"") >&5 5785 5793 (eval $ac_try) 2>&5 5786 5794 ac_status=$? 5787 5795 - echo "$as_me:6408: \$? = $ac_status" >&5 5788 + echo "$as_me:669 4: \$? = $ac_status" >&55796 + echo "$as_me:6695: \$? = $ac_status" >&5 5789 5797 (exit $ac_status); }; }; then 5790 5798 cf_cv_xopen_source=no 5791 5799 else 5792 @@ -6420,7 +670 6,7 @@5800 @@ -6420,7 +6707,7 @@ 5793 5801 rm -f conftest.$ac_objext conftest.$ac_ext 5794 5802 5795 5803 fi 5796 5804 -echo "$as_me:6423: result: $cf_cv_xopen_source" >&5 5797 +echo "$as_me:67 09: result: $cf_cv_xopen_source" >&55805 +echo "$as_me:6710: result: $cf_cv_xopen_source" >&5 5798 5806 echo "${ECHO_T}$cf_cv_xopen_source" >&6 5799 5807 if test "$cf_cv_xopen_source" != no ; then 5800 5808 5801 @@ -6454,16 +674 0,16 @@5809 @@ -6454,16 +6741,16 @@ 5802 5810 sed -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?[ ]/ /g' \ 5803 5811 -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?$//g'` 5804 5812 5805 5813 -echo "$as_me:6457: checking if we should define _POSIX_C_SOURCE" >&5 5806 +echo "$as_me:674 3: checking if we should define _POSIX_C_SOURCE" >&55814 +echo "$as_me:6744: checking if we should define _POSIX_C_SOURCE" >&5 5807 5815 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 5808 5816 if test "${cf_cv_posix_c_source+set}" = set; then … … 5811 5819 5812 5820 -echo "${as_me-configure}:6463: testing if the symbol is already defined go no further ..." 1>&5 5813 +echo "${as_me-configure}:67 49: testing if the symbol is already defined go no further ..." 1>&55821 +echo "${as_me-configure}:6750: testing if the symbol is already defined go no further ..." 1>&5 5814 5822 5815 5823 cat >conftest.$ac_ext <<_ACEOF 5816 5824 -#line 6466 "configure" 5817 +#line 675 2"configure"5825 +#line 6753 "configure" 5818 5826 #include "confdefs.h" 5819 5827 #include <sys/types.h> 5820 5828 int 5821 @@ -6478,16 +676 4,16 @@5829 @@ -6478,16 +6765,16 @@ 5822 5830 } 5823 5831 _ACEOF 5824 5832 rm -f conftest.$ac_objext 5825 5833 -if { (eval echo "$as_me:6481: \"$ac_compile\"") >&5 5826 +if { (eval echo "$as_me:676 7: \"$ac_compile\"") >&55834 +if { (eval echo "$as_me:6768: \"$ac_compile\"") >&5 5827 5835 (eval $ac_compile) 2>&5 5828 5836 ac_status=$? 5829 5837 - echo "$as_me:6484: \$? = $ac_status" >&5 5830 + echo "$as_me:677 0: \$? = $ac_status" >&55838 + echo "$as_me:6771: \$? = $ac_status" >&5 5831 5839 (exit $ac_status); } && 5832 5840 { ac_try='test -s conftest.$ac_objext' 5833 5841 - { (eval echo "$as_me:6487: \"$ac_try\"") >&5 5834 + { (eval echo "$as_me:677 3: \"$ac_try\"") >&55842 + { (eval echo "$as_me:6774: \"$ac_try\"") >&5 5835 5843 (eval $ac_try) 2>&5 5836 5844 ac_status=$? 5837 5845 - echo "$as_me:6490: \$? = $ac_status" >&5 5838 + echo "$as_me:677 6: \$? = $ac_status" >&55846 + echo "$as_me:6777: \$? = $ac_status" >&5 5839 5847 (exit $ac_status); }; }; then 5840 5848 cf_cv_posix_c_source=no 5841 5849 else 5842 @@ -6508,7 +679 4,7 @@5850 @@ -6508,7 +6795,7 @@ 5843 5851 esac 5844 5852 if test "$cf_want_posix_source" = yes ; then 5845 5853 cat >conftest.$ac_ext <<_ACEOF 5846 5854 -#line 6511 "configure" 5847 +#line 679 7"configure"5855 +#line 6798 "configure" 5848 5856 #include "confdefs.h" 5849 5857 #include <sys/types.h> 5850 5858 int 5851 @@ -6523,16 +68 09,16 @@5859 @@ -6523,16 +6810,16 @@ 5852 5860 } 5853 5861 _ACEOF 5854 5862 rm -f conftest.$ac_objext 5855 5863 -if { (eval echo "$as_me:6526: \"$ac_compile\"") >&5 5856 +if { (eval echo "$as_me:681 2: \"$ac_compile\"") >&55864 +if { (eval echo "$as_me:6813: \"$ac_compile\"") >&5 5857 5865 (eval $ac_compile) 2>&5 5858 5866 ac_status=$? 5859 5867 - echo "$as_me:6529: \$? = $ac_status" >&5 5860 + echo "$as_me:681 5: \$? = $ac_status" >&55868 + echo "$as_me:6816: \$? = $ac_status" >&5 5861 5869 (exit $ac_status); } && 5862 5870 { ac_try='test -s conftest.$ac_objext' 5863 5871 - { (eval echo "$as_me:6532: \"$ac_try\"") >&5 5864 + { (eval echo "$as_me:681 8: \"$ac_try\"") >&55872 + { (eval echo "$as_me:6819: \"$ac_try\"") >&5 5865 5873 (eval $ac_try) 2>&5 5866 5874 ac_status=$? 5867 5875 - echo "$as_me:6535: \$? = $ac_status" >&5 5868 + echo "$as_me:682 1: \$? = $ac_status" >&55876 + echo "$as_me:6822: \$? = $ac_status" >&5 5869 5877 (exit $ac_status); }; }; then 5870 5878 : 5871 5879 else 5872 @@ -6543,15 +68 29,15 @@5880 @@ -6543,15 +6830,15 @@ 5873 5881 rm -f conftest.$ac_objext conftest.$ac_ext 5874 5882 fi 5875 5883 5876 5884 -echo "${as_me-configure}:6546: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 5877 +echo "${as_me-configure}:683 2: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&55885 +echo "${as_me-configure}:6833: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 5878 5886 5879 5887 CFLAGS="$cf_trim_CFLAGS" … … 5881 5889 5882 5890 -echo "${as_me-configure}:6551: testing if the second compile does not leave our definition intact error ..." 1>&5 5883 +echo "${as_me-configure}:683 7: testing if the second compile does not leave our definition intact error ..." 1>&55891 +echo "${as_me-configure}:6838: testing if the second compile does not leave our definition intact error ..." 1>&5 5884 5892 5885 5893 cat >conftest.$ac_ext <<_ACEOF 5886 5894 -#line 6554 "configure" 5887 +#line 684 0"configure"5895 +#line 6841 "configure" 5888 5896 #include "confdefs.h" 5889 5897 #include <sys/types.h> 5890 5898 int 5891 @@ -6566,16 +685 2,16 @@5899 @@ -6566,16 +6853,16 @@ 5892 5900 } 5893 5901 _ACEOF 5894 5902 rm -f conftest.$ac_objext 5895 5903 -if { (eval echo "$as_me:6569: \"$ac_compile\"") >&5 5896 +if { (eval echo "$as_me:685 5: \"$ac_compile\"") >&55904 +if { (eval echo "$as_me:6856: \"$ac_compile\"") >&5 5897 5905 (eval $ac_compile) 2>&5 5898 5906 ac_status=$? 5899 5907 - echo "$as_me:6572: \$? = $ac_status" >&5 5900 + echo "$as_me:685 8: \$? = $ac_status" >&55908 + echo "$as_me:6859: \$? = $ac_status" >&5 5901 5909 (exit $ac_status); } && 5902 5910 { ac_try='test -s conftest.$ac_objext' 5903 5911 - { (eval echo "$as_me:6575: \"$ac_try\"") >&5 5904 + { (eval echo "$as_me:686 1: \"$ac_try\"") >&55912 + { (eval echo "$as_me:6862: \"$ac_try\"") >&5 5905 5913 (eval $ac_try) 2>&5 5906 5914 ac_status=$? 5907 5915 - echo "$as_me:6578: \$? = $ac_status" >&5 5908 + echo "$as_me:686 4: \$? = $ac_status" >&55916 + echo "$as_me:6865: \$? = $ac_status" >&5 5909 5917 (exit $ac_status); }; }; then 5910 5918 : 5911 5919 else 5912 @@ -6591,7 +687 7,7 @@5920 @@ -6591,7 +6878,7 @@ 5913 5921 rm -f conftest.$ac_objext conftest.$ac_ext 5914 5922 5915 5923 fi 5916 5924 -echo "$as_me:6594: result: $cf_cv_posix_c_source" >&5 5917 +echo "$as_me:688 0: result: $cf_cv_posix_c_source" >&55925 +echo "$as_me:6881: result: $cf_cv_posix_c_source" >&5 5918 5926 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 5919 5927 5920 5928 if test "$cf_cv_posix_c_source" != no ; then 5921 @@ -6610,14 +689 6,14 @@5929 @@ -6610,14 +6897,14 @@ 5922 5930 5923 5931 # Work around breakage on OS X 5924 5932 5925 5933 -echo "$as_me:6613: checking if SIGWINCH is defined" >&5 5926 +echo "$as_me:6 899: checking if SIGWINCH is defined" >&55934 +echo "$as_me:6900: checking if SIGWINCH is defined" >&5 5927 5935 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6 5928 5936 if test "${cf_cv_define_sigwinch+set}" = set; then … … 5932 5940 cat >conftest.$ac_ext <<_ACEOF 5933 5941 -#line 6620 "configure" 5934 +#line 690 6"configure"5942 +#line 6907 "configure" 5935 5943 #include "confdefs.h" 5936 5944 5937 5945 #include <sys/types.h> 5938 @@ -6632,23 +691 8,23 @@5946 @@ -6632,23 +6919,23 @@ 5939 5947 } 5940 5948 _ACEOF 5941 5949 rm -f conftest.$ac_objext 5942 5950 -if { (eval echo "$as_me:6635: \"$ac_compile\"") >&5 5943 +if { (eval echo "$as_me:692 1: \"$ac_compile\"") >&55951 +if { (eval echo "$as_me:6922: \"$ac_compile\"") >&5 5944 5952 (eval $ac_compile) 2>&5 5945 5953 ac_status=$? 5946 5954 - echo "$as_me:6638: \$? = $ac_status" >&5 5947 + echo "$as_me:692 4: \$? = $ac_status" >&55955 + echo "$as_me:6925: \$? = $ac_status" >&5 5948 5956 (exit $ac_status); } && 5949 5957 { ac_try='test -s conftest.$ac_objext' 5950 5958 - { (eval echo "$as_me:6641: \"$ac_try\"") >&5 5951 + { (eval echo "$as_me:692 7: \"$ac_try\"") >&55959 + { (eval echo "$as_me:6928: \"$ac_try\"") >&5 5952 5960 (eval $ac_try) 2>&5 5953 5961 ac_status=$? 5954 5962 - echo "$as_me:6644: \$? = $ac_status" >&5 5955 + echo "$as_me:693 0: \$? = $ac_status" >&55963 + echo "$as_me:6931: \$? = $ac_status" >&5 5956 5964 (exit $ac_status); }; }; then 5957 5965 cf_cv_define_sigwinch=yes … … 5961 5969 cat >conftest.$ac_ext <<_ACEOF 5962 5970 -#line 6651 "configure" 5963 +#line 693 7"configure"5971 +#line 6938 "configure" 5964 5972 #include "confdefs.h" 5965 5973 5966 5974 #undef _XOPEN_SOURCE 5967 @@ -6666,16 +695 2,16 @@5975 @@ -6666,16 +6953,16 @@ 5968 5976 } 5969 5977 _ACEOF 5970 5978 rm -f conftest.$ac_objext 5971 5979 -if { (eval echo "$as_me:6669: \"$ac_compile\"") >&5 5972 +if { (eval echo "$as_me:695 5: \"$ac_compile\"") >&55980 +if { (eval echo "$as_me:6956: \"$ac_compile\"") >&5 5973 5981 (eval $ac_compile) 2>&5 5974 5982 ac_status=$? 5975 5983 - echo "$as_me:6672: \$? = $ac_status" >&5 5976 + echo "$as_me:695 8: \$? = $ac_status" >&55984 + echo "$as_me:6959: \$? = $ac_status" >&5 5977 5985 (exit $ac_status); } && 5978 5986 { ac_try='test -s conftest.$ac_objext' 5979 5987 - { (eval echo "$as_me:6675: \"$ac_try\"") >&5 5980 + { (eval echo "$as_me:696 1: \"$ac_try\"") >&55988 + { (eval echo "$as_me:6962: \"$ac_try\"") >&5 5981 5989 (eval $ac_try) 2>&5 5982 5990 ac_status=$? 5983 5991 - echo "$as_me:6678: \$? = $ac_status" >&5 5984 + echo "$as_me:696 4: \$? = $ac_status" >&55992 + echo "$as_me:6965: \$? = $ac_status" >&5 5985 5993 (exit $ac_status); }; }; then 5986 5994 cf_cv_define_sigwinch=maybe 5987 5995 else 5988 @@ -6689,11 +697 5,11 @@5996 @@ -6689,11 +6976,11 @@ 5989 5997 rm -f conftest.$ac_objext conftest.$ac_ext 5990 5998 5991 5999 fi 5992 6000 -echo "$as_me:6692: result: $cf_cv_define_sigwinch" >&5 5993 +echo "$as_me:697 8: result: $cf_cv_define_sigwinch" >&56001 +echo "$as_me:6979: result: $cf_cv_define_sigwinch" >&5 5994 6002 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6 5995 6003 5996 6004 if test "$cf_cv_define_sigwinch" = maybe ; then 5997 6005 -echo "$as_me:6696: checking for actual SIGWINCH definition" >&5 5998 +echo "$as_me:698 2: checking for actual SIGWINCH definition" >&56006 +echo "$as_me:6983: checking for actual SIGWINCH definition" >&5 5999 6007 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6 6000 6008 if test "${cf_cv_fixup_sigwinch+set}" = set; then 6001 6009 echo $ECHO_N "(cached) $ECHO_C" >&6 6002 @@ -6704,7 +699 0,7 @@6010 @@ -6704,7 +6991,7 @@ 6003 6011 while test $cf_sigwinch != 1 6004 6012 do 6005 6013 cat >conftest.$ac_ext <<_ACEOF 6006 6014 -#line 6707 "configure" 6007 +#line 699 3"configure"6015 +#line 6994 "configure" 6008 6016 #include "confdefs.h" 6009 6017 6010 6018 #undef _XOPEN_SOURCE 6011 @@ -6726,16 +701 2,16 @@6019 @@ -6726,16 +7013,16 @@ 6012 6020 } 6013 6021 _ACEOF 6014 6022 rm -f conftest.$ac_objext 6015 6023 -if { (eval echo "$as_me:6729: \"$ac_compile\"") >&5 6016 +if { (eval echo "$as_me:701 5: \"$ac_compile\"") >&56024 +if { (eval echo "$as_me:7016: \"$ac_compile\"") >&5 6017 6025 (eval $ac_compile) 2>&5 6018 6026 ac_status=$? 6019 6027 - echo "$as_me:6732: \$? = $ac_status" >&5 6020 + echo "$as_me:701 8: \$? = $ac_status" >&56028 + echo "$as_me:7019: \$? = $ac_status" >&5 6021 6029 (exit $ac_status); } && 6022 6030 { ac_try='test -s conftest.$ac_objext' 6023 6031 - { (eval echo "$as_me:6735: \"$ac_try\"") >&5 6024 + { (eval echo "$as_me:702 1: \"$ac_try\"") >&56032 + { (eval echo "$as_me:7022: \"$ac_try\"") >&5 6025 6033 (eval $ac_try) 2>&5 6026 6034 ac_status=$? 6027 6035 - echo "$as_me:6738: \$? = $ac_status" >&5 6028 + echo "$as_me:702 4: \$? = $ac_status" >&56036 + echo "$as_me:7025: \$? = $ac_status" >&5 6029 6037 (exit $ac_status); }; }; then 6030 6038 cf_cv_fixup_sigwinch=$cf_sigwinch 6031 6039 break 6032 @@ -6749,7 +703 5,7 @@6040 @@ -6749,7 +7036,7 @@ 6033 6041 done 6034 6042 6035 6043 fi 6036 6044 -echo "$as_me:6752: result: $cf_cv_fixup_sigwinch" >&5 6037 +echo "$as_me:703 8: result: $cf_cv_fixup_sigwinch" >&56045 +echo "$as_me:7039: result: $cf_cv_fixup_sigwinch" >&5 6038 6046 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 6039 6047 6040 6048 if test "$cf_cv_fixup_sigwinch" != unknown ; then 6041 @@ -6759,13 +704 5,13 @@6049 @@ -6759,13 +7046,13 @@ 6042 6050 6043 6051 # Checks for CODESET support. 6044 6052 6045 6053 - echo "$as_me:6762: checking for nl_langinfo and CODESET" >&5 6046 + echo "$as_me:704 8: checking for nl_langinfo and CODESET" >&56054 + echo "$as_me:7049: checking for nl_langinfo and CODESET" >&5 6047 6055 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 6048 6056 if test "${am_cv_langinfo_codeset+set}" = set; then … … 6051 6059 cat >conftest.$ac_ext <<_ACEOF 6052 6060 -#line 6768 "configure" 6053 +#line 705 4"configure"6061 +#line 7055 "configure" 6054 6062 #include "confdefs.h" 6055 6063 #include <langinfo.h> 6056 6064 int 6057 @@ -6777,16 +706 3,16 @@6065 @@ -6777,16 +7064,16 @@ 6058 6066 } 6059 6067 _ACEOF 6060 6068 rm -f conftest.$ac_objext conftest$ac_exeext 6061 6069 -if { (eval echo "$as_me:6780: \"$ac_link\"") >&5 6062 +if { (eval echo "$as_me:706 6: \"$ac_link\"") >&56070 +if { (eval echo "$as_me:7067: \"$ac_link\"") >&5 6063 6071 (eval $ac_link) 2>&5 6064 6072 ac_status=$? 6065 6073 - echo "$as_me:6783: \$? = $ac_status" >&5 6066 + echo "$as_me:70 69: \$? = $ac_status" >&56074 + echo "$as_me:7070: \$? = $ac_status" >&5 6067 6075 (exit $ac_status); } && 6068 6076 { ac_try='test -s conftest$ac_exeext' 6069 6077 - { (eval echo "$as_me:6786: \"$ac_try\"") >&5 6070 + { (eval echo "$as_me:707 2: \"$ac_try\"") >&56078 + { (eval echo "$as_me:7073: \"$ac_try\"") >&5 6071 6079 (eval $ac_try) 2>&5 6072 6080 ac_status=$? 6073 6081 - echo "$as_me:6789: \$? = $ac_status" >&5 6074 + echo "$as_me:707 5: \$? = $ac_status" >&56082 + echo "$as_me:7076: \$? = $ac_status" >&5 6075 6083 (exit $ac_status); }; }; then 6076 6084 am_cv_langinfo_codeset=yes 6077 6085 else 6078 @@ -6797,7 +708 3,7 @@6086 @@ -6797,7 +7084,7 @@ 6079 6087 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 6080 6088 6081 6089 fi 6082 6090 -echo "$as_me:6800: result: $am_cv_langinfo_codeset" >&5 6083 +echo "$as_me:708 6: result: $am_cv_langinfo_codeset" >&56091 +echo "$as_me:7087: result: $am_cv_langinfo_codeset" >&5 6084 6092 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 6085 6093 if test $am_cv_langinfo_codeset = yes; then 6086 6094 6087 @@ -6811,7 +709 7,7 @@6095 @@ -6811,7 +7098,7 @@ 6088 6096 NCURSES_OK_WCHAR_T= 6089 6097 NCURSES_OK_WINT_T= 6090 6098 6091 6099 -echo "$as_me:6814: checking if you want wide-character code" >&5 6092 +echo "$as_me:710 0: checking if you want wide-character code" >&56100 +echo "$as_me:7101: checking if you want wide-character code" >&5 6093 6101 echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 6094 6102 6095 6103 # Check whether --enable-widec or --disable-widec was given. 6096 @@ -6821,7 +710 7,7 @@6104 @@ -6821,7 +7108,7 @@ 6097 6105 else 6098 6106 with_widec=no 6099 6107 fi; 6100 6108 -echo "$as_me:6824: result: $with_widec" >&5 6101 +echo "$as_me:711 0: result: $with_widec" >&56109 +echo "$as_me:7111: result: $with_widec" >&5 6102 6110 echo "${ECHO_T}$with_widec" >&6 6103 6111 if test "$with_widec" = yes ; then 6104 6112 LIB_SUFFIX="w${LIB_SUFFIX}" 6105 @@ -6829,10 +711 5,10 @@6113 @@ -6829,10 +7116,10 @@ 6106 6114 #define USE_WIDEC_SUPPORT 1 6107 6115 EOF 6108 6116 6109 6117 -echo "$as_me:6832: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 6110 +echo "$as_me:711 8: checking if we must define _XOPEN_SOURCE_EXTENDED" >&56118 +echo "$as_me:7119: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 6111 6119 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6 6112 6120 cat >conftest.$ac_ext <<_ACEOF 6113 6121 -#line 6835 "configure" 6114 +#line 712 1"configure"6122 +#line 7122 "configure" 6115 6123 #include "confdefs.h" 6116 6124 #include <sys/types.h> 6117 6125 6118 @@ -6848,16 +713 4,16 @@6126 @@ -6848,16 +7135,16 @@ 6119 6127 } 6120 6128 _ACEOF 6121 6129 rm -f conftest.$ac_objext 6122 6130 -if { (eval echo "$as_me:6851: \"$ac_compile\"") >&5 6123 +if { (eval echo "$as_me:713 7: \"$ac_compile\"") >&56131 +if { (eval echo "$as_me:7138: \"$ac_compile\"") >&5 6124 6132 (eval $ac_compile) 2>&5 6125 6133 ac_status=$? 6126 6134 - echo "$as_me:6854: \$? = $ac_status" >&5 6127 + echo "$as_me:714 0: \$? = $ac_status" >&56135 + echo "$as_me:7141: \$? = $ac_status" >&5 6128 6136 (exit $ac_status); } && 6129 6137 { ac_try='test -s conftest.$ac_objext' 6130 6138 - { (eval echo "$as_me:6857: \"$ac_try\"") >&5 6131 + { (eval echo "$as_me:714 3: \"$ac_try\"") >&56139 + { (eval echo "$as_me:7144: \"$ac_try\"") >&5 6132 6140 (eval $ac_try) 2>&5 6133 6141 ac_status=$? 6134 6142 - echo "$as_me:6860: \$? = $ac_status" >&5 6135 + echo "$as_me:714 6: \$? = $ac_status" >&56143 + echo "$as_me:7147: \$? = $ac_status" >&5 6136 6144 (exit $ac_status); }; }; then 6137 6145 cf_result=no 6138 6146 else 6139 @@ -6866,16 +715 2,16 @@6147 @@ -6866,16 +7153,16 @@ 6140 6148 cf_result=yes 6141 6149 fi 6142 6150 rm -f conftest.$ac_objext conftest.$ac_ext 6143 6151 -echo "$as_me:6869: result: $cf_result" >&5 6144 +echo "$as_me:715 5: result: $cf_result" >&56152 +echo "$as_me:7156: result: $cf_result" >&5 6145 6153 echo "${ECHO_T}$cf_result" >&6 6146 6154 … … 6149 6157 elif test "x" != "x" ; then 6150 6158 - echo "$as_me:6875: checking checking for compatible value versus " >&5 6151 + echo "$as_me:716 1: checking checking for compatible value versus " >&56159 + echo "$as_me:7162: checking checking for compatible value versus " >&5 6152 6160 echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6 6153 6161 cat >conftest.$ac_ext <<_ACEOF 6154 6162 -#line 6878 "configure" 6155 +#line 716 4"configure"6163 +#line 7165 "configure" 6156 6164 #include "confdefs.h" 6157 6165 #include <sys/types.h> 6158 6166 6159 @@ -6891,16 +717 7,16 @@6167 @@ -6891,16 +7178,16 @@ 6160 6168 } 6161 6169 _ACEOF 6162 6170 rm -f conftest.$ac_objext 6163 6171 -if { (eval echo "$as_me:6894: \"$ac_compile\"") >&5 6164 +if { (eval echo "$as_me:718 0: \"$ac_compile\"") >&56172 +if { (eval echo "$as_me:7181: \"$ac_compile\"") >&5 6165 6173 (eval $ac_compile) 2>&5 6166 6174 ac_status=$? 6167 6175 - echo "$as_me:6897: \$? = $ac_status" >&5 6168 + echo "$as_me:718 3: \$? = $ac_status" >&56176 + echo "$as_me:7184: \$? = $ac_status" >&5 6169 6177 (exit $ac_status); } && 6170 6178 { ac_try='test -s conftest.$ac_objext' 6171 6179 - { (eval echo "$as_me:6900: \"$ac_try\"") >&5 6172 + { (eval echo "$as_me:718 6: \"$ac_try\"") >&56180 + { (eval echo "$as_me:7187: \"$ac_try\"") >&5 6173 6181 (eval $ac_try) 2>&5 6174 6182 ac_status=$? 6175 6183 - echo "$as_me:6903: \$? = $ac_status" >&5 6176 + echo "$as_me:71 89: \$? = $ac_status" >&56184 + echo "$as_me:7190: \$? = $ac_status" >&5 6177 6185 (exit $ac_status); }; }; then 6178 6186 cf_result=yes 6179 6187 else 6180 @@ -6909,7 +719 5,7 @@6188 @@ -6909,7 +7196,7 @@ 6181 6189 cf_result=no 6182 6190 fi 6183 6191 rm -f conftest.$ac_objext conftest.$ac_ext 6184 6192 - echo "$as_me:6912: result: $cf_result" >&5 6185 + echo "$as_me:719 8: result: $cf_result" >&56193 + echo "$as_me:7199: result: $cf_result" >&5 6186 6194 echo "${ECHO_T}$cf_result" >&6 6187 6195 if test "$cf_result" = no ; then 6188 6196 # perhaps we can override it - try... 6189 @@ -6923,13 +72 09,13 @@6197 @@ -6923,13 +7210,13 @@ 6190 6198 for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs 6191 6199 do 6192 6200 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 6193 6201 -echo "$as_me:6926: checking for $ac_func" >&5 6194 +echo "$as_me:721 2: checking for $ac_func" >&56202 +echo "$as_me:7213: checking for $ac_func" >&5 6195 6203 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 6196 6204 if eval "test \"\${$as_ac_var+set}\" = set"; then … … 6199 6207 cat >conftest.$ac_ext <<_ACEOF 6200 6208 -#line 6932 "configure" 6201 +#line 721 8"configure"6209 +#line 7219 "configure" 6202 6210 #include "confdefs.h" 6203 6211 /* System header to define __stub macros and hopefully few prototypes, 6204 6212 which can conflict with char $ac_func (); below. */ 6205 @@ -6960,16 +724 6,16 @@6213 @@ -6960,16 +7247,16 @@ 6206 6214 } 6207 6215 _ACEOF 6208 6216 rm -f conftest.$ac_objext conftest$ac_exeext 6209 6217 -if { (eval echo "$as_me:6963: \"$ac_link\"") >&5 6210 +if { (eval echo "$as_me:72 49: \"$ac_link\"") >&56218 +if { (eval echo "$as_me:7250: \"$ac_link\"") >&5 6211 6219 (eval $ac_link) 2>&5 6212 6220 ac_status=$? 6213 6221 - echo "$as_me:6966: \$? = $ac_status" >&5 6214 + echo "$as_me:725 2: \$? = $ac_status" >&56222 + echo "$as_me:7253: \$? = $ac_status" >&5 6215 6223 (exit $ac_status); } && 6216 6224 { ac_try='test -s conftest$ac_exeext' 6217 6225 - { (eval echo "$as_me:6969: \"$ac_try\"") >&5 6218 + { (eval echo "$as_me:725 5: \"$ac_try\"") >&56226 + { (eval echo "$as_me:7256: \"$ac_try\"") >&5 6219 6227 (eval $ac_try) 2>&5 6220 6228 ac_status=$? 6221 6229 - echo "$as_me:6972: \$? = $ac_status" >&5 6222 + echo "$as_me:725 8: \$? = $ac_status" >&56230 + echo "$as_me:7259: \$? = $ac_status" >&5 6223 6231 (exit $ac_status); }; }; then 6224 6232 eval "$as_ac_var=yes" 6225 6233 else 6226 @@ -6979,7 +726 5,7 @@6234 @@ -6979,7 +7266,7 @@ 6227 6235 fi 6228 6236 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 6229 6237 fi 6230 6238 -echo "$as_me:6982: result: `eval echo '${'$as_ac_var'}'`" >&5 6231 +echo "$as_me:726 8: result: `eval echo '${'$as_ac_var'}'`" >&56239 +echo "$as_me:7269: result: `eval echo '${'$as_ac_var'}'`" >&5 6232 6240 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 6233 6241 if test `eval echo '${'$as_ac_var'}'` = yes; then 6234 6242 cat >>confdefs.h <<EOF 6235 @@ -6991,7 +727 7,7 @@6243 @@ -6991,7 +7278,7 @@ 6236 6244 6237 6245 if test "$ac_cv_func_putwc" != yes ; then 6238 6246 6239 6247 -echo "$as_me:6994: checking for multibyte character support" >&5 6240 +echo "$as_me:728 0: checking for multibyte character support" >&56248 +echo "$as_me:7281: checking for multibyte character support" >&5 6241 6249 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 6242 6250 if test "${cf_cv_utf8_lib+set}" = set; then 6243 6251 echo $ECHO_N "(cached) $ECHO_C" >&6 6244 @@ -6999,7 +728 5,7 @@6252 @@ -6999,7 +7286,7 @@ 6245 6253 6246 6254 cf_save_LIBS="$LIBS" 6247 6255 cat >conftest.$ac_ext <<_ACEOF 6248 6256 -#line 7002 "configure" 6249 +#line 728 8"configure"6257 +#line 7289 "configure" 6250 6258 #include "confdefs.h" 6251 6259 6252 6260 #include <stdlib.h> 6253 @@ -7012,16 +729 8,16 @@6261 @@ -7012,16 +7299,16 @@ 6254 6262 } 6255 6263 _ACEOF 6256 6264 rm -f conftest.$ac_objext conftest$ac_exeext 6257 6265 -if { (eval echo "$as_me:7015: \"$ac_link\"") >&5 6258 +if { (eval echo "$as_me:730 1: \"$ac_link\"") >&56266 +if { (eval echo "$as_me:7302: \"$ac_link\"") >&5 6259 6267 (eval $ac_link) 2>&5 6260 6268 ac_status=$? 6261 6269 - echo "$as_me:7018: \$? = $ac_status" >&5 6262 + echo "$as_me:730 4: \$? = $ac_status" >&56270 + echo "$as_me:7305: \$? = $ac_status" >&5 6263 6271 (exit $ac_status); } && 6264 6272 { ac_try='test -s conftest$ac_exeext' 6265 6273 - { (eval echo "$as_me:7021: \"$ac_try\"") >&5 6266 + { (eval echo "$as_me:730 7: \"$ac_try\"") >&56274 + { (eval echo "$as_me:7308: \"$ac_try\"") >&5 6267 6275 (eval $ac_try) 2>&5 6268 6276 ac_status=$? 6269 6277 - echo "$as_me:7024: \$? = $ac_status" >&5 6270 + echo "$as_me:731 0: \$? = $ac_status" >&56278 + echo "$as_me:7311: \$? = $ac_status" >&5 6271 6279 (exit $ac_status); }; }; then 6272 6280 cf_cv_utf8_lib=yes 6273 6281 else 6274 @@ -7033,10 +73 19,10 @@6282 @@ -7033,10 +7320,10 @@ 6275 6283 cf_cv_header_path_utf8= 6276 6284 cf_cv_library_path_utf8= 6277 6285 6278 6286 -echo "${as_me-configure}:7036: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 6279 +echo "${as_me-configure}:732 2: testing Starting FIND_LINKAGE(utf8,) ..." 1>&56287 +echo "${as_me-configure}:7323: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 6280 6288 6281 6289 cat >conftest.$ac_ext <<_ACEOF 6282 6290 -#line 7039 "configure" 6283 +#line 732 5"configure"6291 +#line 7326 "configure" 6284 6292 #include "confdefs.h" 6285 6293 6286 6294 #include <libutf8.h> 6287 @@ -7049,16 +733 5,16 @@6295 @@ -7049,16 +7336,16 @@ 6288 6296 } 6289 6297 _ACEOF 6290 6298 rm -f conftest.$ac_objext conftest$ac_exeext 6291 6299 -if { (eval echo "$as_me:7052: \"$ac_link\"") >&5 6292 +if { (eval echo "$as_me:733 8: \"$ac_link\"") >&56300 +if { (eval echo "$as_me:7339: \"$ac_link\"") >&5 6293 6301 (eval $ac_link) 2>&5 6294 6302 ac_status=$? 6295 6303 - echo "$as_me:7055: \$? = $ac_status" >&5 6296 + echo "$as_me:734 1: \$? = $ac_status" >&56304 + echo "$as_me:7342: \$? = $ac_status" >&5 6297 6305 (exit $ac_status); } && 6298 6306 { ac_try='test -s conftest$ac_exeext' 6299 6307 - { (eval echo "$as_me:7058: \"$ac_try\"") >&5 6300 + { (eval echo "$as_me:734 4: \"$ac_try\"") >&56308 + { (eval echo "$as_me:7345: \"$ac_try\"") >&5 6301 6309 (eval $ac_try) 2>&5 6302 6310 ac_status=$? 6303 6311 - echo "$as_me:7061: \$? = $ac_status" >&5 6304 + echo "$as_me:734 7: \$? = $ac_status" >&56312 + echo "$as_me:7348: \$? = $ac_status" >&5 6305 6313 (exit $ac_status); }; }; then 6306 6314 cf_cv_find_linkage_utf8=yes 6307 6315 else 6308 @@ -7067,12 +735 3,41 @@6316 @@ -7067,12 +7354,41 @@ 6309 6317 6310 6318 cf_cv_find_linkage_utf8=no … … 6313 6321 + test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 6314 6322 + 6315 +echo "${as_me-configure}:735 8: testing find linkage for utf8 library ..." 1>&56316 + 6317 +echo "${as_me-configure}:736 0: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&56323 +echo "${as_me-configure}:7359: testing find linkage for utf8 library ..." 1>&5 6324 + 6325 +echo "${as_me-configure}:7361: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 6318 6326 6319 6327 cf_save_CPPFLAGS="$CPPFLAGS" … … 6350 6358 test "/usr" != "$prefix" && \ 6351 6359 test -d "/usr" && \ 6352 @@ -7143,16 +745 8,18 @@6360 @@ -7143,16 +7459,18 @@ 6353 6361 test -d $oldincludedir/utf8 && cf_search="$cf_search $oldincludedir/utf8" 6354 6362 } … … 6362 6370 6363 6371 -echo "${as_me-configure}:7151: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 6364 +echo "${as_me-configure}:746 8: testing ... testing $cf_cv_header_path_utf8 ..." 1>&56372 +echo "${as_me-configure}:7469: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 6365 6373 6366 6374 CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8" 6367 6375 cat >conftest.$ac_ext <<_ACEOF 6368 6376 -#line 7155 "configure" 6369 +#line 747 2"configure"6377 +#line 7473 "configure" 6370 6378 #include "confdefs.h" 6371 6379 6372 6380 #include <libutf8.h> 6373 @@ -7165,21 +748 2,21 @@6381 @@ -7165,21 +7483,21 @@ 6374 6382 } 6375 6383 _ACEOF 6376 6384 rm -f conftest.$ac_objext 6377 6385 -if { (eval echo "$as_me:7168: \"$ac_compile\"") >&5 6378 +if { (eval echo "$as_me:748 5: \"$ac_compile\"") >&56386 +if { (eval echo "$as_me:7486: \"$ac_compile\"") >&5 6379 6387 (eval $ac_compile) 2>&5 6380 6388 ac_status=$? 6381 6389 - echo "$as_me:7171: \$? = $ac_status" >&5 6382 + echo "$as_me:748 8: \$? = $ac_status" >&56390 + echo "$as_me:7489: \$? = $ac_status" >&5 6383 6391 (exit $ac_status); } && 6384 6392 { ac_try='test -s conftest.$ac_objext' 6385 6393 - { (eval echo "$as_me:7174: \"$ac_try\"") >&5 6386 + { (eval echo "$as_me:749 1: \"$ac_try\"") >&56394 + { (eval echo "$as_me:7492: \"$ac_try\"") >&5 6387 6395 (eval $ac_try) 2>&5 6388 6396 ac_status=$? 6389 6397 - echo "$as_me:7177: \$? = $ac_status" >&5 6390 + echo "$as_me:749 4: \$? = $ac_status" >&56398 + echo "$as_me:7495: \$? = $ac_status" >&5 6391 6399 (exit $ac_status); }; }; then 6392 6400 … … 6394 6402 6395 6403 -echo "${as_me-configure}:7182: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 6396 +echo "${as_me-configure}:7 499: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&56404 +echo "${as_me-configure}:7500: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 6397 6405 6398 6406 cf_cv_find_linkage_utf8=maybe 6399 6407 cf_test_CPPFLAGS="$CPPFLAGS" 6400 @@ -7197,13 +751 4,39 @@6408 @@ -7197,13 +7515,39 @@ 6401 6409 6402 6410 if test "$cf_cv_find_linkage_utf8" = maybe ; then 6403 6411 6404 6412 -echo "${as_me-configure}:7200: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 6405 +echo "${as_me-configure}:751 7: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&56413 +echo "${as_me-configure}:7518: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 6406 6414 6407 6415 cf_save_LIBS="$LIBS" … … 6440 6448 test "/usr" != "$prefix" && \ 6441 6449 test -d "/usr" && \ 6442 @@ -7260,18 +760 3,20 @@6450 @@ -7260,18 +7604,20 @@ 6443 6451 test -d $HOME/utf8/lib/utf8 && cf_search="$cf_search $HOME/utf8/lib/utf8" 6444 6452 } … … 6452 6460 6453 6461 -echo "${as_me-configure}:7268: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 6454 +echo "${as_me-configure}:761 3: testing ... testing $cf_cv_library_path_utf8 ..." 1>&56462 +echo "${as_me-configure}:7614: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 6455 6463 6456 6464 CPPFLAGS="$cf_test_CPPFLAGS" … … 6459 6467 cat >conftest.$ac_ext <<_ACEOF 6460 6468 -#line 7274 "configure" 6461 +#line 76 19"configure"6469 +#line 7620 "configure" 6462 6470 #include "confdefs.h" 6463 6471 6464 6472 #include <libutf8.h> 6465 @@ -7284,21 +76 29,21 @@6473 @@ -7284,21 +7630,21 @@ 6466 6474 } 6467 6475 _ACEOF 6468 6476 rm -f conftest.$ac_objext conftest$ac_exeext 6469 6477 -if { (eval echo "$as_me:7287: \"$ac_link\"") >&5 6470 +if { (eval echo "$as_me:763 2: \"$ac_link\"") >&56478 +if { (eval echo "$as_me:7633: \"$ac_link\"") >&5 6471 6479 (eval $ac_link) 2>&5 6472 6480 ac_status=$? 6473 6481 - echo "$as_me:7290: \$? = $ac_status" >&5 6474 + echo "$as_me:763 5: \$? = $ac_status" >&56482 + echo "$as_me:7636: \$? = $ac_status" >&5 6475 6483 (exit $ac_status); } && 6476 6484 { ac_try='test -s conftest$ac_exeext' 6477 6485 - { (eval echo "$as_me:7293: \"$ac_try\"") >&5 6478 + { (eval echo "$as_me:763 8: \"$ac_try\"") >&56486 + { (eval echo "$as_me:7639: \"$ac_try\"") >&5 6479 6487 (eval $ac_try) 2>&5 6480 6488 ac_status=$? 6481 6489 - echo "$as_me:7296: \$? = $ac_status" >&5 6482 + echo "$as_me:764 1: \$? = $ac_status" >&56490 + echo "$as_me:7642: \$? = $ac_status" >&5 6483 6491 (exit $ac_status); }; }; then 6484 6492 … … 6486 6494 6487 6495 -echo "${as_me-configure}:7301: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 6488 +echo "${as_me-configure}:764 6: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&56496 +echo "${as_me-configure}:7647: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 6489 6497 6490 6498 cf_cv_find_linkage_utf8=yes 6491 6499 cf_cv_library_file_utf8="-lutf8" 6492 @@ -7336,7 +768 1,7 @@6500 @@ -7336,7 +7682,7 @@ 6493 6501 fi 6494 6502 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 6495 6503 fi 6496 6504 -echo "$as_me:7339: result: $cf_cv_utf8_lib" >&5 6497 +echo "$as_me:768 4: result: $cf_cv_utf8_lib" >&56505 +echo "$as_me:7685: result: $cf_cv_utf8_lib" >&5 6498 6506 echo "${ECHO_T}$cf_cv_utf8_lib" >&6 6499 6507 6500 6508 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between 6501 @@ -7364,13 +77 09,13 @@6509 @@ -7364,13 +7710,13 @@ 6502 6510 fi 6503 6511 … … 6511 6519 cat >conftest.$ac_ext <<_ACEOF 6512 6520 -#line 7373 "configure" 6513 +#line 771 8"configure"6521 +#line 7719 "configure" 6514 6522 #include "confdefs.h" 6515 6523 #include <stdio.h> 6516 6524 int 6517 @@ -7382,16 +772 7,16 @@6525 @@ -7382,16 +7728,16 @@ 6518 6526 } 6519 6527 _ACEOF 6520 6528 rm -f conftest.$ac_objext 6521 6529 -if { (eval echo "$as_me:7385: \"$ac_compile\"") >&5 6522 +if { (eval echo "$as_me:773 0: \"$ac_compile\"") >&56530 +if { (eval echo "$as_me:7731: \"$ac_compile\"") >&5 6523 6531 (eval $ac_compile) 2>&5 6524 6532 ac_status=$? 6525 6533 - echo "$as_me:7388: \$? = $ac_status" >&5 6526 + echo "$as_me:773 3: \$? = $ac_status" >&56534 + echo "$as_me:7734: \$? = $ac_status" >&5 6527 6535 (exit $ac_status); } && 6528 6536 { ac_try='test -s conftest.$ac_objext' 6529 6537 - { (eval echo "$as_me:7391: \"$ac_try\"") >&5 6530 + { (eval echo "$as_me:773 6: \"$ac_try\"") >&56538 + { (eval echo "$as_me:7737: \"$ac_try\"") >&5 6531 6539 (eval $ac_try) 2>&5 6532 6540 ac_status=$? 6533 6541 - echo "$as_me:7394: \$? = $ac_status" >&5 6534 + echo "$as_me:77 39: \$? = $ac_status" >&56542 + echo "$as_me:7740: \$? = $ac_status" >&5 6535 6543 (exit $ac_status); }; }; then 6536 6544 : 6537 6545 else 6538 @@ -7408,13 +775 3,13 @@6546 @@ -7408,13 +7754,13 @@ 6539 6547 if test "$cf_have_incdir" = no ; then 6540 6548 test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 6541 6549 6542 6550 -echo "${as_me-configure}:7411: testing adding $cf_add_incdir to include-path ..." 1>&5 6543 +echo "${as_me-configure}:775 6: testing adding $cf_add_incdir to include-path ..." 1>&56551 +echo "${as_me-configure}:7757: testing adding $cf_add_incdir to include-path ..." 1>&5 6544 6552 6545 6553 - CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" … … 6555 6563 break 6556 6564 fi 6557 @@ -7442,7 +778 7,7 @@6565 @@ -7442,7 +7788,7 @@ 6558 6566 if test "$cf_have_libdir" = no ; then 6559 6567 test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 6560 6568 6561 6569 -echo "${as_me-configure}:7445: testing adding $cf_add_libdir to library-path ..." 1>&5 6562 +echo "${as_me-configure}:779 0: testing adding $cf_add_libdir to library-path ..." 1>&56570 +echo "${as_me-configure}:7791: testing adding $cf_add_libdir to library-path ..." 1>&5 6563 6571 6564 6572 LDFLAGS="-L$cf_add_libdir $LDFLAGS" 6565 6573 fi 6566 @@ -7459,14 +780 4,14 @@6574 @@ -7459,14 +7805,14 @@ 6567 6575 fi 6568 6576 6569 6577 # This is needed on Tru64 5.0 to declare mbstate_t 6570 6578 -echo "$as_me:7462: checking if we must include wchar.h to declare mbstate_t" >&5 6571 +echo "$as_me:780 7: checking if we must include wchar.h to declare mbstate_t" >&56579 +echo "$as_me:7808: checking if we must include wchar.h to declare mbstate_t" >&5 6572 6580 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6 6573 6581 if test "${cf_cv_mbstate_t+set}" = set; then … … 6577 6585 cat >conftest.$ac_ext <<_ACEOF 6578 6586 -#line 7469 "configure" 6579 +#line 781 4"configure"6587 +#line 7815 "configure" 6580 6588 #include "confdefs.h" 6581 6589 6582 6590 #include <stdlib.h> 6583 @@ -7484,23 +78 29,23 @@6591 @@ -7484,23 +7830,23 @@ 6584 6592 } 6585 6593 _ACEOF 6586 6594 rm -f conftest.$ac_objext 6587 6595 -if { (eval echo "$as_me:7487: \"$ac_compile\"") >&5 6588 +if { (eval echo "$as_me:783 2: \"$ac_compile\"") >&56596 +if { (eval echo "$as_me:7833: \"$ac_compile\"") >&5 6589 6597 (eval $ac_compile) 2>&5 6590 6598 ac_status=$? 6591 6599 - echo "$as_me:7490: \$? = $ac_status" >&5 6592 + echo "$as_me:783 5: \$? = $ac_status" >&56600 + echo "$as_me:7836: \$? = $ac_status" >&5 6593 6601 (exit $ac_status); } && 6594 6602 { ac_try='test -s conftest.$ac_objext' 6595 6603 - { (eval echo "$as_me:7493: \"$ac_try\"") >&5 6596 + { (eval echo "$as_me:783 8: \"$ac_try\"") >&56604 + { (eval echo "$as_me:7839: \"$ac_try\"") >&5 6597 6605 (eval $ac_try) 2>&5 6598 6606 ac_status=$? 6599 6607 - echo "$as_me:7496: \$? = $ac_status" >&5 6600 + echo "$as_me:784 1: \$? = $ac_status" >&56608 + echo "$as_me:7842: \$? = $ac_status" >&5 6601 6609 (exit $ac_status); }; }; then 6602 6610 cf_cv_mbstate_t=no … … 6606 6614 cat >conftest.$ac_ext <<_ACEOF 6607 6615 -#line 7503 "configure" 6608 +#line 784 8"configure"6616 +#line 7849 "configure" 6609 6617 #include "confdefs.h" 6610 6618 6611 6619 #include <stdlib.h> 6612 @@ -7519,16 +786 4,16 @@6620 @@ -7519,16 +7865,16 @@ 6613 6621 } 6614 6622 _ACEOF 6615 6623 rm -f conftest.$ac_objext 6616 6624 -if { (eval echo "$as_me:7522: \"$ac_compile\"") >&5 6617 +if { (eval echo "$as_me:786 7: \"$ac_compile\"") >&56625 +if { (eval echo "$as_me:7868: \"$ac_compile\"") >&5 6618 6626 (eval $ac_compile) 2>&5 6619 6627 ac_status=$? 6620 6628 - echo "$as_me:7525: \$? = $ac_status" >&5 6621 + echo "$as_me:787 0: \$? = $ac_status" >&56629 + echo "$as_me:7871: \$? = $ac_status" >&5 6622 6630 (exit $ac_status); } && 6623 6631 { ac_try='test -s conftest.$ac_objext' 6624 6632 - { (eval echo "$as_me:7528: \"$ac_try\"") >&5 6625 + { (eval echo "$as_me:787 3: \"$ac_try\"") >&56633 + { (eval echo "$as_me:7874: \"$ac_try\"") >&5 6626 6634 (eval $ac_try) 2>&5 6627 6635 ac_status=$? 6628 6636 - echo "$as_me:7531: \$? = $ac_status" >&5 6629 + echo "$as_me:787 6: \$? = $ac_status" >&56637 + echo "$as_me:7877: \$? = $ac_status" >&5 6630 6638 (exit $ac_status); }; }; then 6631 6639 cf_cv_mbstate_t=yes 6632 6640 else 6633 @@ -7540,7 +788 5,7 @@6641 @@ -7540,7 +7886,7 @@ 6634 6642 fi 6635 6643 rm -f conftest.$ac_objext conftest.$ac_ext 6636 6644 fi 6637 6645 -echo "$as_me:7543: result: $cf_cv_mbstate_t" >&5 6638 +echo "$as_me:788 8: result: $cf_cv_mbstate_t" >&56646 +echo "$as_me:7889: result: $cf_cv_mbstate_t" >&5 6639 6647 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 6640 6648 6641 6649 if test "$cf_cv_mbstate_t" = yes ; then 6642 @@ -7557,14 +790 2,14 @@6650 @@ -7557,14 +7903,14 @@ 6643 6651 fi 6644 6652 6645 6653 # This is needed on Tru64 5.0 to declare wchar_t 6646 6654 -echo "$as_me:7560: checking if we must include wchar.h to declare wchar_t" >&5 6647 +echo "$as_me:790 5: checking if we must include wchar.h to declare wchar_t" >&56655 +echo "$as_me:7906: checking if we must include wchar.h to declare wchar_t" >&5 6648 6656 echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6 6649 6657 if test "${cf_cv_wchar_t+set}" = set; then … … 6653 6661 cat >conftest.$ac_ext <<_ACEOF 6654 6662 -#line 7567 "configure" 6655 +#line 791 2"configure"6663 +#line 7913 "configure" 6656 6664 #include "confdefs.h" 6657 6665 6658 6666 #include <stdlib.h> 6659 @@ -7582,23 +792 7,23 @@6667 @@ -7582,23 +7928,23 @@ 6660 6668 } 6661 6669 _ACEOF 6662 6670 rm -f conftest.$ac_objext 6663 6671 -if { (eval echo "$as_me:7585: \"$ac_compile\"") >&5 6664 +if { (eval echo "$as_me:793 0: \"$ac_compile\"") >&56672 +if { (eval echo "$as_me:7931: \"$ac_compile\"") >&5 6665 6673 (eval $ac_compile) 2>&5 6666 6674 ac_status=$? 6667 6675 - echo "$as_me:7588: \$? = $ac_status" >&5 6668 + echo "$as_me:793 3: \$? = $ac_status" >&56676 + echo "$as_me:7934: \$? = $ac_status" >&5 6669 6677 (exit $ac_status); } && 6670 6678 { ac_try='test -s conftest.$ac_objext' 6671 6679 - { (eval echo "$as_me:7591: \"$ac_try\"") >&5 6672 + { (eval echo "$as_me:793 6: \"$ac_try\"") >&56680 + { (eval echo "$as_me:7937: \"$ac_try\"") >&5 6673 6681 (eval $ac_try) 2>&5 6674 6682 ac_status=$? 6675 6683 - echo "$as_me:7594: \$? = $ac_status" >&5 6676 + echo "$as_me:79 39: \$? = $ac_status" >&56684 + echo "$as_me:7940: \$? = $ac_status" >&5 6677 6685 (exit $ac_status); }; }; then 6678 6686 cf_cv_wchar_t=no … … 6682 6690 cat >conftest.$ac_ext <<_ACEOF 6683 6691 -#line 7601 "configure" 6684 +#line 794 6"configure"6692 +#line 7947 "configure" 6685 6693 #include "confdefs.h" 6686 6694 6687 6695 #include <stdlib.h> 6688 @@ -7617,16 +796 2,16 @@6696 @@ -7617,16 +7963,16 @@ 6689 6697 } 6690 6698 _ACEOF 6691 6699 rm -f conftest.$ac_objext 6692 6700 -if { (eval echo "$as_me:7620: \"$ac_compile\"") >&5 6693 +if { (eval echo "$as_me:796 5: \"$ac_compile\"") >&56701 +if { (eval echo "$as_me:7966: \"$ac_compile\"") >&5 6694 6702 (eval $ac_compile) 2>&5 6695 6703 ac_status=$? 6696 6704 - echo "$as_me:7623: \$? = $ac_status" >&5 6697 + echo "$as_me:796 8: \$? = $ac_status" >&56705 + echo "$as_me:7969: \$? = $ac_status" >&5 6698 6706 (exit $ac_status); } && 6699 6707 { ac_try='test -s conftest.$ac_objext' 6700 6708 - { (eval echo "$as_me:7626: \"$ac_try\"") >&5 6701 + { (eval echo "$as_me:797 1: \"$ac_try\"") >&56709 + { (eval echo "$as_me:7972: \"$ac_try\"") >&5 6702 6710 (eval $ac_try) 2>&5 6703 6711 ac_status=$? 6704 6712 - echo "$as_me:7629: \$? = $ac_status" >&5 6705 + echo "$as_me:797 4: \$? = $ac_status" >&56713 + echo "$as_me:7975: \$? = $ac_status" >&5 6706 6714 (exit $ac_status); }; }; then 6707 6715 cf_cv_wchar_t=yes 6708 6716 else 6709 @@ -7638,7 +798 3,7 @@6717 @@ -7638,7 +7984,7 @@ 6710 6718 fi 6711 6719 rm -f conftest.$ac_objext conftest.$ac_ext 6712 6720 fi 6713 6721 -echo "$as_me:7641: result: $cf_cv_wchar_t" >&5 6714 +echo "$as_me:798 6: result: $cf_cv_wchar_t" >&56722 +echo "$as_me:7987: result: $cf_cv_wchar_t" >&5 6715 6723 echo "${ECHO_T}$cf_cv_wchar_t" >&6 6716 6724 6717 6725 if test "$cf_cv_wchar_t" = yes ; then 6718 @@ -7660,14 +800 5,14 @@6726 @@ -7660,14 +8006,14 @@ 6719 6727 fi 6720 6728 6721 6729 # This is needed on Tru64 5.0 to declare wint_t 6722 6730 -echo "$as_me:7663: checking if we must include wchar.h to declare wint_t" >&5 6723 +echo "$as_me:800 8: checking if we must include wchar.h to declare wint_t" >&56731 +echo "$as_me:8009: checking if we must include wchar.h to declare wint_t" >&5 6724 6732 echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6 6725 6733 if test "${cf_cv_wint_t+set}" = set; then … … 6729 6737 cat >conftest.$ac_ext <<_ACEOF 6730 6738 -#line 7670 "configure" 6731 +#line 801 5"configure"6739 +#line 8016 "configure" 6732 6740 #include "confdefs.h" 6733 6741 6734 6742 #include <stdlib.h> 6735 @@ -7685,23 +803 0,23 @@6743 @@ -7685,23 +8031,23 @@ 6736 6744 } 6737 6745 _ACEOF 6738 6746 rm -f conftest.$ac_objext 6739 6747 -if { (eval echo "$as_me:7688: \"$ac_compile\"") >&5 6740 +if { (eval echo "$as_me:803 3: \"$ac_compile\"") >&56748 +if { (eval echo "$as_me:8034: \"$ac_compile\"") >&5 6741 6749 (eval $ac_compile) 2>&5 6742 6750 ac_status=$? 6743 6751 - echo "$as_me:7691: \$? = $ac_status" >&5 6744 + echo "$as_me:803 6: \$? = $ac_status" >&56752 + echo "$as_me:8037: \$? = $ac_status" >&5 6745 6753 (exit $ac_status); } && 6746 6754 { ac_try='test -s conftest.$ac_objext' 6747 6755 - { (eval echo "$as_me:7694: \"$ac_try\"") >&5 6748 + { (eval echo "$as_me:80 39: \"$ac_try\"") >&56756 + { (eval echo "$as_me:8040: \"$ac_try\"") >&5 6749 6757 (eval $ac_try) 2>&5 6750 6758 ac_status=$? 6751 6759 - echo "$as_me:7697: \$? = $ac_status" >&5 6752 + echo "$as_me:804 2: \$? = $ac_status" >&56760 + echo "$as_me:8043: \$? = $ac_status" >&5 6753 6761 (exit $ac_status); }; }; then 6754 6762 cf_cv_wint_t=no … … 6758 6766 cat >conftest.$ac_ext <<_ACEOF 6759 6767 -#line 7704 "configure" 6760 +#line 80 49"configure"6768 +#line 8050 "configure" 6761 6769 #include "confdefs.h" 6762 6770 6763 6771 #include <stdlib.h> 6764 @@ -7720,16 +806 5,16 @@6772 @@ -7720,16 +8066,16 @@ 6765 6773 } 6766 6774 _ACEOF 6767 6775 rm -f conftest.$ac_objext 6768 6776 -if { (eval echo "$as_me:7723: \"$ac_compile\"") >&5 6769 +if { (eval echo "$as_me:806 8: \"$ac_compile\"") >&56777 +if { (eval echo "$as_me:8069: \"$ac_compile\"") >&5 6770 6778 (eval $ac_compile) 2>&5 6771 6779 ac_status=$? 6772 6780 - echo "$as_me:7726: \$? = $ac_status" >&5 6773 + echo "$as_me:807 1: \$? = $ac_status" >&56781 + echo "$as_me:8072: \$? = $ac_status" >&5 6774 6782 (exit $ac_status); } && 6775 6783 { ac_try='test -s conftest.$ac_objext' 6776 6784 - { (eval echo "$as_me:7729: \"$ac_try\"") >&5 6777 + { (eval echo "$as_me:807 4: \"$ac_try\"") >&56785 + { (eval echo "$as_me:8075: \"$ac_try\"") >&5 6778 6786 (eval $ac_try) 2>&5 6779 6787 ac_status=$? 6780 6788 - echo "$as_me:7732: \$? = $ac_status" >&5 6781 + echo "$as_me:807 7: \$? = $ac_status" >&56789 + echo "$as_me:8078: \$? = $ac_status" >&5 6782 6790 (exit $ac_status); }; }; then 6783 6791 cf_cv_wint_t=yes 6784 6792 else 6785 @@ -7741,7 +808 6,7 @@6793 @@ -7741,7 +8087,7 @@ 6786 6794 fi 6787 6795 rm -f conftest.$ac_objext conftest.$ac_ext 6788 6796 fi 6789 6797 -echo "$as_me:7744: result: $cf_cv_wint_t" >&5 6790 +echo "$as_me:80 89: result: $cf_cv_wint_t" >&56798 +echo "$as_me:8090: result: $cf_cv_wint_t" >&5 6791 6799 echo "${ECHO_T}$cf_cv_wint_t" >&6 6792 6800 6793 6801 if test "$cf_cv_wint_t" = yes ; then 6794 @@ -7780,7 +812 5,7 @@6802 @@ -7780,7 +8126,7 @@ 6795 6803 ;; 6796 6804 esac 6797 6805 6798 6806 -echo "$as_me:7783: checking whether to enable _LP64 definition in curses.h" >&5 6799 +echo "$as_me:812 8: checking whether to enable _LP64 definition in curses.h" >&56807 +echo "$as_me:8129: checking whether to enable _LP64 definition in curses.h" >&5 6800 6808 echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6 6801 6809 6802 6810 # Check whether --enable-lp64 or --disable-lp64 was given. 6803 @@ -7790,7 +813 5,7 @@6811 @@ -7790,7 +8136,7 @@ 6804 6812 else 6805 6813 with_lp64=$default_with_lp64 6806 6814 fi; 6807 6815 -echo "$as_me:7793: result: $with_lp64" >&5 6808 +echo "$as_me:813 8: result: $with_lp64" >&56816 +echo "$as_me:8139: result: $with_lp64" >&5 6809 6817 echo "${ECHO_T}$with_lp64" >&6 6810 6818 6811 6819 if test "$with_lp64" = yes ; then 6812 @@ -7806,7 +815 1,7 @@6820 @@ -7806,7 +8152,7 @@ 6813 6821 fi; 6814 6822 if test "$enable_largefile" != no; then 6815 6823 6816 6824 - echo "$as_me:7809: checking for special C compiler options needed for large files" >&5 6817 + echo "$as_me:815 4: checking for special C compiler options needed for large files" >&56825 + echo "$as_me:8155: checking for special C compiler options needed for large files" >&5 6818 6826 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 6819 6827 if test "${ac_cv_sys_largefile_CC+set}" = set; then 6820 6828 echo $ECHO_N "(cached) $ECHO_C" >&6 6821 @@ -7818,7 +816 3,7 @@6829 @@ -7818,7 +8164,7 @@ 6822 6830 # IRIX 6.2 and later do not support large files by default, 6823 6831 # so use the C compiler's -n32 option if that helps. 6824 6832 cat >conftest.$ac_ext <<_ACEOF 6825 6833 -#line 7821 "configure" 6826 +#line 816 6"configure"6834 +#line 8167 "configure" 6827 6835 #include "confdefs.h" 6828 6836 #include <sys/types.h> 6829 6837 /* Check that off_t can represent 2**63 - 1 correctly. 6830 @@ -7838,16 +818 3,16 @@6838 @@ -7838,16 +8184,16 @@ 6831 6839 } 6832 6840 _ACEOF 6833 6841 rm -f conftest.$ac_objext 6834 6842 -if { (eval echo "$as_me:7841: \"$ac_compile\"") >&5 6835 +if { (eval echo "$as_me:818 6: \"$ac_compile\"") >&56843 +if { (eval echo "$as_me:8187: \"$ac_compile\"") >&5 6836 6844 (eval $ac_compile) 2>&5 6837 6845 ac_status=$? 6838 6846 - echo "$as_me:7844: \$? = $ac_status" >&5 6839 + echo "$as_me:81 89: \$? = $ac_status" >&56847 + echo "$as_me:8190: \$? = $ac_status" >&5 6840 6848 (exit $ac_status); } && 6841 6849 { ac_try='test -s conftest.$ac_objext' 6842 6850 - { (eval echo "$as_me:7847: \"$ac_try\"") >&5 6843 + { (eval echo "$as_me:819 2: \"$ac_try\"") >&56851 + { (eval echo "$as_me:8193: \"$ac_try\"") >&5 6844 6852 (eval $ac_try) 2>&5 6845 6853 ac_status=$? 6846 6854 - echo "$as_me:7850: \$? = $ac_status" >&5 6847 + echo "$as_me:819 5: \$? = $ac_status" >&56855 + echo "$as_me:8196: \$? = $ac_status" >&5 6848 6856 (exit $ac_status); }; }; then 6849 6857 break 6850 6858 else 6851 @@ -7857,16 +820 2,16 @@6859 @@ -7857,16 +8203,16 @@ 6852 6860 rm -f conftest.$ac_objext 6853 6861 CC="$CC -n32" 6854 6862 rm -f conftest.$ac_objext 6855 6863 -if { (eval echo "$as_me:7860: \"$ac_compile\"") >&5 6856 +if { (eval echo "$as_me:820 5: \"$ac_compile\"") >&56864 +if { (eval echo "$as_me:8206: \"$ac_compile\"") >&5 6857 6865 (eval $ac_compile) 2>&5 6858 6866 ac_status=$? 6859 6867 - echo "$as_me:7863: \$? = $ac_status" >&5 6860 + echo "$as_me:820 8: \$? = $ac_status" >&56868 + echo "$as_me:8209: \$? = $ac_status" >&5 6861 6869 (exit $ac_status); } && 6862 6870 { ac_try='test -s conftest.$ac_objext' 6863 6871 - { (eval echo "$as_me:7866: \"$ac_try\"") >&5 6864 + { (eval echo "$as_me:821 1: \"$ac_try\"") >&56872 + { (eval echo "$as_me:8212: \"$ac_try\"") >&5 6865 6873 (eval $ac_try) 2>&5 6866 6874 ac_status=$? 6867 6875 - echo "$as_me:7869: \$? = $ac_status" >&5 6868 + echo "$as_me:821 4: \$? = $ac_status" >&56876 + echo "$as_me:8215: \$? = $ac_status" >&5 6869 6877 (exit $ac_status); }; }; then 6870 6878 ac_cv_sys_largefile_CC=' -n32'; break 6871 6879 else 6872 @@ -7880,13 +822 5,13 @@6880 @@ -7880,13 +8226,13 @@ 6873 6881 rm -f conftest.$ac_ext 6874 6882 fi 6875 6883 fi 6876 6884 -echo "$as_me:7883: result: $ac_cv_sys_largefile_CC" >&5 6877 +echo "$as_me:822 8: result: $ac_cv_sys_largefile_CC" >&56885 +echo "$as_me:8229: result: $ac_cv_sys_largefile_CC" >&5 6878 6886 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 6879 6887 if test "$ac_cv_sys_largefile_CC" != no; then … … 6882 6890 6883 6891 - echo "$as_me:7889: checking for _FILE_OFFSET_BITS value needed for large files" >&5 6884 + echo "$as_me:823 4: checking for _FILE_OFFSET_BITS value needed for large files" >&56892 + echo "$as_me:8235: checking for _FILE_OFFSET_BITS value needed for large files" >&5 6885 6893 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 6886 6894 if test "${ac_cv_sys_file_offset_bits+set}" = set; then 6887 6895 echo $ECHO_N "(cached) $ECHO_C" >&6 6888 @@ -7894,7 +82 39,7 @@6896 @@ -7894,7 +8240,7 @@ 6889 6897 while :; do 6890 6898 ac_cv_sys_file_offset_bits=no 6891 6899 cat >conftest.$ac_ext <<_ACEOF 6892 6900 -#line 7897 "configure" 6893 +#line 824 2"configure"6901 +#line 8243 "configure" 6894 6902 #include "confdefs.h" 6895 6903 #include <sys/types.h> 6896 6904 /* Check that off_t can represent 2**63 - 1 correctly. 6897 @@ -7914,16 +82 59,16 @@6905 @@ -7914,16 +8260,16 @@ 6898 6906 } 6899 6907 _ACEOF 6900 6908 rm -f conftest.$ac_objext 6901 6909 -if { (eval echo "$as_me:7917: \"$ac_compile\"") >&5 6902 +if { (eval echo "$as_me:826 2: \"$ac_compile\"") >&56910 +if { (eval echo "$as_me:8263: \"$ac_compile\"") >&5 6903 6911 (eval $ac_compile) 2>&5 6904 6912 ac_status=$? 6905 6913 - echo "$as_me:7920: \$? = $ac_status" >&5 6906 + echo "$as_me:826 5: \$? = $ac_status" >&56914 + echo "$as_me:8266: \$? = $ac_status" >&5 6907 6915 (exit $ac_status); } && 6908 6916 { ac_try='test -s conftest.$ac_objext' 6909 6917 - { (eval echo "$as_me:7923: \"$ac_try\"") >&5 6910 + { (eval echo "$as_me:826 8: \"$ac_try\"") >&56918 + { (eval echo "$as_me:8269: \"$ac_try\"") >&5 6911 6919 (eval $ac_try) 2>&5 6912 6920 ac_status=$? 6913 6921 - echo "$as_me:7926: \$? = $ac_status" >&5 6914 + echo "$as_me:827 1: \$? = $ac_status" >&56922 + echo "$as_me:8272: \$? = $ac_status" >&5 6915 6923 (exit $ac_status); }; }; then 6916 6924 break 6917 6925 else 6918 @@ -7932,7 +827 7,7 @@6926 @@ -7932,7 +8278,7 @@ 6919 6927 fi 6920 6928 rm -f conftest.$ac_objext conftest.$ac_ext 6921 6929 cat >conftest.$ac_ext <<_ACEOF 6922 6930 -#line 7935 "configure" 6923 +#line 828 0"configure"6931 +#line 8281 "configure" 6924 6932 #include "confdefs.h" 6925 6933 #define _FILE_OFFSET_BITS 64 6926 6934 #include <sys/types.h> 6927 @@ -7953,16 +829 8,16 @@6935 @@ -7953,16 +8299,16 @@ 6928 6936 } 6929 6937 _ACEOF 6930 6938 rm -f conftest.$ac_objext 6931 6939 -if { (eval echo "$as_me:7956: \"$ac_compile\"") >&5 6932 +if { (eval echo "$as_me:830 1: \"$ac_compile\"") >&56940 +if { (eval echo "$as_me:8302: \"$ac_compile\"") >&5 6933 6941 (eval $ac_compile) 2>&5 6934 6942 ac_status=$? 6935 6943 - echo "$as_me:7959: \$? = $ac_status" >&5 6936 + echo "$as_me:830 4: \$? = $ac_status" >&56944 + echo "$as_me:8305: \$? = $ac_status" >&5 6937 6945 (exit $ac_status); } && 6938 6946 { ac_try='test -s conftest.$ac_objext' 6939 6947 - { (eval echo "$as_me:7962: \"$ac_try\"") >&5 6940 + { (eval echo "$as_me:830 7: \"$ac_try\"") >&56948 + { (eval echo "$as_me:8308: \"$ac_try\"") >&5 6941 6949 (eval $ac_try) 2>&5 6942 6950 ac_status=$? 6943 6951 - echo "$as_me:7965: \$? = $ac_status" >&5 6944 + echo "$as_me:831 0: \$? = $ac_status" >&56952 + echo "$as_me:8311: \$? = $ac_status" >&5 6945 6953 (exit $ac_status); }; }; then 6946 6954 ac_cv_sys_file_offset_bits=64; break 6947 6955 else 6948 @@ -7973,7 +831 8,7 @@6956 @@ -7973,7 +8319,7 @@ 6949 6957 break 6950 6958 done 6951 6959 fi 6952 6960 -echo "$as_me:7976: result: $ac_cv_sys_file_offset_bits" >&5 6953 +echo "$as_me:832 1: result: $ac_cv_sys_file_offset_bits" >&56961 +echo "$as_me:8322: result: $ac_cv_sys_file_offset_bits" >&5 6954 6962 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 6955 6963 if test "$ac_cv_sys_file_offset_bits" != no; then 6956 6964 6957 @@ -7983,7 +832 8,7 @@6965 @@ -7983,7 +8329,7 @@ 6958 6966 6959 6967 fi 6960 6968 rm -f conftest* 6961 6969 - echo "$as_me:7986: checking for _LARGE_FILES value needed for large files" >&5 6962 + echo "$as_me:833 1: checking for _LARGE_FILES value needed for large files" >&56970 + echo "$as_me:8332: checking for _LARGE_FILES value needed for large files" >&5 6963 6971 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 6964 6972 if test "${ac_cv_sys_large_files+set}" = set; then 6965 6973 echo $ECHO_N "(cached) $ECHO_C" >&6 6966 @@ -7991,7 +833 6,7 @@6974 @@ -7991,7 +8337,7 @@ 6967 6975 while :; do 6968 6976 ac_cv_sys_large_files=no 6969 6977 cat >conftest.$ac_ext <<_ACEOF 6970 6978 -#line 7994 "configure" 6971 +#line 83 39"configure"6979 +#line 8340 "configure" 6972 6980 #include "confdefs.h" 6973 6981 #include <sys/types.h> 6974 6982 /* Check that off_t can represent 2**63 - 1 correctly. 6975 @@ -8011,16 +835 6,16 @@6983 @@ -8011,16 +8357,16 @@ 6976 6984 } 6977 6985 _ACEOF 6978 6986 rm -f conftest.$ac_objext 6979 6987 -if { (eval echo "$as_me:8014: \"$ac_compile\"") >&5 6980 +if { (eval echo "$as_me:83 59: \"$ac_compile\"") >&56988 +if { (eval echo "$as_me:8360: \"$ac_compile\"") >&5 6981 6989 (eval $ac_compile) 2>&5 6982 6990 ac_status=$? 6983 6991 - echo "$as_me:8017: \$? = $ac_status" >&5 6984 + echo "$as_me:836 2: \$? = $ac_status" >&56992 + echo "$as_me:8363: \$? = $ac_status" >&5 6985 6993 (exit $ac_status); } && 6986 6994 { ac_try='test -s conftest.$ac_objext' 6987 6995 - { (eval echo "$as_me:8020: \"$ac_try\"") >&5 6988 + { (eval echo "$as_me:836 5: \"$ac_try\"") >&56996 + { (eval echo "$as_me:8366: \"$ac_try\"") >&5 6989 6997 (eval $ac_try) 2>&5 6990 6998 ac_status=$? 6991 6999 - echo "$as_me:8023: \$? = $ac_status" >&5 6992 + echo "$as_me:836 8: \$? = $ac_status" >&57000 + echo "$as_me:8369: \$? = $ac_status" >&5 6993 7001 (exit $ac_status); }; }; then 6994 7002 break 6995 7003 else 6996 @@ -8029,7 +837 4,7 @@7004 @@ -8029,7 +8375,7 @@ 6997 7005 fi 6998 7006 rm -f conftest.$ac_objext conftest.$ac_ext 6999 7007 cat >conftest.$ac_ext <<_ACEOF 7000 7008 -#line 8032 "configure" 7001 +#line 837 7"configure"7009 +#line 8378 "configure" 7002 7010 #include "confdefs.h" 7003 7011 #define _LARGE_FILES 1 7004 7012 #include <sys/types.h> 7005 @@ -8050,16 +839 5,16 @@7013 @@ -8050,16 +8396,16 @@ 7006 7014 } 7007 7015 _ACEOF 7008 7016 rm -f conftest.$ac_objext 7009 7017 -if { (eval echo "$as_me:8053: \"$ac_compile\"") >&5 7010 +if { (eval echo "$as_me:839 8: \"$ac_compile\"") >&57018 +if { (eval echo "$as_me:8399: \"$ac_compile\"") >&5 7011 7019 (eval $ac_compile) 2>&5 7012 7020 ac_status=$? 7013 7021 - echo "$as_me:8056: \$? = $ac_status" >&5 7014 + echo "$as_me:840 1: \$? = $ac_status" >&57022 + echo "$as_me:8402: \$? = $ac_status" >&5 7015 7023 (exit $ac_status); } && 7016 7024 { ac_try='test -s conftest.$ac_objext' 7017 7025 - { (eval echo "$as_me:8059: \"$ac_try\"") >&5 7018 + { (eval echo "$as_me:840 4: \"$ac_try\"") >&57026 + { (eval echo "$as_me:8405: \"$ac_try\"") >&5 7019 7027 (eval $ac_try) 2>&5 7020 7028 ac_status=$? 7021 7029 - echo "$as_me:8062: \$? = $ac_status" >&5 7022 + echo "$as_me:840 7: \$? = $ac_status" >&57030 + echo "$as_me:8408: \$? = $ac_status" >&5 7023 7031 (exit $ac_status); }; }; then 7024 7032 ac_cv_sys_large_files=1; break 7025 7033 else 7026 @@ -8070,7 +841 5,7 @@7034 @@ -8070,7 +8416,7 @@ 7027 7035 break 7028 7036 done 7029 7037 fi 7030 7038 -echo "$as_me:8073: result: $ac_cv_sys_large_files" >&5 7031 +echo "$as_me:841 8: result: $ac_cv_sys_large_files" >&57039 +echo "$as_me:8419: result: $ac_cv_sys_large_files" >&5 7032 7040 echo "${ECHO_T}$ac_cv_sys_large_files" >&6 7033 7041 if test "$ac_cv_sys_large_files" != no; then 7034 7042 7035 @@ -8083,7 +842 8,7 @@7043 @@ -8083,7 +8429,7 @@ 7036 7044 fi 7037 7045 7038 7046 if test "$enable_largefile" != no ; then 7039 7047 - echo "$as_me:8086: checking for _LARGEFILE_SOURCE value needed for large files" >&5 7040 + echo "$as_me:843 1: checking for _LARGEFILE_SOURCE value needed for large files" >&57048 + echo "$as_me:8432: checking for _LARGEFILE_SOURCE value needed for large files" >&5 7041 7049 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 7042 7050 if test "${ac_cv_sys_largefile_source+set}" = set; then 7043 7051 echo $ECHO_N "(cached) $ECHO_C" >&6 7044 @@ -8091,7 +843 6,7 @@7052 @@ -8091,7 +8437,7 @@ 7045 7053 while :; do 7046 7054 ac_cv_sys_largefile_source=no 7047 7055 cat >conftest.$ac_ext <<_ACEOF 7048 7056 -#line 8094 "configure" 7049 +#line 84 39"configure"7057 +#line 8440 "configure" 7050 7058 #include "confdefs.h" 7051 7059 #include <stdio.h> 7052 7060 int 7053 @@ -8103,16 +844 8,16 @@7061 @@ -8103,16 +8449,16 @@ 7054 7062 } 7055 7063 _ACEOF 7056 7064 rm -f conftest.$ac_objext 7057 7065 -if { (eval echo "$as_me:8106: \"$ac_compile\"") >&5 7058 +if { (eval echo "$as_me:845 1: \"$ac_compile\"") >&57066 +if { (eval echo "$as_me:8452: \"$ac_compile\"") >&5 7059 7067 (eval $ac_compile) 2>&5 7060 7068 ac_status=$? 7061 7069 - echo "$as_me:8109: \$? = $ac_status" >&5 7062 + echo "$as_me:845 4: \$? = $ac_status" >&57070 + echo "$as_me:8455: \$? = $ac_status" >&5 7063 7071 (exit $ac_status); } && 7064 7072 { ac_try='test -s conftest.$ac_objext' 7065 7073 - { (eval echo "$as_me:8112: \"$ac_try\"") >&5 7066 + { (eval echo "$as_me:845 7: \"$ac_try\"") >&57074 + { (eval echo "$as_me:8458: \"$ac_try\"") >&5 7067 7075 (eval $ac_try) 2>&5 7068 7076 ac_status=$? 7069 7077 - echo "$as_me:8115: \$? = $ac_status" >&5 7070 + echo "$as_me:846 0: \$? = $ac_status" >&57078 + echo "$as_me:8461: \$? = $ac_status" >&5 7071 7079 (exit $ac_status); }; }; then 7072 7080 break 7073 7081 else 7074 @@ -8121,7 +846 6,7 @@7082 @@ -8121,7 +8467,7 @@ 7075 7083 fi 7076 7084 rm -f conftest.$ac_objext conftest.$ac_ext 7077 7085 cat >conftest.$ac_ext <<_ACEOF 7078 7086 -#line 8124 "configure" 7079 +#line 84 69"configure"7087 +#line 8470 "configure" 7080 7088 #include "confdefs.h" 7081 7089 #define _LARGEFILE_SOURCE 1 7082 7090 #include <stdio.h> 7083 @@ -8134,16 +84 79,16 @@7091 @@ -8134,16 +8480,16 @@ 7084 7092 } 7085 7093 _ACEOF 7086 7094 rm -f conftest.$ac_objext 7087 7095 -if { (eval echo "$as_me:8137: \"$ac_compile\"") >&5 7088 +if { (eval echo "$as_me:848 2: \"$ac_compile\"") >&57096 +if { (eval echo "$as_me:8483: \"$ac_compile\"") >&5 7089 7097 (eval $ac_compile) 2>&5 7090 7098 ac_status=$? 7091 7099 - echo "$as_me:8140: \$? = $ac_status" >&5 7092 + echo "$as_me:848 5: \$? = $ac_status" >&57100 + echo "$as_me:8486: \$? = $ac_status" >&5 7093 7101 (exit $ac_status); } && 7094 7102 { ac_try='test -s conftest.$ac_objext' 7095 7103 - { (eval echo "$as_me:8143: \"$ac_try\"") >&5 7096 + { (eval echo "$as_me:848 8: \"$ac_try\"") >&57104 + { (eval echo "$as_me:8489: \"$ac_try\"") >&5 7097 7105 (eval $ac_try) 2>&5 7098 7106 ac_status=$? 7099 7107 - echo "$as_me:8146: \$? = $ac_status" >&5 7100 + echo "$as_me:849 1: \$? = $ac_status" >&57108 + echo "$as_me:8492: \$? = $ac_status" >&5 7101 7109 (exit $ac_status); }; }; then 7102 7110 ac_cv_sys_largefile_source=1; break 7103 7111 else 7104 @@ -8154,7 +8 499,7 @@7112 @@ -8154,7 +8500,7 @@ 7105 7113 break 7106 7114 done 7107 7115 fi 7108 7116 -echo "$as_me:8157: result: $ac_cv_sys_largefile_source" >&5 7109 +echo "$as_me:850 2: result: $ac_cv_sys_largefile_source" >&57117 +echo "$as_me:8503: result: $ac_cv_sys_largefile_source" >&5 7110 7118 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 7111 7119 if test "$ac_cv_sys_largefile_source" != no; then 7112 7120 7113 @@ -8168,13 +851 3,13 @@7121 @@ -8168,13 +8514,13 @@ 7114 7122 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug 7115 7123 # in glibc 2.1.3, but that breaks too many other things. 7116 7124 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. 7117 7125 -echo "$as_me:8171: checking for fseeko" >&5 7118 +echo "$as_me:851 6: checking for fseeko" >&57126 +echo "$as_me:8517: checking for fseeko" >&5 7119 7127 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 7120 7128 if test "${ac_cv_func_fseeko+set}" = set; then … … 7123 7131 cat >conftest.$ac_ext <<_ACEOF 7124 7132 -#line 8177 "configure" 7125 +#line 852 2"configure"7133 +#line 8523 "configure" 7126 7134 #include "confdefs.h" 7127 7135 #include <stdio.h> 7128 7136 int 7129 @@ -8186,16 +853 1,16 @@7137 @@ -8186,16 +8532,16 @@ 7130 7138 } 7131 7139 _ACEOF 7132 7140 rm -f conftest.$ac_objext conftest$ac_exeext 7133 7141 -if { (eval echo "$as_me:8189: \"$ac_link\"") >&5 7134 +if { (eval echo "$as_me:853 4: \"$ac_link\"") >&57142 +if { (eval echo "$as_me:8535: \"$ac_link\"") >&5 7135 7143 (eval $ac_link) 2>&5 7136 7144 ac_status=$? 7137 7145 - echo "$as_me:8192: \$? = $ac_status" >&5 7138 + echo "$as_me:853 7: \$? = $ac_status" >&57146 + echo "$as_me:8538: \$? = $ac_status" >&5 7139 7147 (exit $ac_status); } && 7140 7148 { ac_try='test -s conftest$ac_exeext' 7141 7149 - { (eval echo "$as_me:8195: \"$ac_try\"") >&5 7142 + { (eval echo "$as_me:854 0: \"$ac_try\"") >&57150 + { (eval echo "$as_me:8541: \"$ac_try\"") >&5 7143 7151 (eval $ac_try) 2>&5 7144 7152 ac_status=$? 7145 7153 - echo "$as_me:8198: \$? = $ac_status" >&5 7146 + echo "$as_me:854 3: \$? = $ac_status" >&57154 + echo "$as_me:8544: \$? = $ac_status" >&5 7147 7155 (exit $ac_status); }; }; then 7148 7156 ac_cv_func_fseeko=yes 7149 7157 else 7150 @@ -8205,7 +855 0,7 @@7158 @@ -8205,7 +8551,7 @@ 7151 7159 fi 7152 7160 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 7153 7161 fi 7154 7162 -echo "$as_me:8208: result: $ac_cv_func_fseeko" >&5 7155 +echo "$as_me:855 3: result: $ac_cv_func_fseeko" >&57163 +echo "$as_me:8554: result: $ac_cv_func_fseeko" >&5 7156 7164 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 7157 7165 if test $ac_cv_func_fseeko = yes; then 7158 7166 7159 @@ -8226,14 +857 1,14 @@7167 @@ -8226,14 +8572,14 @@ 7160 7168 test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE " 7161 7169 test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits " 7162 7170 7163 7171 - echo "$as_me:8229: checking whether to use struct dirent64" >&5 7164 + echo "$as_me:857 4: checking whether to use struct dirent64" >&57172 + echo "$as_me:8575: checking whether to use struct dirent64" >&5 7165 7173 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 7166 7174 if test "${cf_cv_struct_dirent64+set}" = set; then … … 7170 7178 cat >conftest.$ac_ext <<_ACEOF 7171 7179 -#line 8236 "configure" 7172 +#line 858 1"configure"7180 +#line 8582 "configure" 7173 7181 #include "confdefs.h" 7174 7182 7175 7183 #include <sys/types.h> 7176 @@ -8254,16 +8 599,16 @@7184 @@ -8254,16 +8600,16 @@ 7177 7185 } 7178 7186 _ACEOF 7179 7187 rm -f conftest.$ac_objext 7180 7188 -if { (eval echo "$as_me:8257: \"$ac_compile\"") >&5 7181 +if { (eval echo "$as_me:860 2: \"$ac_compile\"") >&57189 +if { (eval echo "$as_me:8603: \"$ac_compile\"") >&5 7182 7190 (eval $ac_compile) 2>&5 7183 7191 ac_status=$? 7184 7192 - echo "$as_me:8260: \$? = $ac_status" >&5 7185 + echo "$as_me:860 5: \$? = $ac_status" >&57193 + echo "$as_me:8606: \$? = $ac_status" >&5 7186 7194 (exit $ac_status); } && 7187 7195 { ac_try='test -s conftest.$ac_objext' 7188 7196 - { (eval echo "$as_me:8263: \"$ac_try\"") >&5 7189 + { (eval echo "$as_me:860 8: \"$ac_try\"") >&57197 + { (eval echo "$as_me:8609: \"$ac_try\"") >&5 7190 7198 (eval $ac_try) 2>&5 7191 7199 ac_status=$? 7192 7200 - echo "$as_me:8266: \$? = $ac_status" >&5 7193 + echo "$as_me:861 1: \$? = $ac_status" >&57201 + echo "$as_me:8612: \$? = $ac_status" >&5 7194 7202 (exit $ac_status); }; }; then 7195 7203 cf_cv_struct_dirent64=yes 7196 7204 else 7197 @@ -8274,7 +86 19,7 @@7205 @@ -8274,7 +8620,7 @@ 7198 7206 rm -f conftest.$ac_objext conftest.$ac_ext 7199 7207 7200 7208 fi 7201 7209 -echo "$as_me:8277: result: $cf_cv_struct_dirent64" >&5 7202 +echo "$as_me:862 2: result: $cf_cv_struct_dirent64" >&57210 +echo "$as_me:8623: result: $cf_cv_struct_dirent64" >&5 7203 7211 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 7204 7212 test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF 7205 7213 #define HAVE_STRUCT_DIRENT64 1 7206 @@ -8283,7 +862 8,7 @@7214 @@ -8283,7 +8629,7 @@ 7207 7215 fi 7208 7216 7209 7217 ### use option --disable-tparm-varargs to make tparm() conform to X/Open 7210 7218 -echo "$as_me:8286: checking if you want tparm not to use X/Open fixed-parameter list" >&5 7211 +echo "$as_me:863 1: checking if you want tparm not to use X/Open fixed-parameter list" >&57219 +echo "$as_me:8632: checking if you want tparm not to use X/Open fixed-parameter list" >&5 7212 7220 echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6 7213 7221 7214 7222 # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given. 7215 @@ -8293,14 +863 8,14 @@7223 @@ -8293,14 +8639,14 @@ 7216 7224 else 7217 7225 with_tparm_varargs=yes 7218 7226 fi; 7219 7227 -echo "$as_me:8296: result: $with_tparm_varargs" >&5 7220 +echo "$as_me:864 1: result: $with_tparm_varargs" >&57228 +echo "$as_me:8642: result: $with_tparm_varargs" >&5 7221 7229 echo "${ECHO_T}$with_tparm_varargs" >&6 7222 7230 NCURSES_TPARM_VARARGS=0 … … 7226 7234 if test "$with_ticlib" != no ; then 7227 7235 -echo "$as_me:8303: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 7228 +echo "$as_me:864 8: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&57236 +echo "$as_me:8649: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 7229 7237 echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6 7230 7238 7231 7239 # Check whether --enable-tic-depends or --disable-tic-depends was given. 7232 @@ -8310,14 +865 5,14 @@7240 @@ -8310,14 +8656,14 @@ 7233 7241 else 7234 7242 with_tic_depends=yes 7235 7243 fi; 7236 7244 -echo "$as_me:8313: result: $with_tic_depends" >&5 7237 +echo "$as_me:865 8: result: $with_tic_depends" >&57245 +echo "$as_me:8659: result: $with_tic_depends" >&5 7238 7246 echo "${ECHO_T}$with_tic_depends" >&6 7239 7247 else … … 7243 7251 ### use option --with-bool to override bool's type 7244 7252 -echo "$as_me:8320: checking for type of bool" >&5 7245 +echo "$as_me:866 5: checking for type of bool" >&57253 +echo "$as_me:8666: checking for type of bool" >&5 7246 7254 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 7247 7255 7248 7256 # Check whether --with-bool or --without-bool was given. 7249 @@ -8327,10 +867 2,10 @@7257 @@ -8327,10 +8673,10 @@ 7250 7258 else 7251 7259 NCURSES_BOOL=auto 7252 7260 fi; 7253 7261 -echo "$as_me:8330: result: $NCURSES_BOOL" >&5 7254 +echo "$as_me:867 5: result: $NCURSES_BOOL" >&57262 +echo "$as_me:8676: result: $NCURSES_BOOL" >&5 7255 7263 echo "${ECHO_T}$NCURSES_BOOL" >&6 7256 7264 7257 7265 -echo "$as_me:8333: checking for alternate terminal capabilities file" >&5 7258 +echo "$as_me:867 8: checking for alternate terminal capabilities file" >&57266 +echo "$as_me:8679: checking for alternate terminal capabilities file" >&5 7259 7267 echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6 7260 7268 7261 7269 # Check whether --with-caps or --without-caps was given. 7262 @@ -8341,11 +868 6,11 @@7270 @@ -8341,11 +8687,11 @@ 7263 7271 TERMINFO_CAPS=Caps 7264 7272 fi; 7265 7273 test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps 7266 7274 -echo "$as_me:8344: result: $TERMINFO_CAPS" >&5 7267 +echo "$as_me:86 89: result: $TERMINFO_CAPS" >&57275 +echo "$as_me:8690: result: $TERMINFO_CAPS" >&5 7268 7276 echo "${ECHO_T}$TERMINFO_CAPS" >&6 7269 7277 7270 7278 ### use option --with-chtype to override chtype's type 7271 7279 -echo "$as_me:8348: checking for type of chtype" >&5 7272 +echo "$as_me:869 3: checking for type of chtype" >&57280 +echo "$as_me:8694: checking for type of chtype" >&5 7273 7281 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 7274 7282 7275 7283 # Check whether --with-chtype or --without-chtype was given. 7276 @@ -8355,11 +870 0,11 @@7284 @@ -8355,11 +8701,11 @@ 7277 7285 else 7278 7286 NCURSES_CHTYPE=auto 7279 7287 fi; 7280 7288 -echo "$as_me:8358: result: $NCURSES_CHTYPE" >&5 7281 +echo "$as_me:870 3: result: $NCURSES_CHTYPE" >&57289 +echo "$as_me:8704: result: $NCURSES_CHTYPE" >&5 7282 7290 echo "${ECHO_T}$NCURSES_CHTYPE" >&6 7283 7291 7284 7292 ### use option --with-ospeed to override ospeed's type 7285 7293 -echo "$as_me:8362: checking for type of ospeed" >&5 7286 +echo "$as_me:870 7: checking for type of ospeed" >&57294 +echo "$as_me:8708: checking for type of ospeed" >&5 7287 7295 echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6 7288 7296 7289 7297 # Check whether --with-ospeed or --without-ospeed was given. 7290 @@ -8369,11 +871 4,11 @@7298 @@ -8369,11 +8715,11 @@ 7291 7299 else 7292 7300 NCURSES_OSPEED=short 7293 7301 fi; 7294 7302 -echo "$as_me:8372: result: $NCURSES_OSPEED" >&5 7295 +echo "$as_me:871 7: result: $NCURSES_OSPEED" >&57303 +echo "$as_me:8718: result: $NCURSES_OSPEED" >&5 7296 7304 echo "${ECHO_T}$NCURSES_OSPEED" >&6 7297 7305 7298 7306 ### use option --with-mmask-t to override mmask_t's type 7299 7307 -echo "$as_me:8376: checking for type of mmask_t" >&5 7300 +echo "$as_me:872 1: checking for type of mmask_t" >&57308 +echo "$as_me:8722: checking for type of mmask_t" >&5 7301 7309 echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6 7302 7310 7303 7311 # Check whether --with-mmask-t or --without-mmask-t was given. 7304 @@ -8383,11 +872 8,11 @@7312 @@ -8383,11 +8729,11 @@ 7305 7313 else 7306 7314 NCURSES_MMASK_T=auto 7307 7315 fi; 7308 7316 -echo "$as_me:8386: result: $NCURSES_MMASK_T" >&5 7309 +echo "$as_me:873 1: result: $NCURSES_MMASK_T" >&57317 +echo "$as_me:8732: result: $NCURSES_MMASK_T" >&5 7310 7318 echo "${ECHO_T}$NCURSES_MMASK_T" >&6 7311 7319 7312 7320 ### Enable compiling-in rcs id's 7313 7321 -echo "$as_me:8390: checking if RCS identifiers should be compiled-in" >&5 7314 +echo "$as_me:873 5: checking if RCS identifiers should be compiled-in" >&57322 +echo "$as_me:8736: checking if RCS identifiers should be compiled-in" >&5 7315 7323 echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 7316 7324 7317 7325 # Check whether --with-rcs-ids or --without-rcs-ids was given. 7318 @@ -8397,7 +874 2,7 @@7326 @@ -8397,7 +8743,7 @@ 7319 7327 else 7320 7328 with_rcs_ids=no 7321 7329 fi; 7322 7330 -echo "$as_me:8400: result: $with_rcs_ids" >&5 7323 +echo "$as_me:874 5: result: $with_rcs_ids" >&57331 +echo "$as_me:8746: result: $with_rcs_ids" >&5 7324 7332 echo "${ECHO_T}$with_rcs_ids" >&6 7325 7333 test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF 7326 7334 #define USE_RCS_IDS 1 7327 @@ -8405,7 +875 0,7 @@7335 @@ -8405,7 +8751,7 @@ 7328 7336 7329 7337 ############################################################################### 7330 7338 7331 7339 -echo "$as_me:8408: checking format of man-pages" >&5 7332 +echo "$as_me:875 3: checking format of man-pages" >&57340 +echo "$as_me:8754: checking format of man-pages" >&5 7333 7341 echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6 7334 7342 7335 7343 # Check whether --with-manpage-format or --without-manpage-format was given. 7336 @@ -8433,7 +877 8,7 @@7344 @@ -8433,7 +8779,7 @@ 7337 7345 cf_catonly=yes 7338 7346 cf_example=date … … 7343 7351 test -z "$cf_dir" && cf_dir=/usr/man 7344 7352 for cf_name in $cf_dir/man*/$cf_example.[01]* $cf_dir/cat*/$cf_example.[01]* $cf_dir/man*/$cf_example $cf_dir/cat*/$cf_example 7345 @@ -8494,14 +88 39,14 @@7353 @@ -8494,14 +8840,14 @@ 7346 7354 ;; 7347 7355 esac 7348 7356 7349 7357 -echo "$as_me:8497: result: $MANPAGE_FORMAT" >&5 7350 +echo "$as_me:884 2: result: $MANPAGE_FORMAT" >&57358 +echo "$as_me:8843: result: $MANPAGE_FORMAT" >&5 7351 7359 echo "${ECHO_T}$MANPAGE_FORMAT" >&6 7352 7360 if test -n "$cf_unknown" ; then 7353 7361 - { echo "$as_me:8500: WARNING: Unexpected manpage-format $cf_unknown" >&5 7354 + { echo "$as_me:884 5: WARNING: Unexpected manpage-format $cf_unknown" >&57362 + { echo "$as_me:8846: WARNING: Unexpected manpage-format $cf_unknown" >&5 7355 7363 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;} 7356 7364 fi 7357 7365 7358 7366 -echo "$as_me:8504: checking for manpage renaming" >&5 7359 +echo "$as_me:88 49: checking for manpage renaming" >&57367 +echo "$as_me:8850: checking for manpage renaming" >&5 7360 7368 echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6 7361 7369 7362 7370 # Check whether --with-manpage-renames or --without-manpage-renames was given. 7363 @@ -8529,7 +887 4,7 @@7371 @@ -8529,7 +8875,7 @@ 7364 7372 if test -f $srcdir/man/$MANPAGE_RENAMES ; then 7365 7373 MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES 7366 7374 elif test ! -f $MANPAGE_RENAMES ; then 7367 7375 - { { echo "$as_me:8532: error: not a filename: $MANPAGE_RENAMES" >&5 7368 + { { echo "$as_me:887 7: error: not a filename: $MANPAGE_RENAMES" >&57376 + { { echo "$as_me:8878: error: not a filename: $MANPAGE_RENAMES" >&5 7369 7377 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} 7370 7378 { (exit 1); exit 1; }; } 7371 7379 fi 7372 @@ -8543,10 +888 8,10 @@7380 @@ -8543,10 +8889,10 @@ 7373 7381 fi 7374 7382 fi 7375 7383 7376 7384 -echo "$as_me:8546: result: $MANPAGE_RENAMES" >&5 7377 +echo "$as_me:889 1: result: $MANPAGE_RENAMES" >&57385 +echo "$as_me:8892: result: $MANPAGE_RENAMES" >&5 7378 7386 echo "${ECHO_T}$MANPAGE_RENAMES" >&6 7379 7387 7380 7388 -echo "$as_me:8549: checking if manpage aliases will be installed" >&5 7381 +echo "$as_me:889 4: checking if manpage aliases will be installed" >&57389 +echo "$as_me:8895: checking if manpage aliases will be installed" >&5 7382 7390 echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6 7383 7391 7384 7392 # Check whether --with-manpage-aliases or --without-manpage-aliases was given. 7385 @@ -8557,7 +890 2,7 @@7393 @@ -8557,7 +8903,7 @@ 7386 7394 MANPAGE_ALIASES=yes 7387 7395 fi; 7388 7396 7389 7397 -echo "$as_me:8560: result: $MANPAGE_ALIASES" >&5 7390 +echo "$as_me:890 5: result: $MANPAGE_ALIASES" >&57398 +echo "$as_me:8906: result: $MANPAGE_ALIASES" >&5 7391 7399 echo "${ECHO_T}$MANPAGE_ALIASES" >&6 7392 7400 7393 7401 if test "$LN_S" = "ln -s"; then 7394 @@ -8568,7 +891 3,7 @@7402 @@ -8568,7 +8914,7 @@ 7395 7403 7396 7404 MANPAGE_SYMLINKS=no 7397 7405 if test "$MANPAGE_ALIASES" = yes ; then 7398 7406 -echo "$as_me:8571: checking if manpage symlinks should be used" >&5 7399 +echo "$as_me:891 6: checking if manpage symlinks should be used" >&57407 +echo "$as_me:8917: checking if manpage symlinks should be used" >&5 7400 7408 echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6 7401 7409 7402 7410 # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given. 7403 @@ -8581,17 +892 6,17 @@7411 @@ -8581,17 +8927,17 @@ 7404 7412 7405 7413 if test "$$cf_use_symlinks" = no; then 7406 7414 if test "$MANPAGE_SYMLINKS" = yes ; then 7407 7415 - { echo "$as_me:8584: WARNING: cannot make symlinks" >&5 7408 + { echo "$as_me:89 29: WARNING: cannot make symlinks" >&57416 + { echo "$as_me:8930: WARNING: cannot make symlinks" >&5 7409 7417 echo "$as_me: WARNING: cannot make symlinks" >&2;} 7410 7418 MANPAGE_SYMLINKS=no … … 7413 7421 7414 7422 -echo "$as_me:8590: result: $MANPAGE_SYMLINKS" >&5 7415 +echo "$as_me:893 5: result: $MANPAGE_SYMLINKS" >&57423 +echo "$as_me:8936: result: $MANPAGE_SYMLINKS" >&5 7416 7424 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6 7417 7425 fi 7418 7426 7419 7427 -echo "$as_me:8594: checking for manpage tbl" >&5 7420 +echo "$as_me:89 39: checking for manpage tbl" >&57428 +echo "$as_me:8940: checking for manpage tbl" >&5 7421 7429 echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6 7422 7430 7423 7431 # Check whether --with-manpage-tbl or --without-manpage-tbl was given. 7424 @@ -8602,7 +894 7,7 @@7432 @@ -8602,7 +8948,7 @@ 7425 7433 MANPAGE_TBL=no 7426 7434 fi; 7427 7435 7428 7436 -echo "$as_me:8605: result: $MANPAGE_TBL" >&5 7429 +echo "$as_me:895 0: result: $MANPAGE_TBL" >&57437 +echo "$as_me:8951: result: $MANPAGE_TBL" >&5 7430 7438 echo "${ECHO_T}$MANPAGE_TBL" >&6 7431 7439 7432 7440 if test "$prefix" = "NONE" ; then 7433 @@ -8718,7 +906 3,7 @@7441 @@ -8718,7 +9064,7 @@ 7434 7442 s,@NCURSES_OSPEED@,\$NCURSES_OSPEED,g 7435 7443 CF_EOF … … 7440 7448 cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 7441 7449 cf_name=`echo $cf_name|sed "$program_transform_name"` 7442 @@ -8913,7 +925 8,7 @@7450 @@ -8913,7 +9259,7 @@ 7443 7451 ############################################################################### 7444 7452 7445 7453 ### Note that some functions (such as const) are normally disabled anyway. 7446 7454 -echo "$as_me:8916: checking if you want to build with function extensions" >&5 7447 +echo "$as_me:926 1: checking if you want to build with function extensions" >&57455 +echo "$as_me:9262: checking if you want to build with function extensions" >&5 7448 7456 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 7449 7457 7450 7458 # Check whether --enable-ext-funcs or --disable-ext-funcs was given. 7451 @@ -8923,7 +926 8,7 @@7459 @@ -8923,7 +9269,7 @@ 7452 7460 else 7453 7461 with_ext_funcs=yes 7454 7462 fi; 7455 7463 -echo "$as_me:8926: result: $with_ext_funcs" >&5 7456 +echo "$as_me:927 1: result: $with_ext_funcs" >&57464 +echo "$as_me:9272: result: $with_ext_funcs" >&5 7457 7465 echo "${ECHO_T}$with_ext_funcs" >&6 7458 7466 if test "$with_ext_funcs" = yes ; then 7459 7467 NCURSES_EXT_FUNCS=1 7460 @@ -8955,12 +930 0,14@@7468 @@ -8955,12 +9301,38 @@ 7461 7469 #define NCURSES_EXT_FUNCS 1 7462 7470 EOF … … 7466 7474 NCURSES_EXT_FUNCS=0 7467 7475 + GENERATED_EXT_FUNCS= 7476 +fi 7477 + 7478 +echo "$as_me:9310: checking if you want to build with experimental SCREEN extensions" >&5 7479 +echo $ECHO_N "checking if you want to build with experimental SCREEN extensions... $ECHO_C" >&6 7480 + 7481 +# Check whether --enable-sp-funcs or --disable-sp-funcs was given. 7482 +if test "${enable_sp_funcs+set}" = set; then 7483 + enableval="$enable_sp_funcs" 7484 + with_sp_funcs=$enableval 7485 +else 7486 + with_sp_funcs=no 7487 +fi; 7488 +echo "$as_me:9320: result: $with_sp_funcs" >&5 7489 +echo "${ECHO_T}$with_sp_funcs" >&6 7490 +if test "$with_sp_funcs" = yes ; then 7491 + NCURSES_SP_FUNCS=1 7492 + cat >>confdefs.h <<\EOF 7493 +#define NCURSES_SP_FUNCS 1 7494 +EOF 7495 + 7496 + GENERATED_SP_FUNCS=generated 7497 +else 7498 + NCURSES_SP_FUNCS=0 7499 + GENERATED_SP_FUNCS= 7468 7500 fi 7469 7501 7470 7502 ### use option --enable-const to turn on use of const beyond that in XSI. 7471 7503 -echo "$as_me:8963: checking for extended use of const keyword" >&5 7472 +echo "$as_me:93 10: checking for extended use of const keyword" >&57504 +echo "$as_me:9335: checking for extended use of const keyword" >&5 7473 7505 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 7474 7506 7475 7507 # Check whether --enable-const or --disable-const was given. 7476 @@ -8970,7 +93 17,7 @@7508 @@ -8970,7 +9342,7 @@ 7477 7509 else 7478 7510 with_ext_const=no 7479 7511 fi; 7480 7512 -echo "$as_me:8973: result: $with_ext_const" >&5 7481 +echo "$as_me:93 20: result: $with_ext_const" >&57513 +echo "$as_me:9345: result: $with_ext_const" >&5 7482 7514 echo "${ECHO_T}$with_ext_const" >&6 7483 7515 NCURSES_CONST='/*nothing*/' 7484 7516 if test "$with_ext_const" = yes ; then 7485 @@ -8978,7 +93 25,7 @@7517 @@ -8978,7 +9350,7 @@ 7486 7518 fi 7487 7519 7488 7520 ### use option --enable-ext-colors to turn on use of colors beyond 16. 7489 7521 -echo "$as_me:8981: checking if you want to use extended colors" >&5 7490 +echo "$as_me:93 28: checking if you want to use extended colors" >&57522 +echo "$as_me:9353: checking if you want to use extended colors" >&5 7491 7523 echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6 7492 7524 7493 7525 # Check whether --enable-ext-colors or --disable-ext-colors was given. 7494 @@ -8988,12 +93 35,12 @@7526 @@ -8988,12 +9360,12 @@ 7495 7527 else 7496 7528 with_ext_colors=no 7497 7529 fi; 7498 7530 -echo "$as_me:8991: result: $with_ext_colors" >&5 7499 +echo "$as_me:93 38: result: $with_ext_colors" >&57531 +echo "$as_me:9363: result: $with_ext_colors" >&5 7500 7532 echo "${ECHO_T}$with_ext_colors" >&6 7501 7533 NCURSES_EXT_COLORS=0 … … 7503 7535 if test "$with_widec" != yes ; then 7504 7536 - { { echo "$as_me:8996: error: This option applies only to wide-character library" >&5 7505 + { { echo "$as_me:93 43: error: This option applies only to wide-character library" >&57537 + { { echo "$as_me:9368: error: This option applies only to wide-character library" >&5 7506 7538 echo "$as_me: error: This option applies only to wide-character library" >&2;} 7507 7539 { (exit 1); exit 1; }; } 7508 7540 else 7509 @@ -9004,7 +93 51,7 @@7541 @@ -9004,7 +9376,7 @@ 7510 7542 5.*) 7511 7543 cf_cv_rel_version=6.0 7512 7544 cf_cv_abi_version=6 7513 7545 - { echo "$as_me:9007: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 7514 + { echo "$as_me:93 54: WARNING: Overriding ABI version to $cf_cv_abi_version" >&57546 + { echo "$as_me:9379: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 7515 7547 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} 7516 7548 ;; 7517 7549 esac 7518 @@ -9019,7 +93 66,7 @@7550 @@ -9019,7 +9391,7 @@ 7519 7551 fi 7520 7552 7521 7553 ### use option --enable-ext-mouse to modify coding to support 5-button mice 7522 7554 -echo "$as_me:9022: checking if you want to use extended mouse encoding" >&5 7523 +echo "$as_me:93 69: checking if you want to use extended mouse encoding" >&57555 +echo "$as_me:9394: checking if you want to use extended mouse encoding" >&5 7524 7556 echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6 7525 7557 7526 7558 # Check whether --enable-ext-mouse or --disable-ext-mouse was given. 7527 @@ -9029,7 +9 376,7 @@7559 @@ -9029,7 +9401,7 @@ 7528 7560 else 7529 7561 with_ext_mouse=no 7530 7562 fi; 7531 7563 -echo "$as_me:9032: result: $with_ext_mouse" >&5 7532 +echo "$as_me:9 379: result: $with_ext_mouse" >&57564 +echo "$as_me:9404: result: $with_ext_mouse" >&5 7533 7565 echo "${ECHO_T}$with_ext_mouse" >&6 7534 7566 NCURSES_MOUSE_VERSION=1 7535 7567 if test "$with_ext_mouse" = yes ; then 7536 @@ -9040,7 +9 387,7 @@7568 @@ -9040,7 +9412,7 @@ 7537 7569 5.*) 7538 7570 cf_cv_rel_version=6.0 7539 7571 cf_cv_abi_version=6 7540 7572 - { echo "$as_me:9043: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 7541 + { echo "$as_me:9 390: WARNING: Overriding ABI version to $cf_cv_abi_version" >&57573 + { echo "$as_me:9415: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 7542 7574 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} 7543 7575 ;; 7544 7576 esac 7545 @@ -9048,7 +9 395,7 @@7577 @@ -9048,7 +9420,7 @@ 7546 7578 7547 7579 fi 7548 7580 7549 7581 -echo "$as_me:9051: checking if you want \$NCURSES_NO_PADDING code" >&5 7550 +echo "$as_me:9 398: checking if you want \$NCURSES_NO_PADDING code" >&57582 +echo "$as_me:9423: checking if you want \$NCURSES_NO_PADDING code" >&5 7551 7583 echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6 7552 7584 7553 7585 # Check whether --enable-no-padding or --disable-no-padding was given. 7554 @@ -9058,19 +94 05,19 @@7586 @@ -9058,19 +9430,19 @@ 7555 7587 else 7556 7588 with_no_padding=$with_ext_funcs 7557 7589 fi; 7558 7590 -echo "$as_me:9061: result: $with_no_padding" >&5 7559 +echo "$as_me:94 08: result: $with_no_padding" >&57591 +echo "$as_me:9433: result: $with_no_padding" >&5 7560 7592 echo "${ECHO_T}$with_no_padding" >&6 7561 7593 test "$with_no_padding" = yes && cat >>confdefs.h <<\EOF … … 7564 7596 7565 7597 -echo "$as_me:9067: checking for ANSI C header files" >&5 7566 +echo "$as_me:94 14: checking for ANSI C header files" >&57598 +echo "$as_me:9439: checking for ANSI C header files" >&5 7567 7599 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 7568 7600 if test "${ac_cv_header_stdc+set}" = set; then … … 7571 7603 cat >conftest.$ac_ext <<_ACEOF 7572 7604 -#line 9073 "configure" 7573 +#line 94 20"configure"7605 +#line 9445 "configure" 7574 7606 #include "confdefs.h" 7575 7607 #include <stdlib.h> 7576 7608 #include <stdarg.h> 7577 @@ -9078,13 +94 25,13 @@7609 @@ -9078,13 +9450,13 @@ 7578 7610 #include <float.h> 7579 7611 7580 7612 _ACEOF 7581 7613 -if { (eval echo "$as_me:9081: \"$ac_cpp conftest.$ac_ext\"") >&5 7582 +if { (eval echo "$as_me:94 28: \"$ac_cpp conftest.$ac_ext\"") >&57614 +if { (eval echo "$as_me:9453: \"$ac_cpp conftest.$ac_ext\"") >&5 7583 7615 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 7584 7616 ac_status=$? … … 7587 7619 cat conftest.err >&5 7588 7620 - echo "$as_me:9087: \$? = $ac_status" >&5 7589 + echo "$as_me:94 34: \$? = $ac_status" >&57621 + echo "$as_me:9459: \$? = $ac_status" >&5 7590 7622 (exit $ac_status); } >/dev/null; then 7591 7623 if test -s conftest.err; then 7592 7624 ac_cpp_err=$ac_c_preproc_warn_flag 7593 @@ -9106,7 +94 53,7 @@7625 @@ -9106,7 +9478,7 @@ 7594 7626 if test $ac_cv_header_stdc = yes; then 7595 7627 # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 7596 7628 cat >conftest.$ac_ext <<_ACEOF 7597 7629 -#line 9109 "configure" 7598 +#line 94 56"configure"7630 +#line 9481 "configure" 7599 7631 #include "confdefs.h" 7600 7632 #include <string.h> 7601 7633 7602 @@ -9124,7 +94 71,7 @@7634 @@ -9124,7 +9496,7 @@ 7603 7635 if test $ac_cv_header_stdc = yes; then 7604 7636 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 7605 7637 cat >conftest.$ac_ext <<_ACEOF 7606 7638 -#line 9127 "configure" 7607 +#line 94 74"configure"7639 +#line 9499 "configure" 7608 7640 #include "confdefs.h" 7609 7641 #include <stdlib.h> 7610 7642 7611 @@ -9145,7 +9 492,7 @@7643 @@ -9145,7 +9517,7 @@ 7612 7644 : 7613 7645 else 7614 7646 cat >conftest.$ac_ext <<_ACEOF 7615 7647 -#line 9148 "configure" 7616 +#line 9 495"configure"7648 +#line 9520 "configure" 7617 7649 #include "confdefs.h" 7618 7650 #include <ctype.h> 7619 7651 #if ((' ' & 0x0FF) == 0x020) 7620 @@ -9171,15 +95 18,15 @@7652 @@ -9171,15 +9543,15 @@ 7621 7653 } 7622 7654 _ACEOF 7623 7655 rm -f conftest$ac_exeext 7624 7656 -if { (eval echo "$as_me:9174: \"$ac_link\"") >&5 7625 +if { (eval echo "$as_me:95 21: \"$ac_link\"") >&57657 +if { (eval echo "$as_me:9546: \"$ac_link\"") >&5 7626 7658 (eval $ac_link) 2>&5 7627 7659 ac_status=$? 7628 7660 - echo "$as_me:9177: \$? = $ac_status" >&5 7629 + echo "$as_me:95 24: \$? = $ac_status" >&57661 + echo "$as_me:9549: \$? = $ac_status" >&5 7630 7662 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 7631 7663 - { (eval echo "$as_me:9179: \"$ac_try\"") >&5 7632 + { (eval echo "$as_me:95 26: \"$ac_try\"") >&57664 + { (eval echo "$as_me:9551: \"$ac_try\"") >&5 7633 7665 (eval $ac_try) 2>&5 7634 7666 ac_status=$? 7635 7667 - echo "$as_me:9182: \$? = $ac_status" >&5 7636 + echo "$as_me:95 29: \$? = $ac_status" >&57668 + echo "$as_me:9554: \$? = $ac_status" >&5 7637 7669 (exit $ac_status); }; }; then 7638 7670 : 7639 7671 else 7640 @@ -9192,7 +95 39,7 @@7672 @@ -9192,7 +9564,7 @@ 7641 7673 fi 7642 7674 fi 7643 7675 fi 7644 7676 -echo "$as_me:9195: result: $ac_cv_header_stdc" >&5 7645 +echo "$as_me:95 42: result: $ac_cv_header_stdc" >&57677 +echo "$as_me:9567: result: $ac_cv_header_stdc" >&5 7646 7678 echo "${ECHO_T}$ac_cv_header_stdc" >&6 7647 7679 if test $ac_cv_header_stdc = yes; then 7648 7680 7649 @@ -9208,28 +95 55,28 @@7681 @@ -9208,28 +9580,28 @@ 7650 7682 inttypes.h stdint.h unistd.h 7651 7683 do 7652 7684 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 7653 7685 -echo "$as_me:9211: checking for $ac_header" >&5 7654 +echo "$as_me:95 58: checking for $ac_header" >&57686 +echo "$as_me:9583: checking for $ac_header" >&5 7655 7687 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 7656 7688 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 7659 7691 cat >conftest.$ac_ext <<_ACEOF 7660 7692 -#line 9217 "configure" 7661 +#line 95 64"configure"7693 +#line 9589 "configure" 7662 7694 #include "confdefs.h" 7663 7695 $ac_includes_default … … 7666 7698 rm -f conftest.$ac_objext 7667 7699 -if { (eval echo "$as_me:9223: \"$ac_compile\"") >&5 7668 +if { (eval echo "$as_me:95 70: \"$ac_compile\"") >&57700 +if { (eval echo "$as_me:9595: \"$ac_compile\"") >&5 7669 7701 (eval $ac_compile) 2>&5 7670 7702 ac_status=$? 7671 7703 - echo "$as_me:9226: \$? = $ac_status" >&5 7672 + echo "$as_me:95 73: \$? = $ac_status" >&57704 + echo "$as_me:9598: \$? = $ac_status" >&5 7673 7705 (exit $ac_status); } && 7674 7706 { ac_try='test -s conftest.$ac_objext' 7675 7707 - { (eval echo "$as_me:9229: \"$ac_try\"") >&5 7676 + { (eval echo "$as_me:9 576: \"$ac_try\"") >&57708 + { (eval echo "$as_me:9601: \"$ac_try\"") >&5 7677 7709 (eval $ac_try) 2>&5 7678 7710 ac_status=$? 7679 7711 - echo "$as_me:9232: \$? = $ac_status" >&5 7680 + echo "$as_me:9 579: \$? = $ac_status" >&57712 + echo "$as_me:9604: \$? = $ac_status" >&5 7681 7713 (exit $ac_status); }; }; then 7682 7714 eval "$as_ac_Header=yes" 7683 7715 else 7684 @@ -9239,7 +9 586,7 @@7716 @@ -9239,7 +9611,7 @@ 7685 7717 fi 7686 7718 rm -f conftest.$ac_objext conftest.$ac_ext 7687 7719 fi 7688 7720 -echo "$as_me:9242: result: `eval echo '${'$as_ac_Header'}'`" >&5 7689 +echo "$as_me:9 589: result: `eval echo '${'$as_ac_Header'}'`" >&57721 +echo "$as_me:9614: result: `eval echo '${'$as_ac_Header'}'`" >&5 7690 7722 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 7691 7723 if test `eval echo '${'$as_ac_Header'}'` = yes; then 7692 7724 cat >>confdefs.h <<EOF 7693 @@ -9249,13 +9 596,13 @@7725 @@ -9249,13 +9621,13 @@ 7694 7726 fi 7695 7727 done 7696 7728 7697 7729 -echo "$as_me:9252: checking for signed char" >&5 7698 +echo "$as_me:9 599: checking for signed char" >&57730 +echo "$as_me:9624: checking for signed char" >&5 7699 7731 echo $ECHO_N "checking for signed char... $ECHO_C" >&6 7700 7732 if test "${ac_cv_type_signed_char+set}" = set; then … … 7703 7735 cat >conftest.$ac_ext <<_ACEOF 7704 7736 -#line 9258 "configure" 7705 +#line 96 05"configure"7737 +#line 9630 "configure" 7706 7738 #include "confdefs.h" 7707 7739 $ac_includes_default 7708 7740 int 7709 @@ -9270,16 +96 17,16 @@7741 @@ -9270,16 +9642,16 @@ 7710 7742 } 7711 7743 _ACEOF 7712 7744 rm -f conftest.$ac_objext 7713 7745 -if { (eval echo "$as_me:9273: \"$ac_compile\"") >&5 7714 +if { (eval echo "$as_me:96 20: \"$ac_compile\"") >&57746 +if { (eval echo "$as_me:9645: \"$ac_compile\"") >&5 7715 7747 (eval $ac_compile) 2>&5 7716 7748 ac_status=$? 7717 7749 - echo "$as_me:9276: \$? = $ac_status" >&5 7718 + echo "$as_me:96 23: \$? = $ac_status" >&57750 + echo "$as_me:9648: \$? = $ac_status" >&5 7719 7751 (exit $ac_status); } && 7720 7752 { ac_try='test -s conftest.$ac_objext' 7721 7753 - { (eval echo "$as_me:9279: \"$ac_try\"") >&5 7722 + { (eval echo "$as_me:96 26: \"$ac_try\"") >&57754 + { (eval echo "$as_me:9651: \"$ac_try\"") >&5 7723 7755 (eval $ac_try) 2>&5 7724 7756 ac_status=$? 7725 7757 - echo "$as_me:9282: \$? = $ac_status" >&5 7726 + echo "$as_me:96 29: \$? = $ac_status" >&57758 + echo "$as_me:9654: \$? = $ac_status" >&5 7727 7759 (exit $ac_status); }; }; then 7728 7760 ac_cv_type_signed_char=yes 7729 7761 else 7730 @@ -9289,10 +96 36,10 @@7762 @@ -9289,10 +9661,10 @@ 7731 7763 fi 7732 7764 rm -f conftest.$ac_objext conftest.$ac_ext 7733 7765 fi 7734 7766 -echo "$as_me:9292: result: $ac_cv_type_signed_char" >&5 7735 +echo "$as_me:96 39: result: $ac_cv_type_signed_char" >&57767 +echo "$as_me:9664: result: $ac_cv_type_signed_char" >&5 7736 7768 echo "${ECHO_T}$ac_cv_type_signed_char" >&6 7737 7769 7738 7770 -echo "$as_me:9295: checking size of signed char" >&5 7739 +echo "$as_me:96 42: checking size of signed char" >&57771 +echo "$as_me:9667: checking size of signed char" >&5 7740 7772 echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 7741 7773 if test "${ac_cv_sizeof_signed_char+set}" = set; then 7742 7774 echo $ECHO_N "(cached) $ECHO_C" >&6 7743 @@ -9301,7 +96 48,7 @@7775 @@ -9301,7 +9673,7 @@ 7744 7776 if test "$cross_compiling" = yes; then 7745 7777 # Depending upon the size, compute the lo and hi bounds. 7746 7778 cat >conftest.$ac_ext <<_ACEOF 7747 7779 -#line 9304 "configure" 7748 +#line 96 51"configure"7780 +#line 9676 "configure" 7749 7781 #include "confdefs.h" 7750 7782 $ac_includes_default 7751 7783 int 7752 @@ -9313,21 +96 60,21 @@7784 @@ -9313,21 +9685,21 @@ 7753 7785 } 7754 7786 _ACEOF 7755 7787 rm -f conftest.$ac_objext 7756 7788 -if { (eval echo "$as_me:9316: \"$ac_compile\"") >&5 7757 +if { (eval echo "$as_me:96 63: \"$ac_compile\"") >&57789 +if { (eval echo "$as_me:9688: \"$ac_compile\"") >&5 7758 7790 (eval $ac_compile) 2>&5 7759 7791 ac_status=$? 7760 7792 - echo "$as_me:9319: \$? = $ac_status" >&5 7761 + echo "$as_me:96 66: \$? = $ac_status" >&57793 + echo "$as_me:9691: \$? = $ac_status" >&5 7762 7794 (exit $ac_status); } && 7763 7795 { ac_try='test -s conftest.$ac_objext' 7764 7796 - { (eval echo "$as_me:9322: \"$ac_try\"") >&5 7765 + { (eval echo "$as_me:96 69: \"$ac_try\"") >&57797 + { (eval echo "$as_me:9694: \"$ac_try\"") >&5 7766 7798 (eval $ac_try) 2>&5 7767 7799 ac_status=$? 7768 7800 - echo "$as_me:9325: \$? = $ac_status" >&5 7769 + echo "$as_me:96 72: \$? = $ac_status" >&57801 + echo "$as_me:9697: \$? = $ac_status" >&5 7770 7802 (exit $ac_status); }; }; then 7771 7803 ac_lo=0 ac_mid=0 … … 7773 7805 cat >conftest.$ac_ext <<_ACEOF 7774 7806 -#line 9330 "configure" 7775 +#line 9 677"configure"7807 +#line 9702 "configure" 7776 7808 #include "confdefs.h" 7777 7809 $ac_includes_default 7778 7810 int 7779 @@ -9339,16 +9 686,16 @@7811 @@ -9339,16 +9711,16 @@ 7780 7812 } 7781 7813 _ACEOF 7782 7814 rm -f conftest.$ac_objext 7783 7815 -if { (eval echo "$as_me:9342: \"$ac_compile\"") >&5 7784 +if { (eval echo "$as_me:9 689: \"$ac_compile\"") >&57816 +if { (eval echo "$as_me:9714: \"$ac_compile\"") >&5 7785 7817 (eval $ac_compile) 2>&5 7786 7818 ac_status=$? 7787 7819 - echo "$as_me:9345: \$? = $ac_status" >&5 7788 + echo "$as_me:9 692: \$? = $ac_status" >&57820 + echo "$as_me:9717: \$? = $ac_status" >&5 7789 7821 (exit $ac_status); } && 7790 7822 { ac_try='test -s conftest.$ac_objext' 7791 7823 - { (eval echo "$as_me:9348: \"$ac_try\"") >&5 7792 + { (eval echo "$as_me:9 695: \"$ac_try\"") >&57824 + { (eval echo "$as_me:9720: \"$ac_try\"") >&5 7793 7825 (eval $ac_try) 2>&5 7794 7826 ac_status=$? 7795 7827 - echo "$as_me:9351: \$? = $ac_status" >&5 7796 + echo "$as_me:9 698: \$? = $ac_status" >&57828 + echo "$as_me:9723: \$? = $ac_status" >&5 7797 7829 (exit $ac_status); }; }; then 7798 7830 ac_hi=$ac_mid; break 7799 7831 else 7800 @@ -9364,7 +97 11,7 @@7832 @@ -9364,7 +9736,7 @@ 7801 7833 ac_hi=-1 ac_mid=-1 7802 7834 while :; do 7803 7835 cat >conftest.$ac_ext <<_ACEOF 7804 7836 -#line 9367 "configure" 7805 +#line 97 14"configure"7837 +#line 9739 "configure" 7806 7838 #include "confdefs.h" 7807 7839 $ac_includes_default 7808 7840 int 7809 @@ -9376,16 +97 23,16 @@7841 @@ -9376,16 +9748,16 @@ 7810 7842 } 7811 7843 _ACEOF 7812 7844 rm -f conftest.$ac_objext 7813 7845 -if { (eval echo "$as_me:9379: \"$ac_compile\"") >&5 7814 +if { (eval echo "$as_me:97 26: \"$ac_compile\"") >&57846 +if { (eval echo "$as_me:9751: \"$ac_compile\"") >&5 7815 7847 (eval $ac_compile) 2>&5 7816 7848 ac_status=$? 7817 7849 - echo "$as_me:9382: \$? = $ac_status" >&5 7818 + echo "$as_me:97 29: \$? = $ac_status" >&57850 + echo "$as_me:9754: \$? = $ac_status" >&5 7819 7851 (exit $ac_status); } && 7820 7852 { ac_try='test -s conftest.$ac_objext' 7821 7853 - { (eval echo "$as_me:9385: \"$ac_try\"") >&5 7822 + { (eval echo "$as_me:97 32: \"$ac_try\"") >&57854 + { (eval echo "$as_me:9757: \"$ac_try\"") >&5 7823 7855 (eval $ac_try) 2>&5 7824 7856 ac_status=$? 7825 7857 - echo "$as_me:9388: \$? = $ac_status" >&5 7826 + echo "$as_me:97 35: \$? = $ac_status" >&57858 + echo "$as_me:9760: \$? = $ac_status" >&5 7827 7859 (exit $ac_status); }; }; then 7828 7860 ac_lo=$ac_mid; break 7829 7861 else 7830 @@ -9401,7 +97 48,7 @@7862 @@ -9401,7 +9773,7 @@ 7831 7863 while test "x$ac_lo" != "x$ac_hi"; do 7832 7864 ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 7833 7865 cat >conftest.$ac_ext <<_ACEOF 7834 7866 -#line 9404 "configure" 7835 +#line 97 51"configure"7867 +#line 9776 "configure" 7836 7868 #include "confdefs.h" 7837 7869 $ac_includes_default 7838 7870 int 7839 @@ -9413,16 +97 60,16 @@7871 @@ -9413,16 +9785,16 @@ 7840 7872 } 7841 7873 _ACEOF 7842 7874 rm -f conftest.$ac_objext 7843 7875 -if { (eval echo "$as_me:9416: \"$ac_compile\"") >&5 7844 +if { (eval echo "$as_me:97 63: \"$ac_compile\"") >&57876 +if { (eval echo "$as_me:9788: \"$ac_compile\"") >&5 7845 7877 (eval $ac_compile) 2>&5 7846 7878 ac_status=$? 7847 7879 - echo "$as_me:9419: \$? = $ac_status" >&5 7848 + echo "$as_me:97 66: \$? = $ac_status" >&57880 + echo "$as_me:9791: \$? = $ac_status" >&5 7849 7881 (exit $ac_status); } && 7850 7882 { ac_try='test -s conftest.$ac_objext' 7851 7883 - { (eval echo "$as_me:9422: \"$ac_try\"") >&5 7852 + { (eval echo "$as_me:97 69: \"$ac_try\"") >&57884 + { (eval echo "$as_me:9794: \"$ac_try\"") >&5 7853 7885 (eval $ac_try) 2>&5 7854 7886 ac_status=$? 7855 7887 - echo "$as_me:9425: \$? = $ac_status" >&5 7856 + echo "$as_me:97 72: \$? = $ac_status" >&57888 + echo "$as_me:9797: \$? = $ac_status" >&5 7857 7889 (exit $ac_status); }; }; then 7858 7890 ac_hi=$ac_mid 7859 7891 else 7860 @@ -9435,12 +9 782,12 @@7892 @@ -9435,12 +9807,12 @@ 7861 7893 ac_cv_sizeof_signed_char=$ac_lo 7862 7894 else 7863 7895 if test "$cross_compiling" = yes; then 7864 7896 - { { echo "$as_me:9438: error: cannot run test program while cross compiling" >&5 7865 + { { echo "$as_me:9 785: error: cannot run test program while cross compiling" >&57897 + { { echo "$as_me:9810: error: cannot run test program while cross compiling" >&5 7866 7898 echo "$as_me: error: cannot run test program while cross compiling" >&2;} 7867 7899 { (exit 1); exit 1; }; } … … 7869 7901 cat >conftest.$ac_ext <<_ACEOF 7870 7902 -#line 9443 "configure" 7871 +#line 9 790"configure"7903 +#line 9815 "configure" 7872 7904 #include "confdefs.h" 7873 7905 $ac_includes_default 7874 7906 int 7875 @@ -9456,15 +98 03,15 @@7907 @@ -9456,15 +9828,15 @@ 7876 7908 } 7877 7909 _ACEOF 7878 7910 rm -f conftest$ac_exeext 7879 7911 -if { (eval echo "$as_me:9459: \"$ac_link\"") >&5 7880 +if { (eval echo "$as_me:98 06: \"$ac_link\"") >&57912 +if { (eval echo "$as_me:9831: \"$ac_link\"") >&5 7881 7913 (eval $ac_link) 2>&5 7882 7914 ac_status=$? 7883 7915 - echo "$as_me:9462: \$? = $ac_status" >&5 7884 + echo "$as_me:98 09: \$? = $ac_status" >&57916 + echo "$as_me:9834: \$? = $ac_status" >&5 7885 7917 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 7886 7918 - { (eval echo "$as_me:9464: \"$ac_try\"") >&5 7887 + { (eval echo "$as_me:98 11: \"$ac_try\"") >&57919 + { (eval echo "$as_me:9836: \"$ac_try\"") >&5 7888 7920 (eval $ac_try) 2>&5 7889 7921 ac_status=$? 7890 7922 - echo "$as_me:9467: \$? = $ac_status" >&5 7891 + echo "$as_me:98 14: \$? = $ac_status" >&57923 + echo "$as_me:9839: \$? = $ac_status" >&5 7892 7924 (exit $ac_status); }; }; then 7893 7925 ac_cv_sizeof_signed_char=`cat conftest.val` 7894 7926 else 7895 @@ -9480,7 +98 27,7 @@7927 @@ -9480,7 +9852,7 @@ 7896 7928 ac_cv_sizeof_signed_char=0 7897 7929 fi 7898 7930 fi 7899 7931 -echo "$as_me:9483: result: $ac_cv_sizeof_signed_char" >&5 7900 +echo "$as_me:98 30: result: $ac_cv_sizeof_signed_char" >&57932 +echo "$as_me:9855: result: $ac_cv_sizeof_signed_char" >&5 7901 7933 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 7902 7934 cat >>confdefs.h <<EOF 7903 7935 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char 7904 @@ -9491,7 +98 38,7 @@7936 @@ -9491,7 +9863,7 @@ 7905 7937 else 7906 7938 NCURSES_SBOOL="char" 7907 7939 fi 7908 7940 -echo "$as_me:9494: checking if you want to use signed Boolean array in term.h" >&5 7909 +echo "$as_me:98 41: checking if you want to use signed Boolean array in term.h" >&57941 +echo "$as_me:9866: checking if you want to use signed Boolean array in term.h" >&5 7910 7942 echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6 7911 7943 7912 7944 # Check whether --enable-signed-char or --disable-signed-char was given. 7913 @@ -9501,12 +98 48,12 @@7945 @@ -9501,12 +9873,12 @@ 7914 7946 else 7915 7947 with_signed_char=no 7916 7948 fi; 7917 7949 -echo "$as_me:9504: result: $with_signed_char" >&5 7918 +echo "$as_me:98 51: result: $with_signed_char" >&57950 +echo "$as_me:9876: result: $with_signed_char" >&5 7919 7951 echo "${ECHO_T}$with_signed_char" >&6 7920 7952 test "$with_signed_char" != yes && NCURSES_SBOOL="char" … … 7922 7954 ### use option --enable-sigwinch to turn on use of SIGWINCH logic 7923 7955 -echo "$as_me:9509: checking if you want SIGWINCH handler" >&5 7924 +echo "$as_me:98 56: checking if you want SIGWINCH handler" >&57956 +echo "$as_me:9881: checking if you want SIGWINCH handler" >&5 7925 7957 echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6 7926 7958 7927 7959 # Check whether --enable-sigwinch or --disable-sigwinch was given. 7928 @@ -9516,14 +98 63,14 @@7960 @@ -9516,14 +9888,14 @@ 7929 7961 else 7930 7962 with_sigwinch=$with_ext_funcs 7931 7963 fi; 7932 7964 -echo "$as_me:9519: result: $with_sigwinch" >&5 7933 +echo "$as_me:98 66: result: $with_sigwinch" >&57965 +echo "$as_me:9891: result: $with_sigwinch" >&5 7934 7966 echo "${ECHO_T}$with_sigwinch" >&6 7935 7967 test "$with_sigwinch" = yes && cat >>confdefs.h <<\EOF … … 7939 7971 ### use option --enable-tcap-names to allow user to define new capabilities 7940 7972 -echo "$as_me:9526: checking if you want user-definable terminal capabilities like termcap" >&5 7941 +echo "$as_me:98 73: checking if you want user-definable terminal capabilities like termcap" >&57973 +echo "$as_me:9898: checking if you want user-definable terminal capabilities like termcap" >&5 7942 7974 echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6 7943 7975 7944 7976 # Check whether --enable-tcap-names or --disable-tcap-names was given. 7945 @@ -9533,7 +9 880,7 @@7977 @@ -9533,7 +9905,7 @@ 7946 7978 else 7947 7979 with_tcap_names=$with_ext_funcs 7948 7980 fi; 7949 7981 -echo "$as_me:9536: result: $with_tcap_names" >&5 7950 +echo "$as_me:9 883: result: $with_tcap_names" >&57982 +echo "$as_me:9908: result: $with_tcap_names" >&5 7951 7983 echo "${ECHO_T}$with_tcap_names" >&6 7952 7984 NCURSES_XNAMES=0 7953 7985 test "$with_tcap_names" = yes && NCURSES_XNAMES=1 7954 @@ -9541,7 +9 888,7 @@7986 @@ -9541,7 +9913,7 @@ 7955 7987 ############################################################################### 7956 7988 # These options are relatively safe to experiment with. 7957 7989 7958 7990 -echo "$as_me:9544: checking if you want all development code" >&5 7959 +echo "$as_me:9 891: checking if you want all development code" >&57991 +echo "$as_me:9916: checking if you want all development code" >&5 7960 7992 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 7961 7993 7962 7994 # Check whether --with-develop or --without-develop was given. 7963 @@ -9551,11 +9 898,11 @@7995 @@ -9551,11 +9923,11 @@ 7964 7996 else 7965 7997 with_develop=no 7966 7998 fi; 7967 7999 -echo "$as_me:9554: result: $with_develop" >&5 7968 +echo "$as_me:99 01: result: $with_develop" >&58000 +echo "$as_me:9926: result: $with_develop" >&5 7969 8001 echo "${ECHO_T}$with_develop" >&6 7970 8002 7971 8003 ### use option --enable-hard-tabs to turn on use of hard-tabs optimize 7972 8004 -echo "$as_me:9558: checking if you want hard-tabs code" >&5 7973 +echo "$as_me:99 05: checking if you want hard-tabs code" >&58005 +echo "$as_me:9930: checking if you want hard-tabs code" >&5 7974 8006 echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6 7975 8007 7976 8008 # Check whether --enable-hard-tabs or --disable-hard-tabs was given. 7977 @@ -9565,14 +99 12,14 @@8009 @@ -9565,14 +9937,14 @@ 7978 8010 else 7979 8011 enable_hard_tabs=$with_develop 7980 8012 fi; 7981 8013 -echo "$as_me:9568: result: $enable_hard_tabs" >&5 7982 +echo "$as_me:99 15: result: $enable_hard_tabs" >&58014 +echo "$as_me:9940: result: $enable_hard_tabs" >&5 7983 8015 echo "${ECHO_T}$enable_hard_tabs" >&6 7984 8016 test "$enable_hard_tabs" = yes && cat >>confdefs.h <<\EOF … … 7988 8020 ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize 7989 8021 -echo "$as_me:9575: checking if you want limited support for xmc" >&5 7990 +echo "$as_me:99 22: checking if you want limited support for xmc" >&58022 +echo "$as_me:9947: checking if you want limited support for xmc" >&5 7991 8023 echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6 7992 8024 7993 8025 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. 7994 @@ -9582,7 +99 29,7 @@8026 @@ -9582,7 +9954,7 @@ 7995 8027 else 7996 8028 enable_xmc_glitch=$with_develop 7997 8029 fi; 7998 8030 -echo "$as_me:9585: result: $enable_xmc_glitch" >&5 7999 +echo "$as_me:99 32: result: $enable_xmc_glitch" >&58031 +echo "$as_me:9957: result: $enable_xmc_glitch" >&5 8000 8032 echo "${ECHO_T}$enable_xmc_glitch" >&6 8001 8033 test "$enable_xmc_glitch" = yes && cat >>confdefs.h <<\EOF 8002 8034 #define USE_XMC_SUPPORT 1 8003 @@ -9591,7 +99 38,7 @@8035 @@ -9591,7 +9963,7 @@ 8004 8036 ############################################################################### 8005 8037 # These are just experimental, probably should not be in a package: 8006 8038 8007 8039 -echo "$as_me:9594: checking if you do not want to assume colors are white-on-black" >&5 8008 +echo "$as_me:99 41: checking if you do not want to assume colors are white-on-black" >&58040 +echo "$as_me:9966: checking if you do not want to assume colors are white-on-black" >&5 8009 8041 echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6 8010 8042 8011 8043 # Check whether --enable-assumed-color or --disable-assumed-color was given. 8012 @@ -9601,14 +99 48,14 @@8044 @@ -9601,14 +9973,14 @@ 8013 8045 else 8014 8046 with_assumed_color=yes 8015 8047 fi; 8016 8048 -echo "$as_me:9604: result: $with_assumed_color" >&5 8017 +echo "$as_me:99 51: result: $with_assumed_color" >&58049 +echo "$as_me:9976: result: $with_assumed_color" >&5 8018 8050 echo "${ECHO_T}$with_assumed_color" >&6 8019 8051 test "$with_assumed_color" = yes && cat >>confdefs.h <<\EOF … … 8023 8055 ### use option --enable-hashmap to turn on use of hashmap scrolling logic 8024 8056 -echo "$as_me:9611: checking if you want hashmap scrolling-optimization code" >&5 8025 +echo "$as_me:99 58: checking if you want hashmap scrolling-optimization code" >&58057 +echo "$as_me:9983: checking if you want hashmap scrolling-optimization code" >&5 8026 8058 echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6 8027 8059 8028 8060 # Check whether --enable-hashmap or --disable-hashmap was given. 8029 @@ -9618,14 +99 65,14 @@8061 @@ -9618,14 +9990,14 @@ 8030 8062 else 8031 8063 with_hashmap=yes 8032 8064 fi; 8033 8065 -echo "$as_me:9621: result: $with_hashmap" >&5 8034 +echo "$as_me:99 68: result: $with_hashmap" >&58066 +echo "$as_me:9993: result: $with_hashmap" >&5 8035 8067 echo "${ECHO_T}$with_hashmap" >&6 8036 8068 test "$with_hashmap" = yes && cat >>confdefs.h <<\EOF … … 8040 8072 ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment 8041 8073 -echo "$as_me:9628: checking if you want colorfgbg code" >&5 8042 +echo "$as_me: 9975: checking if you want colorfgbg code" >&58074 +echo "$as_me:10000: checking if you want colorfgbg code" >&5 8043 8075 echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6 8044 8076 8045 8077 # Check whether --enable-colorfgbg or --disable-colorfgbg was given. 8046 @@ -9635,7 + 9982,7 @@8078 @@ -9635,7 +10007,7 @@ 8047 8079 else 8048 8080 with_colorfgbg=no 8049 8081 fi; 8050 8082 -echo "$as_me:9638: result: $with_colorfgbg" >&5 8051 +echo "$as_me: 9985: result: $with_colorfgbg" >&58083 +echo "$as_me:10010: result: $with_colorfgbg" >&5 8052 8084 echo "${ECHO_T}$with_colorfgbg" >&6 8053 8085 test "$with_colorfgbg" = yes && cat >>confdefs.h <<\EOF 8054 8086 #define USE_COLORFGBG 1 8055 @@ -9644,7 + 9991,7 @@8087 @@ -9644,7 +10016,7 @@ 8056 8088 # This is still experimental (20080329), but should ultimately be moved to 8057 8089 # the script-block --with-normal, etc. 8058 8090 8059 8091 -echo "$as_me:9647: checking if you want to link with the pthread library" >&5 8060 +echo "$as_me: 9994: checking if you want to link with the pthread library" >&58092 +echo "$as_me:10019: checking if you want to link with the pthread library" >&5 8061 8093 echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 8062 8094 8063 8095 # Check whether --with-pthread or --without-pthread was given. 8064 @@ -9654,27 +100 01,27 @@8096 @@ -9654,27 +10026,27 @@ 8065 8097 else 8066 8098 with_pthread=no 8067 8099 fi; 8068 8100 -echo "$as_me:9657: result: $with_pthread" >&5 8069 +echo "$as_me:100 04: result: $with_pthread" >&58101 +echo "$as_me:10029: result: $with_pthread" >&5 8070 8102 echo "${ECHO_T}$with_pthread" >&6 8071 8103 8072 8104 if test "$with_pthread" != no ; then 8073 8105 - echo "$as_me:9661: checking for pthread.h" >&5 8074 + echo "$as_me:100 08: checking for pthread.h" >&58106 + echo "$as_me:10033: checking for pthread.h" >&5 8075 8107 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 8076 8108 if test "${ac_cv_header_pthread_h+set}" = set; then … … 8079 8111 cat >conftest.$ac_ext <<_ACEOF 8080 8112 -#line 9667 "configure" 8081 +#line 100 14"configure"8113 +#line 10039 "configure" 8082 8114 #include "confdefs.h" 8083 8115 #include <pthread.h> 8084 8116 _ACEOF 8085 8117 -if { (eval echo "$as_me:9671: \"$ac_cpp conftest.$ac_ext\"") >&5 8086 +if { (eval echo "$as_me:100 18: \"$ac_cpp conftest.$ac_ext\"") >&58118 +if { (eval echo "$as_me:10043: \"$ac_cpp conftest.$ac_ext\"") >&5 8087 8119 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 8088 8120 ac_status=$? … … 8091 8123 cat conftest.err >&5 8092 8124 - echo "$as_me:9677: \$? = $ac_status" >&5 8093 + echo "$as_me:100 24: \$? = $ac_status" >&58125 + echo "$as_me:10049: \$? = $ac_status" >&5 8094 8126 (exit $ac_status); } >/dev/null; then 8095 8127 if test -s conftest.err; then 8096 8128 ac_cpp_err=$ac_c_preproc_warn_flag 8097 @@ -9693,7 +100 40,7 @@8129 @@ -9693,7 +10065,7 @@ 8098 8130 fi 8099 8131 rm -f conftest.err conftest.$ac_ext 8100 8132 fi 8101 8133 -echo "$as_me:9696: result: $ac_cv_header_pthread_h" >&5 8102 +echo "$as_me:100 43: result: $ac_cv_header_pthread_h" >&58134 +echo "$as_me:10068: result: $ac_cv_header_pthread_h" >&5 8103 8135 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 8104 8136 if test $ac_cv_header_pthread_h = yes; then 8105 8137 8106 @@ -9701,12 +100 48,12 @@8138 @@ -9701,12 +10073,12 @@ 8107 8139 #define HAVE_PTHREADS_H 1 8108 8140 EOF 8109 8141 8110 8142 - echo "$as_me:9704: checking if we can link with the pthread library" >&5 8111 + echo "$as_me:100 51: checking if we can link with the pthread library" >&58143 + echo "$as_me:10076: checking if we can link with the pthread library" >&5 8112 8144 echo $ECHO_N "checking if we can link with the pthread library... $ECHO_C" >&6 8113 8145 cf_save_LIBS="$LIBS" … … 8115 8147 cat >conftest.$ac_ext <<_ACEOF 8116 8148 -#line 9709 "configure" 8117 +#line 100 56"configure"8149 +#line 10081 "configure" 8118 8150 #include "confdefs.h" 8119 8151 8120 8152 #include <pthread.h> 8121 @@ -9722,16 +100 69,16 @@8153 @@ -9722,16 +10094,16 @@ 8122 8154 } 8123 8155 _ACEOF 8124 8156 rm -f conftest.$ac_objext conftest$ac_exeext 8125 8157 -if { (eval echo "$as_me:9725: \"$ac_link\"") >&5 8126 +if { (eval echo "$as_me:100 72: \"$ac_link\"") >&58158 +if { (eval echo "$as_me:10097: \"$ac_link\"") >&5 8127 8159 (eval $ac_link) 2>&5 8128 8160 ac_status=$? 8129 8161 - echo "$as_me:9728: \$? = $ac_status" >&5 8130 + echo "$as_me:10 075: \$? = $ac_status" >&58162 + echo "$as_me:10100: \$? = $ac_status" >&5 8131 8163 (exit $ac_status); } && 8132 8164 { ac_try='test -s conftest$ac_exeext' 8133 8165 - { (eval echo "$as_me:9731: \"$ac_try\"") >&5 8134 + { (eval echo "$as_me:10 078: \"$ac_try\"") >&58166 + { (eval echo "$as_me:10103: \"$ac_try\"") >&5 8135 8167 (eval $ac_try) 2>&5 8136 8168 ac_status=$? 8137 8169 - echo "$as_me:9734: \$? = $ac_status" >&5 8138 + echo "$as_me:10 081: \$? = $ac_status" >&58170 + echo "$as_me:10106: \$? = $ac_status" >&5 8139 8171 (exit $ac_status); }; }; then 8140 8172 with_pthread=yes 8141 8173 else 8142 @@ -9741,7 +10 088,7 @@8174 @@ -9741,7 +10113,7 @@ 8143 8175 fi 8144 8176 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 8145 8177 LIBS="$cf_save_LIBS" 8146 8178 - echo "$as_me:9744: result: $with_pthread" >&5 8147 + echo "$as_me:10 091: result: $with_pthread" >&58179 + echo "$as_me:10116: result: $with_pthread" >&5 8148 8180 echo "${ECHO_T}$with_pthread" >&6 8149 8181 8150 8182 if test "$with_pthread" = yes ; then 8151 @@ -9751,7 +10 098,7 @@8183 @@ -9751,7 +10123,7 @@ 8152 8184 EOF 8153 8185 8154 8186 else 8155 8187 - { { echo "$as_me:9754: error: Cannot link with pthread library" >&5 8156 + { { echo "$as_me:101 01: error: Cannot link with pthread library" >&58188 + { { echo "$as_me:10126: error: Cannot link with pthread library" >&5 8157 8189 echo "$as_me: error: Cannot link with pthread library" >&2;} 8158 8190 { (exit 1); exit 1; }; } 8159 8191 fi 8160 @@ -9760,7 +101 07,7 @@8192 @@ -9760,7 +10132,7 @@ 8161 8193 8162 8194 fi 8163 8195 8164 8196 -echo "$as_me:9763: checking if you want to use weak-symbols for pthreads" >&5 8165 +echo "$as_me:101 10: checking if you want to use weak-symbols for pthreads" >&58197 +echo "$as_me:10135: checking if you want to use weak-symbols for pthreads" >&5 8166 8198 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 8167 8199 8168 8200 # Check whether --enable-weak-symbols or --disable-weak-symbols was given. 8169 @@ -9770,18 +101 17,18 @@8201 @@ -9770,18 +10142,18 @@ 8170 8202 else 8171 8203 use_weak_symbols=no 8172 8204 fi; 8173 8205 -echo "$as_me:9773: result: $use_weak_symbols" >&5 8174 +echo "$as_me:101 20: result: $use_weak_symbols" >&58206 +echo "$as_me:10145: result: $use_weak_symbols" >&5 8175 8207 echo "${ECHO_T}$use_weak_symbols" >&6 8176 8208 if test "$use_weak_symbols" = yes ; then 8177 8209 8178 8210 -echo "$as_me:9777: checking if $CC supports weak symbols" >&5 8179 +echo "$as_me:101 24: checking if $CC supports weak symbols" >&58211 +echo "$as_me:10149: checking if $CC supports weak symbols" >&5 8180 8212 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 8181 8213 if test "${cf_cv_weak_symbols+set}" = set; then … … 8185 8217 cat >conftest.$ac_ext <<_ACEOF 8186 8218 -#line 9784 "configure" 8187 +#line 101 31"configure"8219 +#line 10156 "configure" 8188 8220 #include "confdefs.h" 8189 8221 8190 8222 #include <stdio.h> 8191 @@ -9807,16 +101 54,16 @@8223 @@ -9807,16 +10179,16 @@ 8192 8224 } 8193 8225 _ACEOF 8194 8226 rm -f conftest.$ac_objext 8195 8227 -if { (eval echo "$as_me:9810: \"$ac_compile\"") >&5 8196 +if { (eval echo "$as_me:101 57: \"$ac_compile\"") >&58228 +if { (eval echo "$as_me:10182: \"$ac_compile\"") >&5 8197 8229 (eval $ac_compile) 2>&5 8198 8230 ac_status=$? 8199 8231 - echo "$as_me:9813: \$? = $ac_status" >&5 8200 + echo "$as_me:101 60: \$? = $ac_status" >&58232 + echo "$as_me:10185: \$? = $ac_status" >&5 8201 8233 (exit $ac_status); } && 8202 8234 { ac_try='test -s conftest.$ac_objext' 8203 8235 - { (eval echo "$as_me:9816: \"$ac_try\"") >&5 8204 + { (eval echo "$as_me:101 63: \"$ac_try\"") >&58236 + { (eval echo "$as_me:10188: \"$ac_try\"") >&5 8205 8237 (eval $ac_try) 2>&5 8206 8238 ac_status=$? 8207 8239 - echo "$as_me:9819: \$? = $ac_status" >&5 8208 + echo "$as_me:101 66: \$? = $ac_status" >&58240 + echo "$as_me:10191: \$? = $ac_status" >&5 8209 8241 (exit $ac_status); }; }; then 8210 8242 cf_cv_weak_symbols=yes 8211 8243 else 8212 @@ -9827,7 +101 74,7 @@8244 @@ -9827,7 +10199,7 @@ 8213 8245 rm -f conftest.$ac_objext conftest.$ac_ext 8214 8246 8215 8247 fi 8216 8248 -echo "$as_me:9830: result: $cf_cv_weak_symbols" >&5 8217 +echo "$as_me:10 177: result: $cf_cv_weak_symbols" >&58249 +echo "$as_me:10202: result: $cf_cv_weak_symbols" >&5 8218 8250 echo "${ECHO_T}$cf_cv_weak_symbols" >&6 8219 8251 8220 8252 else 8221 @@ -9857,7 +102 04,7 @@8253 @@ -9857,7 +10229,7 @@ 8222 8254 # opaque outside of that, so there is no --enable-opaque option. We can use 8223 8255 # this option without --with-pthreads, but this will be always set for 8224 8256 # pthreads. 8225 8257 -echo "$as_me:9860: checking if you want experimental reentrant code" >&5 8226 +echo "$as_me:102 07: checking if you want experimental reentrant code" >&58258 +echo "$as_me:10232: checking if you want experimental reentrant code" >&5 8227 8259 echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6 8228 8260 8229 8261 # Check whether --enable-reentrant or --disable-reentrant was given. 8230 @@ -9867,7 +102 14,7 @@8262 @@ -9867,7 +10239,7 @@ 8231 8263 else 8232 8264 with_reentrant=no 8233 8265 fi; 8234 8266 -echo "$as_me:9870: result: $with_reentrant" >&5 8235 +echo "$as_me:102 17: result: $with_reentrant" >&58267 +echo "$as_me:10242: result: $with_reentrant" >&5 8236 8268 echo "${ECHO_T}$with_reentrant" >&6 8237 8269 if test "$with_reentrant" = yes ; then 8238 8270 cf_cv_enable_reentrant=1 8239 @@ -9891,7 +102 38,7 @@8271 @@ -9891,7 +10263,7 @@ 8240 8272 5.*) 8241 8273 cf_cv_rel_version=6.0 8242 8274 cf_cv_abi_version=6 8243 8275 - { echo "$as_me:9894: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 8244 + { echo "$as_me:102 41: WARNING: Overriding ABI version to $cf_cv_abi_version" >&58276 + { echo "$as_me:10266: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 8245 8277 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} 8246 8278 ;; 8247 8279 esac 8248 @@ -9904,7 +102 51,7 @@8280 @@ -9904,7 +10276,7 @@ 8249 8281 NCURSES_SIZE_T=short 8250 8282 fi 8251 8283 8252 8284 -echo "$as_me:9907: checking if you want experimental safe-sprintf code" >&5 8253 +echo "$as_me:102 54: checking if you want experimental safe-sprintf code" >&58285 +echo "$as_me:10279: checking if you want experimental safe-sprintf code" >&5 8254 8286 echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6 8255 8287 8256 8288 # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given. 8257 @@ -9914,7 +102 61,7 @@8289 @@ -9914,7 +10286,7 @@ 8258 8290 else 8259 8291 with_safe_sprintf=no 8260 8292 fi; 8261 8293 -echo "$as_me:9917: result: $with_safe_sprintf" >&5 8262 +echo "$as_me:102 64: result: $with_safe_sprintf" >&58294 +echo "$as_me:10289: result: $with_safe_sprintf" >&5 8263 8295 echo "${ECHO_T}$with_safe_sprintf" >&6 8264 8296 test "$with_safe_sprintf" = yes && cat >>confdefs.h <<\EOF 8265 8297 #define USE_SAFE_SPRINTF 1 8266 @@ -9923,7 +102 70,7 @@8298 @@ -9923,7 +10295,7 @@ 8267 8299 ### use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic 8268 8300 # when hashmap is used scroll hints are useless 8269 8301 if test "$with_hashmap" = no ; then 8270 8302 -echo "$as_me:9926: checking if you want to experiment without scrolling-hints code" >&5 8271 +echo "$as_me:102 73: checking if you want to experiment without scrolling-hints code" >&58303 +echo "$as_me:10298: checking if you want to experiment without scrolling-hints code" >&5 8272 8304 echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6 8273 8305 8274 8306 # Check whether --enable-scroll-hints or --disable-scroll-hints was given. 8275 @@ -9933,7 +10 280,7 @@8307 @@ -9933,7 +10305,7 @@ 8276 8308 else 8277 8309 with_scroll_hints=yes 8278 8310 fi; 8279 8311 -echo "$as_me:9936: result: $with_scroll_hints" >&5 8280 +echo "$as_me:10 283: result: $with_scroll_hints" >&58312 +echo "$as_me:10308: result: $with_scroll_hints" >&5 8281 8313 echo "${ECHO_T}$with_scroll_hints" >&6 8282 8314 test "$with_scroll_hints" = yes && cat >>confdefs.h <<\EOF 8283 8315 #define USE_SCROLL_HINTS 1 8284 @@ -9941,7 +10 288,7 @@8316 @@ -9941,7 +10313,7 @@ 8285 8317 8286 8318 fi 8287 8319 8288 8320 -echo "$as_me:9944: checking if you want experimental wgetch-events code" >&5 8289 +echo "$as_me:10 291: checking if you want experimental wgetch-events code" >&58321 +echo "$as_me:10316: checking if you want experimental wgetch-events code" >&5 8290 8322 echo $ECHO_N "checking if you want experimental wgetch-events code... $ECHO_C" >&6 8291 8323 8292 8324 # Check whether --enable-wgetch-events or --disable-wgetch-events was given. 8293 @@ -9951,7 +10 298,7 @@8325 @@ -9951,7 +10323,7 @@ 8294 8326 else 8295 8327 with_wgetch_events=no 8296 8328 fi; 8297 8329 -echo "$as_me:9954: result: $with_wgetch_events" >&5 8298 +echo "$as_me:103 01: result: $with_wgetch_events" >&58330 +echo "$as_me:10326: result: $with_wgetch_events" >&5 8299 8331 echo "${ECHO_T}$with_wgetch_events" >&6 8300 8332 test "$with_wgetch_events" = yes && cat >>confdefs.h <<\EOF 8301 8333 #define NCURSES_WGETCH_EVENTS 1 8302 @@ -9960,7 +103 07,7 @@8334 @@ -9960,7 +10332,7 @@ 8303 8335 ############################################################################### 8304 8336 8305 8337 ### use option --disable-echo to suppress full display compiling commands 8306 8338 -echo "$as_me:9963: checking if you want to display full commands during build" >&5 8307 +echo "$as_me:103 10: checking if you want to display full commands during build" >&58339 +echo "$as_me:10335: checking if you want to display full commands during build" >&5 8308 8340 echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6 8309 8341 8310 8342 # Check whether --enable-echo or --disable-echo was given. 8311 @@ -9977,11 +103 24,11 @@8343 @@ -9977,11 +10349,11 @@ 8312 8344 test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent" 8313 8345 test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent" 8314 8346 fi 8315 8347 -echo "$as_me:9980: result: $with_echo" >&5 8316 +echo "$as_me:103 27: result: $with_echo" >&58348 +echo "$as_me:10352: result: $with_echo" >&5 8317 8349 echo "${ECHO_T}$with_echo" >&6 8318 8350 8319 8351 ### use option --enable-warnings to turn on all gcc warnings 8320 8352 -echo "$as_me:9984: checking if you want to see compiler warnings" >&5 8321 +echo "$as_me:103 31: checking if you want to see compiler warnings" >&58353 +echo "$as_me:10356: checking if you want to see compiler warnings" >&5 8322 8354 echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6 8323 8355 8324 8356 # Check whether --enable-warnings or --disable-warnings was given. 8325 @@ -9989,7 +103 36,7 @@8357 @@ -9989,7 +10361,7 @@ 8326 8358 enableval="$enable_warnings" 8327 8359 with_warnings=$enableval 8328 8360 fi; 8329 8361 -echo "$as_me:9992: result: $with_warnings" >&5 8330 +echo "$as_me:103 39: result: $with_warnings" >&58362 +echo "$as_me:10364: result: $with_warnings" >&5 8331 8363 echo "${ECHO_T}$with_warnings" >&6 8332 8364 8333 8365 if test "x$with_warnings" = "xyes"; then 8334 @@ -10000,12 +103 47,12 @@8366 @@ -10000,12 +10372,12 @@ 8335 8367 if test "$GCC" = yes ; then 8336 8368 case $host_os in 8337 8369 linux*|gnu*) 8338 8370 - echo "$as_me:10003: checking if this is really Intel C compiler" >&5 8339 + echo "$as_me:103 50: checking if this is really Intel C compiler" >&58371 + echo "$as_me:10375: checking if this is really Intel C compiler" >&5 8340 8372 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 8341 8373 cf_save_CFLAGS="$CFLAGS" … … 8343 8375 cat >conftest.$ac_ext <<_ACEOF 8344 8376 -#line 10008 "configure" 8345 +#line 103 55"configure"8377 +#line 10380 "configure" 8346 8378 #include "confdefs.h" 8347 8379 8348 8380 int 8349 @@ -10022,16 +103 69,16 @@8381 @@ -10022,16 +10394,16 @@ 8350 8382 } 8351 8383 _ACEOF 8352 8384 rm -f conftest.$ac_objext 8353 8385 -if { (eval echo "$as_me:10025: \"$ac_compile\"") >&5 8354 +if { (eval echo "$as_me:103 72: \"$ac_compile\"") >&58386 +if { (eval echo "$as_me:10397: \"$ac_compile\"") >&5 8355 8387 (eval $ac_compile) 2>&5 8356 8388 ac_status=$? 8357 8389 - echo "$as_me:10028: \$? = $ac_status" >&5 8358 + echo "$as_me:10 375: \$? = $ac_status" >&58390 + echo "$as_me:10400: \$? = $ac_status" >&5 8359 8391 (exit $ac_status); } && 8360 8392 { ac_try='test -s conftest.$ac_objext' 8361 8393 - { (eval echo "$as_me:10031: \"$ac_try\"") >&5 8362 + { (eval echo "$as_me:10 378: \"$ac_try\"") >&58394 + { (eval echo "$as_me:10403: \"$ac_try\"") >&5 8363 8395 (eval $ac_try) 2>&5 8364 8396 ac_status=$? 8365 8397 - echo "$as_me:10034: \$? = $ac_status" >&5 8366 + echo "$as_me:10 381: \$? = $ac_status" >&58398 + echo "$as_me:10406: \$? = $ac_status" >&5 8367 8399 (exit $ac_status); }; }; then 8368 8400 INTEL_COMPILER=yes 8369 8401 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" 8370 @@ -10042,14 +10 389,14 @@8402 @@ -10042,14 +10414,14 @@ 8371 8403 fi 8372 8404 rm -f conftest.$ac_objext conftest.$ac_ext 8373 8405 CFLAGS="$cf_save_CFLAGS" 8374 8406 - echo "$as_me:10045: result: $INTEL_COMPILER" >&5 8375 + echo "$as_me:10 392: result: $INTEL_COMPILER" >&58407 + echo "$as_me:10417: result: $INTEL_COMPILER" >&5 8376 8408 echo "${ECHO_T}$INTEL_COMPILER" >&6 8377 8409 ;; … … 8381 8413 cat > conftest.$ac_ext <<EOF 8382 8414 -#line 10052 "${as_me-configure}" 8383 +#line 10 399"${as_me-configure}"8415 +#line 10424 "${as_me-configure}" 8384 8416 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } 8385 8417 EOF 8386 8418 8387 @@ -10067,7 +104 14,7 @@8419 @@ -10067,7 +10439,7 @@ 8388 8420 # remark #981: operands are evaluated in unspecified order 8389 8421 # warning #269: invalid format string conversion 8390 8422 8391 8423 - { echo "$as_me:10070: checking for $CC warning options..." >&5 8392 + { echo "$as_me:104 17: checking for $CC warning options..." >&58424 + { echo "$as_me:10442: checking for $CC warning options..." >&5 8393 8425 echo "$as_me: checking for $CC warning options..." >&6;} 8394 8426 cf_save_CFLAGS="$CFLAGS" 8395 8427 EXTRA_CFLAGS="-Wall" 8396 @@ -10084,12 +104 31,12 @@8428 @@ -10084,12 +10456,12 @@ 8397 8429 wd981 8398 8430 do 8399 8431 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" 8400 8432 - if { (eval echo "$as_me:10087: \"$ac_compile\"") >&5 8401 + if { (eval echo "$as_me:104 34: \"$ac_compile\"") >&58433 + if { (eval echo "$as_me:10459: \"$ac_compile\"") >&5 8402 8434 (eval $ac_compile) 2>&5 8403 8435 ac_status=$? 8404 8436 - echo "$as_me:10090: \$? = $ac_status" >&5 8405 + echo "$as_me:104 37: \$? = $ac_status" >&58437 + echo "$as_me:10462: \$? = $ac_status" >&5 8406 8438 (exit $ac_status); }; then 8407 8439 - test -n "$verbose" && echo "$as_me:10092: result: ... -$cf_opt" >&5 8408 + test -n "$verbose" && echo "$as_me:104 39: result: ... -$cf_opt" >&58440 + test -n "$verbose" && echo "$as_me:10464: result: ... -$cf_opt" >&5 8409 8441 echo "${ECHO_T}... -$cf_opt" >&6 8410 8442 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" 8411 8443 fi 8412 @@ -10098,7 +104 45,7 @@8444 @@ -10098,7 +10470,7 @@ 8413 8445 8414 8446 elif test "$GCC" = yes 8415 8447 then 8416 8448 - { echo "$as_me:10101: checking for $CC warning options..." >&5 8417 + { echo "$as_me:104 48: checking for $CC warning options..." >&58449 + { echo "$as_me:10473: checking for $CC warning options..." >&5 8418 8450 echo "$as_me: checking for $CC warning options..." >&6;} 8419 8451 cf_save_CFLAGS="$CFLAGS" 8420 8452 EXTRA_CFLAGS="-W -Wall" 8421 @@ -10118,12 +104 65,12 @@8453 @@ -10118,12 +10490,12 @@ 8422 8454 Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum 8423 8455 do 8424 8456 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" 8425 8457 - if { (eval echo "$as_me:10121: \"$ac_compile\"") >&5 8426 + if { (eval echo "$as_me:104 68: \"$ac_compile\"") >&58458 + if { (eval echo "$as_me:10493: \"$ac_compile\"") >&5 8427 8459 (eval $ac_compile) 2>&5 8428 8460 ac_status=$? 8429 8461 - echo "$as_me:10124: \$? = $ac_status" >&5 8430 + echo "$as_me:104 71: \$? = $ac_status" >&58462 + echo "$as_me:10496: \$? = $ac_status" >&5 8431 8463 (exit $ac_status); }; then 8432 8464 - test -n "$verbose" && echo "$as_me:10126: result: ... -$cf_opt" >&5 8433 + test -n "$verbose" && echo "$as_me:104 73: result: ... -$cf_opt" >&58465 + test -n "$verbose" && echo "$as_me:10498: result: ... -$cf_opt" >&5 8434 8466 echo "${ECHO_T}... -$cf_opt" >&6 8435 8467 case $cf_opt in #(vi 8436 8468 Wcast-qual) #(vi 8437 @@ -10134,7 +10 481,7 @@8469 @@ -10134,7 +10506,7 @@ 8438 8470 [34].*) 8439 8471 test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 8440 8472 8441 8473 -echo "${as_me-configure}:10137: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 8442 +echo "${as_me-configure}:10 484: testing feature is broken in gcc $GCC_VERSION ..." 1>&58474 +echo "${as_me-configure}:10509: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 8443 8475 8444 8476 continue;; 8445 8477 esac 8446 @@ -10154,12 +105 01,12 @@8478 @@ -10154,12 +10526,12 @@ 8447 8479 if test "$GCC" = yes ; then 8448 8480 case $host_os in 8449 8481 linux*|gnu*) 8450 8482 - echo "$as_me:10157: checking if this is really Intel C++ compiler" >&5 8451 + echo "$as_me:105 04: checking if this is really Intel C++ compiler" >&58483 + echo "$as_me:10529: checking if this is really Intel C++ compiler" >&5 8452 8484 echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6 8453 8485 cf_save_CFLAGS="$CXXFLAGS" … … 8455 8487 cat >conftest.$ac_ext <<_ACEOF 8456 8488 -#line 10162 "configure" 8457 +#line 105 09"configure"8489 +#line 10534 "configure" 8458 8490 #include "confdefs.h" 8459 8491 8460 8492 int 8461 @@ -10176,16 +105 23,16 @@8493 @@ -10176,16 +10548,16 @@ 8462 8494 } 8463 8495 _ACEOF 8464 8496 rm -f conftest.$ac_objext 8465 8497 -if { (eval echo "$as_me:10179: \"$ac_compile\"") >&5 8466 +if { (eval echo "$as_me:105 26: \"$ac_compile\"") >&58498 +if { (eval echo "$as_me:10551: \"$ac_compile\"") >&5 8467 8499 (eval $ac_compile) 2>&5 8468 8500 ac_status=$? 8469 8501 - echo "$as_me:10182: \$? = $ac_status" >&5 8470 + echo "$as_me:105 29: \$? = $ac_status" >&58502 + echo "$as_me:10554: \$? = $ac_status" >&5 8471 8503 (exit $ac_status); } && 8472 8504 { ac_try='test -s conftest.$ac_objext' 8473 8505 - { (eval echo "$as_me:10185: \"$ac_try\"") >&5 8474 + { (eval echo "$as_me:105 32: \"$ac_try\"") >&58506 + { (eval echo "$as_me:10557: \"$ac_try\"") >&5 8475 8507 (eval $ac_try) 2>&5 8476 8508 ac_status=$? 8477 8509 - echo "$as_me:10188: \$? = $ac_status" >&5 8478 + echo "$as_me:105 35: \$? = $ac_status" >&58510 + echo "$as_me:10560: \$? = $ac_status" >&5 8479 8511 (exit $ac_status); }; }; then 8480 8512 INTEL_CPLUSPLUS=yes 8481 8513 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" 8482 @@ -10196,7 +105 43,7 @@8514 @@ -10196,7 +10568,7 @@ 8483 8515 fi 8484 8516 rm -f conftest.$ac_objext conftest.$ac_ext 8485 8517 CXXFLAGS="$cf_save_CFLAGS" 8486 8518 - echo "$as_me:10199: result: $INTEL_CPLUSPLUS" >&5 8487 + echo "$as_me:105 46: result: $INTEL_CPLUSPLUS" >&58519 + echo "$as_me:10571: result: $INTEL_CPLUSPLUS" >&5 8488 8520 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 8489 8521 ;; 8490 8522 esac 8491 @@ -10210,7 +105 57,7 @@8523 @@ -10210,7 +10582,7 @@ 8492 8524 ac_main_return=return 8493 8525 8494 8526 cat > conftest.$ac_ext <<EOF 8495 8527 -#line 10213 "configure" 8496 +#line 105 60"configure"8528 +#line 10585 "configure" 8497 8529 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } 8498 8530 EOF 8499 8531 8500 @@ -10228,7 +10 575,7 @@8532 @@ -10228,7 +10600,7 @@ 8501 8533 # remark #981: operands are evaluated in unspecified order 8502 8534 # warning #269: invalid format string conversion 8503 8535 8504 8536 - { echo "$as_me:10231: checking for $CC warning options..." >&5 8505 + { echo "$as_me:10 578: checking for $CC warning options..." >&58537 + { echo "$as_me:10603: checking for $CC warning options..." >&5 8506 8538 echo "$as_me: checking for $CC warning options..." >&6;} 8507 8539 cf_save_CXXFLAGS="$CXXFLAGS" 8508 8540 EXTRA_CXXFLAGS="-Wall" 8509 @@ -10245,12 +10 592,12 @@8541 @@ -10245,12 +10617,12 @@ 8510 8542 wd981 8511 8543 do 8512 8544 CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt" 8513 8545 - if { (eval echo "$as_me:10248: \"$ac_compile\"") >&5 8514 + if { (eval echo "$as_me:10 595: \"$ac_compile\"") >&58546 + if { (eval echo "$as_me:10620: \"$ac_compile\"") >&5 8515 8547 (eval $ac_compile) 2>&5 8516 8548 ac_status=$? 8517 8549 - echo "$as_me:10251: \$? = $ac_status" >&5 8518 + echo "$as_me:10 598: \$? = $ac_status" >&58550 + echo "$as_me:10623: \$? = $ac_status" >&5 8519 8551 (exit $ac_status); }; then 8520 8552 - test -n "$verbose" && echo "$as_me:10253: result: ... -$cf_opt" >&5 8521 + test -n "$verbose" && echo "$as_me:106 00: result: ... -$cf_opt" >&58553 + test -n "$verbose" && echo "$as_me:10625: result: ... -$cf_opt" >&5 8522 8554 echo "${ECHO_T}... -$cf_opt" >&6 8523 8555 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" 8524 8556 fi 8525 @@ -10259,7 +106 06,7 @@8557 @@ -10259,7 +10631,7 @@ 8526 8558 8527 8559 elif test "$GXX" = yes 8528 8560 then 8529 8561 - { echo "$as_me:10262: checking for $CXX warning options..." >&5 8530 + { echo "$as_me:106 09: checking for $CXX warning options..." >&58562 + { echo "$as_me:10634: checking for $CXX warning options..." >&5 8531 8563 echo "$as_me: checking for $CXX warning options..." >&6;} 8532 8564 cf_save_CXXFLAGS="$CXXFLAGS" 8533 8565 EXTRA_CXXFLAGS="-W -Wall" 8534 @@ -10288,16 +106 35,16 @@8566 @@ -10288,16 +10660,16 @@ 8535 8567 Wundef $cf_gxx_extra_warnings Wno-unused 8536 8568 do 8537 8569 CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt" 8538 8570 - if { (eval echo "$as_me:10291: \"$ac_compile\"") >&5 8539 + if { (eval echo "$as_me:106 38: \"$ac_compile\"") >&58571 + if { (eval echo "$as_me:10663: \"$ac_compile\"") >&5 8540 8572 (eval $ac_compile) 2>&5 8541 8573 ac_status=$? 8542 8574 - echo "$as_me:10294: \$? = $ac_status" >&5 8543 + echo "$as_me:106 41: \$? = $ac_status" >&58575 + echo "$as_me:10666: \$? = $ac_status" >&5 8544 8576 (exit $ac_status); }; then 8545 8577 - test -n "$verbose" && echo "$as_me:10296: result: ... -$cf_opt" >&5 8546 + test -n "$verbose" && echo "$as_me:106 43: result: ... -$cf_opt" >&58578 + test -n "$verbose" && echo "$as_me:10668: result: ... -$cf_opt" >&5 8547 8579 echo "${ECHO_T}... -$cf_opt" >&6 8548 8580 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" 8549 8581 else 8550 8582 - test -n "$verbose" && echo "$as_me:10300: result: ... no -$cf_opt" >&5 8551 + test -n "$verbose" && echo "$as_me:106 47: result: ... no -$cf_opt" >&58583 + test -n "$verbose" && echo "$as_me:10672: result: ... no -$cf_opt" >&5 8552 8584 echo "${ECHO_T}... no -$cf_opt" >&6 8553 8585 fi 8554 8586 done 8555 @@ -10333,10 +10 680,10 @@8587 @@ -10333,10 +10705,10 @@ 8556 8588 EOF 8557 8589 if test "$GCC" = yes 8558 8590 then 8559 8591 - { echo "$as_me:10336: checking for $CC __attribute__ directives..." >&5 8560 + { echo "$as_me:10 683: checking for $CC __attribute__ directives..." >&58592 + { echo "$as_me:10708: checking for $CC __attribute__ directives..." >&5 8561 8593 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} 8562 8594 cat > conftest.$ac_ext <<EOF 8563 8595 -#line 10339 "${as_me-configure}" 8564 +#line 10 686"${as_me-configure}"8596 +#line 10711 "${as_me-configure}" 8565 8597 #include "confdefs.h" 8566 8598 #include "conftest.h" 8567 8599 #include "conftest.i" 8568 @@ -10374,12 +107 21,12 @@8600 @@ -10374,12 +10746,12 @@ 8569 8601 EOF 8570 8602 ;; 8571 8603 esac 8572 8604 - if { (eval echo "$as_me:10377: \"$ac_compile\"") >&5 8573 + if { (eval echo "$as_me:107 24: \"$ac_compile\"") >&58605 + if { (eval echo "$as_me:10749: \"$ac_compile\"") >&5 8574 8606 (eval $ac_compile) 2>&5 8575 8607 ac_status=$? 8576 8608 - echo "$as_me:10380: \$? = $ac_status" >&5 8577 + echo "$as_me:107 27: \$? = $ac_status" >&58609 + echo "$as_me:10752: \$? = $ac_status" >&5 8578 8610 (exit $ac_status); }; then 8579 8611 - test -n "$verbose" && echo "$as_me:10382: result: ... $cf_attribute" >&5 8580 + test -n "$verbose" && echo "$as_me:107 29: result: ... $cf_attribute" >&58612 + test -n "$verbose" && echo "$as_me:10754: result: ... $cf_attribute" >&5 8581 8613 echo "${ECHO_T}... $cf_attribute" >&6 8582 8614 cat conftest.h >>confdefs.h 8583 8615 fi 8584 @@ -10391,7 +107 38,7 @@8616 @@ -10391,7 +10763,7 @@ 8585 8617 fi 8586 8618 8587 8619 ### use option --enable-assertions to turn on generation of assertion code 8588 8620 -echo "$as_me:10394: checking if you want to enable runtime assertions" >&5 8589 +echo "$as_me:107 41: checking if you want to enable runtime assertions" >&58621 +echo "$as_me:10766: checking if you want to enable runtime assertions" >&5 8590 8622 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 8591 8623 8592 8624 # Check whether --enable-assertions or --disable-assertions was given. 8593 @@ -10401,7 +107 48,7 @@8625 @@ -10401,7 +10773,7 @@ 8594 8626 else 8595 8627 with_assertions=no 8596 8628 fi; 8597 8629 -echo "$as_me:10404: result: $with_assertions" >&5 8598 +echo "$as_me:107 51: result: $with_assertions" >&58630 +echo "$as_me:10776: result: $with_assertions" >&5 8599 8631 echo "${ECHO_T}$with_assertions" >&6 8600 8632 if test -n "$GCC" 8601 8633 then 8602 @@ -10419,7 +107 66,7 @@8634 @@ -10419,7 +10791,7 @@ 8603 8635 8604 8636 ### use option --disable-leaks to suppress "permanent" leaks, for testing 8605 8637 8606 8638 -echo "$as_me:10422: checking if you want to use dmalloc for testing" >&5 8607 +echo "$as_me:107 69: checking if you want to use dmalloc for testing" >&58639 +echo "$as_me:10794: checking if you want to use dmalloc for testing" >&5 8608 8640 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 8609 8641 8610 8642 # Check whether --with-dmalloc or --without-dmalloc was given. 8611 @@ -10435,7 +10 782,7 @@8643 @@ -10435,7 +10807,7 @@ 8612 8644 else 8613 8645 with_dmalloc= 8614 8646 fi; 8615 8647 -echo "$as_me:10438: result: ${with_dmalloc:-no}" >&5 8616 +echo "$as_me:10 785: result: ${with_dmalloc:-no}" >&58648 +echo "$as_me:10810: result: ${with_dmalloc:-no}" >&5 8617 8649 echo "${ECHO_T}${with_dmalloc:-no}" >&6 8618 8650 8619 8651 case .$with_cflags in #(vi 8620 @@ -10505,7 +108 52,7 @@8652 @@ -10505,7 +10877,7 @@ 8621 8653 8622 8654 if test -n "$cf_new_cppflags" ; then … … 8627 8659 8628 8660 if test -n "$cf_new_extra_cppflags" ; then 8629 @@ -10519,23 +108 66,23 @@8661 @@ -10519,23 +10891,23 @@ 8630 8662 esac 8631 8663 8632 8664 if test "$with_dmalloc" = yes ; then 8633 8665 - echo "$as_me:10522: checking for dmalloc.h" >&5 8634 + echo "$as_me:108 69: checking for dmalloc.h" >&58666 + echo "$as_me:10894: checking for dmalloc.h" >&5 8635 8667 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6 8636 8668 if test "${ac_cv_header_dmalloc_h+set}" = set; then … … 8639 8671 cat >conftest.$ac_ext <<_ACEOF 8640 8672 -#line 10528 "configure" 8641 +#line 10 875"configure"8673 +#line 10900 "configure" 8642 8674 #include "confdefs.h" 8643 8675 #include <dmalloc.h> 8644 8676 _ACEOF 8645 8677 -if { (eval echo "$as_me:10532: \"$ac_cpp conftest.$ac_ext\"") >&5 8646 +if { (eval echo "$as_me:10 879: \"$ac_cpp conftest.$ac_ext\"") >&58678 +if { (eval echo "$as_me:10904: \"$ac_cpp conftest.$ac_ext\"") >&5 8647 8679 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 8648 8680 ac_status=$? … … 8651 8683 cat conftest.err >&5 8652 8684 - echo "$as_me:10538: \$? = $ac_status" >&5 8653 + echo "$as_me:10 885: \$? = $ac_status" >&58685 + echo "$as_me:10910: \$? = $ac_status" >&5 8654 8686 (exit $ac_status); } >/dev/null; then 8655 8687 if test -s conftest.err; then 8656 8688 ac_cpp_err=$ac_c_preproc_warn_flag 8657 @@ -10554,11 +109 01,11 @@8689 @@ -10554,11 +10926,11 @@ 8658 8690 fi 8659 8691 rm -f conftest.err conftest.$ac_ext 8660 8692 fi 8661 8693 -echo "$as_me:10557: result: $ac_cv_header_dmalloc_h" >&5 8662 +echo "$as_me:109 04: result: $ac_cv_header_dmalloc_h" >&58694 +echo "$as_me:10929: result: $ac_cv_header_dmalloc_h" >&5 8663 8695 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6 8664 8696 if test $ac_cv_header_dmalloc_h = yes; then 8665 8697 8666 8698 -echo "$as_me:10561: checking for dmalloc_debug in -ldmalloc" >&5 8667 +echo "$as_me:109 08: checking for dmalloc_debug in -ldmalloc" >&58699 +echo "$as_me:10933: checking for dmalloc_debug in -ldmalloc" >&5 8668 8700 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 8669 8701 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then 8670 8702 echo $ECHO_N "(cached) $ECHO_C" >&6 8671 @@ -10566,7 +109 13,7 @@8703 @@ -10566,7 +10938,7 @@ 8672 8704 ac_check_lib_save_LIBS=$LIBS 8673 8705 LIBS="-ldmalloc $LIBS" 8674 8706 cat >conftest.$ac_ext <<_ACEOF 8675 8707 -#line 10569 "configure" 8676 +#line 109 16"configure"8708 +#line 10941 "configure" 8677 8709 #include "confdefs.h" 8678 8710 8679 8711 /* Override any gcc2 internal prototype to avoid an error. */ 8680 @@ -10585,16 +109 32,16 @@8712 @@ -10585,16 +10957,16 @@ 8681 8713 } 8682 8714 _ACEOF 8683 8715 rm -f conftest.$ac_objext conftest$ac_exeext 8684 8716 -if { (eval echo "$as_me:10588: \"$ac_link\"") >&5 8685 +if { (eval echo "$as_me:109 35: \"$ac_link\"") >&58717 +if { (eval echo "$as_me:10960: \"$ac_link\"") >&5 8686 8718 (eval $ac_link) 2>&5 8687 8719 ac_status=$? 8688 8720 - echo "$as_me:10591: \$? = $ac_status" >&5 8689 + echo "$as_me:109 38: \$? = $ac_status" >&58721 + echo "$as_me:10963: \$? = $ac_status" >&5 8690 8722 (exit $ac_status); } && 8691 8723 { ac_try='test -s conftest$ac_exeext' 8692 8724 - { (eval echo "$as_me:10594: \"$ac_try\"") >&5 8693 + { (eval echo "$as_me:109 41: \"$ac_try\"") >&58725 + { (eval echo "$as_me:10966: \"$ac_try\"") >&5 8694 8726 (eval $ac_try) 2>&5 8695 8727 ac_status=$? 8696 8728 - echo "$as_me:10597: \$? = $ac_status" >&5 8697 + echo "$as_me:109 44: \$? = $ac_status" >&58729 + echo "$as_me:10969: \$? = $ac_status" >&5 8698 8730 (exit $ac_status); }; }; then 8699 8731 ac_cv_lib_dmalloc_dmalloc_debug=yes 8700 8732 else 8701 @@ -10605,7 +109 52,7 @@8733 @@ -10605,7 +10977,7 @@ 8702 8734 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 8703 8735 LIBS=$ac_check_lib_save_LIBS 8704 8736 fi 8705 8737 -echo "$as_me:10608: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 8706 +echo "$as_me:109 55: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&58738 +echo "$as_me:10980: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 8707 8739 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 8708 8740 if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then 8709 8741 cat >>confdefs.h <<EOF 8710 @@ -10620,7 +109 67,7 @@8742 @@ -10620,7 +10992,7 @@ 8711 8743 8712 8744 fi 8713 8745 8714 8746 -echo "$as_me:10623: checking if you want to use dbmalloc for testing" >&5 8715 +echo "$as_me:109 70: checking if you want to use dbmalloc for testing" >&58747 +echo "$as_me:10995: checking if you want to use dbmalloc for testing" >&5 8716 8748 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 8717 8749 8718 8750 # Check whether --with-dbmalloc or --without-dbmalloc was given. 8719 @@ -10636,7 +1 0983,7 @@8751 @@ -10636,7 +11008,7 @@ 8720 8752 else 8721 8753 with_dbmalloc= 8722 8754 fi; 8723 8755 -echo "$as_me:10639: result: ${with_dbmalloc:-no}" >&5 8724 +echo "$as_me:1 0986: result: ${with_dbmalloc:-no}" >&58756 +echo "$as_me:11011: result: ${with_dbmalloc:-no}" >&5 8725 8757 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 8726 8758 8727 8759 case .$with_cflags in #(vi 8728 @@ -10706,7 +110 53,7 @@8760 @@ -10706,7 +11078,7 @@ 8729 8761 8730 8762 if test -n "$cf_new_cppflags" ; then … … 8735 8767 8736 8768 if test -n "$cf_new_extra_cppflags" ; then 8737 @@ -10720,23 +110 67,23 @@8769 @@ -10720,23 +11092,23 @@ 8738 8770 esac 8739 8771 8740 8772 if test "$with_dbmalloc" = yes ; then 8741 8773 - echo "$as_me:10723: checking for dbmalloc.h" >&5 8742 + echo "$as_me:110 70: checking for dbmalloc.h" >&58774 + echo "$as_me:11095: checking for dbmalloc.h" >&5 8743 8775 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6 8744 8776 if test "${ac_cv_header_dbmalloc_h+set}" = set; then … … 8747 8779 cat >conftest.$ac_ext <<_ACEOF 8748 8780 -#line 10729 "configure" 8749 +#line 11 076"configure"8781 +#line 11101 "configure" 8750 8782 #include "confdefs.h" 8751 8783 #include <dbmalloc.h> 8752 8784 _ACEOF 8753 8785 -if { (eval echo "$as_me:10733: \"$ac_cpp conftest.$ac_ext\"") >&5 8754 +if { (eval echo "$as_me:11 080: \"$ac_cpp conftest.$ac_ext\"") >&58786 +if { (eval echo "$as_me:11105: \"$ac_cpp conftest.$ac_ext\"") >&5 8755 8787 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 8756 8788 ac_status=$? … … 8759 8791 cat conftest.err >&5 8760 8792 - echo "$as_me:10739: \$? = $ac_status" >&5 8761 + echo "$as_me:11 086: \$? = $ac_status" >&58793 + echo "$as_me:11111: \$? = $ac_status" >&5 8762 8794 (exit $ac_status); } >/dev/null; then 8763 8795 if test -s conftest.err; then 8764 8796 ac_cpp_err=$ac_c_preproc_warn_flag 8765 @@ -10755,11 +111 02,11 @@8797 @@ -10755,11 +11127,11 @@ 8766 8798 fi 8767 8799 rm -f conftest.err conftest.$ac_ext 8768 8800 fi 8769 8801 -echo "$as_me:10758: result: $ac_cv_header_dbmalloc_h" >&5 8770 +echo "$as_me:111 05: result: $ac_cv_header_dbmalloc_h" >&58802 +echo "$as_me:11130: result: $ac_cv_header_dbmalloc_h" >&5 8771 8803 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6 8772 8804 if test $ac_cv_header_dbmalloc_h = yes; then 8773 8805 8774 8806 -echo "$as_me:10762: checking for debug_malloc in -ldbmalloc" >&5 8775 +echo "$as_me:111 09: checking for debug_malloc in -ldbmalloc" >&58807 +echo "$as_me:11134: checking for debug_malloc in -ldbmalloc" >&5 8776 8808 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 8777 8809 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then 8778 8810 echo $ECHO_N "(cached) $ECHO_C" >&6 8779 @@ -10767,7 +111 14,7 @@8811 @@ -10767,7 +11139,7 @@ 8780 8812 ac_check_lib_save_LIBS=$LIBS 8781 8813 LIBS="-ldbmalloc $LIBS" 8782 8814 cat >conftest.$ac_ext <<_ACEOF 8783 8815 -#line 10770 "configure" 8784 +#line 111 17"configure"8816 +#line 11142 "configure" 8785 8817 #include "confdefs.h" 8786 8818 8787 8819 /* Override any gcc2 internal prototype to avoid an error. */ 8788 @@ -10786,16 +111 33,16 @@8820 @@ -10786,16 +11158,16 @@ 8789 8821 } 8790 8822 _ACEOF 8791 8823 rm -f conftest.$ac_objext conftest$ac_exeext 8792 8824 -if { (eval echo "$as_me:10789: \"$ac_link\"") >&5 8793 +if { (eval echo "$as_me:111 36: \"$ac_link\"") >&58825 +if { (eval echo "$as_me:11161: \"$ac_link\"") >&5 8794 8826 (eval $ac_link) 2>&5 8795 8827 ac_status=$? 8796 8828 - echo "$as_me:10792: \$? = $ac_status" >&5 8797 + echo "$as_me:111 39: \$? = $ac_status" >&58829 + echo "$as_me:11164: \$? = $ac_status" >&5 8798 8830 (exit $ac_status); } && 8799 8831 { ac_try='test -s conftest$ac_exeext' 8800 8832 - { (eval echo "$as_me:10795: \"$ac_try\"") >&5 8801 + { (eval echo "$as_me:111 42: \"$ac_try\"") >&58833 + { (eval echo "$as_me:11167: \"$ac_try\"") >&5 8802 8834 (eval $ac_try) 2>&5 8803 8835 ac_status=$? 8804 8836 - echo "$as_me:10798: \$? = $ac_status" >&5 8805 + echo "$as_me:111 45: \$? = $ac_status" >&58837 + echo "$as_me:11170: \$? = $ac_status" >&5 8806 8838 (exit $ac_status); }; }; then 8807 8839 ac_cv_lib_dbmalloc_debug_malloc=yes 8808 8840 else 8809 @@ -10806,7 +111 53,7 @@8841 @@ -10806,7 +11178,7 @@ 8810 8842 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 8811 8843 LIBS=$ac_check_lib_save_LIBS 8812 8844 fi 8813 8845 -echo "$as_me:10809: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 8814 +echo "$as_me:111 56: result: $ac_cv_lib_dbmalloc_debug_malloc" >&58846 +echo "$as_me:11181: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 8815 8847 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 8816 8848 if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then 8817 8849 cat >>confdefs.h <<EOF 8818 @@ -10821,7 +111 68,7 @@8850 @@ -10821,7 +11193,7 @@ 8819 8851 8820 8852 fi 8821 8853 8822 8854 -echo "$as_me:10824: checking if you want to use valgrind for testing" >&5 8823 +echo "$as_me:111 71: checking if you want to use valgrind for testing" >&58855 +echo "$as_me:11196: checking if you want to use valgrind for testing" >&5 8824 8856 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6 8825 8857 8826 8858 # Check whether --with-valgrind or --without-valgrind was given. 8827 @@ -10837,7 +11 184,7 @@8859 @@ -10837,7 +11209,7 @@ 8828 8860 else 8829 8861 with_valgrind= 8830 8862 fi; 8831 8863 -echo "$as_me:10840: result: ${with_valgrind:-no}" >&5 8832 +echo "$as_me:11 187: result: ${with_valgrind:-no}" >&58864 +echo "$as_me:11212: result: ${with_valgrind:-no}" >&5 8833 8865 echo "${ECHO_T}${with_valgrind:-no}" >&6 8834 8866 8835 8867 case .$with_cflags in #(vi 8836 @@ -10907,7 +112 54,7 @@8868 @@ -10907,7 +11279,7 @@ 8837 8869 8838 8870 if test -n "$cf_new_cppflags" ; then … … 8843 8875 8844 8876 if test -n "$cf_new_extra_cppflags" ; then 8845 @@ -10920,7 +112 67,7 @@8877 @@ -10920,7 +11292,7 @@ 8846 8878 ;; 8847 8879 esac 8848 8880 8849 8881 -echo "$as_me:10923: checking if you want to perform memory-leak testing" >&5 8850 +echo "$as_me:112 70: checking if you want to perform memory-leak testing" >&58882 +echo "$as_me:11295: checking if you want to perform memory-leak testing" >&5 8851 8883 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 8852 8884 8853 8885 # Check whether --enable-leaks or --disable-leaks was given. 8854 @@ -10930,7 +11 277,7 @@8886 @@ -10930,7 +11302,7 @@ 8855 8887 else 8856 8888 : ${with_no_leaks:=no} 8857 8889 fi; 8858 8890 -echo "$as_me:10933: result: $with_no_leaks" >&5 8859 +echo "$as_me:11 280: result: $with_no_leaks" >&58891 +echo "$as_me:11305: result: $with_no_leaks" >&5 8860 8892 echo "${ECHO_T}$with_no_leaks" >&6 8861 8893 8862 8894 if test "$with_no_leaks" = yes ; then 8863 @@ -10975,7 +113 22,7 @@8895 @@ -10975,7 +11347,7 @@ 8864 8896 ;; 8865 8897 esac 8866 8898 8867 8899 -echo "$as_me:10978: checking whether to add trace feature to all models" >&5 8868 +echo "$as_me:113 25: checking whether to add trace feature to all models" >&58900 +echo "$as_me:11350: checking whether to add trace feature to all models" >&5 8869 8901 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 8870 8902 8871 8903 # Check whether --with-trace or --without-trace was given. 8872 @@ -10985,7 +113 32,7 @@8904 @@ -10985,7 +11357,7 @@ 8873 8905 else 8874 8906 cf_with_trace=$cf_all_traces 8875 8907 fi; 8876 8908 -echo "$as_me:10988: result: $cf_with_trace" >&5 8877 +echo "$as_me:113 35: result: $cf_with_trace" >&58909 +echo "$as_me:11360: result: $cf_with_trace" >&5 8878 8910 echo "${ECHO_T}$cf_with_trace" >&6 8879 8911 8880 8912 if test "$cf_with_trace" = yes ; then 8881 @@ -11052,7 +11 399,7 @@8913 @@ -11052,7 +11424,7 @@ 8882 8914 8883 8915 if test -n "$cf_new_cppflags" ; then … … 8888 8920 8889 8921 if test -n "$cf_new_extra_cppflags" ; then 8890 @@ -11066,13 +114 13,13@@8922 @@ -11066,13 +11438,17 @@ 8891 8923 fi 8892 8924 8893 8925 ### Checks for libraries. 8894 8926 -echo "$as_me:11069: checking for gettimeofday" >&5 8895 +echo "$as_me:11416: checking for gettimeofday" >&5 8927 +case $cf_cv_system_name in #(vi 8928 +*mingw32*) #(vi 8929 + ;; 8930 +*) 8931 +echo "$as_me:11445: checking for gettimeofday" >&5 8896 8932 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 8897 8933 if test "${ac_cv_func_gettimeofday+set}" = set; then … … 8900 8936 cat >conftest.$ac_ext <<_ACEOF 8901 8937 -#line 11075 "configure" 8902 +#line 114 22"configure"8938 +#line 11451 "configure" 8903 8939 #include "confdefs.h" 8904 8940 /* System header to define __stub macros and hopefully few prototypes, 8905 8941 which can conflict with char gettimeofday (); below. */ 8906 @@ -11103,16 +114 50,16 @@8942 @@ -11103,16 +11479,16 @@ 8907 8943 } 8908 8944 _ACEOF 8909 8945 rm -f conftest.$ac_objext conftest$ac_exeext 8910 8946 -if { (eval echo "$as_me:11106: \"$ac_link\"") >&5 8911 +if { (eval echo "$as_me:114 53: \"$ac_link\"") >&58947 +if { (eval echo "$as_me:11482: \"$ac_link\"") >&5 8912 8948 (eval $ac_link) 2>&5 8913 8949 ac_status=$? 8914 8950 - echo "$as_me:11109: \$? = $ac_status" >&5 8915 + echo "$as_me:114 56: \$? = $ac_status" >&58951 + echo "$as_me:11485: \$? = $ac_status" >&5 8916 8952 (exit $ac_status); } && 8917 8953 { ac_try='test -s conftest$ac_exeext' 8918 8954 - { (eval echo "$as_me:11112: \"$ac_try\"") >&5 8919 + { (eval echo "$as_me:114 59: \"$ac_try\"") >&58955 + { (eval echo "$as_me:11488: \"$ac_try\"") >&5 8920 8956 (eval $ac_try) 2>&5 8921 8957 ac_status=$? 8922 8958 - echo "$as_me:11115: \$? = $ac_status" >&5 8923 + echo "$as_me:114 62: \$? = $ac_status" >&58959 + echo "$as_me:11491: \$? = $ac_status" >&5 8924 8960 (exit $ac_status); }; }; then 8925 8961 ac_cv_func_gettimeofday=yes 8926 8962 else 8927 @@ -11122,7 +114 69,7 @@8963 @@ -11122,7 +11498,7 @@ 8928 8964 fi 8929 8965 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 8930 8966 fi 8931 8967 -echo "$as_me:11125: result: $ac_cv_func_gettimeofday" >&5 8932 +echo "$as_me:11 472: result: $ac_cv_func_gettimeofday" >&58968 +echo "$as_me:11501: result: $ac_cv_func_gettimeofday" >&5 8933 8969 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 8934 8970 if test $ac_cv_func_gettimeofday = yes; then 8935 8971 cat >>confdefs.h <<\EOF 8936 @@ -11131,7 +11 478,7 @@8972 @@ -11131,7 +11507,7 @@ 8937 8973 8938 8974 else 8939 8975 8940 8976 -echo "$as_me:11134: checking for gettimeofday in -lbsd" >&5 8941 +echo "$as_me:11 481: checking for gettimeofday in -lbsd" >&58977 +echo "$as_me:11510: checking for gettimeofday in -lbsd" >&5 8942 8978 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 8943 8979 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then 8944 8980 echo $ECHO_N "(cached) $ECHO_C" >&6 8945 @@ -11139,7 +11 486,7 @@8981 @@ -11139,7 +11515,7 @@ 8946 8982 ac_check_lib_save_LIBS=$LIBS 8947 8983 LIBS="-lbsd $LIBS" 8948 8984 cat >conftest.$ac_ext <<_ACEOF 8949 8985 -#line 11142 "configure" 8950 +#line 11 489"configure"8986 +#line 11518 "configure" 8951 8987 #include "confdefs.h" 8952 8988 8953 8989 /* Override any gcc2 internal prototype to avoid an error. */ 8954 @@ -11158,16 +115 05,16 @@8990 @@ -11158,16 +11534,16 @@ 8955 8991 } 8956 8992 _ACEOF 8957 8993 rm -f conftest.$ac_objext conftest$ac_exeext 8958 8994 -if { (eval echo "$as_me:11161: \"$ac_link\"") >&5 8959 +if { (eval echo "$as_me:115 08: \"$ac_link\"") >&58995 +if { (eval echo "$as_me:11537: \"$ac_link\"") >&5 8960 8996 (eval $ac_link) 2>&5 8961 8997 ac_status=$? 8962 8998 - echo "$as_me:11164: \$? = $ac_status" >&5 8963 + echo "$as_me:115 11: \$? = $ac_status" >&58999 + echo "$as_me:11540: \$? = $ac_status" >&5 8964 9000 (exit $ac_status); } && 8965 9001 { ac_try='test -s conftest$ac_exeext' 8966 9002 - { (eval echo "$as_me:11167: \"$ac_try\"") >&5 8967 + { (eval echo "$as_me:115 14: \"$ac_try\"") >&59003 + { (eval echo "$as_me:11543: \"$ac_try\"") >&5 8968 9004 (eval $ac_try) 2>&5 8969 9005 ac_status=$? 8970 9006 - echo "$as_me:11170: \$? = $ac_status" >&5 8971 + echo "$as_me:115 17: \$? = $ac_status" >&59007 + echo "$as_me:11546: \$? = $ac_status" >&5 8972 9008 (exit $ac_status); }; }; then 8973 9009 ac_cv_lib_bsd_gettimeofday=yes 8974 9010 else 8975 @@ -11178,7 +115 25,7 @@9011 @@ -11178,7 +11554,7 @@ 8976 9012 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 8977 9013 LIBS=$ac_check_lib_save_LIBS 8978 9014 fi 8979 9015 -echo "$as_me:11181: result: $ac_cv_lib_bsd_gettimeofday" >&5 8980 +echo "$as_me:115 28: result: $ac_cv_lib_bsd_gettimeofday" >&59016 +echo "$as_me:11557: result: $ac_cv_lib_bsd_gettimeofday" >&5 8981 9017 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 8982 9018 if test $ac_cv_lib_bsd_gettimeofday = yes; then 8983 9019 cat >>confdefs.h <<\EOF 8984 @@ -11190,14 +11537,14 @@ 8985 8986 fi 9020 @@ -11189,15 +11565,17 @@ 9021 fi 9022 9023 fi 9024 + ;; 9025 +esac 8987 9026 8988 9027 -echo "$as_me:11193: checking if -lm needed for math functions" >&5 8989 +echo "$as_me:115 40: checking if -lm needed for math functions" >&59028 +echo "$as_me:11571: checking if -lm needed for math functions" >&5 8990 9029 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6 8991 9030 if test "${cf_cv_need_libm+set}" = set; then … … 8995 9034 cat >conftest.$ac_ext <<_ACEOF 8996 9035 -#line 11200 "configure" 8997 +#line 115 47"configure"9036 +#line 11578 "configure" 8998 9037 #include "confdefs.h" 8999 9038 9000 9039 #include <stdio.h> 9001 @@ -11212,16 +115 59,16 @@9040 @@ -11212,16 +11590,16 @@ 9002 9041 } 9003 9042 _ACEOF 9004 9043 rm -f conftest.$ac_objext conftest$ac_exeext 9005 9044 -if { (eval echo "$as_me:11215: \"$ac_link\"") >&5 9006 +if { (eval echo "$as_me:115 62: \"$ac_link\"") >&59045 +if { (eval echo "$as_me:11593: \"$ac_link\"") >&5 9007 9046 (eval $ac_link) 2>&5 9008 9047 ac_status=$? 9009 9048 - echo "$as_me:11218: \$? = $ac_status" >&5 9010 + echo "$as_me:115 65: \$? = $ac_status" >&59049 + echo "$as_me:11596: \$? = $ac_status" >&5 9011 9050 (exit $ac_status); } && 9012 9051 { ac_try='test -s conftest$ac_exeext' 9013 9052 - { (eval echo "$as_me:11221: \"$ac_try\"") >&5 9014 + { (eval echo "$as_me:115 68: \"$ac_try\"") >&59053 + { (eval echo "$as_me:11599: \"$ac_try\"") >&5 9015 9054 (eval $ac_try) 2>&5 9016 9055 ac_status=$? 9017 9056 - echo "$as_me:11224: \$? = $ac_status" >&5 9018 + echo "$as_me:11 571: \$? = $ac_status" >&59057 + echo "$as_me:11602: \$? = $ac_status" >&5 9019 9058 (exit $ac_status); }; }; then 9020 9059 cf_cv_need_libm=no 9021 9060 else 9022 @@ -11231,7 +11 578,7 @@9061 @@ -11231,7 +11609,7 @@ 9023 9062 fi 9024 9063 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 9025 9064 fi 9026 9065 -echo "$as_me:11234: result: $cf_cv_need_libm" >&5 9027 +echo "$as_me:11 581: result: $cf_cv_need_libm" >&59066 +echo "$as_me:11612: result: $cf_cv_need_libm" >&5 9028 9067 echo "${ECHO_T}$cf_cv_need_libm" >&6 9029 9068 if test "$cf_cv_need_libm" = yes 9030 9069 then 9031 @@ -11239,13 +11 586,13 @@9070 @@ -11239,13 +11617,13 @@ 9032 9071 fi 9033 9072 9034 9073 ### Checks for header files. 9035 9074 -echo "$as_me:11242: checking for ANSI C header files" >&5 9036 +echo "$as_me:11 589: checking for ANSI C header files" >&59075 +echo "$as_me:11620: checking for ANSI C header files" >&5 9037 9076 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 9038 9077 if test "${ac_cv_header_stdc+set}" = set; then … … 9041 9080 cat >conftest.$ac_ext <<_ACEOF 9042 9081 -#line 11248 "configure" 9043 +#line 11 595"configure"9082 +#line 11626 "configure" 9044 9083 #include "confdefs.h" 9045 9084 #include <stdlib.h> 9046 9085 #include <stdarg.h> 9047 @@ -11253,13 +116 00,13 @@9086 @@ -11253,13 +11631,13 @@ 9048 9087 #include <float.h> 9049 9088 9050 9089 _ACEOF 9051 9090 -if { (eval echo "$as_me:11256: \"$ac_cpp conftest.$ac_ext\"") >&5 9052 +if { (eval echo "$as_me:116 03: \"$ac_cpp conftest.$ac_ext\"") >&59091 +if { (eval echo "$as_me:11634: \"$ac_cpp conftest.$ac_ext\"") >&5 9053 9092 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 9054 9093 ac_status=$? … … 9057 9096 cat conftest.err >&5 9058 9097 - echo "$as_me:11262: \$? = $ac_status" >&5 9059 + echo "$as_me:116 09: \$? = $ac_status" >&59098 + echo "$as_me:11640: \$? = $ac_status" >&5 9060 9099 (exit $ac_status); } >/dev/null; then 9061 9100 if test -s conftest.err; then 9062 9101 ac_cpp_err=$ac_c_preproc_warn_flag 9063 @@ -11281,7 +116 28,7 @@9102 @@ -11281,7 +11659,7 @@ 9064 9103 if test $ac_cv_header_stdc = yes; then 9065 9104 # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 9066 9105 cat >conftest.$ac_ext <<_ACEOF 9067 9106 -#line 11284 "configure" 9068 +#line 116 31"configure"9107 +#line 11662 "configure" 9069 9108 #include "confdefs.h" 9070 9109 #include <string.h> 9071 9110 9072 @@ -11299,7 +116 46,7 @@9111 @@ -11299,7 +11677,7 @@ 9073 9112 if test $ac_cv_header_stdc = yes; then 9074 9113 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 9075 9114 cat >conftest.$ac_ext <<_ACEOF 9076 9115 -#line 11302 "configure" 9077 +#line 116 49"configure"9116 +#line 11680 "configure" 9078 9117 #include "confdefs.h" 9079 9118 #include <stdlib.h> 9080 9119 9081 @@ -11320,7 +116 67,7 @@9120 @@ -11320,7 +11698,7 @@ 9082 9121 : 9083 9122 else 9084 9123 cat >conftest.$ac_ext <<_ACEOF 9085 9124 -#line 11323 "configure" 9086 +#line 11 670"configure"9125 +#line 11701 "configure" 9087 9126 #include "confdefs.h" 9088 9127 #include <ctype.h> 9089 9128 #if ((' ' & 0x0FF) == 0x020) 9090 @@ -11346,15 +11 693,15 @@9129 @@ -11346,15 +11724,15 @@ 9091 9130 } 9092 9131 _ACEOF 9093 9132 rm -f conftest$ac_exeext 9094 9133 -if { (eval echo "$as_me:11349: \"$ac_link\"") >&5 9095 +if { (eval echo "$as_me:11 696: \"$ac_link\"") >&59134 +if { (eval echo "$as_me:11727: \"$ac_link\"") >&5 9096 9135 (eval $ac_link) 2>&5 9097 9136 ac_status=$? 9098 9137 - echo "$as_me:11352: \$? = $ac_status" >&5 9099 + echo "$as_me:11 699: \$? = $ac_status" >&59138 + echo "$as_me:11730: \$? = $ac_status" >&5 9100 9139 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 9101 9140 - { (eval echo "$as_me:11354: \"$ac_try\"") >&5 9102 + { (eval echo "$as_me:117 01: \"$ac_try\"") >&59141 + { (eval echo "$as_me:11732: \"$ac_try\"") >&5 9103 9142 (eval $ac_try) 2>&5 9104 9143 ac_status=$? 9105 9144 - echo "$as_me:11357: \$? = $ac_status" >&5 9106 + echo "$as_me:117 04: \$? = $ac_status" >&59145 + echo "$as_me:11735: \$? = $ac_status" >&5 9107 9146 (exit $ac_status); }; }; then 9108 9147 : 9109 9148 else 9110 @@ -11367,7 +117 14,7 @@9149 @@ -11367,7 +11745,7 @@ 9111 9150 fi 9112 9151 fi 9113 9152 fi 9114 9153 -echo "$as_me:11370: result: $ac_cv_header_stdc" >&5 9115 +echo "$as_me:117 17: result: $ac_cv_header_stdc" >&59154 +echo "$as_me:11748: result: $ac_cv_header_stdc" >&5 9116 9155 echo "${ECHO_T}$ac_cv_header_stdc" >&6 9117 9156 if test $ac_cv_header_stdc = yes; then 9118 9157 9119 @@ -11380,13 +117 27,13 @@9158 @@ -11380,13 +11758,13 @@ 9120 9159 ac_header_dirent=no 9121 9160 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do 9122 9161 as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` 9123 9162 -echo "$as_me:11383: checking for $ac_hdr that defines DIR" >&5 9124 +echo "$as_me:117 30: checking for $ac_hdr that defines DIR" >&59163 +echo "$as_me:11761: checking for $ac_hdr that defines DIR" >&5 9125 9164 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 9126 9165 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 9129 9168 cat >conftest.$ac_ext <<_ACEOF 9130 9169 -#line 11389 "configure" 9131 +#line 117 36"configure"9170 +#line 11767 "configure" 9132 9171 #include "confdefs.h" 9133 9172 #include <sys/types.h> 9134 9173 #include <$ac_hdr> 9135 @@ -11401,16 +117 48,16 @@9174 @@ -11401,16 +11779,16 @@ 9136 9175 } 9137 9176 _ACEOF 9138 9177 rm -f conftest.$ac_objext 9139 9178 -if { (eval echo "$as_me:11404: \"$ac_compile\"") >&5 9140 +if { (eval echo "$as_me:117 51: \"$ac_compile\"") >&59179 +if { (eval echo "$as_me:11782: \"$ac_compile\"") >&5 9141 9180 (eval $ac_compile) 2>&5 9142 9181 ac_status=$? 9143 9182 - echo "$as_me:11407: \$? = $ac_status" >&5 9144 + echo "$as_me:117 54: \$? = $ac_status" >&59183 + echo "$as_me:11785: \$? = $ac_status" >&5 9145 9184 (exit $ac_status); } && 9146 9185 { ac_try='test -s conftest.$ac_objext' 9147 9186 - { (eval echo "$as_me:11410: \"$ac_try\"") >&5 9148 + { (eval echo "$as_me:117 57: \"$ac_try\"") >&59187 + { (eval echo "$as_me:11788: \"$ac_try\"") >&5 9149 9188 (eval $ac_try) 2>&5 9150 9189 ac_status=$? 9151 9190 - echo "$as_me:11413: \$? = $ac_status" >&5 9152 + echo "$as_me:117 60: \$? = $ac_status" >&59191 + echo "$as_me:11791: \$? = $ac_status" >&5 9153 9192 (exit $ac_status); }; }; then 9154 9193 eval "$as_ac_Header=yes" 9155 9194 else 9156 @@ -11420,7 +117 67,7 @@9195 @@ -11420,7 +11798,7 @@ 9157 9196 fi 9158 9197 rm -f conftest.$ac_objext conftest.$ac_ext 9159 9198 fi 9160 9199 -echo "$as_me:11423: result: `eval echo '${'$as_ac_Header'}'`" >&5 9161 +echo "$as_me:11 770: result: `eval echo '${'$as_ac_Header'}'`" >&59200 +echo "$as_me:11801: result: `eval echo '${'$as_ac_Header'}'`" >&5 9162 9201 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 9163 9202 if test `eval echo '${'$as_ac_Header'}'` = yes; then 9164 9203 cat >>confdefs.h <<EOF 9165 @@ -11433,7 +11 780,7 @@9204 @@ -11433,7 +11811,7 @@ 9166 9205 done 9167 9206 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. 9168 9207 if test $ac_header_dirent = dirent.h; then 9169 9208 - echo "$as_me:11436: checking for opendir in -ldir" >&5 9170 + echo "$as_me:11 783: checking for opendir in -ldir" >&59209 + echo "$as_me:11814: checking for opendir in -ldir" >&5 9171 9210 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 9172 9211 if test "${ac_cv_lib_dir_opendir+set}" = set; then 9173 9212 echo $ECHO_N "(cached) $ECHO_C" >&6 9174 @@ -11441,7 +11 788,7 @@9213 @@ -11441,7 +11819,7 @@ 9175 9214 ac_check_lib_save_LIBS=$LIBS 9176 9215 LIBS="-ldir $LIBS" 9177 9216 cat >conftest.$ac_ext <<_ACEOF 9178 9217 -#line 11444 "configure" 9179 +#line 11 791"configure"9218 +#line 11822 "configure" 9180 9219 #include "confdefs.h" 9181 9220 9182 9221 /* Override any gcc2 internal prototype to avoid an error. */ 9183 @@ -11460,16 +118 07,16 @@9222 @@ -11460,16 +11838,16 @@ 9184 9223 } 9185 9224 _ACEOF 9186 9225 rm -f conftest.$ac_objext conftest$ac_exeext 9187 9226 -if { (eval echo "$as_me:11463: \"$ac_link\"") >&5 9188 +if { (eval echo "$as_me:118 10: \"$ac_link\"") >&59227 +if { (eval echo "$as_me:11841: \"$ac_link\"") >&5 9189 9228 (eval $ac_link) 2>&5 9190 9229 ac_status=$? 9191 9230 - echo "$as_me:11466: \$? = $ac_status" >&5 9192 + echo "$as_me:118 13: \$? = $ac_status" >&59231 + echo "$as_me:11844: \$? = $ac_status" >&5 9193 9232 (exit $ac_status); } && 9194 9233 { ac_try='test -s conftest$ac_exeext' 9195 9234 - { (eval echo "$as_me:11469: \"$ac_try\"") >&5 9196 + { (eval echo "$as_me:118 16: \"$ac_try\"") >&59235 + { (eval echo "$as_me:11847: \"$ac_try\"") >&5 9197 9236 (eval $ac_try) 2>&5 9198 9237 ac_status=$? 9199 9238 - echo "$as_me:11472: \$? = $ac_status" >&5 9200 + echo "$as_me:118 19: \$? = $ac_status" >&59239 + echo "$as_me:11850: \$? = $ac_status" >&5 9201 9240 (exit $ac_status); }; }; then 9202 9241 ac_cv_lib_dir_opendir=yes 9203 9242 else 9204 @@ -11480,14 +118 27,14 @@9243 @@ -11480,14 +11858,14 @@ 9205 9244 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 9206 9245 LIBS=$ac_check_lib_save_LIBS 9207 9246 fi 9208 9247 -echo "$as_me:11483: result: $ac_cv_lib_dir_opendir" >&5 9209 +echo "$as_me:118 30: result: $ac_cv_lib_dir_opendir" >&59248 +echo "$as_me:11861: result: $ac_cv_lib_dir_opendir" >&5 9210 9249 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 9211 9250 if test $ac_cv_lib_dir_opendir = yes; then … … 9215 9254 else 9216 9255 - echo "$as_me:11490: checking for opendir in -lx" >&5 9217 + echo "$as_me:118 37: checking for opendir in -lx" >&59256 + echo "$as_me:11868: checking for opendir in -lx" >&5 9218 9257 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 9219 9258 if test "${ac_cv_lib_x_opendir+set}" = set; then 9220 9259 echo $ECHO_N "(cached) $ECHO_C" >&6 9221 @@ -11495,7 +118 42,7 @@9260 @@ -11495,7 +11873,7 @@ 9222 9261 ac_check_lib_save_LIBS=$LIBS 9223 9262 LIBS="-lx $LIBS" 9224 9263 cat >conftest.$ac_ext <<_ACEOF 9225 9264 -#line 11498 "configure" 9226 +#line 118 45"configure"9265 +#line 11876 "configure" 9227 9266 #include "confdefs.h" 9228 9267 9229 9268 /* Override any gcc2 internal prototype to avoid an error. */ 9230 @@ -11514,16 +118 61,16 @@9269 @@ -11514,16 +11892,16 @@ 9231 9270 } 9232 9271 _ACEOF 9233 9272 rm -f conftest.$ac_objext conftest$ac_exeext 9234 9273 -if { (eval echo "$as_me:11517: \"$ac_link\"") >&5 9235 +if { (eval echo "$as_me:118 64: \"$ac_link\"") >&59274 +if { (eval echo "$as_me:11895: \"$ac_link\"") >&5 9236 9275 (eval $ac_link) 2>&5 9237 9276 ac_status=$? 9238 9277 - echo "$as_me:11520: \$? = $ac_status" >&5 9239 + echo "$as_me:118 67: \$? = $ac_status" >&59278 + echo "$as_me:11898: \$? = $ac_status" >&5 9240 9279 (exit $ac_status); } && 9241 9280 { ac_try='test -s conftest$ac_exeext' 9242 9281 - { (eval echo "$as_me:11523: \"$ac_try\"") >&5 9243 + { (eval echo "$as_me:11 870: \"$ac_try\"") >&59282 + { (eval echo "$as_me:11901: \"$ac_try\"") >&5 9244 9283 (eval $ac_try) 2>&5 9245 9284 ac_status=$? 9246 9285 - echo "$as_me:11526: \$? = $ac_status" >&5 9247 + echo "$as_me:11 873: \$? = $ac_status" >&59286 + echo "$as_me:11904: \$? = $ac_status" >&5 9248 9287 (exit $ac_status); }; }; then 9249 9288 ac_cv_lib_x_opendir=yes 9250 9289 else 9251 @@ -11534,7 +11 881,7 @@9290 @@ -11534,7 +11912,7 @@ 9252 9291 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 9253 9292 LIBS=$ac_check_lib_save_LIBS 9254 9293 fi 9255 9294 -echo "$as_me:11537: result: $ac_cv_lib_x_opendir" >&5 9256 +echo "$as_me:11 884: result: $ac_cv_lib_x_opendir" >&59295 +echo "$as_me:11915: result: $ac_cv_lib_x_opendir" >&5 9257 9296 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 9258 9297 if test $ac_cv_lib_x_opendir = yes; then 9259 9298 LIBS="$LIBS -lx" 9260 @@ -11542,13 +11 889,13 @@9299 @@ -11542,13 +11920,13 @@ 9261 9300 9262 9301 fi 9263 9302 9264 9303 -echo "$as_me:11545: checking whether time.h and sys/time.h may both be included" >&5 9265 +echo "$as_me:11 892: checking whether time.h and sys/time.h may both be included" >&59304 +echo "$as_me:11923: checking whether time.h and sys/time.h may both be included" >&5 9266 9305 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 9267 9306 if test "${ac_cv_header_time+set}" = set; then … … 9270 9309 cat >conftest.$ac_ext <<_ACEOF 9271 9310 -#line 11551 "configure" 9272 +#line 11 898"configure"9311 +#line 11929 "configure" 9273 9312 #include "confdefs.h" 9274 9313 #include <sys/types.h> 9275 9314 #include <sys/time.h> 9276 @@ -11564,16 +119 11,16 @@9315 @@ -11564,16 +11942,16 @@ 9277 9316 } 9278 9317 _ACEOF 9279 9318 rm -f conftest.$ac_objext 9280 9319 -if { (eval echo "$as_me:11567: \"$ac_compile\"") >&5 9281 +if { (eval echo "$as_me:119 14: \"$ac_compile\"") >&59320 +if { (eval echo "$as_me:11945: \"$ac_compile\"") >&5 9282 9321 (eval $ac_compile) 2>&5 9283 9322 ac_status=$? 9284 9323 - echo "$as_me:11570: \$? = $ac_status" >&5 9285 + echo "$as_me:119 17: \$? = $ac_status" >&59324 + echo "$as_me:11948: \$? = $ac_status" >&5 9286 9325 (exit $ac_status); } && 9287 9326 { ac_try='test -s conftest.$ac_objext' 9288 9327 - { (eval echo "$as_me:11573: \"$ac_try\"") >&5 9289 + { (eval echo "$as_me:119 20: \"$ac_try\"") >&59328 + { (eval echo "$as_me:11951: \"$ac_try\"") >&5 9290 9329 (eval $ac_try) 2>&5 9291 9330 ac_status=$? 9292 9331 - echo "$as_me:11576: \$? = $ac_status" >&5 9293 + echo "$as_me:119 23: \$? = $ac_status" >&59332 + echo "$as_me:11954: \$? = $ac_status" >&5 9294 9333 (exit $ac_status); }; }; then 9295 9334 ac_cv_header_time=yes 9296 9335 else 9297 @@ -11583,7 +119 30,7 @@9336 @@ -11583,7 +11961,7 @@ 9298 9337 fi 9299 9338 rm -f conftest.$ac_objext conftest.$ac_ext 9300 9339 fi 9301 9340 -echo "$as_me:11586: result: $ac_cv_header_time" >&5 9302 +echo "$as_me:119 33: result: $ac_cv_header_time" >&59341 +echo "$as_me:11964: result: $ac_cv_header_time" >&5 9303 9342 echo "${ECHO_T}$ac_cv_header_time" >&6 9304 9343 if test $ac_cv_header_time = yes; then 9305 9344 9306 @@ -11593,14 +119 40,14 @@9345 @@ -11593,14 +11971,14 @@ 9307 9346 9308 9347 fi 9309 9348 9310 9349 -echo "$as_me:11596: checking for regular-expression headers" >&5 9311 +echo "$as_me:119 43: checking for regular-expression headers" >&59350 +echo "$as_me:11974: checking for regular-expression headers" >&5 9312 9351 echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6 9313 9352 if test "${cf_cv_regex+set}" = set; then … … 9317 9356 cat >conftest.$ac_ext <<_ACEOF 9318 9357 -#line 11603 "configure" 9319 +#line 119 50"configure"9358 +#line 11981 "configure" 9320 9359 #include "confdefs.h" 9321 9360 #include <sys/types.h> 9322 9361 #include <regex.h> 9323 @@ -11618,16 +119 65,16 @@9362 @@ -11618,16 +11996,16 @@ 9324 9363 } 9325 9364 _ACEOF 9326 9365 rm -f conftest.$ac_objext conftest$ac_exeext 9327 9366 -if { (eval echo "$as_me:11621: \"$ac_link\"") >&5 9328 +if { (eval echo "$as_me:119 68: \"$ac_link\"") >&59367 +if { (eval echo "$as_me:11999: \"$ac_link\"") >&5 9329 9368 (eval $ac_link) 2>&5 9330 9369 ac_status=$? 9331 9370 - echo "$as_me:11624: \$? = $ac_status" >&5 9332 + echo "$as_me:1 1971: \$? = $ac_status" >&59371 + echo "$as_me:12002: \$? = $ac_status" >&5 9333 9372 (exit $ac_status); } && 9334 9373 { ac_try='test -s conftest$ac_exeext' 9335 9374 - { (eval echo "$as_me:11627: \"$ac_try\"") >&5 9336 + { (eval echo "$as_me:1 1974: \"$ac_try\"") >&59375 + { (eval echo "$as_me:12005: \"$ac_try\"") >&5 9337 9376 (eval $ac_try) 2>&5 9338 9377 ac_status=$? 9339 9378 - echo "$as_me:11630: \$? = $ac_status" >&5 9340 + echo "$as_me:1 1977: \$? = $ac_status" >&59379 + echo "$as_me:12008: \$? = $ac_status" >&5 9341 9380 (exit $ac_status); }; }; then 9342 9381 cf_cv_regex="regex.h" 9343 9382 else 9344 @@ -11635,7 +1 1982,7 @@9383 @@ -11635,7 +12013,7 @@ 9345 9384 cat conftest.$ac_ext >&5 9346 9385 9347 9386 cat >conftest.$ac_ext <<_ACEOF 9348 9387 -#line 11638 "configure" 9349 +#line 1 1985"configure"9388 +#line 12016 "configure" 9350 9389 #include "confdefs.h" 9351 9390 #include <regexp.h> 9352 9391 int 9353 @@ -11650,16 +1 1997,16 @@9392 @@ -11650,16 +12028,16 @@ 9354 9393 } 9355 9394 _ACEOF 9356 9395 rm -f conftest.$ac_objext conftest$ac_exeext 9357 9396 -if { (eval echo "$as_me:11653: \"$ac_link\"") >&5 9358 +if { (eval echo "$as_me:120 00: \"$ac_link\"") >&59397 +if { (eval echo "$as_me:12031: \"$ac_link\"") >&5 9359 9398 (eval $ac_link) 2>&5 9360 9399 ac_status=$? 9361 9400 - echo "$as_me:11656: \$? = $ac_status" >&5 9362 + echo "$as_me:120 03: \$? = $ac_status" >&59401 + echo "$as_me:12034: \$? = $ac_status" >&5 9363 9402 (exit $ac_status); } && 9364 9403 { ac_try='test -s conftest$ac_exeext' 9365 9404 - { (eval echo "$as_me:11659: \"$ac_try\"") >&5 9366 + { (eval echo "$as_me:120 06: \"$ac_try\"") >&59405 + { (eval echo "$as_me:12037: \"$ac_try\"") >&5 9367 9406 (eval $ac_try) 2>&5 9368 9407 ac_status=$? 9369 9408 - echo "$as_me:11662: \$? = $ac_status" >&5 9370 + echo "$as_me:120 09: \$? = $ac_status" >&59409 + echo "$as_me:12040: \$? = $ac_status" >&5 9371 9410 (exit $ac_status); }; }; then 9372 9411 cf_cv_regex="regexp.h" 9373 9412 else 9374 @@ -11669,7 +120 16,7 @@9413 @@ -11669,7 +12047,7 @@ 9375 9414 cf_save_LIBS="$LIBS" 9376 9415 LIBS="-lgen $LIBS" 9377 9416 cat >conftest.$ac_ext <<_ACEOF 9378 9417 -#line 11672 "configure" 9379 +#line 120 19"configure"9418 +#line 12050 "configure" 9380 9419 #include "confdefs.h" 9381 9420 #include <regexpr.h> 9382 9421 int 9383 @@ -11684,16 +120 31,16 @@9422 @@ -11684,16 +12062,16 @@ 9384 9423 } 9385 9424 _ACEOF 9386 9425 rm -f conftest.$ac_objext conftest$ac_exeext 9387 9426 -if { (eval echo "$as_me:11687: \"$ac_link\"") >&5 9388 +if { (eval echo "$as_me:120 34: \"$ac_link\"") >&59427 +if { (eval echo "$as_me:12065: \"$ac_link\"") >&5 9389 9428 (eval $ac_link) 2>&5 9390 9429 ac_status=$? 9391 9430 - echo "$as_me:11690: \$? = $ac_status" >&5 9392 + echo "$as_me:120 37: \$? = $ac_status" >&59431 + echo "$as_me:12068: \$? = $ac_status" >&5 9393 9432 (exit $ac_status); } && 9394 9433 { ac_try='test -s conftest$ac_exeext' 9395 9434 - { (eval echo "$as_me:11693: \"$ac_try\"") >&5 9396 + { (eval echo "$as_me:120 40: \"$ac_try\"") >&59435 + { (eval echo "$as_me:12071: \"$ac_try\"") >&5 9397 9436 (eval $ac_try) 2>&5 9398 9437 ac_status=$? 9399 9438 - echo "$as_me:11696: \$? = $ac_status" >&5 9400 + echo "$as_me:120 43: \$? = $ac_status" >&59439 + echo "$as_me:12074: \$? = $ac_status" >&5 9401 9440 (exit $ac_status); }; }; then 9402 9441 cf_cv_regex="regexpr.h" 9403 9442 else 9404 @@ -11709,7 +120 56,7 @@9443 @@ -11709,7 +12087,7 @@ 9405 9444 9406 9445 fi 9407 9446 9408 9447 -echo "$as_me:11712: result: $cf_cv_regex" >&5 9409 +echo "$as_me:120 59: result: $cf_cv_regex" >&59448 +echo "$as_me:12090: result: $cf_cv_regex" >&5 9410 9449 echo "${ECHO_T}$cf_cv_regex" >&6 9411 9450 case $cf_cv_regex in 9412 9451 regex.h) cat >>confdefs.h <<\EOF 9413 @@ -11745,23 +12 092,23 @@9452 @@ -11745,23 +12123,23 @@ 9414 9453 9415 9454 do 9416 9455 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 9417 9456 -echo "$as_me:11748: checking for $ac_header" >&5 9418 +echo "$as_me:12 095: checking for $ac_header" >&59457 +echo "$as_me:12126: checking for $ac_header" >&5 9419 9458 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 9420 9459 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 9423 9462 cat >conftest.$ac_ext <<_ACEOF 9424 9463 -#line 11754 "configure" 9425 +#line 121 01"configure"9464 +#line 12132 "configure" 9426 9465 #include "confdefs.h" 9427 9466 #include <$ac_header> 9428 9467 _ACEOF 9429 9468 -if { (eval echo "$as_me:11758: \"$ac_cpp conftest.$ac_ext\"") >&5 9430 +if { (eval echo "$as_me:121 05: \"$ac_cpp conftest.$ac_ext\"") >&59469 +if { (eval echo "$as_me:12136: \"$ac_cpp conftest.$ac_ext\"") >&5 9431 9470 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 9432 9471 ac_status=$? … … 9435 9474 cat conftest.err >&5 9436 9475 - echo "$as_me:11764: \$? = $ac_status" >&5 9437 + echo "$as_me:121 11: \$? = $ac_status" >&59476 + echo "$as_me:12142: \$? = $ac_status" >&5 9438 9477 (exit $ac_status); } >/dev/null; then 9439 9478 if test -s conftest.err; then 9440 9479 ac_cpp_err=$ac_c_preproc_warn_flag 9441 @@ -11780,7 +121 27,7 @@9480 @@ -11780,7 +12158,7 @@ 9442 9481 fi 9443 9482 rm -f conftest.err conftest.$ac_ext 9444 9483 fi 9445 9484 -echo "$as_me:11783: result: `eval echo '${'$as_ac_Header'}'`" >&5 9446 +echo "$as_me:121 30: result: `eval echo '${'$as_ac_Header'}'`" >&59485 +echo "$as_me:12161: result: `eval echo '${'$as_ac_Header'}'`" >&5 9447 9486 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 9448 9487 if test `eval echo '${'$as_ac_Header'}'` = yes; then 9449 9488 cat >>confdefs.h <<EOF 9450 @@ -11794,7 +121 41,7 @@9489 @@ -11794,7 +12172,7 @@ 9451 9490 # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set 9452 9491 if test "$ISC" = yes ; then 9453 9492 9454 9493 -echo "$as_me:11797: checking for main in -lcposix" >&5 9455 +echo "$as_me:121 44: checking for main in -lcposix" >&59494 +echo "$as_me:12175: checking for main in -lcposix" >&5 9456 9495 echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6 9457 9496 if test "${ac_cv_lib_cposix_main+set}" = set; then 9458 9497 echo $ECHO_N "(cached) $ECHO_C" >&6 9459 @@ -11802,7 +121 49,7 @@9498 @@ -11802,7 +12180,7 @@ 9460 9499 ac_check_lib_save_LIBS=$LIBS 9461 9500 LIBS="-lcposix $LIBS" 9462 9501 cat >conftest.$ac_ext <<_ACEOF 9463 9502 -#line 11805 "configure" 9464 +#line 121 52"configure"9503 +#line 12183 "configure" 9465 9504 #include "confdefs.h" 9466 9505 9467 9506 int 9468 @@ -11814,16 +121 61,16 @@9507 @@ -11814,16 +12192,16 @@ 9469 9508 } 9470 9509 _ACEOF 9471 9510 rm -f conftest.$ac_objext conftest$ac_exeext 9472 9511 -if { (eval echo "$as_me:11817: \"$ac_link\"") >&5 9473 +if { (eval echo "$as_me:121 64: \"$ac_link\"") >&59512 +if { (eval echo "$as_me:12195: \"$ac_link\"") >&5 9474 9513 (eval $ac_link) 2>&5 9475 9514 ac_status=$? 9476 9515 - echo "$as_me:11820: \$? = $ac_status" >&5 9477 + echo "$as_me:121 67: \$? = $ac_status" >&59516 + echo "$as_me:12198: \$? = $ac_status" >&5 9478 9517 (exit $ac_status); } && 9479 9518 { ac_try='test -s conftest$ac_exeext' 9480 9519 - { (eval echo "$as_me:11823: \"$ac_try\"") >&5 9481 + { (eval echo "$as_me:12 170: \"$ac_try\"") >&59520 + { (eval echo "$as_me:12201: \"$ac_try\"") >&5 9482 9521 (eval $ac_try) 2>&5 9483 9522 ac_status=$? 9484 9523 - echo "$as_me:11826: \$? = $ac_status" >&5 9485 + echo "$as_me:12 173: \$? = $ac_status" >&59524 + echo "$as_me:12204: \$? = $ac_status" >&5 9486 9525 (exit $ac_status); }; }; then 9487 9526 ac_cv_lib_cposix_main=yes 9488 9527 else 9489 @@ -11834,7 +12 181,7 @@9528 @@ -11834,7 +12212,7 @@ 9490 9529 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 9491 9530 LIBS=$ac_check_lib_save_LIBS 9492 9531 fi 9493 9532 -echo "$as_me:11837: result: $ac_cv_lib_cposix_main" >&5 9494 +echo "$as_me:12 184: result: $ac_cv_lib_cposix_main" >&59533 +echo "$as_me:12215: result: $ac_cv_lib_cposix_main" >&5 9495 9534 echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6 9496 9535 if test $ac_cv_lib_cposix_main = yes; then 9497 9536 cat >>confdefs.h <<EOF 9498 @@ -11845,7 +12 192,7 @@9537 @@ -11845,7 +12223,7 @@ 9499 9538 9500 9539 fi 9501 9540 9502 9541 - echo "$as_me:11848: checking for bzero in -linet" >&5 9503 + echo "$as_me:12 195: checking for bzero in -linet" >&59542 + echo "$as_me:12226: checking for bzero in -linet" >&5 9504 9543 echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6 9505 9544 if test "${ac_cv_lib_inet_bzero+set}" = set; then 9506 9545 echo $ECHO_N "(cached) $ECHO_C" >&6 9507 @@ -11853,7 +122 00,7 @@9546 @@ -11853,7 +12231,7 @@ 9508 9547 ac_check_lib_save_LIBS=$LIBS 9509 9548 LIBS="-linet $LIBS" 9510 9549 cat >conftest.$ac_ext <<_ACEOF 9511 9550 -#line 11856 "configure" 9512 +#line 122 03"configure"9551 +#line 12234 "configure" 9513 9552 #include "confdefs.h" 9514 9553 9515 9554 /* Override any gcc2 internal prototype to avoid an error. */ 9516 @@ -11872,16 +122 19,16 @@9555 @@ -11872,16 +12250,16 @@ 9517 9556 } 9518 9557 _ACEOF 9519 9558 rm -f conftest.$ac_objext conftest$ac_exeext 9520 9559 -if { (eval echo "$as_me:11875: \"$ac_link\"") >&5 9521 +if { (eval echo "$as_me:122 22: \"$ac_link\"") >&59560 +if { (eval echo "$as_me:12253: \"$ac_link\"") >&5 9522 9561 (eval $ac_link) 2>&5 9523 9562 ac_status=$? 9524 9563 - echo "$as_me:11878: \$? = $ac_status" >&5 9525 + echo "$as_me:122 25: \$? = $ac_status" >&59564 + echo "$as_me:12256: \$? = $ac_status" >&5 9526 9565 (exit $ac_status); } && 9527 9566 { ac_try='test -s conftest$ac_exeext' 9528 9567 - { (eval echo "$as_me:11881: \"$ac_try\"") >&5 9529 + { (eval echo "$as_me:122 28: \"$ac_try\"") >&59568 + { (eval echo "$as_me:12259: \"$ac_try\"") >&5 9530 9569 (eval $ac_try) 2>&5 9531 9570 ac_status=$? 9532 9571 - echo "$as_me:11884: \$? = $ac_status" >&5 9533 + echo "$as_me:122 31: \$? = $ac_status" >&59572 + echo "$as_me:12262: \$? = $ac_status" >&5 9534 9573 (exit $ac_status); }; }; then 9535 9574 ac_cv_lib_inet_bzero=yes 9536 9575 else 9537 @@ -11892,21 +122 39,21 @@9576 @@ -11892,21 +12270,21 @@ 9538 9577 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 9539 9578 LIBS=$ac_check_lib_save_LIBS 9540 9579 fi 9541 9580 -echo "$as_me:11895: result: $ac_cv_lib_inet_bzero" >&5 9542 +echo "$as_me:122 42: result: $ac_cv_lib_inet_bzero" >&59581 +echo "$as_me:12273: result: $ac_cv_lib_inet_bzero" >&5 9543 9582 echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6 9544 9583 if test $ac_cv_lib_inet_bzero = yes; then … … 9548 9587 9549 9588 -echo "$as_me:11902: checking if sys/time.h works with sys/select.h" >&5 9550 +echo "$as_me:122 49: checking if sys/time.h works with sys/select.h" >&59589 +echo "$as_me:12280: checking if sys/time.h works with sys/select.h" >&5 9551 9590 echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6 9552 9591 if test "${cf_cv_sys_time_select+set}" = set; then … … 9556 9595 cat >conftest.$ac_ext <<_ACEOF 9557 9596 -#line 11909 "configure" 9558 +#line 122 56"configure"9597 +#line 12287 "configure" 9559 9598 #include "confdefs.h" 9560 9599 9561 9600 #include <sys/types.h> 9562 @@ -11926,16 +12 273,16 @@9601 @@ -11926,16 +12304,16 @@ 9563 9602 } 9564 9603 _ACEOF 9565 9604 rm -f conftest.$ac_objext 9566 9605 -if { (eval echo "$as_me:11929: \"$ac_compile\"") >&5 9567 +if { (eval echo "$as_me:12 276: \"$ac_compile\"") >&59606 +if { (eval echo "$as_me:12307: \"$ac_compile\"") >&5 9568 9607 (eval $ac_compile) 2>&5 9569 9608 ac_status=$? 9570 9609 - echo "$as_me:11932: \$? = $ac_status" >&5 9571 + echo "$as_me:12 279: \$? = $ac_status" >&59610 + echo "$as_me:12310: \$? = $ac_status" >&5 9572 9611 (exit $ac_status); } && 9573 9612 { ac_try='test -s conftest.$ac_objext' 9574 9613 - { (eval echo "$as_me:11935: \"$ac_try\"") >&5 9575 + { (eval echo "$as_me:12 282: \"$ac_try\"") >&59614 + { (eval echo "$as_me:12313: \"$ac_try\"") >&5 9576 9615 (eval $ac_try) 2>&5 9577 9616 ac_status=$? 9578 9617 - echo "$as_me:11938: \$? = $ac_status" >&5 9579 + echo "$as_me:12 285: \$? = $ac_status" >&59618 + echo "$as_me:12316: \$? = $ac_status" >&5 9580 9619 (exit $ac_status); }; }; then 9581 9620 cf_cv_sys_time_select=yes 9582 9621 else 9583 @@ -11947,7 +12 294,7 @@9622 @@ -11947,7 +12325,7 @@ 9584 9623 9585 9624 fi 9586 9625 9587 9626 -echo "$as_me:11950: result: $cf_cv_sys_time_select" >&5 9588 +echo "$as_me:12 297: result: $cf_cv_sys_time_select" >&59627 +echo "$as_me:12328: result: $cf_cv_sys_time_select" >&5 9589 9628 echo "${ECHO_T}$cf_cv_sys_time_select" >&6 9590 9629 test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF 9591 9630 #define HAVE_SYS_TIME_SELECT 1 9592 @@ -11961,7 +123 08,7 @@9631 @@ -11961,7 +12339,7 @@ 9593 9632 ac_compiler_gnu=$ac_cv_c_compiler_gnu 9594 9633 ac_main_return=return 9595 9634 9596 9635 -echo "$as_me:11964: checking for $CC option to accept ANSI C" >&5 9597 +echo "$as_me:123 11: checking for $CC option to accept ANSI C" >&59636 +echo "$as_me:12342: checking for $CC option to accept ANSI C" >&5 9598 9637 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 9599 9638 if test "${ac_cv_prog_cc_stdc+set}" = set; then 9600 9639 echo $ECHO_N "(cached) $ECHO_C" >&6 9601 @@ -11969,7 +123 16,7 @@9640 @@ -11969,7 +12347,7 @@ 9602 9641 ac_cv_prog_cc_stdc=no 9603 9642 ac_save_CC=$CC 9604 9643 cat >conftest.$ac_ext <<_ACEOF 9605 9644 -#line 11972 "configure" 9606 +#line 123 19"configure"9645 +#line 12350 "configure" 9607 9646 #include "confdefs.h" 9608 9647 #include <stdarg.h> 9609 9648 #include <stdio.h> 9610 @@ -12018,16 +123 65,16 @@9649 @@ -12018,16 +12396,16 @@ 9611 9650 do 9612 9651 CC="$ac_save_CC $ac_arg" 9613 9652 rm -f conftest.$ac_objext 9614 9653 -if { (eval echo "$as_me:12021: \"$ac_compile\"") >&5 9615 +if { (eval echo "$as_me:123 68: \"$ac_compile\"") >&59654 +if { (eval echo "$as_me:12399: \"$ac_compile\"") >&5 9616 9655 (eval $ac_compile) 2>&5 9617 9656 ac_status=$? 9618 9657 - echo "$as_me:12024: \$? = $ac_status" >&5 9619 + echo "$as_me:12 371: \$? = $ac_status" >&59658 + echo "$as_me:12402: \$? = $ac_status" >&5 9620 9659 (exit $ac_status); } && 9621 9660 { ac_try='test -s conftest.$ac_objext' 9622 9661 - { (eval echo "$as_me:12027: \"$ac_try\"") >&5 9623 + { (eval echo "$as_me:12 374: \"$ac_try\"") >&59662 + { (eval echo "$as_me:12405: \"$ac_try\"") >&5 9624 9663 (eval $ac_try) 2>&5 9625 9664 ac_status=$? 9626 9665 - echo "$as_me:12030: \$? = $ac_status" >&5 9627 + echo "$as_me:12 377: \$? = $ac_status" >&59666 + echo "$as_me:12408: \$? = $ac_status" >&5 9628 9667 (exit $ac_status); }; }; then 9629 9668 ac_cv_prog_cc_stdc=$ac_arg 9630 9669 break 9631 @@ -12044,21 +12 391,21 @@9670 @@ -12044,21 +12422,21 @@ 9632 9671 9633 9672 case "x$ac_cv_prog_cc_stdc" in 9634 9673 x|xno) 9635 9674 - echo "$as_me:12047: result: none needed" >&5 9636 + echo "$as_me:12 394: result: none needed" >&59675 + echo "$as_me:12425: result: none needed" >&5 9637 9676 echo "${ECHO_T}none needed" >&6 ;; 9638 9677 *) 9639 9678 - echo "$as_me:12050: result: $ac_cv_prog_cc_stdc" >&5 9640 + echo "$as_me:12 397: result: $ac_cv_prog_cc_stdc" >&59679 + echo "$as_me:12428: result: $ac_cv_prog_cc_stdc" >&5 9641 9680 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 9642 9681 CC="$CC $ac_cv_prog_cc_stdc" ;; … … 9644 9683 9645 9684 -echo "$as_me:12055: checking for an ANSI C-conforming const" >&5 9646 +echo "$as_me:124 02: checking for an ANSI C-conforming const" >&59685 +echo "$as_me:12433: checking for an ANSI C-conforming const" >&5 9647 9686 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 9648 9687 if test "${ac_cv_c_const+set}" = set; then … … 9651 9690 cat >conftest.$ac_ext <<_ACEOF 9652 9691 -#line 12061 "configure" 9653 +#line 124 08"configure"9692 +#line 12439 "configure" 9654 9693 #include "confdefs.h" 9655 9694 9656 9695 int 9657 @@ -12116,16 +124 63,16 @@9696 @@ -12116,16 +12494,16 @@ 9658 9697 } 9659 9698 _ACEOF 9660 9699 rm -f conftest.$ac_objext 9661 9700 -if { (eval echo "$as_me:12119: \"$ac_compile\"") >&5 9662 +if { (eval echo "$as_me:124 66: \"$ac_compile\"") >&59701 +if { (eval echo "$as_me:12497: \"$ac_compile\"") >&5 9663 9702 (eval $ac_compile) 2>&5 9664 9703 ac_status=$? 9665 9704 - echo "$as_me:12122: \$? = $ac_status" >&5 9666 + echo "$as_me:12 469: \$? = $ac_status" >&59705 + echo "$as_me:12500: \$? = $ac_status" >&5 9667 9706 (exit $ac_status); } && 9668 9707 { ac_try='test -s conftest.$ac_objext' 9669 9708 - { (eval echo "$as_me:12125: \"$ac_try\"") >&5 9670 + { (eval echo "$as_me:12 472: \"$ac_try\"") >&59709 + { (eval echo "$as_me:12503: \"$ac_try\"") >&5 9671 9710 (eval $ac_try) 2>&5 9672 9711 ac_status=$? 9673 9712 - echo "$as_me:12128: \$? = $ac_status" >&5 9674 + echo "$as_me:12 475: \$? = $ac_status" >&59713 + echo "$as_me:12506: \$? = $ac_status" >&5 9675 9714 (exit $ac_status); }; }; then 9676 9715 ac_cv_c_const=yes 9677 9716 else 9678 @@ -12135,7 +12 482,7 @@9717 @@ -12135,7 +12513,7 @@ 9679 9718 fi 9680 9719 rm -f conftest.$ac_objext conftest.$ac_ext 9681 9720 fi 9682 9721 -echo "$as_me:12138: result: $ac_cv_c_const" >&5 9683 +echo "$as_me:12 485: result: $ac_cv_c_const" >&59722 +echo "$as_me:12516: result: $ac_cv_c_const" >&5 9684 9723 echo "${ECHO_T}$ac_cv_c_const" >&6 9685 9724 if test $ac_cv_c_const = no; then 9686 9725 9687 @@ -12145,7 +12 492,7 @@9726 @@ -12145,7 +12523,7 @@ 9688 9727 9689 9728 fi 9690 9729 9691 9730 -echo "$as_me:12148: checking for inline" >&5 9692 +echo "$as_me:12 495: checking for inline" >&59731 +echo "$as_me:12526: checking for inline" >&5 9693 9732 echo $ECHO_N "checking for inline... $ECHO_C" >&6 9694 9733 if test "${ac_cv_c_inline+set}" = set; then 9695 9734 echo $ECHO_N "(cached) $ECHO_C" >&6 9696 @@ -12153,7 +125 00,7 @@9735 @@ -12153,7 +12531,7 @@ 9697 9736 ac_cv_c_inline=no 9698 9737 for ac_kw in inline __inline__ __inline; do 9699 9738 cat >conftest.$ac_ext <<_ACEOF 9700 9739 -#line 12156 "configure" 9701 +#line 125 03"configure"9740 +#line 12534 "configure" 9702 9741 #include "confdefs.h" 9703 9742 #ifndef __cplusplus 9704 9743 static $ac_kw int static_foo () {return 0; } 9705 @@ -12162,16 +125 09,16 @@9744 @@ -12162,16 +12540,16 @@ 9706 9745 9707 9746 _ACEOF 9708 9747 rm -f conftest.$ac_objext 9709 9748 -if { (eval echo "$as_me:12165: \"$ac_compile\"") >&5 9710 +if { (eval echo "$as_me:125 12: \"$ac_compile\"") >&59749 +if { (eval echo "$as_me:12543: \"$ac_compile\"") >&5 9711 9750 (eval $ac_compile) 2>&5 9712 9751 ac_status=$? 9713 9752 - echo "$as_me:12168: \$? = $ac_status" >&5 9714 + echo "$as_me:125 15: \$? = $ac_status" >&59753 + echo "$as_me:12546: \$? = $ac_status" >&5 9715 9754 (exit $ac_status); } && 9716 9755 { ac_try='test -s conftest.$ac_objext' 9717 9756 - { (eval echo "$as_me:12171: \"$ac_try\"") >&5 9718 + { (eval echo "$as_me:125 18: \"$ac_try\"") >&59757 + { (eval echo "$as_me:12549: \"$ac_try\"") >&5 9719 9758 (eval $ac_try) 2>&5 9720 9759 ac_status=$? 9721 9760 - echo "$as_me:12174: \$? = $ac_status" >&5 9722 + echo "$as_me:125 21: \$? = $ac_status" >&59761 + echo "$as_me:12552: \$? = $ac_status" >&5 9723 9762 (exit $ac_status); }; }; then 9724 9763 ac_cv_c_inline=$ac_kw; break 9725 9764 else 9726 @@ -12182,7 +125 29,7 @@9765 @@ -12182,7 +12560,7 @@ 9727 9766 done 9728 9767 9729 9768 fi 9730 9769 -echo "$as_me:12185: result: $ac_cv_c_inline" >&5 9731 +echo "$as_me:125 32: result: $ac_cv_c_inline" >&59770 +echo "$as_me:12563: result: $ac_cv_c_inline" >&5 9732 9771 echo "${ECHO_T}$ac_cv_c_inline" >&6 9733 9772 case $ac_cv_c_inline in 9734 9773 inline | yes) ;; 9735 @@ -12205,7 +125 52,7 @@9774 @@ -12205,7 +12583,7 @@ 9736 9775 : 9737 9776 elif test "$GCC" = yes 9738 9777 then 9739 9778 - echo "$as_me:12208: checking if gcc supports options to tune inlining" >&5 9740 + echo "$as_me:125 55: checking if gcc supports options to tune inlining" >&59779 + echo "$as_me:12586: checking if gcc supports options to tune inlining" >&5 9741 9780 echo $ECHO_N "checking if gcc supports options to tune inlining... $ECHO_C" >&6 9742 9781 if test "${cf_cv_gcc_inline+set}" = set; then 9743 9782 echo $ECHO_N "(cached) $ECHO_C" >&6 9744 @@ -12214,7 +125 61,7 @@9783 @@ -12214,7 +12592,7 @@ 9745 9784 cf_save_CFLAGS=$CFLAGS 9746 9785 CFLAGS="$CFLAGS --param max-inline-insns-single=1200" 9747 9786 cat >conftest.$ac_ext <<_ACEOF 9748 9787 -#line 12217 "configure" 9749 +#line 125 64"configure"9788 +#line 12595 "configure" 9750 9789 #include "confdefs.h" 9751 9790 inline int foo(void) { return 1; } 9752 9791 int 9753 @@ -12226,16 +12 573,16 @@9792 @@ -12226,16 +12604,16 @@ 9754 9793 } 9755 9794 _ACEOF 9756 9795 rm -f conftest.$ac_objext 9757 9796 -if { (eval echo "$as_me:12229: \"$ac_compile\"") >&5 9758 +if { (eval echo "$as_me:12 576: \"$ac_compile\"") >&59797 +if { (eval echo "$as_me:12607: \"$ac_compile\"") >&5 9759 9798 (eval $ac_compile) 2>&5 9760 9799 ac_status=$? 9761 9800 - echo "$as_me:12232: \$? = $ac_status" >&5 9762 + echo "$as_me:12 579: \$? = $ac_status" >&59801 + echo "$as_me:12610: \$? = $ac_status" >&5 9763 9802 (exit $ac_status); } && 9764 9803 { ac_try='test -s conftest.$ac_objext' 9765 9804 - { (eval echo "$as_me:12235: \"$ac_try\"") >&5 9766 + { (eval echo "$as_me:12 582: \"$ac_try\"") >&59805 + { (eval echo "$as_me:12613: \"$ac_try\"") >&5 9767 9806 (eval $ac_try) 2>&5 9768 9807 ac_status=$? 9769 9808 - echo "$as_me:12238: \$? = $ac_status" >&5 9770 + echo "$as_me:12 585: \$? = $ac_status" >&59809 + echo "$as_me:12616: \$? = $ac_status" >&5 9771 9810 (exit $ac_status); }; }; then 9772 9811 cf_cv_gcc_inline=yes 9773 9812 else 9774 @@ -12247,7 +12 594,7 @@9813 @@ -12247,7 +12625,7 @@ 9775 9814 CFLAGS=$cf_save_CFLAGS 9776 9815 9777 9816 fi 9778 9817 -echo "$as_me:12250: result: $cf_cv_gcc_inline" >&5 9779 +echo "$as_me:12 597: result: $cf_cv_gcc_inline" >&59818 +echo "$as_me:12628: result: $cf_cv_gcc_inline" >&5 9780 9819 echo "${ECHO_T}$cf_cv_gcc_inline" >&6 9781 9820 if test "$cf_cv_gcc_inline" = yes ; then 9782 9821 9783 @@ -12311,7 +126 58,7 @@9822 @@ -12311,7 +12689,7 @@ 9784 9823 9785 9824 if test -n "$cf_new_cppflags" ; then … … 9790 9829 9791 9830 if test -n "$cf_new_extra_cppflags" ; then 9792 @@ -12323,7 +12 670,7 @@9831 @@ -12323,7 +12701,7 @@ 9793 9832 fi 9794 9833 fi 9795 9834 9796 9835 -echo "$as_me:12326: checking for signal global datatype" >&5 9797 +echo "$as_me:12 673: checking for signal global datatype" >&59836 +echo "$as_me:12704: checking for signal global datatype" >&5 9798 9837 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 9799 9838 if test "${cf_cv_sig_atomic_t+set}" = set; then 9800 9839 echo $ECHO_N "(cached) $ECHO_C" >&6 9801 @@ -12335,7 +12 682,7 @@9840 @@ -12335,7 +12713,7 @@ 9802 9841 "int" 9803 9842 do 9804 9843 cat >conftest.$ac_ext <<_ACEOF 9805 9844 -#line 12338 "configure" 9806 +#line 12 685"configure"9845 +#line 12716 "configure" 9807 9846 #include "confdefs.h" 9808 9847 9809 9848 #include <sys/types.h> 9810 @@ -12358,16 +127 05,16 @@9849 @@ -12358,16 +12736,16 @@ 9811 9850 } 9812 9851 _ACEOF 9813 9852 rm -f conftest.$ac_objext 9814 9853 -if { (eval echo "$as_me:12361: \"$ac_compile\"") >&5 9815 +if { (eval echo "$as_me:127 08: \"$ac_compile\"") >&59854 +if { (eval echo "$as_me:12739: \"$ac_compile\"") >&5 9816 9855 (eval $ac_compile) 2>&5 9817 9856 ac_status=$? 9818 9857 - echo "$as_me:12364: \$? = $ac_status" >&5 9819 + echo "$as_me:127 11: \$? = $ac_status" >&59858 + echo "$as_me:12742: \$? = $ac_status" >&5 9820 9859 (exit $ac_status); } && 9821 9860 { ac_try='test -s conftest.$ac_objext' 9822 9861 - { (eval echo "$as_me:12367: \"$ac_try\"") >&5 9823 + { (eval echo "$as_me:127 14: \"$ac_try\"") >&59862 + { (eval echo "$as_me:12745: \"$ac_try\"") >&5 9824 9863 (eval $ac_try) 2>&5 9825 9864 ac_status=$? 9826 9865 - echo "$as_me:12370: \$? = $ac_status" >&5 9827 + echo "$as_me:127 17: \$? = $ac_status" >&59866 + echo "$as_me:12748: \$? = $ac_status" >&5 9828 9867 (exit $ac_status); }; }; then 9829 9868 cf_cv_sig_atomic_t=$cf_type 9830 9869 else 9831 @@ -12381,7 +127 28,7 @@9870 @@ -12381,7 +12759,7 @@ 9832 9871 9833 9872 fi 9834 9873 9835 9874 -echo "$as_me:12384: result: $cf_cv_sig_atomic_t" >&5 9836 +echo "$as_me:127 31: result: $cf_cv_sig_atomic_t" >&59875 +echo "$as_me:12762: result: $cf_cv_sig_atomic_t" >&5 9837 9876 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 9838 9877 test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <<EOF 9839 9878 #define SIG_ATOMIC_T $cf_cv_sig_atomic_t 9840 @@ -12389,7 +127 36,7 @@9879 @@ -12389,7 +12767,7 @@ 9841 9880 9842 9881 if test $NCURSES_CHTYPE = auto ; then 9843 9882 9844 9883 -echo "$as_me:12392: checking for type of chtype" >&5 9845 +echo "$as_me:127 39: checking for type of chtype" >&59884 +echo "$as_me:12770: checking for type of chtype" >&5 9846 9885 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 9847 9886 if test "${cf_cv_typeof_chtype+set}" = set; then 9848 9887 echo $ECHO_N "(cached) $ECHO_C" >&6 9849 @@ -12399,7 +127 46,7 @@9888 @@ -12399,7 +12777,7 @@ 9850 9889 cf_cv_typeof_chtype=long 9851 9890 else 9852 9891 cat >conftest.$ac_ext <<_ACEOF 9853 9892 -#line 12402 "configure" 9854 +#line 127 49"configure"9893 +#line 12780 "configure" 9855 9894 #include "confdefs.h" 9856 9895 9857 9896 #define WANT_BITS 31 9858 @@ -12434,15 +12 781,15 @@9897 @@ -12434,15 +12812,15 @@ 9859 9898 9860 9899 _ACEOF 9861 9900 rm -f conftest$ac_exeext 9862 9901 -if { (eval echo "$as_me:12437: \"$ac_link\"") >&5 9863 +if { (eval echo "$as_me:12 784: \"$ac_link\"") >&59902 +if { (eval echo "$as_me:12815: \"$ac_link\"") >&5 9864 9903 (eval $ac_link) 2>&5 9865 9904 ac_status=$? 9866 9905 - echo "$as_me:12440: \$? = $ac_status" >&5 9867 + echo "$as_me:12 787: \$? = $ac_status" >&59906 + echo "$as_me:12818: \$? = $ac_status" >&5 9868 9907 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 9869 9908 - { (eval echo "$as_me:12442: \"$ac_try\"") >&5 9870 + { (eval echo "$as_me:12 789: \"$ac_try\"") >&59909 + { (eval echo "$as_me:12820: \"$ac_try\"") >&5 9871 9910 (eval $ac_try) 2>&5 9872 9911 ac_status=$? 9873 9912 - echo "$as_me:12445: \$? = $ac_status" >&5 9874 + echo "$as_me:12 792: \$? = $ac_status" >&59913 + echo "$as_me:12823: \$? = $ac_status" >&5 9875 9914 (exit $ac_status); }; }; then 9876 9915 cf_cv_typeof_chtype=`cat cf_test.out` 9877 9916 else 9878 @@ -12457,7 +128 04,7 @@9917 @@ -12457,7 +12835,7 @@ 9879 9918 9880 9919 fi 9881 9920 9882 9921 -echo "$as_me:12460: result: $cf_cv_typeof_chtype" >&5 9883 +echo "$as_me:128 07: result: $cf_cv_typeof_chtype" >&59922 +echo "$as_me:12838: result: $cf_cv_typeof_chtype" >&5 9884 9923 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 9885 9924 9886 9925 cat >>confdefs.h <<EOF 9887 @@ -12469,14 +128 16,14 @@9926 @@ -12469,14 +12847,14 @@ 9888 9927 fi 9889 9928 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype="" 9890 9929 9891 9930 -echo "$as_me:12472: checking if unsigned literals are legal" >&5 9892 +echo "$as_me:128 19: checking if unsigned literals are legal" >&59931 +echo "$as_me:12850: checking if unsigned literals are legal" >&5 9893 9932 echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6 9894 9933 if test "${cf_cv_unsigned_literals+set}" = set; then … … 9898 9937 cat >conftest.$ac_ext <<_ACEOF 9899 9938 -#line 12479 "configure" 9900 +#line 128 26"configure"9939 +#line 12857 "configure" 9901 9940 #include "confdefs.h" 9902 9941 9903 9942 int 9904 @@ -12488,16 +128 35,16 @@9943 @@ -12488,16 +12866,16 @@ 9905 9944 } 9906 9945 _ACEOF 9907 9946 rm -f conftest.$ac_objext 9908 9947 -if { (eval echo "$as_me:12491: \"$ac_compile\"") >&5 9909 +if { (eval echo "$as_me:128 38: \"$ac_compile\"") >&59948 +if { (eval echo "$as_me:12869: \"$ac_compile\"") >&5 9910 9949 (eval $ac_compile) 2>&5 9911 9950 ac_status=$? 9912 9951 - echo "$as_me:12494: \$? = $ac_status" >&5 9913 + echo "$as_me:128 41: \$? = $ac_status" >&59952 + echo "$as_me:12872: \$? = $ac_status" >&5 9914 9953 (exit $ac_status); } && 9915 9954 { ac_try='test -s conftest.$ac_objext' 9916 9955 - { (eval echo "$as_me:12497: \"$ac_try\"") >&5 9917 + { (eval echo "$as_me:128 44: \"$ac_try\"") >&59956 + { (eval echo "$as_me:12875: \"$ac_try\"") >&5 9918 9957 (eval $ac_try) 2>&5 9919 9958 ac_status=$? 9920 9959 - echo "$as_me:12500: \$? = $ac_status" >&5 9921 + echo "$as_me:128 47: \$? = $ac_status" >&59960 + echo "$as_me:12878: \$? = $ac_status" >&5 9922 9961 (exit $ac_status); }; }; then 9923 9962 cf_cv_unsigned_literals=yes 9924 9963 else 9925 @@ -12509,7 +128 56,7 @@9964 @@ -12509,7 +12887,7 @@ 9926 9965 9927 9966 fi 9928 9967 9929 9968 -echo "$as_me:12512: result: $cf_cv_unsigned_literals" >&5 9930 +echo "$as_me:128 59: result: $cf_cv_unsigned_literals" >&59969 +echo "$as_me:12890: result: $cf_cv_unsigned_literals" >&5 9931 9970 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 9932 9971 9933 9972 cf_cv_1UL="1" 9934 @@ -12525,14 +12 872,14 @@9973 @@ -12525,14 +12903,14 @@ 9935 9974 9936 9975 ### Checks for external-data 9937 9976 9938 9977 -echo "$as_me:12528: checking if external errno is declared" >&5 9939 +echo "$as_me:12 875: checking if external errno is declared" >&59978 +echo "$as_me:12906: checking if external errno is declared" >&5 9940 9979 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 9941 9980 if test "${cf_cv_dcl_errno+set}" = set; then … … 9945 9984 cat >conftest.$ac_ext <<_ACEOF 9946 9985 -#line 12535 "configure" 9947 +#line 12 882"configure"9986 +#line 12913 "configure" 9948 9987 #include "confdefs.h" 9949 9988 9950 9989 #ifdef HAVE_STDLIB_H 9951 @@ -12550,16 +12 897,16 @@9990 @@ -12550,16 +12928,16 @@ 9952 9991 } 9953 9992 _ACEOF 9954 9993 rm -f conftest.$ac_objext 9955 9994 -if { (eval echo "$as_me:12553: \"$ac_compile\"") >&5 9956 +if { (eval echo "$as_me:129 00: \"$ac_compile\"") >&59995 +if { (eval echo "$as_me:12931: \"$ac_compile\"") >&5 9957 9996 (eval $ac_compile) 2>&5 9958 9997 ac_status=$? 9959 9998 - echo "$as_me:12556: \$? = $ac_status" >&5 9960 + echo "$as_me:129 03: \$? = $ac_status" >&59999 + echo "$as_me:12934: \$? = $ac_status" >&5 9961 10000 (exit $ac_status); } && 9962 10001 { ac_try='test -s conftest.$ac_objext' 9963 10002 - { (eval echo "$as_me:12559: \"$ac_try\"") >&5 9964 + { (eval echo "$as_me:129 06: \"$ac_try\"") >&510003 + { (eval echo "$as_me:12937: \"$ac_try\"") >&5 9965 10004 (eval $ac_try) 2>&5 9966 10005 ac_status=$? 9967 10006 - echo "$as_me:12562: \$? = $ac_status" >&5 9968 + echo "$as_me:129 09: \$? = $ac_status" >&510007 + echo "$as_me:12940: \$? = $ac_status" >&5 9969 10008 (exit $ac_status); }; }; then 9970 10009 cf_cv_dcl_errno=yes 9971 10010 else 9972 @@ -12570,7 +129 17,7 @@10011 @@ -12570,7 +12948,7 @@ 9973 10012 rm -f conftest.$ac_objext conftest.$ac_ext 9974 10013 9975 10014 fi 9976 10015 -echo "$as_me:12573: result: $cf_cv_dcl_errno" >&5 9977 +echo "$as_me:129 20: result: $cf_cv_dcl_errno" >&510016 +echo "$as_me:12951: result: $cf_cv_dcl_errno" >&5 9978 10017 echo "${ECHO_T}$cf_cv_dcl_errno" >&6 9979 10018 9980 10019 if test "$cf_cv_dcl_errno" = no ; then 9981 @@ -12585,14 +129 32,14 @@10020 @@ -12585,14 +12963,14 @@ 9982 10021 9983 10022 # It's possible (for near-UNIX clones) that the data doesn't exist 9984 10023 9985 10024 -echo "$as_me:12588: checking if external errno exists" >&5 9986 +echo "$as_me:129 35: checking if external errno exists" >&510025 +echo "$as_me:12966: checking if external errno exists" >&5 9987 10026 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 9988 10027 if test "${cf_cv_have_errno+set}" = set; then … … 9992 10031 cat >conftest.$ac_ext <<_ACEOF 9993 10032 -#line 12595 "configure" 9994 +#line 129 42"configure"10033 +#line 12973 "configure" 9995 10034 #include "confdefs.h" 9996 10035 9997 10036 #undef errno 9998 @@ -12607,16 +129 54,16 @@10037 @@ -12607,16 +12985,16 @@ 9999 10038 } 10000 10039 _ACEOF 10001 10040 rm -f conftest.$ac_objext conftest$ac_exeext 10002 10041 -if { (eval echo "$as_me:12610: \"$ac_link\"") >&5 10003 +if { (eval echo "$as_me:129 57: \"$ac_link\"") >&510042 +if { (eval echo "$as_me:12988: \"$ac_link\"") >&5 10004 10043 (eval $ac_link) 2>&5 10005 10044 ac_status=$? 10006 10045 - echo "$as_me:12613: \$? = $ac_status" >&5 10007 + echo "$as_me:129 60: \$? = $ac_status" >&510046 + echo "$as_me:12991: \$? = $ac_status" >&5 10008 10047 (exit $ac_status); } && 10009 10048 { ac_try='test -s conftest$ac_exeext' 10010 10049 - { (eval echo "$as_me:12616: \"$ac_try\"") >&5 10011 + { (eval echo "$as_me:129 63: \"$ac_try\"") >&510050 + { (eval echo "$as_me:12994: \"$ac_try\"") >&5 10012 10051 (eval $ac_try) 2>&5 10013 10052 ac_status=$? 10014 10053 - echo "$as_me:12619: \$? = $ac_status" >&5 10015 + echo "$as_me:129 66: \$? = $ac_status" >&510054 + echo "$as_me:12997: \$? = $ac_status" >&5 10016 10055 (exit $ac_status); }; }; then 10017 10056 cf_cv_have_errno=yes 10018 10057 else 10019 @@ -12627,7 +1 2974,7 @@10058 @@ -12627,7 +13005,7 @@ 10020 10059 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 10021 10060 10022 10061 fi 10023 10062 -echo "$as_me:12630: result: $cf_cv_have_errno" >&5 10024 +echo "$as_me:1 2977: result: $cf_cv_have_errno" >&510063 +echo "$as_me:13008: result: $cf_cv_have_errno" >&5 10025 10064 echo "${ECHO_T}$cf_cv_have_errno" >&6 10026 10065 10027 10066 if test "$cf_cv_have_errno" = yes ; then 10028 @@ -12640,7 +1 2987,7 @@10067 @@ -12640,7 +13018,7 @@ 10029 10068 10030 10069 fi 10031 10070 10032 10071 -echo "$as_me:12643: checking if data-only library module links" >&5 10033 +echo "$as_me:1 2990: checking if data-only library module links" >&510072 +echo "$as_me:13021: checking if data-only library module links" >&5 10034 10073 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 10035 10074 if test "${cf_cv_link_dataonly+set}" = set; then 10036 10075 echo $ECHO_N "(cached) $ECHO_C" >&6 10037 @@ -12648,20 +1 2995,20 @@10076 @@ -12648,20 +13026,20 @@ 10038 10077 10039 10078 rm -f conftest.a 10040 10079 cat >conftest.$ac_ext <<EOF 10041 10080 -#line 12651 "configure" 10042 +#line 1 2998"configure"10081 +#line 13029 "configure" 10043 10082 int testdata[3] = { 123, 456, 789 }; 10044 10083 EOF 10045 10084 - if { (eval echo "$as_me:12654: \"$ac_compile\"") >&5 10046 + if { (eval echo "$as_me:130 01: \"$ac_compile\"") >&510085 + if { (eval echo "$as_me:13032: \"$ac_compile\"") >&5 10047 10086 (eval $ac_compile) 2>&5 10048 10087 ac_status=$? 10049 10088 - echo "$as_me:12657: \$? = $ac_status" >&5 10050 + echo "$as_me:130 04: \$? = $ac_status" >&510089 + echo "$as_me:13035: \$? = $ac_status" >&5 10051 10090 (exit $ac_status); } ; then 10052 10091 mv conftest.o data.o && \ … … 10057 10096 cat >conftest.$ac_ext <<EOF 10058 10097 -#line 12664 "configure" 10059 +#line 130 11"configure"10098 +#line 13042 "configure" 10060 10099 int testfunc() 10061 10100 { 10062 10101 #if defined(NeXT) 10063 @@ -12674,13 +130 21,13 @@10102 @@ -12674,13 +13052,13 @@ 10064 10103 #endif 10065 10104 } 10066 10105 EOF 10067 10106 - if { (eval echo "$as_me:12677: \"$ac_compile\"") >&5 10068 + if { (eval echo "$as_me:130 24: \"$ac_compile\"") >&510107 + if { (eval echo "$as_me:13055: \"$ac_compile\"") >&5 10069 10108 (eval $ac_compile) 2>&5 10070 10109 ac_status=$? 10071 10110 - echo "$as_me:12680: \$? = $ac_status" >&5 10072 + echo "$as_me:130 27: \$? = $ac_status" >&510111 + echo "$as_me:13058: \$? = $ac_status" >&5 10073 10112 (exit $ac_status); }; then 10074 10113 mv conftest.o func.o && \ … … 10078 10117 rm -f conftest.$ac_ext func.o 10079 10118 ( eval $RANLIB conftest.a ) 2>&5 >/dev/null 10080 @@ -12690,7 +130 37,7 @@10119 @@ -12690,7 +13068,7 @@ 10081 10120 cf_cv_link_dataonly=unknown 10082 10121 else 10083 10122 cat >conftest.$ac_ext <<_ACEOF 10084 10123 -#line 12693 "configure" 10085 +#line 130 40"configure"10124 +#line 13071 "configure" 10086 10125 #include "confdefs.h" 10087 10126 10088 10127 int main() 10089 @@ -12701,15 +130 48,15 @@10128 @@ -12701,15 +13079,15 @@ 10090 10129 10091 10130 _ACEOF 10092 10131 rm -f conftest$ac_exeext 10093 10132 -if { (eval echo "$as_me:12704: \"$ac_link\"") >&5 10094 +if { (eval echo "$as_me:130 51: \"$ac_link\"") >&510133 +if { (eval echo "$as_me:13082: \"$ac_link\"") >&5 10095 10134 (eval $ac_link) 2>&5 10096 10135 ac_status=$? 10097 10136 - echo "$as_me:12707: \$? = $ac_status" >&5 10098 + echo "$as_me:130 54: \$? = $ac_status" >&510137 + echo "$as_me:13085: \$? = $ac_status" >&5 10099 10138 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 10100 10139 - { (eval echo "$as_me:12709: \"$ac_try\"") >&5 10101 + { (eval echo "$as_me:130 56: \"$ac_try\"") >&510140 + { (eval echo "$as_me:13087: \"$ac_try\"") >&5 10102 10141 (eval $ac_try) 2>&5 10103 10142 ac_status=$? 10104 10143 - echo "$as_me:12712: \$? = $ac_status" >&5 10105 + echo "$as_me:130 59: \$? = $ac_status" >&510144 + echo "$as_me:13090: \$? = $ac_status" >&5 10106 10145 (exit $ac_status); }; }; then 10107 10146 cf_cv_link_dataonly=yes 10108 10147 else 10109 @@ -12724,7 +13 071,7 @@10148 @@ -12724,7 +13102,7 @@ 10110 10149 10111 10150 fi 10112 10151 10113 10152 -echo "$as_me:12727: result: $cf_cv_link_dataonly" >&5 10114 +echo "$as_me:13 074: result: $cf_cv_link_dataonly" >&510153 +echo "$as_me:13105: result: $cf_cv_link_dataonly" >&5 10115 10154 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 10116 10155 10117 10156 if test "$cf_cv_link_dataonly" = no ; then 10118 @@ -12759,13 +131 06,13 @@10157 @@ -12759,13 +13137,13 @@ 10119 10158 10120 10159 do 10121 10160 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 10122 10161 -echo "$as_me:12762: checking for $ac_func" >&5 10123 +echo "$as_me:131 09: checking for $ac_func" >&510162 +echo "$as_me:13140: checking for $ac_func" >&5 10124 10163 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 10125 10164 if eval "test \"\${$as_ac_var+set}\" = set"; then … … 10128 10167 cat >conftest.$ac_ext <<_ACEOF 10129 10168 -#line 12768 "configure" 10130 +#line 131 15"configure"10169 +#line 13146 "configure" 10131 10170 #include "confdefs.h" 10132 10171 /* System header to define __stub macros and hopefully few prototypes, 10133 10172 which can conflict with char $ac_func (); below. */ 10134 @@ -12796,16 +131 43,16 @@10173 @@ -12796,16 +13174,16 @@ 10135 10174 } 10136 10175 _ACEOF 10137 10176 rm -f conftest.$ac_objext conftest$ac_exeext 10138 10177 -if { (eval echo "$as_me:12799: \"$ac_link\"") >&5 10139 +if { (eval echo "$as_me:131 46: \"$ac_link\"") >&510178 +if { (eval echo "$as_me:13177: \"$ac_link\"") >&5 10140 10179 (eval $ac_link) 2>&5 10141 10180 ac_status=$? 10142 10181 - echo "$as_me:12802: \$? = $ac_status" >&5 10143 + echo "$as_me:131 49: \$? = $ac_status" >&510182 + echo "$as_me:13180: \$? = $ac_status" >&5 10144 10183 (exit $ac_status); } && 10145 10184 { ac_try='test -s conftest$ac_exeext' 10146 10185 - { (eval echo "$as_me:12805: \"$ac_try\"") >&5 10147 + { (eval echo "$as_me:131 52: \"$ac_try\"") >&510186 + { (eval echo "$as_me:13183: \"$ac_try\"") >&5 10148 10187 (eval $ac_try) 2>&5 10149 10188 ac_status=$? 10150 10189 - echo "$as_me:12808: \$? = $ac_status" >&5 10151 + echo "$as_me:131 55: \$? = $ac_status" >&510190 + echo "$as_me:13186: \$? = $ac_status" >&5 10152 10191 (exit $ac_status); }; }; then 10153 10192 eval "$as_ac_var=yes" 10154 10193 else 10155 @@ -12815,7 +131 62,7 @@10194 @@ -12815,7 +13193,7 @@ 10156 10195 fi 10157 10196 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 10158 10197 fi 10159 10198 -echo "$as_me:12818: result: `eval echo '${'$as_ac_var'}'`" >&5 10160 +echo "$as_me:131 65: result: `eval echo '${'$as_ac_var'}'`" >&510199 +echo "$as_me:13196: result: `eval echo '${'$as_ac_var'}'`" >&5 10161 10200 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 10162 10201 if test `eval echo '${'$as_ac_var'}'` = yes; then 10163 10202 cat >>confdefs.h <<EOF 10164 @@ -12827,14 +13 174,14 @@10203 @@ -12827,14 +13205,14 @@ 10165 10204 10166 10205 if test "$with_getcap" = "yes" ; then 10167 10206 10168 10207 -echo "$as_me:12830: checking for terminal-capability database functions" >&5 10169 +echo "$as_me:13 177: checking for terminal-capability database functions" >&510208 +echo "$as_me:13208: checking for terminal-capability database functions" >&5 10170 10209 echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6 10171 10210 if test "${cf_cv_cgetent+set}" = set; then … … 10175 10214 cat >conftest.$ac_ext <<_ACEOF 10176 10215 -#line 12837 "configure" 10177 +#line 13 184"configure"10216 +#line 13215 "configure" 10178 10217 #include "confdefs.h" 10179 10218 10180 10219 #include <stdlib.h> 10181 @@ -12854,16 +132 01,16 @@10220 @@ -12854,16 +13232,16 @@ 10182 10221 } 10183 10222 _ACEOF 10184 10223 rm -f conftest.$ac_objext conftest$ac_exeext 10185 10224 -if { (eval echo "$as_me:12857: \"$ac_link\"") >&5 10186 +if { (eval echo "$as_me:132 04: \"$ac_link\"") >&510225 +if { (eval echo "$as_me:13235: \"$ac_link\"") >&5 10187 10226 (eval $ac_link) 2>&5 10188 10227 ac_status=$? 10189 10228 - echo "$as_me:12860: \$? = $ac_status" >&5 10190 + echo "$as_me:132 07: \$? = $ac_status" >&510229 + echo "$as_me:13238: \$? = $ac_status" >&5 10191 10230 (exit $ac_status); } && 10192 10231 { ac_try='test -s conftest$ac_exeext' 10193 10232 - { (eval echo "$as_me:12863: \"$ac_try\"") >&5 10194 + { (eval echo "$as_me:132 10: \"$ac_try\"") >&510233 + { (eval echo "$as_me:13241: \"$ac_try\"") >&5 10195 10234 (eval $ac_try) 2>&5 10196 10235 ac_status=$? 10197 10236 - echo "$as_me:12866: \$? = $ac_status" >&5 10198 + echo "$as_me:132 13: \$? = $ac_status" >&510237 + echo "$as_me:13244: \$? = $ac_status" >&5 10199 10238 (exit $ac_status); }; }; then 10200 10239 cf_cv_cgetent=yes 10201 10240 else 10202 @@ -12875,7 +132 22,7 @@10241 @@ -12875,7 +13253,7 @@ 10203 10242 10204 10243 fi 10205 10244 10206 10245 -echo "$as_me:12878: result: $cf_cv_cgetent" >&5 10207 +echo "$as_me:132 25: result: $cf_cv_cgetent" >&510246 +echo "$as_me:13256: result: $cf_cv_cgetent" >&5 10208 10247 echo "${ECHO_T}$cf_cv_cgetent" >&6 10209 10248 test "$cf_cv_cgetent" = yes && cat >>confdefs.h <<\EOF 10210 10249 #define HAVE_BSD_CGETENT 1 10211 @@ -12883,14 +132 30,14 @@10250 @@ -12883,14 +13261,14 @@ 10212 10251 10213 10252 fi 10214 10253 10215 10254 -echo "$as_me:12886: checking for isascii" >&5 10216 +echo "$as_me:132 33: checking for isascii" >&510255 +echo "$as_me:13264: checking for isascii" >&5 10217 10256 echo $ECHO_N "checking for isascii... $ECHO_C" >&6 10218 10257 if test "${cf_cv_have_isascii+set}" = set; then … … 10222 10261 cat >conftest.$ac_ext <<_ACEOF 10223 10262 -#line 12893 "configure" 10224 +#line 132 40"configure"10263 +#line 13271 "configure" 10225 10264 #include "confdefs.h" 10226 10265 #include <ctype.h> 10227 10266 int 10228 @@ -12902,16 +132 49,16 @@10267 @@ -12902,16 +13280,16 @@ 10229 10268 } 10230 10269 _ACEOF 10231 10270 rm -f conftest.$ac_objext conftest$ac_exeext 10232 10271 -if { (eval echo "$as_me:12905: \"$ac_link\"") >&5 10233 +if { (eval echo "$as_me:132 52: \"$ac_link\"") >&510272 +if { (eval echo "$as_me:13283: \"$ac_link\"") >&5 10234 10273 (eval $ac_link) 2>&5 10235 10274 ac_status=$? 10236 10275 - echo "$as_me:12908: \$? = $ac_status" >&5 10237 + echo "$as_me:132 55: \$? = $ac_status" >&510276 + echo "$as_me:13286: \$? = $ac_status" >&5 10238 10277 (exit $ac_status); } && 10239 10278 { ac_try='test -s conftest$ac_exeext' 10240 10279 - { (eval echo "$as_me:12911: \"$ac_try\"") >&5 10241 + { (eval echo "$as_me:132 58: \"$ac_try\"") >&510280 + { (eval echo "$as_me:13289: \"$ac_try\"") >&5 10242 10281 (eval $ac_try) 2>&5 10243 10282 ac_status=$? 10244 10283 - echo "$as_me:12914: \$? = $ac_status" >&5 10245 + echo "$as_me:132 61: \$? = $ac_status" >&510284 + echo "$as_me:13292: \$? = $ac_status" >&5 10246 10285 (exit $ac_status); }; }; then 10247 10286 cf_cv_have_isascii=yes 10248 10287 else 10249 @@ -12922,17 +13 269,17 @@10288 @@ -12922,17 +13300,17 @@ 10250 10289 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 10251 10290 10252 10291 fi 10253 10292 -echo "$as_me:12925: result: $cf_cv_have_isascii" >&5 10254 +echo "$as_me:13 272: result: $cf_cv_have_isascii" >&510293 +echo "$as_me:13303: result: $cf_cv_have_isascii" >&5 10255 10294 echo "${ECHO_T}$cf_cv_have_isascii" >&6 10256 10295 test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF … … 10260 10299 if test "$ac_cv_func_sigaction" = yes; then 10261 10300 -echo "$as_me:12932: checking whether sigaction needs _POSIX_SOURCE" >&5 10262 +echo "$as_me:13 279: checking whether sigaction needs _POSIX_SOURCE" >&510301 +echo "$as_me:13310: checking whether sigaction needs _POSIX_SOURCE" >&5 10263 10302 echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6 10264 10303 cat >conftest.$ac_ext <<_ACEOF 10265 10304 -#line 12935 "configure" 10266 +#line 13 282"configure"10305 +#line 13313 "configure" 10267 10306 #include "confdefs.h" 10268 10307 10269 10308 #include <sys/types.h> 10270 @@ -12946,16 +13 293,16 @@10309 @@ -12946,16 +13324,16 @@ 10271 10310 } 10272 10311 _ACEOF 10273 10312 rm -f conftest.$ac_objext 10274 10313 -if { (eval echo "$as_me:12949: \"$ac_compile\"") >&5 10275 +if { (eval echo "$as_me:13 296: \"$ac_compile\"") >&510314 +if { (eval echo "$as_me:13327: \"$ac_compile\"") >&5 10276 10315 (eval $ac_compile) 2>&5 10277 10316 ac_status=$? 10278 10317 - echo "$as_me:12952: \$? = $ac_status" >&5 10279 + echo "$as_me:13 299: \$? = $ac_status" >&510318 + echo "$as_me:13330: \$? = $ac_status" >&5 10280 10319 (exit $ac_status); } && 10281 10320 { ac_try='test -s conftest.$ac_objext' 10282 10321 - { (eval echo "$as_me:12955: \"$ac_try\"") >&5 10283 + { (eval echo "$as_me:133 02: \"$ac_try\"") >&510322 + { (eval echo "$as_me:13333: \"$ac_try\"") >&5 10284 10323 (eval $ac_try) 2>&5 10285 10324 ac_status=$? 10286 10325 - echo "$as_me:12958: \$? = $ac_status" >&5 10287 + echo "$as_me:133 05: \$? = $ac_status" >&510326 + echo "$as_me:13336: \$? = $ac_status" >&5 10288 10327 (exit $ac_status); }; }; then 10289 10328 sigact_bad=no 10290 10329 else 10291 @@ -12963,7 +133 10,7 @@10330 @@ -12963,7 +13341,7 @@ 10292 10331 cat conftest.$ac_ext >&5 10293 10332 10294 10333 cat >conftest.$ac_ext <<_ACEOF 10295 10334 -#line 12966 "configure" 10296 +#line 133 13"configure"10335 +#line 13344 "configure" 10297 10336 #include "confdefs.h" 10298 10337 10299 10338 #define _POSIX_SOURCE 10300 @@ -12978,16 +133 25,16 @@10339 @@ -12978,16 +13356,16 @@ 10301 10340 } 10302 10341 _ACEOF 10303 10342 rm -f conftest.$ac_objext 10304 10343 -if { (eval echo "$as_me:12981: \"$ac_compile\"") >&5 10305 +if { (eval echo "$as_me:133 28: \"$ac_compile\"") >&510344 +if { (eval echo "$as_me:13359: \"$ac_compile\"") >&5 10306 10345 (eval $ac_compile) 2>&5 10307 10346 ac_status=$? 10308 10347 - echo "$as_me:12984: \$? = $ac_status" >&5 10309 + echo "$as_me:133 31: \$? = $ac_status" >&510348 + echo "$as_me:13362: \$? = $ac_status" >&5 10310 10349 (exit $ac_status); } && 10311 10350 { ac_try='test -s conftest.$ac_objext' 10312 10351 - { (eval echo "$as_me:12987: \"$ac_try\"") >&5 10313 + { (eval echo "$as_me:133 34: \"$ac_try\"") >&510352 + { (eval echo "$as_me:13365: \"$ac_try\"") >&5 10314 10353 (eval $ac_try) 2>&5 10315 10354 ac_status=$? 10316 10355 - echo "$as_me:12990: \$? = $ac_status" >&5 10317 + echo "$as_me:133 37: \$? = $ac_status" >&510356 + echo "$as_me:13368: \$? = $ac_status" >&5 10318 10357 (exit $ac_status); }; }; then 10319 10358 sigact_bad=yes 10320 10359 cat >>confdefs.h <<\EOF 10321 @@ -13002,11 +133 49,11 @@10360 @@ -13002,11 +13380,11 @@ 10322 10361 rm -f conftest.$ac_objext conftest.$ac_ext 10323 10362 fi 10324 10363 rm -f conftest.$ac_objext conftest.$ac_ext 10325 10364 -echo "$as_me:13005: result: $sigact_bad" >&5 10326 +echo "$as_me:133 52: result: $sigact_bad" >&510365 +echo "$as_me:13383: result: $sigact_bad" >&5 10327 10366 echo "${ECHO_T}$sigact_bad" >&6 10328 10367 fi 10329 10368 10330 10369 -echo "$as_me:13009: checking if nanosleep really works" >&5 10331 +echo "$as_me:133 56: checking if nanosleep really works" >&510370 +echo "$as_me:13387: checking if nanosleep really works" >&5 10332 10371 echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6 10333 10372 if test "${cf_cv_func_nanosleep+set}" = set; then 10334 10373 echo $ECHO_N "(cached) $ECHO_C" >&6 10335 @@ -13016,7 +133 63,7 @@10374 @@ -13016,7 +13394,7 @@ 10336 10375 cf_cv_func_nanosleep=unknown 10337 10376 else 10338 10377 cat >conftest.$ac_ext <<_ACEOF 10339 10378 -#line 13019 "configure" 10340 +#line 133 66"configure"10379 +#line 13397 "configure" 10341 10380 #include "confdefs.h" 10342 10381 10343 10382 #include <stdio.h> 10344 @@ -13041,15 +13 388,15 @@10383 @@ -13041,15 +13419,15 @@ 10345 10384 10346 10385 _ACEOF 10347 10386 rm -f conftest$ac_exeext 10348 10387 -if { (eval echo "$as_me:13044: \"$ac_link\"") >&5 10349 +if { (eval echo "$as_me:13 391: \"$ac_link\"") >&510388 +if { (eval echo "$as_me:13422: \"$ac_link\"") >&5 10350 10389 (eval $ac_link) 2>&5 10351 10390 ac_status=$? 10352 10391 - echo "$as_me:13047: \$? = $ac_status" >&5 10353 + echo "$as_me:13 394: \$? = $ac_status" >&510392 + echo "$as_me:13425: \$? = $ac_status" >&5 10354 10393 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 10355 10394 - { (eval echo "$as_me:13049: \"$ac_try\"") >&5 10356 + { (eval echo "$as_me:13 396: \"$ac_try\"") >&510395 + { (eval echo "$as_me:13427: \"$ac_try\"") >&5 10357 10396 (eval $ac_try) 2>&5 10358 10397 ac_status=$? 10359 10398 - echo "$as_me:13052: \$? = $ac_status" >&5 10360 + echo "$as_me:13 399: \$? = $ac_status" >&510399 + echo "$as_me:13430: \$? = $ac_status" >&5 10361 10400 (exit $ac_status); }; }; then 10362 10401 cf_cv_func_nanosleep=yes 10363 10402 else 10364 @@ -13061,7 +134 08,7 @@10403 @@ -13061,7 +13439,7 @@ 10365 10404 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 10366 10405 fi 10367 10406 fi 10368 10407 -echo "$as_me:13064: result: $cf_cv_func_nanosleep" >&5 10369 +echo "$as_me:134 11: result: $cf_cv_func_nanosleep" >&510408 +echo "$as_me:13442: result: $cf_cv_func_nanosleep" >&5 10370 10409 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 10371 10410 10372 10411 test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF 10373 @@ -13075,23 +134 22,23 @@10412 @@ -13075,23 +13453,23 @@ 10374 10413 10375 10414 do 10376 10415 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 10377 10416 -echo "$as_me:13078: checking for $ac_header" >&5 10378 +echo "$as_me:134 25: checking for $ac_header" >&510417 +echo "$as_me:13456: checking for $ac_header" >&5 10379 10418 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 10380 10419 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 10383 10422 cat >conftest.$ac_ext <<_ACEOF 10384 10423 -#line 13084 "configure" 10385 +#line 134 31"configure"10424 +#line 13462 "configure" 10386 10425 #include "confdefs.h" 10387 10426 #include <$ac_header> 10388 10427 _ACEOF 10389 10428 -if { (eval echo "$as_me:13088: \"$ac_cpp conftest.$ac_ext\"") >&5 10390 +if { (eval echo "$as_me:134 35: \"$ac_cpp conftest.$ac_ext\"") >&510429 +if { (eval echo "$as_me:13466: \"$ac_cpp conftest.$ac_ext\"") >&5 10391 10430 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 10392 10431 ac_status=$? … … 10395 10434 cat conftest.err >&5 10396 10435 - echo "$as_me:13094: \$? = $ac_status" >&5 10397 + echo "$as_me:134 41: \$? = $ac_status" >&510436 + echo "$as_me:13472: \$? = $ac_status" >&5 10398 10437 (exit $ac_status); } >/dev/null; then 10399 10438 if test -s conftest.err; then 10400 10439 ac_cpp_err=$ac_c_preproc_warn_flag 10401 @@ -13110,7 +134 57,7 @@10440 @@ -13110,7 +13488,7 @@ 10402 10441 fi 10403 10442 rm -f conftest.err conftest.$ac_ext 10404 10443 fi 10405 10444 -echo "$as_me:13113: result: `eval echo '${'$as_ac_Header'}'`" >&5 10406 +echo "$as_me:134 60: result: `eval echo '${'$as_ac_Header'}'`" >&510445 +echo "$as_me:13491: result: `eval echo '${'$as_ac_Header'}'`" >&5 10407 10446 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 10408 10447 if test `eval echo '${'$as_ac_Header'}'` = yes; then 10409 10448 cat >>confdefs.h <<EOF 10410 @@ -13125,23 +13 472,23 @@10449 @@ -13125,23 +13503,23 @@ 10411 10450 for ac_header in sys/termio.h 10412 10451 do 10413 10452 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 10414 10453 -echo "$as_me:13128: checking for $ac_header" >&5 10415 +echo "$as_me:13 475: checking for $ac_header" >&510454 +echo "$as_me:13506: checking for $ac_header" >&5 10416 10455 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 10417 10456 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 10420 10459 cat >conftest.$ac_ext <<_ACEOF 10421 10460 -#line 13134 "configure" 10422 +#line 13 481"configure"10461 +#line 13512 "configure" 10423 10462 #include "confdefs.h" 10424 10463 #include <$ac_header> 10425 10464 _ACEOF 10426 10465 -if { (eval echo "$as_me:13138: \"$ac_cpp conftest.$ac_ext\"") >&5 10427 +if { (eval echo "$as_me:13 485: \"$ac_cpp conftest.$ac_ext\"") >&510466 +if { (eval echo "$as_me:13516: \"$ac_cpp conftest.$ac_ext\"") >&5 10428 10467 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 10429 10468 ac_status=$? … … 10432 10471 cat conftest.err >&5 10433 10472 - echo "$as_me:13144: \$? = $ac_status" >&5 10434 + echo "$as_me:13 491: \$? = $ac_status" >&510473 + echo "$as_me:13522: \$? = $ac_status" >&5 10435 10474 (exit $ac_status); } >/dev/null; then 10436 10475 if test -s conftest.err; then 10437 10476 ac_cpp_err=$ac_c_preproc_warn_flag 10438 @@ -13160,7 +135 07,7 @@10477 @@ -13160,7 +13538,7 @@ 10439 10478 fi 10440 10479 rm -f conftest.err conftest.$ac_ext 10441 10480 fi 10442 10481 -echo "$as_me:13163: result: `eval echo '${'$as_ac_Header'}'`" >&5 10443 +echo "$as_me:135 10: result: `eval echo '${'$as_ac_Header'}'`" >&510482 +echo "$as_me:13541: result: `eval echo '${'$as_ac_Header'}'`" >&5 10444 10483 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 10445 10484 if test `eval echo '${'$as_ac_Header'}'` = yes; then 10446 10485 cat >>confdefs.h <<EOF 10447 @@ -13178,10 +135 25,10 @@10486 @@ -13178,10 +13556,10 @@ 10448 10487 *) termios_bad=maybe ;; 10449 10488 esac 10450 10489 if test "$termios_bad" = maybe ; then 10451 10490 - echo "$as_me:13181: checking whether termios.h needs _POSIX_SOURCE" >&5 10452 + echo "$as_me:135 28: checking whether termios.h needs _POSIX_SOURCE" >&510491 + echo "$as_me:13559: checking whether termios.h needs _POSIX_SOURCE" >&5 10453 10492 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6 10454 10493 cat >conftest.$ac_ext <<_ACEOF 10455 10494 -#line 13184 "configure" 10456 +#line 135 31"configure"10495 +#line 13562 "configure" 10457 10496 #include "confdefs.h" 10458 10497 #include <termios.h> 10459 10498 int 10460 @@ -13193,16 +135 40,16 @@10499 @@ -13193,16 +13571,16 @@ 10461 10500 } 10462 10501 _ACEOF 10463 10502 rm -f conftest.$ac_objext 10464 10503 -if { (eval echo "$as_me:13196: \"$ac_compile\"") >&5 10465 +if { (eval echo "$as_me:135 43: \"$ac_compile\"") >&510504 +if { (eval echo "$as_me:13574: \"$ac_compile\"") >&5 10466 10505 (eval $ac_compile) 2>&5 10467 10506 ac_status=$? 10468 10507 - echo "$as_me:13199: \$? = $ac_status" >&5 10469 + echo "$as_me:135 46: \$? = $ac_status" >&510508 + echo "$as_me:13577: \$? = $ac_status" >&5 10470 10509 (exit $ac_status); } && 10471 10510 { ac_try='test -s conftest.$ac_objext' 10472 10511 - { (eval echo "$as_me:13202: \"$ac_try\"") >&5 10473 + { (eval echo "$as_me:135 49: \"$ac_try\"") >&510512 + { (eval echo "$as_me:13580: \"$ac_try\"") >&5 10474 10513 (eval $ac_try) 2>&5 10475 10514 ac_status=$? 10476 10515 - echo "$as_me:13205: \$? = $ac_status" >&5 10477 + echo "$as_me:135 52: \$? = $ac_status" >&510516 + echo "$as_me:13583: \$? = $ac_status" >&5 10478 10517 (exit $ac_status); }; }; then 10479 10518 termios_bad=no 10480 10519 else 10481 @@ -13210,7 +135 57,7 @@10520 @@ -13210,7 +13588,7 @@ 10482 10521 cat conftest.$ac_ext >&5 10483 10522 10484 10523 cat >conftest.$ac_ext <<_ACEOF 10485 10524 -#line 13213 "configure" 10486 +#line 135 60"configure"10525 +#line 13591 "configure" 10487 10526 #include "confdefs.h" 10488 10527 10489 10528 #define _POSIX_SOURCE 10490 @@ -13224,16 +13 571,16 @@10529 @@ -13224,16 +13602,16 @@ 10491 10530 } 10492 10531 _ACEOF 10493 10532 rm -f conftest.$ac_objext 10494 10533 -if { (eval echo "$as_me:13227: \"$ac_compile\"") >&5 10495 +if { (eval echo "$as_me:13 574: \"$ac_compile\"") >&510534 +if { (eval echo "$as_me:13605: \"$ac_compile\"") >&5 10496 10535 (eval $ac_compile) 2>&5 10497 10536 ac_status=$? 10498 10537 - echo "$as_me:13230: \$? = $ac_status" >&5 10499 + echo "$as_me:13 577: \$? = $ac_status" >&510538 + echo "$as_me:13608: \$? = $ac_status" >&5 10500 10539 (exit $ac_status); } && 10501 10540 { ac_try='test -s conftest.$ac_objext' 10502 10541 - { (eval echo "$as_me:13233: \"$ac_try\"") >&5 10503 + { (eval echo "$as_me:13 580: \"$ac_try\"") >&510542 + { (eval echo "$as_me:13611: \"$ac_try\"") >&5 10504 10543 (eval $ac_try) 2>&5 10505 10544 ac_status=$? 10506 10545 - echo "$as_me:13236: \$? = $ac_status" >&5 10507 + echo "$as_me:13 583: \$? = $ac_status" >&510546 + echo "$as_me:13614: \$? = $ac_status" >&5 10508 10547 (exit $ac_status); }; }; then 10509 10548 termios_bad=unknown 10510 10549 else 10511 @@ -13248,19 +13 595,19 @@10550 @@ -13248,19 +13626,19 @@ 10512 10551 10513 10552 fi 10514 10553 rm -f conftest.$ac_objext conftest.$ac_ext 10515 10554 - echo "$as_me:13251: result: $termios_bad" >&5 10516 + echo "$as_me:13 598: result: $termios_bad" >&510555 + echo "$as_me:13629: result: $termios_bad" >&5 10517 10556 echo "${ECHO_T}$termios_bad" >&6 10518 10557 fi … … 10520 10559 10521 10560 -echo "$as_me:13256: checking for tcgetattr" >&5 10522 +echo "$as_me:136 03: checking for tcgetattr" >&510561 +echo "$as_me:13634: checking for tcgetattr" >&5 10523 10562 echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6 10524 10563 if test "${cf_cv_have_tcgetattr+set}" = set; then … … 10528 10567 cat >conftest.$ac_ext <<_ACEOF 10529 10568 -#line 13263 "configure" 10530 +#line 136 10"configure"10569 +#line 13641 "configure" 10531 10570 #include "confdefs.h" 10532 10571 10533 10572 #include <sys/types.h> 10534 @@ -13288,16 +136 35,16 @@10573 @@ -13288,16 +13666,16 @@ 10535 10574 } 10536 10575 _ACEOF 10537 10576 rm -f conftest.$ac_objext conftest$ac_exeext 10538 10577 -if { (eval echo "$as_me:13291: \"$ac_link\"") >&5 10539 +if { (eval echo "$as_me:136 38: \"$ac_link\"") >&510578 +if { (eval echo "$as_me:13669: \"$ac_link\"") >&5 10540 10579 (eval $ac_link) 2>&5 10541 10580 ac_status=$? 10542 10581 - echo "$as_me:13294: \$? = $ac_status" >&5 10543 + echo "$as_me:136 41: \$? = $ac_status" >&510582 + echo "$as_me:13672: \$? = $ac_status" >&5 10544 10583 (exit $ac_status); } && 10545 10584 { ac_try='test -s conftest$ac_exeext' 10546 10585 - { (eval echo "$as_me:13297: \"$ac_try\"") >&5 10547 + { (eval echo "$as_me:136 44: \"$ac_try\"") >&510586 + { (eval echo "$as_me:13675: \"$ac_try\"") >&5 10548 10587 (eval $ac_try) 2>&5 10549 10588 ac_status=$? 10550 10589 - echo "$as_me:13300: \$? = $ac_status" >&5 10551 + echo "$as_me:136 47: \$? = $ac_status" >&510590 + echo "$as_me:13678: \$? = $ac_status" >&5 10552 10591 (exit $ac_status); }; }; then 10553 10592 cf_cv_have_tcgetattr=yes 10554 10593 else 10555 @@ -13307,20 +136 54,20 @@10594 @@ -13307,20 +13685,20 @@ 10556 10595 fi 10557 10596 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 10558 10597 fi 10559 10598 -echo "$as_me:13310: result: $cf_cv_have_tcgetattr" >&5 10560 +echo "$as_me:136 57: result: $cf_cv_have_tcgetattr" >&510599 +echo "$as_me:13688: result: $cf_cv_have_tcgetattr" >&5 10561 10600 echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6 10562 10601 test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF … … 10565 10604 10566 10605 -echo "$as_me:13316: checking for vsscanf function or workaround" >&5 10567 +echo "$as_me:136 63: checking for vsscanf function or workaround" >&510606 +echo "$as_me:13694: checking for vsscanf function or workaround" >&5 10568 10607 echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6 10569 10608 if test "${cf_cv_func_vsscanf+set}" = set; then … … 10573 10612 cat >conftest.$ac_ext <<_ACEOF 10574 10613 -#line 13323 "configure" 10575 +#line 13 670"configure"10614 +#line 13701 "configure" 10576 10615 #include "confdefs.h" 10577 10616 10578 10617 #include <stdarg.h> 10579 @@ -13336,16 +13 683,16 @@10618 @@ -13336,16 +13714,16 @@ 10580 10619 } 10581 10620 _ACEOF 10582 10621 rm -f conftest.$ac_objext conftest$ac_exeext 10583 10622 -if { (eval echo "$as_me:13339: \"$ac_link\"") >&5 10584 +if { (eval echo "$as_me:13 686: \"$ac_link\"") >&510623 +if { (eval echo "$as_me:13717: \"$ac_link\"") >&5 10585 10624 (eval $ac_link) 2>&5 10586 10625 ac_status=$? 10587 10626 - echo "$as_me:13342: \$? = $ac_status" >&5 10588 + echo "$as_me:13 689: \$? = $ac_status" >&510627 + echo "$as_me:13720: \$? = $ac_status" >&5 10589 10628 (exit $ac_status); } && 10590 10629 { ac_try='test -s conftest$ac_exeext' 10591 10630 - { (eval echo "$as_me:13345: \"$ac_try\"") >&5 10592 + { (eval echo "$as_me:13 692: \"$ac_try\"") >&510631 + { (eval echo "$as_me:13723: \"$ac_try\"") >&5 10593 10632 (eval $ac_try) 2>&5 10594 10633 ac_status=$? 10595 10634 - echo "$as_me:13348: \$? = $ac_status" >&5 10596 + echo "$as_me:13 695: \$? = $ac_status" >&510635 + echo "$as_me:13726: \$? = $ac_status" >&5 10597 10636 (exit $ac_status); }; }; then 10598 10637 cf_cv_func_vsscanf=vsscanf 10599 10638 else 10600 @@ -13353,7 +137 00,7 @@10639 @@ -13353,7 +13731,7 @@ 10601 10640 cat conftest.$ac_ext >&5 10602 10641 10603 10642 cat >conftest.$ac_ext <<_ACEOF 10604 10643 -#line 13356 "configure" 10605 +#line 137 03"configure"10644 +#line 13734 "configure" 10606 10645 #include "confdefs.h" 10607 10646 10608 10647 #include <stdarg.h> 10609 @@ -13375,16 +137 22,16 @@10648 @@ -13375,16 +13753,16 @@ 10610 10649 } 10611 10650 _ACEOF 10612 10651 rm -f conftest.$ac_objext conftest$ac_exeext 10613 10652 -if { (eval echo "$as_me:13378: \"$ac_link\"") >&5 10614 +if { (eval echo "$as_me:137 25: \"$ac_link\"") >&510653 +if { (eval echo "$as_me:13756: \"$ac_link\"") >&5 10615 10654 (eval $ac_link) 2>&5 10616 10655 ac_status=$? 10617 10656 - echo "$as_me:13381: \$? = $ac_status" >&5 10618 + echo "$as_me:137 28: \$? = $ac_status" >&510657 + echo "$as_me:13759: \$? = $ac_status" >&5 10619 10658 (exit $ac_status); } && 10620 10659 { ac_try='test -s conftest$ac_exeext' 10621 10660 - { (eval echo "$as_me:13384: \"$ac_try\"") >&5 10622 + { (eval echo "$as_me:137 31: \"$ac_try\"") >&510661 + { (eval echo "$as_me:13762: \"$ac_try\"") >&5 10623 10662 (eval $ac_try) 2>&5 10624 10663 ac_status=$? 10625 10664 - echo "$as_me:13387: \$? = $ac_status" >&5 10626 + echo "$as_me:137 34: \$? = $ac_status" >&510665 + echo "$as_me:13765: \$? = $ac_status" >&5 10627 10666 (exit $ac_status); }; }; then 10628 10667 cf_cv_func_vsscanf=vfscanf 10629 10668 else 10630 @@ -13392,7 +137 39,7 @@10669 @@ -13392,7 +13770,7 @@ 10631 10670 cat conftest.$ac_ext >&5 10632 10671 10633 10672 cat >conftest.$ac_ext <<_ACEOF 10634 10673 -#line 13395 "configure" 10635 +#line 137 42"configure"10674 +#line 13773 "configure" 10636 10675 #include "confdefs.h" 10637 10676 10638 10677 #include <stdarg.h> 10639 @@ -13414,16 +137 61,16 @@10678 @@ -13414,16 +13792,16 @@ 10640 10679 } 10641 10680 _ACEOF 10642 10681 rm -f conftest.$ac_objext conftest$ac_exeext 10643 10682 -if { (eval echo "$as_me:13417: \"$ac_link\"") >&5 10644 +if { (eval echo "$as_me:137 64: \"$ac_link\"") >&510683 +if { (eval echo "$as_me:13795: \"$ac_link\"") >&5 10645 10684 (eval $ac_link) 2>&5 10646 10685 ac_status=$? 10647 10686 - echo "$as_me:13420: \$? = $ac_status" >&5 10648 + echo "$as_me:137 67: \$? = $ac_status" >&510687 + echo "$as_me:13798: \$? = $ac_status" >&5 10649 10688 (exit $ac_status); } && 10650 10689 { ac_try='test -s conftest$ac_exeext' 10651 10690 - { (eval echo "$as_me:13423: \"$ac_try\"") >&5 10652 + { (eval echo "$as_me:13 770: \"$ac_try\"") >&510691 + { (eval echo "$as_me:13801: \"$ac_try\"") >&5 10653 10692 (eval $ac_try) 2>&5 10654 10693 ac_status=$? 10655 10694 - echo "$as_me:13426: \$? = $ac_status" >&5 10656 + echo "$as_me:13 773: \$? = $ac_status" >&510695 + echo "$as_me:13804: \$? = $ac_status" >&5 10657 10696 (exit $ac_status); }; }; then 10658 10697 cf_cv_func_vsscanf=_doscan 10659 10698 else 10660 @@ -13438,7 +13 785,7 @@10699 @@ -13438,7 +13816,7 @@ 10661 10700 fi 10662 10701 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 10663 10702 fi 10664 10703 -echo "$as_me:13441: result: $cf_cv_func_vsscanf" >&5 10665 +echo "$as_me:13 788: result: $cf_cv_func_vsscanf" >&510704 +echo "$as_me:13819: result: $cf_cv_func_vsscanf" >&5 10666 10705 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 10667 10706 10668 10707 case $cf_cv_func_vsscanf in #(vi 10669 @@ -13456,7 +138 03,7 @@10708 @@ -13456,7 +13834,7 @@ 10670 10709 ;; 10671 10710 esac 10672 10711 10673 10712 -echo "$as_me:13459: checking for working mkstemp" >&5 10674 +echo "$as_me:138 06: checking for working mkstemp" >&510713 +echo "$as_me:13837: checking for working mkstemp" >&5 10675 10714 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 10676 10715 if test "${cf_cv_func_mkstemp+set}" = set; then 10677 10716 echo $ECHO_N "(cached) $ECHO_C" >&6 10678 @@ -13464,13 +138 11,13 @@10717 @@ -13464,13 +13842,13 @@ 10679 10718 10680 10719 rm -f conftest* 10681 10720 if test "$cross_compiling" = yes; then 10682 10721 - echo "$as_me:13467: checking for mkstemp" >&5 10683 + echo "$as_me:138 14: checking for mkstemp" >&510722 + echo "$as_me:13845: checking for mkstemp" >&5 10684 10723 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 10685 10724 if test "${ac_cv_func_mkstemp+set}" = set; then … … 10688 10727 cat >conftest.$ac_ext <<_ACEOF 10689 10728 -#line 13473 "configure" 10690 +#line 138 20"configure"10729 +#line 13851 "configure" 10691 10730 #include "confdefs.h" 10692 10731 /* System header to define __stub macros and hopefully few prototypes, 10693 10732 which can conflict with char mkstemp (); below. */ 10694 @@ -13501,16 +138 48,16 @@10733 @@ -13501,16 +13879,16 @@ 10695 10734 } 10696 10735 _ACEOF 10697 10736 rm -f conftest.$ac_objext conftest$ac_exeext 10698 10737 -if { (eval echo "$as_me:13504: \"$ac_link\"") >&5 10699 +if { (eval echo "$as_me:138 51: \"$ac_link\"") >&510738 +if { (eval echo "$as_me:13882: \"$ac_link\"") >&5 10700 10739 (eval $ac_link) 2>&5 10701 10740 ac_status=$? 10702 10741 - echo "$as_me:13507: \$? = $ac_status" >&5 10703 + echo "$as_me:138 54: \$? = $ac_status" >&510742 + echo "$as_me:13885: \$? = $ac_status" >&5 10704 10743 (exit $ac_status); } && 10705 10744 { ac_try='test -s conftest$ac_exeext' 10706 10745 - { (eval echo "$as_me:13510: \"$ac_try\"") >&5 10707 + { (eval echo "$as_me:138 57: \"$ac_try\"") >&510746 + { (eval echo "$as_me:13888: \"$ac_try\"") >&5 10708 10747 (eval $ac_try) 2>&5 10709 10748 ac_status=$? 10710 10749 - echo "$as_me:13513: \$? = $ac_status" >&5 10711 + echo "$as_me:138 60: \$? = $ac_status" >&510750 + echo "$as_me:13891: \$? = $ac_status" >&5 10712 10751 (exit $ac_status); }; }; then 10713 10752 ac_cv_func_mkstemp=yes 10714 10753 else 10715 @@ -13520,12 +138 67,12 @@10754 @@ -13520,12 +13898,12 @@ 10716 10755 fi 10717 10756 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 10718 10757 fi 10719 10758 -echo "$as_me:13523: result: $ac_cv_func_mkstemp" >&5 10720 +echo "$as_me:13 870: result: $ac_cv_func_mkstemp" >&510759 +echo "$as_me:13901: result: $ac_cv_func_mkstemp" >&5 10721 10760 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 10722 10761 … … 10724 10763 cat >conftest.$ac_ext <<_ACEOF 10725 10764 -#line 13528 "configure" 10726 +#line 13 875"configure"10765 +#line 13906 "configure" 10727 10766 #include "confdefs.h" 10728 10767 10729 10768 #include <sys/types.h> 10730 @@ -13563,15 +139 10,15 @@10769 @@ -13563,15 +13941,15 @@ 10731 10770 10732 10771 _ACEOF 10733 10772 rm -f conftest$ac_exeext 10734 10773 -if { (eval echo "$as_me:13566: \"$ac_link\"") >&5 10735 +if { (eval echo "$as_me:139 13: \"$ac_link\"") >&510774 +if { (eval echo "$as_me:13944: \"$ac_link\"") >&5 10736 10775 (eval $ac_link) 2>&5 10737 10776 ac_status=$? 10738 10777 - echo "$as_me:13569: \$? = $ac_status" >&5 10739 + echo "$as_me:139 16: \$? = $ac_status" >&510778 + echo "$as_me:13947: \$? = $ac_status" >&5 10740 10779 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 10741 10780 - { (eval echo "$as_me:13571: \"$ac_try\"") >&5 10742 + { (eval echo "$as_me:139 18: \"$ac_try\"") >&510781 + { (eval echo "$as_me:13949: \"$ac_try\"") >&5 10743 10782 (eval $ac_try) 2>&5 10744 10783 ac_status=$? 10745 10784 - echo "$as_me:13574: \$? = $ac_status" >&5 10746 + echo "$as_me:139 21: \$? = $ac_status" >&510785 + echo "$as_me:13952: \$? = $ac_status" >&5 10747 10786 (exit $ac_status); }; }; then 10748 10787 cf_cv_func_mkstemp=yes 10749 10788 10750 @@ -13586,7 +139 33,7 @@10789 @@ -13586,7 +13964,7 @@ 10751 10790 fi 10752 10791 10753 10792 fi 10754 10793 -echo "$as_me:13589: result: $cf_cv_func_mkstemp" >&5 10755 +echo "$as_me:139 36: result: $cf_cv_func_mkstemp" >&510794 +echo "$as_me:13967: result: $cf_cv_func_mkstemp" >&5 10756 10795 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 10757 10796 if test "$cf_cv_func_mkstemp" = yes ; then 10758 10797 cat >>confdefs.h <<\EOF 10759 @@ -13604,21 +139 51,21 @@10798 @@ -13604,21 +13982,21 @@ 10760 10799 fi 10761 10800 10762 10801 if test "$cross_compiling" = yes ; then 10763 10802 - { echo "$as_me:13607: WARNING: cross compiling: assume setvbuf params not reversed" >&5 10764 + { echo "$as_me:139 54: WARNING: cross compiling: assume setvbuf params not reversed" >&510803 + { echo "$as_me:13985: WARNING: cross compiling: assume setvbuf params not reversed" >&5 10765 10804 echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;} 10766 10805 else 10767 10806 - echo "$as_me:13610: checking whether setvbuf arguments are reversed" >&5 10768 + echo "$as_me:139 57: checking whether setvbuf arguments are reversed" >&510807 + echo "$as_me:13988: checking whether setvbuf arguments are reversed" >&5 10769 10808 echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 10770 10809 if test "${ac_cv_func_setvbuf_reversed+set}" = set; then … … 10773 10812 if test "$cross_compiling" = yes; then 10774 10813 - { { echo "$as_me:13616: error: cannot run test program while cross compiling" >&5 10775 + { { echo "$as_me:139 63: error: cannot run test program while cross compiling" >&510814 + { { echo "$as_me:13994: error: cannot run test program while cross compiling" >&5 10776 10815 echo "$as_me: error: cannot run test program while cross compiling" >&2;} 10777 10816 { (exit 1); exit 1; }; } … … 10779 10818 cat >conftest.$ac_ext <<_ACEOF 10780 10819 -#line 13621 "configure" 10781 +#line 139 68"configure"10820 +#line 13999 "configure" 10782 10821 #include "confdefs.h" 10783 10822 #include <stdio.h> 10784 10823 /* If setvbuf has the reversed format, exit 0. */ 10785 @@ -13635,15 +1 3982,15 @@10824 @@ -13635,15 +14013,15 @@ 10786 10825 } 10787 10826 _ACEOF 10788 10827 rm -f conftest$ac_exeext 10789 10828 -if { (eval echo "$as_me:13638: \"$ac_link\"") >&5 10790 +if { (eval echo "$as_me:1 3985: \"$ac_link\"") >&510829 +if { (eval echo "$as_me:14016: \"$ac_link\"") >&5 10791 10830 (eval $ac_link) 2>&5 10792 10831 ac_status=$? 10793 10832 - echo "$as_me:13641: \$? = $ac_status" >&5 10794 + echo "$as_me:1 3988: \$? = $ac_status" >&510833 + echo "$as_me:14019: \$? = $ac_status" >&5 10795 10834 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 10796 10835 - { (eval echo "$as_me:13643: \"$ac_try\"") >&5 10797 + { (eval echo "$as_me:1 3990: \"$ac_try\"") >&510836 + { (eval echo "$as_me:14021: \"$ac_try\"") >&5 10798 10837 (eval $ac_try) 2>&5 10799 10838 ac_status=$? 10800 10839 - echo "$as_me:13646: \$? = $ac_status" >&5 10801 + echo "$as_me:1 3993: \$? = $ac_status" >&510840 + echo "$as_me:14024: \$? = $ac_status" >&5 10802 10841 (exit $ac_status); }; }; then 10803 10842 ac_cv_func_setvbuf_reversed=yes 10804 10843 else 10805 @@ -13656,7 +140 03,7 @@10844 @@ -13656,7 +14034,7 @@ 10806 10845 fi 10807 10846 rm -f core core.* *.core 10808 10847 fi 10809 10848 -echo "$as_me:13659: result: $ac_cv_func_setvbuf_reversed" >&5 10810 +echo "$as_me:140 06: result: $ac_cv_func_setvbuf_reversed" >&510849 +echo "$as_me:14037: result: $ac_cv_func_setvbuf_reversed" >&5 10811 10850 echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 10812 10851 if test $ac_cv_func_setvbuf_reversed = yes; then 10813 10852 10814 @@ -13667,13 +140 14,13 @@10853 @@ -13667,13 +14045,13 @@ 10815 10854 fi 10816 10855 10817 10856 fi 10818 10857 -echo "$as_me:13670: checking return type of signal handlers" >&5 10819 +echo "$as_me:140 17: checking return type of signal handlers" >&510858 +echo "$as_me:14048: checking return type of signal handlers" >&5 10820 10859 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 10821 10860 if test "${ac_cv_type_signal+set}" = set; then … … 10824 10863 cat >conftest.$ac_ext <<_ACEOF 10825 10864 -#line 13676 "configure" 10826 +#line 140 23"configure"10865 +#line 14054 "configure" 10827 10866 #include "confdefs.h" 10828 10867 #include <sys/types.h> 10829 10868 #include <signal.h> 10830 @@ -13695,16 +140 42,16 @@10869 @@ -13695,16 +14073,16 @@ 10831 10870 } 10832 10871 _ACEOF 10833 10872 rm -f conftest.$ac_objext 10834 10873 -if { (eval echo "$as_me:13698: \"$ac_compile\"") >&5 10835 +if { (eval echo "$as_me:140 45: \"$ac_compile\"") >&510874 +if { (eval echo "$as_me:14076: \"$ac_compile\"") >&5 10836 10875 (eval $ac_compile) 2>&5 10837 10876 ac_status=$? 10838 10877 - echo "$as_me:13701: \$? = $ac_status" >&5 10839 + echo "$as_me:140 48: \$? = $ac_status" >&510878 + echo "$as_me:14079: \$? = $ac_status" >&5 10840 10879 (exit $ac_status); } && 10841 10880 { ac_try='test -s conftest.$ac_objext' 10842 10881 - { (eval echo "$as_me:13704: \"$ac_try\"") >&5 10843 + { (eval echo "$as_me:140 51: \"$ac_try\"") >&510882 + { (eval echo "$as_me:14082: \"$ac_try\"") >&5 10844 10883 (eval $ac_try) 2>&5 10845 10884 ac_status=$? 10846 10885 - echo "$as_me:13707: \$? = $ac_status" >&5 10847 + echo "$as_me:140 54: \$? = $ac_status" >&510886 + echo "$as_me:14085: \$? = $ac_status" >&5 10848 10887 (exit $ac_status); }; }; then 10849 10888 ac_cv_type_signal=void 10850 10889 else 10851 @@ -13714,21 +140 61,21 @@10890 @@ -13714,21 +14092,21 @@ 10852 10891 fi 10853 10892 rm -f conftest.$ac_objext conftest.$ac_ext 10854 10893 fi 10855 10894 -echo "$as_me:13717: result: $ac_cv_type_signal" >&5 10856 +echo "$as_me:140 64: result: $ac_cv_type_signal" >&510895 +echo "$as_me:14095: result: $ac_cv_type_signal" >&5 10857 10896 echo "${ECHO_T}$ac_cv_type_signal" >&6 10858 10897 … … 10862 10901 10863 10902 -echo "$as_me:13724: checking for type sigaction_t" >&5 10864 +echo "$as_me:14 071: checking for type sigaction_t" >&510903 +echo "$as_me:14102: checking for type sigaction_t" >&5 10865 10904 echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6 10866 10905 if test "${cf_cv_type_sigaction+set}" = set; then … … 10870 10909 cat >conftest.$ac_ext <<_ACEOF 10871 10910 -#line 13731 "configure" 10872 +#line 14 078"configure"10911 +#line 14109 "configure" 10873 10912 #include "confdefs.h" 10874 10913 10875 10914 #include <signal.h> 10876 @@ -13741,16 +14 088,16 @@10915 @@ -13741,16 +14119,16 @@ 10877 10916 } 10878 10917 _ACEOF 10879 10918 rm -f conftest.$ac_objext 10880 10919 -if { (eval echo "$as_me:13744: \"$ac_compile\"") >&5 10881 +if { (eval echo "$as_me:14 091: \"$ac_compile\"") >&510920 +if { (eval echo "$as_me:14122: \"$ac_compile\"") >&5 10882 10921 (eval $ac_compile) 2>&5 10883 10922 ac_status=$? 10884 10923 - echo "$as_me:13747: \$? = $ac_status" >&5 10885 + echo "$as_me:14 094: \$? = $ac_status" >&510924 + echo "$as_me:14125: \$? = $ac_status" >&5 10886 10925 (exit $ac_status); } && 10887 10926 { ac_try='test -s conftest.$ac_objext' 10888 10927 - { (eval echo "$as_me:13750: \"$ac_try\"") >&5 10889 + { (eval echo "$as_me:14 097: \"$ac_try\"") >&510928 + { (eval echo "$as_me:14128: \"$ac_try\"") >&5 10890 10929 (eval $ac_try) 2>&5 10891 10930 ac_status=$? 10892 10931 - echo "$as_me:13753: \$? = $ac_status" >&5 10893 + echo "$as_me:141 00: \$? = $ac_status" >&510932 + echo "$as_me:14131: \$? = $ac_status" >&5 10894 10933 (exit $ac_status); }; }; then 10895 10934 cf_cv_type_sigaction=yes 10896 10935 else 10897 @@ -13761,13 +141 08,13 @@10936 @@ -13761,13 +14139,13 @@ 10898 10937 rm -f conftest.$ac_objext conftest.$ac_ext 10899 10938 fi 10900 10939 10901 10940 -echo "$as_me:13764: result: $cf_cv_type_sigaction" >&5 10902 +echo "$as_me:141 11: result: $cf_cv_type_sigaction" >&510941 +echo "$as_me:14142: result: $cf_cv_type_sigaction" >&5 10903 10942 echo "${ECHO_T}$cf_cv_type_sigaction" >&6 10904 10943 test "$cf_cv_type_sigaction" = yes && cat >>confdefs.h <<\EOF … … 10907 10946 10908 10947 -echo "$as_me:13770: checking declaration of size-change" >&5 10909 +echo "$as_me:141 17: checking declaration of size-change" >&510948 +echo "$as_me:14148: checking declaration of size-change" >&5 10910 10949 echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6 10911 10950 if test "${cf_cv_sizechange+set}" = set; then 10912 10951 echo $ECHO_N "(cached) $ECHO_C" >&6 10913 @@ -13782,7 +141 29,7 @@10952 @@ -13782,7 +14160,7 @@ 10914 10953 CPPFLAGS="$cf_save_CPPFLAGS" 10915 10954 test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" 10916 10955 cat >conftest.$ac_ext <<_ACEOF 10917 10956 -#line 13785 "configure" 10918 +#line 141 32"configure"10957 +#line 14163 "configure" 10919 10958 #include "confdefs.h" 10920 10959 #include <sys/types.h> 10921 10960 #ifdef HAVE_TERMIOS_H 10922 @@ -13826,16 +14 173,16 @@10961 @@ -13826,16 +14204,16 @@ 10923 10962 } 10924 10963 _ACEOF 10925 10964 rm -f conftest.$ac_objext 10926 10965 -if { (eval echo "$as_me:13829: \"$ac_compile\"") >&5 10927 +if { (eval echo "$as_me:14 176: \"$ac_compile\"") >&510966 +if { (eval echo "$as_me:14207: \"$ac_compile\"") >&5 10928 10967 (eval $ac_compile) 2>&5 10929 10968 ac_status=$? 10930 10969 - echo "$as_me:13832: \$? = $ac_status" >&5 10931 + echo "$as_me:14 179: \$? = $ac_status" >&510970 + echo "$as_me:14210: \$? = $ac_status" >&5 10932 10971 (exit $ac_status); } && 10933 10972 { ac_try='test -s conftest.$ac_objext' 10934 10973 - { (eval echo "$as_me:13835: \"$ac_try\"") >&5 10935 + { (eval echo "$as_me:14 182: \"$ac_try\"") >&510974 + { (eval echo "$as_me:14213: \"$ac_try\"") >&5 10936 10975 (eval $ac_try) 2>&5 10937 10976 ac_status=$? 10938 10977 - echo "$as_me:13838: \$? = $ac_status" >&5 10939 + echo "$as_me:14 185: \$? = $ac_status" >&510978 + echo "$as_me:14216: \$? = $ac_status" >&5 10940 10979 (exit $ac_status); }; }; then 10941 10980 cf_cv_sizechange=yes 10942 10981 else 10943 @@ -13854,7 +142 01,7 @@10982 @@ -13854,7 +14232,7 @@ 10944 10983 done 10945 10984 10946 10985 fi 10947 10986 -echo "$as_me:13857: result: $cf_cv_sizechange" >&5 10948 +echo "$as_me:142 04: result: $cf_cv_sizechange" >&510987 +echo "$as_me:14235: result: $cf_cv_sizechange" >&5 10949 10988 echo "${ECHO_T}$cf_cv_sizechange" >&6 10950 10989 if test "$cf_cv_sizechange" != no ; then 10951 10990 cat >>confdefs.h <<\EOF 10952 @@ -13871,13 +142 18,13 @@10991 @@ -13871,13 +14249,13 @@ 10953 10992 esac 10954 10993 fi 10955 10994 10956 10995 -echo "$as_me:13874: checking for memmove" >&5 10957 +echo "$as_me:142 21: checking for memmove" >&510996 +echo "$as_me:14252: checking for memmove" >&5 10958 10997 echo $ECHO_N "checking for memmove... $ECHO_C" >&6 10959 10998 if test "${ac_cv_func_memmove+set}" = set; then … … 10962 11001 cat >conftest.$ac_ext <<_ACEOF 10963 11002 -#line 13880 "configure" 10964 +#line 142 27"configure"11003 +#line 14258 "configure" 10965 11004 #include "confdefs.h" 10966 11005 /* System header to define __stub macros and hopefully few prototypes, 10967 11006 which can conflict with char memmove (); below. */ 10968 @@ -13908,16 +142 55,16 @@11007 @@ -13908,16 +14286,16 @@ 10969 11008 } 10970 11009 _ACEOF 10971 11010 rm -f conftest.$ac_objext conftest$ac_exeext 10972 11011 -if { (eval echo "$as_me:13911: \"$ac_link\"") >&5 10973 +if { (eval echo "$as_me:142 58: \"$ac_link\"") >&511012 +if { (eval echo "$as_me:14289: \"$ac_link\"") >&5 10974 11013 (eval $ac_link) 2>&5 10975 11014 ac_status=$? 10976 11015 - echo "$as_me:13914: \$? = $ac_status" >&5 10977 + echo "$as_me:142 61: \$? = $ac_status" >&511016 + echo "$as_me:14292: \$? = $ac_status" >&5 10978 11017 (exit $ac_status); } && 10979 11018 { ac_try='test -s conftest$ac_exeext' 10980 11019 - { (eval echo "$as_me:13917: \"$ac_try\"") >&5 10981 + { (eval echo "$as_me:142 64: \"$ac_try\"") >&511020 + { (eval echo "$as_me:14295: \"$ac_try\"") >&5 10982 11021 (eval $ac_try) 2>&5 10983 11022 ac_status=$? 10984 11023 - echo "$as_me:13920: \$? = $ac_status" >&5 10985 + echo "$as_me:142 67: \$? = $ac_status" >&511024 + echo "$as_me:14298: \$? = $ac_status" >&5 10986 11025 (exit $ac_status); }; }; then 10987 11026 ac_cv_func_memmove=yes 10988 11027 else 10989 @@ -13927,19 +14 274,19 @@11028 @@ -13927,19 +14305,19 @@ 10990 11029 fi 10991 11030 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 10992 11031 fi 10993 11032 -echo "$as_me:13930: result: $ac_cv_func_memmove" >&5 10994 +echo "$as_me:14 277: result: $ac_cv_func_memmove" >&511033 +echo "$as_me:14308: result: $ac_cv_func_memmove" >&5 10995 11034 echo "${ECHO_T}$ac_cv_func_memmove" >&6 10996 11035 if test $ac_cv_func_memmove = yes; then … … 10999 11038 11000 11039 -echo "$as_me:13936: checking for bcopy" >&5 11001 +echo "$as_me:14 283: checking for bcopy" >&511040 +echo "$as_me:14314: checking for bcopy" >&5 11002 11041 echo $ECHO_N "checking for bcopy... $ECHO_C" >&6 11003 11042 if test "${ac_cv_func_bcopy+set}" = set; then … … 11006 11045 cat >conftest.$ac_ext <<_ACEOF 11007 11046 -#line 13942 "configure" 11008 +#line 14 289"configure"11047 +#line 14320 "configure" 11009 11048 #include "confdefs.h" 11010 11049 /* System header to define __stub macros and hopefully few prototypes, 11011 11050 which can conflict with char bcopy (); below. */ 11012 @@ -13970,16 +143 17,16 @@11051 @@ -13970,16 +14348,16 @@ 11013 11052 } 11014 11053 _ACEOF 11015 11054 rm -f conftest.$ac_objext conftest$ac_exeext 11016 11055 -if { (eval echo "$as_me:13973: \"$ac_link\"") >&5 11017 +if { (eval echo "$as_me:143 20: \"$ac_link\"") >&511056 +if { (eval echo "$as_me:14351: \"$ac_link\"") >&5 11018 11057 (eval $ac_link) 2>&5 11019 11058 ac_status=$? 11020 11059 - echo "$as_me:13976: \$? = $ac_status" >&5 11021 + echo "$as_me:143 23: \$? = $ac_status" >&511060 + echo "$as_me:14354: \$? = $ac_status" >&5 11022 11061 (exit $ac_status); } && 11023 11062 { ac_try='test -s conftest$ac_exeext' 11024 11063 - { (eval echo "$as_me:13979: \"$ac_try\"") >&5 11025 + { (eval echo "$as_me:143 26: \"$ac_try\"") >&511064 + { (eval echo "$as_me:14357: \"$ac_try\"") >&5 11026 11065 (eval $ac_try) 2>&5 11027 11066 ac_status=$? 11028 11067 - echo "$as_me:13982: \$? = $ac_status" >&5 11029 + echo "$as_me:143 29: \$? = $ac_status" >&511068 + echo "$as_me:14360: \$? = $ac_status" >&5 11030 11069 (exit $ac_status); }; }; then 11031 11070 ac_cv_func_bcopy=yes 11032 11071 else 11033 @@ -13989,11 +143 36,11 @@11072 @@ -13989,11 +14367,11 @@ 11034 11073 fi 11035 11074 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 11036 11075 fi 11037 11076 -echo "$as_me:13992: result: $ac_cv_func_bcopy" >&5 11038 +echo "$as_me:143 39: result: $ac_cv_func_bcopy" >&511077 +echo "$as_me:14370: result: $ac_cv_func_bcopy" >&5 11039 11078 echo "${ECHO_T}$ac_cv_func_bcopy" >&6 11040 11079 if test $ac_cv_func_bcopy = yes; then 11041 11080 11042 11081 - echo "$as_me:13996: checking if bcopy does overlapping moves" >&5 11043 + echo "$as_me:143 43: checking if bcopy does overlapping moves" >&511082 + echo "$as_me:14374: checking if bcopy does overlapping moves" >&5 11044 11083 echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6 11045 11084 if test "${cf_cv_good_bcopy+set}" = set; then 11046 11085 echo $ECHO_N "(cached) $ECHO_C" >&6 11047 @@ -14003,7 +143 50,7 @@11086 @@ -14003,7 +14381,7 @@ 11048 11087 cf_cv_good_bcopy=unknown 11049 11088 else 11050 11089 cat >conftest.$ac_ext <<_ACEOF 11051 11090 -#line 14006 "configure" 11052 +#line 143 53"configure"11091 +#line 14384 "configure" 11053 11092 #include "confdefs.h" 11054 11093 11055 11094 int main() { 11056 @@ -14017,15 +143 64,15 @@11095 @@ -14017,15 +14395,15 @@ 11057 11096 11058 11097 _ACEOF 11059 11098 rm -f conftest$ac_exeext 11060 11099 -if { (eval echo "$as_me:14020: \"$ac_link\"") >&5 11061 +if { (eval echo "$as_me:143 67: \"$ac_link\"") >&511100 +if { (eval echo "$as_me:14398: \"$ac_link\"") >&5 11062 11101 (eval $ac_link) 2>&5 11063 11102 ac_status=$? 11064 11103 - echo "$as_me:14023: \$? = $ac_status" >&5 11065 + echo "$as_me:14 370: \$? = $ac_status" >&511104 + echo "$as_me:14401: \$? = $ac_status" >&5 11066 11105 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 11067 11106 - { (eval echo "$as_me:14025: \"$ac_try\"") >&5 11068 + { (eval echo "$as_me:14 372: \"$ac_try\"") >&511107 + { (eval echo "$as_me:14403: \"$ac_try\"") >&5 11069 11108 (eval $ac_try) 2>&5 11070 11109 ac_status=$? 11071 11110 - echo "$as_me:14028: \$? = $ac_status" >&5 11072 + echo "$as_me:14 375: \$? = $ac_status" >&511111 + echo "$as_me:14406: \$? = $ac_status" >&5 11073 11112 (exit $ac_status); }; }; then 11074 11113 cf_cv_good_bcopy=yes 11075 11114 else 11076 @@ -14038,7 +14 385,7 @@11115 @@ -14038,7 +14416,7 @@ 11077 11116 fi 11078 11117 11079 11118 fi 11080 11119 -echo "$as_me:14041: result: $cf_cv_good_bcopy" >&5 11081 +echo "$as_me:14 388: result: $cf_cv_good_bcopy" >&511120 +echo "$as_me:14419: result: $cf_cv_good_bcopy" >&5 11082 11121 echo "${ECHO_T}$cf_cv_good_bcopy" >&6 11083 11122 11084 11123 else 11085 @@ -14059,7 +144 06,7 @@11124 @@ -14059,7 +14437,7 @@ 11086 11125 11087 11126 fi 11088 11127 11089 11128 -echo "$as_me:14062: checking if poll really works" >&5 11090 +echo "$as_me:144 09: checking if poll really works" >&511129 +echo "$as_me:14440: checking if poll really works" >&5 11091 11130 echo $ECHO_N "checking if poll really works... $ECHO_C" >&6 11092 11131 if test "${cf_cv_working_poll+set}" = set; then 11093 11132 echo $ECHO_N "(cached) $ECHO_C" >&6 11094 @@ -14069,7 +144 16,7 @@11133 @@ -14069,7 +14447,7 @@ 11095 11134 cf_cv_working_poll=unknown 11096 11135 else 11097 11136 cat >conftest.$ac_ext <<_ACEOF 11098 11137 -#line 14072 "configure" 11099 +#line 144 19"configure"11138 +#line 14450 "configure" 11100 11139 #include "confdefs.h" 11101 11140 11102 11141 #include <stdio.h> 11103 @@ -14090,15 +144 37,15 @@11142 @@ -14090,15 +14468,15 @@ 11104 11143 } 11105 11144 _ACEOF 11106 11145 rm -f conftest$ac_exeext 11107 11146 -if { (eval echo "$as_me:14093: \"$ac_link\"") >&5 11108 +if { (eval echo "$as_me:144 40: \"$ac_link\"") >&511147 +if { (eval echo "$as_me:14471: \"$ac_link\"") >&5 11109 11148 (eval $ac_link) 2>&5 11110 11149 ac_status=$? 11111 11150 - echo "$as_me:14096: \$? = $ac_status" >&5 11112 + echo "$as_me:144 43: \$? = $ac_status" >&511151 + echo "$as_me:14474: \$? = $ac_status" >&5 11113 11152 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 11114 11153 - { (eval echo "$as_me:14098: \"$ac_try\"") >&5 11115 + { (eval echo "$as_me:144 45: \"$ac_try\"") >&511154 + { (eval echo "$as_me:14476: \"$ac_try\"") >&5 11116 11155 (eval $ac_try) 2>&5 11117 11156 ac_status=$? 11118 11157 - echo "$as_me:14101: \$? = $ac_status" >&5 11119 + echo "$as_me:144 48: \$? = $ac_status" >&511158 + echo "$as_me:14479: \$? = $ac_status" >&5 11120 11159 (exit $ac_status); }; }; then 11121 11160 cf_cv_working_poll=yes 11122 11161 else 11123 @@ -14110,7 +144 57,7 @@11162 @@ -14110,7 +14488,7 @@ 11124 11163 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 11125 11164 fi 11126 11165 fi 11127 11166 -echo "$as_me:14113: result: $cf_cv_working_poll" >&5 11128 +echo "$as_me:144 60: result: $cf_cv_working_poll" >&511167 +echo "$as_me:14491: result: $cf_cv_working_poll" >&5 11129 11168 echo "${ECHO_T}$cf_cv_working_poll" >&6 11130 11169 test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF 11131 11170 #define HAVE_WORKING_POLL 1 11132 @@ -14118,7 +144 65,7 @@11171 @@ -14118,7 +14496,7 @@ 11133 11172 11134 11173 # special check for test/ditto.c 11135 11174 11136 11175 -echo "$as_me:14121: checking for openpty in -lutil" >&5 11137 +echo "$as_me:144 68: checking for openpty in -lutil" >&511176 +echo "$as_me:14499: checking for openpty in -lutil" >&5 11138 11177 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 11139 11178 if test "${ac_cv_lib_util_openpty+set}" = set; then 11140 11179 echo $ECHO_N "(cached) $ECHO_C" >&6 11141 @@ -14126,7 +14 473,7 @@11180 @@ -14126,7 +14504,7 @@ 11142 11181 ac_check_lib_save_LIBS=$LIBS 11143 11182 LIBS="-lutil $LIBS" 11144 11183 cat >conftest.$ac_ext <<_ACEOF 11145 11184 -#line 14129 "configure" 11146 +#line 14 476"configure"11185 +#line 14507 "configure" 11147 11186 #include "confdefs.h" 11148 11187 11149 11188 /* Override any gcc2 internal prototype to avoid an error. */ 11150 @@ -14145,16 +14 492,16 @@11189 @@ -14145,16 +14523,16 @@ 11151 11190 } 11152 11191 _ACEOF 11153 11192 rm -f conftest.$ac_objext conftest$ac_exeext 11154 11193 -if { (eval echo "$as_me:14148: \"$ac_link\"") >&5 11155 +if { (eval echo "$as_me:14 495: \"$ac_link\"") >&511194 +if { (eval echo "$as_me:14526: \"$ac_link\"") >&5 11156 11195 (eval $ac_link) 2>&5 11157 11196 ac_status=$? 11158 11197 - echo "$as_me:14151: \$? = $ac_status" >&5 11159 + echo "$as_me:14 498: \$? = $ac_status" >&511198 + echo "$as_me:14529: \$? = $ac_status" >&5 11160 11199 (exit $ac_status); } && 11161 11200 { ac_try='test -s conftest$ac_exeext' 11162 11201 - { (eval echo "$as_me:14154: \"$ac_try\"") >&5 11163 + { (eval echo "$as_me:145 01: \"$ac_try\"") >&511202 + { (eval echo "$as_me:14532: \"$ac_try\"") >&5 11164 11203 (eval $ac_try) 2>&5 11165 11204 ac_status=$? 11166 11205 - echo "$as_me:14157: \$? = $ac_status" >&5 11167 + echo "$as_me:145 04: \$? = $ac_status" >&511206 + echo "$as_me:14535: \$? = $ac_status" >&5 11168 11207 (exit $ac_status); }; }; then 11169 11208 ac_cv_lib_util_openpty=yes 11170 11209 else 11171 @@ -14165,7 +145 12,7 @@11210 @@ -14165,7 +14543,7 @@ 11172 11211 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 11173 11212 LIBS=$ac_check_lib_save_LIBS 11174 11213 fi 11175 11214 -echo "$as_me:14168: result: $ac_cv_lib_util_openpty" >&5 11176 +echo "$as_me:145 15: result: $ac_cv_lib_util_openpty" >&511215 +echo "$as_me:14546: result: $ac_cv_lib_util_openpty" >&5 11177 11216 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 11178 11217 if test $ac_cv_lib_util_openpty = yes; then 11179 11218 cf_cv_lib_util=yes 11180 @@ -14173,7 +145 20,7 @@11219 @@ -14173,7 +14551,7 @@ 11181 11220 cf_cv_lib_util=no 11182 11221 fi 11183 11222 11184 11223 -echo "$as_me:14176: checking for openpty header" >&5 11185 +echo "$as_me:145 23: checking for openpty header" >&511224 +echo "$as_me:14554: checking for openpty header" >&5 11186 11225 echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 11187 11226 if test "${cf_cv_func_openpty+set}" = set; then 11188 11227 echo $ECHO_N "(cached) $ECHO_C" >&6 11189 @@ -14184,7 +145 31,7 @@11228 @@ -14184,7 +14562,7 @@ 11190 11229 for cf_header in pty.h libutil.h util.h 11191 11230 do 11192 11231 cat >conftest.$ac_ext <<_ACEOF 11193 11232 -#line 14187 "configure" 11194 +#line 145 34"configure"11233 +#line 14565 "configure" 11195 11234 #include "confdefs.h" 11196 11235 11197 11236 #include <$cf_header> 11198 @@ -14201,16 +145 48,16 @@11237 @@ -14201,16 +14579,16 @@ 11199 11238 } 11200 11239 _ACEOF 11201 11240 rm -f conftest.$ac_objext conftest$ac_exeext 11202 11241 -if { (eval echo "$as_me:14204: \"$ac_link\"") >&5 11203 +if { (eval echo "$as_me:145 51: \"$ac_link\"") >&511242 +if { (eval echo "$as_me:14582: \"$ac_link\"") >&5 11204 11243 (eval $ac_link) 2>&5 11205 11244 ac_status=$? 11206 11245 - echo "$as_me:14207: \$? = $ac_status" >&5 11207 + echo "$as_me:145 54: \$? = $ac_status" >&511246 + echo "$as_me:14585: \$? = $ac_status" >&5 11208 11247 (exit $ac_status); } && 11209 11248 { ac_try='test -s conftest$ac_exeext' 11210 11249 - { (eval echo "$as_me:14210: \"$ac_try\"") >&5 11211 + { (eval echo "$as_me:145 57: \"$ac_try\"") >&511250 + { (eval echo "$as_me:14588: \"$ac_try\"") >&5 11212 11251 (eval $ac_try) 2>&5 11213 11252 ac_status=$? 11214 11253 - echo "$as_me:14213: \$? = $ac_status" >&5 11215 + echo "$as_me:145 60: \$? = $ac_status" >&511254 + echo "$as_me:14591: \$? = $ac_status" >&5 11216 11255 (exit $ac_status); }; }; then 11217 11256 11218 11257 cf_cv_func_openpty=$cf_header 11219 @@ -14228,7 +14 575,7 @@11258 @@ -14228,7 +14606,7 @@ 11220 11259 LIBS="$cf_save_LIBS" 11221 11260 11222 11261 fi 11223 11262 -echo "$as_me:14231: result: $cf_cv_func_openpty" >&5 11224 +echo "$as_me:14 578: result: $cf_cv_func_openpty" >&511263 +echo "$as_me:14609: result: $cf_cv_func_openpty" >&5 11225 11264 echo "${ECHO_T}$cf_cv_func_openpty" >&6 11226 11265 11227 11266 if test "$cf_cv_func_openpty" != no ; then 11228 @@ -14274,13 +146 21,13 @@11267 @@ -14274,13 +14652,13 @@ 11229 11268 fi 11230 11269 … … 11238 11277 cat >conftest.$ac_ext <<_ACEOF 11239 11278 -#line 14283 "configure" 11240 +#line 146 30"configure"11279 +#line 14661 "configure" 11241 11280 #include "confdefs.h" 11242 11281 #include <stdio.h> 11243 11282 int 11244 @@ -14292,16 +146 39,16 @@11283 @@ -14292,16 +14670,16 @@ 11245 11284 } 11246 11285 _ACEOF 11247 11286 rm -f conftest.$ac_objext 11248 11287 -if { (eval echo "$as_me:14295: \"$ac_compile\"") >&5 11249 +if { (eval echo "$as_me:146 42: \"$ac_compile\"") >&511288 +if { (eval echo "$as_me:14673: \"$ac_compile\"") >&5 11250 11289 (eval $ac_compile) 2>&5 11251 11290 ac_status=$? 11252 11291 - echo "$as_me:14298: \$? = $ac_status" >&5 11253 + echo "$as_me:146 45: \$? = $ac_status" >&511292 + echo "$as_me:14676: \$? = $ac_status" >&5 11254 11293 (exit $ac_status); } && 11255 11294 { ac_try='test -s conftest.$ac_objext' 11256 11295 - { (eval echo "$as_me:14301: \"$ac_try\"") >&5 11257 + { (eval echo "$as_me:146 48: \"$ac_try\"") >&511296 + { (eval echo "$as_me:14679: \"$ac_try\"") >&5 11258 11297 (eval $ac_try) 2>&5 11259 11298 ac_status=$? 11260 11299 - echo "$as_me:14304: \$? = $ac_status" >&5 11261 + echo "$as_me:146 51: \$? = $ac_status" >&511300 + echo "$as_me:14682: \$? = $ac_status" >&5 11262 11301 (exit $ac_status); }; }; then 11263 11302 : 11264 11303 else 11265 @@ -14318,13 +146 65,13 @@11304 @@ -14318,13 +14696,13 @@ 11266 11305 if test "$cf_have_incdir" = no ; then 11267 11306 test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 11268 11307 11269 11308 -echo "${as_me-configure}:14321: testing adding $cf_add_incdir to include-path ..." 1>&5 11270 +echo "${as_me-configure}:146 68: testing adding $cf_add_incdir to include-path ..." 1>&511309 +echo "${as_me-configure}:14699: testing adding $cf_add_incdir to include-path ..." 1>&5 11271 11310 11272 11311 - CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" … … 11282 11321 break 11283 11322 fi 11284 @@ -14352,7 +14 699,7 @@11323 @@ -14352,7 +14730,7 @@ 11285 11324 if test "$cf_have_libdir" = no ; then 11286 11325 test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 11287 11326 11288 11327 -echo "${as_me-configure}:14355: testing adding $cf_add_libdir to library-path ..." 1>&5 11289 +echo "${as_me-configure}:147 02: testing adding $cf_add_libdir to library-path ..." 1>&511328 +echo "${as_me-configure}:14733: testing adding $cf_add_libdir to library-path ..." 1>&5 11290 11329 11291 11330 LDFLAGS="-L$cf_add_libdir $LDFLAGS" 11292 11331 fi 11293 @@ -14363,23 +147 10,23 @@11332 @@ -14363,23 +14741,23 @@ 11294 11333 fi 11295 11334 esac 11296 11335 11297 11336 -echo "$as_me:14366: checking for db.h" >&5 11298 +echo "$as_me:147 13: checking for db.h" >&511337 +echo "$as_me:14744: checking for db.h" >&5 11299 11338 echo $ECHO_N "checking for db.h... $ECHO_C" >&6 11300 11339 if test "${ac_cv_header_db_h+set}" = set; then … … 11303 11342 cat >conftest.$ac_ext <<_ACEOF 11304 11343 -#line 14372 "configure" 11305 +#line 147 19"configure"11344 +#line 14750 "configure" 11306 11345 #include "confdefs.h" 11307 11346 #include <db.h> 11308 11347 _ACEOF 11309 11348 -if { (eval echo "$as_me:14376: \"$ac_cpp conftest.$ac_ext\"") >&5 11310 +if { (eval echo "$as_me:147 23: \"$ac_cpp conftest.$ac_ext\"") >&511349 +if { (eval echo "$as_me:14754: \"$ac_cpp conftest.$ac_ext\"") >&5 11311 11350 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 11312 11351 ac_status=$? … … 11315 11354 cat conftest.err >&5 11316 11355 - echo "$as_me:14382: \$? = $ac_status" >&5 11317 + echo "$as_me:147 29: \$? = $ac_status" >&511356 + echo "$as_me:14760: \$? = $ac_status" >&5 11318 11357 (exit $ac_status); } >/dev/null; then 11319 11358 if test -s conftest.err; then 11320 11359 ac_cpp_err=$ac_c_preproc_warn_flag 11321 @@ -14398,11 +147 45,11 @@11360 @@ -14398,11 +14776,11 @@ 11322 11361 fi 11323 11362 rm -f conftest.err conftest.$ac_ext 11324 11363 fi 11325 11364 -echo "$as_me:14401: result: $ac_cv_header_db_h" >&5 11326 +echo "$as_me:147 48: result: $ac_cv_header_db_h" >&511365 +echo "$as_me:14779: result: $ac_cv_header_db_h" >&5 11327 11366 echo "${ECHO_T}$ac_cv_header_db_h" >&6 11328 11367 if test $ac_cv_header_db_h = yes; then 11329 11368 11330 11369 -echo "$as_me:14405: checking for version of db" >&5 11331 +echo "$as_me:147 52: checking for version of db" >&511370 +echo "$as_me:14783: checking for version of db" >&5 11332 11371 echo $ECHO_N "checking for version of db... $ECHO_C" >&6 11333 11372 if test "${cf_cv_hashed_db_version+set}" = set; then 11334 11373 echo $ECHO_N "(cached) $ECHO_C" >&6 11335 @@ -14413,10 +147 60,10 @@11374 @@ -14413,10 +14791,10 @@ 11336 11375 for cf_db_version in 1 2 3 4 5 11337 11376 do 11338 11377 11339 11378 -echo "${as_me-configure}:14416: testing checking for db version $cf_db_version ..." 1>&5 11340 +echo "${as_me-configure}:147 63: testing checking for db version $cf_db_version ..." 1>&511379 +echo "${as_me-configure}:14794: testing checking for db version $cf_db_version ..." 1>&5 11341 11380 11342 11381 cat >conftest.$ac_ext <<_ACEOF 11343 11382 -#line 14419 "configure" 11344 +#line 147 66"configure"11383 +#line 14797 "configure" 11345 11384 #include "confdefs.h" 11346 11385 11347 11386 $ac_includes_default 11348 @@ -14446,16 +14 793,16 @@11387 @@ -14446,16 +14824,16 @@ 11349 11388 } 11350 11389 _ACEOF 11351 11390 rm -f conftest.$ac_objext 11352 11391 -if { (eval echo "$as_me:14449: \"$ac_compile\"") >&5 11353 +if { (eval echo "$as_me:14 796: \"$ac_compile\"") >&511392 +if { (eval echo "$as_me:14827: \"$ac_compile\"") >&5 11354 11393 (eval $ac_compile) 2>&5 11355 11394 ac_status=$? 11356 11395 - echo "$as_me:14452: \$? = $ac_status" >&5 11357 + echo "$as_me:14 799: \$? = $ac_status" >&511396 + echo "$as_me:14830: \$? = $ac_status" >&5 11358 11397 (exit $ac_status); } && 11359 11398 { ac_try='test -s conftest.$ac_objext' 11360 11399 - { (eval echo "$as_me:14455: \"$ac_try\"") >&5 11361 + { (eval echo "$as_me:148 02: \"$ac_try\"") >&511400 + { (eval echo "$as_me:14833: \"$ac_try\"") >&5 11362 11401 (eval $ac_try) 2>&5 11363 11402 ac_status=$? 11364 11403 - echo "$as_me:14458: \$? = $ac_status" >&5 11365 + echo "$as_me:148 05: \$? = $ac_status" >&511404 + echo "$as_me:14836: \$? = $ac_status" >&5 11366 11405 (exit $ac_status); }; }; then 11367 11406 11368 11407 cf_cv_hashed_db_version=$cf_db_version 11369 @@ -14469,16 +148 16,16 @@11408 @@ -14469,16 +14847,16 @@ 11370 11409 done 11371 11410 11372 11411 fi 11373 11412 -echo "$as_me:14472: result: $cf_cv_hashed_db_version" >&5 11374 +echo "$as_me:148 19: result: $cf_cv_hashed_db_version" >&511413 +echo "$as_me:14850: result: $cf_cv_hashed_db_version" >&5 11375 11414 echo "${ECHO_T}$cf_cv_hashed_db_version" >&6 11376 11415 11377 11416 if test "$cf_cv_hashed_db_version" = unknown ; then 11378 11417 - { { echo "$as_me:14476: error: Cannot determine version of db" >&5 11379 + { { echo "$as_me:148 23: error: Cannot determine version of db" >&511418 + { { echo "$as_me:14854: error: Cannot determine version of db" >&5 11380 11419 echo "$as_me: error: Cannot determine version of db" >&2;} 11381 11420 { (exit 1); exit 1; }; } … … 11383 11422 11384 11423 -echo "$as_me:14481: checking for db libraries" >&5 11385 +echo "$as_me:148 28: checking for db libraries" >&511424 +echo "$as_me:14859: checking for db libraries" >&5 11386 11425 echo $ECHO_N "checking for db libraries... $ECHO_C" >&6 11387 11426 if test "${cf_cv_hashed_db_libs+set}" = set; then 11388 11427 echo $ECHO_N "(cached) $ECHO_C" >&6 11389 @@ -14492,10 +148 39,10 @@11428 @@ -14492,10 +14870,10 @@ 11390 11429 LIBS="-l$cf_db_libs $LIBS" 11391 11430 fi 11392 11431 11393 11432 -echo "${as_me-configure}:14495: testing checking for library "$cf_db_libs" ..." 1>&5 11394 +echo "${as_me-configure}:148 42: testing checking for library "$cf_db_libs" ..." 1>&511433 +echo "${as_me-configure}:14873: testing checking for library "$cf_db_libs" ..." 1>&5 11395 11434 11396 11435 cat >conftest.$ac_ext <<_ACEOF 11397 11436 -#line 14498 "configure" 11398 +#line 148 45"configure"11437 +#line 14876 "configure" 11399 11438 #include "confdefs.h" 11400 11439 11401 11440 $ac_includes_default 11402 @@ -14550,16 +14 897,16 @@11441 @@ -14550,16 +14928,16 @@ 11403 11442 } 11404 11443 _ACEOF 11405 11444 rm -f conftest.$ac_objext conftest$ac_exeext 11406 11445 -if { (eval echo "$as_me:14553: \"$ac_link\"") >&5 11407 +if { (eval echo "$as_me:149 00: \"$ac_link\"") >&511446 +if { (eval echo "$as_me:14931: \"$ac_link\"") >&5 11408 11447 (eval $ac_link) 2>&5 11409 11448 ac_status=$? 11410 11449 - echo "$as_me:14556: \$? = $ac_status" >&5 11411 + echo "$as_me:149 03: \$? = $ac_status" >&511450 + echo "$as_me:14934: \$? = $ac_status" >&5 11412 11451 (exit $ac_status); } && 11413 11452 { ac_try='test -s conftest$ac_exeext' 11414 11453 - { (eval echo "$as_me:14559: \"$ac_try\"") >&5 11415 + { (eval echo "$as_me:149 06: \"$ac_try\"") >&511454 + { (eval echo "$as_me:14937: \"$ac_try\"") >&5 11416 11455 (eval $ac_try) 2>&5 11417 11456 ac_status=$? 11418 11457 - echo "$as_me:14562: \$? = $ac_status" >&5 11419 + echo "$as_me:149 09: \$? = $ac_status" >&511458 + echo "$as_me:14940: \$? = $ac_status" >&5 11420 11459 (exit $ac_status); }; }; then 11421 11460 11422 11461 if test -n "$cf_db_libs" ; then 11423 @@ -14579,11 +149 26,11 @@11462 @@ -14579,11 +14957,11 @@ 11424 11463 done 11425 11464 11426 11465 fi 11427 11466 -echo "$as_me:14582: result: $cf_cv_hashed_db_libs" >&5 11428 +echo "$as_me:149 29: result: $cf_cv_hashed_db_libs" >&511467 +echo "$as_me:14960: result: $cf_cv_hashed_db_libs" >&5 11429 11468 echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6 11430 11469 11431 11470 if test "$cf_cv_hashed_db_libs" = unknown ; then 11432 11471 - { { echo "$as_me:14586: error: Cannot determine library for db" >&5 11433 + { { echo "$as_me:149 33: error: Cannot determine library for db" >&511472 + { { echo "$as_me:14964: error: Cannot determine library for db" >&5 11434 11473 echo "$as_me: error: Cannot determine library for db" >&2;} 11435 11474 { (exit 1); exit 1; }; } 11436 11475 elif test "$cf_cv_hashed_db_libs" != default ; then 11437 @@ -14593,7 +149 40,7 @@11476 @@ -14593,7 +14971,7 @@ 11438 11477 11439 11478 else 11440 11479 11441 11480 - { { echo "$as_me:14596: error: Cannot find db.h" >&5 11442 + { { echo "$as_me:149 43: error: Cannot find db.h" >&511481 + { { echo "$as_me:14974: error: Cannot find db.h" >&5 11443 11482 echo "$as_me: error: Cannot find db.h" >&2;} 11444 11483 { (exit 1); exit 1; }; } 11445 11484 11446 @@ -14608,7 +149 55,7 @@11485 @@ -14608,7 +14986,7 @@ 11447 11486 11448 11487 # Just in case, check if the C compiler has a bool type. 11449 11488 11450 11489 -echo "$as_me:14611: checking if we should include stdbool.h" >&5 11451 +echo "$as_me:149 58: checking if we should include stdbool.h" >&511490 +echo "$as_me:14989: checking if we should include stdbool.h" >&5 11452 11491 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 11453 11492 11454 11493 if test "${cf_cv_header_stdbool_h+set}" = set; then 11455 @@ -14616,7 +149 63,7 @@11494 @@ -14616,7 +14994,7 @@ 11456 11495 else 11457 11496 11458 11497 cat >conftest.$ac_ext <<_ACEOF 11459 11498 -#line 14619 "configure" 11460 +#line 149 66"configure"11499 +#line 14997 "configure" 11461 11500 #include "confdefs.h" 11462 11501 11463 11502 int 11464 @@ -14628,23 +1 4975,23 @@11503 @@ -14628,23 +15006,23 @@ 11465 11504 } 11466 11505 _ACEOF 11467 11506 rm -f conftest.$ac_objext 11468 11507 -if { (eval echo "$as_me:14631: \"$ac_compile\"") >&5 11469 +if { (eval echo "$as_me:1 4978: \"$ac_compile\"") >&511508 +if { (eval echo "$as_me:15009: \"$ac_compile\"") >&5 11470 11509 (eval $ac_compile) 2>&5 11471 11510 ac_status=$? 11472 11511 - echo "$as_me:14634: \$? = $ac_status" >&5 11473 + echo "$as_me:1 4981: \$? = $ac_status" >&511512 + echo "$as_me:15012: \$? = $ac_status" >&5 11474 11513 (exit $ac_status); } && 11475 11514 { ac_try='test -s conftest.$ac_objext' 11476 11515 - { (eval echo "$as_me:14637: \"$ac_try\"") >&5 11477 + { (eval echo "$as_me:1 4984: \"$ac_try\"") >&511516 + { (eval echo "$as_me:15015: \"$ac_try\"") >&5 11478 11517 (eval $ac_try) 2>&5 11479 11518 ac_status=$? 11480 11519 - echo "$as_me:14640: \$? = $ac_status" >&5 11481 + echo "$as_me:1 4987: \$? = $ac_status" >&511520 + echo "$as_me:15018: \$? = $ac_status" >&5 11482 11521 (exit $ac_status); }; }; then 11483 11522 cf_cv_header_stdbool_h=0 … … 11487 11526 cat >conftest.$ac_ext <<_ACEOF 11488 11527 -#line 14647 "configure" 11489 +#line 1 4994"configure"11528 +#line 15025 "configure" 11490 11529 #include "confdefs.h" 11491 11530 11492 11531 #ifndef __BEOS__ 11493 @@ -14660,16 +150 07,16 @@11532 @@ -14660,16 +15038,16 @@ 11494 11533 } 11495 11534 _ACEOF 11496 11535 rm -f conftest.$ac_objext 11497 11536 -if { (eval echo "$as_me:14663: \"$ac_compile\"") >&5 11498 +if { (eval echo "$as_me:150 10: \"$ac_compile\"") >&511537 +if { (eval echo "$as_me:15041: \"$ac_compile\"") >&5 11499 11538 (eval $ac_compile) 2>&5 11500 11539 ac_status=$? 11501 11540 - echo "$as_me:14666: \$? = $ac_status" >&5 11502 + echo "$as_me:150 13: \$? = $ac_status" >&511541 + echo "$as_me:15044: \$? = $ac_status" >&5 11503 11542 (exit $ac_status); } && 11504 11543 { ac_try='test -s conftest.$ac_objext' 11505 11544 - { (eval echo "$as_me:14669: \"$ac_try\"") >&5 11506 + { (eval echo "$as_me:150 16: \"$ac_try\"") >&511545 + { (eval echo "$as_me:15047: \"$ac_try\"") >&5 11507 11546 (eval $ac_try) 2>&5 11508 11547 ac_status=$? 11509 11548 - echo "$as_me:14672: \$? = $ac_status" >&5 11510 + echo "$as_me:150 19: \$? = $ac_status" >&511549 + echo "$as_me:15050: \$? = $ac_status" >&5 11511 11550 (exit $ac_status); }; }; then 11512 11551 cf_cv_header_stdbool_h=1 11513 11552 else 11514 @@ -14683,13 +150 30,13 @@11553 @@ -14683,13 +15061,13 @@ 11515 11554 fi 11516 11555 11517 11556 if test "$cf_cv_header_stdbool_h" = 1 11518 11557 -then echo "$as_me:14686: result: yes" >&5 11519 +then echo "$as_me:150 33: result: yes" >&511558 +then echo "$as_me:15064: result: yes" >&5 11520 11559 echo "${ECHO_T}yes" >&6 11521 11560 -else echo "$as_me:14688: result: no" >&5 11522 +else echo "$as_me:150 35: result: no" >&511561 +else echo "$as_me:15066: result: no" >&5 11523 11562 echo "${ECHO_T}no" >&6 11524 11563 fi 11525 11564 11526 11565 -echo "$as_me:14692: checking for builtin bool type" >&5 11527 +echo "$as_me:150 39: checking for builtin bool type" >&511566 +echo "$as_me:15070: checking for builtin bool type" >&5 11528 11567 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 11529 11568 11530 11569 if test "${cf_cv_cc_bool_type+set}" = set; then 11531 @@ -14697,7 +150 44,7 @@11570 @@ -14697,7 +15075,7 @@ 11532 11571 else 11533 11572 11534 11573 cat >conftest.$ac_ext <<_ACEOF 11535 11574 -#line 14700 "configure" 11536 +#line 150 47"configure"11575 +#line 15078 "configure" 11537 11576 #include "confdefs.h" 11538 11577 11539 11578 #include <stdio.h> 11540 @@ -14712,16 +150 59,16 @@11579 @@ -14712,16 +15090,16 @@ 11541 11580 } 11542 11581 _ACEOF 11543 11582 rm -f conftest.$ac_objext 11544 11583 -if { (eval echo "$as_me:14715: \"$ac_compile\"") >&5 11545 +if { (eval echo "$as_me:150 62: \"$ac_compile\"") >&511584 +if { (eval echo "$as_me:15093: \"$ac_compile\"") >&5 11546 11585 (eval $ac_compile) 2>&5 11547 11586 ac_status=$? 11548 11587 - echo "$as_me:14718: \$? = $ac_status" >&5 11549 + echo "$as_me:150 65: \$? = $ac_status" >&511588 + echo "$as_me:15096: \$? = $ac_status" >&5 11550 11589 (exit $ac_status); } && 11551 11590 { ac_try='test -s conftest.$ac_objext' 11552 11591 - { (eval echo "$as_me:14721: \"$ac_try\"") >&5 11553 + { (eval echo "$as_me:150 68: \"$ac_try\"") >&511592 + { (eval echo "$as_me:15099: \"$ac_try\"") >&5 11554 11593 (eval $ac_try) 2>&5 11555 11594 ac_status=$? 11556 11595 - echo "$as_me:14724: \$? = $ac_status" >&5 11557 + echo "$as_me:15 071: \$? = $ac_status" >&511596 + echo "$as_me:15102: \$? = $ac_status" >&5 11558 11597 (exit $ac_status); }; }; then 11559 11598 cf_cv_cc_bool_type=1 11560 11599 else 11561 @@ -14734,9 +15 081,9 @@11600 @@ -14734,9 +15112,9 @@ 11562 11601 fi 11563 11602 11564 11603 if test "$cf_cv_cc_bool_type" = 1 11565 11604 -then echo "$as_me:14737: result: yes" >&5 11566 +then echo "$as_me:15 084: result: yes" >&511605 +then echo "$as_me:15115: result: yes" >&5 11567 11606 echo "${ECHO_T}yes" >&6 11568 11607 -else echo "$as_me:14739: result: no" >&5 11569 +else echo "$as_me:15 086: result: no" >&511608 +else echo "$as_me:15117: result: no" >&5 11570 11609 echo "${ECHO_T}no" >&6 11571 11610 fi 11572 11611 11573 @@ -14758,7 +151 05,7 @@11612 @@ -14758,7 +15136,7 @@ 11574 11613 cf_stdcpp_libname=stdc++ 11575 11614 ;; 11576 11615 esac 11577 11616 -echo "$as_me:14761: checking for library $cf_stdcpp_libname" >&5 11578 +echo "$as_me:151 08: checking for library $cf_stdcpp_libname" >&511617 +echo "$as_me:15139: checking for library $cf_stdcpp_libname" >&5 11579 11618 echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6 11580 11619 if test "${cf_cv_libstdcpp+set}" = set; then 11581 11620 echo $ECHO_N "(cached) $ECHO_C" >&6 11582 @@ -14767,7 +151 14,7 @@11621 @@ -14767,7 +15145,7 @@ 11583 11622 cf_save="$LIBS" 11584 11623 LIBS="$LIBS -l$cf_stdcpp_libname" 11585 11624 cat >conftest.$ac_ext <<_ACEOF 11586 11625 -#line 14770 "configure" 11587 +#line 151 17"configure"11626 +#line 15148 "configure" 11588 11627 #include "confdefs.h" 11589 11628 11590 11629 #include <strstream.h> 11591 @@ -14783,16 +151 30,16 @@11630 @@ -14783,16 +15161,16 @@ 11592 11631 } 11593 11632 _ACEOF 11594 11633 rm -f conftest.$ac_objext conftest$ac_exeext 11595 11634 -if { (eval echo "$as_me:14786: \"$ac_link\"") >&5 11596 +if { (eval echo "$as_me:151 33: \"$ac_link\"") >&511635 +if { (eval echo "$as_me:15164: \"$ac_link\"") >&5 11597 11636 (eval $ac_link) 2>&5 11598 11637 ac_status=$? 11599 11638 - echo "$as_me:14789: \$? = $ac_status" >&5 11600 + echo "$as_me:151 36: \$? = $ac_status" >&511639 + echo "$as_me:15167: \$? = $ac_status" >&5 11601 11640 (exit $ac_status); } && 11602 11641 { ac_try='test -s conftest$ac_exeext' 11603 11642 - { (eval echo "$as_me:14792: \"$ac_try\"") >&5 11604 + { (eval echo "$as_me:151 39: \"$ac_try\"") >&511643 + { (eval echo "$as_me:15170: \"$ac_try\"") >&5 11605 11644 (eval $ac_try) 2>&5 11606 11645 ac_status=$? 11607 11646 - echo "$as_me:14795: \$? = $ac_status" >&5 11608 + echo "$as_me:151 42: \$? = $ac_status" >&511647 + echo "$as_me:15173: \$? = $ac_status" >&5 11609 11648 (exit $ac_status); }; }; then 11610 11649 cf_cv_libstdcpp=yes 11611 11650 else 11612 @@ -14804,12 +151 51,12 @@11651 @@ -14804,12 +15182,12 @@ 11613 11652 LIBS="$cf_save" 11614 11653 11615 11654 fi 11616 11655 -echo "$as_me:14807: result: $cf_cv_libstdcpp" >&5 11617 +echo "$as_me:151 54: result: $cf_cv_libstdcpp" >&511656 +echo "$as_me:15185: result: $cf_cv_libstdcpp" >&5 11618 11657 echo "${ECHO_T}$cf_cv_libstdcpp" >&6 11619 11658 test "$cf_cv_libstdcpp" = yes && CXXLIBS="$CXXLIBS -l$cf_stdcpp_libname" … … 11621 11660 11622 11661 - echo "$as_me:14812: checking whether $CXX understands -c and -o together" >&5 11623 + echo "$as_me:151 59: checking whether $CXX understands -c and -o together" >&511662 + echo "$as_me:15190: checking whether $CXX understands -c and -o together" >&5 11624 11663 echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6 11625 11664 if test "${cf_cv_prog_CXX_c_o+set}" = set; then 11626 11665 echo $ECHO_N "(cached) $ECHO_C" >&6 11627 @@ -14825,15 +15 172,15 @@11666 @@ -14825,15 +15203,15 @@ 11628 11667 # We do the test twice because some compilers refuse to overwrite an 11629 11668 # existing .o file with -o, though they will create one. 11630 11669 ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5' 11631 11670 -if { (eval echo "$as_me:14828: \"$ac_try\"") >&5 11632 +if { (eval echo "$as_me:15 175: \"$ac_try\"") >&511671 +if { (eval echo "$as_me:15206: \"$ac_try\"") >&5 11633 11672 (eval $ac_try) 2>&5 11634 11673 ac_status=$? 11635 11674 - echo "$as_me:14831: \$? = $ac_status" >&5 11636 + echo "$as_me:15 178: \$? = $ac_status" >&511675 + echo "$as_me:15209: \$? = $ac_status" >&5 11637 11676 (exit $ac_status); } && 11638 11677 - test -f conftest2.$ac_objext && { (eval echo "$as_me:14833: \"$ac_try\"") >&5 11639 + test -f conftest2.$ac_objext && { (eval echo "$as_me:15 180: \"$ac_try\"") >&511678 + test -f conftest2.$ac_objext && { (eval echo "$as_me:15211: \"$ac_try\"") >&5 11640 11679 (eval $ac_try) 2>&5 11641 11680 ac_status=$? 11642 11681 - echo "$as_me:14836: \$? = $ac_status" >&5 11643 + echo "$as_me:15 183: \$? = $ac_status" >&511682 + echo "$as_me:15214: \$? = $ac_status" >&5 11644 11683 (exit $ac_status); }; 11645 11684 then 11646 11685 eval cf_cv_prog_CXX_c_o=yes 11647 @@ -14844,10 +15 191,10 @@11686 @@ -14844,10 +15222,10 @@ 11648 11687 11649 11688 fi 11650 11689 if test $cf_cv_prog_CXX_c_o = yes; then 11651 11690 - echo "$as_me:14847: result: yes" >&5 11652 + echo "$as_me:15 194: result: yes" >&511691 + echo "$as_me:15225: result: yes" >&5 11653 11692 echo "${ECHO_T}yes" >&6 11654 11693 else 11655 11694 - echo "$as_me:14850: result: no" >&5 11656 + echo "$as_me:15 197: result: no" >&511695 + echo "$as_me:15228: result: no" >&5 11657 11696 echo "${ECHO_T}no" >&6 11658 11697 fi 11659 11698 11660 @@ -14867,12 +152 14,12 @@11699 @@ -14867,12 +15245,12 @@ 11661 11700 ;; 11662 11701 esac 11663 11702 if test "$GXX" = yes; then 11664 11703 - echo "$as_me:14870: checking for lib$cf_gpp_libname" >&5 11665 + echo "$as_me:152 17: checking for lib$cf_gpp_libname" >&511704 + echo "$as_me:15248: checking for lib$cf_gpp_libname" >&5 11666 11705 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 11667 11706 cf_save="$LIBS" … … 11669 11708 cat >conftest.$ac_ext <<_ACEOF 11670 11709 -#line 14875 "configure" 11671 +#line 152 22"configure"11710 +#line 15253 "configure" 11672 11711 #include "confdefs.h" 11673 11712 11674 11713 #include <$cf_gpp_libname/builtin.h> 11675 @@ -14886,16 +152 33,16 @@11714 @@ -14886,16 +15264,16 @@ 11676 11715 } 11677 11716 _ACEOF 11678 11717 rm -f conftest.$ac_objext conftest$ac_exeext 11679 11718 -if { (eval echo "$as_me:14889: \"$ac_link\"") >&5 11680 +if { (eval echo "$as_me:152 36: \"$ac_link\"") >&511719 +if { (eval echo "$as_me:15267: \"$ac_link\"") >&5 11681 11720 (eval $ac_link) 2>&5 11682 11721 ac_status=$? 11683 11722 - echo "$as_me:14892: \$? = $ac_status" >&5 11684 + echo "$as_me:152 39: \$? = $ac_status" >&511723 + echo "$as_me:15270: \$? = $ac_status" >&5 11685 11724 (exit $ac_status); } && 11686 11725 { ac_try='test -s conftest$ac_exeext' 11687 11726 - { (eval echo "$as_me:14895: \"$ac_try\"") >&5 11688 + { (eval echo "$as_me:152 42: \"$ac_try\"") >&511727 + { (eval echo "$as_me:15273: \"$ac_try\"") >&5 11689 11728 (eval $ac_try) 2>&5 11690 11729 ac_status=$? 11691 11730 - echo "$as_me:14898: \$? = $ac_status" >&5 11692 + echo "$as_me:152 45: \$? = $ac_status" >&511731 + echo "$as_me:15276: \$? = $ac_status" >&5 11693 11732 (exit $ac_status); }; }; then 11694 11733 cf_cxx_library=yes 11695 11734 CXXLIBS="$CXXLIBS -l$cf_gpp_libname" 11696 @@ -14914,7 +152 61,7 @@11735 @@ -14914,7 +15292,7 @@ 11697 11736 echo "$as_me: failed program was:" >&5 11698 11737 cat conftest.$ac_ext >&5 11699 11738 cat >conftest.$ac_ext <<_ACEOF 11700 11739 -#line 14917 "configure" 11701 +#line 152 64"configure"11740 +#line 15295 "configure" 11702 11741 #include "confdefs.h" 11703 11742 11704 11743 #include <builtin.h> 11705 @@ -14928,16 +15 275,16 @@11744 @@ -14928,16 +15306,16 @@ 11706 11745 } 11707 11746 _ACEOF 11708 11747 rm -f conftest.$ac_objext conftest$ac_exeext 11709 11748 -if { (eval echo "$as_me:14931: \"$ac_link\"") >&5 11710 +if { (eval echo "$as_me:15 278: \"$ac_link\"") >&511749 +if { (eval echo "$as_me:15309: \"$ac_link\"") >&5 11711 11750 (eval $ac_link) 2>&5 11712 11751 ac_status=$? 11713 11752 - echo "$as_me:14934: \$? = $ac_status" >&5 11714 + echo "$as_me:15 281: \$? = $ac_status" >&511753 + echo "$as_me:15312: \$? = $ac_status" >&5 11715 11754 (exit $ac_status); } && 11716 11755 { ac_try='test -s conftest$ac_exeext' 11717 11756 - { (eval echo "$as_me:14937: \"$ac_try\"") >&5 11718 + { (eval echo "$as_me:15 284: \"$ac_try\"") >&511757 + { (eval echo "$as_me:15315: \"$ac_try\"") >&5 11719 11758 (eval $ac_try) 2>&5 11720 11759 ac_status=$? 11721 11760 - echo "$as_me:14940: \$? = $ac_status" >&5 11722 + echo "$as_me:15 287: \$? = $ac_status" >&511761 + echo "$as_me:15318: \$? = $ac_status" >&5 11723 11762 (exit $ac_status); }; }; then 11724 11763 cf_cxx_library=yes 11725 11764 CXXLIBS="$CXXLIBS -l$cf_gpp_libname" 11726 @@ -14954,7 +153 01,7 @@11765 @@ -14954,7 +15332,7 @@ 11727 11766 fi 11728 11767 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 11729 11768 LIBS="$cf_save" 11730 11769 - echo "$as_me:14957: result: $cf_cxx_library" >&5 11731 + echo "$as_me:153 04: result: $cf_cxx_library" >&511770 + echo "$as_me:15335: result: $cf_cxx_library" >&5 11732 11771 echo "${ECHO_T}$cf_cxx_library" >&6 11733 11772 fi 11734 11773 11735 @@ -14970,7 +153 17,7 @@11774 @@ -14970,7 +15348,7 @@ 11736 11775 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 11737 11776 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 11738 11777 ac_main_return=return 11739 11778 -echo "$as_me:14973: checking how to run the C++ preprocessor" >&5 11740 +echo "$as_me:153 20: checking how to run the C++ preprocessor" >&511779 +echo "$as_me:15351: checking how to run the C++ preprocessor" >&5 11741 11780 echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 11742 11781 if test -z "$CXXCPP"; then 11743 11782 if test "${ac_cv_prog_CXXCPP+set}" = set; then 11744 @@ -14987,18 +153 34,18 @@11783 @@ -14987,18 +15365,18 @@ 11745 11784 # On the NeXT, cc -E runs the code through the compiler's parser, 11746 11785 # not just through cpp. "Syntax error" is here to catch this case. 11747 11786 cat >conftest.$ac_ext <<_ACEOF 11748 11787 -#line 14990 "configure" 11749 +#line 153 37"configure"11788 +#line 15368 "configure" 11750 11789 #include "confdefs.h" 11751 11790 #include <assert.h> … … 11753 11792 _ACEOF 11754 11793 -if { (eval echo "$as_me:14995: \"$ac_cpp conftest.$ac_ext\"") >&5 11755 +if { (eval echo "$as_me:153 42: \"$ac_cpp conftest.$ac_ext\"") >&511794 +if { (eval echo "$as_me:15373: \"$ac_cpp conftest.$ac_ext\"") >&5 11756 11795 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 11757 11796 ac_status=$? … … 11760 11799 cat conftest.err >&5 11761 11800 - echo "$as_me:15001: \$? = $ac_status" >&5 11762 + echo "$as_me:153 48: \$? = $ac_status" >&511801 + echo "$as_me:15379: \$? = $ac_status" >&5 11763 11802 (exit $ac_status); } >/dev/null; then 11764 11803 if test -s conftest.err; then 11765 11804 ac_cpp_err=$ac_cxx_preproc_warn_flag 11766 @@ -15021,17 +153 68,17 @@11805 @@ -15021,17 +15399,17 @@ 11767 11806 # OK, works on sane cases. Now check whether non-existent headers 11768 11807 # can be detected and how. 11769 11808 cat >conftest.$ac_ext <<_ACEOF 11770 11809 -#line 15024 "configure" 11771 +#line 15 371"configure"11810 +#line 15402 "configure" 11772 11811 #include "confdefs.h" 11773 11812 #include <ac_nonexistent.h> 11774 11813 _ACEOF 11775 11814 -if { (eval echo "$as_me:15028: \"$ac_cpp conftest.$ac_ext\"") >&5 11776 +if { (eval echo "$as_me:15 375: \"$ac_cpp conftest.$ac_ext\"") >&511815 +if { (eval echo "$as_me:15406: \"$ac_cpp conftest.$ac_ext\"") >&5 11777 11816 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 11778 11817 ac_status=$? … … 11781 11820 cat conftest.err >&5 11782 11821 - echo "$as_me:15034: \$? = $ac_status" >&5 11783 + echo "$as_me:15 381: \$? = $ac_status" >&511822 + echo "$as_me:15412: \$? = $ac_status" >&5 11784 11823 (exit $ac_status); } >/dev/null; then 11785 11824 if test -s conftest.err; then 11786 11825 ac_cpp_err=$ac_cxx_preproc_warn_flag 11787 @@ -15068,7 +154 15,7 @@11826 @@ -15068,7 +15446,7 @@ 11788 11827 else 11789 11828 ac_cv_prog_CXXCPP=$CXXCPP 11790 11829 fi 11791 11830 -echo "$as_me:15071: result: $CXXCPP" >&5 11792 +echo "$as_me:154 18: result: $CXXCPP" >&511831 +echo "$as_me:15449: result: $CXXCPP" >&5 11793 11832 echo "${ECHO_T}$CXXCPP" >&6 11794 11833 ac_preproc_ok=false 11795 11834 for ac_cxx_preproc_warn_flag in '' yes 11796 @@ -15078,18 +154 25,18 @@11835 @@ -15078,18 +15456,18 @@ 11797 11836 # On the NeXT, cc -E runs the code through the compiler's parser, 11798 11837 # not just through cpp. "Syntax error" is here to catch this case. 11799 11838 cat >conftest.$ac_ext <<_ACEOF 11800 11839 -#line 15081 "configure" 11801 +#line 154 28"configure"11840 +#line 15459 "configure" 11802 11841 #include "confdefs.h" 11803 11842 #include <assert.h> … … 11805 11844 _ACEOF 11806 11845 -if { (eval echo "$as_me:15086: \"$ac_cpp conftest.$ac_ext\"") >&5 11807 +if { (eval echo "$as_me:154 33: \"$ac_cpp conftest.$ac_ext\"") >&511846 +if { (eval echo "$as_me:15464: \"$ac_cpp conftest.$ac_ext\"") >&5 11808 11847 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 11809 11848 ac_status=$? … … 11812 11851 cat conftest.err >&5 11813 11852 - echo "$as_me:15092: \$? = $ac_status" >&5 11814 + echo "$as_me:154 39: \$? = $ac_status" >&511853 + echo "$as_me:15470: \$? = $ac_status" >&5 11815 11854 (exit $ac_status); } >/dev/null; then 11816 11855 if test -s conftest.err; then 11817 11856 ac_cpp_err=$ac_cxx_preproc_warn_flag 11818 @@ -15112,17 +154 59,17 @@11857 @@ -15112,17 +15490,17 @@ 11819 11858 # OK, works on sane cases. Now check whether non-existent headers 11820 11859 # can be detected and how. 11821 11860 cat >conftest.$ac_ext <<_ACEOF 11822 11861 -#line 15115 "configure" 11823 +#line 154 62"configure"11862 +#line 15493 "configure" 11824 11863 #include "confdefs.h" 11825 11864 #include <ac_nonexistent.h> 11826 11865 _ACEOF 11827 11866 -if { (eval echo "$as_me:15119: \"$ac_cpp conftest.$ac_ext\"") >&5 11828 +if { (eval echo "$as_me:154 66: \"$ac_cpp conftest.$ac_ext\"") >&511867 +if { (eval echo "$as_me:15497: \"$ac_cpp conftest.$ac_ext\"") >&5 11829 11868 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 11830 11869 ac_status=$? … … 11833 11872 cat conftest.err >&5 11834 11873 - echo "$as_me:15125: \$? = $ac_status" >&5 11835 + echo "$as_me:15 472: \$? = $ac_status" >&511874 + echo "$as_me:15503: \$? = $ac_status" >&5 11836 11875 (exit $ac_status); } >/dev/null; then 11837 11876 if test -s conftest.err; then 11838 11877 ac_cpp_err=$ac_cxx_preproc_warn_flag 11839 @@ -15150,7 +15 497,7 @@11878 @@ -15150,7 +15528,7 @@ 11840 11879 if $ac_preproc_ok; then 11841 11880 : 11842 11881 else 11843 11882 - { { echo "$as_me:15153: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 11844 + { { echo "$as_me:155 00: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&511883 + { { echo "$as_me:15531: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 11845 11884 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} 11846 11885 { (exit 1); exit 1; }; } 11847 11886 fi 11848 @@ -15165,23 +155 12,23 @@11887 @@ -15165,23 +15543,23 @@ 11849 11888 for ac_header in iostream typeinfo 11850 11889 do 11851 11890 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 11852 11891 -echo "$as_me:15168: checking for $ac_header" >&5 11853 +echo "$as_me:155 15: checking for $ac_header" >&511892 +echo "$as_me:15546: checking for $ac_header" >&5 11854 11893 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 11855 11894 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 11858 11897 cat >conftest.$ac_ext <<_ACEOF 11859 11898 -#line 15174 "configure" 11860 +#line 155 21"configure"11899 +#line 15552 "configure" 11861 11900 #include "confdefs.h" 11862 11901 #include <$ac_header> 11863 11902 _ACEOF 11864 11903 -if { (eval echo "$as_me:15178: \"$ac_cpp conftest.$ac_ext\"") >&5 11865 +if { (eval echo "$as_me:155 25: \"$ac_cpp conftest.$ac_ext\"") >&511904 +if { (eval echo "$as_me:15556: \"$ac_cpp conftest.$ac_ext\"") >&5 11866 11905 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 11867 11906 ac_status=$? … … 11870 11909 cat conftest.err >&5 11871 11910 - echo "$as_me:15184: \$? = $ac_status" >&5 11872 + echo "$as_me:155 31: \$? = $ac_status" >&511911 + echo "$as_me:15562: \$? = $ac_status" >&5 11873 11912 (exit $ac_status); } >/dev/null; then 11874 11913 if test -s conftest.err; then 11875 11914 ac_cpp_err=$ac_cxx_preproc_warn_flag 11876 @@ -15200,7 +155 47,7 @@11915 @@ -15200,7 +15578,7 @@ 11877 11916 fi 11878 11917 rm -f conftest.err conftest.$ac_ext 11879 11918 fi 11880 11919 -echo "$as_me:15203: result: `eval echo '${'$as_ac_Header'}'`" >&5 11881 +echo "$as_me:155 50: result: `eval echo '${'$as_ac_Header'}'`" >&511920 +echo "$as_me:15581: result: `eval echo '${'$as_ac_Header'}'`" >&5 11882 11921 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 11883 11922 if test `eval echo '${'$as_ac_Header'}'` = yes; then 11884 11923 cat >>confdefs.h <<EOF 11885 @@ -15211,10 +155 58,10 @@11924 @@ -15211,10 +15589,10 @@ 11886 11925 done 11887 11926 11888 11927 if test x"$ac_cv_header_iostream" = xyes ; then 11889 11928 - echo "$as_me:15214: checking if iostream uses std-namespace" >&5 11890 + echo "$as_me:155 61: checking if iostream uses std-namespace" >&511929 + echo "$as_me:15592: checking if iostream uses std-namespace" >&5 11891 11930 echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6 11892 11931 cat >conftest.$ac_ext <<_ACEOF 11893 11932 -#line 15217 "configure" 11894 +#line 155 64"configure"11933 +#line 15595 "configure" 11895 11934 #include "confdefs.h" 11896 11935 11897 11936 #include <iostream> 11898 @@ -15231,16 +15 578,16 @@11937 @@ -15231,16 +15609,16 @@ 11899 11938 } 11900 11939 _ACEOF 11901 11940 rm -f conftest.$ac_objext 11902 11941 -if { (eval echo "$as_me:15234: \"$ac_compile\"") >&5 11903 +if { (eval echo "$as_me:15 581: \"$ac_compile\"") >&511942 +if { (eval echo "$as_me:15612: \"$ac_compile\"") >&5 11904 11943 (eval $ac_compile) 2>&5 11905 11944 ac_status=$? 11906 11945 - echo "$as_me:15237: \$? = $ac_status" >&5 11907 + echo "$as_me:15 584: \$? = $ac_status" >&511946 + echo "$as_me:15615: \$? = $ac_status" >&5 11908 11947 (exit $ac_status); } && 11909 11948 { ac_try='test -s conftest.$ac_objext' 11910 11949 - { (eval echo "$as_me:15240: \"$ac_try\"") >&5 11911 + { (eval echo "$as_me:15 587: \"$ac_try\"") >&511950 + { (eval echo "$as_me:15618: \"$ac_try\"") >&5 11912 11951 (eval $ac_try) 2>&5 11913 11952 ac_status=$? 11914 11953 - echo "$as_me:15243: \$? = $ac_status" >&5 11915 + echo "$as_me:15 590: \$? = $ac_status" >&511954 + echo "$as_me:15621: \$? = $ac_status" >&5 11916 11955 (exit $ac_status); }; }; then 11917 11956 cf_iostream_namespace=yes 11918 11957 else 11919 @@ -15249,7 +15 596,7 @@11958 @@ -15249,7 +15627,7 @@ 11920 11959 cf_iostream_namespace=no 11921 11960 fi 11922 11961 rm -f conftest.$ac_objext conftest.$ac_ext 11923 11962 - echo "$as_me:15252: result: $cf_iostream_namespace" >&5 11924 + echo "$as_me:15 599: result: $cf_iostream_namespace" >&511963 + echo "$as_me:15630: result: $cf_iostream_namespace" >&5 11925 11964 echo "${ECHO_T}$cf_iostream_namespace" >&6 11926 11965 if test "$cf_iostream_namespace" = yes ; then 11927 11966 cat >>confdefs.h <<\EOF 11928 @@ -15259,7 +156 06,7 @@11967 @@ -15259,7 +15637,7 @@ 11929 11968 fi 11930 11969 fi 11931 11970 11932 11971 -echo "$as_me:15262: checking if we should include stdbool.h" >&5 11933 +echo "$as_me:156 09: checking if we should include stdbool.h" >&511972 +echo "$as_me:15640: checking if we should include stdbool.h" >&5 11934 11973 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 11935 11974 11936 11975 if test "${cf_cv_header_stdbool_h+set}" = set; then 11937 @@ -15267,7 +156 14,7 @@11976 @@ -15267,7 +15645,7 @@ 11938 11977 else 11939 11978 11940 11979 cat >conftest.$ac_ext <<_ACEOF 11941 11980 -#line 15270 "configure" 11942 +#line 156 17"configure"11981 +#line 15648 "configure" 11943 11982 #include "confdefs.h" 11944 11983 11945 11984 int 11946 @@ -15279,23 +156 26,23 @@11985 @@ -15279,23 +15657,23 @@ 11947 11986 } 11948 11987 _ACEOF 11949 11988 rm -f conftest.$ac_objext 11950 11989 -if { (eval echo "$as_me:15282: \"$ac_compile\"") >&5 11951 +if { (eval echo "$as_me:156 29: \"$ac_compile\"") >&511990 +if { (eval echo "$as_me:15660: \"$ac_compile\"") >&5 11952 11991 (eval $ac_compile) 2>&5 11953 11992 ac_status=$? 11954 11993 - echo "$as_me:15285: \$? = $ac_status" >&5 11955 + echo "$as_me:156 32: \$? = $ac_status" >&511994 + echo "$as_me:15663: \$? = $ac_status" >&5 11956 11995 (exit $ac_status); } && 11957 11996 { ac_try='test -s conftest.$ac_objext' 11958 11997 - { (eval echo "$as_me:15288: \"$ac_try\"") >&5 11959 + { (eval echo "$as_me:156 35: \"$ac_try\"") >&511998 + { (eval echo "$as_me:15666: \"$ac_try\"") >&5 11960 11999 (eval $ac_try) 2>&5 11961 12000 ac_status=$? 11962 12001 - echo "$as_me:15291: \$? = $ac_status" >&5 11963 + echo "$as_me:156 38: \$? = $ac_status" >&512002 + echo "$as_me:15669: \$? = $ac_status" >&5 11964 12003 (exit $ac_status); }; }; then 11965 12004 cf_cv_header_stdbool_h=0 … … 11969 12008 cat >conftest.$ac_ext <<_ACEOF 11970 12009 -#line 15298 "configure" 11971 +#line 156 45"configure"12010 +#line 15676 "configure" 11972 12011 #include "confdefs.h" 11973 12012 11974 12013 #ifndef __BEOS__ 11975 @@ -15311,16 +156 58,16 @@12014 @@ -15311,16 +15689,16 @@ 11976 12015 } 11977 12016 _ACEOF 11978 12017 rm -f conftest.$ac_objext 11979 12018 -if { (eval echo "$as_me:15314: \"$ac_compile\"") >&5 11980 +if { (eval echo "$as_me:156 61: \"$ac_compile\"") >&512019 +if { (eval echo "$as_me:15692: \"$ac_compile\"") >&5 11981 12020 (eval $ac_compile) 2>&5 11982 12021 ac_status=$? 11983 12022 - echo "$as_me:15317: \$? = $ac_status" >&5 11984 + echo "$as_me:156 64: \$? = $ac_status" >&512023 + echo "$as_me:15695: \$? = $ac_status" >&5 11985 12024 (exit $ac_status); } && 11986 12025 { ac_try='test -s conftest.$ac_objext' 11987 12026 - { (eval echo "$as_me:15320: \"$ac_try\"") >&5 11988 + { (eval echo "$as_me:156 67: \"$ac_try\"") >&512027 + { (eval echo "$as_me:15698: \"$ac_try\"") >&5 11989 12028 (eval $ac_try) 2>&5 11990 12029 ac_status=$? 11991 12030 - echo "$as_me:15323: \$? = $ac_status" >&5 11992 + echo "$as_me:15 670: \$? = $ac_status" >&512031 + echo "$as_me:15701: \$? = $ac_status" >&5 11993 12032 (exit $ac_status); }; }; then 11994 12033 cf_cv_header_stdbool_h=1 11995 12034 else 11996 @@ -15334,13 +15 681,13 @@12035 @@ -15334,13 +15712,13 @@ 11997 12036 fi 11998 12037 11999 12038 if test "$cf_cv_header_stdbool_h" = 1 12000 12039 -then echo "$as_me:15337: result: yes" >&5 12001 +then echo "$as_me:15 684: result: yes" >&512040 +then echo "$as_me:15715: result: yes" >&5 12002 12041 echo "${ECHO_T}yes" >&6 12003 12042 -else echo "$as_me:15339: result: no" >&5 12004 +else echo "$as_me:15 686: result: no" >&512043 +else echo "$as_me:15717: result: no" >&5 12005 12044 echo "${ECHO_T}no" >&6 12006 12045 fi 12007 12046 12008 12047 -echo "$as_me:15343: checking for builtin bool type" >&5 12009 +echo "$as_me:15 690: checking for builtin bool type" >&512048 +echo "$as_me:15721: checking for builtin bool type" >&5 12010 12049 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 12011 12050 12012 12051 if test "${cf_cv_builtin_bool+set}" = set; then 12013 @@ -15348,7 +15 695,7 @@12052 @@ -15348,7 +15726,7 @@ 12014 12053 else 12015 12054 12016 12055 cat >conftest.$ac_ext <<_ACEOF 12017 12056 -#line 15351 "configure" 12018 +#line 15 698"configure"12057 +#line 15729 "configure" 12019 12058 #include "confdefs.h" 12020 12059 12021 12060 #include <stdio.h> 12022 @@ -15363,16 +157 10,16 @@12061 @@ -15363,16 +15741,16 @@ 12023 12062 } 12024 12063 _ACEOF 12025 12064 rm -f conftest.$ac_objext 12026 12065 -if { (eval echo "$as_me:15366: \"$ac_compile\"") >&5 12027 +if { (eval echo "$as_me:157 13: \"$ac_compile\"") >&512066 +if { (eval echo "$as_me:15744: \"$ac_compile\"") >&5 12028 12067 (eval $ac_compile) 2>&5 12029 12068 ac_status=$? 12030 12069 - echo "$as_me:15369: \$? = $ac_status" >&5 12031 + echo "$as_me:157 16: \$? = $ac_status" >&512070 + echo "$as_me:15747: \$? = $ac_status" >&5 12032 12071 (exit $ac_status); } && 12033 12072 { ac_try='test -s conftest.$ac_objext' 12034 12073 - { (eval echo "$as_me:15372: \"$ac_try\"") >&5 12035 + { (eval echo "$as_me:157 19: \"$ac_try\"") >&512074 + { (eval echo "$as_me:15750: \"$ac_try\"") >&5 12036 12075 (eval $ac_try) 2>&5 12037 12076 ac_status=$? 12038 12077 - echo "$as_me:15375: \$? = $ac_status" >&5 12039 + echo "$as_me:157 22: \$? = $ac_status" >&512078 + echo "$as_me:15753: \$? = $ac_status" >&5 12040 12079 (exit $ac_status); }; }; then 12041 12080 cf_cv_builtin_bool=1 12042 12081 else 12043 @@ -15385,13 +157 32,13 @@12082 @@ -15385,13 +15763,13 @@ 12044 12083 fi 12045 12084 12046 12085 if test "$cf_cv_builtin_bool" = 1 12047 12086 -then echo "$as_me:15388: result: yes" >&5 12048 +then echo "$as_me:157 35: result: yes" >&512087 +then echo "$as_me:15766: result: yes" >&5 12049 12088 echo "${ECHO_T}yes" >&6 12050 12089 -else echo "$as_me:15390: result: no" >&5 12051 +else echo "$as_me:157 37: result: no" >&512090 +else echo "$as_me:15768: result: no" >&5 12052 12091 echo "${ECHO_T}no" >&6 12053 12092 fi 12054 12093 12055 12094 -echo "$as_me:15394: checking for size of bool" >&5 12056 +echo "$as_me:157 41: checking for size of bool" >&512095 +echo "$as_me:15772: checking for size of bool" >&5 12057 12096 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 12058 12097 if test "${cf_cv_type_of_bool+set}" = set; then 12059 12098 echo $ECHO_N "(cached) $ECHO_C" >&6 12060 @@ -15402,7 +157 49,7 @@12099 @@ -15402,7 +15780,7 @@ 12061 12100 cf_cv_type_of_bool=unknown 12062 12101 else 12063 12102 cat >conftest.$ac_ext <<_ACEOF 12064 12103 -#line 15405 "configure" 12065 +#line 157 52"configure"12104 +#line 15783 "configure" 12066 12105 #include "confdefs.h" 12067 12106 12068 12107 #include <stdlib.h> 12069 @@ -15444,15 +15 791,15 @@12108 @@ -15444,15 +15822,15 @@ 12070 12109 12071 12110 _ACEOF 12072 12111 rm -f conftest$ac_exeext 12073 12112 -if { (eval echo "$as_me:15447: \"$ac_link\"") >&5 12074 +if { (eval echo "$as_me:15 794: \"$ac_link\"") >&512113 +if { (eval echo "$as_me:15825: \"$ac_link\"") >&5 12075 12114 (eval $ac_link) 2>&5 12076 12115 ac_status=$? 12077 12116 - echo "$as_me:15450: \$? = $ac_status" >&5 12078 + echo "$as_me:15 797: \$? = $ac_status" >&512117 + echo "$as_me:15828: \$? = $ac_status" >&5 12079 12118 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 12080 12119 - { (eval echo "$as_me:15452: \"$ac_try\"") >&5 12081 + { (eval echo "$as_me:15 799: \"$ac_try\"") >&512120 + { (eval echo "$as_me:15830: \"$ac_try\"") >&5 12082 12121 (eval $ac_try) 2>&5 12083 12122 ac_status=$? 12084 12123 - echo "$as_me:15455: \$? = $ac_status" >&5 12085 + echo "$as_me:158 02: \$? = $ac_status" >&512124 + echo "$as_me:15833: \$? = $ac_status" >&5 12086 12125 (exit $ac_status); }; }; then 12087 12126 cf_cv_type_of_bool=`cat cf_test.out` 12088 12127 if test -z "$cf_cv_type_of_bool"; then 12089 @@ -15470,18 +158 17,18 @@12128 @@ -15470,18 +15848,18 @@ 12090 12129 fi 12091 12130 12092 12131 rm -f cf_test.out 12093 12132 -echo "$as_me:15473: result: $cf_cv_type_of_bool" >&5 12094 +echo "$as_me:158 20: result: $cf_cv_type_of_bool" >&512133 +echo "$as_me:15851: result: $cf_cv_type_of_bool" >&5 12095 12134 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 12096 12135 if test "$cf_cv_type_of_bool" = unknown ; then … … 12099 12138 esac 12100 12139 - { echo "$as_me:15479: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 12101 + { echo "$as_me:158 26: WARNING: Assuming $NCURSES_BOOL for type of bool" >&512140 + { echo "$as_me:15857: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 12102 12141 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} 12103 12142 cf_cv_type_of_bool=$NCURSES_BOOL … … 12105 12144 12106 12145 -echo "$as_me:15484: checking for special defines needed for etip.h" >&5 12107 +echo "$as_me:158 31: checking for special defines needed for etip.h" >&512146 +echo "$as_me:15862: checking for special defines needed for etip.h" >&5 12108 12147 echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6 12109 12148 cf_save_CXXFLAGS="$CXXFLAGS" 12110 12149 cf_result="none" 12111 @@ -15493,7 +158 40,7 @@12150 @@ -15493,7 +15871,7 @@ 12112 12151 test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" 12113 12152 test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" 12114 12153 cat >conftest.$ac_ext <<_ACEOF 12115 12154 -#line 15496 "configure" 12116 +#line 158 43"configure"12155 +#line 15874 "configure" 12117 12156 #include "confdefs.h" 12118 12157 12119 12158 #include <etip.h.in> 12120 @@ -15507,16 +158 54,16 @@12159 @@ -15507,16 +15885,16 @@ 12121 12160 } 12122 12161 _ACEOF 12123 12162 rm -f conftest.$ac_objext 12124 12163 -if { (eval echo "$as_me:15510: \"$ac_compile\"") >&5 12125 +if { (eval echo "$as_me:158 57: \"$ac_compile\"") >&512164 +if { (eval echo "$as_me:15888: \"$ac_compile\"") >&5 12126 12165 (eval $ac_compile) 2>&5 12127 12166 ac_status=$? 12128 12167 - echo "$as_me:15513: \$? = $ac_status" >&5 12129 + echo "$as_me:158 60: \$? = $ac_status" >&512168 + echo "$as_me:15891: \$? = $ac_status" >&5 12130 12169 (exit $ac_status); } && 12131 12170 { ac_try='test -s conftest.$ac_objext' 12132 12171 - { (eval echo "$as_me:15516: \"$ac_try\"") >&5 12133 + { (eval echo "$as_me:158 63: \"$ac_try\"") >&512172 + { (eval echo "$as_me:15894: \"$ac_try\"") >&5 12134 12173 (eval $ac_try) 2>&5 12135 12174 ac_status=$? 12136 12175 - echo "$as_me:15519: \$? = $ac_status" >&5 12137 + echo "$as_me:158 66: \$? = $ac_status" >&512176 + echo "$as_me:15897: \$? = $ac_status" >&5 12138 12177 (exit $ac_status); }; }; then 12139 12178 12140 12179 test -n "$cf_math" && cat >>confdefs.h <<EOF 12141 @@ -15537,12 +15 884,12 @@12180 @@ -15537,12 +15915,12 @@ 12142 12181 rm -f conftest.$ac_objext conftest.$ac_ext 12143 12182 done 12144 12183 done 12145 12184 -echo "$as_me:15540: result: $cf_result" >&5 12146 +echo "$as_me:15 887: result: $cf_result" >&512185 +echo "$as_me:15918: result: $cf_result" >&5 12147 12186 echo "${ECHO_T}$cf_result" >&6 12148 12187 CXXFLAGS="$cf_save_CXXFLAGS" … … 12150 12189 if test -n "$CXX"; then 12151 12190 -echo "$as_me:15545: checking if $CXX accepts parameter initialization" >&5 12152 +echo "$as_me:15 892: checking if $CXX accepts parameter initialization" >&512191 +echo "$as_me:15923: checking if $CXX accepts parameter initialization" >&5 12153 12192 echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6 12154 12193 if test "${cf_cv_cpp_param_init+set}" = set; then 12155 12194 echo $ECHO_N "(cached) $ECHO_C" >&6 12156 @@ -15559,7 +159 06,7 @@12195 @@ -15559,7 +15937,7 @@ 12157 12196 cf_cv_cpp_param_init=unknown 12158 12197 else 12159 12198 cat >conftest.$ac_ext <<_ACEOF 12160 12199 -#line 15562 "configure" 12161 +#line 159 09"configure"12200 +#line 15940 "configure" 12162 12201 #include "confdefs.h" 12163 12202 12164 12203 class TEST { 12165 @@ -15578,15 +159 25,15 @@12204 @@ -15578,15 +15956,15 @@ 12166 12205 12167 12206 _ACEOF 12168 12207 rm -f conftest$ac_exeext 12169 12208 -if { (eval echo "$as_me:15581: \"$ac_link\"") >&5 12170 +if { (eval echo "$as_me:159 28: \"$ac_link\"") >&512209 +if { (eval echo "$as_me:15959: \"$ac_link\"") >&5 12171 12210 (eval $ac_link) 2>&5 12172 12211 ac_status=$? 12173 12212 - echo "$as_me:15584: \$? = $ac_status" >&5 12174 + echo "$as_me:159 31: \$? = $ac_status" >&512213 + echo "$as_me:15962: \$? = $ac_status" >&5 12175 12214 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 12176 12215 - { (eval echo "$as_me:15586: \"$ac_try\"") >&5 12177 + { (eval echo "$as_me:159 33: \"$ac_try\"") >&512216 + { (eval echo "$as_me:15964: \"$ac_try\"") >&5 12178 12217 (eval $ac_try) 2>&5 12179 12218 ac_status=$? 12180 12219 - echo "$as_me:15589: \$? = $ac_status" >&5 12181 + echo "$as_me:159 36: \$? = $ac_status" >&512220 + echo "$as_me:15967: \$? = $ac_status" >&5 12182 12221 (exit $ac_status); }; }; then 12183 12222 cf_cv_cpp_param_init=yes 12184 12223 else 12185 @@ -15605,7 +159 52,7 @@12224 @@ -15605,7 +15983,7 @@ 12186 12225 ac_main_return=return 12187 12226 12188 12227 fi 12189 12228 -echo "$as_me:15608: result: $cf_cv_cpp_param_init" >&5 12190 +echo "$as_me:159 55: result: $cf_cv_cpp_param_init" >&512229 +echo "$as_me:15986: result: $cf_cv_cpp_param_init" >&5 12191 12230 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 12192 12231 fi 12193 12232 test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF 12194 @@ -15614,7 +159 61,7 @@12233 @@ -15614,7 +15992,7 @@ 12195 12234 12196 12235 if test -n "$CXX"; then 12197 12236 12198 12237 -echo "$as_me:15617: checking if $CXX accepts static_cast" >&5 12199 +echo "$as_me:159 64: checking if $CXX accepts static_cast" >&512238 +echo "$as_me:15995: checking if $CXX accepts static_cast" >&5 12200 12239 echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6 12201 12240 if test "${cf_cv_cpp_static_cast+set}" = set; then 12202 12241 echo $ECHO_N "(cached) $ECHO_C" >&6 12203 @@ -15628,7 +1 5975,7 @@12242 @@ -15628,7 +16006,7 @@ 12204 12243 ac_main_return=return 12205 12244 12206 12245 cat >conftest.$ac_ext <<_ACEOF 12207 12246 -#line 15631 "configure" 12208 +#line 1 5978"configure"12247 +#line 16009 "configure" 12209 12248 #include "confdefs.h" 12210 12249 12211 12250 class NCursesPanel 12212 @@ -15672,16 +160 19,16 @@12251 @@ -15672,16 +16050,16 @@ 12213 12252 } 12214 12253 _ACEOF 12215 12254 rm -f conftest.$ac_objext 12216 12255 -if { (eval echo "$as_me:15675: \"$ac_compile\"") >&5 12217 +if { (eval echo "$as_me:160 22: \"$ac_compile\"") >&512256 +if { (eval echo "$as_me:16053: \"$ac_compile\"") >&5 12218 12257 (eval $ac_compile) 2>&5 12219 12258 ac_status=$? 12220 12259 - echo "$as_me:15678: \$? = $ac_status" >&5 12221 + echo "$as_me:160 25: \$? = $ac_status" >&512260 + echo "$as_me:16056: \$? = $ac_status" >&5 12222 12261 (exit $ac_status); } && 12223 12262 { ac_try='test -s conftest.$ac_objext' 12224 12263 - { (eval echo "$as_me:15681: \"$ac_try\"") >&5 12225 + { (eval echo "$as_me:160 28: \"$ac_try\"") >&512264 + { (eval echo "$as_me:16059: \"$ac_try\"") >&5 12226 12265 (eval $ac_try) 2>&5 12227 12266 ac_status=$? 12228 12267 - echo "$as_me:15684: \$? = $ac_status" >&5 12229 + echo "$as_me:160 31: \$? = $ac_status" >&512268 + echo "$as_me:16062: \$? = $ac_status" >&5 12230 12269 (exit $ac_status); }; }; then 12231 12270 cf_cv_cpp_static_cast=yes 12232 12271 else 12233 @@ -15699,7 +160 46,7 @@12272 @@ -15699,7 +16077,7 @@ 12234 12273 ac_main_return=return 12235 12274 12236 12275 fi 12237 12276 -echo "$as_me:15702: result: $cf_cv_cpp_static_cast" >&5 12238 +echo "$as_me:160 49: result: $cf_cv_cpp_static_cast" >&512277 +echo "$as_me:16080: result: $cf_cv_cpp_static_cast" >&5 12239 12278 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 12240 12279 12241 12280 fi 12242 @@ -15709,12 +160 56,12 @@12281 @@ -15709,12 +16087,12 @@ 12243 12282 EOF 12244 12283 … … 12255 12294 ;; 12256 12295 sco3.2v5*) #(vi 12257 @@ -15723,7 +16 070,7 @@12296 @@ -15723,7 +16101,7 @@ 12258 12297 solaris2*) 12259 12298 if test "$GXX" != yes ; then … … 12264 12303 ;; 12265 12304 esac 12266 @@ -15747,7 +16 094,7 @@12305 @@ -15747,7 +16125,7 @@ 12267 12306 else 12268 12307 if test "$cf_cv_header_stdbool_h" = 1 ; then 12269 12308 12270 12309 -echo "$as_me:15750: checking for size of bool" >&5 12271 +echo "$as_me:16 097: checking for size of bool" >&512310 +echo "$as_me:16128: checking for size of bool" >&5 12272 12311 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 12273 12312 if test "${cf_cv_type_of_bool+set}" = set; then 12274 12313 echo $ECHO_N "(cached) $ECHO_C" >&6 12275 @@ -15758,7 +161 05,7 @@12314 @@ -15758,7 +16136,7 @@ 12276 12315 cf_cv_type_of_bool=unknown 12277 12316 else 12278 12317 cat >conftest.$ac_ext <<_ACEOF 12279 12318 -#line 15761 "configure" 12280 +#line 161 08"configure"12319 +#line 16139 "configure" 12281 12320 #include "confdefs.h" 12282 12321 12283 12322 #include <stdlib.h> 12284 @@ -15800,15 +161 47,15 @@12323 @@ -15800,15 +16178,15 @@ 12285 12324 12286 12325 _ACEOF 12287 12326 rm -f conftest$ac_exeext 12288 12327 -if { (eval echo "$as_me:15803: \"$ac_link\"") >&5 12289 +if { (eval echo "$as_me:161 50: \"$ac_link\"") >&512328 +if { (eval echo "$as_me:16181: \"$ac_link\"") >&5 12290 12329 (eval $ac_link) 2>&5 12291 12330 ac_status=$? 12292 12331 - echo "$as_me:15806: \$? = $ac_status" >&5 12293 + echo "$as_me:161 53: \$? = $ac_status" >&512332 + echo "$as_me:16184: \$? = $ac_status" >&5 12294 12333 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 12295 12334 - { (eval echo "$as_me:15808: \"$ac_try\"") >&5 12296 + { (eval echo "$as_me:161 55: \"$ac_try\"") >&512335 + { (eval echo "$as_me:16186: \"$ac_try\"") >&5 12297 12336 (eval $ac_try) 2>&5 12298 12337 ac_status=$? 12299 12338 - echo "$as_me:15811: \$? = $ac_status" >&5 12300 + echo "$as_me:161 58: \$? = $ac_status" >&512339 + echo "$as_me:16189: \$? = $ac_status" >&5 12301 12340 (exit $ac_status); }; }; then 12302 12341 cf_cv_type_of_bool=`cat cf_test.out` 12303 12342 if test -z "$cf_cv_type_of_bool"; then 12304 @@ -15826,25 +16 173,25 @@12343 @@ -15826,25 +16204,25 @@ 12305 12344 fi 12306 12345 12307 12346 rm -f cf_test.out 12308 12347 -echo "$as_me:15829: result: $cf_cv_type_of_bool" >&5 12309 +echo "$as_me:16 176: result: $cf_cv_type_of_bool" >&512348 +echo "$as_me:16207: result: $cf_cv_type_of_bool" >&5 12310 12349 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 12311 12350 if test "$cf_cv_type_of_bool" = unknown ; then … … 12314 12353 esac 12315 12354 - { echo "$as_me:15835: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 12316 + { echo "$as_me:16 182: WARNING: Assuming $NCURSES_BOOL for type of bool" >&512355 + { echo "$as_me:16213: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 12317 12356 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} 12318 12357 cf_cv_type_of_bool=$NCURSES_BOOL … … 12321 12360 else 12322 12361 - echo "$as_me:15841: checking for fallback type of bool" >&5 12323 + echo "$as_me:16 188: checking for fallback type of bool" >&512362 + echo "$as_me:16219: checking for fallback type of bool" >&5 12324 12363 echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6 12325 12364 case "$host_cpu" in #(vi … … 12328 12367 esac 12329 12368 - echo "$as_me:15847: result: $cf_cv_type_of_bool" >&5 12330 + echo "$as_me:16 194: result: $cf_cv_type_of_bool" >&512369 + echo "$as_me:16225: result: $cf_cv_type_of_bool" >&5 12331 12370 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 12332 12371 fi 12333 12372 fi 12334 @@ -15873,7 +162 20,7 @@12373 @@ -15873,7 +16251,7 @@ 12335 12374 12336 12375 if test "$cf_with_ada" != "no" ; then 12337 12376 if test "$with_libtool" != "no"; then 12338 12377 - { echo "$as_me:15876: WARNING: libtool does not support Ada - disabling feature" >&5 12339 + { echo "$as_me:162 23: WARNING: libtool does not support Ada - disabling feature" >&512378 + { echo "$as_me:16254: WARNING: libtool does not support Ada - disabling feature" >&5 12340 12379 echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} 12341 12380 cf_with_ada=no 12342 12381 fi 12343 @@ -15883,7 +162 30,7 @@12382 @@ -15883,7 +16261,7 @@ 12344 12383 cf_ada_make=gnatmake 12345 12384 # Extract the first word of "$cf_ada_make", so it can be a program name with args. 12346 12385 set dummy $cf_ada_make; ac_word=$2 12347 12386 -echo "$as_me:15886: checking for $ac_word" >&5 12348 +echo "$as_me:162 33: checking for $ac_word" >&512387 +echo "$as_me:16264: checking for $ac_word" >&5 12349 12388 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 12350 12389 if test "${ac_cv_prog_gnat_exists+set}" = set; then 12351 12390 echo $ECHO_N "(cached) $ECHO_C" >&6 12352 @@ -15898,7 +162 45,7 @@12391 @@ -15898,7 +16276,7 @@ 12353 12392 test -z "$ac_dir" && ac_dir=. 12354 12393 $as_executable_p "$ac_dir/$ac_word" || continue 12355 12394 ac_cv_prog_gnat_exists="yes" 12356 12395 -echo "$as_me:15901: found $ac_dir/$ac_word" >&5 12357 +echo "$as_me:162 48: found $ac_dir/$ac_word" >&512396 +echo "$as_me:16279: found $ac_dir/$ac_word" >&5 12358 12397 break 12359 12398 done 12360 12399 12361 @@ -15907,10 +162 54,10 @@12400 @@ -15907,10 +16285,10 @@ 12362 12401 fi 12363 12402 gnat_exists=$ac_cv_prog_gnat_exists 12364 12403 if test -n "$gnat_exists"; then 12365 12404 - echo "$as_me:15910: result: $gnat_exists" >&5 12366 + echo "$as_me:162 57: result: $gnat_exists" >&512405 + echo "$as_me:16288: result: $gnat_exists" >&5 12367 12406 echo "${ECHO_T}$gnat_exists" >&6 12368 12407 else 12369 12408 - echo "$as_me:15913: result: no" >&5 12370 + echo "$as_me:162 60: result: no" >&512409 + echo "$as_me:16291: result: no" >&5 12371 12410 echo "${ECHO_T}no" >&6 12372 12411 fi 12373 12412 12374 @@ -15918,11 +162 65,11 @@12413 @@ -15918,11 +16296,11 @@ 12375 12414 cf_ada_make= 12376 12415 else 12377 12416 12378 12417 -echo "$as_me:15921: checking for gnat version" >&5 12379 +echo "$as_me:162 68: checking for gnat version" >&512418 +echo "$as_me:16299: checking for gnat version" >&5 12380 12419 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 12381 12420 cf_gnat_version=`${cf_ada_make-gnatmake} -v 2>&1 | grep '[0-9].[0-9][0-9]*' |\ 12382 12421 sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` 12383 12422 -echo "$as_me:15925: result: $cf_gnat_version" >&5 12384 +echo "$as_me:16 272: result: $cf_gnat_version" >&512423 +echo "$as_me:16303: result: $cf_gnat_version" >&5 12385 12424 echo "${ECHO_T}$cf_gnat_version" >&6 12386 12425 12387 12426 case $cf_gnat_version in 12388 @@ -15945,7 +16 292,7 @@12427 @@ -15945,7 +16323,7 @@ 12389 12428 12390 12429 # Extract the first word of "m4", so it can be a program name with args. 12391 12430 set dummy m4; ac_word=$2 12392 12431 -echo "$as_me:15948: checking for $ac_word" >&5 12393 +echo "$as_me:16 295: checking for $ac_word" >&512432 +echo "$as_me:16326: checking for $ac_word" >&5 12394 12433 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 12395 12434 if test "${ac_cv_prog_M4_exists+set}" = set; then 12396 12435 echo $ECHO_N "(cached) $ECHO_C" >&6 12397 @@ -15960,7 +163 07,7 @@12436 @@ -15960,7 +16338,7 @@ 12398 12437 test -z "$ac_dir" && ac_dir=. 12399 12438 $as_executable_p "$ac_dir/$ac_word" || continue 12400 12439 ac_cv_prog_M4_exists="yes" 12401 12440 -echo "$as_me:15963: found $ac_dir/$ac_word" >&5 12402 +echo "$as_me:163 10: found $ac_dir/$ac_word" >&512441 +echo "$as_me:16341: found $ac_dir/$ac_word" >&5 12403 12442 break 12404 12443 done 12405 12444 12406 @@ -15969,10 +163 16,10 @@12445 @@ -15969,10 +16347,10 @@ 12407 12446 fi 12408 12447 M4_exists=$ac_cv_prog_M4_exists 12409 12448 if test -n "$M4_exists"; then 12410 12449 - echo "$as_me:15972: result: $M4_exists" >&5 12411 + echo "$as_me:163 19: result: $M4_exists" >&512450 + echo "$as_me:16350: result: $M4_exists" >&5 12412 12451 echo "${ECHO_T}$M4_exists" >&6 12413 12452 else 12414 12453 - echo "$as_me:15975: result: no" >&5 12415 + echo "$as_me:163 22: result: no" >&512454 + echo "$as_me:16353: result: no" >&5 12416 12455 echo "${ECHO_T}no" >&6 12417 12456 fi 12418 12457 12419 @@ -15981,7 +163 28,7 @@12458 @@ -15981,7 +16359,7 @@ 12420 12459 echo Ada95 binding required program m4 not found. Ada95 binding disabled. 12421 12460 fi 12422 12461 if test "$cf_cv_prog_gnat_correct" = yes; then 12423 12462 - echo "$as_me:15984: checking if GNAT works" >&5 12424 + echo "$as_me:163 31: checking if GNAT works" >&512463 + echo "$as_me:16362: checking if GNAT works" >&5 12425 12464 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 12426 12465 12427 12466 rm -f conftest* 12428 @@ -16009,14 +163 56,14 @@12467 @@ -16009,14 +16387,14 @@ 12429 12468 fi 12430 12469 rm -f conftest* 12431 12470 12432 12471 - echo "$as_me:16012: result: $cf_cv_prog_gnat_correct" >&5 12433 + echo "$as_me:163 59: result: $cf_cv_prog_gnat_correct" >&512472 + echo "$as_me:16390: result: $cf_cv_prog_gnat_correct" >&5 12434 12473 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 12435 12474 fi … … 12439 12478 12440 12479 - echo "$as_me:16019: checking if GNAT pragma Unreferenced works" >&5 12441 + echo "$as_me:163 66: checking if GNAT pragma Unreferenced works" >&512480 + echo "$as_me:16397: checking if GNAT pragma Unreferenced works" >&5 12442 12481 echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6 12443 12482 12444 12483 rm -f conftest* 12445 @@ -16043,7 +16 390,7 @@12484 @@ -16043,7 +16421,7 @@ 12446 12485 fi 12447 12486 rm -f conftest* 12448 12487 12449 12488 - echo "$as_me:16046: result: $cf_cv_pragma_unreferenced" >&5 12450 + echo "$as_me:16 393: result: $cf_cv_pragma_unreferenced" >&512489 + echo "$as_me:16424: result: $cf_cv_pragma_unreferenced" >&5 12451 12490 echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6 12452 12491 12453 12492 # if the pragma is supported, use it (needed in the Trace code). 12454 @@ -16096,7 +164 43,7 @@12493 @@ -16096,7 +16474,7 @@ 12455 12494 withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` 12456 12495 ;; 12457 12496 *) 12458 12497 - { { echo "$as_me:16099: error: expected a pathname, not \"$withval\"" >&5 12459 + { { echo "$as_me:164 46: error: expected a pathname, not \"$withval\"" >&512498 + { { echo "$as_me:16477: error: expected a pathname, not \"$withval\"" >&5 12460 12499 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} 12461 12500 { (exit 1); exit 1; }; } 12462 12501 ;; 12463 @@ -16138,7 +16 485,7 @@12502 @@ -16138,7 +16516,7 @@ 12464 12503 withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` 12465 12504 ;; 12466 12505 *) 12467 12506 - { { echo "$as_me:16141: error: expected a pathname, not \"$withval\"" >&5 12468 + { { echo "$as_me:16 488: error: expected a pathname, not \"$withval\"" >&512507 + { { echo "$as_me:16519: error: expected a pathname, not \"$withval\"" >&5 12469 12508 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} 12470 12509 { (exit 1); exit 1; }; } 12471 12510 ;; 12472 @@ -16163,7 +165 10,7 @@12511 @@ -16163,7 +16541,7 @@ 12473 12512 ### chooses to split module lists into libraries. 12474 12513 ### 12475 12514 ### (see CF_LIB_RULES). 12476 12515 -echo "$as_me:16166: checking for library subsets" >&5 12477 +echo "$as_me:165 13: checking for library subsets" >&512516 +echo "$as_me:16544: checking for library subsets" >&5 12478 12517 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 12479 12518 LIB_SUBSETS= 12480 12519 12481 @@ -16188,14 +16535,14 @@ 12520 @@ -16176,7 +16554,17 @@ 12521 fi 12522 fi 12523 12524 -LIB_SUBSETS="${LIB_SUBSETS}termlib" 12525 +LIB_SUBSETS="${LIB_SUBSETS}termlib+port_drivers" 12526 + 12527 +case $cf_cv_system_name in #(vi 12528 +*mingw32*) #(vi 12529 + LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo+port_win32con" 12530 + ;; 12531 +*) #(vi 12532 + LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo" 12533 + ;; 12534 +esac 12535 + 12536 test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_tinfo" 12537 if test "$with_termlib" != no ; then 12538 LIB_SUBSETS="${LIB_SUBSETS} " 12539 @@ -16185,17 +16573,18 @@ 12540 fi 12541 12542 LIB_SUBSETS="${LIB_SUBSETS}base" 12543 + 12482 12544 test "$with_widec" = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" 12483 12545 test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" 12484 12546 12485 12547 -echo "$as_me:16191: result: $LIB_SUBSETS" >&5 12486 +echo "$as_me:165 38: result: $LIB_SUBSETS" >&512548 +echo "$as_me:16580: result: $LIB_SUBSETS" >&5 12487 12549 echo "${ECHO_T}$LIB_SUBSETS" >&6 12488 12550 … … 12497 12559 if test "$GCC" != yes; then 12498 12560 CPPFLAGS="$CPPFLAGS -I\${includedir}" 12499 @@ -16226,7 +16 573,7 @@12561 @@ -16226,7 +16615,7 @@ 12500 12562 fi 12501 12563 12502 12564 ### Build up pieces for makefile rules 12503 12565 -echo "$as_me:16229: checking default library suffix" >&5 12504 +echo "$as_me:16 576: checking default library suffix" >&512566 +echo "$as_me:16618: checking default library suffix" >&5 12505 12567 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 12506 12568 12507 12569 case $DFT_LWR_MODEL in 12508 @@ -16237,46 +16 584,50 @@12570 @@ -16237,46 +16626,50 @@ 12509 12571 shared) DFT_ARG_SUFFIX='' ;; 12510 12572 esac 12511 12573 test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" 12512 12574 -echo "$as_me:16240: result: $DFT_ARG_SUFFIX" >&5 12513 +echo "$as_me:16 587: result: $DFT_ARG_SUFFIX" >&512575 +echo "$as_me:16629: result: $DFT_ARG_SUFFIX" >&5 12514 12576 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 12515 12577 12516 12578 -echo "$as_me:16243: checking default library-dependency suffix" >&5 12517 +echo "$as_me:16 590: checking default library-dependency suffix" >&512579 +echo "$as_me:16632: checking default library-dependency suffix" >&5 12518 12580 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 12519 12581 … … 12570 12632 DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX 12571 12633 ;; 12572 @@ -16289,10 +166 40,10 @@12634 @@ -16289,10 +16682,10 @@ 12573 12635 esac 12574 12636 test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}" 12575 12637 test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}" 12576 12638 -echo "$as_me:16292: result: $DFT_DEP_SUFFIX" >&5 12577 +echo "$as_me:166 43: result: $DFT_DEP_SUFFIX" >&512639 +echo "$as_me:16685: result: $DFT_DEP_SUFFIX" >&5 12578 12640 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 12579 12641 12580 12642 -echo "$as_me:16295: checking default object directory" >&5 12581 +echo "$as_me:166 46: checking default object directory" >&512643 +echo "$as_me:16688: checking default object directory" >&5 12582 12644 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 12583 12645 12584 12646 case $DFT_LWR_MODEL in 12585 @@ -16308,51 +16 659,55 @@12647 @@ -16308,51 +16701,55 @@ 12586 12648 DFT_OBJ_SUBDIR='obj_s' ;; 12587 12649 esac 12588 12650 esac 12589 12651 -echo "$as_me:16311: result: $DFT_OBJ_SUBDIR" >&5 12590 +echo "$as_me:16 662: result: $DFT_OBJ_SUBDIR" >&512652 +echo "$as_me:16704: result: $DFT_OBJ_SUBDIR" >&5 12591 12653 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 12592 12654 … … 12594 12656 if test "$cf_with_cxx" = yes ; then 12595 12657 -echo "$as_me:16316: checking c++ library-dependency suffix" >&5 12596 +echo "$as_me:16 667: checking c++ library-dependency suffix" >&512658 +echo "$as_me:16709: checking c++ library-dependency suffix" >&5 12597 12659 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 12598 12660 if test "$with_libtool" != "no"; then … … 12652 12714 CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX 12653 12715 ;; 12654 @@ -16366,7 +167 21,7 @@12716 @@ -16366,7 +16763,7 @@ 12655 12717 test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}" 12656 12718 test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}" 12657 12719 fi 12658 12720 -echo "$as_me:16369: result: $CXX_LIB_SUFFIX" >&5 12659 +echo "$as_me:167 24: result: $CXX_LIB_SUFFIX" >&512721 +echo "$as_me:16766: result: $CXX_LIB_SUFFIX" >&5 12660 12722 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 12661 12723 12662 12724 fi 12663 @@ -16480,7 +168 35,7 @@12725 @@ -16480,7 +16877,7 @@ 12664 12726 12665 12727 if test "$GCC" = yes ; then … … 12670 12732 LDFLAGS_SHARED= 12671 12733 ;; 12672 @@ -16491,7 +168 46,7 @@12734 @@ -16491,7 +16888,7 @@ 12673 12735 esac 12674 12736 else … … 12679 12741 LDFLAGS_SHARED=-bdynamic 12680 12742 ;; 12681 @@ -16519,12 +16 874,12 @@12743 @@ -16519,12 +16916,12 @@ 12682 12744 ;; 12683 12745 esac 12684 12746 12685 12747 -echo "$as_me:16522: checking where we will install curses.h" >&5 12686 +echo "$as_me:16 877: checking where we will install curses.h" >&512748 +echo "$as_me:16919: checking where we will install curses.h" >&5 12687 12749 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 12688 12750 test "$with_overwrite" = no && \ … … 12690 12752 includedir='${prefix}/include/ncurses'${LIB_SUFFIX} 12691 12753 -echo "$as_me:16527: result: $includedir" >&5 12692 +echo "$as_me:16 882: result: $includedir" >&512754 +echo "$as_me:16924: result: $includedir" >&5 12693 12755 echo "${ECHO_T}$includedir" >&6 12694 12756 12695 12757 ### Resolve a conflict between normal and wide-curses by forcing applications 12696 @@ -16532,10 +16 887,11 @@12758 @@ -16532,10 +16929,11 @@ 12697 12759 if test "$with_overwrite" != no ; then 12698 12760 if test "$NCURSES_LIBUTF8" = 1 ; then 12699 12761 NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' 12700 12762 - { echo "$as_me:16535: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 12701 + { echo "$as_me:16 890: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&512763 + { echo "$as_me:16932: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 12702 12764 echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;} 12703 12765 fi … … 12707 12769 # used to separate tack out of the tree 12708 12770 NCURSES_TREE= 12709 @@ -16548,7 +169 04,7 @@12771 @@ -16548,7 +16946,7 @@ 12710 12772 ### Construct the list of subdirectories for which we'll customize makefiles 12711 12773 ### with the appropriate compile-rules. 12712 12774 12713 12775 -echo "$as_me:16551: checking for src modules" >&5 12714 +echo "$as_me:169 07: checking for src modules" >&512776 +echo "$as_me:16949: checking for src modules" >&5 12715 12777 echo $ECHO_N "checking for src modules... $ECHO_C" >&6 12716 12778 12717 12779 # dependencies and linker-arguments for test-programs 12718 @@ -16611,13 +1 6967,17 @@12780 @@ -16611,13 +17009,17 @@ 12719 12781 fi 12720 12782 fi 12721 12783 done 12722 12784 -echo "$as_me:16614: result: $cf_cv_src_modules" >&5 12723 +echo "$as_me:1 6970: result: $cf_cv_src_modules" >&512785 +echo "$as_me:17012: result: $cf_cv_src_modules" >&5 12724 12786 echo "${ECHO_T}$cf_cv_src_modules" >&6 12725 12787 … … 12736 12798 do 12737 12799 SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir" 12738 @@ -16628,8 +1 6988,8 @@12800 @@ -16628,8 +17030,8 @@ 12739 12801 12740 12802 ADA_SUBDIRS= … … 12747 12809 12748 12810 SUB_MAKEFILES= 12749 @@ -16639,15 +1 6999,15 @@12811 @@ -16639,15 +17041,15 @@ 12750 12812 done 12751 12813 … … 12768 12830 12769 12831 DIRS_TO_MAKE="lib" 12770 @@ -16680,7 +170 40,7 @@12832 @@ -16680,7 +17082,7 @@ 12771 12833 done 12772 12834 … … 12777 12839 12778 12840 cat >>confdefs.h <<EOF 12779 @@ -16749,7 +171 09,7 @@12841 @@ -16749,7 +17151,7 @@ 12780 12842 12781 12843 if test -n "$cf_new_cppflags" ; then … … 12786 12848 12787 12849 if test -n "$cf_new_extra_cppflags" ; then 12788 @@ -16760,18 +171 20,18 @@12850 @@ -16760,18 +17162,18 @@ 12789 12851 ### If we're building with rpath, try to link non-standard libs that way too. 12790 12852 if test "$DFT_LWR_MODEL" = "shared"; then 12791 12853 12792 12854 -echo "$as_me:16763: checking for updated LDFLAGS" >&5 12793 +echo "$as_me:171 23: checking for updated LDFLAGS" >&512855 +echo "$as_me:17165: checking for updated LDFLAGS" >&5 12794 12856 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6 12795 12857 if test -n "$LDFLAGS" ; then 12796 12858 -echo "$as_me:16766: result: maybe" >&5 12797 +echo "$as_me:171 26: result: maybe" >&512859 +echo "$as_me:17168: result: maybe" >&5 12798 12860 echo "${ECHO_T}maybe" >&6 12799 12861 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 12800 12862 12801 12863 -echo "${as_me-configure}:16770: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 12802 +echo "${as_me-configure}:171 30: testing ...checking LDFLAGS $LDFLAGS ..." 1>&512864 +echo "${as_me-configure}:17172: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 12803 12865 12804 12866 test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 12805 12867 12806 12868 -echo "${as_me-configure}:16774: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 12807 +echo "${as_me-configure}:171 34: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&512869 +echo "${as_me-configure}:17176: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 12808 12870 12809 12871 case "$EXTRA_LDFLAGS" in #(vi 12810 12872 -Wl,-rpath,*) #(vi 12811 @@ -16793,7 +171 53,7 @@12873 @@ -16793,7 +17195,7 @@ 12812 12874 do 12813 12875 test -n "$verbose" && echo " Filtering $cf_rpath_src" 1>&6 12814 12876 12815 12877 -echo "${as_me-configure}:16796: testing Filtering $cf_rpath_src ..." 1>&5 12816 +echo "${as_me-configure}:171 56: testing Filtering $cf_rpath_src ..." 1>&512878 +echo "${as_me-configure}:17198: testing Filtering $cf_rpath_src ..." 1>&5 12817 12879 12818 12880 case $cf_rpath_src in #(vi 12819 12881 -L*) #(vi 12820 @@ -16804,7 +17 164,7 @@12882 @@ -16804,7 +17206,7 @@ 12821 12883 fi 12822 12884 test -n "$verbose" && echo " ...Filter $cf_rpath_tmp" 1>&6 12823 12885 12824 12886 -echo "${as_me-configure}:16807: testing ...Filter $cf_rpath_tmp ..." 1>&5 12825 +echo "${as_me-configure}:17 167: testing ...Filter $cf_rpath_tmp ..." 1>&512887 +echo "${as_me-configure}:17209: testing ...Filter $cf_rpath_tmp ..." 1>&5 12826 12888 12827 12889 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" 12828 12890 ;; 12829 @@ -16814,15 +17 174,15 @@12891 @@ -16814,15 +17216,15 @@ 12830 12892 LDFLAGS=$cf_rpath_dst 12831 12893 test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 12832 12894 12833 12895 -echo "${as_me-configure}:16817: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 12834 +echo "${as_me-configure}:17 177: testing ...checked LDFLAGS $LDFLAGS ..." 1>&512896 +echo "${as_me-configure}:17219: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 12835 12897 12836 12898 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 12837 12899 12838 12900 -echo "${as_me-configure}:16821: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 12839 +echo "${as_me-configure}:17 181: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&512901 +echo "${as_me-configure}:17223: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 12840 12902 12841 12903 fi 12842 12904 else 12843 12905 -echo "$as_me:16825: result: no" >&5 12844 +echo "$as_me:17 185: result: no" >&512906 +echo "$as_me:17227: result: no" >&5 12845 12907 echo "${ECHO_T}no" >&6 12846 12908 fi 12847 12909 12848 @@ -16849,8 +172 09,18 @@12910 @@ -16849,8 +17251,18 @@ 12849 12911 fi 12850 12912 … … 12866 12928 ac_config_commands="$ac_config_commands default" 12867 12929 cat >confcache <<\_ACEOF 12868 @@ -16932,7 +173 02,7 @@12930 @@ -16932,7 +17344,7 @@ 12869 12931 : ${CONFIG_STATUS=./config.status} 12870 12932 ac_clean_files_save=$ac_clean_files 12871 12933 ac_clean_files="$ac_clean_files $CONFIG_STATUS" 12872 12934 -{ echo "$as_me:16935: creating $CONFIG_STATUS" >&5 12873 +{ echo "$as_me:173 05: creating $CONFIG_STATUS" >&512935 +{ echo "$as_me:17347: creating $CONFIG_STATUS" >&5 12874 12936 echo "$as_me: creating $CONFIG_STATUS" >&6;} 12875 12937 cat >$CONFIG_STATUS <<_ACEOF 12876 12938 #! $SHELL 12877 @@ -17064,7 +174 34,7 @@12939 @@ -17064,7 +17476,7 @@ 12878 12940 cat >>$CONFIG_STATUS <<EOF 12879 12941 ac_cs_version="\\ … … 12884 12946 12885 12947 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 12886 @@ -17108,7 +17 478,7 @@12948 @@ -17108,7 +17520,7 @@ 12887 12949 echo "$ac_cs_version"; exit 0 ;; 12888 12950 --he | --h) 12889 12951 # Conflict between --help and --header 12890 12952 - { { echo "$as_me:17111: error: ambiguous option: $1 12891 + { { echo "$as_me:17 481: error: ambiguous option: $112953 + { { echo "$as_me:17523: error: ambiguous option: $1 12892 12954 Try \`$0 --help' for more information." >&5 12893 12955 echo "$as_me: error: ambiguous option: $1 12894 12956 Try \`$0 --help' for more information." >&2;} 12895 @@ -17127,7 +17 497,7 @@12957 @@ -17127,7 +17539,7 @@ 12896 12958 ac_need_defaults=false;; 12897 12959 12898 12960 # This is an error. 12899 12961 - -*) { { echo "$as_me:17130: error: unrecognized option: $1 12900 + -*) { { echo "$as_me:175 00: error: unrecognized option: $112962 + -*) { { echo "$as_me:17542: error: unrecognized option: $1 12901 12963 Try \`$0 --help' for more information." >&5 12902 12964 echo "$as_me: error: unrecognized option: $1 12903 12965 Try \`$0 --help' for more information." >&2;} 12904 @@ -17146,7 +175 16,7 @@12966 @@ -17146,7 +17558,7 @@ 12905 12967 ## Running config.status. ## 12906 12968 ## ----------------------- ## … … 12911 12973 CONFIG_HEADERS = $CONFIG_HEADERS 12912 12974 CONFIG_LINKS = $CONFIG_LINKS 12913 @@ -17181,13 +175 51,13 @@12975 @@ -17181,13 +17593,13 @@ 12914 12976 NCURSES_PATCH="$NCURSES_PATCH" 12915 12977 SRC_SUBDIRS="$SRC_SUBDIRS" … … 12928 12990 WITH_ECHO="$with_echo" 12929 12991 WITH_OVERWRITE="$with_overwrite" 12930 @@ -17206,6 +17 576,7 @@12992 @@ -17206,6 +17618,7 @@ 12931 12993 cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix" 12932 12994 cf_cv_system_name="$cf_cv_system_name" … … 12936 12998 target="$target" 12937 12999 12938 @@ -17224,7 +17 595,7 @@13000 @@ -17224,7 +17637,7 @@ 12939 13001 "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; 12940 13002 "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; 12941 13003 "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; 12942 13004 - *) { { echo "$as_me:17227: error: invalid argument: $ac_config_target" >&5 12943 + *) { { echo "$as_me:17 598: error: invalid argument: $ac_config_target" >&513005 + *) { { echo "$as_me:17640: error: invalid argument: $ac_config_target" >&5 12944 13006 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} 12945 13007 { (exit 1); exit 1; }; };; 12946 13008 esac 12947 @@ -17349,6 +177 20,8 @@13009 @@ -17349,6 +17762,8 @@ 12948 13010 s,@LINT@,$LINT,;t t 12949 13011 s,@LINT_OPTS@,$LINT_OPTS,;t t … … 12954 13016 s,@MAKE_LOWER_TAGS@,$MAKE_LOWER_TAGS,;t t 12955 13017 s,@MAKE_UPPER_TAGS@,$MAKE_UPPER_TAGS,;t t 12956 @@ -17359,7 +177 32,7 @@13018 @@ -17359,7 +17774,7 @@ 12957 13019 s,@ac_ct_LD@,$ac_ct_LD,;t t 12958 13020 s,@AR@,$AR,;t t … … 12963 13025 s,@BUILD_CC@,$BUILD_CC,;t t 12964 13026 s,@BUILD_CPP@,$BUILD_CPP,;t t 12965 @@ -17392,6 +17 765,7 @@13027 @@ -17392,6 +17807,7 @@ 12966 13028 s,@CXX_G_OPT@,$CXX_G_OPT,;t t 12967 13029 s,@LD_MODEL@,$LD_MODEL,;t t … … 12971 13033 s,@MK_SHARED_LIB@,$MK_SHARED_LIB,;t t 12972 13034 s,@LINK_PROGS@,$LINK_PROGS,;t t 12973 @@ -17401,7 +17 775,6 @@13035 @@ -17401,7 +17817,6 @@ 12974 13036 s,@LOCAL_LDFLAGS2@,$LOCAL_LDFLAGS2,;t t 12975 13037 s,@INSTALL_LIB@,$INSTALL_LIB,;t t … … 12979 13041 s,@WHICH_XTERM@,$WHICH_XTERM,;t t 12980 13042 s,@TERMINFO_DIRS@,$TERMINFO_DIRS,;t t 12981 @@ -17425,6 +17 798,7@@13043 @@ -17425,6 +17840,9 @@ 12982 13044 s,@NCURSES_OSPEED@,$NCURSES_OSPEED,;t t 12983 13045 s,@MANPAGE_RENAMES@,$MANPAGE_RENAMES,;t t 12984 13046 s,@NCURSES_EXT_FUNCS@,$NCURSES_EXT_FUNCS,;t t 12985 13047 +s,@GENERATED_EXT_FUNCS@,$GENERATED_EXT_FUNCS,;t t 13048 +s,@NCURSES_SP_FUNCS@,$NCURSES_SP_FUNCS,;t t 13049 +s,@GENERATED_SP_FUNCS@,$GENERATED_SP_FUNCS,;t t 12986 13050 s,@NCURSES_CONST@,$NCURSES_CONST,;t t 12987 13051 s,@NCURSES_EXT_COLORS@,$NCURSES_EXT_COLORS,;t t 12988 13052 s,@NCURSES_MOUSE_VERSION@,$NCURSES_MOUSE_VERSION,;t t 12989 @@ -17449,7 +178 23,7 @@13053 @@ -17449,7 +17867,7 @@ 12990 13054 s,@CXXCPP@,$CXXCPP,;t t 12991 13055 s,@CXXLDFLAGS@,$CXXLDFLAGS,;t t … … 12996 13060 s,@USE_CXX_BOOL@,$USE_CXX_BOOL,;t t 12997 13061 s,@gnat_exists@,$gnat_exists,;t t 12998 @@ -17493,6 +17 867,7 @@13062 @@ -17493,6 +17911,7 @@ 12999 13063 s,@HAVE_TCGETATTR@,$HAVE_TCGETATTR,;t t 13000 13064 s,@HAVE_TERMIO_H@,$HAVE_TERMIO_H,;t t … … 13004 13068 13005 13069 EOF 13006 @@ -17607,7 +1 7982,7 @@13070 @@ -17607,7 +18026,7 @@ 13007 13071 esac 13008 13072 13009 13073 if test x"$ac_file" != x-; then 13010 13074 - { echo "$as_me:17610: creating $ac_file" >&5 13011 + { echo "$as_me:1 7985: creating $ac_file" >&513075 + { echo "$as_me:18029: creating $ac_file" >&5 13012 13076 echo "$as_me: creating $ac_file" >&6;} 13013 13077 rm -f "$ac_file" 13014 13078 fi 13015 @@ -17625,7 +180 00,7 @@13079 @@ -17625,7 +18044,7 @@ 13016 13080 -) echo $tmp/stdin ;; 13017 13081 [\\/$]*) 13018 13082 # Absolute (can't be DOS-style, as IFS=:) 13019 13083 - test -f "$f" || { { echo "$as_me:17628: error: cannot find input file: $f" >&5 13020 + test -f "$f" || { { echo "$as_me:180 03: error: cannot find input file: $f" >&513084 + test -f "$f" || { { echo "$as_me:18047: error: cannot find input file: $f" >&5 13021 13085 echo "$as_me: error: cannot find input file: $f" >&2;} 13022 13086 { (exit 1); exit 1; }; } 13023 13087 echo $f;; 13024 @@ -17638,7 +180 13,7 @@13088 @@ -17638,7 +18057,7 @@ 13025 13089 echo $srcdir/$f 13026 13090 else 13027 13091 # /dev/null tree 13028 13092 - { { echo "$as_me:17641: error: cannot find input file: $f" >&5 13029 + { { echo "$as_me:180 16: error: cannot find input file: $f" >&513093 + { { echo "$as_me:18060: error: cannot find input file: $f" >&5 13030 13094 echo "$as_me: error: cannot find input file: $f" >&2;} 13031 13095 { (exit 1); exit 1; }; } 13032 13096 fi;; 13033 @@ -17704,7 +18 079,7 @@13097 @@ -17704,7 +18123,7 @@ 13034 13098 * ) ac_file_in=$ac_file.in ;; 13035 13099 esac 13036 13100 13037 13101 - test x"$ac_file" != x- && { echo "$as_me:17707: creating $ac_file" >&5 13038 + test x"$ac_file" != x- && { echo "$as_me:18 082: creating $ac_file" >&513102 + test x"$ac_file" != x- && { echo "$as_me:18126: creating $ac_file" >&5 13039 13103 echo "$as_me: creating $ac_file" >&6;} 13040 13104 13041 13105 # First look for the input files in the build tree, otherwise in the 13042 @@ -17715,7 +18 090,7 @@13106 @@ -17715,7 +18134,7 @@ 13043 13107 -) echo $tmp/stdin ;; 13044 13108 [\\/$]*) 13045 13109 # Absolute (can't be DOS-style, as IFS=:) 13046 13110 - test -f "$f" || { { echo "$as_me:17718: error: cannot find input file: $f" >&5 13047 + test -f "$f" || { { echo "$as_me:18 093: error: cannot find input file: $f" >&513111 + test -f "$f" || { { echo "$as_me:18137: error: cannot find input file: $f" >&5 13048 13112 echo "$as_me: error: cannot find input file: $f" >&2;} 13049 13113 { (exit 1); exit 1; }; } 13050 13114 echo $f;; 13051 @@ -17728,7 +181 03,7 @@13115 @@ -17728,7 +18147,7 @@ 13052 13116 echo $srcdir/$f 13053 13117 else 13054 13118 # /dev/null tree 13055 13119 - { { echo "$as_me:17731: error: cannot find input file: $f" >&5 13056 + { { echo "$as_me:181 06: error: cannot find input file: $f" >&513120 + { { echo "$as_me:18150: error: cannot find input file: $f" >&5 13057 13121 echo "$as_me: error: cannot find input file: $f" >&2;} 13058 13122 { (exit 1); exit 1; }; } 13059 13123 fi;; 13060 @@ -17786,7 +18 161,7 @@13124 @@ -17786,7 +18205,7 @@ 13061 13125 rm -f $tmp/in 13062 13126 if test x"$ac_file" != x-; then 13063 13127 if cmp -s $ac_file $tmp/config.h 2>/dev/null; then 13064 13128 - { echo "$as_me:17789: $ac_file is unchanged" >&5 13065 + { echo "$as_me:18 164: $ac_file is unchanged" >&513129 + { echo "$as_me:18208: $ac_file is unchanged" >&5 13066 13130 echo "$as_me: $ac_file is unchanged" >&6;} 13067 13131 else 13068 13132 ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 13069 @@ -17873,40 +182 48,44 @@13133 @@ -17873,40 +18292,44 @@ 13070 13134 for cf_item in $cf_LIST_MODELS 13071 13135 do … … 13123 13187 cf_depsuf=$cf_suffix 13124 13188 ;; 13125 @@ -18020,40 +18 399,44 @@13189 @@ -18020,40 +18443,44 @@ 13126 13190 13127 13191 cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` … … 13179 13243 cf_depsuf=$cf_suffix 13180 13244 ;; 13181 @@ -18234,18 +186 17,28 @@13245 @@ -18234,18 +18661,28 @@ 13182 13246 install.libs uninstall.libs \\ 13183 13247 install.data uninstall.data :: … … 13208 13272 if test -f $srcdir/$tack.h; then 13209 13273 cat >> Makefile <<CF_EOF 13210 @@ -18256,6 +186 49,7 @@13274 @@ -18256,6 +18693,7 @@ 13211 13275 CF_EOF 13212 13276 fi … … 13218 13282 diff -Naur ncurses-5.7.orig/configure.in ncurses-5.7/configure.in 13219 13283 --- ncurses-5.7.orig/configure.in 2008-10-18 07:53:32.000000000 -0700 13220 +++ ncurses-5.7/configure.in 2009-02- 07 22:08:38.023632072-080013284 +++ ncurses-5.7/configure.in 2009-02-15 23:21:24.616480793 -0800 13221 13285 @@ -1,5 +1,5 @@ 13222 13286 dnl*************************************************************************** … … 13231 13295 dnl 13232 13296 -dnl $Id: configure.in,v 1.454 2008/10/18 14:53:32 tom Exp $ 13233 +dnl $Id: configure.in,v 1.46 5 2009/02/07 18:41:03tom Exp $13297 +dnl $Id: configure.in,v 1.466 2009/02/15 00:19:01 tom Exp $ 13234 13298 dnl Process this file with autoconf to produce a configure script. 13235 13299 dnl … … 13239 13303 AC_PREREQ(2.13.20020210) 13240 13304 -AC_REVISION($Revision: 1.454 $) 13241 +AC_REVISION($Revision: 1.46 5$)13305 +AC_REVISION($Revision: 1.466 $) 13242 13306 AC_INIT(ncurses/base/lib_initscr.c) 13243 13307 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) … … 13307 13371 ############################################################################### 13308 13372 CF_HELP_MESSAGE(Extensions:) 13309 @@ -828,10 +860, 13@@13373 @@ -828,10 +860,30 @@ 13310 13374 AC_DEFINE(HAVE_USE_DEFAULT_COLORS) 13311 13375 AC_DEFINE(HAVE_WRESIZE) … … 13318 13382 AC_SUBST(NCURSES_EXT_FUNCS) 13319 13383 +AC_SUBST(GENERATED_EXT_FUNCS) 13384 + 13385 +AC_MSG_CHECKING(if you want to build with experimental SCREEN extensions) 13386 +AC_ARG_ENABLE(sp-funcs, 13387 + [ --enable-sp-funcs disable experimental SCREEN-extensions], 13388 + [with_sp_funcs=$enableval], 13389 + [with_sp_funcs=no]) 13390 +AC_MSG_RESULT($with_sp_funcs) 13391 +if test "$with_sp_funcs" = yes ; then 13392 + NCURSES_SP_FUNCS=1 13393 + AC_DEFINE(NCURSES_SP_FUNCS) 13394 + GENERATED_SP_FUNCS=generated 13395 +else 13396 + NCURSES_SP_FUNCS=0 13397 + GENERATED_SP_FUNCS= 13398 +fi 13399 +AC_SUBST(NCURSES_SP_FUNCS) 13400 +AC_SUBST(GENERATED_SP_FUNCS) 13320 13401 13321 13402 ### use option --enable-const to turn on use of const beyond that in XSI. 13322 13403 AC_MSG_CHECKING(for extended use of const keyword) 13323 @@ -1354,12 +1389,12 @@ 13404 @@ -1165,12 +1217,18 @@ 13405 AC_SUBST(ADA_TRACE) 13406 13407 ### Checks for libraries. 13408 +case $cf_cv_system_name in #(vi 13409 +*mingw32*) #(vi 13410 + ;; 13411 +*) 13412 AC_CHECK_FUNC(gettimeofday, 13413 AC_DEFINE(HAVE_GETTIMEOFDAY),[ 13414 13415 AC_CHECK_LIB(bsd, gettimeofday, 13416 AC_DEFINE(HAVE_GETTIMEOFDAY) 13417 LIBS="$LIBS -lbsd")])dnl CLIX: bzero, select, gettimeofday 13418 + ;; 13419 +esac 13420 13421 CF_MATH_LIB(MATH_LIB,sin(x)) 13422 AC_SUBST(MATH_LIB) 13423 @@ -1354,12 +1412,12 @@ 13324 13424 CF_CPP_STATIC_CAST 13325 13425 … … 13336 13436 ;; 13337 13437 sco3.2v5*) #(vi 13338 @@ -1368,13 +14 03,13 @@13438 @@ -1368,13 +1426,13 @@ 13339 13439 solaris2*) 13340 13440 if test "$GXX" != yes ; then … … 13352 13452 cf_cxx_library=no 13353 13453 cf_cv_builtin_bool=1 13354 @@ -1723,6 +1758,7 @@ 13454 @@ -1552,7 +1610,17 @@ 13455 fi 13456 fi 13457 13458 -LIB_SUBSETS="${LIB_SUBSETS}termlib" 13459 +LIB_SUBSETS="${LIB_SUBSETS}termlib+port_drivers" 13460 + 13461 +case $cf_cv_system_name in #(vi 13462 +*mingw32*) #(vi 13463 + LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo+port_win32con" 13464 + ;; 13465 +*) #(vi 13466 + LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo" 13467 + ;; 13468 +esac 13469 + 13470 test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_tinfo" 13471 if test "$with_termlib" != no ; then 13472 LIB_SUBSETS="${LIB_SUBSETS} " 13473 @@ -1561,6 +1629,7 @@ 13474 fi 13475 13476 LIB_SUBSETS="${LIB_SUBSETS}base" 13477 + 13478 test "$with_widec" = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" 13479 test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" 13480 13481 @@ -1723,6 +1792,7 @@ 13355 13482 AC_MSG_WARN(Wide-character applications must define HAVE_LIBUTF8_H to include curses.h) 13356 13483 fi … … 13360 13487 AC_SUBST(WITH_OVERWRITE) 13361 13488 AC_SUBST(TICS_LIST) 13362 @@ -1742,12 +1 778,12 @@13489 @@ -1742,12 +1812,12 @@ 13363 13490 CF_SRC_MODULES($modules_to_build) 13364 13491 … … 13375 13502 AC_DEFINE_UNQUOTED(NCURSES_VERSION_STRING, "${NCURSES_MAJOR}.${NCURSES_MINOR}.${NCURSES_PATCH}") 13376 13503 13377 @@ -1765,8 +18 01,19 @@13504 @@ -1765,8 +1835,19 @@ 13378 13505 CF_SUBST_IF(["$ac_cv_header_termios_h" = yes], HAVE_TERMIOS_H, 1, 0) 13379 13506 … … 13396 13523 include/MKterm.h.awk \ 13397 13524 include/curses.head:include/curses.h.in \ 13398 @@ -1796,13 +18 43,13 @@13525 @@ -1796,13 +1877,13 @@ 13399 13526 NCURSES_PATCH="$NCURSES_PATCH" 13400 13527 SRC_SUBDIRS="$SRC_SUBDIRS" … … 13413 13540 WITH_ECHO="$with_echo" 13414 13541 WITH_OVERWRITE="$with_overwrite" 13415 @@ -1821,6 +1 868,7 @@13542 @@ -1821,6 +1902,7 @@ 13416 13543 cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix" 13417 13544 cf_cv_system_name="$cf_cv_system_name" … … 13423 13550 diff -Naur ncurses-5.7.orig/dist.mk ncurses-5.7/dist.mk 13424 13551 --- ncurses-5.7.orig/dist.mk 2008-11-01 17:58:38.000000000 -0700 13425 +++ ncurses-5.7/dist.mk 2009-02- 07 22:08:38.023632072-080013552 +++ ncurses-5.7/dist.mk 2009-02-15 23:21:24.616480793 -0800 13426 13553 @@ -25,7 +25,7 @@ 13427 13554 # use or other dealings in this Software without prior written # … … 13429 13556 ############################################################################## 13430 13557 -# $Id: dist.mk,v 1.671 2008/11/02 00:58:38 tom Exp $ 13431 +# $Id: dist.mk,v 1.68 5 2009/02/07 14:08:14tom Exp $13558 +# $Id: dist.mk,v 1.686 2009/02/14 21:09:27 tom Exp $ 13432 13559 # Makefile for creating ncurses distributions. 13433 13560 # … … 13438 13565 NCURSES_MINOR = 7 13439 13566 -NCURSES_PATCH = 20081102 13440 +NCURSES_PATCH = 200902 0713567 +NCURSES_PATCH = 20090214 13441 13568 13442 13569 # We don't append the patch to the version, since this only applies to releases … … 13444 13571 diff -Naur ncurses-5.7.orig/form/frm_driver.c ncurses-5.7/form/frm_driver.c 13445 13572 --- ncurses-5.7.orig/form/frm_driver.c 2008-10-18 09:25:00.000000000 -0700 13446 +++ ncurses-5.7/form/frm_driver.c 2009-02- 07 22:08:20.957088421-080013573 +++ ncurses-5.7/form/frm_driver.c 2009-02-15 23:21:03.083101270 -0800 13447 13574 @@ -32,7 +32,7 @@ 13448 13575 … … 13464 13591 diff -Naur ncurses-5.7.orig/form/Makefile.in ncurses-5.7/form/Makefile.in 13465 13592 --- ncurses-5.7.orig/form/Makefile.in 2007-04-28 07:56:11.000000000 -0700 13466 +++ ncurses-5.7/form/Makefile.in 2009-02- 07 22:08:29.738503702 -080013593 +++ ncurses-5.7/form/Makefile.in 2009-02-15 23:21:09.919538762 -0800 13467 13594 @@ -1,6 +1,6 @@ 13468 13595 -# $Id: Makefile.in,v 1.47 2007/04/28 14:56:11 tom Exp $ … … 13485 13612 diff -Naur ncurses-5.7.orig/include/curses.h.in ncurses-5.7/include/curses.h.in 13486 13613 --- ncurses-5.7.orig/include/curses.h.in 2008-08-30 13:11:29.000000000 -0700 13487 +++ ncurses-5.7/include/curses.h.in 2009-02-07 22:08:26.211171952 -0800 13614 +++ ncurses-5.7/include/curses.h.in 2009-02-15 23:21:24.620481072 -0800 13615 @@ -1,5 +1,5 @@ 13616 /**************************************************************************** 13617 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 13618 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 13619 * * 13620 * Permission is hereby granted, free of charge, to any person obtaining a * 13621 * copy of this software and associated documentation files (the * 13488 13622 @@ -32,7 +32,7 @@ 13489 13623 * and: Thomas E. Dickey 1996-on * … … 13491 13625 13492 13626 -/* $Id: curses.h.in,v 1.187 2008/08/30 20:11:29 tom Exp $ */ 13493 +/* $Id: curses.h.in,v 1.19 0 2008/12/20 22:28:52tom Exp $ */13627 +/* $Id: curses.h.in,v 1.193 2009/02/15 00:04:23 tom Exp $ */ 13494 13628 13495 13629 #ifndef __NCURSES_H … … 13508 13642 #define NCURSES_VERSION_MAJOR @NCURSES_MAJOR@ 13509 13643 #define NCURSES_VERSION_MINOR @NCURSES_MINOR@ 13510 @@ -856,18 +850,18 @@ 13644 @@ -110,6 +104,13 @@ 13645 #endif 13646 13647 /* 13648 + * The reentrant code relies on the opaque setting, but adds features. 13649 + */ 13650 +#ifndef NCURSES_REENTRANT 13651 +#define NCURSES_REENTRANT @cf_cv_enable_reentrant@ 13652 +#endif 13653 + 13654 +/* 13655 * The internal type used for window dimensions. 13656 */ 13657 #undef NCURSES_SIZE_T 13658 @@ -224,7 +225,7 @@ 13659 13660 /* line graphics */ 13661 13662 -#if @BROKEN_LINKER@ || @cf_cv_enable_reentrant@ 13663 +#if @BROKEN_LINKER@ || NCURSES_REENTRANT 13664 NCURSES_WRAPPED_VAR(chtype*, acs_map); 13665 #define acs_map (_nc_acs_map()) 13666 #else 13667 @@ -646,7 +647,7 @@ 13668 extern NCURSES_EXPORT(int) mvwinnstr (WINDOW *, int, int, char *, int); /* generated */ 13669 extern NCURSES_EXPORT(int) mvwinsch (WINDOW *, int, int, chtype); /* generated */ 13670 extern NCURSES_EXPORT(int) mvwinsnstr (WINDOW *, int, int, const char *, int); /* generated */ 13671 -extern NCURSES_EXPORT(int) mvwinsstr (WINDOW *, int, int, const char *); /* generated */ 13672 +extern NCURSES_EXPORT(int) mvwinsstr (WINDOW *, int, int, const char *); /* generated */ 13673 extern NCURSES_EXPORT(int) mvwinstr (WINDOW *, int, int, char *); /* generated */ 13674 extern NCURSES_EXPORT(int) mvwprintw (WINDOW*,int,int, const char *,...) /* implemented */ 13675 GCC_PRINTFLIKE(4,5); 13676 @@ -654,9 +655,9 @@ 13677 GCC_SCANFLIKE(4,5); 13678 extern NCURSES_EXPORT(int) mvwvline (WINDOW *,int, int, chtype, int); /* generated */ 13679 extern NCURSES_EXPORT(int) napms (int); /* implemented */ 13680 -extern NCURSES_EXPORT(WINDOW *) newpad (int,int); /* implemented */ 13681 +extern NCURSES_EXPORT(WINDOW *) newpad (int,int); /* implemented */ 13682 extern NCURSES_EXPORT(SCREEN *) newterm (NCURSES_CONST char *,FILE *,FILE *); /* implemented */ 13683 -extern NCURSES_EXPORT(WINDOW *) newwin (int,int,int,int); /* implemented */ 13684 +extern NCURSES_EXPORT(WINDOW *) newwin (int,int,int,int); /* implemented */ 13685 extern NCURSES_EXPORT(int) nl (void); /* implemented */ 13686 extern NCURSES_EXPORT(int) nocbreak (void); /* implemented */ 13687 extern NCURSES_EXPORT(int) nodelay (WINDOW *,bool); /* implemented */ 13688 @@ -710,7 +711,7 @@ 13689 extern NCURSES_EXPORT(int) slk_refresh (void); /* implemented */ 13690 extern NCURSES_EXPORT(int) slk_restore (void); /* implemented */ 13691 extern NCURSES_EXPORT(int) slk_set (int,const char *,int); /* implemented */ 13692 -extern NCURSES_EXPORT(int) slk_touch (void); /* implemented */ 13693 +extern NCURSES_EXPORT(int) slk_touch (void); /* implemented */ 13694 extern NCURSES_EXPORT(int) standout (void); /* generated */ 13695 extern NCURSES_EXPORT(int) standend (void); /* generated */ 13696 extern NCURSES_EXPORT(int) start_color (void); /* implemented */ 13697 @@ -856,23 +857,117 @@ 13511 13698 * These extensions provide access to information stored in the WINDOW even 13512 13699 * when NCURSES_OPAQUE is set: … … 13539 13726 #else 13540 13727 #define curses_version() NCURSES_VERSION 13728 #endif 13729 13730 +/* 13731 + * Extra extension-functions, which pass a SCREEN pointer rather than using 13732 + * a global variable SP. 13733 + */ 13734 +#if @NCURSES_SP_FUNCS@ 13735 +#undef NCURSES_SP_FUNCS 13736 +#define NCURSES_SP_FUNCS @NCURSES_PATCH@ 13737 +#define NCURSES_SP_NAME(name) name##_sp 13738 + 13739 +extern NCURSES_EXPORT(SCREEN*) new_prescr(void); /* implemented */ 13740 + 13741 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(baudrate) (SCREEN*); /* implemented */ 13742 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(beep) (SCREEN*); /* implemented */ 13743 +extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(can_change_color) (SCREEN*); /* implemented */ 13744 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(cbreak) (SCREEN*); /* implemented */ 13745 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(color_content) (SCREEN*, short, short*, short*, short*); /* implemented */ 13746 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(def_prog_mode) (SCREEN*); /* implemented */ 13747 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(def_shell_mode) (SCREEN*); /* implemented */ 13748 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(delay_output) (SCREEN*, int); /* implemented */ 13749 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(doupdate) (SCREEN*); /* implemented */ 13750 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(echo) (SCREEN*); /* implemented */ 13751 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(endwin) (SCREEN*); /* implemented */ 13752 +extern NCURSES_EXPORT(char) NCURSES_SP_NAME(erasechar) (SCREEN*);/* implemented */ 13753 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(filter) (SCREEN*); /* implemented */ 13754 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(flash) (SCREEN*); /* implemented */ 13755 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(flushinp) (SCREEN*); /* implemented */ 13756 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(halfdelay)(SCREEN*, int); /* implemented */ 13757 +extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(has_colors) (SCREEN*); /* implemented */ 13758 +extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(has_ic) (SCREEN*); /* implemented */ 13759 +extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(has_il) (SCREEN*); /* implemented */ 13760 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(init_color) (SCREEN*, short, short, short, short); /* implemented */ 13761 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(init_pair) (SCREEN*, short, short, short); /* implemented */ 13762 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(intrflush) (SCREEN*, WINDOW*, bool); /* implemented */ 13763 +extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(isendwin) (SCREEN*); /* implemented */ 13764 +extern NCURSES_EXPORT(NCURSES_CONST char *) NCURSES_SP_NAME(keyname) (SCREEN*, int); /* implemented */ 13765 +extern NCURSES_EXPORT(char) NCURSES_SP_NAME(killchar) (SCREEN*); /* implemented */ 13766 +extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(longname) (SCREEN*); /* implemented */ 13767 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(mvcur) (SCREEN*, int, int, int, int); /* implemented */ 13768 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(napms) (SCREEN*, int); /* implemented */ 13769 +extern NCURSES_EXPORT(WINDOW *) NCURSES_SP_NAME(newpad) (SCREEN*, int, int); /* implemented */ 13770 +extern NCURSES_EXPORT(SCREEN *) NCURSES_SP_NAME(newterm) (SCREEN*, NCURSES_CONST char *, FILE *, FILE *); /* implemented */ 13771 +extern NCURSES_EXPORT(WINDOW *) NCURSES_SP_NAME(newwin) (SCREEN*, int, int, int, int); /* implemented */ 13772 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(nl) (SCREEN*); /* implemented */ 13773 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(nocbreak) (SCREEN*); /* implemented */ 13774 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(noecho) (SCREEN*); /* implemented */ 13775 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(nofilter) (SCREEN*); /* implemented */ 13776 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(nonl) (SCREEN*); /* implemented */ 13777 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(noqiflush) (SCREEN*); /* implemented */ 13778 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(noraw) (SCREEN*); /* implemented */ 13779 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(pair_content) (SCREEN*, short, short*, short*); /* implemented */ 13780 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(qiflush) (SCREEN*); /* implemented */ 13781 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(raw) (SCREEN*); /* implemented */ 13782 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(reset_prog_mode) (SCREEN*); /* implemented */ 13783 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(reset_shell_mode) (SCREEN*); /* implemented */ 13784 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(ripoffline) (SCREEN*, int, int (*)(WINDOW *, int)); /* implemented */ 13785 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(scr_set) (SCREEN*, const char *); /* implemented */ 13786 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attroff) (SCREEN*, const chtype); /* implemented */ 13787 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attron) (SCREEN*, const chtype); /* implemented */ 13788 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attrset) (SCREEN*, const chtype); /* implemented */ 13789 +extern NCURSES_EXPORT(attr_t) NCURSES_SP_NAME(slk_attr) (SCREEN*); /* implemented */ 13790 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attr_set) (SCREEN*, const attr_t, short, void*); /* implemented */ 13791 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_clear) (SCREEN*); /* implemented */ 13792 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_color) (SCREEN*, short); /* implemented */ 13793 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_init) (SCREEN*, int); /* implemented */ 13794 +extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(slk_label) (SCREEN*, int); /* implemented */ 13795 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_noutrefresh) (SCREEN*); /* implemented */ 13796 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_refresh) (SCREEN*); /* implemented */ 13797 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_restore) (SCREEN*); /* implemented */ 13798 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_set) (SCREEN*, int, const char *, int); /* implemented */ 13799 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_touch) (SCREEN*); /* implemented */ 13800 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(start_color) (SCREEN*); /* implemented */ 13801 +extern NCURSES_EXPORT(chtype) NCURSES_SP_NAME(termattrs) (SCREEN*); /* implemented */ 13802 +extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(termname) (SCREEN*); /* implemented */ 13803 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(typeahead) (SCREEN*, int); /* implemented */ 13804 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(ungetch) (SCREEN*, int); /* implemented */ 13805 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(use_env) (SCREEN*, bool); /* implemented */ 13806 +#if @NCURSES_EXT_FUNCS@ 13807 +extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(keybound) (SCREEN*, int, int); 13808 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(assume_default_colors) (SCREEN*, int, int); 13809 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(define_key) (SCREEN*, const char *, int); 13810 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(get_escdelay) (SCREEN*); 13811 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(key_defined)(SCREEN*, const char *); 13812 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(keyok) (SCREEN*, int, bool); 13813 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(set_escdelay) (SCREEN*, int); 13814 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(set_tabsize) (SCREEN*, int); 13815 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(use_default_colors) (SCREEN*); 13816 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(use_legacy_coding) (SCREEN*, int); 13817 +#endif 13818 +#else 13819 +#undef NCURSES_SP_FUNCS 13820 +#define NCURSES_SP_FUNCS 0 13821 +#define NCURSES_SP_NAME(name) name 13822 +#endif 13823 + 13824 /* attributes */ 13825 13826 #define NCURSES_ATTR_SHIFT 8 13827 @@ -1173,7 +1268,7 @@ 13828 * It gives the ESC expire time in milliseconds. 13829 * b. ttytype is needed for backward compatibility 13830 */ 13831 -#if @cf_cv_enable_reentrant@ 13832 +#if NCURSES_REENTRANT 13833 13834 NCURSES_WRAPPED_VAR(WINDOW *, curscr); 13835 NCURSES_WRAPPED_VAR(WINDOW *, newscr); 13541 13836 diff -Naur ncurses-5.7.orig/include/curses.tail ncurses-5.7/include/curses.tail 13542 13837 --- ncurses-5.7.orig/include/curses.tail 2008-07-05 13:20:38.000000000 -0700 13543 +++ ncurses-5.7/include/curses.tail 2009-02- 07 22:08:17.958857941-080013838 +++ ncurses-5.7/include/curses.tail 2009-02-15 23:21:00.214919122 -0800 13544 13839 @@ -1,4 +1,4 @@ 13545 13840 -/* $Id: curses.tail,v 1.16 2008/07/05 20:20:38 tom Exp $ */ … … 13558 13853 diff -Naur ncurses-5.7.orig/include/curses.wide ncurses-5.7/include/curses.wide 13559 13854 --- ncurses-5.7.orig/include/curses.wide 2007-03-10 09:52:23.000000000 -0800 13560 +++ ncurses-5.7/include/curses.wide 2009-02- 07 22:08:19.476430787-080013855 +++ ncurses-5.7/include/curses.wide 2009-02-15 23:21:01.799020254 -0800 13561 13856 @@ -1,9 +1,11 @@ 13562 13857 -/* $Id: curses.wide,v 1.34 2007/03/10 17:52:23 tom Exp $ */ … … 13574 13869 diff -Naur ncurses-5.7.orig/INSTALL ncurses-5.7/INSTALL 13575 13870 --- ncurses-5.7.orig/INSTALL 2008-11-02 13:13:51.000000000 -0800 13576 +++ ncurses-5.7/INSTALL 2009-02- 07 22:08:29.713894399-080013871 +++ ncurses-5.7/INSTALL 2009-02-15 23:21:09.895537365 -0800 13577 13872 @@ -1,5 +1,5 @@ 13578 13873 ------------------------------------------------------------------------------- … … 13625 13920 diff -Naur ncurses-5.7.orig/man/curs_color.3x ncurses-5.7/man/curs_color.3x 13626 13921 --- ncurses-5.7.orig/man/curs_color.3x 2005-12-17 16:00:37.000000000 -0800 13627 +++ ncurses-5.7/man/curs_color.3x 2009-02- 07 22:08:36.698833077-080013922 +++ ncurses-5.7/man/curs_color.3x 2009-02-15 23:21:17.376018158 -0800 13628 13923 @@ -1,5 +1,5 @@ 13629 13924 .\"*************************************************************************** … … 13656 13951 diff -Naur ncurses-5.7.orig/man/curs_mouse.3x ncurses-5.7/man/curs_mouse.3x 13657 13952 --- ncurses-5.7.orig/man/curs_mouse.3x 2006-12-30 15:43:34.000000000 -0800 13658 +++ ncurses-5.7/man/curs_mouse.3x 2009-02- 07 22:08:17.958857941-080013953 +++ ncurses-5.7/man/curs_mouse.3x 2009-02-15 23:21:00.214919122 -0800 13659 13954 @@ -1,6 +1,6 @@ 13660 13955 '\" t … … 13702 13997 diff -Naur ncurses-5.7.orig/man/keybound.3x ncurses-5.7/man/keybound.3x 13703 13998 --- ncurses-5.7.orig/man/keybound.3x 2006-02-25 13:47:06.000000000 -0800 13704 +++ ncurses-5.7/man/keybound.3x 2009-02- 07 22:08:22.700246404-080013999 +++ ncurses-5.7/man/keybound.3x 2009-02-15 23:21:04.663202123 -0800 13705 14000 @@ -1,5 +1,5 @@ 13706 14001 .\"*************************************************************************** … … 13723 14018 diff -Naur ncurses-5.7.orig/man/tabs.1 ncurses-5.7/man/tabs.1 13724 14019 --- ncurses-5.7.orig/man/tabs.1 1969-12-31 16:00:00.000000000 -0800 13725 +++ ncurses-5.7/man/tabs.1 2009-02- 07 22:08:16.560228245-080014020 +++ ncurses-5.7/man/tabs.1 2009-02-15 23:20:58.758823578 -0800 13726 14021 @@ -0,0 +1,143 @@ 13727 14022 +.\"*************************************************************************** … … 13870 14165 diff -Naur ncurses-5.7.orig/man/tset.1 ncurses-5.7/man/tset.1 13871 14166 --- ncurses-5.7.orig/man/tset.1 2006-12-24 07:00:30.000000000 -0800 13872 +++ ncurses-5.7/man/tset.1 2009-02- 07 22:08:16.560228245-080014167 +++ ncurses-5.7/man/tset.1 2009-02-15 23:20:58.758823578 -0800 13873 14168 @@ -1,5 +1,5 @@ 13874 14169 .\"*************************************************************************** … … 13891 14186 diff -Naur ncurses-5.7.orig/MANIFEST ncurses-5.7/MANIFEST 13892 14187 --- ncurses-5.7.orig/MANIFEST 2008-10-25 16:47:24.000000000 -0700 13893 +++ ncurses-5.7/MANIFEST 2009-02- 07 22:08:29.713894399-080014188 +++ ncurses-5.7/MANIFEST 2009-02-15 23:21:09.895537365 -0800 13894 14189 @@ -640,6 +640,7 @@ 13895 14190 ./man/ncurses.3x … … 13934 14229 diff -Naur ncurses-5.7.orig/menu/Makefile.in ncurses-5.7/menu/Makefile.in 13935 14230 --- ncurses-5.7.orig/menu/Makefile.in 2007-04-28 07:56:11.000000000 -0700 13936 +++ ncurses-5.7/menu/Makefile.in 2009-02- 07 22:08:29.738503702 -080014231 +++ ncurses-5.7/menu/Makefile.in 2009-02-15 23:21:09.919538762 -0800 13937 14232 @@ -1,6 +1,6 @@ 13938 14233 -# $Id: Makefile.in,v 1.48 2007/04/28 14:56:11 tom Exp $ … … 13955 14250 diff -Naur ncurses-5.7.orig/misc/gen-pkgconfig.in ncurses-5.7/misc/gen-pkgconfig.in 13956 14251 --- ncurses-5.7.orig/misc/gen-pkgconfig.in 1969-12-31 16:00:00.000000000 -0800 13957 +++ ncurses-5.7/misc/gen-pkgconfig.in 2009-02- 07 22:08:36.698833077-080014252 +++ ncurses-5.7/misc/gen-pkgconfig.in 2009-02-15 23:21:17.376018158 -0800 13958 14253 @@ -0,0 +1,119 @@ 13959 14254 +#!@SHELL@ … … 14078 14373 diff -Naur ncurses-5.7.orig/misc/Makefile.in ncurses-5.7/misc/Makefile.in 14079 14374 --- ncurses-5.7.orig/misc/Makefile.in 2007-03-31 08:54:17.000000000 -0700 14080 +++ ncurses-5.7/misc/Makefile.in 2009-02- 07 22:08:38.023632072-080014375 +++ ncurses-5.7/misc/Makefile.in 2009-02-15 23:21:19.700165665 -0800 14081 14376 @@ -1,6 +1,6 @@ 14082 14377 -# $Id: Makefile.in,v 1.43 2007/03/31 15:54:17 tom Exp $ … … 14161 14456 diff -Naur ncurses-5.7.orig/misc/ncurses-config.in ncurses-5.7/misc/ncurses-config.in 14162 14457 --- ncurses-5.7.orig/misc/ncurses-config.in 2007-03-17 13:02:19.000000000 -0700 14163 +++ ncurses-5.7/misc/ncurses-config.in 2009-02- 07 22:08:36.698833077-080014458 +++ ncurses-5.7/misc/ncurses-config.in 2009-02-15 23:21:17.376018158 -0800 14164 14459 @@ -1,7 +1,7 @@ 14165 14460 #!@SHELL@ … … 14288 14583 diff -Naur ncurses-5.7.orig/misc/terminfo.src ncurses-5.7/misc/terminfo.src 14289 14584 --- ncurses-5.7.orig/misc/terminfo.src 2008-10-12 16:03:54.000000000 -0700 14290 +++ ncurses-5.7/misc/terminfo.src 2009-02- 07 22:08:33.758021512-080014585 +++ ncurses-5.7/misc/terminfo.src 2009-02-15 23:21:14.363823718 -0800 14291 14586 @@ -6,8 +6,8 @@ 14292 14587 # Report bugs and new terminal descriptions to … … 14454 14749 diff -Naur ncurses-5.7.orig/mk-1st.awk ncurses-5.7/mk-1st.awk 14455 14750 --- ncurses-5.7.orig/mk-1st.awk 2007-03-24 15:10:55.000000000 -0700 14456 +++ ncurses-5.7/mk-1st.awk 2009-02- 07 22:08:31.055101551-080014751 +++ ncurses-5.7/mk-1st.awk 2009-02-15 23:21:11.279628160 -0800 14457 14752 @@ -1,6 +1,6 @@ 14458 14753 -# $Id: mk-1st.awk,v 1.78 2007/03/24 22:10:55 tom Exp $ … … 14482 14777 if ( host == "vxworks" ) 14483 14778 { 14779 diff -Naur ncurses-5.7.orig/ncurses/base/define_key.c ncurses-5.7/ncurses/base/define_key.c 14780 --- ncurses-5.7.orig/ncurses/base/define_key.c 2006-12-30 15:23:31.000000000 -0800 14781 +++ ncurses-5.7/ncurses/base/define_key.c 2009-02-15 23:21:24.620481072 -0800 14782 @@ -1,5 +1,5 @@ 14783 /**************************************************************************** 14784 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 14785 + * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. * 14786 * * 14787 * Permission is hereby granted, free of charge, to any person obtaining a * 14788 * copy of this software and associated documentation files (the * 14789 @@ -27,20 +27,21 @@ 14790 ****************************************************************************/ 14791 14792 /**************************************************************************** 14793 - * Author: Thomas E. Dickey 1997-on * 14794 + * Author: Thomas E. Dickey 1997-on * 14795 + * and: Juergen Pfeifer 2009 * 14796 ****************************************************************************/ 14797 14798 #include <curses.priv.h> 14799 14800 -MODULE_ID("$Id: define_key.c,v 1.13 2006/12/30 23:23:31 tom Exp $") 14801 +MODULE_ID("$Id: define_key.c,v 1.15 2009/02/15 00:30:40 tom Exp $") 14802 14803 NCURSES_EXPORT(int) 14804 -define_key(const char *str, int keycode) 14805 +NCURSES_SP_NAME(define_key) (NCURSES_SP_DCLx const char *str, int keycode) 14806 { 14807 int code = ERR; 14808 14809 T((T_CALLED("define_key(%s,%d)"), _nc_visbuf(str), keycode)); 14810 - if (SP == 0) { 14811 + if (SP_PARM == 0) { 14812 code = ERR; 14813 } else if (keycode > 0) { 14814 unsigned ukey = (unsigned) keycode; 14815 @@ -48,12 +49,12 @@ 14816 if (str != 0) { 14817 define_key(str, 0); 14818 } else if (has_key(keycode)) { 14819 - while (_nc_remove_key(&(SP->_keytry), ukey)) 14820 + while (_nc_remove_key(&(SP_PARM->_keytry), ukey)) 14821 code = OK; 14822 } 14823 if (str != 0) { 14824 if (key_defined(str) == 0) { 14825 - if (_nc_add_to_try(&(SP->_keytry), str, ukey) == OK) { 14826 + if (_nc_add_to_try(&(SP_PARM->_keytry), str, ukey) == OK) { 14827 code = OK; 14828 } else { 14829 code = ERR; 14830 @@ -63,8 +64,16 @@ 14831 } 14832 } 14833 } else { 14834 - while (_nc_remove_string(&(SP->_keytry), str)) 14835 + while (_nc_remove_string(&(SP_PARM->_keytry), str)) 14836 code = OK; 14837 } 14838 returnCode(code); 14839 } 14840 + 14841 +#if NCURSES_SP_FUNCS 14842 +NCURSES_EXPORT(int) 14843 +define_key(const char *str, int keycode) 14844 +{ 14845 + return NCURSES_SP_NAME(define_key) (CURRENT_SCREEN, str, keycode); 14846 +} 14847 +#endif 14848 diff -Naur ncurses-5.7.orig/ncurses/base/keybound.c ncurses-5.7/ncurses/base/keybound.c 14849 --- ncurses-5.7.orig/ncurses/base/keybound.c 2006-06-17 11:19:24.000000000 -0700 14850 +++ ncurses-5.7/ncurses/base/keybound.c 2009-02-15 23:21:24.620481072 -0800 14851 @@ -1,5 +1,5 @@ 14852 /**************************************************************************** 14853 - * Copyright (c) 1999-2005,2006 Free Software Foundation, Inc. * 14854 + * Copyright (c) 1999-2006,2009 Free Software Foundation, Inc. * 14855 * * 14856 * Permission is hereby granted, free of charge, to any person obtaining a * 14857 * copy of this software and associated documentation files (the * 14858 @@ -27,25 +27,34 @@ 14859 ****************************************************************************/ 14860 14861 /**************************************************************************** 14862 - * Author: Thomas E. Dickey 1999-on * 14863 + * Author: Thomas E. Dickey 1999-on * 14864 + * and: Juergen Pfeifer 2009 * 14865 ****************************************************************************/ 14866 14867 #include <curses.priv.h> 14868 14869 -MODULE_ID("$Id: keybound.c,v 1.7 2006/06/17 18:19:24 tom Exp $") 14870 +MODULE_ID("$Id: keybound.c,v 1.8 2009/02/15 00:31:10 tom Exp $") 14871 14872 /* 14873 * Returns the count'th string definition which is associated with the 14874 * given keycode. The result is malloc'd, must be freed by the caller. 14875 */ 14876 NCURSES_EXPORT(char *) 14877 -keybound(int code, int count) 14878 +NCURSES_SP_NAME(keybound) (NCURSES_SP_DCLx int code, int count) 14879 { 14880 char *result = 0; 14881 14882 T((T_CALLED("keybound(%d,%d)"), code, count)); 14883 - if (SP != 0 && code >= 0) { 14884 - result = _nc_expand_try(SP->_keytry, (unsigned) code, &count, 0); 14885 + if (SP_PARM != 0 && code >= 0) { 14886 + result = _nc_expand_try(SP_PARM->_keytry, (unsigned) code, &count, 0); 14887 } 14888 returnPtr(result); 14889 } 14890 + 14891 +#if NCURSES_SP_FUNCS 14892 +NCURSES_EXPORT(char *) 14893 +keybound(int code, int count) 14894 +{ 14895 + return NCURSES_SP_NAME(keybound) (CURRENT_SCREEN, code, count); 14896 +} 14897 +#endif 14898 diff -Naur ncurses-5.7.orig/ncurses/base/key_defined.c ncurses-5.7/ncurses/base/key_defined.c 14899 --- ncurses-5.7.orig/ncurses/base/key_defined.c 2006-12-30 15:22:55.000000000 -0800 14900 +++ ncurses-5.7/ncurses/base/key_defined.c 2009-02-15 23:21:24.620481072 -0800 14901 @@ -1,5 +1,5 @@ 14902 /**************************************************************************** 14903 - * Copyright (c) 2003,2006 Free Software Foundation, Inc. * 14904 + * Copyright (c) 2003-2006,2009 Free Software Foundation, Inc. * 14905 * * 14906 * Permission is hereby granted, free of charge, to any person obtaining a * 14907 * copy of this software and associated documentation files (the * 14908 @@ -27,12 +27,13 @@ 14909 ****************************************************************************/ 14910 14911 /**************************************************************************** 14912 - * Author: Thomas E. Dickey, 2003 * 14913 + * Author: Thomas E. Dickey 2003 * 14914 + * and: Juergen Pfeifer 2009 * 14915 ****************************************************************************/ 14916 14917 #include <curses.priv.h> 14918 14919 -MODULE_ID("$Id: key_defined.c,v 1.6 2006/12/30 23:22:55 tom Exp $") 14920 +MODULE_ID("$Id: key_defined.c,v 1.7 2009/02/15 00:30:00 tom Exp $") 14921 14922 static int 14923 find_definition(TRIES * tree, const char *str) 14924 @@ -65,14 +66,22 @@ 14925 * Otherwise, return the keycode's value (neither OK/ERR). 14926 */ 14927 NCURSES_EXPORT(int) 14928 -key_defined(const char *str) 14929 +NCURSES_SP_NAME(key_defined) (NCURSES_SP_DCLx const char *str) 14930 { 14931 int code = ERR; 14932 14933 T((T_CALLED("key_defined(%s)"), _nc_visbuf(str))); 14934 - if (SP != 0 && str != 0) { 14935 - code = find_definition(SP->_keytry, str); 14936 + if (SP_PARM != 0 && str != 0) { 14937 + code = find_definition(SP_PARM->_keytry, str); 14938 } 14939 14940 returnCode(code); 14941 } 14942 + 14943 +#if NCURSES_SP_FUNCS 14944 +NCURSES_EXPORT(int) 14945 +key_defined(const char *str) 14946 +{ 14947 + return NCURSES_SP_NAME(key_defined) (CURRENT_SCREEN, str); 14948 +} 14949 +#endif 14950 diff -Naur ncurses-5.7.orig/ncurses/base/keyok.c ncurses-5.7/ncurses/base/keyok.c 14951 --- ncurses-5.7.orig/ncurses/base/keyok.c 2006-12-30 08:22:33.000000000 -0800 14952 +++ ncurses-5.7/ncurses/base/keyok.c 2009-02-15 23:21:24.620481072 -0800 14953 @@ -1,5 +1,5 @@ 14954 /**************************************************************************** 14955 - * Copyright (c) 1998-2000,2006 Free Software Foundation, Inc. * 14956 + * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. * 14957 * * 14958 * Permission is hereby granted, free of charge, to any person obtaining a * 14959 * copy of this software and associated documentation files (the * 14960 @@ -27,12 +27,13 @@ 14961 ****************************************************************************/ 14962 14963 /**************************************************************************** 14964 - * Author: Thomas E. Dickey 1997-on * 14965 + * Author: Thomas E. Dickey 1997-on * 14966 + * and: Juergen Pfeifer 2009 * 14967 ****************************************************************************/ 14968 14969 #include <curses.priv.h> 14970 14971 -MODULE_ID("$Id: keyok.c,v 1.7 2006/12/30 16:22:33 tom Exp $") 14972 +MODULE_ID("$Id: keyok.c,v 1.8 2009/02/15 00:31:38 tom Exp $") 14973 14974 /* 14975 * Enable (or disable) ncurses' interpretation of a keycode by adding (or 14976 @@ -45,7 +46,7 @@ 14977 */ 14978 14979 NCURSES_EXPORT(int) 14980 -keyok(int c, bool flag) 14981 +NCURSES_SP_NAME(keyok) (NCURSES_SP_DCLx int c, bool flag) 14982 { 14983 int code = ERR; 14984 int count = 0; 14985 @@ -55,18 +56,18 @@ 14986 if (c >= 0) { 14987 unsigned ch = (unsigned) c; 14988 if (flag) { 14989 - while ((s = _nc_expand_try(SP->_key_ok, ch, &count, 0)) != 0 14990 - && _nc_remove_key(&(SP->_key_ok), ch)) { 14991 - code = _nc_add_to_try(&(SP->_keytry), s, ch); 14992 + while ((s = _nc_expand_try(SP_PARM->_key_ok, ch, &count, 0)) != 0 14993 + && _nc_remove_key(&(SP_PARM->_key_ok), ch)) { 14994 + code = _nc_add_to_try(&(SP_PARM->_keytry), s, ch); 14995 free(s); 14996 count = 0; 14997 if (code != OK) 14998 break; 14999 } 15000 } else { 15001 - while ((s = _nc_expand_try(SP->_keytry, ch, &count, 0)) != 0 15002 - && _nc_remove_key(&(SP->_keytry), ch)) { 15003 - code = _nc_add_to_try(&(SP->_key_ok), s, ch); 15004 + while ((s = _nc_expand_try(SP_PARM->_keytry, ch, &count, 0)) != 0 15005 + && _nc_remove_key(&(SP_PARM->_keytry), ch)) { 15006 + code = _nc_add_to_try(&(SP_PARM->_key_ok), s, ch); 15007 free(s); 15008 count = 0; 15009 if (code != OK) 15010 @@ -76,3 +77,11 @@ 15011 } 15012 returnCode(code); 15013 } 15014 + 15015 +#if NCURSES_SP_FUNCS 15016 +NCURSES_EXPORT(int) 15017 +keyok(int c, bool flag) 15018 +{ 15019 + return NCURSES_SP_NAME(keyok) (CURRENT_SCREEN, c, flag); 15020 +} 15021 +#endif 15022 diff -Naur ncurses-5.7.orig/ncurses/base/legacy_coding.c ncurses-5.7/ncurses/base/legacy_coding.c 15023 --- ncurses-5.7.orig/ncurses/base/legacy_coding.c 2005-12-17 15:38:17.000000000 -0800 15024 +++ ncurses-5.7/ncurses/base/legacy_coding.c 2009-02-15 23:21:24.620481072 -0800 15025 @@ -1,5 +1,5 @@ 15026 /**************************************************************************** 15027 - * Copyright (c) 2005 Free Software Foundation, Inc. * 15028 + * Copyright (c) 2005,2009 Free Software Foundation, Inc. * 15029 * * 15030 * Permission is hereby granted, free of charge, to any person obtaining a * 15031 * copy of this software and associated documentation files (the * 15032 @@ -27,22 +27,31 @@ 15033 ****************************************************************************/ 15034 15035 /**************************************************************************** 15036 - * Author: Thomas E. Dickey * 15037 + * Author: Thomas E. Dickey 2005 * 15038 + * Juergen Pfeifer 2009 * 15039 ****************************************************************************/ 15040 15041 #include <curses.priv.h> 15042 15043 -MODULE_ID("$Id: legacy_coding.c,v 1.2 2005/12/17 23:38:17 tom Exp $") 15044 +MODULE_ID("$Id: legacy_coding.c,v 1.3 2009/02/14 21:46:14 tom Exp $") 15045 15046 NCURSES_EXPORT(int) 15047 -use_legacy_coding(int level) 15048 +NCURSES_SP_NAME(use_legacy_coding) (NCURSES_SP_DCLx int level) 15049 { 15050 int result = ERR; 15051 15052 T((T_CALLED("use_legacy_coding(%d)"), level)); 15053 - if (level >= 0 && level <= 2 && SP != 0) { 15054 - result = SP->_legacy_coding; 15055 - SP->_legacy_coding = level; 15056 + if (level >= 0 && level <= 2 && SP_PARM != 0) { 15057 + result = SP_PARM->_legacy_coding; 15058 + SP_PARM->_legacy_coding = level; 15059 } 15060 returnCode(result); 15061 } 15062 + 15063 +#if NCURSES_SP_FUNCS 15064 +NCURSES_EXPORT(int) 15065 +use_legacy_coding(int level) 15066 +{ 15067 + return NCURSES_SP_NAME(use_legacy_coding) (CURRENT_SCREEN, level); 15068 +} 15069 +#endif 14484 15070 diff -Naur ncurses-5.7.orig/ncurses/base/lib_addch.c ncurses-5.7/ncurses/base/lib_addch.c 14485 15071 --- ncurses-5.7.orig/ncurses/base/lib_addch.c 2008-08-16 12:20:04.000000000 -0700 14486 +++ ncurses-5.7/ncurses/base/lib_addch.c 2009-02- 07 22:08:35.070519626-080015072 +++ ncurses-5.7/ncurses/base/lib_addch.c 2009-02-15 23:21:15.875920379 -0800 14487 15073 @@ -1,5 +1,5 @@ 14488 15074 /**************************************************************************** … … 14539 15125 /* 14540 15126 * Check for cells which are orphaned by adding this character, set 15127 diff -Naur ncurses-5.7.orig/ncurses/base/lib_beep.c ncurses-5.7/ncurses/base/lib_beep.c 15128 --- ncurses-5.7.orig/ncurses/base/lib_beep.c 2005-04-09 08:20:04.000000000 -0700 15129 +++ ncurses-5.7/ncurses/base/lib_beep.c 2009-02-15 23:21:24.620481072 -0800 15130 @@ -1,5 +1,5 @@ 15131 /**************************************************************************** 15132 - * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc. * 15133 + * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * 15134 * * 15135 * Permission is hereby granted, free of charge, to any person obtaining a * 15136 * copy of this software and associated documentation files (the * 15137 @@ -30,6 +30,7 @@ 15138 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 15139 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 15140 * and: Thomas E. Dickey 1996-on * 15141 + * and: Juergen Pfeifer 2009 * 15142 ****************************************************************************/ 15143 15144 /* 15145 @@ -42,7 +43,7 @@ 15146 #include <curses.priv.h> 15147 #include <term.h> /* beep, flash */ 15148 15149 -MODULE_ID("$Id: lib_beep.c,v 1.10 2005/04/09 15:20:04 tom Exp $") 15150 +MODULE_ID("$Id: lib_beep.c,v 1.11 2009/02/15 00:32:06 tom Exp $") 15151 15152 /* 15153 * beep() 15154 @@ -53,7 +54,7 @@ 15155 */ 15156 15157 NCURSES_EXPORT(int) 15158 -beep(void) 15159 +NCURSES_SP_NAME(beep) (NCURSES_SP_DCL0) 15160 { 15161 int res = ERR; 15162 15163 @@ -74,3 +75,11 @@ 15164 15165 returnCode(res); 15166 } 15167 + 15168 +#if NCURSES_SP_FUNCS 15169 +NCURSES_EXPORT(int) 15170 +beep(void) 15171 +{ 15172 + return NCURSES_SP_NAME(beep) (CURRENT_SCREEN); 15173 +} 15174 +#endif 14541 15175 diff -Naur ncurses-5.7.orig/ncurses/base/lib_color.c ncurses-5.7/ncurses/base/lib_color.c 14542 15176 --- ncurses-5.7.orig/ncurses/base/lib_color.c 2007-04-07 10:07:28.000000000 -0700 14543 +++ ncurses-5.7/ncurses/base/lib_color.c 2009-02- 07 22:08:36.698833077-080015177 +++ ncurses-5.7/ncurses/base/lib_color.c 2009-02-15 23:21:24.620481072 -0800 14544 15178 @@ -1,5 +1,5 @@ 14545 15179 /**************************************************************************** … … 14549 15183 * Permission is hereby granted, free of charge, to any person obtaining a * 14550 15184 * copy of this software and associated documentation files (the * 14551 @@ -42,7 +42,7 @@ 15185 @@ -30,6 +30,7 @@ 15186 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 15187 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 15188 * and: Thomas E. Dickey 1996-on * 15189 + * and: Juergen Pfeifer 2009 * 15190 ****************************************************************************/ 15191 15192 /* lib_color.c 15193 @@ -42,7 +43,7 @@ 14552 15194 #include <term.h> 14553 15195 #include <tic.h> 14554 15196 14555 15197 -MODULE_ID("$Id: lib_color.c,v 1.85 2007/04/07 17:07:28 tom Exp $") 14556 +MODULE_ID("$Id: lib_color.c,v 1.8 7 2009/01/25 00:25:31tom Exp $")15198 +MODULE_ID("$Id: lib_color.c,v 1.88 2009/02/15 00:33:02 tom Exp $") 14557 15199 14558 15200 /* 14559 15201 * These should be screen structure members. They need to be globals for 14560 @@ -108,6 +10 8,13 @@15202 @@ -108,6 +109,13 @@ 14561 15203 }; 14562 15204 /* *INDENT-ON* */ … … 14572 15214 /* 14573 15215 * These are called from _nc_do_color(), which in turn is called from 14574 @@ -255,6 +262,15 @@ 15216 @@ -237,15 +245,15 @@ 15217 } 15218 15219 NCURSES_EXPORT(int) 15220 -start_color(void) 15221 +NCURSES_SP_NAME(start_color) (NCURSES_SP_DCL0) 15222 { 15223 int result = ERR; 15224 15225 T((T_CALLED("start_color()"))); 15226 15227 - if (SP == 0) { 15228 + if (SP_PARM == 0) { 15229 result = ERR; 15230 - } else if (SP->_coloron) { 15231 + } else if (SP_PARM->_coloron) { 15232 result = OK; 15233 } else { 15234 15235 @@ -255,27 +263,38 @@ 14575 15236 } 14576 15237 14577 15238 if (max_pairs > 0 && max_colors > 0) { 14578 + SP->_pair_limit = max_pairs; 15239 - SP->_pair_count = max_pairs; 15240 - SP->_color_count = max_colors; 15241 + SP_PARM->_pair_limit = max_pairs; 14579 15242 + 14580 15243 +#if NCURSES_EXT_FUNCS … … 14583 15246 + * allow for default-color as a component of a color-pair. 14584 15247 + */ 14585 + SP ->_pair_limit += (1 + (2 * max_colors));15248 + SP_PARM->_pair_limit += (1 + (2 * max_colors)); 14586 15249 +#endif 14587 SP->_pair_count = max_pairs;14588 SP->_color_count = max_colors;15250 + SP_PARM->_pair_count = max_pairs; 15251 + SP_PARM->_color_count = max_colors; 14589 15252 #if !USE_REENTRANT 14590 @@ -263,7 +279,7 @@ 15253 COLOR_PAIRS = max_pairs; 15254 COLORS = max_colors; 14591 15255 #endif 14592 15256 14593 15257 - if ((SP->_color_pairs = TYPE_CALLOC(colorpair_t, 14594 15258 - max_pairs)) != 0) { 14595 + SP->_pair_limit)) != 0) { 14596 if ((SP->_color_table = TYPE_CALLOC(color_t, 14597 max_colors)) != 0) { 14598 SP->_color_pairs[0] = PAIR_OF(default_fg(), default_bg()); 14599 @@ -331,21 +347,69 @@ 14600 init_pair(short pair, short f, short b) 15259 - if ((SP->_color_table = TYPE_CALLOC(color_t, 15260 - max_colors)) != 0) { 15261 - SP->_color_pairs[0] = PAIR_OF(default_fg(), default_bg()); 15262 + SP_PARM->_color_pairs = TYPE_CALLOC(colorpair_t, 15263 + SP_PARM->_pair_limit); 15264 + if (SP_PARM->_color_pairs != 0) { 15265 + SP_PARM->_color_table = TYPE_CALLOC(color_t, max_colors); 15266 + if (SP_PARM->_color_table != 0) { 15267 + SP_PARM->_color_pairs[0] = PAIR_OF(default_fg(), 15268 + default_bg()); 15269 init_color_table(); 15270 15271 T(("started color: COLORS = %d, COLOR_PAIRS = %d", 15272 COLORS, COLOR_PAIRS)); 15273 15274 - SP->_coloron = 1; 15275 + SP_PARM->_coloron = 1; 15276 result = OK; 15277 - } else if (SP->_color_pairs != 0) { 15278 - FreeAndNull(SP->_color_pairs); 15279 + } else if (SP_PARM->_color_pairs != 0) { 15280 + FreeAndNull(SP_PARM->_color_pairs); 15281 } 15282 } 15283 } else { 15284 @@ -285,6 +304,14 @@ 15285 returnCode(result); 15286 } 15287 15288 +#if NCURSES_SP_FUNCS 15289 +NCURSES_EXPORT(int) 15290 +start_color(void) 15291 +{ 15292 + return NCURSES_SP_NAME(start_color) (CURRENT_SCREEN); 15293 +} 15294 +#endif 15295 + 15296 /* This function was originally written by Daniel Weaver <danw@znyx.com> */ 15297 static void 15298 rgb2hls(short r, short g, short b, short *h, short *l, short *s) 15299 @@ -328,24 +355,72 @@ 15300 * values. 15301 */ 15302 NCURSES_EXPORT(int) 15303 -init_pair(short pair, short f, short b) 15304 +NCURSES_SP_NAME(init_pair) (NCURSES_SP_DCLx short pair, short f, short b) 14601 15305 { 14602 15306 colorpair_t result; … … 14609 15313 returnCode(ERR); 14610 15314 + 14611 + previous = SP ->_color_pairs[pair];15315 + previous = SP_PARM->_color_pairs[pair]; 14612 15316 #if NCURSES_EXT_FUNCS 14613 15317 - if (SP->_default_color) { 14614 15318 - if (f < 0) 15319 + if (SP_PARM->_default_color) { 14615 15320 + bool isDefault = FALSE; 14616 15321 + bool wasDefault = FALSE; 14617 + int default_pairs = SP ->_default_pairs;15322 + int default_pairs = SP_PARM->_default_pairs; 14618 15323 + 14619 15324 + /* … … 14665 15370 + * with sequentially adding new pairs. 14666 15371 + */ 14667 + if (pair > (SP ->_pair_count + default_pairs)) {15372 + if (pair > (SP_PARM->_pair_count + default_pairs)) { 14668 15373 returnCode(ERR); 14669 15374 + } 14670 + SP ->_default_pairs = default_pairs;15375 + SP_PARM->_default_pairs = default_pairs; 14671 15376 } else 14672 15377 #endif 14673 15378 { 14674 @@ -361,8 +4 25,8 @@15379 @@ -361,8 +436,8 @@ 14675 15380 * pair colors with the new ones). 14676 15381 */ … … 14683 15388 14684 15389 for (y = 0; y <= curscr->_maxy; y++) { 14685 @@ -496,11 +560,11 @@ 15390 @@ -381,9 +456,9 @@ 15391 _nc_make_oldhash(y); 15392 } 15393 } 15394 - SP->_color_pairs[pair] = result; 15395 - if (GET_SCREEN_PAIR(SP) == pair) 15396 - SET_SCREEN_PAIR(SP, (chtype) (~0)); /* force attribute update */ 15397 + SP_PARM->_color_pairs[pair] = result; 15398 + if (GET_SCREEN_PAIR(SP_PARM) == pair) 15399 + SET_SCREEN_PAIR(SP_PARM, (chtype) (~0)); /* force attribute update */ 15400 15401 if (initialize_pair && InPalette(f) && InPalette(b)) { 15402 const color_t *tp = hue_lightness_saturation ? hls_palette : cga_palette; 15403 @@ -404,54 +479,79 @@ 15404 returnCode(OK); 15405 } 15406 15407 +#if NCURSES_SP_FUNCS 15408 +NCURSES_EXPORT(int) 15409 +init_pair(short pair, short f, short b) 15410 +{ 15411 + return NCURSES_SP_NAME(init_pair) (CURRENT_SCREEN, pair, f, b); 15412 +} 15413 +#endif 15414 + 15415 #define okRGB(n) ((n) >= 0 && (n) <= 1000) 15416 15417 NCURSES_EXPORT(int) 15418 -init_color(short color, short r, short g, short b) 15419 +NCURSES_SP_NAME(init_color) (NCURSES_SP_DCLx 15420 + short color, short r, short g, short b) 15421 { 15422 int result = ERR; 15423 15424 T((T_CALLED("init_color(%d,%d,%d,%d)"), color, r, g, b)); 15425 15426 if (initialize_color != NULL 15427 - && SP != 0 15428 - && SP->_coloron 15429 + && SP_PARM != 0 15430 + && SP_PARM->_coloron 15431 && (color >= 0 && OkColorHi(color)) 15432 && (okRGB(r) && okRGB(g) && okRGB(b))) { 15433 15434 - SP->_color_table[color].init = 1; 15435 - SP->_color_table[color].r = r; 15436 - SP->_color_table[color].g = g; 15437 - SP->_color_table[color].b = b; 15438 + SP_PARM->_color_table[color].init = 1; 15439 + SP_PARM->_color_table[color].r = r; 15440 + SP_PARM->_color_table[color].g = g; 15441 + SP_PARM->_color_table[color].b = b; 15442 15443 if (hue_lightness_saturation) { 15444 rgb2hls(r, g, b, 15445 - &SP->_color_table[color].red, 15446 - &SP->_color_table[color].green, 15447 - &SP->_color_table[color].blue); 15448 + &SP_PARM->_color_table[color].red, 15449 + &SP_PARM->_color_table[color].green, 15450 + &SP_PARM->_color_table[color].blue); 15451 } else { 15452 - SP->_color_table[color].red = r; 15453 - SP->_color_table[color].green = g; 15454 - SP->_color_table[color].blue = b; 15455 + SP_PARM->_color_table[color].red = r; 15456 + SP_PARM->_color_table[color].green = g; 15457 + SP_PARM->_color_table[color].blue = b; 15458 } 15459 15460 TPUTS_TRACE("initialize_color"); 15461 putp(TPARM_4(initialize_color, color, r, g, b)); 15462 - SP->_color_defs = max(color + 1, SP->_color_defs); 15463 + SP_PARM->_color_defs = max(color + 1, SP_PARM->_color_defs); 15464 result = OK; 15465 } 15466 returnCode(result); 15467 } 15468 15469 +#if NCURSES_SP_FUNCS 15470 +NCURSES_EXPORT(int) 15471 +init_color(short color, short r, short g, short b) 15472 +{ 15473 + return NCURSES_SP_NAME(init_color) (CURRENT_SCREEN, color, r, g, b); 15474 +} 15475 +#endif 15476 + 15477 NCURSES_EXPORT(bool) 15478 -can_change_color(void) 15479 +NCURSES_SP_NAME(can_change_color) (NCURSES_SP_DCL0) 15480 { 15481 T((T_CALLED("can_change_color()"))); 15482 returnCode((can_change != 0) ? TRUE : FALSE); 15483 } 15484 15485 +#if NCURSES_SP_FUNCS 15486 NCURSES_EXPORT(bool) 15487 -has_colors(void) 15488 +can_change_color(void) 15489 +{ 15490 + return NCURSES_SP_NAME(can_change_color) (CURRENT_SCREEN); 15491 +} 15492 +#endif 15493 + 15494 +NCURSES_EXPORT(bool) 15495 +NCURSES_SP_NAME(has_colors) (NCURSES_SP_DCL0) 15496 { 15497 T((T_CALLED("has_colors()"))); 15498 returnCode((VALID_NUMERIC(max_colors) && VALID_NUMERIC(max_pairs) 15499 @@ -462,18 +562,27 @@ 15500 || set_color_pair)) ? TRUE : FALSE); 15501 } 15502 15503 +#if NCURSES_SP_FUNCS 15504 +NCURSES_EXPORT(bool) 15505 +has_colors(void) 15506 +{ 15507 + return NCURSES_SP_NAME(has_colors) (CURRENT_SCREEN); 15508 +} 15509 +#endif 15510 + 15511 NCURSES_EXPORT(int) 15512 -color_content(short color, short *r, short *g, short *b) 15513 +NCURSES_SP_NAME(color_content) (NCURSES_SP_DCLx short color, short *r, 15514 + short *g, short *b) 15515 { 15516 int result; 15517 15518 T((T_CALLED("color_content(%d,%p,%p,%p)"), color, r, g, b)); 15519 - if (color < 0 || !OkColorHi(color) || SP == 0 || !SP->_coloron) { 15520 + if (color < 0 || !OkColorHi(color) || SP_PARM == 0 || !SP_PARM->_coloron) { 15521 result = ERR; 15522 } else { 15523 - NCURSES_COLOR_T c_r = SP->_color_table[color].red; 15524 - NCURSES_COLOR_T c_g = SP->_color_table[color].green; 15525 - NCURSES_COLOR_T c_b = SP->_color_table[color].blue; 15526 + NCURSES_COLOR_T c_r = SP_PARM->_color_table[color].red; 15527 + NCURSES_COLOR_T c_g = SP_PARM->_color_table[color].green; 15528 + NCURSES_COLOR_T c_b = SP_PARM->_color_table[color].blue; 15529 15530 if (r) 15531 *r = c_r; 15532 @@ -489,18 +598,27 @@ 15533 returnCode(result); 15534 } 15535 15536 +#if NCURSES_SP_FUNCS 15537 NCURSES_EXPORT(int) 15538 -pair_content(short pair, short *f, short *b) 15539 +color_content(short color, short *r, short *g, short *b) 15540 +{ 15541 + return NCURSES_SP_NAME(color_content) (CURRENT_SCREEN, color, r, g, b); 15542 +} 15543 +#endif 15544 + 15545 +NCURSES_EXPORT(int) 15546 +NCURSES_SP_NAME(pair_content) (NCURSES_SP_DCLx short pair, short *f, 15547 + short *b) 15548 { 15549 int result; 14686 15550 14687 15551 T((T_CALLED("pair_content(%d,%p,%p)"), pair, f, b)); … … 14693 15557 - NCURSES_COLOR_T fg = ((SP->_color_pairs[pair] >> C_SHIFT) & C_MASK); 14694 15558 - NCURSES_COLOR_T bg = (SP->_color_pairs[pair] & C_MASK); 14695 + NCURSES_COLOR_T fg = FORE_OF(SP ->_color_pairs[pair]);14696 + NCURSES_COLOR_T bg = BACK_OF(SP ->_color_pairs[pair]);15559 + NCURSES_COLOR_T fg = FORE_OF(SP_PARM->_color_pairs[pair]); 15560 + NCURSES_COLOR_T bg = BACK_OF(SP_PARM->_color_pairs[pair]); 14697 15561 14698 15562 #if NCURSES_EXT_FUNCS 14699 15563 if (fg == COLOR_DEFAULT) 14700 @@ -527,7 +591,7 @@ 15564 @@ -520,6 +638,14 @@ 15565 returnCode(result); 15566 } 15567 15568 +#if NCURSES_SP_FUNCS 15569 +NCURSES_EXPORT(int) 15570 +pair_content(short pair, short *f, short *b) 15571 +{ 15572 + return NCURSES_SP_NAME(pair_content) (CURRENT_SCREEN, pair, f, b); 15573 +} 15574 +#endif 15575 + 15576 NCURSES_EXPORT(void) 15577 _nc_do_color(short old_pair, short pair, bool reverse, int (*outc) (int)) 15578 { 15579 @@ -527,7 +653,7 @@ 14701 15580 NCURSES_COLOR_T bg = COLOR_DEFAULT; 14702 15581 NCURSES_COLOR_T old_fg, old_bg; … … 14709 15588 diff -Naur ncurses-5.7.orig/ncurses/base/lib_colorset.c ncurses-5.7/ncurses/base/lib_colorset.c 14710 15589 --- ncurses-5.7.orig/ncurses/base/lib_colorset.c 2005-01-29 13:40:51.000000000 -0800 14711 +++ ncurses-5.7/ncurses/base/lib_colorset.c 2009-02- 07 22:08:36.698833077-080015590 +++ ncurses-5.7/ncurses/base/lib_colorset.c 2009-02-15 23:21:17.376018158 -0800 14712 15591 @@ -1,5 +1,5 @@ 14713 15592 /**************************************************************************** … … 14755 15634 + returnCode(code); 14756 15635 } 15636 diff -Naur ncurses-5.7.orig/ncurses/base/lib_dft_fgbg.c ncurses-5.7/ncurses/base/lib_dft_fgbg.c 15637 --- ncurses-5.7.orig/ncurses/base/lib_dft_fgbg.c 2005-11-26 12:03:38.000000000 -0800 15638 +++ ncurses-5.7/ncurses/base/lib_dft_fgbg.c 2009-02-15 23:21:24.620481072 -0800 15639 @@ -1,5 +1,5 @@ 15640 /**************************************************************************** 15641 - * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. * 15642 + * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * 15643 * * 15644 * Permission is hereby granted, free of charge, to any person obtaining a * 15645 * copy of this software and associated documentation files (the * 15646 @@ -27,31 +27,40 @@ 15647 ****************************************************************************/ 15648 15649 /**************************************************************************** 15650 - * Author: Thomas E. Dickey * 15651 + * Author: Thomas E. Dickey 1998-on * 15652 + * Juergen Pfeifer 2009 * 15653 ****************************************************************************/ 15654 15655 #include <curses.priv.h> 15656 #include <term.h> 15657 15658 -MODULE_ID("$Id: lib_dft_fgbg.c,v 1.18 2005/11/26 20:03:38 tom Exp $") 15659 +MODULE_ID("$Id: lib_dft_fgbg.c,v 1.19 2009/02/14 21:53:21 tom Exp $") 15660 15661 /* 15662 * Modify the behavior of color-pair 0 so that the library doesn't assume that 15663 * it is white on black. This is an extension to XSI curses. 15664 */ 15665 NCURSES_EXPORT(int) 15666 -use_default_colors(void) 15667 +NCURSES_SP_NAME(use_default_colors) (NCURSES_SP_DCL0) 15668 { 15669 T((T_CALLED("use_default_colors()"))); 15670 - returnCode(assume_default_colors(-1, -1)); 15671 + returnCode(NCURSES_SP_NAME(assume_default_colors) (NCURSES_SP_ARGx - 1, -1)); 15672 +} 15673 + 15674 +#if NCURSES_SP_FUNCS 15675 +NCURSES_EXPORT(int) 15676 +use_default_colors(void) 15677 +{ 15678 + return NCURSES_SP_NAME(use_default_colors) (CURRENT_SCREEN); 15679 } 15680 +#endif 15681 15682 /* 15683 * Modify the behavior of color-pair 0 so that the library assumes that it 15684 * is something specific, possibly not white on black. 15685 */ 15686 NCURSES_EXPORT(int) 15687 -assume_default_colors(int fg, int bg) 15688 +NCURSES_SP_NAME(assume_default_colors) (NCURSES_SP_DCLx int fg, int bg) 15689 { 15690 T((T_CALLED("assume_default_colors(%d,%d)"), fg, bg)); 15691 15692 @@ -61,15 +70,23 @@ 15693 if (initialize_pair) /* don't know how to handle this */ 15694 returnCode(ERR); 15695 15696 - SP->_default_color = isDefaultColor(fg) || isDefaultColor(bg); 15697 - SP->_has_sgr_39_49 = (tigetflag("AX") == TRUE); 15698 - SP->_default_fg = isDefaultColor(fg) ? COLOR_DEFAULT : (fg & C_MASK); 15699 - SP->_default_bg = isDefaultColor(bg) ? COLOR_DEFAULT : (bg & C_MASK); 15700 - if (SP->_color_pairs != 0) { 15701 - bool save = SP->_default_color; 15702 - SP->_default_color = TRUE; 15703 + SP_PARM->_default_color = isDefaultColor(fg) || isDefaultColor(bg); 15704 + SP_PARM->_has_sgr_39_49 = (tigetflag("AX") == TRUE); 15705 + SP_PARM->_default_fg = isDefaultColor(fg) ? COLOR_DEFAULT : (fg & C_MASK); 15706 + SP_PARM->_default_bg = isDefaultColor(bg) ? COLOR_DEFAULT : (bg & C_MASK); 15707 + if (SP_PARM->_color_pairs != 0) { 15708 + bool save = SP_PARM->_default_color; 15709 + SP_PARM->_default_color = TRUE; 15710 init_pair(0, (short) fg, (short) bg); 15711 - SP->_default_color = save; 15712 + SP_PARM->_default_color = save; 15713 } 15714 returnCode(OK); 15715 } 15716 + 15717 +#if NCURSES_SP_FUNCS 15718 +NCURSES_EXPORT(int) 15719 +assume_default_colors(int fg, int bg) 15720 +{ 15721 + return NCURSES_SP_NAME(assume_default_colors) (CURRENT_SCREEN, fg, bg); 15722 +} 15723 +#endif 15724 diff -Naur ncurses-5.7.orig/ncurses/base/lib_echo.c ncurses-5.7/ncurses/base/lib_echo.c 15725 --- ncurses-5.7.orig/ncurses/base/lib_echo.c 2000-12-09 18:43:27.000000000 -0800 15726 +++ ncurses-5.7/ncurses/base/lib_echo.c 2009-02-15 23:21:24.620481072 -0800 15727 @@ -1,5 +1,5 @@ 15728 /**************************************************************************** 15729 - * Copyright (c) 1998,2000 Free Software Foundation, Inc. * 15730 + * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc. * 15731 * * 15732 * Permission is hereby granted, free of charge, to any person obtaining a * 15733 * copy of this software and associated documentation files (the * 15734 @@ -29,6 +29,8 @@ 15735 /**************************************************************************** 15736 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 15737 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 15738 + * and: Thomas E. Dickey 1996-on * 15739 + * and: Juergen Pfeifer 2009 * 15740 ****************************************************************************/ 15741 15742 /* 15743 @@ -42,20 +44,36 @@ 15744 15745 #include <curses.priv.h> 15746 15747 -MODULE_ID("$Id: lib_echo.c,v 1.5 2000/12/10 02:43:27 tom Exp $") 15748 +MODULE_ID("$Id: lib_echo.c,v 1.6 2009/02/15 00:34:19 tom Exp $") 15749 15750 NCURSES_EXPORT(int) 15751 -echo(void) 15752 +NCURSES_SP_NAME(echo) (NCURSES_SP_DCL0) 15753 { 15754 T((T_CALLED("echo()"))); 15755 - SP->_echo = TRUE; 15756 + SP_PARM->_echo = TRUE; 15757 returnCode(OK); 15758 } 15759 15760 +#if NCURSES_SP_FUNCS 15761 NCURSES_EXPORT(int) 15762 -noecho(void) 15763 +echo(void) 15764 +{ 15765 + return NCURSES_SP_NAME(echo) (CURRENT_SCREEN); 15766 +} 15767 +#endif 15768 + 15769 +NCURSES_EXPORT(int) 15770 +NCURSES_SP_NAME(noecho) (NCURSES_SP_DCL0) 15771 { 15772 T((T_CALLED("noecho()"))); 15773 - SP->_echo = FALSE; 15774 + SP_PARM->_echo = FALSE; 15775 returnCode(OK); 15776 } 15777 + 15778 +#if NCURSES_SP_FUNCS 15779 +NCURSES_EXPORT(int) 15780 +noecho(void) 15781 +{ 15782 + return NCURSES_SP_NAME(noecho) (CURRENT_SCREEN); 15783 +} 15784 +#endif 15785 diff -Naur ncurses-5.7.orig/ncurses/base/lib_endwin.c ncurses-5.7/ncurses/base/lib_endwin.c 15786 --- ncurses-5.7.orig/ncurses/base/lib_endwin.c 2000-12-09 18:43:27.000000000 -0800 15787 +++ ncurses-5.7/ncurses/base/lib_endwin.c 2009-02-15 23:21:24.620481072 -0800 15788 @@ -1,5 +1,5 @@ 15789 /**************************************************************************** 15790 - * Copyright (c) 1998,2000 Free Software Foundation, Inc. * 15791 + * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc. * 15792 * * 15793 * Permission is hereby granted, free of charge, to any person obtaining a * 15794 * copy of this software and associated documentation files (the * 15795 @@ -29,6 +29,8 @@ 15796 /**************************************************************************** 15797 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 15798 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 15799 + * and: Thomas E. Dickey 1996-on * 15800 + * and: Juergen Pfeifer 2009 * 15801 ****************************************************************************/ 15802 15803 /* 15804 @@ -41,16 +43,16 @@ 15805 #include <curses.priv.h> 15806 #include <term.h> 15807 15808 -MODULE_ID("$Id: lib_endwin.c,v 1.19 2000/12/10 02:43:27 tom Exp $") 15809 +MODULE_ID("$Id: lib_endwin.c,v 1.20 2009/02/15 00:35:00 tom Exp $") 15810 15811 NCURSES_EXPORT(int) 15812 -endwin(void) 15813 +NCURSES_SP_NAME(endwin) (NCURSES_SP_DCL0) 15814 { 15815 T((T_CALLED("endwin()"))); 15816 15817 - if (SP) { 15818 - SP->_endwin = TRUE; 15819 - SP->_mouse_wrap(SP); 15820 + if (SP_PARM) { 15821 + SP_PARM->_endwin = TRUE; 15822 + SP_PARM->_mouse_wrap(SP_PARM); 15823 _nc_screen_wrap(); 15824 _nc_mvcur_wrap(); /* wrap up cursor addressing */ 15825 returnCode(reset_shell_mode()); 15826 @@ -58,3 +60,11 @@ 15827 15828 returnCode(ERR); 15829 } 15830 + 15831 +#if NCURSES_SP_FUNCS 15832 +NCURSES_EXPORT(int) 15833 +endwin(void) 15834 +{ 15835 + return NCURSES_SP_NAME(endwin) (CURRENT_SCREEN); 15836 +} 15837 +#endif 15838 diff -Naur ncurses-5.7.orig/ncurses/base/lib_flash.c ncurses-5.7/ncurses/base/lib_flash.c 15839 --- ncurses-5.7.orig/ncurses/base/lib_flash.c 2000-12-09 18:43:27.000000000 -0800 15840 +++ ncurses-5.7/ncurses/base/lib_flash.c 2009-02-15 23:21:24.624480793 -0800 15841 @@ -1,5 +1,5 @@ 15842 /**************************************************************************** 15843 - * Copyright (c) 1998,2000 Free Software Foundation, Inc. * 15844 + * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc. * 15845 * * 15846 * Permission is hereby granted, free of charge, to any person obtaining a * 15847 * copy of this software and associated documentation files (the * 15848 @@ -29,6 +29,8 @@ 15849 /**************************************************************************** 15850 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 15851 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 15852 + * and: Thomas E. Dickey 1996-on * 15853 + * and: Juergen Pfeifer 2009 * 15854 ****************************************************************************/ 15855 15856 /* 15857 @@ -41,7 +43,7 @@ 15858 #include <curses.priv.h> 15859 #include <term.h> /* beep, flash */ 15860 15861 -MODULE_ID("$Id: lib_flash.c,v 1.6 2000/12/10 02:43:27 tom Exp $") 15862 +MODULE_ID("$Id: lib_flash.c,v 1.7 2009/02/15 00:35:15 tom Exp $") 15863 15864 /* 15865 * flash() 15866 @@ -52,7 +54,7 @@ 15867 */ 15868 15869 NCURSES_EXPORT(int) 15870 -flash(void) 15871 +NCURSES_SP_NAME(flash) (NCURSES_SP_DCL0) 15872 { 15873 int res = ERR; 15874 15875 @@ -71,3 +73,11 @@ 15876 15877 returnCode(res); 15878 } 15879 + 15880 +#if NCURSES_SP_FUNCS 15881 +NCURSES_EXPORT(int) 15882 +flash(void) 15883 +{ 15884 + return NCURSES_SP_NAME(flash) (CURRENT_SCREEN); 15885 +} 15886 +#endif 14757 15887 diff -Naur ncurses-5.7.orig/ncurses/base/lib_freeall.c ncurses-5.7/ncurses/base/lib_freeall.c 14758 15888 --- ncurses-5.7.orig/ncurses/base/lib_freeall.c 2008-09-27 06:09:57.000000000 -0700 14759 +++ ncurses-5.7/ncurses/base/lib_freeall.c 2009-02- 07 22:08:20.957088421-080015889 +++ ncurses-5.7/ncurses/base/lib_freeall.c 2009-02-15 23:21:03.083101270 -0800 14760 15890 @@ -40,7 +40,7 @@ 14761 15891 extern int malloc_errfd; /* FIXME */ … … 14776 15906 (void) _nc_printf_string(0, empty_va); 14777 15907 #ifdef TRACE 15908 diff -Naur ncurses-5.7.orig/ncurses/base/lib_getch.c ncurses-5.7/ncurses/base/lib_getch.c 15909 --- ncurses-5.7.orig/ncurses/base/lib_getch.c 2008-09-20 12:46:13.000000000 -0700 15910 +++ ncurses-5.7/ncurses/base/lib_getch.c 2009-02-15 23:21:24.624480793 -0800 15911 @@ -1,5 +1,5 @@ 15912 /**************************************************************************** 15913 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 15914 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 15915 * * 15916 * Permission is hereby granted, free of charge, to any person obtaining a * 15917 * copy of this software and associated documentation files (the * 15918 @@ -30,6 +30,7 @@ 15919 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 15920 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 15921 * and: Thomas E. Dickey 1996-on * 15922 + * and: Juergen Pfeifer 2009 * 15923 ****************************************************************************/ 15924 15925 /* 15926 @@ -41,7 +42,7 @@ 15927 15928 #include <curses.priv.h> 15929 15930 -MODULE_ID("$Id: lib_getch.c,v 1.99 2008/09/20 19:46:13 tom Exp $") 15931 +MODULE_ID("$Id: lib_getch.c,v 1.100 2009/02/15 00:36:00 tom Exp $") 15932 15933 #include <fifo_defs.h> 15934 15935 @@ -54,27 +55,36 @@ 15936 } 15937 #else 15938 #define GetEscdelay(sp) ESCDELAY 15939 -NCURSES_EXPORT_VAR(int) 15940 -ESCDELAY = 1000; /* max interval betw. chars in funkeys, in millisecs */ 15941 +NCURSES_EXPORT_VAR (int) 15942 + ESCDELAY = 1000; /* max interval betw. chars in funkeys, in millisecs */ 15943 #endif 15944 15945 #if NCURSES_EXT_FUNCS 15946 NCURSES_EXPORT(int) 15947 -set_escdelay(int value) 15948 +NCURSES_SP_NAME(set_escdelay) (NCURSES_SP_DCLx int value) 15949 { 15950 int code = OK; 15951 #if USE_REENTRANT 15952 - if (SP) { 15953 - SP->_ESCDELAY = value; 15954 + if (SP_PARM) { 15955 + SP_PARM->_ESCDELAY = value; 15956 } else { 15957 code = ERR; 15958 } 15959 #else 15960 + (void) SP_PARM; 15961 ESCDELAY = value; 15962 #endif 15963 return code; 15964 } 15965 + 15966 +#if NCURSES_SP_FUNCS 15967 +NCURSES_EXPORT(int) 15968 +set_escdelay(int value) 15969 +{ 15970 + return NCURSES_SP_NAME(set_escdelay) (CURRENT_SCREEN, value); 15971 +} 15972 #endif 15973 +#endif /* NCURSES_EXT_FUNCS */ 15974 15975 static int 15976 _nc_use_meta(WINDOW *win) 15977 diff -Naur ncurses-5.7.orig/ncurses/base/lib_isendwin.c ncurses-5.7/ncurses/base/lib_isendwin.c 15978 --- ncurses-5.7.orig/ncurses/base/lib_isendwin.c 2000-12-09 18:43:27.000000000 -0800 15979 +++ ncurses-5.7/ncurses/base/lib_isendwin.c 2009-02-15 23:21:24.624480793 -0800 15980 @@ -1,5 +1,5 @@ 15981 /**************************************************************************** 15982 - * Copyright (c) 1998,2000 Free Software Foundation, Inc. * 15983 + * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc. * 15984 * * 15985 * Permission is hereby granted, free of charge, to any person obtaining a * 15986 * copy of this software and associated documentation files (the * 15987 @@ -29,6 +29,8 @@ 15988 /**************************************************************************** 15989 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 15990 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 15991 + * and: Thomas E. Dickey 1996-on * 15992 + * and: Juergen Pfeifer 2009 * 15993 ****************************************************************************/ 15994 15995 /* 15996 @@ -40,12 +42,20 @@ 15997 15998 #include <curses.priv.h> 15999 16000 -MODULE_ID("$Id: lib_isendwin.c,v 1.6 2000/12/10 02:43:27 tom Exp $") 16001 +MODULE_ID("$Id: lib_isendwin.c,v 1.7 2009/02/15 00:36:24 tom Exp $") 16002 16003 NCURSES_EXPORT(bool) 16004 -isendwin(void) 16005 +NCURSES_SP_NAME(isendwin) (NCURSES_SP_DCL0) 16006 { 16007 - if (SP == NULL) 16008 + if (SP_PARM == NULL) 16009 return FALSE; 16010 - return SP->_endwin; 16011 + return SP_PARM->_endwin; 16012 +} 16013 + 16014 +#if NCURSES_SP_FUNCS 16015 +NCURSES_EXPORT(bool) 16016 +isendwin(void) 16017 +{ 16018 + return NCURSES_SP_NAME(isendwin) (CURRENT_SCREEN); 16019 } 16020 +#endif 14778 16021 diff -Naur ncurses-5.7.orig/ncurses/base/lib_mouse.c ncurses-5.7/ncurses/base/lib_mouse.c 14779 16022 --- ncurses-5.7.orig/ncurses/base/lib_mouse.c 2008-10-18 14:48:55.000000000 -0700 14780 +++ ncurses-5.7/ncurses/base/lib_mouse.c 2009-02- 07 22:08:20.957088421-080016023 +++ ncurses-5.7/ncurses/base/lib_mouse.c 2009-02-15 23:21:03.083101270 -0800 14781 16024 @@ -79,7 +79,7 @@ 14782 16025 … … 14835 16078 14836 16079 NCURSES_EXPORT(bool) 16080 diff -Naur ncurses-5.7.orig/ncurses/base/lib_newterm.c ncurses-5.7/ncurses/base/lib_newterm.c 16081 --- ncurses-5.7.orig/ncurses/base/lib_newterm.c 2008-08-16 14:20:48.000000000 -0700 16082 +++ ncurses-5.7/ncurses/base/lib_newterm.c 2009-02-15 23:21:24.624480793 -0800 16083 @@ -1,5 +1,5 @@ 16084 /**************************************************************************** 16085 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 16086 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 16087 * * 16088 * Permission is hereby granted, free of charge, to any person obtaining a * 16089 * copy of this software and associated documentation files (the * 16090 @@ -30,6 +30,7 @@ 16091 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 16092 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 16093 * and: Thomas E. Dickey 1996-on * 16094 + * and: Juergen Pfeifer 2009 * 16095 ****************************************************************************/ 16096 16097 /* 16098 @@ -48,7 +49,7 @@ 16099 #include <term.h> /* clear_screen, cup & friends, cur_term */ 16100 #include <tic.h> 16101 16102 -MODULE_ID("$Id: lib_newterm.c,v 1.73 2008/08/16 21:20:48 Werner.Fink Exp $") 16103 +MODULE_ID("$Id: lib_newterm.c,v 1.74 2009/02/15 00:37:10 tom Exp $") 16104 16105 #ifndef ONLCR /* Allows compilation under the QNX 4.2 OS */ 16106 #define ONLCR 0 16107 @@ -95,7 +96,7 @@ 16108 * initialized. 16109 */ 16110 NCURSES_EXPORT(void) 16111 -filter(void) 16112 +NCURSES_SP_NAME(filter) (NCURSES_SP_DCL0) 16113 { 16114 START_TRACE(); 16115 T((T_CALLED("filter"))); 16116 @@ -103,23 +104,40 @@ 16117 returnVoid; 16118 } 16119 16120 +#if NCURSES_SP_FUNCS 16121 +NCURSES_EXPORT(void) 16122 +filter(void) 16123 +{ 16124 + NCURSES_SP_NAME(filter) (CURRENT_SCREEN); 16125 +} 16126 +#endif 16127 + 16128 #if NCURSES_EXT_FUNCS 16129 /* 16130 * An extension, allowing the application to open a new screen without 16131 * requiring it to also be filtered. 16132 */ 16133 NCURSES_EXPORT(void) 16134 -nofilter(void) 16135 +NCURSES_SP_NAME(nofilter) (NCURSES_SP_DCL0) 16136 { 16137 START_TRACE(); 16138 T((T_CALLED("nofilter"))); 16139 _nc_prescreen.filter_mode = FALSE; 16140 returnVoid; 16141 } 16142 + 16143 +#if NCURSES_SP_FUNCS 16144 +NCURSES_EXPORT(void) 16145 +nofilter(void) 16146 +{ 16147 + NCURSES_SP_NAME(nofilter) (CURRENT_SCREEN); 16148 +} 16149 #endif 16150 +#endif /* NCURSES_EXT_FUNCS */ 16151 16152 NCURSES_EXPORT(SCREEN *) 16153 -newterm(NCURSES_CONST char *name, FILE *ofp, FILE *ifp) 16154 +NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx NCURSES_CONST char *name, FILE 16155 + *ofp, FILE *ifp) 16156 { 16157 int value; 16158 int errret; 16159 @@ -133,8 +151,8 @@ 16160 _nc_init_pthreads(); 16161 _nc_lock_global(curses); 16162 16163 - current = SP; 16164 - its_term = (SP ? SP->_term : 0); 16165 + current = SP_PARM; 16166 + its_term = (SP_PARM ? SP_PARM->_term : 0); 16167 16168 /* this loads the capability entry, then sets LINES and COLS */ 16169 if (setupterm(name, fileno(ofp), &errret) != ERR) { 16170 @@ -159,7 +177,7 @@ 16171 _nc_set_screen(current); 16172 result = 0; 16173 } else { 16174 - assert(SP != 0); 16175 + assert(SP_PARM != 0); 16176 /* 16177 * In setupterm() we did a set_curterm(), but it was before we set 16178 * SP. So the "current" screen's terminal pointer was overwritten 16179 @@ -233,3 +251,11 @@ 16180 _nc_unlock_global(curses); 16181 returnSP(result); 16182 } 16183 + 16184 +#if NCURSES_SP_FUNCS 16185 +NCURSES_EXPORT(SCREEN *) 16186 +newterm(NCURSES_CONST char *name, FILE *ofp, FILE *ifp) 16187 +{ 16188 + return NCURSES_SP_NAME(newterm) (CURRENT_SCREEN, name, ofp, ifp); 16189 +} 16190 +#endif 16191 diff -Naur ncurses-5.7.orig/ncurses/base/lib_newwin.c ncurses-5.7/ncurses/base/lib_newwin.c 16192 --- ncurses-5.7.orig/ncurses/base/lib_newwin.c 2008-06-07 06:58:09.000000000 -0700 16193 +++ ncurses-5.7/ncurses/base/lib_newwin.c 2009-02-15 23:21:24.624480793 -0800 16194 @@ -1,5 +1,5 @@ 16195 /**************************************************************************** 16196 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 16197 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 16198 * * 16199 * Permission is hereby granted, free of charge, to any person obtaining a * 16200 * copy of this software and associated documentation files (the * 16201 @@ -30,6 +30,7 @@ 16202 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 16203 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 16204 * and: Thomas E. Dickey 1996-on * 16205 + * and: Juergen Pfeifer 2009 * 16206 ****************************************************************************/ 16207 16208 /* 16209 @@ -42,7 +43,7 @@ 16210 #include <curses.priv.h> 16211 #include <stddef.h> 16212 16213 -MODULE_ID("$Id: lib_newwin.c,v 1.52 2008/06/07 13:58:09 tom Exp $") 16214 +MODULE_ID("$Id: lib_newwin.c,v 1.53 2009/02/15 00:38:00 tom Exp $") 16215 16216 #define window_is(name) ((sp)->_##name == win) 16217 16218 @@ -115,7 +116,8 @@ 16219 } 16220 16221 NCURSES_EXPORT(WINDOW *) 16222 -newwin(int num_lines, int num_columns, int begy, int begx) 16223 +NCURSES_SP_NAME(newwin) (NCURSES_SP_DCLx 16224 + int num_lines, int num_columns, int begy, int begx) 16225 { 16226 WINDOW *win; 16227 NCURSES_CH_T *ptr; 16228 @@ -127,7 +129,7 @@ 16229 returnWin(0); 16230 16231 if (num_lines == 0) 16232 - num_lines = SP->_lines_avail - begy; 16233 + num_lines = SP_PARM->_lines_avail - begy; 16234 if (num_columns == 0) 16235 num_columns = screen_columns - begx; 16236 16237 @@ -149,6 +151,15 @@ 16238 returnWin(win); 16239 } 16240 16241 +#if NCURSES_SP_FUNCS 16242 +NCURSES_EXPORT(WINDOW *) 16243 +newwin(int num_lines, int num_columns, int begy, int begx) 16244 +{ 16245 + return NCURSES_SP_NAME(newwin) (CURRENT_SCREEN, num_lines, num_columns, 16246 + begy, begx); 16247 +} 16248 +#endif 16249 + 16250 NCURSES_EXPORT(WINDOW *) 16251 derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int begx) 16252 { 16253 diff -Naur ncurses-5.7.orig/ncurses/base/lib_nl.c ncurses-5.7/ncurses/base/lib_nl.c 16254 --- ncurses-5.7.orig/ncurses/base/lib_nl.c 2000-12-09 18:43:27.000000000 -0800 16255 +++ ncurses-5.7/ncurses/base/lib_nl.c 2009-02-15 23:21:24.624480793 -0800 16256 @@ -1,5 +1,5 @@ 16257 /**************************************************************************** 16258 - * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc. * 16259 + * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc. * 16260 * * 16261 * Permission is hereby granted, free of charge, to any person obtaining a * 16262 * copy of this software and associated documentation files (the * 16263 @@ -29,6 +29,8 @@ 16264 /**************************************************************************** 16265 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 16266 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 16267 + * and: Thomas E. Dickey 1996-on * 16268 + * and: Juergen Pfeifer 2009 * 16269 ****************************************************************************/ 16270 16271 /* 16272 @@ -42,18 +44,18 @@ 16273 16274 #include <curses.priv.h> 16275 16276 -MODULE_ID("$Id: lib_nl.c,v 1.8 2000/12/10 02:43:27 tom Exp $") 16277 +MODULE_ID("$Id: lib_nl.c,v 1.9 2009/02/15 00:38:22 tom Exp $") 16278 16279 #ifdef __EMX__ 16280 #include <io.h> 16281 #endif 16282 16283 NCURSES_EXPORT(int) 16284 -nl(void) 16285 +NCURSES_SP_NAME(nl) (NCURSES_SP_DCL0) 16286 { 16287 T((T_CALLED("nl()"))); 16288 16289 - SP->_nl = TRUE; 16290 + SP_PARM->_nl = TRUE; 16291 16292 #ifdef __EMX__ 16293 _nc_flush(); 16294 @@ -63,12 +65,20 @@ 16295 returnCode(OK); 16296 } 16297 16298 +#if NCURSES_SP_FUNCS 16299 NCURSES_EXPORT(int) 16300 -nonl(void) 16301 +nl(void) 16302 +{ 16303 + return NCURSES_SP_NAME(nl) (CURRENT_SCREEN); 16304 +} 16305 +#endif 16306 + 16307 +NCURSES_EXPORT(int) 16308 +NCURSES_SP_NAME(nonl) (NCURSES_SP_DCL0) 16309 { 16310 T((T_CALLED("nonl()"))); 16311 16312 - SP->_nl = FALSE; 16313 + SP_PARM->_nl = FALSE; 16314 16315 #ifdef __EMX__ 16316 _nc_flush(); 16317 @@ -77,3 +87,11 @@ 16318 16319 returnCode(OK); 16320 } 16321 + 16322 +#if NCURSES_SP_FUNCS 16323 +NCURSES_EXPORT(int) 16324 +nonl(void) 16325 +{ 16326 + return NCURSES_SP_NAME(nonl) (CURRENT_SCREEN); 16327 +} 16328 +#endif 16329 diff -Naur ncurses-5.7.orig/ncurses/base/lib_pad.c ncurses-5.7/ncurses/base/lib_pad.c 16330 --- ncurses-5.7.orig/ncurses/base/lib_pad.c 2006-10-14 13:47:13.000000000 -0700 16331 +++ ncurses-5.7/ncurses/base/lib_pad.c 2009-02-15 23:21:24.624480793 -0800 16332 @@ -1,5 +1,5 @@ 16333 /**************************************************************************** 16334 - * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. * 16335 + * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. * 16336 * * 16337 * Permission is hereby granted, free of charge, to any person obtaining a * 16338 * copy of this software and associated documentation files (the * 16339 @@ -29,6 +29,8 @@ 16340 /**************************************************************************** 16341 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 16342 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 16343 + * and: Thomas E. Dickey 1996-on * 16344 + * and: Juergen Pfeifer 2009 * 16345 ****************************************************************************/ 16346 16347 /* 16348 @@ -40,10 +42,10 @@ 16349 16350 #include <curses.priv.h> 16351 16352 -MODULE_ID("$Id: lib_pad.c,v 1.41 2006/10/14 20:47:13 tom Exp $") 16353 +MODULE_ID("$Id: lib_pad.c,v 1.42 2009/02/15 00:38:48 tom Exp $") 16354 16355 NCURSES_EXPORT(WINDOW *) 16356 -newpad(int l, int c) 16357 +NCURSES_SP_NAME(newpad) (NCURSES_SP_DCLx int l, int c) 16358 { 16359 WINDOW *win; 16360 NCURSES_CH_T *ptr; 16361 @@ -70,6 +72,14 @@ 16362 returnWin(win); 16363 } 16364 16365 +#if NCURSES_SP_FUNCS 16366 +NCURSES_EXPORT(WINDOW *) 16367 +newpad(int l, int c) 16368 +{ 16369 + return NCURSES_SP_NAME(newpad) (CURRENT_SCREEN, l, c); 16370 +} 16371 +#endif 16372 + 16373 NCURSES_EXPORT(WINDOW *) 16374 subpad(WINDOW *orig, int l, int c, int begy, int begx) 16375 { 16376 diff -Naur ncurses-5.7.orig/ncurses/base/lib_screen.c ncurses-5.7/ncurses/base/lib_screen.c 16377 --- ncurses-5.7.orig/ncurses/base/lib_screen.c 2008-08-16 12:05:37.000000000 -0700 16378 +++ ncurses-5.7/ncurses/base/lib_screen.c 2009-02-15 23:21:24.624480793 -0800 16379 @@ -1,5 +1,5 @@ 16380 /**************************************************************************** 16381 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 16382 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 16383 * * 16384 * Permission is hereby granted, free of charge, to any person obtaining a * 16385 * copy of this software and associated documentation files (the * 16386 @@ -30,11 +30,12 @@ 16387 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 16388 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 16389 * and: Thomas E. Dickey 1996 on * 16390 + * and: Juergen Pfeifer 2009 * 16391 ****************************************************************************/ 16392 16393 #include <curses.priv.h> 16394 16395 -MODULE_ID("$Id: lib_screen.c,v 1.31 2008/08/16 19:05:37 tom Exp $") 16396 +MODULE_ID("$Id: lib_screen.c,v 1.32 2009/02/15 00:39:13 tom Exp $") 16397 16398 #define MAX_SIZE 0x3fff /* 16k is big enough for a window or pad */ 16399 16400 @@ -141,7 +142,7 @@ 16401 } 16402 16403 NCURSES_EXPORT(int) 16404 -scr_restore(const char *file) 16405 +NCURSES_SP_NAME(scr_restore) (NCURSES_SP_DCLx const char *file) 16406 { 16407 FILE *fp = 0; 16408 16409 @@ -152,15 +153,23 @@ 16410 returnCode(ERR); 16411 } else { 16412 delwin(newscr); 16413 - SP->_newscr = getwin(fp); 16414 + SP_PARM->_newscr = getwin(fp); 16415 #if !USE_REENTRANT 16416 - newscr = SP->_newscr; 16417 + newscr = SP_PARM->_newscr; 16418 #endif 16419 (void) fclose(fp); 16420 returnCode(OK); 16421 } 16422 } 16423 16424 +#if NCURSES_SP_FUNCS 16425 +NCURSES_EXPORT(int) 16426 +scr_restore(const char *file) 16427 +{ 16428 + return NCURSES_SP_NAME(scr_restore) (CURRENT_SCREEN, file); 16429 +} 16430 +#endif 16431 + 16432 NCURSES_EXPORT(int) 16433 scr_dump(const char *file) 16434 { 16435 @@ -179,7 +188,7 @@ 16436 } 16437 16438 NCURSES_EXPORT(int) 16439 -scr_init(const char *file) 16440 +NCURSES_SP_NAME(scr_init) (NCURSES_SP_DCLx const char *file) 16441 { 16442 FILE *fp = 0; 16443 16444 @@ -193,17 +202,25 @@ 16445 returnCode(ERR); 16446 } else { 16447 delwin(curscr); 16448 - SP->_curscr = getwin(fp); 16449 + SP_PARM->_curscr = getwin(fp); 16450 #if !USE_REENTRANT 16451 - curscr = SP->_curscr; 16452 + curscr = SP_PARM->_curscr; 16453 #endif 16454 (void) fclose(fp); 16455 returnCode(OK); 16456 } 16457 } 16458 16459 +#if NCURSES_SP_FUNCS 16460 NCURSES_EXPORT(int) 16461 -scr_set(const char *file) 16462 +scr_init(const char *file) 16463 +{ 16464 + return NCURSES_SP_NAME(scr_init) (CURRENT_SCREEN, file); 16465 +} 16466 +#endif 16467 + 16468 +NCURSES_EXPORT(int) 16469 +NCURSES_SP_NAME(scr_set) (NCURSES_SP_DCLx const char *file) 16470 { 16471 T((T_CALLED("scr_set(%s)"), _nc_visbuf(file))); 16472 16473 @@ -211,10 +228,18 @@ 16474 returnCode(ERR); 16475 } else { 16476 delwin(newscr); 16477 - SP->_newscr = dupwin(curscr); 16478 + SP_PARM->_newscr = dupwin(curscr); 16479 #if !USE_REENTRANT 16480 - newscr = SP->_newscr; 16481 + newscr = SP_PARM->_newscr; 16482 #endif 16483 returnCode(OK); 16484 } 16485 } 16486 + 16487 +#if NCURSES_SP_FUNCS 16488 +NCURSES_EXPORT(int) 16489 +scr_set(const char *file) 16490 +{ 16491 + return NCURSES_SP_NAME(scr_set) (CURRENT_SCREEN, file); 16492 +} 16493 +#endif 16494 diff -Naur ncurses-5.7.orig/ncurses/base/lib_set_term.c ncurses-5.7/ncurses/base/lib_set_term.c 16495 --- ncurses-5.7.orig/ncurses/base/lib_set_term.c 2008-08-04 11:11:12.000000000 -0700 16496 +++ ncurses-5.7/ncurses/base/lib_set_term.c 2009-02-15 23:21:24.624480793 -0800 16497 @@ -1,5 +1,5 @@ 16498 /**************************************************************************** 16499 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 16500 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 16501 * * 16502 * Permission is hereby granted, free of charge, to any person obtaining a * 16503 * copy of this software and associated documentation files (the * 16504 @@ -30,6 +30,7 @@ 16505 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 16506 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 16507 * and: Thomas E. Dickey 1996-on * 16508 + * and: Juergen Pfeifer 2009 * 16509 ****************************************************************************/ 16510 16511 /* 16512 @@ -44,7 +45,7 @@ 16513 #include <term.h> /* cur_term */ 16514 #include <tic.h> 16515 16516 -MODULE_ID("$Id: lib_set_term.c,v 1.117 2008/08/04 18:11:12 tom Exp $") 16517 +MODULE_ID("$Id: lib_set_term.c,v 1.118 2009/02/15 00:39:46 tom Exp $") 16518 16519 NCURSES_EXPORT(SCREEN *) 16520 set_term(SCREEN *screenp) 16521 @@ -635,7 +636,9 @@ 16522 } 16523 16524 NCURSES_EXPORT(int) 16525 -ripoffline(int line, int (*init) (WINDOW *, int)) 16526 +NCURSES_SP_NAME(ripoffline) (NCURSES_SP_DCLx 16527 + int line, 16528 + int (*init) (WINDOW *, int)) 16529 { 16530 START_TRACE(); 16531 T((T_CALLED("ripoffline(%d,%p)"), line, init)); 16532 @@ -645,3 +648,11 @@ 16533 16534 returnCode(_nc_ripoffline((line < 0) ? -1 : 1, init)); 16535 } 16536 + 16537 +#if NCURSES_SP_FUNCS 16538 +NCURSES_EXPORT(int) 16539 +ripoffline(int line, int (*init) (WINDOW *, int)) 16540 +{ 16541 + return NCURSES_SP_NAME(ripoffline) (CURRENT_SCREEN, line, init); 16542 +} 16543 +#endif 16544 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatrof.c ncurses-5.7/ncurses/base/lib_slkatrof.c 16545 --- ncurses-5.7.orig/ncurses/base/lib_slkatrof.c 2005-01-08 15:01:32.000000000 -0800 16546 +++ ncurses-5.7/ncurses/base/lib_slkatrof.c 2009-02-15 23:21:24.624480793 -0800 16547 @@ -1,5 +1,5 @@ 16548 /**************************************************************************** 16549 - * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc. * 16550 + * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * 16551 * * 16552 * Permission is hereby granted, free of charge, to any person obtaining a * 16553 * copy of this software and associated documentation files (the * 16554 @@ -38,21 +38,29 @@ 16555 */ 16556 #include <curses.priv.h> 16557 16558 -MODULE_ID("$Id: lib_slkatrof.c,v 1.8 2005/01/08 23:01:32 tom Exp $") 16559 +MODULE_ID("$Id: lib_slkatrof.c,v 1.9 2009/02/15 00:33:48 tom Exp $") 16560 16561 NCURSES_EXPORT(int) 16562 -slk_attroff(const chtype attr) 16563 +NCURSES_SP_NAME(slk_attroff) (NCURSES_SP_DCLx const chtype attr) 16564 { 16565 T((T_CALLED("slk_attroff(%s)"), _traceattr(attr))); 16566 16567 - if (SP != 0 && SP->_slk != 0) { 16568 - TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP->_slk->attr)))); 16569 - RemAttr(SP->_slk->attr, attr); 16570 + if (SP_PARM != 0 && SP_PARM->_slk != 0) { 16571 + TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP_PARM->_slk->attr)))); 16572 + RemAttr(SP_PARM->_slk->attr, attr); 16573 if ((attr & A_COLOR) != 0) { 16574 - SetPair(SP->_slk->attr, 0); 16575 + SetPair(SP_PARM->_slk->attr, 0); 16576 } 16577 - TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr)))); 16578 + TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP_PARM->_slk->attr)))); 16579 returnCode(OK); 16580 } else 16581 returnCode(ERR); 16582 } 16583 + 16584 +#if NCURSES_SP_FUNCS 16585 +NCURSES_EXPORT(int) 16586 +slk_attroff(const chtype attr) 16587 +{ 16588 + return NCURSES_SP_NAME(slk_attroff) (CURRENT_SCREEN, attr); 16589 +} 16590 +#endif 16591 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatron.c ncurses-5.7/ncurses/base/lib_slkatron.c 16592 --- ncurses-5.7.orig/ncurses/base/lib_slkatron.c 2005-01-08 15:02:01.000000000 -0800 16593 +++ ncurses-5.7/ncurses/base/lib_slkatron.c 2009-02-15 23:21:24.624480793 -0800 16594 @@ -1,5 +1,5 @@ 16595 /**************************************************************************** 16596 - * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc. * 16597 + * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * 16598 * * 16599 * Permission is hereby granted, free of charge, to any person obtaining a * 16600 * copy of this software and associated documentation files (the * 16601 @@ -38,21 +38,29 @@ 16602 */ 16603 #include <curses.priv.h> 16604 16605 -MODULE_ID("$Id: lib_slkatron.c,v 1.8 2005/01/08 23:02:01 tom Exp $") 16606 +MODULE_ID("$Id: lib_slkatron.c,v 1.9 2009/02/15 00:33:48 tom Exp $") 16607 16608 NCURSES_EXPORT(int) 16609 -slk_attron(const chtype attr) 16610 +NCURSES_SP_NAME(slk_attron) (NCURSES_SP_DCLx const chtype attr) 16611 { 16612 T((T_CALLED("slk_attron(%s)"), _traceattr(attr))); 16613 16614 - if (SP != 0 && SP->_slk != 0) { 16615 - TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP->_slk->attr)))); 16616 - AddAttr(SP->_slk->attr, attr); 16617 + if (SP_PARM != 0 && SP_PARM->_slk != 0) { 16618 + TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP_PARM->_slk->attr)))); 16619 + AddAttr(SP_PARM->_slk->attr, attr); 16620 if ((attr & A_COLOR) != 0) { 16621 - SetPair(SP->_slk->attr, PAIR_NUMBER(attr)); 16622 + SetPair(SP_PARM->_slk->attr, PAIR_NUMBER(attr)); 16623 } 16624 - TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr)))); 16625 + TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP_PARM->_slk->attr)))); 16626 returnCode(OK); 16627 } else 16628 returnCode(ERR); 16629 } 16630 + 16631 +#if NCURSES_SP_FUNCS 16632 +NCURSES_EXPORT(int) 16633 +slk_attron(const chtype attr) 16634 +{ 16635 + return NCURSES_SP_NAME(slk_attron) (CURRENT_SCREEN, attr); 16636 +} 16637 +#endif 14837 16638 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatr_set.c ncurses-5.7/ncurses/base/lib_slkatr_set.c 14838 16639 --- ncurses-5.7.orig/ncurses/base/lib_slkatr_set.c 2005-01-28 13:11:53.000000000 -0800 14839 +++ ncurses-5.7/ncurses/base/lib_slkatr_set.c 2009-02- 07 22:08:36.698833077-080016640 +++ ncurses-5.7/ncurses/base/lib_slkatr_set.c 2009-02-15 23:21:24.624480793 -0800 14840 16641 @@ -1,5 +1,5 @@ 14841 16642 /**************************************************************************** … … 14854 16655 14855 16656 /* 14856 @@ -38,22 +38, 27@@16657 @@ -38,22 +38,39 @@ 14857 16658 */ 14858 16659 #include <curses.priv.h> 14859 16660 14860 16661 -MODULE_ID("$Id: lib_slkatr_set.c,v 1.10 2005/01/28 21:11:53 tom Exp $") 14861 +MODULE_ID("$Id: lib_slkatr_set.c,v 1.1 1 2009/01/25 00:47:15tom Exp $")16662 +MODULE_ID("$Id: lib_slkatr_set.c,v 1.12 2009/02/15 00:33:48 tom Exp $") 14862 16663 14863 16664 NCURSES_EXPORT(int) 14864 slk_attr_set(const attr_t attr, short color_pair_number, void *opts) 16665 -slk_attr_set(const attr_t attr, short color_pair_number, void *opts) 16666 +NCURSES_SP_NAME(slk_attr_set) (NCURSES_SP_DCLx 16667 + const attr_t attr, 16668 + short color_pair_number, 16669 + void *opts) 14865 16670 { 14866 16671 + int code = ERR; … … 14870 16675 - if (SP != 0 && SP->_slk != 0 && !opts && 14871 16676 - color_pair_number >= 0 && color_pair_number < COLOR_PAIRS) { 14872 + if (SP != 0 14873 + && SP->_slk != 0 16677 - TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP->_slk->attr)))); 16678 - SetAttr(SP->_slk->attr, attr); 16679 + if (SP_PARM != 0 16680 + && SP_PARM->_slk != 0 14874 16681 + && !opts 14875 16682 + && color_pair_number >= 0 14876 + && color_pair_number < SP ->_pair_limit) {14877 TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP->_slk->attr))));14878 SetAttr(SP->_slk->attr, attr);16683 + && color_pair_number < SP_PARM->_pair_limit) { 16684 + TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP_PARM->_slk->attr)))); 16685 + SetAttr(SP_PARM->_slk->attr, attr); 14879 16686 if (color_pair_number > 0) { 14880 SetPair(SP->_slk->attr, color_pair_number); 16687 - SetPair(SP->_slk->attr, color_pair_number); 16688 + SetPair(SP_PARM->_slk->attr, color_pair_number); 14881 16689 } 14882 16690 - TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr)))); 14883 16691 - returnCode(OK); 14884 16692 - } else 14885 16693 - returnCode(ERR); 16694 + TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP_PARM->_slk->attr)))); 14886 16695 + code = OK; 14887 16696 + } 14888 16697 + returnCode(code); 14889 } 16698 +} 16699 + 16700 +#if NCURSES_SP_FUNCS 16701 +NCURSES_EXPORT(int) 16702 +slk_attr_set(const attr_t attr, short color_pair_number, void *opts) 16703 +{ 16704 + return NCURSES_SP_NAME(slk_attr_set) (CURRENT_SCREEN, attr, 16705 + color_pair_number, opts); 16706 } 16707 +#endif 16708 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatrset.c ncurses-5.7/ncurses/base/lib_slkatrset.c 16709 --- ncurses-5.7.orig/ncurses/base/lib_slkatrset.c 2005-01-08 13:46:47.000000000 -0800 16710 +++ ncurses-5.7/ncurses/base/lib_slkatrset.c 2009-02-15 23:21:24.628481072 -0800 16711 @@ -1,5 +1,5 @@ 16712 /**************************************************************************** 16713 - * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc. * 16714 + * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * 16715 * * 16716 * Permission is hereby granted, free of charge, to any person obtaining a * 16717 * copy of this software and associated documentation files (the * 16718 @@ -38,16 +38,24 @@ 16719 */ 16720 #include <curses.priv.h> 16721 16722 -MODULE_ID("$Id: lib_slkatrset.c,v 1.7 2005/01/08 21:46:47 tom Exp $") 16723 +MODULE_ID("$Id: lib_slkatrset.c,v 1.8 2009/02/15 00:33:48 tom Exp $") 16724 16725 NCURSES_EXPORT(int) 16726 -slk_attrset(const chtype attr) 16727 +NCURSES_SP_NAME(slk_attrset) (NCURSES_SP_DCLx const chtype attr) 16728 { 16729 T((T_CALLED("slk_attrset(%s)"), _traceattr(attr))); 16730 16731 - if (SP != 0 && SP->_slk != 0) { 16732 - SetAttr(SP->_slk->attr, attr); 16733 + if (SP_PARM != 0 && SP_PARM->_slk != 0) { 16734 + SetAttr(SP_PARM->_slk->attr, attr); 16735 returnCode(OK); 16736 } else 16737 returnCode(ERR); 16738 } 16739 + 16740 +#if NCURSES_SP_FUNCS 16741 +NCURSES_EXPORT(int) 16742 +slk_attrset(const chtype attr) 16743 +{ 16744 + return NCURSES_SP_NAME(slk_attrset) (CURRENT_SCREEN, attr); 16745 +} 16746 +#endif 16747 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkattr.c ncurses-5.7/ncurses/base/lib_slkattr.c 16748 --- ncurses-5.7.orig/ncurses/base/lib_slkattr.c 2005-01-08 13:44:28.000000000 -0800 16749 +++ ncurses-5.7/ncurses/base/lib_slkattr.c 2009-02-15 23:21:24.628481072 -0800 16750 @@ -1,5 +1,5 @@ 16751 /**************************************************************************** 16752 - * Copyright (c) 1998,2000 Free Software Foundation, Inc. * 16753 + * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc. * 16754 * * 16755 * Permission is hereby granted, free of charge, to any person obtaining a * 16756 * copy of this software and associated documentation files (the * 16757 @@ -38,19 +38,27 @@ 16758 */ 16759 #include <curses.priv.h> 16760 16761 -MODULE_ID("$Id: lib_slkattr.c,v 1.6 2005/01/08 21:44:28 tom Exp $") 16762 +MODULE_ID("$Id: lib_slkattr.c,v 1.7 2009/02/15 00:33:48 tom Exp $") 16763 16764 NCURSES_EXPORT(attr_t) 16765 -slk_attr(void) 16766 +NCURSES_SP_NAME(slk_attr) (NCURSES_SP_DCL0) 16767 { 16768 T((T_CALLED("slk_attr()"))); 16769 16770 - if (SP != 0 && SP->_slk != 0) { 16771 - attr_t result = AttrOf(SP->_slk->attr) & ALL_BUT_COLOR; 16772 - int pair = GetPair(SP->_slk->attr); 16773 + if (SP_PARM != 0 && SP_PARM->_slk != 0) { 16774 + attr_t result = AttrOf(SP_PARM->_slk->attr) & ALL_BUT_COLOR; 16775 + int pair = GetPair(SP_PARM->_slk->attr); 16776 16777 result |= COLOR_PAIR(pair); 16778 returnAttr(result); 16779 } else 16780 returnAttr(0); 16781 } 16782 + 16783 +#if NCURSES_SP_FUNCS 16784 +NCURSES_EXPORT(attr_t) 16785 +slk_attr(void) 16786 +{ 16787 + return NCURSES_SP_NAME(slk_attr) (CURRENT_SCREEN); 16788 +} 16789 +#endif 16790 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slk.c ncurses-5.7/ncurses/base/lib_slk.c 16791 --- ncurses-5.7.orig/ncurses/base/lib_slk.c 2008-09-27 07:07:33.000000000 -0700 16792 +++ ncurses-5.7/ncurses/base/lib_slk.c 2009-02-15 23:21:24.624480793 -0800 16793 @@ -1,5 +1,5 @@ 16794 /**************************************************************************** 16795 - * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc. * 16796 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 16797 * * 16798 * Permission is hereby granted, free of charge, to any person obtaining a * 16799 * copy of this software and associated documentation files (the * 16800 @@ -45,7 +45,7 @@ 16801 #include <ctype.h> 16802 #include <term.h> /* num_labels, label_*, plab_norm */ 16803 16804 -MODULE_ID("$Id: lib_slk.c,v 1.35 2008/09/27 14:07:33 juergen Exp $") 16805 +MODULE_ID("$Id: lib_slk.c,v 1.36 2009/02/15 00:33:48 tom Exp $") 16806 16807 /* 16808 * Free any memory related to soft labels, return an error. 16809 @@ -178,14 +178,22 @@ 16810 * Restore the soft labels on the screen. 16811 */ 16812 NCURSES_EXPORT(int) 16813 -slk_restore(void) 16814 +NCURSES_SP_NAME(slk_restore) (NCURSES_SP_DCL0) 16815 { 16816 T((T_CALLED("slk_restore()"))); 16817 16818 - if (SP->_slk == NULL) 16819 + if (SP_PARM->_slk == NULL) 16820 return (ERR); 16821 - SP->_slk->hidden = FALSE; 16822 - SP->_slk->dirty = TRUE; 16823 + SP_PARM->_slk->hidden = FALSE; 16824 + SP_PARM->_slk->dirty = TRUE; 16825 16826 returnCode(slk_refresh()); 16827 } 16828 + 16829 +#if NCURSES_SP_FUNCS 16830 +NCURSES_EXPORT(int) 16831 +slk_restore(void) 16832 +{ 16833 + return NCURSES_SP_NAME(slk_restore) (CURRENT_SCREEN); 16834 +} 16835 +#endif 16836 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkclear.c ncurses-5.7/ncurses/base/lib_slkclear.c 16837 --- ncurses-5.7.orig/ncurses/base/lib_slkclear.c 2007-12-29 09:51:47.000000000 -0800 16838 +++ ncurses-5.7/ncurses/base/lib_slkclear.c 2009-02-15 23:21:24.628481072 -0800 16839 @@ -1,5 +1,5 @@ 16840 /**************************************************************************** 16841 - * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. * 16842 + * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. * 16843 * * 16844 * Permission is hereby granted, free of charge, to any person obtaining a * 16845 * copy of this software and associated documentation files (the * 16846 @@ -40,27 +40,35 @@ 16847 */ 16848 #include <curses.priv.h> 16849 16850 -MODULE_ID("$Id: lib_slkclear.c,v 1.10 2007/12/29 17:51:47 tom Exp $") 16851 +MODULE_ID("$Id: lib_slkclear.c,v 1.11 2009/02/15 00:33:48 tom Exp $") 16852 16853 NCURSES_EXPORT(int) 16854 -slk_clear(void) 16855 +NCURSES_SP_NAME(slk_clear) (NCURSES_SP_DCL0) 16856 { 16857 int rc = ERR; 16858 16859 T((T_CALLED("slk_clear()"))); 16860 16861 - if (SP != NULL && SP->_slk != NULL) { 16862 - SP->_slk->hidden = TRUE; 16863 + if (SP_PARM != NULL && SP_PARM->_slk != NULL) { 16864 + SP_PARM->_slk->hidden = TRUE; 16865 /* For simulated SLK's it looks much more natural to 16866 inherit those attributes from the standard screen */ 16867 - SP->_slk->win->_nc_bkgd = stdscr->_nc_bkgd; 16868 - WINDOW_ATTRS(SP->_slk->win) = WINDOW_ATTRS(stdscr); 16869 - if (SP->_slk->win == stdscr) { 16870 + SP_PARM->_slk->win->_nc_bkgd = stdscr->_nc_bkgd; 16871 + WINDOW_ATTRS(SP_PARM->_slk->win) = WINDOW_ATTRS(stdscr); 16872 + if (SP_PARM->_slk->win == stdscr) { 16873 rc = OK; 16874 } else { 16875 - werase(SP->_slk->win); 16876 - rc = wrefresh(SP->_slk->win); 16877 + werase(SP_PARM->_slk->win); 16878 + rc = wrefresh(SP_PARM->_slk->win); 16879 } 16880 } 16881 returnCode(rc); 16882 } 16883 + 16884 +#if NCURSES_SP_FUNCS 16885 +NCURSES_EXPORT(int) 16886 +slk_clear(void) 16887 +{ 16888 + return NCURSES_SP_NAME(slk_clear) (CURRENT_SCREEN); 16889 +} 16890 +#endif 14890 16891 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkcolor.c ncurses-5.7/ncurses/base/lib_slkcolor.c 14891 16892 --- ncurses-5.7.orig/ncurses/base/lib_slkcolor.c 2005-01-28 13:11:53.000000000 -0800 14892 +++ ncurses-5.7/ncurses/base/lib_slkcolor.c 2009-02- 07 22:08:36.698833077-080016893 +++ ncurses-5.7/ncurses/base/lib_slkcolor.c 2009-02-15 23:21:24.628481072 -0800 14893 16894 @@ -1,5 +1,5 @@ 14894 16895 /**************************************************************************** … … 14907 16908 14908 16909 /* 14909 @@ -38,19 +38, 23@@16910 @@ -38,19 +38,31 @@ 14910 16911 */ 14911 16912 #include <curses.priv.h> 14912 16913 14913 16914 -MODULE_ID("$Id: lib_slkcolor.c,v 1.12 2005/01/28 21:11:53 tom Exp $") 14914 +MODULE_ID("$Id: lib_slkcolor.c,v 1.1 3 2009/01/25 00:48:07tom Exp $")16915 +MODULE_ID("$Id: lib_slkcolor.c,v 1.14 2009/02/15 00:33:48 tom Exp $") 14915 16916 14916 16917 NCURSES_EXPORT(int) 14917 slk_color(short color_pair_number) 16918 -slk_color(short color_pair_number) 16919 +NCURSES_SP_NAME(slk_color) (NCURSES_SP_DCLx short color_pair_number) 14918 16920 { 14919 16921 + int code = ERR; … … 14923 16925 - if (SP != 0 && SP->_slk != 0 && 14924 16926 - color_pair_number >= 0 && color_pair_number < COLOR_PAIRS) { 14925 + if (SP != 0 14926 + && SP->_slk != 0 14927 + && color_pair_number >= 0 14928 + && color_pair_number < SP->_pair_limit) { 14929 TR(TRACE_ATTRS, ("... current is %s", _tracech_t(CHREF(SP->_slk->attr)))); 14930 SetPair(SP->_slk->attr, color_pair_number); 14931 TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr)))); 16927 - TR(TRACE_ATTRS, ("... current is %s", _tracech_t(CHREF(SP->_slk->attr)))); 16928 - SetPair(SP->_slk->attr, color_pair_number); 16929 - TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr)))); 14932 16930 - returnCode(OK); 14933 16931 - } else 14934 16932 - returnCode(ERR); 16933 + if (SP_PARM != 0 16934 + && SP_PARM->_slk != 0 16935 + && color_pair_number >= 0 16936 + && color_pair_number < SP_PARM->_pair_limit) { 16937 + TR(TRACE_ATTRS, ("... current is %s", _tracech_t(CHREF(SP_PARM->_slk->attr)))); 16938 + SetPair(SP_PARM->_slk->attr, color_pair_number); 16939 + TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP_PARM->_slk->attr)))); 14935 16940 + code = OK; 14936 16941 + } 14937 16942 + returnCode(code); 14938 } 16943 +} 16944 + 16945 +#if NCURSES_SP_FUNCS 16946 +NCURSES_EXPORT(int) 16947 +slk_color(short color_pair_number) 16948 +{ 16949 + return NCURSES_SP_NAME(slk_color) (CURRENT_SCREEN, color_pair_number); 16950 } 16951 +#endif 16952 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkinit.c ncurses-5.7/ncurses/base/lib_slkinit.c 16953 --- ncurses-5.7.orig/ncurses/base/lib_slkinit.c 2008-01-12 12:23:39.000000000 -0800 16954 +++ ncurses-5.7/ncurses/base/lib_slkinit.c 2009-02-15 23:21:24.628481072 -0800 16955 @@ -1,5 +1,5 @@ 16956 /**************************************************************************** 16957 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 16958 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 16959 * * 16960 * Permission is hereby granted, free of charge, to any person obtaining a * 16961 * copy of this software and associated documentation files (the * 16962 @@ -30,6 +30,7 @@ 16963 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 16964 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 16965 * and: Thomas E. Dickey 1996-on * 16966 + * and: Juergen Pfeifer 2009 * 16967 ****************************************************************************/ 16968 16969 /* 16970 @@ -39,10 +40,10 @@ 16971 */ 16972 #include <curses.priv.h> 16973 16974 -MODULE_ID("$Id: lib_slkinit.c,v 1.7 2008/01/12 20:23:39 tom Exp $") 16975 +MODULE_ID("$Id: lib_slkinit.c,v 1.8 2009/02/15 00:42:36 tom Exp $") 16976 16977 NCURSES_EXPORT(int) 16978 -slk_init(int format) 16979 +NCURSES_SP_NAME(slk_init) (NCURSES_SP_DCLx int format) 16980 { 16981 int code = ERR; 16982 16983 @@ -53,3 +54,11 @@ 16984 } 16985 returnCode(code); 16986 } 16987 + 16988 +#if NCURSES_SP_FUNCS 16989 +NCURSES_EXPORT(int) 16990 +slk_init(int format) 16991 +{ 16992 + return NCURSES_SP_NAME(slk_init) (CURRENT_SCREEN, format); 16993 +} 16994 +#endif 16995 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slklab.c ncurses-5.7/ncurses/base/lib_slklab.c 16996 --- ncurses-5.7.orig/ncurses/base/lib_slklab.c 2003-03-29 14:53:48.000000000 -0800 16997 +++ ncurses-5.7/ncurses/base/lib_slklab.c 2009-02-15 23:21:24.628481072 -0800 16998 @@ -1,5 +1,5 @@ 16999 /**************************************************************************** 17000 - * Copyright (c) 1998-2000,2003 Free Software Foundation, Inc. * 17001 + * Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. * 17002 * * 17003 * Permission is hereby granted, free of charge, to any person obtaining a * 17004 * copy of this software and associated documentation files (the * 17005 @@ -29,6 +29,8 @@ 17006 /**************************************************************************** 17007 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 17008 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 17009 + * and: Thomas E. Dickey 1996-on * 17010 + * and: Juergen Pfeifer 2009 * 17011 ****************************************************************************/ 17012 17013 /* 17014 @@ -38,14 +40,22 @@ 17015 */ 17016 #include <curses.priv.h> 17017 17018 -MODULE_ID("$Id: lib_slklab.c,v 1.7 2003/03/29 22:53:48 tom Exp $") 17019 +MODULE_ID("$Id: lib_slklab.c,v 1.8 2009/02/15 00:42:53 tom Exp $") 17020 17021 NCURSES_EXPORT(char *) 17022 -slk_label(int n) 17023 +NCURSES_SP_NAME(slk_label) (NCURSES_SP_DCLx int n) 17024 { 17025 T((T_CALLED("slk_label(%d)"), n)); 17026 17027 - if (SP == NULL || SP->_slk == NULL || n < 1 || n > SP->_slk->labcnt) 17028 + if (SP_PARM == NULL || SP_PARM->_slk == NULL || n < 1 || n > SP_PARM->_slk->labcnt) 17029 returnPtr(0); 17030 - returnPtr(SP->_slk->ent[n - 1].ent_text); 17031 + returnPtr(SP_PARM->_slk->ent[n - 1].ent_text); 17032 +} 17033 + 17034 +#if NCURSES_SP_FUNCS 17035 +NCURSES_EXPORT(char *) 17036 +slk_label(int n) 17037 +{ 17038 + return NCURSES_SP_NAME(slk_label) (CURRENT_SCREEN, n); 17039 } 17040 +#endif 17041 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkrefr.c ncurses-5.7/ncurses/base/lib_slkrefr.c 17042 --- ncurses-5.7.orig/ncurses/base/lib_slkrefr.c 2008-09-27 07:07:53.000000000 -0700 17043 +++ ncurses-5.7/ncurses/base/lib_slkrefr.c 2009-02-15 23:21:24.628481072 -0800 17044 @@ -1,5 +1,5 @@ 17045 /**************************************************************************** 17046 - * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. * 17047 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 17048 * * 17049 * Permission is hereby granted, free of charge, to any person obtaining a * 17050 * copy of this software and associated documentation files (the * 17051 @@ -40,7 +40,7 @@ 17052 #include <curses.priv.h> 17053 #include <term.h> /* num_labels, label_*, plab_norm */ 17054 17055 -MODULE_ID("$Id: lib_slkrefr.c,v 1.17 2008/09/27 14:07:53 juergen Exp $") 17056 +MODULE_ID("$Id: lib_slkrefr.c,v 1.18 2009/02/15 00:33:48 tom Exp $") 17057 17058 /* 17059 * Paint the info line for the PC style SLK emulation. 17060 @@ -113,32 +113,48 @@ 17061 * Refresh the soft labels. 17062 */ 17063 NCURSES_EXPORT(int) 17064 -slk_noutrefresh(void) 17065 +NCURSES_SP_NAME(slk_noutrefresh) (NCURSES_SP_DCL0) 17066 { 17067 T((T_CALLED("slk_noutrefresh()"))); 17068 17069 - if (SP == NULL || SP->_slk == NULL) 17070 + if (SP_PARM == NULL || SP_PARM->_slk == NULL) 17071 returnCode(ERR); 17072 - if (SP->_slk->hidden) 17073 + if (SP_PARM->_slk->hidden) 17074 returnCode(OK); 17075 - slk_intern_refresh(SP->_slk); 17076 + slk_intern_refresh(SP_PARM->_slk); 17077 + 17078 + returnCode(wnoutrefresh(SP_PARM->_slk->win)); 17079 +} 17080 17081 - returnCode(wnoutrefresh(SP->_slk->win)); 17082 +#if NCURSES_SP_FUNCS 17083 +NCURSES_EXPORT(int) 17084 +slk_noutrefresh(void) 17085 +{ 17086 + return NCURSES_SP_NAME(slk_noutrefresh) (CURRENT_SCREEN); 17087 } 17088 +#endif 17089 17090 /* 17091 * Refresh the soft labels. 17092 */ 17093 NCURSES_EXPORT(int) 17094 -slk_refresh(void) 17095 +NCURSES_SP_NAME(slk_refresh) (NCURSES_SP_DCL0) 17096 { 17097 T((T_CALLED("slk_refresh()"))); 17098 17099 - if (SP == NULL || SP->_slk == NULL) 17100 + if (SP_PARM == NULL || SP_PARM->_slk == NULL) 17101 returnCode(ERR); 17102 - if (SP->_slk->hidden) 17103 + if (SP_PARM->_slk->hidden) 17104 returnCode(OK); 17105 - slk_intern_refresh(SP->_slk); 17106 + slk_intern_refresh(SP_PARM->_slk); 17107 + 17108 + returnCode(wrefresh(SP_PARM->_slk->win)); 17109 +} 17110 17111 - returnCode(wrefresh(SP->_slk->win)); 17112 +#if NCURSES_SP_FUNCS 17113 +NCURSES_EXPORT(int) 17114 +slk_refresh(void) 17115 +{ 17116 + return NCURSES_SP_NAME(slk_refresh) (CURRENT_SCREEN); 17117 } 17118 +#endif 17119 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkset.c ncurses-5.7/ncurses/base/lib_slkset.c 17120 --- ncurses-5.7.orig/ncurses/base/lib_slkset.c 2007-10-13 13:08:46.000000000 -0700 17121 +++ ncurses-5.7/ncurses/base/lib_slkset.c 2009-02-15 23:21:24.628481072 -0800 17122 @@ -1,5 +1,5 @@ 17123 /**************************************************************************** 17124 - * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc. * 17125 + * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. * 17126 * * 17127 * Permission is hereby granted, free of charge, to any person obtaining a * 17128 * copy of this software and associated documentation files (the * 17129 @@ -44,10 +44,10 @@ 17130 #endif 17131 #endif 17132 17133 -MODULE_ID("$Id: lib_slkset.c,v 1.17 2007/10/13 20:08:46 tom Exp $") 17134 +MODULE_ID("$Id: lib_slkset.c,v 1.18 2009/02/15 00:33:48 tom Exp $") 17135 17136 NCURSES_EXPORT(int) 17137 -slk_set(int i, const char *astr, int format) 17138 +NCURSES_SP_NAME(slk_set) (NCURSES_SP_DCLx int i, const char *astr, int format) 17139 { 17140 SLK *slk; 17141 int offset; 17142 @@ -59,8 +59,8 @@ 17143 17144 T((T_CALLED("slk_set(%d, \"%s\", %d)"), i, str, format)); 17145 17146 - if (SP == 0 17147 - || (slk = SP->_slk) == 0 17148 + if (SP_PARM == 0 17149 + || (slk = SP_PARM->_slk) == 0 17150 || i < 1 17151 || i > slk->labcnt 17152 || format < 0 17153 @@ -70,7 +70,7 @@ 17154 str = ""; 17155 --i; /* Adjust numbering of labels */ 17156 17157 - limit = MAX_SKEY_LEN(SP->slk_format); 17158 + limit = MAX_SKEY_LEN(SP_PARM->slk_format); 17159 while (isspace(UChar(*str))) 17160 str++; /* skip over leading spaces */ 17161 p = str; 17162 @@ -147,3 +147,11 @@ 17163 slk->ent[i].dirty = TRUE; 17164 returnCode(OK); 17165 } 17166 + 17167 +#if NCURSES_SP_FUNCS 17168 +NCURSES_EXPORT(int) 17169 +slk_set(int i, const char *astr, int format) 17170 +{ 17171 + return NCURSES_SP_NAME(slk_set) (CURRENT_SCREEN, i, astr, format); 17172 +} 17173 +#endif 17174 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slktouch.c ncurses-5.7/ncurses/base/lib_slktouch.c 17175 --- ncurses-5.7.orig/ncurses/base/lib_slktouch.c 2000-12-09 18:43:27.000000000 -0800 17176 +++ ncurses-5.7/ncurses/base/lib_slktouch.c 2009-02-15 23:21:24.628481072 -0800 17177 @@ -1,5 +1,5 @@ 17178 /**************************************************************************** 17179 - * Copyright (c) 1998,2000 Free Software Foundation, Inc. * 17180 + * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc. * 17181 * * 17182 * Permission is hereby granted, free of charge, to any person obtaining a * 17183 * copy of this software and associated documentation files (the * 17184 @@ -27,8 +27,8 @@ 17185 ****************************************************************************/ 17186 17187 /**************************************************************************** 17188 - * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 17189 - * and: Eric S. Raymond <esr@snark.thyrsus.com> * 17190 + * Author: Juergen Pfeifer 1997,2009 * 17191 + * and: Thomas E. Dickey 1996-on * 17192 ****************************************************************************/ 17193 17194 /* 17195 @@ -38,16 +38,24 @@ 17196 */ 17197 #include <curses.priv.h> 17198 17199 -MODULE_ID("$Id: lib_slktouch.c,v 1.5 2000/12/10 02:43:27 tom Exp $") 17200 +MODULE_ID("$Id: lib_slktouch.c,v 1.6 2009/02/15 00:44:36 tom Exp $") 17201 17202 NCURSES_EXPORT(int) 17203 -slk_touch(void) 17204 +NCURSES_SP_NAME(slk_touch) (NCURSES_SP_DCL0) 17205 { 17206 T((T_CALLED("slk_touch()"))); 17207 17208 - if (SP == NULL || SP->_slk == NULL) 17209 + if (SP_PARM == NULL || SP_PARM->_slk == NULL) 17210 returnCode(ERR); 17211 - SP->_slk->dirty = TRUE; 17212 + SP_PARM->_slk->dirty = TRUE; 17213 17214 returnCode(OK); 17215 } 17216 + 17217 +#if NCURSES_SP_FUNCS 17218 +NCURSES_EXPORT(int) 17219 +slk_touch(void) 17220 +{ 17221 + return NCURSES_SP_NAME(slk_touch) (CURRENT_SCREEN); 17222 +} 17223 +#endif 17224 diff -Naur ncurses-5.7.orig/ncurses/base/lib_ungetch.c ncurses-5.7/ncurses/base/lib_ungetch.c 17225 --- ncurses-5.7.orig/ncurses/base/lib_ungetch.c 2008-05-31 09:44:54.000000000 -0700 17226 +++ ncurses-5.7/ncurses/base/lib_ungetch.c 2009-02-15 23:21:24.628481072 -0800 17227 @@ -1,5 +1,5 @@ 17228 /**************************************************************************** 17229 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 17230 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 17231 * * 17232 * Permission is hereby granted, free of charge, to any person obtaining a * 17233 * copy of this software and associated documentation files (the * 17234 @@ -30,6 +30,7 @@ 17235 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 17236 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 17237 * and: Thomas E. Dickey 1996-on * 17238 + * and: Juergen Pfeifer 2009 * 17239 ****************************************************************************/ 17240 17241 /* 17242 @@ -41,7 +42,7 @@ 17243 17244 #include <curses.priv.h> 17245 17246 -MODULE_ID("$Id: lib_ungetch.c,v 1.11 2008/05/31 16:44:54 tom Exp $") 17247 +MODULE_ID("$Id: lib_ungetch.c,v 1.12 2009/02/15 00:46:58 tom Exp $") 17248 17249 #include <fifo_defs.h> 17250 17251 @@ -83,8 +84,16 @@ 17252 } 17253 17254 NCURSES_EXPORT(int) 17255 +NCURSES_SP_NAME(ungetch) (NCURSES_SP_DCLx int ch) 17256 +{ 17257 + T((T_CALLED("ungetch(%s)"), _nc_tracechar(SP_PARM, ch))); 17258 + returnCode(_nc_ungetch(SP_PARM, ch)); 17259 +} 17260 + 17261 +#if NCURSES_SP_FUNCS 17262 +NCURSES_EXPORT(int) 17263 ungetch(int ch) 17264 { 17265 - T((T_CALLED("ungetch(%s)"), _nc_tracechar(SP, ch))); 17266 - returnCode(_nc_ungetch(SP, ch)); 17267 + return NCURSES_SP_NAME(ungetch) (CURRENT_SCREEN, ch); 17268 } 17269 +#endif 17270 diff -Naur ncurses-5.7.orig/ncurses/base/MKkeyname.awk ncurses-5.7/ncurses/base/MKkeyname.awk 17271 --- ncurses-5.7.orig/ncurses/base/MKkeyname.awk 2008-07-12 11:40:00.000000000 -0700 17272 +++ ncurses-5.7/ncurses/base/MKkeyname.awk 2009-02-15 23:21:24.620481072 -0800 17273 @@ -1,6 +1,6 @@ 17274 -# $Id: MKkeyname.awk,v 1.40 2008/07/12 18:40:00 tom Exp $ 17275 +# $Id: MKkeyname.awk,v 1.41 2009/02/15 00:24:58 tom Exp $ 17276 ############################################################################## 17277 -# Copyright (c) 1999-2007,2008 Free Software Foundation, Inc. # 17278 +# Copyright (c) 1999-2008,2009 Free Software Foundation, Inc. # 17279 # # 17280 # Permission is hereby granted, free of charge, to any person obtaining a # 17281 # copy of this software and associated documentation files (the "Software"), # 17282 @@ -141,11 +141,20 @@ 17283 print " return result;" 17284 print "}" 17285 print "" 17286 - print "NCURSES_EXPORT(NCURSES_CONST char *) keyname (int c)" 17287 + print "NCURSES_EXPORT(NCURSES_CONST char *)" 17288 + print "NCURSES_SP_NAME(keyname) (NCURSES_SP_DCLx int c)" 17289 print "{" 17290 - print "\treturn _nc_keyname(SP, c);" 17291 + print "\treturn _nc_keyname(SP_PARM, c);" 17292 print "}" 17293 print "" 17294 + print "#if NCURSES_SP_FUNCS" 17295 + print "NCURSES_EXPORT(NCURSES_CONST char *)" 17296 + print "keyname (int c)" 17297 + print "{" 17298 + print " return NCURSES_SP_NAME(keyname) (CURRENT_SCREEN, c);" 17299 + print "}" 17300 + print "#endif" 17301 + print "" 17302 print "#if NO_LEAKS" 17303 print "void _nc_keyname_leaks(void)" 17304 print "{" 14939 17305 diff -Naur ncurses-5.7.orig/ncurses/curses.priv.h ncurses-5.7/ncurses/curses.priv.h 14940 17306 --- ncurses-5.7.orig/ncurses/curses.priv.h 2008-10-04 14:37:45.000000000 -0700 14941 +++ ncurses-5.7/ncurses/curses.priv.h 2009-02- 07 22:08:36.698833077-080017307 +++ ncurses-5.7/ncurses/curses.priv.h 2009-02-15 23:21:24.628481072 -0800 14942 17308 @@ -1,5 +1,5 @@ 14943 17309 /**************************************************************************** … … 14952 17318 /* 14953 17319 - * $Id: curses.priv.h,v 1.394 2008/10/04 21:37:45 tom Exp $ 14954 + * $Id: curses.priv.h,v 1.39 6 2009/01/24 23:04:59tom Exp $17320 + * $Id: curses.priv.h,v 1.399 2009/02/15 01:05:47 tom Exp $ 14955 17321 * 14956 17322 * curses.priv.h 14957 17323 * 14958 @@ -404,6 +404,8 @@ 17324 @@ -97,8 +97,6 @@ 17325 extern int errno; 17326 #endif 17327 17328 -#include <nc_panel.h> 17329 - 17330 /* Some systems have a broken 'select()', but workable 'poll()'. Use that */ 17331 #if HAVE_WORKING_POLL 17332 #define USE_FUNC_POLL 1 17333 @@ -257,6 +255,38 @@ 17334 #define NCURSES_OPAQUE 0 17335 17336 #include <curses.h> /* we'll use -Ipath directive to get the right one! */ 17337 + 17338 +/* 17339 + * If curses.h did not expose the SCREEN-functions, then we do not need the 17340 + * parameter in the corresponding unextended functions. 17341 + */ 17342 +#if NCURSES_SP_FUNCS 17343 +#define SP_PARM sp /* use parameter */ 17344 +#define NCURSES_SP_ARG SP_PARM 17345 +#define NCURSES_SP_DCL SCREEN *NCURSES_SP_ARG 17346 +#define NCURSES_SP_DCL0 NCURSES_SP_DCL 17347 +#define NCURSES_SP_ARGx NCURSES_SP_ARG, 17348 +#define NCURSES_SP_DCLx SCREEN *NCURSES_SP_ARGx 17349 +#else 17350 +#define SP_PARM SP /* use global variable */ 17351 +#define NCURSES_SP_ARG 17352 +#define NCURSES_SP_DCL 17353 +#define NCURSES_SP_DCL0 void 17354 +#define NCURSES_SP_ARGx 17355 +#define NCURSES_SP_DCLx 17356 +#endif 17357 + 17358 +#include <nc_panel.h> 17359 + 17360 +#define IsPreScreen(sp) (((sp)!=0) && sp->_prescreen) 17361 +#define HasTerminal(sp) (((sp)!=0) && (0!=((sp)->_term))) 17362 +#define IsValidScreen(sp) (HasTerminal(sp) && !sp->_prescreen) 17363 +#if BROKEN_LINKER || USE_REENTRANT 17364 +#define TerminalOf(sp) ((sp)?((sp)->_term?(sp)->_term:_nc_prescreen._cur_term): _nc_prescreen._cur_term) 17365 +#else 17366 +#define TerminalOf(sp) ((sp)?((sp)->_term?(sp)->_term:cur_term):cur_term) 17367 +#endif 17368 + 17369 #include <term.h> 17370 #include <term_entry.h> 17371 #include <nc_tparm.h> 17372 @@ -404,6 +434,8 @@ 14959 17373 #define C_SHIFT 9 /* we need more bits than there are colors */ 14960 17374 #define C_MASK ((1 << C_SHIFT) - 1) … … 14965 17379 14966 17380 #define COLOR_DEFAULT C_MASK 14967 @@ -794,11 +796,13 @@ 17381 @@ -703,6 +735,8 @@ 17382 char *_setbuf; /* buffered I/O for output */ 17383 bool _filtered; /* filter() was called */ 17384 bool _buffered; /* setvbuf uses _setbuf data */ 17385 + bool _prescreen; /* is in prescreen phase */ 17386 + bool _use_env; /* LINES & COLS from environment? */ 17387 int _checkfd; /* filedesc for typeahead check */ 17388 TERMINAL *_term; /* terminal type information */ 17389 TTY _saved_tty; /* savetty/resetty information */ 17390 @@ -794,11 +828,13 @@ 14968 17391 int _color_count; /* count of colors in palette */ 14969 17392 colorpair_t *_color_pairs; /* screen's color pair list */ … … 14979 17402 chtype _ok_attributes; /* valid attributes for terminal */ 14980 17403 chtype _xmc_suppress; /* attributes to suppress if xmc */ 14981 @@ -1519,7 +15 23,7 @@17404 @@ -1519,7 +1555,7 @@ 14982 17405 extern NCURSES_EXPORT(void) _nc_screen_wrap (void); 14983 17406 … … 14988 17411 /* lib_mvcur.c */ 14989 17412 #define INFINITY 1000000 /* cost: too high to use */ 17413 @@ -1681,6 +1717,8 @@ 17414 #define _nc_set_screen(sp) SP = sp 17415 #endif 17416 17417 +#define CURRENT_SCREEN SP 17418 + 17419 /* 17420 * We don't want to use the lines or columns capabilities internally, because 17421 * if the application is running multiple screens under X, it's quite possible 14990 17422 diff -Naur ncurses-5.7.orig/ncurses/Makefile.in ncurses-5.7/ncurses/Makefile.in 14991 17423 --- ncurses-5.7.orig/ncurses/Makefile.in 2008-10-18 07:11:54.000000000 -0700 14992 +++ ncurses-5.7/ncurses/Makefile.in 2009-02- 07 22:08:29.738503702 -080017424 +++ ncurses-5.7/ncurses/Makefile.in 2009-02-15 23:21:09.919538762 -0800 14993 17425 @@ -1,6 +1,6 @@ 14994 17426 -# $Id: Makefile.in,v 1.113 2008/10/18 14:11:54 tom Exp $ … … 15011 17443 diff -Naur ncurses-5.7.orig/ncurses/tinfo/entries.c ncurses-5.7/ncurses/tinfo/entries.c 15012 17444 --- ncurses-5.7.orig/ncurses/tinfo/entries.c 2008-09-27 06:11:10.000000000 -0700 15013 +++ ncurses-5.7/ncurses/tinfo/entries.c 2009-02- 07 22:08:20.961189552-080017445 +++ ncurses-5.7/ncurses/tinfo/entries.c 2009-02-15 23:21:03.083101270 -0800 15014 17446 @@ -37,7 +37,7 @@ 15015 17447 #include <tic.h> … … 15033 17465 diff -Naur ncurses-5.7.orig/ncurses/tinfo/hashed_db.c ncurses-5.7/ncurses/tinfo/hashed_db.c 15034 17466 --- ncurses-5.7.orig/ncurses/tinfo/hashed_db.c 2006-08-19 12:48:38.000000000 -0700 15035 +++ ncurses-5.7/ncurses/tinfo/hashed_db.c 2009-02- 07 22:08:22.700246404-080017467 +++ ncurses-5.7/ncurses/tinfo/hashed_db.c 2009-02-15 23:21:04.663202123 -0800 15036 17468 @@ -1,5 +1,5 @@ 15037 17469 /**************************************************************************** … … 15137 17569 } 15138 17570 15139 diff -Naur ncurses-5.7.orig/ncurses/t ty/tty_update.c ncurses-5.7/ncurses/tty/tty_update.c15140 --- ncurses-5.7.orig/ncurses/t ty/tty_update.c 2008-08-30 13:08:19.000000000 -070015141 +++ ncurses-5.7/ncurses/t ty/tty_update.c 2009-02-07 22:08:36.702933371-080017571 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_baudrate.c ncurses-5.7/ncurses/tinfo/lib_baudrate.c 17572 --- ncurses-5.7.orig/ncurses/tinfo/lib_baudrate.c 2008-06-28 08:19:24.000000000 -0700 17573 +++ ncurses-5.7/ncurses/tinfo/lib_baudrate.c 2009-02-15 23:21:24.628481072 -0800 15142 17574 @@ -1,5 +1,5 @@ 15143 17575 /**************************************************************************** … … 15147 17579 * Permission is hereby granted, free of charge, to any person obtaining a * 15148 17580 * copy of this software and associated documentation files (the * 15149 @@ -78,7 +78,7 @@ 17581 @@ -80,7 +80,7 @@ 17582 #undef USE_OLD_TTY 17583 #endif /* USE_OLD_TTY */ 17584 17585 -MODULE_ID("$Id: lib_baudrate.c,v 1.27 2008/06/28 15:19:24 tom Exp $") 17586 +MODULE_ID("$Id: lib_baudrate.c,v 1.28 2009/02/14 21:41:22 tom Exp $") 17587 17588 /* 17589 * int 17590 @@ -195,7 +195,7 @@ 17591 } 17592 17593 NCURSES_EXPORT(int) 17594 -baudrate(void) 17595 +NCURSES_SP_NAME(baudrate) (NCURSES_SP_DCL0) 17596 { 17597 int result; 17598 17599 @@ -207,7 +207,7 @@ 17600 * that take into account costs that depend on baudrate. 17601 */ 17602 #ifdef TRACE 17603 - if (!isatty(fileno(SP ? SP->_ofp : stdout)) 17604 + if (!isatty(fileno(SP_PARM ? SP_PARM->_ofp : stdout)) 17605 && getenv("BAUDRATE") != 0) { 17606 int ret; 17607 if ((ret = _nc_getenv_num("BAUDRATE")) <= 0) 17608 @@ -236,3 +236,11 @@ 17609 17610 returnCode(result); 17611 } 17612 + 17613 +#if NCURSES_SP_FUNCS 17614 +NCURSES_EXPORT(int) 17615 +baudrate(void) 17616 +{ 17617 + return NCURSES_SP_NAME(baudrate) (CURRENT_SCREEN); 17618 +} 17619 +#endif 17620 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_has_cap.c ncurses-5.7/ncurses/tinfo/lib_has_cap.c 17621 --- ncurses-5.7.orig/ncurses/tinfo/lib_has_cap.c 2003-10-25 12:43:55.000000000 -0700 17622 +++ ncurses-5.7/ncurses/tinfo/lib_has_cap.c 2009-02-15 23:21:24.632481631 -0800 17623 @@ -1,5 +1,5 @@ 17624 /**************************************************************************** 17625 - * Copyright (c) 1998-2000,2003 Free Software Foundation, Inc. * 17626 + * Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. * 17627 * * 17628 * Permission is hereby granted, free of charge, to any person obtaining a * 17629 * copy of this software and associated documentation files (the * 17630 @@ -30,6 +30,7 @@ 17631 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 17632 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 17633 * and: Thomas E. Dickey 1996-2003 * 17634 + * and: Juergen Pfeifer 2009 * 17635 ****************************************************************************/ 17636 17637 /* 17638 @@ -43,10 +44,10 @@ 17639 17640 #include <term.h> 17641 17642 -MODULE_ID("$Id: lib_has_cap.c,v 1.4 2003/10/25 19:43:55 tom Exp $") 17643 +MODULE_ID("$Id: lib_has_cap.c,v 1.5 2009/02/15 00:47:12 tom Exp $") 17644 17645 NCURSES_EXPORT(bool) 17646 -has_ic(void) 17647 +NCURSES_SP_NAME(has_ic) (NCURSES_SP_DCL0) 17648 { 17649 T((T_CALLED("has_ic()"))); 17650 returnCode(cur_term && 17651 @@ -55,11 +56,27 @@ 17652 && (delete_character || parm_dch)); 17653 } 17654 17655 +#if NCURSES_SP_FUNCS 17656 NCURSES_EXPORT(bool) 17657 -has_il(void) 17658 +has_ic(void) 17659 +{ 17660 + return NCURSES_SP_NAME(has_ic) (CURRENT_SCREEN); 17661 +} 17662 +#endif 17663 + 17664 +NCURSES_EXPORT(bool) 17665 +NCURSES_SP_NAME(has_il) (NCURSES_SP_DCL0) 17666 { 17667 T((T_CALLED("has_il()"))); 17668 returnCode(cur_term 17669 && (insert_line || parm_insert_line) 17670 && (delete_line || parm_delete_line)); 17671 } 17672 + 17673 +#if NCURSES_SP_FUNCS 17674 +NCURSES_EXPORT(bool) 17675 +has_il(void) 17676 +{ 17677 + return NCURSES_SP_NAME(has_il) (CURRENT_SCREEN); 17678 +} 17679 +#endif 17680 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_kernel.c ncurses-5.7/ncurses/tinfo/lib_kernel.c 17681 --- ncurses-5.7.orig/ncurses/tinfo/lib_kernel.c 2004-05-08 10:11:21.000000000 -0700 17682 +++ ncurses-5.7/ncurses/tinfo/lib_kernel.c 2009-02-15 23:21:24.632481631 -0800 17683 @@ -1,5 +1,5 @@ 17684 /**************************************************************************** 17685 - * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. * 17686 + * Copyright (c) 1998-2004,2009 Free Software Foundation, Inc. * 17687 * * 17688 * Permission is hereby granted, free of charge, to any person obtaining a * 17689 * copy of this software and associated documentation files (the * 17690 @@ -29,7 +29,8 @@ 17691 /**************************************************************************** 17692 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 17693 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 17694 - * and: Thomas E. Dickey 2002 * 17695 + * and: Thomas E. Dickey 2002 * 17696 + * and: Juergen Pfeifer 2009 * 17697 ****************************************************************************/ 17698 17699 /* 17700 @@ -48,7 +49,7 @@ 17701 #include <curses.priv.h> 17702 #include <term.h> /* cur_term */ 17703 17704 -MODULE_ID("$Id: lib_kernel.c,v 1.24 2004/05/08 17:11:21 tom Exp $") 17705 +MODULE_ID("$Id: lib_kernel.c,v 1.25 2009/02/15 00:47:52 tom Exp $") 17706 17707 static int 17708 _nc_vdisable(void) 17709 @@ -79,7 +80,7 @@ 17710 */ 17711 17712 NCURSES_EXPORT(char) 17713 -erasechar(void) 17714 +NCURSES_SP_NAME(erasechar) (NCURSES_SP_DCL0) 17715 { 17716 int result = ERR; 17717 T((T_CALLED("erasechar()"))); 17718 @@ -96,6 +97,14 @@ 17719 returnCode(result); 17720 } 17721 17722 +#if NCURSES_SP_FUNCS 17723 +NCURSES_EXPORT(char) 17724 +erasechar(void) 17725 +{ 17726 + return NCURSES_SP_NAME(erasechar) (CURRENT_SCREEN); 17727 +} 17728 +#endif 17729 + 17730 /* 17731 * killchar() 17732 * 17733 @@ -104,7 +113,7 @@ 17734 */ 17735 17736 NCURSES_EXPORT(char) 17737 -killchar(void) 17738 +NCURSES_SP_NAME(killchar) (NCURSES_SP_DCL0) 17739 { 17740 int result = ERR; 17741 T((T_CALLED("killchar()"))); 17742 @@ -121,6 +130,14 @@ 17743 returnCode(result); 17744 } 17745 17746 +#if NCURSES_SP_FUNCS 17747 +NCURSES_EXPORT(char) 17748 +killchar(void) 17749 +{ 17750 + return NCURSES_SP_NAME(killchar) (CURRENT_SCREEN); 17751 +} 17752 +#endif 17753 + 17754 /* 17755 * flushinp() 17756 * 17757 @@ -129,7 +146,7 @@ 17758 */ 17759 17760 NCURSES_EXPORT(int) 17761 -flushinp(void) 17762 +NCURSES_SP_NAME(flushinp) (NCURSES_SP_DCL0) 17763 { 17764 T((T_CALLED("flushinp()"))); 17765 17766 @@ -143,12 +160,20 @@ 17767 } while 17768 (errno == EINTR); 17769 #endif 17770 - if (SP) { 17771 - SP->_fifohead = -1; 17772 - SP->_fifotail = 0; 17773 - SP->_fifopeek = 0; 17774 + if (SP_PARM) { 17775 + SP_PARM->_fifohead = -1; 17776 + SP_PARM->_fifotail = 0; 17777 + SP_PARM->_fifopeek = 0; 17778 } 17779 returnCode(OK); 17780 } 17781 returnCode(ERR); 17782 } 17783 + 17784 +#if NCURSES_SP_FUNCS 17785 +NCURSES_EXPORT(int) 17786 +flushinp(void) 17787 +{ 17788 + return NCURSES_SP_NAME(flushinp) (CURRENT_SCREEN); 17789 +} 17790 +#endif 17791 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_longname.c ncurses-5.7/ncurses/tinfo/lib_longname.c 17792 --- ncurses-5.7.orig/ncurses/tinfo/lib_longname.c 2000-12-09 18:55:07.000000000 -0800 17793 +++ ncurses-5.7/ncurses/tinfo/lib_longname.c 2009-02-15 23:21:24.632481631 -0800 17794 @@ -1,5 +1,5 @@ 17795 /**************************************************************************** 17796 - * Copyright (c) 1998,2000 Free Software Foundation, Inc. * 17797 + * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc. * 17798 * * 17799 * Permission is hereby granted, free of charge, to any person obtaining a * 17800 * copy of this software and associated documentation files (the * 17801 @@ -29,6 +29,8 @@ 17802 /**************************************************************************** 17803 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 17804 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 17805 + * and: Thomas E. Dickey 1996-on * 17806 + * and: Juergen Pfeifer 2009 * 17807 ****************************************************************************/ 17808 17809 /* 17810 @@ -40,10 +42,10 @@ 17811 17812 #include <curses.priv.h> 17813 17814 -MODULE_ID("$Id: lib_longname.c,v 1.9 2000/12/10 02:55:07 tom Exp $") 17815 +MODULE_ID("$Id: lib_longname.c,v 1.10 2009/02/15 00:48:15 tom Exp $") 17816 17817 NCURSES_EXPORT(char *) 17818 -longname(void) 17819 +NCURSES_SP_NAME(longname) (NCURSES_SP_DCL0) 17820 { 17821 char *ptr; 17822 17823 @@ -55,3 +57,11 @@ 17824 17825 returnPtr(ttytype); 17826 } 17827 + 17828 +#if NCURSES_SP_FUNCS 17829 +NCURSES_EXPORT(char *) 17830 +longname(void) 17831 +{ 17832 + return NCURSES_SP_NAME(longname) (CURRENT_SCREEN); 17833 +} 17834 +#endif 17835 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_napms.c ncurses-5.7/ncurses/tinfo/lib_napms.c 17836 --- ncurses-5.7.orig/ncurses/tinfo/lib_napms.c 2008-05-03 14:34:13.000000000 -0700 17837 +++ ncurses-5.7/ncurses/tinfo/lib_napms.c 2009-02-15 23:21:24.632481631 -0800 17838 @@ -1,5 +1,5 @@ 17839 /**************************************************************************** 17840 - * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc. * 17841 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 17842 * * 17843 * Permission is hereby granted, free of charge, to any person obtaining a * 17844 * copy of this software and associated documentation files (the * 17845 @@ -29,6 +29,8 @@ 17846 /**************************************************************************** 17847 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 17848 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 17849 + * and: Thomas E. Dickey 1996-on * 17850 + * and: Juergen Pfeifer 2009 * 17851 ****************************************************************************/ 17852 17853 /* 17854 @@ -49,10 +51,10 @@ 17855 #endif 17856 #endif 17857 17858 -MODULE_ID("$Id: lib_napms.c,v 1.17 2008/05/03 21:34:13 tom Exp $") 17859 +MODULE_ID("$Id: lib_napms.c,v 1.18 2009/02/15 00:48:27 tom Exp $") 17860 17861 NCURSES_EXPORT(int) 17862 -napms(int ms) 17863 +NCURSES_SP_NAME(napms) (NCURSES_SP_DCLx int ms) 17864 { 17865 T((T_CALLED("napms(%d)"), ms)); 17866 17867 @@ -72,3 +74,11 @@ 17868 17869 returnCode(OK); 17870 } 17871 + 17872 +#if NCURSES_SP_FUNCS 17873 +NCURSES_EXPORT(int) 17874 +napms(int ms) 17875 +{ 17876 + return NCURSES_SP_NAME(napms) (CURRENT_SCREEN, ms); 17877 +} 17878 +#endif 17879 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_options.c ncurses-5.7/ncurses/tinfo/lib_options.c 17880 --- ncurses-5.7.orig/ncurses/tinfo/lib_options.c 2008-08-16 14:20:48.000000000 -0700 17881 +++ ncurses-5.7/ncurses/tinfo/lib_options.c 2009-02-15 23:21:24.632481631 -0800 17882 @@ -1,5 +1,5 @@ 17883 /**************************************************************************** 17884 - * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. * 17885 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 17886 * * 17887 * Permission is hereby granted, free of charge, to any person obtaining a * 17888 * copy of this software and associated documentation files (the * 17889 @@ -30,6 +30,7 @@ 17890 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 17891 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 17892 * and: Thomas E. Dickey 1996-on * 17893 + * and: Juergen Pfeifer 2009 * 17894 ****************************************************************************/ 17895 17896 /* 17897 @@ -43,7 +44,7 @@ 17898 17899 #include <term.h> 17900 17901 -MODULE_ID("$Id: lib_options.c,v 1.58 2008/08/16 21:20:48 Werner.Fink Exp $") 17902 +MODULE_ID("$Id: lib_options.c,v 1.59 2009/02/15 00:48:40 tom Exp $") 17903 17904 static int _nc_curs_set(SCREEN *, int); 17905 static int _nc_meta(SCREEN *, bool); 17906 @@ -72,18 +73,26 @@ 17907 } 17908 17909 NCURSES_EXPORT(int) 17910 -halfdelay(int t) 17911 +NCURSES_SP_NAME(halfdelay) (NCURSES_SP_DCLx int t) 17912 { 17913 T((T_CALLED("halfdelay(%d)"), t)); 17914 17915 - if (t < 1 || t > 255 || SP == 0) 17916 + if (t < 1 || t > 255 || SP_PARM == 0) 17917 returnCode(ERR); 17918 17919 cbreak(); 17920 - SP->_cbreak = t + 1; 17921 + SP_PARM->_cbreak = t + 1; 17922 returnCode(OK); 17923 } 17924 17925 +#if NCURSES_SP_FUNCS 17926 +NCURSES_EXPORT(int) 17927 +halfdelay(int t) 17928 +{ 17929 + return NCURSES_SP_NAME(halfdelay) (CURRENT_SCREEN, t); 17930 +} 17931 +#endif 17932 + 17933 NCURSES_EXPORT(int) 17934 nodelay(WINDOW *win, bool flag) 17935 { 17936 @@ -158,17 +167,25 @@ 17937 } 17938 17939 NCURSES_EXPORT(int) 17940 -typeahead(int fd) 17941 +NCURSES_SP_NAME(typeahead) (NCURSES_SP_DCLx int fd) 17942 { 17943 T((T_CALLED("typeahead(%d)"), fd)); 17944 - if (SP != 0) { 17945 - SP->_checkfd = fd; 17946 + if (SP_PARM != 0) { 17947 + SP_PARM->_checkfd = fd; 17948 returnCode(OK); 17949 } else { 17950 returnCode(ERR); 17951 } 17952 } 17953 17954 +#if NCURSES_SP_FUNCS 17955 +NCURSES_EXPORT(int) 17956 +typeahead(int fd) 17957 +{ 17958 + return NCURSES_SP_NAME(typeahead) (CURRENT_SCREEN, fd); 17959 +} 17960 +#endif 17961 + 17962 /* 17963 ** has_key() 17964 ** 17965 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_raw.c ncurses-5.7/ncurses/tinfo/lib_raw.c 17966 --- ncurses-5.7.orig/ncurses/tinfo/lib_raw.c 2007-09-29 14:50:22.000000000 -0700 17967 +++ ncurses-5.7/ncurses/tinfo/lib_raw.c 2009-02-15 23:21:24.632481631 -0800 17968 @@ -1,5 +1,5 @@ 17969 /**************************************************************************** 17970 - * Copyright (c) 1998-2002,2007 Free Software Foundation, Inc. * 17971 + * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. * 17972 * * 17973 * Permission is hereby granted, free of charge, to any person obtaining a * 17974 * copy of this software and associated documentation files (the * 17975 @@ -29,7 +29,8 @@ 17976 /**************************************************************************** 17977 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 17978 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 17979 - * and: Thomas E. Dickey 1998 on * 17980 + * and: Thomas E. Dickey 1998-on * 17981 + * and: Juergen Pfeifer 2009 * 17982 ****************************************************************************/ 17983 17984 /* 17985 @@ -49,7 +50,7 @@ 17986 #include <curses.priv.h> 17987 #include <term.h> /* cur_term */ 17988 17989 -MODULE_ID("$Id: lib_raw.c,v 1.14 2007/09/29 21:50:22 tom Exp $") 17990 +MODULE_ID("$Id: lib_raw.c,v 1.15 2009/02/15 00:49:02 tom Exp $") 17991 17992 #if SVR4_TERMIO && !defined(_POSIX_SOURCE) 17993 #define _POSIX_SOURCE 17994 @@ -61,7 +62,7 @@ 17995 17996 #ifdef __EMX__ 17997 #include <io.h> 17998 -#define _nc_setmode(mode) setmode(SP->_ifd, mode) 17999 +#define _nc_setmode(mode) setmode(SP_PARM->_ifd, mode) 18000 #else 18001 #define _nc_setmode(mode) /* nothing */ 18002 #endif 18003 @@ -77,13 +78,13 @@ 18004 #endif /* TRACE */ 18005 18006 NCURSES_EXPORT(int) 18007 -raw(void) 18008 +NCURSES_SP_NAME(raw) (NCURSES_SP_DCL0) 18009 { 18010 int result = ERR; 18011 18012 T((T_CALLED("raw()"))); 18013 18014 - if (SP != 0 && cur_term != 0) { 18015 + if (SP_PARM != 0 && cur_term != 0) { 18016 TTY buf; 18017 18018 BEFORE("raw"); 18019 @@ -99,8 +100,8 @@ 18020 buf.sg_flags |= RAW; 18021 #endif 18022 if ((result = _nc_set_tty_mode(&buf)) == OK) { 18023 - SP->_raw = TRUE; 18024 - SP->_cbreak = 1; 18025 + SP_PARM->_raw = TRUE; 18026 + SP_PARM->_cbreak = 1; 18027 cur_term->Nttyb = buf; 18028 } 18029 AFTER("raw"); 18030 @@ -108,14 +109,22 @@ 18031 returnCode(result); 18032 } 18033 18034 +#if NCURSES_SP_FUNCS 18035 NCURSES_EXPORT(int) 18036 -cbreak(void) 18037 +raw(void) 18038 +{ 18039 + return NCURSES_SP_NAME(raw) (CURRENT_SCREEN); 18040 +} 18041 +#endif 18042 + 18043 +NCURSES_EXPORT(int) 18044 +NCURSES_SP_NAME(cbreak) (NCURSES_SP_DCL0) 18045 { 18046 int result = ERR; 18047 18048 T((T_CALLED("cbreak()"))); 18049 18050 - if (SP != 0 && cur_term != 0) { 18051 + if (SP_PARM != 0 && cur_term != 0) { 18052 TTY buf; 18053 18054 BEFORE("cbreak"); 18055 @@ -132,7 +141,7 @@ 18056 buf.sg_flags |= CBREAK; 18057 #endif 18058 if ((result = _nc_set_tty_mode(&buf)) == OK) { 18059 - SP->_cbreak = 1; 18060 + SP_PARM->_cbreak = 1; 18061 cur_term->Nttyb = buf; 18062 } 18063 AFTER("cbreak"); 18064 @@ -140,12 +149,20 @@ 18065 returnCode(result); 18066 } 18067 18068 +#if NCURSES_SP_FUNCS 18069 +NCURSES_EXPORT(int) 18070 +cbreak(void) 18071 +{ 18072 + return NCURSES_SP_NAME(cbreak) (CURRENT_SCREEN); 18073 +} 18074 +#endif 18075 + 18076 /* 18077 * Note: 18078 * this implementation may be wrong. See the comment under intrflush(). 18079 */ 18080 NCURSES_EXPORT(void) 18081 -qiflush(void) 18082 +NCURSES_SP_NAME(qiflush) (NCURSES_SP_DCL0) 18083 { 18084 int result = ERR; 18085 18086 @@ -169,14 +186,22 @@ 18087 returnVoid; 18088 } 18089 18090 +#if NCURSES_SP_FUNCS 18091 +NCURSES_EXPORT(void) 18092 +qiflush(void) 18093 +{ 18094 + NCURSES_SP_NAME(qiflush) (CURRENT_SCREEN); 18095 +} 18096 +#endif 18097 + 18098 NCURSES_EXPORT(int) 18099 -noraw(void) 18100 +NCURSES_SP_NAME(noraw) (NCURSES_SP_DCL0) 18101 { 18102 int result = ERR; 18103 18104 T((T_CALLED("noraw()"))); 18105 18106 - if (SP != 0 && cur_term != 0) { 18107 + if (SP_PARM != 0 && cur_term != 0) { 18108 TTY buf; 18109 18110 BEFORE("noraw"); 18111 @@ -191,8 +216,8 @@ 18112 buf.sg_flags &= ~(RAW | CBREAK); 18113 #endif 18114 if ((result = _nc_set_tty_mode(&buf)) == OK) { 18115 - SP->_raw = FALSE; 18116 - SP->_cbreak = 0; 18117 + SP_PARM->_raw = FALSE; 18118 + SP_PARM->_cbreak = 0; 18119 cur_term->Nttyb = buf; 18120 } 18121 AFTER("noraw"); 18122 @@ -200,14 +225,22 @@ 18123 returnCode(result); 18124 } 18125 18126 +#if NCURSES_SP_FUNCS 18127 NCURSES_EXPORT(int) 18128 -nocbreak(void) 18129 +noraw(void) 18130 +{ 18131 + return NCURSES_SP_NAME(noraw) (CURRENT_SCREEN); 18132 +} 18133 +#endif 18134 + 18135 +NCURSES_EXPORT(int) 18136 +NCURSES_SP_NAME(nocbreak) (NCURSES_SP_DCL0) 18137 { 18138 int result = ERR; 18139 18140 T((T_CALLED("nocbreak()"))); 18141 18142 - if (SP != 0 && cur_term != 0) { 18143 + if (SP_PARM != 0 && cur_term != 0) { 18144 TTY buf; 18145 18146 BEFORE("nocbreak"); 18147 @@ -221,7 +254,7 @@ 18148 buf.sg_flags &= ~CBREAK; 18149 #endif 18150 if ((result = _nc_set_tty_mode(&buf)) == OK) { 18151 - SP->_cbreak = 0; 18152 + SP_PARM->_cbreak = 0; 18153 cur_term->Nttyb = buf; 18154 } 18155 AFTER("nocbreak"); 18156 @@ -229,12 +262,20 @@ 18157 returnCode(result); 18158 } 18159 18160 +#if NCURSES_SP_FUNCS 18161 +NCURSES_EXPORT(int) 18162 +nocbreak(void) 18163 +{ 18164 + return NCURSES_SP_NAME(nocbreak) (CURRENT_SCREEN); 18165 +} 18166 +#endif 18167 + 18168 /* 18169 * Note: 18170 * this implementation may be wrong. See the comment under intrflush(). 18171 */ 18172 NCURSES_EXPORT(void) 18173 -noqiflush(void) 18174 +NCURSES_SP_NAME(noqiflush) (NCURSES_SP_DCL0) 18175 { 18176 int result = ERR; 18177 18178 @@ -259,6 +300,14 @@ 18179 returnVoid; 18180 } 18181 18182 +#if NCURSES_SP_FUNCS 18183 +NCURSES_EXPORT(void) 18184 +noqiflush(void) 18185 +{ 18186 + NCURSES_SP_NAME(noqiflush) (CURRENT_SCREEN); 18187 +} 18188 +#endif 18189 + 18190 /* 18191 * This call does the same thing as the qiflush()/noqiflush() pair. We know 18192 * for certain that SVr3 intrflush() tweaks the NOFLSH bit; on the other hand, 18193 @@ -267,7 +316,7 @@ 18194 * curs_inopts(3x) is too exact to be coincidence. 18195 */ 18196 NCURSES_EXPORT(int) 18197 -intrflush(WINDOW *win GCC_UNUSED, bool flag) 18198 +NCURSES_SP_NAME(intrflush) (NCURSES_SP_DCLx WINDOW *win GCC_UNUSED, bool flag) 18199 { 18200 int result = ERR; 18201 18202 @@ -294,3 +343,11 @@ 18203 } 18204 returnCode(result); 18205 } 18206 + 18207 +#if NCURSES_SP_FUNCS 18208 +NCURSES_EXPORT(int) 18209 +intrflush(WINDOW *win GCC_UNUSED, bool flag) 18210 +{ 18211 + return NCURSES_SP_NAME(intrflush) (CURRENT_SCREEN, win, flag); 18212 +} 18213 +#endif 18214 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_setup.c ncurses-5.7/ncurses/tinfo/lib_setup.c 18215 --- ncurses-5.7.orig/ncurses/tinfo/lib_setup.c 2008-08-03 15:42:33.000000000 -0700 18216 +++ ncurses-5.7/ncurses/tinfo/lib_setup.c 2009-02-15 23:21:24.632481631 -0800 18217 @@ -1,5 +1,5 @@ 18218 /**************************************************************************** 18219 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 18220 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 18221 * * 18222 * Permission is hereby granted, free of charge, to any person obtaining a * 18223 * copy of this software and associated documentation files (the * 18224 @@ -30,6 +30,7 @@ 18225 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 18226 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 18227 * and: Thomas E. Dickey 1996-on * 18228 + * and: Juergen Pfeifer 2009 * 18229 ****************************************************************************/ 18230 18231 /* 18232 @@ -53,7 +54,7 @@ 18233 18234 #include <term.h> /* lines, columns, cur_term */ 18235 18236 -MODULE_ID("$Id: lib_setup.c,v 1.111 2008/08/03 22:42:33 tom Exp $") 18237 +MODULE_ID("$Id: lib_setup.c,v 1.113 2009/02/14 22:21:40 tom Exp $") 18238 18239 /**************************************************************************** 18240 * 18241 @@ -149,21 +150,30 @@ 18242 18243 #if NCURSES_EXT_FUNCS 18244 NCURSES_EXPORT(int) 18245 -set_tabsize(int value) 18246 +NCURSES_SP_NAME(set_tabsize) (NCURSES_SP_DCLx int value) 18247 { 18248 int code = OK; 18249 #if USE_REENTRANT 18250 - if (SP) { 18251 - SP->_TABSIZE = value; 18252 + if (SP_PARM) { 18253 + SP_PARM->_TABSIZE = value; 18254 } else { 18255 code = ERR; 18256 } 18257 #else 18258 + (void) SP_PARM; 18259 TABSIZE = value; 18260 #endif 18261 return code; 18262 } 18263 + 18264 +#if NCURSES_SP_FUNCS 18265 +NCURSES_EXPORT(int) 18266 +set_tabsize(int value) 18267 +{ 18268 + return NCURSES_SP_NAME(set_tabsize) (CURRENT_SCREEN, value); 18269 +} 18270 #endif 18271 +#endif /* NCURSES_EXT_FUNCS */ 18272 18273 #if USE_SIGWINCH 18274 /* 18275 @@ -188,13 +198,25 @@ 18276 #endif 18277 18278 NCURSES_EXPORT(void) 18279 -use_env(bool f) 18280 +NCURSES_SP_NAME(use_env) (NCURSES_SP_DCLx bool f) 18281 { 18282 T((T_CALLED("use_env()"))); 18283 - _nc_prescreen.use_env = f; 18284 + if (IsPreScreen(SP_PARM)) { 18285 + SP_PARM->_use_env = f; 18286 + } else { 18287 + _nc_prescreen.use_env = f; 18288 + } 18289 returnVoid; 18290 } 18291 18292 +#if NCURSES_SP_FUNCS 18293 +NCURSES_EXPORT(void) 18294 +use_env(bool f) 18295 +{ 18296 + NCURSES_SP_NAME(use_env) (CURRENT_SCREEN, f); 18297 +} 18298 +#endif 18299 + 18300 NCURSES_EXPORT(void) 18301 _nc_get_screensize(SCREEN *sp, int *linep, int *colp) 18302 /* Obtain lines/columns values from the environment and/or terminfo entry */ 18303 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_termname.c ncurses-5.7/ncurses/tinfo/lib_termname.c 18304 --- ncurses-5.7.orig/ncurses/tinfo/lib_termname.c 2003-12-27 10:23:01.000000000 -0800 18305 +++ ncurses-5.7/ncurses/tinfo/lib_termname.c 2009-02-15 23:21:24.632481631 -0800 18306 @@ -1,5 +1,5 @@ 18307 /**************************************************************************** 18308 - * Copyright (c) 1998-2001,2003 Free Software Foundation, Inc. * 18309 + * Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. * 18310 * * 18311 * Permission is hereby granted, free of charge, to any person obtaining a * 18312 * copy of this software and associated documentation files (the * 18313 @@ -28,17 +28,31 @@ 18314 18315 #include <curses.priv.h> 18316 18317 -MODULE_ID("$Id: lib_termname.c,v 1.8 2003/12/27 18:23:01 tom Exp $") 18318 +MODULE_ID("$Id: lib_termname.c,v 1.10 2009/02/15 01:07:06 tom Exp $") 18319 18320 NCURSES_EXPORT(char *) 18321 -termname(void) 18322 +NCURSES_SP_NAME(termname) (NCURSES_SP_DCL0) 18323 { 18324 char *name = 0; 18325 18326 T((T_CALLED("termname()"))); 18327 18328 +#if NCURSES_SP_FUNCS 18329 + if (TerminalOf(SP_PARM) != 0) { 18330 + name = TerminalOf(SP_PARM)->_termname; 18331 + } 18332 +#else 18333 if (cur_term != 0) 18334 name = cur_term->_termname; 18335 +#endif 18336 18337 returnPtr(name); 18338 } 18339 + 18340 +#if NCURSES_SP_FUNCS 18341 +NCURSES_EXPORT(char *) 18342 +termname(void) 18343 +{ 18344 + return NCURSES_SP_NAME(termname) (CURRENT_SCREEN); 18345 +} 18346 +#endif 18347 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_tputs.c ncurses-5.7/ncurses/tinfo/lib_tputs.c 18348 --- ncurses-5.7.orig/ncurses/tinfo/lib_tputs.c 2008-06-28 06:12:15.000000000 -0700 18349 +++ ncurses-5.7/ncurses/tinfo/lib_tputs.c 2009-02-15 23:21:24.632481631 -0800 18350 @@ -1,5 +1,5 @@ 18351 /**************************************************************************** 18352 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 18353 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 18354 * * 18355 * Permission is hereby granted, free of charge, to any person obtaining a * 18356 * copy of this software and associated documentation files (the * 18357 @@ -30,6 +30,7 @@ 18358 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 18359 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 18360 * and: Thomas E. Dickey 1996-on * 18361 + * and: Juergen Pfeifer 2009 * 18362 ****************************************************************************/ 18363 18364 /* 18365 @@ -46,7 +47,7 @@ 18366 #include <termcap.h> /* ospeed */ 18367 #include <tic.h> 18368 18369 -MODULE_ID("$Id: lib_tputs.c,v 1.66 2008/06/28 13:12:15 tom Exp $") 18370 +MODULE_ID("$Id: lib_tputs.c,v 1.67 2009/02/15 00:49:44 tom Exp $") 18371 18372 NCURSES_EXPORT_VAR(char) PC = 0; /* used by termcap library */ 18373 NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0; /* used by termcap library */ 18374 @@ -72,7 +73,7 @@ 18375 static int (*my_outch) (int c) = _nc_outch; 18376 18377 NCURSES_EXPORT(int) 18378 -delay_output(int ms) 18379 +NCURSES_SP_NAME(delay_output) (NCURSES_SP_DCLx int ms) 18380 { 18381 T((T_CALLED("delay_output(%d)"), ms)); 18382 18383 @@ -92,6 +93,14 @@ 18384 returnCode(OK); 18385 } 18386 18387 +#if NCURSES_SP_FUNCS 18388 +NCURSES_EXPORT(int) 18389 +delay_output(int ms) 18390 +{ 18391 + return NCURSES_SP_NAME(delay_output) (CURRENT_SCREEN, ms); 18392 +} 18393 +#endif 18394 + 18395 NCURSES_EXPORT(void) 18396 _nc_flush(void) 18397 { 18398 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_ttyflags.c ncurses-5.7/ncurses/tinfo/lib_ttyflags.c 18399 --- ncurses-5.7.orig/ncurses/tinfo/lib_ttyflags.c 2008-08-03 15:10:44.000000000 -0700 18400 +++ ncurses-5.7/ncurses/tinfo/lib_ttyflags.c 2009-02-15 23:21:24.632481631 -0800 18401 @@ -1,5 +1,5 @@ 18402 /**************************************************************************** 18403 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 18404 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 18405 * * 18406 * Permission is hereby granted, free of charge, to any person obtaining a * 18407 * copy of this software and associated documentation files (the * 18408 @@ -38,7 +38,7 @@ 18409 #include <curses.priv.h> 18410 #include <term.h> /* cur_term */ 18411 18412 -MODULE_ID("$Id: lib_ttyflags.c,v 1.18 2008/08/03 22:10:44 tom Exp $") 18413 +MODULE_ID("$Id: lib_ttyflags.c,v 1.19 2009/02/15 00:33:49 tom Exp $") 18414 18415 NCURSES_EXPORT(int) 18416 _nc_get_tty_mode(TTY * buf) 18417 @@ -101,7 +101,7 @@ 18418 } 18419 18420 NCURSES_EXPORT(int) 18421 -def_shell_mode(void) 18422 +NCURSES_SP_NAME(def_shell_mode) (NCURSES_SP_DCL0) 18423 { 18424 int rc = ERR; 18425 18426 @@ -125,8 +125,16 @@ 18427 returnCode(rc); 18428 } 18429 18430 +#if NCURSES_SP_FUNCS 18431 NCURSES_EXPORT(int) 18432 -def_prog_mode(void) 18433 +def_shell_mode(void) 18434 +{ 18435 + return NCURSES_SP_NAME(def_shell_mode) (CURRENT_SCREEN); 18436 +} 18437 +#endif 18438 + 18439 +NCURSES_EXPORT(int) 18440 +NCURSES_SP_NAME(def_prog_mode) (NCURSES_SP_DCL0) 18441 { 18442 int rc = ERR; 18443 18444 @@ -148,16 +156,24 @@ 18445 returnCode(rc); 18446 } 18447 18448 +#if NCURSES_SP_FUNCS 18449 NCURSES_EXPORT(int) 18450 -reset_prog_mode(void) 18451 +def_prog_mode(void) 18452 +{ 18453 + return NCURSES_SP_NAME(def_prog_mode) (CURRENT_SCREEN); 18454 +} 18455 +#endif 18456 + 18457 +NCURSES_EXPORT(int) 18458 +NCURSES_SP_NAME(reset_prog_mode) (NCURSES_SP_DCL0) 18459 { 18460 T((T_CALLED("reset_prog_mode()"))); 18461 18462 if (cur_term != 0) { 18463 if (_nc_set_tty_mode(&cur_term->Nttyb) == OK) { 18464 - if (SP) { 18465 - if (SP->_keypad_on) 18466 - _nc_keypad(SP, TRUE); 18467 + if (SP_PARM) { 18468 + if (SP_PARM->_keypad_on) 18469 + _nc_keypad(SP_PARM, TRUE); 18470 NC_BUFFERED(TRUE); 18471 } 18472 returnCode(OK); 18473 @@ -166,14 +182,22 @@ 18474 returnCode(ERR); 18475 } 18476 18477 +#if NCURSES_SP_FUNCS 18478 NCURSES_EXPORT(int) 18479 -reset_shell_mode(void) 18480 +reset_prog_mode(void) 18481 +{ 18482 + return NCURSES_SP_NAME(reset_prog_mode) (CURRENT_SCREEN); 18483 +} 18484 +#endif 18485 + 18486 +NCURSES_EXPORT(int) 18487 +NCURSES_SP_NAME(reset_shell_mode) (NCURSES_SP_DCL0) 18488 { 18489 T((T_CALLED("reset_shell_mode()"))); 18490 18491 if (cur_term != 0) { 18492 - if (SP) { 18493 - _nc_keypad(SP, FALSE); 18494 + if (SP_PARM) { 18495 + _nc_keypad(SP_PARM, FALSE); 18496 _nc_flush(); 18497 NC_BUFFERED(FALSE); 18498 } 18499 @@ -182,6 +206,14 @@ 18500 returnCode(ERR); 18501 } 18502 18503 +#if NCURSES_SP_FUNCS 18504 +NCURSES_EXPORT(int) 18505 +reset_shell_mode(void) 18506 +{ 18507 + return NCURSES_SP_NAME(reset_shell_mode) (CURRENT_SCREEN); 18508 +} 18509 +#endif 18510 + 18511 static TTY * 18512 saved_tty(void) 18513 { 18514 diff -Naur ncurses-5.7.orig/ncurses/tty/lib_mvcur.c ncurses-5.7/ncurses/tty/lib_mvcur.c 18515 --- ncurses-5.7.orig/ncurses/tty/lib_mvcur.c 2008-08-16 12:30:58.000000000 -0700 18516 +++ ncurses-5.7/ncurses/tty/lib_mvcur.c 2009-02-15 23:21:24.632481631 -0800 18517 @@ -1,5 +1,5 @@ 18518 /**************************************************************************** 18519 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 18520 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 18521 * * 18522 * Permission is hereby granted, free of charge, to any person obtaining a * 18523 * copy of this software and associated documentation files (the * 18524 @@ -30,6 +30,7 @@ 18525 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 18526 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 18527 * and: Thomas E. Dickey 1996-on * 18528 + * and: Juergen Pfeifer 2009 * 18529 ****************************************************************************/ 18530 18531 /* 18532 @@ -155,7 +156,7 @@ 18533 #include <term.h> 18534 #include <ctype.h> 18535 18536 -MODULE_ID("$Id: lib_mvcur.c,v 1.113 2008/08/16 19:30:58 tom Exp $") 18537 +MODULE_ID("$Id: lib_mvcur.c,v 1.114 2009/02/15 00:50:33 tom Exp $") 18538 18539 #define WANT_CHAR(y, x) SP->_newscr->_line[y].text[x] /* desired state */ 18540 #define BAUDRATE cur_term->_baudrate /* bits per second */ 18541 @@ -853,9 +854,10 @@ 18542 return (ERR); 18543 } 18544 18545 -NCURSES_EXPORT(int) 18546 -mvcur(int yold, int xold, int ynew, int xnew) 18547 /* optimized cursor move from (yold, xold) to (ynew, xnew) */ 18548 +NCURSES_EXPORT(int) 18549 +NCURSES_SP_NAME(mvcur) (NCURSES_SP_DCLx 18550 + int yold, int xold, int ynew, int xnew) 18551 { 18552 NCURSES_CH_T oldattr; 18553 int code; 18554 @@ -863,7 +865,7 @@ 18555 TR(TRACE_CALLS | TRACE_MOVE, (T_CALLED("mvcur(%d,%d,%d,%d)"), 18556 yold, xold, ynew, xnew)); 18557 18558 - if (SP == 0) { 18559 + if (SP_PARM == 0) { 18560 code = ERR; 18561 } else if (yold == ynew && xold == xnew) { 18562 code = OK; 18563 @@ -884,7 +886,7 @@ 18564 * character set -- these have a strong tendency to screw up the CR & 18565 * LF used for local character motions! 18566 */ 18567 - oldattr = SCREEN_ATTRS(SP); 18568 + oldattr = SCREEN_ATTRS(SP_PARM); 18569 if ((AttrOf(oldattr) & A_ALTCHARSET) 18570 || (AttrOf(oldattr) && !move_standout_mode)) { 18571 TR(TRACE_CHARPUT, ("turning off (%#lx) %s before move", 18572 @@ -896,7 +898,7 @@ 18573 if (xold >= screen_columns) { 18574 int l; 18575 18576 - if (SP->_nl) { 18577 + if (SP_PARM->_nl) { 18578 l = (xold + 1) / screen_columns; 18579 yold += l; 18580 if (yold >= screen_lines) 18581 @@ -940,7 +942,7 @@ 18582 /* 18583 * Restore attributes if we disabled them before moving. 18584 */ 18585 - if (!SameAttrOf(oldattr, SCREEN_ATTRS(SP))) { 18586 + if (!SameAttrOf(oldattr, SCREEN_ATTRS(SP_PARM))) { 18587 TR(TRACE_CHARPUT, ("turning on (%#lx) %s after move", 18588 (unsigned long) AttrOf(oldattr), 18589 _traceattr(AttrOf(oldattr)))); 18590 @@ -950,6 +952,14 @@ 18591 returnCode(code); 18592 } 18593 18594 +#if NCURSES_SP_FUNCS 18595 +NCURSES_EXPORT(int) 18596 +mvcur(int yold, int xold, int ynew, int xnew) 18597 +{ 18598 + return NCURSES_SP_NAME(mvcur) (CURRENT_SCREEN, yold, xold, ynew, xnew); 18599 +} 18600 +#endif 18601 + 18602 #if defined(TRACE) || defined(NCURSES_TEST) 18603 NCURSES_EXPORT_VAR(int) _nc_optimize_enable = OPTIMIZE_ALL; 18604 #endif 18605 diff -Naur ncurses-5.7.orig/ncurses/tty/lib_vidattr.c ncurses-5.7/ncurses/tty/lib_vidattr.c 18606 --- ncurses-5.7.orig/ncurses/tty/lib_vidattr.c 2007-06-30 14:58:04.000000000 -0700 18607 +++ ncurses-5.7/ncurses/tty/lib_vidattr.c 2009-02-15 23:21:24.636481910 -0800 18608 @@ -1,5 +1,5 @@ 18609 /**************************************************************************** 18610 - * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. * 18611 + * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. * 18612 * * 18613 * Permission is hereby granted, free of charge, to any person obtaining a * 18614 * copy of this software and associated documentation files (the * 18615 @@ -29,7 +29,8 @@ 18616 /**************************************************************************** 18617 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 18618 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 18619 - * and: Thomas E. Dickey 1996 on * 18620 + * and: Thomas E. Dickey 1996-on * 18621 + * and: Juergen Pfeifer 2009 * 18622 ****************************************************************************/ 18623 18624 /* 18625 @@ -65,7 +66,7 @@ 18626 #include <curses.priv.h> 18627 #include <term.h> 18628 18629 -MODULE_ID("$Id: lib_vidattr.c,v 1.49 2007/06/30 21:58:04 tom Exp $") 18630 +MODULE_ID("$Id: lib_vidattr.c,v 1.50 2009/02/15 00:51:03 tom Exp $") 18631 18632 #define doPut(mode) TPUTS_TRACE(#mode); tputs(mode, 1, outc) 18633 18634 @@ -299,7 +300,7 @@ 18635 } 18636 18637 NCURSES_EXPORT(chtype) 18638 -termattrs(void) 18639 +NCURSES_SP_NAME(termattrs) (NCURSES_SP_DCL0) 18640 { 18641 chtype attrs = A_NORMAL; 18642 18643 @@ -331,8 +332,16 @@ 18644 if (enter_underline_mode) 18645 attrs |= A_UNDERLINE; 18646 18647 - if (SP->_coloron) 18648 + if (SP_PARM->_coloron) 18649 attrs |= A_COLOR; 18650 18651 returnChar(attrs); 18652 } 18653 + 18654 +#if NCURSES_SP_FUNCS 18655 +NCURSES_EXPORT(chtype) 18656 +termattrs(void) 18657 +{ 18658 + return NCURSES_SP_NAME(termattrs) (CURRENT_SCREEN); 18659 +} 18660 +#endif 18661 diff -Naur ncurses-5.7.orig/ncurses/tty/tty_update.c ncurses-5.7/ncurses/tty/tty_update.c 18662 --- ncurses-5.7.orig/ncurses/tty/tty_update.c 2008-08-30 13:08:19.000000000 -0700 18663 +++ ncurses-5.7/ncurses/tty/tty_update.c 2009-02-15 23:21:24.636481910 -0800 18664 @@ -1,5 +1,5 @@ 18665 /**************************************************************************** 18666 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 18667 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 18668 * * 18669 * Permission is hereby granted, free of charge, to any person obtaining a * 18670 * copy of this software and associated documentation files (the * 18671 @@ -30,6 +30,7 @@ 18672 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 18673 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 18674 * and: Thomas E. Dickey 1996-on * 18675 + * and: Juergen Pfeifer 2009 * 18676 ****************************************************************************/ 18677 18678 /*----------------------------------------------------------------- 18679 @@ -78,7 +79,7 @@ 15150 18680 #include <ctype.h> 15151 18681 #include <term.h> 15152 18682 15153 18683 -MODULE_ID("$Id: tty_update.c,v 1.246 2008/08/30 20:08:19 tom Exp $") 15154 +MODULE_ID("$Id: tty_update.c,v 1.24 7 2009/01/25 00:48:36tom Exp $")18684 +MODULE_ID("$Id: tty_update.c,v 1.248 2009/02/15 00:51:22 tom Exp $") 15155 18685 15156 18686 /* 15157 18687 * This define controls the line-breakout optimization. Every once in a 15158 @@ -1165,8 +1165,8 @@ 18688 @@ -618,7 +619,7 @@ 18689 if_USE_SCROLL_HINTS(win->_line[row].oldindex = row) 18690 18691 NCURSES_EXPORT(int) 18692 -doupdate(void) 18693 +NCURSES_SP_NAME(doupdate) (NCURSES_SP_DCL0) 18694 { 18695 int i; 18696 int nonempty; 18697 @@ -645,11 +646,11 @@ 18698 18699 _nc_signal_handler(FALSE); 18700 18701 - if (SP->_fifohold) 18702 - SP->_fifohold--; 18703 + if (SP_PARM->_fifohold) 18704 + SP_PARM->_fifohold--; 18705 18706 #if USE_SIZECHANGE 18707 - if (SP->_endwin || _nc_handle_sigwinch(SP)) { 18708 + if (SP_PARM->_endwin || _nc_handle_sigwinch(SP_PARM)) { 18709 /* 18710 * This is a transparent extension: XSI does not address it, 18711 * and applications need not know that ncurses can do it. 18712 @@ -658,20 +659,20 @@ 18713 * (this can happen in an xterm, for example), and resize the 18714 * ncurses data structures accordingly. 18715 */ 18716 - _nc_update_screensize(SP); 18717 + _nc_update_screensize(SP_PARM); 18718 } 18719 #endif 18720 18721 - if (SP->_endwin) { 18722 + if (SP_PARM->_endwin) { 18723 18724 T(("coming back from shell mode")); 18725 reset_prog_mode(); 18726 18727 _nc_mvcur_resume(); 18728 _nc_screen_resume(); 18729 - SP->_mouse_resume(SP); 18730 + SP_PARM->_mouse_resume(SP_PARM); 18731 18732 - SP->_endwin = FALSE; 18733 + SP_PARM->_endwin = FALSE; 18734 } 18735 #if USE_TRACE_TIMES 18736 /* zero the metering machinery */ 18737 @@ -699,7 +700,7 @@ 18738 for (j = 0; j < screen_columns; j++) { 18739 bool failed = FALSE; 18740 NCURSES_CH_T *thisline = newscr->_line[i].text; 18741 - attr_t thisattr = AttrOf(thisline[j]) & SP->_xmc_triggers; 18742 + attr_t thisattr = AttrOf(thisline[j]) & SP_PARM->_xmc_triggers; 18743 attr_t turnon = thisattr & ~rattr; 18744 18745 /* is an attribute turned on here? */ 18746 @@ -717,7 +718,7 @@ 18747 * there's enough room to set the attribute before the first 18748 * non-blank in the run. 18749 */ 18750 -#define SAFE(a) (!((a) & SP->_xmc_triggers)) 18751 +#define SAFE(a) (!((a) & SP_PARM->_xmc_triggers)) 18752 if (ISBLANK(thisline[j]) && SAFE(turnon)) { 18753 RemAttr(thisline[j], turnon); 18754 continue; 18755 @@ -748,7 +749,7 @@ 18756 for (m = i; m < screen_lines; m++) { 18757 for (; n < screen_columns; n++) { 18758 attr_t testattr = AttrOf(newscr->_line[m].text[n]); 18759 - if ((testattr & SP->_xmc_triggers) == rattr) { 18760 + if ((testattr & SP_PARM->_xmc_triggers) == rattr) { 18761 end_onscreen = TRUE; 18762 TR(TRACE_ATTRS, 18763 ("Range attributed with %s ends at (%d, %d)", 18764 @@ -809,7 +810,7 @@ 18765 for (p = i; p < screen_lines; p++) { 18766 for (; q < screen_columns; q++) { 18767 attr_t testattr = AttrOf(newscr->_line[p].text[q]); 18768 - if ((testattr & SP->_xmc_triggers) == rattr) 18769 + if ((testattr & SP_PARM->_xmc_triggers) == rattr) 18770 goto foundend; 18771 RemAttr(newscr->_line[p].text[q], turnon); 18772 } 18773 @@ -857,7 +858,7 @@ 18774 18775 nonempty = min(screen_lines, newscr->_maxy + 1); 18776 18777 - if (SP->_scrolling) { 18778 + if (SP_PARM->_scrolling) { 18779 _nc_scroll_optimize(); 18780 } 18781 18782 @@ -940,6 +941,14 @@ 18783 returnCode(OK); 18784 } 18785 18786 +#if NCURSES_SP_FUNCS 18787 +NCURSES_EXPORT(int) 18788 +doupdate(void) 18789 +{ 18790 + return NCURSES_SP_NAME(doupdate) (CURRENT_SCREEN); 18791 +} 18792 +#endif 18793 + 18794 /* 18795 * ClrBlank(win) 18796 * 18797 @@ -1165,8 +1174,8 @@ 15159 18798 newPair = GetPair(newLine[n]); 15160 18799 if (oldPair != newPair … … 15169 18808 diff -Naur ncurses-5.7.orig/NEWS ncurses-5.7/NEWS 15170 18809 --- ncurses-5.7.orig/NEWS 2008-11-01 17:56:22.000000000 -0700 15171 +++ ncurses-5.7/NEWS 2009-02- 07 22:08:38.011328119-080018810 +++ ncurses-5.7/NEWS 2009-02-15 23:21:24.600479396 -0800 15172 18811 @@ -1,5 +1,5 @@ 15173 18812 ------------------------------------------------------------------------------- … … 15182 18821 ------------------------------------------------------------------------------- 15183 18822 --- $Id: NEWS,v 1.1320 2008/11/02 00:56:22 tom Exp $ 15184 +-- $Id: NEWS,v 1.136 2 2009/02/07 19:20:43tom Exp $18823 +-- $Id: NEWS,v 1.1364 2009/02/15 00:20:00 tom Exp $ 15185 18824 ------------------------------------------------------------------------------- 15186 18825 15187 18826 This is a log of changes that ncurses has gone through since Zeyd started 15188 @@ -45,6 +45,1 41@@18827 @@ -45,6 +45,150 @@ 15189 18828 Changes through 1.9.9e did not credit all contributions; 15190 18829 it is not possible to add this information. 15191 18830 18831 +20090214 18832 + + add configure script --enable-sp-funcs to enable the new set of 18833 + extended functions. 18834 + + start integrating patches by Juergen Pfeifer: 18835 + + add extended functions which specify the SCREEN pointer for several 18836 + curses functions which use the global SP (these are incomplete; 18837 + some internals work is needed to complete these). 18838 + + add special cases to configure script for MinGW port. 18839 + 15192 18840 +20090207 15193 18841 + + update several configure macros from lynx changes … … 15330 18978 diff -Naur ncurses-5.7.orig/panel/Makefile.in ncurses-5.7/panel/Makefile.in 15331 18979 --- ncurses-5.7.orig/panel/Makefile.in 2007-04-28 07:56:11.000000000 -0700 15332 +++ ncurses-5.7/panel/Makefile.in 2009-02- 07 22:08:29.738503702 -080018980 +++ ncurses-5.7/panel/Makefile.in 2009-02-15 23:21:09.919538762 -0800 15333 18981 @@ -1,6 +1,6 @@ 15334 18982 -# $Id: Makefile.in,v 1.52 2007/04/28 14:56:11 tom Exp $ … … 15351 18999 diff -Naur ncurses-5.7.orig/progs/Makefile.in ncurses-5.7/progs/Makefile.in 15352 19000 --- ncurses-5.7.orig/progs/Makefile.in 2008-09-07 06:58:55.000000000 -0700 15353 +++ ncurses-5.7/progs/Makefile.in 2009-02- 07 22:08:16.568430787 -080019001 +++ ncurses-5.7/progs/Makefile.in 2009-02-15 23:20:58.766824137 -0800 15354 19002 @@ -1,6 +1,6 @@ 15355 19003 -# $Id: Makefile.in,v 1.79 2008/09/07 13:58:55 tom Exp $ … … 15417 19065 diff -Naur ncurses-5.7.orig/progs/modules ncurses-5.7/progs/modules 15418 19066 --- ncurses-5.7.orig/progs/modules 2006-12-23 16:53:21.000000000 -0800 15419 +++ ncurses-5.7/progs/modules 2009-02- 07 22:08:16.568430787 -080019067 +++ ncurses-5.7/progs/modules 2009-02-15 23:20:58.766824137 -0800 15420 19068 @@ -1,7 +1,7 @@ 15421 19069 -# $Id: modules,v 1.13 2006/12/24 00:53:21 tom Exp $ … … 15438 19086 diff -Naur ncurses-5.7.orig/progs/tabs.c ncurses-5.7/progs/tabs.c 15439 19087 --- ncurses-5.7.orig/progs/tabs.c 1969-12-31 16:00:00.000000000 -0800 15440 +++ ncurses-5.7/progs/tabs.c 2009-02- 07 22:08:17.958857941-080019088 +++ ncurses-5.7/progs/tabs.c 2009-02-15 23:21:00.214919122 -0800 15441 19089 @@ -0,0 +1,506 @@ 15442 19090 +/**************************************************************************** … … 15948 19596 diff -Naur ncurses-5.7.orig/test/clip_printw.c ncurses-5.7/test/clip_printw.c 15949 19597 --- ncurses-5.7.orig/test/clip_printw.c 1969-12-31 16:00:00.000000000 -0800 15950 +++ ncurses-5.7/test/clip_printw.c 2009-02- 07 22:08:26.211171952-080019598 +++ ncurses-5.7/test/clip_printw.c 2009-02-15 23:21:06.503320016 -0800 15951 19599 @@ -0,0 +1,360 @@ 15952 19600 +/**************************************************************************** … … 16312 19960 diff -Naur ncurses-5.7.orig/test/demo_forms.c ncurses-5.7/test/demo_forms.c 16313 19961 --- ncurses-5.7.orig/test/demo_forms.c 2008-10-18 13:38:20.000000000 -0700 16314 +++ ncurses-5.7/test/demo_forms.c 2009-02- 07 22:08:26.215273362-080019962 +++ ncurses-5.7/test/demo_forms.c 2009-02-15 23:21:06.503320016 -0800 16315 19963 @@ -26,7 +26,7 @@ 16316 19964 * authorization. * … … 16347 19995 diff -Naur ncurses-5.7.orig/test/edit_field.c ncurses-5.7/test/edit_field.c 16348 19996 --- ncurses-5.7.orig/test/edit_field.c 2008-10-18 13:40:20.000000000 -0700 16349 +++ ncurses-5.7/test/edit_field.c 2009-02- 07 22:08:26.215273362-080019997 +++ ncurses-5.7/test/edit_field.c 2009-02-15 23:21:06.503320016 -0800 16350 19998 @@ -26,7 +26,7 @@ 16351 19999 * authorization. * … … 16370 20018 diff -Naur ncurses-5.7.orig/test/edit_field.h ncurses-5.7/test/edit_field.h 16371 20019 --- ncurses-5.7.orig/test/edit_field.h 2006-06-03 09:38:57.000000000 -0700 16372 +++ ncurses-5.7/test/edit_field.h 2009-02- 07 22:08:26.215273362-080020020 +++ ncurses-5.7/test/edit_field.h 2009-02-15 23:21:06.507320016 -0800 16373 20021 @@ -1,5 +1,5 @@ 16374 20022 /**************************************************************************** … … 16400 20048 diff -Naur ncurses-5.7.orig/test/filter.c ncurses-5.7/test/filter.c 16401 20049 --- ncurses-5.7.orig/test/filter.c 2006-12-09 08:53:47.000000000 -0800 16402 +++ ncurses-5.7/test/filter.c 2009-02- 07 22:08:20.961189552-080020050 +++ ncurses-5.7/test/filter.c 2009-02-15 23:21:03.083101270 -0800 16403 20051 @@ -1,5 +1,5 @@ 16404 20052 /**************************************************************************** … … 16472 20120 diff -Naur ncurses-5.7.orig/test/insdelln.c ncurses-5.7/test/insdelln.c 16473 20121 --- ncurses-5.7.orig/test/insdelln.c 1969-12-31 16:00:00.000000000 -0800 16474 +++ ncurses-5.7/test/insdelln.c 2009-02- 07 22:08:26.215273362-080020122 +++ ncurses-5.7/test/insdelln.c 2009-02-15 23:21:06.507320016 -0800 16475 20123 @@ -0,0 +1,380 @@ 16476 20124 +/**************************************************************************** … … 16856 20504 diff -Naur ncurses-5.7.orig/test/modules ncurses-5.7/test/modules 16857 20505 --- ncurses-5.7.orig/test/modules 2007-08-18 10:57:08.000000000 -0700 16858 +++ ncurses-5.7/test/modules 2009-02- 07 22:08:26.215273362-080020506 +++ ncurses-5.7/test/modules 2009-02-15 23:21:06.507320016 -0800 16859 20507 @@ -1,4 +1,4 @@ 16860 20508 -# $Id: modules,v 1.36 2007/08/18 17:57:08 tom Exp $ … … 16881 20529 diff -Naur ncurses-5.7.orig/test/ncurses.c ncurses-5.7/test/ncurses.c 16882 20530 --- ncurses-5.7.orig/test/ncurses.c 2008-09-27 07:34:58.000000000 -0700 16883 +++ ncurses-5.7/test/ncurses.c 2009-02- 07 22:08:36.702933371 -080020531 +++ ncurses-5.7/test/ncurses.c 2009-02-15 23:21:17.380017041 -0800 16884 20532 @@ -40,7 +40,7 @@ 16885 20533 Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993 … … 17373 21021 diff -Naur ncurses-5.7.orig/test/programs ncurses-5.7/test/programs 17374 21022 --- ncurses-5.7.orig/test/programs 2008-08-16 14:47:39.000000000 -0700 17375 +++ ncurses-5.7/test/programs 2009-02- 07 22:08:26.215273362-080021023 +++ ncurses-5.7/test/programs 2009-02-15 23:21:06.507320016 -0800 17376 21024 @@ -1,4 +1,4 @@ 17377 21025 -# $Id: programs,v 1.14 2008/08/16 21:47:39 tom Exp $ … … 17398 21046 diff -Naur ncurses-5.7.orig/test/README ncurses-5.7/test/README 17399 21047 --- ncurses-5.7.orig/test/README 2008-10-18 14:02:45.000000000 -0700 17400 +++ ncurses-5.7/test/README 2009-02- 07 22:08:26.211171952-080021048 +++ ncurses-5.7/test/README 2009-02-15 23:21:06.503320016 -0800 17401 21049 @@ -25,7 +25,7 @@ 17402 21050 -- sale, use or other dealings in this Software without prior written -- … … 17694 21342 diff -Naur ncurses-5.7.orig/test/test.priv.h ncurses-5.7/test/test.priv.h 17695 21343 --- ncurses-5.7.orig/test/test.priv.h 2008-10-04 14:53:41.000000000 -0700 17696 +++ ncurses-5.7/test/test.priv.h 2009-02- 07 22:08:26.215273362-080021344 +++ ncurses-5.7/test/test.priv.h 2009-02-15 23:21:06.507320016 -0800 17697 21345 @@ -29,7 +29,7 @@ 17698 21346 /**************************************************************************** … … 17716 21364 diff -Naur ncurses-5.7.orig/TO-DO ncurses-5.7/TO-DO 17717 21365 --- ncurses-5.7.orig/TO-DO 2008-10-11 12:22:27.000000000 -0700 17718 +++ ncurses-5.7/TO-DO 2009-02- 07 22:08:19.472330214-080021366 +++ ncurses-5.7/TO-DO 2009-02-15 23:21:01.795020533 -0800 17719 21367 @@ -25,7 +25,7 @@ 17720 21368 -- sale, use or other dealings in this Software without prior written --
Note:
See TracChangeset
for help on using the changeset viewer.