Changeset 1970967 in clfs-sysroot
- Timestamp:
- Mar 15, 2009, 2:41:38 PM (16 years ago)
- Branches:
- master
- Children:
- 676d923
- Parents:
- 875332a
- File:
-
- 1 moved
-
patches/ncurses-5.7-branch_update-10.patch (moved) (moved from patches/ncurses-5.7-branch_update-6.patch ) (363 diffs)
Legend:
- Unmodified
- Added
- Removed
-
patches/ncurses-5.7-branch_update-10.patch
r875332a r1970967 1 1 Submitted By: Jim Gifford (jim at cross-lfs dot org) 2 Date: 0 1-27-20092 Date: 02-28-2009 3 3 Initial Package Version: 5.7 4 4 Origin: Upstream 5 5 Upstream Status: Applied 6 6 Description: This is a branch update for NCurses-5.7, and should be 7 rechecked periodically. This patch covers up to 5.7-20090 124.7 rechecked periodically. This patch covers up to 5.7-20090228. 8 8 9 9 diff -Naur ncurses-5.7.orig/aclocal.m4 ncurses-5.7/aclocal.m4 10 10 --- ncurses-5.7.orig/aclocal.m4 2008-10-25 15:15:32.000000000 -0700 11 +++ ncurses-5.7/aclocal.m4 2009-0 1-27 16:45:03.668729990-080011 +++ ncurses-5.7/aclocal.m4 2009-02-28 20:38:54.327061041 -0800 12 12 @@ -1,5 +1,5 @@ 13 13 dnl*************************************************************************** … … 22 22 dnl 23 23 -dnl $Id: aclocal.m4,v 1.470 2008/10/25 22:15:32 tom Exp $ 24 +dnl $Id: aclocal.m4,v 1.48 2 2009/01/17 21:10:05tom Exp $24 +dnl $Id: aclocal.m4,v 1.483 2009/02/07 19:12:17 tom Exp $ 25 25 dnl Macros used in NCURSES auto-configuration script. 26 26 dnl 27 27 dnl These macros are maintained separately from NCURSES. The copyright on 28 @@ -86,7 +86,7 @@ 29 AC_SUBST(ACPPFLAGS) 30 ])dnl 31 dnl --------------------------------------------------------------------------- 32 -dnl CF_ADD_CFLAGS version: 7 updated: 2004/04/25 17:48:30 33 +dnl CF_ADD_CFLAGS version: 8 updated: 2009/01/06 19:33:30 34 dnl ------------- 35 dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS 36 dnl The second parameter if given makes this macro verbose. 37 @@ -156,7 +156,7 @@ 38 39 if test -n "$cf_new_cppflags" ; then 40 ifelse($2,,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)]) 41 - CPPFLAGS="$cf_new_cppflags $CPPFLAGS" 42 + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" 43 fi 44 45 if test -n "$cf_new_extra_cppflags" ; then 28 46 @@ -168,7 +168,7 @@ 29 47 … … 31 49 dnl --------------------------------------------------------------------------- 32 50 -dnl CF_ADD_INCDIR version: 9 updated: 2008/02/09 13:15:34 33 +dnl CF_ADD_INCDIR version: 1 0 updated: 2008/12/27 12:30:0351 +dnl CF_ADD_INCDIR version: 12 updated: 2009/01/18 10:00:47 34 52 dnl ------------- 35 53 dnl Add an include-directory to $CPPFLAGS. Don't add /usr/include, since it's … … 44 62 then 45 63 cf_save_CPPFLAGS=$CPPFLAGS 46 @@ -213,9 +213,9 @@ 64 @@ -211,11 +211,11 @@ 65 66 if test "$cf_have_incdir" = no ; then 47 67 CF_VERBOSE(adding $cf_add_incdir to include-path) 48 ifelse($2,,CPPFLAGS,$2)="-I$cf_add_incdir $ifelse($2,,CPPFLAGS,[$]$2)" 68 - ifelse($2,,CPPFLAGS,$2)="-I$cf_add_incdir $ifelse($2,,CPPFLAGS,[$]$2)" 69 + ifelse($2,,CPPFLAGS,$2)="$ifelse($2,,CPPFLAGS,$2) -I$cf_add_incdir" 49 70 50 71 - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` … … 57 78 break 58 79 fi 80 @@ -225,7 +225,7 @@ 81 fi 82 ])dnl 83 dnl --------------------------------------------------------------------------- 84 -dnl CF_ADD_LIBDIR version: 6 updated: 2008/02/09 13:15:34 85 +dnl CF_ADD_LIBDIR version: 8 updated: 2009/01/18 10:01:08 86 dnl ------------- 87 dnl Adds to the library-path 88 dnl 89 @@ -254,7 +254,7 @@ 90 fi 91 if test "$cf_have_libdir" = no ; then 92 CF_VERBOSE(adding $cf_add_libdir to library-path) 93 - ifelse($2,,LDFLAGS,$2)="-L$cf_add_libdir $ifelse($2,,LDFLAGS,[$]$2)" 94 + ifelse($2,,LDFLAGS,$2)="-L$cf_add_libdir $ifelse($2,,LDFLAGS,$2)" 95 fi 96 fi 97 done 59 98 @@ -353,7 +353,41 @@ 60 99 fi … … 62 101 dnl --------------------------------------------------------------------------- 63 102 -dnl CF_AWK_BIG_PRINTF version: 2 updated: 2008/10/04 17:16:18 64 +dnl CF_AR_FLAGS version: 2 updated: 2009/01/01 20:45:18103 +dnl CF_AR_FLAGS version: 4 updated: 2009/02/07 13:42:23 65 104 +dnl ----------- 66 105 +dnl Check for suitable "ar" (archiver) options for updating an archive. … … 92 131 + rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext 93 132 +]) 94 + 133 +test -z "$ARFLAGS" && ARFLAGS=$cf_cv_ar_flags 95 134 +AC_SUBST(ARFLAGS,$cf_cv_ar_flags) 96 135 +]) … … 193 232 dnl --------------------------------------------------------------------------- 194 233 dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23 234 @@ -2026,7 +2082,7 @@ 235 [AC_DIVERT_HELP([$1])dnl 236 ])dnl 237 dnl --------------------------------------------------------------------------- 238 -dnl CF_INCLUDE_DIRS version: 5 updated: 2006/10/14 15:23:15 239 +dnl CF_INCLUDE_DIRS version: 6 updated: 2009/01/06 19:37:40 240 dnl --------------- 241 dnl Construct the list of include-options according to whether we're building 242 dnl in the source directory or using '--srcdir=DIR' option. If we're building 243 @@ -2034,9 +2090,9 @@ 244 dnl since that usually breaks gcc's shadow-includes. 245 AC_DEFUN([CF_INCLUDE_DIRS], 246 [ 247 -CPPFLAGS="-I. -I../include $CPPFLAGS" 248 +CPPFLAGS="$CPPFLAGS -I. -I../include" 249 if test "$srcdir" != "."; then 250 - CPPFLAGS="-I\${srcdir}/../include $CPPFLAGS" 251 + CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include" 252 fi 253 if test "$GCC" != yes; then 254 CPPFLAGS="$CPPFLAGS -I\${includedir}" 195 255 @@ -2143,7 +2199,7 @@ 196 256 ]) … … 404 464 rm -f conftest.$ac_ext func.o 405 465 ( eval $RANLIB conftest.a ) 2>&AC_FD_CC >/dev/null 466 @@ -2956,7 +3049,7 @@ 467 AC_SUBST(MAKE_LOWER_TAGS) 468 ])dnl 469 dnl --------------------------------------------------------------------------- 470 -dnl CF_MANPAGE_FORMAT version: 7 updated: 2003/12/20 19:30:34 471 +dnl CF_MANPAGE_FORMAT version: 8 updated: 2009/01/11 20:30:50 472 dnl ----------------- 473 dnl Option to allow user to override automatic configuration of manpage format. 474 dnl There are several special cases: 475 @@ -2998,7 +3091,7 @@ 476 cf_catonly=yes 477 cf_example=date 478 479 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATHSEP}" 480 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" 481 for cf_dir in $MANPATH; do 482 test -z "$cf_dir" && cf_dir=/usr/man 483 for cf_name in $cf_dir/man*/$cf_example.[[01]]* $cf_dir/cat*/$cf_example.[[01]]* $cf_dir/man*/$cf_example $cf_dir/cat*/$cf_example 484 @@ -3687,17 +3780,17 @@ 485 esac 486 ])dnl 487 dnl --------------------------------------------------------------------------- 488 -dnl CF_PATHSEP version: 3 updated: 2001/01/12 01:23:53 489 +dnl CF_PATHSEP version: 4 updated: 2009/01/11 20:30:23 490 dnl ---------- 491 dnl Provide a value for the $PATH and similar separator 492 AC_DEFUN([CF_PATHSEP], 493 [ 494 case $cf_cv_system_name in 495 - os2*) PATHSEP=';' ;; 496 - *) PATHSEP=':' ;; 497 + os2*) PATH_SEPARATOR=';' ;; 498 + *) PATH_SEPARATOR=':' ;; 499 esac 500 -ifelse($1,,,[$1=$PATHSEP]) 501 - AC_SUBST(PATHSEP) 502 +ifelse($1,,,[$1=$PATH_SEPARATOR]) 503 + AC_SUBST(PATH_SEPARATOR) 504 ])dnl 505 dnl --------------------------------------------------------------------------- 506 dnl CF_PATH_SYNTAX version: 12 updated: 2008/03/23 14:45:59 406 507 @@ -3737,6 +3830,38 @@ 407 508 esac 408 509 ])dnl 409 510 dnl --------------------------------------------------------------------------- 410 +dnl CF_PKG_CONFIG version: 2 updated: 2008/12/24 07:57:28511 +dnl CF_PKG_CONFIG version: 3 updated: 2009/01/25 10:55:09 411 512 +dnl ------------- 412 513 +dnl Check for the package-config program, unless disabled by command-line. … … 420 521 +AC_MSG_RESULT($cf_pkg_config) 421 522 + 422 +case $cf_pkg_config in 423 +no) 523 +case $cf_pkg_config in #(vi 524 +no) #(vi 424 525 + PKG_CONFIG=none 425 526 + ;; 426 +yes) 527 +yes) #(vi 427 528 + AC_PATH_PROG(PKG_CONFIG, pkg-config, none) 428 529 + ;; … … 738 839 LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o' 739 840 LIB_OBJECT='${OBJECTS:.o=.lo}' 841 @@ -5393,7 +5544,7 @@ 842 AC_SUBST($3)dnl 843 ])dnl 844 dnl --------------------------------------------------------------------------- 845 -dnl CF_WITH_PATHLIST version: 5 updated: 2001/12/10 01:28:30 846 +dnl CF_WITH_PATHLIST version: 6 updated: 2009/01/11 20:30:23 847 dnl ---------------- 848 dnl Process an option specifying a list of colon-separated paths. 849 dnl 850 @@ -5409,7 +5560,7 @@ 851 AC_ARG_WITH($1,[$2 ](default: ifelse($4,,empty,$4)),, 852 ifelse($4,,[withval=${$3}],[withval=${$3-ifelse($5,,$4,$5)}]))dnl 853 854 -IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${PATHSEP}" 855 +IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${PATH_SEPARATOR}" 856 cf_dst_path= 857 for cf_src_path in $withval 858 do 740 859 @@ -5535,7 +5686,7 @@ 741 860 [USE_VALGRIND]) … … 767 886 diff -Naur ncurses-5.7.orig/Ada95/gen/adacurses-config.in ncurses-5.7/Ada95/gen/adacurses-config.in 768 887 --- ncurses-5.7.orig/Ada95/gen/adacurses-config.in 2007-04-07 14:06:50.000000000 -0700 769 +++ ncurses-5.7/Ada95/gen/adacurses-config.in 2009-0 1-27 16:45:02.332643665-0800888 +++ ncurses-5.7/Ada95/gen/adacurses-config.in 2009-02-28 20:38:50.310805699 -0800 770 889 @@ -1,18 +1,47 @@ 771 890 #! /bin/sh … … 841 960 diff -Naur ncurses-5.7.orig/Ada95/gen/Makefile.in ncurses-5.7/Ada95/gen/Makefile.in 842 961 --- ncurses-5.7.orig/Ada95/gen/Makefile.in 2008-10-04 15:58:31.000000000 -0700 843 +++ ncurses-5.7/Ada95/gen/Makefile.in 2009-0 1-27 16:45:02.332643665-0800962 +++ ncurses-5.7/Ada95/gen/Makefile.in 2009-02-28 20:38:50.306805140 -0800 844 963 @@ -1,5 +1,5 @@ 845 964 ############################################################################## … … 897 1016 diff -Naur ncurses-5.7.orig/Ada95/samples/Makefile.in ncurses-5.7/Ada95/samples/Makefile.in 898 1017 --- ncurses-5.7.orig/Ada95/samples/Makefile.in 2006-12-17 08:45:02.000000000 -0800 899 +++ ncurses-5.7/Ada95/samples/Makefile.in 2009-0 1-27 16:45:02.332643665-08001018 +++ ncurses-5.7/Ada95/samples/Makefile.in 2009-02-28 20:38:50.310805699 -0800 900 1019 @@ -1,5 +1,5 @@ 901 1020 ############################################################################## … … 936 1055 diff -Naur ncurses-5.7.orig/Ada95/src/Makefile.in ncurses-5.7/Ada95/src/Makefile.in 937 1056 --- ncurses-5.7.orig/Ada95/src/Makefile.in 2007-09-15 11:22:24.000000000 -0700 938 +++ ncurses-5.7/Ada95/src/Makefile.in 2009-0 1-27 16:45:02.332643665-08001057 +++ ncurses-5.7/Ada95/src/Makefile.in 2009-02-28 20:38:50.310805699 -0800 939 1058 @@ -1,5 +1,5 @@ 940 1059 ############################################################################## … … 1028 1147 diff -Naur ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb 1029 1148 --- ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb 2008-07-26 11:51:11.000000000 -0700 1030 +++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb 2009-0 1-27 16:44:46.507629836-08001149 +++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb 2009-02-28 20:38:37.153962564 -0800 1031 1150 @@ -35,8 +35,8 @@ 1032 1151 ------------------------------------------------------------------------------ … … 1051 1170 diff -Naur ncurses-5.7.orig/c++/cursesw.cc ncurses-5.7/c++/cursesw.cc 1052 1171 --- ncurses-5.7.orig/c++/cursesw.cc 2007-12-15 15:01:57.000000000 -0800 1053 +++ ncurses-5.7/c++/cursesw.cc 2009-0 1-27 16:44:46.511630953-08001172 +++ ncurses-5.7/c++/cursesw.cc 2009-02-28 20:38:37.161961447 -0800 1054 1173 @@ -1,6 +1,6 @@ 1055 1174 // * this is for making emacs happy: -*-Mode: C++;-*- … … 1088 1207 diff -Naur ncurses-5.7.orig/c++/Makefile.in ncurses-5.7/c++/Makefile.in 1089 1208 --- ncurses-5.7.orig/c++/Makefile.in 2007-04-28 08:29:12.000000000 -0700 1090 +++ ncurses-5.7/c++/Makefile.in 2009-0 1-27 16:44:58.008364855 -08001209 +++ ncurses-5.7/c++/Makefile.in 2009-02-28 20:38:46.290546165 -0800 1091 1210 @@ -1,6 +1,6 @@ 1092 1211 -# $Id: Makefile.in,v 1.84 2007/04/28 15:29:12 tom Exp $ … … 1122 1241 diff -Naur ncurses-5.7.orig/config.guess ncurses-5.7/config.guess 1123 1242 --- ncurses-5.7.orig/config.guess 2008-08-30 13:25:07.000000000 -0700 1124 +++ ncurses-5.7/config.guess 2009-0 1-27 16:44:58.008364855 -08001243 +++ ncurses-5.7/config.guess 2009-02-28 20:38:46.290546165 -0800 1125 1244 @@ -4,7 +4,7 @@ 1126 1245 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 … … 1192 1311 diff -Naur ncurses-5.7.orig/config.sub ncurses-5.7/config.sub 1193 1312 --- ncurses-5.7.orig/config.sub 2008-08-30 13:25:02.000000000 -0700 1194 +++ ncurses-5.7/config.sub 2009-0 1-27 16:44:58.008364855 -08001313 +++ ncurses-5.7/config.sub 2009-02-28 20:38:46.290546165 -0800 1195 1314 @@ -4,7 +4,7 @@ 1196 1315 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 … … 1276 1395 diff -Naur ncurses-5.7.orig/configure ncurses-5.7/configure 1277 1396 --- ncurses-5.7.orig/configure 2008-10-25 17:04:38.000000000 -0700 1278 +++ ncurses-5.7/configure 2009-0 1-27 16:45:03.672730548 -08001397 +++ ncurses-5.7/configure 2009-02-28 20:38:57.039235088 -0800 1279 1398 @@ -1,7 +1,7 @@ 1280 1399 #! /bin/sh 1281 1400 -# From configure.in Revision: 1.454 . 1282 +# From configure.in Revision: 1.46 4.1401 +# From configure.in Revision: 1.466 . 1283 1402 # Guess values for system-dependent variables and create Makefiles. 1284 1403 -# Generated by Autoconf 2.52.20080325. … … 1299 1418 --with-install-prefix prefixes actual install-location ($DESTDIR) 1300 1419 Build-Tools Needed to Compile Temporary Applications for Cross-compiling: 1301 @@ -870,7 +873,7 @@ 1420 @@ -762,6 +765,7 @@ 1421 --with-manpage-tbl specify manpage processing with tbl 1422 Extensions: 1423 --disable-ext-funcs disable function-extensions 1424 + --enable-sp-funcs disable experimental SCREEN-extensions 1425 --enable-const compile with extra/non-standard const 1426 --enable-ext-colors compile for 256-color support 1427 --enable-ext-mouse compile for extended mouse-encoding 1428 @@ -870,7 +874,7 @@ 1302 1429 running configure, to aid debugging if configure makes a mistake. 1303 1430 … … 1308 1435 $ $0 $@ 1309 1436 1310 @@ -994,7 +99 7,7 @@1437 @@ -994,7 +998,7 @@ 1311 1438 fi 1312 1439 for ac_site_file in $CONFIG_SITE; do 1313 1440 if test -r "$ac_site_file"; then 1314 1441 - { echo "$as_me:997: loading site script $ac_site_file" >&5 1315 + { echo "$as_me:100 0: loading site script $ac_site_file" >&51442 + { echo "$as_me:1001: loading site script $ac_site_file" >&5 1316 1443 echo "$as_me: loading site script $ac_site_file" >&6;} 1317 1444 cat "$ac_site_file" >&5 1318 1445 . "$ac_site_file" 1319 @@ -1005,7 +100 8,7 @@1446 @@ -1005,7 +1009,7 @@ 1320 1447 # Some versions of bash will fail to source /dev/null (special 1321 1448 # files actually), so we avoid doing that. 1322 1449 if test -f "$cache_file"; then 1323 1450 - { echo "$as_me:1008: loading cache $cache_file" >&5 1324 + { echo "$as_me:101 1: loading cache $cache_file" >&51451 + { echo "$as_me:1012: loading cache $cache_file" >&5 1325 1452 echo "$as_me: loading cache $cache_file" >&6;} 1326 1453 case $cache_file in 1327 1454 [\\/]* | ?:[\\/]* ) . $cache_file;; 1328 @@ -1013,7 +101 6,7 @@1455 @@ -1013,7 +1017,7 @@ 1329 1456 esac 1330 1457 fi 1331 1458 else 1332 1459 - { echo "$as_me:1016: creating cache $cache_file" >&5 1333 + { echo "$as_me:10 19: creating cache $cache_file" >&51460 + { echo "$as_me:1020: creating cache $cache_file" >&5 1334 1461 echo "$as_me: creating cache $cache_file" >&6;} 1335 1462 >$cache_file 1336 1463 fi 1337 @@ -1029,21 +103 2,21 @@1464 @@ -1029,21 +1033,21 @@ 1338 1465 eval ac_new_val="\$ac_env_${ac_var}_value" 1339 1466 case $ac_old_set,$ac_new_set in 1340 1467 set,) 1341 1468 - { echo "$as_me:1032: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 1342 + { 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 1343 1470 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} 1344 1471 ac_cache_corrupted=: ;; 1345 1472 ,set) 1346 1473 - { echo "$as_me:1036: error: \`$ac_var' was not set in the previous run" >&5 1347 + { 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 1348 1475 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} 1349 1476 ac_cache_corrupted=: ;; … … 1352 1479 if test "x$ac_old_val" != "x$ac_new_val"; then 1353 1480 - { echo "$as_me:1042: error: \`$ac_var' has changed since the previous run:" >&5 1354 + { 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 1355 1482 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} 1356 1483 - { echo "$as_me:1044: former value: $ac_old_val" >&5 1357 + { echo "$as_me:104 7: former value: $ac_old_val" >&51484 + { echo "$as_me:1048: former value: $ac_old_val" >&5 1358 1485 echo "$as_me: former value: $ac_old_val" >&2;} 1359 1486 - { echo "$as_me:1046: current value: $ac_new_val" >&5 1360 + { echo "$as_me:10 49: current value: $ac_new_val" >&51487 + { echo "$as_me:1050: current value: $ac_new_val" >&5 1361 1488 echo "$as_me: current value: $ac_new_val" >&2;} 1362 1489 ac_cache_corrupted=: 1363 1490 fi;; 1364 @@ -1062,9 +106 5,9 @@1491 @@ -1062,9 +1066,9 @@ 1365 1492 fi 1366 1493 done 1367 1494 if $ac_cache_corrupted; then 1368 1495 - { echo "$as_me:1065: error: changes in the environment can compromise the build" >&5 1369 + { 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 1370 1497 echo "$as_me: error: changes in the environment can compromise the build" >&2;} 1371 1498 - { { echo "$as_me:1067: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 1372 + { { 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 1373 1500 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} 1374 1501 { (exit 1); exit 1; }; } 1375 1502 fi 1376 @@ -1085,10 +108 8,10 @@1503 @@ -1085,10 +1089,10 @@ 1377 1504 echo "#! $SHELL" >conftest.sh 1378 1505 echo "exit 0" >>conftest.sh 1379 1506 chmod +x conftest.sh 1380 1507 -if { (echo "$as_me:1088: PATH=\".;.\"; conftest.sh") >&5 1381 +if { (echo "$as_me:109 1: PATH=\".;.\"; conftest.sh") >&51508 +if { (echo "$as_me:1092: PATH=\".;.\"; conftest.sh") >&5 1382 1509 (PATH=".;."; conftest.sh) 2>&5 1383 1510 ac_status=$? 1384 1511 - echo "$as_me:1091: \$? = $ac_status" >&5 1385 + echo "$as_me:109 4: \$? = $ac_status" >&51512 + echo "$as_me:1095: \$? = $ac_status" >&5 1386 1513 (exit $ac_status); }; then 1387 1514 ac_path_separator=';' 1388 1515 else 1389 @@ -1101,7 +110 4,7 @@1516 @@ -1101,7 +1105,7 @@ 1390 1517 1391 1518 top_builddir=`pwd` 1392 1519 1393 1520 -echo "$as_me:1104: checking for egrep" >&5 1394 +echo "$as_me:110 7: checking for egrep" >&51521 +echo "$as_me:1108: checking for egrep" >&5 1395 1522 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 1396 1523 if test "${ac_cv_prog_egrep+set}" = set; then 1397 1524 echo $ECHO_N "(cached) $ECHO_C" >&6 1398 @@ -1111,11 +111 4,11 @@1525 @@ -1111,11 +1115,11 @@ 1399 1526 else ac_cv_prog_egrep='egrep' 1400 1527 fi 1401 1528 fi 1402 1529 -echo "$as_me:1114: result: $ac_cv_prog_egrep" >&5 1403 +echo "$as_me:111 7: result: $ac_cv_prog_egrep" >&51530 +echo "$as_me:1118: result: $ac_cv_prog_egrep" >&5 1404 1531 echo "${ECHO_T}$ac_cv_prog_egrep" >&6 1405 1532 EGREP=$ac_cv_prog_egrep 1406 1533 1407 1534 -test -z "$EGREP" && { { echo "$as_me:1118: error: No egrep program found" >&5 1408 +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 1409 1536 echo "$as_me: error: No egrep program found" >&2;} 1410 1537 { (exit 1); exit 1; }; } 1411 1538 1412 @@ -1125,7 +112 8,7 @@1539 @@ -1125,7 +1129,7 @@ 1413 1540 cf_cv_abi_version=${NCURSES_MAJOR} 1414 1541 cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR} 1415 1542 cf_cv_timestamp=`date` 1416 1543 -echo "$as_me:1128: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 1417 +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 1418 1545 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6 1419 1546 1420 1547 test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0 1421 @@ -1133,7 +113 6,7 @@1548 @@ -1133,7 +1137,7 @@ 1422 1549 # Check whether --with-rel-version or --without-rel-version was given. 1423 1550 if test "${with_rel_version+set}" = set; then 1424 1551 withval="$with_rel_version" 1425 1552 - { echo "$as_me:1136: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5 1426 + { 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 1427 1554 echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;} 1428 1555 cf_cv_rel_version=$withval 1429 1556 fi; 1430 @@ -1146,13 +11 49,13 @@1557 @@ -1146,13 +1150,13 @@ 1431 1558 [0-9]*) #(vi 1432 1559 ;; 1433 1560 *) 1434 1561 - { { echo "$as_me:1149: error: Release major-version is not a number: $NCURSES_MAJOR" >&5 1435 + { { 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 1436 1563 echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;} 1437 1564 { (exit 1); exit 1; }; } … … 1440 1567 else 1441 1568 - { { echo "$as_me:1155: error: Release major-version value is empty" >&5 1442 + { { 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 1443 1570 echo "$as_me: error: Release major-version value is empty" >&2;} 1444 1571 { (exit 1); exit 1; }; } 1445 1572 fi 1446 @@ -1162,13 +116 5,13 @@1573 @@ -1162,13 +1166,13 @@ 1447 1574 [0-9]*) #(vi 1448 1575 ;; 1449 1576 *) 1450 1577 - { { echo "$as_me:1165: error: Release minor-version is not a number: $NCURSES_MINOR" >&5 1451 + { { 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 1452 1579 echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;} 1453 1580 { (exit 1); exit 1; }; } … … 1456 1583 else 1457 1584 - { { echo "$as_me:1171: error: Release minor-version value is empty" >&5 1458 + { { 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 1459 1586 echo "$as_me: error: Release minor-version value is empty" >&2;} 1460 1587 { (exit 1); exit 1; }; } 1461 1588 fi 1462 @@ -1178,7 +118 1,7 @@1589 @@ -1178,7 +1182,7 @@ 1463 1590 # Check whether --with-abi-version or --without-abi-version was given. 1464 1591 if test "${with_abi_version+set}" = set; then 1465 1592 withval="$with_abi_version" 1466 1593 - { echo "$as_me:1181: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5 1467 + { 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 1468 1595 echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;} 1469 1596 cf_cv_abi_version=$withval 1470 1597 fi; 1471 @@ -1188,13 +119 1,13 @@1598 @@ -1188,13 +1192,13 @@ 1472 1599 [0-9]*) #(vi 1473 1600 ;; 1474 1601 *) 1475 1602 - { { echo "$as_me:1191: error: ABI version is not a number: $cf_cv_abi_version" >&5 1476 + { { 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 1477 1604 echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;} 1478 1605 { (exit 1); exit 1; }; } … … 1481 1608 else 1482 1609 - { { echo "$as_me:1197: error: ABI version value is empty" >&5 1483 + { { echo "$as_me:120 0: error: ABI version value is empty" >&51610 + { { echo "$as_me:1201: error: ABI version value is empty" >&5 1484 1611 echo "$as_me: error: ABI version value is empty" >&2;} 1485 1612 { (exit 1); exit 1; }; } 1486 1613 fi 1487 @@ -1216,7 +12 19,7 @@1614 @@ -1216,7 +1220,7 @@ 1488 1615 fi 1489 1616 done 1490 1617 if test -z "$ac_aux_dir"; then 1491 1618 - { { echo "$as_me:1219: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 1492 + { { 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 1493 1620 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} 1494 1621 { (exit 1); exit 1; }; } 1495 1622 fi 1496 @@ -1226,11 +12 29,11 @@1623 @@ -1226,11 +1230,11 @@ 1497 1624 1498 1625 # Make sure we can run config.sub. 1499 1626 $ac_config_sub sun4 >/dev/null 2>&1 || 1500 1627 - { { echo "$as_me:1229: error: cannot run $ac_config_sub" >&5 1501 + { { echo "$as_me:123 2: error: cannot run $ac_config_sub" >&51628 + { { echo "$as_me:1233: error: cannot run $ac_config_sub" >&5 1502 1629 echo "$as_me: error: cannot run $ac_config_sub" >&2;} 1503 1630 { (exit 1); exit 1; }; } 1504 1631 1505 1632 -echo "$as_me:1233: checking build system type" >&5 1506 +echo "$as_me:123 6: checking build system type" >&51633 +echo "$as_me:1237: checking build system type" >&5 1507 1634 echo $ECHO_N "checking build system type... $ECHO_C" >&6 1508 1635 if test "${ac_cv_build+set}" = set; then 1509 1636 echo $ECHO_N "(cached) $ECHO_C" >&6 1510 @@ -1239,23 +124 2,23 @@1637 @@ -1239,23 +1243,23 @@ 1511 1638 test -z "$ac_cv_build_alias" && 1512 1639 ac_cv_build_alias=`$ac_config_guess` 1513 1640 test -z "$ac_cv_build_alias" && 1514 1641 - { { echo "$as_me:1242: error: cannot guess build type; you must specify one" >&5 1515 + { { 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 1516 1643 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} 1517 1644 { (exit 1); exit 1; }; } 1518 1645 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || 1519 1646 - { { echo "$as_me:1246: error: $ac_config_sub $ac_cv_build_alias failed." >&5 1520 + { { 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 1521 1648 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} 1522 1649 { (exit 1); exit 1; }; } … … 1524 1651 fi 1525 1652 -echo "$as_me:1251: result: $ac_cv_build" >&5 1526 +echo "$as_me:125 4: result: $ac_cv_build" >&51653 +echo "$as_me:1255: result: $ac_cv_build" >&5 1527 1654 echo "${ECHO_T}$ac_cv_build" >&6 1528 1655 build=$ac_cv_build … … 1532 1659 1533 1660 -echo "$as_me:1258: checking host system type" >&5 1534 +echo "$as_me:126 1: checking host system type" >&51661 +echo "$as_me:1262: checking host system type" >&5 1535 1662 echo $ECHO_N "checking host system type... $ECHO_C" >&6 1536 1663 if test "${ac_cv_host+set}" = set; then 1537 1664 echo $ECHO_N "(cached) $ECHO_C" >&6 1538 @@ -1264,12 +126 7,12 @@1665 @@ -1264,12 +1268,12 @@ 1539 1666 test -z "$ac_cv_host_alias" && 1540 1667 ac_cv_host_alias=$ac_cv_build_alias 1541 1668 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || 1542 1669 - { { echo "$as_me:1267: error: $ac_config_sub $ac_cv_host_alias failed" >&5 1543 + { { 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 1544 1671 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} 1545 1672 { (exit 1); exit 1; }; } … … 1547 1674 fi 1548 1675 -echo "$as_me:1272: result: $ac_cv_host" >&5 1549 +echo "$as_me:127 5: result: $ac_cv_host" >&51676 +echo "$as_me:1276: result: $ac_cv_host" >&5 1550 1677 echo "${ECHO_T}$ac_cv_host" >&6 1551 1678 host=$ac_cv_host 1552 1679 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` 1553 @@ -1277,7 +128 0,7 @@1680 @@ -1277,7 +1281,7 @@ 1554 1681 host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` 1555 1682 1556 1683 if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then 1557 1684 - echo "$as_me:1280: checking target system type" >&5 1558 + echo "$as_me:128 3: checking target system type" >&51685 + echo "$as_me:1284: checking target system type" >&5 1559 1686 echo $ECHO_N "checking target system type... $ECHO_C" >&6 1560 1687 if test "${ac_cv_target+set}" = set; then 1561 1688 echo $ECHO_N "(cached) $ECHO_C" >&6 1562 @@ -1286,12 +12 89,12 @@1689 @@ -1286,12 +1290,12 @@ 1563 1690 test "x$ac_cv_target_alias" = "x" && 1564 1691 ac_cv_target_alias=$ac_cv_host_alias 1565 1692 ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || 1566 1693 - { { echo "$as_me:1289: error: $ac_config_sub $ac_cv_target_alias failed" >&5 1567 + { { 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 1568 1695 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} 1569 1696 { (exit 1); exit 1; }; } … … 1571 1698 fi 1572 1699 -echo "$as_me:1294: result: $ac_cv_target" >&5 1573 +echo "$as_me:129 7: result: $ac_cv_target" >&51700 +echo "$as_me:1298: result: $ac_cv_target" >&5 1574 1701 echo "${ECHO_T}$ac_cv_target" >&6 1575 1702 target=$ac_cv_target 1576 1703 target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` 1577 @@ -1322,13 +132 5,13 @@1704 @@ -1322,13 +1326,13 @@ 1578 1705 fi 1579 1706 1580 1707 test -z "$system_name" && system_name="$cf_cv_system_name" 1581 1708 -test -n "$cf_cv_system_name" && echo "$as_me:1325: result: Configuring for $cf_cv_system_name" >&5 1582 +test -n "$cf_cv_system_name" && echo "$as_me: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 1583 1710 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 1584 1711 1585 1712 if test ".$system_name" != ".$cf_cv_system_name" ; then 1586 1713 - echo "$as_me:1329: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 1587 + 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 1588 1715 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 1589 1716 - { { echo "$as_me:1331: error: \"Please remove config.cache and try again.\"" >&5 1590 + { { 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 1591 1718 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} 1592 1719 { (exit 1); exit 1; }; } 1593 1720 fi 1594 @@ -1336,7 +13 39,7 @@1721 @@ -1336,7 +1340,7 @@ 1595 1722 # Check whether --with-system-type or --without-system-type was given. 1596 1723 if test "${with_system_type+set}" = set; then 1597 1724 withval="$with_system_type" 1598 1725 - { echo "$as_me:1339: WARNING: overriding system type to $withval" >&5 1599 + { echo "$as_me:134 2: WARNING: overriding system type to $withval" >&51726 + { echo "$as_me:1343: WARNING: overriding system type to $withval" >&5 1600 1727 echo "$as_me: WARNING: overriding system type to $withval" >&2;} 1601 1728 cf_cv_system_name=$withval 1602 1729 fi; 1603 @@ -1346,7 +13 49,7 @@1730 @@ -1346,7 +1350,7 @@ 1604 1731 1605 1732 ### Default install-location 1606 1733 1607 1734 -echo "$as_me:1349: checking for prefix" >&5 1608 +echo "$as_me:135 2: checking for prefix" >&51735 +echo "$as_me:1353: checking for prefix" >&5 1609 1736 echo $ECHO_N "checking for prefix... $ECHO_C" >&6 1610 1737 if test "x$prefix" = "xNONE" ; then 1611 1738 case "$cf_cv_system_name" in 1612 @@ -1358,11 +136 1,11 @@1739 @@ -1358,11 +1362,11 @@ 1613 1740 ;; 1614 1741 esac 1615 1742 fi 1616 1743 -echo "$as_me:1361: result: $prefix" >&5 1617 +echo "$as_me:136 4: result: $prefix" >&51744 +echo "$as_me:1365: result: $prefix" >&5 1618 1745 echo "${ECHO_T}$prefix" >&6 1619 1746 1620 1747 if test "x$prefix" = "xNONE" ; then 1621 1748 -echo "$as_me:1365: checking for default include-directory" >&5 1622 +echo "$as_me:136 8: checking for default include-directory" >&51749 +echo "$as_me:1369: checking for default include-directory" >&5 1623 1750 echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6 1624 1751 test -n "$verbose" && echo 1>&6 1625 1752 for cf_symbol in \ 1626 @@ -1385,7 +138 8,7 @@1753 @@ -1385,7 +1389,7 @@ 1627 1754 fi 1628 1755 test -n "$verbose" && echo " tested $cf_dir" 1>&6 1629 1756 done 1630 1757 -echo "$as_me:1388: result: $includedir" >&5 1631 +echo "$as_me:139 1: result: $includedir" >&51758 +echo "$as_me:1392: result: $includedir" >&5 1632 1759 echo "${ECHO_T}$includedir" >&6 1633 1760 fi 1634 1761 1635 @@ -1399,7 +140 2,7 @@1762 @@ -1399,7 +1403,7 @@ 1636 1763 if test -n "$ac_tool_prefix"; then 1637 1764 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. 1638 1765 set dummy ${ac_tool_prefix}gcc; ac_word=$2 1639 1766 -echo "$as_me:1402: checking for $ac_word" >&5 1640 +echo "$as_me:140 5: checking for $ac_word" >&51767 +echo "$as_me:1406: checking for $ac_word" >&5 1641 1768 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 1642 1769 if test "${ac_cv_prog_CC+set}" = set; then 1643 1770 echo $ECHO_N "(cached) $ECHO_C" >&6 1644 @@ -1414,7 +141 7,7 @@1771 @@ -1414,7 +1418,7 @@ 1645 1772 test -z "$ac_dir" && ac_dir=. 1646 1773 $as_executable_p "$ac_dir/$ac_word" || continue 1647 1774 ac_cv_prog_CC="${ac_tool_prefix}gcc" 1648 1775 -echo "$as_me:1417: found $ac_dir/$ac_word" >&5 1649 +echo "$as_me:142 0: found $ac_dir/$ac_word" >&51776 +echo "$as_me:1421: found $ac_dir/$ac_word" >&5 1650 1777 break 1651 1778 done 1652 1779 1653 @@ -1422,10 +142 5,10 @@1780 @@ -1422,10 +1426,10 @@ 1654 1781 fi 1655 1782 CC=$ac_cv_prog_CC 1656 1783 if test -n "$CC"; then 1657 1784 - echo "$as_me:1425: result: $CC" >&5 1658 + echo "$as_me:142 8: result: $CC" >&51785 + echo "$as_me:1429: result: $CC" >&5 1659 1786 echo "${ECHO_T}$CC" >&6 1660 1787 else 1661 1788 - echo "$as_me:1428: result: no" >&5 1662 + echo "$as_me:143 1: result: no" >&51789 + echo "$as_me:1432: result: no" >&5 1663 1790 echo "${ECHO_T}no" >&6 1664 1791 fi 1665 1792 1666 @@ -1434,7 +143 7,7 @@1793 @@ -1434,7 +1438,7 @@ 1667 1794 ac_ct_CC=$CC 1668 1795 # Extract the first word of "gcc", so it can be a program name with args. 1669 1796 set dummy gcc; ac_word=$2 1670 1797 -echo "$as_me:1437: checking for $ac_word" >&5 1671 +echo "$as_me:144 0: checking for $ac_word" >&51798 +echo "$as_me:1441: checking for $ac_word" >&5 1672 1799 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 1673 1800 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then 1674 1801 echo $ECHO_N "(cached) $ECHO_C" >&6 1675 @@ -1449,7 +145 2,7 @@1802 @@ -1449,7 +1453,7 @@ 1676 1803 test -z "$ac_dir" && ac_dir=. 1677 1804 $as_executable_p "$ac_dir/$ac_word" || continue 1678 1805 ac_cv_prog_ac_ct_CC="gcc" 1679 1806 -echo "$as_me:1452: found $ac_dir/$ac_word" >&5 1680 +echo "$as_me:145 5: found $ac_dir/$ac_word" >&51807 +echo "$as_me:1456: found $ac_dir/$ac_word" >&5 1681 1808 break 1682 1809 done 1683 1810 1684 @@ -1457,10 +146 0,10 @@1811 @@ -1457,10 +1461,10 @@ 1685 1812 fi 1686 1813 ac_ct_CC=$ac_cv_prog_ac_ct_CC 1687 1814 if test -n "$ac_ct_CC"; then 1688 1815 - echo "$as_me:1460: result: $ac_ct_CC" >&5 1689 + echo "$as_me:146 3: result: $ac_ct_CC" >&51816 + echo "$as_me:1464: result: $ac_ct_CC" >&5 1690 1817 echo "${ECHO_T}$ac_ct_CC" >&6 1691 1818 else 1692 1819 - echo "$as_me:1463: result: no" >&5 1693 + echo "$as_me:146 6: result: no" >&51820 + echo "$as_me:1467: result: no" >&5 1694 1821 echo "${ECHO_T}no" >&6 1695 1822 fi 1696 1823 1697 @@ -1473,7 +147 6,7 @@1824 @@ -1473,7 +1477,7 @@ 1698 1825 if test -n "$ac_tool_prefix"; then 1699 1826 # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. 1700 1827 set dummy ${ac_tool_prefix}cc; ac_word=$2 1701 1828 -echo "$as_me:1476: checking for $ac_word" >&5 1702 +echo "$as_me:14 79: checking for $ac_word" >&51829 +echo "$as_me:1480: checking for $ac_word" >&5 1703 1830 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 1704 1831 if test "${ac_cv_prog_CC+set}" = set; then 1705 1832 echo $ECHO_N "(cached) $ECHO_C" >&6 1706 @@ -1488,7 +149 1,7 @@1833 @@ -1488,7 +1492,7 @@ 1707 1834 test -z "$ac_dir" && ac_dir=. 1708 1835 $as_executable_p "$ac_dir/$ac_word" || continue 1709 1836 ac_cv_prog_CC="${ac_tool_prefix}cc" 1710 1837 -echo "$as_me:1491: found $ac_dir/$ac_word" >&5 1711 +echo "$as_me:149 4: found $ac_dir/$ac_word" >&51838 +echo "$as_me:1495: found $ac_dir/$ac_word" >&5 1712 1839 break 1713 1840 done 1714 1841 1715 @@ -1496,10 +1 499,10 @@1842 @@ -1496,10 +1500,10 @@ 1716 1843 fi 1717 1844 CC=$ac_cv_prog_CC 1718 1845 if test -n "$CC"; then 1719 1846 - echo "$as_me:1499: result: $CC" >&5 1720 + echo "$as_me:150 2: result: $CC" >&51847 + echo "$as_me:1503: result: $CC" >&5 1721 1848 echo "${ECHO_T}$CC" >&6 1722 1849 else 1723 1850 - echo "$as_me:1502: result: no" >&5 1724 + echo "$as_me:150 5: result: no" >&51851 + echo "$as_me:1506: result: no" >&5 1725 1852 echo "${ECHO_T}no" >&6 1726 1853 fi 1727 1854 1728 @@ -1508,7 +151 1,7 @@1855 @@ -1508,7 +1512,7 @@ 1729 1856 ac_ct_CC=$CC 1730 1857 # Extract the first word of "cc", so it can be a program name with args. 1731 1858 set dummy cc; ac_word=$2 1732 1859 -echo "$as_me:1511: checking for $ac_word" >&5 1733 +echo "$as_me:151 4: checking for $ac_word" >&51860 +echo "$as_me:1515: checking for $ac_word" >&5 1734 1861 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 1735 1862 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then 1736 1863 echo $ECHO_N "(cached) $ECHO_C" >&6 1737 @@ -1523,7 +152 6,7 @@1864 @@ -1523,7 +1527,7 @@ 1738 1865 test -z "$ac_dir" && ac_dir=. 1739 1866 $as_executable_p "$ac_dir/$ac_word" || continue 1740 1867 ac_cv_prog_ac_ct_CC="cc" 1741 1868 -echo "$as_me:1526: found $ac_dir/$ac_word" >&5 1742 +echo "$as_me:15 29: found $ac_dir/$ac_word" >&51869 +echo "$as_me:1530: found $ac_dir/$ac_word" >&5 1743 1870 break 1744 1871 done 1745 1872 1746 @@ -1531,10 +153 4,10 @@1873 @@ -1531,10 +1535,10 @@ 1747 1874 fi 1748 1875 ac_ct_CC=$ac_cv_prog_ac_ct_CC 1749 1876 if test -n "$ac_ct_CC"; then 1750 1877 - echo "$as_me:1534: result: $ac_ct_CC" >&5 1751 + echo "$as_me:153 7: result: $ac_ct_CC" >&51878 + echo "$as_me:1538: result: $ac_ct_CC" >&5 1752 1879 echo "${ECHO_T}$ac_ct_CC" >&6 1753 1880 else 1754 1881 - echo "$as_me:1537: result: no" >&5 1755 + echo "$as_me:154 0: result: no" >&51882 + echo "$as_me:1541: result: no" >&5 1756 1883 echo "${ECHO_T}no" >&6 1757 1884 fi 1758 1885 1759 @@ -1547,7 +155 0,7 @@1886 @@ -1547,7 +1551,7 @@ 1760 1887 if test -z "$CC"; then 1761 1888 # Extract the first word of "cc", so it can be a program name with args. 1762 1889 set dummy cc; ac_word=$2 1763 1890 -echo "$as_me:1550: checking for $ac_word" >&5 1764 +echo "$as_me:155 3: checking for $ac_word" >&51891 +echo "$as_me:1554: checking for $ac_word" >&5 1765 1892 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 1766 1893 if test "${ac_cv_prog_CC+set}" = set; then 1767 1894 echo $ECHO_N "(cached) $ECHO_C" >&6 1768 @@ -1567,7 +157 0,7 @@1895 @@ -1567,7 +1571,7 @@ 1769 1896 continue 1770 1897 fi 1771 1898 ac_cv_prog_CC="cc" 1772 1899 -echo "$as_me:1570: found $ac_dir/$ac_word" >&5 1773 +echo "$as_me:157 3: found $ac_dir/$ac_word" >&51900 +echo "$as_me:1574: found $ac_dir/$ac_word" >&5 1774 1901 break 1775 1902 done 1776 1903 1777 @@ -1589,10 +159 2,10 @@1904 @@ -1589,10 +1593,10 @@ 1778 1905 fi 1779 1906 CC=$ac_cv_prog_CC 1780 1907 if test -n "$CC"; then 1781 1908 - echo "$as_me:1592: result: $CC" >&5 1782 + echo "$as_me:159 5: result: $CC" >&51909 + echo "$as_me:1596: result: $CC" >&5 1783 1910 echo "${ECHO_T}$CC" >&6 1784 1911 else 1785 1912 - echo "$as_me:1595: result: no" >&5 1786 + echo "$as_me:159 8: result: no" >&51913 + echo "$as_me:1599: result: no" >&5 1787 1914 echo "${ECHO_T}no" >&6 1788 1915 fi 1789 1916 1790 @@ -1603,7 +160 6,7 @@1917 @@ -1603,7 +1607,7 @@ 1791 1918 do 1792 1919 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 1793 1920 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 1794 1921 -echo "$as_me:1606: checking for $ac_word" >&5 1795 +echo "$as_me:16 09: checking for $ac_word" >&51922 +echo "$as_me:1610: checking for $ac_word" >&5 1796 1923 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 1797 1924 if test "${ac_cv_prog_CC+set}" = set; then 1798 1925 echo $ECHO_N "(cached) $ECHO_C" >&6 1799 @@ -1618,7 +162 1,7 @@1926 @@ -1618,7 +1622,7 @@ 1800 1927 test -z "$ac_dir" && ac_dir=. 1801 1928 $as_executable_p "$ac_dir/$ac_word" || continue 1802 1929 ac_cv_prog_CC="$ac_tool_prefix$ac_prog" 1803 1930 -echo "$as_me:1621: found $ac_dir/$ac_word" >&5 1804 +echo "$as_me:162 4: found $ac_dir/$ac_word" >&51931 +echo "$as_me:1625: found $ac_dir/$ac_word" >&5 1805 1932 break 1806 1933 done 1807 1934 1808 @@ -1626,10 +16 29,10 @@1935 @@ -1626,10 +1630,10 @@ 1809 1936 fi 1810 1937 CC=$ac_cv_prog_CC 1811 1938 if test -n "$CC"; then 1812 1939 - echo "$as_me:1629: result: $CC" >&5 1813 + echo "$as_me:163 2: result: $CC" >&51940 + echo "$as_me:1633: result: $CC" >&5 1814 1941 echo "${ECHO_T}$CC" >&6 1815 1942 else 1816 1943 - echo "$as_me:1632: result: no" >&5 1817 + echo "$as_me:163 5: result: no" >&51944 + echo "$as_me:1636: result: no" >&5 1818 1945 echo "${ECHO_T}no" >&6 1819 1946 fi 1820 1947 1821 @@ -1642,7 +164 5,7 @@1948 @@ -1642,7 +1646,7 @@ 1822 1949 do 1823 1950 # Extract the first word of "$ac_prog", so it can be a program name with args. 1824 1951 set dummy $ac_prog; ac_word=$2 1825 1952 -echo "$as_me:1645: checking for $ac_word" >&5 1826 +echo "$as_me:164 8: checking for $ac_word" >&51953 +echo "$as_me:1649: checking for $ac_word" >&5 1827 1954 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 1828 1955 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then 1829 1956 echo $ECHO_N "(cached) $ECHO_C" >&6 1830 @@ -1657,7 +166 0,7 @@1957 @@ -1657,7 +1661,7 @@ 1831 1958 test -z "$ac_dir" && ac_dir=. 1832 1959 $as_executable_p "$ac_dir/$ac_word" || continue 1833 1960 ac_cv_prog_ac_ct_CC="$ac_prog" 1834 1961 -echo "$as_me:1660: found $ac_dir/$ac_word" >&5 1835 +echo "$as_me:166 3: found $ac_dir/$ac_word" >&51962 +echo "$as_me:1664: found $ac_dir/$ac_word" >&5 1836 1963 break 1837 1964 done 1838 1965 1839 @@ -1665,10 +166 8,10 @@1966 @@ -1665,10 +1669,10 @@ 1840 1967 fi 1841 1968 ac_ct_CC=$ac_cv_prog_ac_ct_CC 1842 1969 if test -n "$ac_ct_CC"; then 1843 1970 - echo "$as_me:1668: result: $ac_ct_CC" >&5 1844 + echo "$as_me:167 1: result: $ac_ct_CC" >&51971 + echo "$as_me:1672: result: $ac_ct_CC" >&5 1845 1972 echo "${ECHO_T}$ac_ct_CC" >&6 1846 1973 else 1847 1974 - echo "$as_me:1671: result: no" >&5 1848 + echo "$as_me:167 4: result: no" >&51975 + echo "$as_me:1675: result: no" >&5 1849 1976 echo "${ECHO_T}no" >&6 1850 1977 fi 1851 1978 1852 @@ -1680,32 +168 3,32 @@1979 @@ -1680,32 +1684,32 @@ 1853 1980 1854 1981 fi 1855 1982 1856 1983 -test -z "$CC" && { { echo "$as_me:1683: error: no acceptable cc found in \$PATH" >&5 1857 +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 1858 1985 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} 1859 1986 { (exit 1); exit 1; }; } … … 1861 1988 # Provide some information about the compiler. 1862 1989 -echo "$as_me:1688:" \ 1863 +echo "$as_me:169 1:" \1990 +echo "$as_me:1692:" \ 1864 1991 "checking for C compiler version" >&5 1865 1992 ac_compiler=`set X $ac_compile; echo $2` 1866 1993 -{ (eval echo "$as_me:1691: \"$ac_compiler --version </dev/null >&5\"") >&5 1867 +{ (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 1868 1995 (eval $ac_compiler --version </dev/null >&5) 2>&5 1869 1996 ac_status=$? 1870 1997 - echo "$as_me:1694: \$? = $ac_status" >&5 1871 + echo "$as_me:169 7: \$? = $ac_status" >&51998 + echo "$as_me:1698: \$? = $ac_status" >&5 1872 1999 (exit $ac_status); } 1873 2000 -{ (eval echo "$as_me:1696: \"$ac_compiler -v </dev/null >&5\"") >&5 1874 +{ (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 1875 2002 (eval $ac_compiler -v </dev/null >&5) 2>&5 1876 2003 ac_status=$? 1877 2004 - echo "$as_me:1699: \$? = $ac_status" >&5 1878 + echo "$as_me:170 2: \$? = $ac_status" >&52005 + echo "$as_me:1703: \$? = $ac_status" >&5 1879 2006 (exit $ac_status); } 1880 2007 -{ (eval echo "$as_me:1701: \"$ac_compiler -V </dev/null >&5\"") >&5 1881 +{ (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 1882 2009 (eval $ac_compiler -V </dev/null >&5) 2>&5 1883 2010 ac_status=$? 1884 2011 - echo "$as_me:1704: \$? = $ac_status" >&5 1885 + echo "$as_me:170 7: \$? = $ac_status" >&52012 + echo "$as_me:1708: \$? = $ac_status" >&5 1886 2013 (exit $ac_status); } 1887 2014 1888 2015 cat >conftest.$ac_ext <<_ACEOF 1889 2016 -#line 1708 "configure" 1890 +#line 171 1"configure"2017 +#line 1712 "configure" 1891 2018 #include "confdefs.h" 1892 2019 1893 2020 int 1894 @@ -1721,13 +172 4,13 @@2021 @@ -1721,13 +1725,13 @@ 1895 2022 # Try to create an executable without -o first, disregard a.out. 1896 2023 # It will help us diagnose broken compilers, and finding out an intuition 1897 2024 # of exeext. 1898 2025 -echo "$as_me:1724: checking for C compiler default output" >&5 1899 +echo "$as_me:172 7: checking for C compiler default output" >&52026 +echo "$as_me:1728: checking for C compiler default output" >&5 1900 2027 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 1901 2028 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` 1902 2029 -if { (eval echo "$as_me:1727: \"$ac_link_default\"") >&5 1903 +if { (eval echo "$as_me:173 0: \"$ac_link_default\"") >&52030 +if { (eval echo "$as_me:1731: \"$ac_link_default\"") >&5 1904 2031 (eval $ac_link_default) 2>&5 1905 2032 ac_status=$? 1906 2033 - echo "$as_me:1730: \$? = $ac_status" >&5 1907 + echo "$as_me:173 3: \$? = $ac_status" >&52034 + echo "$as_me:1734: \$? = $ac_status" >&5 1908 2035 (exit $ac_status); }; then 1909 2036 # Find the output, starting from the most likely. This scheme is 1910 2037 # not robust to junk in `.', hence go to wildcards (a.*) only as a last 1911 @@ -1736,7 +17 39,7 @@2038 @@ -1736,7 +1740,7 @@ 1912 2039 ls a.out conftest 2>/dev/null; 1913 2040 ls a.* conftest.* 2>/dev/null`; do … … 1918 2045 # certainly right. 1919 2046 break;; 1920 @@ -1750,34 +175 3,34 @@2047 @@ -1750,34 +1754,34 @@ 1921 2048 else 1922 2049 echo "$as_me: failed program was:" >&5 1923 2050 cat conftest.$ac_ext >&5 1924 2051 -{ { echo "$as_me:1753: error: C compiler cannot create executables" >&5 1925 +{ { echo "$as_me:175 6: error: C compiler cannot create executables" >&52052 +{ { echo "$as_me:1757: error: C compiler cannot create executables" >&5 1926 2053 echo "$as_me: error: C compiler cannot create executables" >&2;} 1927 2054 { (exit 77); exit 77; }; } … … 1930 2057 ac_exeext=$ac_cv_exeext 1931 2058 -echo "$as_me:1759: result: $ac_file" >&5 1932 +echo "$as_me:176 2: result: $ac_file" >&52059 +echo "$as_me:1763: result: $ac_file" >&5 1933 2060 echo "${ECHO_T}$ac_file" >&6 1934 2061 … … 1936 2063 # the compiler is broken, or we cross compile. 1937 2064 -echo "$as_me:1764: checking whether the C compiler works" >&5 1938 +echo "$as_me:176 7: checking whether the C compiler works" >&52065 +echo "$as_me:1768: checking whether the C compiler works" >&5 1939 2066 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 1940 2067 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 … … 1943 2070 if { ac_try='./$ac_file' 1944 2071 - { (eval echo "$as_me:1770: \"$ac_try\"") >&5 1945 + { (eval echo "$as_me:177 3: \"$ac_try\"") >&52072 + { (eval echo "$as_me:1774: \"$ac_try\"") >&5 1946 2073 (eval $ac_try) 2>&5 1947 2074 ac_status=$? 1948 2075 - echo "$as_me:1773: \$? = $ac_status" >&5 1949 + echo "$as_me:177 6: \$? = $ac_status" >&52076 + echo "$as_me:1777: \$? = $ac_status" >&5 1950 2077 (exit $ac_status); }; }; then 1951 2078 cross_compiling=no … … 1955 2082 else 1956 2083 - { { echo "$as_me:1780: error: cannot run C compiled programs. 1957 + { { echo "$as_me:178 3: error: cannot run C compiled programs.2084 + { { echo "$as_me:1784: error: cannot run C compiled programs. 1958 2085 If you meant to cross compile, use \`--host'." >&5 1959 2086 echo "$as_me: error: cannot run C compiled programs. 1960 2087 If you meant to cross compile, use \`--host'." >&2;} 1961 @@ -1785,24 +178 8,24 @@2088 @@ -1785,24 +1789,24 @@ 1962 2089 fi 1963 2090 fi 1964 2091 fi 1965 2092 -echo "$as_me:1788: result: yes" >&5 1966 +echo "$as_me:179 1: result: yes" >&52093 +echo "$as_me:1792: result: yes" >&5 1967 2094 echo "${ECHO_T}yes" >&6 1968 2095 … … 1972 2099 # the compiler is broken, or we cross compile. 1973 2100 -echo "$as_me:1795: checking whether we are cross compiling" >&5 1974 +echo "$as_me:179 8: checking whether we are cross compiling" >&52101 +echo "$as_me:1799: checking whether we are cross compiling" >&5 1975 2102 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 1976 2103 -echo "$as_me:1797: result: $cross_compiling" >&5 1977 +echo "$as_me:180 0: result: $cross_compiling" >&52104 +echo "$as_me:1801: result: $cross_compiling" >&5 1978 2105 echo "${ECHO_T}$cross_compiling" >&6 1979 2106 1980 2107 -echo "$as_me:1800: checking for executable suffix" >&5 1981 +echo "$as_me:180 3: checking for executable suffix" >&52108 +echo "$as_me:1804: checking for executable suffix" >&5 1982 2109 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 1983 2110 -if { (eval echo "$as_me:1802: \"$ac_link\"") >&5 1984 +if { (eval echo "$as_me:180 5: \"$ac_link\"") >&52111 +if { (eval echo "$as_me:1806: \"$ac_link\"") >&5 1985 2112 (eval $ac_link) 2>&5 1986 2113 ac_status=$? 1987 2114 - echo "$as_me:1805: \$? = $ac_status" >&5 1988 + echo "$as_me:180 8: \$? = $ac_status" >&52115 + echo "$as_me:1809: \$? = $ac_status" >&5 1989 2116 (exit $ac_status); }; then 1990 2117 # If both `conftest.exe' and `conftest' are `present' (well, observable) 1991 2118 # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will 1992 @@ -1810,7 +181 3,7 @@2119 @@ -1810,7 +1814,7 @@ 1993 2120 # `rm'. 1994 2121 for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do … … 1999 2126 export ac_cv_exeext 2000 2127 break;; 2001 @@ -1818,25 +182 1,25 @@2128 @@ -1818,25 +1822,25 @@ 2002 2129 esac 2003 2130 done 2004 2131 else 2005 2132 - { { echo "$as_me:1821: error: cannot compute EXEEXT: cannot compile and link" >&5 2006 + { { 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 2007 2134 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} 2008 2135 { (exit 1); exit 1; }; } … … 2011 2138 rm -f conftest$ac_cv_exeext 2012 2139 -echo "$as_me:1827: result: $ac_cv_exeext" >&5 2013 +echo "$as_me:183 0: result: $ac_cv_exeext" >&52140 +echo "$as_me:1831: result: $ac_cv_exeext" >&5 2014 2141 echo "${ECHO_T}$ac_cv_exeext" >&6 2015 2142 … … 2018 2145 ac_exeext=$EXEEXT 2019 2146 -echo "$as_me:1833: checking for object suffix" >&5 2020 +echo "$as_me:183 6: checking for object suffix" >&52147 +echo "$as_me:1837: checking for object suffix" >&5 2021 2148 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 2022 2149 if test "${ac_cv_objext+set}" = set; then … … 2025 2152 cat >conftest.$ac_ext <<_ACEOF 2026 2153 -#line 1839 "configure" 2027 +#line 184 2"configure"2154 +#line 1843 "configure" 2028 2155 #include "confdefs.h" 2029 2156 2030 2157 int 2031 @@ -1848,14 +185 1,14 @@2158 @@ -1848,14 +1852,14 @@ 2032 2159 } 2033 2160 _ACEOF 2034 2161 rm -f conftest.o conftest.obj 2035 2162 -if { (eval echo "$as_me:1851: \"$ac_compile\"") >&5 2036 +if { (eval echo "$as_me:185 4: \"$ac_compile\"") >&52163 +if { (eval echo "$as_me:1855: \"$ac_compile\"") >&5 2037 2164 (eval $ac_compile) 2>&5 2038 2165 ac_status=$? 2039 2166 - echo "$as_me:1854: \$? = $ac_status" >&5 2040 + echo "$as_me:185 7: \$? = $ac_status" >&52167 + echo "$as_me:1858: \$? = $ac_status" >&5 2041 2168 (exit $ac_status); }; then 2042 2169 for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do … … 2047 2174 break;; 2048 2175 esac 2049 @@ -1863,24 +186 6,24 @@2176 @@ -1863,24 +1867,24 @@ 2050 2177 else 2051 2178 echo "$as_me: failed program was:" >&5 2052 2179 cat conftest.$ac_ext >&5 2053 2180 -{ { echo "$as_me:1866: error: cannot compute OBJEXT: cannot compile" >&5 2054 +{ { echo "$as_me:18 69: error: cannot compute OBJEXT: cannot compile" >&52181 +{ { echo "$as_me:1870: error: cannot compute OBJEXT: cannot compile" >&5 2055 2182 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} 2056 2183 { (exit 1); exit 1; }; } … … 2060 2187 fi 2061 2188 -echo "$as_me:1873: result: $ac_cv_objext" >&5 2062 +echo "$as_me:187 6: result: $ac_cv_objext" >&52189 +echo "$as_me:1877: result: $ac_cv_objext" >&5 2063 2190 echo "${ECHO_T}$ac_cv_objext" >&6 2064 2191 OBJEXT=$ac_cv_objext 2065 2192 ac_objext=$OBJEXT 2066 2193 -echo "$as_me:1877: checking whether we are using the GNU C compiler" >&5 2067 +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 2068 2195 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 2069 2196 if test "${ac_cv_c_compiler_gnu+set}" = set; then … … 2072 2199 cat >conftest.$ac_ext <<_ACEOF 2073 2200 -#line 1883 "configure" 2074 +#line 188 6"configure"2201 +#line 1887 "configure" 2075 2202 #include "confdefs.h" 2076 2203 2077 2204 int 2078 @@ -1895,16 +189 8,16 @@2205 @@ -1895,16 +1899,16 @@ 2079 2206 } 2080 2207 _ACEOF 2081 2208 rm -f conftest.$ac_objext 2082 2209 -if { (eval echo "$as_me:1898: \"$ac_compile\"") >&5 2083 +if { (eval echo "$as_me:190 1: \"$ac_compile\"") >&52210 +if { (eval echo "$as_me:1902: \"$ac_compile\"") >&5 2084 2211 (eval $ac_compile) 2>&5 2085 2212 ac_status=$? 2086 2213 - echo "$as_me:1901: \$? = $ac_status" >&5 2087 + echo "$as_me:190 4: \$? = $ac_status" >&52214 + echo "$as_me:1905: \$? = $ac_status" >&5 2088 2215 (exit $ac_status); } && 2089 2216 { ac_try='test -s conftest.$ac_objext' 2090 2217 - { (eval echo "$as_me:1904: \"$ac_try\"") >&5 2091 + { (eval echo "$as_me:190 7: \"$ac_try\"") >&52218 + { (eval echo "$as_me:1908: \"$ac_try\"") >&5 2092 2219 (eval $ac_try) 2>&5 2093 2220 ac_status=$? 2094 2221 - echo "$as_me:1907: \$? = $ac_status" >&5 2095 + echo "$as_me:191 0: \$? = $ac_status" >&52222 + echo "$as_me:1911: \$? = $ac_status" >&5 2096 2223 (exit $ac_status); }; }; then 2097 2224 ac_compiler_gnu=yes 2098 2225 else 2099 @@ -1916,19 +19 19,19 @@2226 @@ -1916,19 +1920,19 @@ 2100 2227 ac_cv_c_compiler_gnu=$ac_compiler_gnu 2101 2228 2102 2229 fi 2103 2230 -echo "$as_me:1919: result: $ac_cv_c_compiler_gnu" >&5 2104 +echo "$as_me:192 2: result: $ac_cv_c_compiler_gnu" >&52231 +echo "$as_me:1923: result: $ac_cv_c_compiler_gnu" >&5 2105 2232 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 2106 2233 GCC=`test $ac_compiler_gnu = yes && echo yes` … … 2109 2236 CFLAGS="-g" 2110 2237 -echo "$as_me:1925: checking whether $CC accepts -g" >&5 2111 +echo "$as_me:192 8: checking whether $CC accepts -g" >&52238 +echo "$as_me:1929: checking whether $CC accepts -g" >&5 2112 2239 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 2113 2240 if test "${ac_cv_prog_cc_g+set}" = set; then … … 2116 2243 cat >conftest.$ac_ext <<_ACEOF 2117 2244 -#line 1931 "configure" 2118 +#line 193 4"configure"2245 +#line 1935 "configure" 2119 2246 #include "confdefs.h" 2120 2247 2121 2248 int 2122 @@ -1940,16 +194 3,16 @@2249 @@ -1940,16 +1944,16 @@ 2123 2250 } 2124 2251 _ACEOF 2125 2252 rm -f conftest.$ac_objext 2126 2253 -if { (eval echo "$as_me:1943: \"$ac_compile\"") >&5 2127 +if { (eval echo "$as_me:194 6: \"$ac_compile\"") >&52254 +if { (eval echo "$as_me:1947: \"$ac_compile\"") >&5 2128 2255 (eval $ac_compile) 2>&5 2129 2256 ac_status=$? 2130 2257 - echo "$as_me:1946: \$? = $ac_status" >&5 2131 + echo "$as_me:19 49: \$? = $ac_status" >&52258 + echo "$as_me:1950: \$? = $ac_status" >&5 2132 2259 (exit $ac_status); } && 2133 2260 { ac_try='test -s conftest.$ac_objext' 2134 2261 - { (eval echo "$as_me:1949: \"$ac_try\"") >&5 2135 + { (eval echo "$as_me:195 2: \"$ac_try\"") >&52262 + { (eval echo "$as_me:1953: \"$ac_try\"") >&5 2136 2263 (eval $ac_try) 2>&5 2137 2264 ac_status=$? 2138 2265 - echo "$as_me:1952: \$? = $ac_status" >&5 2139 + echo "$as_me:195 5: \$? = $ac_status" >&52266 + echo "$as_me:1956: \$? = $ac_status" >&5 2140 2267 (exit $ac_status); }; }; then 2141 2268 ac_cv_prog_cc_g=yes 2142 2269 else 2143 @@ -1959,7 +196 2,7 @@2270 @@ -1959,7 +1963,7 @@ 2144 2271 fi 2145 2272 rm -f conftest.$ac_objext conftest.$ac_ext 2146 2273 fi 2147 2274 -echo "$as_me:1962: result: $ac_cv_prog_cc_g" >&5 2148 +echo "$as_me:196 5: result: $ac_cv_prog_cc_g" >&52275 +echo "$as_me:1966: result: $ac_cv_prog_cc_g" >&5 2149 2276 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 2150 2277 if test "$ac_test_CFLAGS" = set; then 2151 2278 CFLAGS=$ac_save_CFLAGS 2152 @@ -1986,16 +19 89,16 @@2279 @@ -1986,16 +1990,16 @@ 2153 2280 #endif 2154 2281 _ACEOF 2155 2282 rm -f conftest.$ac_objext 2156 2283 -if { (eval echo "$as_me:1989: \"$ac_compile\"") >&5 2157 +if { (eval echo "$as_me:199 2: \"$ac_compile\"") >&52284 +if { (eval echo "$as_me:1993: \"$ac_compile\"") >&5 2158 2285 (eval $ac_compile) 2>&5 2159 2286 ac_status=$? 2160 2287 - echo "$as_me:1992: \$? = $ac_status" >&5 2161 + echo "$as_me:199 5: \$? = $ac_status" >&52288 + echo "$as_me:1996: \$? = $ac_status" >&5 2162 2289 (exit $ac_status); } && 2163 2290 { ac_try='test -s conftest.$ac_objext' 2164 2291 - { (eval echo "$as_me:1995: \"$ac_try\"") >&5 2165 + { (eval echo "$as_me:199 8: \"$ac_try\"") >&52292 + { (eval echo "$as_me:1999: \"$ac_try\"") >&5 2166 2293 (eval $ac_try) 2>&5 2167 2294 ac_status=$? 2168 2295 - echo "$as_me:1998: \$? = $ac_status" >&5 2169 + echo "$as_me:200 1: \$? = $ac_status" >&52296 + echo "$as_me:2002: \$? = $ac_status" >&5 2170 2297 (exit $ac_status); }; }; then 2171 2298 for ac_declaration in \ 2172 2299 ''\ 2173 @@ -2007,7 +201 0,7 @@2300 @@ -2007,7 +2011,7 @@ 2174 2301 'void exit (int);' 2175 2302 do 2176 2303 cat >conftest.$ac_ext <<_ACEOF 2177 2304 -#line 2010 "configure" 2178 +#line 201 3"configure"2305 +#line 2014 "configure" 2179 2306 #include "confdefs.h" 2180 2307 #include <stdlib.h> 2181 2308 $ac_declaration 2182 @@ -2020,16 +202 3,16 @@2309 @@ -2020,16 +2024,16 @@ 2183 2310 } 2184 2311 _ACEOF 2185 2312 rm -f conftest.$ac_objext 2186 2313 -if { (eval echo "$as_me:2023: \"$ac_compile\"") >&5 2187 +if { (eval echo "$as_me:202 6: \"$ac_compile\"") >&52314 +if { (eval echo "$as_me:2027: \"$ac_compile\"") >&5 2188 2315 (eval $ac_compile) 2>&5 2189 2316 ac_status=$? 2190 2317 - echo "$as_me:2026: \$? = $ac_status" >&5 2191 + echo "$as_me:20 29: \$? = $ac_status" >&52318 + echo "$as_me:2030: \$? = $ac_status" >&5 2192 2319 (exit $ac_status); } && 2193 2320 { ac_try='test -s conftest.$ac_objext' 2194 2321 - { (eval echo "$as_me:2029: \"$ac_try\"") >&5 2195 + { (eval echo "$as_me:203 2: \"$ac_try\"") >&52322 + { (eval echo "$as_me:2033: \"$ac_try\"") >&5 2196 2323 (eval $ac_try) 2>&5 2197 2324 ac_status=$? 2198 2325 - echo "$as_me:2032: \$? = $ac_status" >&5 2199 + echo "$as_me:203 5: \$? = $ac_status" >&52326 + echo "$as_me:2036: \$? = $ac_status" >&5 2200 2327 (exit $ac_status); }; }; then 2201 2328 : 2202 2329 else 2203 @@ -2039,7 +204 2,7 @@2330 @@ -2039,7 +2043,7 @@ 2204 2331 fi 2205 2332 rm -f conftest.$ac_objext conftest.$ac_ext 2206 2333 cat >conftest.$ac_ext <<_ACEOF 2207 2334 -#line 2042 "configure" 2208 +#line 204 5"configure"2335 +#line 2046 "configure" 2209 2336 #include "confdefs.h" 2210 2337 $ac_declaration 2211 2338 int 2212 @@ -2051,16 +205 4,16 @@2339 @@ -2051,16 +2055,16 @@ 2213 2340 } 2214 2341 _ACEOF 2215 2342 rm -f conftest.$ac_objext 2216 2343 -if { (eval echo "$as_me:2054: \"$ac_compile\"") >&5 2217 +if { (eval echo "$as_me:205 7: \"$ac_compile\"") >&52344 +if { (eval echo "$as_me:2058: \"$ac_compile\"") >&5 2218 2345 (eval $ac_compile) 2>&5 2219 2346 ac_status=$? 2220 2347 - echo "$as_me:2057: \$? = $ac_status" >&5 2221 + echo "$as_me:206 0: \$? = $ac_status" >&52348 + echo "$as_me:2061: \$? = $ac_status" >&5 2222 2349 (exit $ac_status); } && 2223 2350 { ac_try='test -s conftest.$ac_objext' 2224 2351 - { (eval echo "$as_me:2060: \"$ac_try\"") >&5 2225 + { (eval echo "$as_me:206 3: \"$ac_try\"") >&52352 + { (eval echo "$as_me:2064: \"$ac_try\"") >&5 2226 2353 (eval $ac_try) 2>&5 2227 2354 ac_status=$? 2228 2355 - echo "$as_me:2063: \$? = $ac_status" >&5 2229 + echo "$as_me:206 6: \$? = $ac_status" >&52356 + echo "$as_me:2067: \$? = $ac_status" >&5 2230 2357 (exit $ac_status); }; }; then 2231 2358 break 2232 2359 else 2233 @@ -2090,11 +209 3,11 @@2360 @@ -2090,11 +2094,11 @@ 2234 2361 2235 2362 GCC_VERSION=none 2236 2363 if test "$GCC" = yes ; then 2237 2364 - echo "$as_me:2093: checking version of $CC" >&5 2238 + echo "$as_me:209 6: checking version of $CC" >&52365 + echo "$as_me:2097: checking version of $CC" >&5 2239 2366 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 2240 2367 GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" 2241 2368 test -z "$GCC_VERSION" && GCC_VERSION=unknown 2242 2369 - echo "$as_me:2097: result: $GCC_VERSION" >&5 2243 + echo "$as_me:210 0: result: $GCC_VERSION" >&52370 + echo "$as_me:2101: result: $GCC_VERSION" >&5 2244 2371 echo "${ECHO_T}$GCC_VERSION" >&6 2245 2372 fi 2246 2373 2247 @@ -2104,7 +210 7,7 @@2374 @@ -2104,7 +2108,7 @@ 2248 2375 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 2249 2376 ac_compiler_gnu=$ac_cv_c_compiler_gnu 2250 2377 ac_main_return=return 2251 2378 -echo "$as_me:2107: checking how to run the C preprocessor" >&5 2252 +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 2253 2380 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 2254 2381 # On Suns, sometimes $CPP names a directory. 2255 2382 if test -n "$CPP" && test -d "$CPP"; then 2256 @@ -2125,18 +212 8,18 @@2383 @@ -2125,18 +2129,18 @@ 2257 2384 # On the NeXT, cc -E runs the code through the compiler's parser, 2258 2385 # not just through cpp. "Syntax error" is here to catch this case. 2259 2386 cat >conftest.$ac_ext <<_ACEOF 2260 2387 -#line 2128 "configure" 2261 +#line 213 1"configure"2388 +#line 2132 "configure" 2262 2389 #include "confdefs.h" 2263 2390 #include <assert.h> … … 2265 2392 _ACEOF 2266 2393 -if { (eval echo "$as_me:2133: \"$ac_cpp conftest.$ac_ext\"") >&5 2267 +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 2268 2395 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 2269 2396 ac_status=$? … … 2272 2399 cat conftest.err >&5 2273 2400 - echo "$as_me:2139: \$? = $ac_status" >&5 2274 + echo "$as_me:214 2: \$? = $ac_status" >&52401 + echo "$as_me:2143: \$? = $ac_status" >&5 2275 2402 (exit $ac_status); } >/dev/null; then 2276 2403 if test -s conftest.err; then 2277 2404 ac_cpp_err=$ac_c_preproc_warn_flag 2278 @@ -2159,17 +216 2,17 @@2405 @@ -2159,17 +2163,17 @@ 2279 2406 # OK, works on sane cases. Now check whether non-existent headers 2280 2407 # can be detected and how. 2281 2408 cat >conftest.$ac_ext <<_ACEOF 2282 2409 -#line 2162 "configure" 2283 +#line 216 5"configure"2410 +#line 2166 "configure" 2284 2411 #include "confdefs.h" 2285 2412 #include <ac_nonexistent.h> 2286 2413 _ACEOF 2287 2414 -if { (eval echo "$as_me:2166: \"$ac_cpp conftest.$ac_ext\"") >&5 2288 +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 2289 2416 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 2290 2417 ac_status=$? … … 2293 2420 cat conftest.err >&5 2294 2421 - echo "$as_me:2172: \$? = $ac_status" >&5 2295 + echo "$as_me:217 5: \$? = $ac_status" >&52422 + echo "$as_me:2176: \$? = $ac_status" >&5 2296 2423 (exit $ac_status); } >/dev/null; then 2297 2424 if test -s conftest.err; then 2298 2425 ac_cpp_err=$ac_c_preproc_warn_flag 2299 @@ -2206,7 +22 09,7 @@2426 @@ -2206,7 +2210,7 @@ 2300 2427 else 2301 2428 ac_cv_prog_CPP=$CPP 2302 2429 fi 2303 2430 -echo "$as_me:2209: result: $CPP" >&5 2304 +echo "$as_me:221 2: result: $CPP" >&52431 +echo "$as_me:2213: result: $CPP" >&5 2305 2432 echo "${ECHO_T}$CPP" >&6 2306 2433 ac_preproc_ok=false 2307 2434 for ac_c_preproc_warn_flag in '' yes 2308 @@ -2216,18 +22 19,18 @@2435 @@ -2216,18 +2220,18 @@ 2309 2436 # On the NeXT, cc -E runs the code through the compiler's parser, 2310 2437 # not just through cpp. "Syntax error" is here to catch this case. 2311 2438 cat >conftest.$ac_ext <<_ACEOF 2312 2439 -#line 2219 "configure" 2313 +#line 222 2"configure"2440 +#line 2223 "configure" 2314 2441 #include "confdefs.h" 2315 2442 #include <assert.h> … … 2317 2444 _ACEOF 2318 2445 -if { (eval echo "$as_me:2224: \"$ac_cpp conftest.$ac_ext\"") >&5 2319 +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 2320 2447 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 2321 2448 ac_status=$? … … 2324 2451 cat conftest.err >&5 2325 2452 - echo "$as_me:2230: \$? = $ac_status" >&5 2326 + echo "$as_me:223 3: \$? = $ac_status" >&52453 + echo "$as_me:2234: \$? = $ac_status" >&5 2327 2454 (exit $ac_status); } >/dev/null; then 2328 2455 if test -s conftest.err; then 2329 2456 ac_cpp_err=$ac_c_preproc_warn_flag 2330 @@ -2250,17 +225 3,17 @@2457 @@ -2250,17 +2254,17 @@ 2331 2458 # OK, works on sane cases. Now check whether non-existent headers 2332 2459 # can be detected and how. 2333 2460 cat >conftest.$ac_ext <<_ACEOF 2334 2461 -#line 2253 "configure" 2335 +#line 225 6"configure"2462 +#line 2257 "configure" 2336 2463 #include "confdefs.h" 2337 2464 #include <ac_nonexistent.h> 2338 2465 _ACEOF 2339 2466 -if { (eval echo "$as_me:2257: \"$ac_cpp conftest.$ac_ext\"") >&5 2340 +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 2341 2468 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 2342 2469 ac_status=$? … … 2345 2472 cat conftest.err >&5 2346 2473 - echo "$as_me:2263: \$? = $ac_status" >&5 2347 + echo "$as_me:226 6: \$? = $ac_status" >&52474 + echo "$as_me:2267: \$? = $ac_status" >&5 2348 2475 (exit $ac_status); } >/dev/null; then 2349 2476 if test -s conftest.err; then 2350 2477 ac_cpp_err=$ac_c_preproc_warn_flag 2351 @@ -2288,7 +229 1,7 @@2478 @@ -2288,7 +2292,7 @@ 2352 2479 if $ac_preproc_ok; then 2353 2480 : 2354 2481 else 2355 2482 - { { echo "$as_me:2291: error: C preprocessor \"$CPP\" fails sanity check" >&5 2356 + { { 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 2357 2484 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} 2358 2485 { (exit 1); exit 1; }; } 2359 2486 fi 2360 @@ -2301,14 +230 4,14 @@2487 @@ -2301,14 +2305,14 @@ 2361 2488 ac_main_return=return 2362 2489 2363 2490 if test $ac_cv_c_compiler_gnu = yes; then 2364 2491 - echo "$as_me:2304: checking whether $CC needs -traditional" >&5 2365 + echo "$as_me:230 7: checking whether $CC needs -traditional" >&52492 + echo "$as_me:2308: checking whether $CC needs -traditional" >&5 2366 2493 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 2367 2494 if test "${ac_cv_prog_gcc_traditional+set}" = set; then … … 2371 2498 cat >conftest.$ac_ext <<_ACEOF 2372 2499 -#line 2311 "configure" 2373 +#line 231 4"configure"2500 +#line 2315 "configure" 2374 2501 #include "confdefs.h" 2375 2502 #include <sgtty.h> 2376 2503 int Autoconf = TIOCGETP; 2377 @@ -2323,7 +232 6,7 @@2504 @@ -2323,7 +2327,7 @@ 2378 2505 2379 2506 if test $ac_cv_prog_gcc_traditional = no; then 2380 2507 cat >conftest.$ac_ext <<_ACEOF 2381 2508 -#line 2326 "configure" 2382 +#line 23 29"configure"2509 +#line 2330 "configure" 2383 2510 #include "confdefs.h" 2384 2511 #include <termio.h> 2385 2512 int Autoconf = TCGETA; 2386 @@ -2336,14 +23 39,14 @@2513 @@ -2336,14 +2340,14 @@ 2387 2514 2388 2515 fi 2389 2516 fi 2390 2517 -echo "$as_me:2339: result: $ac_cv_prog_gcc_traditional" >&5 2391 +echo "$as_me:234 2: result: $ac_cv_prog_gcc_traditional" >&52518 +echo "$as_me:2343: result: $ac_cv_prog_gcc_traditional" >&5 2392 2519 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 2393 2520 if test $ac_cv_prog_gcc_traditional = yes; then … … 2397 2524 2398 2525 -echo "$as_me:2346: checking whether $CC understands -c and -o together" >&5 2399 +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 2400 2527 echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6 2401 2528 if test "${cf_cv_prog_CC_c_o+set}" = set; then 2402 2529 echo $ECHO_N "(cached) $ECHO_C" >&6 2403 @@ -2359,15 +236 2,15 @@2530 @@ -2359,15 +2363,15 @@ 2404 2531 # We do the test twice because some compilers refuse to overwrite an 2405 2532 # existing .o file with -o, though they will create one. 2406 2533 ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' 2407 2534 -if { (eval echo "$as_me:2362: \"$ac_try\"") >&5 2408 +if { (eval echo "$as_me:236 5: \"$ac_try\"") >&52535 +if { (eval echo "$as_me:2366: \"$ac_try\"") >&5 2409 2536 (eval $ac_try) 2>&5 2410 2537 ac_status=$? 2411 2538 - echo "$as_me:2365: \$? = $ac_status" >&5 2412 + echo "$as_me:236 8: \$? = $ac_status" >&52539 + echo "$as_me:2369: \$? = $ac_status" >&5 2413 2540 (exit $ac_status); } && 2414 2541 - test -f conftest2.$ac_objext && { (eval echo "$as_me:2367: \"$ac_try\"") >&5 2415 + 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 2416 2543 (eval $ac_try) 2>&5 2417 2544 ac_status=$? 2418 2545 - echo "$as_me:2370: \$? = $ac_status" >&5 2419 + echo "$as_me:237 3: \$? = $ac_status" >&52546 + echo "$as_me:2374: \$? = $ac_status" >&5 2420 2547 (exit $ac_status); }; 2421 2548 then 2422 2549 eval cf_cv_prog_CC_c_o=yes 2423 @@ -2378,19 +238 1,19 @@2550 @@ -2378,19 +2382,19 @@ 2424 2551 2425 2552 fi 2426 2553 if test $cf_cv_prog_CC_c_o = yes; then 2427 2554 - echo "$as_me:2381: result: yes" >&5 2428 + echo "$as_me:238 4: result: yes" >&52555 + echo "$as_me:2385: result: yes" >&5 2429 2556 echo "${ECHO_T}yes" >&6 2430 2557 else 2431 2558 - echo "$as_me:2384: result: no" >&5 2432 + echo "$as_me:238 7: result: no" >&52559 + echo "$as_me:2388: result: no" >&5 2433 2560 echo "${ECHO_T}no" >&6 2434 2561 fi 2435 2562 2436 2563 -echo "$as_me:2388: checking for POSIXized ISC" >&5 2437 +echo "$as_me:239 1: checking for POSIXized ISC" >&52564 +echo "$as_me:2392: checking for POSIXized ISC" >&5 2438 2565 echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6 2439 2566 if test -d /etc/conf/kconfig.d && … … 2441 2568 then 2442 2569 - echo "$as_me:2393: result: yes" >&5 2443 + echo "$as_me:239 6: result: yes" >&52570 + echo "$as_me:2397: result: yes" >&5 2444 2571 echo "${ECHO_T}yes" >&6 2445 2572 ISC=yes # If later tests want to check for ISC. 2446 2573 2447 @@ -2404,12 +240 7,12 @@2574 @@ -2404,12 +2408,12 @@ 2448 2575 CC="$CC -Xp" 2449 2576 fi 2450 2577 else 2451 2578 - echo "$as_me:2407: result: no" >&5 2452 + echo "$as_me:241 0: result: no" >&52579 + echo "$as_me:2411: result: no" >&5 2453 2580 echo "${ECHO_T}no" >&6 2454 2581 ISC= … … 2456 2583 2457 2584 -echo "$as_me:2412: checking for ${CC-cc} option to accept ANSI C" >&5 2458 +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 2459 2586 echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6 2460 2587 if test "${cf_cv_ansi_cc+set}" = set; then 2461 2588 echo $ECHO_N "(cached) $ECHO_C" >&6 2462 @@ -2503,7 +2506,7 @@ 2589 @@ -2494,7 +2498,7 @@ 2590 2591 if test -n "$cf_new_cppflags" ; then 2592 2593 - CPPFLAGS="$cf_new_cppflags $CPPFLAGS" 2594 + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" 2595 fi 2596 2597 if test -n "$cf_new_extra_cppflags" ; then 2598 @@ -2503,7 +2507,7 @@ 2463 2599 fi 2464 2600 2465 2601 cat >conftest.$ac_ext <<_ACEOF 2466 2602 -#line 2506 "configure" 2467 +#line 25 09"configure"2603 +#line 2510 "configure" 2468 2604 #include "confdefs.h" 2469 2605 2470 2606 #ifndef CC_HAS_PROTOS 2471 @@ -2524,16 +252 7,16 @@2607 @@ -2524,16 +2528,16 @@ 2472 2608 } 2473 2609 _ACEOF 2474 2610 rm -f conftest.$ac_objext 2475 2611 -if { (eval echo "$as_me:2527: \"$ac_compile\"") >&5 2476 +if { (eval echo "$as_me:253 0: \"$ac_compile\"") >&52612 +if { (eval echo "$as_me:2531: \"$ac_compile\"") >&5 2477 2613 (eval $ac_compile) 2>&5 2478 2614 ac_status=$? 2479 2615 - echo "$as_me:2530: \$? = $ac_status" >&5 2480 + echo "$as_me:253 3: \$? = $ac_status" >&52616 + echo "$as_me:2534: \$? = $ac_status" >&5 2481 2617 (exit $ac_status); } && 2482 2618 { ac_try='test -s conftest.$ac_objext' 2483 2619 - { (eval echo "$as_me:2533: \"$ac_try\"") >&5 2484 + { (eval echo "$as_me:253 6: \"$ac_try\"") >&52620 + { (eval echo "$as_me:2537: \"$ac_try\"") >&5 2485 2621 (eval $ac_try) 2>&5 2486 2622 ac_status=$? 2487 2623 - echo "$as_me:2536: \$? = $ac_status" >&5 2488 + echo "$as_me:25 39: \$? = $ac_status" >&52624 + echo "$as_me:2540: \$? = $ac_status" >&5 2489 2625 (exit $ac_status); }; }; then 2490 2626 cf_cv_ansi_cc="$cf_arg"; break 2491 2627 else 2492 @@ -2546,7 +25 49,7 @@2628 @@ -2546,7 +2550,7 @@ 2493 2629 CPPFLAGS="$cf_save_CPPFLAGS" 2494 2630 2495 2631 fi 2496 2632 -echo "$as_me:2549: result: $cf_cv_ansi_cc" >&5 2497 +echo "$as_me:255 2: result: $cf_cv_ansi_cc" >&52633 +echo "$as_me:2553: result: $cf_cv_ansi_cc" >&5 2498 2634 echo "${ECHO_T}$cf_cv_ansi_cc" >&6 2499 2635 2500 2636 if test "$cf_cv_ansi_cc" != "no"; then 2501 @@ -2629,7 +2632,7 @@ 2637 @@ -2612,7 +2616,7 @@ 2638 2639 if test -n "$cf_new_cppflags" ; then 2640 2641 - CPPFLAGS="$cf_new_cppflags $CPPFLAGS" 2642 + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" 2643 fi 2644 2645 if test -n "$cf_new_extra_cppflags" ; then 2646 @@ -2629,7 +2633,7 @@ 2502 2647 fi 2503 2648 2504 2649 if test "$cf_cv_ansi_cc" = "no"; then 2505 2650 - { { echo "$as_me:2632: error: Your compiler does not appear to recognize prototypes. 2506 + { { 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. 2507 2652 You have the following choices: 2508 2653 a. adjust your compiler options 2509 2654 b. get an up-to-date compiler 2510 @@ -2663,13 +266 6,13 @@2655 @@ -2663,13 +2667,13 @@ 2511 2656 LDCONFIG=: 2512 2657 else … … 2520 2665 set dummy ldconfig; ac_word=$2 2521 2666 -echo "$as_me:2672: checking for $ac_word" >&5 2522 +echo "$as_me:267 5: checking for $ac_word" >&52667 +echo "$as_me:2676: checking for $ac_word" >&5 2523 2668 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 2524 2669 if test "${ac_cv_path_LDCONFIG+set}" = set; then 2525 2670 echo $ECHO_N "(cached) $ECHO_C" >&6 2526 @@ -2686,7 +26 89,7 @@2671 @@ -2686,7 +2690,7 @@ 2527 2672 test -z "$ac_dir" && ac_dir=. 2528 2673 if $as_executable_p "$ac_dir/$ac_word"; then 2529 2674 ac_cv_path_LDCONFIG="$ac_dir/$ac_word" 2530 2675 - echo "$as_me:2689: found $ac_dir/$ac_word" >&5 2531 + echo "$as_me:269 2: found $ac_dir/$ac_word" >&52676 + echo "$as_me:2693: found $ac_dir/$ac_word" >&5 2532 2677 break 2533 2678 fi 2534 2679 done 2535 @@ -2697,10 +270 0,10 @@2680 @@ -2697,10 +2701,10 @@ 2536 2681 LDCONFIG=$ac_cv_path_LDCONFIG 2537 2682 2538 2683 if test -n "$LDCONFIG"; then 2539 2684 - echo "$as_me:2700: result: $LDCONFIG" >&5 2540 + echo "$as_me:270 3: result: $LDCONFIG" >&52685 + echo "$as_me:2704: result: $LDCONFIG" >&5 2541 2686 echo "${ECHO_T}$LDCONFIG" >&6 2542 2687 else 2543 2688 - echo "$as_me:2703: result: no" >&5 2544 + echo "$as_me:270 6: result: no" >&52689 + echo "$as_me:2707: result: no" >&5 2545 2690 echo "${ECHO_T}no" >&6 2546 2691 fi 2547 2692 2548 @@ -2708,7 +271 1,7 @@2693 @@ -2708,7 +2712,7 @@ 2549 2694 esac 2550 2695 fi 2551 2696 2552 2697 -echo "$as_me:2711: checking if you want to ensure bool is consistent with C++" >&5 2553 +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 2554 2699 echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6 2555 2700 2556 2701 # Check whether --with-cxx or --without-cxx was given. 2557 @@ -2718,7 +272 1,7 @@2702 @@ -2718,7 +2722,7 @@ 2558 2703 else 2559 2704 cf_with_cxx=yes 2560 2705 fi; 2561 2706 -echo "$as_me:2721: result: $cf_with_cxx" >&5 2562 +echo "$as_me:272 4: result: $cf_with_cxx" >&52707 +echo "$as_me:2725: result: $cf_with_cxx" >&5 2563 2708 echo "${ECHO_T}$cf_with_cxx" >&6 2564 2709 if test "X$cf_with_cxx" = Xno ; then 2565 2710 CXX="" 2566 @@ -2736,7 +27 39,7 @@2711 @@ -2736,7 +2740,7 @@ 2567 2712 do 2568 2713 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 2569 2714 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 2570 2715 -echo "$as_me:2739: checking for $ac_word" >&5 2571 +echo "$as_me:274 2: checking for $ac_word" >&52716 +echo "$as_me:2743: checking for $ac_word" >&5 2572 2717 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 2573 2718 if test "${ac_cv_prog_CXX+set}" = set; then 2574 2719 echo $ECHO_N "(cached) $ECHO_C" >&6 2575 @@ -2751,7 +275 4,7 @@2720 @@ -2751,7 +2755,7 @@ 2576 2721 test -z "$ac_dir" && ac_dir=. 2577 2722 $as_executable_p "$ac_dir/$ac_word" || continue 2578 2723 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" 2579 2724 -echo "$as_me:2754: found $ac_dir/$ac_word" >&5 2580 +echo "$as_me:275 7: found $ac_dir/$ac_word" >&52725 +echo "$as_me:2758: found $ac_dir/$ac_word" >&5 2581 2726 break 2582 2727 done 2583 2728 2584 @@ -2759,10 +276 2,10 @@2729 @@ -2759,10 +2763,10 @@ 2585 2730 fi 2586 2731 CXX=$ac_cv_prog_CXX 2587 2732 if test -n "$CXX"; then 2588 2733 - echo "$as_me:2762: result: $CXX" >&5 2589 + echo "$as_me:276 5: result: $CXX" >&52734 + echo "$as_me:2766: result: $CXX" >&5 2590 2735 echo "${ECHO_T}$CXX" >&6 2591 2736 else 2592 2737 - echo "$as_me:2765: result: no" >&5 2593 + echo "$as_me:276 8: result: no" >&52738 + echo "$as_me:2769: result: no" >&5 2594 2739 echo "${ECHO_T}no" >&6 2595 2740 fi 2596 2741 2597 @@ -2775,7 +277 8,7 @@2742 @@ -2775,7 +2779,7 @@ 2598 2743 do 2599 2744 # Extract the first word of "$ac_prog", so it can be a program name with args. 2600 2745 set dummy $ac_prog; ac_word=$2 2601 2746 -echo "$as_me:2778: checking for $ac_word" >&5 2602 +echo "$as_me:278 1: checking for $ac_word" >&52747 +echo "$as_me:2782: checking for $ac_word" >&5 2603 2748 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 2604 2749 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then 2605 2750 echo $ECHO_N "(cached) $ECHO_C" >&6 2606 @@ -2790,7 +279 3,7 @@2751 @@ -2790,7 +2794,7 @@ 2607 2752 test -z "$ac_dir" && ac_dir=. 2608 2753 $as_executable_p "$ac_dir/$ac_word" || continue 2609 2754 ac_cv_prog_ac_ct_CXX="$ac_prog" 2610 2755 -echo "$as_me:2793: found $ac_dir/$ac_word" >&5 2611 +echo "$as_me:279 6: found $ac_dir/$ac_word" >&52756 +echo "$as_me:2797: found $ac_dir/$ac_word" >&5 2612 2757 break 2613 2758 done 2614 2759 2615 @@ -2798,10 +280 1,10 @@2760 @@ -2798,10 +2802,10 @@ 2616 2761 fi 2617 2762 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX 2618 2763 if test -n "$ac_ct_CXX"; then 2619 2764 - echo "$as_me:2801: result: $ac_ct_CXX" >&5 2620 + echo "$as_me:280 4: result: $ac_ct_CXX" >&52765 + echo "$as_me:2805: result: $ac_ct_CXX" >&5 2621 2766 echo "${ECHO_T}$ac_ct_CXX" >&6 2622 2767 else 2623 2768 - echo "$as_me:2804: result: no" >&5 2624 + echo "$as_me:280 7: result: no" >&52769 + echo "$as_me:2808: result: no" >&5 2625 2770 echo "${ECHO_T}no" >&6 2626 2771 fi 2627 2772 2628 @@ -2813,32 +281 6,32 @@2773 @@ -2813,32 +2817,32 @@ 2629 2774 fi 2630 2775 2631 2776 # Provide some information about the compiler. 2632 2777 -echo "$as_me:2816:" \ 2633 +echo "$as_me:28 19:" \2778 +echo "$as_me:2820:" \ 2634 2779 "checking for C++ compiler version" >&5 2635 2780 ac_compiler=`set X $ac_compile; echo $2` 2636 2781 -{ (eval echo "$as_me:2819: \"$ac_compiler --version </dev/null >&5\"") >&5 2637 +{ (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 2638 2783 (eval $ac_compiler --version </dev/null >&5) 2>&5 2639 2784 ac_status=$? 2640 2785 - echo "$as_me:2822: \$? = $ac_status" >&5 2641 + echo "$as_me:282 5: \$? = $ac_status" >&52786 + echo "$as_me:2826: \$? = $ac_status" >&5 2642 2787 (exit $ac_status); } 2643 2788 -{ (eval echo "$as_me:2824: \"$ac_compiler -v </dev/null >&5\"") >&5 2644 +{ (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 2645 2790 (eval $ac_compiler -v </dev/null >&5) 2>&5 2646 2791 ac_status=$? 2647 2792 - echo "$as_me:2827: \$? = $ac_status" >&5 2648 + echo "$as_me:283 0: \$? = $ac_status" >&52793 + echo "$as_me:2831: \$? = $ac_status" >&5 2649 2794 (exit $ac_status); } 2650 2795 -{ (eval echo "$as_me:2829: \"$ac_compiler -V </dev/null >&5\"") >&5 2651 +{ (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 2652 2797 (eval $ac_compiler -V </dev/null >&5) 2>&5 2653 2798 ac_status=$? 2654 2799 - echo "$as_me:2832: \$? = $ac_status" >&5 2655 + echo "$as_me:283 5: \$? = $ac_status" >&52800 + echo "$as_me:2836: \$? = $ac_status" >&5 2656 2801 (exit $ac_status); } 2657 2802 2658 2803 -echo "$as_me:2835: checking whether we are using the GNU C++ compiler" >&5 2659 +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 2660 2805 echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 2661 2806 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then … … 2664 2809 cat >conftest.$ac_ext <<_ACEOF 2665 2810 -#line 2841 "configure" 2666 +#line 284 4"configure"2811 +#line 2845 "configure" 2667 2812 #include "confdefs.h" 2668 2813 2669 2814 int 2670 @@ -2853,16 +285 6,16 @@2815 @@ -2853,16 +2857,16 @@ 2671 2816 } 2672 2817 _ACEOF 2673 2818 rm -f conftest.$ac_objext 2674 2819 -if { (eval echo "$as_me:2856: \"$ac_compile\"") >&5 2675 +if { (eval echo "$as_me:28 59: \"$ac_compile\"") >&52820 +if { (eval echo "$as_me:2860: \"$ac_compile\"") >&5 2676 2821 (eval $ac_compile) 2>&5 2677 2822 ac_status=$? 2678 2823 - echo "$as_me:2859: \$? = $ac_status" >&5 2679 + echo "$as_me:286 2: \$? = $ac_status" >&52824 + echo "$as_me:2863: \$? = $ac_status" >&5 2680 2825 (exit $ac_status); } && 2681 2826 { ac_try='test -s conftest.$ac_objext' 2682 2827 - { (eval echo "$as_me:2862: \"$ac_try\"") >&5 2683 + { (eval echo "$as_me:286 5: \"$ac_try\"") >&52828 + { (eval echo "$as_me:2866: \"$ac_try\"") >&5 2684 2829 (eval $ac_try) 2>&5 2685 2830 ac_status=$? 2686 2831 - echo "$as_me:2865: \$? = $ac_status" >&5 2687 + echo "$as_me:286 8: \$? = $ac_status" >&52832 + echo "$as_me:2869: \$? = $ac_status" >&5 2688 2833 (exit $ac_status); }; }; then 2689 2834 ac_compiler_gnu=yes 2690 2835 else 2691 @@ -2874,19 +287 7,19 @@2836 @@ -2874,19 +2878,19 @@ 2692 2837 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu 2693 2838 2694 2839 fi 2695 2840 -echo "$as_me:2877: result: $ac_cv_cxx_compiler_gnu" >&5 2696 +echo "$as_me:288 0: result: $ac_cv_cxx_compiler_gnu" >&52841 +echo "$as_me:2881: result: $ac_cv_cxx_compiler_gnu" >&5 2697 2842 echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 2698 2843 GXX=`test $ac_compiler_gnu = yes && echo yes` … … 2701 2846 CXXFLAGS="-g" 2702 2847 -echo "$as_me:2883: checking whether $CXX accepts -g" >&5 2703 +echo "$as_me:288 6: checking whether $CXX accepts -g" >&52848 +echo "$as_me:2887: checking whether $CXX accepts -g" >&5 2704 2849 echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 2705 2850 if test "${ac_cv_prog_cxx_g+set}" = set; then … … 2708 2853 cat >conftest.$ac_ext <<_ACEOF 2709 2854 -#line 2889 "configure" 2710 +#line 289 2"configure"2855 +#line 2893 "configure" 2711 2856 #include "confdefs.h" 2712 2857 2713 2858 int 2714 @@ -2898,16 +290 1,16 @@2859 @@ -2898,16 +2902,16 @@ 2715 2860 } 2716 2861 _ACEOF 2717 2862 rm -f conftest.$ac_objext 2718 2863 -if { (eval echo "$as_me:2901: \"$ac_compile\"") >&5 2719 +if { (eval echo "$as_me:290 4: \"$ac_compile\"") >&52864 +if { (eval echo "$as_me:2905: \"$ac_compile\"") >&5 2720 2865 (eval $ac_compile) 2>&5 2721 2866 ac_status=$? 2722 2867 - echo "$as_me:2904: \$? = $ac_status" >&5 2723 + echo "$as_me:290 7: \$? = $ac_status" >&52868 + echo "$as_me:2908: \$? = $ac_status" >&5 2724 2869 (exit $ac_status); } && 2725 2870 { ac_try='test -s conftest.$ac_objext' 2726 2871 - { (eval echo "$as_me:2907: \"$ac_try\"") >&5 2727 + { (eval echo "$as_me:291 0: \"$ac_try\"") >&52872 + { (eval echo "$as_me:2911: \"$ac_try\"") >&5 2728 2873 (eval $ac_try) 2>&5 2729 2874 ac_status=$? 2730 2875 - echo "$as_me:2910: \$? = $ac_status" >&5 2731 + echo "$as_me:291 3: \$? = $ac_status" >&52876 + echo "$as_me:2914: \$? = $ac_status" >&5 2732 2877 (exit $ac_status); }; }; then 2733 2878 ac_cv_prog_cxx_g=yes 2734 2879 else 2735 @@ -2917,7 +292 0,7 @@2880 @@ -2917,7 +2921,7 @@ 2736 2881 fi 2737 2882 rm -f conftest.$ac_objext conftest.$ac_ext 2738 2883 fi 2739 2884 -echo "$as_me:2920: result: $ac_cv_prog_cxx_g" >&5 2740 +echo "$as_me:292 3: result: $ac_cv_prog_cxx_g" >&52885 +echo "$as_me:2924: result: $ac_cv_prog_cxx_g" >&5 2741 2886 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 2742 2887 if test "$ac_test_CXXFLAGS" = set; then 2743 2888 CXXFLAGS=$ac_save_CXXFLAGS 2744 @@ -2944,7 +294 7,7 @@2889 @@ -2944,7 +2948,7 @@ 2745 2890 'void exit (int);' 2746 2891 do 2747 2892 cat >conftest.$ac_ext <<_ACEOF 2748 2893 -#line 2947 "configure" 2749 +#line 295 0"configure"2894 +#line 2951 "configure" 2750 2895 #include "confdefs.h" 2751 2896 #include <stdlib.h> 2752 2897 $ac_declaration 2753 @@ -2957,16 +296 0,16 @@2898 @@ -2957,16 +2961,16 @@ 2754 2899 } 2755 2900 _ACEOF 2756 2901 rm -f conftest.$ac_objext 2757 2902 -if { (eval echo "$as_me:2960: \"$ac_compile\"") >&5 2758 +if { (eval echo "$as_me:296 3: \"$ac_compile\"") >&52903 +if { (eval echo "$as_me:2964: \"$ac_compile\"") >&5 2759 2904 (eval $ac_compile) 2>&5 2760 2905 ac_status=$? 2761 2906 - echo "$as_me:2963: \$? = $ac_status" >&5 2762 + echo "$as_me:296 6: \$? = $ac_status" >&52907 + echo "$as_me:2967: \$? = $ac_status" >&5 2763 2908 (exit $ac_status); } && 2764 2909 { ac_try='test -s conftest.$ac_objext' 2765 2910 - { (eval echo "$as_me:2966: \"$ac_try\"") >&5 2766 + { (eval echo "$as_me:29 69: \"$ac_try\"") >&52911 + { (eval echo "$as_me:2970: \"$ac_try\"") >&5 2767 2912 (eval $ac_try) 2>&5 2768 2913 ac_status=$? 2769 2914 - echo "$as_me:2969: \$? = $ac_status" >&5 2770 + echo "$as_me:297 2: \$? = $ac_status" >&52915 + echo "$as_me:2973: \$? = $ac_status" >&5 2771 2916 (exit $ac_status); }; }; then 2772 2917 : 2773 2918 else 2774 @@ -2976,7 +29 79,7 @@2919 @@ -2976,7 +2980,7 @@ 2775 2920 fi 2776 2921 rm -f conftest.$ac_objext conftest.$ac_ext 2777 2922 cat >conftest.$ac_ext <<_ACEOF 2778 2923 -#line 2979 "configure" 2779 +#line 298 2"configure"2924 +#line 2983 "configure" 2780 2925 #include "confdefs.h" 2781 2926 $ac_declaration 2782 2927 int 2783 @@ -2988,16 +299 1,16 @@2928 @@ -2988,16 +2992,16 @@ 2784 2929 } 2785 2930 _ACEOF 2786 2931 rm -f conftest.$ac_objext 2787 2932 -if { (eval echo "$as_me:2991: \"$ac_compile\"") >&5 2788 +if { (eval echo "$as_me:299 4: \"$ac_compile\"") >&52933 +if { (eval echo "$as_me:2995: \"$ac_compile\"") >&5 2789 2934 (eval $ac_compile) 2>&5 2790 2935 ac_status=$? 2791 2936 - echo "$as_me:2994: \$? = $ac_status" >&5 2792 + echo "$as_me:299 7: \$? = $ac_status" >&52937 + echo "$as_me:2998: \$? = $ac_status" >&5 2793 2938 (exit $ac_status); } && 2794 2939 { ac_try='test -s conftest.$ac_objext' 2795 2940 - { (eval echo "$as_me:2997: \"$ac_try\"") >&5 2796 + { (eval echo "$as_me:300 0: \"$ac_try\"") >&52941 + { (eval echo "$as_me:3001: \"$ac_try\"") >&5 2797 2942 (eval $ac_try) 2>&5 2798 2943 ac_status=$? 2799 2944 - echo "$as_me:3000: \$? = $ac_status" >&5 2800 + echo "$as_me:300 3: \$? = $ac_status" >&52945 + echo "$as_me:3004: \$? = $ac_status" >&5 2801 2946 (exit $ac_status); }; }; then 2802 2947 break 2803 2948 else 2804 @@ -3024,7 +302 7,7 @@2949 @@ -3024,7 +3028,7 @@ 2805 2950 if test "$CXX" = "g++" ; then 2806 2951 # Extract the first word of "g++", so it can be a program name with args. 2807 2952 set dummy g++; ac_word=$2 2808 2953 -echo "$as_me:3027: checking for $ac_word" >&5 2809 +echo "$as_me:303 0: checking for $ac_word" >&52954 +echo "$as_me:3031: checking for $ac_word" >&5 2810 2955 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 2811 2956 if test "${ac_cv_path_CXX+set}" = set; then 2812 2957 echo $ECHO_N "(cached) $ECHO_C" >&6 2813 @@ -3041,7 +304 4,7 @@2958 @@ -3041,7 +3045,7 @@ 2814 2959 test -z "$ac_dir" && ac_dir=. 2815 2960 if $as_executable_p "$ac_dir/$ac_word"; then 2816 2961 ac_cv_path_CXX="$ac_dir/$ac_word" 2817 2962 - echo "$as_me:3044: found $ac_dir/$ac_word" >&5 2818 + echo "$as_me:304 7: found $ac_dir/$ac_word" >&52963 + echo "$as_me:3048: found $ac_dir/$ac_word" >&5 2819 2964 break 2820 2965 fi 2821 2966 done 2822 @@ -3052,16 +305 5,16 @@2967 @@ -3052,16 +3056,16 @@ 2823 2968 CXX=$ac_cv_path_CXX 2824 2969 2825 2970 if test -n "$CXX"; then 2826 2971 - echo "$as_me:3055: result: $CXX" >&5 2827 + echo "$as_me:305 8: result: $CXX" >&52972 + echo "$as_me:3059: result: $CXX" >&5 2828 2973 echo "${ECHO_T}$CXX" >&6 2829 2974 else 2830 2975 - echo "$as_me:3058: result: no" >&5 2831 + echo "$as_me:306 1: result: no" >&52976 + echo "$as_me:3062: result: no" >&5 2832 2977 echo "${ECHO_T}no" >&6 2833 2978 fi … … 2836 2981 if test "$CXX" = "g++" ; then 2837 2982 - { echo "$as_me:3064: WARNING: ignoring hardcoded g++" >&5 2838 + { echo "$as_me:306 7: WARNING: ignoring hardcoded g++" >&52983 + { echo "$as_me:3068: WARNING: ignoring hardcoded g++" >&5 2839 2984 echo "$as_me: WARNING: ignoring hardcoded g++" >&2;} 2840 2985 cf_with_cxx=no; CXX=""; GXX=""; 2841 2986 fi 2842 @@ -3069,11 +307 2,11 @@2987 @@ -3069,11 +3073,11 @@ 2843 2988 2844 2989 GXX_VERSION=none 2845 2990 if test "$GXX" = yes; then 2846 2991 - echo "$as_me:3072: checking version of g++" >&5 2847 + echo "$as_me:307 5: checking version of g++" >&52992 + echo "$as_me:3076: checking version of g++" >&5 2848 2993 echo $ECHO_N "checking version of g++... $ECHO_C" >&6 2849 2994 GXX_VERSION="`${CXX-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" 2850 2995 test -z "$GXX_VERSION" && GXX_VERSION=unknown 2851 2996 - echo "$as_me:3076: result: $GXX_VERSION" >&5 2852 + echo "$as_me:30 79: result: $GXX_VERSION" >&52997 + echo "$as_me:3080: result: $GXX_VERSION" >&5 2853 2998 echo "${ECHO_T}$GXX_VERSION" >&6 2854 2999 fi 2855 3000 2856 @@ -3081,12 +308 4,12 @@3001 @@ -3081,12 +3085,12 @@ 2857 3002 1*|2.[0-6]*) 2858 3003 # GXX=""; CXX=""; ac_cv_prog_gxx=no 2859 3004 # cf_cxx_library=no 2860 3005 - { echo "$as_me:3084: WARNING: templates do not work" >&5 2861 + { echo "$as_me:308 7: WARNING: templates do not work" >&53006 + { echo "$as_me:3088: WARNING: templates do not work" >&5 2862 3007 echo "$as_me: WARNING: templates do not work" >&2;} 2863 3008 ;; … … 2865 3010 2866 3011 -echo "$as_me:3089: checking if you want to build C++ binding and demo" >&5 2867 +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 2868 3013 echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6 2869 3014 2870 3015 # Check whether --with-cxx-binding or --without-cxx-binding was given. 2871 @@ -3096,10 +3 099,10 @@3016 @@ -3096,10 +3100,10 @@ 2872 3017 else 2873 3018 cf_with_cxx_binding=$cf_with_cxx 2874 3019 fi; 2875 3020 -echo "$as_me:3099: result: $cf_with_cxx_binding" >&5 2876 +echo "$as_me:310 2: result: $cf_with_cxx_binding" >&53021 +echo "$as_me:3103: result: $cf_with_cxx_binding" >&5 2877 3022 echo "${ECHO_T}$cf_with_cxx_binding" >&6 2878 3023 2879 3024 -echo "$as_me:3102: checking if you want to build with Ada95" >&5 2880 +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 2881 3026 echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6 2882 3027 2883 3028 # Check whether --with-ada or --without-ada was given. 2884 @@ -3109,10 +311 2,23 @@3029 @@ -3109,10 +3113,23 @@ 2885 3030 else 2886 3031 cf_with_ada=yes 2887 3032 fi; 2888 3033 -echo "$as_me:3112: result: $cf_with_ada" >&5 2889 +echo "$as_me:311 5: result: $cf_with_ada" >&53034 +echo "$as_me:3116: result: $cf_with_ada" >&5 2890 3035 echo "${ECHO_T}$cf_with_ada" >&6 2891 3036 2892 3037 -echo "$as_me:3115: checking if you want to build programs such as tic" >&5 2893 +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 2894 3039 +echo $ECHO_N "checking if you want to install manpages... $ECHO_C" >&6 2895 3040 + … … 2901 3046 + cf_with_manpages=yes 2902 3047 +fi; 2903 +echo "$as_me:312 8: result: $cf_with_manpages" >&53048 +echo "$as_me:3129: result: $cf_with_manpages" >&5 2904 3049 +echo "${ECHO_T}$cf_with_manpages" >&6 2905 3050 + 2906 +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 2907 3052 echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6 2908 3053 2909 3054 # Check whether --with-progs or --without-progs was given. 2910 @@ -3122,10 +313 8,10 @@3055 @@ -3122,10 +3139,10 @@ 2911 3056 else 2912 3057 cf_with_progs=yes 2913 3058 fi; 2914 3059 -echo "$as_me:3125: result: $cf_with_progs" >&5 2915 +echo "$as_me:314 1: result: $cf_with_progs" >&53060 +echo "$as_me:3142: result: $cf_with_progs" >&5 2916 3061 echo "${ECHO_T}$cf_with_progs" >&6 2917 3062 2918 3063 -echo "$as_me:3128: checking if you wish to install curses.h" >&5 2919 +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 2920 3065 echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6 2921 3066 2922 3067 # Check whether --with-curses-h or --without-curses-h was given. 2923 @@ -3135,7 +315 1,7 @@3068 @@ -3135,7 +3152,7 @@ 2924 3069 else 2925 3070 with_curses_h=yes 2926 3071 fi; 2927 3072 -echo "$as_me:3138: result: $with_curses_h" >&5 2928 +echo "$as_me:315 4: result: $with_curses_h" >&53073 +echo "$as_me:3155: result: $with_curses_h" >&5 2929 3074 echo "${ECHO_T}$with_curses_h" >&6 2930 3075 2931 3076 modules_to_build="ncurses" 2932 @@ -3161,7 +317 7,7 @@3077 @@ -3161,7 +3178,7 @@ 2933 3078 do 2934 3079 # Extract the first word of "$ac_prog", so it can be a program name with args. 2935 3080 set dummy $ac_prog; ac_word=$2 2936 3081 -echo "$as_me:3164: checking for $ac_word" >&5 2937 +echo "$as_me:318 0: checking for $ac_word" >&53082 +echo "$as_me:3181: checking for $ac_word" >&5 2938 3083 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 2939 3084 if test "${ac_cv_prog_AWK+set}" = set; then 2940 3085 echo $ECHO_N "(cached) $ECHO_C" >&6 2941 @@ -3176,7 +319 2,7 @@3086 @@ -3176,7 +3193,7 @@ 2942 3087 test -z "$ac_dir" && ac_dir=. 2943 3088 $as_executable_p "$ac_dir/$ac_word" || continue 2944 3089 ac_cv_prog_AWK="$ac_prog" 2945 3090 -echo "$as_me:3179: found $ac_dir/$ac_word" >&5 2946 +echo "$as_me:319 5: found $ac_dir/$ac_word" >&53091 +echo "$as_me:3196: found $ac_dir/$ac_word" >&5 2947 3092 break 2948 3093 done 2949 3094 2950 @@ -3184,21 +320 0,21 @@3095 @@ -3184,21 +3201,21 @@ 2951 3096 fi 2952 3097 AWK=$ac_cv_prog_AWK 2953 3098 if test -n "$AWK"; then 2954 3099 - echo "$as_me:3187: result: $AWK" >&5 2955 + echo "$as_me:320 3: result: $AWK" >&53100 + echo "$as_me:3204: result: $AWK" >&5 2956 3101 echo "${ECHO_T}$AWK" >&6 2957 3102 else 2958 3103 - echo "$as_me:3190: result: no" >&5 2959 + echo "$as_me:320 6: result: no" >&53104 + echo "$as_me:3207: result: no" >&5 2960 3105 echo "${ECHO_T}no" >&6 2961 3106 fi … … 2965 3110 2966 3111 -test -z "$AWK" && { { echo "$as_me:3197: error: No awk program found" >&5 2967 +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 2968 3113 echo "$as_me: error: No awk program found" >&2;} 2969 3114 { (exit 1); exit 1; }; } 2970 3115 2971 3116 -echo "$as_me:3201: checking for egrep" >&5 2972 +echo "$as_me:321 7: checking for egrep" >&53117 +echo "$as_me:3218: checking for egrep" >&5 2973 3118 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 2974 3119 if test "${ac_cv_prog_egrep+set}" = set; then 2975 3120 echo $ECHO_N "(cached) $ECHO_C" >&6 2976 @@ -3208,11 +322 4,11 @@3121 @@ -3208,11 +3225,11 @@ 2977 3122 else ac_cv_prog_egrep='egrep' 2978 3123 fi 2979 3124 fi 2980 3125 -echo "$as_me:3211: result: $ac_cv_prog_egrep" >&5 2981 +echo "$as_me:322 7: result: $ac_cv_prog_egrep" >&53126 +echo "$as_me:3228: result: $ac_cv_prog_egrep" >&5 2982 3127 echo "${ECHO_T}$ac_cv_prog_egrep" >&6 2983 3128 EGREP=$ac_cv_prog_egrep 2984 3129 2985 3130 -test -z "$EGREP" && { { echo "$as_me:3215: error: No egrep program found" >&5 2986 +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 2987 3132 echo "$as_me: error: No egrep program found" >&2;} 2988 3133 { (exit 1); exit 1; }; } 2989 3134 2990 @@ -3228,7 +324 4,7 @@3135 @@ -3228,7 +3245,7 @@ 2991 3136 # AFS /usr/afsws/bin/install, which mishandles nonexistent args 2992 3137 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" 2993 3138 # ./install, which can be erroneously created by make from ./install.sh. 2994 3139 -echo "$as_me:3231: checking for a BSD compatible install" >&5 2995 +echo "$as_me:324 7: checking for a BSD compatible install" >&53140 +echo "$as_me:3248: checking for a BSD compatible install" >&5 2996 3141 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 2997 3142 if test -z "$INSTALL"; then 2998 3143 if test "${ac_cv_path_install+set}" = set; then 2999 @@ -3277,7 +329 3,7 @@3144 @@ -3277,7 +3294,7 @@ 3000 3145 INSTALL=$ac_install_sh 3001 3146 fi 3002 3147 fi 3003 3148 -echo "$as_me:3280: result: $INSTALL" >&5 3004 +echo "$as_me:329 6: result: $INSTALL" >&53149 +echo "$as_me:3297: result: $INSTALL" >&5 3005 3150 echo "${ECHO_T}$INSTALL" >&6 3006 3151 3007 3152 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. 3008 @@ -3302,7 +331 8,7 @@3153 @@ -3302,7 +3319,7 @@ 3009 3154 do 3010 3155 # Extract the first word of "$ac_prog", so it can be a program name with args. 3011 3156 set dummy $ac_prog; ac_word=$2 3012 3157 -echo "$as_me:3305: checking for $ac_word" >&5 3013 +echo "$as_me:332 1: checking for $ac_word" >&53158 +echo "$as_me:3322: checking for $ac_word" >&5 3014 3159 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3015 3160 if test "${ac_cv_prog_LINT+set}" = set; then 3016 3161 echo $ECHO_N "(cached) $ECHO_C" >&6 3017 @@ -3317,7 +333 3,7 @@3162 @@ -3317,7 +3334,7 @@ 3018 3163 test -z "$ac_dir" && ac_dir=. 3019 3164 $as_executable_p "$ac_dir/$ac_word" || continue 3020 3165 ac_cv_prog_LINT="$ac_prog" 3021 3166 -echo "$as_me:3320: found $ac_dir/$ac_word" >&5 3022 +echo "$as_me:333 6: found $ac_dir/$ac_word" >&53167 +echo "$as_me:3337: found $ac_dir/$ac_word" >&5 3023 3168 break 3024 3169 done 3025 3170 3026 @@ -3325,28 +334 1,28 @@3171 @@ -3325,28 +3342,28 @@ 3027 3172 fi 3028 3173 LINT=$ac_cv_prog_LINT 3029 3174 if test -n "$LINT"; then 3030 3175 - echo "$as_me:3328: result: $LINT" >&5 3031 + echo "$as_me:334 4: result: $LINT" >&53176 + echo "$as_me:3345: result: $LINT" >&5 3032 3177 echo "${ECHO_T}$LINT" >&6 3033 3178 else 3034 3179 - echo "$as_me:3331: result: no" >&5 3035 + echo "$as_me:334 7: result: no" >&53180 + echo "$as_me:3348: result: no" >&5 3036 3181 echo "${ECHO_T}no" >&6 3037 3182 fi … … 3041 3186 3042 3187 -echo "$as_me:3338: checking whether ln -s works" >&5 3043 +echo "$as_me:335 4: checking whether ln -s works" >&53188 +echo "$as_me:3355: checking whether ln -s works" >&5 3044 3189 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 3045 3190 LN_S=$as_ln_s 3046 3191 if test "$LN_S" = "ln -s"; then 3047 3192 - echo "$as_me:3342: result: yes" >&5 3048 + echo "$as_me:335 8: result: yes" >&53193 + echo "$as_me:3359: result: yes" >&5 3049 3194 echo "${ECHO_T}yes" >&6 3050 3195 else 3051 3196 - echo "$as_me:3345: result: no, using $LN_S" >&5 3052 + echo "$as_me:336 1: result: no, using $LN_S" >&53197 + echo "$as_me:3362: result: no, using $LN_S" >&5 3053 3198 echo "${ECHO_T}no, using $LN_S" >&6 3054 3199 fi 3055 3200 3056 3201 -echo "$as_me:3349: checking for long file names" >&5 3057 +echo "$as_me:336 5: checking for long file names" >&53202 +echo "$as_me:3366: checking for long file names" >&5 3058 3203 echo $ECHO_N "checking for long file names... $ECHO_C" >&6 3059 3204 if test "${ac_cv_sys_long_file_names+set}" = set; then 3060 3205 echo $ECHO_N "(cached) $ECHO_C" >&6 3061 @@ -3385,7 +340 1,7 @@3206 @@ -3385,7 +3402,7 @@ 3062 3207 rm -rf $ac_xdir 2>/dev/null 3063 3208 done 3064 3209 fi 3065 3210 -echo "$as_me:3388: result: $ac_cv_sys_long_file_names" >&5 3066 +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 3067 3212 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 3068 3213 if test $ac_cv_sys_long_file_names = yes; then 3069 3214 3070 @@ -3395,7 +341 1,136 @@3215 @@ -3395,7 +3412,136 @@ 3071 3216 3072 3217 fi … … 3075 3220 +# if we find pkg-config, check if we should install the ".pc" files. 3076 3221 + 3077 +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 3078 3223 +echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6 3079 3224 + … … 3085 3230 + cf_pkg_config=yes 3086 3231 +fi; 3087 +echo "$as_me:342 6: result: $cf_pkg_config" >&53232 +echo "$as_me:3427: result: $cf_pkg_config" >&5 3088 3233 +echo "${ECHO_T}$cf_pkg_config" >&6 3089 3234 + 3090 +case $cf_pkg_config in 3091 +no) 3235 +case $cf_pkg_config in #(vi 3236 +no) #(vi 3092 3237 + PKG_CONFIG=none 3093 3238 + ;; 3094 +yes) 3239 +yes) #(vi 3095 3240 + # Extract the first word of "pkg-config", so it can be a program name with args. 3096 3241 +set dummy pkg-config; ac_word=$2 3097 +echo "$as_me:343 6: checking for $ac_word" >&53242 +echo "$as_me:3437: checking for $ac_word" >&5 3098 3243 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3099 3244 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then … … 3112 3257 + if $as_executable_p "$ac_dir/$ac_word"; then 3113 3258 + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" 3114 + echo "$as_me:345 3: found $ac_dir/$ac_word" >&53259 + echo "$as_me:3454: found $ac_dir/$ac_word" >&5 3115 3260 + break 3116 3261 +fi … … 3124 3269 + 3125 3270 +if test -n "$PKG_CONFIG"; then 3126 + echo "$as_me:346 5: result: $PKG_CONFIG" >&53271 + echo "$as_me:3466: result: $PKG_CONFIG" >&5 3127 3272 +echo "${ECHO_T}$PKG_CONFIG" >&6 3128 3273 +else 3129 + echo "$as_me:346 8: result: no" >&53274 + echo "$as_me:3469: result: no" >&5 3130 3275 +echo "${ECHO_T}no" >&6 3131 3276 +fi … … 3165 3310 + ;; 3166 3311 +*) 3167 + { { 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 3168 3313 +echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} 3169 3314 + { (exit 1); exit 1; }; } … … 3174 3319 + 3175 3320 +if test "$PKG_CONFIG" != no ; then 3176 + 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 3177 3322 +echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6 3178 3323 + … … 3191 3336 + enable_pc_files=no 3192 3337 +fi; 3193 + echo "$as_me:353 2: result: $enable_pc_files" >&53338 + echo "$as_me:3533: result: $enable_pc_files" >&5 3194 3339 +echo "${ECHO_T}$enable_pc_files" >&6 3195 3340 + else 3196 + echo "$as_me:353 5: result: no" >&53341 + echo "$as_me:3536: result: no" >&5 3197 3342 +echo "${ECHO_T}no" >&6 3198 + { 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 3199 3344 +echo "$as_me: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&2;} 3200 3345 + enable_pc_files=no … … 3202 3347 +fi 3203 3348 + 3204 +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 3205 3350 echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6 3206 3351 3207 3352 # Check whether --enable-mixed-case or --disable-mixed-case was given. 3208 @@ -3405,11 +355 0,11 @@3353 @@ -3405,11 +3551,11 @@ 3209 3354 else 3210 3355 enable_mixedcase=auto 3211 3356 fi; 3212 3357 -echo "$as_me:3408: result: $enable_mixedcase" >&5 3213 +echo "$as_me:355 3: result: $enable_mixedcase" >&53358 +echo "$as_me:3554: result: $enable_mixedcase" >&5 3214 3359 echo "${ECHO_T}$enable_mixedcase" >&6 3215 3360 if test "$enable_mixedcase" = "auto" ; then 3216 3361 3217 3362 -echo "$as_me:3412: checking if filesystem supports mixed-case filenames" >&5 3218 +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 3219 3364 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 3220 3365 if test "${cf_cv_mixedcase+set}" = set; then 3221 3366 echo $ECHO_N "(cached) $ECHO_C" >&6 3222 @@ -3436,7 +358 1,7 @@3367 @@ -3436,7 +3582,7 @@ 3223 3368 fi 3224 3369 3225 3370 fi 3226 3371 -echo "$as_me:3439: result: $cf_cv_mixedcase" >&5 3227 +echo "$as_me:358 4: result: $cf_cv_mixedcase" >&53372 +echo "$as_me:3585: result: $cf_cv_mixedcase" >&5 3228 3373 echo "${ECHO_T}$cf_cv_mixedcase" >&6 3229 3374 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF 3230 3375 #define MIXEDCASE_FILENAMES 1 3231 @@ -3453,7 +359 8,7 @@3376 @@ -3453,7 +3599,7 @@ 3232 3377 fi 3233 3378 3234 3379 # do this after mixed-case option (tags/TAGS is not as important as tic). 3235 3380 -echo "$as_me:3456: checking whether ${MAKE-make} sets \${MAKE}" >&5 3236 +echo "$as_me:360 1: checking whether ${MAKE-make} sets \${MAKE}" >&53381 +echo "$as_me:3602: checking whether ${MAKE-make} sets \${MAKE}" >&5 3237 3382 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 3238 3383 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` 3239 3384 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then 3240 @@ -3473,18 +361 8,18 @@3385 @@ -3473,18 +3619,18 @@ 3241 3386 rm -f conftest.make 3242 3387 fi 3243 3388 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then 3244 3389 - echo "$as_me:3476: result: yes" >&5 3245 + echo "$as_me:362 1: result: yes" >&53390 + echo "$as_me:3622: result: yes" >&5 3246 3391 echo "${ECHO_T}yes" >&6 3247 3392 SET_MAKE= 3248 3393 else 3249 3394 - echo "$as_me:3480: result: no" >&5 3250 + echo "$as_me:362 5: result: no" >&53395 + echo "$as_me:3626: result: no" >&5 3251 3396 echo "${ECHO_T}no" >&6 3252 3397 SET_MAKE="MAKE=${MAKE-make}" … … 3256 3401 set dummy ctags; ac_word=$2 3257 3402 -echo "$as_me:3487: checking for $ac_word" >&5 3258 +echo "$as_me:363 2: checking for $ac_word" >&53403 +echo "$as_me:3633: checking for $ac_word" >&5 3259 3404 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3260 3405 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then 3261 3406 echo $ECHO_N "(cached) $ECHO_C" >&6 3262 @@ -3499,7 +364 4,7 @@3407 @@ -3499,7 +3645,7 @@ 3263 3408 test -z "$ac_dir" && ac_dir=. 3264 3409 $as_executable_p "$ac_dir/$ac_word" || continue 3265 3410 ac_cv_prog_MAKE_LOWER_TAGS="yes" 3266 3411 -echo "$as_me:3502: found $ac_dir/$ac_word" >&5 3267 +echo "$as_me:364 7: found $ac_dir/$ac_word" >&53412 +echo "$as_me:3648: found $ac_dir/$ac_word" >&5 3268 3413 break 3269 3414 done 3270 3415 3271 @@ -3508,17 +365 3,17 @@3416 @@ -3508,17 +3654,17 @@ 3272 3417 fi 3273 3418 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS 3274 3419 if test -n "$MAKE_LOWER_TAGS"; then 3275 3420 - echo "$as_me:3511: result: $MAKE_LOWER_TAGS" >&5 3276 + echo "$as_me:365 6: result: $MAKE_LOWER_TAGS" >&53421 + echo "$as_me:3657: result: $MAKE_LOWER_TAGS" >&5 3277 3422 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 3278 3423 else 3279 3424 - echo "$as_me:3514: result: no" >&5 3280 + echo "$as_me:36 59: result: no" >&53425 + echo "$as_me:3660: result: no" >&5 3281 3426 echo "${ECHO_T}no" >&6 3282 3427 fi … … 3286 3431 set dummy etags; ac_word=$2 3287 3432 -echo "$as_me:3521: checking for $ac_word" >&5 3288 +echo "$as_me:366 6: checking for $ac_word" >&53433 +echo "$as_me:3667: checking for $ac_word" >&5 3289 3434 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3290 3435 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then 3291 3436 echo $ECHO_N "(cached) $ECHO_C" >&6 3292 @@ -3533,7 +367 8,7 @@3437 @@ -3533,7 +3679,7 @@ 3293 3438 test -z "$ac_dir" && ac_dir=. 3294 3439 $as_executable_p "$ac_dir/$ac_word" || continue 3295 3440 ac_cv_prog_MAKE_UPPER_TAGS="yes" 3296 3441 -echo "$as_me:3536: found $ac_dir/$ac_word" >&5 3297 +echo "$as_me:368 1: found $ac_dir/$ac_word" >&53442 +echo "$as_me:3682: found $ac_dir/$ac_word" >&5 3298 3443 break 3299 3444 done 3300 3445 3301 @@ -3542,10 +368 7,10 @@3446 @@ -3542,10 +3688,10 @@ 3302 3447 fi 3303 3448 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS 3304 3449 if test -n "$MAKE_UPPER_TAGS"; then 3305 3450 - echo "$as_me:3545: result: $MAKE_UPPER_TAGS" >&5 3306 + echo "$as_me:369 0: result: $MAKE_UPPER_TAGS" >&53451 + echo "$as_me:3691: result: $MAKE_UPPER_TAGS" >&5 3307 3452 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 3308 3453 else 3309 3454 - echo "$as_me:3548: result: no" >&5 3310 + echo "$as_me:369 3: result: no" >&53455 + echo "$as_me:3694: result: no" >&5 3311 3456 echo "${ECHO_T}no" >&6 3312 3457 fi 3313 3458 3314 @@ -3565,7 +371 0,7 @@3459 @@ -3565,7 +3711,7 @@ 3315 3460 MAKE_LOWER_TAGS="#" 3316 3461 fi 3317 3462 3318 3463 -echo "$as_me:3568: checking for makeflags variable" >&5 3319 +echo "$as_me:371 3: checking for makeflags variable" >&53464 +echo "$as_me:3714: checking for makeflags variable" >&5 3320 3465 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 3321 3466 if test "${cf_cv_makeflags+set}" = set; then 3322 3467 echo $ECHO_N "(cached) $ECHO_C" >&6 3323 @@ -3599,13 +374 4,13 @@3468 @@ -3599,13 +3745,13 @@ 3324 3469 rm -f cf_makeflags.tmp 3325 3470 3326 3471 fi 3327 3472 -echo "$as_me:3602: result: $cf_cv_makeflags" >&5 3328 +echo "$as_me:374 7: result: $cf_cv_makeflags" >&53473 +echo "$as_me:3748: result: $cf_cv_makeflags" >&5 3329 3474 echo "${ECHO_T}$cf_cv_makeflags" >&6 3330 3475 … … 3333 3478 set dummy ${ac_tool_prefix}ranlib; ac_word=$2 3334 3479 -echo "$as_me:3608: checking for $ac_word" >&5 3335 +echo "$as_me:375 3: checking for $ac_word" >&53480 +echo "$as_me:3754: checking for $ac_word" >&5 3336 3481 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3337 3482 if test "${ac_cv_prog_RANLIB+set}" = set; then 3338 3483 echo $ECHO_N "(cached) $ECHO_C" >&6 3339 @@ -3620,7 +376 5,7 @@3484 @@ -3620,7 +3766,7 @@ 3340 3485 test -z "$ac_dir" && ac_dir=. 3341 3486 $as_executable_p "$ac_dir/$ac_word" || continue 3342 3487 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" 3343 3488 -echo "$as_me:3623: found $ac_dir/$ac_word" >&5 3344 +echo "$as_me:376 8: found $ac_dir/$ac_word" >&53489 +echo "$as_me:3769: found $ac_dir/$ac_word" >&5 3345 3490 break 3346 3491 done 3347 3492 3348 @@ -3628,10 +377 3,10 @@3493 @@ -3628,10 +3774,10 @@ 3349 3494 fi 3350 3495 RANLIB=$ac_cv_prog_RANLIB 3351 3496 if test -n "$RANLIB"; then 3352 3497 - echo "$as_me:3631: result: $RANLIB" >&5 3353 + echo "$as_me:377 6: result: $RANLIB" >&53498 + echo "$as_me:3777: result: $RANLIB" >&5 3354 3499 echo "${ECHO_T}$RANLIB" >&6 3355 3500 else 3356 3501 - echo "$as_me:3634: result: no" >&5 3357 + echo "$as_me:37 79: result: no" >&53502 + echo "$as_me:3780: result: no" >&5 3358 3503 echo "${ECHO_T}no" >&6 3359 3504 fi 3360 3505 3361 @@ -3640,7 +378 5,7 @@3506 @@ -3640,7 +3786,7 @@ 3362 3507 ac_ct_RANLIB=$RANLIB 3363 3508 # Extract the first word of "ranlib", so it can be a program name with args. 3364 3509 set dummy ranlib; ac_word=$2 3365 3510 -echo "$as_me:3643: checking for $ac_word" >&5 3366 +echo "$as_me:378 8: checking for $ac_word" >&53511 +echo "$as_me:3789: checking for $ac_word" >&5 3367 3512 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3368 3513 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then 3369 3514 echo $ECHO_N "(cached) $ECHO_C" >&6 3370 @@ -3655,7 +380 0,7 @@3515 @@ -3655,7 +3801,7 @@ 3371 3516 test -z "$ac_dir" && ac_dir=. 3372 3517 $as_executable_p "$ac_dir/$ac_word" || continue 3373 3518 ac_cv_prog_ac_ct_RANLIB="ranlib" 3374 3519 -echo "$as_me:3658: found $ac_dir/$ac_word" >&5 3375 +echo "$as_me:380 3: found $ac_dir/$ac_word" >&53520 +echo "$as_me:3804: found $ac_dir/$ac_word" >&5 3376 3521 break 3377 3522 done 3378 3523 3379 @@ -3664,10 +38 09,10 @@3524 @@ -3664,10 +3810,10 @@ 3380 3525 fi 3381 3526 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB 3382 3527 if test -n "$ac_ct_RANLIB"; then 3383 3528 - echo "$as_me:3667: result: $ac_ct_RANLIB" >&5 3384 + echo "$as_me:381 2: result: $ac_ct_RANLIB" >&53529 + echo "$as_me:3813: result: $ac_ct_RANLIB" >&5 3385 3530 echo "${ECHO_T}$ac_ct_RANLIB" >&6 3386 3531 else 3387 3532 - echo "$as_me:3670: result: no" >&5 3388 + echo "$as_me:381 5: result: no" >&53533 + echo "$as_me:3816: result: no" >&5 3389 3534 echo "${ECHO_T}no" >&6 3390 3535 fi 3391 3536 3392 @@ -3679,7 +382 4,7 @@3537 @@ -3679,7 +3825,7 @@ 3393 3538 if test -n "$ac_tool_prefix"; then 3394 3539 # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. 3395 3540 set dummy ${ac_tool_prefix}ld; ac_word=$2 3396 3541 -echo "$as_me:3682: checking for $ac_word" >&5 3397 +echo "$as_me:382 7: checking for $ac_word" >&53542 +echo "$as_me:3828: checking for $ac_word" >&5 3398 3543 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3399 3544 if test "${ac_cv_prog_LD+set}" = set; then 3400 3545 echo $ECHO_N "(cached) $ECHO_C" >&6 3401 @@ -3694,7 +38 39,7 @@3546 @@ -3694,7 +3840,7 @@ 3402 3547 test -z "$ac_dir" && ac_dir=. 3403 3548 $as_executable_p "$ac_dir/$ac_word" || continue 3404 3549 ac_cv_prog_LD="${ac_tool_prefix}ld" 3405 3550 -echo "$as_me:3697: found $ac_dir/$ac_word" >&5 3406 +echo "$as_me:384 2: found $ac_dir/$ac_word" >&53551 +echo "$as_me:3843: found $ac_dir/$ac_word" >&5 3407 3552 break 3408 3553 done 3409 3554 3410 @@ -3702,10 +384 7,10 @@3555 @@ -3702,10 +3848,10 @@ 3411 3556 fi 3412 3557 LD=$ac_cv_prog_LD 3413 3558 if test -n "$LD"; then 3414 3559 - echo "$as_me:3705: result: $LD" >&5 3415 + echo "$as_me:385 0: result: $LD" >&53560 + echo "$as_me:3851: result: $LD" >&5 3416 3561 echo "${ECHO_T}$LD" >&6 3417 3562 else 3418 3563 - echo "$as_me:3708: result: no" >&5 3419 + echo "$as_me:385 3: result: no" >&53564 + echo "$as_me:3854: result: no" >&5 3420 3565 echo "${ECHO_T}no" >&6 3421 3566 fi 3422 3567 3423 @@ -3714,7 +38 59,7 @@3568 @@ -3714,7 +3860,7 @@ 3424 3569 ac_ct_LD=$LD 3425 3570 # Extract the first word of "ld", so it can be a program name with args. 3426 3571 set dummy ld; ac_word=$2 3427 3572 -echo "$as_me:3717: checking for $ac_word" >&5 3428 +echo "$as_me:386 2: checking for $ac_word" >&53573 +echo "$as_me:3863: checking for $ac_word" >&5 3429 3574 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3430 3575 if test "${ac_cv_prog_ac_ct_LD+set}" = set; then 3431 3576 echo $ECHO_N "(cached) $ECHO_C" >&6 3432 @@ -3729,7 +387 4,7 @@3577 @@ -3729,7 +3875,7 @@ 3433 3578 test -z "$ac_dir" && ac_dir=. 3434 3579 $as_executable_p "$ac_dir/$ac_word" || continue 3435 3580 ac_cv_prog_ac_ct_LD="ld" 3436 3581 -echo "$as_me:3732: found $ac_dir/$ac_word" >&5 3437 +echo "$as_me:387 7: found $ac_dir/$ac_word" >&53582 +echo "$as_me:3878: found $ac_dir/$ac_word" >&5 3438 3583 break 3439 3584 done 3440 3585 3441 @@ -3738,10 +388 3,10 @@3586 @@ -3738,10 +3884,10 @@ 3442 3587 fi 3443 3588 ac_ct_LD=$ac_cv_prog_ac_ct_LD 3444 3589 if test -n "$ac_ct_LD"; then 3445 3590 - echo "$as_me:3741: result: $ac_ct_LD" >&5 3446 + echo "$as_me:388 6: result: $ac_ct_LD" >&53591 + echo "$as_me:3887: result: $ac_ct_LD" >&5 3447 3592 echo "${ECHO_T}$ac_ct_LD" >&6 3448 3593 else 3449 3594 - echo "$as_me:3744: result: no" >&5 3450 + echo "$as_me:38 89: result: no" >&53595 + echo "$as_me:3890: result: no" >&5 3451 3596 echo "${ECHO_T}no" >&6 3452 3597 fi 3453 3598 3454 @@ -3753,7 +389 8,7 @@3599 @@ -3753,7 +3899,7 @@ 3455 3600 if test -n "$ac_tool_prefix"; then 3456 3601 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 3457 3602 set dummy ${ac_tool_prefix}ar; ac_word=$2 3458 3603 -echo "$as_me:3756: checking for $ac_word" >&5 3459 +echo "$as_me:390 1: checking for $ac_word" >&53604 +echo "$as_me:3902: checking for $ac_word" >&5 3460 3605 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3461 3606 if test "${ac_cv_prog_AR+set}" = set; then 3462 3607 echo $ECHO_N "(cached) $ECHO_C" >&6 3463 @@ -3768,7 +391 3,7 @@3608 @@ -3768,7 +3914,7 @@ 3464 3609 test -z "$ac_dir" && ac_dir=. 3465 3610 $as_executable_p "$ac_dir/$ac_word" || continue 3466 3611 ac_cv_prog_AR="${ac_tool_prefix}ar" 3467 3612 -echo "$as_me:3771: found $ac_dir/$ac_word" >&5 3468 +echo "$as_me:391 6: found $ac_dir/$ac_word" >&53613 +echo "$as_me:3917: found $ac_dir/$ac_word" >&5 3469 3614 break 3470 3615 done 3471 3616 3472 @@ -3776,10 +392 1,10 @@3617 @@ -3776,10 +3922,10 @@ 3473 3618 fi 3474 3619 AR=$ac_cv_prog_AR 3475 3620 if test -n "$AR"; then 3476 3621 - echo "$as_me:3779: result: $AR" >&5 3477 + echo "$as_me:392 4: result: $AR" >&53622 + echo "$as_me:3925: result: $AR" >&5 3478 3623 echo "${ECHO_T}$AR" >&6 3479 3624 else 3480 3625 - echo "$as_me:3782: result: no" >&5 3481 + echo "$as_me:392 7: result: no" >&53626 + echo "$as_me:3928: result: no" >&5 3482 3627 echo "${ECHO_T}no" >&6 3483 3628 fi 3484 3629 3485 @@ -3788,7 +393 3,7 @@3630 @@ -3788,7 +3934,7 @@ 3486 3631 ac_ct_AR=$AR 3487 3632 # Extract the first word of "ar", so it can be a program name with args. 3488 3633 set dummy ar; ac_word=$2 3489 3634 -echo "$as_me:3791: checking for $ac_word" >&5 3490 +echo "$as_me:393 6: checking for $ac_word" >&53635 +echo "$as_me:3937: checking for $ac_word" >&5 3491 3636 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3492 3637 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then 3493 3638 echo $ECHO_N "(cached) $ECHO_C" >&6 3494 @@ -3803,7 +394 8,7 @@3639 @@ -3803,7 +3949,7 @@ 3495 3640 test -z "$ac_dir" && ac_dir=. 3496 3641 $as_executable_p "$ac_dir/$ac_word" || continue 3497 3642 ac_cv_prog_ac_ct_AR="ar" 3498 3643 -echo "$as_me:3806: found $ac_dir/$ac_word" >&5 3499 +echo "$as_me:395 1: found $ac_dir/$ac_word" >&53644 +echo "$as_me:3952: found $ac_dir/$ac_word" >&5 3500 3645 break 3501 3646 done 3502 3647 3503 @@ -3812,10 +395 7,10 @@3648 @@ -3812,10 +3958,10 @@ 3504 3649 fi 3505 3650 ac_ct_AR=$ac_cv_prog_ac_ct_AR 3506 3651 if test -n "$ac_ct_AR"; then 3507 3652 - echo "$as_me:3815: result: $ac_ct_AR" >&5 3508 + echo "$as_me:396 0: result: $ac_ct_AR" >&53653 + echo "$as_me:3961: result: $ac_ct_AR" >&5 3509 3654 echo "${ECHO_T}$ac_ct_AR" >&6 3510 3655 else 3511 3656 - echo "$as_me:3818: result: no" >&5 3512 + echo "$as_me:396 3: result: no" >&53657 + echo "$as_me:3964: result: no" >&5 3513 3658 echo "${ECHO_T}no" >&6 3514 3659 fi 3515 3660 3516 @@ -3824,25 +39 69,123 @@3661 @@ -3824,25 +3970,123 @@ 3517 3662 AR="$ac_cv_prog_AR" 3518 3663 fi … … 3522 3667 + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 3523 3668 +set dummy ${ac_tool_prefix}ar; ac_word=$2 3524 +echo "$as_me:397 5: checking for $ac_word" >&53669 +echo "$as_me:3976: checking for $ac_word" >&5 3525 3670 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3526 3671 +if test "${ac_cv_prog_AR+set}" = set; then … … 3537 3682 + $as_executable_p "$ac_dir/$ac_word" || continue 3538 3683 +ac_cv_prog_AR="${ac_tool_prefix}ar" 3539 +echo "$as_me:399 0: found $ac_dir/$ac_word" >&53684 +echo "$as_me:3991: found $ac_dir/$ac_word" >&5 3540 3685 +break 3541 3686 +done … … 3547 3692 +AR=$ac_cv_prog_AR 3548 3693 +if test -n "$AR"; then 3549 + echo "$as_me:399 8: result: $AR" >&53694 + echo "$as_me:3999: result: $AR" >&5 3550 3695 +echo "${ECHO_T}$AR" >&6 3551 3696 +else 3552 + echo "$as_me:400 1: result: no" >&53697 + echo "$as_me:4002: result: no" >&5 3553 3698 +echo "${ECHO_T}no" >&6 3554 3699 +fi … … 3561 3706 + # Extract the first word of "ar", so it can be a program name with args. 3562 3707 +set dummy ar; ac_word=$2 3563 +echo "$as_me:401 0: checking for $ac_word" >&53708 +echo "$as_me:4011: checking for $ac_word" >&5 3564 3709 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3565 3710 +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then … … 3576 3721 + $as_executable_p "$ac_dir/$ac_word" || continue 3577 3722 +ac_cv_prog_ac_ct_AR="ar" 3578 +echo "$as_me:402 5: found $ac_dir/$ac_word" >&53723 +echo "$as_me:4026: found $ac_dir/$ac_word" >&5 3579 3724 +break 3580 3725 +done … … 3585 3730 +ac_ct_AR=$ac_cv_prog_ac_ct_AR 3586 3731 +if test -n "$ac_ct_AR"; then 3587 + echo "$as_me:403 4: result: $ac_ct_AR" >&53732 + echo "$as_me:4035: result: $ac_ct_AR" >&5 3588 3733 +echo "${ECHO_T}$ac_ct_AR" >&6 3589 3734 +else 3590 + echo "$as_me:403 7: result: no" >&53735 + echo "$as_me:4038: result: no" >&5 3591 3736 +echo "${ECHO_T}no" >&6 3592 3737 +fi … … 3597 3742 +fi 3598 3743 + 3599 +echo "$as_me:404 6: checking for options to update archives" >&53744 +echo "$as_me:4047: checking for options to update archives" >&5 3600 3745 +echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 3601 3746 +if test "${cf_cv_ar_flags+set}" = set; then 3602 3747 + echo $ECHO_N "(cached) $ECHO_C" >&6 3603 3748 +else 3604 + 3749 3750 -cf_cv_subst_AR_OPTS=$AR_OPTS 3751 -echo "$as_me:3840: result: $AR_OPTS" >&5 3752 -echo "${ECHO_T}$AR_OPTS" >&6 3605 3753 + cf_cv_ar_flags=unknown 3606 3754 + for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv … … 3610 3758 + 3611 3759 + cat >conftest.$ac_ext <<EOF 3612 +#line 40 59"configure"3760 +#line 4060 "configure" 3613 3761 +int testdata[3] = { 123, 456, 789 }; 3614 3762 +EOF 3615 + if { (eval echo "$as_me:406 2: \"$ac_compile\"") >&53763 + if { (eval echo "$as_me:4063: \"$ac_compile\"") >&5 3616 3764 + (eval $ac_compile) 2>&5 3617 3765 + ac_status=$? 3618 + echo "$as_me:406 5: \$? = $ac_status" >&53766 + echo "$as_me:4066: \$? = $ac_status" >&5 3619 3767 + (exit $ac_status); } ; then 3620 3768 + $AR $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null … … 3625 3773 + else 3626 3774 + test -n "$verbose" && echo " cannot compile test-program" 1>&6 3627 3628 -cf_cv_subst_AR_OPTS=$AR_OPTS 3629 -echo "$as_me:3840: result: $AR_OPTS" >&5 3630 -echo "${ECHO_T}$AR_OPTS" >&6 3631 +echo "${as_me-configure}:4075: testing cannot compile test-program ..." 1>&5 3775 + 3776 +echo "${as_me-configure}:4076: testing cannot compile test-program ..." 1>&5 3632 3777 + 3633 3778 + break … … 3637 3782 3638 3783 fi 3639 +echo "$as_me:408 3: result: $cf_cv_ar_flags" >&53784 +echo "$as_me:4084: result: $cf_cv_ar_flags" >&5 3640 3785 +echo "${ECHO_T}$cf_cv_ar_flags" >&6 3786 +test -z "$ARFLAGS" && ARFLAGS=$cf_cv_ar_flags 3787 +ARFLAGS=$cf_cv_ar_flags 3641 3788 3642 3789 -echo "$as_me:3845: checking if you have specified an install-prefix" >&5 3643 +ARFLAGS=$cf_cv_ar_flags 3644 + 3645 +echo "$as_me:4088: checking if you have specified an install-prefix" >&5 3790 +echo "$as_me:4089: checking if you have specified an install-prefix" >&5 3646 3791 echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6 3647 3792 3648 3793 # Check whether --with-install-prefix or --without-install-prefix was given. 3649 @@ -3855,7 +409 8,7 @@3794 @@ -3855,7 +4099,7 @@ 3650 3795 ;; 3651 3796 esac 3652 3797 fi; 3653 3798 -echo "$as_me:3858: result: $DESTDIR" >&5 3654 +echo "$as_me:410 1: result: $DESTDIR" >&53799 +echo "$as_me:4102: result: $DESTDIR" >&5 3655 3800 echo "${ECHO_T}$DESTDIR" >&6 3656 3801 3657 3802 ############################################################################### 3658 @@ -3883,7 +412 6,7 @@3803 @@ -3883,7 +4127,7 @@ 3659 3804 do 3660 3805 # Extract the first word of "$ac_prog", so it can be a program name with args. 3661 3806 set dummy $ac_prog; ac_word=$2 3662 3807 -echo "$as_me:3886: checking for $ac_word" >&5 3663 +echo "$as_me:41 29: checking for $ac_word" >&53808 +echo "$as_me:4130: checking for $ac_word" >&5 3664 3809 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3665 3810 if test "${ac_cv_prog_BUILD_CC+set}" = set; then 3666 3811 echo $ECHO_N "(cached) $ECHO_C" >&6 3667 @@ -3898,7 +414 1,7 @@3812 @@ -3898,7 +4142,7 @@ 3668 3813 test -z "$ac_dir" && ac_dir=. 3669 3814 $as_executable_p "$ac_dir/$ac_word" || continue 3670 3815 ac_cv_prog_BUILD_CC="$ac_prog" 3671 3816 -echo "$as_me:3901: found $ac_dir/$ac_word" >&5 3672 +echo "$as_me:414 4: found $ac_dir/$ac_word" >&53817 +echo "$as_me:4145: found $ac_dir/$ac_word" >&5 3673 3818 break 3674 3819 done 3675 3820 3676 @@ -3906,10 +41 49,10 @@3821 @@ -3906,10 +4150,10 @@ 3677 3822 fi 3678 3823 BUILD_CC=$ac_cv_prog_BUILD_CC 3679 3824 if test -n "$BUILD_CC"; then 3680 3825 - echo "$as_me:3909: result: $BUILD_CC" >&5 3681 + echo "$as_me:415 2: result: $BUILD_CC" >&53826 + echo "$as_me:4153: result: $BUILD_CC" >&5 3682 3827 echo "${ECHO_T}$BUILD_CC" >&6 3683 3828 else 3684 3829 - echo "$as_me:3912: result: no" >&5 3685 + echo "$as_me:415 5: result: no" >&53830 + echo "$as_me:4156: result: no" >&5 3686 3831 echo "${ECHO_T}no" >&6 3687 3832 fi 3688 3833 3689 @@ -3917,12 +416 0,12 @@3834 @@ -3917,12 +4161,12 @@ 3690 3835 done 3691 3836 3692 3837 fi; 3693 3838 - echo "$as_me:3920: checking for native build C compiler" >&5 3694 + echo "$as_me:416 3: checking for native build C compiler" >&53839 + echo "$as_me:4164: checking for native build C compiler" >&5 3695 3840 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 3696 3841 - echo "$as_me:3922: result: $BUILD_CC" >&5 3697 + echo "$as_me:416 5: result: $BUILD_CC" >&53842 + echo "$as_me:4166: result: $BUILD_CC" >&5 3698 3843 echo "${ECHO_T}$BUILD_CC" >&6 3699 3844 3700 3845 - echo "$as_me:3925: checking for native build C preprocessor" >&5 3701 + echo "$as_me:416 8: checking for native build C preprocessor" >&53846 + echo "$as_me:4169: checking for native build C preprocessor" >&5 3702 3847 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6 3703 3848 3704 3849 # Check whether --with-build-cpp or --without-build-cpp was given. 3705 @@ -3932,10 +417 5,10 @@3850 @@ -3932,10 +4176,10 @@ 3706 3851 else 3707 3852 BUILD_CPP='${BUILD_CC} -E' 3708 3853 fi; 3709 3854 - echo "$as_me:3935: result: $BUILD_CPP" >&5 3710 + echo "$as_me:417 8: result: $BUILD_CPP" >&53855 + echo "$as_me:4179: result: $BUILD_CPP" >&5 3711 3856 echo "${ECHO_T}$BUILD_CPP" >&6 3712 3857 3713 3858 - echo "$as_me:3938: checking for native build C flags" >&5 3714 + echo "$as_me:418 1: checking for native build C flags" >&53859 + echo "$as_me:4182: checking for native build C flags" >&5 3715 3860 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6 3716 3861 3717 3862 # Check whether --with-build-cflags or --without-build-cflags was given. 3718 @@ -3943,10 +418 6,10 @@3863 @@ -3943,10 +4187,10 @@ 3719 3864 withval="$with_build_cflags" 3720 3865 BUILD_CFLAGS="$withval" 3721 3866 fi; 3722 3867 - echo "$as_me:3946: result: $BUILD_CFLAGS" >&5 3723 + echo "$as_me:41 89: result: $BUILD_CFLAGS" >&53868 + echo "$as_me:4190: result: $BUILD_CFLAGS" >&5 3724 3869 echo "${ECHO_T}$BUILD_CFLAGS" >&6 3725 3870 3726 3871 - echo "$as_me:3949: checking for native build C preprocessor-flags" >&5 3727 + 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 3728 3873 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6 3729 3874 3730 3875 # Check whether --with-build-cppflags or --without-build-cppflags was given. 3731 @@ -3954,10 +419 7,10 @@3876 @@ -3954,10 +4198,10 @@ 3732 3877 withval="$with_build_cppflags" 3733 3878 BUILD_CPPFLAGS="$withval" 3734 3879 fi; 3735 3880 - echo "$as_me:3957: result: $BUILD_CPPFLAGS" >&5 3736 + echo "$as_me:420 0: result: $BUILD_CPPFLAGS" >&53881 + echo "$as_me:4201: result: $BUILD_CPPFLAGS" >&5 3737 3882 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 3738 3883 3739 3884 - echo "$as_me:3960: checking for native build linker-flags" >&5 3740 + echo "$as_me:420 3: checking for native build linker-flags" >&53885 + echo "$as_me:4204: checking for native build linker-flags" >&5 3741 3886 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6 3742 3887 3743 3888 # Check whether --with-build-ldflags or --without-build-ldflags was given. 3744 @@ -3965,10 +420 8,10 @@3889 @@ -3965,10 +4209,10 @@ 3745 3890 withval="$with_build_ldflags" 3746 3891 BUILD_LDFLAGS="$withval" 3747 3892 fi; 3748 3893 - echo "$as_me:3968: result: $BUILD_LDFLAGS" >&5 3749 + echo "$as_me:421 1: result: $BUILD_LDFLAGS" >&53894 + echo "$as_me:4212: result: $BUILD_LDFLAGS" >&5 3750 3895 echo "${ECHO_T}$BUILD_LDFLAGS" >&6 3751 3896 3752 3897 - echo "$as_me:3971: checking for native build linker-libraries" >&5 3753 + echo "$as_me:421 4: checking for native build linker-libraries" >&53898 + echo "$as_me:4215: checking for native build linker-libraries" >&5 3754 3899 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6 3755 3900 3756 3901 # Check whether --with-build-libs or --without-build-libs was given. 3757 @@ -3976,7 +42 19,7 @@3902 @@ -3976,7 +4220,7 @@ 3758 3903 withval="$with_build_libs" 3759 3904 BUILD_LIBS="$withval" 3760 3905 fi; 3761 3906 - echo "$as_me:3979: result: $BUILD_LIBS" >&5 3762 + echo "$as_me:422 2: result: $BUILD_LIBS" >&53907 + echo "$as_me:4223: result: $BUILD_LIBS" >&5 3763 3908 echo "${ECHO_T}$BUILD_LIBS" >&6 3764 3909 3765 3910 # this assumes we're on Unix. 3766 @@ -3986,7 +42 29,7 @@3911 @@ -3986,7 +4230,7 @@ 3767 3912 : ${BUILD_CC:='${CC}'} 3768 3913 3769 3914 if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then 3770 3915 - { { echo "$as_me:3989: error: Cross-build requires two compilers. 3771 + { { echo "$as_me:423 2: error: Cross-build requires two compilers.3916 + { { echo "$as_me:4233: error: Cross-build requires two compilers. 3772 3917 Use --with-build-cc to specify the native compiler." >&5 3773 3918 echo "$as_me: error: Cross-build requires two compilers. 3774 3919 Use --with-build-cc to specify the native compiler." >&2;} 3775 @@ -4027,7 +427 0,7 @@3920 @@ -4027,7 +4271,7 @@ 3776 3921 LIB_INSTALL= 3777 3922 LIB_UNINSTALL= 3778 3923 3779 3924 -echo "$as_me:4030: checking if you want to build libraries with libtool" >&5 3780 +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 3781 3926 echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6 3782 3927 3783 3928 # Check whether --with-libtool or --without-libtool was given. 3784 @@ -4037,11 +428 0,11 @@3929 @@ -4037,11 +4281,11 @@ 3785 3930 else 3786 3931 with_libtool=no 3787 3932 fi; 3788 3933 -echo "$as_me:4040: result: $with_libtool" >&5 3789 +echo "$as_me:428 3: result: $with_libtool" >&53934 +echo "$as_me:4284: result: $with_libtool" >&5 3790 3935 echo "${ECHO_T}$with_libtool" >&6 3791 3936 if test "$with_libtool" != "no"; then … … 3796 3941 if test "x$prefix" != xNONE; then 3797 3942 cf_path_syntax="$prefix" 3798 @@ -4068,7 +431 1,7 @@3943 @@ -4068,7 +4312,7 @@ 3799 3944 with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%` 3800 3945 ;; 3801 3946 *) 3802 3947 - { { echo "$as_me:4071: error: expected a pathname, not \"$with_libtool\"" >&5 3803 + { { 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 3804 3949 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;} 3805 3950 { (exit 1); exit 1; }; } 3806 3951 ;; 3807 @@ -4076,9 +43 19,9 @@3952 @@ -4076,9 +4320,9 @@ 3808 3953 3809 3954 LIBTOOL=$with_libtool … … 3813 3958 set dummy libtool; ac_word=$2 3814 3959 -echo "$as_me:4081: checking for $ac_word" >&5 3815 +echo "$as_me:432 4: checking for $ac_word" >&53960 +echo "$as_me:4325: checking for $ac_word" >&5 3816 3961 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3817 3962 if test "${ac_cv_path_LIBTOOL+set}" = set; then 3818 3963 echo $ECHO_N "(cached) $ECHO_C" >&6 3819 @@ -4095,7 +433 8,7 @@3964 @@ -4095,7 +4339,7 @@ 3820 3965 test -z "$ac_dir" && ac_dir=. 3821 3966 if $as_executable_p "$ac_dir/$ac_word"; then 3822 3967 ac_cv_path_LIBTOOL="$ac_dir/$ac_word" 3823 3968 - echo "$as_me:4098: found $ac_dir/$ac_word" >&5 3824 + echo "$as_me:434 1: found $ac_dir/$ac_word" >&53969 + echo "$as_me:4342: found $ac_dir/$ac_word" >&5 3825 3970 break 3826 3971 fi 3827 3972 done 3828 @@ -4106,19 +43 49,19 @@3973 @@ -4106,19 +4350,19 @@ 3829 3974 LIBTOOL=$ac_cv_path_LIBTOOL 3830 3975 3831 3976 if test -n "$LIBTOOL"; then 3832 3977 - echo "$as_me:4109: result: $LIBTOOL" >&5 3833 + echo "$as_me:435 2: result: $LIBTOOL" >&53978 + echo "$as_me:4353: result: $LIBTOOL" >&5 3834 3979 echo "${ECHO_T}$LIBTOOL" >&6 3835 3980 else 3836 3981 - echo "$as_me:4112: result: no" >&5 3837 + echo "$as_me:435 5: result: no" >&53982 + echo "$as_me:4356: result: no" >&5 3838 3983 echo "${ECHO_T}no" >&6 3839 3984 fi … … 3844 3989 + fi 3845 3990 + if test -z "$LIBTOOL" ; then 3846 + { { echo "$as_me:436 1: error: Cannot find libtool" >&53991 + { { echo "$as_me:4362: error: Cannot find libtool" >&5 3847 3992 echo "$as_me: error: Cannot find libtool" >&2;} 3848 3993 { (exit 1); exit 1; }; } … … 3852 3997 LIB_OBJECT='${OBJECTS:.o=.lo}' 3853 3998 LIB_SUFFIX=.la 3854 @@ -4130,17 +437 3,17 @@3999 @@ -4130,17 +4374,17 @@ 3855 4000 LIB_PREP=: 3856 4001 3857 4002 # Show the version of libtool 3858 4003 - echo "$as_me:4133: checking version of libtool" >&5 3859 + echo "$as_me:437 6: checking version of libtool" >&54004 + echo "$as_me:4377: checking version of libtool" >&5 3860 4005 echo $ECHO_N "checking version of libtool... $ECHO_C" >&6 3861 4006 … … 3865 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.].*//'` 3866 4011 - echo "$as_me:4140: result: $cf_cv_libtool_version" >&5 3867 + echo "$as_me:438 3: result: $cf_cv_libtool_version" >&54012 + echo "$as_me:4384: result: $cf_cv_libtool_version" >&5 3868 4013 echo "${ECHO_T}$cf_cv_libtool_version" >&6 3869 4014 if test -z "$cf_cv_libtool_version" ; then 3870 4015 - { { echo "$as_me:4143: error: This is not GNU libtool" >&5 3871 + { { echo "$as_me:438 6: error: This is not GNU libtool" >&54016 + { { echo "$as_me:4387: error: This is not GNU libtool" >&5 3872 4017 echo "$as_me: error: This is not GNU libtool" >&2;} 3873 4018 { (exit 1); exit 1; }; } 3874 4019 fi 3875 @@ -4168,7 +441 1,7 @@4020 @@ -4168,7 +4412,7 @@ 3876 4021 3877 4022 else 3878 4023 3879 4024 -echo "$as_me:4171: checking if you want to build shared libraries" >&5 3880 +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 3881 4026 echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6 3882 4027 3883 4028 # Check whether --with-shared or --without-shared was given. 3884 @@ -4178,11 +442 1,11 @@4029 @@ -4178,11 +4422,11 @@ 3885 4030 else 3886 4031 with_shared=no 3887 4032 fi; 3888 4033 -echo "$as_me:4181: result: $with_shared" >&5 3889 +echo "$as_me:442 4: result: $with_shared" >&54034 +echo "$as_me:4425: result: $with_shared" >&5 3890 4035 echo "${ECHO_T}$with_shared" >&6 3891 4036 test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared" 3892 4037 3893 4038 -echo "$as_me:4185: checking if you want to build static libraries" >&5 3894 +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 3895 4040 echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6 3896 4041 3897 4042 # Check whether --with-normal or --without-normal was given. 3898 @@ -4192,11 +443 5,11 @@4043 @@ -4192,11 +4436,11 @@ 3899 4044 else 3900 4045 with_normal=yes 3901 4046 fi; 3902 4047 -echo "$as_me:4195: result: $with_normal" >&5 3903 +echo "$as_me:443 8: result: $with_normal" >&54048 +echo "$as_me:4439: result: $with_normal" >&5 3904 4049 echo "${ECHO_T}$with_normal" >&6 3905 4050 test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal" 3906 4051 3907 4052 -echo "$as_me:4199: checking if you want to build debug libraries" >&5 3908 +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 3909 4054 echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6 3910 4055 3911 4056 # Check whether --with-debug or --without-debug was given. 3912 @@ -4206,11 +44 49,11 @@4057 @@ -4206,11 +4450,11 @@ 3913 4058 else 3914 4059 with_debug=yes 3915 4060 fi; 3916 4061 -echo "$as_me:4209: result: $with_debug" >&5 3917 +echo "$as_me:445 2: result: $with_debug" >&54062 +echo "$as_me:4453: result: $with_debug" >&5 3918 4063 echo "${ECHO_T}$with_debug" >&6 3919 4064 test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug" 3920 4065 3921 4066 -echo "$as_me:4213: checking if you want to build profiling libraries" >&5 3922 +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 3923 4068 echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6 3924 4069 3925 4070 # Check whether --with-profile or --without-profile was given. 3926 @@ -4220,7 +446 3,7 @@4071 @@ -4220,7 +4464,7 @@ 3927 4072 else 3928 4073 with_profile=no 3929 4074 fi; 3930 4075 -echo "$as_me:4223: result: $with_profile" >&5 3931 +echo "$as_me:446 6: result: $with_profile" >&54076 +echo "$as_me:4467: result: $with_profile" >&5 3932 4077 echo "${ECHO_T}$with_profile" >&6 3933 4078 test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile" 3934 4079 3935 @@ -4228,19 +447 1,19 @@4080 @@ -4228,19 +4472,19 @@ 3936 4081 3937 4082 ############################################################################### 3938 4083 3939 4084 -echo "$as_me:4231: checking for specified models" >&5 3940 +echo "$as_me:447 4: checking for specified models" >&54085 +echo "$as_me:4475: checking for specified models" >&5 3941 4086 echo $ECHO_N "checking for specified models... $ECHO_C" >&6 3942 4087 test -z "$cf_list_models" && cf_list_models=normal 3943 4088 test "$with_libtool" != "no" && cf_list_models=libtool 3944 4089 -echo "$as_me:4235: result: $cf_list_models" >&5 3945 +echo "$as_me:447 8: result: $cf_list_models" >&54090 +echo "$as_me:4479: result: $cf_list_models" >&5 3946 4091 echo "${ECHO_T}$cf_list_models" >&6 3947 4092 … … 3949 4094 ### up test-applications. 3950 4095 -echo "$as_me:4240: checking for default model" >&5 3951 +echo "$as_me:448 3: checking for default model" >&54096 +echo "$as_me:4484: checking for default model" >&5 3952 4097 echo $ECHO_N "checking for default model... $ECHO_C" >&6 3953 4098 DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'` 3954 4099 -echo "$as_me:4243: result: $DFT_LWR_MODEL" >&5 3955 +echo "$as_me:448 6: result: $DFT_LWR_MODEL" >&54100 +echo "$as_me:4487: result: $DFT_LWR_MODEL" >&5 3956 4101 echo "${ECHO_T}$DFT_LWR_MODEL" >&6 3957 4102 3958 4103 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 3959 @@ -4269,7 +451 2,7 @@4104 @@ -4269,7 +4513,7 @@ 3960 4105 3961 4106 ############################################################################### 3962 4107 3963 4108 -echo "$as_me:4272: checking if you want to build a separate terminfo library" >&5 3964 +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 3965 4110 echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6 3966 4111 3967 4112 # Check whether --with-termlib or --without-termlib was given. 3968 @@ -4279,10 +452 2,10 @@4113 @@ -4279,10 +4523,10 @@ 3969 4114 else 3970 4115 with_termlib=no 3971 4116 fi; 3972 4117 -echo "$as_me:4282: result: $with_termlib" >&5 3973 +echo "$as_me:452 5: result: $with_termlib" >&54118 +echo "$as_me:4526: result: $with_termlib" >&5 3974 4119 echo "${ECHO_T}$with_termlib" >&6 3975 4120 3976 4121 -echo "$as_me:4285: checking if you want to build a separate tic library" >&5 3977 +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 3978 4123 echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6 3979 4124 3980 4125 # Check whether --with-ticlib or --without-ticlib was given. 3981 @@ -4292,13 +453 5,13 @@4126 @@ -4292,13 +4536,13 @@ 3982 4127 else 3983 4128 with_ticlib=no 3984 4129 fi; 3985 4130 -echo "$as_me:4295: result: $with_ticlib" >&5 3986 +echo "$as_me:453 8: result: $with_ticlib" >&54131 +echo "$as_me:4539: result: $with_ticlib" >&5 3987 4132 echo "${ECHO_T}$with_ticlib" >&6 3988 4133 … … 3991 4136 3992 4137 -echo "$as_me:4301: checking if you want to link with the GPM mouse library" >&5 3993 +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 3994 4139 echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6 3995 4140 3996 4141 # Check whether --with-gpm or --without-gpm was given. 3997 @@ -4308,27 +455 1,27 @@4142 @@ -4308,27 +4552,27 @@ 3998 4143 else 3999 4144 with_gpm=maybe 4000 4145 fi; 4001 4146 -echo "$as_me:4311: result: $with_gpm" >&5 4002 +echo "$as_me:455 4: result: $with_gpm" >&54147 +echo "$as_me:4555: result: $with_gpm" >&5 4003 4148 echo "${ECHO_T}$with_gpm" >&6 4004 4149 4005 4150 if test "$with_gpm" != no ; then 4006 4151 - echo "$as_me:4315: checking for gpm.h" >&5 4007 + echo "$as_me:455 8: checking for gpm.h" >&54152 + echo "$as_me:4559: checking for gpm.h" >&5 4008 4153 echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6 4009 4154 if test "${ac_cv_header_gpm_h+set}" = set; then … … 4012 4157 cat >conftest.$ac_ext <<_ACEOF 4013 4158 -#line 4321 "configure" 4014 +#line 456 4"configure"4159 +#line 4565 "configure" 4015 4160 #include "confdefs.h" 4016 4161 #include <gpm.h> 4017 4162 _ACEOF 4018 4163 -if { (eval echo "$as_me:4325: \"$ac_cpp conftest.$ac_ext\"") >&5 4019 +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 4020 4165 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 4021 4166 ac_status=$? … … 4024 4169 cat conftest.err >&5 4025 4170 - echo "$as_me:4331: \$? = $ac_status" >&5 4026 + echo "$as_me:457 4: \$? = $ac_status" >&54171 + echo "$as_me:4575: \$? = $ac_status" >&5 4027 4172 (exit $ac_status); } >/dev/null; then 4028 4173 if test -s conftest.err; then 4029 4174 ac_cpp_err=$ac_c_preproc_warn_flag 4030 @@ -4347,7 +459 0,7 @@4175 @@ -4347,7 +4591,7 @@ 4031 4176 fi 4032 4177 rm -f conftest.err conftest.$ac_ext 4033 4178 fi 4034 4179 -echo "$as_me:4350: result: $ac_cv_header_gpm_h" >&5 4035 +echo "$as_me:459 3: result: $ac_cv_header_gpm_h" >&54180 +echo "$as_me:4594: result: $ac_cv_header_gpm_h" >&5 4036 4181 echo "${ECHO_T}$ac_cv_header_gpm_h" >&6 4037 4182 if test $ac_cv_header_gpm_h = yes; then 4038 4183 4039 @@ -4358,14 +460 1,14 @@4184 @@ -4358,14 +4602,14 @@ 4040 4185 if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then 4041 4186 test -n "$verbose" && echo " assuming we really have GPM library" 1>&6 4042 4187 4043 4188 -echo "${as_me-configure}:4361: testing assuming we really have GPM library ..." 1>&5 4044 +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 4045 4190 4046 4191 cat >>confdefs.h <<\EOF … … 4050 4195 else 4051 4196 - echo "$as_me:4368: checking for Gpm_Open in -lgpm" >&5 4052 + echo "$as_me:461 1: checking for Gpm_Open in -lgpm" >&54197 + echo "$as_me:4612: checking for Gpm_Open in -lgpm" >&5 4053 4198 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 4054 4199 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then 4055 4200 echo $ECHO_N "(cached) $ECHO_C" >&6 4056 @@ -4373,7 +461 6,7 @@4201 @@ -4373,7 +4617,7 @@ 4057 4202 ac_check_lib_save_LIBS=$LIBS 4058 4203 LIBS="-lgpm $LIBS" 4059 4204 cat >conftest.$ac_ext <<_ACEOF 4060 4205 -#line 4376 "configure" 4061 +#line 46 19"configure"4206 +#line 4620 "configure" 4062 4207 #include "confdefs.h" 4063 4208 4064 4209 /* Override any gcc2 internal prototype to avoid an error. */ 4065 @@ -4392,16 +463 5,16 @@4210 @@ -4392,16 +4636,16 @@ 4066 4211 } 4067 4212 _ACEOF 4068 4213 rm -f conftest.$ac_objext conftest$ac_exeext 4069 4214 -if { (eval echo "$as_me:4395: \"$ac_link\"") >&5 4070 +if { (eval echo "$as_me:463 8: \"$ac_link\"") >&54215 +if { (eval echo "$as_me:4639: \"$ac_link\"") >&5 4071 4216 (eval $ac_link) 2>&5 4072 4217 ac_status=$? 4073 4218 - echo "$as_me:4398: \$? = $ac_status" >&5 4074 + echo "$as_me:464 1: \$? = $ac_status" >&54219 + echo "$as_me:4642: \$? = $ac_status" >&5 4075 4220 (exit $ac_status); } && 4076 4221 { ac_try='test -s conftest$ac_exeext' 4077 4222 - { (eval echo "$as_me:4401: \"$ac_try\"") >&5 4078 + { (eval echo "$as_me:464 4: \"$ac_try\"") >&54223 + { (eval echo "$as_me:4645: \"$ac_try\"") >&5 4079 4224 (eval $ac_try) 2>&5 4080 4225 ac_status=$? 4081 4226 - echo "$as_me:4404: \$? = $ac_status" >&5 4082 + echo "$as_me:464 7: \$? = $ac_status" >&54227 + echo "$as_me:4648: \$? = $ac_status" >&5 4083 4228 (exit $ac_status); }; }; then 4084 4229 ac_cv_lib_gpm_Gpm_Open=yes 4085 4230 else 4086 @@ -4412,13 +465 5,13 @@4231 @@ -4412,13 +4656,13 @@ 4087 4232 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4088 4233 LIBS=$ac_check_lib_save_LIBS 4089 4234 fi 4090 4235 -echo "$as_me:4415: result: $ac_cv_lib_gpm_Gpm_Open" >&5 4091 +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 4092 4237 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 4093 4238 if test $ac_cv_lib_gpm_Gpm_Open = yes; then … … 4096 4241 4097 4242 - { { echo "$as_me:4421: error: Cannot link with GPM library" >&5 4098 + { { echo "$as_me:466 4: error: Cannot link with GPM library" >&54243 + { { echo "$as_me:4665: error: Cannot link with GPM library" >&5 4099 4244 echo "$as_me: error: Cannot link with GPM library" >&2;} 4100 4245 { (exit 1); exit 1; }; } 4101 4246 fi 4102 @@ -4428,7 +467 1,7 @@4247 @@ -4428,7 +4672,7 @@ 4103 4248 4104 4249 else 4105 4250 4106 4251 - test "$with_gpm" != maybe && { echo "$as_me:4431: WARNING: Cannot find GPM header" >&5 4107 + 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 4108 4253 echo "$as_me: WARNING: Cannot find GPM header" >&2;} 4109 4254 with_gpm=no 4110 4255 4111 @@ -4437,7 +468 0,7 @@4256 @@ -4437,7 +4681,7 @@ 4112 4257 fi 4113 4258 4114 4259 if test "$with_gpm" != no ; then 4115 4260 - echo "$as_me:4440: checking if you want to load GPM dynamically" >&5 4116 + 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 4117 4262 echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6 4118 4263 4119 4264 # Check whether --with-dlsym or --without-dlsym was given. 4120 @@ -4447,18 +469 0,18 @@4265 @@ -4447,18 +4691,18 @@ 4121 4266 else 4122 4267 with_dlsym=yes 4123 4268 fi; 4124 4269 - echo "$as_me:4450: result: $with_dlsym" >&5 4125 + echo "$as_me:469 3: result: $with_dlsym" >&54270 + echo "$as_me:4694: result: $with_dlsym" >&5 4126 4271 echo "${ECHO_T}$with_dlsym" >&6 4127 4272 if test "$with_dlsym" = yes ; then … … 4129 4274 cf_have_dlsym=no 4130 4275 -echo "$as_me:4455: checking for dlsym" >&5 4131 +echo "$as_me:469 8: checking for dlsym" >&54276 +echo "$as_me:4699: checking for dlsym" >&5 4132 4277 echo $ECHO_N "checking for dlsym... $ECHO_C" >&6 4133 4278 if test "${ac_cv_func_dlsym+set}" = set; then … … 4136 4281 cat >conftest.$ac_ext <<_ACEOF 4137 4282 -#line 4461 "configure" 4138 +#line 470 4"configure"4283 +#line 4705 "configure" 4139 4284 #include "confdefs.h" 4140 4285 /* System header to define __stub macros and hopefully few prototypes, 4141 4286 which can conflict with char dlsym (); below. */ 4142 @@ -4489,16 +473 2,16 @@4287 @@ -4489,16 +4733,16 @@ 4143 4288 } 4144 4289 _ACEOF 4145 4290 rm -f conftest.$ac_objext conftest$ac_exeext 4146 4291 -if { (eval echo "$as_me:4492: \"$ac_link\"") >&5 4147 +if { (eval echo "$as_me:473 5: \"$ac_link\"") >&54292 +if { (eval echo "$as_me:4736: \"$ac_link\"") >&5 4148 4293 (eval $ac_link) 2>&5 4149 4294 ac_status=$? 4150 4295 - echo "$as_me:4495: \$? = $ac_status" >&5 4151 + echo "$as_me:473 8: \$? = $ac_status" >&54296 + echo "$as_me:4739: \$? = $ac_status" >&5 4152 4297 (exit $ac_status); } && 4153 4298 { ac_try='test -s conftest$ac_exeext' 4154 4299 - { (eval echo "$as_me:4498: \"$ac_try\"") >&5 4155 + { (eval echo "$as_me:474 1: \"$ac_try\"") >&54300 + { (eval echo "$as_me:4742: \"$ac_try\"") >&5 4156 4301 (eval $ac_try) 2>&5 4157 4302 ac_status=$? 4158 4303 - echo "$as_me:4501: \$? = $ac_status" >&5 4159 + echo "$as_me:474 4: \$? = $ac_status" >&54304 + echo "$as_me:4745: \$? = $ac_status" >&5 4160 4305 (exit $ac_status); }; }; then 4161 4306 ac_cv_func_dlsym=yes 4162 4307 else 4163 @@ -4508,14 +475 1,14 @@4308 @@ -4508,14 +4752,14 @@ 4164 4309 fi 4165 4310 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4166 4311 fi 4167 4312 -echo "$as_me:4511: result: $ac_cv_func_dlsym" >&5 4168 +echo "$as_me:475 4: result: $ac_cv_func_dlsym" >&54313 +echo "$as_me:4755: result: $ac_cv_func_dlsym" >&5 4169 4314 echo "${ECHO_T}$ac_cv_func_dlsym" >&6 4170 4315 if test $ac_cv_func_dlsym = yes; then … … 4174 4319 cf_have_libdl=no 4175 4320 -echo "$as_me:4518: checking for dlsym in -ldl" >&5 4176 +echo "$as_me:476 1: checking for dlsym in -ldl" >&54321 +echo "$as_me:4762: checking for dlsym in -ldl" >&5 4177 4322 echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6 4178 4323 if test "${ac_cv_lib_dl_dlsym+set}" = set; then 4179 4324 echo $ECHO_N "(cached) $ECHO_C" >&6 4180 @@ -4523,7 +476 6,7 @@4325 @@ -4523,7 +4767,7 @@ 4181 4326 ac_check_lib_save_LIBS=$LIBS 4182 4327 LIBS="-ldl $LIBS" 4183 4328 cat >conftest.$ac_ext <<_ACEOF 4184 4329 -#line 4526 "configure" 4185 +#line 47 69"configure"4330 +#line 4770 "configure" 4186 4331 #include "confdefs.h" 4187 4332 4188 4333 /* Override any gcc2 internal prototype to avoid an error. */ 4189 @@ -4542,16 +478 5,16 @@4334 @@ -4542,16 +4786,16 @@ 4190 4335 } 4191 4336 _ACEOF 4192 4337 rm -f conftest.$ac_objext conftest$ac_exeext 4193 4338 -if { (eval echo "$as_me:4545: \"$ac_link\"") >&5 4194 +if { (eval echo "$as_me:478 8: \"$ac_link\"") >&54339 +if { (eval echo "$as_me:4789: \"$ac_link\"") >&5 4195 4340 (eval $ac_link) 2>&5 4196 4341 ac_status=$? 4197 4342 - echo "$as_me:4548: \$? = $ac_status" >&5 4198 + echo "$as_me:479 1: \$? = $ac_status" >&54343 + echo "$as_me:4792: \$? = $ac_status" >&5 4199 4344 (exit $ac_status); } && 4200 4345 { ac_try='test -s conftest$ac_exeext' 4201 4346 - { (eval echo "$as_me:4551: \"$ac_try\"") >&5 4202 + { (eval echo "$as_me:479 4: \"$ac_try\"") >&54347 + { (eval echo "$as_me:4795: \"$ac_try\"") >&5 4203 4348 (eval $ac_try) 2>&5 4204 4349 ac_status=$? 4205 4350 - echo "$as_me:4554: \$? = $ac_status" >&5 4206 + echo "$as_me:479 7: \$? = $ac_status" >&54351 + echo "$as_me:4798: \$? = $ac_status" >&5 4207 4352 (exit $ac_status); }; }; then 4208 4353 ac_cv_lib_dl_dlsym=yes 4209 4354 else 4210 @@ -4562,7 +480 5,7 @@4355 @@ -4562,7 +4806,7 @@ 4211 4356 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4212 4357 LIBS=$ac_check_lib_save_LIBS 4213 4358 fi 4214 4359 -echo "$as_me:4565: result: $ac_cv_lib_dl_dlsym" >&5 4215 +echo "$as_me:480 8: result: $ac_cv_lib_dl_dlsym" >&54360 +echo "$as_me:4809: result: $ac_cv_lib_dl_dlsym" >&5 4216 4361 echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6 4217 4362 if test $ac_cv_lib_dl_dlsym = yes; then 4218 4363 4219 @@ -4575,10 +481 8,10 @@4364 @@ -4575,10 +4819,10 @@ 4220 4365 if test "$cf_have_dlsym" = yes ; then 4221 4366 test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS" 4222 4367 4223 4368 - echo "$as_me:4578: checking whether able to link to dl*() functions" >&5 4224 + 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 4225 4370 echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6 4226 4371 cat >conftest.$ac_ext <<_ACEOF 4227 4372 -#line 4581 "configure" 4228 +#line 482 4"configure"4373 +#line 4825 "configure" 4229 4374 #include "confdefs.h" 4230 4375 #include <dlfcn.h> 4231 4376 int 4232 @@ -4596,16 +48 39,16 @@4377 @@ -4596,16 +4840,16 @@ 4233 4378 } 4234 4379 _ACEOF 4235 4380 rm -f conftest.$ac_objext conftest$ac_exeext 4236 4381 -if { (eval echo "$as_me:4599: \"$ac_link\"") >&5 4237 +if { (eval echo "$as_me:484 2: \"$ac_link\"") >&54382 +if { (eval echo "$as_me:4843: \"$ac_link\"") >&5 4238 4383 (eval $ac_link) 2>&5 4239 4384 ac_status=$? 4240 4385 - echo "$as_me:4602: \$? = $ac_status" >&5 4241 + echo "$as_me:484 5: \$? = $ac_status" >&54386 + echo "$as_me:4846: \$? = $ac_status" >&5 4242 4387 (exit $ac_status); } && 4243 4388 { ac_try='test -s conftest$ac_exeext' 4244 4389 - { (eval echo "$as_me:4605: \"$ac_try\"") >&5 4245 + { (eval echo "$as_me:484 8: \"$ac_try\"") >&54390 + { (eval echo "$as_me:4849: \"$ac_try\"") >&5 4246 4391 (eval $ac_try) 2>&5 4247 4392 ac_status=$? 4248 4393 - echo "$as_me:4608: \$? = $ac_status" >&5 4249 + echo "$as_me:485 1: \$? = $ac_status" >&54394 + echo "$as_me:4852: \$? = $ac_status" >&5 4250 4395 (exit $ac_status); }; }; then 4251 4396 4252 4397 cat >>confdefs.h <<\EOF 4253 @@ -4616,15 +48 59,15 @@4398 @@ -4616,15 +4860,15 @@ 4254 4399 echo "$as_me: failed program was:" >&5 4255 4400 cat conftest.$ac_ext >&5 4256 4401 4257 4402 - { { echo "$as_me:4619: error: Cannot link test program for libdl" >&5 4258 + { { 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 4259 4404 echo "$as_me: error: Cannot link test program for libdl" >&2;} 4260 4405 { (exit 1); exit 1; }; } … … 4262 4407 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4263 4408 - echo "$as_me:4624: result: ok" >&5 4264 + echo "$as_me:486 7: result: ok" >&54409 + echo "$as_me:4868: result: ok" >&5 4265 4410 echo "${ECHO_T}ok" >&6 4266 4411 else 4267 4412 - { { echo "$as_me:4627: error: Cannot find dlsym function" >&5 4268 + { { echo "$as_me:487 0: error: Cannot find dlsym function" >&54413 + { { echo "$as_me:4871: error: Cannot find dlsym function" >&5 4269 4414 echo "$as_me: error: Cannot find dlsym function" >&2;} 4270 4415 { (exit 1); exit 1; }; } 4271 4416 fi 4272 @@ -4632,12 +487 5,12 @@4417 @@ -4632,12 +4876,12 @@ 4273 4418 if test "$with_gpm" != yes ; then 4274 4419 test -n "$verbose" && echo " assuming soname for gpm is $with_gpm" 1>&6 4275 4420 4276 4421 -echo "${as_me-configure}:4635: testing assuming soname for gpm is $with_gpm ..." 1>&5 4277 +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 4278 4423 4279 4424 cf_cv_gpm_soname="$with_gpm" … … 4281 4426 4282 4427 -echo "$as_me:4640: checking for soname of gpm library" >&5 4283 +echo "$as_me:488 3: checking for soname of gpm library" >&54428 +echo "$as_me:4884: checking for soname of gpm library" >&5 4284 4429 echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6 4285 4430 if test "${cf_cv_gpm_soname+set}" = set; then 4286 4431 echo $ECHO_N "(cached) $ECHO_C" >&6 4287 @@ -4655,15 +489 8,15 @@4432 @@ -4655,15 +4899,15 @@ 4288 4433 CF_EOF 4289 4434 cf_save_LIBS="$LIBS" 4290 4435 LIBS="-lgpm $LIBS" 4291 4436 - if { (eval echo "$as_me:4658: \"$ac_compile\"") >&5 4292 + if { (eval echo "$as_me:490 1: \"$ac_compile\"") >&54437 + if { (eval echo "$as_me:4902: \"$ac_compile\"") >&5 4293 4438 (eval $ac_compile) 2>&5 4294 4439 ac_status=$? 4295 4440 - echo "$as_me:4661: \$? = $ac_status" >&5 4296 + echo "$as_me:490 4: \$? = $ac_status" >&54441 + echo "$as_me:4905: \$? = $ac_status" >&5 4297 4442 (exit $ac_status); } ; then 4298 4443 - if { (eval echo "$as_me:4663: \"$ac_link\"") >&5 4299 + if { (eval echo "$as_me:490 6: \"$ac_link\"") >&54444 + if { (eval echo "$as_me:4907: \"$ac_link\"") >&5 4300 4445 (eval $ac_link) 2>&5 4301 4446 ac_status=$? 4302 4447 - echo "$as_me:4666: \$? = $ac_status" >&5 4303 + echo "$as_me:49 09: \$? = $ac_status" >&54448 + echo "$as_me:4910: \$? = $ac_status" >&5 4304 4449 (exit $ac_status); } ; then 4305 4450 cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.` 4306 4451 test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown 4307 @@ -4674,7 +491 7,7 @@4452 @@ -4674,7 +4918,7 @@ 4308 4453 fi 4309 4454 4310 4455 fi 4311 4456 -echo "$as_me:4677: result: $cf_cv_gpm_soname" >&5 4312 +echo "$as_me:492 0: result: $cf_cv_gpm_soname" >&54457 +echo "$as_me:4921: result: $cf_cv_gpm_soname" >&5 4313 4458 echo "${ECHO_T}$cf_cv_gpm_soname" >&6 4314 4459 4315 4460 fi 4316 @@ -4690,7 +493 3,7 @@4461 @@ -4690,7 +4934,7 @@ 4317 4462 #define HAVE_LIBGPM 1 4318 4463 EOF 4319 4464 4320 4465 -echo "$as_me:4693: checking for Gpm_Wgetch in -lgpm" >&5 4321 +echo "$as_me:493 6: checking for Gpm_Wgetch in -lgpm" >&54466 +echo "$as_me:4937: checking for Gpm_Wgetch in -lgpm" >&5 4322 4467 echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6 4323 4468 if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then 4324 4469 echo $ECHO_N "(cached) $ECHO_C" >&6 4325 @@ -4698,7 +494 1,7 @@4470 @@ -4698,7 +4942,7 @@ 4326 4471 ac_check_lib_save_LIBS=$LIBS 4327 4472 LIBS="-lgpm $LIBS" 4328 4473 cat >conftest.$ac_ext <<_ACEOF 4329 4474 -#line 4701 "configure" 4330 +#line 494 4"configure"4475 +#line 4945 "configure" 4331 4476 #include "confdefs.h" 4332 4477 4333 4478 /* Override any gcc2 internal prototype to avoid an error. */ 4334 @@ -4717,16 +496 0,16 @@4479 @@ -4717,16 +4961,16 @@ 4335 4480 } 4336 4481 _ACEOF 4337 4482 rm -f conftest.$ac_objext conftest$ac_exeext 4338 4483 -if { (eval echo "$as_me:4720: \"$ac_link\"") >&5 4339 +if { (eval echo "$as_me:496 3: \"$ac_link\"") >&54484 +if { (eval echo "$as_me:4964: \"$ac_link\"") >&5 4340 4485 (eval $ac_link) 2>&5 4341 4486 ac_status=$? 4342 4487 - echo "$as_me:4723: \$? = $ac_status" >&5 4343 + echo "$as_me:496 6: \$? = $ac_status" >&54488 + echo "$as_me:4967: \$? = $ac_status" >&5 4344 4489 (exit $ac_status); } && 4345 4490 { ac_try='test -s conftest$ac_exeext' 4346 4491 - { (eval echo "$as_me:4726: \"$ac_try\"") >&5 4347 + { (eval echo "$as_me:49 69: \"$ac_try\"") >&54492 + { (eval echo "$as_me:4970: \"$ac_try\"") >&5 4348 4493 (eval $ac_try) 2>&5 4349 4494 ac_status=$? 4350 4495 - echo "$as_me:4729: \$? = $ac_status" >&5 4351 + echo "$as_me:497 2: \$? = $ac_status" >&54496 + echo "$as_me:4973: \$? = $ac_status" >&5 4352 4497 (exit $ac_status); }; }; then 4353 4498 ac_cv_lib_gpm_Gpm_Wgetch=yes 4354 4499 else 4355 @@ -4737,11 +498 0,11 @@4500 @@ -4737,11 +4981,11 @@ 4356 4501 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4357 4502 LIBS=$ac_check_lib_save_LIBS 4358 4503 fi 4359 4504 -echo "$as_me:4740: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 4360 +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 4361 4506 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6 4362 4507 if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then 4363 4508 4364 4509 -echo "$as_me:4744: checking if GPM is weakly bound to curses library" >&5 4365 +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 4366 4511 echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6 4367 4512 if test "${cf_cv_check_gpm_wgetch+set}" = set; then 4368 4513 echo $ECHO_N "(cached) $ECHO_C" >&6 4369 @@ -4765,15 +500 8,15 @@4514 @@ -4765,15 +5009,15 @@ 4370 4515 # to rely on the static library, noting that some packagers may not 4371 4516 # include it. 4372 4517 LIBS="-static -lgpm -dynamic $LIBS" 4373 4518 - if { (eval echo "$as_me:4768: \"$ac_compile\"") >&5 4374 + if { (eval echo "$as_me:501 1: \"$ac_compile\"") >&54519 + if { (eval echo "$as_me:5012: \"$ac_compile\"") >&5 4375 4520 (eval $ac_compile) 2>&5 4376 4521 ac_status=$? 4377 4522 - echo "$as_me:4771: \$? = $ac_status" >&5 4378 + echo "$as_me:501 4: \$? = $ac_status" >&54523 + echo "$as_me:5015: \$? = $ac_status" >&5 4379 4524 (exit $ac_status); } ; then 4380 4525 - if { (eval echo "$as_me:4773: \"$ac_link\"") >&5 4381 + if { (eval echo "$as_me:501 6: \"$ac_link\"") >&54526 + if { (eval echo "$as_me:5017: \"$ac_link\"") >&5 4382 4527 (eval $ac_link) 2>&5 4383 4528 ac_status=$? 4384 4529 - echo "$as_me:4776: \$? = $ac_status" >&5 4385 + echo "$as_me:50 19: \$? = $ac_status" >&54530 + echo "$as_me:5020: \$? = $ac_status" >&5 4386 4531 (exit $ac_status); } ; then 4387 4532 cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'` 4388 4533 test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes 4389 @@ -4785,11 +502 8,11 @@4534 @@ -4785,11 +5029,11 @@ 4390 4535 fi 4391 4536 4392 4537 fi 4393 4538 -echo "$as_me:4788: result: $cf_cv_check_gpm_wgetch" >&5 4394 +echo "$as_me:503 1: result: $cf_cv_check_gpm_wgetch" >&54539 +echo "$as_me:5032: result: $cf_cv_check_gpm_wgetch" >&5 4395 4540 echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6 4396 4541 4397 4542 if test "$cf_cv_check_gpm_wgetch" != yes ; then 4398 4543 - { echo "$as_me:4792: WARNING: GPM library is already linked with curses - read the FAQ" >&5 4399 + { 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 4400 4545 echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;} 4401 4546 fi 4402 4547 4403 @@ -4799,7 +504 2,7 @@4548 @@ -4799,7 +5043,7 @@ 4404 4549 4405 4550 # not everyone has "test -c" 4406 4551 if test -c /dev/sysmouse 2>/dev/null ; then 4407 4552 -echo "$as_me:4802: checking if you want to use sysmouse" >&5 4408 +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 4409 4554 echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6 4410 4555 4411 4556 # Check whether --with-sysmouse or --without-sysmouse was given. 4412 @@ -4811,7 +505 4,7 @@4557 @@ -4811,7 +5055,7 @@ 4413 4558 fi; 4414 4559 if test "$cf_with_sysmouse" != no ; then 4415 4560 cat >conftest.$ac_ext <<_ACEOF 4416 4561 -#line 4814 "configure" 4417 +#line 505 7"configure"4562 +#line 5058 "configure" 4418 4563 #include "confdefs.h" 4419 4564 4420 4565 #include <osreldate.h> 4421 @@ -4834,16 +507 7,16 @@4566 @@ -4834,16 +5078,16 @@ 4422 4567 } 4423 4568 _ACEOF 4424 4569 rm -f conftest.$ac_objext 4425 4570 -if { (eval echo "$as_me:4837: \"$ac_compile\"") >&5 4426 +if { (eval echo "$as_me:508 0: \"$ac_compile\"") >&54571 +if { (eval echo "$as_me:5081: \"$ac_compile\"") >&5 4427 4572 (eval $ac_compile) 2>&5 4428 4573 ac_status=$? 4429 4574 - echo "$as_me:4840: \$? = $ac_status" >&5 4430 + echo "$as_me:508 3: \$? = $ac_status" >&54575 + echo "$as_me:5084: \$? = $ac_status" >&5 4431 4576 (exit $ac_status); } && 4432 4577 { ac_try='test -s conftest.$ac_objext' 4433 4578 - { (eval echo "$as_me:4843: \"$ac_try\"") >&5 4434 + { (eval echo "$as_me:508 6: \"$ac_try\"") >&54579 + { (eval echo "$as_me:5087: \"$ac_try\"") >&5 4435 4580 (eval $ac_try) 2>&5 4436 4581 ac_status=$? 4437 4582 - echo "$as_me:4846: \$? = $ac_status" >&5 4438 + echo "$as_me:50 89: \$? = $ac_status" >&54583 + echo "$as_me:5090: \$? = $ac_status" >&5 4439 4584 (exit $ac_status); }; }; then 4440 4585 cf_with_sysmouse=yes 4441 4586 else 4442 @@ -4853,7 +509 6,7 @@4587 @@ -4853,7 +5097,7 @@ 4443 4588 fi 4444 4589 rm -f conftest.$ac_objext conftest.$ac_ext 4445 4590 fi 4446 4591 -echo "$as_me:4856: result: $cf_with_sysmouse" >&5 4447 +echo "$as_me:5 099: result: $cf_with_sysmouse" >&54592 +echo "$as_me:5100: result: $cf_with_sysmouse" >&5 4448 4593 echo "${ECHO_T}$cf_with_sysmouse" >&6 4449 4594 test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF 4450 4595 #define USE_SYSMOUSE 1 4451 @@ -4871,7 +511 4,7 @@4596 @@ -4871,7 +5115,7 @@ 4452 4597 test -n "$GXX" && test "${ac_cv_prog_cxx_g}" != yes && CXX_G_OPT='' 4453 4598 fi 4454 4599 4455 4600 -echo "$as_me:4874: checking for default loader flags" >&5 4456 +echo "$as_me:511 7: checking for default loader flags" >&54601 +echo "$as_me:5118: checking for default loader flags" >&5 4457 4602 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 4458 4603 case $DFT_LWR_MODEL in 4459 4604 libtool) LD_MODEL='' ;; 4460 @@ -4880,13 +512 3,13 @@4605 @@ -4880,13 +5124,13 @@ 4461 4606 profile) LD_MODEL='-pg';; 4462 4607 shared) LD_MODEL='' ;; 4463 4608 esac 4464 4609 -echo "$as_me:4883: result: $LD_MODEL" >&5 4465 +echo "$as_me:512 6: result: $LD_MODEL" >&54610 +echo "$as_me:5127: result: $LD_MODEL" >&5 4466 4611 echo "${ECHO_T}$LD_MODEL" >&6 4467 4612 … … 4470 4615 4471 4616 -echo "$as_me:4889: checking if rpath option should be used" >&5 4472 +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 4473 4618 echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6 4474 4619 4475 4620 # Check whether --enable-rpath or --disable-rpath was given. 4476 @@ -4896,10 +51 39,10 @@4621 @@ -4896,10 +5140,10 @@ 4477 4622 else 4478 4623 cf_cv_ld_rpath=no 4479 4624 fi; 4480 4625 -echo "$as_me:4899: result: $cf_cv_ld_rpath" >&5 4481 +echo "$as_me:514 2: result: $cf_cv_ld_rpath" >&54626 +echo "$as_me:5143: result: $cf_cv_ld_rpath" >&5 4482 4627 echo "${ECHO_T}$cf_cv_ld_rpath" >&6 4483 4628 4484 4629 -echo "$as_me:4902: checking if shared libraries should be relinked during install" >&5 4485 +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 4486 4631 echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6 4487 4632 4488 4633 # Check whether --enable-relink or --disable-relink was given. 4489 @@ -4909,19 +515 2,20 @@4634 @@ -4909,19 +5153,20 @@ 4490 4635 else 4491 4636 cf_cv_do_relink=yes 4492 4637 fi; 4493 4638 -echo "$as_me:4912: result: $cf_cv_do_relink" >&5 4494 +echo "$as_me:515 5: result: $cf_cv_do_relink" >&54639 +echo "$as_me:5156: result: $cf_cv_do_relink" >&5 4495 4640 echo "${ECHO_T}$cf_cv_do_relink" >&6 4496 4641 ;; … … 4506 4651 4507 4652 - echo "$as_me:4924: checking if release/abi version should be used for shared libs" >&5 4508 + 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 4509 4654 echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 4510 4655 4511 4656 # Check whether --with-shlib-version or --without-shlib-version was given. 4512 @@ -4936,7 +518 0,7 @@4657 @@ -4936,7 +5181,7 @@ 4513 4658 cf_cv_shlib_version=$withval 4514 4659 ;; 4515 4660 *) 4516 4661 - { { echo "$as_me:4939: error: option value must be one of: rel, abi, auto or no" >&5 4517 + { { 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 4518 4663 echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;} 4519 4664 { (exit 1); exit 1; }; } 4520 4665 ;; 4521 @@ -4945,7 +51 89,7 @@4666 @@ -4945,7 +5190,7 @@ 4522 4667 else 4523 4668 cf_cv_shlib_version=auto 4524 4669 fi; 4525 4670 - echo "$as_me:4948: result: $cf_cv_shlib_version" >&5 4526 + echo "$as_me:519 2: result: $cf_cv_shlib_version" >&54671 + echo "$as_me:5193: result: $cf_cv_shlib_version" >&5 4527 4672 echo "${ECHO_T}$cf_cv_shlib_version" >&6 4528 4673 4529 4674 cf_cv_rm_so_locs=no 4530 @@ -4954,14 +519 8,14 @@4675 @@ -4954,14 +5199,14 @@ 4531 4676 CC_SHARED_OPTS= 4532 4677 if test "$GCC" = yes 4533 4678 then 4534 4679 - echo "$as_me:4957: checking which $CC option to use" >&5 4535 + echo "$as_me:520 1: checking which $CC option to use" >&54680 + echo "$as_me:5202: checking which $CC option to use" >&5 4536 4681 echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 4537 4682 cf_save_CFLAGS="$CFLAGS" … … 4541 4686 cat >conftest.$ac_ext <<_ACEOF 4542 4687 -#line 4964 "configure" 4543 +#line 520 8"configure"4688 +#line 5209 "configure" 4544 4689 #include "confdefs.h" 4545 4690 #include <stdio.h> 4546 4691 int 4547 @@ -4973,16 +521 7,16 @@4692 @@ -4973,16 +5218,16 @@ 4548 4693 } 4549 4694 _ACEOF 4550 4695 rm -f conftest.$ac_objext 4551 4696 -if { (eval echo "$as_me:4976: \"$ac_compile\"") >&5 4552 +if { (eval echo "$as_me:522 0: \"$ac_compile\"") >&54697 +if { (eval echo "$as_me:5221: \"$ac_compile\"") >&5 4553 4698 (eval $ac_compile) 2>&5 4554 4699 ac_status=$? 4555 4700 - echo "$as_me:4979: \$? = $ac_status" >&5 4556 + echo "$as_me:522 3: \$? = $ac_status" >&54701 + echo "$as_me:5224: \$? = $ac_status" >&5 4557 4702 (exit $ac_status); } && 4558 4703 { ac_try='test -s conftest.$ac_objext' 4559 4704 - { (eval echo "$as_me:4982: \"$ac_try\"") >&5 4560 + { (eval echo "$as_me:522 6: \"$ac_try\"") >&54705 + { (eval echo "$as_me:5227: \"$ac_try\"") >&5 4561 4706 (eval $ac_try) 2>&5 4562 4707 ac_status=$? 4563 4708 - echo "$as_me:4985: \$? = $ac_status" >&5 4564 + echo "$as_me:52 29: \$? = $ac_status" >&54709 + echo "$as_me:5230: \$? = $ac_status" >&5 4565 4710 (exit $ac_status); }; }; then 4566 4711 break 4567 4712 else 4568 @@ -4991,7 +523 5,7 @@4713 @@ -4991,7 +5236,7 @@ 4569 4714 fi 4570 4715 rm -f conftest.$ac_objext conftest.$ac_ext 4571 4716 done 4572 4717 - echo "$as_me:4994: result: $CC_SHARED_OPTS" >&5 4573 + echo "$as_me:523 8: result: $CC_SHARED_OPTS" >&54718 + echo "$as_me:5239: result: $CC_SHARED_OPTS" >&5 4574 4719 echo "${ECHO_T}$CC_SHARED_OPTS" >&6 4575 4720 CFLAGS="$cf_save_CFLAGS" 4576 4721 fi 4577 @@ -4999,6 +524 3,12 @@4722 @@ -4999,6 +5244,12 @@ 4578 4723 cf_cv_shlib_version_infix=no 4579 4724 … … 4588 4733 MK_SHARED_LIB='${CC} ${CFLAGS} -o $@ -Xlinker -soname=`basename $@` -nostart -e 0' 4589 4734 ;; 4590 @@ -5027,7 +527 7,7 @@4735 @@ -5027,7 +5278,7 @@ 4591 4736 MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' 4592 4737 test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi 4593 4738 cf_cv_shlib_version_infix=yes 4594 4739 - echo "$as_me:5030: checking if ld -search_paths_first works" >&5 4595 + 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 4596 4741 echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 4597 4742 if test "${cf_cv_ldflags_search_paths_first+set}" = set; then 4598 4743 echo $ECHO_N "(cached) $ECHO_C" >&6 4599 @@ -5036,7 +528 6,7 @@4744 @@ -5036,7 +5287,7 @@ 4600 4745 cf_save_LDFLAGS=$LDFLAGS 4601 4746 LDFLAGS="$LDFLAGS -Wl,-search_paths_first" 4602 4747 cat >conftest.$ac_ext <<_ACEOF 4603 4748 -#line 5039 "configure" 4604 +#line 52 89"configure"4749 +#line 5290 "configure" 4605 4750 #include "confdefs.h" 4606 4751 4607 4752 int 4608 @@ -5048,16 +529 8,16 @@4753 @@ -5048,16 +5299,16 @@ 4609 4754 } 4610 4755 _ACEOF 4611 4756 rm -f conftest.$ac_objext conftest$ac_exeext 4612 4757 -if { (eval echo "$as_me:5051: \"$ac_link\"") >&5 4613 +if { (eval echo "$as_me:530 1: \"$ac_link\"") >&54758 +if { (eval echo "$as_me:5302: \"$ac_link\"") >&5 4614 4759 (eval $ac_link) 2>&5 4615 4760 ac_status=$? 4616 4761 - echo "$as_me:5054: \$? = $ac_status" >&5 4617 + echo "$as_me:530 4: \$? = $ac_status" >&54762 + echo "$as_me:5305: \$? = $ac_status" >&5 4618 4763 (exit $ac_status); } && 4619 4764 { ac_try='test -s conftest$ac_exeext' 4620 4765 - { (eval echo "$as_me:5057: \"$ac_try\"") >&5 4621 + { (eval echo "$as_me:530 7: \"$ac_try\"") >&54766 + { (eval echo "$as_me:5308: \"$ac_try\"") >&5 4622 4767 (eval $ac_try) 2>&5 4623 4768 ac_status=$? 4624 4769 - echo "$as_me:5060: \$? = $ac_status" >&5 4625 + echo "$as_me:531 0: \$? = $ac_status" >&54770 + echo "$as_me:5311: \$? = $ac_status" >&5 4626 4771 (exit $ac_status); }; }; then 4627 4772 cf_cv_ldflags_search_paths_first=yes 4628 4773 else 4629 @@ -5068,7 +531 8,7 @@4774 @@ -5068,7 +5319,7 @@ 4630 4775 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4631 4776 LDFLAGS=$cf_save_LDFLAGS 4632 4777 fi 4633 4778 -echo "$as_me:5071: result: $cf_cv_ldflags_search_paths_first" >&5 4634 +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 4635 4780 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 4636 4781 if test $cf_cv_ldflags_search_paths_first = yes; then 4637 4782 LDFLAGS="$LDFLAGS -Wl,-search_paths_first" 4638 @@ -5090,10 +534 0,10 @@4783 @@ -5090,10 +5341,10 @@ 4639 4784 irix*) 4640 4785 if test "$cf_cv_ld_rpath" = yes ; then … … 4649 4794 fi 4650 4795 fi 4651 @@ -5112,7 +536 2,7 @@4796 @@ -5112,7 +5363,7 @@ 4652 4797 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" 4653 4798 fi … … 4658 4803 fi 4659 4804 4660 @@ -5131,7 +538 1,7 @@4805 @@ -5131,7 +5382,7 @@ 4661 4806 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" 4662 4807 fi … … 4667 4812 fi 4668 4813 CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" 4669 @@ -5143,7 +539 3,7 @@4814 @@ -5143,7 +5394,7 @@ 4670 4815 cf_cv_shared_soname='`basename $@`' 4671 4816 fi … … 4676 4821 nto-qnx*|openbsd*|freebsd[12].*) 4677 4822 CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" 4678 @@ -5155,7 +540 5,7 @@4823 @@ -5155,7 +5406,7 @@ 4679 4824 if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then 4680 4825 LOCAL_LDFLAGS="-rpath \$(LOCAL_LIBDIR)" … … 4685 4830 fi 4686 4831 4687 @@ -5166,11 +541 6,11 @@4832 @@ -5166,11 +5417,11 @@ 4688 4833 cf_cv_shared_soname='`basename $@`' 4689 4834 fi … … 4699 4844 LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)" 4700 4845 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" 4701 @@ -5192,7 +544 2,7 @@4846 @@ -5192,7 +5443,7 @@ 4702 4847 4703 4848 MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@' … … 4708 4853 ;; 4709 4854 osf*|mls+*) 4710 @@ -5211,7 +546 1,7 @@4855 @@ -5211,7 +5462,7 @@ 4711 4856 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" 4712 4857 fi … … 4717 4862 fi 4718 4863 cf_cv_rm_so_locs=yes 4719 @@ -5246,7 +549 6,7 @@4864 @@ -5246,7 +5497,7 @@ 4720 4865 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" 4721 4866 fi … … 4726 4871 fi 4727 4872 4728 @@ -5258,7 +550 8,43 @@4873 @@ -5258,7 +5509,43 @@ 4729 4874 fi 4730 4875 … … 4736 4881 + CFLAGS="$cf_shared_opts $cf_save_CFLAGS" 4737 4882 + cat >conftest.$ac_ext <<_ACEOF 4738 +#line 551 6"configure"4883 +#line 5517 "configure" 4739 4884 +#include "confdefs.h" 4740 4885 +#include <stdio.h> … … 4748 4893 +_ACEOF 4749 4894 +rm -f conftest.$ac_objext 4750 +if { (eval echo "$as_me:552 8: \"$ac_compile\"") >&54895 +if { (eval echo "$as_me:5529: \"$ac_compile\"") >&5 4751 4896 + (eval $ac_compile) 2>&5 4752 4897 + ac_status=$? 4753 + echo "$as_me:553 1: \$? = $ac_status" >&54898 + echo "$as_me:5532: \$? = $ac_status" >&5 4754 4899 + (exit $ac_status); } && 4755 4900 + { ac_try='test -s conftest.$ac_objext' 4756 + { (eval echo "$as_me:553 4: \"$ac_try\"") >&54901 + { (eval echo "$as_me:5535: \"$ac_try\"") >&5 4757 4902 + (eval $ac_try) 2>&5 4758 4903 + ac_status=$? 4759 + echo "$as_me:553 7: \$? = $ac_status" >&54904 + echo "$as_me:5538: \$? = $ac_status" >&5 4760 4905 + (exit $ac_status); }; }; then 4761 4906 + break … … 4771 4916 else 4772 4917 MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $@' 4773 @@ -5285,20 +557 1,20 @@4918 @@ -5285,20 +5572,20 @@ 4774 4919 test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes 4775 4920 ;; 4776 4921 *) 4777 4922 - { echo "$as_me:5288: WARNING: ignored --with-shlib-version" >&5 4778 + { echo "$as_me:557 4: WARNING: ignored --with-shlib-version" >&54923 + { echo "$as_me:5575: WARNING: ignored --with-shlib-version" >&5 4779 4924 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} 4780 4925 ;; … … 4786 4931 - echo "$as_me:5296: checking if we need a space after rpath option" >&5 4787 4932 + if test -n "$LD_RPATH_OPT" ; then 4788 + 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 4789 4934 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 4790 4935 cf_save_LIBS="$LIBS" … … 4793 4938 cat >conftest.$ac_ext <<_ACEOF 4794 4939 -#line 5301 "configure" 4795 +#line 558 7"configure"4940 +#line 5588 "configure" 4796 4941 #include "confdefs.h" 4797 4942 4798 4943 int 4799 @@ -5310,16 +559 6,16 @@4944 @@ -5310,16 +5597,16 @@ 4800 4945 } 4801 4946 _ACEOF 4802 4947 rm -f conftest.$ac_objext conftest$ac_exeext 4803 4948 -if { (eval echo "$as_me:5313: \"$ac_link\"") >&5 4804 +if { (eval echo "$as_me:5 599: \"$ac_link\"") >&54949 +if { (eval echo "$as_me:5600: \"$ac_link\"") >&5 4805 4950 (eval $ac_link) 2>&5 4806 4951 ac_status=$? 4807 4952 - echo "$as_me:5316: \$? = $ac_status" >&5 4808 + echo "$as_me:560 2: \$? = $ac_status" >&54953 + echo "$as_me:5603: \$? = $ac_status" >&5 4809 4954 (exit $ac_status); } && 4810 4955 { ac_try='test -s conftest$ac_exeext' 4811 4956 - { (eval echo "$as_me:5319: \"$ac_try\"") >&5 4812 + { (eval echo "$as_me:560 5: \"$ac_try\"") >&54957 + { (eval echo "$as_me:5606: \"$ac_try\"") >&5 4813 4958 (eval $ac_try) 2>&5 4814 4959 ac_status=$? 4815 4960 - echo "$as_me:5322: \$? = $ac_status" >&5 4816 + echo "$as_me:560 8: \$? = $ac_status" >&54961 + echo "$as_me:5609: \$? = $ac_status" >&5 4817 4962 (exit $ac_status); }; }; then 4818 4963 cf_rpath_space=no 4819 4964 else 4820 @@ -5329,16 +561 5,16 @@4965 @@ -5329,16 +5616,16 @@ 4821 4966 fi 4822 4967 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4823 4968 LIBS="$cf_save_LIBS" 4824 4969 - echo "$as_me:5332: result: $cf_rpath_space" >&5 4825 + echo "$as_me:561 8: result: $cf_rpath_space" >&54970 + echo "$as_me:5619: result: $cf_rpath_space" >&5 4826 4971 echo "${ECHO_T}$cf_rpath_space" >&6 4827 4972 - test "$cf_rpath_space" = yes && cf_ld_rpath_opt="$cf_ld_rpath_opt " … … 4835 4980 if test "$model" = "shared"; then 4836 4981 - { { echo "$as_me:5341: error: Shared libraries are not supported in this version" >&5 4837 + { { 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 4838 4983 echo "$as_me: error: Shared libraries are not supported in this version" >&2;} 4839 4984 { (exit 1); exit 1; }; } 4840 4985 fi 4841 @@ -5348,7 +563 4,7 @@4986 @@ -5348,7 +5635,7 @@ 4842 4987 ############################################################################### 4843 4988 4844 4989 ### use option --disable-overwrite to leave out the link to -lcurses 4845 4990 -echo "$as_me:5351: checking if you wish to install ncurses overwriting curses" >&5 4846 +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 4847 4992 echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6 4848 4993 4849 4994 # Check whether --enable-overwrite or --disable-overwrite was given. 4850 @@ -5358,10 +564 4,10 @@4995 @@ -5358,10 +5645,10 @@ 4851 4996 else 4852 4997 if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi 4853 4998 fi; 4854 4999 -echo "$as_me:5361: result: $with_overwrite" >&5 4855 +echo "$as_me:564 7: result: $with_overwrite" >&55000 +echo "$as_me:5648: result: $with_overwrite" >&5 4856 5001 echo "${ECHO_T}$with_overwrite" >&6 4857 5002 4858 5003 -echo "$as_me:5364: checking if external terminfo-database is used" >&5 4859 +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 4860 5005 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 4861 5006 4862 5007 # Check whether --enable-database or --disable-database was given. 4863 @@ -5371,7 +565 7,7 @@5008 @@ -5371,7 +5658,7 @@ 4864 5009 else 4865 5010 use_database=yes 4866 5011 fi; 4867 5012 -echo "$as_me:5374: result: $use_database" >&5 4868 +echo "$as_me:566 0: result: $use_database" >&55013 +echo "$as_me:5661: result: $use_database" >&5 4869 5014 echo "${ECHO_T}$use_database" >&6 4870 5015 4871 5016 case $host_os in #(vi 4872 @@ -5393,7 +5679,7 @@ 5017 @@ -5384,8 +5671,8 @@ 5018 esac 5019 5020 case $cf_cv_system_name in 5021 - os2*) PATHSEP=';' ;; 5022 - *) PATHSEP=':' ;; 5023 + os2*) PATH_SEPARATOR=';' ;; 5024 + *) PATH_SEPARATOR=':' ;; 5025 esac 5026 5027 if test "$use_database" != no ; then 5028 @@ -5393,7 +5680,7 @@ 4873 5029 #define USE_DATABASE 1 4874 5030 EOF 4875 5031 4876 5032 - echo "$as_me:5396: checking which terminfo source-file will be installed" >&5 4877 + 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 4878 5034 echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6 4879 5035 4880 5036 # Check whether --enable-database or --disable-database was given. 4881 @@ -5401,10 +568 7,10 @@5037 @@ -5401,10 +5688,10 @@ 4882 5038 enableval="$enable_database" 4883 5039 TERMINFO_SRC=$withval 4884 5040 fi; 4885 5041 - echo "$as_me:5404: result: $TERMINFO_SRC" >&5 4886 + echo "$as_me:569 0: result: $TERMINFO_SRC" >&55042 + echo "$as_me:5691: result: $TERMINFO_SRC" >&5 4887 5043 echo "${ECHO_T}$TERMINFO_SRC" >&6 4888 5044 4889 5045 - echo "$as_me:5407: checking whether to use hashed database instead of directory/tree" >&5 4890 + 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 4891 5047 echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6 4892 5048 4893 5049 # Check whether --with-hashed-db or --without-hashed-db was given. 4894 @@ -5414,13 +570 0,13 @@5050 @@ -5414,13 +5701,13 @@ 4895 5051 else 4896 5052 with_hashed_db=no 4897 5053 fi; 4898 5054 - echo "$as_me:5417: result: $with_hashed_db" >&5 4899 + echo "$as_me:570 3: result: $with_hashed_db" >&55055 + echo "$as_me:5704: result: $with_hashed_db" >&5 4900 5056 echo "${ECHO_T}$with_hashed_db" >&6 4901 5057 else … … 4904 5060 4905 5061 -echo "$as_me:5423: checking for list of fallback descriptions" >&5 4906 +echo "$as_me:57 09: checking for list of fallback descriptions" >&55062 +echo "$as_me:5710: checking for list of fallback descriptions" >&5 4907 5063 echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6 4908 5064 4909 5065 # Check whether --with-fallbacks or --without-fallbacks was given. 4910 @@ -5430,11 +571 6,11 @@5066 @@ -5430,11 +5717,11 @@ 4911 5067 else 4912 5068 with_fallback= 4913 5069 fi; 4914 5070 -echo "$as_me:5433: result: $with_fallback" >&5 4915 +echo "$as_me:57 19: result: $with_fallback" >&55071 +echo "$as_me:5720: result: $with_fallback" >&5 4916 5072 echo "${ECHO_T}$with_fallback" >&6 4917 5073 FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'` 4918 5074 4919 5075 -echo "$as_me:5437: checking if you want modern xterm or antique" >&5 4920 +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 4921 5077 echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6 4922 5078 4923 5079 # Check whether --with-xterm-new or --without-xterm-new was given. 4924 @@ -5448,7 +573 4,7 @@5080 @@ -5448,7 +5735,7 @@ 4925 5081 no) with_xterm_new=xterm-old;; 4926 5082 *) with_xterm_new=xterm-new;; 4927 5083 esac 4928 5084 -echo "$as_me:5451: result: $with_xterm_new" >&5 4929 +echo "$as_me:573 7: result: $with_xterm_new" >&55085 +echo "$as_me:5738: result: $with_xterm_new" >&5 4930 5086 echo "${ECHO_T}$with_xterm_new" >&6 4931 5087 WHICH_XTERM=$with_xterm_new 4932 5088 4933 @@ -5458,7 +574 4,7 @@5089 @@ -5458,7 +5745,7 @@ 4934 5090 MAKE_TERMINFO="#" 4935 5091 else 4936 5092 4937 5093 -echo "$as_me:5461: checking for list of terminfo directories" >&5 4938 +echo "$as_me:574 7: checking for list of terminfo directories" >&55094 +echo "$as_me:5748: checking for list of terminfo directories" >&5 4939 5095 echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6 4940 5096 4941 5097 # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given. 4942 @@ -5498,7 +5784,7 @@ 5098 @@ -5468,7 +5755,7 @@ 5099 else 5100 withval=${TERMINFO_DIRS-${datadir}/terminfo} 5101 fi; 5102 -IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${PATHSEP}" 5103 +IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${PATH_SEPARATOR}" 5104 cf_dst_path= 5105 for cf_src_path in $withval 5106 do 5107 @@ -5498,7 +5785,7 @@ 4943 5108 cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` 4944 5109 ;; 4945 5110 *) 4946 5111 - { { echo "$as_me:5501: error: expected a pathname, not \"$cf_src_path\"" >&5 4947 + { { 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 4948 5113 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} 4949 5114 { (exit 1); exit 1; }; } 4950 5115 ;; 4951 @@ -5511,13 +579 7,13 @@5116 @@ -5511,13 +5798,13 @@ 4952 5117 4953 5118 eval 'TERMINFO_DIRS="$cf_dst_path"' 4954 5119 4955 5120 -echo "$as_me:5514: result: $TERMINFO_DIRS" >&5 4956 +echo "$as_me:580 0: result: $TERMINFO_DIRS" >&55121 +echo "$as_me:5801: result: $TERMINFO_DIRS" >&5 4957 5122 echo "${ECHO_T}$TERMINFO_DIRS" >&6 4958 5123 test -n "$TERMINFO_DIRS" && cat >>confdefs.h <<EOF … … 4961 5126 4962 5127 -echo "$as_me:5520: checking for default terminfo directory" >&5 4963 +echo "$as_me:580 6: checking for default terminfo directory" >&55128 +echo "$as_me:5807: checking for default terminfo directory" >&5 4964 5129 echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6 4965 5130 4966 5131 # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given. 4967 @@ -5553,7 +58 39,7 @@5132 @@ -5553,7 +5840,7 @@ 4968 5133 withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` 4969 5134 ;; 4970 5135 *) 4971 5136 - { { echo "$as_me:5556: error: expected a pathname, not \"$withval\"" >&5 4972 + { { echo "$as_me:584 2: error: expected a pathname, not \"$withval\"" >&55137 + { { echo "$as_me:5843: error: expected a pathname, not \"$withval\"" >&5 4973 5138 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} 4974 5139 { (exit 1); exit 1; }; } 4975 5140 ;; 4976 @@ -5562,7 +584 8,7 @@5141 @@ -5562,7 +5849,7 @@ 4977 5142 fi 4978 5143 TERMINFO="$withval" 4979 5144 4980 5145 -echo "$as_me:5565: result: $TERMINFO" >&5 4981 +echo "$as_me:585 1: result: $TERMINFO" >&55146 +echo "$as_me:5852: result: $TERMINFO" >&5 4982 5147 echo "${ECHO_T}$TERMINFO" >&6 4983 5148 cat >>confdefs.h <<EOF 4984 5149 #define TERMINFO "$TERMINFO" 4985 @@ -5572,7 +585 8,7 @@5150 @@ -5572,7 +5859,7 @@ 4986 5151 4987 5152 ### use option --disable-big-core to make tic run on small machines 4988 5153 ### We need 4Mb, check if we can allocate 50% more than that. 4989 5154 -echo "$as_me:5575: checking if big-core option selected" >&5 4990 +echo "$as_me:586 1: checking if big-core option selected" >&55155 +echo "$as_me:5862: checking if big-core option selected" >&5 4991 5156 echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6 4992 5157 4993 5158 # Check whether --enable-big-core or --disable-big-core was given. 4994 @@ -5584,7 +587 0,7 @@5159 @@ -5584,7 +5871,7 @@ 4995 5160 with_big_core=no 4996 5161 else 4997 5162 cat >conftest.$ac_ext <<_ACEOF 4998 5163 -#line 5587 "configure" 4999 +#line 587 3"configure"5164 +#line 5874 "configure" 5000 5165 #include "confdefs.h" 5001 5166 5002 5167 #include <stdlib.h> 5003 @@ -5598,15 +588 4,15 @@5168 @@ -5598,15 +5885,15 @@ 5004 5169 } 5005 5170 _ACEOF 5006 5171 rm -f conftest$ac_exeext 5007 5172 -if { (eval echo "$as_me:5601: \"$ac_link\"") >&5 5008 +if { (eval echo "$as_me:588 7: \"$ac_link\"") >&55173 +if { (eval echo "$as_me:5888: \"$ac_link\"") >&5 5009 5174 (eval $ac_link) 2>&5 5010 5175 ac_status=$? 5011 5176 - echo "$as_me:5604: \$? = $ac_status" >&5 5012 + echo "$as_me:589 0: \$? = $ac_status" >&55177 + echo "$as_me:5891: \$? = $ac_status" >&5 5013 5178 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 5014 5179 - { (eval echo "$as_me:5606: \"$ac_try\"") >&5 5015 + { (eval echo "$as_me:589 2: \"$ac_try\"") >&55180 + { (eval echo "$as_me:5893: \"$ac_try\"") >&5 5016 5181 (eval $ac_try) 2>&5 5017 5182 ac_status=$? 5018 5183 - echo "$as_me:5609: \$? = $ac_status" >&5 5019 + echo "$as_me:589 5: \$? = $ac_status" >&55184 + echo "$as_me:5896: \$? = $ac_status" >&5 5020 5185 (exit $ac_status); }; }; then 5021 5186 with_big_core=yes 5022 5187 else 5023 @@ -5618,7 +590 4,7 @@5188 @@ -5618,7 +5905,7 @@ 5024 5189 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 5025 5190 fi 5026 5191 fi; 5027 5192 -echo "$as_me:5621: result: $with_big_core" >&5 5028 +echo "$as_me:590 7: result: $with_big_core" >&55193 +echo "$as_me:5908: result: $with_big_core" >&5 5029 5194 echo "${ECHO_T}$with_big_core" >&6 5030 5195 test "$with_big_core" = "yes" && cat >>confdefs.h <<\EOF 5031 5196 #define HAVE_BIG_CORE 1 5032 @@ -5627,7 +591 3,7 @@5197 @@ -5627,7 +5914,7 @@ 5033 5198 ### ISO C only guarantees 512-char strings, we have tables which load faster 5034 5199 ### when constructed using "big" strings. More than the C compiler, the awk 5035 5200 ### program is a limit on most vendor UNIX systems. Check that we can build. 5036 5201 -echo "$as_me:5630: checking if big-strings option selected" >&5 5037 +echo "$as_me:591 6: checking if big-strings option selected" >&55202 +echo "$as_me:5917: checking if big-strings option selected" >&5 5038 5203 echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6 5039 5204 5040 5205 # Check whether --enable-big-strings or --disable-big-strings was given. 5041 @@ -5636,29 +592 2,29 @@5206 @@ -5636,29 +5923,29 @@ 5042 5207 with_big_strings=$enableval 5043 5208 else … … 5072 5237 fi; 5073 5238 -echo "$as_me:5654: result: $with_big_strings" >&5 5074 +echo "$as_me:594 0: result: $with_big_strings" >&55239 +echo "$as_me:5941: result: $with_big_strings" >&5 5075 5240 echo "${ECHO_T}$with_big_strings" >&6 5076 5241 … … 5080 5245 ### use option --enable-termcap to compile in the termcap fallback support 5081 5246 -echo "$as_me:5661: checking if you want termcap-fallback support" >&5 5082 +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 5083 5248 echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6 5084 5249 5085 5250 # Check whether --enable-termcap or --disable-termcap was given. 5086 @@ -5668,13 +595 4,13 @@5251 @@ -5668,13 +5955,13 @@ 5087 5252 else 5088 5253 with_termcap=no 5089 5254 fi; 5090 5255 -echo "$as_me:5671: result: $with_termcap" >&5 5091 +echo "$as_me:595 7: result: $with_termcap" >&55256 +echo "$as_me:5958: result: $with_termcap" >&5 5092 5257 echo "${ECHO_T}$with_termcap" >&6 5093 5258 … … 5096 5261 if test -z "$with_fallback" ; then 5097 5262 - { { echo "$as_me:5677: error: You have disabled the database w/o specifying fallbacks" >&5 5098 + { { 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 5099 5264 echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;} 5100 5265 { (exit 1); exit 1; }; } 5101 5266 fi 5102 @@ -5686,7 +597 2,7 @@5267 @@ -5686,7 +5973,7 @@ 5103 5268 else 5104 5269 5105 5270 if test "$with_ticlib" != no ; then 5106 5271 - { { echo "$as_me:5689: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 5107 + { { 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 5108 5273 echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;} 5109 5274 { (exit 1); exit 1; }; } 5110 5275 fi 5111 @@ -5695,7 +598 1,7 @@5276 @@ -5695,7 +5982,7 @@ 5112 5277 #define USE_TERMCAP 1 5113 5278 EOF 5114 5279 5115 5280 -echo "$as_me:5698: checking for list of termcap files" >&5 5116 +echo "$as_me:598 4: checking for list of termcap files" >&55281 +echo "$as_me:5985: checking for list of termcap files" >&5 5117 5282 echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6 5118 5283 5119 5284 # Check whether --with-termpath or --without-termpath was given. 5120 @@ -5735,7 +6021,7 @@ 5285 @@ -5705,7 +5992,7 @@ 5286 else 5287 withval=${TERMPATH-/etc/termcap:/usr/share/misc/termcap} 5288 fi; 5289 -IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${PATHSEP}" 5290 +IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${PATH_SEPARATOR}" 5291 cf_dst_path= 5292 for cf_src_path in $withval 5293 do 5294 @@ -5735,7 +6022,7 @@ 5121 5295 cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` 5122 5296 ;; 5123 5297 *) 5124 5298 - { { echo "$as_me:5738: error: expected a pathname, not \"$cf_src_path\"" >&5 5125 + { { 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 5126 5300 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} 5127 5301 { (exit 1); exit 1; }; } 5128 5302 ;; 5129 @@ -5748,14 +603 4,14 @@5303 @@ -5748,14 +6035,14 @@ 5130 5304 5131 5305 eval 'TERMPATH="$cf_dst_path"' 5132 5306 5133 5307 -echo "$as_me:5751: result: $TERMPATH" >&5 5134 +echo "$as_me:603 7: result: $TERMPATH" >&55308 +echo "$as_me:6038: result: $TERMPATH" >&5 5135 5309 echo "${ECHO_T}$TERMPATH" >&6 5136 5310 test -n "$TERMPATH" && cat >>confdefs.h <<EOF … … 5140 5314 ### use option --enable-getcap to use a hacked getcap for reading termcaps 5141 5315 -echo "$as_me:5758: checking if fast termcap-loader is needed" >&5 5142 +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 5143 5317 echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6 5144 5318 5145 5319 # Check whether --enable-getcap or --disable-getcap was given. 5146 @@ -5765,13 +605 1,13 @@5320 @@ -5765,13 +6052,13 @@ 5147 5321 else 5148 5322 with_getcap=no 5149 5323 fi; 5150 5324 -echo "$as_me:5768: result: $with_getcap" >&5 5151 +echo "$as_me:605 4: result: $with_getcap" >&55325 +echo "$as_me:6055: result: $with_getcap" >&5 5152 5326 echo "${ECHO_T}$with_getcap" >&6 5153 5327 test "$with_getcap" = "yes" && cat >>confdefs.h <<\EOF … … 5156 5330 5157 5331 -echo "$as_me:5774: checking if translated termcaps will be cached in ~/.terminfo" >&5 5158 +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 5159 5333 echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6 5160 5334 5161 5335 # Check whether --enable-getcap-cache or --disable-getcap-cache was given. 5162 @@ -5781,7 +606 7,7 @@5336 @@ -5781,7 +6068,7 @@ 5163 5337 else 5164 5338 with_getcap_cache=no 5165 5339 fi; 5166 5340 -echo "$as_me:5784: result: $with_getcap_cache" >&5 5167 +echo "$as_me:607 0: result: $with_getcap_cache" >&55341 +echo "$as_me:6071: result: $with_getcap_cache" >&5 5168 5342 echo "${ECHO_T}$with_getcap_cache" >&6 5169 5343 test "$with_getcap_cache" = "yes" && cat >>confdefs.h <<\EOF 5170 5344 #define USE_GETCAP_CACHE 1 5171 @@ -5790,7 +607 6,7 @@5345 @@ -5790,7 +6077,7 @@ 5172 5346 fi 5173 5347 5174 5348 ### Use option --disable-home-terminfo to completely remove ~/.terminfo 5175 5349 -echo "$as_me:5793: checking if ~/.terminfo is wanted" >&5 5176 +echo "$as_me:60 79: checking if ~/.terminfo is wanted" >&55350 +echo "$as_me:6080: checking if ~/.terminfo is wanted" >&5 5177 5351 echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6 5178 5352 5179 5353 # Check whether --enable-home-terminfo or --disable-home-terminfo was given. 5180 @@ -5800,13 +608 6,13 @@5354 @@ -5800,13 +6087,13 @@ 5181 5355 else 5182 5356 with_home_terminfo=yes 5183 5357 fi; 5184 5358 -echo "$as_me:5803: result: $with_home_terminfo" >&5 5185 +echo "$as_me:60 89: result: $with_home_terminfo" >&55359 +echo "$as_me:6090: result: $with_home_terminfo" >&5 5186 5360 echo "${ECHO_T}$with_home_terminfo" >&6 5187 5361 test "$with_home_terminfo" = "yes" && cat >>confdefs.h <<\EOF … … 5190 5364 5191 5365 -echo "$as_me:5809: checking if you want to use restricted environment when running as root" >&5 5192 +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 5193 5367 echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6 5194 5368 5195 5369 # Check whether --enable-root-environ or --disable-root-environ was given. 5196 @@ -5816,7 +610 2,7 @@5370 @@ -5816,7 +6103,7 @@ 5197 5371 else 5198 5372 with_root_environ=yes 5199 5373 fi; 5200 5374 -echo "$as_me:5819: result: $with_root_environ" >&5 5201 +echo "$as_me:610 5: result: $with_root_environ" >&55375 +echo "$as_me:6106: result: $with_root_environ" >&5 5202 5376 echo "${ECHO_T}$with_root_environ" >&6 5203 5377 test "$with_root_environ" = yes && cat >>confdefs.h <<\EOF 5204 5378 #define USE_ROOT_ENVIRON 1 5205 @@ -5830,13 +611 6,13 @@5379 @@ -5830,13 +6117,13 @@ 5206 5380 unlink 5207 5381 do 5208 5382 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 5209 5383 -echo "$as_me:5833: checking for $ac_func" >&5 5210 +echo "$as_me:61 19: checking for $ac_func" >&55384 +echo "$as_me:6120: checking for $ac_func" >&5 5211 5385 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 5212 5386 if eval "test \"\${$as_ac_var+set}\" = set"; then … … 5215 5389 cat >conftest.$ac_ext <<_ACEOF 5216 5390 -#line 5839 "configure" 5217 +#line 612 5"configure"5391 +#line 6126 "configure" 5218 5392 #include "confdefs.h" 5219 5393 /* System header to define __stub macros and hopefully few prototypes, 5220 5394 which can conflict with char $ac_func (); below. */ 5221 @@ -5867,16 +615 3,16 @@5395 @@ -5867,16 +6154,16 @@ 5222 5396 } 5223 5397 _ACEOF 5224 5398 rm -f conftest.$ac_objext conftest$ac_exeext 5225 5399 -if { (eval echo "$as_me:5870: \"$ac_link\"") >&5 5226 +if { (eval echo "$as_me:615 6: \"$ac_link\"") >&55400 +if { (eval echo "$as_me:6157: \"$ac_link\"") >&5 5227 5401 (eval $ac_link) 2>&5 5228 5402 ac_status=$? 5229 5403 - echo "$as_me:5873: \$? = $ac_status" >&5 5230 + echo "$as_me:61 59: \$? = $ac_status" >&55404 + echo "$as_me:6160: \$? = $ac_status" >&5 5231 5405 (exit $ac_status); } && 5232 5406 { ac_try='test -s conftest$ac_exeext' 5233 5407 - { (eval echo "$as_me:5876: \"$ac_try\"") >&5 5234 + { (eval echo "$as_me:616 2: \"$ac_try\"") >&55408 + { (eval echo "$as_me:6163: \"$ac_try\"") >&5 5235 5409 (eval $ac_try) 2>&5 5236 5410 ac_status=$? 5237 5411 - echo "$as_me:5879: \$? = $ac_status" >&5 5238 + echo "$as_me:616 5: \$? = $ac_status" >&55412 + echo "$as_me:6166: \$? = $ac_status" >&5 5239 5413 (exit $ac_status); }; }; then 5240 5414 eval "$as_ac_var=yes" 5241 5415 else 5242 @@ -5886,7 +617 2,7 @@5416 @@ -5886,7 +6173,7 @@ 5243 5417 fi 5244 5418 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 5245 5419 fi 5246 5420 -echo "$as_me:5889: result: `eval echo '${'$as_ac_var'}'`" >&5 5247 +echo "$as_me:617 5: result: `eval echo '${'$as_ac_var'}'`" >&55421 +echo "$as_me:6176: result: `eval echo '${'$as_ac_var'}'`" >&5 5248 5422 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 5249 5423 if test `eval echo '${'$as_ac_var'}'` = yes; then 5250 5424 cat >>confdefs.h <<EOF 5251 @@ -5903,13 +61 89,13 @@5425 @@ -5903,13 +6190,13 @@ 5252 5426 symlink 5253 5427 do 5254 5428 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 5255 5429 -echo "$as_me:5906: checking for $ac_func" >&5 5256 +echo "$as_me:619 2: checking for $ac_func" >&55430 +echo "$as_me:6193: checking for $ac_func" >&5 5257 5431 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 5258 5432 if eval "test \"\${$as_ac_var+set}\" = set"; then … … 5261 5435 cat >conftest.$ac_ext <<_ACEOF 5262 5436 -#line 5912 "configure" 5263 +#line 619 8"configure"5437 +#line 6199 "configure" 5264 5438 #include "confdefs.h" 5265 5439 /* System header to define __stub macros and hopefully few prototypes, 5266 5440 which can conflict with char $ac_func (); below. */ 5267 @@ -5940,16 +622 6,16 @@5441 @@ -5940,16 +6227,16 @@ 5268 5442 } 5269 5443 _ACEOF 5270 5444 rm -f conftest.$ac_objext conftest$ac_exeext 5271 5445 -if { (eval echo "$as_me:5943: \"$ac_link\"") >&5 5272 +if { (eval echo "$as_me:62 29: \"$ac_link\"") >&55446 +if { (eval echo "$as_me:6230: \"$ac_link\"") >&5 5273 5447 (eval $ac_link) 2>&5 5274 5448 ac_status=$? 5275 5449 - echo "$as_me:5946: \$? = $ac_status" >&5 5276 + echo "$as_me:623 2: \$? = $ac_status" >&55450 + echo "$as_me:6233: \$? = $ac_status" >&5 5277 5451 (exit $ac_status); } && 5278 5452 { ac_try='test -s conftest$ac_exeext' 5279 5453 - { (eval echo "$as_me:5949: \"$ac_try\"") >&5 5280 + { (eval echo "$as_me:623 5: \"$ac_try\"") >&55454 + { (eval echo "$as_me:6236: \"$ac_try\"") >&5 5281 5455 (eval $ac_try) 2>&5 5282 5456 ac_status=$? 5283 5457 - echo "$as_me:5952: \$? = $ac_status" >&5 5284 + echo "$as_me:623 8: \$? = $ac_status" >&55458 + echo "$as_me:6239: \$? = $ac_status" >&5 5285 5459 (exit $ac_status); }; }; then 5286 5460 eval "$as_ac_var=yes" 5287 5461 else 5288 @@ -5959,7 +624 5,7 @@5462 @@ -5959,7 +6246,7 @@ 5289 5463 fi 5290 5464 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 5291 5465 fi 5292 5466 -echo "$as_me:5962: result: `eval echo '${'$as_ac_var'}'`" >&5 5293 +echo "$as_me:624 8: result: `eval echo '${'$as_ac_var'}'`" >&55467 +echo "$as_me:6249: result: `eval echo '${'$as_ac_var'}'`" >&5 5294 5468 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 5295 5469 if test `eval echo '${'$as_ac_var'}'` = yes; then 5296 5470 cat >>confdefs.h <<EOF 5297 @@ -5970,7 +625 6,7 @@5471 @@ -5970,7 +6257,7 @@ 5298 5472 done 5299 5473 5300 5474 else 5301 5475 - echo "$as_me:5973: checking if link/symlink functions work" >&5 5302 + echo "$as_me:62 59: checking if link/symlink functions work" >&55476 + echo "$as_me:6260: checking if link/symlink functions work" >&5 5303 5477 echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6 5304 5478 if test "${cf_cv_link_funcs+set}" = set; then 5305 5479 echo $ECHO_N "(cached) $ECHO_C" >&6 5306 @@ -5983,7 +62 69,7 @@5480 @@ -5983,7 +6270,7 @@ 5307 5481 eval 'ac_cv_func_'$cf_func'=error' 5308 5482 else 5309 5483 cat >conftest.$ac_ext <<_ACEOF 5310 5484 -#line 5986 "configure" 5311 +#line 627 2"configure"5485 +#line 6273 "configure" 5312 5486 #include "confdefs.h" 5313 5487 5314 5488 #include <sys/types.h> 5315 @@ -6013,15 +6 299,15 @@5489 @@ -6013,15 +6300,15 @@ 5316 5490 5317 5491 _ACEOF 5318 5492 rm -f conftest$ac_exeext 5319 5493 -if { (eval echo "$as_me:6016: \"$ac_link\"") >&5 5320 +if { (eval echo "$as_me:630 2: \"$ac_link\"") >&55494 +if { (eval echo "$as_me:6303: \"$ac_link\"") >&5 5321 5495 (eval $ac_link) 2>&5 5322 5496 ac_status=$? 5323 5497 - echo "$as_me:6019: \$? = $ac_status" >&5 5324 + echo "$as_me:630 5: \$? = $ac_status" >&55498 + echo "$as_me:6306: \$? = $ac_status" >&5 5325 5499 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 5326 5500 - { (eval echo "$as_me:6021: \"$ac_try\"") >&5 5327 + { (eval echo "$as_me:630 7: \"$ac_try\"") >&55501 + { (eval echo "$as_me:6308: \"$ac_try\"") >&5 5328 5502 (eval $ac_try) 2>&5 5329 5503 ac_status=$? 5330 5504 - echo "$as_me:6024: \$? = $ac_status" >&5 5331 + echo "$as_me:631 0: \$? = $ac_status" >&55505 + echo "$as_me:6311: \$? = $ac_status" >&5 5332 5506 (exit $ac_status); }; }; then 5333 5507 5334 5508 cf_cv_link_funcs="$cf_cv_link_funcs $cf_func" 5335 @@ -6039,7 +632 5,7 @@5509 @@ -6039,7 +6326,7 @@ 5336 5510 test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no 5337 5511 5338 5512 fi 5339 5513 -echo "$as_me:6042: result: $cf_cv_link_funcs" >&5 5340 +echo "$as_me:632 8: result: $cf_cv_link_funcs" >&55514 +echo "$as_me:6329: result: $cf_cv_link_funcs" >&5 5341 5515 echo "${ECHO_T}$cf_cv_link_funcs" >&6 5342 5516 test "$ac_cv_func_link" = yes && cat >>confdefs.h <<\EOF 5343 5517 #define HAVE_LINK 1 5344 @@ -6057,7 +634 3,7 @@5518 @@ -6057,7 +6344,7 @@ 5345 5519 # soft links (symbolic links) are useful for some systems where hard links do 5346 5520 # not work, or to make it simpler to copy terminfo trees around. 5347 5521 if test "$ac_cv_func_symlink" = yes ; then 5348 5522 - echo "$as_me:6060: checking if tic should use symbolic links" >&5 5349 + 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 5350 5524 echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6 5351 5525 5352 5526 # Check whether --enable-symlinks or --disable-symlinks was given. 5353 @@ -6067,21 +635 3,21 @@5527 @@ -6067,21 +6354,21 @@ 5354 5528 else 5355 5529 with_symlinks=no 5356 5530 fi; 5357 5531 - echo "$as_me:6070: result: $with_symlinks" >&5 5358 + echo "$as_me:635 6: result: $with_symlinks" >&55532 + echo "$as_me:6357: result: $with_symlinks" >&5 5359 5533 echo "${ECHO_T}$with_symlinks" >&6 5360 5534 fi … … 5364 5538 if test "$with_symlinks" = no ; then 5365 5539 - echo "$as_me:6077: checking if tic should use hard links" >&5 5366 + 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 5367 5541 echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6 5368 5542 if test "$ac_cv_func_link" = yes ; then … … 5372 5546 fi 5373 5547 - echo "$as_me:6084: result: $with_links" >&5 5374 + echo "$as_me:637 0: result: $with_links" >&55548 + echo "$as_me:6371: result: $with_links" >&5 5375 5549 echo "${ECHO_T}$with_links" >&6 5376 5550 fi 5377 5551 5378 @@ -6094,7 +638 0,7 @@5552 @@ -6094,7 +6381,7 @@ 5379 5553 EOF 5380 5554 5381 5555 ### use option --enable-broken-linker to force on use of broken-linker support 5382 5556 -echo "$as_me:6097: checking if you want broken-linker support code" >&5 5383 +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 5384 5558 echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 5385 5559 5386 5560 # Check whether --enable-broken_linker or --disable-broken_linker was given. 5387 @@ -6104,7 +639 0,7 @@5561 @@ -6104,7 +6391,7 @@ 5388 5562 else 5389 5563 with_broken_linker=${BROKEN_LINKER-no} 5390 5564 fi; 5391 5565 -echo "$as_me:6107: result: $with_broken_linker" >&5 5392 +echo "$as_me:639 3: result: $with_broken_linker" >&55566 +echo "$as_me:6394: result: $with_broken_linker" >&5 5393 5567 echo "${ECHO_T}$with_broken_linker" >&6 5394 5568 5395 5569 BROKEN_LINKER=0 5396 @@ -6124,14 +641 0,14 @@5570 @@ -6124,14 +6411,14 @@ 5397 5571 BROKEN_LINKER=1 5398 5572 test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6 5399 5573 5400 5574 -echo "${as_me-configure}:6127: testing cygwin linker is broken anyway ..." 1>&5 5401 +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 5402 5576 5403 5577 ;; … … 5407 5581 ### use option --enable-bsdpad to have tputs process BSD-style prefix padding 5408 5582 -echo "$as_me:6134: checking if tputs should process BSD-style prefix padding" >&5 5409 +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 5410 5584 echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6 5411 5585 5412 5586 # Check whether --enable-bsdpad or --disable-bsdpad was given. 5413 @@ -6141,7 +642 7,7 @@5587 @@ -6141,7 +6428,7 @@ 5414 5588 else 5415 5589 with_bsdpad=no 5416 5590 fi; 5417 5591 -echo "$as_me:6144: result: $with_bsdpad" >&5 5418 +echo "$as_me:643 0: result: $with_bsdpad" >&55592 +echo "$as_me:6431: result: $with_bsdpad" >&5 5419 5593 echo "${ECHO_T}$with_bsdpad" >&6 5420 5594 test "$with_bsdpad" = yes && cat >>confdefs.h <<\EOF 5421 5595 #define BSD_TPUTS 1 5422 @@ -6158,7 +644 4,7 @@5596 @@ -6158,7 +6445,7 @@ 5423 5597 5424 5598 # Check to define _XOPEN_SOURCE "automatically" 5425 5599 5426 5600 -echo "$as_me:6161: checking if $CC -U and -D options work together" >&5 5427 +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 5428 5602 echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6 5429 5603 if test "${cf_cv_cc_u_d_options+set}" = set; then 5430 5604 echo $ECHO_N "(cached) $ECHO_C" >&6 5431 @@ -6167,7 +645 3,7 @@5605 @@ -6167,7 +6454,7 @@ 5432 5606 cf_save_CPPFLAGS="$CPPFLAGS" 5433 5607 CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS" 5434 5608 cat >conftest.$ac_ext <<_ACEOF 5435 5609 -#line 6170 "configure" 5436 +#line 645 6"configure"5610 +#line 6457 "configure" 5437 5611 #include "confdefs.h" 5438 5612 5439 5613 int 5440 @@ -6186,16 +647 2,16 @@5614 @@ -6186,16 +6473,16 @@ 5441 5615 } 5442 5616 _ACEOF 5443 5617 rm -f conftest.$ac_objext 5444 5618 -if { (eval echo "$as_me:6189: \"$ac_compile\"") >&5 5445 +if { (eval echo "$as_me:647 5: \"$ac_compile\"") >&55619 +if { (eval echo "$as_me:6476: \"$ac_compile\"") >&5 5446 5620 (eval $ac_compile) 2>&5 5447 5621 ac_status=$? 5448 5622 - echo "$as_me:6192: \$? = $ac_status" >&5 5449 + echo "$as_me:647 8: \$? = $ac_status" >&55623 + echo "$as_me:6479: \$? = $ac_status" >&5 5450 5624 (exit $ac_status); } && 5451 5625 { ac_try='test -s conftest.$ac_objext' 5452 5626 - { (eval echo "$as_me:6195: \"$ac_try\"") >&5 5453 + { (eval echo "$as_me:648 1: \"$ac_try\"") >&55627 + { (eval echo "$as_me:6482: \"$ac_try\"") >&5 5454 5628 (eval $ac_try) 2>&5 5455 5629 ac_status=$? 5456 5630 - echo "$as_me:6198: \$? = $ac_status" >&5 5457 + echo "$as_me:648 4: \$? = $ac_status" >&55631 + echo "$as_me:6485: \$? = $ac_status" >&5 5458 5632 (exit $ac_status); }; }; then 5459 5633 5460 5634 cf_cv_cc_u_d_options=yes 5461 @@ -6209,14 +649 5,14 @@5635 @@ -6209,14 +6496,14 @@ 5462 5636 CPPFLAGS="$cf_save_CPPFLAGS" 5463 5637 5464 5638 fi 5465 5639 -echo "$as_me:6212: result: $cf_cv_cc_u_d_options" >&5 5466 +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 5467 5641 echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6 5468 5642 … … 5476 5650 ;; 5477 5651 freebsd*|dragonfly*) #(vi 5478 @@ -6233,16 +65 19,16 @@5652 @@ -6233,16 +6520,16 @@ 5479 5653 irix[56].*) #(vi 5480 5654 CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE" … … 5484 5658 5485 5659 -echo "$as_me:6238: checking if we must define _GNU_SOURCE" >&5 5486 +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 5487 5661 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 5488 5662 if test "${cf_cv_gnu_source+set}" = set; then … … 5492 5666 cat >conftest.$ac_ext <<_ACEOF 5493 5667 -#line 6245 "configure" 5494 +#line 653 1"configure"5668 +#line 6532 "configure" 5495 5669 #include "confdefs.h" 5496 5670 #include <sys/types.h> 5497 5671 int 5498 @@ -6257,16 +654 3,16 @@5672 @@ -6257,16 +6544,16 @@ 5499 5673 } 5500 5674 _ACEOF 5501 5675 rm -f conftest.$ac_objext 5502 5676 -if { (eval echo "$as_me:6260: \"$ac_compile\"") >&5 5503 +if { (eval echo "$as_me:654 6: \"$ac_compile\"") >&55677 +if { (eval echo "$as_me:6547: \"$ac_compile\"") >&5 5504 5678 (eval $ac_compile) 2>&5 5505 5679 ac_status=$? 5506 5680 - echo "$as_me:6263: \$? = $ac_status" >&5 5507 + echo "$as_me:65 49: \$? = $ac_status" >&55681 + echo "$as_me:6550: \$? = $ac_status" >&5 5508 5682 (exit $ac_status); } && 5509 5683 { ac_try='test -s conftest.$ac_objext' 5510 5684 - { (eval echo "$as_me:6266: \"$ac_try\"") >&5 5511 + { (eval echo "$as_me:655 2: \"$ac_try\"") >&55685 + { (eval echo "$as_me:6553: \"$ac_try\"") >&5 5512 5686 (eval $ac_try) 2>&5 5513 5687 ac_status=$? 5514 5688 - echo "$as_me:6269: \$? = $ac_status" >&5 5515 + echo "$as_me:655 5: \$? = $ac_status" >&55689 + echo "$as_me:6556: \$? = $ac_status" >&5 5516 5690 (exit $ac_status); }; }; then 5517 5691 cf_cv_gnu_source=no 5518 5692 else 5519 @@ -6275,7 +656 1,7 @@5693 @@ -6275,7 +6562,7 @@ 5520 5694 cf_save="$CPPFLAGS" 5521 5695 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" 5522 5696 cat >conftest.$ac_ext <<_ACEOF 5523 5697 -#line 6278 "configure" 5524 +#line 656 4"configure"5698 +#line 6565 "configure" 5525 5699 #include "confdefs.h" 5526 5700 #include <sys/types.h> 5527 5701 int 5528 @@ -6290,16 +657 6,16 @@5702 @@ -6290,16 +6577,16 @@ 5529 5703 } 5530 5704 _ACEOF 5531 5705 rm -f conftest.$ac_objext 5532 5706 -if { (eval echo "$as_me:6293: \"$ac_compile\"") >&5 5533 +if { (eval echo "$as_me:65 79: \"$ac_compile\"") >&55707 +if { (eval echo "$as_me:6580: \"$ac_compile\"") >&5 5534 5708 (eval $ac_compile) 2>&5 5535 5709 ac_status=$? 5536 5710 - echo "$as_me:6296: \$? = $ac_status" >&5 5537 + echo "$as_me:658 2: \$? = $ac_status" >&55711 + echo "$as_me:6583: \$? = $ac_status" >&5 5538 5712 (exit $ac_status); } && 5539 5713 { ac_try='test -s conftest.$ac_objext' 5540 5714 - { (eval echo "$as_me:6299: \"$ac_try\"") >&5 5541 + { (eval echo "$as_me:658 5: \"$ac_try\"") >&55715 + { (eval echo "$as_me:6586: \"$ac_try\"") >&5 5542 5716 (eval $ac_try) 2>&5 5543 5717 ac_status=$? 5544 5718 - echo "$as_me:6302: \$? = $ac_status" >&5 5545 + echo "$as_me:658 8: \$? = $ac_status" >&55719 + echo "$as_me:6589: \$? = $ac_status" >&5 5546 5720 (exit $ac_status); }; }; then 5547 5721 cf_cv_gnu_source=no 5548 5722 else 5549 @@ -6314,7 +660 0,7 @@5723 @@ -6314,7 +6601,7 @@ 5550 5724 rm -f conftest.$ac_objext conftest.$ac_ext 5551 5725 5552 5726 fi 5553 5727 -echo "$as_me:6317: result: $cf_cv_gnu_source" >&5 5554 +echo "$as_me:660 3: result: $cf_cv_gnu_source" >&55728 +echo "$as_me:6604: result: $cf_cv_gnu_source" >&5 5555 5729 echo "${ECHO_T}$cf_cv_gnu_source" >&6 5556 5730 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" 5557 5731 5558 @@ -6341,14 +662 7,14 @@5732 @@ -6341,14 +6628,14 @@ 5559 5733 CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__" 5560 5734 ;; 5561 5735 *) 5562 5736 - echo "$as_me:6344: checking if we should define _XOPEN_SOURCE" >&5 5563 + 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 5564 5738 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 5565 5739 if test "${cf_cv_xopen_source+set}" = set; then … … 5569 5743 cat >conftest.$ac_ext <<_ACEOF 5570 5744 -#line 6351 "configure" 5571 +#line 663 7"configure"5745 +#line 6638 "configure" 5572 5746 #include "confdefs.h" 5573 5747 #include <sys/types.h> 5574 5748 int 5575 @@ -6363,16 +66 49,16 @@5749 @@ -6363,16 +6650,16 @@ 5576 5750 } 5577 5751 _ACEOF 5578 5752 rm -f conftest.$ac_objext 5579 5753 -if { (eval echo "$as_me:6366: \"$ac_compile\"") >&5 5580 +if { (eval echo "$as_me:665 2: \"$ac_compile\"") >&55754 +if { (eval echo "$as_me:6653: \"$ac_compile\"") >&5 5581 5755 (eval $ac_compile) 2>&5 5582 5756 ac_status=$? 5583 5757 - echo "$as_me:6369: \$? = $ac_status" >&5 5584 + echo "$as_me:665 5: \$? = $ac_status" >&55758 + echo "$as_me:6656: \$? = $ac_status" >&5 5585 5759 (exit $ac_status); } && 5586 5760 { ac_try='test -s conftest.$ac_objext' 5587 5761 - { (eval echo "$as_me:6372: \"$ac_try\"") >&5 5588 + { (eval echo "$as_me:665 8: \"$ac_try\"") >&55762 + { (eval echo "$as_me:6659: \"$ac_try\"") >&5 5589 5763 (eval $ac_try) 2>&5 5590 5764 ac_status=$? 5591 5765 - echo "$as_me:6375: \$? = $ac_status" >&5 5592 + echo "$as_me:666 1: \$? = $ac_status" >&55766 + echo "$as_me:6662: \$? = $ac_status" >&5 5593 5767 (exit $ac_status); }; }; then 5594 5768 cf_cv_xopen_source=no 5595 5769 else 5596 @@ -6381,7 +666 7,7 @@5770 @@ -6381,7 +6668,7 @@ 5597 5771 cf_save="$CPPFLAGS" 5598 5772 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" 5599 5773 cat >conftest.$ac_ext <<_ACEOF 5600 5774 -#line 6384 "configure" 5601 +#line 667 0"configure"5775 +#line 6671 "configure" 5602 5776 #include "confdefs.h" 5603 5777 #include <sys/types.h> 5604 5778 int 5605 @@ -6396,16 +668 2,16 @@5779 @@ -6396,16 +6683,16 @@ 5606 5780 } 5607 5781 _ACEOF 5608 5782 rm -f conftest.$ac_objext 5609 5783 -if { (eval echo "$as_me:6399: \"$ac_compile\"") >&5 5610 +if { (eval echo "$as_me:668 5: \"$ac_compile\"") >&55784 +if { (eval echo "$as_me:6686: \"$ac_compile\"") >&5 5611 5785 (eval $ac_compile) 2>&5 5612 5786 ac_status=$? 5613 5787 - echo "$as_me:6402: \$? = $ac_status" >&5 5614 + echo "$as_me:668 8: \$? = $ac_status" >&55788 + echo "$as_me:6689: \$? = $ac_status" >&5 5615 5789 (exit $ac_status); } && 5616 5790 { ac_try='test -s conftest.$ac_objext' 5617 5791 - { (eval echo "$as_me:6405: \"$ac_try\"") >&5 5618 + { (eval echo "$as_me:669 1: \"$ac_try\"") >&55792 + { (eval echo "$as_me:6692: \"$ac_try\"") >&5 5619 5793 (eval $ac_try) 2>&5 5620 5794 ac_status=$? 5621 5795 - echo "$as_me:6408: \$? = $ac_status" >&5 5622 + echo "$as_me:669 4: \$? = $ac_status" >&55796 + echo "$as_me:6695: \$? = $ac_status" >&5 5623 5797 (exit $ac_status); }; }; then 5624 5798 cf_cv_xopen_source=no 5625 5799 else 5626 @@ -6420,7 +670 6,7 @@5800 @@ -6420,7 +6707,7 @@ 5627 5801 rm -f conftest.$ac_objext conftest.$ac_ext 5628 5802 5629 5803 fi 5630 5804 -echo "$as_me:6423: result: $cf_cv_xopen_source" >&5 5631 +echo "$as_me:67 09: result: $cf_cv_xopen_source" >&55805 +echo "$as_me:6710: result: $cf_cv_xopen_source" >&5 5632 5806 echo "${ECHO_T}$cf_cv_xopen_source" >&6 5633 5807 if test "$cf_cv_xopen_source" != no ; then 5634 5808 5635 @@ -6454,16 +674 0,16 @@5809 @@ -6454,16 +6741,16 @@ 5636 5810 sed -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?[ ]/ /g' \ 5637 5811 -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?$//g'` 5638 5812 5639 5813 -echo "$as_me:6457: checking if we should define _POSIX_C_SOURCE" >&5 5640 +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 5641 5815 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 5642 5816 if test "${cf_cv_posix_c_source+set}" = set; then … … 5645 5819 5646 5820 -echo "${as_me-configure}:6463: testing if the symbol is already defined go no further ..." 1>&5 5647 +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 5648 5822 5649 5823 cat >conftest.$ac_ext <<_ACEOF 5650 5824 -#line 6466 "configure" 5651 +#line 675 2"configure"5825 +#line 6753 "configure" 5652 5826 #include "confdefs.h" 5653 5827 #include <sys/types.h> 5654 5828 int 5655 @@ -6478,16 +676 4,16 @@5829 @@ -6478,16 +6765,16 @@ 5656 5830 } 5657 5831 _ACEOF 5658 5832 rm -f conftest.$ac_objext 5659 5833 -if { (eval echo "$as_me:6481: \"$ac_compile\"") >&5 5660 +if { (eval echo "$as_me:676 7: \"$ac_compile\"") >&55834 +if { (eval echo "$as_me:6768: \"$ac_compile\"") >&5 5661 5835 (eval $ac_compile) 2>&5 5662 5836 ac_status=$? 5663 5837 - echo "$as_me:6484: \$? = $ac_status" >&5 5664 + echo "$as_me:677 0: \$? = $ac_status" >&55838 + echo "$as_me:6771: \$? = $ac_status" >&5 5665 5839 (exit $ac_status); } && 5666 5840 { ac_try='test -s conftest.$ac_objext' 5667 5841 - { (eval echo "$as_me:6487: \"$ac_try\"") >&5 5668 + { (eval echo "$as_me:677 3: \"$ac_try\"") >&55842 + { (eval echo "$as_me:6774: \"$ac_try\"") >&5 5669 5843 (eval $ac_try) 2>&5 5670 5844 ac_status=$? 5671 5845 - echo "$as_me:6490: \$? = $ac_status" >&5 5672 + echo "$as_me:677 6: \$? = $ac_status" >&55846 + echo "$as_me:6777: \$? = $ac_status" >&5 5673 5847 (exit $ac_status); }; }; then 5674 5848 cf_cv_posix_c_source=no 5675 5849 else 5676 @@ -6508,7 +679 4,7 @@5850 @@ -6508,7 +6795,7 @@ 5677 5851 esac 5678 5852 if test "$cf_want_posix_source" = yes ; then 5679 5853 cat >conftest.$ac_ext <<_ACEOF 5680 5854 -#line 6511 "configure" 5681 +#line 679 7"configure"5855 +#line 6798 "configure" 5682 5856 #include "confdefs.h" 5683 5857 #include <sys/types.h> 5684 5858 int 5685 @@ -6523,16 +68 09,16 @@5859 @@ -6523,16 +6810,16 @@ 5686 5860 } 5687 5861 _ACEOF 5688 5862 rm -f conftest.$ac_objext 5689 5863 -if { (eval echo "$as_me:6526: \"$ac_compile\"") >&5 5690 +if { (eval echo "$as_me:681 2: \"$ac_compile\"") >&55864 +if { (eval echo "$as_me:6813: \"$ac_compile\"") >&5 5691 5865 (eval $ac_compile) 2>&5 5692 5866 ac_status=$? 5693 5867 - echo "$as_me:6529: \$? = $ac_status" >&5 5694 + echo "$as_me:681 5: \$? = $ac_status" >&55868 + echo "$as_me:6816: \$? = $ac_status" >&5 5695 5869 (exit $ac_status); } && 5696 5870 { ac_try='test -s conftest.$ac_objext' 5697 5871 - { (eval echo "$as_me:6532: \"$ac_try\"") >&5 5698 + { (eval echo "$as_me:681 8: \"$ac_try\"") >&55872 + { (eval echo "$as_me:6819: \"$ac_try\"") >&5 5699 5873 (eval $ac_try) 2>&5 5700 5874 ac_status=$? 5701 5875 - echo "$as_me:6535: \$? = $ac_status" >&5 5702 + echo "$as_me:682 1: \$? = $ac_status" >&55876 + echo "$as_me:6822: \$? = $ac_status" >&5 5703 5877 (exit $ac_status); }; }; then 5704 5878 : 5705 5879 else 5706 @@ -6543,15 +68 29,15 @@5880 @@ -6543,15 +6830,15 @@ 5707 5881 rm -f conftest.$ac_objext conftest.$ac_ext 5708 5882 fi 5709 5883 5710 5884 -echo "${as_me-configure}:6546: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 5711 +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 5712 5886 5713 5887 CFLAGS="$cf_trim_CFLAGS" … … 5715 5889 5716 5890 -echo "${as_me-configure}:6551: testing if the second compile does not leave our definition intact error ..." 1>&5 5717 +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 5718 5892 5719 5893 cat >conftest.$ac_ext <<_ACEOF 5720 5894 -#line 6554 "configure" 5721 +#line 684 0"configure"5895 +#line 6841 "configure" 5722 5896 #include "confdefs.h" 5723 5897 #include <sys/types.h> 5724 5898 int 5725 @@ -6566,16 +685 2,16 @@5899 @@ -6566,16 +6853,16 @@ 5726 5900 } 5727 5901 _ACEOF 5728 5902 rm -f conftest.$ac_objext 5729 5903 -if { (eval echo "$as_me:6569: \"$ac_compile\"") >&5 5730 +if { (eval echo "$as_me:685 5: \"$ac_compile\"") >&55904 +if { (eval echo "$as_me:6856: \"$ac_compile\"") >&5 5731 5905 (eval $ac_compile) 2>&5 5732 5906 ac_status=$? 5733 5907 - echo "$as_me:6572: \$? = $ac_status" >&5 5734 + echo "$as_me:685 8: \$? = $ac_status" >&55908 + echo "$as_me:6859: \$? = $ac_status" >&5 5735 5909 (exit $ac_status); } && 5736 5910 { ac_try='test -s conftest.$ac_objext' 5737 5911 - { (eval echo "$as_me:6575: \"$ac_try\"") >&5 5738 + { (eval echo "$as_me:686 1: \"$ac_try\"") >&55912 + { (eval echo "$as_me:6862: \"$ac_try\"") >&5 5739 5913 (eval $ac_try) 2>&5 5740 5914 ac_status=$? 5741 5915 - echo "$as_me:6578: \$? = $ac_status" >&5 5742 + echo "$as_me:686 4: \$? = $ac_status" >&55916 + echo "$as_me:6865: \$? = $ac_status" >&5 5743 5917 (exit $ac_status); }; }; then 5744 5918 : 5745 5919 else 5746 @@ -6591,7 +687 7,7 @@5920 @@ -6591,7 +6878,7 @@ 5747 5921 rm -f conftest.$ac_objext conftest.$ac_ext 5748 5922 5749 5923 fi 5750 5924 -echo "$as_me:6594: result: $cf_cv_posix_c_source" >&5 5751 +echo "$as_me:688 0: result: $cf_cv_posix_c_source" >&55925 +echo "$as_me:6881: result: $cf_cv_posix_c_source" >&5 5752 5926 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 5753 5927 5754 5928 if test "$cf_cv_posix_c_source" != no ; then 5755 @@ -6610,14 +689 6,14 @@5929 @@ -6610,14 +6897,14 @@ 5756 5930 5757 5931 # Work around breakage on OS X 5758 5932 5759 5933 -echo "$as_me:6613: checking if SIGWINCH is defined" >&5 5760 +echo "$as_me:6 899: checking if SIGWINCH is defined" >&55934 +echo "$as_me:6900: checking if SIGWINCH is defined" >&5 5761 5935 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6 5762 5936 if test "${cf_cv_define_sigwinch+set}" = set; then … … 5766 5940 cat >conftest.$ac_ext <<_ACEOF 5767 5941 -#line 6620 "configure" 5768 +#line 690 6"configure"5942 +#line 6907 "configure" 5769 5943 #include "confdefs.h" 5770 5944 5771 5945 #include <sys/types.h> 5772 @@ -6632,23 +691 8,23 @@5946 @@ -6632,23 +6919,23 @@ 5773 5947 } 5774 5948 _ACEOF 5775 5949 rm -f conftest.$ac_objext 5776 5950 -if { (eval echo "$as_me:6635: \"$ac_compile\"") >&5 5777 +if { (eval echo "$as_me:692 1: \"$ac_compile\"") >&55951 +if { (eval echo "$as_me:6922: \"$ac_compile\"") >&5 5778 5952 (eval $ac_compile) 2>&5 5779 5953 ac_status=$? 5780 5954 - echo "$as_me:6638: \$? = $ac_status" >&5 5781 + echo "$as_me:692 4: \$? = $ac_status" >&55955 + echo "$as_me:6925: \$? = $ac_status" >&5 5782 5956 (exit $ac_status); } && 5783 5957 { ac_try='test -s conftest.$ac_objext' 5784 5958 - { (eval echo "$as_me:6641: \"$ac_try\"") >&5 5785 + { (eval echo "$as_me:692 7: \"$ac_try\"") >&55959 + { (eval echo "$as_me:6928: \"$ac_try\"") >&5 5786 5960 (eval $ac_try) 2>&5 5787 5961 ac_status=$? 5788 5962 - echo "$as_me:6644: \$? = $ac_status" >&5 5789 + echo "$as_me:693 0: \$? = $ac_status" >&55963 + echo "$as_me:6931: \$? = $ac_status" >&5 5790 5964 (exit $ac_status); }; }; then 5791 5965 cf_cv_define_sigwinch=yes … … 5795 5969 cat >conftest.$ac_ext <<_ACEOF 5796 5970 -#line 6651 "configure" 5797 +#line 693 7"configure"5971 +#line 6938 "configure" 5798 5972 #include "confdefs.h" 5799 5973 5800 5974 #undef _XOPEN_SOURCE 5801 @@ -6666,16 +695 2,16 @@5975 @@ -6666,16 +6953,16 @@ 5802 5976 } 5803 5977 _ACEOF 5804 5978 rm -f conftest.$ac_objext 5805 5979 -if { (eval echo "$as_me:6669: \"$ac_compile\"") >&5 5806 +if { (eval echo "$as_me:695 5: \"$ac_compile\"") >&55980 +if { (eval echo "$as_me:6956: \"$ac_compile\"") >&5 5807 5981 (eval $ac_compile) 2>&5 5808 5982 ac_status=$? 5809 5983 - echo "$as_me:6672: \$? = $ac_status" >&5 5810 + echo "$as_me:695 8: \$? = $ac_status" >&55984 + echo "$as_me:6959: \$? = $ac_status" >&5 5811 5985 (exit $ac_status); } && 5812 5986 { ac_try='test -s conftest.$ac_objext' 5813 5987 - { (eval echo "$as_me:6675: \"$ac_try\"") >&5 5814 + { (eval echo "$as_me:696 1: \"$ac_try\"") >&55988 + { (eval echo "$as_me:6962: \"$ac_try\"") >&5 5815 5989 (eval $ac_try) 2>&5 5816 5990 ac_status=$? 5817 5991 - echo "$as_me:6678: \$? = $ac_status" >&5 5818 + echo "$as_me:696 4: \$? = $ac_status" >&55992 + echo "$as_me:6965: \$? = $ac_status" >&5 5819 5993 (exit $ac_status); }; }; then 5820 5994 cf_cv_define_sigwinch=maybe 5821 5995 else 5822 @@ -6689,11 +697 5,11 @@5996 @@ -6689,11 +6976,11 @@ 5823 5997 rm -f conftest.$ac_objext conftest.$ac_ext 5824 5998 5825 5999 fi 5826 6000 -echo "$as_me:6692: result: $cf_cv_define_sigwinch" >&5 5827 +echo "$as_me:697 8: result: $cf_cv_define_sigwinch" >&56001 +echo "$as_me:6979: result: $cf_cv_define_sigwinch" >&5 5828 6002 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6 5829 6003 5830 6004 if test "$cf_cv_define_sigwinch" = maybe ; then 5831 6005 -echo "$as_me:6696: checking for actual SIGWINCH definition" >&5 5832 +echo "$as_me:698 2: checking for actual SIGWINCH definition" >&56006 +echo "$as_me:6983: checking for actual SIGWINCH definition" >&5 5833 6007 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6 5834 6008 if test "${cf_cv_fixup_sigwinch+set}" = set; then 5835 6009 echo $ECHO_N "(cached) $ECHO_C" >&6 5836 @@ -6704,7 +699 0,7 @@6010 @@ -6704,7 +6991,7 @@ 5837 6011 while test $cf_sigwinch != 1 5838 6012 do 5839 6013 cat >conftest.$ac_ext <<_ACEOF 5840 6014 -#line 6707 "configure" 5841 +#line 699 3"configure"6015 +#line 6994 "configure" 5842 6016 #include "confdefs.h" 5843 6017 5844 6018 #undef _XOPEN_SOURCE 5845 @@ -6726,16 +701 2,16 @@6019 @@ -6726,16 +7013,16 @@ 5846 6020 } 5847 6021 _ACEOF 5848 6022 rm -f conftest.$ac_objext 5849 6023 -if { (eval echo "$as_me:6729: \"$ac_compile\"") >&5 5850 +if { (eval echo "$as_me:701 5: \"$ac_compile\"") >&56024 +if { (eval echo "$as_me:7016: \"$ac_compile\"") >&5 5851 6025 (eval $ac_compile) 2>&5 5852 6026 ac_status=$? 5853 6027 - echo "$as_me:6732: \$? = $ac_status" >&5 5854 + echo "$as_me:701 8: \$? = $ac_status" >&56028 + echo "$as_me:7019: \$? = $ac_status" >&5 5855 6029 (exit $ac_status); } && 5856 6030 { ac_try='test -s conftest.$ac_objext' 5857 6031 - { (eval echo "$as_me:6735: \"$ac_try\"") >&5 5858 + { (eval echo "$as_me:702 1: \"$ac_try\"") >&56032 + { (eval echo "$as_me:7022: \"$ac_try\"") >&5 5859 6033 (eval $ac_try) 2>&5 5860 6034 ac_status=$? 5861 6035 - echo "$as_me:6738: \$? = $ac_status" >&5 5862 + echo "$as_me:702 4: \$? = $ac_status" >&56036 + echo "$as_me:7025: \$? = $ac_status" >&5 5863 6037 (exit $ac_status); }; }; then 5864 6038 cf_cv_fixup_sigwinch=$cf_sigwinch 5865 6039 break 5866 @@ -6749,7 +703 5,7 @@6040 @@ -6749,7 +7036,7 @@ 5867 6041 done 5868 6042 5869 6043 fi 5870 6044 -echo "$as_me:6752: result: $cf_cv_fixup_sigwinch" >&5 5871 +echo "$as_me:703 8: result: $cf_cv_fixup_sigwinch" >&56045 +echo "$as_me:7039: result: $cf_cv_fixup_sigwinch" >&5 5872 6046 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 5873 6047 5874 6048 if test "$cf_cv_fixup_sigwinch" != unknown ; then 5875 @@ -6759,13 +704 5,13 @@6049 @@ -6759,13 +7046,13 @@ 5876 6050 5877 6051 # Checks for CODESET support. 5878 6052 5879 6053 - echo "$as_me:6762: checking for nl_langinfo and CODESET" >&5 5880 + echo "$as_me:704 8: checking for nl_langinfo and CODESET" >&56054 + echo "$as_me:7049: checking for nl_langinfo and CODESET" >&5 5881 6055 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 5882 6056 if test "${am_cv_langinfo_codeset+set}" = set; then … … 5885 6059 cat >conftest.$ac_ext <<_ACEOF 5886 6060 -#line 6768 "configure" 5887 +#line 705 4"configure"6061 +#line 7055 "configure" 5888 6062 #include "confdefs.h" 5889 6063 #include <langinfo.h> 5890 6064 int 5891 @@ -6777,16 +706 3,16 @@6065 @@ -6777,16 +7064,16 @@ 5892 6066 } 5893 6067 _ACEOF 5894 6068 rm -f conftest.$ac_objext conftest$ac_exeext 5895 6069 -if { (eval echo "$as_me:6780: \"$ac_link\"") >&5 5896 +if { (eval echo "$as_me:706 6: \"$ac_link\"") >&56070 +if { (eval echo "$as_me:7067: \"$ac_link\"") >&5 5897 6071 (eval $ac_link) 2>&5 5898 6072 ac_status=$? 5899 6073 - echo "$as_me:6783: \$? = $ac_status" >&5 5900 + echo "$as_me:70 69: \$? = $ac_status" >&56074 + echo "$as_me:7070: \$? = $ac_status" >&5 5901 6075 (exit $ac_status); } && 5902 6076 { ac_try='test -s conftest$ac_exeext' 5903 6077 - { (eval echo "$as_me:6786: \"$ac_try\"") >&5 5904 + { (eval echo "$as_me:707 2: \"$ac_try\"") >&56078 + { (eval echo "$as_me:7073: \"$ac_try\"") >&5 5905 6079 (eval $ac_try) 2>&5 5906 6080 ac_status=$? 5907 6081 - echo "$as_me:6789: \$? = $ac_status" >&5 5908 + echo "$as_me:707 5: \$? = $ac_status" >&56082 + echo "$as_me:7076: \$? = $ac_status" >&5 5909 6083 (exit $ac_status); }; }; then 5910 6084 am_cv_langinfo_codeset=yes 5911 6085 else 5912 @@ -6797,7 +708 3,7 @@6086 @@ -6797,7 +7084,7 @@ 5913 6087 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 5914 6088 5915 6089 fi 5916 6090 -echo "$as_me:6800: result: $am_cv_langinfo_codeset" >&5 5917 +echo "$as_me:708 6: result: $am_cv_langinfo_codeset" >&56091 +echo "$as_me:7087: result: $am_cv_langinfo_codeset" >&5 5918 6092 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 5919 6093 if test $am_cv_langinfo_codeset = yes; then 5920 6094 5921 @@ -6811,7 +709 7,7 @@6095 @@ -6811,7 +7098,7 @@ 5922 6096 NCURSES_OK_WCHAR_T= 5923 6097 NCURSES_OK_WINT_T= 5924 6098 5925 6099 -echo "$as_me:6814: checking if you want wide-character code" >&5 5926 +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 5927 6101 echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 5928 6102 5929 6103 # Check whether --enable-widec or --disable-widec was given. 5930 @@ -6821,7 +710 7,7 @@6104 @@ -6821,7 +7108,7 @@ 5931 6105 else 5932 6106 with_widec=no 5933 6107 fi; 5934 6108 -echo "$as_me:6824: result: $with_widec" >&5 5935 +echo "$as_me:711 0: result: $with_widec" >&56109 +echo "$as_me:7111: result: $with_widec" >&5 5936 6110 echo "${ECHO_T}$with_widec" >&6 5937 6111 if test "$with_widec" = yes ; then 5938 6112 LIB_SUFFIX="w${LIB_SUFFIX}" 5939 @@ -6829,10 +711 5,10 @@6113 @@ -6829,10 +7116,10 @@ 5940 6114 #define USE_WIDEC_SUPPORT 1 5941 6115 EOF 5942 6116 5943 6117 -echo "$as_me:6832: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 5944 +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 5945 6119 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6 5946 6120 cat >conftest.$ac_ext <<_ACEOF 5947 6121 -#line 6835 "configure" 5948 +#line 712 1"configure"6122 +#line 7122 "configure" 5949 6123 #include "confdefs.h" 5950 6124 #include <sys/types.h> 5951 6125 5952 @@ -6848,16 +713 4,16 @@6126 @@ -6848,16 +7135,16 @@ 5953 6127 } 5954 6128 _ACEOF 5955 6129 rm -f conftest.$ac_objext 5956 6130 -if { (eval echo "$as_me:6851: \"$ac_compile\"") >&5 5957 +if { (eval echo "$as_me:713 7: \"$ac_compile\"") >&56131 +if { (eval echo "$as_me:7138: \"$ac_compile\"") >&5 5958 6132 (eval $ac_compile) 2>&5 5959 6133 ac_status=$? 5960 6134 - echo "$as_me:6854: \$? = $ac_status" >&5 5961 + echo "$as_me:714 0: \$? = $ac_status" >&56135 + echo "$as_me:7141: \$? = $ac_status" >&5 5962 6136 (exit $ac_status); } && 5963 6137 { ac_try='test -s conftest.$ac_objext' 5964 6138 - { (eval echo "$as_me:6857: \"$ac_try\"") >&5 5965 + { (eval echo "$as_me:714 3: \"$ac_try\"") >&56139 + { (eval echo "$as_me:7144: \"$ac_try\"") >&5 5966 6140 (eval $ac_try) 2>&5 5967 6141 ac_status=$? 5968 6142 - echo "$as_me:6860: \$? = $ac_status" >&5 5969 + echo "$as_me:714 6: \$? = $ac_status" >&56143 + echo "$as_me:7147: \$? = $ac_status" >&5 5970 6144 (exit $ac_status); }; }; then 5971 6145 cf_result=no 5972 6146 else 5973 @@ -6866,16 +715 2,16 @@6147 @@ -6866,16 +7153,16 @@ 5974 6148 cf_result=yes 5975 6149 fi 5976 6150 rm -f conftest.$ac_objext conftest.$ac_ext 5977 6151 -echo "$as_me:6869: result: $cf_result" >&5 5978 +echo "$as_me:715 5: result: $cf_result" >&56152 +echo "$as_me:7156: result: $cf_result" >&5 5979 6153 echo "${ECHO_T}$cf_result" >&6 5980 6154 … … 5983 6157 elif test "x" != "x" ; then 5984 6158 - echo "$as_me:6875: checking checking for compatible value versus " >&5 5985 + echo "$as_me:716 1: checking checking for compatible value versus " >&56159 + echo "$as_me:7162: checking checking for compatible value versus " >&5 5986 6160 echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6 5987 6161 cat >conftest.$ac_ext <<_ACEOF 5988 6162 -#line 6878 "configure" 5989 +#line 716 4"configure"6163 +#line 7165 "configure" 5990 6164 #include "confdefs.h" 5991 6165 #include <sys/types.h> 5992 6166 5993 @@ -6891,16 +717 7,16 @@6167 @@ -6891,16 +7178,16 @@ 5994 6168 } 5995 6169 _ACEOF 5996 6170 rm -f conftest.$ac_objext 5997 6171 -if { (eval echo "$as_me:6894: \"$ac_compile\"") >&5 5998 +if { (eval echo "$as_me:718 0: \"$ac_compile\"") >&56172 +if { (eval echo "$as_me:7181: \"$ac_compile\"") >&5 5999 6173 (eval $ac_compile) 2>&5 6000 6174 ac_status=$? 6001 6175 - echo "$as_me:6897: \$? = $ac_status" >&5 6002 + echo "$as_me:718 3: \$? = $ac_status" >&56176 + echo "$as_me:7184: \$? = $ac_status" >&5 6003 6177 (exit $ac_status); } && 6004 6178 { ac_try='test -s conftest.$ac_objext' 6005 6179 - { (eval echo "$as_me:6900: \"$ac_try\"") >&5 6006 + { (eval echo "$as_me:718 6: \"$ac_try\"") >&56180 + { (eval echo "$as_me:7187: \"$ac_try\"") >&5 6007 6181 (eval $ac_try) 2>&5 6008 6182 ac_status=$? 6009 6183 - echo "$as_me:6903: \$? = $ac_status" >&5 6010 + echo "$as_me:71 89: \$? = $ac_status" >&56184 + echo "$as_me:7190: \$? = $ac_status" >&5 6011 6185 (exit $ac_status); }; }; then 6012 6186 cf_result=yes 6013 6187 else 6014 @@ -6909,7 +719 5,7 @@6188 @@ -6909,7 +7196,7 @@ 6015 6189 cf_result=no 6016 6190 fi 6017 6191 rm -f conftest.$ac_objext conftest.$ac_ext 6018 6192 - echo "$as_me:6912: result: $cf_result" >&5 6019 + echo "$as_me:719 8: result: $cf_result" >&56193 + echo "$as_me:7199: result: $cf_result" >&5 6020 6194 echo "${ECHO_T}$cf_result" >&6 6021 6195 if test "$cf_result" = no ; then 6022 6196 # perhaps we can override it - try... 6023 @@ -6923,13 +72 09,13 @@6197 @@ -6923,13 +7210,13 @@ 6024 6198 for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs 6025 6199 do 6026 6200 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 6027 6201 -echo "$as_me:6926: checking for $ac_func" >&5 6028 +echo "$as_me:721 2: checking for $ac_func" >&56202 +echo "$as_me:7213: checking for $ac_func" >&5 6029 6203 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 6030 6204 if eval "test \"\${$as_ac_var+set}\" = set"; then … … 6033 6207 cat >conftest.$ac_ext <<_ACEOF 6034 6208 -#line 6932 "configure" 6035 +#line 721 8"configure"6209 +#line 7219 "configure" 6036 6210 #include "confdefs.h" 6037 6211 /* System header to define __stub macros and hopefully few prototypes, 6038 6212 which can conflict with char $ac_func (); below. */ 6039 @@ -6960,16 +724 6,16 @@6213 @@ -6960,16 +7247,16 @@ 6040 6214 } 6041 6215 _ACEOF 6042 6216 rm -f conftest.$ac_objext conftest$ac_exeext 6043 6217 -if { (eval echo "$as_me:6963: \"$ac_link\"") >&5 6044 +if { (eval echo "$as_me:72 49: \"$ac_link\"") >&56218 +if { (eval echo "$as_me:7250: \"$ac_link\"") >&5 6045 6219 (eval $ac_link) 2>&5 6046 6220 ac_status=$? 6047 6221 - echo "$as_me:6966: \$? = $ac_status" >&5 6048 + echo "$as_me:725 2: \$? = $ac_status" >&56222 + echo "$as_me:7253: \$? = $ac_status" >&5 6049 6223 (exit $ac_status); } && 6050 6224 { ac_try='test -s conftest$ac_exeext' 6051 6225 - { (eval echo "$as_me:6969: \"$ac_try\"") >&5 6052 + { (eval echo "$as_me:725 5: \"$ac_try\"") >&56226 + { (eval echo "$as_me:7256: \"$ac_try\"") >&5 6053 6227 (eval $ac_try) 2>&5 6054 6228 ac_status=$? 6055 6229 - echo "$as_me:6972: \$? = $ac_status" >&5 6056 + echo "$as_me:725 8: \$? = $ac_status" >&56230 + echo "$as_me:7259: \$? = $ac_status" >&5 6057 6231 (exit $ac_status); }; }; then 6058 6232 eval "$as_ac_var=yes" 6059 6233 else 6060 @@ -6979,7 +726 5,7 @@6234 @@ -6979,7 +7266,7 @@ 6061 6235 fi 6062 6236 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 6063 6237 fi 6064 6238 -echo "$as_me:6982: result: `eval echo '${'$as_ac_var'}'`" >&5 6065 +echo "$as_me:726 8: result: `eval echo '${'$as_ac_var'}'`" >&56239 +echo "$as_me:7269: result: `eval echo '${'$as_ac_var'}'`" >&5 6066 6240 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 6067 6241 if test `eval echo '${'$as_ac_var'}'` = yes; then 6068 6242 cat >>confdefs.h <<EOF 6069 @@ -6991,7 +727 7,7 @@6243 @@ -6991,7 +7278,7 @@ 6070 6244 6071 6245 if test "$ac_cv_func_putwc" != yes ; then 6072 6246 6073 6247 -echo "$as_me:6994: checking for multibyte character support" >&5 6074 +echo "$as_me:728 0: checking for multibyte character support" >&56248 +echo "$as_me:7281: checking for multibyte character support" >&5 6075 6249 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 6076 6250 if test "${cf_cv_utf8_lib+set}" = set; then 6077 6251 echo $ECHO_N "(cached) $ECHO_C" >&6 6078 @@ -6999,7 +728 5,7 @@6252 @@ -6999,7 +7286,7 @@ 6079 6253 6080 6254 cf_save_LIBS="$LIBS" 6081 6255 cat >conftest.$ac_ext <<_ACEOF 6082 6256 -#line 7002 "configure" 6083 +#line 728 8"configure"6257 +#line 7289 "configure" 6084 6258 #include "confdefs.h" 6085 6259 6086 6260 #include <stdlib.h> 6087 @@ -7012,16 +729 8,16 @@6261 @@ -7012,16 +7299,16 @@ 6088 6262 } 6089 6263 _ACEOF 6090 6264 rm -f conftest.$ac_objext conftest$ac_exeext 6091 6265 -if { (eval echo "$as_me:7015: \"$ac_link\"") >&5 6092 +if { (eval echo "$as_me:730 1: \"$ac_link\"") >&56266 +if { (eval echo "$as_me:7302: \"$ac_link\"") >&5 6093 6267 (eval $ac_link) 2>&5 6094 6268 ac_status=$? 6095 6269 - echo "$as_me:7018: \$? = $ac_status" >&5 6096 + echo "$as_me:730 4: \$? = $ac_status" >&56270 + echo "$as_me:7305: \$? = $ac_status" >&5 6097 6271 (exit $ac_status); } && 6098 6272 { ac_try='test -s conftest$ac_exeext' 6099 6273 - { (eval echo "$as_me:7021: \"$ac_try\"") >&5 6100 + { (eval echo "$as_me:730 7: \"$ac_try\"") >&56274 + { (eval echo "$as_me:7308: \"$ac_try\"") >&5 6101 6275 (eval $ac_try) 2>&5 6102 6276 ac_status=$? 6103 6277 - echo "$as_me:7024: \$? = $ac_status" >&5 6104 + echo "$as_me:731 0: \$? = $ac_status" >&56278 + echo "$as_me:7311: \$? = $ac_status" >&5 6105 6279 (exit $ac_status); }; }; then 6106 6280 cf_cv_utf8_lib=yes 6107 6281 else 6108 @@ -7033,10 +73 19,10 @@6282 @@ -7033,10 +7320,10 @@ 6109 6283 cf_cv_header_path_utf8= 6110 6284 cf_cv_library_path_utf8= 6111 6285 6112 6286 -echo "${as_me-configure}:7036: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 6113 +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 6114 6288 6115 6289 cat >conftest.$ac_ext <<_ACEOF 6116 6290 -#line 7039 "configure" 6117 +#line 732 5"configure"6291 +#line 7326 "configure" 6118 6292 #include "confdefs.h" 6119 6293 6120 6294 #include <libutf8.h> 6121 @@ -7049,16 +733 5,16 @@6295 @@ -7049,16 +7336,16 @@ 6122 6296 } 6123 6297 _ACEOF 6124 6298 rm -f conftest.$ac_objext conftest$ac_exeext 6125 6299 -if { (eval echo "$as_me:7052: \"$ac_link\"") >&5 6126 +if { (eval echo "$as_me:733 8: \"$ac_link\"") >&56300 +if { (eval echo "$as_me:7339: \"$ac_link\"") >&5 6127 6301 (eval $ac_link) 2>&5 6128 6302 ac_status=$? 6129 6303 - echo "$as_me:7055: \$? = $ac_status" >&5 6130 + echo "$as_me:734 1: \$? = $ac_status" >&56304 + echo "$as_me:7342: \$? = $ac_status" >&5 6131 6305 (exit $ac_status); } && 6132 6306 { ac_try='test -s conftest$ac_exeext' 6133 6307 - { (eval echo "$as_me:7058: \"$ac_try\"") >&5 6134 + { (eval echo "$as_me:734 4: \"$ac_try\"") >&56308 + { (eval echo "$as_me:7345: \"$ac_try\"") >&5 6135 6309 (eval $ac_try) 2>&5 6136 6310 ac_status=$? 6137 6311 - echo "$as_me:7061: \$? = $ac_status" >&5 6138 + echo "$as_me:734 7: \$? = $ac_status" >&56312 + echo "$as_me:7348: \$? = $ac_status" >&5 6139 6313 (exit $ac_status); }; }; then 6140 6314 cf_cv_find_linkage_utf8=yes 6141 6315 else 6142 @@ -7067,12 +735 3,41 @@6316 @@ -7067,12 +7354,41 @@ 6143 6317 6144 6318 cf_cv_find_linkage_utf8=no … … 6147 6321 + test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 6148 6322 + 6149 +echo "${as_me-configure}:735 8: testing find linkage for utf8 library ..." 1>&56150 + 6151 +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 6152 6326 6153 6327 cf_save_CPPFLAGS="$CPPFLAGS" … … 6184 6358 test "/usr" != "$prefix" && \ 6185 6359 test -d "/usr" && \ 6186 @@ -7143,16 +745 8,18 @@6360 @@ -7143,16 +7459,18 @@ 6187 6361 test -d $oldincludedir/utf8 && cf_search="$cf_search $oldincludedir/utf8" 6188 6362 } … … 6196 6370 6197 6371 -echo "${as_me-configure}:7151: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 6198 +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 6199 6373 6200 6374 CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8" 6201 6375 cat >conftest.$ac_ext <<_ACEOF 6202 6376 -#line 7155 "configure" 6203 +#line 747 2"configure"6377 +#line 7473 "configure" 6204 6378 #include "confdefs.h" 6205 6379 6206 6380 #include <libutf8.h> 6207 @@ -7165,21 +748 2,21 @@6381 @@ -7165,21 +7483,21 @@ 6208 6382 } 6209 6383 _ACEOF 6210 6384 rm -f conftest.$ac_objext 6211 6385 -if { (eval echo "$as_me:7168: \"$ac_compile\"") >&5 6212 +if { (eval echo "$as_me:748 5: \"$ac_compile\"") >&56386 +if { (eval echo "$as_me:7486: \"$ac_compile\"") >&5 6213 6387 (eval $ac_compile) 2>&5 6214 6388 ac_status=$? 6215 6389 - echo "$as_me:7171: \$? = $ac_status" >&5 6216 + echo "$as_me:748 8: \$? = $ac_status" >&56390 + echo "$as_me:7489: \$? = $ac_status" >&5 6217 6391 (exit $ac_status); } && 6218 6392 { ac_try='test -s conftest.$ac_objext' 6219 6393 - { (eval echo "$as_me:7174: \"$ac_try\"") >&5 6220 + { (eval echo "$as_me:749 1: \"$ac_try\"") >&56394 + { (eval echo "$as_me:7492: \"$ac_try\"") >&5 6221 6395 (eval $ac_try) 2>&5 6222 6396 ac_status=$? 6223 6397 - echo "$as_me:7177: \$? = $ac_status" >&5 6224 + echo "$as_me:749 4: \$? = $ac_status" >&56398 + echo "$as_me:7495: \$? = $ac_status" >&5 6225 6399 (exit $ac_status); }; }; then 6226 6400 … … 6228 6402 6229 6403 -echo "${as_me-configure}:7182: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 6230 +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 6231 6405 6232 6406 cf_cv_find_linkage_utf8=maybe 6233 6407 cf_test_CPPFLAGS="$CPPFLAGS" 6234 @@ -7197,13 +751 4,39 @@6408 @@ -7197,13 +7515,39 @@ 6235 6409 6236 6410 if test "$cf_cv_find_linkage_utf8" = maybe ; then 6237 6411 6238 6412 -echo "${as_me-configure}:7200: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 6239 +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 6240 6414 6241 6415 cf_save_LIBS="$LIBS" … … 6274 6448 test "/usr" != "$prefix" && \ 6275 6449 test -d "/usr" && \ 6276 @@ -7260,18 +760 3,20 @@6450 @@ -7260,18 +7604,20 @@ 6277 6451 test -d $HOME/utf8/lib/utf8 && cf_search="$cf_search $HOME/utf8/lib/utf8" 6278 6452 } … … 6286 6460 6287 6461 -echo "${as_me-configure}:7268: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 6288 +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 6289 6463 6290 6464 CPPFLAGS="$cf_test_CPPFLAGS" … … 6293 6467 cat >conftest.$ac_ext <<_ACEOF 6294 6468 -#line 7274 "configure" 6295 +#line 76 19"configure"6469 +#line 7620 "configure" 6296 6470 #include "confdefs.h" 6297 6471 6298 6472 #include <libutf8.h> 6299 @@ -7284,21 +76 29,21 @@6473 @@ -7284,21 +7630,21 @@ 6300 6474 } 6301 6475 _ACEOF 6302 6476 rm -f conftest.$ac_objext conftest$ac_exeext 6303 6477 -if { (eval echo "$as_me:7287: \"$ac_link\"") >&5 6304 +if { (eval echo "$as_me:763 2: \"$ac_link\"") >&56478 +if { (eval echo "$as_me:7633: \"$ac_link\"") >&5 6305 6479 (eval $ac_link) 2>&5 6306 6480 ac_status=$? 6307 6481 - echo "$as_me:7290: \$? = $ac_status" >&5 6308 + echo "$as_me:763 5: \$? = $ac_status" >&56482 + echo "$as_me:7636: \$? = $ac_status" >&5 6309 6483 (exit $ac_status); } && 6310 6484 { ac_try='test -s conftest$ac_exeext' 6311 6485 - { (eval echo "$as_me:7293: \"$ac_try\"") >&5 6312 + { (eval echo "$as_me:763 8: \"$ac_try\"") >&56486 + { (eval echo "$as_me:7639: \"$ac_try\"") >&5 6313 6487 (eval $ac_try) 2>&5 6314 6488 ac_status=$? 6315 6489 - echo "$as_me:7296: \$? = $ac_status" >&5 6316 + echo "$as_me:764 1: \$? = $ac_status" >&56490 + echo "$as_me:7642: \$? = $ac_status" >&5 6317 6491 (exit $ac_status); }; }; then 6318 6492 … … 6320 6494 6321 6495 -echo "${as_me-configure}:7301: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 6322 +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 6323 6497 6324 6498 cf_cv_find_linkage_utf8=yes 6325 6499 cf_cv_library_file_utf8="-lutf8" 6326 @@ -7336,7 +768 1,7 @@6500 @@ -7336,7 +7682,7 @@ 6327 6501 fi 6328 6502 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 6329 6503 fi 6330 6504 -echo "$as_me:7339: result: $cf_cv_utf8_lib" >&5 6331 +echo "$as_me:768 4: result: $cf_cv_utf8_lib" >&56505 +echo "$as_me:7685: result: $cf_cv_utf8_lib" >&5 6332 6506 echo "${ECHO_T}$cf_cv_utf8_lib" >&6 6333 6507 6334 6508 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between 6335 @@ -7364,13 +77 09,13 @@6509 @@ -7364,13 +7710,13 @@ 6336 6510 fi 6337 6511 … … 6345 6519 cat >conftest.$ac_ext <<_ACEOF 6346 6520 -#line 7373 "configure" 6347 +#line 771 8"configure"6521 +#line 7719 "configure" 6348 6522 #include "confdefs.h" 6349 6523 #include <stdio.h> 6350 6524 int 6351 @@ -7382,16 +772 7,16 @@6525 @@ -7382,16 +7728,16 @@ 6352 6526 } 6353 6527 _ACEOF 6354 6528 rm -f conftest.$ac_objext 6355 6529 -if { (eval echo "$as_me:7385: \"$ac_compile\"") >&5 6356 +if { (eval echo "$as_me:773 0: \"$ac_compile\"") >&56530 +if { (eval echo "$as_me:7731: \"$ac_compile\"") >&5 6357 6531 (eval $ac_compile) 2>&5 6358 6532 ac_status=$? 6359 6533 - echo "$as_me:7388: \$? = $ac_status" >&5 6360 + echo "$as_me:773 3: \$? = $ac_status" >&56534 + echo "$as_me:7734: \$? = $ac_status" >&5 6361 6535 (exit $ac_status); } && 6362 6536 { ac_try='test -s conftest.$ac_objext' 6363 6537 - { (eval echo "$as_me:7391: \"$ac_try\"") >&5 6364 + { (eval echo "$as_me:773 6: \"$ac_try\"") >&56538 + { (eval echo "$as_me:7737: \"$ac_try\"") >&5 6365 6539 (eval $ac_try) 2>&5 6366 6540 ac_status=$? 6367 6541 - echo "$as_me:7394: \$? = $ac_status" >&5 6368 + echo "$as_me:77 39: \$? = $ac_status" >&56542 + echo "$as_me:7740: \$? = $ac_status" >&5 6369 6543 (exit $ac_status); }; }; then 6370 6544 : 6371 6545 else 6372 @@ -7408,13 +775 3,13 @@6546 @@ -7408,13 +7754,13 @@ 6373 6547 if test "$cf_have_incdir" = no ; then 6374 6548 test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 6375 6549 6376 6550 -echo "${as_me-configure}:7411: testing adding $cf_add_incdir to include-path ..." 1>&5 6377 +echo "${as_me-configure}:7756: testing adding $cf_add_incdir to include-path ..." 1>&5 6378 6379 CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" 6551 +echo "${as_me-configure}:7757: testing adding $cf_add_incdir to include-path ..." 1>&5 6552 6553 - CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" 6554 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 6380 6555 6381 6556 - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` … … 6388 6563 break 6389 6564 fi 6390 @@ -7442,7 +778 7,7 @@6565 @@ -7442,7 +7788,7 @@ 6391 6566 if test "$cf_have_libdir" = no ; then 6392 6567 test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 6393 6568 6394 6569 -echo "${as_me-configure}:7445: testing adding $cf_add_libdir to library-path ..." 1>&5 6395 +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 6396 6571 6397 6572 LDFLAGS="-L$cf_add_libdir $LDFLAGS" 6398 6573 fi 6399 @@ -7459,14 +780 4,14 @@6574 @@ -7459,14 +7805,14 @@ 6400 6575 fi 6401 6576 6402 6577 # This is needed on Tru64 5.0 to declare mbstate_t 6403 6578 -echo "$as_me:7462: checking if we must include wchar.h to declare mbstate_t" >&5 6404 +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 6405 6580 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6 6406 6581 if test "${cf_cv_mbstate_t+set}" = set; then … … 6410 6585 cat >conftest.$ac_ext <<_ACEOF 6411 6586 -#line 7469 "configure" 6412 +#line 781 4"configure"6587 +#line 7815 "configure" 6413 6588 #include "confdefs.h" 6414 6589 6415 6590 #include <stdlib.h> 6416 @@ -7484,23 +78 29,23 @@6591 @@ -7484,23 +7830,23 @@ 6417 6592 } 6418 6593 _ACEOF 6419 6594 rm -f conftest.$ac_objext 6420 6595 -if { (eval echo "$as_me:7487: \"$ac_compile\"") >&5 6421 +if { (eval echo "$as_me:783 2: \"$ac_compile\"") >&56596 +if { (eval echo "$as_me:7833: \"$ac_compile\"") >&5 6422 6597 (eval $ac_compile) 2>&5 6423 6598 ac_status=$? 6424 6599 - echo "$as_me:7490: \$? = $ac_status" >&5 6425 + echo "$as_me:783 5: \$? = $ac_status" >&56600 + echo "$as_me:7836: \$? = $ac_status" >&5 6426 6601 (exit $ac_status); } && 6427 6602 { ac_try='test -s conftest.$ac_objext' 6428 6603 - { (eval echo "$as_me:7493: \"$ac_try\"") >&5 6429 + { (eval echo "$as_me:783 8: \"$ac_try\"") >&56604 + { (eval echo "$as_me:7839: \"$ac_try\"") >&5 6430 6605 (eval $ac_try) 2>&5 6431 6606 ac_status=$? 6432 6607 - echo "$as_me:7496: \$? = $ac_status" >&5 6433 + echo "$as_me:784 1: \$? = $ac_status" >&56608 + echo "$as_me:7842: \$? = $ac_status" >&5 6434 6609 (exit $ac_status); }; }; then 6435 6610 cf_cv_mbstate_t=no … … 6439 6614 cat >conftest.$ac_ext <<_ACEOF 6440 6615 -#line 7503 "configure" 6441 +#line 784 8"configure"6616 +#line 7849 "configure" 6442 6617 #include "confdefs.h" 6443 6618 6444 6619 #include <stdlib.h> 6445 @@ -7519,16 +786 4,16 @@6620 @@ -7519,16 +7865,16 @@ 6446 6621 } 6447 6622 _ACEOF 6448 6623 rm -f conftest.$ac_objext 6449 6624 -if { (eval echo "$as_me:7522: \"$ac_compile\"") >&5 6450 +if { (eval echo "$as_me:786 7: \"$ac_compile\"") >&56625 +if { (eval echo "$as_me:7868: \"$ac_compile\"") >&5 6451 6626 (eval $ac_compile) 2>&5 6452 6627 ac_status=$? 6453 6628 - echo "$as_me:7525: \$? = $ac_status" >&5 6454 + echo "$as_me:787 0: \$? = $ac_status" >&56629 + echo "$as_me:7871: \$? = $ac_status" >&5 6455 6630 (exit $ac_status); } && 6456 6631 { ac_try='test -s conftest.$ac_objext' 6457 6632 - { (eval echo "$as_me:7528: \"$ac_try\"") >&5 6458 + { (eval echo "$as_me:787 3: \"$ac_try\"") >&56633 + { (eval echo "$as_me:7874: \"$ac_try\"") >&5 6459 6634 (eval $ac_try) 2>&5 6460 6635 ac_status=$? 6461 6636 - echo "$as_me:7531: \$? = $ac_status" >&5 6462 + echo "$as_me:787 6: \$? = $ac_status" >&56637 + echo "$as_me:7877: \$? = $ac_status" >&5 6463 6638 (exit $ac_status); }; }; then 6464 6639 cf_cv_mbstate_t=yes 6465 6640 else 6466 @@ -7540,7 +788 5,7 @@6641 @@ -7540,7 +7886,7 @@ 6467 6642 fi 6468 6643 rm -f conftest.$ac_objext conftest.$ac_ext 6469 6644 fi 6470 6645 -echo "$as_me:7543: result: $cf_cv_mbstate_t" >&5 6471 +echo "$as_me:788 8: result: $cf_cv_mbstate_t" >&56646 +echo "$as_me:7889: result: $cf_cv_mbstate_t" >&5 6472 6647 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 6473 6648 6474 6649 if test "$cf_cv_mbstate_t" = yes ; then 6475 @@ -7557,14 +790 2,14 @@6650 @@ -7557,14 +7903,14 @@ 6476 6651 fi 6477 6652 6478 6653 # This is needed on Tru64 5.0 to declare wchar_t 6479 6654 -echo "$as_me:7560: checking if we must include wchar.h to declare wchar_t" >&5 6480 +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 6481 6656 echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6 6482 6657 if test "${cf_cv_wchar_t+set}" = set; then … … 6486 6661 cat >conftest.$ac_ext <<_ACEOF 6487 6662 -#line 7567 "configure" 6488 +#line 791 2"configure"6663 +#line 7913 "configure" 6489 6664 #include "confdefs.h" 6490 6665 6491 6666 #include <stdlib.h> 6492 @@ -7582,23 +792 7,23 @@6667 @@ -7582,23 +7928,23 @@ 6493 6668 } 6494 6669 _ACEOF 6495 6670 rm -f conftest.$ac_objext 6496 6671 -if { (eval echo "$as_me:7585: \"$ac_compile\"") >&5 6497 +if { (eval echo "$as_me:793 0: \"$ac_compile\"") >&56672 +if { (eval echo "$as_me:7931: \"$ac_compile\"") >&5 6498 6673 (eval $ac_compile) 2>&5 6499 6674 ac_status=$? 6500 6675 - echo "$as_me:7588: \$? = $ac_status" >&5 6501 + echo "$as_me:793 3: \$? = $ac_status" >&56676 + echo "$as_me:7934: \$? = $ac_status" >&5 6502 6677 (exit $ac_status); } && 6503 6678 { ac_try='test -s conftest.$ac_objext' 6504 6679 - { (eval echo "$as_me:7591: \"$ac_try\"") >&5 6505 + { (eval echo "$as_me:793 6: \"$ac_try\"") >&56680 + { (eval echo "$as_me:7937: \"$ac_try\"") >&5 6506 6681 (eval $ac_try) 2>&5 6507 6682 ac_status=$? 6508 6683 - echo "$as_me:7594: \$? = $ac_status" >&5 6509 + echo "$as_me:79 39: \$? = $ac_status" >&56684 + echo "$as_me:7940: \$? = $ac_status" >&5 6510 6685 (exit $ac_status); }; }; then 6511 6686 cf_cv_wchar_t=no … … 6515 6690 cat >conftest.$ac_ext <<_ACEOF 6516 6691 -#line 7601 "configure" 6517 +#line 794 6"configure"6692 +#line 7947 "configure" 6518 6693 #include "confdefs.h" 6519 6694 6520 6695 #include <stdlib.h> 6521 @@ -7617,16 +796 2,16 @@6696 @@ -7617,16 +7963,16 @@ 6522 6697 } 6523 6698 _ACEOF 6524 6699 rm -f conftest.$ac_objext 6525 6700 -if { (eval echo "$as_me:7620: \"$ac_compile\"") >&5 6526 +if { (eval echo "$as_me:796 5: \"$ac_compile\"") >&56701 +if { (eval echo "$as_me:7966: \"$ac_compile\"") >&5 6527 6702 (eval $ac_compile) 2>&5 6528 6703 ac_status=$? 6529 6704 - echo "$as_me:7623: \$? = $ac_status" >&5 6530 + echo "$as_me:796 8: \$? = $ac_status" >&56705 + echo "$as_me:7969: \$? = $ac_status" >&5 6531 6706 (exit $ac_status); } && 6532 6707 { ac_try='test -s conftest.$ac_objext' 6533 6708 - { (eval echo "$as_me:7626: \"$ac_try\"") >&5 6534 + { (eval echo "$as_me:797 1: \"$ac_try\"") >&56709 + { (eval echo "$as_me:7972: \"$ac_try\"") >&5 6535 6710 (eval $ac_try) 2>&5 6536 6711 ac_status=$? 6537 6712 - echo "$as_me:7629: \$? = $ac_status" >&5 6538 + echo "$as_me:797 4: \$? = $ac_status" >&56713 + echo "$as_me:7975: \$? = $ac_status" >&5 6539 6714 (exit $ac_status); }; }; then 6540 6715 cf_cv_wchar_t=yes 6541 6716 else 6542 @@ -7638,7 +798 3,7 @@6717 @@ -7638,7 +7984,7 @@ 6543 6718 fi 6544 6719 rm -f conftest.$ac_objext conftest.$ac_ext 6545 6720 fi 6546 6721 -echo "$as_me:7641: result: $cf_cv_wchar_t" >&5 6547 +echo "$as_me:798 6: result: $cf_cv_wchar_t" >&56722 +echo "$as_me:7987: result: $cf_cv_wchar_t" >&5 6548 6723 echo "${ECHO_T}$cf_cv_wchar_t" >&6 6549 6724 6550 6725 if test "$cf_cv_wchar_t" = yes ; then 6551 @@ -7660,14 +800 5,14 @@6726 @@ -7660,14 +8006,14 @@ 6552 6727 fi 6553 6728 6554 6729 # This is needed on Tru64 5.0 to declare wint_t 6555 6730 -echo "$as_me:7663: checking if we must include wchar.h to declare wint_t" >&5 6556 +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 6557 6732 echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6 6558 6733 if test "${cf_cv_wint_t+set}" = set; then … … 6562 6737 cat >conftest.$ac_ext <<_ACEOF 6563 6738 -#line 7670 "configure" 6564 +#line 801 5"configure"6739 +#line 8016 "configure" 6565 6740 #include "confdefs.h" 6566 6741 6567 6742 #include <stdlib.h> 6568 @@ -7685,23 +803 0,23 @@6743 @@ -7685,23 +8031,23 @@ 6569 6744 } 6570 6745 _ACEOF 6571 6746 rm -f conftest.$ac_objext 6572 6747 -if { (eval echo "$as_me:7688: \"$ac_compile\"") >&5 6573 +if { (eval echo "$as_me:803 3: \"$ac_compile\"") >&56748 +if { (eval echo "$as_me:8034: \"$ac_compile\"") >&5 6574 6749 (eval $ac_compile) 2>&5 6575 6750 ac_status=$? 6576 6751 - echo "$as_me:7691: \$? = $ac_status" >&5 6577 + echo "$as_me:803 6: \$? = $ac_status" >&56752 + echo "$as_me:8037: \$? = $ac_status" >&5 6578 6753 (exit $ac_status); } && 6579 6754 { ac_try='test -s conftest.$ac_objext' 6580 6755 - { (eval echo "$as_me:7694: \"$ac_try\"") >&5 6581 + { (eval echo "$as_me:80 39: \"$ac_try\"") >&56756 + { (eval echo "$as_me:8040: \"$ac_try\"") >&5 6582 6757 (eval $ac_try) 2>&5 6583 6758 ac_status=$? 6584 6759 - echo "$as_me:7697: \$? = $ac_status" >&5 6585 + echo "$as_me:804 2: \$? = $ac_status" >&56760 + echo "$as_me:8043: \$? = $ac_status" >&5 6586 6761 (exit $ac_status); }; }; then 6587 6762 cf_cv_wint_t=no … … 6591 6766 cat >conftest.$ac_ext <<_ACEOF 6592 6767 -#line 7704 "configure" 6593 +#line 80 49"configure"6768 +#line 8050 "configure" 6594 6769 #include "confdefs.h" 6595 6770 6596 6771 #include <stdlib.h> 6597 @@ -7720,16 +806 5,16 @@6772 @@ -7720,16 +8066,16 @@ 6598 6773 } 6599 6774 _ACEOF 6600 6775 rm -f conftest.$ac_objext 6601 6776 -if { (eval echo "$as_me:7723: \"$ac_compile\"") >&5 6602 +if { (eval echo "$as_me:806 8: \"$ac_compile\"") >&56777 +if { (eval echo "$as_me:8069: \"$ac_compile\"") >&5 6603 6778 (eval $ac_compile) 2>&5 6604 6779 ac_status=$? 6605 6780 - echo "$as_me:7726: \$? = $ac_status" >&5 6606 + echo "$as_me:807 1: \$? = $ac_status" >&56781 + echo "$as_me:8072: \$? = $ac_status" >&5 6607 6782 (exit $ac_status); } && 6608 6783 { ac_try='test -s conftest.$ac_objext' 6609 6784 - { (eval echo "$as_me:7729: \"$ac_try\"") >&5 6610 + { (eval echo "$as_me:807 4: \"$ac_try\"") >&56785 + { (eval echo "$as_me:8075: \"$ac_try\"") >&5 6611 6786 (eval $ac_try) 2>&5 6612 6787 ac_status=$? 6613 6788 - echo "$as_me:7732: \$? = $ac_status" >&5 6614 + echo "$as_me:807 7: \$? = $ac_status" >&56789 + echo "$as_me:8078: \$? = $ac_status" >&5 6615 6790 (exit $ac_status); }; }; then 6616 6791 cf_cv_wint_t=yes 6617 6792 else 6618 @@ -7741,7 +808 6,7 @@6793 @@ -7741,7 +8087,7 @@ 6619 6794 fi 6620 6795 rm -f conftest.$ac_objext conftest.$ac_ext 6621 6796 fi 6622 6797 -echo "$as_me:7744: result: $cf_cv_wint_t" >&5 6623 +echo "$as_me:80 89: result: $cf_cv_wint_t" >&56798 +echo "$as_me:8090: result: $cf_cv_wint_t" >&5 6624 6799 echo "${ECHO_T}$cf_cv_wint_t" >&6 6625 6800 6626 6801 if test "$cf_cv_wint_t" = yes ; then 6627 @@ -7780,7 +812 5,7 @@6802 @@ -7780,7 +8126,7 @@ 6628 6803 ;; 6629 6804 esac 6630 6805 6631 6806 -echo "$as_me:7783: checking whether to enable _LP64 definition in curses.h" >&5 6632 +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 6633 6808 echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6 6634 6809 6635 6810 # Check whether --enable-lp64 or --disable-lp64 was given. 6636 @@ -7790,7 +813 5,7 @@6811 @@ -7790,7 +8136,7 @@ 6637 6812 else 6638 6813 with_lp64=$default_with_lp64 6639 6814 fi; 6640 6815 -echo "$as_me:7793: result: $with_lp64" >&5 6641 +echo "$as_me:813 8: result: $with_lp64" >&56816 +echo "$as_me:8139: result: $with_lp64" >&5 6642 6817 echo "${ECHO_T}$with_lp64" >&6 6643 6818 6644 6819 if test "$with_lp64" = yes ; then 6645 @@ -7806,7 +815 1,7 @@6820 @@ -7806,7 +8152,7 @@ 6646 6821 fi; 6647 6822 if test "$enable_largefile" != no; then 6648 6823 6649 6824 - echo "$as_me:7809: checking for special C compiler options needed for large files" >&5 6650 + 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 6651 6826 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 6652 6827 if test "${ac_cv_sys_largefile_CC+set}" = set; then 6653 6828 echo $ECHO_N "(cached) $ECHO_C" >&6 6654 @@ -7818,7 +816 3,7 @@6829 @@ -7818,7 +8164,7 @@ 6655 6830 # IRIX 6.2 and later do not support large files by default, 6656 6831 # so use the C compiler's -n32 option if that helps. 6657 6832 cat >conftest.$ac_ext <<_ACEOF 6658 6833 -#line 7821 "configure" 6659 +#line 816 6"configure"6834 +#line 8167 "configure" 6660 6835 #include "confdefs.h" 6661 6836 #include <sys/types.h> 6662 6837 /* Check that off_t can represent 2**63 - 1 correctly. 6663 @@ -7838,16 +818 3,16 @@6838 @@ -7838,16 +8184,16 @@ 6664 6839 } 6665 6840 _ACEOF 6666 6841 rm -f conftest.$ac_objext 6667 6842 -if { (eval echo "$as_me:7841: \"$ac_compile\"") >&5 6668 +if { (eval echo "$as_me:818 6: \"$ac_compile\"") >&56843 +if { (eval echo "$as_me:8187: \"$ac_compile\"") >&5 6669 6844 (eval $ac_compile) 2>&5 6670 6845 ac_status=$? 6671 6846 - echo "$as_me:7844: \$? = $ac_status" >&5 6672 + echo "$as_me:81 89: \$? = $ac_status" >&56847 + echo "$as_me:8190: \$? = $ac_status" >&5 6673 6848 (exit $ac_status); } && 6674 6849 { ac_try='test -s conftest.$ac_objext' 6675 6850 - { (eval echo "$as_me:7847: \"$ac_try\"") >&5 6676 + { (eval echo "$as_me:819 2: \"$ac_try\"") >&56851 + { (eval echo "$as_me:8193: \"$ac_try\"") >&5 6677 6852 (eval $ac_try) 2>&5 6678 6853 ac_status=$? 6679 6854 - echo "$as_me:7850: \$? = $ac_status" >&5 6680 + echo "$as_me:819 5: \$? = $ac_status" >&56855 + echo "$as_me:8196: \$? = $ac_status" >&5 6681 6856 (exit $ac_status); }; }; then 6682 6857 break 6683 6858 else 6684 @@ -7857,16 +820 2,16 @@6859 @@ -7857,16 +8203,16 @@ 6685 6860 rm -f conftest.$ac_objext 6686 6861 CC="$CC -n32" 6687 6862 rm -f conftest.$ac_objext 6688 6863 -if { (eval echo "$as_me:7860: \"$ac_compile\"") >&5 6689 +if { (eval echo "$as_me:820 5: \"$ac_compile\"") >&56864 +if { (eval echo "$as_me:8206: \"$ac_compile\"") >&5 6690 6865 (eval $ac_compile) 2>&5 6691 6866 ac_status=$? 6692 6867 - echo "$as_me:7863: \$? = $ac_status" >&5 6693 + echo "$as_me:820 8: \$? = $ac_status" >&56868 + echo "$as_me:8209: \$? = $ac_status" >&5 6694 6869 (exit $ac_status); } && 6695 6870 { ac_try='test -s conftest.$ac_objext' 6696 6871 - { (eval echo "$as_me:7866: \"$ac_try\"") >&5 6697 + { (eval echo "$as_me:821 1: \"$ac_try\"") >&56872 + { (eval echo "$as_me:8212: \"$ac_try\"") >&5 6698 6873 (eval $ac_try) 2>&5 6699 6874 ac_status=$? 6700 6875 - echo "$as_me:7869: \$? = $ac_status" >&5 6701 + echo "$as_me:821 4: \$? = $ac_status" >&56876 + echo "$as_me:8215: \$? = $ac_status" >&5 6702 6877 (exit $ac_status); }; }; then 6703 6878 ac_cv_sys_largefile_CC=' -n32'; break 6704 6879 else 6705 @@ -7880,13 +822 5,13 @@6880 @@ -7880,13 +8226,13 @@ 6706 6881 rm -f conftest.$ac_ext 6707 6882 fi 6708 6883 fi 6709 6884 -echo "$as_me:7883: result: $ac_cv_sys_largefile_CC" >&5 6710 +echo "$as_me:822 8: result: $ac_cv_sys_largefile_CC" >&56885 +echo "$as_me:8229: result: $ac_cv_sys_largefile_CC" >&5 6711 6886 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 6712 6887 if test "$ac_cv_sys_largefile_CC" != no; then … … 6715 6890 6716 6891 - echo "$as_me:7889: checking for _FILE_OFFSET_BITS value needed for large files" >&5 6717 + 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 6718 6893 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 6719 6894 if test "${ac_cv_sys_file_offset_bits+set}" = set; then 6720 6895 echo $ECHO_N "(cached) $ECHO_C" >&6 6721 @@ -7894,7 +82 39,7 @@6896 @@ -7894,7 +8240,7 @@ 6722 6897 while :; do 6723 6898 ac_cv_sys_file_offset_bits=no 6724 6899 cat >conftest.$ac_ext <<_ACEOF 6725 6900 -#line 7897 "configure" 6726 +#line 824 2"configure"6901 +#line 8243 "configure" 6727 6902 #include "confdefs.h" 6728 6903 #include <sys/types.h> 6729 6904 /* Check that off_t can represent 2**63 - 1 correctly. 6730 @@ -7914,16 +82 59,16 @@6905 @@ -7914,16 +8260,16 @@ 6731 6906 } 6732 6907 _ACEOF 6733 6908 rm -f conftest.$ac_objext 6734 6909 -if { (eval echo "$as_me:7917: \"$ac_compile\"") >&5 6735 +if { (eval echo "$as_me:826 2: \"$ac_compile\"") >&56910 +if { (eval echo "$as_me:8263: \"$ac_compile\"") >&5 6736 6911 (eval $ac_compile) 2>&5 6737 6912 ac_status=$? 6738 6913 - echo "$as_me:7920: \$? = $ac_status" >&5 6739 + echo "$as_me:826 5: \$? = $ac_status" >&56914 + echo "$as_me:8266: \$? = $ac_status" >&5 6740 6915 (exit $ac_status); } && 6741 6916 { ac_try='test -s conftest.$ac_objext' 6742 6917 - { (eval echo "$as_me:7923: \"$ac_try\"") >&5 6743 + { (eval echo "$as_me:826 8: \"$ac_try\"") >&56918 + { (eval echo "$as_me:8269: \"$ac_try\"") >&5 6744 6919 (eval $ac_try) 2>&5 6745 6920 ac_status=$? 6746 6921 - echo "$as_me:7926: \$? = $ac_status" >&5 6747 + echo "$as_me:827 1: \$? = $ac_status" >&56922 + echo "$as_me:8272: \$? = $ac_status" >&5 6748 6923 (exit $ac_status); }; }; then 6749 6924 break 6750 6925 else 6751 @@ -7932,7 +827 7,7 @@6926 @@ -7932,7 +8278,7 @@ 6752 6927 fi 6753 6928 rm -f conftest.$ac_objext conftest.$ac_ext 6754 6929 cat >conftest.$ac_ext <<_ACEOF 6755 6930 -#line 7935 "configure" 6756 +#line 828 0"configure"6931 +#line 8281 "configure" 6757 6932 #include "confdefs.h" 6758 6933 #define _FILE_OFFSET_BITS 64 6759 6934 #include <sys/types.h> 6760 @@ -7953,16 +829 8,16 @@6935 @@ -7953,16 +8299,16 @@ 6761 6936 } 6762 6937 _ACEOF 6763 6938 rm -f conftest.$ac_objext 6764 6939 -if { (eval echo "$as_me:7956: \"$ac_compile\"") >&5 6765 +if { (eval echo "$as_me:830 1: \"$ac_compile\"") >&56940 +if { (eval echo "$as_me:8302: \"$ac_compile\"") >&5 6766 6941 (eval $ac_compile) 2>&5 6767 6942 ac_status=$? 6768 6943 - echo "$as_me:7959: \$? = $ac_status" >&5 6769 + echo "$as_me:830 4: \$? = $ac_status" >&56944 + echo "$as_me:8305: \$? = $ac_status" >&5 6770 6945 (exit $ac_status); } && 6771 6946 { ac_try='test -s conftest.$ac_objext' 6772 6947 - { (eval echo "$as_me:7962: \"$ac_try\"") >&5 6773 + { (eval echo "$as_me:830 7: \"$ac_try\"") >&56948 + { (eval echo "$as_me:8308: \"$ac_try\"") >&5 6774 6949 (eval $ac_try) 2>&5 6775 6950 ac_status=$? 6776 6951 - echo "$as_me:7965: \$? = $ac_status" >&5 6777 + echo "$as_me:831 0: \$? = $ac_status" >&56952 + echo "$as_me:8311: \$? = $ac_status" >&5 6778 6953 (exit $ac_status); }; }; then 6779 6954 ac_cv_sys_file_offset_bits=64; break 6780 6955 else 6781 @@ -7973,7 +831 8,7 @@6956 @@ -7973,7 +8319,7 @@ 6782 6957 break 6783 6958 done 6784 6959 fi 6785 6960 -echo "$as_me:7976: result: $ac_cv_sys_file_offset_bits" >&5 6786 +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 6787 6962 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 6788 6963 if test "$ac_cv_sys_file_offset_bits" != no; then 6789 6964 6790 @@ -7983,7 +832 8,7 @@6965 @@ -7983,7 +8329,7 @@ 6791 6966 6792 6967 fi 6793 6968 rm -f conftest* 6794 6969 - echo "$as_me:7986: checking for _LARGE_FILES value needed for large files" >&5 6795 + 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 6796 6971 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 6797 6972 if test "${ac_cv_sys_large_files+set}" = set; then 6798 6973 echo $ECHO_N "(cached) $ECHO_C" >&6 6799 @@ -7991,7 +833 6,7 @@6974 @@ -7991,7 +8337,7 @@ 6800 6975 while :; do 6801 6976 ac_cv_sys_large_files=no 6802 6977 cat >conftest.$ac_ext <<_ACEOF 6803 6978 -#line 7994 "configure" 6804 +#line 83 39"configure"6979 +#line 8340 "configure" 6805 6980 #include "confdefs.h" 6806 6981 #include <sys/types.h> 6807 6982 /* Check that off_t can represent 2**63 - 1 correctly. 6808 @@ -8011,16 +835 6,16 @@6983 @@ -8011,16 +8357,16 @@ 6809 6984 } 6810 6985 _ACEOF 6811 6986 rm -f conftest.$ac_objext 6812 6987 -if { (eval echo "$as_me:8014: \"$ac_compile\"") >&5 6813 +if { (eval echo "$as_me:83 59: \"$ac_compile\"") >&56988 +if { (eval echo "$as_me:8360: \"$ac_compile\"") >&5 6814 6989 (eval $ac_compile) 2>&5 6815 6990 ac_status=$? 6816 6991 - echo "$as_me:8017: \$? = $ac_status" >&5 6817 + echo "$as_me:836 2: \$? = $ac_status" >&56992 + echo "$as_me:8363: \$? = $ac_status" >&5 6818 6993 (exit $ac_status); } && 6819 6994 { ac_try='test -s conftest.$ac_objext' 6820 6995 - { (eval echo "$as_me:8020: \"$ac_try\"") >&5 6821 + { (eval echo "$as_me:836 5: \"$ac_try\"") >&56996 + { (eval echo "$as_me:8366: \"$ac_try\"") >&5 6822 6997 (eval $ac_try) 2>&5 6823 6998 ac_status=$? 6824 6999 - echo "$as_me:8023: \$? = $ac_status" >&5 6825 + echo "$as_me:836 8: \$? = $ac_status" >&57000 + echo "$as_me:8369: \$? = $ac_status" >&5 6826 7001 (exit $ac_status); }; }; then 6827 7002 break 6828 7003 else 6829 @@ -8029,7 +837 4,7 @@7004 @@ -8029,7 +8375,7 @@ 6830 7005 fi 6831 7006 rm -f conftest.$ac_objext conftest.$ac_ext 6832 7007 cat >conftest.$ac_ext <<_ACEOF 6833 7008 -#line 8032 "configure" 6834 +#line 837 7"configure"7009 +#line 8378 "configure" 6835 7010 #include "confdefs.h" 6836 7011 #define _LARGE_FILES 1 6837 7012 #include <sys/types.h> 6838 @@ -8050,16 +839 5,16 @@7013 @@ -8050,16 +8396,16 @@ 6839 7014 } 6840 7015 _ACEOF 6841 7016 rm -f conftest.$ac_objext 6842 7017 -if { (eval echo "$as_me:8053: \"$ac_compile\"") >&5 6843 +if { (eval echo "$as_me:839 8: \"$ac_compile\"") >&57018 +if { (eval echo "$as_me:8399: \"$ac_compile\"") >&5 6844 7019 (eval $ac_compile) 2>&5 6845 7020 ac_status=$? 6846 7021 - echo "$as_me:8056: \$? = $ac_status" >&5 6847 + echo "$as_me:840 1: \$? = $ac_status" >&57022 + echo "$as_me:8402: \$? = $ac_status" >&5 6848 7023 (exit $ac_status); } && 6849 7024 { ac_try='test -s conftest.$ac_objext' 6850 7025 - { (eval echo "$as_me:8059: \"$ac_try\"") >&5 6851 + { (eval echo "$as_me:840 4: \"$ac_try\"") >&57026 + { (eval echo "$as_me:8405: \"$ac_try\"") >&5 6852 7027 (eval $ac_try) 2>&5 6853 7028 ac_status=$? 6854 7029 - echo "$as_me:8062: \$? = $ac_status" >&5 6855 + echo "$as_me:840 7: \$? = $ac_status" >&57030 + echo "$as_me:8408: \$? = $ac_status" >&5 6856 7031 (exit $ac_status); }; }; then 6857 7032 ac_cv_sys_large_files=1; break 6858 7033 else 6859 @@ -8070,7 +841 5,7 @@7034 @@ -8070,7 +8416,7 @@ 6860 7035 break 6861 7036 done 6862 7037 fi 6863 7038 -echo "$as_me:8073: result: $ac_cv_sys_large_files" >&5 6864 +echo "$as_me:841 8: result: $ac_cv_sys_large_files" >&57039 +echo "$as_me:8419: result: $ac_cv_sys_large_files" >&5 6865 7040 echo "${ECHO_T}$ac_cv_sys_large_files" >&6 6866 7041 if test "$ac_cv_sys_large_files" != no; then 6867 7042 6868 @@ -8083,7 +842 8,7 @@7043 @@ -8083,7 +8429,7 @@ 6869 7044 fi 6870 7045 6871 7046 if test "$enable_largefile" != no ; then 6872 7047 - echo "$as_me:8086: checking for _LARGEFILE_SOURCE value needed for large files" >&5 6873 + 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 6874 7049 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 6875 7050 if test "${ac_cv_sys_largefile_source+set}" = set; then 6876 7051 echo $ECHO_N "(cached) $ECHO_C" >&6 6877 @@ -8091,7 +843 6,7 @@7052 @@ -8091,7 +8437,7 @@ 6878 7053 while :; do 6879 7054 ac_cv_sys_largefile_source=no 6880 7055 cat >conftest.$ac_ext <<_ACEOF 6881 7056 -#line 8094 "configure" 6882 +#line 84 39"configure"7057 +#line 8440 "configure" 6883 7058 #include "confdefs.h" 6884 7059 #include <stdio.h> 6885 7060 int 6886 @@ -8103,16 +844 8,16 @@7061 @@ -8103,16 +8449,16 @@ 6887 7062 } 6888 7063 _ACEOF 6889 7064 rm -f conftest.$ac_objext 6890 7065 -if { (eval echo "$as_me:8106: \"$ac_compile\"") >&5 6891 +if { (eval echo "$as_me:845 1: \"$ac_compile\"") >&57066 +if { (eval echo "$as_me:8452: \"$ac_compile\"") >&5 6892 7067 (eval $ac_compile) 2>&5 6893 7068 ac_status=$? 6894 7069 - echo "$as_me:8109: \$? = $ac_status" >&5 6895 + echo "$as_me:845 4: \$? = $ac_status" >&57070 + echo "$as_me:8455: \$? = $ac_status" >&5 6896 7071 (exit $ac_status); } && 6897 7072 { ac_try='test -s conftest.$ac_objext' 6898 7073 - { (eval echo "$as_me:8112: \"$ac_try\"") >&5 6899 + { (eval echo "$as_me:845 7: \"$ac_try\"") >&57074 + { (eval echo "$as_me:8458: \"$ac_try\"") >&5 6900 7075 (eval $ac_try) 2>&5 6901 7076 ac_status=$? 6902 7077 - echo "$as_me:8115: \$? = $ac_status" >&5 6903 + echo "$as_me:846 0: \$? = $ac_status" >&57078 + echo "$as_me:8461: \$? = $ac_status" >&5 6904 7079 (exit $ac_status); }; }; then 6905 7080 break 6906 7081 else 6907 @@ -8121,7 +846 6,7 @@7082 @@ -8121,7 +8467,7 @@ 6908 7083 fi 6909 7084 rm -f conftest.$ac_objext conftest.$ac_ext 6910 7085 cat >conftest.$ac_ext <<_ACEOF 6911 7086 -#line 8124 "configure" 6912 +#line 84 69"configure"7087 +#line 8470 "configure" 6913 7088 #include "confdefs.h" 6914 7089 #define _LARGEFILE_SOURCE 1 6915 7090 #include <stdio.h> 6916 @@ -8134,16 +84 79,16 @@7091 @@ -8134,16 +8480,16 @@ 6917 7092 } 6918 7093 _ACEOF 6919 7094 rm -f conftest.$ac_objext 6920 7095 -if { (eval echo "$as_me:8137: \"$ac_compile\"") >&5 6921 +if { (eval echo "$as_me:848 2: \"$ac_compile\"") >&57096 +if { (eval echo "$as_me:8483: \"$ac_compile\"") >&5 6922 7097 (eval $ac_compile) 2>&5 6923 7098 ac_status=$? 6924 7099 - echo "$as_me:8140: \$? = $ac_status" >&5 6925 + echo "$as_me:848 5: \$? = $ac_status" >&57100 + echo "$as_me:8486: \$? = $ac_status" >&5 6926 7101 (exit $ac_status); } && 6927 7102 { ac_try='test -s conftest.$ac_objext' 6928 7103 - { (eval echo "$as_me:8143: \"$ac_try\"") >&5 6929 + { (eval echo "$as_me:848 8: \"$ac_try\"") >&57104 + { (eval echo "$as_me:8489: \"$ac_try\"") >&5 6930 7105 (eval $ac_try) 2>&5 6931 7106 ac_status=$? 6932 7107 - echo "$as_me:8146: \$? = $ac_status" >&5 6933 + echo "$as_me:849 1: \$? = $ac_status" >&57108 + echo "$as_me:8492: \$? = $ac_status" >&5 6934 7109 (exit $ac_status); }; }; then 6935 7110 ac_cv_sys_largefile_source=1; break 6936 7111 else 6937 @@ -8154,7 +8 499,7 @@7112 @@ -8154,7 +8500,7 @@ 6938 7113 break 6939 7114 done 6940 7115 fi 6941 7116 -echo "$as_me:8157: result: $ac_cv_sys_largefile_source" >&5 6942 +echo "$as_me:850 2: result: $ac_cv_sys_largefile_source" >&57117 +echo "$as_me:8503: result: $ac_cv_sys_largefile_source" >&5 6943 7118 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 6944 7119 if test "$ac_cv_sys_largefile_source" != no; then 6945 7120 6946 @@ -8168,13 +851 3,13 @@7121 @@ -8168,13 +8514,13 @@ 6947 7122 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug 6948 7123 # in glibc 2.1.3, but that breaks too many other things. 6949 7124 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. 6950 7125 -echo "$as_me:8171: checking for fseeko" >&5 6951 +echo "$as_me:851 6: checking for fseeko" >&57126 +echo "$as_me:8517: checking for fseeko" >&5 6952 7127 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 6953 7128 if test "${ac_cv_func_fseeko+set}" = set; then … … 6956 7131 cat >conftest.$ac_ext <<_ACEOF 6957 7132 -#line 8177 "configure" 6958 +#line 852 2"configure"7133 +#line 8523 "configure" 6959 7134 #include "confdefs.h" 6960 7135 #include <stdio.h> 6961 7136 int 6962 @@ -8186,16 +853 1,16 @@7137 @@ -8186,16 +8532,16 @@ 6963 7138 } 6964 7139 _ACEOF 6965 7140 rm -f conftest.$ac_objext conftest$ac_exeext 6966 7141 -if { (eval echo "$as_me:8189: \"$ac_link\"") >&5 6967 +if { (eval echo "$as_me:853 4: \"$ac_link\"") >&57142 +if { (eval echo "$as_me:8535: \"$ac_link\"") >&5 6968 7143 (eval $ac_link) 2>&5 6969 7144 ac_status=$? 6970 7145 - echo "$as_me:8192: \$? = $ac_status" >&5 6971 + echo "$as_me:853 7: \$? = $ac_status" >&57146 + echo "$as_me:8538: \$? = $ac_status" >&5 6972 7147 (exit $ac_status); } && 6973 7148 { ac_try='test -s conftest$ac_exeext' 6974 7149 - { (eval echo "$as_me:8195: \"$ac_try\"") >&5 6975 + { (eval echo "$as_me:854 0: \"$ac_try\"") >&57150 + { (eval echo "$as_me:8541: \"$ac_try\"") >&5 6976 7151 (eval $ac_try) 2>&5 6977 7152 ac_status=$? 6978 7153 - echo "$as_me:8198: \$? = $ac_status" >&5 6979 + echo "$as_me:854 3: \$? = $ac_status" >&57154 + echo "$as_me:8544: \$? = $ac_status" >&5 6980 7155 (exit $ac_status); }; }; then 6981 7156 ac_cv_func_fseeko=yes 6982 7157 else 6983 @@ -8205,7 +855 0,7 @@7158 @@ -8205,7 +8551,7 @@ 6984 7159 fi 6985 7160 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 6986 7161 fi 6987 7162 -echo "$as_me:8208: result: $ac_cv_func_fseeko" >&5 6988 +echo "$as_me:855 3: result: $ac_cv_func_fseeko" >&57163 +echo "$as_me:8554: result: $ac_cv_func_fseeko" >&5 6989 7164 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 6990 7165 if test $ac_cv_func_fseeko = yes; then 6991 7166 6992 @@ -8226,14 +857 1,14 @@7167 @@ -8226,14 +8572,14 @@ 6993 7168 test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE " 6994 7169 test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits " 6995 7170 6996 7171 - echo "$as_me:8229: checking whether to use struct dirent64" >&5 6997 + echo "$as_me:857 4: checking whether to use struct dirent64" >&57172 + echo "$as_me:8575: checking whether to use struct dirent64" >&5 6998 7173 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 6999 7174 if test "${cf_cv_struct_dirent64+set}" = set; then … … 7003 7178 cat >conftest.$ac_ext <<_ACEOF 7004 7179 -#line 8236 "configure" 7005 +#line 858 1"configure"7180 +#line 8582 "configure" 7006 7181 #include "confdefs.h" 7007 7182 7008 7183 #include <sys/types.h> 7009 @@ -8254,16 +8 599,16 @@7184 @@ -8254,16 +8600,16 @@ 7010 7185 } 7011 7186 _ACEOF 7012 7187 rm -f conftest.$ac_objext 7013 7188 -if { (eval echo "$as_me:8257: \"$ac_compile\"") >&5 7014 +if { (eval echo "$as_me:860 2: \"$ac_compile\"") >&57189 +if { (eval echo "$as_me:8603: \"$ac_compile\"") >&5 7015 7190 (eval $ac_compile) 2>&5 7016 7191 ac_status=$? 7017 7192 - echo "$as_me:8260: \$? = $ac_status" >&5 7018 + echo "$as_me:860 5: \$? = $ac_status" >&57193 + echo "$as_me:8606: \$? = $ac_status" >&5 7019 7194 (exit $ac_status); } && 7020 7195 { ac_try='test -s conftest.$ac_objext' 7021 7196 - { (eval echo "$as_me:8263: \"$ac_try\"") >&5 7022 + { (eval echo "$as_me:860 8: \"$ac_try\"") >&57197 + { (eval echo "$as_me:8609: \"$ac_try\"") >&5 7023 7198 (eval $ac_try) 2>&5 7024 7199 ac_status=$? 7025 7200 - echo "$as_me:8266: \$? = $ac_status" >&5 7026 + echo "$as_me:861 1: \$? = $ac_status" >&57201 + echo "$as_me:8612: \$? = $ac_status" >&5 7027 7202 (exit $ac_status); }; }; then 7028 7203 cf_cv_struct_dirent64=yes 7029 7204 else 7030 @@ -8274,7 +86 19,7 @@7205 @@ -8274,7 +8620,7 @@ 7031 7206 rm -f conftest.$ac_objext conftest.$ac_ext 7032 7207 7033 7208 fi 7034 7209 -echo "$as_me:8277: result: $cf_cv_struct_dirent64" >&5 7035 +echo "$as_me:862 2: result: $cf_cv_struct_dirent64" >&57210 +echo "$as_me:8623: result: $cf_cv_struct_dirent64" >&5 7036 7211 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 7037 7212 test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF 7038 7213 #define HAVE_STRUCT_DIRENT64 1 7039 @@ -8283,7 +862 8,7 @@7214 @@ -8283,7 +8629,7 @@ 7040 7215 fi 7041 7216 7042 7217 ### use option --disable-tparm-varargs to make tparm() conform to X/Open 7043 7218 -echo "$as_me:8286: checking if you want tparm not to use X/Open fixed-parameter list" >&5 7044 +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 7045 7220 echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6 7046 7221 7047 7222 # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given. 7048 @@ -8293,14 +863 8,14 @@7223 @@ -8293,14 +8639,14 @@ 7049 7224 else 7050 7225 with_tparm_varargs=yes 7051 7226 fi; 7052 7227 -echo "$as_me:8296: result: $with_tparm_varargs" >&5 7053 +echo "$as_me:864 1: result: $with_tparm_varargs" >&57228 +echo "$as_me:8642: result: $with_tparm_varargs" >&5 7054 7229 echo "${ECHO_T}$with_tparm_varargs" >&6 7055 7230 NCURSES_TPARM_VARARGS=0 … … 7059 7234 if test "$with_ticlib" != no ; then 7060 7235 -echo "$as_me:8303: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 7061 +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 7062 7237 echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6 7063 7238 7064 7239 # Check whether --enable-tic-depends or --disable-tic-depends was given. 7065 @@ -8310,14 +865 5,14 @@7240 @@ -8310,14 +8656,14 @@ 7066 7241 else 7067 7242 with_tic_depends=yes 7068 7243 fi; 7069 7244 -echo "$as_me:8313: result: $with_tic_depends" >&5 7070 +echo "$as_me:865 8: result: $with_tic_depends" >&57245 +echo "$as_me:8659: result: $with_tic_depends" >&5 7071 7246 echo "${ECHO_T}$with_tic_depends" >&6 7072 7247 else … … 7076 7251 ### use option --with-bool to override bool's type 7077 7252 -echo "$as_me:8320: checking for type of bool" >&5 7078 +echo "$as_me:866 5: checking for type of bool" >&57253 +echo "$as_me:8666: checking for type of bool" >&5 7079 7254 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 7080 7255 7081 7256 # Check whether --with-bool or --without-bool was given. 7082 @@ -8327,10 +867 2,10 @@7257 @@ -8327,10 +8673,10 @@ 7083 7258 else 7084 7259 NCURSES_BOOL=auto 7085 7260 fi; 7086 7261 -echo "$as_me:8330: result: $NCURSES_BOOL" >&5 7087 +echo "$as_me:867 5: result: $NCURSES_BOOL" >&57262 +echo "$as_me:8676: result: $NCURSES_BOOL" >&5 7088 7263 echo "${ECHO_T}$NCURSES_BOOL" >&6 7089 7264 7090 7265 -echo "$as_me:8333: checking for alternate terminal capabilities file" >&5 7091 +echo "$as_me:867 8: checking for alternate terminal capabilities file" >&57266 +echo "$as_me:8679: checking for alternate terminal capabilities file" >&5 7092 7267 echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6 7093 7268 7094 7269 # Check whether --with-caps or --without-caps was given. 7095 @@ -8341,11 +868 6,11 @@7270 @@ -8341,11 +8687,11 @@ 7096 7271 TERMINFO_CAPS=Caps 7097 7272 fi; 7098 7273 test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps 7099 7274 -echo "$as_me:8344: result: $TERMINFO_CAPS" >&5 7100 +echo "$as_me:86 89: result: $TERMINFO_CAPS" >&57275 +echo "$as_me:8690: result: $TERMINFO_CAPS" >&5 7101 7276 echo "${ECHO_T}$TERMINFO_CAPS" >&6 7102 7277 7103 7278 ### use option --with-chtype to override chtype's type 7104 7279 -echo "$as_me:8348: checking for type of chtype" >&5 7105 +echo "$as_me:869 3: checking for type of chtype" >&57280 +echo "$as_me:8694: checking for type of chtype" >&5 7106 7281 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 7107 7282 7108 7283 # Check whether --with-chtype or --without-chtype was given. 7109 @@ -8355,11 +870 0,11 @@7284 @@ -8355,11 +8701,11 @@ 7110 7285 else 7111 7286 NCURSES_CHTYPE=auto 7112 7287 fi; 7113 7288 -echo "$as_me:8358: result: $NCURSES_CHTYPE" >&5 7114 +echo "$as_me:870 3: result: $NCURSES_CHTYPE" >&57289 +echo "$as_me:8704: result: $NCURSES_CHTYPE" >&5 7115 7290 echo "${ECHO_T}$NCURSES_CHTYPE" >&6 7116 7291 7117 7292 ### use option --with-ospeed to override ospeed's type 7118 7293 -echo "$as_me:8362: checking for type of ospeed" >&5 7119 +echo "$as_me:870 7: checking for type of ospeed" >&57294 +echo "$as_me:8708: checking for type of ospeed" >&5 7120 7295 echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6 7121 7296 7122 7297 # Check whether --with-ospeed or --without-ospeed was given. 7123 @@ -8369,11 +871 4,11 @@7298 @@ -8369,11 +8715,11 @@ 7124 7299 else 7125 7300 NCURSES_OSPEED=short 7126 7301 fi; 7127 7302 -echo "$as_me:8372: result: $NCURSES_OSPEED" >&5 7128 +echo "$as_me:871 7: result: $NCURSES_OSPEED" >&57303 +echo "$as_me:8718: result: $NCURSES_OSPEED" >&5 7129 7304 echo "${ECHO_T}$NCURSES_OSPEED" >&6 7130 7305 7131 7306 ### use option --with-mmask-t to override mmask_t's type 7132 7307 -echo "$as_me:8376: checking for type of mmask_t" >&5 7133 +echo "$as_me:872 1: checking for type of mmask_t" >&57308 +echo "$as_me:8722: checking for type of mmask_t" >&5 7134 7309 echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6 7135 7310 7136 7311 # Check whether --with-mmask-t or --without-mmask-t was given. 7137 @@ -8383,11 +872 8,11 @@7312 @@ -8383,11 +8729,11 @@ 7138 7313 else 7139 7314 NCURSES_MMASK_T=auto 7140 7315 fi; 7141 7316 -echo "$as_me:8386: result: $NCURSES_MMASK_T" >&5 7142 +echo "$as_me:873 1: result: $NCURSES_MMASK_T" >&57317 +echo "$as_me:8732: result: $NCURSES_MMASK_T" >&5 7143 7318 echo "${ECHO_T}$NCURSES_MMASK_T" >&6 7144 7319 7145 7320 ### Enable compiling-in rcs id's 7146 7321 -echo "$as_me:8390: checking if RCS identifiers should be compiled-in" >&5 7147 +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 7148 7323 echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 7149 7324 7150 7325 # Check whether --with-rcs-ids or --without-rcs-ids was given. 7151 @@ -8397,7 +874 2,7 @@7326 @@ -8397,7 +8743,7 @@ 7152 7327 else 7153 7328 with_rcs_ids=no 7154 7329 fi; 7155 7330 -echo "$as_me:8400: result: $with_rcs_ids" >&5 7156 +echo "$as_me:874 5: result: $with_rcs_ids" >&57331 +echo "$as_me:8746: result: $with_rcs_ids" >&5 7157 7332 echo "${ECHO_T}$with_rcs_ids" >&6 7158 7333 test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF 7159 7334 #define USE_RCS_IDS 1 7160 @@ -8405,7 +875 0,7 @@7335 @@ -8405,7 +8751,7 @@ 7161 7336 7162 7337 ############################################################################### 7163 7338 7164 7339 -echo "$as_me:8408: checking format of man-pages" >&5 7165 +echo "$as_me:875 3: checking format of man-pages" >&57340 +echo "$as_me:8754: checking format of man-pages" >&5 7166 7341 echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6 7167 7342 7168 7343 # Check whether --with-manpage-format or --without-manpage-format was given. 7169 @@ -8494,14 +8839,14 @@ 7344 @@ -8433,7 +8779,7 @@ 7345 cf_catonly=yes 7346 cf_example=date 7347 7348 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATHSEP}" 7349 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" 7350 for cf_dir in $MANPATH; do 7351 test -z "$cf_dir" && cf_dir=/usr/man 7352 for cf_name in $cf_dir/man*/$cf_example.[01]* $cf_dir/cat*/$cf_example.[01]* $cf_dir/man*/$cf_example $cf_dir/cat*/$cf_example 7353 @@ -8494,14 +8840,14 @@ 7170 7354 ;; 7171 7355 esac 7172 7356 7173 7357 -echo "$as_me:8497: result: $MANPAGE_FORMAT" >&5 7174 +echo "$as_me:884 2: result: $MANPAGE_FORMAT" >&57358 +echo "$as_me:8843: result: $MANPAGE_FORMAT" >&5 7175 7359 echo "${ECHO_T}$MANPAGE_FORMAT" >&6 7176 7360 if test -n "$cf_unknown" ; then 7177 7361 - { echo "$as_me:8500: WARNING: Unexpected manpage-format $cf_unknown" >&5 7178 + { echo "$as_me:884 5: WARNING: Unexpected manpage-format $cf_unknown" >&57362 + { echo "$as_me:8846: WARNING: Unexpected manpage-format $cf_unknown" >&5 7179 7363 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;} 7180 7364 fi 7181 7365 7182 7366 -echo "$as_me:8504: checking for manpage renaming" >&5 7183 +echo "$as_me:88 49: checking for manpage renaming" >&57367 +echo "$as_me:8850: checking for manpage renaming" >&5 7184 7368 echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6 7185 7369 7186 7370 # Check whether --with-manpage-renames or --without-manpage-renames was given. 7187 @@ -8529,7 +887 4,7 @@7371 @@ -8529,7 +8875,7 @@ 7188 7372 if test -f $srcdir/man/$MANPAGE_RENAMES ; then 7189 7373 MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES 7190 7374 elif test ! -f $MANPAGE_RENAMES ; then 7191 7375 - { { echo "$as_me:8532: error: not a filename: $MANPAGE_RENAMES" >&5 7192 + { { echo "$as_me:887 7: error: not a filename: $MANPAGE_RENAMES" >&57376 + { { echo "$as_me:8878: error: not a filename: $MANPAGE_RENAMES" >&5 7193 7377 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} 7194 7378 { (exit 1); exit 1; }; } 7195 7379 fi 7196 @@ -8543,10 +888 8,10 @@7380 @@ -8543,10 +8889,10 @@ 7197 7381 fi 7198 7382 fi 7199 7383 7200 7384 -echo "$as_me:8546: result: $MANPAGE_RENAMES" >&5 7201 +echo "$as_me:889 1: result: $MANPAGE_RENAMES" >&57385 +echo "$as_me:8892: result: $MANPAGE_RENAMES" >&5 7202 7386 echo "${ECHO_T}$MANPAGE_RENAMES" >&6 7203 7387 7204 7388 -echo "$as_me:8549: checking if manpage aliases will be installed" >&5 7205 +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 7206 7390 echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6 7207 7391 7208 7392 # Check whether --with-manpage-aliases or --without-manpage-aliases was given. 7209 @@ -8557,7 +890 2,7 @@7393 @@ -8557,7 +8903,7 @@ 7210 7394 MANPAGE_ALIASES=yes 7211 7395 fi; 7212 7396 7213 7397 -echo "$as_me:8560: result: $MANPAGE_ALIASES" >&5 7214 +echo "$as_me:890 5: result: $MANPAGE_ALIASES" >&57398 +echo "$as_me:8906: result: $MANPAGE_ALIASES" >&5 7215 7399 echo "${ECHO_T}$MANPAGE_ALIASES" >&6 7216 7400 7217 7401 if test "$LN_S" = "ln -s"; then 7218 @@ -8568,7 +891 3,7 @@7402 @@ -8568,7 +8914,7 @@ 7219 7403 7220 7404 MANPAGE_SYMLINKS=no 7221 7405 if test "$MANPAGE_ALIASES" = yes ; then 7222 7406 -echo "$as_me:8571: checking if manpage symlinks should be used" >&5 7223 +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 7224 7408 echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6 7225 7409 7226 7410 # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given. 7227 @@ -8581,17 +892 6,17 @@7411 @@ -8581,17 +8927,17 @@ 7228 7412 7229 7413 if test "$$cf_use_symlinks" = no; then 7230 7414 if test "$MANPAGE_SYMLINKS" = yes ; then 7231 7415 - { echo "$as_me:8584: WARNING: cannot make symlinks" >&5 7232 + { echo "$as_me:89 29: WARNING: cannot make symlinks" >&57416 + { echo "$as_me:8930: WARNING: cannot make symlinks" >&5 7233 7417 echo "$as_me: WARNING: cannot make symlinks" >&2;} 7234 7418 MANPAGE_SYMLINKS=no … … 7237 7421 7238 7422 -echo "$as_me:8590: result: $MANPAGE_SYMLINKS" >&5 7239 +echo "$as_me:893 5: result: $MANPAGE_SYMLINKS" >&57423 +echo "$as_me:8936: result: $MANPAGE_SYMLINKS" >&5 7240 7424 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6 7241 7425 fi 7242 7426 7243 7427 -echo "$as_me:8594: checking for manpage tbl" >&5 7244 +echo "$as_me:89 39: checking for manpage tbl" >&57428 +echo "$as_me:8940: checking for manpage tbl" >&5 7245 7429 echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6 7246 7430 7247 7431 # Check whether --with-manpage-tbl or --without-manpage-tbl was given. 7248 @@ -8602,7 +894 7,7 @@7432 @@ -8602,7 +8948,7 @@ 7249 7433 MANPAGE_TBL=no 7250 7434 fi; 7251 7435 7252 7436 -echo "$as_me:8605: result: $MANPAGE_TBL" >&5 7253 +echo "$as_me:895 0: result: $MANPAGE_TBL" >&57437 +echo "$as_me:8951: result: $MANPAGE_TBL" >&5 7254 7438 echo "${ECHO_T}$MANPAGE_TBL" >&6 7255 7439 7256 7440 if test "$prefix" = "NONE" ; then 7257 @@ -8718,7 +906 3,7 @@7441 @@ -8718,7 +9064,7 @@ 7258 7442 s,@NCURSES_OSPEED@,\$NCURSES_OSPEED,g 7259 7443 CF_EOF … … 7264 7448 cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 7265 7449 cf_name=`echo $cf_name|sed "$program_transform_name"` 7266 @@ -8913,7 +925 8,7 @@7450 @@ -8913,7 +9259,7 @@ 7267 7451 ############################################################################### 7268 7452 7269 7453 ### Note that some functions (such as const) are normally disabled anyway. 7270 7454 -echo "$as_me:8916: checking if you want to build with function extensions" >&5 7271 +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 7272 7456 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 7273 7457 7274 7458 # Check whether --enable-ext-funcs or --disable-ext-funcs was given. 7275 @@ -8923,7 +926 8,7 @@7459 @@ -8923,7 +9269,7 @@ 7276 7460 else 7277 7461 with_ext_funcs=yes 7278 7462 fi; 7279 7463 -echo "$as_me:8926: result: $with_ext_funcs" >&5 7280 +echo "$as_me:927 1: result: $with_ext_funcs" >&57464 +echo "$as_me:9272: result: $with_ext_funcs" >&5 7281 7465 echo "${ECHO_T}$with_ext_funcs" >&6 7282 7466 if test "$with_ext_funcs" = yes ; then 7283 7467 NCURSES_EXT_FUNCS=1 7284 @@ -8955,12 +930 0,14@@7468 @@ -8955,12 +9301,38 @@ 7285 7469 #define NCURSES_EXT_FUNCS 1 7286 7470 EOF … … 7290 7474 NCURSES_EXT_FUNCS=0 7291 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= 7292 7500 fi 7293 7501 7294 7502 ### use option --enable-const to turn on use of const beyond that in XSI. 7295 7503 -echo "$as_me:8963: checking for extended use of const keyword" >&5 7296 +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 7297 7505 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 7298 7506 7299 7507 # Check whether --enable-const or --disable-const was given. 7300 @@ -8970,7 +93 17,7 @@7508 @@ -8970,7 +9342,7 @@ 7301 7509 else 7302 7510 with_ext_const=no 7303 7511 fi; 7304 7512 -echo "$as_me:8973: result: $with_ext_const" >&5 7305 +echo "$as_me:93 20: result: $with_ext_const" >&57513 +echo "$as_me:9345: result: $with_ext_const" >&5 7306 7514 echo "${ECHO_T}$with_ext_const" >&6 7307 7515 NCURSES_CONST='/*nothing*/' 7308 7516 if test "$with_ext_const" = yes ; then 7309 @@ -8978,7 +93 25,7 @@7517 @@ -8978,7 +9350,7 @@ 7310 7518 fi 7311 7519 7312 7520 ### use option --enable-ext-colors to turn on use of colors beyond 16. 7313 7521 -echo "$as_me:8981: checking if you want to use extended colors" >&5 7314 +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 7315 7523 echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6 7316 7524 7317 7525 # Check whether --enable-ext-colors or --disable-ext-colors was given. 7318 @@ -8988,12 +93 35,12 @@7526 @@ -8988,12 +9360,12 @@ 7319 7527 else 7320 7528 with_ext_colors=no 7321 7529 fi; 7322 7530 -echo "$as_me:8991: result: $with_ext_colors" >&5 7323 +echo "$as_me:93 38: result: $with_ext_colors" >&57531 +echo "$as_me:9363: result: $with_ext_colors" >&5 7324 7532 echo "${ECHO_T}$with_ext_colors" >&6 7325 7533 NCURSES_EXT_COLORS=0 … … 7327 7535 if test "$with_widec" != yes ; then 7328 7536 - { { echo "$as_me:8996: error: This option applies only to wide-character library" >&5 7329 + { { 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 7330 7538 echo "$as_me: error: This option applies only to wide-character library" >&2;} 7331 7539 { (exit 1); exit 1; }; } 7332 7540 else 7333 @@ -9004,7 +93 51,7 @@7541 @@ -9004,7 +9376,7 @@ 7334 7542 5.*) 7335 7543 cf_cv_rel_version=6.0 7336 7544 cf_cv_abi_version=6 7337 7545 - { echo "$as_me:9007: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 7338 + { 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 7339 7547 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} 7340 7548 ;; 7341 7549 esac 7342 @@ -9019,7 +93 66,7 @@7550 @@ -9019,7 +9391,7 @@ 7343 7551 fi 7344 7552 7345 7553 ### use option --enable-ext-mouse to modify coding to support 5-button mice 7346 7554 -echo "$as_me:9022: checking if you want to use extended mouse encoding" >&5 7347 +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 7348 7556 echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6 7349 7557 7350 7558 # Check whether --enable-ext-mouse or --disable-ext-mouse was given. 7351 @@ -9029,7 +9 376,7 @@7559 @@ -9029,7 +9401,7 @@ 7352 7560 else 7353 7561 with_ext_mouse=no 7354 7562 fi; 7355 7563 -echo "$as_me:9032: result: $with_ext_mouse" >&5 7356 +echo "$as_me:9 379: result: $with_ext_mouse" >&57564 +echo "$as_me:9404: result: $with_ext_mouse" >&5 7357 7565 echo "${ECHO_T}$with_ext_mouse" >&6 7358 7566 NCURSES_MOUSE_VERSION=1 7359 7567 if test "$with_ext_mouse" = yes ; then 7360 @@ -9040,7 +9 387,7 @@7568 @@ -9040,7 +9412,7 @@ 7361 7569 5.*) 7362 7570 cf_cv_rel_version=6.0 7363 7571 cf_cv_abi_version=6 7364 7572 - { echo "$as_me:9043: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 7365 + { 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 7366 7574 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} 7367 7575 ;; 7368 7576 esac 7369 @@ -9048,7 +9 395,7 @@7577 @@ -9048,7 +9420,7 @@ 7370 7578 7371 7579 fi 7372 7580 7373 7581 -echo "$as_me:9051: checking if you want \$NCURSES_NO_PADDING code" >&5 7374 +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 7375 7583 echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6 7376 7584 7377 7585 # Check whether --enable-no-padding or --disable-no-padding was given. 7378 @@ -9058,19 +94 05,19 @@7586 @@ -9058,19 +9430,19 @@ 7379 7587 else 7380 7588 with_no_padding=$with_ext_funcs 7381 7589 fi; 7382 7590 -echo "$as_me:9061: result: $with_no_padding" >&5 7383 +echo "$as_me:94 08: result: $with_no_padding" >&57591 +echo "$as_me:9433: result: $with_no_padding" >&5 7384 7592 echo "${ECHO_T}$with_no_padding" >&6 7385 7593 test "$with_no_padding" = yes && cat >>confdefs.h <<\EOF … … 7388 7596 7389 7597 -echo "$as_me:9067: checking for ANSI C header files" >&5 7390 +echo "$as_me:94 14: checking for ANSI C header files" >&57598 +echo "$as_me:9439: checking for ANSI C header files" >&5 7391 7599 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 7392 7600 if test "${ac_cv_header_stdc+set}" = set; then … … 7395 7603 cat >conftest.$ac_ext <<_ACEOF 7396 7604 -#line 9073 "configure" 7397 +#line 94 20"configure"7605 +#line 9445 "configure" 7398 7606 #include "confdefs.h" 7399 7607 #include <stdlib.h> 7400 7608 #include <stdarg.h> 7401 @@ -9078,13 +94 25,13 @@7609 @@ -9078,13 +9450,13 @@ 7402 7610 #include <float.h> 7403 7611 7404 7612 _ACEOF 7405 7613 -if { (eval echo "$as_me:9081: \"$ac_cpp conftest.$ac_ext\"") >&5 7406 +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 7407 7615 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 7408 7616 ac_status=$? … … 7411 7619 cat conftest.err >&5 7412 7620 - echo "$as_me:9087: \$? = $ac_status" >&5 7413 + echo "$as_me:94 34: \$? = $ac_status" >&57621 + echo "$as_me:9459: \$? = $ac_status" >&5 7414 7622 (exit $ac_status); } >/dev/null; then 7415 7623 if test -s conftest.err; then 7416 7624 ac_cpp_err=$ac_c_preproc_warn_flag 7417 @@ -9106,7 +94 53,7 @@7625 @@ -9106,7 +9478,7 @@ 7418 7626 if test $ac_cv_header_stdc = yes; then 7419 7627 # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 7420 7628 cat >conftest.$ac_ext <<_ACEOF 7421 7629 -#line 9109 "configure" 7422 +#line 94 56"configure"7630 +#line 9481 "configure" 7423 7631 #include "confdefs.h" 7424 7632 #include <string.h> 7425 7633 7426 @@ -9124,7 +94 71,7 @@7634 @@ -9124,7 +9496,7 @@ 7427 7635 if test $ac_cv_header_stdc = yes; then 7428 7636 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 7429 7637 cat >conftest.$ac_ext <<_ACEOF 7430 7638 -#line 9127 "configure" 7431 +#line 94 74"configure"7639 +#line 9499 "configure" 7432 7640 #include "confdefs.h" 7433 7641 #include <stdlib.h> 7434 7642 7435 @@ -9145,7 +9 492,7 @@7643 @@ -9145,7 +9517,7 @@ 7436 7644 : 7437 7645 else 7438 7646 cat >conftest.$ac_ext <<_ACEOF 7439 7647 -#line 9148 "configure" 7440 +#line 9 495"configure"7648 +#line 9520 "configure" 7441 7649 #include "confdefs.h" 7442 7650 #include <ctype.h> 7443 7651 #if ((' ' & 0x0FF) == 0x020) 7444 @@ -9171,15 +95 18,15 @@7652 @@ -9171,15 +9543,15 @@ 7445 7653 } 7446 7654 _ACEOF 7447 7655 rm -f conftest$ac_exeext 7448 7656 -if { (eval echo "$as_me:9174: \"$ac_link\"") >&5 7449 +if { (eval echo "$as_me:95 21: \"$ac_link\"") >&57657 +if { (eval echo "$as_me:9546: \"$ac_link\"") >&5 7450 7658 (eval $ac_link) 2>&5 7451 7659 ac_status=$? 7452 7660 - echo "$as_me:9177: \$? = $ac_status" >&5 7453 + echo "$as_me:95 24: \$? = $ac_status" >&57661 + echo "$as_me:9549: \$? = $ac_status" >&5 7454 7662 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 7455 7663 - { (eval echo "$as_me:9179: \"$ac_try\"") >&5 7456 + { (eval echo "$as_me:95 26: \"$ac_try\"") >&57664 + { (eval echo "$as_me:9551: \"$ac_try\"") >&5 7457 7665 (eval $ac_try) 2>&5 7458 7666 ac_status=$? 7459 7667 - echo "$as_me:9182: \$? = $ac_status" >&5 7460 + echo "$as_me:95 29: \$? = $ac_status" >&57668 + echo "$as_me:9554: \$? = $ac_status" >&5 7461 7669 (exit $ac_status); }; }; then 7462 7670 : 7463 7671 else 7464 @@ -9192,7 +95 39,7 @@7672 @@ -9192,7 +9564,7 @@ 7465 7673 fi 7466 7674 fi 7467 7675 fi 7468 7676 -echo "$as_me:9195: result: $ac_cv_header_stdc" >&5 7469 +echo "$as_me:95 42: result: $ac_cv_header_stdc" >&57677 +echo "$as_me:9567: result: $ac_cv_header_stdc" >&5 7470 7678 echo "${ECHO_T}$ac_cv_header_stdc" >&6 7471 7679 if test $ac_cv_header_stdc = yes; then 7472 7680 7473 @@ -9208,28 +95 55,28 @@7681 @@ -9208,28 +9580,28 @@ 7474 7682 inttypes.h stdint.h unistd.h 7475 7683 do 7476 7684 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 7477 7685 -echo "$as_me:9211: checking for $ac_header" >&5 7478 +echo "$as_me:95 58: checking for $ac_header" >&57686 +echo "$as_me:9583: checking for $ac_header" >&5 7479 7687 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 7480 7688 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 7483 7691 cat >conftest.$ac_ext <<_ACEOF 7484 7692 -#line 9217 "configure" 7485 +#line 95 64"configure"7693 +#line 9589 "configure" 7486 7694 #include "confdefs.h" 7487 7695 $ac_includes_default … … 7490 7698 rm -f conftest.$ac_objext 7491 7699 -if { (eval echo "$as_me:9223: \"$ac_compile\"") >&5 7492 +if { (eval echo "$as_me:95 70: \"$ac_compile\"") >&57700 +if { (eval echo "$as_me:9595: \"$ac_compile\"") >&5 7493 7701 (eval $ac_compile) 2>&5 7494 7702 ac_status=$? 7495 7703 - echo "$as_me:9226: \$? = $ac_status" >&5 7496 + echo "$as_me:95 73: \$? = $ac_status" >&57704 + echo "$as_me:9598: \$? = $ac_status" >&5 7497 7705 (exit $ac_status); } && 7498 7706 { ac_try='test -s conftest.$ac_objext' 7499 7707 - { (eval echo "$as_me:9229: \"$ac_try\"") >&5 7500 + { (eval echo "$as_me:9 576: \"$ac_try\"") >&57708 + { (eval echo "$as_me:9601: \"$ac_try\"") >&5 7501 7709 (eval $ac_try) 2>&5 7502 7710 ac_status=$? 7503 7711 - echo "$as_me:9232: \$? = $ac_status" >&5 7504 + echo "$as_me:9 579: \$? = $ac_status" >&57712 + echo "$as_me:9604: \$? = $ac_status" >&5 7505 7713 (exit $ac_status); }; }; then 7506 7714 eval "$as_ac_Header=yes" 7507 7715 else 7508 @@ -9239,7 +9 586,7 @@7716 @@ -9239,7 +9611,7 @@ 7509 7717 fi 7510 7718 rm -f conftest.$ac_objext conftest.$ac_ext 7511 7719 fi 7512 7720 -echo "$as_me:9242: result: `eval echo '${'$as_ac_Header'}'`" >&5 7513 +echo "$as_me:9 589: result: `eval echo '${'$as_ac_Header'}'`" >&57721 +echo "$as_me:9614: result: `eval echo '${'$as_ac_Header'}'`" >&5 7514 7722 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 7515 7723 if test `eval echo '${'$as_ac_Header'}'` = yes; then 7516 7724 cat >>confdefs.h <<EOF 7517 @@ -9249,13 +9 596,13 @@7725 @@ -9249,13 +9621,13 @@ 7518 7726 fi 7519 7727 done 7520 7728 7521 7729 -echo "$as_me:9252: checking for signed char" >&5 7522 +echo "$as_me:9 599: checking for signed char" >&57730 +echo "$as_me:9624: checking for signed char" >&5 7523 7731 echo $ECHO_N "checking for signed char... $ECHO_C" >&6 7524 7732 if test "${ac_cv_type_signed_char+set}" = set; then … … 7527 7735 cat >conftest.$ac_ext <<_ACEOF 7528 7736 -#line 9258 "configure" 7529 +#line 96 05"configure"7737 +#line 9630 "configure" 7530 7738 #include "confdefs.h" 7531 7739 $ac_includes_default 7532 7740 int 7533 @@ -9270,16 +96 17,16 @@7741 @@ -9270,16 +9642,16 @@ 7534 7742 } 7535 7743 _ACEOF 7536 7744 rm -f conftest.$ac_objext 7537 7745 -if { (eval echo "$as_me:9273: \"$ac_compile\"") >&5 7538 +if { (eval echo "$as_me:96 20: \"$ac_compile\"") >&57746 +if { (eval echo "$as_me:9645: \"$ac_compile\"") >&5 7539 7747 (eval $ac_compile) 2>&5 7540 7748 ac_status=$? 7541 7749 - echo "$as_me:9276: \$? = $ac_status" >&5 7542 + echo "$as_me:96 23: \$? = $ac_status" >&57750 + echo "$as_me:9648: \$? = $ac_status" >&5 7543 7751 (exit $ac_status); } && 7544 7752 { ac_try='test -s conftest.$ac_objext' 7545 7753 - { (eval echo "$as_me:9279: \"$ac_try\"") >&5 7546 + { (eval echo "$as_me:96 26: \"$ac_try\"") >&57754 + { (eval echo "$as_me:9651: \"$ac_try\"") >&5 7547 7755 (eval $ac_try) 2>&5 7548 7756 ac_status=$? 7549 7757 - echo "$as_me:9282: \$? = $ac_status" >&5 7550 + echo "$as_me:96 29: \$? = $ac_status" >&57758 + echo "$as_me:9654: \$? = $ac_status" >&5 7551 7759 (exit $ac_status); }; }; then 7552 7760 ac_cv_type_signed_char=yes 7553 7761 else 7554 @@ -9289,10 +96 36,10 @@7762 @@ -9289,10 +9661,10 @@ 7555 7763 fi 7556 7764 rm -f conftest.$ac_objext conftest.$ac_ext 7557 7765 fi 7558 7766 -echo "$as_me:9292: result: $ac_cv_type_signed_char" >&5 7559 +echo "$as_me:96 39: result: $ac_cv_type_signed_char" >&57767 +echo "$as_me:9664: result: $ac_cv_type_signed_char" >&5 7560 7768 echo "${ECHO_T}$ac_cv_type_signed_char" >&6 7561 7769 7562 7770 -echo "$as_me:9295: checking size of signed char" >&5 7563 +echo "$as_me:96 42: checking size of signed char" >&57771 +echo "$as_me:9667: checking size of signed char" >&5 7564 7772 echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 7565 7773 if test "${ac_cv_sizeof_signed_char+set}" = set; then 7566 7774 echo $ECHO_N "(cached) $ECHO_C" >&6 7567 @@ -9301,7 +96 48,7 @@7775 @@ -9301,7 +9673,7 @@ 7568 7776 if test "$cross_compiling" = yes; then 7569 7777 # Depending upon the size, compute the lo and hi bounds. 7570 7778 cat >conftest.$ac_ext <<_ACEOF 7571 7779 -#line 9304 "configure" 7572 +#line 96 51"configure"7780 +#line 9676 "configure" 7573 7781 #include "confdefs.h" 7574 7782 $ac_includes_default 7575 7783 int 7576 @@ -9313,21 +96 60,21 @@7784 @@ -9313,21 +9685,21 @@ 7577 7785 } 7578 7786 _ACEOF 7579 7787 rm -f conftest.$ac_objext 7580 7788 -if { (eval echo "$as_me:9316: \"$ac_compile\"") >&5 7581 +if { (eval echo "$as_me:96 63: \"$ac_compile\"") >&57789 +if { (eval echo "$as_me:9688: \"$ac_compile\"") >&5 7582 7790 (eval $ac_compile) 2>&5 7583 7791 ac_status=$? 7584 7792 - echo "$as_me:9319: \$? = $ac_status" >&5 7585 + echo "$as_me:96 66: \$? = $ac_status" >&57793 + echo "$as_me:9691: \$? = $ac_status" >&5 7586 7794 (exit $ac_status); } && 7587 7795 { ac_try='test -s conftest.$ac_objext' 7588 7796 - { (eval echo "$as_me:9322: \"$ac_try\"") >&5 7589 + { (eval echo "$as_me:96 69: \"$ac_try\"") >&57797 + { (eval echo "$as_me:9694: \"$ac_try\"") >&5 7590 7798 (eval $ac_try) 2>&5 7591 7799 ac_status=$? 7592 7800 - echo "$as_me:9325: \$? = $ac_status" >&5 7593 + echo "$as_me:96 72: \$? = $ac_status" >&57801 + echo "$as_me:9697: \$? = $ac_status" >&5 7594 7802 (exit $ac_status); }; }; then 7595 7803 ac_lo=0 ac_mid=0 … … 7597 7805 cat >conftest.$ac_ext <<_ACEOF 7598 7806 -#line 9330 "configure" 7599 +#line 9 677"configure"7807 +#line 9702 "configure" 7600 7808 #include "confdefs.h" 7601 7809 $ac_includes_default 7602 7810 int 7603 @@ -9339,16 +9 686,16 @@7811 @@ -9339,16 +9711,16 @@ 7604 7812 } 7605 7813 _ACEOF 7606 7814 rm -f conftest.$ac_objext 7607 7815 -if { (eval echo "$as_me:9342: \"$ac_compile\"") >&5 7608 +if { (eval echo "$as_me:9 689: \"$ac_compile\"") >&57816 +if { (eval echo "$as_me:9714: \"$ac_compile\"") >&5 7609 7817 (eval $ac_compile) 2>&5 7610 7818 ac_status=$? 7611 7819 - echo "$as_me:9345: \$? = $ac_status" >&5 7612 + echo "$as_me:9 692: \$? = $ac_status" >&57820 + echo "$as_me:9717: \$? = $ac_status" >&5 7613 7821 (exit $ac_status); } && 7614 7822 { ac_try='test -s conftest.$ac_objext' 7615 7823 - { (eval echo "$as_me:9348: \"$ac_try\"") >&5 7616 + { (eval echo "$as_me:9 695: \"$ac_try\"") >&57824 + { (eval echo "$as_me:9720: \"$ac_try\"") >&5 7617 7825 (eval $ac_try) 2>&5 7618 7826 ac_status=$? 7619 7827 - echo "$as_me:9351: \$? = $ac_status" >&5 7620 + echo "$as_me:9 698: \$? = $ac_status" >&57828 + echo "$as_me:9723: \$? = $ac_status" >&5 7621 7829 (exit $ac_status); }; }; then 7622 7830 ac_hi=$ac_mid; break 7623 7831 else 7624 @@ -9364,7 +97 11,7 @@7832 @@ -9364,7 +9736,7 @@ 7625 7833 ac_hi=-1 ac_mid=-1 7626 7834 while :; do 7627 7835 cat >conftest.$ac_ext <<_ACEOF 7628 7836 -#line 9367 "configure" 7629 +#line 97 14"configure"7837 +#line 9739 "configure" 7630 7838 #include "confdefs.h" 7631 7839 $ac_includes_default 7632 7840 int 7633 @@ -9376,16 +97 23,16 @@7841 @@ -9376,16 +9748,16 @@ 7634 7842 } 7635 7843 _ACEOF 7636 7844 rm -f conftest.$ac_objext 7637 7845 -if { (eval echo "$as_me:9379: \"$ac_compile\"") >&5 7638 +if { (eval echo "$as_me:97 26: \"$ac_compile\"") >&57846 +if { (eval echo "$as_me:9751: \"$ac_compile\"") >&5 7639 7847 (eval $ac_compile) 2>&5 7640 7848 ac_status=$? 7641 7849 - echo "$as_me:9382: \$? = $ac_status" >&5 7642 + echo "$as_me:97 29: \$? = $ac_status" >&57850 + echo "$as_me:9754: \$? = $ac_status" >&5 7643 7851 (exit $ac_status); } && 7644 7852 { ac_try='test -s conftest.$ac_objext' 7645 7853 - { (eval echo "$as_me:9385: \"$ac_try\"") >&5 7646 + { (eval echo "$as_me:97 32: \"$ac_try\"") >&57854 + { (eval echo "$as_me:9757: \"$ac_try\"") >&5 7647 7855 (eval $ac_try) 2>&5 7648 7856 ac_status=$? 7649 7857 - echo "$as_me:9388: \$? = $ac_status" >&5 7650 + echo "$as_me:97 35: \$? = $ac_status" >&57858 + echo "$as_me:9760: \$? = $ac_status" >&5 7651 7859 (exit $ac_status); }; }; then 7652 7860 ac_lo=$ac_mid; break 7653 7861 else 7654 @@ -9401,7 +97 48,7 @@7862 @@ -9401,7 +9773,7 @@ 7655 7863 while test "x$ac_lo" != "x$ac_hi"; do 7656 7864 ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 7657 7865 cat >conftest.$ac_ext <<_ACEOF 7658 7866 -#line 9404 "configure" 7659 +#line 97 51"configure"7867 +#line 9776 "configure" 7660 7868 #include "confdefs.h" 7661 7869 $ac_includes_default 7662 7870 int 7663 @@ -9413,16 +97 60,16 @@7871 @@ -9413,16 +9785,16 @@ 7664 7872 } 7665 7873 _ACEOF 7666 7874 rm -f conftest.$ac_objext 7667 7875 -if { (eval echo "$as_me:9416: \"$ac_compile\"") >&5 7668 +if { (eval echo "$as_me:97 63: \"$ac_compile\"") >&57876 +if { (eval echo "$as_me:9788: \"$ac_compile\"") >&5 7669 7877 (eval $ac_compile) 2>&5 7670 7878 ac_status=$? 7671 7879 - echo "$as_me:9419: \$? = $ac_status" >&5 7672 + echo "$as_me:97 66: \$? = $ac_status" >&57880 + echo "$as_me:9791: \$? = $ac_status" >&5 7673 7881 (exit $ac_status); } && 7674 7882 { ac_try='test -s conftest.$ac_objext' 7675 7883 - { (eval echo "$as_me:9422: \"$ac_try\"") >&5 7676 + { (eval echo "$as_me:97 69: \"$ac_try\"") >&57884 + { (eval echo "$as_me:9794: \"$ac_try\"") >&5 7677 7885 (eval $ac_try) 2>&5 7678 7886 ac_status=$? 7679 7887 - echo "$as_me:9425: \$? = $ac_status" >&5 7680 + echo "$as_me:97 72: \$? = $ac_status" >&57888 + echo "$as_me:9797: \$? = $ac_status" >&5 7681 7889 (exit $ac_status); }; }; then 7682 7890 ac_hi=$ac_mid 7683 7891 else 7684 @@ -9435,12 +9 782,12 @@7892 @@ -9435,12 +9807,12 @@ 7685 7893 ac_cv_sizeof_signed_char=$ac_lo 7686 7894 else 7687 7895 if test "$cross_compiling" = yes; then 7688 7896 - { { echo "$as_me:9438: error: cannot run test program while cross compiling" >&5 7689 + { { 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 7690 7898 echo "$as_me: error: cannot run test program while cross compiling" >&2;} 7691 7899 { (exit 1); exit 1; }; } … … 7693 7901 cat >conftest.$ac_ext <<_ACEOF 7694 7902 -#line 9443 "configure" 7695 +#line 9 790"configure"7903 +#line 9815 "configure" 7696 7904 #include "confdefs.h" 7697 7905 $ac_includes_default 7698 7906 int 7699 @@ -9456,15 +98 03,15 @@7907 @@ -9456,15 +9828,15 @@ 7700 7908 } 7701 7909 _ACEOF 7702 7910 rm -f conftest$ac_exeext 7703 7911 -if { (eval echo "$as_me:9459: \"$ac_link\"") >&5 7704 +if { (eval echo "$as_me:98 06: \"$ac_link\"") >&57912 +if { (eval echo "$as_me:9831: \"$ac_link\"") >&5 7705 7913 (eval $ac_link) 2>&5 7706 7914 ac_status=$? 7707 7915 - echo "$as_me:9462: \$? = $ac_status" >&5 7708 + echo "$as_me:98 09: \$? = $ac_status" >&57916 + echo "$as_me:9834: \$? = $ac_status" >&5 7709 7917 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 7710 7918 - { (eval echo "$as_me:9464: \"$ac_try\"") >&5 7711 + { (eval echo "$as_me:98 11: \"$ac_try\"") >&57919 + { (eval echo "$as_me:9836: \"$ac_try\"") >&5 7712 7920 (eval $ac_try) 2>&5 7713 7921 ac_status=$? 7714 7922 - echo "$as_me:9467: \$? = $ac_status" >&5 7715 + echo "$as_me:98 14: \$? = $ac_status" >&57923 + echo "$as_me:9839: \$? = $ac_status" >&5 7716 7924 (exit $ac_status); }; }; then 7717 7925 ac_cv_sizeof_signed_char=`cat conftest.val` 7718 7926 else 7719 @@ -9480,7 +98 27,7 @@7927 @@ -9480,7 +9852,7 @@ 7720 7928 ac_cv_sizeof_signed_char=0 7721 7929 fi 7722 7930 fi 7723 7931 -echo "$as_me:9483: result: $ac_cv_sizeof_signed_char" >&5 7724 +echo "$as_me:98 30: result: $ac_cv_sizeof_signed_char" >&57932 +echo "$as_me:9855: result: $ac_cv_sizeof_signed_char" >&5 7725 7933 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 7726 7934 cat >>confdefs.h <<EOF 7727 7935 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char 7728 @@ -9491,7 +98 38,7 @@7936 @@ -9491,7 +9863,7 @@ 7729 7937 else 7730 7938 NCURSES_SBOOL="char" 7731 7939 fi 7732 7940 -echo "$as_me:9494: checking if you want to use signed Boolean array in term.h" >&5 7733 +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 7734 7942 echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6 7735 7943 7736 7944 # Check whether --enable-signed-char or --disable-signed-char was given. 7737 @@ -9501,12 +98 48,12 @@7945 @@ -9501,12 +9873,12 @@ 7738 7946 else 7739 7947 with_signed_char=no 7740 7948 fi; 7741 7949 -echo "$as_me:9504: result: $with_signed_char" >&5 7742 +echo "$as_me:98 51: result: $with_signed_char" >&57950 +echo "$as_me:9876: result: $with_signed_char" >&5 7743 7951 echo "${ECHO_T}$with_signed_char" >&6 7744 7952 test "$with_signed_char" != yes && NCURSES_SBOOL="char" … … 7746 7954 ### use option --enable-sigwinch to turn on use of SIGWINCH logic 7747 7955 -echo "$as_me:9509: checking if you want SIGWINCH handler" >&5 7748 +echo "$as_me:98 56: checking if you want SIGWINCH handler" >&57956 +echo "$as_me:9881: checking if you want SIGWINCH handler" >&5 7749 7957 echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6 7750 7958 7751 7959 # Check whether --enable-sigwinch or --disable-sigwinch was given. 7752 @@ -9516,14 +98 63,14 @@7960 @@ -9516,14 +9888,14 @@ 7753 7961 else 7754 7962 with_sigwinch=$with_ext_funcs 7755 7963 fi; 7756 7964 -echo "$as_me:9519: result: $with_sigwinch" >&5 7757 +echo "$as_me:98 66: result: $with_sigwinch" >&57965 +echo "$as_me:9891: result: $with_sigwinch" >&5 7758 7966 echo "${ECHO_T}$with_sigwinch" >&6 7759 7967 test "$with_sigwinch" = yes && cat >>confdefs.h <<\EOF … … 7763 7971 ### use option --enable-tcap-names to allow user to define new capabilities 7764 7972 -echo "$as_me:9526: checking if you want user-definable terminal capabilities like termcap" >&5 7765 +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 7766 7974 echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6 7767 7975 7768 7976 # Check whether --enable-tcap-names or --disable-tcap-names was given. 7769 @@ -9533,7 +9 880,7 @@7977 @@ -9533,7 +9905,7 @@ 7770 7978 else 7771 7979 with_tcap_names=$with_ext_funcs 7772 7980 fi; 7773 7981 -echo "$as_me:9536: result: $with_tcap_names" >&5 7774 +echo "$as_me:9 883: result: $with_tcap_names" >&57982 +echo "$as_me:9908: result: $with_tcap_names" >&5 7775 7983 echo "${ECHO_T}$with_tcap_names" >&6 7776 7984 NCURSES_XNAMES=0 7777 7985 test "$with_tcap_names" = yes && NCURSES_XNAMES=1 7778 @@ -9541,7 +9 888,7 @@7986 @@ -9541,7 +9913,7 @@ 7779 7987 ############################################################################### 7780 7988 # These options are relatively safe to experiment with. 7781 7989 7782 7990 -echo "$as_me:9544: checking if you want all development code" >&5 7783 +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 7784 7992 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 7785 7993 7786 7994 # Check whether --with-develop or --without-develop was given. 7787 @@ -9551,11 +9 898,11 @@7995 @@ -9551,11 +9923,11 @@ 7788 7996 else 7789 7997 with_develop=no 7790 7998 fi; 7791 7999 -echo "$as_me:9554: result: $with_develop" >&5 7792 +echo "$as_me:99 01: result: $with_develop" >&58000 +echo "$as_me:9926: result: $with_develop" >&5 7793 8001 echo "${ECHO_T}$with_develop" >&6 7794 8002 7795 8003 ### use option --enable-hard-tabs to turn on use of hard-tabs optimize 7796 8004 -echo "$as_me:9558: checking if you want hard-tabs code" >&5 7797 +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 7798 8006 echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6 7799 8007 7800 8008 # Check whether --enable-hard-tabs or --disable-hard-tabs was given. 7801 @@ -9565,14 +99 12,14 @@8009 @@ -9565,14 +9937,14 @@ 7802 8010 else 7803 8011 enable_hard_tabs=$with_develop 7804 8012 fi; 7805 8013 -echo "$as_me:9568: result: $enable_hard_tabs" >&5 7806 +echo "$as_me:99 15: result: $enable_hard_tabs" >&58014 +echo "$as_me:9940: result: $enable_hard_tabs" >&5 7807 8015 echo "${ECHO_T}$enable_hard_tabs" >&6 7808 8016 test "$enable_hard_tabs" = yes && cat >>confdefs.h <<\EOF … … 7812 8020 ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize 7813 8021 -echo "$as_me:9575: checking if you want limited support for xmc" >&5 7814 +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 7815 8023 echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6 7816 8024 7817 8025 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. 7818 @@ -9582,7 +99 29,7 @@8026 @@ -9582,7 +9954,7 @@ 7819 8027 else 7820 8028 enable_xmc_glitch=$with_develop 7821 8029 fi; 7822 8030 -echo "$as_me:9585: result: $enable_xmc_glitch" >&5 7823 +echo "$as_me:99 32: result: $enable_xmc_glitch" >&58031 +echo "$as_me:9957: result: $enable_xmc_glitch" >&5 7824 8032 echo "${ECHO_T}$enable_xmc_glitch" >&6 7825 8033 test "$enable_xmc_glitch" = yes && cat >>confdefs.h <<\EOF 7826 8034 #define USE_XMC_SUPPORT 1 7827 @@ -9591,7 +99 38,7 @@8035 @@ -9591,7 +9963,7 @@ 7828 8036 ############################################################################### 7829 8037 # These are just experimental, probably should not be in a package: 7830 8038 7831 8039 -echo "$as_me:9594: checking if you do not want to assume colors are white-on-black" >&5 7832 +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 7833 8041 echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6 7834 8042 7835 8043 # Check whether --enable-assumed-color or --disable-assumed-color was given. 7836 @@ -9601,14 +99 48,14 @@8044 @@ -9601,14 +9973,14 @@ 7837 8045 else 7838 8046 with_assumed_color=yes 7839 8047 fi; 7840 8048 -echo "$as_me:9604: result: $with_assumed_color" >&5 7841 +echo "$as_me:99 51: result: $with_assumed_color" >&58049 +echo "$as_me:9976: result: $with_assumed_color" >&5 7842 8050 echo "${ECHO_T}$with_assumed_color" >&6 7843 8051 test "$with_assumed_color" = yes && cat >>confdefs.h <<\EOF … … 7847 8055 ### use option --enable-hashmap to turn on use of hashmap scrolling logic 7848 8056 -echo "$as_me:9611: checking if you want hashmap scrolling-optimization code" >&5 7849 +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 7850 8058 echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6 7851 8059 7852 8060 # Check whether --enable-hashmap or --disable-hashmap was given. 7853 @@ -9618,14 +99 65,14 @@8061 @@ -9618,14 +9990,14 @@ 7854 8062 else 7855 8063 with_hashmap=yes 7856 8064 fi; 7857 8065 -echo "$as_me:9621: result: $with_hashmap" >&5 7858 +echo "$as_me:99 68: result: $with_hashmap" >&58066 +echo "$as_me:9993: result: $with_hashmap" >&5 7859 8067 echo "${ECHO_T}$with_hashmap" >&6 7860 8068 test "$with_hashmap" = yes && cat >>confdefs.h <<\EOF … … 7864 8072 ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment 7865 8073 -echo "$as_me:9628: checking if you want colorfgbg code" >&5 7866 +echo "$as_me: 9975: checking if you want colorfgbg code" >&58074 +echo "$as_me:10000: checking if you want colorfgbg code" >&5 7867 8075 echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6 7868 8076 7869 8077 # Check whether --enable-colorfgbg or --disable-colorfgbg was given. 7870 @@ -9635,7 + 9982,7 @@8078 @@ -9635,7 +10007,7 @@ 7871 8079 else 7872 8080 with_colorfgbg=no 7873 8081 fi; 7874 8082 -echo "$as_me:9638: result: $with_colorfgbg" >&5 7875 +echo "$as_me: 9985: result: $with_colorfgbg" >&58083 +echo "$as_me:10010: result: $with_colorfgbg" >&5 7876 8084 echo "${ECHO_T}$with_colorfgbg" >&6 7877 8085 test "$with_colorfgbg" = yes && cat >>confdefs.h <<\EOF 7878 8086 #define USE_COLORFGBG 1 7879 @@ -9644,7 + 9991,7 @@8087 @@ -9644,7 +10016,7 @@ 7880 8088 # This is still experimental (20080329), but should ultimately be moved to 7881 8089 # the script-block --with-normal, etc. 7882 8090 7883 8091 -echo "$as_me:9647: checking if you want to link with the pthread library" >&5 7884 +echo "$as_me: 9994: checking if you want to link with the pthread library" >&58092 +echo "$as_me:10019: checking if you want to link with the pthread library" >&5 7885 8093 echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 7886 8094 7887 8095 # Check whether --with-pthread or --without-pthread was given. 7888 @@ -9654,27 +100 01,27 @@8096 @@ -9654,27 +10026,27 @@ 7889 8097 else 7890 8098 with_pthread=no 7891 8099 fi; 7892 8100 -echo "$as_me:9657: result: $with_pthread" >&5 7893 +echo "$as_me:100 04: result: $with_pthread" >&58101 +echo "$as_me:10029: result: $with_pthread" >&5 7894 8102 echo "${ECHO_T}$with_pthread" >&6 7895 8103 7896 8104 if test "$with_pthread" != no ; then 7897 8105 - echo "$as_me:9661: checking for pthread.h" >&5 7898 + echo "$as_me:100 08: checking for pthread.h" >&58106 + echo "$as_me:10033: checking for pthread.h" >&5 7899 8107 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 7900 8108 if test "${ac_cv_header_pthread_h+set}" = set; then … … 7903 8111 cat >conftest.$ac_ext <<_ACEOF 7904 8112 -#line 9667 "configure" 7905 +#line 100 14"configure"8113 +#line 10039 "configure" 7906 8114 #include "confdefs.h" 7907 8115 #include <pthread.h> 7908 8116 _ACEOF 7909 8117 -if { (eval echo "$as_me:9671: \"$ac_cpp conftest.$ac_ext\"") >&5 7910 +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 7911 8119 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 7912 8120 ac_status=$? … … 7915 8123 cat conftest.err >&5 7916 8124 - echo "$as_me:9677: \$? = $ac_status" >&5 7917 + echo "$as_me:100 24: \$? = $ac_status" >&58125 + echo "$as_me:10049: \$? = $ac_status" >&5 7918 8126 (exit $ac_status); } >/dev/null; then 7919 8127 if test -s conftest.err; then 7920 8128 ac_cpp_err=$ac_c_preproc_warn_flag 7921 @@ -9693,7 +100 40,7 @@8129 @@ -9693,7 +10065,7 @@ 7922 8130 fi 7923 8131 rm -f conftest.err conftest.$ac_ext 7924 8132 fi 7925 8133 -echo "$as_me:9696: result: $ac_cv_header_pthread_h" >&5 7926 +echo "$as_me:100 43: result: $ac_cv_header_pthread_h" >&58134 +echo "$as_me:10068: result: $ac_cv_header_pthread_h" >&5 7927 8135 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 7928 8136 if test $ac_cv_header_pthread_h = yes; then 7929 8137 7930 @@ -9701,12 +100 48,12 @@8138 @@ -9701,12 +10073,12 @@ 7931 8139 #define HAVE_PTHREADS_H 1 7932 8140 EOF 7933 8141 7934 8142 - echo "$as_me:9704: checking if we can link with the pthread library" >&5 7935 + 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 7936 8144 echo $ECHO_N "checking if we can link with the pthread library... $ECHO_C" >&6 7937 8145 cf_save_LIBS="$LIBS" … … 7939 8147 cat >conftest.$ac_ext <<_ACEOF 7940 8148 -#line 9709 "configure" 7941 +#line 100 56"configure"8149 +#line 10081 "configure" 7942 8150 #include "confdefs.h" 7943 8151 7944 8152 #include <pthread.h> 7945 @@ -9722,16 +100 69,16 @@8153 @@ -9722,16 +10094,16 @@ 7946 8154 } 7947 8155 _ACEOF 7948 8156 rm -f conftest.$ac_objext conftest$ac_exeext 7949 8157 -if { (eval echo "$as_me:9725: \"$ac_link\"") >&5 7950 +if { (eval echo "$as_me:100 72: \"$ac_link\"") >&58158 +if { (eval echo "$as_me:10097: \"$ac_link\"") >&5 7951 8159 (eval $ac_link) 2>&5 7952 8160 ac_status=$? 7953 8161 - echo "$as_me:9728: \$? = $ac_status" >&5 7954 + echo "$as_me:10 075: \$? = $ac_status" >&58162 + echo "$as_me:10100: \$? = $ac_status" >&5 7955 8163 (exit $ac_status); } && 7956 8164 { ac_try='test -s conftest$ac_exeext' 7957 8165 - { (eval echo "$as_me:9731: \"$ac_try\"") >&5 7958 + { (eval echo "$as_me:10 078: \"$ac_try\"") >&58166 + { (eval echo "$as_me:10103: \"$ac_try\"") >&5 7959 8167 (eval $ac_try) 2>&5 7960 8168 ac_status=$? 7961 8169 - echo "$as_me:9734: \$? = $ac_status" >&5 7962 + echo "$as_me:10 081: \$? = $ac_status" >&58170 + echo "$as_me:10106: \$? = $ac_status" >&5 7963 8171 (exit $ac_status); }; }; then 7964 8172 with_pthread=yes 7965 8173 else 7966 @@ -9741,7 +10 088,7 @@8174 @@ -9741,7 +10113,7 @@ 7967 8175 fi 7968 8176 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 7969 8177 LIBS="$cf_save_LIBS" 7970 8178 - echo "$as_me:9744: result: $with_pthread" >&5 7971 + echo "$as_me:10 091: result: $with_pthread" >&58179 + echo "$as_me:10116: result: $with_pthread" >&5 7972 8180 echo "${ECHO_T}$with_pthread" >&6 7973 8181 7974 8182 if test "$with_pthread" = yes ; then 7975 @@ -9751,7 +10 098,7 @@8183 @@ -9751,7 +10123,7 @@ 7976 8184 EOF 7977 8185 7978 8186 else 7979 8187 - { { echo "$as_me:9754: error: Cannot link with pthread library" >&5 7980 + { { echo "$as_me:101 01: error: Cannot link with pthread library" >&58188 + { { echo "$as_me:10126: error: Cannot link with pthread library" >&5 7981 8189 echo "$as_me: error: Cannot link with pthread library" >&2;} 7982 8190 { (exit 1); exit 1; }; } 7983 8191 fi 7984 @@ -9760,7 +101 07,7 @@8192 @@ -9760,7 +10132,7 @@ 7985 8193 7986 8194 fi 7987 8195 7988 8196 -echo "$as_me:9763: checking if you want to use weak-symbols for pthreads" >&5 7989 +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 7990 8198 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 7991 8199 7992 8200 # Check whether --enable-weak-symbols or --disable-weak-symbols was given. 7993 @@ -9770,18 +101 17,18 @@8201 @@ -9770,18 +10142,18 @@ 7994 8202 else 7995 8203 use_weak_symbols=no 7996 8204 fi; 7997 8205 -echo "$as_me:9773: result: $use_weak_symbols" >&5 7998 +echo "$as_me:101 20: result: $use_weak_symbols" >&58206 +echo "$as_me:10145: result: $use_weak_symbols" >&5 7999 8207 echo "${ECHO_T}$use_weak_symbols" >&6 8000 8208 if test "$use_weak_symbols" = yes ; then 8001 8209 8002 8210 -echo "$as_me:9777: checking if $CC supports weak symbols" >&5 8003 +echo "$as_me:101 24: checking if $CC supports weak symbols" >&58211 +echo "$as_me:10149: checking if $CC supports weak symbols" >&5 8004 8212 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 8005 8213 if test "${cf_cv_weak_symbols+set}" = set; then … … 8009 8217 cat >conftest.$ac_ext <<_ACEOF 8010 8218 -#line 9784 "configure" 8011 +#line 101 31"configure"8219 +#line 10156 "configure" 8012 8220 #include "confdefs.h" 8013 8221 8014 8222 #include <stdio.h> 8015 @@ -9807,16 +101 54,16 @@8223 @@ -9807,16 +10179,16 @@ 8016 8224 } 8017 8225 _ACEOF 8018 8226 rm -f conftest.$ac_objext 8019 8227 -if { (eval echo "$as_me:9810: \"$ac_compile\"") >&5 8020 +if { (eval echo "$as_me:101 57: \"$ac_compile\"") >&58228 +if { (eval echo "$as_me:10182: \"$ac_compile\"") >&5 8021 8229 (eval $ac_compile) 2>&5 8022 8230 ac_status=$? 8023 8231 - echo "$as_me:9813: \$? = $ac_status" >&5 8024 + echo "$as_me:101 60: \$? = $ac_status" >&58232 + echo "$as_me:10185: \$? = $ac_status" >&5 8025 8233 (exit $ac_status); } && 8026 8234 { ac_try='test -s conftest.$ac_objext' 8027 8235 - { (eval echo "$as_me:9816: \"$ac_try\"") >&5 8028 + { (eval echo "$as_me:101 63: \"$ac_try\"") >&58236 + { (eval echo "$as_me:10188: \"$ac_try\"") >&5 8029 8237 (eval $ac_try) 2>&5 8030 8238 ac_status=$? 8031 8239 - echo "$as_me:9819: \$? = $ac_status" >&5 8032 + echo "$as_me:101 66: \$? = $ac_status" >&58240 + echo "$as_me:10191: \$? = $ac_status" >&5 8033 8241 (exit $ac_status); }; }; then 8034 8242 cf_cv_weak_symbols=yes 8035 8243 else 8036 @@ -9827,7 +101 74,7 @@8244 @@ -9827,7 +10199,7 @@ 8037 8245 rm -f conftest.$ac_objext conftest.$ac_ext 8038 8246 8039 8247 fi 8040 8248 -echo "$as_me:9830: result: $cf_cv_weak_symbols" >&5 8041 +echo "$as_me:10 177: result: $cf_cv_weak_symbols" >&58249 +echo "$as_me:10202: result: $cf_cv_weak_symbols" >&5 8042 8250 echo "${ECHO_T}$cf_cv_weak_symbols" >&6 8043 8251 8044 8252 else 8045 @@ -9857,7 +102 04,7 @@8253 @@ -9857,7 +10229,7 @@ 8046 8254 # opaque outside of that, so there is no --enable-opaque option. We can use 8047 8255 # this option without --with-pthreads, but this will be always set for 8048 8256 # pthreads. 8049 8257 -echo "$as_me:9860: checking if you want experimental reentrant code" >&5 8050 +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 8051 8259 echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6 8052 8260 8053 8261 # Check whether --enable-reentrant or --disable-reentrant was given. 8054 @@ -9867,7 +102 14,7 @@8262 @@ -9867,7 +10239,7 @@ 8055 8263 else 8056 8264 with_reentrant=no 8057 8265 fi; 8058 8266 -echo "$as_me:9870: result: $with_reentrant" >&5 8059 +echo "$as_me:102 17: result: $with_reentrant" >&58267 +echo "$as_me:10242: result: $with_reentrant" >&5 8060 8268 echo "${ECHO_T}$with_reentrant" >&6 8061 8269 if test "$with_reentrant" = yes ; then 8062 8270 cf_cv_enable_reentrant=1 8063 @@ -9891,7 +102 38,7 @@8271 @@ -9891,7 +10263,7 @@ 8064 8272 5.*) 8065 8273 cf_cv_rel_version=6.0 8066 8274 cf_cv_abi_version=6 8067 8275 - { echo "$as_me:9894: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 8068 + { 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 8069 8277 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} 8070 8278 ;; 8071 8279 esac 8072 @@ -9904,7 +102 51,7 @@8280 @@ -9904,7 +10276,7 @@ 8073 8281 NCURSES_SIZE_T=short 8074 8282 fi 8075 8283 8076 8284 -echo "$as_me:9907: checking if you want experimental safe-sprintf code" >&5 8077 +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 8078 8286 echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6 8079 8287 8080 8288 # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given. 8081 @@ -9914,7 +102 61,7 @@8289 @@ -9914,7 +10286,7 @@ 8082 8290 else 8083 8291 with_safe_sprintf=no 8084 8292 fi; 8085 8293 -echo "$as_me:9917: result: $with_safe_sprintf" >&5 8086 +echo "$as_me:102 64: result: $with_safe_sprintf" >&58294 +echo "$as_me:10289: result: $with_safe_sprintf" >&5 8087 8295 echo "${ECHO_T}$with_safe_sprintf" >&6 8088 8296 test "$with_safe_sprintf" = yes && cat >>confdefs.h <<\EOF 8089 8297 #define USE_SAFE_SPRINTF 1 8090 @@ -9923,7 +102 70,7 @@8298 @@ -9923,7 +10295,7 @@ 8091 8299 ### use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic 8092 8300 # when hashmap is used scroll hints are useless 8093 8301 if test "$with_hashmap" = no ; then 8094 8302 -echo "$as_me:9926: checking if you want to experiment without scrolling-hints code" >&5 8095 +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 8096 8304 echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6 8097 8305 8098 8306 # Check whether --enable-scroll-hints or --disable-scroll-hints was given. 8099 @@ -9933,7 +10 280,7 @@8307 @@ -9933,7 +10305,7 @@ 8100 8308 else 8101 8309 with_scroll_hints=yes 8102 8310 fi; 8103 8311 -echo "$as_me:9936: result: $with_scroll_hints" >&5 8104 +echo "$as_me:10 283: result: $with_scroll_hints" >&58312 +echo "$as_me:10308: result: $with_scroll_hints" >&5 8105 8313 echo "${ECHO_T}$with_scroll_hints" >&6 8106 8314 test "$with_scroll_hints" = yes && cat >>confdefs.h <<\EOF 8107 8315 #define USE_SCROLL_HINTS 1 8108 @@ -9941,7 +10 288,7 @@8316 @@ -9941,7 +10313,7 @@ 8109 8317 8110 8318 fi 8111 8319 8112 8320 -echo "$as_me:9944: checking if you want experimental wgetch-events code" >&5 8113 +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 8114 8322 echo $ECHO_N "checking if you want experimental wgetch-events code... $ECHO_C" >&6 8115 8323 8116 8324 # Check whether --enable-wgetch-events or --disable-wgetch-events was given. 8117 @@ -9951,7 +10 298,7 @@8325 @@ -9951,7 +10323,7 @@ 8118 8326 else 8119 8327 with_wgetch_events=no 8120 8328 fi; 8121 8329 -echo "$as_me:9954: result: $with_wgetch_events" >&5 8122 +echo "$as_me:103 01: result: $with_wgetch_events" >&58330 +echo "$as_me:10326: result: $with_wgetch_events" >&5 8123 8331 echo "${ECHO_T}$with_wgetch_events" >&6 8124 8332 test "$with_wgetch_events" = yes && cat >>confdefs.h <<\EOF 8125 8333 #define NCURSES_WGETCH_EVENTS 1 8126 @@ -9960,7 +103 07,7 @@8334 @@ -9960,7 +10332,7 @@ 8127 8335 ############################################################################### 8128 8336 8129 8337 ### use option --disable-echo to suppress full display compiling commands 8130 8338 -echo "$as_me:9963: checking if you want to display full commands during build" >&5 8131 +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 8132 8340 echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6 8133 8341 8134 8342 # Check whether --enable-echo or --disable-echo was given. 8135 @@ -9977,11 +103 24,11 @@8343 @@ -9977,11 +10349,11 @@ 8136 8344 test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent" 8137 8345 test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent" 8138 8346 fi 8139 8347 -echo "$as_me:9980: result: $with_echo" >&5 8140 +echo "$as_me:103 27: result: $with_echo" >&58348 +echo "$as_me:10352: result: $with_echo" >&5 8141 8349 echo "${ECHO_T}$with_echo" >&6 8142 8350 8143 8351 ### use option --enable-warnings to turn on all gcc warnings 8144 8352 -echo "$as_me:9984: checking if you want to see compiler warnings" >&5 8145 +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 8146 8354 echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6 8147 8355 8148 8356 # Check whether --enable-warnings or --disable-warnings was given. 8149 @@ -9989,7 +103 36,7 @@8357 @@ -9989,7 +10361,7 @@ 8150 8358 enableval="$enable_warnings" 8151 8359 with_warnings=$enableval 8152 8360 fi; 8153 8361 -echo "$as_me:9992: result: $with_warnings" >&5 8154 +echo "$as_me:103 39: result: $with_warnings" >&58362 +echo "$as_me:10364: result: $with_warnings" >&5 8155 8363 echo "${ECHO_T}$with_warnings" >&6 8156 8364 8157 8365 if test "x$with_warnings" = "xyes"; then 8158 @@ -10000,12 +103 47,12 @@8366 @@ -10000,12 +10372,12 @@ 8159 8367 if test "$GCC" = yes ; then 8160 8368 case $host_os in 8161 8369 linux*|gnu*) 8162 8370 - echo "$as_me:10003: checking if this is really Intel C compiler" >&5 8163 + 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 8164 8372 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 8165 8373 cf_save_CFLAGS="$CFLAGS" … … 8167 8375 cat >conftest.$ac_ext <<_ACEOF 8168 8376 -#line 10008 "configure" 8169 +#line 103 55"configure"8377 +#line 10380 "configure" 8170 8378 #include "confdefs.h" 8171 8379 8172 8380 int 8173 @@ -10022,16 +103 69,16 @@8381 @@ -10022,16 +10394,16 @@ 8174 8382 } 8175 8383 _ACEOF 8176 8384 rm -f conftest.$ac_objext 8177 8385 -if { (eval echo "$as_me:10025: \"$ac_compile\"") >&5 8178 +if { (eval echo "$as_me:103 72: \"$ac_compile\"") >&58386 +if { (eval echo "$as_me:10397: \"$ac_compile\"") >&5 8179 8387 (eval $ac_compile) 2>&5 8180 8388 ac_status=$? 8181 8389 - echo "$as_me:10028: \$? = $ac_status" >&5 8182 + echo "$as_me:10 375: \$? = $ac_status" >&58390 + echo "$as_me:10400: \$? = $ac_status" >&5 8183 8391 (exit $ac_status); } && 8184 8392 { ac_try='test -s conftest.$ac_objext' 8185 8393 - { (eval echo "$as_me:10031: \"$ac_try\"") >&5 8186 + { (eval echo "$as_me:10 378: \"$ac_try\"") >&58394 + { (eval echo "$as_me:10403: \"$ac_try\"") >&5 8187 8395 (eval $ac_try) 2>&5 8188 8396 ac_status=$? 8189 8397 - echo "$as_me:10034: \$? = $ac_status" >&5 8190 + echo "$as_me:10 381: \$? = $ac_status" >&58398 + echo "$as_me:10406: \$? = $ac_status" >&5 8191 8399 (exit $ac_status); }; }; then 8192 8400 INTEL_COMPILER=yes 8193 8401 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" 8194 @@ -10042,14 +10 389,14 @@8402 @@ -10042,14 +10414,14 @@ 8195 8403 fi 8196 8404 rm -f conftest.$ac_objext conftest.$ac_ext 8197 8405 CFLAGS="$cf_save_CFLAGS" 8198 8406 - echo "$as_me:10045: result: $INTEL_COMPILER" >&5 8199 + echo "$as_me:10 392: result: $INTEL_COMPILER" >&58407 + echo "$as_me:10417: result: $INTEL_COMPILER" >&5 8200 8408 echo "${ECHO_T}$INTEL_COMPILER" >&6 8201 8409 ;; … … 8205 8413 cat > conftest.$ac_ext <<EOF 8206 8414 -#line 10052 "${as_me-configure}" 8207 +#line 10 399"${as_me-configure}"8415 +#line 10424 "${as_me-configure}" 8208 8416 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } 8209 8417 EOF 8210 8418 8211 @@ -10067,7 +104 14,7 @@8419 @@ -10067,7 +10439,7 @@ 8212 8420 # remark #981: operands are evaluated in unspecified order 8213 8421 # warning #269: invalid format string conversion 8214 8422 8215 8423 - { echo "$as_me:10070: checking for $CC warning options..." >&5 8216 + { echo "$as_me:104 17: checking for $CC warning options..." >&58424 + { echo "$as_me:10442: checking for $CC warning options..." >&5 8217 8425 echo "$as_me: checking for $CC warning options..." >&6;} 8218 8426 cf_save_CFLAGS="$CFLAGS" 8219 8427 EXTRA_CFLAGS="-Wall" 8220 @@ -10084,12 +104 31,12 @@8428 @@ -10084,12 +10456,12 @@ 8221 8429 wd981 8222 8430 do 8223 8431 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" 8224 8432 - if { (eval echo "$as_me:10087: \"$ac_compile\"") >&5 8225 + if { (eval echo "$as_me:104 34: \"$ac_compile\"") >&58433 + if { (eval echo "$as_me:10459: \"$ac_compile\"") >&5 8226 8434 (eval $ac_compile) 2>&5 8227 8435 ac_status=$? 8228 8436 - echo "$as_me:10090: \$? = $ac_status" >&5 8229 + echo "$as_me:104 37: \$? = $ac_status" >&58437 + echo "$as_me:10462: \$? = $ac_status" >&5 8230 8438 (exit $ac_status); }; then 8231 8439 - test -n "$verbose" && echo "$as_me:10092: result: ... -$cf_opt" >&5 8232 + test -n "$verbose" && echo "$as_me:104 39: result: ... -$cf_opt" >&58440 + test -n "$verbose" && echo "$as_me:10464: result: ... -$cf_opt" >&5 8233 8441 echo "${ECHO_T}... -$cf_opt" >&6 8234 8442 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" 8235 8443 fi 8236 @@ -10098,7 +104 45,7 @@8444 @@ -10098,7 +10470,7 @@ 8237 8445 8238 8446 elif test "$GCC" = yes 8239 8447 then 8240 8448 - { echo "$as_me:10101: checking for $CC warning options..." >&5 8241 + { echo "$as_me:104 48: checking for $CC warning options..." >&58449 + { echo "$as_me:10473: checking for $CC warning options..." >&5 8242 8450 echo "$as_me: checking for $CC warning options..." >&6;} 8243 8451 cf_save_CFLAGS="$CFLAGS" 8244 8452 EXTRA_CFLAGS="-W -Wall" 8245 @@ -10118,12 +104 65,12 @@8453 @@ -10118,12 +10490,12 @@ 8246 8454 Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum 8247 8455 do 8248 8456 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" 8249 8457 - if { (eval echo "$as_me:10121: \"$ac_compile\"") >&5 8250 + if { (eval echo "$as_me:104 68: \"$ac_compile\"") >&58458 + if { (eval echo "$as_me:10493: \"$ac_compile\"") >&5 8251 8459 (eval $ac_compile) 2>&5 8252 8460 ac_status=$? 8253 8461 - echo "$as_me:10124: \$? = $ac_status" >&5 8254 + echo "$as_me:104 71: \$? = $ac_status" >&58462 + echo "$as_me:10496: \$? = $ac_status" >&5 8255 8463 (exit $ac_status); }; then 8256 8464 - test -n "$verbose" && echo "$as_me:10126: result: ... -$cf_opt" >&5 8257 + test -n "$verbose" && echo "$as_me:104 73: result: ... -$cf_opt" >&58465 + test -n "$verbose" && echo "$as_me:10498: result: ... -$cf_opt" >&5 8258 8466 echo "${ECHO_T}... -$cf_opt" >&6 8259 8467 case $cf_opt in #(vi 8260 8468 Wcast-qual) #(vi 8261 @@ -10134,7 +10 481,7 @@8469 @@ -10134,7 +10506,7 @@ 8262 8470 [34].*) 8263 8471 test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 8264 8472 8265 8473 -echo "${as_me-configure}:10137: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 8266 +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 8267 8475 8268 8476 continue;; 8269 8477 esac 8270 @@ -10154,12 +105 01,12 @@8478 @@ -10154,12 +10526,12 @@ 8271 8479 if test "$GCC" = yes ; then 8272 8480 case $host_os in 8273 8481 linux*|gnu*) 8274 8482 - echo "$as_me:10157: checking if this is really Intel C++ compiler" >&5 8275 + 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 8276 8484 echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6 8277 8485 cf_save_CFLAGS="$CXXFLAGS" … … 8279 8487 cat >conftest.$ac_ext <<_ACEOF 8280 8488 -#line 10162 "configure" 8281 +#line 105 09"configure"8489 +#line 10534 "configure" 8282 8490 #include "confdefs.h" 8283 8491 8284 8492 int 8285 @@ -10176,16 +105 23,16 @@8493 @@ -10176,16 +10548,16 @@ 8286 8494 } 8287 8495 _ACEOF 8288 8496 rm -f conftest.$ac_objext 8289 8497 -if { (eval echo "$as_me:10179: \"$ac_compile\"") >&5 8290 +if { (eval echo "$as_me:105 26: \"$ac_compile\"") >&58498 +if { (eval echo "$as_me:10551: \"$ac_compile\"") >&5 8291 8499 (eval $ac_compile) 2>&5 8292 8500 ac_status=$? 8293 8501 - echo "$as_me:10182: \$? = $ac_status" >&5 8294 + echo "$as_me:105 29: \$? = $ac_status" >&58502 + echo "$as_me:10554: \$? = $ac_status" >&5 8295 8503 (exit $ac_status); } && 8296 8504 { ac_try='test -s conftest.$ac_objext' 8297 8505 - { (eval echo "$as_me:10185: \"$ac_try\"") >&5 8298 + { (eval echo "$as_me:105 32: \"$ac_try\"") >&58506 + { (eval echo "$as_me:10557: \"$ac_try\"") >&5 8299 8507 (eval $ac_try) 2>&5 8300 8508 ac_status=$? 8301 8509 - echo "$as_me:10188: \$? = $ac_status" >&5 8302 + echo "$as_me:105 35: \$? = $ac_status" >&58510 + echo "$as_me:10560: \$? = $ac_status" >&5 8303 8511 (exit $ac_status); }; }; then 8304 8512 INTEL_CPLUSPLUS=yes 8305 8513 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" 8306 @@ -10196,7 +105 43,7 @@8514 @@ -10196,7 +10568,7 @@ 8307 8515 fi 8308 8516 rm -f conftest.$ac_objext conftest.$ac_ext 8309 8517 CXXFLAGS="$cf_save_CFLAGS" 8310 8518 - echo "$as_me:10199: result: $INTEL_CPLUSPLUS" >&5 8311 + echo "$as_me:105 46: result: $INTEL_CPLUSPLUS" >&58519 + echo "$as_me:10571: result: $INTEL_CPLUSPLUS" >&5 8312 8520 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 8313 8521 ;; 8314 8522 esac 8315 @@ -10210,7 +105 57,7 @@8523 @@ -10210,7 +10582,7 @@ 8316 8524 ac_main_return=return 8317 8525 8318 8526 cat > conftest.$ac_ext <<EOF 8319 8527 -#line 10213 "configure" 8320 +#line 105 60"configure"8528 +#line 10585 "configure" 8321 8529 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } 8322 8530 EOF 8323 8531 8324 @@ -10228,7 +10 575,7 @@8532 @@ -10228,7 +10600,7 @@ 8325 8533 # remark #981: operands are evaluated in unspecified order 8326 8534 # warning #269: invalid format string conversion 8327 8535 8328 8536 - { echo "$as_me:10231: checking for $CC warning options..." >&5 8329 + { echo "$as_me:10 578: checking for $CC warning options..." >&58537 + { echo "$as_me:10603: checking for $CC warning options..." >&5 8330 8538 echo "$as_me: checking for $CC warning options..." >&6;} 8331 8539 cf_save_CXXFLAGS="$CXXFLAGS" 8332 8540 EXTRA_CXXFLAGS="-Wall" 8333 @@ -10245,12 +10 592,12 @@8541 @@ -10245,12 +10617,12 @@ 8334 8542 wd981 8335 8543 do 8336 8544 CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt" 8337 8545 - if { (eval echo "$as_me:10248: \"$ac_compile\"") >&5 8338 + if { (eval echo "$as_me:10 595: \"$ac_compile\"") >&58546 + if { (eval echo "$as_me:10620: \"$ac_compile\"") >&5 8339 8547 (eval $ac_compile) 2>&5 8340 8548 ac_status=$? 8341 8549 - echo "$as_me:10251: \$? = $ac_status" >&5 8342 + echo "$as_me:10 598: \$? = $ac_status" >&58550 + echo "$as_me:10623: \$? = $ac_status" >&5 8343 8551 (exit $ac_status); }; then 8344 8552 - test -n "$verbose" && echo "$as_me:10253: result: ... -$cf_opt" >&5 8345 + test -n "$verbose" && echo "$as_me:106 00: result: ... -$cf_opt" >&58553 + test -n "$verbose" && echo "$as_me:10625: result: ... -$cf_opt" >&5 8346 8554 echo "${ECHO_T}... -$cf_opt" >&6 8347 8555 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" 8348 8556 fi 8349 @@ -10259,7 +106 06,7 @@8557 @@ -10259,7 +10631,7 @@ 8350 8558 8351 8559 elif test "$GXX" = yes 8352 8560 then 8353 8561 - { echo "$as_me:10262: checking for $CXX warning options..." >&5 8354 + { echo "$as_me:106 09: checking for $CXX warning options..." >&58562 + { echo "$as_me:10634: checking for $CXX warning options..." >&5 8355 8563 echo "$as_me: checking for $CXX warning options..." >&6;} 8356 8564 cf_save_CXXFLAGS="$CXXFLAGS" 8357 8565 EXTRA_CXXFLAGS="-W -Wall" 8358 @@ -10288,16 +106 35,16 @@8566 @@ -10288,16 +10660,16 @@ 8359 8567 Wundef $cf_gxx_extra_warnings Wno-unused 8360 8568 do 8361 8569 CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt" 8362 8570 - if { (eval echo "$as_me:10291: \"$ac_compile\"") >&5 8363 + if { (eval echo "$as_me:106 38: \"$ac_compile\"") >&58571 + if { (eval echo "$as_me:10663: \"$ac_compile\"") >&5 8364 8572 (eval $ac_compile) 2>&5 8365 8573 ac_status=$? 8366 8574 - echo "$as_me:10294: \$? = $ac_status" >&5 8367 + echo "$as_me:106 41: \$? = $ac_status" >&58575 + echo "$as_me:10666: \$? = $ac_status" >&5 8368 8576 (exit $ac_status); }; then 8369 8577 - test -n "$verbose" && echo "$as_me:10296: result: ... -$cf_opt" >&5 8370 + test -n "$verbose" && echo "$as_me:106 43: result: ... -$cf_opt" >&58578 + test -n "$verbose" && echo "$as_me:10668: result: ... -$cf_opt" >&5 8371 8579 echo "${ECHO_T}... -$cf_opt" >&6 8372 8580 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" 8373 8581 else 8374 8582 - test -n "$verbose" && echo "$as_me:10300: result: ... no -$cf_opt" >&5 8375 + 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 8376 8584 echo "${ECHO_T}... no -$cf_opt" >&6 8377 8585 fi 8378 8586 done 8379 @@ -10333,10 +10 680,10 @@8587 @@ -10333,10 +10705,10 @@ 8380 8588 EOF 8381 8589 if test "$GCC" = yes 8382 8590 then 8383 8591 - { echo "$as_me:10336: checking for $CC __attribute__ directives..." >&5 8384 + { echo "$as_me:10 683: checking for $CC __attribute__ directives..." >&58592 + { echo "$as_me:10708: checking for $CC __attribute__ directives..." >&5 8385 8593 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} 8386 8594 cat > conftest.$ac_ext <<EOF 8387 8595 -#line 10339 "${as_me-configure}" 8388 +#line 10 686"${as_me-configure}"8596 +#line 10711 "${as_me-configure}" 8389 8597 #include "confdefs.h" 8390 8598 #include "conftest.h" 8391 8599 #include "conftest.i" 8392 @@ -10374,12 +107 21,12 @@8600 @@ -10374,12 +10746,12 @@ 8393 8601 EOF 8394 8602 ;; 8395 8603 esac 8396 8604 - if { (eval echo "$as_me:10377: \"$ac_compile\"") >&5 8397 + if { (eval echo "$as_me:107 24: \"$ac_compile\"") >&58605 + if { (eval echo "$as_me:10749: \"$ac_compile\"") >&5 8398 8606 (eval $ac_compile) 2>&5 8399 8607 ac_status=$? 8400 8608 - echo "$as_me:10380: \$? = $ac_status" >&5 8401 + echo "$as_me:107 27: \$? = $ac_status" >&58609 + echo "$as_me:10752: \$? = $ac_status" >&5 8402 8610 (exit $ac_status); }; then 8403 8611 - test -n "$verbose" && echo "$as_me:10382: result: ... $cf_attribute" >&5 8404 + test -n "$verbose" && echo "$as_me:107 29: result: ... $cf_attribute" >&58612 + test -n "$verbose" && echo "$as_me:10754: result: ... $cf_attribute" >&5 8405 8613 echo "${ECHO_T}... $cf_attribute" >&6 8406 8614 cat conftest.h >>confdefs.h 8407 8615 fi 8408 @@ -10391,7 +107 38,7 @@8616 @@ -10391,7 +10763,7 @@ 8409 8617 fi 8410 8618 8411 8619 ### use option --enable-assertions to turn on generation of assertion code 8412 8620 -echo "$as_me:10394: checking if you want to enable runtime assertions" >&5 8413 +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 8414 8622 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 8415 8623 8416 8624 # Check whether --enable-assertions or --disable-assertions was given. 8417 @@ -10401,7 +107 48,7 @@8625 @@ -10401,7 +10773,7 @@ 8418 8626 else 8419 8627 with_assertions=no 8420 8628 fi; 8421 8629 -echo "$as_me:10404: result: $with_assertions" >&5 8422 +echo "$as_me:107 51: result: $with_assertions" >&58630 +echo "$as_me:10776: result: $with_assertions" >&5 8423 8631 echo "${ECHO_T}$with_assertions" >&6 8424 8632 if test -n "$GCC" 8425 8633 then 8426 @@ -10419,7 +107 66,7 @@8634 @@ -10419,7 +10791,7 @@ 8427 8635 8428 8636 ### use option --disable-leaks to suppress "permanent" leaks, for testing 8429 8637 8430 8638 -echo "$as_me:10422: checking if you want to use dmalloc for testing" >&5 8431 +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 8432 8640 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 8433 8641 8434 8642 # Check whether --with-dmalloc or --without-dmalloc was given. 8435 @@ -10435,7 +10 782,7 @@8643 @@ -10435,7 +10807,7 @@ 8436 8644 else 8437 8645 with_dmalloc= 8438 8646 fi; 8439 8647 -echo "$as_me:10438: result: ${with_dmalloc:-no}" >&5 8440 +echo "$as_me:10 785: result: ${with_dmalloc:-no}" >&58648 +echo "$as_me:10810: result: ${with_dmalloc:-no}" >&5 8441 8649 echo "${ECHO_T}${with_dmalloc:-no}" >&6 8442 8650 8443 8651 case .$with_cflags in #(vi 8444 @@ -10519,23 +10866,23 @@ 8652 @@ -10505,7 +10877,7 @@ 8653 8654 if test -n "$cf_new_cppflags" ; then 8655 8656 - CPPFLAGS="$cf_new_cppflags $CPPFLAGS" 8657 + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" 8658 fi 8659 8660 if test -n "$cf_new_extra_cppflags" ; then 8661 @@ -10519,23 +10891,23 @@ 8445 8662 esac 8446 8663 8447 8664 if test "$with_dmalloc" = yes ; then 8448 8665 - echo "$as_me:10522: checking for dmalloc.h" >&5 8449 + echo "$as_me:108 69: checking for dmalloc.h" >&58666 + echo "$as_me:10894: checking for dmalloc.h" >&5 8450 8667 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6 8451 8668 if test "${ac_cv_header_dmalloc_h+set}" = set; then … … 8454 8671 cat >conftest.$ac_ext <<_ACEOF 8455 8672 -#line 10528 "configure" 8456 +#line 10 875"configure"8673 +#line 10900 "configure" 8457 8674 #include "confdefs.h" 8458 8675 #include <dmalloc.h> 8459 8676 _ACEOF 8460 8677 -if { (eval echo "$as_me:10532: \"$ac_cpp conftest.$ac_ext\"") >&5 8461 +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 8462 8679 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 8463 8680 ac_status=$? … … 8466 8683 cat conftest.err >&5 8467 8684 - echo "$as_me:10538: \$? = $ac_status" >&5 8468 + echo "$as_me:10 885: \$? = $ac_status" >&58685 + echo "$as_me:10910: \$? = $ac_status" >&5 8469 8686 (exit $ac_status); } >/dev/null; then 8470 8687 if test -s conftest.err; then 8471 8688 ac_cpp_err=$ac_c_preproc_warn_flag 8472 @@ -10554,11 +109 01,11 @@8689 @@ -10554,11 +10926,11 @@ 8473 8690 fi 8474 8691 rm -f conftest.err conftest.$ac_ext 8475 8692 fi 8476 8693 -echo "$as_me:10557: result: $ac_cv_header_dmalloc_h" >&5 8477 +echo "$as_me:109 04: result: $ac_cv_header_dmalloc_h" >&58694 +echo "$as_me:10929: result: $ac_cv_header_dmalloc_h" >&5 8478 8695 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6 8479 8696 if test $ac_cv_header_dmalloc_h = yes; then 8480 8697 8481 8698 -echo "$as_me:10561: checking for dmalloc_debug in -ldmalloc" >&5 8482 +echo "$as_me:109 08: checking for dmalloc_debug in -ldmalloc" >&58699 +echo "$as_me:10933: checking for dmalloc_debug in -ldmalloc" >&5 8483 8700 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 8484 8701 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then 8485 8702 echo $ECHO_N "(cached) $ECHO_C" >&6 8486 @@ -10566,7 +109 13,7 @@8703 @@ -10566,7 +10938,7 @@ 8487 8704 ac_check_lib_save_LIBS=$LIBS 8488 8705 LIBS="-ldmalloc $LIBS" 8489 8706 cat >conftest.$ac_ext <<_ACEOF 8490 8707 -#line 10569 "configure" 8491 +#line 109 16"configure"8708 +#line 10941 "configure" 8492 8709 #include "confdefs.h" 8493 8710 8494 8711 /* Override any gcc2 internal prototype to avoid an error. */ 8495 @@ -10585,16 +109 32,16 @@8712 @@ -10585,16 +10957,16 @@ 8496 8713 } 8497 8714 _ACEOF 8498 8715 rm -f conftest.$ac_objext conftest$ac_exeext 8499 8716 -if { (eval echo "$as_me:10588: \"$ac_link\"") >&5 8500 +if { (eval echo "$as_me:109 35: \"$ac_link\"") >&58717 +if { (eval echo "$as_me:10960: \"$ac_link\"") >&5 8501 8718 (eval $ac_link) 2>&5 8502 8719 ac_status=$? 8503 8720 - echo "$as_me:10591: \$? = $ac_status" >&5 8504 + echo "$as_me:109 38: \$? = $ac_status" >&58721 + echo "$as_me:10963: \$? = $ac_status" >&5 8505 8722 (exit $ac_status); } && 8506 8723 { ac_try='test -s conftest$ac_exeext' 8507 8724 - { (eval echo "$as_me:10594: \"$ac_try\"") >&5 8508 + { (eval echo "$as_me:109 41: \"$ac_try\"") >&58725 + { (eval echo "$as_me:10966: \"$ac_try\"") >&5 8509 8726 (eval $ac_try) 2>&5 8510 8727 ac_status=$? 8511 8728 - echo "$as_me:10597: \$? = $ac_status" >&5 8512 + echo "$as_me:109 44: \$? = $ac_status" >&58729 + echo "$as_me:10969: \$? = $ac_status" >&5 8513 8730 (exit $ac_status); }; }; then 8514 8731 ac_cv_lib_dmalloc_dmalloc_debug=yes 8515 8732 else 8516 @@ -10605,7 +109 52,7 @@8733 @@ -10605,7 +10977,7 @@ 8517 8734 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 8518 8735 LIBS=$ac_check_lib_save_LIBS 8519 8736 fi 8520 8737 -echo "$as_me:10608: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 8521 +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 8522 8739 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 8523 8740 if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then 8524 8741 cat >>confdefs.h <<EOF 8525 @@ -10620,7 +109 67,7 @@8742 @@ -10620,7 +10992,7 @@ 8526 8743 8527 8744 fi 8528 8745 8529 8746 -echo "$as_me:10623: checking if you want to use dbmalloc for testing" >&5 8530 +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 8531 8748 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 8532 8749 8533 8750 # Check whether --with-dbmalloc or --without-dbmalloc was given. 8534 @@ -10636,7 +1 0983,7 @@8751 @@ -10636,7 +11008,7 @@ 8535 8752 else 8536 8753 with_dbmalloc= 8537 8754 fi; 8538 8755 -echo "$as_me:10639: result: ${with_dbmalloc:-no}" >&5 8539 +echo "$as_me:1 0986: result: ${with_dbmalloc:-no}" >&58756 +echo "$as_me:11011: result: ${with_dbmalloc:-no}" >&5 8540 8757 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 8541 8758 8542 8759 case .$with_cflags in #(vi 8543 @@ -10720,23 +11067,23 @@ 8760 @@ -10706,7 +11078,7 @@ 8761 8762 if test -n "$cf_new_cppflags" ; then 8763 8764 - CPPFLAGS="$cf_new_cppflags $CPPFLAGS" 8765 + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" 8766 fi 8767 8768 if test -n "$cf_new_extra_cppflags" ; then 8769 @@ -10720,23 +11092,23 @@ 8544 8770 esac 8545 8771 8546 8772 if test "$with_dbmalloc" = yes ; then 8547 8773 - echo "$as_me:10723: checking for dbmalloc.h" >&5 8548 + echo "$as_me:110 70: checking for dbmalloc.h" >&58774 + echo "$as_me:11095: checking for dbmalloc.h" >&5 8549 8775 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6 8550 8776 if test "${ac_cv_header_dbmalloc_h+set}" = set; then … … 8553 8779 cat >conftest.$ac_ext <<_ACEOF 8554 8780 -#line 10729 "configure" 8555 +#line 11 076"configure"8781 +#line 11101 "configure" 8556 8782 #include "confdefs.h" 8557 8783 #include <dbmalloc.h> 8558 8784 _ACEOF 8559 8785 -if { (eval echo "$as_me:10733: \"$ac_cpp conftest.$ac_ext\"") >&5 8560 +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 8561 8787 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 8562 8788 ac_status=$? … … 8565 8791 cat conftest.err >&5 8566 8792 - echo "$as_me:10739: \$? = $ac_status" >&5 8567 + echo "$as_me:11 086: \$? = $ac_status" >&58793 + echo "$as_me:11111: \$? = $ac_status" >&5 8568 8794 (exit $ac_status); } >/dev/null; then 8569 8795 if test -s conftest.err; then 8570 8796 ac_cpp_err=$ac_c_preproc_warn_flag 8571 @@ -10755,11 +111 02,11 @@8797 @@ -10755,11 +11127,11 @@ 8572 8798 fi 8573 8799 rm -f conftest.err conftest.$ac_ext 8574 8800 fi 8575 8801 -echo "$as_me:10758: result: $ac_cv_header_dbmalloc_h" >&5 8576 +echo "$as_me:111 05: result: $ac_cv_header_dbmalloc_h" >&58802 +echo "$as_me:11130: result: $ac_cv_header_dbmalloc_h" >&5 8577 8803 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6 8578 8804 if test $ac_cv_header_dbmalloc_h = yes; then 8579 8805 8580 8806 -echo "$as_me:10762: checking for debug_malloc in -ldbmalloc" >&5 8581 +echo "$as_me:111 09: checking for debug_malloc in -ldbmalloc" >&58807 +echo "$as_me:11134: checking for debug_malloc in -ldbmalloc" >&5 8582 8808 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 8583 8809 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then 8584 8810 echo $ECHO_N "(cached) $ECHO_C" >&6 8585 @@ -10767,7 +111 14,7 @@8811 @@ -10767,7 +11139,7 @@ 8586 8812 ac_check_lib_save_LIBS=$LIBS 8587 8813 LIBS="-ldbmalloc $LIBS" 8588 8814 cat >conftest.$ac_ext <<_ACEOF 8589 8815 -#line 10770 "configure" 8590 +#line 111 17"configure"8816 +#line 11142 "configure" 8591 8817 #include "confdefs.h" 8592 8818 8593 8819 /* Override any gcc2 internal prototype to avoid an error. */ 8594 @@ -10786,16 +111 33,16 @@8820 @@ -10786,16 +11158,16 @@ 8595 8821 } 8596 8822 _ACEOF 8597 8823 rm -f conftest.$ac_objext conftest$ac_exeext 8598 8824 -if { (eval echo "$as_me:10789: \"$ac_link\"") >&5 8599 +if { (eval echo "$as_me:111 36: \"$ac_link\"") >&58825 +if { (eval echo "$as_me:11161: \"$ac_link\"") >&5 8600 8826 (eval $ac_link) 2>&5 8601 8827 ac_status=$? 8602 8828 - echo "$as_me:10792: \$? = $ac_status" >&5 8603 + echo "$as_me:111 39: \$? = $ac_status" >&58829 + echo "$as_me:11164: \$? = $ac_status" >&5 8604 8830 (exit $ac_status); } && 8605 8831 { ac_try='test -s conftest$ac_exeext' 8606 8832 - { (eval echo "$as_me:10795: \"$ac_try\"") >&5 8607 + { (eval echo "$as_me:111 42: \"$ac_try\"") >&58833 + { (eval echo "$as_me:11167: \"$ac_try\"") >&5 8608 8834 (eval $ac_try) 2>&5 8609 8835 ac_status=$? 8610 8836 - echo "$as_me:10798: \$? = $ac_status" >&5 8611 + echo "$as_me:111 45: \$? = $ac_status" >&58837 + echo "$as_me:11170: \$? = $ac_status" >&5 8612 8838 (exit $ac_status); }; }; then 8613 8839 ac_cv_lib_dbmalloc_debug_malloc=yes 8614 8840 else 8615 @@ -10806,7 +111 53,7 @@8841 @@ -10806,7 +11178,7 @@ 8616 8842 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 8617 8843 LIBS=$ac_check_lib_save_LIBS 8618 8844 fi 8619 8845 -echo "$as_me:10809: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 8620 +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 8621 8847 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 8622 8848 if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then 8623 8849 cat >>confdefs.h <<EOF 8624 @@ -10821,7 +111 68,7 @@8850 @@ -10821,7 +11193,7 @@ 8625 8851 8626 8852 fi 8627 8853 8628 8854 -echo "$as_me:10824: checking if you want to use valgrind for testing" >&5 8629 +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 8630 8856 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6 8631 8857 8632 8858 # Check whether --with-valgrind or --without-valgrind was given. 8633 @@ -10837,7 +11 184,7 @@8859 @@ -10837,7 +11209,7 @@ 8634 8860 else 8635 8861 with_valgrind= 8636 8862 fi; 8637 8863 -echo "$as_me:10840: result: ${with_valgrind:-no}" >&5 8638 +echo "$as_me:11 187: result: ${with_valgrind:-no}" >&58864 +echo "$as_me:11212: result: ${with_valgrind:-no}" >&5 8639 8865 echo "${ECHO_T}${with_valgrind:-no}" >&6 8640 8866 8641 8867 case .$with_cflags in #(vi 8642 @@ -10920,7 +11267,7 @@ 8868 @@ -10907,7 +11279,7 @@ 8869 8870 if test -n "$cf_new_cppflags" ; then 8871 8872 - CPPFLAGS="$cf_new_cppflags $CPPFLAGS" 8873 + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" 8874 fi 8875 8876 if test -n "$cf_new_extra_cppflags" ; then 8877 @@ -10920,7 +11292,7 @@ 8643 8878 ;; 8644 8879 esac 8645 8880 8646 8881 -echo "$as_me:10923: checking if you want to perform memory-leak testing" >&5 8647 +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 8648 8883 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 8649 8884 8650 8885 # Check whether --enable-leaks or --disable-leaks was given. 8651 @@ -10930,7 +11 277,7 @@8886 @@ -10930,7 +11302,7 @@ 8652 8887 else 8653 8888 : ${with_no_leaks:=no} 8654 8889 fi; 8655 8890 -echo "$as_me:10933: result: $with_no_leaks" >&5 8656 +echo "$as_me:11 280: result: $with_no_leaks" >&58891 +echo "$as_me:11305: result: $with_no_leaks" >&5 8657 8892 echo "${ECHO_T}$with_no_leaks" >&6 8658 8893 8659 8894 if test "$with_no_leaks" = yes ; then 8660 @@ -10975,7 +113 22,7 @@8895 @@ -10975,7 +11347,7 @@ 8661 8896 ;; 8662 8897 esac 8663 8898 8664 8899 -echo "$as_me:10978: checking whether to add trace feature to all models" >&5 8665 +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 8666 8901 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 8667 8902 8668 8903 # Check whether --with-trace or --without-trace was given. 8669 @@ -10985,7 +113 32,7 @@8904 @@ -10985,7 +11357,7 @@ 8670 8905 else 8671 8906 cf_with_trace=$cf_all_traces 8672 8907 fi; 8673 8908 -echo "$as_me:10988: result: $cf_with_trace" >&5 8674 +echo "$as_me:113 35: result: $cf_with_trace" >&58909 +echo "$as_me:11360: result: $cf_with_trace" >&5 8675 8910 echo "${ECHO_T}$cf_with_trace" >&6 8676 8911 8677 8912 if test "$cf_with_trace" = yes ; then 8678 @@ -11066,13 +11413,13 @@ 8913 @@ -11052,7 +11424,7 @@ 8914 8915 if test -n "$cf_new_cppflags" ; then 8916 8917 - CPPFLAGS="$cf_new_cppflags $CPPFLAGS" 8918 + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" 8919 fi 8920 8921 if test -n "$cf_new_extra_cppflags" ; then 8922 @@ -11066,13 +11438,17 @@ 8679 8923 fi 8680 8924 8681 8925 ### Checks for libraries. 8682 8926 -echo "$as_me:11069: checking for gettimeofday" >&5 8683 +echo "$as_me:11416: checking for gettimeofday" >&5 8927 +case $cf_cv_system_name in #(vi 8928 +*mingw32*) #(vi 8929 + ;; 8930 +*) 8931 +echo "$as_me:11445: checking for gettimeofday" >&5 8684 8932 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 8685 8933 if test "${ac_cv_func_gettimeofday+set}" = set; then … … 8688 8936 cat >conftest.$ac_ext <<_ACEOF 8689 8937 -#line 11075 "configure" 8690 +#line 114 22"configure"8938 +#line 11451 "configure" 8691 8939 #include "confdefs.h" 8692 8940 /* System header to define __stub macros and hopefully few prototypes, 8693 8941 which can conflict with char gettimeofday (); below. */ 8694 @@ -11103,16 +114 50,16 @@8942 @@ -11103,16 +11479,16 @@ 8695 8943 } 8696 8944 _ACEOF 8697 8945 rm -f conftest.$ac_objext conftest$ac_exeext 8698 8946 -if { (eval echo "$as_me:11106: \"$ac_link\"") >&5 8699 +if { (eval echo "$as_me:114 53: \"$ac_link\"") >&58947 +if { (eval echo "$as_me:11482: \"$ac_link\"") >&5 8700 8948 (eval $ac_link) 2>&5 8701 8949 ac_status=$? 8702 8950 - echo "$as_me:11109: \$? = $ac_status" >&5 8703 + echo "$as_me:114 56: \$? = $ac_status" >&58951 + echo "$as_me:11485: \$? = $ac_status" >&5 8704 8952 (exit $ac_status); } && 8705 8953 { ac_try='test -s conftest$ac_exeext' 8706 8954 - { (eval echo "$as_me:11112: \"$ac_try\"") >&5 8707 + { (eval echo "$as_me:114 59: \"$ac_try\"") >&58955 + { (eval echo "$as_me:11488: \"$ac_try\"") >&5 8708 8956 (eval $ac_try) 2>&5 8709 8957 ac_status=$? 8710 8958 - echo "$as_me:11115: \$? = $ac_status" >&5 8711 + echo "$as_me:114 62: \$? = $ac_status" >&58959 + echo "$as_me:11491: \$? = $ac_status" >&5 8712 8960 (exit $ac_status); }; }; then 8713 8961 ac_cv_func_gettimeofday=yes 8714 8962 else 8715 @@ -11122,7 +114 69,7 @@8963 @@ -11122,7 +11498,7 @@ 8716 8964 fi 8717 8965 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 8718 8966 fi 8719 8967 -echo "$as_me:11125: result: $ac_cv_func_gettimeofday" >&5 8720 +echo "$as_me:11 472: result: $ac_cv_func_gettimeofday" >&58968 +echo "$as_me:11501: result: $ac_cv_func_gettimeofday" >&5 8721 8969 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 8722 8970 if test $ac_cv_func_gettimeofday = yes; then 8723 8971 cat >>confdefs.h <<\EOF 8724 @@ -11131,7 +11 478,7 @@8972 @@ -11131,7 +11507,7 @@ 8725 8973 8726 8974 else 8727 8975 8728 8976 -echo "$as_me:11134: checking for gettimeofday in -lbsd" >&5 8729 +echo "$as_me:11 481: checking for gettimeofday in -lbsd" >&58977 +echo "$as_me:11510: checking for gettimeofday in -lbsd" >&5 8730 8978 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 8731 8979 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then 8732 8980 echo $ECHO_N "(cached) $ECHO_C" >&6 8733 @@ -11139,7 +11 486,7 @@8981 @@ -11139,7 +11515,7 @@ 8734 8982 ac_check_lib_save_LIBS=$LIBS 8735 8983 LIBS="-lbsd $LIBS" 8736 8984 cat >conftest.$ac_ext <<_ACEOF 8737 8985 -#line 11142 "configure" 8738 +#line 11 489"configure"8986 +#line 11518 "configure" 8739 8987 #include "confdefs.h" 8740 8988 8741 8989 /* Override any gcc2 internal prototype to avoid an error. */ 8742 @@ -11158,16 +115 05,16 @@8990 @@ -11158,16 +11534,16 @@ 8743 8991 } 8744 8992 _ACEOF 8745 8993 rm -f conftest.$ac_objext conftest$ac_exeext 8746 8994 -if { (eval echo "$as_me:11161: \"$ac_link\"") >&5 8747 +if { (eval echo "$as_me:115 08: \"$ac_link\"") >&58995 +if { (eval echo "$as_me:11537: \"$ac_link\"") >&5 8748 8996 (eval $ac_link) 2>&5 8749 8997 ac_status=$? 8750 8998 - echo "$as_me:11164: \$? = $ac_status" >&5 8751 + echo "$as_me:115 11: \$? = $ac_status" >&58999 + echo "$as_me:11540: \$? = $ac_status" >&5 8752 9000 (exit $ac_status); } && 8753 9001 { ac_try='test -s conftest$ac_exeext' 8754 9002 - { (eval echo "$as_me:11167: \"$ac_try\"") >&5 8755 + { (eval echo "$as_me:115 14: \"$ac_try\"") >&59003 + { (eval echo "$as_me:11543: \"$ac_try\"") >&5 8756 9004 (eval $ac_try) 2>&5 8757 9005 ac_status=$? 8758 9006 - echo "$as_me:11170: \$? = $ac_status" >&5 8759 + echo "$as_me:115 17: \$? = $ac_status" >&59007 + echo "$as_me:11546: \$? = $ac_status" >&5 8760 9008 (exit $ac_status); }; }; then 8761 9009 ac_cv_lib_bsd_gettimeofday=yes 8762 9010 else 8763 @@ -11178,7 +115 25,7 @@9011 @@ -11178,7 +11554,7 @@ 8764 9012 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 8765 9013 LIBS=$ac_check_lib_save_LIBS 8766 9014 fi 8767 9015 -echo "$as_me:11181: result: $ac_cv_lib_bsd_gettimeofday" >&5 8768 +echo "$as_me:115 28: result: $ac_cv_lib_bsd_gettimeofday" >&59016 +echo "$as_me:11557: result: $ac_cv_lib_bsd_gettimeofday" >&5 8769 9017 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 8770 9018 if test $ac_cv_lib_bsd_gettimeofday = yes; then 8771 9019 cat >>confdefs.h <<\EOF 8772 @@ -11190,14 +11537,14 @@ 8773 8774 fi 9020 @@ -11189,15 +11565,17 @@ 9021 fi 9022 9023 fi 9024 + ;; 9025 +esac 8775 9026 8776 9027 -echo "$as_me:11193: checking if -lm needed for math functions" >&5 8777 +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 8778 9029 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6 8779 9030 if test "${cf_cv_need_libm+set}" = set; then … … 8783 9034 cat >conftest.$ac_ext <<_ACEOF 8784 9035 -#line 11200 "configure" 8785 +#line 115 47"configure"9036 +#line 11578 "configure" 8786 9037 #include "confdefs.h" 8787 9038 8788 9039 #include <stdio.h> 8789 @@ -11212,16 +115 59,16 @@9040 @@ -11212,16 +11590,16 @@ 8790 9041 } 8791 9042 _ACEOF 8792 9043 rm -f conftest.$ac_objext conftest$ac_exeext 8793 9044 -if { (eval echo "$as_me:11215: \"$ac_link\"") >&5 8794 +if { (eval echo "$as_me:115 62: \"$ac_link\"") >&59045 +if { (eval echo "$as_me:11593: \"$ac_link\"") >&5 8795 9046 (eval $ac_link) 2>&5 8796 9047 ac_status=$? 8797 9048 - echo "$as_me:11218: \$? = $ac_status" >&5 8798 + echo "$as_me:115 65: \$? = $ac_status" >&59049 + echo "$as_me:11596: \$? = $ac_status" >&5 8799 9050 (exit $ac_status); } && 8800 9051 { ac_try='test -s conftest$ac_exeext' 8801 9052 - { (eval echo "$as_me:11221: \"$ac_try\"") >&5 8802 + { (eval echo "$as_me:115 68: \"$ac_try\"") >&59053 + { (eval echo "$as_me:11599: \"$ac_try\"") >&5 8803 9054 (eval $ac_try) 2>&5 8804 9055 ac_status=$? 8805 9056 - echo "$as_me:11224: \$? = $ac_status" >&5 8806 + echo "$as_me:11 571: \$? = $ac_status" >&59057 + echo "$as_me:11602: \$? = $ac_status" >&5 8807 9058 (exit $ac_status); }; }; then 8808 9059 cf_cv_need_libm=no 8809 9060 else 8810 @@ -11231,7 +11 578,7 @@9061 @@ -11231,7 +11609,7 @@ 8811 9062 fi 8812 9063 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 8813 9064 fi 8814 9065 -echo "$as_me:11234: result: $cf_cv_need_libm" >&5 8815 +echo "$as_me:11 581: result: $cf_cv_need_libm" >&59066 +echo "$as_me:11612: result: $cf_cv_need_libm" >&5 8816 9067 echo "${ECHO_T}$cf_cv_need_libm" >&6 8817 9068 if test "$cf_cv_need_libm" = yes 8818 9069 then 8819 @@ -11239,13 +11 586,13 @@9070 @@ -11239,13 +11617,13 @@ 8820 9071 fi 8821 9072 8822 9073 ### Checks for header files. 8823 9074 -echo "$as_me:11242: checking for ANSI C header files" >&5 8824 +echo "$as_me:11 589: checking for ANSI C header files" >&59075 +echo "$as_me:11620: checking for ANSI C header files" >&5 8825 9076 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 8826 9077 if test "${ac_cv_header_stdc+set}" = set; then … … 8829 9080 cat >conftest.$ac_ext <<_ACEOF 8830 9081 -#line 11248 "configure" 8831 +#line 11 595"configure"9082 +#line 11626 "configure" 8832 9083 #include "confdefs.h" 8833 9084 #include <stdlib.h> 8834 9085 #include <stdarg.h> 8835 @@ -11253,13 +116 00,13 @@9086 @@ -11253,13 +11631,13 @@ 8836 9087 #include <float.h> 8837 9088 8838 9089 _ACEOF 8839 9090 -if { (eval echo "$as_me:11256: \"$ac_cpp conftest.$ac_ext\"") >&5 8840 +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 8841 9092 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 8842 9093 ac_status=$? … … 8845 9096 cat conftest.err >&5 8846 9097 - echo "$as_me:11262: \$? = $ac_status" >&5 8847 + echo "$as_me:116 09: \$? = $ac_status" >&59098 + echo "$as_me:11640: \$? = $ac_status" >&5 8848 9099 (exit $ac_status); } >/dev/null; then 8849 9100 if test -s conftest.err; then 8850 9101 ac_cpp_err=$ac_c_preproc_warn_flag 8851 @@ -11281,7 +116 28,7 @@9102 @@ -11281,7 +11659,7 @@ 8852 9103 if test $ac_cv_header_stdc = yes; then 8853 9104 # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 8854 9105 cat >conftest.$ac_ext <<_ACEOF 8855 9106 -#line 11284 "configure" 8856 +#line 116 31"configure"9107 +#line 11662 "configure" 8857 9108 #include "confdefs.h" 8858 9109 #include <string.h> 8859 9110 8860 @@ -11299,7 +116 46,7 @@9111 @@ -11299,7 +11677,7 @@ 8861 9112 if test $ac_cv_header_stdc = yes; then 8862 9113 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 8863 9114 cat >conftest.$ac_ext <<_ACEOF 8864 9115 -#line 11302 "configure" 8865 +#line 116 49"configure"9116 +#line 11680 "configure" 8866 9117 #include "confdefs.h" 8867 9118 #include <stdlib.h> 8868 9119 8869 @@ -11320,7 +116 67,7 @@9120 @@ -11320,7 +11698,7 @@ 8870 9121 : 8871 9122 else 8872 9123 cat >conftest.$ac_ext <<_ACEOF 8873 9124 -#line 11323 "configure" 8874 +#line 11 670"configure"9125 +#line 11701 "configure" 8875 9126 #include "confdefs.h" 8876 9127 #include <ctype.h> 8877 9128 #if ((' ' & 0x0FF) == 0x020) 8878 @@ -11346,15 +11 693,15 @@9129 @@ -11346,15 +11724,15 @@ 8879 9130 } 8880 9131 _ACEOF 8881 9132 rm -f conftest$ac_exeext 8882 9133 -if { (eval echo "$as_me:11349: \"$ac_link\"") >&5 8883 +if { (eval echo "$as_me:11 696: \"$ac_link\"") >&59134 +if { (eval echo "$as_me:11727: \"$ac_link\"") >&5 8884 9135 (eval $ac_link) 2>&5 8885 9136 ac_status=$? 8886 9137 - echo "$as_me:11352: \$? = $ac_status" >&5 8887 + echo "$as_me:11 699: \$? = $ac_status" >&59138 + echo "$as_me:11730: \$? = $ac_status" >&5 8888 9139 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 8889 9140 - { (eval echo "$as_me:11354: \"$ac_try\"") >&5 8890 + { (eval echo "$as_me:117 01: \"$ac_try\"") >&59141 + { (eval echo "$as_me:11732: \"$ac_try\"") >&5 8891 9142 (eval $ac_try) 2>&5 8892 9143 ac_status=$? 8893 9144 - echo "$as_me:11357: \$? = $ac_status" >&5 8894 + echo "$as_me:117 04: \$? = $ac_status" >&59145 + echo "$as_me:11735: \$? = $ac_status" >&5 8895 9146 (exit $ac_status); }; }; then 8896 9147 : 8897 9148 else 8898 @@ -11367,7 +117 14,7 @@9149 @@ -11367,7 +11745,7 @@ 8899 9150 fi 8900 9151 fi 8901 9152 fi 8902 9153 -echo "$as_me:11370: result: $ac_cv_header_stdc" >&5 8903 +echo "$as_me:117 17: result: $ac_cv_header_stdc" >&59154 +echo "$as_me:11748: result: $ac_cv_header_stdc" >&5 8904 9155 echo "${ECHO_T}$ac_cv_header_stdc" >&6 8905 9156 if test $ac_cv_header_stdc = yes; then 8906 9157 8907 @@ -11380,13 +117 27,13 @@9158 @@ -11380,13 +11758,13 @@ 8908 9159 ac_header_dirent=no 8909 9160 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do 8910 9161 as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` 8911 9162 -echo "$as_me:11383: checking for $ac_hdr that defines DIR" >&5 8912 +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 8913 9164 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 8914 9165 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 8917 9168 cat >conftest.$ac_ext <<_ACEOF 8918 9169 -#line 11389 "configure" 8919 +#line 117 36"configure"9170 +#line 11767 "configure" 8920 9171 #include "confdefs.h" 8921 9172 #include <sys/types.h> 8922 9173 #include <$ac_hdr> 8923 @@ -11401,16 +117 48,16 @@9174 @@ -11401,16 +11779,16 @@ 8924 9175 } 8925 9176 _ACEOF 8926 9177 rm -f conftest.$ac_objext 8927 9178 -if { (eval echo "$as_me:11404: \"$ac_compile\"") >&5 8928 +if { (eval echo "$as_me:117 51: \"$ac_compile\"") >&59179 +if { (eval echo "$as_me:11782: \"$ac_compile\"") >&5 8929 9180 (eval $ac_compile) 2>&5 8930 9181 ac_status=$? 8931 9182 - echo "$as_me:11407: \$? = $ac_status" >&5 8932 + echo "$as_me:117 54: \$? = $ac_status" >&59183 + echo "$as_me:11785: \$? = $ac_status" >&5 8933 9184 (exit $ac_status); } && 8934 9185 { ac_try='test -s conftest.$ac_objext' 8935 9186 - { (eval echo "$as_me:11410: \"$ac_try\"") >&5 8936 + { (eval echo "$as_me:117 57: \"$ac_try\"") >&59187 + { (eval echo "$as_me:11788: \"$ac_try\"") >&5 8937 9188 (eval $ac_try) 2>&5 8938 9189 ac_status=$? 8939 9190 - echo "$as_me:11413: \$? = $ac_status" >&5 8940 + echo "$as_me:117 60: \$? = $ac_status" >&59191 + echo "$as_me:11791: \$? = $ac_status" >&5 8941 9192 (exit $ac_status); }; }; then 8942 9193 eval "$as_ac_Header=yes" 8943 9194 else 8944 @@ -11420,7 +117 67,7 @@9195 @@ -11420,7 +11798,7 @@ 8945 9196 fi 8946 9197 rm -f conftest.$ac_objext conftest.$ac_ext 8947 9198 fi 8948 9199 -echo "$as_me:11423: result: `eval echo '${'$as_ac_Header'}'`" >&5 8949 +echo "$as_me:11 770: result: `eval echo '${'$as_ac_Header'}'`" >&59200 +echo "$as_me:11801: result: `eval echo '${'$as_ac_Header'}'`" >&5 8950 9201 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 8951 9202 if test `eval echo '${'$as_ac_Header'}'` = yes; then 8952 9203 cat >>confdefs.h <<EOF 8953 @@ -11433,7 +11 780,7 @@9204 @@ -11433,7 +11811,7 @@ 8954 9205 done 8955 9206 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. 8956 9207 if test $ac_header_dirent = dirent.h; then 8957 9208 - echo "$as_me:11436: checking for opendir in -ldir" >&5 8958 + echo "$as_me:11 783: checking for opendir in -ldir" >&59209 + echo "$as_me:11814: checking for opendir in -ldir" >&5 8959 9210 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 8960 9211 if test "${ac_cv_lib_dir_opendir+set}" = set; then 8961 9212 echo $ECHO_N "(cached) $ECHO_C" >&6 8962 @@ -11441,7 +11 788,7 @@9213 @@ -11441,7 +11819,7 @@ 8963 9214 ac_check_lib_save_LIBS=$LIBS 8964 9215 LIBS="-ldir $LIBS" 8965 9216 cat >conftest.$ac_ext <<_ACEOF 8966 9217 -#line 11444 "configure" 8967 +#line 11 791"configure"9218 +#line 11822 "configure" 8968 9219 #include "confdefs.h" 8969 9220 8970 9221 /* Override any gcc2 internal prototype to avoid an error. */ 8971 @@ -11460,16 +118 07,16 @@9222 @@ -11460,16 +11838,16 @@ 8972 9223 } 8973 9224 _ACEOF 8974 9225 rm -f conftest.$ac_objext conftest$ac_exeext 8975 9226 -if { (eval echo "$as_me:11463: \"$ac_link\"") >&5 8976 +if { (eval echo "$as_me:118 10: \"$ac_link\"") >&59227 +if { (eval echo "$as_me:11841: \"$ac_link\"") >&5 8977 9228 (eval $ac_link) 2>&5 8978 9229 ac_status=$? 8979 9230 - echo "$as_me:11466: \$? = $ac_status" >&5 8980 + echo "$as_me:118 13: \$? = $ac_status" >&59231 + echo "$as_me:11844: \$? = $ac_status" >&5 8981 9232 (exit $ac_status); } && 8982 9233 { ac_try='test -s conftest$ac_exeext' 8983 9234 - { (eval echo "$as_me:11469: \"$ac_try\"") >&5 8984 + { (eval echo "$as_me:118 16: \"$ac_try\"") >&59235 + { (eval echo "$as_me:11847: \"$ac_try\"") >&5 8985 9236 (eval $ac_try) 2>&5 8986 9237 ac_status=$? 8987 9238 - echo "$as_me:11472: \$? = $ac_status" >&5 8988 + echo "$as_me:118 19: \$? = $ac_status" >&59239 + echo "$as_me:11850: \$? = $ac_status" >&5 8989 9240 (exit $ac_status); }; }; then 8990 9241 ac_cv_lib_dir_opendir=yes 8991 9242 else 8992 @@ -11480,14 +118 27,14 @@9243 @@ -11480,14 +11858,14 @@ 8993 9244 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 8994 9245 LIBS=$ac_check_lib_save_LIBS 8995 9246 fi 8996 9247 -echo "$as_me:11483: result: $ac_cv_lib_dir_opendir" >&5 8997 +echo "$as_me:118 30: result: $ac_cv_lib_dir_opendir" >&59248 +echo "$as_me:11861: result: $ac_cv_lib_dir_opendir" >&5 8998 9249 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 8999 9250 if test $ac_cv_lib_dir_opendir = yes; then … … 9003 9254 else 9004 9255 - echo "$as_me:11490: checking for opendir in -lx" >&5 9005 + echo "$as_me:118 37: checking for opendir in -lx" >&59256 + echo "$as_me:11868: checking for opendir in -lx" >&5 9006 9257 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 9007 9258 if test "${ac_cv_lib_x_opendir+set}" = set; then 9008 9259 echo $ECHO_N "(cached) $ECHO_C" >&6 9009 @@ -11495,7 +118 42,7 @@9260 @@ -11495,7 +11873,7 @@ 9010 9261 ac_check_lib_save_LIBS=$LIBS 9011 9262 LIBS="-lx $LIBS" 9012 9263 cat >conftest.$ac_ext <<_ACEOF 9013 9264 -#line 11498 "configure" 9014 +#line 118 45"configure"9265 +#line 11876 "configure" 9015 9266 #include "confdefs.h" 9016 9267 9017 9268 /* Override any gcc2 internal prototype to avoid an error. */ 9018 @@ -11514,16 +118 61,16 @@9269 @@ -11514,16 +11892,16 @@ 9019 9270 } 9020 9271 _ACEOF 9021 9272 rm -f conftest.$ac_objext conftest$ac_exeext 9022 9273 -if { (eval echo "$as_me:11517: \"$ac_link\"") >&5 9023 +if { (eval echo "$as_me:118 64: \"$ac_link\"") >&59274 +if { (eval echo "$as_me:11895: \"$ac_link\"") >&5 9024 9275 (eval $ac_link) 2>&5 9025 9276 ac_status=$? 9026 9277 - echo "$as_me:11520: \$? = $ac_status" >&5 9027 + echo "$as_me:118 67: \$? = $ac_status" >&59278 + echo "$as_me:11898: \$? = $ac_status" >&5 9028 9279 (exit $ac_status); } && 9029 9280 { ac_try='test -s conftest$ac_exeext' 9030 9281 - { (eval echo "$as_me:11523: \"$ac_try\"") >&5 9031 + { (eval echo "$as_me:11 870: \"$ac_try\"") >&59282 + { (eval echo "$as_me:11901: \"$ac_try\"") >&5 9032 9283 (eval $ac_try) 2>&5 9033 9284 ac_status=$? 9034 9285 - echo "$as_me:11526: \$? = $ac_status" >&5 9035 + echo "$as_me:11 873: \$? = $ac_status" >&59286 + echo "$as_me:11904: \$? = $ac_status" >&5 9036 9287 (exit $ac_status); }; }; then 9037 9288 ac_cv_lib_x_opendir=yes 9038 9289 else 9039 @@ -11534,7 +11 881,7 @@9290 @@ -11534,7 +11912,7 @@ 9040 9291 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 9041 9292 LIBS=$ac_check_lib_save_LIBS 9042 9293 fi 9043 9294 -echo "$as_me:11537: result: $ac_cv_lib_x_opendir" >&5 9044 +echo "$as_me:11 884: result: $ac_cv_lib_x_opendir" >&59295 +echo "$as_me:11915: result: $ac_cv_lib_x_opendir" >&5 9045 9296 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 9046 9297 if test $ac_cv_lib_x_opendir = yes; then 9047 9298 LIBS="$LIBS -lx" 9048 @@ -11542,13 +11 889,13 @@9299 @@ -11542,13 +11920,13 @@ 9049 9300 9050 9301 fi 9051 9302 9052 9303 -echo "$as_me:11545: checking whether time.h and sys/time.h may both be included" >&5 9053 +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 9054 9305 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 9055 9306 if test "${ac_cv_header_time+set}" = set; then … … 9058 9309 cat >conftest.$ac_ext <<_ACEOF 9059 9310 -#line 11551 "configure" 9060 +#line 11 898"configure"9311 +#line 11929 "configure" 9061 9312 #include "confdefs.h" 9062 9313 #include <sys/types.h> 9063 9314 #include <sys/time.h> 9064 @@ -11564,16 +119 11,16 @@9315 @@ -11564,16 +11942,16 @@ 9065 9316 } 9066 9317 _ACEOF 9067 9318 rm -f conftest.$ac_objext 9068 9319 -if { (eval echo "$as_me:11567: \"$ac_compile\"") >&5 9069 +if { (eval echo "$as_me:119 14: \"$ac_compile\"") >&59320 +if { (eval echo "$as_me:11945: \"$ac_compile\"") >&5 9070 9321 (eval $ac_compile) 2>&5 9071 9322 ac_status=$? 9072 9323 - echo "$as_me:11570: \$? = $ac_status" >&5 9073 + echo "$as_me:119 17: \$? = $ac_status" >&59324 + echo "$as_me:11948: \$? = $ac_status" >&5 9074 9325 (exit $ac_status); } && 9075 9326 { ac_try='test -s conftest.$ac_objext' 9076 9327 - { (eval echo "$as_me:11573: \"$ac_try\"") >&5 9077 + { (eval echo "$as_me:119 20: \"$ac_try\"") >&59328 + { (eval echo "$as_me:11951: \"$ac_try\"") >&5 9078 9329 (eval $ac_try) 2>&5 9079 9330 ac_status=$? 9080 9331 - echo "$as_me:11576: \$? = $ac_status" >&5 9081 + echo "$as_me:119 23: \$? = $ac_status" >&59332 + echo "$as_me:11954: \$? = $ac_status" >&5 9082 9333 (exit $ac_status); }; }; then 9083 9334 ac_cv_header_time=yes 9084 9335 else 9085 @@ -11583,7 +119 30,7 @@9336 @@ -11583,7 +11961,7 @@ 9086 9337 fi 9087 9338 rm -f conftest.$ac_objext conftest.$ac_ext 9088 9339 fi 9089 9340 -echo "$as_me:11586: result: $ac_cv_header_time" >&5 9090 +echo "$as_me:119 33: result: $ac_cv_header_time" >&59341 +echo "$as_me:11964: result: $ac_cv_header_time" >&5 9091 9342 echo "${ECHO_T}$ac_cv_header_time" >&6 9092 9343 if test $ac_cv_header_time = yes; then 9093 9344 9094 @@ -11593,14 +119 40,14 @@9345 @@ -11593,14 +11971,14 @@ 9095 9346 9096 9347 fi 9097 9348 9098 9349 -echo "$as_me:11596: checking for regular-expression headers" >&5 9099 +echo "$as_me:119 43: checking for regular-expression headers" >&59350 +echo "$as_me:11974: checking for regular-expression headers" >&5 9100 9351 echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6 9101 9352 if test "${cf_cv_regex+set}" = set; then … … 9105 9356 cat >conftest.$ac_ext <<_ACEOF 9106 9357 -#line 11603 "configure" 9107 +#line 119 50"configure"9358 +#line 11981 "configure" 9108 9359 #include "confdefs.h" 9109 9360 #include <sys/types.h> 9110 9361 #include <regex.h> 9111 @@ -11618,16 +119 65,16 @@9362 @@ -11618,16 +11996,16 @@ 9112 9363 } 9113 9364 _ACEOF 9114 9365 rm -f conftest.$ac_objext conftest$ac_exeext 9115 9366 -if { (eval echo "$as_me:11621: \"$ac_link\"") >&5 9116 +if { (eval echo "$as_me:119 68: \"$ac_link\"") >&59367 +if { (eval echo "$as_me:11999: \"$ac_link\"") >&5 9117 9368 (eval $ac_link) 2>&5 9118 9369 ac_status=$? 9119 9370 - echo "$as_me:11624: \$? = $ac_status" >&5 9120 + echo "$as_me:1 1971: \$? = $ac_status" >&59371 + echo "$as_me:12002: \$? = $ac_status" >&5 9121 9372 (exit $ac_status); } && 9122 9373 { ac_try='test -s conftest$ac_exeext' 9123 9374 - { (eval echo "$as_me:11627: \"$ac_try\"") >&5 9124 + { (eval echo "$as_me:1 1974: \"$ac_try\"") >&59375 + { (eval echo "$as_me:12005: \"$ac_try\"") >&5 9125 9376 (eval $ac_try) 2>&5 9126 9377 ac_status=$? 9127 9378 - echo "$as_me:11630: \$? = $ac_status" >&5 9128 + echo "$as_me:1 1977: \$? = $ac_status" >&59379 + echo "$as_me:12008: \$? = $ac_status" >&5 9129 9380 (exit $ac_status); }; }; then 9130 9381 cf_cv_regex="regex.h" 9131 9382 else 9132 @@ -11635,7 +1 1982,7 @@9383 @@ -11635,7 +12013,7 @@ 9133 9384 cat conftest.$ac_ext >&5 9134 9385 9135 9386 cat >conftest.$ac_ext <<_ACEOF 9136 9387 -#line 11638 "configure" 9137 +#line 1 1985"configure"9388 +#line 12016 "configure" 9138 9389 #include "confdefs.h" 9139 9390 #include <regexp.h> 9140 9391 int 9141 @@ -11650,16 +1 1997,16 @@9392 @@ -11650,16 +12028,16 @@ 9142 9393 } 9143 9394 _ACEOF 9144 9395 rm -f conftest.$ac_objext conftest$ac_exeext 9145 9396 -if { (eval echo "$as_me:11653: \"$ac_link\"") >&5 9146 +if { (eval echo "$as_me:120 00: \"$ac_link\"") >&59397 +if { (eval echo "$as_me:12031: \"$ac_link\"") >&5 9147 9398 (eval $ac_link) 2>&5 9148 9399 ac_status=$? 9149 9400 - echo "$as_me:11656: \$? = $ac_status" >&5 9150 + echo "$as_me:120 03: \$? = $ac_status" >&59401 + echo "$as_me:12034: \$? = $ac_status" >&5 9151 9402 (exit $ac_status); } && 9152 9403 { ac_try='test -s conftest$ac_exeext' 9153 9404 - { (eval echo "$as_me:11659: \"$ac_try\"") >&5 9154 + { (eval echo "$as_me:120 06: \"$ac_try\"") >&59405 + { (eval echo "$as_me:12037: \"$ac_try\"") >&5 9155 9406 (eval $ac_try) 2>&5 9156 9407 ac_status=$? 9157 9408 - echo "$as_me:11662: \$? = $ac_status" >&5 9158 + echo "$as_me:120 09: \$? = $ac_status" >&59409 + echo "$as_me:12040: \$? = $ac_status" >&5 9159 9410 (exit $ac_status); }; }; then 9160 9411 cf_cv_regex="regexp.h" 9161 9412 else 9162 @@ -11669,7 +120 16,7 @@9413 @@ -11669,7 +12047,7 @@ 9163 9414 cf_save_LIBS="$LIBS" 9164 9415 LIBS="-lgen $LIBS" 9165 9416 cat >conftest.$ac_ext <<_ACEOF 9166 9417 -#line 11672 "configure" 9167 +#line 120 19"configure"9418 +#line 12050 "configure" 9168 9419 #include "confdefs.h" 9169 9420 #include <regexpr.h> 9170 9421 int 9171 @@ -11684,16 +120 31,16 @@9422 @@ -11684,16 +12062,16 @@ 9172 9423 } 9173 9424 _ACEOF 9174 9425 rm -f conftest.$ac_objext conftest$ac_exeext 9175 9426 -if { (eval echo "$as_me:11687: \"$ac_link\"") >&5 9176 +if { (eval echo "$as_me:120 34: \"$ac_link\"") >&59427 +if { (eval echo "$as_me:12065: \"$ac_link\"") >&5 9177 9428 (eval $ac_link) 2>&5 9178 9429 ac_status=$? 9179 9430 - echo "$as_me:11690: \$? = $ac_status" >&5 9180 + echo "$as_me:120 37: \$? = $ac_status" >&59431 + echo "$as_me:12068: \$? = $ac_status" >&5 9181 9432 (exit $ac_status); } && 9182 9433 { ac_try='test -s conftest$ac_exeext' 9183 9434 - { (eval echo "$as_me:11693: \"$ac_try\"") >&5 9184 + { (eval echo "$as_me:120 40: \"$ac_try\"") >&59435 + { (eval echo "$as_me:12071: \"$ac_try\"") >&5 9185 9436 (eval $ac_try) 2>&5 9186 9437 ac_status=$? 9187 9438 - echo "$as_me:11696: \$? = $ac_status" >&5 9188 + echo "$as_me:120 43: \$? = $ac_status" >&59439 + echo "$as_me:12074: \$? = $ac_status" >&5 9189 9440 (exit $ac_status); }; }; then 9190 9441 cf_cv_regex="regexpr.h" 9191 9442 else 9192 @@ -11709,7 +120 56,7 @@9443 @@ -11709,7 +12087,7 @@ 9193 9444 9194 9445 fi 9195 9446 9196 9447 -echo "$as_me:11712: result: $cf_cv_regex" >&5 9197 +echo "$as_me:120 59: result: $cf_cv_regex" >&59448 +echo "$as_me:12090: result: $cf_cv_regex" >&5 9198 9449 echo "${ECHO_T}$cf_cv_regex" >&6 9199 9450 case $cf_cv_regex in 9200 9451 regex.h) cat >>confdefs.h <<\EOF 9201 @@ -11745,23 +12 092,23 @@9452 @@ -11745,23 +12123,23 @@ 9202 9453 9203 9454 do 9204 9455 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 9205 9456 -echo "$as_me:11748: checking for $ac_header" >&5 9206 +echo "$as_me:12 095: checking for $ac_header" >&59457 +echo "$as_me:12126: checking for $ac_header" >&5 9207 9458 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 9208 9459 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 9211 9462 cat >conftest.$ac_ext <<_ACEOF 9212 9463 -#line 11754 "configure" 9213 +#line 121 01"configure"9464 +#line 12132 "configure" 9214 9465 #include "confdefs.h" 9215 9466 #include <$ac_header> 9216 9467 _ACEOF 9217 9468 -if { (eval echo "$as_me:11758: \"$ac_cpp conftest.$ac_ext\"") >&5 9218 +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 9219 9470 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 9220 9471 ac_status=$? … … 9223 9474 cat conftest.err >&5 9224 9475 - echo "$as_me:11764: \$? = $ac_status" >&5 9225 + echo "$as_me:121 11: \$? = $ac_status" >&59476 + echo "$as_me:12142: \$? = $ac_status" >&5 9226 9477 (exit $ac_status); } >/dev/null; then 9227 9478 if test -s conftest.err; then 9228 9479 ac_cpp_err=$ac_c_preproc_warn_flag 9229 @@ -11780,7 +121 27,7 @@9480 @@ -11780,7 +12158,7 @@ 9230 9481 fi 9231 9482 rm -f conftest.err conftest.$ac_ext 9232 9483 fi 9233 9484 -echo "$as_me:11783: result: `eval echo '${'$as_ac_Header'}'`" >&5 9234 +echo "$as_me:121 30: result: `eval echo '${'$as_ac_Header'}'`" >&59485 +echo "$as_me:12161: result: `eval echo '${'$as_ac_Header'}'`" >&5 9235 9486 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 9236 9487 if test `eval echo '${'$as_ac_Header'}'` = yes; then 9237 9488 cat >>confdefs.h <<EOF 9238 @@ -11794,7 +121 41,7 @@9489 @@ -11794,7 +12172,7 @@ 9239 9490 # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set 9240 9491 if test "$ISC" = yes ; then 9241 9492 9242 9493 -echo "$as_me:11797: checking for main in -lcposix" >&5 9243 +echo "$as_me:121 44: checking for main in -lcposix" >&59494 +echo "$as_me:12175: checking for main in -lcposix" >&5 9244 9495 echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6 9245 9496 if test "${ac_cv_lib_cposix_main+set}" = set; then 9246 9497 echo $ECHO_N "(cached) $ECHO_C" >&6 9247 @@ -11802,7 +121 49,7 @@9498 @@ -11802,7 +12180,7 @@ 9248 9499 ac_check_lib_save_LIBS=$LIBS 9249 9500 LIBS="-lcposix $LIBS" 9250 9501 cat >conftest.$ac_ext <<_ACEOF 9251 9502 -#line 11805 "configure" 9252 +#line 121 52"configure"9503 +#line 12183 "configure" 9253 9504 #include "confdefs.h" 9254 9505 9255 9506 int 9256 @@ -11814,16 +121 61,16 @@9507 @@ -11814,16 +12192,16 @@ 9257 9508 } 9258 9509 _ACEOF 9259 9510 rm -f conftest.$ac_objext conftest$ac_exeext 9260 9511 -if { (eval echo "$as_me:11817: \"$ac_link\"") >&5 9261 +if { (eval echo "$as_me:121 64: \"$ac_link\"") >&59512 +if { (eval echo "$as_me:12195: \"$ac_link\"") >&5 9262 9513 (eval $ac_link) 2>&5 9263 9514 ac_status=$? 9264 9515 - echo "$as_me:11820: \$? = $ac_status" >&5 9265 + echo "$as_me:121 67: \$? = $ac_status" >&59516 + echo "$as_me:12198: \$? = $ac_status" >&5 9266 9517 (exit $ac_status); } && 9267 9518 { ac_try='test -s conftest$ac_exeext' 9268 9519 - { (eval echo "$as_me:11823: \"$ac_try\"") >&5 9269 + { (eval echo "$as_me:12 170: \"$ac_try\"") >&59520 + { (eval echo "$as_me:12201: \"$ac_try\"") >&5 9270 9521 (eval $ac_try) 2>&5 9271 9522 ac_status=$? 9272 9523 - echo "$as_me:11826: \$? = $ac_status" >&5 9273 + echo "$as_me:12 173: \$? = $ac_status" >&59524 + echo "$as_me:12204: \$? = $ac_status" >&5 9274 9525 (exit $ac_status); }; }; then 9275 9526 ac_cv_lib_cposix_main=yes 9276 9527 else 9277 @@ -11834,7 +12 181,7 @@9528 @@ -11834,7 +12212,7 @@ 9278 9529 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 9279 9530 LIBS=$ac_check_lib_save_LIBS 9280 9531 fi 9281 9532 -echo "$as_me:11837: result: $ac_cv_lib_cposix_main" >&5 9282 +echo "$as_me:12 184: result: $ac_cv_lib_cposix_main" >&59533 +echo "$as_me:12215: result: $ac_cv_lib_cposix_main" >&5 9283 9534 echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6 9284 9535 if test $ac_cv_lib_cposix_main = yes; then 9285 9536 cat >>confdefs.h <<EOF 9286 @@ -11845,7 +12 192,7 @@9537 @@ -11845,7 +12223,7 @@ 9287 9538 9288 9539 fi 9289 9540 9290 9541 - echo "$as_me:11848: checking for bzero in -linet" >&5 9291 + echo "$as_me:12 195: checking for bzero in -linet" >&59542 + echo "$as_me:12226: checking for bzero in -linet" >&5 9292 9543 echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6 9293 9544 if test "${ac_cv_lib_inet_bzero+set}" = set; then 9294 9545 echo $ECHO_N "(cached) $ECHO_C" >&6 9295 @@ -11853,7 +122 00,7 @@9546 @@ -11853,7 +12231,7 @@ 9296 9547 ac_check_lib_save_LIBS=$LIBS 9297 9548 LIBS="-linet $LIBS" 9298 9549 cat >conftest.$ac_ext <<_ACEOF 9299 9550 -#line 11856 "configure" 9300 +#line 122 03"configure"9551 +#line 12234 "configure" 9301 9552 #include "confdefs.h" 9302 9553 9303 9554 /* Override any gcc2 internal prototype to avoid an error. */ 9304 @@ -11872,16 +122 19,16 @@9555 @@ -11872,16 +12250,16 @@ 9305 9556 } 9306 9557 _ACEOF 9307 9558 rm -f conftest.$ac_objext conftest$ac_exeext 9308 9559 -if { (eval echo "$as_me:11875: \"$ac_link\"") >&5 9309 +if { (eval echo "$as_me:122 22: \"$ac_link\"") >&59560 +if { (eval echo "$as_me:12253: \"$ac_link\"") >&5 9310 9561 (eval $ac_link) 2>&5 9311 9562 ac_status=$? 9312 9563 - echo "$as_me:11878: \$? = $ac_status" >&5 9313 + echo "$as_me:122 25: \$? = $ac_status" >&59564 + echo "$as_me:12256: \$? = $ac_status" >&5 9314 9565 (exit $ac_status); } && 9315 9566 { ac_try='test -s conftest$ac_exeext' 9316 9567 - { (eval echo "$as_me:11881: \"$ac_try\"") >&5 9317 + { (eval echo "$as_me:122 28: \"$ac_try\"") >&59568 + { (eval echo "$as_me:12259: \"$ac_try\"") >&5 9318 9569 (eval $ac_try) 2>&5 9319 9570 ac_status=$? 9320 9571 - echo "$as_me:11884: \$? = $ac_status" >&5 9321 + echo "$as_me:122 31: \$? = $ac_status" >&59572 + echo "$as_me:12262: \$? = $ac_status" >&5 9322 9573 (exit $ac_status); }; }; then 9323 9574 ac_cv_lib_inet_bzero=yes 9324 9575 else 9325 @@ -11892,21 +122 39,21 @@9576 @@ -11892,21 +12270,21 @@ 9326 9577 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 9327 9578 LIBS=$ac_check_lib_save_LIBS 9328 9579 fi 9329 9580 -echo "$as_me:11895: result: $ac_cv_lib_inet_bzero" >&5 9330 +echo "$as_me:122 42: result: $ac_cv_lib_inet_bzero" >&59581 +echo "$as_me:12273: result: $ac_cv_lib_inet_bzero" >&5 9331 9582 echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6 9332 9583 if test $ac_cv_lib_inet_bzero = yes; then … … 9336 9587 9337 9588 -echo "$as_me:11902: checking if sys/time.h works with sys/select.h" >&5 9338 +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 9339 9590 echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6 9340 9591 if test "${cf_cv_sys_time_select+set}" = set; then … … 9344 9595 cat >conftest.$ac_ext <<_ACEOF 9345 9596 -#line 11909 "configure" 9346 +#line 122 56"configure"9597 +#line 12287 "configure" 9347 9598 #include "confdefs.h" 9348 9599 9349 9600 #include <sys/types.h> 9350 @@ -11926,16 +12 273,16 @@9601 @@ -11926,16 +12304,16 @@ 9351 9602 } 9352 9603 _ACEOF 9353 9604 rm -f conftest.$ac_objext 9354 9605 -if { (eval echo "$as_me:11929: \"$ac_compile\"") >&5 9355 +if { (eval echo "$as_me:12 276: \"$ac_compile\"") >&59606 +if { (eval echo "$as_me:12307: \"$ac_compile\"") >&5 9356 9607 (eval $ac_compile) 2>&5 9357 9608 ac_status=$? 9358 9609 - echo "$as_me:11932: \$? = $ac_status" >&5 9359 + echo "$as_me:12 279: \$? = $ac_status" >&59610 + echo "$as_me:12310: \$? = $ac_status" >&5 9360 9611 (exit $ac_status); } && 9361 9612 { ac_try='test -s conftest.$ac_objext' 9362 9613 - { (eval echo "$as_me:11935: \"$ac_try\"") >&5 9363 + { (eval echo "$as_me:12 282: \"$ac_try\"") >&59614 + { (eval echo "$as_me:12313: \"$ac_try\"") >&5 9364 9615 (eval $ac_try) 2>&5 9365 9616 ac_status=$? 9366 9617 - echo "$as_me:11938: \$? = $ac_status" >&5 9367 + echo "$as_me:12 285: \$? = $ac_status" >&59618 + echo "$as_me:12316: \$? = $ac_status" >&5 9368 9619 (exit $ac_status); }; }; then 9369 9620 cf_cv_sys_time_select=yes 9370 9621 else 9371 @@ -11947,7 +12 294,7 @@9622 @@ -11947,7 +12325,7 @@ 9372 9623 9373 9624 fi 9374 9625 9375 9626 -echo "$as_me:11950: result: $cf_cv_sys_time_select" >&5 9376 +echo "$as_me:12 297: result: $cf_cv_sys_time_select" >&59627 +echo "$as_me:12328: result: $cf_cv_sys_time_select" >&5 9377 9628 echo "${ECHO_T}$cf_cv_sys_time_select" >&6 9378 9629 test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF 9379 9630 #define HAVE_SYS_TIME_SELECT 1 9380 @@ -11961,7 +123 08,7 @@9631 @@ -11961,7 +12339,7 @@ 9381 9632 ac_compiler_gnu=$ac_cv_c_compiler_gnu 9382 9633 ac_main_return=return 9383 9634 9384 9635 -echo "$as_me:11964: checking for $CC option to accept ANSI C" >&5 9385 +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 9386 9637 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 9387 9638 if test "${ac_cv_prog_cc_stdc+set}" = set; then 9388 9639 echo $ECHO_N "(cached) $ECHO_C" >&6 9389 @@ -11969,7 +123 16,7 @@9640 @@ -11969,7 +12347,7 @@ 9390 9641 ac_cv_prog_cc_stdc=no 9391 9642 ac_save_CC=$CC 9392 9643 cat >conftest.$ac_ext <<_ACEOF 9393 9644 -#line 11972 "configure" 9394 +#line 123 19"configure"9645 +#line 12350 "configure" 9395 9646 #include "confdefs.h" 9396 9647 #include <stdarg.h> 9397 9648 #include <stdio.h> 9398 @@ -12018,16 +123 65,16 @@9649 @@ -12018,16 +12396,16 @@ 9399 9650 do 9400 9651 CC="$ac_save_CC $ac_arg" 9401 9652 rm -f conftest.$ac_objext 9402 9653 -if { (eval echo "$as_me:12021: \"$ac_compile\"") >&5 9403 +if { (eval echo "$as_me:123 68: \"$ac_compile\"") >&59654 +if { (eval echo "$as_me:12399: \"$ac_compile\"") >&5 9404 9655 (eval $ac_compile) 2>&5 9405 9656 ac_status=$? 9406 9657 - echo "$as_me:12024: \$? = $ac_status" >&5 9407 + echo "$as_me:12 371: \$? = $ac_status" >&59658 + echo "$as_me:12402: \$? = $ac_status" >&5 9408 9659 (exit $ac_status); } && 9409 9660 { ac_try='test -s conftest.$ac_objext' 9410 9661 - { (eval echo "$as_me:12027: \"$ac_try\"") >&5 9411 + { (eval echo "$as_me:12 374: \"$ac_try\"") >&59662 + { (eval echo "$as_me:12405: \"$ac_try\"") >&5 9412 9663 (eval $ac_try) 2>&5 9413 9664 ac_status=$? 9414 9665 - echo "$as_me:12030: \$? = $ac_status" >&5 9415 + echo "$as_me:12 377: \$? = $ac_status" >&59666 + echo "$as_me:12408: \$? = $ac_status" >&5 9416 9667 (exit $ac_status); }; }; then 9417 9668 ac_cv_prog_cc_stdc=$ac_arg 9418 9669 break 9419 @@ -12044,21 +12 391,21 @@9670 @@ -12044,21 +12422,21 @@ 9420 9671 9421 9672 case "x$ac_cv_prog_cc_stdc" in 9422 9673 x|xno) 9423 9674 - echo "$as_me:12047: result: none needed" >&5 9424 + echo "$as_me:12 394: result: none needed" >&59675 + echo "$as_me:12425: result: none needed" >&5 9425 9676 echo "${ECHO_T}none needed" >&6 ;; 9426 9677 *) 9427 9678 - echo "$as_me:12050: result: $ac_cv_prog_cc_stdc" >&5 9428 + echo "$as_me:12 397: result: $ac_cv_prog_cc_stdc" >&59679 + echo "$as_me:12428: result: $ac_cv_prog_cc_stdc" >&5 9429 9680 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 9430 9681 CC="$CC $ac_cv_prog_cc_stdc" ;; … … 9432 9683 9433 9684 -echo "$as_me:12055: checking for an ANSI C-conforming const" >&5 9434 +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 9435 9686 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 9436 9687 if test "${ac_cv_c_const+set}" = set; then … … 9439 9690 cat >conftest.$ac_ext <<_ACEOF 9440 9691 -#line 12061 "configure" 9441 +#line 124 08"configure"9692 +#line 12439 "configure" 9442 9693 #include "confdefs.h" 9443 9694 9444 9695 int 9445 @@ -12116,16 +124 63,16 @@9696 @@ -12116,16 +12494,16 @@ 9446 9697 } 9447 9698 _ACEOF 9448 9699 rm -f conftest.$ac_objext 9449 9700 -if { (eval echo "$as_me:12119: \"$ac_compile\"") >&5 9450 +if { (eval echo "$as_me:124 66: \"$ac_compile\"") >&59701 +if { (eval echo "$as_me:12497: \"$ac_compile\"") >&5 9451 9702 (eval $ac_compile) 2>&5 9452 9703 ac_status=$? 9453 9704 - echo "$as_me:12122: \$? = $ac_status" >&5 9454 + echo "$as_me:12 469: \$? = $ac_status" >&59705 + echo "$as_me:12500: \$? = $ac_status" >&5 9455 9706 (exit $ac_status); } && 9456 9707 { ac_try='test -s conftest.$ac_objext' 9457 9708 - { (eval echo "$as_me:12125: \"$ac_try\"") >&5 9458 + { (eval echo "$as_me:12 472: \"$ac_try\"") >&59709 + { (eval echo "$as_me:12503: \"$ac_try\"") >&5 9459 9710 (eval $ac_try) 2>&5 9460 9711 ac_status=$? 9461 9712 - echo "$as_me:12128: \$? = $ac_status" >&5 9462 + echo "$as_me:12 475: \$? = $ac_status" >&59713 + echo "$as_me:12506: \$? = $ac_status" >&5 9463 9714 (exit $ac_status); }; }; then 9464 9715 ac_cv_c_const=yes 9465 9716 else 9466 @@ -12135,7 +12 482,7 @@9717 @@ -12135,7 +12513,7 @@ 9467 9718 fi 9468 9719 rm -f conftest.$ac_objext conftest.$ac_ext 9469 9720 fi 9470 9721 -echo "$as_me:12138: result: $ac_cv_c_const" >&5 9471 +echo "$as_me:12 485: result: $ac_cv_c_const" >&59722 +echo "$as_me:12516: result: $ac_cv_c_const" >&5 9472 9723 echo "${ECHO_T}$ac_cv_c_const" >&6 9473 9724 if test $ac_cv_c_const = no; then 9474 9725 9475 @@ -12145,7 +12 492,7 @@9726 @@ -12145,7 +12523,7 @@ 9476 9727 9477 9728 fi 9478 9729 9479 9730 -echo "$as_me:12148: checking for inline" >&5 9480 +echo "$as_me:12 495: checking for inline" >&59731 +echo "$as_me:12526: checking for inline" >&5 9481 9732 echo $ECHO_N "checking for inline... $ECHO_C" >&6 9482 9733 if test "${ac_cv_c_inline+set}" = set; then 9483 9734 echo $ECHO_N "(cached) $ECHO_C" >&6 9484 @@ -12153,7 +125 00,7 @@9735 @@ -12153,7 +12531,7 @@ 9485 9736 ac_cv_c_inline=no 9486 9737 for ac_kw in inline __inline__ __inline; do 9487 9738 cat >conftest.$ac_ext <<_ACEOF 9488 9739 -#line 12156 "configure" 9489 +#line 125 03"configure"9740 +#line 12534 "configure" 9490 9741 #include "confdefs.h" 9491 9742 #ifndef __cplusplus 9492 9743 static $ac_kw int static_foo () {return 0; } 9493 @@ -12162,16 +125 09,16 @@9744 @@ -12162,16 +12540,16 @@ 9494 9745 9495 9746 _ACEOF 9496 9747 rm -f conftest.$ac_objext 9497 9748 -if { (eval echo "$as_me:12165: \"$ac_compile\"") >&5 9498 +if { (eval echo "$as_me:125 12: \"$ac_compile\"") >&59749 +if { (eval echo "$as_me:12543: \"$ac_compile\"") >&5 9499 9750 (eval $ac_compile) 2>&5 9500 9751 ac_status=$? 9501 9752 - echo "$as_me:12168: \$? = $ac_status" >&5 9502 + echo "$as_me:125 15: \$? = $ac_status" >&59753 + echo "$as_me:12546: \$? = $ac_status" >&5 9503 9754 (exit $ac_status); } && 9504 9755 { ac_try='test -s conftest.$ac_objext' 9505 9756 - { (eval echo "$as_me:12171: \"$ac_try\"") >&5 9506 + { (eval echo "$as_me:125 18: \"$ac_try\"") >&59757 + { (eval echo "$as_me:12549: \"$ac_try\"") >&5 9507 9758 (eval $ac_try) 2>&5 9508 9759 ac_status=$? 9509 9760 - echo "$as_me:12174: \$? = $ac_status" >&5 9510 + echo "$as_me:125 21: \$? = $ac_status" >&59761 + echo "$as_me:12552: \$? = $ac_status" >&5 9511 9762 (exit $ac_status); }; }; then 9512 9763 ac_cv_c_inline=$ac_kw; break 9513 9764 else 9514 @@ -12182,7 +125 29,7 @@9765 @@ -12182,7 +12560,7 @@ 9515 9766 done 9516 9767 9517 9768 fi 9518 9769 -echo "$as_me:12185: result: $ac_cv_c_inline" >&5 9519 +echo "$as_me:125 32: result: $ac_cv_c_inline" >&59770 +echo "$as_me:12563: result: $ac_cv_c_inline" >&5 9520 9771 echo "${ECHO_T}$ac_cv_c_inline" >&6 9521 9772 case $ac_cv_c_inline in 9522 9773 inline | yes) ;; 9523 @@ -12205,7 +125 52,7 @@9774 @@ -12205,7 +12583,7 @@ 9524 9775 : 9525 9776 elif test "$GCC" = yes 9526 9777 then 9527 9778 - echo "$as_me:12208: checking if gcc supports options to tune inlining" >&5 9528 + 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 9529 9780 echo $ECHO_N "checking if gcc supports options to tune inlining... $ECHO_C" >&6 9530 9781 if test "${cf_cv_gcc_inline+set}" = set; then 9531 9782 echo $ECHO_N "(cached) $ECHO_C" >&6 9532 @@ -12214,7 +125 61,7 @@9783 @@ -12214,7 +12592,7 @@ 9533 9784 cf_save_CFLAGS=$CFLAGS 9534 9785 CFLAGS="$CFLAGS --param max-inline-insns-single=1200" 9535 9786 cat >conftest.$ac_ext <<_ACEOF 9536 9787 -#line 12217 "configure" 9537 +#line 125 64"configure"9788 +#line 12595 "configure" 9538 9789 #include "confdefs.h" 9539 9790 inline int foo(void) { return 1; } 9540 9791 int 9541 @@ -12226,16 +12 573,16 @@9792 @@ -12226,16 +12604,16 @@ 9542 9793 } 9543 9794 _ACEOF 9544 9795 rm -f conftest.$ac_objext 9545 9796 -if { (eval echo "$as_me:12229: \"$ac_compile\"") >&5 9546 +if { (eval echo "$as_me:12 576: \"$ac_compile\"") >&59797 +if { (eval echo "$as_me:12607: \"$ac_compile\"") >&5 9547 9798 (eval $ac_compile) 2>&5 9548 9799 ac_status=$? 9549 9800 - echo "$as_me:12232: \$? = $ac_status" >&5 9550 + echo "$as_me:12 579: \$? = $ac_status" >&59801 + echo "$as_me:12610: \$? = $ac_status" >&5 9551 9802 (exit $ac_status); } && 9552 9803 { ac_try='test -s conftest.$ac_objext' 9553 9804 - { (eval echo "$as_me:12235: \"$ac_try\"") >&5 9554 + { (eval echo "$as_me:12 582: \"$ac_try\"") >&59805 + { (eval echo "$as_me:12613: \"$ac_try\"") >&5 9555 9806 (eval $ac_try) 2>&5 9556 9807 ac_status=$? 9557 9808 - echo "$as_me:12238: \$? = $ac_status" >&5 9558 + echo "$as_me:12 585: \$? = $ac_status" >&59809 + echo "$as_me:12616: \$? = $ac_status" >&5 9559 9810 (exit $ac_status); }; }; then 9560 9811 cf_cv_gcc_inline=yes 9561 9812 else 9562 @@ -12247,7 +12 594,7 @@9813 @@ -12247,7 +12625,7 @@ 9563 9814 CFLAGS=$cf_save_CFLAGS 9564 9815 9565 9816 fi 9566 9817 -echo "$as_me:12250: result: $cf_cv_gcc_inline" >&5 9567 +echo "$as_me:12 597: result: $cf_cv_gcc_inline" >&59818 +echo "$as_me:12628: result: $cf_cv_gcc_inline" >&5 9568 9819 echo "${ECHO_T}$cf_cv_gcc_inline" >&6 9569 9820 if test "$cf_cv_gcc_inline" = yes ; then 9570 9821 9571 @@ -12323,7 +12670,7 @@ 9822 @@ -12311,7 +12689,7 @@ 9823 9824 if test -n "$cf_new_cppflags" ; then 9825 9826 - CPPFLAGS="$cf_new_cppflags $CPPFLAGS" 9827 + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" 9828 fi 9829 9830 if test -n "$cf_new_extra_cppflags" ; then 9831 @@ -12323,7 +12701,7 @@ 9572 9832 fi 9573 9833 fi 9574 9834 9575 9835 -echo "$as_me:12326: checking for signal global datatype" >&5 9576 +echo "$as_me:12 673: checking for signal global datatype" >&59836 +echo "$as_me:12704: checking for signal global datatype" >&5 9577 9837 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 9578 9838 if test "${cf_cv_sig_atomic_t+set}" = set; then 9579 9839 echo $ECHO_N "(cached) $ECHO_C" >&6 9580 @@ -12335,7 +12 682,7 @@9840 @@ -12335,7 +12713,7 @@ 9581 9841 "int" 9582 9842 do 9583 9843 cat >conftest.$ac_ext <<_ACEOF 9584 9844 -#line 12338 "configure" 9585 +#line 12 685"configure"9845 +#line 12716 "configure" 9586 9846 #include "confdefs.h" 9587 9847 9588 9848 #include <sys/types.h> 9589 @@ -12358,16 +127 05,16 @@9849 @@ -12358,16 +12736,16 @@ 9590 9850 } 9591 9851 _ACEOF 9592 9852 rm -f conftest.$ac_objext 9593 9853 -if { (eval echo "$as_me:12361: \"$ac_compile\"") >&5 9594 +if { (eval echo "$as_me:127 08: \"$ac_compile\"") >&59854 +if { (eval echo "$as_me:12739: \"$ac_compile\"") >&5 9595 9855 (eval $ac_compile) 2>&5 9596 9856 ac_status=$? 9597 9857 - echo "$as_me:12364: \$? = $ac_status" >&5 9598 + echo "$as_me:127 11: \$? = $ac_status" >&59858 + echo "$as_me:12742: \$? = $ac_status" >&5 9599 9859 (exit $ac_status); } && 9600 9860 { ac_try='test -s conftest.$ac_objext' 9601 9861 - { (eval echo "$as_me:12367: \"$ac_try\"") >&5 9602 + { (eval echo "$as_me:127 14: \"$ac_try\"") >&59862 + { (eval echo "$as_me:12745: \"$ac_try\"") >&5 9603 9863 (eval $ac_try) 2>&5 9604 9864 ac_status=$? 9605 9865 - echo "$as_me:12370: \$? = $ac_status" >&5 9606 + echo "$as_me:127 17: \$? = $ac_status" >&59866 + echo "$as_me:12748: \$? = $ac_status" >&5 9607 9867 (exit $ac_status); }; }; then 9608 9868 cf_cv_sig_atomic_t=$cf_type 9609 9869 else 9610 @@ -12381,7 +127 28,7 @@9870 @@ -12381,7 +12759,7 @@ 9611 9871 9612 9872 fi 9613 9873 9614 9874 -echo "$as_me:12384: result: $cf_cv_sig_atomic_t" >&5 9615 +echo "$as_me:127 31: result: $cf_cv_sig_atomic_t" >&59875 +echo "$as_me:12762: result: $cf_cv_sig_atomic_t" >&5 9616 9876 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 9617 9877 test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <<EOF 9618 9878 #define SIG_ATOMIC_T $cf_cv_sig_atomic_t 9619 @@ -12389,7 +127 36,7 @@9879 @@ -12389,7 +12767,7 @@ 9620 9880 9621 9881 if test $NCURSES_CHTYPE = auto ; then 9622 9882 9623 9883 -echo "$as_me:12392: checking for type of chtype" >&5 9624 +echo "$as_me:127 39: checking for type of chtype" >&59884 +echo "$as_me:12770: checking for type of chtype" >&5 9625 9885 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 9626 9886 if test "${cf_cv_typeof_chtype+set}" = set; then 9627 9887 echo $ECHO_N "(cached) $ECHO_C" >&6 9628 @@ -12399,7 +127 46,7 @@9888 @@ -12399,7 +12777,7 @@ 9629 9889 cf_cv_typeof_chtype=long 9630 9890 else 9631 9891 cat >conftest.$ac_ext <<_ACEOF 9632 9892 -#line 12402 "configure" 9633 +#line 127 49"configure"9893 +#line 12780 "configure" 9634 9894 #include "confdefs.h" 9635 9895 9636 9896 #define WANT_BITS 31 9637 @@ -12434,15 +12 781,15 @@9897 @@ -12434,15 +12812,15 @@ 9638 9898 9639 9899 _ACEOF 9640 9900 rm -f conftest$ac_exeext 9641 9901 -if { (eval echo "$as_me:12437: \"$ac_link\"") >&5 9642 +if { (eval echo "$as_me:12 784: \"$ac_link\"") >&59902 +if { (eval echo "$as_me:12815: \"$ac_link\"") >&5 9643 9903 (eval $ac_link) 2>&5 9644 9904 ac_status=$? 9645 9905 - echo "$as_me:12440: \$? = $ac_status" >&5 9646 + echo "$as_me:12 787: \$? = $ac_status" >&59906 + echo "$as_me:12818: \$? = $ac_status" >&5 9647 9907 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 9648 9908 - { (eval echo "$as_me:12442: \"$ac_try\"") >&5 9649 + { (eval echo "$as_me:12 789: \"$ac_try\"") >&59909 + { (eval echo "$as_me:12820: \"$ac_try\"") >&5 9650 9910 (eval $ac_try) 2>&5 9651 9911 ac_status=$? 9652 9912 - echo "$as_me:12445: \$? = $ac_status" >&5 9653 + echo "$as_me:12 792: \$? = $ac_status" >&59913 + echo "$as_me:12823: \$? = $ac_status" >&5 9654 9914 (exit $ac_status); }; }; then 9655 9915 cf_cv_typeof_chtype=`cat cf_test.out` 9656 9916 else 9657 @@ -12457,7 +128 04,7 @@9917 @@ -12457,7 +12835,7 @@ 9658 9918 9659 9919 fi 9660 9920 9661 9921 -echo "$as_me:12460: result: $cf_cv_typeof_chtype" >&5 9662 +echo "$as_me:128 07: result: $cf_cv_typeof_chtype" >&59922 +echo "$as_me:12838: result: $cf_cv_typeof_chtype" >&5 9663 9923 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 9664 9924 9665 9925 cat >>confdefs.h <<EOF 9666 @@ -12469,14 +128 16,14 @@9926 @@ -12469,14 +12847,14 @@ 9667 9927 fi 9668 9928 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype="" 9669 9929 9670 9930 -echo "$as_me:12472: checking if unsigned literals are legal" >&5 9671 +echo "$as_me:128 19: checking if unsigned literals are legal" >&59931 +echo "$as_me:12850: checking if unsigned literals are legal" >&5 9672 9932 echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6 9673 9933 if test "${cf_cv_unsigned_literals+set}" = set; then … … 9677 9937 cat >conftest.$ac_ext <<_ACEOF 9678 9938 -#line 12479 "configure" 9679 +#line 128 26"configure"9939 +#line 12857 "configure" 9680 9940 #include "confdefs.h" 9681 9941 9682 9942 int 9683 @@ -12488,16 +128 35,16 @@9943 @@ -12488,16 +12866,16 @@ 9684 9944 } 9685 9945 _ACEOF 9686 9946 rm -f conftest.$ac_objext 9687 9947 -if { (eval echo "$as_me:12491: \"$ac_compile\"") >&5 9688 +if { (eval echo "$as_me:128 38: \"$ac_compile\"") >&59948 +if { (eval echo "$as_me:12869: \"$ac_compile\"") >&5 9689 9949 (eval $ac_compile) 2>&5 9690 9950 ac_status=$? 9691 9951 - echo "$as_me:12494: \$? = $ac_status" >&5 9692 + echo "$as_me:128 41: \$? = $ac_status" >&59952 + echo "$as_me:12872: \$? = $ac_status" >&5 9693 9953 (exit $ac_status); } && 9694 9954 { ac_try='test -s conftest.$ac_objext' 9695 9955 - { (eval echo "$as_me:12497: \"$ac_try\"") >&5 9696 + { (eval echo "$as_me:128 44: \"$ac_try\"") >&59956 + { (eval echo "$as_me:12875: \"$ac_try\"") >&5 9697 9957 (eval $ac_try) 2>&5 9698 9958 ac_status=$? 9699 9959 - echo "$as_me:12500: \$? = $ac_status" >&5 9700 + echo "$as_me:128 47: \$? = $ac_status" >&59960 + echo "$as_me:12878: \$? = $ac_status" >&5 9701 9961 (exit $ac_status); }; }; then 9702 9962 cf_cv_unsigned_literals=yes 9703 9963 else 9704 @@ -12509,7 +128 56,7 @@9964 @@ -12509,7 +12887,7 @@ 9705 9965 9706 9966 fi 9707 9967 9708 9968 -echo "$as_me:12512: result: $cf_cv_unsigned_literals" >&5 9709 +echo "$as_me:128 59: result: $cf_cv_unsigned_literals" >&59969 +echo "$as_me:12890: result: $cf_cv_unsigned_literals" >&5 9710 9970 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 9711 9971 9712 9972 cf_cv_1UL="1" 9713 @@ -12525,14 +12 872,14 @@9973 @@ -12525,14 +12903,14 @@ 9714 9974 9715 9975 ### Checks for external-data 9716 9976 9717 9977 -echo "$as_me:12528: checking if external errno is declared" >&5 9718 +echo "$as_me:12 875: checking if external errno is declared" >&59978 +echo "$as_me:12906: checking if external errno is declared" >&5 9719 9979 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 9720 9980 if test "${cf_cv_dcl_errno+set}" = set; then … … 9724 9984 cat >conftest.$ac_ext <<_ACEOF 9725 9985 -#line 12535 "configure" 9726 +#line 12 882"configure"9986 +#line 12913 "configure" 9727 9987 #include "confdefs.h" 9728 9988 9729 9989 #ifdef HAVE_STDLIB_H 9730 @@ -12550,16 +12 897,16 @@9990 @@ -12550,16 +12928,16 @@ 9731 9991 } 9732 9992 _ACEOF 9733 9993 rm -f conftest.$ac_objext 9734 9994 -if { (eval echo "$as_me:12553: \"$ac_compile\"") >&5 9735 +if { (eval echo "$as_me:129 00: \"$ac_compile\"") >&59995 +if { (eval echo "$as_me:12931: \"$ac_compile\"") >&5 9736 9996 (eval $ac_compile) 2>&5 9737 9997 ac_status=$? 9738 9998 - echo "$as_me:12556: \$? = $ac_status" >&5 9739 + echo "$as_me:129 03: \$? = $ac_status" >&59999 + echo "$as_me:12934: \$? = $ac_status" >&5 9740 10000 (exit $ac_status); } && 9741 10001 { ac_try='test -s conftest.$ac_objext' 9742 10002 - { (eval echo "$as_me:12559: \"$ac_try\"") >&5 9743 + { (eval echo "$as_me:129 06: \"$ac_try\"") >&510003 + { (eval echo "$as_me:12937: \"$ac_try\"") >&5 9744 10004 (eval $ac_try) 2>&5 9745 10005 ac_status=$? 9746 10006 - echo "$as_me:12562: \$? = $ac_status" >&5 9747 + echo "$as_me:129 09: \$? = $ac_status" >&510007 + echo "$as_me:12940: \$? = $ac_status" >&5 9748 10008 (exit $ac_status); }; }; then 9749 10009 cf_cv_dcl_errno=yes 9750 10010 else 9751 @@ -12570,7 +129 17,7 @@10011 @@ -12570,7 +12948,7 @@ 9752 10012 rm -f conftest.$ac_objext conftest.$ac_ext 9753 10013 9754 10014 fi 9755 10015 -echo "$as_me:12573: result: $cf_cv_dcl_errno" >&5 9756 +echo "$as_me:129 20: result: $cf_cv_dcl_errno" >&510016 +echo "$as_me:12951: result: $cf_cv_dcl_errno" >&5 9757 10017 echo "${ECHO_T}$cf_cv_dcl_errno" >&6 9758 10018 9759 10019 if test "$cf_cv_dcl_errno" = no ; then 9760 @@ -12585,14 +129 32,14 @@10020 @@ -12585,14 +12963,14 @@ 9761 10021 9762 10022 # It's possible (for near-UNIX clones) that the data doesn't exist 9763 10023 9764 10024 -echo "$as_me:12588: checking if external errno exists" >&5 9765 +echo "$as_me:129 35: checking if external errno exists" >&510025 +echo "$as_me:12966: checking if external errno exists" >&5 9766 10026 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 9767 10027 if test "${cf_cv_have_errno+set}" = set; then … … 9771 10031 cat >conftest.$ac_ext <<_ACEOF 9772 10032 -#line 12595 "configure" 9773 +#line 129 42"configure"10033 +#line 12973 "configure" 9774 10034 #include "confdefs.h" 9775 10035 9776 10036 #undef errno 9777 @@ -12607,16 +129 54,16 @@10037 @@ -12607,16 +12985,16 @@ 9778 10038 } 9779 10039 _ACEOF 9780 10040 rm -f conftest.$ac_objext conftest$ac_exeext 9781 10041 -if { (eval echo "$as_me:12610: \"$ac_link\"") >&5 9782 +if { (eval echo "$as_me:129 57: \"$ac_link\"") >&510042 +if { (eval echo "$as_me:12988: \"$ac_link\"") >&5 9783 10043 (eval $ac_link) 2>&5 9784 10044 ac_status=$? 9785 10045 - echo "$as_me:12613: \$? = $ac_status" >&5 9786 + echo "$as_me:129 60: \$? = $ac_status" >&510046 + echo "$as_me:12991: \$? = $ac_status" >&5 9787 10047 (exit $ac_status); } && 9788 10048 { ac_try='test -s conftest$ac_exeext' 9789 10049 - { (eval echo "$as_me:12616: \"$ac_try\"") >&5 9790 + { (eval echo "$as_me:129 63: \"$ac_try\"") >&510050 + { (eval echo "$as_me:12994: \"$ac_try\"") >&5 9791 10051 (eval $ac_try) 2>&5 9792 10052 ac_status=$? 9793 10053 - echo "$as_me:12619: \$? = $ac_status" >&5 9794 + echo "$as_me:129 66: \$? = $ac_status" >&510054 + echo "$as_me:12997: \$? = $ac_status" >&5 9795 10055 (exit $ac_status); }; }; then 9796 10056 cf_cv_have_errno=yes 9797 10057 else 9798 @@ -12627,7 +1 2974,7 @@10058 @@ -12627,7 +13005,7 @@ 9799 10059 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 9800 10060 9801 10061 fi 9802 10062 -echo "$as_me:12630: result: $cf_cv_have_errno" >&5 9803 +echo "$as_me:1 2977: result: $cf_cv_have_errno" >&510063 +echo "$as_me:13008: result: $cf_cv_have_errno" >&5 9804 10064 echo "${ECHO_T}$cf_cv_have_errno" >&6 9805 10065 9806 10066 if test "$cf_cv_have_errno" = yes ; then 9807 @@ -12640,7 +1 2987,7 @@10067 @@ -12640,7 +13018,7 @@ 9808 10068 9809 10069 fi 9810 10070 9811 10071 -echo "$as_me:12643: checking if data-only library module links" >&5 9812 +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 9813 10073 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 9814 10074 if test "${cf_cv_link_dataonly+set}" = set; then 9815 10075 echo $ECHO_N "(cached) $ECHO_C" >&6 9816 @@ -12648,20 +1 2995,20 @@10076 @@ -12648,20 +13026,20 @@ 9817 10077 9818 10078 rm -f conftest.a 9819 10079 cat >conftest.$ac_ext <<EOF 9820 10080 -#line 12651 "configure" 9821 +#line 1 2998"configure"10081 +#line 13029 "configure" 9822 10082 int testdata[3] = { 123, 456, 789 }; 9823 10083 EOF 9824 10084 - if { (eval echo "$as_me:12654: \"$ac_compile\"") >&5 9825 + if { (eval echo "$as_me:130 01: \"$ac_compile\"") >&510085 + if { (eval echo "$as_me:13032: \"$ac_compile\"") >&5 9826 10086 (eval $ac_compile) 2>&5 9827 10087 ac_status=$? 9828 10088 - echo "$as_me:12657: \$? = $ac_status" >&5 9829 + echo "$as_me:130 04: \$? = $ac_status" >&510089 + echo "$as_me:13035: \$? = $ac_status" >&5 9830 10090 (exit $ac_status); } ; then 9831 10091 mv conftest.o data.o && \ … … 9836 10096 cat >conftest.$ac_ext <<EOF 9837 10097 -#line 12664 "configure" 9838 +#line 130 11"configure"10098 +#line 13042 "configure" 9839 10099 int testfunc() 9840 10100 { 9841 10101 #if defined(NeXT) 9842 @@ -12674,13 +130 21,13 @@10102 @@ -12674,13 +13052,13 @@ 9843 10103 #endif 9844 10104 } 9845 10105 EOF 9846 10106 - if { (eval echo "$as_me:12677: \"$ac_compile\"") >&5 9847 + if { (eval echo "$as_me:130 24: \"$ac_compile\"") >&510107 + if { (eval echo "$as_me:13055: \"$ac_compile\"") >&5 9848 10108 (eval $ac_compile) 2>&5 9849 10109 ac_status=$? 9850 10110 - echo "$as_me:12680: \$? = $ac_status" >&5 9851 + echo "$as_me:130 27: \$? = $ac_status" >&510111 + echo "$as_me:13058: \$? = $ac_status" >&5 9852 10112 (exit $ac_status); }; then 9853 10113 mv conftest.o func.o && \ … … 9857 10117 rm -f conftest.$ac_ext func.o 9858 10118 ( eval $RANLIB conftest.a ) 2>&5 >/dev/null 9859 @@ -12690,7 +130 37,7 @@10119 @@ -12690,7 +13068,7 @@ 9860 10120 cf_cv_link_dataonly=unknown 9861 10121 else 9862 10122 cat >conftest.$ac_ext <<_ACEOF 9863 10123 -#line 12693 "configure" 9864 +#line 130 40"configure"10124 +#line 13071 "configure" 9865 10125 #include "confdefs.h" 9866 10126 9867 10127 int main() 9868 @@ -12701,15 +130 48,15 @@10128 @@ -12701,15 +13079,15 @@ 9869 10129 9870 10130 _ACEOF 9871 10131 rm -f conftest$ac_exeext 9872 10132 -if { (eval echo "$as_me:12704: \"$ac_link\"") >&5 9873 +if { (eval echo "$as_me:130 51: \"$ac_link\"") >&510133 +if { (eval echo "$as_me:13082: \"$ac_link\"") >&5 9874 10134 (eval $ac_link) 2>&5 9875 10135 ac_status=$? 9876 10136 - echo "$as_me:12707: \$? = $ac_status" >&5 9877 + echo "$as_me:130 54: \$? = $ac_status" >&510137 + echo "$as_me:13085: \$? = $ac_status" >&5 9878 10138 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 9879 10139 - { (eval echo "$as_me:12709: \"$ac_try\"") >&5 9880 + { (eval echo "$as_me:130 56: \"$ac_try\"") >&510140 + { (eval echo "$as_me:13087: \"$ac_try\"") >&5 9881 10141 (eval $ac_try) 2>&5 9882 10142 ac_status=$? 9883 10143 - echo "$as_me:12712: \$? = $ac_status" >&5 9884 + echo "$as_me:130 59: \$? = $ac_status" >&510144 + echo "$as_me:13090: \$? = $ac_status" >&5 9885 10145 (exit $ac_status); }; }; then 9886 10146 cf_cv_link_dataonly=yes 9887 10147 else 9888 @@ -12724,7 +13 071,7 @@10148 @@ -12724,7 +13102,7 @@ 9889 10149 9890 10150 fi 9891 10151 9892 10152 -echo "$as_me:12727: result: $cf_cv_link_dataonly" >&5 9893 +echo "$as_me:13 074: result: $cf_cv_link_dataonly" >&510153 +echo "$as_me:13105: result: $cf_cv_link_dataonly" >&5 9894 10154 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 9895 10155 9896 10156 if test "$cf_cv_link_dataonly" = no ; then 9897 @@ -12759,13 +131 06,13 @@10157 @@ -12759,13 +13137,13 @@ 9898 10158 9899 10159 do 9900 10160 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 9901 10161 -echo "$as_me:12762: checking for $ac_func" >&5 9902 +echo "$as_me:131 09: checking for $ac_func" >&510162 +echo "$as_me:13140: checking for $ac_func" >&5 9903 10163 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 9904 10164 if eval "test \"\${$as_ac_var+set}\" = set"; then … … 9907 10167 cat >conftest.$ac_ext <<_ACEOF 9908 10168 -#line 12768 "configure" 9909 +#line 131 15"configure"10169 +#line 13146 "configure" 9910 10170 #include "confdefs.h" 9911 10171 /* System header to define __stub macros and hopefully few prototypes, 9912 10172 which can conflict with char $ac_func (); below. */ 9913 @@ -12796,16 +131 43,16 @@10173 @@ -12796,16 +13174,16 @@ 9914 10174 } 9915 10175 _ACEOF 9916 10176 rm -f conftest.$ac_objext conftest$ac_exeext 9917 10177 -if { (eval echo "$as_me:12799: \"$ac_link\"") >&5 9918 +if { (eval echo "$as_me:131 46: \"$ac_link\"") >&510178 +if { (eval echo "$as_me:13177: \"$ac_link\"") >&5 9919 10179 (eval $ac_link) 2>&5 9920 10180 ac_status=$? 9921 10181 - echo "$as_me:12802: \$? = $ac_status" >&5 9922 + echo "$as_me:131 49: \$? = $ac_status" >&510182 + echo "$as_me:13180: \$? = $ac_status" >&5 9923 10183 (exit $ac_status); } && 9924 10184 { ac_try='test -s conftest$ac_exeext' 9925 10185 - { (eval echo "$as_me:12805: \"$ac_try\"") >&5 9926 + { (eval echo "$as_me:131 52: \"$ac_try\"") >&510186 + { (eval echo "$as_me:13183: \"$ac_try\"") >&5 9927 10187 (eval $ac_try) 2>&5 9928 10188 ac_status=$? 9929 10189 - echo "$as_me:12808: \$? = $ac_status" >&5 9930 + echo "$as_me:131 55: \$? = $ac_status" >&510190 + echo "$as_me:13186: \$? = $ac_status" >&5 9931 10191 (exit $ac_status); }; }; then 9932 10192 eval "$as_ac_var=yes" 9933 10193 else 9934 @@ -12815,7 +131 62,7 @@10194 @@ -12815,7 +13193,7 @@ 9935 10195 fi 9936 10196 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 9937 10197 fi 9938 10198 -echo "$as_me:12818: result: `eval echo '${'$as_ac_var'}'`" >&5 9939 +echo "$as_me:131 65: result: `eval echo '${'$as_ac_var'}'`" >&510199 +echo "$as_me:13196: result: `eval echo '${'$as_ac_var'}'`" >&5 9940 10200 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 9941 10201 if test `eval echo '${'$as_ac_var'}'` = yes; then 9942 10202 cat >>confdefs.h <<EOF 9943 @@ -12827,14 +13 174,14 @@10203 @@ -12827,14 +13205,14 @@ 9944 10204 9945 10205 if test "$with_getcap" = "yes" ; then 9946 10206 9947 10207 -echo "$as_me:12830: checking for terminal-capability database functions" >&5 9948 +echo "$as_me:13 177: checking for terminal-capability database functions" >&510208 +echo "$as_me:13208: checking for terminal-capability database functions" >&5 9949 10209 echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6 9950 10210 if test "${cf_cv_cgetent+set}" = set; then … … 9954 10214 cat >conftest.$ac_ext <<_ACEOF 9955 10215 -#line 12837 "configure" 9956 +#line 13 184"configure"10216 +#line 13215 "configure" 9957 10217 #include "confdefs.h" 9958 10218 9959 10219 #include <stdlib.h> 9960 @@ -12854,16 +132 01,16 @@10220 @@ -12854,16 +13232,16 @@ 9961 10221 } 9962 10222 _ACEOF 9963 10223 rm -f conftest.$ac_objext conftest$ac_exeext 9964 10224 -if { (eval echo "$as_me:12857: \"$ac_link\"") >&5 9965 +if { (eval echo "$as_me:132 04: \"$ac_link\"") >&510225 +if { (eval echo "$as_me:13235: \"$ac_link\"") >&5 9966 10226 (eval $ac_link) 2>&5 9967 10227 ac_status=$? 9968 10228 - echo "$as_me:12860: \$? = $ac_status" >&5 9969 + echo "$as_me:132 07: \$? = $ac_status" >&510229 + echo "$as_me:13238: \$? = $ac_status" >&5 9970 10230 (exit $ac_status); } && 9971 10231 { ac_try='test -s conftest$ac_exeext' 9972 10232 - { (eval echo "$as_me:12863: \"$ac_try\"") >&5 9973 + { (eval echo "$as_me:132 10: \"$ac_try\"") >&510233 + { (eval echo "$as_me:13241: \"$ac_try\"") >&5 9974 10234 (eval $ac_try) 2>&5 9975 10235 ac_status=$? 9976 10236 - echo "$as_me:12866: \$? = $ac_status" >&5 9977 + echo "$as_me:132 13: \$? = $ac_status" >&510237 + echo "$as_me:13244: \$? = $ac_status" >&5 9978 10238 (exit $ac_status); }; }; then 9979 10239 cf_cv_cgetent=yes 9980 10240 else 9981 @@ -12875,7 +132 22,7 @@10241 @@ -12875,7 +13253,7 @@ 9982 10242 9983 10243 fi 9984 10244 9985 10245 -echo "$as_me:12878: result: $cf_cv_cgetent" >&5 9986 +echo "$as_me:132 25: result: $cf_cv_cgetent" >&510246 +echo "$as_me:13256: result: $cf_cv_cgetent" >&5 9987 10247 echo "${ECHO_T}$cf_cv_cgetent" >&6 9988 10248 test "$cf_cv_cgetent" = yes && cat >>confdefs.h <<\EOF 9989 10249 #define HAVE_BSD_CGETENT 1 9990 @@ -12883,14 +132 30,14 @@10250 @@ -12883,14 +13261,14 @@ 9991 10251 9992 10252 fi 9993 10253 9994 10254 -echo "$as_me:12886: checking for isascii" >&5 9995 +echo "$as_me:132 33: checking for isascii" >&510255 +echo "$as_me:13264: checking for isascii" >&5 9996 10256 echo $ECHO_N "checking for isascii... $ECHO_C" >&6 9997 10257 if test "${cf_cv_have_isascii+set}" = set; then … … 10001 10261 cat >conftest.$ac_ext <<_ACEOF 10002 10262 -#line 12893 "configure" 10003 +#line 132 40"configure"10263 +#line 13271 "configure" 10004 10264 #include "confdefs.h" 10005 10265 #include <ctype.h> 10006 10266 int 10007 @@ -12902,16 +132 49,16 @@10267 @@ -12902,16 +13280,16 @@ 10008 10268 } 10009 10269 _ACEOF 10010 10270 rm -f conftest.$ac_objext conftest$ac_exeext 10011 10271 -if { (eval echo "$as_me:12905: \"$ac_link\"") >&5 10012 +if { (eval echo "$as_me:132 52: \"$ac_link\"") >&510272 +if { (eval echo "$as_me:13283: \"$ac_link\"") >&5 10013 10273 (eval $ac_link) 2>&5 10014 10274 ac_status=$? 10015 10275 - echo "$as_me:12908: \$? = $ac_status" >&5 10016 + echo "$as_me:132 55: \$? = $ac_status" >&510276 + echo "$as_me:13286: \$? = $ac_status" >&5 10017 10277 (exit $ac_status); } && 10018 10278 { ac_try='test -s conftest$ac_exeext' 10019 10279 - { (eval echo "$as_me:12911: \"$ac_try\"") >&5 10020 + { (eval echo "$as_me:132 58: \"$ac_try\"") >&510280 + { (eval echo "$as_me:13289: \"$ac_try\"") >&5 10021 10281 (eval $ac_try) 2>&5 10022 10282 ac_status=$? 10023 10283 - echo "$as_me:12914: \$? = $ac_status" >&5 10024 + echo "$as_me:132 61: \$? = $ac_status" >&510284 + echo "$as_me:13292: \$? = $ac_status" >&5 10025 10285 (exit $ac_status); }; }; then 10026 10286 cf_cv_have_isascii=yes 10027 10287 else 10028 @@ -12922,17 +13 269,17 @@10288 @@ -12922,17 +13300,17 @@ 10029 10289 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 10030 10290 10031 10291 fi 10032 10292 -echo "$as_me:12925: result: $cf_cv_have_isascii" >&5 10033 +echo "$as_me:13 272: result: $cf_cv_have_isascii" >&510293 +echo "$as_me:13303: result: $cf_cv_have_isascii" >&5 10034 10294 echo "${ECHO_T}$cf_cv_have_isascii" >&6 10035 10295 test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF … … 10039 10299 if test "$ac_cv_func_sigaction" = yes; then 10040 10300 -echo "$as_me:12932: checking whether sigaction needs _POSIX_SOURCE" >&5 10041 +echo "$as_me:13 279: checking whether sigaction needs _POSIX_SOURCE" >&510301 +echo "$as_me:13310: checking whether sigaction needs _POSIX_SOURCE" >&5 10042 10302 echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6 10043 10303 cat >conftest.$ac_ext <<_ACEOF 10044 10304 -#line 12935 "configure" 10045 +#line 13 282"configure"10305 +#line 13313 "configure" 10046 10306 #include "confdefs.h" 10047 10307 10048 10308 #include <sys/types.h> 10049 @@ -12946,16 +13 293,16 @@10309 @@ -12946,16 +13324,16 @@ 10050 10310 } 10051 10311 _ACEOF 10052 10312 rm -f conftest.$ac_objext 10053 10313 -if { (eval echo "$as_me:12949: \"$ac_compile\"") >&5 10054 +if { (eval echo "$as_me:13 296: \"$ac_compile\"") >&510314 +if { (eval echo "$as_me:13327: \"$ac_compile\"") >&5 10055 10315 (eval $ac_compile) 2>&5 10056 10316 ac_status=$? 10057 10317 - echo "$as_me:12952: \$? = $ac_status" >&5 10058 + echo "$as_me:13 299: \$? = $ac_status" >&510318 + echo "$as_me:13330: \$? = $ac_status" >&5 10059 10319 (exit $ac_status); } && 10060 10320 { ac_try='test -s conftest.$ac_objext' 10061 10321 - { (eval echo "$as_me:12955: \"$ac_try\"") >&5 10062 + { (eval echo "$as_me:133 02: \"$ac_try\"") >&510322 + { (eval echo "$as_me:13333: \"$ac_try\"") >&5 10063 10323 (eval $ac_try) 2>&5 10064 10324 ac_status=$? 10065 10325 - echo "$as_me:12958: \$? = $ac_status" >&5 10066 + echo "$as_me:133 05: \$? = $ac_status" >&510326 + echo "$as_me:13336: \$? = $ac_status" >&5 10067 10327 (exit $ac_status); }; }; then 10068 10328 sigact_bad=no 10069 10329 else 10070 @@ -12963,7 +133 10,7 @@10330 @@ -12963,7 +13341,7 @@ 10071 10331 cat conftest.$ac_ext >&5 10072 10332 10073 10333 cat >conftest.$ac_ext <<_ACEOF 10074 10334 -#line 12966 "configure" 10075 +#line 133 13"configure"10335 +#line 13344 "configure" 10076 10336 #include "confdefs.h" 10077 10337 10078 10338 #define _POSIX_SOURCE 10079 @@ -12978,16 +133 25,16 @@10339 @@ -12978,16 +13356,16 @@ 10080 10340 } 10081 10341 _ACEOF 10082 10342 rm -f conftest.$ac_objext 10083 10343 -if { (eval echo "$as_me:12981: \"$ac_compile\"") >&5 10084 +if { (eval echo "$as_me:133 28: \"$ac_compile\"") >&510344 +if { (eval echo "$as_me:13359: \"$ac_compile\"") >&5 10085 10345 (eval $ac_compile) 2>&5 10086 10346 ac_status=$? 10087 10347 - echo "$as_me:12984: \$? = $ac_status" >&5 10088 + echo "$as_me:133 31: \$? = $ac_status" >&510348 + echo "$as_me:13362: \$? = $ac_status" >&5 10089 10349 (exit $ac_status); } && 10090 10350 { ac_try='test -s conftest.$ac_objext' 10091 10351 - { (eval echo "$as_me:12987: \"$ac_try\"") >&5 10092 + { (eval echo "$as_me:133 34: \"$ac_try\"") >&510352 + { (eval echo "$as_me:13365: \"$ac_try\"") >&5 10093 10353 (eval $ac_try) 2>&5 10094 10354 ac_status=$? 10095 10355 - echo "$as_me:12990: \$? = $ac_status" >&5 10096 + echo "$as_me:133 37: \$? = $ac_status" >&510356 + echo "$as_me:13368: \$? = $ac_status" >&5 10097 10357 (exit $ac_status); }; }; then 10098 10358 sigact_bad=yes 10099 10359 cat >>confdefs.h <<\EOF 10100 @@ -13002,11 +133 49,11 @@10360 @@ -13002,11 +13380,11 @@ 10101 10361 rm -f conftest.$ac_objext conftest.$ac_ext 10102 10362 fi 10103 10363 rm -f conftest.$ac_objext conftest.$ac_ext 10104 10364 -echo "$as_me:13005: result: $sigact_bad" >&5 10105 +echo "$as_me:133 52: result: $sigact_bad" >&510365 +echo "$as_me:13383: result: $sigact_bad" >&5 10106 10366 echo "${ECHO_T}$sigact_bad" >&6 10107 10367 fi 10108 10368 10109 10369 -echo "$as_me:13009: checking if nanosleep really works" >&5 10110 +echo "$as_me:133 56: checking if nanosleep really works" >&510370 +echo "$as_me:13387: checking if nanosleep really works" >&5 10111 10371 echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6 10112 10372 if test "${cf_cv_func_nanosleep+set}" = set; then 10113 10373 echo $ECHO_N "(cached) $ECHO_C" >&6 10114 @@ -13016,7 +133 63,7 @@10374 @@ -13016,7 +13394,7 @@ 10115 10375 cf_cv_func_nanosleep=unknown 10116 10376 else 10117 10377 cat >conftest.$ac_ext <<_ACEOF 10118 10378 -#line 13019 "configure" 10119 +#line 133 66"configure"10379 +#line 13397 "configure" 10120 10380 #include "confdefs.h" 10121 10381 10122 10382 #include <stdio.h> 10123 @@ -13041,15 +13 388,15 @@10383 @@ -13041,15 +13419,15 @@ 10124 10384 10125 10385 _ACEOF 10126 10386 rm -f conftest$ac_exeext 10127 10387 -if { (eval echo "$as_me:13044: \"$ac_link\"") >&5 10128 +if { (eval echo "$as_me:13 391: \"$ac_link\"") >&510388 +if { (eval echo "$as_me:13422: \"$ac_link\"") >&5 10129 10389 (eval $ac_link) 2>&5 10130 10390 ac_status=$? 10131 10391 - echo "$as_me:13047: \$? = $ac_status" >&5 10132 + echo "$as_me:13 394: \$? = $ac_status" >&510392 + echo "$as_me:13425: \$? = $ac_status" >&5 10133 10393 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 10134 10394 - { (eval echo "$as_me:13049: \"$ac_try\"") >&5 10135 + { (eval echo "$as_me:13 396: \"$ac_try\"") >&510395 + { (eval echo "$as_me:13427: \"$ac_try\"") >&5 10136 10396 (eval $ac_try) 2>&5 10137 10397 ac_status=$? 10138 10398 - echo "$as_me:13052: \$? = $ac_status" >&5 10139 + echo "$as_me:13 399: \$? = $ac_status" >&510399 + echo "$as_me:13430: \$? = $ac_status" >&5 10140 10400 (exit $ac_status); }; }; then 10141 10401 cf_cv_func_nanosleep=yes 10142 10402 else 10143 @@ -13061,7 +134 08,7 @@10403 @@ -13061,7 +13439,7 @@ 10144 10404 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 10145 10405 fi 10146 10406 fi 10147 10407 -echo "$as_me:13064: result: $cf_cv_func_nanosleep" >&5 10148 +echo "$as_me:134 11: result: $cf_cv_func_nanosleep" >&510408 +echo "$as_me:13442: result: $cf_cv_func_nanosleep" >&5 10149 10409 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 10150 10410 10151 10411 test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF 10152 @@ -13075,23 +134 22,23 @@10412 @@ -13075,23 +13453,23 @@ 10153 10413 10154 10414 do 10155 10415 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 10156 10416 -echo "$as_me:13078: checking for $ac_header" >&5 10157 +echo "$as_me:134 25: checking for $ac_header" >&510417 +echo "$as_me:13456: checking for $ac_header" >&5 10158 10418 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 10159 10419 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 10162 10422 cat >conftest.$ac_ext <<_ACEOF 10163 10423 -#line 13084 "configure" 10164 +#line 134 31"configure"10424 +#line 13462 "configure" 10165 10425 #include "confdefs.h" 10166 10426 #include <$ac_header> 10167 10427 _ACEOF 10168 10428 -if { (eval echo "$as_me:13088: \"$ac_cpp conftest.$ac_ext\"") >&5 10169 +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 10170 10430 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 10171 10431 ac_status=$? … … 10174 10434 cat conftest.err >&5 10175 10435 - echo "$as_me:13094: \$? = $ac_status" >&5 10176 + echo "$as_me:134 41: \$? = $ac_status" >&510436 + echo "$as_me:13472: \$? = $ac_status" >&5 10177 10437 (exit $ac_status); } >/dev/null; then 10178 10438 if test -s conftest.err; then 10179 10439 ac_cpp_err=$ac_c_preproc_warn_flag 10180 @@ -13110,7 +134 57,7 @@10440 @@ -13110,7 +13488,7 @@ 10181 10441 fi 10182 10442 rm -f conftest.err conftest.$ac_ext 10183 10443 fi 10184 10444 -echo "$as_me:13113: result: `eval echo '${'$as_ac_Header'}'`" >&5 10185 +echo "$as_me:134 60: result: `eval echo '${'$as_ac_Header'}'`" >&510445 +echo "$as_me:13491: result: `eval echo '${'$as_ac_Header'}'`" >&5 10186 10446 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 10187 10447 if test `eval echo '${'$as_ac_Header'}'` = yes; then 10188 10448 cat >>confdefs.h <<EOF 10189 @@ -13125,23 +13 472,23 @@10449 @@ -13125,23 +13503,23 @@ 10190 10450 for ac_header in sys/termio.h 10191 10451 do 10192 10452 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 10193 10453 -echo "$as_me:13128: checking for $ac_header" >&5 10194 +echo "$as_me:13 475: checking for $ac_header" >&510454 +echo "$as_me:13506: checking for $ac_header" >&5 10195 10455 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 10196 10456 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 10199 10459 cat >conftest.$ac_ext <<_ACEOF 10200 10460 -#line 13134 "configure" 10201 +#line 13 481"configure"10461 +#line 13512 "configure" 10202 10462 #include "confdefs.h" 10203 10463 #include <$ac_header> 10204 10464 _ACEOF 10205 10465 -if { (eval echo "$as_me:13138: \"$ac_cpp conftest.$ac_ext\"") >&5 10206 +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 10207 10467 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 10208 10468 ac_status=$? … … 10211 10471 cat conftest.err >&5 10212 10472 - echo "$as_me:13144: \$? = $ac_status" >&5 10213 + echo "$as_me:13 491: \$? = $ac_status" >&510473 + echo "$as_me:13522: \$? = $ac_status" >&5 10214 10474 (exit $ac_status); } >/dev/null; then 10215 10475 if test -s conftest.err; then 10216 10476 ac_cpp_err=$ac_c_preproc_warn_flag 10217 @@ -13160,7 +135 07,7 @@10477 @@ -13160,7 +13538,7 @@ 10218 10478 fi 10219 10479 rm -f conftest.err conftest.$ac_ext 10220 10480 fi 10221 10481 -echo "$as_me:13163: result: `eval echo '${'$as_ac_Header'}'`" >&5 10222 +echo "$as_me:135 10: result: `eval echo '${'$as_ac_Header'}'`" >&510482 +echo "$as_me:13541: result: `eval echo '${'$as_ac_Header'}'`" >&5 10223 10483 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 10224 10484 if test `eval echo '${'$as_ac_Header'}'` = yes; then 10225 10485 cat >>confdefs.h <<EOF 10226 @@ -13178,10 +135 25,10 @@10486 @@ -13178,10 +13556,10 @@ 10227 10487 *) termios_bad=maybe ;; 10228 10488 esac 10229 10489 if test "$termios_bad" = maybe ; then 10230 10490 - echo "$as_me:13181: checking whether termios.h needs _POSIX_SOURCE" >&5 10231 + 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 10232 10492 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6 10233 10493 cat >conftest.$ac_ext <<_ACEOF 10234 10494 -#line 13184 "configure" 10235 +#line 135 31"configure"10495 +#line 13562 "configure" 10236 10496 #include "confdefs.h" 10237 10497 #include <termios.h> 10238 10498 int 10239 @@ -13193,16 +135 40,16 @@10499 @@ -13193,16 +13571,16 @@ 10240 10500 } 10241 10501 _ACEOF 10242 10502 rm -f conftest.$ac_objext 10243 10503 -if { (eval echo "$as_me:13196: \"$ac_compile\"") >&5 10244 +if { (eval echo "$as_me:135 43: \"$ac_compile\"") >&510504 +if { (eval echo "$as_me:13574: \"$ac_compile\"") >&5 10245 10505 (eval $ac_compile) 2>&5 10246 10506 ac_status=$? 10247 10507 - echo "$as_me:13199: \$? = $ac_status" >&5 10248 + echo "$as_me:135 46: \$? = $ac_status" >&510508 + echo "$as_me:13577: \$? = $ac_status" >&5 10249 10509 (exit $ac_status); } && 10250 10510 { ac_try='test -s conftest.$ac_objext' 10251 10511 - { (eval echo "$as_me:13202: \"$ac_try\"") >&5 10252 + { (eval echo "$as_me:135 49: \"$ac_try\"") >&510512 + { (eval echo "$as_me:13580: \"$ac_try\"") >&5 10253 10513 (eval $ac_try) 2>&5 10254 10514 ac_status=$? 10255 10515 - echo "$as_me:13205: \$? = $ac_status" >&5 10256 + echo "$as_me:135 52: \$? = $ac_status" >&510516 + echo "$as_me:13583: \$? = $ac_status" >&5 10257 10517 (exit $ac_status); }; }; then 10258 10518 termios_bad=no 10259 10519 else 10260 @@ -13210,7 +135 57,7 @@10520 @@ -13210,7 +13588,7 @@ 10261 10521 cat conftest.$ac_ext >&5 10262 10522 10263 10523 cat >conftest.$ac_ext <<_ACEOF 10264 10524 -#line 13213 "configure" 10265 +#line 135 60"configure"10525 +#line 13591 "configure" 10266 10526 #include "confdefs.h" 10267 10527 10268 10528 #define _POSIX_SOURCE 10269 @@ -13224,16 +13 571,16 @@10529 @@ -13224,16 +13602,16 @@ 10270 10530 } 10271 10531 _ACEOF 10272 10532 rm -f conftest.$ac_objext 10273 10533 -if { (eval echo "$as_me:13227: \"$ac_compile\"") >&5 10274 +if { (eval echo "$as_me:13 574: \"$ac_compile\"") >&510534 +if { (eval echo "$as_me:13605: \"$ac_compile\"") >&5 10275 10535 (eval $ac_compile) 2>&5 10276 10536 ac_status=$? 10277 10537 - echo "$as_me:13230: \$? = $ac_status" >&5 10278 + echo "$as_me:13 577: \$? = $ac_status" >&510538 + echo "$as_me:13608: \$? = $ac_status" >&5 10279 10539 (exit $ac_status); } && 10280 10540 { ac_try='test -s conftest.$ac_objext' 10281 10541 - { (eval echo "$as_me:13233: \"$ac_try\"") >&5 10282 + { (eval echo "$as_me:13 580: \"$ac_try\"") >&510542 + { (eval echo "$as_me:13611: \"$ac_try\"") >&5 10283 10543 (eval $ac_try) 2>&5 10284 10544 ac_status=$? 10285 10545 - echo "$as_me:13236: \$? = $ac_status" >&5 10286 + echo "$as_me:13 583: \$? = $ac_status" >&510546 + echo "$as_me:13614: \$? = $ac_status" >&5 10287 10547 (exit $ac_status); }; }; then 10288 10548 termios_bad=unknown 10289 10549 else 10290 @@ -13248,19 +13 595,19 @@10550 @@ -13248,19 +13626,19 @@ 10291 10551 10292 10552 fi 10293 10553 rm -f conftest.$ac_objext conftest.$ac_ext 10294 10554 - echo "$as_me:13251: result: $termios_bad" >&5 10295 + echo "$as_me:13 598: result: $termios_bad" >&510555 + echo "$as_me:13629: result: $termios_bad" >&5 10296 10556 echo "${ECHO_T}$termios_bad" >&6 10297 10557 fi … … 10299 10559 10300 10560 -echo "$as_me:13256: checking for tcgetattr" >&5 10301 +echo "$as_me:136 03: checking for tcgetattr" >&510561 +echo "$as_me:13634: checking for tcgetattr" >&5 10302 10562 echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6 10303 10563 if test "${cf_cv_have_tcgetattr+set}" = set; then … … 10307 10567 cat >conftest.$ac_ext <<_ACEOF 10308 10568 -#line 13263 "configure" 10309 +#line 136 10"configure"10569 +#line 13641 "configure" 10310 10570 #include "confdefs.h" 10311 10571 10312 10572 #include <sys/types.h> 10313 @@ -13288,16 +136 35,16 @@10573 @@ -13288,16 +13666,16 @@ 10314 10574 } 10315 10575 _ACEOF 10316 10576 rm -f conftest.$ac_objext conftest$ac_exeext 10317 10577 -if { (eval echo "$as_me:13291: \"$ac_link\"") >&5 10318 +if { (eval echo "$as_me:136 38: \"$ac_link\"") >&510578 +if { (eval echo "$as_me:13669: \"$ac_link\"") >&5 10319 10579 (eval $ac_link) 2>&5 10320 10580 ac_status=$? 10321 10581 - echo "$as_me:13294: \$? = $ac_status" >&5 10322 + echo "$as_me:136 41: \$? = $ac_status" >&510582 + echo "$as_me:13672: \$? = $ac_status" >&5 10323 10583 (exit $ac_status); } && 10324 10584 { ac_try='test -s conftest$ac_exeext' 10325 10585 - { (eval echo "$as_me:13297: \"$ac_try\"") >&5 10326 + { (eval echo "$as_me:136 44: \"$ac_try\"") >&510586 + { (eval echo "$as_me:13675: \"$ac_try\"") >&5 10327 10587 (eval $ac_try) 2>&5 10328 10588 ac_status=$? 10329 10589 - echo "$as_me:13300: \$? = $ac_status" >&5 10330 + echo "$as_me:136 47: \$? = $ac_status" >&510590 + echo "$as_me:13678: \$? = $ac_status" >&5 10331 10591 (exit $ac_status); }; }; then 10332 10592 cf_cv_have_tcgetattr=yes 10333 10593 else 10334 @@ -13307,20 +136 54,20 @@10594 @@ -13307,20 +13685,20 @@ 10335 10595 fi 10336 10596 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 10337 10597 fi 10338 10598 -echo "$as_me:13310: result: $cf_cv_have_tcgetattr" >&5 10339 +echo "$as_me:136 57: result: $cf_cv_have_tcgetattr" >&510599 +echo "$as_me:13688: result: $cf_cv_have_tcgetattr" >&5 10340 10600 echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6 10341 10601 test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF … … 10344 10604 10345 10605 -echo "$as_me:13316: checking for vsscanf function or workaround" >&5 10346 +echo "$as_me:136 63: checking for vsscanf function or workaround" >&510606 +echo "$as_me:13694: checking for vsscanf function or workaround" >&5 10347 10607 echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6 10348 10608 if test "${cf_cv_func_vsscanf+set}" = set; then … … 10352 10612 cat >conftest.$ac_ext <<_ACEOF 10353 10613 -#line 13323 "configure" 10354 +#line 13 670"configure"10614 +#line 13701 "configure" 10355 10615 #include "confdefs.h" 10356 10616 10357 10617 #include <stdarg.h> 10358 @@ -13336,16 +13 683,16 @@10618 @@ -13336,16 +13714,16 @@ 10359 10619 } 10360 10620 _ACEOF 10361 10621 rm -f conftest.$ac_objext conftest$ac_exeext 10362 10622 -if { (eval echo "$as_me:13339: \"$ac_link\"") >&5 10363 +if { (eval echo "$as_me:13 686: \"$ac_link\"") >&510623 +if { (eval echo "$as_me:13717: \"$ac_link\"") >&5 10364 10624 (eval $ac_link) 2>&5 10365 10625 ac_status=$? 10366 10626 - echo "$as_me:13342: \$? = $ac_status" >&5 10367 + echo "$as_me:13 689: \$? = $ac_status" >&510627 + echo "$as_me:13720: \$? = $ac_status" >&5 10368 10628 (exit $ac_status); } && 10369 10629 { ac_try='test -s conftest$ac_exeext' 10370 10630 - { (eval echo "$as_me:13345: \"$ac_try\"") >&5 10371 + { (eval echo "$as_me:13 692: \"$ac_try\"") >&510631 + { (eval echo "$as_me:13723: \"$ac_try\"") >&5 10372 10632 (eval $ac_try) 2>&5 10373 10633 ac_status=$? 10374 10634 - echo "$as_me:13348: \$? = $ac_status" >&5 10375 + echo "$as_me:13 695: \$? = $ac_status" >&510635 + echo "$as_me:13726: \$? = $ac_status" >&5 10376 10636 (exit $ac_status); }; }; then 10377 10637 cf_cv_func_vsscanf=vsscanf 10378 10638 else 10379 @@ -13353,7 +137 00,7 @@10639 @@ -13353,7 +13731,7 @@ 10380 10640 cat conftest.$ac_ext >&5 10381 10641 10382 10642 cat >conftest.$ac_ext <<_ACEOF 10383 10643 -#line 13356 "configure" 10384 +#line 137 03"configure"10644 +#line 13734 "configure" 10385 10645 #include "confdefs.h" 10386 10646 10387 10647 #include <stdarg.h> 10388 @@ -13375,16 +137 22,16 @@10648 @@ -13375,16 +13753,16 @@ 10389 10649 } 10390 10650 _ACEOF 10391 10651 rm -f conftest.$ac_objext conftest$ac_exeext 10392 10652 -if { (eval echo "$as_me:13378: \"$ac_link\"") >&5 10393 +if { (eval echo "$as_me:137 25: \"$ac_link\"") >&510653 +if { (eval echo "$as_me:13756: \"$ac_link\"") >&5 10394 10654 (eval $ac_link) 2>&5 10395 10655 ac_status=$? 10396 10656 - echo "$as_me:13381: \$? = $ac_status" >&5 10397 + echo "$as_me:137 28: \$? = $ac_status" >&510657 + echo "$as_me:13759: \$? = $ac_status" >&5 10398 10658 (exit $ac_status); } && 10399 10659 { ac_try='test -s conftest$ac_exeext' 10400 10660 - { (eval echo "$as_me:13384: \"$ac_try\"") >&5 10401 + { (eval echo "$as_me:137 31: \"$ac_try\"") >&510661 + { (eval echo "$as_me:13762: \"$ac_try\"") >&5 10402 10662 (eval $ac_try) 2>&5 10403 10663 ac_status=$? 10404 10664 - echo "$as_me:13387: \$? = $ac_status" >&5 10405 + echo "$as_me:137 34: \$? = $ac_status" >&510665 + echo "$as_me:13765: \$? = $ac_status" >&5 10406 10666 (exit $ac_status); }; }; then 10407 10667 cf_cv_func_vsscanf=vfscanf 10408 10668 else 10409 @@ -13392,7 +137 39,7 @@10669 @@ -13392,7 +13770,7 @@ 10410 10670 cat conftest.$ac_ext >&5 10411 10671 10412 10672 cat >conftest.$ac_ext <<_ACEOF 10413 10673 -#line 13395 "configure" 10414 +#line 137 42"configure"10674 +#line 13773 "configure" 10415 10675 #include "confdefs.h" 10416 10676 10417 10677 #include <stdarg.h> 10418 @@ -13414,16 +137 61,16 @@10678 @@ -13414,16 +13792,16 @@ 10419 10679 } 10420 10680 _ACEOF 10421 10681 rm -f conftest.$ac_objext conftest$ac_exeext 10422 10682 -if { (eval echo "$as_me:13417: \"$ac_link\"") >&5 10423 +if { (eval echo "$as_me:137 64: \"$ac_link\"") >&510683 +if { (eval echo "$as_me:13795: \"$ac_link\"") >&5 10424 10684 (eval $ac_link) 2>&5 10425 10685 ac_status=$? 10426 10686 - echo "$as_me:13420: \$? = $ac_status" >&5 10427 + echo "$as_me:137 67: \$? = $ac_status" >&510687 + echo "$as_me:13798: \$? = $ac_status" >&5 10428 10688 (exit $ac_status); } && 10429 10689 { ac_try='test -s conftest$ac_exeext' 10430 10690 - { (eval echo "$as_me:13423: \"$ac_try\"") >&5 10431 + { (eval echo "$as_me:13 770: \"$ac_try\"") >&510691 + { (eval echo "$as_me:13801: \"$ac_try\"") >&5 10432 10692 (eval $ac_try) 2>&5 10433 10693 ac_status=$? 10434 10694 - echo "$as_me:13426: \$? = $ac_status" >&5 10435 + echo "$as_me:13 773: \$? = $ac_status" >&510695 + echo "$as_me:13804: \$? = $ac_status" >&5 10436 10696 (exit $ac_status); }; }; then 10437 10697 cf_cv_func_vsscanf=_doscan 10438 10698 else 10439 @@ -13438,7 +13 785,7 @@10699 @@ -13438,7 +13816,7 @@ 10440 10700 fi 10441 10701 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 10442 10702 fi 10443 10703 -echo "$as_me:13441: result: $cf_cv_func_vsscanf" >&5 10444 +echo "$as_me:13 788: result: $cf_cv_func_vsscanf" >&510704 +echo "$as_me:13819: result: $cf_cv_func_vsscanf" >&5 10445 10705 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 10446 10706 10447 10707 case $cf_cv_func_vsscanf in #(vi 10448 @@ -13456,7 +138 03,7 @@10708 @@ -13456,7 +13834,7 @@ 10449 10709 ;; 10450 10710 esac 10451 10711 10452 10712 -echo "$as_me:13459: checking for working mkstemp" >&5 10453 +echo "$as_me:138 06: checking for working mkstemp" >&510713 +echo "$as_me:13837: checking for working mkstemp" >&5 10454 10714 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 10455 10715 if test "${cf_cv_func_mkstemp+set}" = set; then 10456 10716 echo $ECHO_N "(cached) $ECHO_C" >&6 10457 @@ -13464,13 +138 11,13 @@10717 @@ -13464,13 +13842,13 @@ 10458 10718 10459 10719 rm -f conftest* 10460 10720 if test "$cross_compiling" = yes; then 10461 10721 - echo "$as_me:13467: checking for mkstemp" >&5 10462 + echo "$as_me:138 14: checking for mkstemp" >&510722 + echo "$as_me:13845: checking for mkstemp" >&5 10463 10723 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 10464 10724 if test "${ac_cv_func_mkstemp+set}" = set; then … … 10467 10727 cat >conftest.$ac_ext <<_ACEOF 10468 10728 -#line 13473 "configure" 10469 +#line 138 20"configure"10729 +#line 13851 "configure" 10470 10730 #include "confdefs.h" 10471 10731 /* System header to define __stub macros and hopefully few prototypes, 10472 10732 which can conflict with char mkstemp (); below. */ 10473 @@ -13501,16 +138 48,16 @@10733 @@ -13501,16 +13879,16 @@ 10474 10734 } 10475 10735 _ACEOF 10476 10736 rm -f conftest.$ac_objext conftest$ac_exeext 10477 10737 -if { (eval echo "$as_me:13504: \"$ac_link\"") >&5 10478 +if { (eval echo "$as_me:138 51: \"$ac_link\"") >&510738 +if { (eval echo "$as_me:13882: \"$ac_link\"") >&5 10479 10739 (eval $ac_link) 2>&5 10480 10740 ac_status=$? 10481 10741 - echo "$as_me:13507: \$? = $ac_status" >&5 10482 + echo "$as_me:138 54: \$? = $ac_status" >&510742 + echo "$as_me:13885: \$? = $ac_status" >&5 10483 10743 (exit $ac_status); } && 10484 10744 { ac_try='test -s conftest$ac_exeext' 10485 10745 - { (eval echo "$as_me:13510: \"$ac_try\"") >&5 10486 + { (eval echo "$as_me:138 57: \"$ac_try\"") >&510746 + { (eval echo "$as_me:13888: \"$ac_try\"") >&5 10487 10747 (eval $ac_try) 2>&5 10488 10748 ac_status=$? 10489 10749 - echo "$as_me:13513: \$? = $ac_status" >&5 10490 + echo "$as_me:138 60: \$? = $ac_status" >&510750 + echo "$as_me:13891: \$? = $ac_status" >&5 10491 10751 (exit $ac_status); }; }; then 10492 10752 ac_cv_func_mkstemp=yes 10493 10753 else 10494 @@ -13520,12 +138 67,12 @@10754 @@ -13520,12 +13898,12 @@ 10495 10755 fi 10496 10756 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 10497 10757 fi 10498 10758 -echo "$as_me:13523: result: $ac_cv_func_mkstemp" >&5 10499 +echo "$as_me:13 870: result: $ac_cv_func_mkstemp" >&510759 +echo "$as_me:13901: result: $ac_cv_func_mkstemp" >&5 10500 10760 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 10501 10761 … … 10503 10763 cat >conftest.$ac_ext <<_ACEOF 10504 10764 -#line 13528 "configure" 10505 +#line 13 875"configure"10765 +#line 13906 "configure" 10506 10766 #include "confdefs.h" 10507 10767 10508 10768 #include <sys/types.h> 10509 @@ -13563,15 +139 10,15 @@10769 @@ -13563,15 +13941,15 @@ 10510 10770 10511 10771 _ACEOF 10512 10772 rm -f conftest$ac_exeext 10513 10773 -if { (eval echo "$as_me:13566: \"$ac_link\"") >&5 10514 +if { (eval echo "$as_me:139 13: \"$ac_link\"") >&510774 +if { (eval echo "$as_me:13944: \"$ac_link\"") >&5 10515 10775 (eval $ac_link) 2>&5 10516 10776 ac_status=$? 10517 10777 - echo "$as_me:13569: \$? = $ac_status" >&5 10518 + echo "$as_me:139 16: \$? = $ac_status" >&510778 + echo "$as_me:13947: \$? = $ac_status" >&5 10519 10779 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 10520 10780 - { (eval echo "$as_me:13571: \"$ac_try\"") >&5 10521 + { (eval echo "$as_me:139 18: \"$ac_try\"") >&510781 + { (eval echo "$as_me:13949: \"$ac_try\"") >&5 10522 10782 (eval $ac_try) 2>&5 10523 10783 ac_status=$? 10524 10784 - echo "$as_me:13574: \$? = $ac_status" >&5 10525 + echo "$as_me:139 21: \$? = $ac_status" >&510785 + echo "$as_me:13952: \$? = $ac_status" >&5 10526 10786 (exit $ac_status); }; }; then 10527 10787 cf_cv_func_mkstemp=yes 10528 10788 10529 @@ -13586,7 +139 33,7 @@10789 @@ -13586,7 +13964,7 @@ 10530 10790 fi 10531 10791 10532 10792 fi 10533 10793 -echo "$as_me:13589: result: $cf_cv_func_mkstemp" >&5 10534 +echo "$as_me:139 36: result: $cf_cv_func_mkstemp" >&510794 +echo "$as_me:13967: result: $cf_cv_func_mkstemp" >&5 10535 10795 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 10536 10796 if test "$cf_cv_func_mkstemp" = yes ; then 10537 10797 cat >>confdefs.h <<\EOF 10538 @@ -13604,21 +139 51,21 @@10798 @@ -13604,21 +13982,21 @@ 10539 10799 fi 10540 10800 10541 10801 if test "$cross_compiling" = yes ; then 10542 10802 - { echo "$as_me:13607: WARNING: cross compiling: assume setvbuf params not reversed" >&5 10543 + { 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 10544 10804 echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;} 10545 10805 else 10546 10806 - echo "$as_me:13610: checking whether setvbuf arguments are reversed" >&5 10547 + echo "$as_me:139 57: checking whether setvbuf arguments are reversed" >&510807 + echo "$as_me:13988: checking whether setvbuf arguments are reversed" >&5 10548 10808 echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 10549 10809 if test "${ac_cv_func_setvbuf_reversed+set}" = set; then … … 10552 10812 if test "$cross_compiling" = yes; then 10553 10813 - { { echo "$as_me:13616: error: cannot run test program while cross compiling" >&5 10554 + { { 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 10555 10815 echo "$as_me: error: cannot run test program while cross compiling" >&2;} 10556 10816 { (exit 1); exit 1; }; } … … 10558 10818 cat >conftest.$ac_ext <<_ACEOF 10559 10819 -#line 13621 "configure" 10560 +#line 139 68"configure"10820 +#line 13999 "configure" 10561 10821 #include "confdefs.h" 10562 10822 #include <stdio.h> 10563 10823 /* If setvbuf has the reversed format, exit 0. */ 10564 @@ -13635,15 +1 3982,15 @@10824 @@ -13635,15 +14013,15 @@ 10565 10825 } 10566 10826 _ACEOF 10567 10827 rm -f conftest$ac_exeext 10568 10828 -if { (eval echo "$as_me:13638: \"$ac_link\"") >&5 10569 +if { (eval echo "$as_me:1 3985: \"$ac_link\"") >&510829 +if { (eval echo "$as_me:14016: \"$ac_link\"") >&5 10570 10830 (eval $ac_link) 2>&5 10571 10831 ac_status=$? 10572 10832 - echo "$as_me:13641: \$? = $ac_status" >&5 10573 + echo "$as_me:1 3988: \$? = $ac_status" >&510833 + echo "$as_me:14019: \$? = $ac_status" >&5 10574 10834 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 10575 10835 - { (eval echo "$as_me:13643: \"$ac_try\"") >&5 10576 + { (eval echo "$as_me:1 3990: \"$ac_try\"") >&510836 + { (eval echo "$as_me:14021: \"$ac_try\"") >&5 10577 10837 (eval $ac_try) 2>&5 10578 10838 ac_status=$? 10579 10839 - echo "$as_me:13646: \$? = $ac_status" >&5 10580 + echo "$as_me:1 3993: \$? = $ac_status" >&510840 + echo "$as_me:14024: \$? = $ac_status" >&5 10581 10841 (exit $ac_status); }; }; then 10582 10842 ac_cv_func_setvbuf_reversed=yes 10583 10843 else 10584 @@ -13656,7 +140 03,7 @@10844 @@ -13656,7 +14034,7 @@ 10585 10845 fi 10586 10846 rm -f core core.* *.core 10587 10847 fi 10588 10848 -echo "$as_me:13659: result: $ac_cv_func_setvbuf_reversed" >&5 10589 +echo "$as_me:140 06: result: $ac_cv_func_setvbuf_reversed" >&510849 +echo "$as_me:14037: result: $ac_cv_func_setvbuf_reversed" >&5 10590 10850 echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 10591 10851 if test $ac_cv_func_setvbuf_reversed = yes; then 10592 10852 10593 @@ -13667,13 +140 14,13 @@10853 @@ -13667,13 +14045,13 @@ 10594 10854 fi 10595 10855 10596 10856 fi 10597 10857 -echo "$as_me:13670: checking return type of signal handlers" >&5 10598 +echo "$as_me:140 17: checking return type of signal handlers" >&510858 +echo "$as_me:14048: checking return type of signal handlers" >&5 10599 10859 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 10600 10860 if test "${ac_cv_type_signal+set}" = set; then … … 10603 10863 cat >conftest.$ac_ext <<_ACEOF 10604 10864 -#line 13676 "configure" 10605 +#line 140 23"configure"10865 +#line 14054 "configure" 10606 10866 #include "confdefs.h" 10607 10867 #include <sys/types.h> 10608 10868 #include <signal.h> 10609 @@ -13695,16 +140 42,16 @@10869 @@ -13695,16 +14073,16 @@ 10610 10870 } 10611 10871 _ACEOF 10612 10872 rm -f conftest.$ac_objext 10613 10873 -if { (eval echo "$as_me:13698: \"$ac_compile\"") >&5 10614 +if { (eval echo "$as_me:140 45: \"$ac_compile\"") >&510874 +if { (eval echo "$as_me:14076: \"$ac_compile\"") >&5 10615 10875 (eval $ac_compile) 2>&5 10616 10876 ac_status=$? 10617 10877 - echo "$as_me:13701: \$? = $ac_status" >&5 10618 + echo "$as_me:140 48: \$? = $ac_status" >&510878 + echo "$as_me:14079: \$? = $ac_status" >&5 10619 10879 (exit $ac_status); } && 10620 10880 { ac_try='test -s conftest.$ac_objext' 10621 10881 - { (eval echo "$as_me:13704: \"$ac_try\"") >&5 10622 + { (eval echo "$as_me:140 51: \"$ac_try\"") >&510882 + { (eval echo "$as_me:14082: \"$ac_try\"") >&5 10623 10883 (eval $ac_try) 2>&5 10624 10884 ac_status=$? 10625 10885 - echo "$as_me:13707: \$? = $ac_status" >&5 10626 + echo "$as_me:140 54: \$? = $ac_status" >&510886 + echo "$as_me:14085: \$? = $ac_status" >&5 10627 10887 (exit $ac_status); }; }; then 10628 10888 ac_cv_type_signal=void 10629 10889 else 10630 @@ -13714,21 +140 61,21 @@10890 @@ -13714,21 +14092,21 @@ 10631 10891 fi 10632 10892 rm -f conftest.$ac_objext conftest.$ac_ext 10633 10893 fi 10634 10894 -echo "$as_me:13717: result: $ac_cv_type_signal" >&5 10635 +echo "$as_me:140 64: result: $ac_cv_type_signal" >&510895 +echo "$as_me:14095: result: $ac_cv_type_signal" >&5 10636 10896 echo "${ECHO_T}$ac_cv_type_signal" >&6 10637 10897 … … 10641 10901 10642 10902 -echo "$as_me:13724: checking for type sigaction_t" >&5 10643 +echo "$as_me:14 071: checking for type sigaction_t" >&510903 +echo "$as_me:14102: checking for type sigaction_t" >&5 10644 10904 echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6 10645 10905 if test "${cf_cv_type_sigaction+set}" = set; then … … 10649 10909 cat >conftest.$ac_ext <<_ACEOF 10650 10910 -#line 13731 "configure" 10651 +#line 14 078"configure"10911 +#line 14109 "configure" 10652 10912 #include "confdefs.h" 10653 10913 10654 10914 #include <signal.h> 10655 @@ -13741,16 +14 088,16 @@10915 @@ -13741,16 +14119,16 @@ 10656 10916 } 10657 10917 _ACEOF 10658 10918 rm -f conftest.$ac_objext 10659 10919 -if { (eval echo "$as_me:13744: \"$ac_compile\"") >&5 10660 +if { (eval echo "$as_me:14 091: \"$ac_compile\"") >&510920 +if { (eval echo "$as_me:14122: \"$ac_compile\"") >&5 10661 10921 (eval $ac_compile) 2>&5 10662 10922 ac_status=$? 10663 10923 - echo "$as_me:13747: \$? = $ac_status" >&5 10664 + echo "$as_me:14 094: \$? = $ac_status" >&510924 + echo "$as_me:14125: \$? = $ac_status" >&5 10665 10925 (exit $ac_status); } && 10666 10926 { ac_try='test -s conftest.$ac_objext' 10667 10927 - { (eval echo "$as_me:13750: \"$ac_try\"") >&5 10668 + { (eval echo "$as_me:14 097: \"$ac_try\"") >&510928 + { (eval echo "$as_me:14128: \"$ac_try\"") >&5 10669 10929 (eval $ac_try) 2>&5 10670 10930 ac_status=$? 10671 10931 - echo "$as_me:13753: \$? = $ac_status" >&5 10672 + echo "$as_me:141 00: \$? = $ac_status" >&510932 + echo "$as_me:14131: \$? = $ac_status" >&5 10673 10933 (exit $ac_status); }; }; then 10674 10934 cf_cv_type_sigaction=yes 10675 10935 else 10676 @@ -13761,13 +141 08,13 @@10936 @@ -13761,13 +14139,13 @@ 10677 10937 rm -f conftest.$ac_objext conftest.$ac_ext 10678 10938 fi 10679 10939 10680 10940 -echo "$as_me:13764: result: $cf_cv_type_sigaction" >&5 10681 +echo "$as_me:141 11: result: $cf_cv_type_sigaction" >&510941 +echo "$as_me:14142: result: $cf_cv_type_sigaction" >&5 10682 10942 echo "${ECHO_T}$cf_cv_type_sigaction" >&6 10683 10943 test "$cf_cv_type_sigaction" = yes && cat >>confdefs.h <<\EOF … … 10686 10946 10687 10947 -echo "$as_me:13770: checking declaration of size-change" >&5 10688 +echo "$as_me:141 17: checking declaration of size-change" >&510948 +echo "$as_me:14148: checking declaration of size-change" >&5 10689 10949 echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6 10690 10950 if test "${cf_cv_sizechange+set}" = set; then 10691 10951 echo $ECHO_N "(cached) $ECHO_C" >&6 10692 @@ -13782,7 +141 29,7 @@10952 @@ -13782,7 +14160,7 @@ 10693 10953 CPPFLAGS="$cf_save_CPPFLAGS" 10694 10954 test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" 10695 10955 cat >conftest.$ac_ext <<_ACEOF 10696 10956 -#line 13785 "configure" 10697 +#line 141 32"configure"10957 +#line 14163 "configure" 10698 10958 #include "confdefs.h" 10699 10959 #include <sys/types.h> 10700 10960 #ifdef HAVE_TERMIOS_H 10701 @@ -13826,16 +14 173,16 @@10961 @@ -13826,16 +14204,16 @@ 10702 10962 } 10703 10963 _ACEOF 10704 10964 rm -f conftest.$ac_objext 10705 10965 -if { (eval echo "$as_me:13829: \"$ac_compile\"") >&5 10706 +if { (eval echo "$as_me:14 176: \"$ac_compile\"") >&510966 +if { (eval echo "$as_me:14207: \"$ac_compile\"") >&5 10707 10967 (eval $ac_compile) 2>&5 10708 10968 ac_status=$? 10709 10969 - echo "$as_me:13832: \$? = $ac_status" >&5 10710 + echo "$as_me:14 179: \$? = $ac_status" >&510970 + echo "$as_me:14210: \$? = $ac_status" >&5 10711 10971 (exit $ac_status); } && 10712 10972 { ac_try='test -s conftest.$ac_objext' 10713 10973 - { (eval echo "$as_me:13835: \"$ac_try\"") >&5 10714 + { (eval echo "$as_me:14 182: \"$ac_try\"") >&510974 + { (eval echo "$as_me:14213: \"$ac_try\"") >&5 10715 10975 (eval $ac_try) 2>&5 10716 10976 ac_status=$? 10717 10977 - echo "$as_me:13838: \$? = $ac_status" >&5 10718 + echo "$as_me:14 185: \$? = $ac_status" >&510978 + echo "$as_me:14216: \$? = $ac_status" >&5 10719 10979 (exit $ac_status); }; }; then 10720 10980 cf_cv_sizechange=yes 10721 10981 else 10722 @@ -13854,7 +142 01,7 @@10982 @@ -13854,7 +14232,7 @@ 10723 10983 done 10724 10984 10725 10985 fi 10726 10986 -echo "$as_me:13857: result: $cf_cv_sizechange" >&5 10727 +echo "$as_me:142 04: result: $cf_cv_sizechange" >&510987 +echo "$as_me:14235: result: $cf_cv_sizechange" >&5 10728 10988 echo "${ECHO_T}$cf_cv_sizechange" >&6 10729 10989 if test "$cf_cv_sizechange" != no ; then 10730 10990 cat >>confdefs.h <<\EOF 10731 @@ -13871,13 +142 18,13 @@10991 @@ -13871,13 +14249,13 @@ 10732 10992 esac 10733 10993 fi 10734 10994 10735 10995 -echo "$as_me:13874: checking for memmove" >&5 10736 +echo "$as_me:142 21: checking for memmove" >&510996 +echo "$as_me:14252: checking for memmove" >&5 10737 10997 echo $ECHO_N "checking for memmove... $ECHO_C" >&6 10738 10998 if test "${ac_cv_func_memmove+set}" = set; then … … 10741 11001 cat >conftest.$ac_ext <<_ACEOF 10742 11002 -#line 13880 "configure" 10743 +#line 142 27"configure"11003 +#line 14258 "configure" 10744 11004 #include "confdefs.h" 10745 11005 /* System header to define __stub macros and hopefully few prototypes, 10746 11006 which can conflict with char memmove (); below. */ 10747 @@ -13908,16 +142 55,16 @@11007 @@ -13908,16 +14286,16 @@ 10748 11008 } 10749 11009 _ACEOF 10750 11010 rm -f conftest.$ac_objext conftest$ac_exeext 10751 11011 -if { (eval echo "$as_me:13911: \"$ac_link\"") >&5 10752 +if { (eval echo "$as_me:142 58: \"$ac_link\"") >&511012 +if { (eval echo "$as_me:14289: \"$ac_link\"") >&5 10753 11013 (eval $ac_link) 2>&5 10754 11014 ac_status=$? 10755 11015 - echo "$as_me:13914: \$? = $ac_status" >&5 10756 + echo "$as_me:142 61: \$? = $ac_status" >&511016 + echo "$as_me:14292: \$? = $ac_status" >&5 10757 11017 (exit $ac_status); } && 10758 11018 { ac_try='test -s conftest$ac_exeext' 10759 11019 - { (eval echo "$as_me:13917: \"$ac_try\"") >&5 10760 + { (eval echo "$as_me:142 64: \"$ac_try\"") >&511020 + { (eval echo "$as_me:14295: \"$ac_try\"") >&5 10761 11021 (eval $ac_try) 2>&5 10762 11022 ac_status=$? 10763 11023 - echo "$as_me:13920: \$? = $ac_status" >&5 10764 + echo "$as_me:142 67: \$? = $ac_status" >&511024 + echo "$as_me:14298: \$? = $ac_status" >&5 10765 11025 (exit $ac_status); }; }; then 10766 11026 ac_cv_func_memmove=yes 10767 11027 else 10768 @@ -13927,19 +14 274,19 @@11028 @@ -13927,19 +14305,19 @@ 10769 11029 fi 10770 11030 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 10771 11031 fi 10772 11032 -echo "$as_me:13930: result: $ac_cv_func_memmove" >&5 10773 +echo "$as_me:14 277: result: $ac_cv_func_memmove" >&511033 +echo "$as_me:14308: result: $ac_cv_func_memmove" >&5 10774 11034 echo "${ECHO_T}$ac_cv_func_memmove" >&6 10775 11035 if test $ac_cv_func_memmove = yes; then … … 10778 11038 10779 11039 -echo "$as_me:13936: checking for bcopy" >&5 10780 +echo "$as_me:14 283: checking for bcopy" >&511040 +echo "$as_me:14314: checking for bcopy" >&5 10781 11041 echo $ECHO_N "checking for bcopy... $ECHO_C" >&6 10782 11042 if test "${ac_cv_func_bcopy+set}" = set; then … … 10785 11045 cat >conftest.$ac_ext <<_ACEOF 10786 11046 -#line 13942 "configure" 10787 +#line 14 289"configure"11047 +#line 14320 "configure" 10788 11048 #include "confdefs.h" 10789 11049 /* System header to define __stub macros and hopefully few prototypes, 10790 11050 which can conflict with char bcopy (); below. */ 10791 @@ -13970,16 +143 17,16 @@11051 @@ -13970,16 +14348,16 @@ 10792 11052 } 10793 11053 _ACEOF 10794 11054 rm -f conftest.$ac_objext conftest$ac_exeext 10795 11055 -if { (eval echo "$as_me:13973: \"$ac_link\"") >&5 10796 +if { (eval echo "$as_me:143 20: \"$ac_link\"") >&511056 +if { (eval echo "$as_me:14351: \"$ac_link\"") >&5 10797 11057 (eval $ac_link) 2>&5 10798 11058 ac_status=$? 10799 11059 - echo "$as_me:13976: \$? = $ac_status" >&5 10800 + echo "$as_me:143 23: \$? = $ac_status" >&511060 + echo "$as_me:14354: \$? = $ac_status" >&5 10801 11061 (exit $ac_status); } && 10802 11062 { ac_try='test -s conftest$ac_exeext' 10803 11063 - { (eval echo "$as_me:13979: \"$ac_try\"") >&5 10804 + { (eval echo "$as_me:143 26: \"$ac_try\"") >&511064 + { (eval echo "$as_me:14357: \"$ac_try\"") >&5 10805 11065 (eval $ac_try) 2>&5 10806 11066 ac_status=$? 10807 11067 - echo "$as_me:13982: \$? = $ac_status" >&5 10808 + echo "$as_me:143 29: \$? = $ac_status" >&511068 + echo "$as_me:14360: \$? = $ac_status" >&5 10809 11069 (exit $ac_status); }; }; then 10810 11070 ac_cv_func_bcopy=yes 10811 11071 else 10812 @@ -13989,11 +143 36,11 @@11072 @@ -13989,11 +14367,11 @@ 10813 11073 fi 10814 11074 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 10815 11075 fi 10816 11076 -echo "$as_me:13992: result: $ac_cv_func_bcopy" >&5 10817 +echo "$as_me:143 39: result: $ac_cv_func_bcopy" >&511077 +echo "$as_me:14370: result: $ac_cv_func_bcopy" >&5 10818 11078 echo "${ECHO_T}$ac_cv_func_bcopy" >&6 10819 11079 if test $ac_cv_func_bcopy = yes; then 10820 11080 10821 11081 - echo "$as_me:13996: checking if bcopy does overlapping moves" >&5 10822 + echo "$as_me:143 43: checking if bcopy does overlapping moves" >&511082 + echo "$as_me:14374: checking if bcopy does overlapping moves" >&5 10823 11083 echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6 10824 11084 if test "${cf_cv_good_bcopy+set}" = set; then 10825 11085 echo $ECHO_N "(cached) $ECHO_C" >&6 10826 @@ -14003,7 +143 50,7 @@11086 @@ -14003,7 +14381,7 @@ 10827 11087 cf_cv_good_bcopy=unknown 10828 11088 else 10829 11089 cat >conftest.$ac_ext <<_ACEOF 10830 11090 -#line 14006 "configure" 10831 +#line 143 53"configure"11091 +#line 14384 "configure" 10832 11092 #include "confdefs.h" 10833 11093 10834 11094 int main() { 10835 @@ -14017,15 +143 64,15 @@11095 @@ -14017,15 +14395,15 @@ 10836 11096 10837 11097 _ACEOF 10838 11098 rm -f conftest$ac_exeext 10839 11099 -if { (eval echo "$as_me:14020: \"$ac_link\"") >&5 10840 +if { (eval echo "$as_me:143 67: \"$ac_link\"") >&511100 +if { (eval echo "$as_me:14398: \"$ac_link\"") >&5 10841 11101 (eval $ac_link) 2>&5 10842 11102 ac_status=$? 10843 11103 - echo "$as_me:14023: \$? = $ac_status" >&5 10844 + echo "$as_me:14 370: \$? = $ac_status" >&511104 + echo "$as_me:14401: \$? = $ac_status" >&5 10845 11105 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 10846 11106 - { (eval echo "$as_me:14025: \"$ac_try\"") >&5 10847 + { (eval echo "$as_me:14 372: \"$ac_try\"") >&511107 + { (eval echo "$as_me:14403: \"$ac_try\"") >&5 10848 11108 (eval $ac_try) 2>&5 10849 11109 ac_status=$? 10850 11110 - echo "$as_me:14028: \$? = $ac_status" >&5 10851 + echo "$as_me:14 375: \$? = $ac_status" >&511111 + echo "$as_me:14406: \$? = $ac_status" >&5 10852 11112 (exit $ac_status); }; }; then 10853 11113 cf_cv_good_bcopy=yes 10854 11114 else 10855 @@ -14038,7 +14 385,7 @@11115 @@ -14038,7 +14416,7 @@ 10856 11116 fi 10857 11117 10858 11118 fi 10859 11119 -echo "$as_me:14041: result: $cf_cv_good_bcopy" >&5 10860 +echo "$as_me:14 388: result: $cf_cv_good_bcopy" >&511120 +echo "$as_me:14419: result: $cf_cv_good_bcopy" >&5 10861 11121 echo "${ECHO_T}$cf_cv_good_bcopy" >&6 10862 11122 10863 11123 else 10864 @@ -14059,7 +144 06,7 @@11124 @@ -14059,7 +14437,7 @@ 10865 11125 10866 11126 fi 10867 11127 10868 11128 -echo "$as_me:14062: checking if poll really works" >&5 10869 +echo "$as_me:144 09: checking if poll really works" >&511129 +echo "$as_me:14440: checking if poll really works" >&5 10870 11130 echo $ECHO_N "checking if poll really works... $ECHO_C" >&6 10871 11131 if test "${cf_cv_working_poll+set}" = set; then 10872 11132 echo $ECHO_N "(cached) $ECHO_C" >&6 10873 @@ -14069,7 +144 16,7 @@11133 @@ -14069,7 +14447,7 @@ 10874 11134 cf_cv_working_poll=unknown 10875 11135 else 10876 11136 cat >conftest.$ac_ext <<_ACEOF 10877 11137 -#line 14072 "configure" 10878 +#line 144 19"configure"11138 +#line 14450 "configure" 10879 11139 #include "confdefs.h" 10880 11140 10881 11141 #include <stdio.h> 10882 @@ -14090,15 +144 37,15 @@11142 @@ -14090,15 +14468,15 @@ 10883 11143 } 10884 11144 _ACEOF 10885 11145 rm -f conftest$ac_exeext 10886 11146 -if { (eval echo "$as_me:14093: \"$ac_link\"") >&5 10887 +if { (eval echo "$as_me:144 40: \"$ac_link\"") >&511147 +if { (eval echo "$as_me:14471: \"$ac_link\"") >&5 10888 11148 (eval $ac_link) 2>&5 10889 11149 ac_status=$? 10890 11150 - echo "$as_me:14096: \$? = $ac_status" >&5 10891 + echo "$as_me:144 43: \$? = $ac_status" >&511151 + echo "$as_me:14474: \$? = $ac_status" >&5 10892 11152 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 10893 11153 - { (eval echo "$as_me:14098: \"$ac_try\"") >&5 10894 + { (eval echo "$as_me:144 45: \"$ac_try\"") >&511154 + { (eval echo "$as_me:14476: \"$ac_try\"") >&5 10895 11155 (eval $ac_try) 2>&5 10896 11156 ac_status=$? 10897 11157 - echo "$as_me:14101: \$? = $ac_status" >&5 10898 + echo "$as_me:144 48: \$? = $ac_status" >&511158 + echo "$as_me:14479: \$? = $ac_status" >&5 10899 11159 (exit $ac_status); }; }; then 10900 11160 cf_cv_working_poll=yes 10901 11161 else 10902 @@ -14110,7 +144 57,7 @@11162 @@ -14110,7 +14488,7 @@ 10903 11163 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 10904 11164 fi 10905 11165 fi 10906 11166 -echo "$as_me:14113: result: $cf_cv_working_poll" >&5 10907 +echo "$as_me:144 60: result: $cf_cv_working_poll" >&511167 +echo "$as_me:14491: result: $cf_cv_working_poll" >&5 10908 11168 echo "${ECHO_T}$cf_cv_working_poll" >&6 10909 11169 test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF 10910 11170 #define HAVE_WORKING_POLL 1 10911 @@ -14118,7 +144 65,7 @@11171 @@ -14118,7 +14496,7 @@ 10912 11172 10913 11173 # special check for test/ditto.c 10914 11174 10915 11175 -echo "$as_me:14121: checking for openpty in -lutil" >&5 10916 +echo "$as_me:144 68: checking for openpty in -lutil" >&511176 +echo "$as_me:14499: checking for openpty in -lutil" >&5 10917 11177 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 10918 11178 if test "${ac_cv_lib_util_openpty+set}" = set; then 10919 11179 echo $ECHO_N "(cached) $ECHO_C" >&6 10920 @@ -14126,7 +14 473,7 @@11180 @@ -14126,7 +14504,7 @@ 10921 11181 ac_check_lib_save_LIBS=$LIBS 10922 11182 LIBS="-lutil $LIBS" 10923 11183 cat >conftest.$ac_ext <<_ACEOF 10924 11184 -#line 14129 "configure" 10925 +#line 14 476"configure"11185 +#line 14507 "configure" 10926 11186 #include "confdefs.h" 10927 11187 10928 11188 /* Override any gcc2 internal prototype to avoid an error. */ 10929 @@ -14145,16 +14 492,16 @@11189 @@ -14145,16 +14523,16 @@ 10930 11190 } 10931 11191 _ACEOF 10932 11192 rm -f conftest.$ac_objext conftest$ac_exeext 10933 11193 -if { (eval echo "$as_me:14148: \"$ac_link\"") >&5 10934 +if { (eval echo "$as_me:14 495: \"$ac_link\"") >&511194 +if { (eval echo "$as_me:14526: \"$ac_link\"") >&5 10935 11195 (eval $ac_link) 2>&5 10936 11196 ac_status=$? 10937 11197 - echo "$as_me:14151: \$? = $ac_status" >&5 10938 + echo "$as_me:14 498: \$? = $ac_status" >&511198 + echo "$as_me:14529: \$? = $ac_status" >&5 10939 11199 (exit $ac_status); } && 10940 11200 { ac_try='test -s conftest$ac_exeext' 10941 11201 - { (eval echo "$as_me:14154: \"$ac_try\"") >&5 10942 + { (eval echo "$as_me:145 01: \"$ac_try\"") >&511202 + { (eval echo "$as_me:14532: \"$ac_try\"") >&5 10943 11203 (eval $ac_try) 2>&5 10944 11204 ac_status=$? 10945 11205 - echo "$as_me:14157: \$? = $ac_status" >&5 10946 + echo "$as_me:145 04: \$? = $ac_status" >&511206 + echo "$as_me:14535: \$? = $ac_status" >&5 10947 11207 (exit $ac_status); }; }; then 10948 11208 ac_cv_lib_util_openpty=yes 10949 11209 else 10950 @@ -14165,7 +145 12,7 @@11210 @@ -14165,7 +14543,7 @@ 10951 11211 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 10952 11212 LIBS=$ac_check_lib_save_LIBS 10953 11213 fi 10954 11214 -echo "$as_me:14168: result: $ac_cv_lib_util_openpty" >&5 10955 +echo "$as_me:145 15: result: $ac_cv_lib_util_openpty" >&511215 +echo "$as_me:14546: result: $ac_cv_lib_util_openpty" >&5 10956 11216 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 10957 11217 if test $ac_cv_lib_util_openpty = yes; then 10958 11218 cf_cv_lib_util=yes 10959 @@ -14173,7 +145 20,7 @@11219 @@ -14173,7 +14551,7 @@ 10960 11220 cf_cv_lib_util=no 10961 11221 fi 10962 11222 10963 11223 -echo "$as_me:14176: checking for openpty header" >&5 10964 +echo "$as_me:145 23: checking for openpty header" >&511224 +echo "$as_me:14554: checking for openpty header" >&5 10965 11225 echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 10966 11226 if test "${cf_cv_func_openpty+set}" = set; then 10967 11227 echo $ECHO_N "(cached) $ECHO_C" >&6 10968 @@ -14184,7 +145 31,7 @@11228 @@ -14184,7 +14562,7 @@ 10969 11229 for cf_header in pty.h libutil.h util.h 10970 11230 do 10971 11231 cat >conftest.$ac_ext <<_ACEOF 10972 11232 -#line 14187 "configure" 10973 +#line 145 34"configure"11233 +#line 14565 "configure" 10974 11234 #include "confdefs.h" 10975 11235 10976 11236 #include <$cf_header> 10977 @@ -14201,16 +145 48,16 @@11237 @@ -14201,16 +14579,16 @@ 10978 11238 } 10979 11239 _ACEOF 10980 11240 rm -f conftest.$ac_objext conftest$ac_exeext 10981 11241 -if { (eval echo "$as_me:14204: \"$ac_link\"") >&5 10982 +if { (eval echo "$as_me:145 51: \"$ac_link\"") >&511242 +if { (eval echo "$as_me:14582: \"$ac_link\"") >&5 10983 11243 (eval $ac_link) 2>&5 10984 11244 ac_status=$? 10985 11245 - echo "$as_me:14207: \$? = $ac_status" >&5 10986 + echo "$as_me:145 54: \$? = $ac_status" >&511246 + echo "$as_me:14585: \$? = $ac_status" >&5 10987 11247 (exit $ac_status); } && 10988 11248 { ac_try='test -s conftest$ac_exeext' 10989 11249 - { (eval echo "$as_me:14210: \"$ac_try\"") >&5 10990 + { (eval echo "$as_me:145 57: \"$ac_try\"") >&511250 + { (eval echo "$as_me:14588: \"$ac_try\"") >&5 10991 11251 (eval $ac_try) 2>&5 10992 11252 ac_status=$? 10993 11253 - echo "$as_me:14213: \$? = $ac_status" >&5 10994 + echo "$as_me:145 60: \$? = $ac_status" >&511254 + echo "$as_me:14591: \$? = $ac_status" >&5 10995 11255 (exit $ac_status); }; }; then 10996 11256 10997 11257 cf_cv_func_openpty=$cf_header 10998 @@ -14228,7 +14 575,7 @@11258 @@ -14228,7 +14606,7 @@ 10999 11259 LIBS="$cf_save_LIBS" 11000 11260 11001 11261 fi 11002 11262 -echo "$as_me:14231: result: $cf_cv_func_openpty" >&5 11003 +echo "$as_me:14 578: result: $cf_cv_func_openpty" >&511263 +echo "$as_me:14609: result: $cf_cv_func_openpty" >&5 11004 11264 echo "${ECHO_T}$cf_cv_func_openpty" >&6 11005 11265 11006 11266 if test "$cf_cv_func_openpty" != no ; then 11007 @@ -14274,13 +146 21,13 @@11267 @@ -14274,13 +14652,13 @@ 11008 11268 fi 11009 11269 … … 11017 11277 cat >conftest.$ac_ext <<_ACEOF 11018 11278 -#line 14283 "configure" 11019 +#line 146 30"configure"11279 +#line 14661 "configure" 11020 11280 #include "confdefs.h" 11021 11281 #include <stdio.h> 11022 11282 int 11023 @@ -14292,16 +146 39,16 @@11283 @@ -14292,16 +14670,16 @@ 11024 11284 } 11025 11285 _ACEOF 11026 11286 rm -f conftest.$ac_objext 11027 11287 -if { (eval echo "$as_me:14295: \"$ac_compile\"") >&5 11028 +if { (eval echo "$as_me:146 42: \"$ac_compile\"") >&511288 +if { (eval echo "$as_me:14673: \"$ac_compile\"") >&5 11029 11289 (eval $ac_compile) 2>&5 11030 11290 ac_status=$? 11031 11291 - echo "$as_me:14298: \$? = $ac_status" >&5 11032 + echo "$as_me:146 45: \$? = $ac_status" >&511292 + echo "$as_me:14676: \$? = $ac_status" >&5 11033 11293 (exit $ac_status); } && 11034 11294 { ac_try='test -s conftest.$ac_objext' 11035 11295 - { (eval echo "$as_me:14301: \"$ac_try\"") >&5 11036 + { (eval echo "$as_me:146 48: \"$ac_try\"") >&511296 + { (eval echo "$as_me:14679: \"$ac_try\"") >&5 11037 11297 (eval $ac_try) 2>&5 11038 11298 ac_status=$? 11039 11299 - echo "$as_me:14304: \$? = $ac_status" >&5 11040 + echo "$as_me:146 51: \$? = $ac_status" >&511300 + echo "$as_me:14682: \$? = $ac_status" >&5 11041 11301 (exit $ac_status); }; }; then 11042 11302 : 11043 11303 else 11044 @@ -14318,13 +146 65,13 @@11304 @@ -14318,13 +14696,13 @@ 11045 11305 if test "$cf_have_incdir" = no ; then 11046 11306 test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 11047 11307 11048 11308 -echo "${as_me-configure}:14321: testing adding $cf_add_incdir to include-path ..." 1>&5 11049 +echo "${as_me-configure}:14668: testing adding $cf_add_incdir to include-path ..." 1>&5 11050 11051 CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" 11309 +echo "${as_me-configure}:14699: testing adding $cf_add_incdir to include-path ..." 1>&5 11310 11311 - CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" 11312 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 11052 11313 11053 11314 - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` … … 11060 11321 break 11061 11322 fi 11062 @@ -14352,7 +14 699,7 @@11323 @@ -14352,7 +14730,7 @@ 11063 11324 if test "$cf_have_libdir" = no ; then 11064 11325 test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 11065 11326 11066 11327 -echo "${as_me-configure}:14355: testing adding $cf_add_libdir to library-path ..." 1>&5 11067 +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 11068 11329 11069 11330 LDFLAGS="-L$cf_add_libdir $LDFLAGS" 11070 11331 fi 11071 @@ -14363,23 +147 10,23 @@11332 @@ -14363,23 +14741,23 @@ 11072 11333 fi 11073 11334 esac 11074 11335 11075 11336 -echo "$as_me:14366: checking for db.h" >&5 11076 +echo "$as_me:147 13: checking for db.h" >&511337 +echo "$as_me:14744: checking for db.h" >&5 11077 11338 echo $ECHO_N "checking for db.h... $ECHO_C" >&6 11078 11339 if test "${ac_cv_header_db_h+set}" = set; then … … 11081 11342 cat >conftest.$ac_ext <<_ACEOF 11082 11343 -#line 14372 "configure" 11083 +#line 147 19"configure"11344 +#line 14750 "configure" 11084 11345 #include "confdefs.h" 11085 11346 #include <db.h> 11086 11347 _ACEOF 11087 11348 -if { (eval echo "$as_me:14376: \"$ac_cpp conftest.$ac_ext\"") >&5 11088 +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 11089 11350 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 11090 11351 ac_status=$? … … 11093 11354 cat conftest.err >&5 11094 11355 - echo "$as_me:14382: \$? = $ac_status" >&5 11095 + echo "$as_me:147 29: \$? = $ac_status" >&511356 + echo "$as_me:14760: \$? = $ac_status" >&5 11096 11357 (exit $ac_status); } >/dev/null; then 11097 11358 if test -s conftest.err; then 11098 11359 ac_cpp_err=$ac_c_preproc_warn_flag 11099 @@ -14398,11 +147 45,11 @@11360 @@ -14398,11 +14776,11 @@ 11100 11361 fi 11101 11362 rm -f conftest.err conftest.$ac_ext 11102 11363 fi 11103 11364 -echo "$as_me:14401: result: $ac_cv_header_db_h" >&5 11104 +echo "$as_me:147 48: result: $ac_cv_header_db_h" >&511365 +echo "$as_me:14779: result: $ac_cv_header_db_h" >&5 11105 11366 echo "${ECHO_T}$ac_cv_header_db_h" >&6 11106 11367 if test $ac_cv_header_db_h = yes; then 11107 11368 11108 11369 -echo "$as_me:14405: checking for version of db" >&5 11109 +echo "$as_me:147 52: checking for version of db" >&511370 +echo "$as_me:14783: checking for version of db" >&5 11110 11371 echo $ECHO_N "checking for version of db... $ECHO_C" >&6 11111 11372 if test "${cf_cv_hashed_db_version+set}" = set; then 11112 11373 echo $ECHO_N "(cached) $ECHO_C" >&6 11113 @@ -14413,10 +147 60,10 @@11374 @@ -14413,10 +14791,10 @@ 11114 11375 for cf_db_version in 1 2 3 4 5 11115 11376 do 11116 11377 11117 11378 -echo "${as_me-configure}:14416: testing checking for db version $cf_db_version ..." 1>&5 11118 +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 11119 11380 11120 11381 cat >conftest.$ac_ext <<_ACEOF 11121 11382 -#line 14419 "configure" 11122 +#line 147 66"configure"11383 +#line 14797 "configure" 11123 11384 #include "confdefs.h" 11124 11385 11125 11386 $ac_includes_default 11126 @@ -14446,16 +14 793,16 @@11387 @@ -14446,16 +14824,16 @@ 11127 11388 } 11128 11389 _ACEOF 11129 11390 rm -f conftest.$ac_objext 11130 11391 -if { (eval echo "$as_me:14449: \"$ac_compile\"") >&5 11131 +if { (eval echo "$as_me:14 796: \"$ac_compile\"") >&511392 +if { (eval echo "$as_me:14827: \"$ac_compile\"") >&5 11132 11393 (eval $ac_compile) 2>&5 11133 11394 ac_status=$? 11134 11395 - echo "$as_me:14452: \$? = $ac_status" >&5 11135 + echo "$as_me:14 799: \$? = $ac_status" >&511396 + echo "$as_me:14830: \$? = $ac_status" >&5 11136 11397 (exit $ac_status); } && 11137 11398 { ac_try='test -s conftest.$ac_objext' 11138 11399 - { (eval echo "$as_me:14455: \"$ac_try\"") >&5 11139 + { (eval echo "$as_me:148 02: \"$ac_try\"") >&511400 + { (eval echo "$as_me:14833: \"$ac_try\"") >&5 11140 11401 (eval $ac_try) 2>&5 11141 11402 ac_status=$? 11142 11403 - echo "$as_me:14458: \$? = $ac_status" >&5 11143 + echo "$as_me:148 05: \$? = $ac_status" >&511404 + echo "$as_me:14836: \$? = $ac_status" >&5 11144 11405 (exit $ac_status); }; }; then 11145 11406 11146 11407 cf_cv_hashed_db_version=$cf_db_version 11147 @@ -14469,16 +148 16,16 @@11408 @@ -14469,16 +14847,16 @@ 11148 11409 done 11149 11410 11150 11411 fi 11151 11412 -echo "$as_me:14472: result: $cf_cv_hashed_db_version" >&5 11152 +echo "$as_me:148 19: result: $cf_cv_hashed_db_version" >&511413 +echo "$as_me:14850: result: $cf_cv_hashed_db_version" >&5 11153 11414 echo "${ECHO_T}$cf_cv_hashed_db_version" >&6 11154 11415 11155 11416 if test "$cf_cv_hashed_db_version" = unknown ; then 11156 11417 - { { echo "$as_me:14476: error: Cannot determine version of db" >&5 11157 + { { echo "$as_me:148 23: error: Cannot determine version of db" >&511418 + { { echo "$as_me:14854: error: Cannot determine version of db" >&5 11158 11419 echo "$as_me: error: Cannot determine version of db" >&2;} 11159 11420 { (exit 1); exit 1; }; } … … 11161 11422 11162 11423 -echo "$as_me:14481: checking for db libraries" >&5 11163 +echo "$as_me:148 28: checking for db libraries" >&511424 +echo "$as_me:14859: checking for db libraries" >&5 11164 11425 echo $ECHO_N "checking for db libraries... $ECHO_C" >&6 11165 11426 if test "${cf_cv_hashed_db_libs+set}" = set; then 11166 11427 echo $ECHO_N "(cached) $ECHO_C" >&6 11167 @@ -14492,10 +148 39,10 @@11428 @@ -14492,10 +14870,10 @@ 11168 11429 LIBS="-l$cf_db_libs $LIBS" 11169 11430 fi 11170 11431 11171 11432 -echo "${as_me-configure}:14495: testing checking for library "$cf_db_libs" ..." 1>&5 11172 +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 11173 11434 11174 11435 cat >conftest.$ac_ext <<_ACEOF 11175 11436 -#line 14498 "configure" 11176 +#line 148 45"configure"11437 +#line 14876 "configure" 11177 11438 #include "confdefs.h" 11178 11439 11179 11440 $ac_includes_default 11180 @@ -14550,16 +14 897,16 @@11441 @@ -14550,16 +14928,16 @@ 11181 11442 } 11182 11443 _ACEOF 11183 11444 rm -f conftest.$ac_objext conftest$ac_exeext 11184 11445 -if { (eval echo "$as_me:14553: \"$ac_link\"") >&5 11185 +if { (eval echo "$as_me:149 00: \"$ac_link\"") >&511446 +if { (eval echo "$as_me:14931: \"$ac_link\"") >&5 11186 11447 (eval $ac_link) 2>&5 11187 11448 ac_status=$? 11188 11449 - echo "$as_me:14556: \$? = $ac_status" >&5 11189 + echo "$as_me:149 03: \$? = $ac_status" >&511450 + echo "$as_me:14934: \$? = $ac_status" >&5 11190 11451 (exit $ac_status); } && 11191 11452 { ac_try='test -s conftest$ac_exeext' 11192 11453 - { (eval echo "$as_me:14559: \"$ac_try\"") >&5 11193 + { (eval echo "$as_me:149 06: \"$ac_try\"") >&511454 + { (eval echo "$as_me:14937: \"$ac_try\"") >&5 11194 11455 (eval $ac_try) 2>&5 11195 11456 ac_status=$? 11196 11457 - echo "$as_me:14562: \$? = $ac_status" >&5 11197 + echo "$as_me:149 09: \$? = $ac_status" >&511458 + echo "$as_me:14940: \$? = $ac_status" >&5 11198 11459 (exit $ac_status); }; }; then 11199 11460 11200 11461 if test -n "$cf_db_libs" ; then 11201 @@ -14579,11 +149 26,11 @@11462 @@ -14579,11 +14957,11 @@ 11202 11463 done 11203 11464 11204 11465 fi 11205 11466 -echo "$as_me:14582: result: $cf_cv_hashed_db_libs" >&5 11206 +echo "$as_me:149 29: result: $cf_cv_hashed_db_libs" >&511467 +echo "$as_me:14960: result: $cf_cv_hashed_db_libs" >&5 11207 11468 echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6 11208 11469 11209 11470 if test "$cf_cv_hashed_db_libs" = unknown ; then 11210 11471 - { { echo "$as_me:14586: error: Cannot determine library for db" >&5 11211 + { { echo "$as_me:149 33: error: Cannot determine library for db" >&511472 + { { echo "$as_me:14964: error: Cannot determine library for db" >&5 11212 11473 echo "$as_me: error: Cannot determine library for db" >&2;} 11213 11474 { (exit 1); exit 1; }; } 11214 11475 elif test "$cf_cv_hashed_db_libs" != default ; then 11215 @@ -14593,7 +149 40,7 @@11476 @@ -14593,7 +14971,7 @@ 11216 11477 11217 11478 else 11218 11479 11219 11480 - { { echo "$as_me:14596: error: Cannot find db.h" >&5 11220 + { { echo "$as_me:149 43: error: Cannot find db.h" >&511481 + { { echo "$as_me:14974: error: Cannot find db.h" >&5 11221 11482 echo "$as_me: error: Cannot find db.h" >&2;} 11222 11483 { (exit 1); exit 1; }; } 11223 11484 11224 @@ -14608,7 +149 55,7 @@11485 @@ -14608,7 +14986,7 @@ 11225 11486 11226 11487 # Just in case, check if the C compiler has a bool type. 11227 11488 11228 11489 -echo "$as_me:14611: checking if we should include stdbool.h" >&5 11229 +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 11230 11491 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 11231 11492 11232 11493 if test "${cf_cv_header_stdbool_h+set}" = set; then 11233 @@ -14616,7 +149 63,7 @@11494 @@ -14616,7 +14994,7 @@ 11234 11495 else 11235 11496 11236 11497 cat >conftest.$ac_ext <<_ACEOF 11237 11498 -#line 14619 "configure" 11238 +#line 149 66"configure"11499 +#line 14997 "configure" 11239 11500 #include "confdefs.h" 11240 11501 11241 11502 int 11242 @@ -14628,23 +1 4975,23 @@11503 @@ -14628,23 +15006,23 @@ 11243 11504 } 11244 11505 _ACEOF 11245 11506 rm -f conftest.$ac_objext 11246 11507 -if { (eval echo "$as_me:14631: \"$ac_compile\"") >&5 11247 +if { (eval echo "$as_me:1 4978: \"$ac_compile\"") >&511508 +if { (eval echo "$as_me:15009: \"$ac_compile\"") >&5 11248 11509 (eval $ac_compile) 2>&5 11249 11510 ac_status=$? 11250 11511 - echo "$as_me:14634: \$? = $ac_status" >&5 11251 + echo "$as_me:1 4981: \$? = $ac_status" >&511512 + echo "$as_me:15012: \$? = $ac_status" >&5 11252 11513 (exit $ac_status); } && 11253 11514 { ac_try='test -s conftest.$ac_objext' 11254 11515 - { (eval echo "$as_me:14637: \"$ac_try\"") >&5 11255 + { (eval echo "$as_me:1 4984: \"$ac_try\"") >&511516 + { (eval echo "$as_me:15015: \"$ac_try\"") >&5 11256 11517 (eval $ac_try) 2>&5 11257 11518 ac_status=$? 11258 11519 - echo "$as_me:14640: \$? = $ac_status" >&5 11259 + echo "$as_me:1 4987: \$? = $ac_status" >&511520 + echo "$as_me:15018: \$? = $ac_status" >&5 11260 11521 (exit $ac_status); }; }; then 11261 11522 cf_cv_header_stdbool_h=0 … … 11265 11526 cat >conftest.$ac_ext <<_ACEOF 11266 11527 -#line 14647 "configure" 11267 +#line 1 4994"configure"11528 +#line 15025 "configure" 11268 11529 #include "confdefs.h" 11269 11530 11270 11531 #ifndef __BEOS__ 11271 @@ -14660,16 +150 07,16 @@11532 @@ -14660,16 +15038,16 @@ 11272 11533 } 11273 11534 _ACEOF 11274 11535 rm -f conftest.$ac_objext 11275 11536 -if { (eval echo "$as_me:14663: \"$ac_compile\"") >&5 11276 +if { (eval echo "$as_me:150 10: \"$ac_compile\"") >&511537 +if { (eval echo "$as_me:15041: \"$ac_compile\"") >&5 11277 11538 (eval $ac_compile) 2>&5 11278 11539 ac_status=$? 11279 11540 - echo "$as_me:14666: \$? = $ac_status" >&5 11280 + echo "$as_me:150 13: \$? = $ac_status" >&511541 + echo "$as_me:15044: \$? = $ac_status" >&5 11281 11542 (exit $ac_status); } && 11282 11543 { ac_try='test -s conftest.$ac_objext' 11283 11544 - { (eval echo "$as_me:14669: \"$ac_try\"") >&5 11284 + { (eval echo "$as_me:150 16: \"$ac_try\"") >&511545 + { (eval echo "$as_me:15047: \"$ac_try\"") >&5 11285 11546 (eval $ac_try) 2>&5 11286 11547 ac_status=$? 11287 11548 - echo "$as_me:14672: \$? = $ac_status" >&5 11288 + echo "$as_me:150 19: \$? = $ac_status" >&511549 + echo "$as_me:15050: \$? = $ac_status" >&5 11289 11550 (exit $ac_status); }; }; then 11290 11551 cf_cv_header_stdbool_h=1 11291 11552 else 11292 @@ -14683,13 +150 30,13 @@11553 @@ -14683,13 +15061,13 @@ 11293 11554 fi 11294 11555 11295 11556 if test "$cf_cv_header_stdbool_h" = 1 11296 11557 -then echo "$as_me:14686: result: yes" >&5 11297 +then echo "$as_me:150 33: result: yes" >&511558 +then echo "$as_me:15064: result: yes" >&5 11298 11559 echo "${ECHO_T}yes" >&6 11299 11560 -else echo "$as_me:14688: result: no" >&5 11300 +else echo "$as_me:150 35: result: no" >&511561 +else echo "$as_me:15066: result: no" >&5 11301 11562 echo "${ECHO_T}no" >&6 11302 11563 fi 11303 11564 11304 11565 -echo "$as_me:14692: checking for builtin bool type" >&5 11305 +echo "$as_me:150 39: checking for builtin bool type" >&511566 +echo "$as_me:15070: checking for builtin bool type" >&5 11306 11567 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 11307 11568 11308 11569 if test "${cf_cv_cc_bool_type+set}" = set; then 11309 @@ -14697,7 +150 44,7 @@11570 @@ -14697,7 +15075,7 @@ 11310 11571 else 11311 11572 11312 11573 cat >conftest.$ac_ext <<_ACEOF 11313 11574 -#line 14700 "configure" 11314 +#line 150 47"configure"11575 +#line 15078 "configure" 11315 11576 #include "confdefs.h" 11316 11577 11317 11578 #include <stdio.h> 11318 @@ -14712,16 +150 59,16 @@11579 @@ -14712,16 +15090,16 @@ 11319 11580 } 11320 11581 _ACEOF 11321 11582 rm -f conftest.$ac_objext 11322 11583 -if { (eval echo "$as_me:14715: \"$ac_compile\"") >&5 11323 +if { (eval echo "$as_me:150 62: \"$ac_compile\"") >&511584 +if { (eval echo "$as_me:15093: \"$ac_compile\"") >&5 11324 11585 (eval $ac_compile) 2>&5 11325 11586 ac_status=$? 11326 11587 - echo "$as_me:14718: \$? = $ac_status" >&5 11327 + echo "$as_me:150 65: \$? = $ac_status" >&511588 + echo "$as_me:15096: \$? = $ac_status" >&5 11328 11589 (exit $ac_status); } && 11329 11590 { ac_try='test -s conftest.$ac_objext' 11330 11591 - { (eval echo "$as_me:14721: \"$ac_try\"") >&5 11331 + { (eval echo "$as_me:150 68: \"$ac_try\"") >&511592 + { (eval echo "$as_me:15099: \"$ac_try\"") >&5 11332 11593 (eval $ac_try) 2>&5 11333 11594 ac_status=$? 11334 11595 - echo "$as_me:14724: \$? = $ac_status" >&5 11335 + echo "$as_me:15 071: \$? = $ac_status" >&511596 + echo "$as_me:15102: \$? = $ac_status" >&5 11336 11597 (exit $ac_status); }; }; then 11337 11598 cf_cv_cc_bool_type=1 11338 11599 else 11339 @@ -14734,9 +15 081,9 @@11600 @@ -14734,9 +15112,9 @@ 11340 11601 fi 11341 11602 11342 11603 if test "$cf_cv_cc_bool_type" = 1 11343 11604 -then echo "$as_me:14737: result: yes" >&5 11344 +then echo "$as_me:15 084: result: yes" >&511605 +then echo "$as_me:15115: result: yes" >&5 11345 11606 echo "${ECHO_T}yes" >&6 11346 11607 -else echo "$as_me:14739: result: no" >&5 11347 +else echo "$as_me:15 086: result: no" >&511608 +else echo "$as_me:15117: result: no" >&5 11348 11609 echo "${ECHO_T}no" >&6 11349 11610 fi 11350 11611 11351 @@ -14758,7 +151 05,7 @@11612 @@ -14758,7 +15136,7 @@ 11352 11613 cf_stdcpp_libname=stdc++ 11353 11614 ;; 11354 11615 esac 11355 11616 -echo "$as_me:14761: checking for library $cf_stdcpp_libname" >&5 11356 +echo "$as_me:151 08: checking for library $cf_stdcpp_libname" >&511617 +echo "$as_me:15139: checking for library $cf_stdcpp_libname" >&5 11357 11618 echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6 11358 11619 if test "${cf_cv_libstdcpp+set}" = set; then 11359 11620 echo $ECHO_N "(cached) $ECHO_C" >&6 11360 @@ -14767,7 +151 14,7 @@11621 @@ -14767,7 +15145,7 @@ 11361 11622 cf_save="$LIBS" 11362 11623 LIBS="$LIBS -l$cf_stdcpp_libname" 11363 11624 cat >conftest.$ac_ext <<_ACEOF 11364 11625 -#line 14770 "configure" 11365 +#line 151 17"configure"11626 +#line 15148 "configure" 11366 11627 #include "confdefs.h" 11367 11628 11368 11629 #include <strstream.h> 11369 @@ -14783,16 +151 30,16 @@11630 @@ -14783,16 +15161,16 @@ 11370 11631 } 11371 11632 _ACEOF 11372 11633 rm -f conftest.$ac_objext conftest$ac_exeext 11373 11634 -if { (eval echo "$as_me:14786: \"$ac_link\"") >&5 11374 +if { (eval echo "$as_me:151 33: \"$ac_link\"") >&511635 +if { (eval echo "$as_me:15164: \"$ac_link\"") >&5 11375 11636 (eval $ac_link) 2>&5 11376 11637 ac_status=$? 11377 11638 - echo "$as_me:14789: \$? = $ac_status" >&5 11378 + echo "$as_me:151 36: \$? = $ac_status" >&511639 + echo "$as_me:15167: \$? = $ac_status" >&5 11379 11640 (exit $ac_status); } && 11380 11641 { ac_try='test -s conftest$ac_exeext' 11381 11642 - { (eval echo "$as_me:14792: \"$ac_try\"") >&5 11382 + { (eval echo "$as_me:151 39: \"$ac_try\"") >&511643 + { (eval echo "$as_me:15170: \"$ac_try\"") >&5 11383 11644 (eval $ac_try) 2>&5 11384 11645 ac_status=$? 11385 11646 - echo "$as_me:14795: \$? = $ac_status" >&5 11386 + echo "$as_me:151 42: \$? = $ac_status" >&511647 + echo "$as_me:15173: \$? = $ac_status" >&5 11387 11648 (exit $ac_status); }; }; then 11388 11649 cf_cv_libstdcpp=yes 11389 11650 else 11390 @@ -14804,12 +151 51,12 @@11651 @@ -14804,12 +15182,12 @@ 11391 11652 LIBS="$cf_save" 11392 11653 11393 11654 fi 11394 11655 -echo "$as_me:14807: result: $cf_cv_libstdcpp" >&5 11395 +echo "$as_me:151 54: result: $cf_cv_libstdcpp" >&511656 +echo "$as_me:15185: result: $cf_cv_libstdcpp" >&5 11396 11657 echo "${ECHO_T}$cf_cv_libstdcpp" >&6 11397 11658 test "$cf_cv_libstdcpp" = yes && CXXLIBS="$CXXLIBS -l$cf_stdcpp_libname" … … 11399 11660 11400 11661 - echo "$as_me:14812: checking whether $CXX understands -c and -o together" >&5 11401 + 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 11402 11663 echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6 11403 11664 if test "${cf_cv_prog_CXX_c_o+set}" = set; then 11404 11665 echo $ECHO_N "(cached) $ECHO_C" >&6 11405 @@ -14825,15 +15 172,15 @@11666 @@ -14825,15 +15203,15 @@ 11406 11667 # We do the test twice because some compilers refuse to overwrite an 11407 11668 # existing .o file with -o, though they will create one. 11408 11669 ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5' 11409 11670 -if { (eval echo "$as_me:14828: \"$ac_try\"") >&5 11410 +if { (eval echo "$as_me:15 175: \"$ac_try\"") >&511671 +if { (eval echo "$as_me:15206: \"$ac_try\"") >&5 11411 11672 (eval $ac_try) 2>&5 11412 11673 ac_status=$? 11413 11674 - echo "$as_me:14831: \$? = $ac_status" >&5 11414 + echo "$as_me:15 178: \$? = $ac_status" >&511675 + echo "$as_me:15209: \$? = $ac_status" >&5 11415 11676 (exit $ac_status); } && 11416 11677 - test -f conftest2.$ac_objext && { (eval echo "$as_me:14833: \"$ac_try\"") >&5 11417 + 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 11418 11679 (eval $ac_try) 2>&5 11419 11680 ac_status=$? 11420 11681 - echo "$as_me:14836: \$? = $ac_status" >&5 11421 + echo "$as_me:15 183: \$? = $ac_status" >&511682 + echo "$as_me:15214: \$? = $ac_status" >&5 11422 11683 (exit $ac_status); }; 11423 11684 then 11424 11685 eval cf_cv_prog_CXX_c_o=yes 11425 @@ -14844,10 +15 191,10 @@11686 @@ -14844,10 +15222,10 @@ 11426 11687 11427 11688 fi 11428 11689 if test $cf_cv_prog_CXX_c_o = yes; then 11429 11690 - echo "$as_me:14847: result: yes" >&5 11430 + echo "$as_me:15 194: result: yes" >&511691 + echo "$as_me:15225: result: yes" >&5 11431 11692 echo "${ECHO_T}yes" >&6 11432 11693 else 11433 11694 - echo "$as_me:14850: result: no" >&5 11434 + echo "$as_me:15 197: result: no" >&511695 + echo "$as_me:15228: result: no" >&5 11435 11696 echo "${ECHO_T}no" >&6 11436 11697 fi 11437 11698 11438 @@ -14867,12 +152 14,12 @@11699 @@ -14867,12 +15245,12 @@ 11439 11700 ;; 11440 11701 esac 11441 11702 if test "$GXX" = yes; then 11442 11703 - echo "$as_me:14870: checking for lib$cf_gpp_libname" >&5 11443 + echo "$as_me:152 17: checking for lib$cf_gpp_libname" >&511704 + echo "$as_me:15248: checking for lib$cf_gpp_libname" >&5 11444 11705 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 11445 11706 cf_save="$LIBS" … … 11447 11708 cat >conftest.$ac_ext <<_ACEOF 11448 11709 -#line 14875 "configure" 11449 +#line 152 22"configure"11710 +#line 15253 "configure" 11450 11711 #include "confdefs.h" 11451 11712 11452 11713 #include <$cf_gpp_libname/builtin.h> 11453 @@ -14886,16 +152 33,16 @@11714 @@ -14886,16 +15264,16 @@ 11454 11715 } 11455 11716 _ACEOF 11456 11717 rm -f conftest.$ac_objext conftest$ac_exeext 11457 11718 -if { (eval echo "$as_me:14889: \"$ac_link\"") >&5 11458 +if { (eval echo "$as_me:152 36: \"$ac_link\"") >&511719 +if { (eval echo "$as_me:15267: \"$ac_link\"") >&5 11459 11720 (eval $ac_link) 2>&5 11460 11721 ac_status=$? 11461 11722 - echo "$as_me:14892: \$? = $ac_status" >&5 11462 + echo "$as_me:152 39: \$? = $ac_status" >&511723 + echo "$as_me:15270: \$? = $ac_status" >&5 11463 11724 (exit $ac_status); } && 11464 11725 { ac_try='test -s conftest$ac_exeext' 11465 11726 - { (eval echo "$as_me:14895: \"$ac_try\"") >&5 11466 + { (eval echo "$as_me:152 42: \"$ac_try\"") >&511727 + { (eval echo "$as_me:15273: \"$ac_try\"") >&5 11467 11728 (eval $ac_try) 2>&5 11468 11729 ac_status=$? 11469 11730 - echo "$as_me:14898: \$? = $ac_status" >&5 11470 + echo "$as_me:152 45: \$? = $ac_status" >&511731 + echo "$as_me:15276: \$? = $ac_status" >&5 11471 11732 (exit $ac_status); }; }; then 11472 11733 cf_cxx_library=yes 11473 11734 CXXLIBS="$CXXLIBS -l$cf_gpp_libname" 11474 @@ -14914,7 +152 61,7 @@11735 @@ -14914,7 +15292,7 @@ 11475 11736 echo "$as_me: failed program was:" >&5 11476 11737 cat conftest.$ac_ext >&5 11477 11738 cat >conftest.$ac_ext <<_ACEOF 11478 11739 -#line 14917 "configure" 11479 +#line 152 64"configure"11740 +#line 15295 "configure" 11480 11741 #include "confdefs.h" 11481 11742 11482 11743 #include <builtin.h> 11483 @@ -14928,16 +15 275,16 @@11744 @@ -14928,16 +15306,16 @@ 11484 11745 } 11485 11746 _ACEOF 11486 11747 rm -f conftest.$ac_objext conftest$ac_exeext 11487 11748 -if { (eval echo "$as_me:14931: \"$ac_link\"") >&5 11488 +if { (eval echo "$as_me:15 278: \"$ac_link\"") >&511749 +if { (eval echo "$as_me:15309: \"$ac_link\"") >&5 11489 11750 (eval $ac_link) 2>&5 11490 11751 ac_status=$? 11491 11752 - echo "$as_me:14934: \$? = $ac_status" >&5 11492 + echo "$as_me:15 281: \$? = $ac_status" >&511753 + echo "$as_me:15312: \$? = $ac_status" >&5 11493 11754 (exit $ac_status); } && 11494 11755 { ac_try='test -s conftest$ac_exeext' 11495 11756 - { (eval echo "$as_me:14937: \"$ac_try\"") >&5 11496 + { (eval echo "$as_me:15 284: \"$ac_try\"") >&511757 + { (eval echo "$as_me:15315: \"$ac_try\"") >&5 11497 11758 (eval $ac_try) 2>&5 11498 11759 ac_status=$? 11499 11760 - echo "$as_me:14940: \$? = $ac_status" >&5 11500 + echo "$as_me:15 287: \$? = $ac_status" >&511761 + echo "$as_me:15318: \$? = $ac_status" >&5 11501 11762 (exit $ac_status); }; }; then 11502 11763 cf_cxx_library=yes 11503 11764 CXXLIBS="$CXXLIBS -l$cf_gpp_libname" 11504 @@ -14954,7 +153 01,7 @@11765 @@ -14954,7 +15332,7 @@ 11505 11766 fi 11506 11767 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 11507 11768 LIBS="$cf_save" 11508 11769 - echo "$as_me:14957: result: $cf_cxx_library" >&5 11509 + echo "$as_me:153 04: result: $cf_cxx_library" >&511770 + echo "$as_me:15335: result: $cf_cxx_library" >&5 11510 11771 echo "${ECHO_T}$cf_cxx_library" >&6 11511 11772 fi 11512 11773 11513 @@ -14970,7 +153 17,7 @@11774 @@ -14970,7 +15348,7 @@ 11514 11775 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 11515 11776 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 11516 11777 ac_main_return=return 11517 11778 -echo "$as_me:14973: checking how to run the C++ preprocessor" >&5 11518 +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 11519 11780 echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 11520 11781 if test -z "$CXXCPP"; then 11521 11782 if test "${ac_cv_prog_CXXCPP+set}" = set; then 11522 @@ -14987,18 +153 34,18 @@11783 @@ -14987,18 +15365,18 @@ 11523 11784 # On the NeXT, cc -E runs the code through the compiler's parser, 11524 11785 # not just through cpp. "Syntax error" is here to catch this case. 11525 11786 cat >conftest.$ac_ext <<_ACEOF 11526 11787 -#line 14990 "configure" 11527 +#line 153 37"configure"11788 +#line 15368 "configure" 11528 11789 #include "confdefs.h" 11529 11790 #include <assert.h> … … 11531 11792 _ACEOF 11532 11793 -if { (eval echo "$as_me:14995: \"$ac_cpp conftest.$ac_ext\"") >&5 11533 +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 11534 11795 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 11535 11796 ac_status=$? … … 11538 11799 cat conftest.err >&5 11539 11800 - echo "$as_me:15001: \$? = $ac_status" >&5 11540 + echo "$as_me:153 48: \$? = $ac_status" >&511801 + echo "$as_me:15379: \$? = $ac_status" >&5 11541 11802 (exit $ac_status); } >/dev/null; then 11542 11803 if test -s conftest.err; then 11543 11804 ac_cpp_err=$ac_cxx_preproc_warn_flag 11544 @@ -15021,17 +153 68,17 @@11805 @@ -15021,17 +15399,17 @@ 11545 11806 # OK, works on sane cases. Now check whether non-existent headers 11546 11807 # can be detected and how. 11547 11808 cat >conftest.$ac_ext <<_ACEOF 11548 11809 -#line 15024 "configure" 11549 +#line 15 371"configure"11810 +#line 15402 "configure" 11550 11811 #include "confdefs.h" 11551 11812 #include <ac_nonexistent.h> 11552 11813 _ACEOF 11553 11814 -if { (eval echo "$as_me:15028: \"$ac_cpp conftest.$ac_ext\"") >&5 11554 +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 11555 11816 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 11556 11817 ac_status=$? … … 11559 11820 cat conftest.err >&5 11560 11821 - echo "$as_me:15034: \$? = $ac_status" >&5 11561 + echo "$as_me:15 381: \$? = $ac_status" >&511822 + echo "$as_me:15412: \$? = $ac_status" >&5 11562 11823 (exit $ac_status); } >/dev/null; then 11563 11824 if test -s conftest.err; then 11564 11825 ac_cpp_err=$ac_cxx_preproc_warn_flag 11565 @@ -15068,7 +154 15,7 @@11826 @@ -15068,7 +15446,7 @@ 11566 11827 else 11567 11828 ac_cv_prog_CXXCPP=$CXXCPP 11568 11829 fi 11569 11830 -echo "$as_me:15071: result: $CXXCPP" >&5 11570 +echo "$as_me:154 18: result: $CXXCPP" >&511831 +echo "$as_me:15449: result: $CXXCPP" >&5 11571 11832 echo "${ECHO_T}$CXXCPP" >&6 11572 11833 ac_preproc_ok=false 11573 11834 for ac_cxx_preproc_warn_flag in '' yes 11574 @@ -15078,18 +154 25,18 @@11835 @@ -15078,18 +15456,18 @@ 11575 11836 # On the NeXT, cc -E runs the code through the compiler's parser, 11576 11837 # not just through cpp. "Syntax error" is here to catch this case. 11577 11838 cat >conftest.$ac_ext <<_ACEOF 11578 11839 -#line 15081 "configure" 11579 +#line 154 28"configure"11840 +#line 15459 "configure" 11580 11841 #include "confdefs.h" 11581 11842 #include <assert.h> … … 11583 11844 _ACEOF 11584 11845 -if { (eval echo "$as_me:15086: \"$ac_cpp conftest.$ac_ext\"") >&5 11585 +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 11586 11847 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 11587 11848 ac_status=$? … … 11590 11851 cat conftest.err >&5 11591 11852 - echo "$as_me:15092: \$? = $ac_status" >&5 11592 + echo "$as_me:154 39: \$? = $ac_status" >&511853 + echo "$as_me:15470: \$? = $ac_status" >&5 11593 11854 (exit $ac_status); } >/dev/null; then 11594 11855 if test -s conftest.err; then 11595 11856 ac_cpp_err=$ac_cxx_preproc_warn_flag 11596 @@ -15112,17 +154 59,17 @@11857 @@ -15112,17 +15490,17 @@ 11597 11858 # OK, works on sane cases. Now check whether non-existent headers 11598 11859 # can be detected and how. 11599 11860 cat >conftest.$ac_ext <<_ACEOF 11600 11861 -#line 15115 "configure" 11601 +#line 154 62"configure"11862 +#line 15493 "configure" 11602 11863 #include "confdefs.h" 11603 11864 #include <ac_nonexistent.h> 11604 11865 _ACEOF 11605 11866 -if { (eval echo "$as_me:15119: \"$ac_cpp conftest.$ac_ext\"") >&5 11606 +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 11607 11868 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 11608 11869 ac_status=$? … … 11611 11872 cat conftest.err >&5 11612 11873 - echo "$as_me:15125: \$? = $ac_status" >&5 11613 + echo "$as_me:15 472: \$? = $ac_status" >&511874 + echo "$as_me:15503: \$? = $ac_status" >&5 11614 11875 (exit $ac_status); } >/dev/null; then 11615 11876 if test -s conftest.err; then 11616 11877 ac_cpp_err=$ac_cxx_preproc_warn_flag 11617 @@ -15150,7 +15 497,7 @@11878 @@ -15150,7 +15528,7 @@ 11618 11879 if $ac_preproc_ok; then 11619 11880 : 11620 11881 else 11621 11882 - { { echo "$as_me:15153: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 11622 + { { 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 11623 11884 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} 11624 11885 { (exit 1); exit 1; }; } 11625 11886 fi 11626 @@ -15165,23 +155 12,23 @@11887 @@ -15165,23 +15543,23 @@ 11627 11888 for ac_header in iostream typeinfo 11628 11889 do 11629 11890 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 11630 11891 -echo "$as_me:15168: checking for $ac_header" >&5 11631 +echo "$as_me:155 15: checking for $ac_header" >&511892 +echo "$as_me:15546: checking for $ac_header" >&5 11632 11893 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 11633 11894 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 11636 11897 cat >conftest.$ac_ext <<_ACEOF 11637 11898 -#line 15174 "configure" 11638 +#line 155 21"configure"11899 +#line 15552 "configure" 11639 11900 #include "confdefs.h" 11640 11901 #include <$ac_header> 11641 11902 _ACEOF 11642 11903 -if { (eval echo "$as_me:15178: \"$ac_cpp conftest.$ac_ext\"") >&5 11643 +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 11644 11905 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 11645 11906 ac_status=$? … … 11648 11909 cat conftest.err >&5 11649 11910 - echo "$as_me:15184: \$? = $ac_status" >&5 11650 + echo "$as_me:155 31: \$? = $ac_status" >&511911 + echo "$as_me:15562: \$? = $ac_status" >&5 11651 11912 (exit $ac_status); } >/dev/null; then 11652 11913 if test -s conftest.err; then 11653 11914 ac_cpp_err=$ac_cxx_preproc_warn_flag 11654 @@ -15200,7 +155 47,7 @@11915 @@ -15200,7 +15578,7 @@ 11655 11916 fi 11656 11917 rm -f conftest.err conftest.$ac_ext 11657 11918 fi 11658 11919 -echo "$as_me:15203: result: `eval echo '${'$as_ac_Header'}'`" >&5 11659 +echo "$as_me:155 50: result: `eval echo '${'$as_ac_Header'}'`" >&511920 +echo "$as_me:15581: result: `eval echo '${'$as_ac_Header'}'`" >&5 11660 11921 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 11661 11922 if test `eval echo '${'$as_ac_Header'}'` = yes; then 11662 11923 cat >>confdefs.h <<EOF 11663 @@ -15211,10 +155 58,10 @@11924 @@ -15211,10 +15589,10 @@ 11664 11925 done 11665 11926 11666 11927 if test x"$ac_cv_header_iostream" = xyes ; then 11667 11928 - echo "$as_me:15214: checking if iostream uses std-namespace" >&5 11668 + echo "$as_me:155 61: checking if iostream uses std-namespace" >&511929 + echo "$as_me:15592: checking if iostream uses std-namespace" >&5 11669 11930 echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6 11670 11931 cat >conftest.$ac_ext <<_ACEOF 11671 11932 -#line 15217 "configure" 11672 +#line 155 64"configure"11933 +#line 15595 "configure" 11673 11934 #include "confdefs.h" 11674 11935 11675 11936 #include <iostream> 11676 @@ -15231,16 +15 578,16 @@11937 @@ -15231,16 +15609,16 @@ 11677 11938 } 11678 11939 _ACEOF 11679 11940 rm -f conftest.$ac_objext 11680 11941 -if { (eval echo "$as_me:15234: \"$ac_compile\"") >&5 11681 +if { (eval echo "$as_me:15 581: \"$ac_compile\"") >&511942 +if { (eval echo "$as_me:15612: \"$ac_compile\"") >&5 11682 11943 (eval $ac_compile) 2>&5 11683 11944 ac_status=$? 11684 11945 - echo "$as_me:15237: \$? = $ac_status" >&5 11685 + echo "$as_me:15 584: \$? = $ac_status" >&511946 + echo "$as_me:15615: \$? = $ac_status" >&5 11686 11947 (exit $ac_status); } && 11687 11948 { ac_try='test -s conftest.$ac_objext' 11688 11949 - { (eval echo "$as_me:15240: \"$ac_try\"") >&5 11689 + { (eval echo "$as_me:15 587: \"$ac_try\"") >&511950 + { (eval echo "$as_me:15618: \"$ac_try\"") >&5 11690 11951 (eval $ac_try) 2>&5 11691 11952 ac_status=$? 11692 11953 - echo "$as_me:15243: \$? = $ac_status" >&5 11693 + echo "$as_me:15 590: \$? = $ac_status" >&511954 + echo "$as_me:15621: \$? = $ac_status" >&5 11694 11955 (exit $ac_status); }; }; then 11695 11956 cf_iostream_namespace=yes 11696 11957 else 11697 @@ -15249,7 +15 596,7 @@11958 @@ -15249,7 +15627,7 @@ 11698 11959 cf_iostream_namespace=no 11699 11960 fi 11700 11961 rm -f conftest.$ac_objext conftest.$ac_ext 11701 11962 - echo "$as_me:15252: result: $cf_iostream_namespace" >&5 11702 + echo "$as_me:15 599: result: $cf_iostream_namespace" >&511963 + echo "$as_me:15630: result: $cf_iostream_namespace" >&5 11703 11964 echo "${ECHO_T}$cf_iostream_namespace" >&6 11704 11965 if test "$cf_iostream_namespace" = yes ; then 11705 11966 cat >>confdefs.h <<\EOF 11706 @@ -15259,7 +156 06,7 @@11967 @@ -15259,7 +15637,7 @@ 11707 11968 fi 11708 11969 fi 11709 11970 11710 11971 -echo "$as_me:15262: checking if we should include stdbool.h" >&5 11711 +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 11712 11973 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 11713 11974 11714 11975 if test "${cf_cv_header_stdbool_h+set}" = set; then 11715 @@ -15267,7 +156 14,7 @@11976 @@ -15267,7 +15645,7 @@ 11716 11977 else 11717 11978 11718 11979 cat >conftest.$ac_ext <<_ACEOF 11719 11980 -#line 15270 "configure" 11720 +#line 156 17"configure"11981 +#line 15648 "configure" 11721 11982 #include "confdefs.h" 11722 11983 11723 11984 int 11724 @@ -15279,23 +156 26,23 @@11985 @@ -15279,23 +15657,23 @@ 11725 11986 } 11726 11987 _ACEOF 11727 11988 rm -f conftest.$ac_objext 11728 11989 -if { (eval echo "$as_me:15282: \"$ac_compile\"") >&5 11729 +if { (eval echo "$as_me:156 29: \"$ac_compile\"") >&511990 +if { (eval echo "$as_me:15660: \"$ac_compile\"") >&5 11730 11991 (eval $ac_compile) 2>&5 11731 11992 ac_status=$? 11732 11993 - echo "$as_me:15285: \$? = $ac_status" >&5 11733 + echo "$as_me:156 32: \$? = $ac_status" >&511994 + echo "$as_me:15663: \$? = $ac_status" >&5 11734 11995 (exit $ac_status); } && 11735 11996 { ac_try='test -s conftest.$ac_objext' 11736 11997 - { (eval echo "$as_me:15288: \"$ac_try\"") >&5 11737 + { (eval echo "$as_me:156 35: \"$ac_try\"") >&511998 + { (eval echo "$as_me:15666: \"$ac_try\"") >&5 11738 11999 (eval $ac_try) 2>&5 11739 12000 ac_status=$? 11740 12001 - echo "$as_me:15291: \$? = $ac_status" >&5 11741 + echo "$as_me:156 38: \$? = $ac_status" >&512002 + echo "$as_me:15669: \$? = $ac_status" >&5 11742 12003 (exit $ac_status); }; }; then 11743 12004 cf_cv_header_stdbool_h=0 … … 11747 12008 cat >conftest.$ac_ext <<_ACEOF 11748 12009 -#line 15298 "configure" 11749 +#line 156 45"configure"12010 +#line 15676 "configure" 11750 12011 #include "confdefs.h" 11751 12012 11752 12013 #ifndef __BEOS__ 11753 @@ -15311,16 +156 58,16 @@12014 @@ -15311,16 +15689,16 @@ 11754 12015 } 11755 12016 _ACEOF 11756 12017 rm -f conftest.$ac_objext 11757 12018 -if { (eval echo "$as_me:15314: \"$ac_compile\"") >&5 11758 +if { (eval echo "$as_me:156 61: \"$ac_compile\"") >&512019 +if { (eval echo "$as_me:15692: \"$ac_compile\"") >&5 11759 12020 (eval $ac_compile) 2>&5 11760 12021 ac_status=$? 11761 12022 - echo "$as_me:15317: \$? = $ac_status" >&5 11762 + echo "$as_me:156 64: \$? = $ac_status" >&512023 + echo "$as_me:15695: \$? = $ac_status" >&5 11763 12024 (exit $ac_status); } && 11764 12025 { ac_try='test -s conftest.$ac_objext' 11765 12026 - { (eval echo "$as_me:15320: \"$ac_try\"") >&5 11766 + { (eval echo "$as_me:156 67: \"$ac_try\"") >&512027 + { (eval echo "$as_me:15698: \"$ac_try\"") >&5 11767 12028 (eval $ac_try) 2>&5 11768 12029 ac_status=$? 11769 12030 - echo "$as_me:15323: \$? = $ac_status" >&5 11770 + echo "$as_me:15 670: \$? = $ac_status" >&512031 + echo "$as_me:15701: \$? = $ac_status" >&5 11771 12032 (exit $ac_status); }; }; then 11772 12033 cf_cv_header_stdbool_h=1 11773 12034 else 11774 @@ -15334,13 +15 681,13 @@12035 @@ -15334,13 +15712,13 @@ 11775 12036 fi 11776 12037 11777 12038 if test "$cf_cv_header_stdbool_h" = 1 11778 12039 -then echo "$as_me:15337: result: yes" >&5 11779 +then echo "$as_me:15 684: result: yes" >&512040 +then echo "$as_me:15715: result: yes" >&5 11780 12041 echo "${ECHO_T}yes" >&6 11781 12042 -else echo "$as_me:15339: result: no" >&5 11782 +else echo "$as_me:15 686: result: no" >&512043 +else echo "$as_me:15717: result: no" >&5 11783 12044 echo "${ECHO_T}no" >&6 11784 12045 fi 11785 12046 11786 12047 -echo "$as_me:15343: checking for builtin bool type" >&5 11787 +echo "$as_me:15 690: checking for builtin bool type" >&512048 +echo "$as_me:15721: checking for builtin bool type" >&5 11788 12049 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 11789 12050 11790 12051 if test "${cf_cv_builtin_bool+set}" = set; then 11791 @@ -15348,7 +15 695,7 @@12052 @@ -15348,7 +15726,7 @@ 11792 12053 else 11793 12054 11794 12055 cat >conftest.$ac_ext <<_ACEOF 11795 12056 -#line 15351 "configure" 11796 +#line 15 698"configure"12057 +#line 15729 "configure" 11797 12058 #include "confdefs.h" 11798 12059 11799 12060 #include <stdio.h> 11800 @@ -15363,16 +157 10,16 @@12061 @@ -15363,16 +15741,16 @@ 11801 12062 } 11802 12063 _ACEOF 11803 12064 rm -f conftest.$ac_objext 11804 12065 -if { (eval echo "$as_me:15366: \"$ac_compile\"") >&5 11805 +if { (eval echo "$as_me:157 13: \"$ac_compile\"") >&512066 +if { (eval echo "$as_me:15744: \"$ac_compile\"") >&5 11806 12067 (eval $ac_compile) 2>&5 11807 12068 ac_status=$? 11808 12069 - echo "$as_me:15369: \$? = $ac_status" >&5 11809 + echo "$as_me:157 16: \$? = $ac_status" >&512070 + echo "$as_me:15747: \$? = $ac_status" >&5 11810 12071 (exit $ac_status); } && 11811 12072 { ac_try='test -s conftest.$ac_objext' 11812 12073 - { (eval echo "$as_me:15372: \"$ac_try\"") >&5 11813 + { (eval echo "$as_me:157 19: \"$ac_try\"") >&512074 + { (eval echo "$as_me:15750: \"$ac_try\"") >&5 11814 12075 (eval $ac_try) 2>&5 11815 12076 ac_status=$? 11816 12077 - echo "$as_me:15375: \$? = $ac_status" >&5 11817 + echo "$as_me:157 22: \$? = $ac_status" >&512078 + echo "$as_me:15753: \$? = $ac_status" >&5 11818 12079 (exit $ac_status); }; }; then 11819 12080 cf_cv_builtin_bool=1 11820 12081 else 11821 @@ -15385,13 +157 32,13 @@12082 @@ -15385,13 +15763,13 @@ 11822 12083 fi 11823 12084 11824 12085 if test "$cf_cv_builtin_bool" = 1 11825 12086 -then echo "$as_me:15388: result: yes" >&5 11826 +then echo "$as_me:157 35: result: yes" >&512087 +then echo "$as_me:15766: result: yes" >&5 11827 12088 echo "${ECHO_T}yes" >&6 11828 12089 -else echo "$as_me:15390: result: no" >&5 11829 +else echo "$as_me:157 37: result: no" >&512090 +else echo "$as_me:15768: result: no" >&5 11830 12091 echo "${ECHO_T}no" >&6 11831 12092 fi 11832 12093 11833 12094 -echo "$as_me:15394: checking for size of bool" >&5 11834 +echo "$as_me:157 41: checking for size of bool" >&512095 +echo "$as_me:15772: checking for size of bool" >&5 11835 12096 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 11836 12097 if test "${cf_cv_type_of_bool+set}" = set; then 11837 12098 echo $ECHO_N "(cached) $ECHO_C" >&6 11838 @@ -15402,7 +157 49,7 @@12099 @@ -15402,7 +15780,7 @@ 11839 12100 cf_cv_type_of_bool=unknown 11840 12101 else 11841 12102 cat >conftest.$ac_ext <<_ACEOF 11842 12103 -#line 15405 "configure" 11843 +#line 157 52"configure"12104 +#line 15783 "configure" 11844 12105 #include "confdefs.h" 11845 12106 11846 12107 #include <stdlib.h> 11847 @@ -15444,15 +15 791,15 @@12108 @@ -15444,15 +15822,15 @@ 11848 12109 11849 12110 _ACEOF 11850 12111 rm -f conftest$ac_exeext 11851 12112 -if { (eval echo "$as_me:15447: \"$ac_link\"") >&5 11852 +if { (eval echo "$as_me:15 794: \"$ac_link\"") >&512113 +if { (eval echo "$as_me:15825: \"$ac_link\"") >&5 11853 12114 (eval $ac_link) 2>&5 11854 12115 ac_status=$? 11855 12116 - echo "$as_me:15450: \$? = $ac_status" >&5 11856 + echo "$as_me:15 797: \$? = $ac_status" >&512117 + echo "$as_me:15828: \$? = $ac_status" >&5 11857 12118 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 11858 12119 - { (eval echo "$as_me:15452: \"$ac_try\"") >&5 11859 + { (eval echo "$as_me:15 799: \"$ac_try\"") >&512120 + { (eval echo "$as_me:15830: \"$ac_try\"") >&5 11860 12121 (eval $ac_try) 2>&5 11861 12122 ac_status=$? 11862 12123 - echo "$as_me:15455: \$? = $ac_status" >&5 11863 + echo "$as_me:158 02: \$? = $ac_status" >&512124 + echo "$as_me:15833: \$? = $ac_status" >&5 11864 12125 (exit $ac_status); }; }; then 11865 12126 cf_cv_type_of_bool=`cat cf_test.out` 11866 12127 if test -z "$cf_cv_type_of_bool"; then 11867 @@ -15470,18 +158 17,18 @@12128 @@ -15470,18 +15848,18 @@ 11868 12129 fi 11869 12130 11870 12131 rm -f cf_test.out 11871 12132 -echo "$as_me:15473: result: $cf_cv_type_of_bool" >&5 11872 +echo "$as_me:158 20: result: $cf_cv_type_of_bool" >&512133 +echo "$as_me:15851: result: $cf_cv_type_of_bool" >&5 11873 12134 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 11874 12135 if test "$cf_cv_type_of_bool" = unknown ; then … … 11877 12138 esac 11878 12139 - { echo "$as_me:15479: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 11879 + { 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 11880 12141 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} 11881 12142 cf_cv_type_of_bool=$NCURSES_BOOL … … 11883 12144 11884 12145 -echo "$as_me:15484: checking for special defines needed for etip.h" >&5 11885 +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 11886 12147 echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6 11887 12148 cf_save_CXXFLAGS="$CXXFLAGS" 11888 12149 cf_result="none" 11889 @@ -15493,7 +158 40,7 @@12150 @@ -15493,7 +15871,7 @@ 11890 12151 test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" 11891 12152 test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" 11892 12153 cat >conftest.$ac_ext <<_ACEOF 11893 12154 -#line 15496 "configure" 11894 +#line 158 43"configure"12155 +#line 15874 "configure" 11895 12156 #include "confdefs.h" 11896 12157 11897 12158 #include <etip.h.in> 11898 @@ -15507,16 +158 54,16 @@12159 @@ -15507,16 +15885,16 @@ 11899 12160 } 11900 12161 _ACEOF 11901 12162 rm -f conftest.$ac_objext 11902 12163 -if { (eval echo "$as_me:15510: \"$ac_compile\"") >&5 11903 +if { (eval echo "$as_me:158 57: \"$ac_compile\"") >&512164 +if { (eval echo "$as_me:15888: \"$ac_compile\"") >&5 11904 12165 (eval $ac_compile) 2>&5 11905 12166 ac_status=$? 11906 12167 - echo "$as_me:15513: \$? = $ac_status" >&5 11907 + echo "$as_me:158 60: \$? = $ac_status" >&512168 + echo "$as_me:15891: \$? = $ac_status" >&5 11908 12169 (exit $ac_status); } && 11909 12170 { ac_try='test -s conftest.$ac_objext' 11910 12171 - { (eval echo "$as_me:15516: \"$ac_try\"") >&5 11911 + { (eval echo "$as_me:158 63: \"$ac_try\"") >&512172 + { (eval echo "$as_me:15894: \"$ac_try\"") >&5 11912 12173 (eval $ac_try) 2>&5 11913 12174 ac_status=$? 11914 12175 - echo "$as_me:15519: \$? = $ac_status" >&5 11915 + echo "$as_me:158 66: \$? = $ac_status" >&512176 + echo "$as_me:15897: \$? = $ac_status" >&5 11916 12177 (exit $ac_status); }; }; then 11917 12178 11918 12179 test -n "$cf_math" && cat >>confdefs.h <<EOF 11919 @@ -15537,12 +15 884,12 @@12180 @@ -15537,12 +15915,12 @@ 11920 12181 rm -f conftest.$ac_objext conftest.$ac_ext 11921 12182 done 11922 12183 done 11923 12184 -echo "$as_me:15540: result: $cf_result" >&5 11924 +echo "$as_me:15 887: result: $cf_result" >&512185 +echo "$as_me:15918: result: $cf_result" >&5 11925 12186 echo "${ECHO_T}$cf_result" >&6 11926 12187 CXXFLAGS="$cf_save_CXXFLAGS" … … 11928 12189 if test -n "$CXX"; then 11929 12190 -echo "$as_me:15545: checking if $CXX accepts parameter initialization" >&5 11930 +echo "$as_me:15 892: checking if $CXX accepts parameter initialization" >&512191 +echo "$as_me:15923: checking if $CXX accepts parameter initialization" >&5 11931 12192 echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6 11932 12193 if test "${cf_cv_cpp_param_init+set}" = set; then 11933 12194 echo $ECHO_N "(cached) $ECHO_C" >&6 11934 @@ -15559,7 +159 06,7 @@12195 @@ -15559,7 +15937,7 @@ 11935 12196 cf_cv_cpp_param_init=unknown 11936 12197 else 11937 12198 cat >conftest.$ac_ext <<_ACEOF 11938 12199 -#line 15562 "configure" 11939 +#line 159 09"configure"12200 +#line 15940 "configure" 11940 12201 #include "confdefs.h" 11941 12202 11942 12203 class TEST { 11943 @@ -15578,15 +159 25,15 @@12204 @@ -15578,15 +15956,15 @@ 11944 12205 11945 12206 _ACEOF 11946 12207 rm -f conftest$ac_exeext 11947 12208 -if { (eval echo "$as_me:15581: \"$ac_link\"") >&5 11948 +if { (eval echo "$as_me:159 28: \"$ac_link\"") >&512209 +if { (eval echo "$as_me:15959: \"$ac_link\"") >&5 11949 12210 (eval $ac_link) 2>&5 11950 12211 ac_status=$? 11951 12212 - echo "$as_me:15584: \$? = $ac_status" >&5 11952 + echo "$as_me:159 31: \$? = $ac_status" >&512213 + echo "$as_me:15962: \$? = $ac_status" >&5 11953 12214 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 11954 12215 - { (eval echo "$as_me:15586: \"$ac_try\"") >&5 11955 + { (eval echo "$as_me:159 33: \"$ac_try\"") >&512216 + { (eval echo "$as_me:15964: \"$ac_try\"") >&5 11956 12217 (eval $ac_try) 2>&5 11957 12218 ac_status=$? 11958 12219 - echo "$as_me:15589: \$? = $ac_status" >&5 11959 + echo "$as_me:159 36: \$? = $ac_status" >&512220 + echo "$as_me:15967: \$? = $ac_status" >&5 11960 12221 (exit $ac_status); }; }; then 11961 12222 cf_cv_cpp_param_init=yes 11962 12223 else 11963 @@ -15605,7 +159 52,7 @@12224 @@ -15605,7 +15983,7 @@ 11964 12225 ac_main_return=return 11965 12226 11966 12227 fi 11967 12228 -echo "$as_me:15608: result: $cf_cv_cpp_param_init" >&5 11968 +echo "$as_me:159 55: result: $cf_cv_cpp_param_init" >&512229 +echo "$as_me:15986: result: $cf_cv_cpp_param_init" >&5 11969 12230 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 11970 12231 fi 11971 12232 test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF 11972 @@ -15614,7 +159 61,7 @@12233 @@ -15614,7 +15992,7 @@ 11973 12234 11974 12235 if test -n "$CXX"; then 11975 12236 11976 12237 -echo "$as_me:15617: checking if $CXX accepts static_cast" >&5 11977 +echo "$as_me:159 64: checking if $CXX accepts static_cast" >&512238 +echo "$as_me:15995: checking if $CXX accepts static_cast" >&5 11978 12239 echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6 11979 12240 if test "${cf_cv_cpp_static_cast+set}" = set; then 11980 12241 echo $ECHO_N "(cached) $ECHO_C" >&6 11981 @@ -15628,7 +1 5975,7 @@12242 @@ -15628,7 +16006,7 @@ 11982 12243 ac_main_return=return 11983 12244 11984 12245 cat >conftest.$ac_ext <<_ACEOF 11985 12246 -#line 15631 "configure" 11986 +#line 1 5978"configure"12247 +#line 16009 "configure" 11987 12248 #include "confdefs.h" 11988 12249 11989 12250 class NCursesPanel 11990 @@ -15672,16 +160 19,16 @@12251 @@ -15672,16 +16050,16 @@ 11991 12252 } 11992 12253 _ACEOF 11993 12254 rm -f conftest.$ac_objext 11994 12255 -if { (eval echo "$as_me:15675: \"$ac_compile\"") >&5 11995 +if { (eval echo "$as_me:160 22: \"$ac_compile\"") >&512256 +if { (eval echo "$as_me:16053: \"$ac_compile\"") >&5 11996 12257 (eval $ac_compile) 2>&5 11997 12258 ac_status=$? 11998 12259 - echo "$as_me:15678: \$? = $ac_status" >&5 11999 + echo "$as_me:160 25: \$? = $ac_status" >&512260 + echo "$as_me:16056: \$? = $ac_status" >&5 12000 12261 (exit $ac_status); } && 12001 12262 { ac_try='test -s conftest.$ac_objext' 12002 12263 - { (eval echo "$as_me:15681: \"$ac_try\"") >&5 12003 + { (eval echo "$as_me:160 28: \"$ac_try\"") >&512264 + { (eval echo "$as_me:16059: \"$ac_try\"") >&5 12004 12265 (eval $ac_try) 2>&5 12005 12266 ac_status=$? 12006 12267 - echo "$as_me:15684: \$? = $ac_status" >&5 12007 + echo "$as_me:160 31: \$? = $ac_status" >&512268 + echo "$as_me:16062: \$? = $ac_status" >&5 12008 12269 (exit $ac_status); }; }; then 12009 12270 cf_cv_cpp_static_cast=yes 12010 12271 else 12011 @@ -15699,7 +160 46,7 @@12272 @@ -15699,7 +16077,7 @@ 12012 12273 ac_main_return=return 12013 12274 12014 12275 fi 12015 12276 -echo "$as_me:15702: result: $cf_cv_cpp_static_cast" >&5 12016 +echo "$as_me:160 49: result: $cf_cv_cpp_static_cast" >&512277 +echo "$as_me:16080: result: $cf_cv_cpp_static_cast" >&5 12017 12278 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 12018 12279 12019 12280 fi 12020 @@ -15709,12 +160 56,12 @@12281 @@ -15709,12 +16087,12 @@ 12021 12282 EOF 12022 12283 … … 12033 12294 ;; 12034 12295 sco3.2v5*) #(vi 12035 @@ -15723,7 +16 070,7 @@12296 @@ -15723,7 +16101,7 @@ 12036 12297 solaris2*) 12037 12298 if test "$GXX" != yes ; then … … 12042 12303 ;; 12043 12304 esac 12044 @@ -15747,7 +16 094,7 @@12305 @@ -15747,7 +16125,7 @@ 12045 12306 else 12046 12307 if test "$cf_cv_header_stdbool_h" = 1 ; then 12047 12308 12048 12309 -echo "$as_me:15750: checking for size of bool" >&5 12049 +echo "$as_me:16 097: checking for size of bool" >&512310 +echo "$as_me:16128: checking for size of bool" >&5 12050 12311 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 12051 12312 if test "${cf_cv_type_of_bool+set}" = set; then 12052 12313 echo $ECHO_N "(cached) $ECHO_C" >&6 12053 @@ -15758,7 +161 05,7 @@12314 @@ -15758,7 +16136,7 @@ 12054 12315 cf_cv_type_of_bool=unknown 12055 12316 else 12056 12317 cat >conftest.$ac_ext <<_ACEOF 12057 12318 -#line 15761 "configure" 12058 +#line 161 08"configure"12319 +#line 16139 "configure" 12059 12320 #include "confdefs.h" 12060 12321 12061 12322 #include <stdlib.h> 12062 @@ -15800,15 +161 47,15 @@12323 @@ -15800,15 +16178,15 @@ 12063 12324 12064 12325 _ACEOF 12065 12326 rm -f conftest$ac_exeext 12066 12327 -if { (eval echo "$as_me:15803: \"$ac_link\"") >&5 12067 +if { (eval echo "$as_me:161 50: \"$ac_link\"") >&512328 +if { (eval echo "$as_me:16181: \"$ac_link\"") >&5 12068 12329 (eval $ac_link) 2>&5 12069 12330 ac_status=$? 12070 12331 - echo "$as_me:15806: \$? = $ac_status" >&5 12071 + echo "$as_me:161 53: \$? = $ac_status" >&512332 + echo "$as_me:16184: \$? = $ac_status" >&5 12072 12333 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 12073 12334 - { (eval echo "$as_me:15808: \"$ac_try\"") >&5 12074 + { (eval echo "$as_me:161 55: \"$ac_try\"") >&512335 + { (eval echo "$as_me:16186: \"$ac_try\"") >&5 12075 12336 (eval $ac_try) 2>&5 12076 12337 ac_status=$? 12077 12338 - echo "$as_me:15811: \$? = $ac_status" >&5 12078 + echo "$as_me:161 58: \$? = $ac_status" >&512339 + echo "$as_me:16189: \$? = $ac_status" >&5 12079 12340 (exit $ac_status); }; }; then 12080 12341 cf_cv_type_of_bool=`cat cf_test.out` 12081 12342 if test -z "$cf_cv_type_of_bool"; then 12082 @@ -15826,25 +16 173,25 @@12343 @@ -15826,25 +16204,25 @@ 12083 12344 fi 12084 12345 12085 12346 rm -f cf_test.out 12086 12347 -echo "$as_me:15829: result: $cf_cv_type_of_bool" >&5 12087 +echo "$as_me:16 176: result: $cf_cv_type_of_bool" >&512348 +echo "$as_me:16207: result: $cf_cv_type_of_bool" >&5 12088 12349 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 12089 12350 if test "$cf_cv_type_of_bool" = unknown ; then … … 12092 12353 esac 12093 12354 - { echo "$as_me:15835: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 12094 + { 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 12095 12356 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} 12096 12357 cf_cv_type_of_bool=$NCURSES_BOOL … … 12099 12360 else 12100 12361 - echo "$as_me:15841: checking for fallback type of bool" >&5 12101 + echo "$as_me:16 188: checking for fallback type of bool" >&512362 + echo "$as_me:16219: checking for fallback type of bool" >&5 12102 12363 echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6 12103 12364 case "$host_cpu" in #(vi … … 12106 12367 esac 12107 12368 - echo "$as_me:15847: result: $cf_cv_type_of_bool" >&5 12108 + echo "$as_me:16 194: result: $cf_cv_type_of_bool" >&512369 + echo "$as_me:16225: result: $cf_cv_type_of_bool" >&5 12109 12370 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 12110 12371 fi 12111 12372 fi 12112 @@ -15873,7 +162 20,7 @@12373 @@ -15873,7 +16251,7 @@ 12113 12374 12114 12375 if test "$cf_with_ada" != "no" ; then 12115 12376 if test "$with_libtool" != "no"; then 12116 12377 - { echo "$as_me:15876: WARNING: libtool does not support Ada - disabling feature" >&5 12117 + { 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 12118 12379 echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} 12119 12380 cf_with_ada=no 12120 12381 fi 12121 @@ -15883,7 +162 30,7 @@12382 @@ -15883,7 +16261,7 @@ 12122 12383 cf_ada_make=gnatmake 12123 12384 # Extract the first word of "$cf_ada_make", so it can be a program name with args. 12124 12385 set dummy $cf_ada_make; ac_word=$2 12125 12386 -echo "$as_me:15886: checking for $ac_word" >&5 12126 +echo "$as_me:162 33: checking for $ac_word" >&512387 +echo "$as_me:16264: checking for $ac_word" >&5 12127 12388 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 12128 12389 if test "${ac_cv_prog_gnat_exists+set}" = set; then 12129 12390 echo $ECHO_N "(cached) $ECHO_C" >&6 12130 @@ -15898,7 +162 45,7 @@12391 @@ -15898,7 +16276,7 @@ 12131 12392 test -z "$ac_dir" && ac_dir=. 12132 12393 $as_executable_p "$ac_dir/$ac_word" || continue 12133 12394 ac_cv_prog_gnat_exists="yes" 12134 12395 -echo "$as_me:15901: found $ac_dir/$ac_word" >&5 12135 +echo "$as_me:162 48: found $ac_dir/$ac_word" >&512396 +echo "$as_me:16279: found $ac_dir/$ac_word" >&5 12136 12397 break 12137 12398 done 12138 12399 12139 @@ -15907,10 +162 54,10 @@12400 @@ -15907,10 +16285,10 @@ 12140 12401 fi 12141 12402 gnat_exists=$ac_cv_prog_gnat_exists 12142 12403 if test -n "$gnat_exists"; then 12143 12404 - echo "$as_me:15910: result: $gnat_exists" >&5 12144 + echo "$as_me:162 57: result: $gnat_exists" >&512405 + echo "$as_me:16288: result: $gnat_exists" >&5 12145 12406 echo "${ECHO_T}$gnat_exists" >&6 12146 12407 else 12147 12408 - echo "$as_me:15913: result: no" >&5 12148 + echo "$as_me:162 60: result: no" >&512409 + echo "$as_me:16291: result: no" >&5 12149 12410 echo "${ECHO_T}no" >&6 12150 12411 fi 12151 12412 12152 @@ -15918,11 +162 65,11 @@12413 @@ -15918,11 +16296,11 @@ 12153 12414 cf_ada_make= 12154 12415 else 12155 12416 12156 12417 -echo "$as_me:15921: checking for gnat version" >&5 12157 +echo "$as_me:162 68: checking for gnat version" >&512418 +echo "$as_me:16299: checking for gnat version" >&5 12158 12419 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 12159 12420 cf_gnat_version=`${cf_ada_make-gnatmake} -v 2>&1 | grep '[0-9].[0-9][0-9]*' |\ 12160 12421 sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` 12161 12422 -echo "$as_me:15925: result: $cf_gnat_version" >&5 12162 +echo "$as_me:16 272: result: $cf_gnat_version" >&512423 +echo "$as_me:16303: result: $cf_gnat_version" >&5 12163 12424 echo "${ECHO_T}$cf_gnat_version" >&6 12164 12425 12165 12426 case $cf_gnat_version in 12166 @@ -15945,7 +16 292,7 @@12427 @@ -15945,7 +16323,7 @@ 12167 12428 12168 12429 # Extract the first word of "m4", so it can be a program name with args. 12169 12430 set dummy m4; ac_word=$2 12170 12431 -echo "$as_me:15948: checking for $ac_word" >&5 12171 +echo "$as_me:16 295: checking for $ac_word" >&512432 +echo "$as_me:16326: checking for $ac_word" >&5 12172 12433 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 12173 12434 if test "${ac_cv_prog_M4_exists+set}" = set; then 12174 12435 echo $ECHO_N "(cached) $ECHO_C" >&6 12175 @@ -15960,7 +163 07,7 @@12436 @@ -15960,7 +16338,7 @@ 12176 12437 test -z "$ac_dir" && ac_dir=. 12177 12438 $as_executable_p "$ac_dir/$ac_word" || continue 12178 12439 ac_cv_prog_M4_exists="yes" 12179 12440 -echo "$as_me:15963: found $ac_dir/$ac_word" >&5 12180 +echo "$as_me:163 10: found $ac_dir/$ac_word" >&512441 +echo "$as_me:16341: found $ac_dir/$ac_word" >&5 12181 12442 break 12182 12443 done 12183 12444 12184 @@ -15969,10 +163 16,10 @@12445 @@ -15969,10 +16347,10 @@ 12185 12446 fi 12186 12447 M4_exists=$ac_cv_prog_M4_exists 12187 12448 if test -n "$M4_exists"; then 12188 12449 - echo "$as_me:15972: result: $M4_exists" >&5 12189 + echo "$as_me:163 19: result: $M4_exists" >&512450 + echo "$as_me:16350: result: $M4_exists" >&5 12190 12451 echo "${ECHO_T}$M4_exists" >&6 12191 12452 else 12192 12453 - echo "$as_me:15975: result: no" >&5 12193 + echo "$as_me:163 22: result: no" >&512454 + echo "$as_me:16353: result: no" >&5 12194 12455 echo "${ECHO_T}no" >&6 12195 12456 fi 12196 12457 12197 @@ -15981,7 +163 28,7 @@12458 @@ -15981,7 +16359,7 @@ 12198 12459 echo Ada95 binding required program m4 not found. Ada95 binding disabled. 12199 12460 fi 12200 12461 if test "$cf_cv_prog_gnat_correct" = yes; then 12201 12462 - echo "$as_me:15984: checking if GNAT works" >&5 12202 + echo "$as_me:163 31: checking if GNAT works" >&512463 + echo "$as_me:16362: checking if GNAT works" >&5 12203 12464 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 12204 12465 12205 12466 rm -f conftest* 12206 @@ -16009,14 +163 56,14 @@12467 @@ -16009,14 +16387,14 @@ 12207 12468 fi 12208 12469 rm -f conftest* 12209 12470 12210 12471 - echo "$as_me:16012: result: $cf_cv_prog_gnat_correct" >&5 12211 + echo "$as_me:163 59: result: $cf_cv_prog_gnat_correct" >&512472 + echo "$as_me:16390: result: $cf_cv_prog_gnat_correct" >&5 12212 12473 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 12213 12474 fi … … 12217 12478 12218 12479 - echo "$as_me:16019: checking if GNAT pragma Unreferenced works" >&5 12219 + echo "$as_me:163 66: checking if GNAT pragma Unreferenced works" >&512480 + echo "$as_me:16397: checking if GNAT pragma Unreferenced works" >&5 12220 12481 echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6 12221 12482 12222 12483 rm -f conftest* 12223 @@ -16043,7 +16 390,7 @@12484 @@ -16043,7 +16421,7 @@ 12224 12485 fi 12225 12486 rm -f conftest* 12226 12487 12227 12488 - echo "$as_me:16046: result: $cf_cv_pragma_unreferenced" >&5 12228 + echo "$as_me:16 393: result: $cf_cv_pragma_unreferenced" >&512489 + echo "$as_me:16424: result: $cf_cv_pragma_unreferenced" >&5 12229 12490 echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6 12230 12491 12231 12492 # if the pragma is supported, use it (needed in the Trace code). 12232 @@ -16096,7 +164 43,7 @@12493 @@ -16096,7 +16474,7 @@ 12233 12494 withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` 12234 12495 ;; 12235 12496 *) 12236 12497 - { { echo "$as_me:16099: error: expected a pathname, not \"$withval\"" >&5 12237 + { { echo "$as_me:164 46: error: expected a pathname, not \"$withval\"" >&512498 + { { echo "$as_me:16477: error: expected a pathname, not \"$withval\"" >&5 12238 12499 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} 12239 12500 { (exit 1); exit 1; }; } 12240 12501 ;; 12241 @@ -16138,7 +16 485,7 @@12502 @@ -16138,7 +16516,7 @@ 12242 12503 withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` 12243 12504 ;; 12244 12505 *) 12245 12506 - { { echo "$as_me:16141: error: expected a pathname, not \"$withval\"" >&5 12246 + { { echo "$as_me:16 488: error: expected a pathname, not \"$withval\"" >&512507 + { { echo "$as_me:16519: error: expected a pathname, not \"$withval\"" >&5 12247 12508 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} 12248 12509 { (exit 1); exit 1; }; } 12249 12510 ;; 12250 @@ -16163,7 +165 10,7 @@12511 @@ -16163,7 +16541,7 @@ 12251 12512 ### chooses to split module lists into libraries. 12252 12513 ### 12253 12514 ### (see CF_LIB_RULES). 12254 12515 -echo "$as_me:16166: checking for library subsets" >&5 12255 +echo "$as_me:165 13: checking for library subsets" >&512516 +echo "$as_me:16544: checking for library subsets" >&5 12256 12517 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 12257 12518 LIB_SUBSETS= 12258 12519 12259 @@ -16188,7 +16535,7 @@ 12520 @@ -16176,7 +16554,17 @@ 12521 fi 12522 fi 12523 12524 -LIB_SUBSETS="${LIB_SUBSETS}termlib" 12525 +LIB_SUBSETS="${LIB_SUBSETS}termlib+port_drivers" 12526 + 12527 +case $cf_cv_system_name in #(vi 12528 +*mingw32*) #(vi 12529 + LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo+port_win32con" 12530 + ;; 12531 +*) #(vi 12532 + LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo" 12533 + ;; 12534 +esac 12535 + 12536 test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_tinfo" 12537 if test "$with_termlib" != no ; then 12538 LIB_SUBSETS="${LIB_SUBSETS} " 12539 @@ -16185,17 +16573,18 @@ 12540 fi 12541 12542 LIB_SUBSETS="${LIB_SUBSETS}base" 12543 + 12260 12544 test "$with_widec" = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" 12261 12545 test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" 12262 12546 12263 12547 -echo "$as_me:16191: result: $LIB_SUBSETS" >&5 12264 +echo "$as_me:165 38: result: $LIB_SUBSETS" >&512548 +echo "$as_me:16580: result: $LIB_SUBSETS" >&5 12265 12549 echo "${ECHO_T}$LIB_SUBSETS" >&6 12266 12550 12267 12551 ### Construct the list of include-directories to be generated 12268 @@ -16226,7 +16573,7 @@ 12552 12553 -CPPFLAGS="-I. -I../include $CPPFLAGS" 12554 +CPPFLAGS="$CPPFLAGS -I. -I../include" 12555 if test "$srcdir" != "."; then 12556 - CPPFLAGS="-I\${srcdir}/../include $CPPFLAGS" 12557 + CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include" 12558 fi 12559 if test "$GCC" != yes; then 12560 CPPFLAGS="$CPPFLAGS -I\${includedir}" 12561 @@ -16226,7 +16615,7 @@ 12269 12562 fi 12270 12563 12271 12564 ### Build up pieces for makefile rules 12272 12565 -echo "$as_me:16229: checking default library suffix" >&5 12273 +echo "$as_me:16 576: checking default library suffix" >&512566 +echo "$as_me:16618: checking default library suffix" >&5 12274 12567 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 12275 12568 12276 12569 case $DFT_LWR_MODEL in 12277 @@ -16237,46 +16 584,50 @@12570 @@ -16237,46 +16626,50 @@ 12278 12571 shared) DFT_ARG_SUFFIX='' ;; 12279 12572 esac 12280 12573 test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" 12281 12574 -echo "$as_me:16240: result: $DFT_ARG_SUFFIX" >&5 12282 +echo "$as_me:16 587: result: $DFT_ARG_SUFFIX" >&512575 +echo "$as_me:16629: result: $DFT_ARG_SUFFIX" >&5 12283 12576 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 12284 12577 12285 12578 -echo "$as_me:16243: checking default library-dependency suffix" >&5 12286 +echo "$as_me:16 590: checking default library-dependency suffix" >&512579 +echo "$as_me:16632: checking default library-dependency suffix" >&5 12287 12580 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 12288 12581 … … 12339 12632 DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX 12340 12633 ;; 12341 @@ -16289,10 +166 40,10 @@12634 @@ -16289,10 +16682,10 @@ 12342 12635 esac 12343 12636 test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}" 12344 12637 test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}" 12345 12638 -echo "$as_me:16292: result: $DFT_DEP_SUFFIX" >&5 12346 +echo "$as_me:166 43: result: $DFT_DEP_SUFFIX" >&512639 +echo "$as_me:16685: result: $DFT_DEP_SUFFIX" >&5 12347 12640 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 12348 12641 12349 12642 -echo "$as_me:16295: checking default object directory" >&5 12350 +echo "$as_me:166 46: checking default object directory" >&512643 +echo "$as_me:16688: checking default object directory" >&5 12351 12644 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 12352 12645 12353 12646 case $DFT_LWR_MODEL in 12354 @@ -16308,51 +16 659,55 @@12647 @@ -16308,51 +16701,55 @@ 12355 12648 DFT_OBJ_SUBDIR='obj_s' ;; 12356 12649 esac 12357 12650 esac 12358 12651 -echo "$as_me:16311: result: $DFT_OBJ_SUBDIR" >&5 12359 +echo "$as_me:16 662: result: $DFT_OBJ_SUBDIR" >&512652 +echo "$as_me:16704: result: $DFT_OBJ_SUBDIR" >&5 12360 12653 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 12361 12654 … … 12363 12656 if test "$cf_with_cxx" = yes ; then 12364 12657 -echo "$as_me:16316: checking c++ library-dependency suffix" >&5 12365 +echo "$as_me:16 667: checking c++ library-dependency suffix" >&512658 +echo "$as_me:16709: checking c++ library-dependency suffix" >&5 12366 12659 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 12367 12660 if test "$with_libtool" != "no"; then … … 12421 12714 CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX 12422 12715 ;; 12423 @@ -16366,7 +167 21,7 @@12716 @@ -16366,7 +16763,7 @@ 12424 12717 test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}" 12425 12718 test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}" 12426 12719 fi 12427 12720 -echo "$as_me:16369: result: $CXX_LIB_SUFFIX" >&5 12428 +echo "$as_me:167 24: result: $CXX_LIB_SUFFIX" >&512721 +echo "$as_me:16766: result: $CXX_LIB_SUFFIX" >&5 12429 12722 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 12430 12723 12431 12724 fi 12432 @@ -16480,7 +168 35,7 @@12725 @@ -16480,7 +16877,7 @@ 12433 12726 12434 12727 if test "$GCC" = yes ; then … … 12439 12732 LDFLAGS_SHARED= 12440 12733 ;; 12441 @@ -16491,7 +168 46,7 @@12734 @@ -16491,7 +16888,7 @@ 12442 12735 esac 12443 12736 else … … 12448 12741 LDFLAGS_SHARED=-bdynamic 12449 12742 ;; 12450 @@ -16519,12 +16 874,12 @@12743 @@ -16519,12 +16916,12 @@ 12451 12744 ;; 12452 12745 esac 12453 12746 12454 12747 -echo "$as_me:16522: checking where we will install curses.h" >&5 12455 +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 12456 12749 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 12457 12750 test "$with_overwrite" = no && \ … … 12459 12752 includedir='${prefix}/include/ncurses'${LIB_SUFFIX} 12460 12753 -echo "$as_me:16527: result: $includedir" >&5 12461 +echo "$as_me:16 882: result: $includedir" >&512754 +echo "$as_me:16924: result: $includedir" >&5 12462 12755 echo "${ECHO_T}$includedir" >&6 12463 12756 12464 12757 ### Resolve a conflict between normal and wide-curses by forcing applications 12465 @@ -16532,10 +16 887,11 @@12758 @@ -16532,10 +16929,11 @@ 12466 12759 if test "$with_overwrite" != no ; then 12467 12760 if test "$NCURSES_LIBUTF8" = 1 ; then 12468 12761 NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' 12469 12762 - { echo "$as_me:16535: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 12470 + { 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 12471 12764 echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;} 12472 12765 fi … … 12476 12769 # used to separate tack out of the tree 12477 12770 NCURSES_TREE= 12478 @@ -16548,7 +169 04,7 @@12771 @@ -16548,7 +16946,7 @@ 12479 12772 ### Construct the list of subdirectories for which we'll customize makefiles 12480 12773 ### with the appropriate compile-rules. 12481 12774 12482 12775 -echo "$as_me:16551: checking for src modules" >&5 12483 +echo "$as_me:169 07: checking for src modules" >&512776 +echo "$as_me:16949: checking for src modules" >&5 12484 12777 echo $ECHO_N "checking for src modules... $ECHO_C" >&6 12485 12778 12486 12779 # dependencies and linker-arguments for test-programs 12487 @@ -16611,13 +1 6967,17 @@12780 @@ -16611,13 +17009,17 @@ 12488 12781 fi 12489 12782 fi 12490 12783 done 12491 12784 -echo "$as_me:16614: result: $cf_cv_src_modules" >&5 12492 +echo "$as_me:1 6970: result: $cf_cv_src_modules" >&512785 +echo "$as_me:17012: result: $cf_cv_src_modules" >&5 12493 12786 echo "${ECHO_T}$cf_cv_src_modules" >&6 12494 12787 … … 12505 12798 do 12506 12799 SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir" 12507 @@ -16628,8 +1 6988,8 @@12800 @@ -16628,8 +17030,8 @@ 12508 12801 12509 12802 ADA_SUBDIRS= … … 12516 12809 12517 12810 SUB_MAKEFILES= 12518 @@ -16639,15 +1 6999,15 @@12811 @@ -16639,15 +17041,15 @@ 12519 12812 done 12520 12813 … … 12537 12830 12538 12831 DIRS_TO_MAKE="lib" 12539 @@ -16760,18 +17120,18 @@ 12832 @@ -16680,7 +17082,7 @@ 12833 done 12834 12835 cat >>confdefs.h <<EOF 12836 -#define NCURSES_PATHSEP '$PATHSEP' 12837 +#define NCURSES_PATHSEP '$PATH_SEPARATOR' 12838 EOF 12839 12840 cat >>confdefs.h <<EOF 12841 @@ -16749,7 +17151,7 @@ 12842 12843 if test -n "$cf_new_cppflags" ; then 12844 12845 - CPPFLAGS="$cf_new_cppflags $CPPFLAGS" 12846 + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" 12847 fi 12848 12849 if test -n "$cf_new_extra_cppflags" ; then 12850 @@ -16760,18 +17162,18 @@ 12540 12851 ### If we're building with rpath, try to link non-standard libs that way too. 12541 12852 if test "$DFT_LWR_MODEL" = "shared"; then 12542 12853 12543 12854 -echo "$as_me:16763: checking for updated LDFLAGS" >&5 12544 +echo "$as_me:171 23: checking for updated LDFLAGS" >&512855 +echo "$as_me:17165: checking for updated LDFLAGS" >&5 12545 12856 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6 12546 12857 if test -n "$LDFLAGS" ; then 12547 12858 -echo "$as_me:16766: result: maybe" >&5 12548 +echo "$as_me:171 26: result: maybe" >&512859 +echo "$as_me:17168: result: maybe" >&5 12549 12860 echo "${ECHO_T}maybe" >&6 12550 12861 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 12551 12862 12552 12863 -echo "${as_me-configure}:16770: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 12553 +echo "${as_me-configure}:171 30: testing ...checking LDFLAGS $LDFLAGS ..." 1>&512864 +echo "${as_me-configure}:17172: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 12554 12865 12555 12866 test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 12556 12867 12557 12868 -echo "${as_me-configure}:16774: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 12558 +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 12559 12870 12560 12871 case "$EXTRA_LDFLAGS" in #(vi 12561 12872 -Wl,-rpath,*) #(vi 12562 @@ -16793,7 +171 53,7 @@12873 @@ -16793,7 +17195,7 @@ 12563 12874 do 12564 12875 test -n "$verbose" && echo " Filtering $cf_rpath_src" 1>&6 12565 12876 12566 12877 -echo "${as_me-configure}:16796: testing Filtering $cf_rpath_src ..." 1>&5 12567 +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 12568 12879 12569 12880 case $cf_rpath_src in #(vi 12570 12881 -L*) #(vi 12571 @@ -16804,7 +17 164,7 @@12882 @@ -16804,7 +17206,7 @@ 12572 12883 fi 12573 12884 test -n "$verbose" && echo " ...Filter $cf_rpath_tmp" 1>&6 12574 12885 12575 12886 -echo "${as_me-configure}:16807: testing ...Filter $cf_rpath_tmp ..." 1>&5 12576 +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 12577 12888 12578 12889 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" 12579 12890 ;; 12580 @@ -16814,15 +17 174,15 @@12891 @@ -16814,15 +17216,15 @@ 12581 12892 LDFLAGS=$cf_rpath_dst 12582 12893 test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 12583 12894 12584 12895 -echo "${as_me-configure}:16817: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 12585 +echo "${as_me-configure}:17 177: testing ...checked LDFLAGS $LDFLAGS ..." 1>&512896 +echo "${as_me-configure}:17219: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 12586 12897 12587 12898 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 12588 12899 12589 12900 -echo "${as_me-configure}:16821: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 12590 +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 12591 12902 12592 12903 fi 12593 12904 else 12594 12905 -echo "$as_me:16825: result: no" >&5 12595 +echo "$as_me:17 185: result: no" >&512906 +echo "$as_me:17227: result: no" >&5 12596 12907 echo "${ECHO_T}no" >&6 12597 12908 fi 12598 12909 12599 @@ -16849,8 +172 09,18 @@12910 @@ -16849,8 +17251,18 @@ 12600 12911 fi 12601 12912 … … 12617 12928 ac_config_commands="$ac_config_commands default" 12618 12929 cat >confcache <<\_ACEOF 12619 @@ -16932,7 +173 02,7 @@12930 @@ -16932,7 +17344,7 @@ 12620 12931 : ${CONFIG_STATUS=./config.status} 12621 12932 ac_clean_files_save=$ac_clean_files 12622 12933 ac_clean_files="$ac_clean_files $CONFIG_STATUS" 12623 12934 -{ echo "$as_me:16935: creating $CONFIG_STATUS" >&5 12624 +{ echo "$as_me:173 05: creating $CONFIG_STATUS" >&512935 +{ echo "$as_me:17347: creating $CONFIG_STATUS" >&5 12625 12936 echo "$as_me: creating $CONFIG_STATUS" >&6;} 12626 12937 cat >$CONFIG_STATUS <<_ACEOF 12627 12938 #! $SHELL 12628 @@ -17064,7 +174 34,7 @@12939 @@ -17064,7 +17476,7 @@ 12629 12940 cat >>$CONFIG_STATUS <<EOF 12630 12941 ac_cs_version="\\ … … 12635 12946 12636 12947 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 12637 @@ -17108,7 +17 478,7 @@12948 @@ -17108,7 +17520,7 @@ 12638 12949 echo "$ac_cs_version"; exit 0 ;; 12639 12950 --he | --h) 12640 12951 # Conflict between --help and --header 12641 12952 - { { echo "$as_me:17111: error: ambiguous option: $1 12642 + { { echo "$as_me:17 481: error: ambiguous option: $112953 + { { echo "$as_me:17523: error: ambiguous option: $1 12643 12954 Try \`$0 --help' for more information." >&5 12644 12955 echo "$as_me: error: ambiguous option: $1 12645 12956 Try \`$0 --help' for more information." >&2;} 12646 @@ -17127,7 +17 497,7 @@12957 @@ -17127,7 +17539,7 @@ 12647 12958 ac_need_defaults=false;; 12648 12959 12649 12960 # This is an error. 12650 12961 - -*) { { echo "$as_me:17130: error: unrecognized option: $1 12651 + -*) { { echo "$as_me:175 00: error: unrecognized option: $112962 + -*) { { echo "$as_me:17542: error: unrecognized option: $1 12652 12963 Try \`$0 --help' for more information." >&5 12653 12964 echo "$as_me: error: unrecognized option: $1 12654 12965 Try \`$0 --help' for more information." >&2;} 12655 @@ -17146,7 +175 16,7 @@12966 @@ -17146,7 +17558,7 @@ 12656 12967 ## Running config.status. ## 12657 12968 ## ----------------------- ## … … 12662 12973 CONFIG_HEADERS = $CONFIG_HEADERS 12663 12974 CONFIG_LINKS = $CONFIG_LINKS 12664 @@ -17181,13 +175 51,13 @@12975 @@ -17181,13 +17593,13 @@ 12665 12976 NCURSES_PATCH="$NCURSES_PATCH" 12666 12977 SRC_SUBDIRS="$SRC_SUBDIRS" … … 12679 12990 WITH_ECHO="$with_echo" 12680 12991 WITH_OVERWRITE="$with_overwrite" 12681 @@ -17206,6 +17 576,7 @@12992 @@ -17206,6 +17618,7 @@ 12682 12993 cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix" 12683 12994 cf_cv_system_name="$cf_cv_system_name" … … 12687 12998 target="$target" 12688 12999 12689 @@ -17224,7 +17 595,7 @@13000 @@ -17224,7 +17637,7 @@ 12690 13001 "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; 12691 13002 "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; 12692 13003 "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; 12693 13004 - *) { { echo "$as_me:17227: error: invalid argument: $ac_config_target" >&5 12694 + *) { { echo "$as_me:17 598: error: invalid argument: $ac_config_target" >&513005 + *) { { echo "$as_me:17640: error: invalid argument: $ac_config_target" >&5 12695 13006 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} 12696 13007 { (exit 1); exit 1; }; };; 12697 13008 esac 12698 @@ -17349,6 +177 20,8 @@13009 @@ -17349,6 +17762,8 @@ 12699 13010 s,@LINT@,$LINT,;t t 12700 13011 s,@LINT_OPTS@,$LINT_OPTS,;t t … … 12705 13016 s,@MAKE_LOWER_TAGS@,$MAKE_LOWER_TAGS,;t t 12706 13017 s,@MAKE_UPPER_TAGS@,$MAKE_UPPER_TAGS,;t t 12707 @@ -17359,7 +177 32,7 @@13018 @@ -17359,7 +17774,7 @@ 12708 13019 s,@ac_ct_LD@,$ac_ct_LD,;t t 12709 13020 s,@AR@,$AR,;t t … … 12714 13025 s,@BUILD_CC@,$BUILD_CC,;t t 12715 13026 s,@BUILD_CPP@,$BUILD_CPP,;t t 12716 @@ -17392,6 +17 765,7 @@13027 @@ -17392,6 +17807,7 @@ 12717 13028 s,@CXX_G_OPT@,$CXX_G_OPT,;t t 12718 13029 s,@LD_MODEL@,$LD_MODEL,;t t … … 12722 13033 s,@MK_SHARED_LIB@,$MK_SHARED_LIB,;t t 12723 13034 s,@LINK_PROGS@,$LINK_PROGS,;t t 12724 @@ -17425,6 +17799,7 @@ 13035 @@ -17401,7 +17817,6 @@ 13036 s,@LOCAL_LDFLAGS2@,$LOCAL_LDFLAGS2,;t t 13037 s,@INSTALL_LIB@,$INSTALL_LIB,;t t 13038 s,@TERMINFO_SRC@,$TERMINFO_SRC,;t t 13039 -s,@PATHSEP@,$PATHSEP,;t t 13040 s,@FALLBACK_LIST@,$FALLBACK_LIST,;t t 13041 s,@WHICH_XTERM@,$WHICH_XTERM,;t t 13042 s,@TERMINFO_DIRS@,$TERMINFO_DIRS,;t t 13043 @@ -17425,6 +17840,9 @@ 12725 13044 s,@NCURSES_OSPEED@,$NCURSES_OSPEED,;t t 12726 13045 s,@MANPAGE_RENAMES@,$MANPAGE_RENAMES,;t t 12727 13046 s,@NCURSES_EXT_FUNCS@,$NCURSES_EXT_FUNCS,;t t 12728 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 12729 13050 s,@NCURSES_CONST@,$NCURSES_CONST,;t t 12730 13051 s,@NCURSES_EXT_COLORS@,$NCURSES_EXT_COLORS,;t t 12731 13052 s,@NCURSES_MOUSE_VERSION@,$NCURSES_MOUSE_VERSION,;t t 12732 @@ -17449,7 +178 24,7 @@13053 @@ -17449,7 +17867,7 @@ 12733 13054 s,@CXXCPP@,$CXXCPP,;t t 12734 13055 s,@CXXLDFLAGS@,$CXXLDFLAGS,;t t … … 12739 13060 s,@USE_CXX_BOOL@,$USE_CXX_BOOL,;t t 12740 13061 s,@gnat_exists@,$gnat_exists,;t t 12741 @@ -17493,6 +17 868,7 @@13062 @@ -17493,6 +17911,7 @@ 12742 13063 s,@HAVE_TCGETATTR@,$HAVE_TCGETATTR,;t t 12743 13064 s,@HAVE_TERMIO_H@,$HAVE_TERMIO_H,;t t … … 12747 13068 12748 13069 EOF 12749 @@ -17607,7 +1 7983,7 @@13070 @@ -17607,7 +18026,7 @@ 12750 13071 esac 12751 13072 12752 13073 if test x"$ac_file" != x-; then 12753 13074 - { echo "$as_me:17610: creating $ac_file" >&5 12754 + { echo "$as_me:1 7986: creating $ac_file" >&513075 + { echo "$as_me:18029: creating $ac_file" >&5 12755 13076 echo "$as_me: creating $ac_file" >&6;} 12756 13077 rm -f "$ac_file" 12757 13078 fi 12758 @@ -17625,7 +180 01,7 @@13079 @@ -17625,7 +18044,7 @@ 12759 13080 -) echo $tmp/stdin ;; 12760 13081 [\\/$]*) 12761 13082 # Absolute (can't be DOS-style, as IFS=:) 12762 13083 - test -f "$f" || { { echo "$as_me:17628: error: cannot find input file: $f" >&5 12763 + test -f "$f" || { { echo "$as_me:180 04: error: cannot find input file: $f" >&513084 + test -f "$f" || { { echo "$as_me:18047: error: cannot find input file: $f" >&5 12764 13085 echo "$as_me: error: cannot find input file: $f" >&2;} 12765 13086 { (exit 1); exit 1; }; } 12766 13087 echo $f;; 12767 @@ -17638,7 +180 14,7 @@13088 @@ -17638,7 +18057,7 @@ 12768 13089 echo $srcdir/$f 12769 13090 else 12770 13091 # /dev/null tree 12771 13092 - { { echo "$as_me:17641: error: cannot find input file: $f" >&5 12772 + { { echo "$as_me:180 17: error: cannot find input file: $f" >&513093 + { { echo "$as_me:18060: error: cannot find input file: $f" >&5 12773 13094 echo "$as_me: error: cannot find input file: $f" >&2;} 12774 13095 { (exit 1); exit 1; }; } 12775 13096 fi;; 12776 @@ -17704,7 +18 080,7 @@13097 @@ -17704,7 +18123,7 @@ 12777 13098 * ) ac_file_in=$ac_file.in ;; 12778 13099 esac 12779 13100 12780 13101 - test x"$ac_file" != x- && { echo "$as_me:17707: creating $ac_file" >&5 12781 + test x"$ac_file" != x- && { echo "$as_me:18 083: creating $ac_file" >&513102 + test x"$ac_file" != x- && { echo "$as_me:18126: creating $ac_file" >&5 12782 13103 echo "$as_me: creating $ac_file" >&6;} 12783 13104 12784 13105 # First look for the input files in the build tree, otherwise in the 12785 @@ -17715,7 +18 091,7 @@13106 @@ -17715,7 +18134,7 @@ 12786 13107 -) echo $tmp/stdin ;; 12787 13108 [\\/$]*) 12788 13109 # Absolute (can't be DOS-style, as IFS=:) 12789 13110 - test -f "$f" || { { echo "$as_me:17718: error: cannot find input file: $f" >&5 12790 + test -f "$f" || { { echo "$as_me:18 094: error: cannot find input file: $f" >&513111 + test -f "$f" || { { echo "$as_me:18137: error: cannot find input file: $f" >&5 12791 13112 echo "$as_me: error: cannot find input file: $f" >&2;} 12792 13113 { (exit 1); exit 1; }; } 12793 13114 echo $f;; 12794 @@ -17728,7 +181 04,7 @@13115 @@ -17728,7 +18147,7 @@ 12795 13116 echo $srcdir/$f 12796 13117 else 12797 13118 # /dev/null tree 12798 13119 - { { echo "$as_me:17731: error: cannot find input file: $f" >&5 12799 + { { echo "$as_me:181 07: error: cannot find input file: $f" >&513120 + { { echo "$as_me:18150: error: cannot find input file: $f" >&5 12800 13121 echo "$as_me: error: cannot find input file: $f" >&2;} 12801 13122 { (exit 1); exit 1; }; } 12802 13123 fi;; 12803 @@ -17786,7 +18 162,7 @@13124 @@ -17786,7 +18205,7 @@ 12804 13125 rm -f $tmp/in 12805 13126 if test x"$ac_file" != x-; then 12806 13127 if cmp -s $ac_file $tmp/config.h 2>/dev/null; then 12807 13128 - { echo "$as_me:17789: $ac_file is unchanged" >&5 12808 + { echo "$as_me:18 165: $ac_file is unchanged" >&513129 + { echo "$as_me:18208: $ac_file is unchanged" >&5 12809 13130 echo "$as_me: $ac_file is unchanged" >&6;} 12810 13131 else 12811 13132 ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 12812 @@ -17873,40 +182 49,44 @@13133 @@ -17873,40 +18292,44 @@ 12813 13134 for cf_item in $cf_LIST_MODELS 12814 13135 do … … 12866 13187 cf_depsuf=$cf_suffix 12867 13188 ;; 12868 @@ -18020,40 +184 00,44 @@13189 @@ -18020,40 +18443,44 @@ 12869 13190 12870 13191 cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` … … 12922 13243 cf_depsuf=$cf_suffix 12923 13244 ;; 12924 @@ -18234,18 +186 18,28 @@13245 @@ -18234,18 +18661,28 @@ 12925 13246 install.libs uninstall.libs \\ 12926 13247 install.data uninstall.data :: … … 12951 13272 if test -f $srcdir/$tack.h; then 12952 13273 cat >> Makefile <<CF_EOF 12953 @@ -18256,6 +186 50,7 @@13274 @@ -18256,6 +18693,7 @@ 12954 13275 CF_EOF 12955 13276 fi … … 12961 13282 diff -Naur ncurses-5.7.orig/configure.in ncurses-5.7/configure.in 12962 13283 --- ncurses-5.7.orig/configure.in 2008-10-18 07:53:32.000000000 -0700 12963 +++ ncurses-5.7/configure.in 2009-0 1-27 16:45:02.344642827-080013284 +++ ncurses-5.7/configure.in 2009-02-28 20:38:57.043235088 -0800 12964 13285 @@ -1,5 +1,5 @@ 12965 13286 dnl*************************************************************************** … … 12974 13295 dnl 12975 13296 -dnl $Id: configure.in,v 1.454 2008/10/18 14:53:32 tom Exp $ 12976 +dnl $Id: configure.in,v 1.46 4 2009/01/10 19:18:03tom Exp $13297 +dnl $Id: configure.in,v 1.466 2009/02/15 00:19:01 tom Exp $ 12977 13298 dnl Process this file with autoconf to produce a configure script. 12978 13299 dnl … … 12982 13303 AC_PREREQ(2.13.20020210) 12983 13304 -AC_REVISION($Revision: 1.454 $) 12984 +AC_REVISION($Revision: 1.46 4$)13305 +AC_REVISION($Revision: 1.466 $) 12985 13306 AC_INIT(ncurses/base/lib_initscr.c) 12986 13307 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) … … 13050 13371 ############################################################################### 13051 13372 CF_HELP_MESSAGE(Extensions:) 13052 @@ -828,10 +860, 13@@13373 @@ -828,10 +860,30 @@ 13053 13374 AC_DEFINE(HAVE_USE_DEFAULT_COLORS) 13054 13375 AC_DEFINE(HAVE_WRESIZE) … … 13061 13382 AC_SUBST(NCURSES_EXT_FUNCS) 13062 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) 13063 13401 13064 13402 ### use option --enable-const to turn on use of const beyond that in XSI. 13065 13403 AC_MSG_CHECKING(for extended use of const keyword) 13066 @@ -1354,12 +1389,12 @@ 13404 @@ -1165,12 +1217,18 @@ 13405 AC_SUBST(ADA_TRACE) 13406 13407 ### Checks for libraries. 13408 +case $cf_cv_system_name in #(vi 13409 +*mingw32*) #(vi 13410 + ;; 13411 +*) 13412 AC_CHECK_FUNC(gettimeofday, 13413 AC_DEFINE(HAVE_GETTIMEOFDAY),[ 13414 13415 AC_CHECK_LIB(bsd, gettimeofday, 13416 AC_DEFINE(HAVE_GETTIMEOFDAY) 13417 LIBS="$LIBS -lbsd")])dnl CLIX: bzero, select, gettimeofday 13418 + ;; 13419 +esac 13420 13421 CF_MATH_LIB(MATH_LIB,sin(x)) 13422 AC_SUBST(MATH_LIB) 13423 @@ -1354,12 +1412,12 @@ 13067 13424 CF_CPP_STATIC_CAST 13068 13425 … … 13079 13436 ;; 13080 13437 sco3.2v5*) #(vi 13081 @@ -1368,13 +14 03,13 @@13438 @@ -1368,13 +1426,13 @@ 13082 13439 solaris2*) 13083 13440 if test "$GXX" != yes ; then … … 13095 13452 cf_cxx_library=no 13096 13453 cf_cv_builtin_bool=1 13097 @@ -1723,6 +1758,7 @@ 13454 @@ -1552,7 +1610,17 @@ 13455 fi 13456 fi 13457 13458 -LIB_SUBSETS="${LIB_SUBSETS}termlib" 13459 +LIB_SUBSETS="${LIB_SUBSETS}termlib+port_drivers" 13460 + 13461 +case $cf_cv_system_name in #(vi 13462 +*mingw32*) #(vi 13463 + LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo+port_win32con" 13464 + ;; 13465 +*) #(vi 13466 + LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo" 13467 + ;; 13468 +esac 13469 + 13470 test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_tinfo" 13471 if test "$with_termlib" != no ; then 13472 LIB_SUBSETS="${LIB_SUBSETS} " 13473 @@ -1561,6 +1629,7 @@ 13474 fi 13475 13476 LIB_SUBSETS="${LIB_SUBSETS}base" 13477 + 13478 test "$with_widec" = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" 13479 test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" 13480 13481 @@ -1723,6 +1792,7 @@ 13098 13482 AC_MSG_WARN(Wide-character applications must define HAVE_LIBUTF8_H to include curses.h) 13099 13483 fi … … 13103 13487 AC_SUBST(WITH_OVERWRITE) 13104 13488 AC_SUBST(TICS_LIST) 13105 @@ -1742, 7 +1778,7@@13489 @@ -1742,12 +1812,12 @@ 13106 13490 CF_SRC_MODULES($modules_to_build) 13107 13491 … … 13112 13496 13113 13497 CF_DIRS_TO_MAKE 13114 @@ -1765,8 +1801,19 @@ 13498 13499 -AC_DEFINE_UNQUOTED(NCURSES_PATHSEP,'$PATHSEP') 13500 +AC_DEFINE_UNQUOTED(NCURSES_PATHSEP,'$PATH_SEPARATOR') 13501 13502 AC_DEFINE_UNQUOTED(NCURSES_VERSION_STRING, "${NCURSES_MAJOR}.${NCURSES_MINOR}.${NCURSES_PATCH}") 13503 13504 @@ -1765,8 +1835,19 @@ 13115 13505 CF_SUBST_IF(["$ac_cv_header_termios_h" = yes], HAVE_TERMIOS_H, 1, 0) 13116 13506 … … 13133 13523 include/MKterm.h.awk \ 13134 13524 include/curses.head:include/curses.h.in \ 13135 @@ -1796,13 +18 43,13 @@13525 @@ -1796,13 +1877,13 @@ 13136 13526 NCURSES_PATCH="$NCURSES_PATCH" 13137 13527 SRC_SUBDIRS="$SRC_SUBDIRS" … … 13150 13540 WITH_ECHO="$with_echo" 13151 13541 WITH_OVERWRITE="$with_overwrite" 13152 @@ -1821,6 +1 868,7 @@13542 @@ -1821,6 +1902,7 @@ 13153 13543 cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix" 13154 13544 cf_cv_system_name="$cf_cv_system_name" … … 13160 13550 diff -Naur ncurses-5.7.orig/dist.mk ncurses-5.7/dist.mk 13161 13551 --- ncurses-5.7.orig/dist.mk 2008-11-01 17:58:38.000000000 -0700 13162 +++ ncurses-5.7/dist.mk 2009-0 1-27 16:45:05.084820505-080013552 +++ ncurses-5.7/dist.mk 2009-02-28 20:38:59.855417236 -0800 13163 13553 @@ -25,7 +25,7 @@ 13164 13554 # use or other dealings in this Software without prior written # … … 13166 13556 ############################################################################## 13167 13557 -# $Id: dist.mk,v 1.671 2008/11/02 00:58:38 tom Exp $ 13168 +# $Id: dist.mk,v 1.68 4 2009/01/24 20:49:01tom Exp $13558 +# $Id: dist.mk,v 1.688 2009/02/28 14:49:13 tom Exp $ 13169 13559 # Makefile for creating ncurses distributions. 13170 13560 # … … 13175 13565 NCURSES_MINOR = 7 13176 13566 -NCURSES_PATCH = 20081102 13177 +NCURSES_PATCH = 20090 12413567 +NCURSES_PATCH = 20090228 13178 13568 13179 13569 # We don't append the patch to the version, since this only applies to releases 13180 13570 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) 13571 diff -Naur ncurses-5.7.orig/form/fld_def.c ncurses-5.7/form/fld_def.c 13572 --- ncurses-5.7.orig/form/fld_def.c 2007-10-13 12:29:58.000000000 -0700 13573 +++ ncurses-5.7/form/fld_def.c 2009-02-28 20:38:59.855417236 -0800 13574 @@ -32,7 +32,7 @@ 13575 13576 #include "form.priv.h" 13577 13578 -MODULE_ID("$Id: fld_def.c,v 1.36 2007/10/13 19:29:58 tom Exp $") 13579 +MODULE_ID("$Id: fld_def.c,v 1.37 2009/02/28 19:00:51 juergen Exp $") 13580 13581 /* this can't be readonly */ 13582 static FIELD default_field = 13583 @@ -252,8 +252,8 @@ 13584 if (field->type != 0) 13585 { 13586 field->type->ref--; 13587 + _nc_Free_Argument(field->type, (TypeArgument *)(field->arg)); 13588 } 13589 - _nc_Free_Argument(field->type, (TypeArgument *)(field->arg)); 13590 } 13591 13592 /*--------------------------------------------------------------------------- 13181 13593 diff -Naur ncurses-5.7.orig/form/frm_driver.c ncurses-5.7/form/frm_driver.c 13182 13594 --- ncurses-5.7.orig/form/frm_driver.c 2008-10-18 09:25:00.000000000 -0700 13183 +++ ncurses-5.7/form/frm_driver.c 2009-0 1-27 16:44:49.391812822-080013595 +++ ncurses-5.7/form/frm_driver.c 2009-02-28 20:38:39.770130185 -0800 13184 13596 @@ -32,7 +32,7 @@ 13185 13597 … … 13201 13613 diff -Naur ncurses-5.7.orig/form/Makefile.in ncurses-5.7/form/Makefile.in 13202 13614 --- ncurses-5.7.orig/form/Makefile.in 2007-04-28 07:56:11.000000000 -0700 13203 +++ ncurses-5.7/form/Makefile.in 2009-0 1-27 16:44:58.024366252 -080013615 +++ ncurses-5.7/form/Makefile.in 2009-02-28 20:38:46.310547562 -0800 13204 13616 @@ -1,6 +1,6 @@ 13205 13617 -# $Id: Makefile.in,v 1.47 2007/04/28 14:56:11 tom Exp $ … … 13220 13632 LD = @LD@ 13221 13633 LN_S = @LN_S@ 13222 diff -Naur ncurses-5.7.orig/include/c urses.h.in ncurses-5.7/include/curses.h.in13223 --- ncurses-5.7.orig/include/c urses.h.in 2008-08-30 13:11:29.000000000 -070013224 +++ ncurses-5.7/include/c urses.h.in 2009-01-27 16:44:52.892037156-080013634 diff -Naur ncurses-5.7.orig/include/capdefaults.c ncurses-5.7/include/capdefaults.c 13635 --- ncurses-5.7.orig/include/capdefaults.c 2008-08-04 05:33:42.000000000 -0700 13636 +++ ncurses-5.7/include/capdefaults.c 2009-02-28 20:38:58.435326721 -0800 13225 13637 @@ -32,7 +32,7 @@ 13226 13638 * and: Thomas E. Dickey 1996-on * 13227 13639 ****************************************************************************/ 13228 13640 13641 -/* $Id: capdefaults.c,v 1.13 2008/08/04 12:33:42 tom Exp $ */ 13642 +/* $Id: capdefaults.c,v 1.14 2008/11/16 00:19:59 juergen Exp $ */ 13643 13644 /* 13645 * Compute obsolete capabilities. The reason this is an include file is 13646 @@ -44,11 +44,11 @@ 13647 * postprocess_termcap(). 13648 */ 13649 { 13650 - char *sp; 13651 + char *strp; 13652 short capval; 13653 13654 #define EXTRACT_DELAY(str) \ 13655 - (short) (sp = strchr(str, '*'), sp ? atoi(sp+1) : 0) 13656 + (short) (strp = strchr(str, '*'), strp ? atoi(strp+1) : 0) 13657 13658 /* current (4.4BSD) capabilities marked obsolete */ 13659 if (VALID_STRING(carriage_return) 13660 diff -Naur ncurses-5.7.orig/include/curses.h.in ncurses-5.7/include/curses.h.in 13661 --- ncurses-5.7.orig/include/curses.h.in 2008-08-30 13:11:29.000000000 -0700 13662 +++ ncurses-5.7/include/curses.h.in 2009-02-28 20:38:58.435326721 -0800 13663 @@ -1,5 +1,5 @@ 13664 /**************************************************************************** 13665 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 13666 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 13667 * * 13668 * Permission is hereby granted, free of charge, to any person obtaining a * 13669 * copy of this software and associated documentation files (the * 13670 @@ -32,7 +32,7 @@ 13671 * and: Thomas E. Dickey 1996-on * 13672 ****************************************************************************/ 13673 13229 13674 -/* $Id: curses.h.in,v 1.187 2008/08/30 20:11:29 tom Exp $ */ 13230 +/* $Id: curses.h.in,v 1.19 0 2008/12/20 22:28:52tom Exp $ */13675 +/* $Id: curses.h.in,v 1.194 2009/02/21 22:44:41 tom Exp $ */ 13231 13676 13232 13677 #ifndef __NCURSES_H … … 13245 13690 #define NCURSES_VERSION_MAJOR @NCURSES_MAJOR@ 13246 13691 #define NCURSES_VERSION_MINOR @NCURSES_MINOR@ 13247 @@ -856,18 +850,18 @@ 13692 @@ -110,6 +104,13 @@ 13693 #endif 13694 13695 /* 13696 + * The reentrant code relies on the opaque setting, but adds features. 13697 + */ 13698 +#ifndef NCURSES_REENTRANT 13699 +#define NCURSES_REENTRANT @cf_cv_enable_reentrant@ 13700 +#endif 13701 + 13702 +/* 13703 * The internal type used for window dimensions. 13704 */ 13705 #undef NCURSES_SIZE_T 13706 @@ -224,7 +225,7 @@ 13707 13708 /* line graphics */ 13709 13710 -#if @BROKEN_LINKER@ || @cf_cv_enable_reentrant@ 13711 +#if @BROKEN_LINKER@ || NCURSES_REENTRANT 13712 NCURSES_WRAPPED_VAR(chtype*, acs_map); 13713 #define acs_map (_nc_acs_map()) 13714 #else 13715 @@ -646,7 +647,7 @@ 13716 extern NCURSES_EXPORT(int) mvwinnstr (WINDOW *, int, int, char *, int); /* generated */ 13717 extern NCURSES_EXPORT(int) mvwinsch (WINDOW *, int, int, chtype); /* generated */ 13718 extern NCURSES_EXPORT(int) mvwinsnstr (WINDOW *, int, int, const char *, int); /* generated */ 13719 -extern NCURSES_EXPORT(int) mvwinsstr (WINDOW *, int, int, const char *); /* generated */ 13720 +extern NCURSES_EXPORT(int) mvwinsstr (WINDOW *, int, int, const char *); /* generated */ 13721 extern NCURSES_EXPORT(int) mvwinstr (WINDOW *, int, int, char *); /* generated */ 13722 extern NCURSES_EXPORT(int) mvwprintw (WINDOW*,int,int, const char *,...) /* implemented */ 13723 GCC_PRINTFLIKE(4,5); 13724 @@ -654,9 +655,9 @@ 13725 GCC_SCANFLIKE(4,5); 13726 extern NCURSES_EXPORT(int) mvwvline (WINDOW *,int, int, chtype, int); /* generated */ 13727 extern NCURSES_EXPORT(int) napms (int); /* implemented */ 13728 -extern NCURSES_EXPORT(WINDOW *) newpad (int,int); /* implemented */ 13729 +extern NCURSES_EXPORT(WINDOW *) newpad (int,int); /* implemented */ 13730 extern NCURSES_EXPORT(SCREEN *) newterm (NCURSES_CONST char *,FILE *,FILE *); /* implemented */ 13731 -extern NCURSES_EXPORT(WINDOW *) newwin (int,int,int,int); /* implemented */ 13732 +extern NCURSES_EXPORT(WINDOW *) newwin (int,int,int,int); /* implemented */ 13733 extern NCURSES_EXPORT(int) nl (void); /* implemented */ 13734 extern NCURSES_EXPORT(int) nocbreak (void); /* implemented */ 13735 extern NCURSES_EXPORT(int) nodelay (WINDOW *,bool); /* implemented */ 13736 @@ -710,7 +711,7 @@ 13737 extern NCURSES_EXPORT(int) slk_refresh (void); /* implemented */ 13738 extern NCURSES_EXPORT(int) slk_restore (void); /* implemented */ 13739 extern NCURSES_EXPORT(int) slk_set (int,const char *,int); /* implemented */ 13740 -extern NCURSES_EXPORT(int) slk_touch (void); /* implemented */ 13741 +extern NCURSES_EXPORT(int) slk_touch (void); /* implemented */ 13742 extern NCURSES_EXPORT(int) standout (void); /* generated */ 13743 extern NCURSES_EXPORT(int) standend (void); /* generated */ 13744 extern NCURSES_EXPORT(int) start_color (void); /* implemented */ 13745 @@ -856,23 +857,119 @@ 13248 13746 * These extensions provide access to information stored in the WINDOW even 13249 13747 * when NCURSES_OPAQUE is set: … … 13276 13774 #else 13277 13775 #define curses_version() NCURSES_VERSION 13776 #endif 13777 13778 +/* 13779 + * Extra extension-functions, which pass a SCREEN pointer rather than using 13780 + * a global variable SP. 13781 + */ 13782 +#if @NCURSES_SP_FUNCS@ 13783 +#undef NCURSES_SP_FUNCS 13784 +#define NCURSES_SP_FUNCS @NCURSES_PATCH@ 13785 +#define NCURSES_SP_NAME(name) name##_sp 13786 + 13787 +extern NCURSES_EXPORT(SCREEN*) new_prescr(void); /* implemented */ 13788 + 13789 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(baudrate) (SCREEN*); /* implemented */ 13790 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(beep) (SCREEN*); /* implemented */ 13791 +extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(can_change_color) (SCREEN*); /* implemented */ 13792 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(cbreak) (SCREEN*); /* implemented */ 13793 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(color_content) (SCREEN*, short, short*, short*, short*); /* implemented */ 13794 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(def_prog_mode) (SCREEN*); /* implemented */ 13795 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(def_shell_mode) (SCREEN*); /* implemented */ 13796 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(delay_output) (SCREEN*, int); /* implemented */ 13797 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(doupdate) (SCREEN*); /* implemented */ 13798 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(echo) (SCREEN*); /* implemented */ 13799 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(endwin) (SCREEN*); /* implemented */ 13800 +extern NCURSES_EXPORT(char) NCURSES_SP_NAME(erasechar) (SCREEN*);/* implemented */ 13801 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(filter) (SCREEN*); /* implemented */ 13802 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(flash) (SCREEN*); /* implemented */ 13803 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(flushinp) (SCREEN*); /* implemented */ 13804 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(halfdelay)(SCREEN*, int); /* implemented */ 13805 +extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(has_colors) (SCREEN*); /* implemented */ 13806 +extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(has_ic) (SCREEN*); /* implemented */ 13807 +extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(has_il) (SCREEN*); /* implemented */ 13808 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(init_color) (SCREEN*, short, short, short, short); /* implemented */ 13809 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(init_pair) (SCREEN*, short, short, short); /* implemented */ 13810 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(intrflush) (SCREEN*, WINDOW*, bool); /* implemented */ 13811 +extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(isendwin) (SCREEN*); /* implemented */ 13812 +extern NCURSES_EXPORT(NCURSES_CONST char *) NCURSES_SP_NAME(keyname) (SCREEN*, int); /* implemented */ 13813 +extern NCURSES_EXPORT(char) NCURSES_SP_NAME(killchar) (SCREEN*); /* implemented */ 13814 +extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(longname) (SCREEN*); /* implemented */ 13815 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(mvcur) (SCREEN*, int, int, int, int); /* implemented */ 13816 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(napms) (SCREEN*, int); /* implemented */ 13817 +extern NCURSES_EXPORT(WINDOW *) NCURSES_SP_NAME(newpad) (SCREEN*, int, int); /* implemented */ 13818 +extern NCURSES_EXPORT(SCREEN *) NCURSES_SP_NAME(newterm) (SCREEN*, NCURSES_CONST char *, FILE *, FILE *); /* implemented */ 13819 +extern NCURSES_EXPORT(WINDOW *) NCURSES_SP_NAME(newwin) (SCREEN*, int, int, int, int); /* implemented */ 13820 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(nl) (SCREEN*); /* implemented */ 13821 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(nocbreak) (SCREEN*); /* implemented */ 13822 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(noecho) (SCREEN*); /* implemented */ 13823 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(nofilter) (SCREEN*); /* implemented */ 13824 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(nonl) (SCREEN*); /* implemented */ 13825 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(noqiflush) (SCREEN*); /* implemented */ 13826 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(noraw) (SCREEN*); /* implemented */ 13827 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(pair_content) (SCREEN*, short, short*, short*); /* implemented */ 13828 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(qiflush) (SCREEN*); /* implemented */ 13829 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(raw) (SCREEN*); /* implemented */ 13830 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(reset_prog_mode) (SCREEN*); /* implemented */ 13831 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(reset_shell_mode) (SCREEN*); /* implemented */ 13832 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(ripoffline) (SCREEN*, int, int (*)(WINDOW *, int)); /* implemented */ 13833 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(scr_init) (SCREEN*, const char *); /* implemented */ 13834 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(scr_restore) (SCREEN*, const char *); /* implemented */ 13835 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(scr_set) (SCREEN*, const char *); /* implemented */ 13836 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attroff) (SCREEN*, const chtype); /* implemented */ 13837 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attron) (SCREEN*, const chtype); /* implemented */ 13838 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attrset) (SCREEN*, const chtype); /* implemented */ 13839 +extern NCURSES_EXPORT(attr_t) NCURSES_SP_NAME(slk_attr) (SCREEN*); /* implemented */ 13840 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attr_set) (SCREEN*, const attr_t, short, void*); /* implemented */ 13841 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_clear) (SCREEN*); /* implemented */ 13842 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_color) (SCREEN*, short); /* implemented */ 13843 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_init) (SCREEN*, int); /* implemented */ 13844 +extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(slk_label) (SCREEN*, int); /* implemented */ 13845 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_noutrefresh) (SCREEN*); /* implemented */ 13846 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_refresh) (SCREEN*); /* implemented */ 13847 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_restore) (SCREEN*); /* implemented */ 13848 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_set) (SCREEN*, int, const char *, int); /* implemented */ 13849 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_touch) (SCREEN*); /* implemented */ 13850 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(start_color) (SCREEN*); /* implemented */ 13851 +extern NCURSES_EXPORT(chtype) NCURSES_SP_NAME(termattrs) (SCREEN*); /* implemented */ 13852 +extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(termname) (SCREEN*); /* implemented */ 13853 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(typeahead) (SCREEN*, int); /* implemented */ 13854 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(ungetch) (SCREEN*, int); /* implemented */ 13855 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(use_env) (SCREEN*, bool); /* implemented */ 13856 +#if @NCURSES_EXT_FUNCS@ 13857 +extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(keybound) (SCREEN*, int, int); 13858 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(assume_default_colors) (SCREEN*, int, int); 13859 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(define_key) (SCREEN*, const char *, int); 13860 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(get_escdelay) (SCREEN*); 13861 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(key_defined)(SCREEN*, const char *); 13862 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(keyok) (SCREEN*, int, bool); 13863 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(set_escdelay) (SCREEN*, int); 13864 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(set_tabsize) (SCREEN*, int); 13865 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(use_default_colors) (SCREEN*); 13866 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(use_legacy_coding) (SCREEN*, int); 13867 +#endif 13868 +#else 13869 +#undef NCURSES_SP_FUNCS 13870 +#define NCURSES_SP_FUNCS 0 13871 +#define NCURSES_SP_NAME(name) name 13872 +#endif 13873 + 13874 /* attributes */ 13875 13876 #define NCURSES_ATTR_SHIFT 8 13877 @@ -1173,7 +1270,7 @@ 13878 * It gives the ESC expire time in milliseconds. 13879 * b. ttytype is needed for backward compatibility 13880 */ 13881 -#if @cf_cv_enable_reentrant@ 13882 +#if NCURSES_REENTRANT 13883 13884 NCURSES_WRAPPED_VAR(WINDOW *, curscr); 13885 NCURSES_WRAPPED_VAR(WINDOW *, newscr); 13278 13886 diff -Naur ncurses-5.7.orig/include/curses.tail ncurses-5.7/include/curses.tail 13279 13887 --- ncurses-5.7.orig/include/curses.tail 2008-07-05 13:20:38.000000000 -0700 13280 +++ ncurses-5.7/include/curses.tail 2009-0 1-27 16:44:46.511630953-080013888 +++ ncurses-5.7/include/curses.tail 2009-02-28 20:38:37.161961447 -0800 13281 13889 @@ -1,4 +1,4 @@ 13282 13890 -/* $Id: curses.tail,v 1.16 2008/07/05 20:20:38 tom Exp $ */ … … 13295 13903 diff -Naur ncurses-5.7.orig/include/curses.wide ncurses-5.7/include/curses.wide 13296 13904 --- ncurses-5.7.orig/include/curses.wide 2007-03-10 09:52:23.000000000 -0800 13297 +++ ncurses-5.7/include/curses.wide 2009-0 1-27 16:44:48.051726777-080013905 +++ ncurses-5.7/include/curses.wide 2009-02-28 20:38:38.454044419 -0800 13298 13906 @@ -1,9 +1,11 @@ 13299 13907 -/* $Id: curses.wide,v 1.34 2007/03/10 17:52:23 tom Exp $ */ … … 13309 13917 13310 13918 extern NCURSES_EXPORT_VAR(cchar_t *) _nc_wacs; 13919 diff -Naur ncurses-5.7.orig/include/MKterm.h.awk.in ncurses-5.7/include/MKterm.h.awk.in 13920 --- ncurses-5.7.orig/include/MKterm.h.awk.in 2008-05-24 16:13:59.000000000 -0700 13921 +++ ncurses-5.7/include/MKterm.h.awk.in 2009-02-28 20:38:59.855417236 -0800 13922 @@ -1,7 +1,7 @@ 13923 # vile:awkmode 13924 BEGIN { 13925 print "/****************************************************************************" 13926 - print " * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. *" 13927 + print " * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. *" 13928 print " * *" 13929 print " * Permission is hereby granted, free of charge, to any person obtaining a *" 13930 print " * copy of this software and associated documentation files (the *" 13931 @@ -34,7 +34,7 @@ 13932 print "/* and: Thomas E. Dickey 1995-on */" 13933 print "/****************************************************************************/" 13934 print "" 13935 - print "/* $Id: MKterm.h.awk.in,v 1.50 2008/05/24 23:13:59 tom Exp $ */" 13936 + print "/* $Id: MKterm.h.awk.in,v 1.53 2009/02/28 21:27:45 tom Exp $ */" 13937 print "" 13938 print "/*" 13939 print "** term.h -- Definition of struct term" 13940 @@ -228,8 +228,16 @@ 13941 print " char * _termname; /* used for termname() */" 13942 print "} TERMINAL;" 13943 print "" 13944 - print "#if @BROKEN_LINKER@ || @cf_cv_enable_reentrant@" 13945 + print "#if @BROKEN_LINKER@ && !@cf_cv_enable_reentrant@" 13946 + print "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;" 13947 + print "#elif @cf_cv_enable_reentrant@" 13948 print "NCURSES_WRAPPED_VAR(TERMINAL *, cur_term);" 13949 + print "#define cur_term NCURSES_PUBLIC_VAR(cur_term())" 13950 + print "#else" 13951 + print "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;" 13952 + print "#endif" 13953 + print "" 13954 + print "#if @BROKEN_LINKER@ || @cf_cv_enable_reentrant@" 13955 print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolnames);" 13956 print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolcodes);" 13957 print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolfnames);" 13958 @@ -240,7 +248,6 @@ 13959 print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strcodes);" 13960 print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strfnames);" 13961 print "" 13962 - print "#define cur_term NCURSES_PUBLIC_VAR(cur_term())" 13963 print "#define boolnames NCURSES_PUBLIC_VAR(boolnames())" 13964 print "#define boolcodes NCURSES_PUBLIC_VAR(boolcodes())" 13965 print "#define boolfnames NCURSES_PUBLIC_VAR(boolfnames())" 13966 @@ -253,8 +260,6 @@ 13967 print "" 13968 print "#else" 13969 print "" 13970 - print "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;" 13971 - print "" 13972 print "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolnames[];" 13973 print "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolcodes[];" 13974 print "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolfnames[];" 13311 13975 diff -Naur ncurses-5.7.orig/INSTALL ncurses-5.7/INSTALL 13312 13976 --- ncurses-5.7.orig/INSTALL 2008-11-02 13:13:51.000000000 -0800 13313 +++ ncurses-5.7/INSTALL 2009-0 1-27 16:44:58.000364576-080013977 +++ ncurses-5.7/INSTALL 2009-02-28 20:38:46.282546444 -0800 13314 13978 @@ -1,5 +1,5 @@ 13315 13979 ------------------------------------------------------------------------------- … … 13362 14026 diff -Naur ncurses-5.7.orig/man/curs_color.3x ncurses-5.7/man/curs_color.3x 13363 14027 --- ncurses-5.7.orig/man/curs_color.3x 2005-12-17 16:00:37.000000000 -0800 13364 +++ ncurses-5.7/man/curs_color.3x 2009-0 1-27 16:45:05.084820505-080014028 +++ ncurses-5.7/man/curs_color.3x 2009-02-28 20:38:53.014978628 -0800 13365 14029 @@ -1,5 +1,5 @@ 13366 14030 .\"*************************************************************************** … … 13393 14057 diff -Naur ncurses-5.7.orig/man/curs_mouse.3x ncurses-5.7/man/curs_mouse.3x 13394 14058 --- ncurses-5.7.orig/man/curs_mouse.3x 2006-12-30 15:43:34.000000000 -0800 13395 +++ ncurses-5.7/man/curs_mouse.3x 2009-0 1-27 16:44:46.515630395-080014059 +++ ncurses-5.7/man/curs_mouse.3x 2009-02-28 20:38:37.161961447 -0800 13396 14060 @@ -1,6 +1,6 @@ 13397 14061 '\" t … … 13439 14103 diff -Naur ncurses-5.7.orig/man/keybound.3x ncurses-5.7/man/keybound.3x 13440 14104 --- ncurses-5.7.orig/man/keybound.3x 2006-02-25 13:47:06.000000000 -0800 13441 +++ ncurses-5.7/man/keybound.3x 2009-0 1-27 16:44:51.023917306-080014105 +++ ncurses-5.7/man/keybound.3x 2009-02-28 20:38:41.374231037 -0800 13442 14106 @@ -1,5 +1,5 @@ 13443 14107 .\"*************************************************************************** … … 13460 14124 diff -Naur ncurses-5.7.orig/man/tabs.1 ncurses-5.7/man/tabs.1 13461 14125 --- ncurses-5.7.orig/man/tabs.1 1969-12-31 16:00:00.000000000 -0800 13462 +++ ncurses-5.7/man/tabs.1 2009-0 1-27 16:44:45.091537644-080014126 +++ ncurses-5.7/man/tabs.1 2009-02-28 20:38:35.777872887 -0800 13463 14127 @@ -0,0 +1,143 @@ 13464 14128 +.\"*************************************************************************** … … 13607 14271 diff -Naur ncurses-5.7.orig/man/tset.1 ncurses-5.7/man/tset.1 13608 14272 --- ncurses-5.7.orig/man/tset.1 2006-12-24 07:00:30.000000000 -0800 13609 +++ ncurses-5.7/man/tset.1 2009-0 1-27 16:44:45.091537644-080014273 +++ ncurses-5.7/man/tset.1 2009-02-28 20:38:35.777872887 -0800 13610 14274 @@ -1,5 +1,5 @@ 13611 14275 .\"*************************************************************************** … … 13628 14292 diff -Naur ncurses-5.7.orig/MANIFEST ncurses-5.7/MANIFEST 13629 14293 --- ncurses-5.7.orig/MANIFEST 2008-10-25 16:47:24.000000000 -0700 13630 +++ ncurses-5.7/MANIFEST 2009-0 1-27 16:44:58.000364576-080014294 +++ ncurses-5.7/MANIFEST 2009-02-28 20:38:46.282546444 -0800 13631 14295 @@ -640,6 +640,7 @@ 13632 14296 ./man/ncurses.3x … … 13671 14335 diff -Naur ncurses-5.7.orig/menu/Makefile.in ncurses-5.7/menu/Makefile.in 13672 14336 --- ncurses-5.7.orig/menu/Makefile.in 2007-04-28 07:56:11.000000000 -0700 13673 +++ ncurses-5.7/menu/Makefile.in 2009-0 1-27 16:44:58.024366252 -080014337 +++ ncurses-5.7/menu/Makefile.in 2009-02-28 20:38:46.310547562 -0800 13674 14338 @@ -1,6 +1,6 @@ 13675 14339 -# $Id: Makefile.in,v 1.48 2007/04/28 14:56:11 tom Exp $ … … 13690 14354 LD = @LD@ 13691 14355 LN_S = @LN_S@ 14356 diff -Naur ncurses-5.7.orig/menu/m_cursor.c ncurses-5.7/menu/m_cursor.c 14357 --- ncurses-5.7.orig/menu/m_cursor.c 2005-10-22 16:03:32.000000000 -0700 14358 +++ ncurses-5.7/menu/m_cursor.c 2009-02-28 20:38:59.855417236 -0800 14359 @@ -1,5 +1,5 @@ 14360 /**************************************************************************** 14361 - * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. * 14362 + * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * 14363 * * 14364 * Permission is hereby granted, free of charge, to any person obtaining a * 14365 * copy of this software and associated documentation files (the * 14366 @@ -37,7 +37,7 @@ 14367 14368 #include "menu.priv.h" 14369 14370 -MODULE_ID("$Id: m_cursor.c,v 1.20 2005/10/22 23:03:32 tom Exp $") 14371 +MODULE_ID("$Id: m_cursor.c,v 1.21 2009/02/28 21:02:46 juergen Exp $") 14372 14373 /*--------------------------------------------------------------------------- 14374 | Facility : libnmenu 14375 @@ -90,7 +90,7 @@ 14376 14377 if (E_OK == err) 14378 { 14379 - win = menu->userwin ? menu->userwin : stdscr; 14380 + win = Get_Menu_UserWin(menu); 14381 sub = menu->usersub ? menu->usersub : win; 14382 assert(win && sub); 14383 14384 diff -Naur ncurses-5.7.orig/menu/m_driver.c ncurses-5.7/menu/m_driver.c 14385 --- ncurses-5.7.orig/menu/m_driver.c 2008-08-03 15:08:22.000000000 -0700 14386 +++ ncurses-5.7/menu/m_driver.c 2009-02-28 20:38:59.855417236 -0800 14387 @@ -1,5 +1,5 @@ 14388 /**************************************************************************** 14389 - * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc. * 14390 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 14391 * * 14392 * Permission is hereby granted, free of charge, to any person obtaining a * 14393 * copy of this software and associated documentation files (the * 14394 @@ -37,7 +37,7 @@ 14395 14396 #include "menu.priv.h" 14397 14398 -MODULE_ID("$Id: m_driver.c,v 1.27 2008/08/03 22:08:22 tom Exp $") 14399 +MODULE_ID("$Id: m_driver.c,v 1.28 2009/02/28 21:02:46 juergen Exp $") 14400 14401 /* Macros */ 14402 14403 @@ -197,7 +197,7 @@ 14404 14405 /*--------------------------------------------------------------------------- 14406 | Facility : libnmenu 14407 -| Function : int menu_driver(MENU *menu, int c) 14408 +| Function : int menu_driver(MENU* menu, int c) 14409 | 14410 | Description : Central dispatcher for the menu. Translates the logical 14411 | request 'c' into a menu action. 14412 diff -Naur ncurses-5.7.orig/menu/menu.priv.h ncurses-5.7/menu/menu.priv.h 14413 --- ncurses-5.7.orig/menu/menu.priv.h 2005-01-15 17:02:23.000000000 -0800 14414 +++ ncurses-5.7/menu/menu.priv.h 2009-02-28 20:38:59.859415560 -0800 14415 @@ -1,5 +1,5 @@ 14416 /**************************************************************************** 14417 - * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. * 14418 + * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * 14419 * * 14420 * Permission is hereby granted, free of charge, to any person obtaining a * 14421 * copy of this software and associated documentation files (the * 14422 @@ -30,7 +30,7 @@ 14423 * Author: Juergen Pfeifer, 1995,1997 * 14424 ****************************************************************************/ 14425 14426 -/* $Id: menu.priv.h,v 1.22 2005/01/16 01:02:23 tom Exp $ */ 14427 +/* $Id: menu.priv.h,v 1.23 2009/02/28 21:02:57 juergen Exp $ */ 14428 14429 /*************************************************************************** 14430 * Module menu.priv.h * 14431 @@ -56,8 +56,12 @@ 14432 /* Normalize menu to default if none was given */ 14433 #define Normalize_Menu( menu ) ((menu)=(menu)?(menu):&_nc_Default_Menu) 14434 14435 +#define Get_Menu_Screen( menu ) (menu->userwin ? \ 14436 + _nc_screen_of(menu->userwin) : CURRENT_SCREEN) 14437 + 14438 /* Get the user defined (framing) window of the menu */ 14439 -#define Get_Menu_UserWin(menu) ((menu)->userwin ? (menu)->userwin : stdscr) 14440 +#define Get_Menu_UserWin(menu) ((menu)->userwin ? \ 14441 + (menu)->userwin : CURRENT_SCREEN->_stdscr) 14442 14443 /* Normalize menu window */ 14444 #define Get_Menu_Window( menu ) \ 14445 diff -Naur ncurses-5.7.orig/menu/m_global.c ncurses-5.7/menu/m_global.c 14446 --- ncurses-5.7.orig/menu/m_global.c 2005-12-31 13:51:52.000000000 -0800 14447 +++ ncurses-5.7/menu/m_global.c 2009-02-28 20:38:59.855417236 -0800 14448 @@ -1,5 +1,5 @@ 14449 /**************************************************************************** 14450 - * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. * 14451 + * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * 14452 * * 14453 * Permission is hereby granted, free of charge, to any person obtaining a * 14454 * copy of this software and associated documentation files (the * 14455 @@ -37,7 +37,7 @@ 14456 14457 #include "menu.priv.h" 14458 14459 -MODULE_ID("$Id: m_global.c,v 1.23 2005/12/31 21:51:52 tom Exp $") 14460 +MODULE_ID("$Id: m_global.c,v 1.24 2009/02/28 21:02:46 juergen Exp $") 14461 14462 static char mark[] = "-"; 14463 /* *INDENT-OFF* */ 14464 @@ -496,7 +496,7 @@ 14465 14466 /*--------------------------------------------------------------------------- 14467 | Facility : libnmenu 14468 -| Function : void _nc_Show_Menu(const MENU *menu) 14469 +| Function : void _nc_Show_Menu(const MENU* menu) 14470 | 14471 | Description : Update the window that is associated with the menu 14472 | 14473 @@ -543,8 +543,10 @@ 14474 | Return Values : - 14475 +--------------------------------------------------------------------------*/ 14476 NCURSES_EXPORT(void) 14477 - _nc_New_TopRow_and_CurrentItem 14478 - (MENU * menu, int new_toprow, ITEM * new_current_item) 14479 +_nc_New_TopRow_and_CurrentItem( 14480 + MENU * menu, 14481 + int new_toprow, 14482 + ITEM * new_current_item) 14483 { 14484 ITEM *cur_item; 14485 bool mterm_called = FALSE; 14486 diff -Naur ncurses-5.7.orig/menu/m_post.c ncurses-5.7/menu/m_post.c 14487 --- ncurses-5.7.orig/menu/m_post.c 2004-12-25 15:57:04.000000000 -0800 14488 +++ ncurses-5.7/menu/m_post.c 2009-02-28 20:38:59.855417236 -0800 14489 @@ -1,5 +1,5 @@ 14490 /**************************************************************************** 14491 - * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. * 14492 + * Copyright (c) 1998-2004,2009 Free Software Foundation, Inc. * 14493 * * 14494 * Permission is hereby granted, free of charge, to any person obtaining a * 14495 * copy of this software and associated documentation files (the * 14496 @@ -37,7 +37,7 @@ 14497 14498 #include "menu.priv.h" 14499 14500 -MODULE_ID("$Id: m_post.c,v 1.26 2004/12/25 23:57:04 tom Exp $") 14501 +MODULE_ID("$Id: m_post.c,v 1.27 2009/02/28 21:02:46 juergen Exp $") 14502 14503 /*--------------------------------------------------------------------------- 14504 | Facility : libnmenu 14505 @@ -255,7 +255,7 @@ 14506 14507 /*--------------------------------------------------------------------------- 14508 | Facility : libnmenu 14509 -| Function : int post_menu(MENU *) 14510 +| Function : int post_menu(MENU* menu) 14511 | 14512 | Description : Post a menu to the screen. This makes it visible. 14513 | 14514 @@ -329,7 +329,7 @@ 14515 14516 /*--------------------------------------------------------------------------- 14517 | Facility : libnmenu 14518 -| Function : int unpost_menu(MENU *) 14519 +| Function : int unpost_menu(MENU*) 14520 | 14521 | Description : Detach menu from screen 14522 | 13692 14523 diff -Naur ncurses-5.7.orig/misc/gen-pkgconfig.in ncurses-5.7/misc/gen-pkgconfig.in 13693 14524 --- ncurses-5.7.orig/misc/gen-pkgconfig.in 1969-12-31 16:00:00.000000000 -0800 13694 +++ ncurses-5.7/misc/gen-pkgconfig.in 2009-0 1-27 16:45:05.084820505-080014525 +++ ncurses-5.7/misc/gen-pkgconfig.in 2009-02-28 20:38:53.014978628 -0800 13695 14526 @@ -0,0 +1,119 @@ 13696 14527 +#!@SHELL@ … … 13815 14646 diff -Naur ncurses-5.7.orig/misc/Makefile.in ncurses-5.7/misc/Makefile.in 13816 14647 --- ncurses-5.7.orig/misc/Makefile.in 2007-03-31 08:54:17.000000000 -0700 13817 +++ ncurses-5.7/misc/Makefile.in 2009-0 1-27 16:45:05.084820505-080014648 +++ ncurses-5.7/misc/Makefile.in 2009-02-28 20:38:54.335061600 -0800 13818 14649 @@ -1,6 +1,6 @@ 13819 14650 -# $Id: Makefile.in,v 1.43 2007/03/31 15:54:17 tom Exp $ 13820 +# $Id: Makefile.in,v 1.5 0 2009/01/24 21:42:15 tomExp $14651 +# $Id: Makefile.in,v 1.51 2009/02/07 18:17:17 Miroslav.Lichvar Exp $ 13821 14652 ############################################################################## 13822 14653 -# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. # … … 13853 14684 $(INSTALL_PROG) ncurses-config $(DESTDIR)$(bindir)/$(NCURSES_CONFIG) 13854 14685 13855 +@MAKE_PC_FILES@install.libs :: pc-files 13856 +@MAKE_PC_FILES@ $(SHELL) -c 'for name in *.pc; do $(INSTALL_DATA) $$name $( PKG_CONFIG_LIBDIR)/$$name; done'14686 +@MAKE_PC_FILES@install.libs :: pc-files $(DESTDIR)$(PKG_CONFIG_LIBDIR) 14687 +@MAKE_PC_FILES@ $(SHELL) -c 'for name in *.pc; do $(INSTALL_DATA) $$name $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; done' 13857 14688 + 13858 14689 +@MAKE_PC_FILES@sources :: pc-files … … 13864 14695 echo '** adjusting tabset paths' 13865 14696 sed -f run_tic.sed $(source) >terminfo.tmp 13866 @@ -130,6 +140,7 @@ 14697 @@ -118,7 +128,8 @@ 14698 $(DESTDIR)$(bindir) \ 14699 $(DESTDIR)$(libdir) \ 14700 $(DESTDIR)$(datadir) \ 14701 -$(DESTDIR)$(tabsetdir) : 14702 +$(DESTDIR)$(tabsetdir) \ 14703 +$(DESTDIR)$(PKG_CONFIG_LIBDIR) : 14704 $(SHELL) $(top_srcdir)/mkdirs.sh $@ 14705 14706 uninstall : uninstall.data uninstall.libs 14707 @@ -130,6 +141,7 @@ 13867 14708 13868 14709 uninstall.libs : 13869 14710 -rm -f $(DESTDIR)$(bindir)/$(NCURSES_CONFIG) 13870 +@MAKE_PC_FILES@ $(SHELL) 'for name in *.pc; do rm -f $( PKG_CONFIG_LIBDIR)/$$name; done'14711 +@MAKE_PC_FILES@ $(SHELL) 'for name in *.pc; do rm -f $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; done' 13871 14712 13872 14713 tags : 13873 14714 13874 @@ -138,11 +1 49,13 @@14715 @@ -138,11 +150,13 @@ 13875 14716 mostlyclean : 13876 14717 -rm -f terminfo.tmp … … 13886 14727 13887 14728 realclean : distclean 14729 diff -Naur ncurses-5.7.orig/misc/ncu-indent ncurses-5.7/misc/ncu-indent 14730 --- ncurses-5.7.orig/misc/ncu-indent 2008-08-03 08:46:44.000000000 -0700 14731 +++ ncurses-5.7/misc/ncu-indent 2009-02-28 20:38:59.859415560 -0800 14732 @@ -26,7 +26,7 @@ 14733 #* sale, use or other dealings in this Software without prior written * 14734 #* authorization. * 14735 #****************************************************************************/ 14736 -# $Id: ncu-indent,v 1.17 2008/08/03 15:46:44 tom Exp $ 14737 +# $Id: ncu-indent,v 1.20 2009/02/21 20:56:23 tom Exp $ 14738 NOOP=no 14739 OPTS=' 14740 --blank-lines-after-procedures 14741 @@ -44,6 +44,8 @@ 14742 --swallow-optional-blank-lines 14743 --tab-size8 14744 14745 +-T NCURSES_SP_ARGx 14746 +-T NCURSES_SP_DCLx 14747 -T NCURSES_EXPORT_VAR 14748 -T NCURSES_INLINE 14749 -T SCREEN 14750 @@ -88,11 +90,12 @@ 14751 mv "$name" "$save" 14752 sed \ 14753 -e '/EMPTY_MODULE(/s/)$/);/' \ 14754 + -e 's,\(MODULEID(\),//\1,' \ 14755 -e '/MODULE_ID(/s/)$/);/' \ 14756 -e 's,\<GCC_NORETURN;,;//GCC_NORETURN;,' \ 14757 -e 's,\<GCC_PRINTFLIKE(,;//GCC_PRINTFLIKE(,' \ 14758 -e 's,\<GCC_SCANFLIKE(,;//GCC_SCANFLIKE(,' \ 14759 - -e 's,\(\<NCURSES_EXPORT_VAR\>\),//\1,' \ 14760 + -e 's,\(\<NCURSES_EXPORT_VAR\>.*;\),//\1,' \ 14761 "$save" >"$test" 14762 cp "$test" "$name" 14763 chmod u+w "$name" 14764 @@ -100,11 +103,12 @@ 14765 ${INDENT_PROG-indent} -npro $OPTS "$name" 14766 sed \ 14767 -e '/EMPTY_MODULE(/s/);$/)/' \ 14768 + -e 's,//\(MODULEID(\),\1,' \ 14769 -e '/MODULE_ID(/s/);$/)/' \ 14770 -e 's,;[ ]*//GCC_NORETURN;, GCC_NORETURN;,' \ 14771 -e 's,;[ ]*//GCC_PRINTFLIKE(, GCC_PRINTFLIKE(,' \ 14772 -e 's,;[ ]*//GCC_SCANFLIKE(, GCC_SCANFLIKE(,' \ 14773 - -e 's,//\(\<NCURSES_EXPORT_VAR\>\),\1,' \ 14774 + -e 's,//\(\<NCURSES_EXPORT_VAR\>[ ]*\),\1,' \ 14775 "$name" >"$test" 14776 mv "$test" "$name" 14777 rm -f "${name}~" 13888 14778 diff -Naur ncurses-5.7.orig/misc/ncurses-config.in ncurses-5.7/misc/ncurses-config.in 13889 14779 --- ncurses-5.7.orig/misc/ncurses-config.in 2007-03-17 13:02:19.000000000 -0700 13890 +++ ncurses-5.7/misc/ncurses-config.in 2009-0 1-27 16:45:05.084820505-080014780 +++ ncurses-5.7/misc/ncurses-config.in 2009-02-28 20:38:53.014978628 -0800 13891 14781 @@ -1,7 +1,7 @@ 13892 14782 #!@SHELL@ … … 14015 14905 diff -Naur ncurses-5.7.orig/misc/terminfo.src ncurses-5.7/misc/terminfo.src 14016 14906 --- ncurses-5.7.orig/misc/terminfo.src 2008-10-12 16:03:54.000000000 -0700 14017 +++ ncurses-5.7/misc/terminfo.src 2009-0 1-27 16:45:02.352643385-080014907 +++ ncurses-5.7/misc/terminfo.src 2009-02-28 20:38:50.326805978 -0800 14018 14908 @@ -6,8 +6,8 @@ 14019 14909 # Report bugs and new terminal descriptions to … … 14181 15071 diff -Naur ncurses-5.7.orig/mk-1st.awk ncurses-5.7/mk-1st.awk 14182 15072 --- ncurses-5.7.orig/mk-1st.awk 2007-03-24 15:10:55.000000000 -0700 14183 +++ ncurses-5.7/mk-1st.awk 2009-0 1-27 16:44:59.364453973-080015073 +++ ncurses-5.7/mk-1st.awk 2009-02-28 20:38:47.598636401 -0800 14184 15074 @@ -1,6 +1,6 @@ 14185 15075 -# $Id: mk-1st.awk,v 1.78 2007/03/24 22:10:55 tom Exp $ … … 14209 15099 if ( host == "vxworks" ) 14210 15100 { 15101 diff -Naur ncurses-5.7.orig/ncurses/base/define_key.c ncurses-5.7/ncurses/base/define_key.c 15102 --- ncurses-5.7.orig/ncurses/base/define_key.c 2006-12-30 15:23:31.000000000 -0800 15103 +++ ncurses-5.7/ncurses/base/define_key.c 2009-02-28 20:38:57.043235088 -0800 15104 @@ -1,5 +1,5 @@ 15105 /**************************************************************************** 15106 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 15107 + * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. * 15108 * * 15109 * Permission is hereby granted, free of charge, to any person obtaining a * 15110 * copy of this software and associated documentation files (the * 15111 @@ -27,20 +27,21 @@ 15112 ****************************************************************************/ 15113 15114 /**************************************************************************** 15115 - * Author: Thomas E. Dickey 1997-on * 15116 + * Author: Thomas E. Dickey 1997-on * 15117 + * and: Juergen Pfeifer 2009 * 15118 ****************************************************************************/ 15119 15120 #include <curses.priv.h> 15121 15122 -MODULE_ID("$Id: define_key.c,v 1.13 2006/12/30 23:23:31 tom Exp $") 15123 +MODULE_ID("$Id: define_key.c,v 1.15 2009/02/15 00:30:40 tom Exp $") 15124 15125 NCURSES_EXPORT(int) 15126 -define_key(const char *str, int keycode) 15127 +NCURSES_SP_NAME(define_key) (NCURSES_SP_DCLx const char *str, int keycode) 15128 { 15129 int code = ERR; 15130 15131 T((T_CALLED("define_key(%s,%d)"), _nc_visbuf(str), keycode)); 15132 - if (SP == 0) { 15133 + if (SP_PARM == 0) { 15134 code = ERR; 15135 } else if (keycode > 0) { 15136 unsigned ukey = (unsigned) keycode; 15137 @@ -48,12 +49,12 @@ 15138 if (str != 0) { 15139 define_key(str, 0); 15140 } else if (has_key(keycode)) { 15141 - while (_nc_remove_key(&(SP->_keytry), ukey)) 15142 + while (_nc_remove_key(&(SP_PARM->_keytry), ukey)) 15143 code = OK; 15144 } 15145 if (str != 0) { 15146 if (key_defined(str) == 0) { 15147 - if (_nc_add_to_try(&(SP->_keytry), str, ukey) == OK) { 15148 + if (_nc_add_to_try(&(SP_PARM->_keytry), str, ukey) == OK) { 15149 code = OK; 15150 } else { 15151 code = ERR; 15152 @@ -63,8 +64,16 @@ 15153 } 15154 } 15155 } else { 15156 - while (_nc_remove_string(&(SP->_keytry), str)) 15157 + while (_nc_remove_string(&(SP_PARM->_keytry), str)) 15158 code = OK; 15159 } 15160 returnCode(code); 15161 } 15162 + 15163 +#if NCURSES_SP_FUNCS 15164 +NCURSES_EXPORT(int) 15165 +define_key(const char *str, int keycode) 15166 +{ 15167 + return NCURSES_SP_NAME(define_key) (CURRENT_SCREEN, str, keycode); 15168 +} 15169 +#endif 15170 diff -Naur ncurses-5.7.orig/ncurses/base/keybound.c ncurses-5.7/ncurses/base/keybound.c 15171 --- ncurses-5.7.orig/ncurses/base/keybound.c 2006-06-17 11:19:24.000000000 -0700 15172 +++ ncurses-5.7/ncurses/base/keybound.c 2009-02-28 20:38:58.435326721 -0800 15173 @@ -1,5 +1,5 @@ 15174 /**************************************************************************** 15175 - * Copyright (c) 1999-2005,2006 Free Software Foundation, Inc. * 15176 + * Copyright (c) 1999-2006,2009 Free Software Foundation, Inc. * 15177 * * 15178 * Permission is hereby granted, free of charge, to any person obtaining a * 15179 * copy of this software and associated documentation files (the * 15180 @@ -27,25 +27,34 @@ 15181 ****************************************************************************/ 15182 15183 /**************************************************************************** 15184 - * Author: Thomas E. Dickey 1999-on * 15185 + * Author: Thomas E. Dickey 1999-on * 15186 + * and: Juergen Pfeifer 2009 * 15187 ****************************************************************************/ 15188 15189 #include <curses.priv.h> 15190 15191 -MODULE_ID("$Id: keybound.c,v 1.7 2006/06/17 18:19:24 tom Exp $") 15192 +MODULE_ID("$Id: keybound.c,v 1.9 2009/02/21 16:32:34 tom Exp $") 15193 15194 /* 15195 * Returns the count'th string definition which is associated with the 15196 * given keycode. The result is malloc'd, must be freed by the caller. 15197 */ 15198 NCURSES_EXPORT(char *) 15199 -keybound(int code, int count) 15200 +NCURSES_SP_NAME(keybound) (NCURSES_SP_DCLx int code, int count) 15201 { 15202 char *result = 0; 15203 15204 - T((T_CALLED("keybound(%d,%d)"), code, count)); 15205 - if (SP != 0 && code >= 0) { 15206 - result = _nc_expand_try(SP->_keytry, (unsigned) code, &count, 0); 15207 + T((T_CALLED("keybound(%p, %d,%d)"), SP_PARM, code, count)); 15208 + if (SP_PARM != 0 && code >= 0) { 15209 + result = _nc_expand_try(SP_PARM->_keytry, (unsigned) code, &count, 0); 15210 } 15211 returnPtr(result); 15212 } 15213 + 15214 +#if NCURSES_SP_FUNCS 15215 +NCURSES_EXPORT(char *) 15216 +keybound(int code, int count) 15217 +{ 15218 + return NCURSES_SP_NAME(keybound) (CURRENT_SCREEN, code, count); 15219 +} 15220 +#endif 15221 diff -Naur ncurses-5.7.orig/ncurses/base/key_defined.c ncurses-5.7/ncurses/base/key_defined.c 15222 --- ncurses-5.7.orig/ncurses/base/key_defined.c 2006-12-30 15:22:55.000000000 -0800 15223 +++ ncurses-5.7/ncurses/base/key_defined.c 2009-02-28 20:38:58.435326721 -0800 15224 @@ -1,5 +1,5 @@ 15225 /**************************************************************************** 15226 - * Copyright (c) 2003,2006 Free Software Foundation, Inc. * 15227 + * Copyright (c) 2003-2006,2009 Free Software Foundation, Inc. * 15228 * * 15229 * Permission is hereby granted, free of charge, to any person obtaining a * 15230 * copy of this software and associated documentation files (the * 15231 @@ -32,7 +32,7 @@ 15232 15233 #include <curses.priv.h> 15234 15235 -MODULE_ID("$Id: key_defined.c,v 1.6 2006/12/30 23:22:55 tom Exp $") 15236 +MODULE_ID("$Id: key_defined.c,v 1.8 2009/02/21 16:24:26 tom Exp $") 15237 15238 static int 15239 find_definition(TRIES * tree, const char *str) 15240 @@ -65,14 +65,22 @@ 15241 * Otherwise, return the keycode's value (neither OK/ERR). 15242 */ 15243 NCURSES_EXPORT(int) 15244 -key_defined(const char *str) 15245 +NCURSES_SP_NAME(key_defined) (NCURSES_SP_DCLx const char *str) 15246 { 15247 int code = ERR; 15248 15249 - T((T_CALLED("key_defined(%s)"), _nc_visbuf(str))); 15250 - if (SP != 0 && str != 0) { 15251 - code = find_definition(SP->_keytry, str); 15252 + T((T_CALLED("key_defined(%p, %s)"), SP_PARM, _nc_visbuf(str))); 15253 + if (SP_PARM != 0 && str != 0) { 15254 + code = find_definition(SP_PARM->_keytry, str); 15255 } 15256 15257 returnCode(code); 15258 } 15259 + 15260 +#if NCURSES_SP_FUNCS 15261 +NCURSES_EXPORT(int) 15262 +key_defined(const char *str) 15263 +{ 15264 + return NCURSES_SP_NAME(key_defined) (CURRENT_SCREEN, str); 15265 +} 15266 +#endif 15267 diff -Naur ncurses-5.7.orig/ncurses/base/keyok.c ncurses-5.7/ncurses/base/keyok.c 15268 --- ncurses-5.7.orig/ncurses/base/keyok.c 2006-12-30 08:22:33.000000000 -0800 15269 +++ ncurses-5.7/ncurses/base/keyok.c 2009-02-28 20:38:57.043235088 -0800 15270 @@ -1,5 +1,5 @@ 15271 /**************************************************************************** 15272 - * Copyright (c) 1998-2000,2006 Free Software Foundation, Inc. * 15273 + * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. * 15274 * * 15275 * Permission is hereby granted, free of charge, to any person obtaining a * 15276 * copy of this software and associated documentation files (the * 15277 @@ -27,12 +27,13 @@ 15278 ****************************************************************************/ 15279 15280 /**************************************************************************** 15281 - * Author: Thomas E. Dickey 1997-on * 15282 + * Author: Thomas E. Dickey 1997-on * 15283 + * and: Juergen Pfeifer 2009 * 15284 ****************************************************************************/ 15285 15286 #include <curses.priv.h> 15287 15288 -MODULE_ID("$Id: keyok.c,v 1.7 2006/12/30 16:22:33 tom Exp $") 15289 +MODULE_ID("$Id: keyok.c,v 1.8 2009/02/15 00:31:38 tom Exp $") 15290 15291 /* 15292 * Enable (or disable) ncurses' interpretation of a keycode by adding (or 15293 @@ -45,7 +46,7 @@ 15294 */ 15295 15296 NCURSES_EXPORT(int) 15297 -keyok(int c, bool flag) 15298 +NCURSES_SP_NAME(keyok) (NCURSES_SP_DCLx int c, bool flag) 15299 { 15300 int code = ERR; 15301 int count = 0; 15302 @@ -55,18 +56,18 @@ 15303 if (c >= 0) { 15304 unsigned ch = (unsigned) c; 15305 if (flag) { 15306 - while ((s = _nc_expand_try(SP->_key_ok, ch, &count, 0)) != 0 15307 - && _nc_remove_key(&(SP->_key_ok), ch)) { 15308 - code = _nc_add_to_try(&(SP->_keytry), s, ch); 15309 + while ((s = _nc_expand_try(SP_PARM->_key_ok, ch, &count, 0)) != 0 15310 + && _nc_remove_key(&(SP_PARM->_key_ok), ch)) { 15311 + code = _nc_add_to_try(&(SP_PARM->_keytry), s, ch); 15312 free(s); 15313 count = 0; 15314 if (code != OK) 15315 break; 15316 } 15317 } else { 15318 - while ((s = _nc_expand_try(SP->_keytry, ch, &count, 0)) != 0 15319 - && _nc_remove_key(&(SP->_keytry), ch)) { 15320 - code = _nc_add_to_try(&(SP->_key_ok), s, ch); 15321 + while ((s = _nc_expand_try(SP_PARM->_keytry, ch, &count, 0)) != 0 15322 + && _nc_remove_key(&(SP_PARM->_keytry), ch)) { 15323 + code = _nc_add_to_try(&(SP_PARM->_key_ok), s, ch); 15324 free(s); 15325 count = 0; 15326 if (code != OK) 15327 @@ -76,3 +77,11 @@ 15328 } 15329 returnCode(code); 15330 } 15331 + 15332 +#if NCURSES_SP_FUNCS 15333 +NCURSES_EXPORT(int) 15334 +keyok(int c, bool flag) 15335 +{ 15336 + return NCURSES_SP_NAME(keyok) (CURRENT_SCREEN, c, flag); 15337 +} 15338 +#endif 15339 diff -Naur ncurses-5.7.orig/ncurses/base/legacy_coding.c ncurses-5.7/ncurses/base/legacy_coding.c 15340 --- ncurses-5.7.orig/ncurses/base/legacy_coding.c 2005-12-17 15:38:17.000000000 -0800 15341 +++ ncurses-5.7/ncurses/base/legacy_coding.c 2009-02-28 20:38:58.435326721 -0800 15342 @@ -1,5 +1,5 @@ 15343 /**************************************************************************** 15344 - * Copyright (c) 2005 Free Software Foundation, Inc. * 15345 + * Copyright (c) 2005,2009 Free Software Foundation, Inc. * 15346 * * 15347 * Permission is hereby granted, free of charge, to any person obtaining a * 15348 * copy of this software and associated documentation files (the * 15349 @@ -27,22 +27,31 @@ 15350 ****************************************************************************/ 15351 15352 /**************************************************************************** 15353 - * Author: Thomas E. Dickey * 15354 + * Author: Thomas E. Dickey 2005 * 15355 + * Juergen Pfeifer 2009 * 15356 ****************************************************************************/ 15357 15358 #include <curses.priv.h> 15359 15360 -MODULE_ID("$Id: legacy_coding.c,v 1.2 2005/12/17 23:38:17 tom Exp $") 15361 +MODULE_ID("$Id: legacy_coding.c,v 1.4 2009/02/21 16:16:38 tom Exp $") 15362 15363 NCURSES_EXPORT(int) 15364 -use_legacy_coding(int level) 15365 +NCURSES_SP_NAME(use_legacy_coding) (NCURSES_SP_DCLx int level) 15366 { 15367 int result = ERR; 15368 15369 - T((T_CALLED("use_legacy_coding(%d)"), level)); 15370 - if (level >= 0 && level <= 2 && SP != 0) { 15371 - result = SP->_legacy_coding; 15372 - SP->_legacy_coding = level; 15373 + T((T_CALLED("use_legacy_coding(%p,%d)"), SP_PARM, level)); 15374 + if (level >= 0 && level <= 2 && SP_PARM != 0) { 15375 + result = SP_PARM->_legacy_coding; 15376 + SP_PARM->_legacy_coding = level; 15377 } 15378 returnCode(result); 15379 } 15380 + 15381 +#if NCURSES_SP_FUNCS 15382 +NCURSES_EXPORT(int) 15383 +use_legacy_coding(int level) 15384 +{ 15385 + return NCURSES_SP_NAME(use_legacy_coding) (CURRENT_SCREEN, level); 15386 +} 15387 +#endif 14211 15388 diff -Naur ncurses-5.7.orig/ncurses/base/lib_addch.c ncurses-5.7/ncurses/base/lib_addch.c 14212 15389 --- ncurses-5.7.orig/ncurses/base/lib_addch.c 2008-08-16 12:20:04.000000000 -0700 14213 +++ ncurses-5.7/ncurses/base/lib_addch.c 2009-0 1-27 16:45:03.676729990 -080015390 +++ ncurses-5.7/ncurses/base/lib_addch.c 2009-02-28 20:38:51.642889230 -0800 14214 15391 @@ -1,5 +1,5 @@ 14215 15392 /**************************************************************************** … … 14266 15443 /* 14267 15444 * Check for cells which are orphaned by adding this character, set 15445 diff -Naur ncurses-5.7.orig/ncurses/base/lib_beep.c ncurses-5.7/ncurses/base/lib_beep.c 15446 --- ncurses-5.7.orig/ncurses/base/lib_beep.c 2005-04-09 08:20:04.000000000 -0700 15447 +++ ncurses-5.7/ncurses/base/lib_beep.c 2009-02-28 20:38:57.043235088 -0800 15448 @@ -1,5 +1,5 @@ 15449 /**************************************************************************** 15450 - * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc. * 15451 + * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * 15452 * * 15453 * Permission is hereby granted, free of charge, to any person obtaining a * 15454 * copy of this software and associated documentation files (the * 15455 @@ -30,6 +30,7 @@ 15456 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 15457 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 15458 * and: Thomas E. Dickey 1996-on * 15459 + * and: Juergen Pfeifer 2009 * 15460 ****************************************************************************/ 15461 15462 /* 15463 @@ -42,7 +43,7 @@ 15464 #include <curses.priv.h> 15465 #include <term.h> /* beep, flash */ 15466 15467 -MODULE_ID("$Id: lib_beep.c,v 1.10 2005/04/09 15:20:04 tom Exp $") 15468 +MODULE_ID("$Id: lib_beep.c,v 1.11 2009/02/15 00:32:06 tom Exp $") 15469 15470 /* 15471 * beep() 15472 @@ -53,7 +54,7 @@ 15473 */ 15474 15475 NCURSES_EXPORT(int) 15476 -beep(void) 15477 +NCURSES_SP_NAME(beep) (NCURSES_SP_DCL0) 15478 { 15479 int res = ERR; 15480 15481 @@ -74,3 +75,11 @@ 15482 15483 returnCode(res); 15484 } 15485 + 15486 +#if NCURSES_SP_FUNCS 15487 +NCURSES_EXPORT(int) 15488 +beep(void) 15489 +{ 15490 + return NCURSES_SP_NAME(beep) (CURRENT_SCREEN); 15491 +} 15492 +#endif 14268 15493 diff -Naur ncurses-5.7.orig/ncurses/base/lib_color.c ncurses-5.7/ncurses/base/lib_color.c 14269 15494 --- ncurses-5.7.orig/ncurses/base/lib_color.c 2007-04-07 10:07:28.000000000 -0700 14270 +++ ncurses-5.7/ncurses/base/lib_color.c 2009-0 1-27 16:45:05.088820784-080015495 +++ ncurses-5.7/ncurses/base/lib_color.c 2009-02-28 20:38:57.047235367 -0800 14271 15496 @@ -1,5 +1,5 @@ 14272 15497 /**************************************************************************** … … 14276 15501 * Permission is hereby granted, free of charge, to any person obtaining a * 14277 15502 * copy of this software and associated documentation files (the * 14278 @@ -42,7 +42,7 @@ 15503 @@ -30,6 +30,7 @@ 15504 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 15505 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 15506 * and: Thomas E. Dickey 1996-on * 15507 + * and: Juergen Pfeifer 2009 * 15508 ****************************************************************************/ 15509 15510 /* lib_color.c 15511 @@ -42,7 +43,7 @@ 14279 15512 #include <term.h> 14280 15513 #include <tic.h> 14281 15514 14282 15515 -MODULE_ID("$Id: lib_color.c,v 1.85 2007/04/07 17:07:28 tom Exp $") 14283 +MODULE_ID("$Id: lib_color.c,v 1.8 7 2009/01/25 00:25:31tom Exp $")15516 +MODULE_ID("$Id: lib_color.c,v 1.88 2009/02/15 00:33:02 tom Exp $") 14284 15517 14285 15518 /* 14286 15519 * These should be screen structure members. They need to be globals for 14287 @@ -108,6 +10 8,13 @@15520 @@ -108,6 +109,13 @@ 14288 15521 }; 14289 15522 /* *INDENT-ON* */ … … 14299 15532 /* 14300 15533 * These are called from _nc_do_color(), which in turn is called from 14301 @@ -255,6 +262,15 @@ 15534 @@ -237,15 +245,15 @@ 15535 } 15536 15537 NCURSES_EXPORT(int) 15538 -start_color(void) 15539 +NCURSES_SP_NAME(start_color) (NCURSES_SP_DCL0) 15540 { 15541 int result = ERR; 15542 15543 T((T_CALLED("start_color()"))); 15544 15545 - if (SP == 0) { 15546 + if (SP_PARM == 0) { 15547 result = ERR; 15548 - } else if (SP->_coloron) { 15549 + } else if (SP_PARM->_coloron) { 15550 result = OK; 15551 } else { 15552 15553 @@ -255,27 +263,38 @@ 14302 15554 } 14303 15555 14304 15556 if (max_pairs > 0 && max_colors > 0) { 14305 + SP->_pair_limit = max_pairs; 15557 - SP->_pair_count = max_pairs; 15558 - SP->_color_count = max_colors; 15559 + SP_PARM->_pair_limit = max_pairs; 14306 15560 + 14307 15561 +#if NCURSES_EXT_FUNCS … … 14310 15564 + * allow for default-color as a component of a color-pair. 14311 15565 + */ 14312 + SP ->_pair_limit += (1 + (2 * max_colors));15566 + SP_PARM->_pair_limit += (1 + (2 * max_colors)); 14313 15567 +#endif 14314 SP->_pair_count = max_pairs;14315 SP->_color_count = max_colors;15568 + SP_PARM->_pair_count = max_pairs; 15569 + SP_PARM->_color_count = max_colors; 14316 15570 #if !USE_REENTRANT 14317 @@ -263,7 +279,7 @@ 15571 COLOR_PAIRS = max_pairs; 15572 COLORS = max_colors; 14318 15573 #endif 14319 15574 14320 15575 - if ((SP->_color_pairs = TYPE_CALLOC(colorpair_t, 14321 15576 - max_pairs)) != 0) { 14322 + SP->_pair_limit)) != 0) { 14323 if ((SP->_color_table = TYPE_CALLOC(color_t, 14324 max_colors)) != 0) { 14325 SP->_color_pairs[0] = PAIR_OF(default_fg(), default_bg()); 14326 @@ -331,21 +347,69 @@ 14327 init_pair(short pair, short f, short b) 15577 - if ((SP->_color_table = TYPE_CALLOC(color_t, 15578 - max_colors)) != 0) { 15579 - SP->_color_pairs[0] = PAIR_OF(default_fg(), default_bg()); 15580 + SP_PARM->_color_pairs = TYPE_CALLOC(colorpair_t, 15581 + SP_PARM->_pair_limit); 15582 + if (SP_PARM->_color_pairs != 0) { 15583 + SP_PARM->_color_table = TYPE_CALLOC(color_t, max_colors); 15584 + if (SP_PARM->_color_table != 0) { 15585 + SP_PARM->_color_pairs[0] = PAIR_OF(default_fg(), 15586 + default_bg()); 15587 init_color_table(); 15588 15589 T(("started color: COLORS = %d, COLOR_PAIRS = %d", 15590 COLORS, COLOR_PAIRS)); 15591 15592 - SP->_coloron = 1; 15593 + SP_PARM->_coloron = 1; 15594 result = OK; 15595 - } else if (SP->_color_pairs != 0) { 15596 - FreeAndNull(SP->_color_pairs); 15597 + } else if (SP_PARM->_color_pairs != 0) { 15598 + FreeAndNull(SP_PARM->_color_pairs); 15599 } 15600 } 15601 } else { 15602 @@ -285,6 +304,14 @@ 15603 returnCode(result); 15604 } 15605 15606 +#if NCURSES_SP_FUNCS 15607 +NCURSES_EXPORT(int) 15608 +start_color(void) 15609 +{ 15610 + return NCURSES_SP_NAME(start_color) (CURRENT_SCREEN); 15611 +} 15612 +#endif 15613 + 15614 /* This function was originally written by Daniel Weaver <danw@znyx.com> */ 15615 static void 15616 rgb2hls(short r, short g, short b, short *h, short *l, short *s) 15617 @@ -328,24 +355,72 @@ 15618 * values. 15619 */ 15620 NCURSES_EXPORT(int) 15621 -init_pair(short pair, short f, short b) 15622 +NCURSES_SP_NAME(init_pair) (NCURSES_SP_DCLx short pair, short f, short b) 14328 15623 { 14329 15624 colorpair_t result; … … 14336 15631 returnCode(ERR); 14337 15632 + 14338 + previous = SP ->_color_pairs[pair];15633 + previous = SP_PARM->_color_pairs[pair]; 14339 15634 #if NCURSES_EXT_FUNCS 14340 15635 - if (SP->_default_color) { 14341 15636 - if (f < 0) 15637 + if (SP_PARM->_default_color) { 14342 15638 + bool isDefault = FALSE; 14343 15639 + bool wasDefault = FALSE; 14344 + int default_pairs = SP ->_default_pairs;15640 + int default_pairs = SP_PARM->_default_pairs; 14345 15641 + 14346 15642 + /* … … 14392 15688 + * with sequentially adding new pairs. 14393 15689 + */ 14394 + if (pair > (SP ->_pair_count + default_pairs)) {15690 + if (pair > (SP_PARM->_pair_count + default_pairs)) { 14395 15691 returnCode(ERR); 14396 15692 + } 14397 + SP ->_default_pairs = default_pairs;15693 + SP_PARM->_default_pairs = default_pairs; 14398 15694 } else 14399 15695 #endif 14400 15696 { 14401 @@ -361,8 +4 25,8 @@15697 @@ -361,8 +436,8 @@ 14402 15698 * pair colors with the new ones). 14403 15699 */ … … 14410 15706 14411 15707 for (y = 0; y <= curscr->_maxy; y++) { 14412 @@ -496,11 +560,11 @@ 15708 @@ -381,9 +456,9 @@ 15709 _nc_make_oldhash(y); 15710 } 15711 } 15712 - SP->_color_pairs[pair] = result; 15713 - if (GET_SCREEN_PAIR(SP) == pair) 15714 - SET_SCREEN_PAIR(SP, (chtype) (~0)); /* force attribute update */ 15715 + SP_PARM->_color_pairs[pair] = result; 15716 + if (GET_SCREEN_PAIR(SP_PARM) == pair) 15717 + SET_SCREEN_PAIR(SP_PARM, (chtype) (~0)); /* force attribute update */ 15718 15719 if (initialize_pair && InPalette(f) && InPalette(b)) { 15720 const color_t *tp = hue_lightness_saturation ? hls_palette : cga_palette; 15721 @@ -404,54 +479,79 @@ 15722 returnCode(OK); 15723 } 15724 15725 +#if NCURSES_SP_FUNCS 15726 +NCURSES_EXPORT(int) 15727 +init_pair(short pair, short f, short b) 15728 +{ 15729 + return NCURSES_SP_NAME(init_pair) (CURRENT_SCREEN, pair, f, b); 15730 +} 15731 +#endif 15732 + 15733 #define okRGB(n) ((n) >= 0 && (n) <= 1000) 15734 15735 NCURSES_EXPORT(int) 15736 -init_color(short color, short r, short g, short b) 15737 +NCURSES_SP_NAME(init_color) (NCURSES_SP_DCLx 15738 + short color, short r, short g, short b) 15739 { 15740 int result = ERR; 15741 15742 T((T_CALLED("init_color(%d,%d,%d,%d)"), color, r, g, b)); 15743 15744 if (initialize_color != NULL 15745 - && SP != 0 15746 - && SP->_coloron 15747 + && SP_PARM != 0 15748 + && SP_PARM->_coloron 15749 && (color >= 0 && OkColorHi(color)) 15750 && (okRGB(r) && okRGB(g) && okRGB(b))) { 15751 15752 - SP->_color_table[color].init = 1; 15753 - SP->_color_table[color].r = r; 15754 - SP->_color_table[color].g = g; 15755 - SP->_color_table[color].b = b; 15756 + SP_PARM->_color_table[color].init = 1; 15757 + SP_PARM->_color_table[color].r = r; 15758 + SP_PARM->_color_table[color].g = g; 15759 + SP_PARM->_color_table[color].b = b; 15760 15761 if (hue_lightness_saturation) { 15762 rgb2hls(r, g, b, 15763 - &SP->_color_table[color].red, 15764 - &SP->_color_table[color].green, 15765 - &SP->_color_table[color].blue); 15766 + &SP_PARM->_color_table[color].red, 15767 + &SP_PARM->_color_table[color].green, 15768 + &SP_PARM->_color_table[color].blue); 15769 } else { 15770 - SP->_color_table[color].red = r; 15771 - SP->_color_table[color].green = g; 15772 - SP->_color_table[color].blue = b; 15773 + SP_PARM->_color_table[color].red = r; 15774 + SP_PARM->_color_table[color].green = g; 15775 + SP_PARM->_color_table[color].blue = b; 15776 } 15777 15778 TPUTS_TRACE("initialize_color"); 15779 putp(TPARM_4(initialize_color, color, r, g, b)); 15780 - SP->_color_defs = max(color + 1, SP->_color_defs); 15781 + SP_PARM->_color_defs = max(color + 1, SP_PARM->_color_defs); 15782 result = OK; 15783 } 15784 returnCode(result); 15785 } 15786 15787 +#if NCURSES_SP_FUNCS 15788 +NCURSES_EXPORT(int) 15789 +init_color(short color, short r, short g, short b) 15790 +{ 15791 + return NCURSES_SP_NAME(init_color) (CURRENT_SCREEN, color, r, g, b); 15792 +} 15793 +#endif 15794 + 15795 NCURSES_EXPORT(bool) 15796 -can_change_color(void) 15797 +NCURSES_SP_NAME(can_change_color) (NCURSES_SP_DCL0) 15798 { 15799 T((T_CALLED("can_change_color()"))); 15800 returnCode((can_change != 0) ? TRUE : FALSE); 15801 } 15802 15803 +#if NCURSES_SP_FUNCS 15804 NCURSES_EXPORT(bool) 15805 -has_colors(void) 15806 +can_change_color(void) 15807 +{ 15808 + return NCURSES_SP_NAME(can_change_color) (CURRENT_SCREEN); 15809 +} 15810 +#endif 15811 + 15812 +NCURSES_EXPORT(bool) 15813 +NCURSES_SP_NAME(has_colors) (NCURSES_SP_DCL0) 15814 { 15815 T((T_CALLED("has_colors()"))); 15816 returnCode((VALID_NUMERIC(max_colors) && VALID_NUMERIC(max_pairs) 15817 @@ -462,18 +562,27 @@ 15818 || set_color_pair)) ? TRUE : FALSE); 15819 } 15820 15821 +#if NCURSES_SP_FUNCS 15822 +NCURSES_EXPORT(bool) 15823 +has_colors(void) 15824 +{ 15825 + return NCURSES_SP_NAME(has_colors) (CURRENT_SCREEN); 15826 +} 15827 +#endif 15828 + 15829 NCURSES_EXPORT(int) 15830 -color_content(short color, short *r, short *g, short *b) 15831 +NCURSES_SP_NAME(color_content) (NCURSES_SP_DCLx short color, short *r, 15832 + short *g, short *b) 15833 { 15834 int result; 15835 15836 T((T_CALLED("color_content(%d,%p,%p,%p)"), color, r, g, b)); 15837 - if (color < 0 || !OkColorHi(color) || SP == 0 || !SP->_coloron) { 15838 + if (color < 0 || !OkColorHi(color) || SP_PARM == 0 || !SP_PARM->_coloron) { 15839 result = ERR; 15840 } else { 15841 - NCURSES_COLOR_T c_r = SP->_color_table[color].red; 15842 - NCURSES_COLOR_T c_g = SP->_color_table[color].green; 15843 - NCURSES_COLOR_T c_b = SP->_color_table[color].blue; 15844 + NCURSES_COLOR_T c_r = SP_PARM->_color_table[color].red; 15845 + NCURSES_COLOR_T c_g = SP_PARM->_color_table[color].green; 15846 + NCURSES_COLOR_T c_b = SP_PARM->_color_table[color].blue; 15847 15848 if (r) 15849 *r = c_r; 15850 @@ -489,18 +598,27 @@ 15851 returnCode(result); 15852 } 15853 15854 +#if NCURSES_SP_FUNCS 15855 NCURSES_EXPORT(int) 15856 -pair_content(short pair, short *f, short *b) 15857 +color_content(short color, short *r, short *g, short *b) 15858 +{ 15859 + return NCURSES_SP_NAME(color_content) (CURRENT_SCREEN, color, r, g, b); 15860 +} 15861 +#endif 15862 + 15863 +NCURSES_EXPORT(int) 15864 +NCURSES_SP_NAME(pair_content) (NCURSES_SP_DCLx short pair, short *f, 15865 + short *b) 15866 { 15867 int result; 14413 15868 14414 15869 T((T_CALLED("pair_content(%d,%p,%p)"), pair, f, b)); … … 14420 15875 - NCURSES_COLOR_T fg = ((SP->_color_pairs[pair] >> C_SHIFT) & C_MASK); 14421 15876 - NCURSES_COLOR_T bg = (SP->_color_pairs[pair] & C_MASK); 14422 + NCURSES_COLOR_T fg = FORE_OF(SP ->_color_pairs[pair]);14423 + NCURSES_COLOR_T bg = BACK_OF(SP ->_color_pairs[pair]);15877 + NCURSES_COLOR_T fg = FORE_OF(SP_PARM->_color_pairs[pair]); 15878 + NCURSES_COLOR_T bg = BACK_OF(SP_PARM->_color_pairs[pair]); 14424 15879 14425 15880 #if NCURSES_EXT_FUNCS 14426 15881 if (fg == COLOR_DEFAULT) 14427 @@ -527,7 +591,7 @@ 15882 @@ -520,6 +638,14 @@ 15883 returnCode(result); 15884 } 15885 15886 +#if NCURSES_SP_FUNCS 15887 +NCURSES_EXPORT(int) 15888 +pair_content(short pair, short *f, short *b) 15889 +{ 15890 + return NCURSES_SP_NAME(pair_content) (CURRENT_SCREEN, pair, f, b); 15891 +} 15892 +#endif 15893 + 15894 NCURSES_EXPORT(void) 15895 _nc_do_color(short old_pair, short pair, bool reverse, int (*outc) (int)) 15896 { 15897 @@ -527,7 +653,7 @@ 14428 15898 NCURSES_COLOR_T bg = COLOR_DEFAULT; 14429 15899 NCURSES_COLOR_T old_fg, old_bg; … … 14436 15906 diff -Naur ncurses-5.7.orig/ncurses/base/lib_colorset.c ncurses-5.7/ncurses/base/lib_colorset.c 14437 15907 --- ncurses-5.7.orig/ncurses/base/lib_colorset.c 2005-01-29 13:40:51.000000000 -0800 14438 +++ ncurses-5.7/ncurses/base/lib_colorset.c 2009-0 1-27 16:45:05.088820784-080015908 +++ ncurses-5.7/ncurses/base/lib_colorset.c 2009-02-28 20:38:53.014978628 -0800 14439 15909 @@ -1,5 +1,5 @@ 14440 15910 /**************************************************************************** … … 14482 15952 + returnCode(code); 14483 15953 } 15954 diff -Naur ncurses-5.7.orig/ncurses/base/lib_dft_fgbg.c ncurses-5.7/ncurses/base/lib_dft_fgbg.c 15955 --- ncurses-5.7.orig/ncurses/base/lib_dft_fgbg.c 2005-11-26 12:03:38.000000000 -0800 15956 +++ ncurses-5.7/ncurses/base/lib_dft_fgbg.c 2009-02-28 20:38:57.047235367 -0800 15957 @@ -1,5 +1,5 @@ 15958 /**************************************************************************** 15959 - * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. * 15960 + * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * 15961 * * 15962 * Permission is hereby granted, free of charge, to any person obtaining a * 15963 * copy of this software and associated documentation files (the * 15964 @@ -27,31 +27,40 @@ 15965 ****************************************************************************/ 15966 15967 /**************************************************************************** 15968 - * Author: Thomas E. Dickey * 15969 + * Author: Thomas E. Dickey 1998-on * 15970 + * Juergen Pfeifer 2009 * 15971 ****************************************************************************/ 15972 15973 #include <curses.priv.h> 15974 #include <term.h> 15975 15976 -MODULE_ID("$Id: lib_dft_fgbg.c,v 1.18 2005/11/26 20:03:38 tom Exp $") 15977 +MODULE_ID("$Id: lib_dft_fgbg.c,v 1.19 2009/02/14 21:53:21 tom Exp $") 15978 15979 /* 15980 * Modify the behavior of color-pair 0 so that the library doesn't assume that 15981 * it is white on black. This is an extension to XSI curses. 15982 */ 15983 NCURSES_EXPORT(int) 15984 -use_default_colors(void) 15985 +NCURSES_SP_NAME(use_default_colors) (NCURSES_SP_DCL0) 15986 { 15987 T((T_CALLED("use_default_colors()"))); 15988 - returnCode(assume_default_colors(-1, -1)); 15989 + returnCode(NCURSES_SP_NAME(assume_default_colors) (NCURSES_SP_ARGx - 1, -1)); 15990 +} 15991 + 15992 +#if NCURSES_SP_FUNCS 15993 +NCURSES_EXPORT(int) 15994 +use_default_colors(void) 15995 +{ 15996 + return NCURSES_SP_NAME(use_default_colors) (CURRENT_SCREEN); 15997 } 15998 +#endif 15999 16000 /* 16001 * Modify the behavior of color-pair 0 so that the library assumes that it 16002 * is something specific, possibly not white on black. 16003 */ 16004 NCURSES_EXPORT(int) 16005 -assume_default_colors(int fg, int bg) 16006 +NCURSES_SP_NAME(assume_default_colors) (NCURSES_SP_DCLx int fg, int bg) 16007 { 16008 T((T_CALLED("assume_default_colors(%d,%d)"), fg, bg)); 16009 16010 @@ -61,15 +70,23 @@ 16011 if (initialize_pair) /* don't know how to handle this */ 16012 returnCode(ERR); 16013 16014 - SP->_default_color = isDefaultColor(fg) || isDefaultColor(bg); 16015 - SP->_has_sgr_39_49 = (tigetflag("AX") == TRUE); 16016 - SP->_default_fg = isDefaultColor(fg) ? COLOR_DEFAULT : (fg & C_MASK); 16017 - SP->_default_bg = isDefaultColor(bg) ? COLOR_DEFAULT : (bg & C_MASK); 16018 - if (SP->_color_pairs != 0) { 16019 - bool save = SP->_default_color; 16020 - SP->_default_color = TRUE; 16021 + SP_PARM->_default_color = isDefaultColor(fg) || isDefaultColor(bg); 16022 + SP_PARM->_has_sgr_39_49 = (tigetflag("AX") == TRUE); 16023 + SP_PARM->_default_fg = isDefaultColor(fg) ? COLOR_DEFAULT : (fg & C_MASK); 16024 + SP_PARM->_default_bg = isDefaultColor(bg) ? COLOR_DEFAULT : (bg & C_MASK); 16025 + if (SP_PARM->_color_pairs != 0) { 16026 + bool save = SP_PARM->_default_color; 16027 + SP_PARM->_default_color = TRUE; 16028 init_pair(0, (short) fg, (short) bg); 16029 - SP->_default_color = save; 16030 + SP_PARM->_default_color = save; 16031 } 16032 returnCode(OK); 16033 } 16034 + 16035 +#if NCURSES_SP_FUNCS 16036 +NCURSES_EXPORT(int) 16037 +assume_default_colors(int fg, int bg) 16038 +{ 16039 + return NCURSES_SP_NAME(assume_default_colors) (CURRENT_SCREEN, fg, bg); 16040 +} 16041 +#endif 16042 diff -Naur ncurses-5.7.orig/ncurses/base/lib_echo.c ncurses-5.7/ncurses/base/lib_echo.c 16043 --- ncurses-5.7.orig/ncurses/base/lib_echo.c 2000-12-09 18:43:27.000000000 -0800 16044 +++ ncurses-5.7/ncurses/base/lib_echo.c 2009-02-28 20:38:58.435326721 -0800 16045 @@ -1,5 +1,5 @@ 16046 /**************************************************************************** 16047 - * Copyright (c) 1998,2000 Free Software Foundation, Inc. * 16048 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 16049 * * 16050 * Permission is hereby granted, free of charge, to any person obtaining a * 16051 * copy of this software and associated documentation files (the * 16052 @@ -29,6 +29,8 @@ 16053 /**************************************************************************** 16054 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 16055 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 16056 + * and: Thomas E. Dickey 1996-on * 16057 + * and: Juergen Pfeifer 2009 * 16058 ****************************************************************************/ 16059 16060 /* 16061 @@ -42,20 +44,40 @@ 16062 16063 #include <curses.priv.h> 16064 16065 -MODULE_ID("$Id: lib_echo.c,v 1.5 2000/12/10 02:43:27 tom Exp $") 16066 +MODULE_ID("$Id: lib_echo.c,v 1.7 2009/02/21 20:20:40 tom Exp $") 16067 16068 NCURSES_EXPORT(int) 16069 +NCURSES_SP_NAME(echo) (NCURSES_SP_DCL0) 16070 +{ 16071 + T((T_CALLED("echo(%p)"), SP_PARM)); 16072 + if (0 == SP_PARM) 16073 + returnCode(ERR); 16074 + SP_PARM->_echo = TRUE; 16075 + returnCode(OK); 16076 +} 16077 + 16078 +#if NCURSES_SP_FUNCS 16079 +NCURSES_EXPORT(int) 16080 echo(void) 16081 { 16082 - T((T_CALLED("echo()"))); 16083 - SP->_echo = TRUE; 16084 + return NCURSES_SP_NAME(echo) (CURRENT_SCREEN); 16085 +} 16086 +#endif 16087 + 16088 +NCURSES_EXPORT(int) 16089 +NCURSES_SP_NAME(noecho) (NCURSES_SP_DCL0) 16090 +{ 16091 + T((T_CALLED("noecho(%p)"), SP_PARM)); 16092 + if (0 == SP_PARM) 16093 + returnCode(ERR); 16094 + SP_PARM->_echo = FALSE; 16095 returnCode(OK); 16096 } 16097 16098 +#if NCURSES_SP_FUNCS 16099 NCURSES_EXPORT(int) 16100 noecho(void) 16101 { 16102 - T((T_CALLED("noecho()"))); 16103 - SP->_echo = FALSE; 16104 - returnCode(OK); 16105 + return NCURSES_SP_NAME(noecho) (CURRENT_SCREEN); 16106 } 16107 +#endif 16108 diff -Naur ncurses-5.7.orig/ncurses/base/lib_endwin.c ncurses-5.7/ncurses/base/lib_endwin.c 16109 --- ncurses-5.7.orig/ncurses/base/lib_endwin.c 2000-12-09 18:43:27.000000000 -0800 16110 +++ ncurses-5.7/ncurses/base/lib_endwin.c 2009-02-28 20:38:57.047235367 -0800 16111 @@ -1,5 +1,5 @@ 16112 /**************************************************************************** 16113 - * Copyright (c) 1998,2000 Free Software Foundation, Inc. * 16114 + * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc. * 16115 * * 16116 * Permission is hereby granted, free of charge, to any person obtaining a * 16117 * copy of this software and associated documentation files (the * 16118 @@ -29,6 +29,8 @@ 16119 /**************************************************************************** 16120 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 16121 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 16122 + * and: Thomas E. Dickey 1996-on * 16123 + * and: Juergen Pfeifer 2009 * 16124 ****************************************************************************/ 16125 16126 /* 16127 @@ -41,16 +43,16 @@ 16128 #include <curses.priv.h> 16129 #include <term.h> 16130 16131 -MODULE_ID("$Id: lib_endwin.c,v 1.19 2000/12/10 02:43:27 tom Exp $") 16132 +MODULE_ID("$Id: lib_endwin.c,v 1.20 2009/02/15 00:35:00 tom Exp $") 16133 16134 NCURSES_EXPORT(int) 16135 -endwin(void) 16136 +NCURSES_SP_NAME(endwin) (NCURSES_SP_DCL0) 16137 { 16138 T((T_CALLED("endwin()"))); 16139 16140 - if (SP) { 16141 - SP->_endwin = TRUE; 16142 - SP->_mouse_wrap(SP); 16143 + if (SP_PARM) { 16144 + SP_PARM->_endwin = TRUE; 16145 + SP_PARM->_mouse_wrap(SP_PARM); 16146 _nc_screen_wrap(); 16147 _nc_mvcur_wrap(); /* wrap up cursor addressing */ 16148 returnCode(reset_shell_mode()); 16149 @@ -58,3 +60,11 @@ 16150 16151 returnCode(ERR); 16152 } 16153 + 16154 +#if NCURSES_SP_FUNCS 16155 +NCURSES_EXPORT(int) 16156 +endwin(void) 16157 +{ 16158 + return NCURSES_SP_NAME(endwin) (CURRENT_SCREEN); 16159 +} 16160 +#endif 16161 diff -Naur ncurses-5.7.orig/ncurses/base/lib_flash.c ncurses-5.7/ncurses/base/lib_flash.c 16162 --- ncurses-5.7.orig/ncurses/base/lib_flash.c 2000-12-09 18:43:27.000000000 -0800 16163 +++ ncurses-5.7/ncurses/base/lib_flash.c 2009-02-28 20:38:57.047235367 -0800 16164 @@ -1,5 +1,5 @@ 16165 /**************************************************************************** 16166 - * Copyright (c) 1998,2000 Free Software Foundation, Inc. * 16167 + * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc. * 16168 * * 16169 * Permission is hereby granted, free of charge, to any person obtaining a * 16170 * copy of this software and associated documentation files (the * 16171 @@ -29,6 +29,8 @@ 16172 /**************************************************************************** 16173 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 16174 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 16175 + * and: Thomas E. Dickey 1996-on * 16176 + * and: Juergen Pfeifer 2009 * 16177 ****************************************************************************/ 16178 16179 /* 16180 @@ -41,7 +43,7 @@ 16181 #include <curses.priv.h> 16182 #include <term.h> /* beep, flash */ 16183 16184 -MODULE_ID("$Id: lib_flash.c,v 1.6 2000/12/10 02:43:27 tom Exp $") 16185 +MODULE_ID("$Id: lib_flash.c,v 1.7 2009/02/15 00:35:15 tom Exp $") 16186 16187 /* 16188 * flash() 16189 @@ -52,7 +54,7 @@ 16190 */ 16191 16192 NCURSES_EXPORT(int) 16193 -flash(void) 16194 +NCURSES_SP_NAME(flash) (NCURSES_SP_DCL0) 16195 { 16196 int res = ERR; 16197 16198 @@ -71,3 +73,11 @@ 16199 16200 returnCode(res); 16201 } 16202 + 16203 +#if NCURSES_SP_FUNCS 16204 +NCURSES_EXPORT(int) 16205 +flash(void) 16206 +{ 16207 + return NCURSES_SP_NAME(flash) (CURRENT_SCREEN); 16208 +} 16209 +#endif 14484 16210 diff -Naur ncurses-5.7.orig/ncurses/base/lib_freeall.c ncurses-5.7/ncurses/base/lib_freeall.c 14485 16211 --- ncurses-5.7.orig/ncurses/base/lib_freeall.c 2008-09-27 06:09:57.000000000 -0700 14486 +++ ncurses-5.7/ncurses/base/lib_freeall.c 2009-0 1-27 16:44:49.391812822-080016212 +++ ncurses-5.7/ncurses/base/lib_freeall.c 2009-02-28 20:38:39.770130185 -0800 14487 16213 @@ -40,7 +40,7 @@ 14488 16214 extern int malloc_errfd; /* FIXME */ … … 14503 16229 (void) _nc_printf_string(0, empty_va); 14504 16230 #ifdef TRACE 16231 diff -Naur ncurses-5.7.orig/ncurses/base/lib_getch.c ncurses-5.7/ncurses/base/lib_getch.c 16232 --- ncurses-5.7.orig/ncurses/base/lib_getch.c 2008-09-20 12:46:13.000000000 -0700 16233 +++ ncurses-5.7/ncurses/base/lib_getch.c 2009-02-28 20:38:59.859415560 -0800 16234 @@ -1,5 +1,5 @@ 16235 /**************************************************************************** 16236 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 16237 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 16238 * * 16239 * Permission is hereby granted, free of charge, to any person obtaining a * 16240 * copy of this software and associated documentation files (the * 16241 @@ -30,6 +30,7 @@ 16242 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 16243 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 16244 * and: Thomas E. Dickey 1996-on * 16245 + * and: Juergen Pfeifer 2009 * 16246 ****************************************************************************/ 16247 16248 /* 16249 @@ -41,7 +42,7 @@ 16250 16251 #include <curses.priv.h> 16252 16253 -MODULE_ID("$Id: lib_getch.c,v 1.99 2008/09/20 19:46:13 tom Exp $") 16254 +MODULE_ID("$Id: lib_getch.c,v 1.101 2009/02/28 19:16:40 tom Exp $") 16255 16256 #include <fifo_defs.h> 16257 16258 @@ -54,27 +55,36 @@ 16259 } 16260 #else 16261 #define GetEscdelay(sp) ESCDELAY 16262 -NCURSES_EXPORT_VAR(int) 16263 -ESCDELAY = 1000; /* max interval betw. chars in funkeys, in millisecs */ 16264 +NCURSES_EXPORT_VAR (int) 16265 + ESCDELAY = 1000; /* max interval betw. chars in funkeys, in millisecs */ 16266 #endif 16267 16268 #if NCURSES_EXT_FUNCS 16269 NCURSES_EXPORT(int) 16270 -set_escdelay(int value) 16271 +NCURSES_SP_NAME(set_escdelay) (NCURSES_SP_DCLx int value) 16272 { 16273 int code = OK; 16274 #if USE_REENTRANT 16275 - if (SP) { 16276 - SP->_ESCDELAY = value; 16277 + if (SP_PARM) { 16278 + SP_PARM->_ESCDELAY = value; 16279 } else { 16280 code = ERR; 16281 } 16282 #else 16283 + (void) SP_PARM; 16284 ESCDELAY = value; 16285 #endif 16286 return code; 16287 } 16288 + 16289 +#if NCURSES_SP_FUNCS 16290 +NCURSES_EXPORT(int) 16291 +set_escdelay(int value) 16292 +{ 16293 + return NCURSES_SP_NAME(set_escdelay) (CURRENT_SCREEN, value); 16294 +} 16295 #endif 16296 +#endif /* NCURSES_EXT_FUNCS */ 16297 16298 static int 16299 _nc_use_meta(WINDOW *win) 16300 @@ -84,9 +94,9 @@ 16301 } 16302 16303 #ifdef NCURSES_WGETCH_EVENTS 16304 -#define TWAIT_MASK 7 16305 +#define TWAIT_MASK (TW_ANY | TW_EVENT) 16306 #else 16307 -#define TWAIT_MASK 3 16308 +#define TWAIT_MASK TW_ANY 16309 #endif 16310 16311 /* 16312 @@ -109,7 +119,7 @@ 16313 && (sp->_sysmouse_head < sp->_sysmouse_tail) 16314 && (rc == 0) 16315 && (errno == EINTR)) { 16316 - rc |= 2; 16317 + rc |= TW_MOUSE; 16318 } 16319 #endif 16320 return rc; 16321 @@ -173,7 +183,7 @@ 16322 } else 16323 mask = 0; 16324 16325 - if (mask & 4) { 16326 + if (mask & TW_EVENT) { 16327 T(("fifo_push: ungetch KEY_EVENT")); 16328 _nc_ungetch(sp, KEY_EVENT); 16329 return KEY_EVENT; 16330 @@ -185,7 +195,7 @@ 16331 #endif 16332 16333 #if USE_GPM_SUPPORT || USE_EMX_MOUSE 16334 - if ((sp->_mouse_fd >= 0) && (mask & 2)) { 16335 + if ((sp->_mouse_fd >= 0) && (mask & TW_MOUSE)) { 16336 sp->_mouse_event(sp); 16337 ch = KEY_MOUSE; 16338 n = 1; 16339 @@ -260,12 +270,12 @@ 16340 { 16341 #ifdef USE_PTHREADS 16342 SCREEN *sp = _nc_screen_of(win); 16343 - if (_nc_use_pthreads && sp != SP) { 16344 + if (_nc_use_pthreads && sp != CURRENT_SCREEN) { 16345 SCREEN *save_SP; 16346 16347 /* temporarily switch to the window's screen to check/refresh */ 16348 _nc_lock_global(curses); 16349 - save_SP = SP; 16350 + save_SP = CURRENT_SCREEN; 16351 _nc_set_screen(sp); 16352 recur_wrefresh(win); 16353 _nc_set_screen(save_SP); 16354 @@ -286,12 +296,12 @@ 16355 16356 if (sp != 0) { 16357 #ifdef USE_PTHREADS 16358 - if (_nc_use_pthreads && sp != SP) { 16359 + if (_nc_use_pthreads && sp != CURRENT_SCREEN) { 16360 SCREEN *save_SP; 16361 16362 /* temporarily switch to the window's screen to get cooked input */ 16363 _nc_lock_global(curses); 16364 - save_SP = SP; 16365 + save_SP = CURRENT_SCREEN; 16366 _nc_set_screen(sp); 16367 rc = recur_wgetnstr(win, buf); 16368 _nc_set_screen(save_SP); 16369 @@ -402,7 +412,7 @@ 16370 rc = check_mouse_activity(sp, delay EVENTLIST_2nd(evl)); 16371 16372 #ifdef NCURSES_WGETCH_EVENTS 16373 - if (rc & 4) { 16374 + if (rc & TW_EVENT) { 16375 *result = KEY_EVENT; 16376 returnCode(KEY_CODE_YES); 16377 } 16378 @@ -427,7 +437,7 @@ 16379 * increase the wait with mouseinterval(). 16380 */ 16381 int runcount = 0; 16382 - int rc; 16383 + int rc = 0; 16384 16385 do { 16386 ch = kgetch(sp EVENTLIST_2nd(evl)); 16387 @@ -442,10 +452,10 @@ 16388 (ch == KEY_MOUSE 16389 && (((rc = check_mouse_activity(sp, sp->_maxclick 16390 EVENTLIST_2nd(evl))) != 0 16391 - && !(rc & 4)) 16392 + && !(rc & TW_EVENT)) 16393 || !sp->_mouse_parse(sp, runcount))); 16394 #ifdef NCURSES_WGETCH_EVENTS 16395 - if ((rc & 4) && !ch == KEY_EVENT) { 16396 + if ((rc & TW_EVENT) && !(ch == KEY_EVENT)) { 16397 _nc_ungetch(sp, ch); 16398 ch = KEY_EVENT; 16399 } 16400 @@ -645,7 +655,7 @@ 16401 TR(TRACE_IEVENT, ("waiting for rest of sequence")); 16402 rc = check_mouse_activity(sp, timeleft EVENTLIST_2nd(evl)); 16403 #ifdef NCURSES_WGETCH_EVENTS 16404 - if (rc & 4) { 16405 + if (rc & TW_EVENT) { 16406 TR(TRACE_IEVENT, ("interrupted by a user event")); 16407 /* FIXME Should have preserved remainder timeleft for reuse... */ 16408 peek = head; /* Restart interpreting later */ 16409 diff -Naur ncurses-5.7.orig/ncurses/base/lib_isendwin.c ncurses-5.7/ncurses/base/lib_isendwin.c 16410 --- ncurses-5.7.orig/ncurses/base/lib_isendwin.c 2000-12-09 18:43:27.000000000 -0800 16411 +++ ncurses-5.7/ncurses/base/lib_isendwin.c 2009-02-28 20:38:57.047235367 -0800 16412 @@ -1,5 +1,5 @@ 16413 /**************************************************************************** 16414 - * Copyright (c) 1998,2000 Free Software Foundation, Inc. * 16415 + * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc. * 16416 * * 16417 * Permission is hereby granted, free of charge, to any person obtaining a * 16418 * copy of this software and associated documentation files (the * 16419 @@ -29,6 +29,8 @@ 16420 /**************************************************************************** 16421 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 16422 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 16423 + * and: Thomas E. Dickey 1996-on * 16424 + * and: Juergen Pfeifer 2009 * 16425 ****************************************************************************/ 16426 16427 /* 16428 @@ -40,12 +42,20 @@ 16429 16430 #include <curses.priv.h> 16431 16432 -MODULE_ID("$Id: lib_isendwin.c,v 1.6 2000/12/10 02:43:27 tom Exp $") 16433 +MODULE_ID("$Id: lib_isendwin.c,v 1.7 2009/02/15 00:36:24 tom Exp $") 16434 16435 NCURSES_EXPORT(bool) 16436 -isendwin(void) 16437 +NCURSES_SP_NAME(isendwin) (NCURSES_SP_DCL0) 16438 { 16439 - if (SP == NULL) 16440 + if (SP_PARM == NULL) 16441 return FALSE; 16442 - return SP->_endwin; 16443 + return SP_PARM->_endwin; 16444 +} 16445 + 16446 +#if NCURSES_SP_FUNCS 16447 +NCURSES_EXPORT(bool) 16448 +isendwin(void) 16449 +{ 16450 + return NCURSES_SP_NAME(isendwin) (CURRENT_SCREEN); 16451 } 16452 +#endif 14505 16453 diff -Naur ncurses-5.7.orig/ncurses/base/lib_mouse.c ncurses-5.7/ncurses/base/lib_mouse.c 14506 16454 --- ncurses-5.7.orig/ncurses/base/lib_mouse.c 2008-10-18 14:48:55.000000000 -0700 14507 +++ ncurses-5.7/ncurses/base/lib_mouse.c 2009-01-27 16:44:49.391812822 -0800 14508 @@ -79,7 +79,7 @@ 16455 +++ ncurses-5.7/ncurses/base/lib_mouse.c 2009-02-28 20:38:59.859415560 -0800 16456 @@ -1,5 +1,5 @@ 16457 /**************************************************************************** 16458 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 16459 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 16460 * * 16461 * Permission is hereby granted, free of charge, to any person obtaining a * 16462 * copy of this software and associated documentation files (the * 16463 @@ -79,9 +79,8 @@ 14509 16464 14510 16465 #include <curses.priv.h> 14511 16466 14512 16467 -MODULE_ID("$Id: lib_mouse.c,v 1.102 2008/10/18 21:48:55 tom Exp $") 14513 +MODULE_ID("$Id: lib_mouse.c,v 1.10 4 2008/11/30 01:37:27tom Exp $")14514 14515 16468 +MODULE_ID("$Id: lib_mouse.c,v 1.105 2009/02/28 21:09:20 tom Exp $") 16469 16470 -#include <term.h> 14516 16471 #include <tic.h> 14517 @@ -694,11 +694,16 @@ 16472 16473 #if USE_GPM_SUPPORT 16474 @@ -150,7 +149,7 @@ 16475 #define LIBGPM_SONAME "libgpm.so" 16476 #endif 16477 16478 -#define GET_DLSYM(name) (my_##name = (TYPE_##name) dlsym(SP->_dlopen_gpm, #name)) 16479 +#define GET_DLSYM(name) (my_##name = (TYPE_##name) dlsym(SP_PARM->_dlopen_gpm, #name)) 16480 16481 #endif /* USE_GPM_SUPPORT */ 16482 16483 @@ -164,13 +163,13 @@ 16484 #define LastEV(sp) ((sp)->_mouse_events + EV_MAX - 1) 16485 16486 #undef NEXT 16487 -#define NEXT(ep) ((ep >= LastEV(sp)) \ 16488 - ? FirstEV(sp) \ 16489 +#define NEXT(ep) ((ep >= LastEV(SP_PARM)) \ 16490 + ? FirstEV(SP_PARM) \ 16491 : ep + 1) 16492 16493 #undef PREV 16494 -#define PREV(ep) ((ep <= FirstEV(sp)) \ 16495 - ? LastEV(sp) \ 16496 +#define PREV(ep) ((ep <= FirstEV(SP_PARM)) \ 16497 + ? LastEV(SP_PARM) \ 16498 : ep - 1) 16499 16500 #define IndexEV(sp, ep) (ep - FirstEV(sp)) 16501 @@ -340,7 +339,7 @@ 16502 static void 16503 handle_sysmouse(int sig GCC_UNUSED) 16504 { 16505 - sysmouse_server(SP); 16506 + sysmouse_server(CURRENT_SCREEN); 16507 } 16508 #endif /* USE_SYSMOUSE */ 16509 16510 @@ -359,7 +358,9 @@ 16511 #if USE_EMX_MOUSE 16512 sp->_emxmouse_activated = enable; 16513 #else 16514 - putp(TPARM_1(sp->_mouse_xtermcap, enable)); 16515 + NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx 16516 + "xterm-mouse", 16517 + TPARM_1(sp->_mouse_xtermcap, enable)); 16518 #endif 16519 sp->_mouse_active = enable; 16520 } 16521 @@ -398,7 +399,7 @@ 16522 static void 16523 unload_gpm_library(SCREEN *sp) 16524 { 16525 - if (SP->_dlopen_gpm != 0) { 16526 + if (sp->_dlopen_gpm != 0) { 16527 T(("unload GPM library")); 16528 sp->_mouse_gpm_loaded = FALSE; 16529 sp->_mouse_fd = -1; 16530 @@ -694,11 +695,16 @@ 14518 16531 14519 16532 #if USE_GPM_SUPPORT … … 14534 16547 eventp->id = NORMAL_EVENT; 14535 16548 14536 @@ -731,6 +73 6,7 @@16549 @@ -731,6 +737,7 @@ 14537 16550 /* bump the next-free pointer into the circular list */ 14538 16551 sp->_mouse_eventp = eventp = NEXT(eventp); … … 14542 16555 } 14543 16556 break; 14544 @@ -1397,10 +1403,16 @@ 14545 16557 @@ -937,7 +944,7 @@ 16558 switch (sp->_mouse_type) { 16559 case M_XTERM: 16560 #if NCURSES_EXT_FUNCS 16561 - keyok(KEY_MOUSE, on); 16562 + NCURSES_SP_NAME(keyok) (NCURSES_SP_ARGx KEY_MOUSE, on); 16563 #endif 16564 TPUTS_TRACE("xterm mouse initialization"); 16565 enable_xterm_mouse(sp, 1); 16566 @@ -989,7 +996,7 @@ 16567 return; 16568 } 16569 } 16570 - _nc_flush(); 16571 + NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG); 16572 } 16573 16574 /************************************************************************** 16575 @@ -1264,13 +1271,13 @@ 16576 * 16577 **************************************************************************/ 16578 16579 -static int 16580 -_nc_getmouse(SCREEN *sp, MEVENT * aevent) 16581 +NCURSES_EXPORT(int) 16582 +NCURSES_SP_NAME(getmouse) (NCURSES_SP_DCLx MEVENT * aevent) 16583 { 16584 - T((T_CALLED("getmouse(%p)"), aevent)); 16585 + T((T_CALLED("getmouse(%p,%p)"), SP_PARM, aevent)); 16586 16587 - if ((aevent != 0) && (sp != 0) && (sp->_mouse_type != M_NONE)) { 16588 - MEVENT *eventp = sp->_mouse_eventp; 16589 + if ((aevent != 0) && (SP_PARM != 0) && (SP_PARM->_mouse_type != M_NONE)) { 16590 + MEVENT *eventp = SP_PARM->_mouse_eventp; 16591 /* compute the current-event pointer */ 16592 MEVENT *prev = PREV(eventp); 16593 16594 @@ -1278,8 +1285,8 @@ 16595 *aevent = *prev; 16596 16597 TR(TRACE_IEVENT, ("getmouse: returning event %s from slot %ld", 16598 - _nc_tracemouse(sp, prev), 16599 - (long) IndexEV(sp, prev))); 16600 + _nc_tracemouse(SP_PARM, prev), 16601 + (long) IndexEV(SP_PARM, prev))); 16602 16603 prev->id = INVALID_EVENT; /* so the queue slot becomes free */ 16604 returnCode(OK); 16605 @@ -1287,57 +1294,61 @@ 16606 returnCode(ERR); 16607 } 16608 16609 +#if NCURSES_SP_FUNCS 16610 /* grab a copy of the current mouse event */ 16611 NCURSES_EXPORT(int) 16612 getmouse(MEVENT * aevent) 16613 { 16614 - return _nc_getmouse(SP, aevent); 16615 + return NCURSES_SP_NAME(getmouse) (CURRENT_SCREEN, aevent); 16616 } 16617 +#endif 16618 16619 -static int 16620 -_nc_ungetmouse(SCREEN *sp, MEVENT * aevent) 16621 +NCURSES_EXPORT(int) 16622 +NCURSES_SP_NAME(ungetmouse) (NCURSES_SP_DCLx MEVENT * aevent) 16623 { 16624 int result = ERR; 16625 16626 - T((T_CALLED("ungetmouse(%p)"), aevent)); 16627 + T((T_CALLED("ungetmouse(%p,%p)"), SP_PARM, aevent)); 16628 16629 - if (aevent != 0 && sp != 0) { 16630 - MEVENT *eventp = sp->_mouse_eventp; 16631 + if (aevent != 0 && SP_PARM != 0) { 16632 + MEVENT *eventp = SP_PARM->_mouse_eventp; 16633 16634 /* stick the given event in the next-free slot */ 16635 *eventp = *aevent; 16636 16637 /* bump the next-free pointer into the circular list */ 16638 - sp->_mouse_eventp = NEXT(eventp); 16639 + SP_PARM->_mouse_eventp = NEXT(eventp); 16640 16641 /* push back the notification event on the keyboard queue */ 16642 - result = _nc_ungetch(sp, KEY_MOUSE); 16643 + result = NCURSES_SP_NAME(ungetch) (NCURSES_SP_ARGx KEY_MOUSE); 16644 } 16645 returnCode(result); 16646 } 16647 16648 +#if NCURSES_SP_FUNCS 16649 /* enqueue a synthesized mouse event to be seen by the next wgetch() */ 16650 NCURSES_EXPORT(int) 16651 ungetmouse(MEVENT * aevent) 16652 { 16653 - return _nc_ungetmouse(SP, aevent); 16654 + return NCURSES_SP_NAME(ungetmouse) (CURRENT_SCREEN, aevent); 16655 } 16656 +#endif 16657 16658 NCURSES_EXPORT(mmask_t) 16659 -mousemask(mmask_t newmask, mmask_t * oldmask) 16660 +NCURSES_SP_NAME(mousemask) (NCURSES_SP_DCLx mmask_t newmask, mmask_t * oldmask) 16661 /* set the mouse event mask */ 16662 { 16663 mmask_t result = 0; 16664 16665 - T((T_CALLED("mousemask(%#lx,%p)"), (unsigned long) newmask, oldmask)); 16666 + T((T_CALLED("mousemask(%p,%#lx,%p)"), SP_PARM, (unsigned long) newmask, oldmask)); 16667 16668 - if (SP != 0) { 16669 + if (SP_PARM != 0) { 16670 if (oldmask) 16671 - *oldmask = SP->_mouse_mask; 16672 + *oldmask = SP_PARM->_mouse_mask; 16673 16674 - if (newmask || SP->_mouse_initialized) { 16675 - _nc_mouse_init(SP); 16676 - if (SP->_mouse_type != M_NONE) { 16677 + if (newmask || SP_PARM->_mouse_initialized) { 16678 + _nc_mouse_init(SP_PARM); 16679 + if (SP_PARM->_mouse_type != M_NONE) { 16680 result = newmask & 16681 (REPORT_MOUSE_POSITION 16682 | BUTTON_ALT 16683 @@ -1349,15 +1360,23 @@ 16684 | BUTTON_DOUBLE_CLICKED 16685 | BUTTON_TRIPLE_CLICKED); 16686 16687 - mouse_activate(SP, (bool) (result != 0)); 16688 + mouse_activate(SP_PARM, (bool) (result != 0)); 16689 16690 - SP->_mouse_mask = result; 16691 + SP_PARM->_mouse_mask = result; 16692 } 16693 } 16694 } 16695 returnBits(result); 16696 } 16697 16698 +#if NCURSES_SP_FUNCS 16699 +NCURSES_EXPORT(mmask_t) 16700 +mousemask(mmask_t newmask, mmask_t * oldmask) 16701 +{ 16702 + return NCURSES_SP_NAME(mousemask) (CURRENT_SCREEN, newmask, oldmask); 16703 +} 16704 +#endif 16705 + 16706 NCURSES_EXPORT(bool) 16707 wenclose(const WINDOW *win, int y, int x) 16708 /* check to see if given window encloses given screen location */ 16709 @@ -1377,17 +1396,17 @@ 16710 } 16711 16712 NCURSES_EXPORT(int) 16713 -mouseinterval(int maxclick) 16714 +NCURSES_SP_NAME(mouseinterval) (NCURSES_SP_DCLx int maxclick) 16715 /* set the maximum mouse interval within which to recognize a click */ 16716 { 16717 int oldval; 16718 16719 - T((T_CALLED("mouseinterval(%d)"), maxclick)); 16720 + T((T_CALLED("mouseinterval(%p,%d)"), SP_PARM, maxclick)); 16721 16722 - if (SP != 0) { 16723 - oldval = SP->_maxclick; 16724 + if (SP_PARM != 0) { 16725 + oldval = SP_PARM->_maxclick; 16726 if (maxclick >= 0) 16727 - SP->_maxclick = maxclick; 16728 + SP_PARM->_maxclick = maxclick; 16729 } else { 16730 oldval = DEFAULT_MAXCLICK; 16731 } 16732 @@ -1395,15 +1414,37 @@ 16733 returnCode(oldval); 16734 } 16735 16736 +#if NCURSES_SP_FUNCS 16737 +NCURSES_EXPORT(int) 16738 +mouseinterval(int maxclick) 16739 +{ 16740 + return NCURSES_SP_NAME(mouseinterval) (CURRENT_SCREEN, maxclick); 16741 +} 16742 +#endif 16743 + 14546 16744 /* This may be used by other routines to ask for the existence of mouse 14547 16745 support */ … … 14550 16748 +NCURSES_EXPORT(bool) 14551 16749 +_nc_has_mouse(SCREEN *sp) 16750 { 16751 - return (SP->_mouse_type == M_NONE ? 0 : 1); 16752 + return (((0 == sp) || (sp->_mouse_type == M_NONE)) ? FALSE : TRUE); 16753 } 16754 16755 NCURSES_EXPORT(bool) 16756 +NCURSES_SP_NAME(has_mouse) (NCURSES_SP_DCL0) 14552 16757 +{ 14553 + return ((sp->_mouse_type == M_NONE) ? FALSE : TRUE);16758 + return _nc_has_mouse(SP_PARM); 14554 16759 +} 14555 16760 + 16761 +#if NCURSES_SP_FUNCS 14556 16762 +NCURSES_EXPORT(bool) 14557 16763 +has_mouse(void) 16764 +{ 16765 + return _nc_has_mouse(CURRENT_SCREEN); 16766 +} 16767 +#endif 16768 + 16769 +NCURSES_EXPORT(bool) 16770 wmouse_trafo(const WINDOW *win, int *pY, int *pX, bool to_screen) 14558 16771 { 14559 - return (SP->_mouse_type == M_NONE ? 0 : 1); 14560 + return _nc_has_mouse(SP); 14561 } 14562 14563 NCURSES_EXPORT(bool) 16772 bool result = FALSE; 16773 diff -Naur ncurses-5.7.orig/ncurses/base/lib_newterm.c ncurses-5.7/ncurses/base/lib_newterm.c 16774 --- ncurses-5.7.orig/ncurses/base/lib_newterm.c 2008-08-16 14:20:48.000000000 -0700 16775 +++ ncurses-5.7/ncurses/base/lib_newterm.c 2009-02-28 20:38:57.047235367 -0800 16776 @@ -1,5 +1,5 @@ 16777 /**************************************************************************** 16778 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 16779 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 16780 * * 16781 * Permission is hereby granted, free of charge, to any person obtaining a * 16782 * copy of this software and associated documentation files (the * 16783 @@ -30,6 +30,7 @@ 16784 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 16785 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 16786 * and: Thomas E. Dickey 1996-on * 16787 + * and: Juergen Pfeifer 2009 * 16788 ****************************************************************************/ 16789 16790 /* 16791 @@ -48,7 +49,7 @@ 16792 #include <term.h> /* clear_screen, cup & friends, cur_term */ 16793 #include <tic.h> 16794 16795 -MODULE_ID("$Id: lib_newterm.c,v 1.73 2008/08/16 21:20:48 Werner.Fink Exp $") 16796 +MODULE_ID("$Id: lib_newterm.c,v 1.74 2009/02/15 00:37:10 tom Exp $") 16797 16798 #ifndef ONLCR /* Allows compilation under the QNX 4.2 OS */ 16799 #define ONLCR 0 16800 @@ -95,7 +96,7 @@ 16801 * initialized. 16802 */ 16803 NCURSES_EXPORT(void) 16804 -filter(void) 16805 +NCURSES_SP_NAME(filter) (NCURSES_SP_DCL0) 16806 { 16807 START_TRACE(); 16808 T((T_CALLED("filter"))); 16809 @@ -103,23 +104,40 @@ 16810 returnVoid; 16811 } 16812 16813 +#if NCURSES_SP_FUNCS 16814 +NCURSES_EXPORT(void) 16815 +filter(void) 16816 +{ 16817 + NCURSES_SP_NAME(filter) (CURRENT_SCREEN); 16818 +} 16819 +#endif 16820 + 16821 #if NCURSES_EXT_FUNCS 16822 /* 16823 * An extension, allowing the application to open a new screen without 16824 * requiring it to also be filtered. 16825 */ 16826 NCURSES_EXPORT(void) 16827 -nofilter(void) 16828 +NCURSES_SP_NAME(nofilter) (NCURSES_SP_DCL0) 16829 { 16830 START_TRACE(); 16831 T((T_CALLED("nofilter"))); 16832 _nc_prescreen.filter_mode = FALSE; 16833 returnVoid; 16834 } 16835 + 16836 +#if NCURSES_SP_FUNCS 16837 +NCURSES_EXPORT(void) 16838 +nofilter(void) 16839 +{ 16840 + NCURSES_SP_NAME(nofilter) (CURRENT_SCREEN); 16841 +} 16842 #endif 16843 +#endif /* NCURSES_EXT_FUNCS */ 16844 16845 NCURSES_EXPORT(SCREEN *) 16846 -newterm(NCURSES_CONST char *name, FILE *ofp, FILE *ifp) 16847 +NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx NCURSES_CONST char *name, FILE 16848 + *ofp, FILE *ifp) 16849 { 16850 int value; 16851 int errret; 16852 @@ -133,8 +151,8 @@ 16853 _nc_init_pthreads(); 16854 _nc_lock_global(curses); 16855 16856 - current = SP; 16857 - its_term = (SP ? SP->_term : 0); 16858 + current = SP_PARM; 16859 + its_term = (SP_PARM ? SP_PARM->_term : 0); 16860 16861 /* this loads the capability entry, then sets LINES and COLS */ 16862 if (setupterm(name, fileno(ofp), &errret) != ERR) { 16863 @@ -159,7 +177,7 @@ 16864 _nc_set_screen(current); 16865 result = 0; 16866 } else { 16867 - assert(SP != 0); 16868 + assert(SP_PARM != 0); 16869 /* 16870 * In setupterm() we did a set_curterm(), but it was before we set 16871 * SP. So the "current" screen's terminal pointer was overwritten 16872 @@ -233,3 +251,11 @@ 16873 _nc_unlock_global(curses); 16874 returnSP(result); 16875 } 16876 + 16877 +#if NCURSES_SP_FUNCS 16878 +NCURSES_EXPORT(SCREEN *) 16879 +newterm(NCURSES_CONST char *name, FILE *ofp, FILE *ifp) 16880 +{ 16881 + return NCURSES_SP_NAME(newterm) (CURRENT_SCREEN, name, ofp, ifp); 16882 +} 16883 +#endif 16884 diff -Naur ncurses-5.7.orig/ncurses/base/lib_newwin.c ncurses-5.7/ncurses/base/lib_newwin.c 16885 --- ncurses-5.7.orig/ncurses/base/lib_newwin.c 2008-06-07 06:58:09.000000000 -0700 16886 +++ ncurses-5.7/ncurses/base/lib_newwin.c 2009-02-28 20:38:57.047235367 -0800 16887 @@ -1,5 +1,5 @@ 16888 /**************************************************************************** 16889 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 16890 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 16891 * * 16892 * Permission is hereby granted, free of charge, to any person obtaining a * 16893 * copy of this software and associated documentation files (the * 16894 @@ -30,6 +30,7 @@ 16895 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 16896 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 16897 * and: Thomas E. Dickey 1996-on * 16898 + * and: Juergen Pfeifer 2009 * 16899 ****************************************************************************/ 16900 16901 /* 16902 @@ -42,7 +43,7 @@ 16903 #include <curses.priv.h> 16904 #include <stddef.h> 16905 16906 -MODULE_ID("$Id: lib_newwin.c,v 1.52 2008/06/07 13:58:09 tom Exp $") 16907 +MODULE_ID("$Id: lib_newwin.c,v 1.53 2009/02/15 00:38:00 tom Exp $") 16908 16909 #define window_is(name) ((sp)->_##name == win) 16910 16911 @@ -115,7 +116,8 @@ 16912 } 16913 16914 NCURSES_EXPORT(WINDOW *) 16915 -newwin(int num_lines, int num_columns, int begy, int begx) 16916 +NCURSES_SP_NAME(newwin) (NCURSES_SP_DCLx 16917 + int num_lines, int num_columns, int begy, int begx) 16918 { 16919 WINDOW *win; 16920 NCURSES_CH_T *ptr; 16921 @@ -127,7 +129,7 @@ 16922 returnWin(0); 16923 16924 if (num_lines == 0) 16925 - num_lines = SP->_lines_avail - begy; 16926 + num_lines = SP_PARM->_lines_avail - begy; 16927 if (num_columns == 0) 16928 num_columns = screen_columns - begx; 16929 16930 @@ -149,6 +151,15 @@ 16931 returnWin(win); 16932 } 16933 16934 +#if NCURSES_SP_FUNCS 16935 +NCURSES_EXPORT(WINDOW *) 16936 +newwin(int num_lines, int num_columns, int begy, int begx) 16937 +{ 16938 + return NCURSES_SP_NAME(newwin) (CURRENT_SCREEN, num_lines, num_columns, 16939 + begy, begx); 16940 +} 16941 +#endif 16942 + 16943 NCURSES_EXPORT(WINDOW *) 16944 derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int begx) 16945 { 16946 diff -Naur ncurses-5.7.orig/ncurses/base/lib_nl.c ncurses-5.7/ncurses/base/lib_nl.c 16947 --- ncurses-5.7.orig/ncurses/base/lib_nl.c 2000-12-09 18:43:27.000000000 -0800 16948 +++ ncurses-5.7/ncurses/base/lib_nl.c 2009-02-28 20:38:58.435326721 -0800 16949 @@ -1,5 +1,5 @@ 16950 /**************************************************************************** 16951 - * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc. * 16952 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 16953 * * 16954 * Permission is hereby granted, free of charge, to any person obtaining a * 16955 * copy of this software and associated documentation files (the * 16956 @@ -29,6 +29,8 @@ 16957 /**************************************************************************** 16958 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 16959 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 16960 + * and: Thomas E. Dickey 1996-on * 16961 + * and: Juergen Pfeifer 2009 * 16962 ****************************************************************************/ 16963 16964 /* 16965 @@ -42,38 +44,52 @@ 16966 16967 #include <curses.priv.h> 16968 16969 -MODULE_ID("$Id: lib_nl.c,v 1.8 2000/12/10 02:43:27 tom Exp $") 16970 +MODULE_ID("$Id: lib_nl.c,v 1.10 2009/02/21 20:58:21 tom Exp $") 16971 16972 #ifdef __EMX__ 16973 #include <io.h> 16974 #endif 16975 16976 NCURSES_EXPORT(int) 16977 -nl(void) 16978 +NCURSES_SP_NAME(nl) (NCURSES_SP_DCL0) 16979 { 16980 - T((T_CALLED("nl()"))); 16981 - 16982 - SP->_nl = TRUE; 16983 - 16984 + T((T_CALLED("nl(%p)"), SP_PARM)); 16985 + if (0 == SP_PARM) 16986 + returnCode(ERR); 16987 + SP_PARM->_nl = TRUE; 16988 #ifdef __EMX__ 16989 _nc_flush(); 16990 _fsetmode(NC_OUTPUT, "t"); 16991 #endif 16992 - 16993 returnCode(OK); 16994 } 16995 16996 +#if NCURSES_SP_FUNCS 16997 NCURSES_EXPORT(int) 16998 -nonl(void) 16999 +nl(void) 17000 { 17001 - T((T_CALLED("nonl()"))); 17002 - 17003 - SP->_nl = FALSE; 17004 + return NCURSES_SP_NAME(nl) (CURRENT_SCREEN); 17005 +} 17006 +#endif 17007 17008 +NCURSES_EXPORT(int) 17009 +NCURSES_SP_NAME(nonl) (NCURSES_SP_DCL0) 17010 +{ 17011 + T((T_CALLED("nonl(%p)"), SP_PARM)); 17012 + if (0 == SP_PARM) 17013 + returnCode(ERR); 17014 + SP_PARM->_nl = FALSE; 17015 #ifdef __EMX__ 17016 _nc_flush(); 17017 _fsetmode(NC_OUTPUT, "b"); 17018 #endif 17019 - 17020 returnCode(OK); 17021 } 17022 + 17023 +#if NCURSES_SP_FUNCS 17024 +NCURSES_EXPORT(int) 17025 +nonl(void) 17026 +{ 17027 + return NCURSES_SP_NAME(nonl) (CURRENT_SCREEN); 17028 +} 17029 +#endif 17030 diff -Naur ncurses-5.7.orig/ncurses/base/lib_pad.c ncurses-5.7/ncurses/base/lib_pad.c 17031 --- ncurses-5.7.orig/ncurses/base/lib_pad.c 2006-10-14 13:47:13.000000000 -0700 17032 +++ ncurses-5.7/ncurses/base/lib_pad.c 2009-02-28 20:38:57.047235367 -0800 17033 @@ -1,5 +1,5 @@ 17034 /**************************************************************************** 17035 - * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. * 17036 + * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. * 17037 * * 17038 * Permission is hereby granted, free of charge, to any person obtaining a * 17039 * copy of this software and associated documentation files (the * 17040 @@ -29,6 +29,8 @@ 17041 /**************************************************************************** 17042 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 17043 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 17044 + * and: Thomas E. Dickey 1996-on * 17045 + * and: Juergen Pfeifer 2009 * 17046 ****************************************************************************/ 17047 17048 /* 17049 @@ -40,10 +42,10 @@ 17050 17051 #include <curses.priv.h> 17052 17053 -MODULE_ID("$Id: lib_pad.c,v 1.41 2006/10/14 20:47:13 tom Exp $") 17054 +MODULE_ID("$Id: lib_pad.c,v 1.42 2009/02/15 00:38:48 tom Exp $") 17055 17056 NCURSES_EXPORT(WINDOW *) 17057 -newpad(int l, int c) 17058 +NCURSES_SP_NAME(newpad) (NCURSES_SP_DCLx int l, int c) 17059 { 17060 WINDOW *win; 17061 NCURSES_CH_T *ptr; 17062 @@ -70,6 +72,14 @@ 17063 returnWin(win); 17064 } 17065 17066 +#if NCURSES_SP_FUNCS 17067 +NCURSES_EXPORT(WINDOW *) 17068 +newpad(int l, int c) 17069 +{ 17070 + return NCURSES_SP_NAME(newpad) (CURRENT_SCREEN, l, c); 17071 +} 17072 +#endif 17073 + 17074 NCURSES_EXPORT(WINDOW *) 17075 subpad(WINDOW *orig, int l, int c, int begy, int begx) 17076 { 17077 diff -Naur ncurses-5.7.orig/ncurses/base/lib_screen.c ncurses-5.7/ncurses/base/lib_screen.c 17078 --- ncurses-5.7.orig/ncurses/base/lib_screen.c 2008-08-16 12:05:37.000000000 -0700 17079 +++ ncurses-5.7/ncurses/base/lib_screen.c 2009-02-28 20:38:57.047235367 -0800 17080 @@ -1,5 +1,5 @@ 17081 /**************************************************************************** 17082 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 17083 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 17084 * * 17085 * Permission is hereby granted, free of charge, to any person obtaining a * 17086 * copy of this software and associated documentation files (the * 17087 @@ -30,11 +30,12 @@ 17088 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 17089 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 17090 * and: Thomas E. Dickey 1996 on * 17091 + * and: Juergen Pfeifer 2009 * 17092 ****************************************************************************/ 17093 17094 #include <curses.priv.h> 17095 17096 -MODULE_ID("$Id: lib_screen.c,v 1.31 2008/08/16 19:05:37 tom Exp $") 17097 +MODULE_ID("$Id: lib_screen.c,v 1.32 2009/02/15 00:39:13 tom Exp $") 17098 17099 #define MAX_SIZE 0x3fff /* 16k is big enough for a window or pad */ 17100 17101 @@ -141,7 +142,7 @@ 17102 } 17103 17104 NCURSES_EXPORT(int) 17105 -scr_restore(const char *file) 17106 +NCURSES_SP_NAME(scr_restore) (NCURSES_SP_DCLx const char *file) 17107 { 17108 FILE *fp = 0; 17109 17110 @@ -152,15 +153,23 @@ 17111 returnCode(ERR); 17112 } else { 17113 delwin(newscr); 17114 - SP->_newscr = getwin(fp); 17115 + SP_PARM->_newscr = getwin(fp); 17116 #if !USE_REENTRANT 17117 - newscr = SP->_newscr; 17118 + newscr = SP_PARM->_newscr; 17119 #endif 17120 (void) fclose(fp); 17121 returnCode(OK); 17122 } 17123 } 17124 17125 +#if NCURSES_SP_FUNCS 17126 +NCURSES_EXPORT(int) 17127 +scr_restore(const char *file) 17128 +{ 17129 + return NCURSES_SP_NAME(scr_restore) (CURRENT_SCREEN, file); 17130 +} 17131 +#endif 17132 + 17133 NCURSES_EXPORT(int) 17134 scr_dump(const char *file) 17135 { 17136 @@ -179,7 +188,7 @@ 17137 } 17138 17139 NCURSES_EXPORT(int) 17140 -scr_init(const char *file) 17141 +NCURSES_SP_NAME(scr_init) (NCURSES_SP_DCLx const char *file) 17142 { 17143 FILE *fp = 0; 17144 17145 @@ -193,17 +202,25 @@ 17146 returnCode(ERR); 17147 } else { 17148 delwin(curscr); 17149 - SP->_curscr = getwin(fp); 17150 + SP_PARM->_curscr = getwin(fp); 17151 #if !USE_REENTRANT 17152 - curscr = SP->_curscr; 17153 + curscr = SP_PARM->_curscr; 17154 #endif 17155 (void) fclose(fp); 17156 returnCode(OK); 17157 } 17158 } 17159 17160 +#if NCURSES_SP_FUNCS 17161 NCURSES_EXPORT(int) 17162 -scr_set(const char *file) 17163 +scr_init(const char *file) 17164 +{ 17165 + return NCURSES_SP_NAME(scr_init) (CURRENT_SCREEN, file); 17166 +} 17167 +#endif 17168 + 17169 +NCURSES_EXPORT(int) 17170 +NCURSES_SP_NAME(scr_set) (NCURSES_SP_DCLx const char *file) 17171 { 17172 T((T_CALLED("scr_set(%s)"), _nc_visbuf(file))); 17173 17174 @@ -211,10 +228,18 @@ 17175 returnCode(ERR); 17176 } else { 17177 delwin(newscr); 17178 - SP->_newscr = dupwin(curscr); 17179 + SP_PARM->_newscr = dupwin(curscr); 17180 #if !USE_REENTRANT 17181 - newscr = SP->_newscr; 17182 + newscr = SP_PARM->_newscr; 17183 #endif 17184 returnCode(OK); 17185 } 17186 } 17187 + 17188 +#if NCURSES_SP_FUNCS 17189 +NCURSES_EXPORT(int) 17190 +scr_set(const char *file) 17191 +{ 17192 + return NCURSES_SP_NAME(scr_set) (CURRENT_SCREEN, file); 17193 +} 17194 +#endif 17195 diff -Naur ncurses-5.7.orig/ncurses/base/lib_set_term.c ncurses-5.7/ncurses/base/lib_set_term.c 17196 --- ncurses-5.7.orig/ncurses/base/lib_set_term.c 2008-08-04 11:11:12.000000000 -0700 17197 +++ ncurses-5.7/ncurses/base/lib_set_term.c 2009-02-28 20:38:57.051235647 -0800 17198 @@ -1,5 +1,5 @@ 17199 /**************************************************************************** 17200 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 17201 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 17202 * * 17203 * Permission is hereby granted, free of charge, to any person obtaining a * 17204 * copy of this software and associated documentation files (the * 17205 @@ -30,6 +30,7 @@ 17206 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 17207 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 17208 * and: Thomas E. Dickey 1996-on * 17209 + * and: Juergen Pfeifer 2009 * 17210 ****************************************************************************/ 17211 17212 /* 17213 @@ -44,7 +45,7 @@ 17214 #include <term.h> /* cur_term */ 17215 #include <tic.h> 17216 17217 -MODULE_ID("$Id: lib_set_term.c,v 1.117 2008/08/04 18:11:12 tom Exp $") 17218 +MODULE_ID("$Id: lib_set_term.c,v 1.118 2009/02/15 00:39:46 tom Exp $") 17219 17220 NCURSES_EXPORT(SCREEN *) 17221 set_term(SCREEN *screenp) 17222 @@ -635,7 +636,9 @@ 17223 } 17224 17225 NCURSES_EXPORT(int) 17226 -ripoffline(int line, int (*init) (WINDOW *, int)) 17227 +NCURSES_SP_NAME(ripoffline) (NCURSES_SP_DCLx 17228 + int line, 17229 + int (*init) (WINDOW *, int)) 17230 { 17231 START_TRACE(); 17232 T((T_CALLED("ripoffline(%d,%p)"), line, init)); 17233 @@ -645,3 +648,11 @@ 17234 17235 returnCode(_nc_ripoffline((line < 0) ? -1 : 1, init)); 17236 } 17237 + 17238 +#if NCURSES_SP_FUNCS 17239 +NCURSES_EXPORT(int) 17240 +ripoffline(int line, int (*init) (WINDOW *, int)) 17241 +{ 17242 + return NCURSES_SP_NAME(ripoffline) (CURRENT_SCREEN, line, init); 17243 +} 17244 +#endif 17245 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatrof.c ncurses-5.7/ncurses/base/lib_slkatrof.c 17246 --- ncurses-5.7.orig/ncurses/base/lib_slkatrof.c 2005-01-08 15:01:32.000000000 -0800 17247 +++ ncurses-5.7/ncurses/base/lib_slkatrof.c 2009-02-28 20:38:58.439326442 -0800 17248 @@ -1,5 +1,5 @@ 17249 /**************************************************************************** 17250 - * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc. * 17251 + * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * 17252 * * 17253 * Permission is hereby granted, free of charge, to any person obtaining a * 17254 * copy of this software and associated documentation files (the * 17255 @@ -38,21 +38,29 @@ 17256 */ 17257 #include <curses.priv.h> 17258 17259 -MODULE_ID("$Id: lib_slkatrof.c,v 1.8 2005/01/08 23:01:32 tom Exp $") 17260 +MODULE_ID("$Id: lib_slkatrof.c,v 1.10 2009/02/21 17:35:28 tom Exp $") 17261 17262 NCURSES_EXPORT(int) 17263 -slk_attroff(const chtype attr) 17264 +NCURSES_SP_NAME(slk_attroff) (NCURSES_SP_DCLx const chtype attr) 17265 { 17266 - T((T_CALLED("slk_attroff(%s)"), _traceattr(attr))); 17267 + T((T_CALLED("slk_attroff(%p,%s)"), SP_PARM, _traceattr(attr))); 17268 17269 - if (SP != 0 && SP->_slk != 0) { 17270 - TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP->_slk->attr)))); 17271 - RemAttr(SP->_slk->attr, attr); 17272 + if (SP_PARM != 0 && SP_PARM->_slk != 0) { 17273 + TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP_PARM->_slk->attr)))); 17274 + RemAttr(SP_PARM->_slk->attr, attr); 17275 if ((attr & A_COLOR) != 0) { 17276 - SetPair(SP->_slk->attr, 0); 17277 + SetPair(SP_PARM->_slk->attr, 0); 17278 } 17279 - TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr)))); 17280 + TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP_PARM->_slk->attr)))); 17281 returnCode(OK); 17282 } else 17283 returnCode(ERR); 17284 } 17285 + 17286 +#if NCURSES_SP_FUNCS 17287 +NCURSES_EXPORT(int) 17288 +slk_attroff(const chtype attr) 17289 +{ 17290 + return NCURSES_SP_NAME(slk_attroff) (CURRENT_SCREEN, attr); 17291 +} 17292 +#endif 17293 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatron.c ncurses-5.7/ncurses/base/lib_slkatron.c 17294 --- ncurses-5.7.orig/ncurses/base/lib_slkatron.c 2005-01-08 15:02:01.000000000 -0800 17295 +++ ncurses-5.7/ncurses/base/lib_slkatron.c 2009-02-28 20:38:58.439326442 -0800 17296 @@ -1,5 +1,5 @@ 17297 /**************************************************************************** 17298 - * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc. * 17299 + * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * 17300 * * 17301 * Permission is hereby granted, free of charge, to any person obtaining a * 17302 * copy of this software and associated documentation files (the * 17303 @@ -38,21 +38,29 @@ 17304 */ 17305 #include <curses.priv.h> 17306 17307 -MODULE_ID("$Id: lib_slkatron.c,v 1.8 2005/01/08 23:02:01 tom Exp $") 17308 +MODULE_ID("$Id: lib_slkatron.c,v 1.10 2009/02/21 18:16:04 tom Exp $") 17309 17310 NCURSES_EXPORT(int) 17311 -slk_attron(const chtype attr) 17312 +NCURSES_SP_NAME(slk_attron) (NCURSES_SP_DCLx const chtype attr) 17313 { 17314 - T((T_CALLED("slk_attron(%s)"), _traceattr(attr))); 17315 + T((T_CALLED("slk_attron(%p,%s)"), SP_PARM, _traceattr(attr))); 17316 17317 - if (SP != 0 && SP->_slk != 0) { 17318 - TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP->_slk->attr)))); 17319 - AddAttr(SP->_slk->attr, attr); 17320 + if (SP_PARM != 0 && SP_PARM->_slk != 0) { 17321 + TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP_PARM->_slk->attr)))); 17322 + AddAttr(SP_PARM->_slk->attr, attr); 17323 if ((attr & A_COLOR) != 0) { 17324 - SetPair(SP->_slk->attr, PAIR_NUMBER(attr)); 17325 + SetPair(SP_PARM->_slk->attr, PAIR_NUMBER(attr)); 17326 } 17327 - TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr)))); 17328 + TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP_PARM->_slk->attr)))); 17329 returnCode(OK); 17330 } else 17331 returnCode(ERR); 17332 } 17333 + 17334 +#if NCURSES_SP_FUNCS 17335 +NCURSES_EXPORT(int) 17336 +slk_attron(const chtype attr) 17337 +{ 17338 + return NCURSES_SP_NAME(slk_attron) (CURRENT_SCREEN, attr); 17339 +} 17340 +#endif 14564 17341 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatr_set.c ncurses-5.7/ncurses/base/lib_slkatr_set.c 14565 17342 --- ncurses-5.7.orig/ncurses/base/lib_slkatr_set.c 2005-01-28 13:11:53.000000000 -0800 14566 +++ ncurses-5.7/ncurses/base/lib_slkatr_set.c 2009-0 1-27 16:45:05.088820784-080017343 +++ ncurses-5.7/ncurses/base/lib_slkatr_set.c 2009-02-28 20:38:58.439326442 -0800 14567 17344 @@ -1,5 +1,5 @@ 14568 17345 /**************************************************************************** … … 14581 17358 14582 17359 /* 14583 @@ -38,22 +38, 27@@17360 @@ -38,22 +38,39 @@ 14584 17361 */ 14585 17362 #include <curses.priv.h> 14586 17363 14587 17364 -MODULE_ID("$Id: lib_slkatr_set.c,v 1.10 2005/01/28 21:11:53 tom Exp $") 14588 +MODULE_ID("$Id: lib_slkatr_set.c,v 1.1 1 2009/01/25 00:47:15tom Exp $")17365 +MODULE_ID("$Id: lib_slkatr_set.c,v 1.13 2009/02/21 17:20:17 tom Exp $") 14589 17366 14590 17367 NCURSES_EXPORT(int) 14591 slk_attr_set(const attr_t attr, short color_pair_number, void *opts) 17368 -slk_attr_set(const attr_t attr, short color_pair_number, void *opts) 17369 +NCURSES_SP_NAME(slk_attr_set) (NCURSES_SP_DCLx 17370 + const attr_t attr, 17371 + short color_pair_number, 17372 + void *opts) 14592 17373 { 17374 - T((T_CALLED("slk_attr_set(%s,%d)"), _traceattr(attr), color_pair_number)); 14593 17375 + int code = ERR; 14594 17376 + 14595 T((T_CALLED("slk_attr_set(%s,%d)"), _traceattr(attr), color_pair_number));17377 + T((T_CALLED("slk_attr_set(%p,%s,%d)"), SP_PARM, _traceattr(attr), color_pair_number)); 14596 17378 14597 17379 - if (SP != 0 && SP->_slk != 0 && !opts && 14598 17380 - color_pair_number >= 0 && color_pair_number < COLOR_PAIRS) { 14599 + if (SP != 0 14600 + && SP->_slk != 0 17381 - TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP->_slk->attr)))); 17382 - SetAttr(SP->_slk->attr, attr); 17383 + if (SP_PARM != 0 17384 + && SP_PARM->_slk != 0 14601 17385 + && !opts 14602 17386 + && color_pair_number >= 0 14603 + && color_pair_number < SP ->_pair_limit) {14604 TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP->_slk->attr))));14605 SetAttr(SP->_slk->attr, attr);17387 + && color_pair_number < SP_PARM->_pair_limit) { 17388 + TR(TRACE_ATTRS, ("... current %s", _tracech_t(CHREF(SP_PARM->_slk->attr)))); 17389 + SetAttr(SP_PARM->_slk->attr, attr); 14606 17390 if (color_pair_number > 0) { 14607 SetPair(SP->_slk->attr, color_pair_number); 17391 - SetPair(SP->_slk->attr, color_pair_number); 17392 + SetPair(SP_PARM->_slk->attr, color_pair_number); 14608 17393 } 14609 17394 - TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr)))); 14610 17395 - returnCode(OK); 14611 17396 - } else 14612 17397 - returnCode(ERR); 17398 + TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP_PARM->_slk->attr)))); 14613 17399 + code = OK; 14614 17400 + } 14615 17401 + returnCode(code); 14616 } 17402 +} 17403 + 17404 +#if NCURSES_SP_FUNCS 17405 +NCURSES_EXPORT(int) 17406 +slk_attr_set(const attr_t attr, short color_pair_number, void *opts) 17407 +{ 17408 + return NCURSES_SP_NAME(slk_attr_set) (CURRENT_SCREEN, attr, 17409 + color_pair_number, opts); 17410 } 17411 +#endif 17412 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatrset.c ncurses-5.7/ncurses/base/lib_slkatrset.c 17413 --- ncurses-5.7.orig/ncurses/base/lib_slkatrset.c 2005-01-08 13:46:47.000000000 -0800 17414 +++ ncurses-5.7/ncurses/base/lib_slkatrset.c 2009-02-28 20:38:58.439326442 -0800 17415 @@ -1,5 +1,5 @@ 17416 /**************************************************************************** 17417 - * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc. * 17418 + * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * 17419 * * 17420 * Permission is hereby granted, free of charge, to any person obtaining a * 17421 * copy of this software and associated documentation files (the * 17422 @@ -38,16 +38,24 @@ 17423 */ 17424 #include <curses.priv.h> 17425 17426 -MODULE_ID("$Id: lib_slkatrset.c,v 1.7 2005/01/08 21:46:47 tom Exp $") 17427 +MODULE_ID("$Id: lib_slkatrset.c,v 1.9 2009/02/21 17:49:07 tom Exp $") 17428 17429 NCURSES_EXPORT(int) 17430 -slk_attrset(const chtype attr) 17431 +NCURSES_SP_NAME(slk_attrset) (NCURSES_SP_DCLx const chtype attr) 17432 { 17433 - T((T_CALLED("slk_attrset(%s)"), _traceattr(attr))); 17434 + T((T_CALLED("slk_attrset(%p,%s)"), SP_PARM, _traceattr(attr))); 17435 17436 - if (SP != 0 && SP->_slk != 0) { 17437 - SetAttr(SP->_slk->attr, attr); 17438 + if (SP_PARM != 0 && SP_PARM->_slk != 0) { 17439 + SetAttr(SP_PARM->_slk->attr, attr); 17440 returnCode(OK); 17441 } else 17442 returnCode(ERR); 17443 } 17444 + 17445 +#if NCURSES_SP_FUNCS 17446 +NCURSES_EXPORT(int) 17447 +slk_attrset(const chtype attr) 17448 +{ 17449 + return NCURSES_SP_NAME(slk_attrset) (CURRENT_SCREEN, attr); 17450 +} 17451 +#endif 17452 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkattr.c ncurses-5.7/ncurses/base/lib_slkattr.c 17453 --- ncurses-5.7.orig/ncurses/base/lib_slkattr.c 2005-01-08 13:44:28.000000000 -0800 17454 +++ ncurses-5.7/ncurses/base/lib_slkattr.c 2009-02-28 20:38:58.439326442 -0800 17455 @@ -1,5 +1,5 @@ 17456 /**************************************************************************** 17457 - * Copyright (c) 1998,2000 Free Software Foundation, Inc. * 17458 + * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc. * 17459 * * 17460 * Permission is hereby granted, free of charge, to any person obtaining a * 17461 * copy of this software and associated documentation files (the * 17462 @@ -38,19 +38,27 @@ 17463 */ 17464 #include <curses.priv.h> 17465 17466 -MODULE_ID("$Id: lib_slkattr.c,v 1.6 2005/01/08 21:44:28 tom Exp $") 17467 +MODULE_ID("$Id: lib_slkattr.c,v 1.8 2009/02/21 17:48:14 tom Exp $") 17468 17469 NCURSES_EXPORT(attr_t) 17470 -slk_attr(void) 17471 +NCURSES_SP_NAME(slk_attr) (NCURSES_SP_DCL0) 17472 { 17473 - T((T_CALLED("slk_attr()"))); 17474 + T((T_CALLED("slk_attr(%p)"), SP_PARM)); 17475 17476 - if (SP != 0 && SP->_slk != 0) { 17477 - attr_t result = AttrOf(SP->_slk->attr) & ALL_BUT_COLOR; 17478 - int pair = GetPair(SP->_slk->attr); 17479 + if (SP_PARM != 0 && SP_PARM->_slk != 0) { 17480 + attr_t result = AttrOf(SP_PARM->_slk->attr) & ALL_BUT_COLOR; 17481 + int pair = GetPair(SP_PARM->_slk->attr); 17482 17483 result |= COLOR_PAIR(pair); 17484 returnAttr(result); 17485 } else 17486 returnAttr(0); 17487 } 17488 + 17489 +#if NCURSES_SP_FUNCS 17490 +NCURSES_EXPORT(attr_t) 17491 +slk_attr(void) 17492 +{ 17493 + return NCURSES_SP_NAME(slk_attr) (CURRENT_SCREEN); 17494 +} 17495 +#endif 17496 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slk.c ncurses-5.7/ncurses/base/lib_slk.c 17497 --- ncurses-5.7.orig/ncurses/base/lib_slk.c 2008-09-27 07:07:33.000000000 -0700 17498 +++ ncurses-5.7/ncurses/base/lib_slk.c 2009-02-28 20:38:57.051235647 -0800 17499 @@ -1,5 +1,5 @@ 17500 /**************************************************************************** 17501 - * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc. * 17502 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 17503 * * 17504 * Permission is hereby granted, free of charge, to any person obtaining a * 17505 * copy of this software and associated documentation files (the * 17506 @@ -45,7 +45,7 @@ 17507 #include <ctype.h> 17508 #include <term.h> /* num_labels, label_*, plab_norm */ 17509 17510 -MODULE_ID("$Id: lib_slk.c,v 1.35 2008/09/27 14:07:33 juergen Exp $") 17511 +MODULE_ID("$Id: lib_slk.c,v 1.36 2009/02/15 00:33:48 tom Exp $") 17512 17513 /* 17514 * Free any memory related to soft labels, return an error. 17515 @@ -178,14 +178,22 @@ 17516 * Restore the soft labels on the screen. 17517 */ 17518 NCURSES_EXPORT(int) 17519 -slk_restore(void) 17520 +NCURSES_SP_NAME(slk_restore) (NCURSES_SP_DCL0) 17521 { 17522 T((T_CALLED("slk_restore()"))); 17523 17524 - if (SP->_slk == NULL) 17525 + if (SP_PARM->_slk == NULL) 17526 return (ERR); 17527 - SP->_slk->hidden = FALSE; 17528 - SP->_slk->dirty = TRUE; 17529 + SP_PARM->_slk->hidden = FALSE; 17530 + SP_PARM->_slk->dirty = TRUE; 17531 17532 returnCode(slk_refresh()); 17533 } 17534 + 17535 +#if NCURSES_SP_FUNCS 17536 +NCURSES_EXPORT(int) 17537 +slk_restore(void) 17538 +{ 17539 + return NCURSES_SP_NAME(slk_restore) (CURRENT_SCREEN); 17540 +} 17541 +#endif 17542 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkclear.c ncurses-5.7/ncurses/base/lib_slkclear.c 17543 --- ncurses-5.7.orig/ncurses/base/lib_slkclear.c 2007-12-29 09:51:47.000000000 -0800 17544 +++ ncurses-5.7/ncurses/base/lib_slkclear.c 2009-02-28 20:38:58.439326442 -0800 17545 @@ -1,5 +1,5 @@ 17546 /**************************************************************************** 17547 - * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. * 17548 + * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. * 17549 * * 17550 * Permission is hereby granted, free of charge, to any person obtaining a * 17551 * copy of this software and associated documentation files (the * 17552 @@ -40,27 +40,35 @@ 17553 */ 17554 #include <curses.priv.h> 17555 17556 -MODULE_ID("$Id: lib_slkclear.c,v 1.10 2007/12/29 17:51:47 tom Exp $") 17557 +MODULE_ID("$Id: lib_slkclear.c,v 1.12 2009/02/21 17:47:14 tom Exp $") 17558 17559 NCURSES_EXPORT(int) 17560 -slk_clear(void) 17561 +NCURSES_SP_NAME(slk_clear) (NCURSES_SP_DCL0) 17562 { 17563 int rc = ERR; 17564 17565 - T((T_CALLED("slk_clear()"))); 17566 + T((T_CALLED("slk_clear(%p)"), SP_PARM)); 17567 17568 - if (SP != NULL && SP->_slk != NULL) { 17569 - SP->_slk->hidden = TRUE; 17570 + if (SP_PARM != 0 && SP_PARM->_slk != 0) { 17571 + SP_PARM->_slk->hidden = TRUE; 17572 /* For simulated SLK's it looks much more natural to 17573 inherit those attributes from the standard screen */ 17574 - SP->_slk->win->_nc_bkgd = stdscr->_nc_bkgd; 17575 - WINDOW_ATTRS(SP->_slk->win) = WINDOW_ATTRS(stdscr); 17576 - if (SP->_slk->win == stdscr) { 17577 + SP_PARM->_slk->win->_nc_bkgd = SP_PARM->_stdscr->_nc_bkgd; 17578 + WINDOW_ATTRS(SP_PARM->_slk->win) = WINDOW_ATTRS(SP_PARM->_stdscr); 17579 + if (SP_PARM->_slk->win == SP_PARM->_stdscr) { 17580 rc = OK; 17581 } else { 17582 - werase(SP->_slk->win); 17583 - rc = wrefresh(SP->_slk->win); 17584 + werase(SP_PARM->_slk->win); 17585 + rc = wrefresh(SP_PARM->_slk->win); 17586 } 17587 } 17588 returnCode(rc); 17589 } 17590 + 17591 +#if NCURSES_SP_FUNCS 17592 +NCURSES_EXPORT(int) 17593 +slk_clear(void) 17594 +{ 17595 + return NCURSES_SP_NAME(slk_clear) (CURRENT_SCREEN); 17596 +} 17597 +#endif 14617 17598 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkcolor.c ncurses-5.7/ncurses/base/lib_slkcolor.c 14618 17599 --- ncurses-5.7.orig/ncurses/base/lib_slkcolor.c 2005-01-28 13:11:53.000000000 -0800 14619 +++ ncurses-5.7/ncurses/base/lib_slkcolor.c 2009-0 1-27 16:45:05.088820784-080017600 +++ ncurses-5.7/ncurses/base/lib_slkcolor.c 2009-02-28 20:38:58.439326442 -0800 14620 17601 @@ -1,5 +1,5 @@ 14621 17602 /**************************************************************************** … … 14625 17606 * Permission is hereby granted, free of charge, to any person obtaining a * 14626 17607 * copy of this software and associated documentation files (the * 14627 @@ -28,7 +28,7 @@ 17608 @@ -27,8 +27,8 @@ 17609 ****************************************************************************/ 14628 17610 14629 17611 /**************************************************************************** 14630 17612 - * Author: Juergen Pfeifer, 1998 * 14631 17613 - * and: Thomas E. Dickey 2005 * 17614 + * Author: Juergen Pfeifer, 1998,2009 * 14632 17615 + * and: Thomas E. Dickey 2005-on * 14633 17616 ****************************************************************************/ 14634 17617 14635 17618 /* 14636 @@ -38,19 +38, 23@@17619 @@ -38,19 +38,31 @@ 14637 17620 */ 14638 17621 #include <curses.priv.h> 14639 17622 14640 17623 -MODULE_ID("$Id: lib_slkcolor.c,v 1.12 2005/01/28 21:11:53 tom Exp $") 14641 +MODULE_ID("$Id: lib_slkcolor.c,v 1.1 3 2009/01/25 00:48:07tom Exp $")17624 +MODULE_ID("$Id: lib_slkcolor.c,v 1.15 2009/02/21 16:59:50 tom Exp $") 14642 17625 14643 17626 NCURSES_EXPORT(int) 14644 slk_color(short color_pair_number) 17627 -slk_color(short color_pair_number) 17628 +NCURSES_SP_NAME(slk_color) (NCURSES_SP_DCLx short color_pair_number) 14645 17629 { 17630 - T((T_CALLED("slk_color(%d)"), color_pair_number)); 14646 17631 + int code = ERR; 14647 17632 + 14648 T((T_CALLED("slk_color(%d)"), color_pair_number)); 17633 + T((T_CALLED("slk_color(%p,%d)"), SP_PARM, color_pair_number)); 17634 + 17635 + if (SP_PARM != 0 17636 + && SP_PARM->_slk != 0 17637 + && color_pair_number >= 0 17638 + && color_pair_number < SP_PARM->_pair_limit) { 17639 + TR(TRACE_ATTRS, ("... current is %s", _tracech_t(CHREF(SP_PARM->_slk->attr)))); 17640 + SetPair(SP_PARM->_slk->attr, color_pair_number); 17641 + TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP_PARM->_slk->attr)))); 17642 + code = OK; 17643 + } 17644 + returnCode(code); 17645 +} 14649 17646 14650 17647 - if (SP != 0 && SP->_slk != 0 && 14651 17648 - color_pair_number >= 0 && color_pair_number < COLOR_PAIRS) { 14652 + if (SP != 0 14653 + && SP->_slk != 0 14654 + && color_pair_number >= 0 14655 + && color_pair_number < SP->_pair_limit) { 14656 TR(TRACE_ATTRS, ("... current is %s", _tracech_t(CHREF(SP->_slk->attr)))); 14657 SetPair(SP->_slk->attr, color_pair_number); 14658 TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr)))); 17649 - TR(TRACE_ATTRS, ("... current is %s", _tracech_t(CHREF(SP->_slk->attr)))); 17650 - SetPair(SP->_slk->attr, color_pair_number); 17651 - TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr)))); 14659 17652 - returnCode(OK); 14660 17653 - } else 14661 17654 - returnCode(ERR); 14662 + code = OK; 14663 + } 14664 + returnCode(code); 14665 } 14666 diff -Naur ncurses-5.7.orig/ncurses/curses.priv.h ncurses-5.7/ncurses/curses.priv.h 14667 --- ncurses-5.7.orig/ncurses/curses.priv.h 2008-10-04 14:37:45.000000000 -0700 14668 +++ ncurses-5.7/ncurses/curses.priv.h 2009-01-27 16:45:05.088820784 -0800 17655 +#if NCURSES_SP_FUNCS 17656 +NCURSES_EXPORT(int) 17657 +slk_color(short color_pair_number) 17658 +{ 17659 + return NCURSES_SP_NAME(slk_color) (CURRENT_SCREEN, color_pair_number); 17660 } 17661 +#endif 17662 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkinit.c ncurses-5.7/ncurses/base/lib_slkinit.c 17663 --- ncurses-5.7.orig/ncurses/base/lib_slkinit.c 2008-01-12 12:23:39.000000000 -0800 17664 +++ ncurses-5.7/ncurses/base/lib_slkinit.c 2009-02-28 20:38:57.051235647 -0800 14669 17665 @@ -1,5 +1,5 @@ 14670 17666 /**************************************************************************** … … 14674 17670 * Permission is hereby granted, free of charge, to any person obtaining a * 14675 17671 * copy of this software and associated documentation files (the * 14676 @@ -34,7 +34,7 @@ 17672 @@ -30,6 +30,7 @@ 17673 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 17674 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 17675 * and: Thomas E. Dickey 1996-on * 17676 + * and: Juergen Pfeifer 2009 * 17677 ****************************************************************************/ 17678 17679 /* 17680 @@ -39,10 +40,10 @@ 17681 */ 17682 #include <curses.priv.h> 17683 17684 -MODULE_ID("$Id: lib_slkinit.c,v 1.7 2008/01/12 20:23:39 tom Exp $") 17685 +MODULE_ID("$Id: lib_slkinit.c,v 1.8 2009/02/15 00:42:36 tom Exp $") 17686 17687 NCURSES_EXPORT(int) 17688 -slk_init(int format) 17689 +NCURSES_SP_NAME(slk_init) (NCURSES_SP_DCLx int format) 17690 { 17691 int code = ERR; 17692 17693 @@ -53,3 +54,11 @@ 17694 } 17695 returnCode(code); 17696 } 17697 + 17698 +#if NCURSES_SP_FUNCS 17699 +NCURSES_EXPORT(int) 17700 +slk_init(int format) 17701 +{ 17702 + return NCURSES_SP_NAME(slk_init) (CURRENT_SCREEN, format); 17703 +} 17704 +#endif 17705 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slklab.c ncurses-5.7/ncurses/base/lib_slklab.c 17706 --- ncurses-5.7.orig/ncurses/base/lib_slklab.c 2003-03-29 14:53:48.000000000 -0800 17707 +++ ncurses-5.7/ncurses/base/lib_slklab.c 2009-02-28 20:38:58.439326442 -0800 17708 @@ -1,5 +1,5 @@ 17709 /**************************************************************************** 17710 - * Copyright (c) 1998-2000,2003 Free Software Foundation, Inc. * 17711 + * Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. * 17712 * * 17713 * Permission is hereby granted, free of charge, to any person obtaining a * 17714 * copy of this software and associated documentation files (the * 17715 @@ -29,6 +29,8 @@ 17716 /**************************************************************************** 17717 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 17718 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 17719 + * and: Juergen Pfeifer, 1998,2009 * 17720 + * and: Thomas E. Dickey 1998-on * 17721 ****************************************************************************/ 17722 17723 /* 17724 @@ -38,14 +40,22 @@ 17725 */ 17726 #include <curses.priv.h> 17727 17728 -MODULE_ID("$Id: lib_slklab.c,v 1.7 2003/03/29 22:53:48 tom Exp $") 17729 +MODULE_ID("$Id: lib_slklab.c,v 1.9 2009/02/21 18:48:42 tom Exp $") 17730 17731 NCURSES_EXPORT(char *) 17732 -slk_label(int n) 17733 +NCURSES_SP_NAME(slk_label) (NCURSES_SP_DCLx int n) 17734 { 17735 - T((T_CALLED("slk_label(%d)"), n)); 17736 + T((T_CALLED("slk_label(%p,%d)"), SP_PARM, n)); 17737 17738 - if (SP == NULL || SP->_slk == NULL || n < 1 || n > SP->_slk->labcnt) 17739 + if (SP_PARM == 0 || SP_PARM->_slk == 0 || n < 1 || n > SP_PARM->_slk->labcnt) 17740 returnPtr(0); 17741 - returnPtr(SP->_slk->ent[n - 1].ent_text); 17742 + returnPtr(SP_PARM->_slk->ent[n - 1].ent_text); 17743 +} 17744 + 17745 +#if NCURSES_SP_FUNCS 17746 +NCURSES_EXPORT(char *) 17747 +slk_label(int n) 17748 +{ 17749 + return NCURSES_SP_NAME(slk_label) (CURRENT_SCREEN, n); 17750 } 17751 +#endif 17752 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkrefr.c ncurses-5.7/ncurses/base/lib_slkrefr.c 17753 --- ncurses-5.7.orig/ncurses/base/lib_slkrefr.c 2008-09-27 07:07:53.000000000 -0700 17754 +++ ncurses-5.7/ncurses/base/lib_slkrefr.c 2009-02-28 20:38:57.051235647 -0800 17755 @@ -1,5 +1,5 @@ 17756 /**************************************************************************** 17757 - * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. * 17758 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 17759 * * 17760 * Permission is hereby granted, free of charge, to any person obtaining a * 17761 * copy of this software and associated documentation files (the * 17762 @@ -40,7 +40,7 @@ 17763 #include <curses.priv.h> 17764 #include <term.h> /* num_labels, label_*, plab_norm */ 17765 17766 -MODULE_ID("$Id: lib_slkrefr.c,v 1.17 2008/09/27 14:07:53 juergen Exp $") 17767 +MODULE_ID("$Id: lib_slkrefr.c,v 1.18 2009/02/15 00:33:48 tom Exp $") 17768 17769 /* 17770 * Paint the info line for the PC style SLK emulation. 17771 @@ -113,32 +113,48 @@ 17772 * Refresh the soft labels. 17773 */ 17774 NCURSES_EXPORT(int) 17775 -slk_noutrefresh(void) 17776 +NCURSES_SP_NAME(slk_noutrefresh) (NCURSES_SP_DCL0) 17777 { 17778 T((T_CALLED("slk_noutrefresh()"))); 17779 17780 - if (SP == NULL || SP->_slk == NULL) 17781 + if (SP_PARM == NULL || SP_PARM->_slk == NULL) 17782 returnCode(ERR); 17783 - if (SP->_slk->hidden) 17784 + if (SP_PARM->_slk->hidden) 17785 returnCode(OK); 17786 - slk_intern_refresh(SP->_slk); 17787 + slk_intern_refresh(SP_PARM->_slk); 17788 + 17789 + returnCode(wnoutrefresh(SP_PARM->_slk->win)); 17790 +} 17791 17792 - returnCode(wnoutrefresh(SP->_slk->win)); 17793 +#if NCURSES_SP_FUNCS 17794 +NCURSES_EXPORT(int) 17795 +slk_noutrefresh(void) 17796 +{ 17797 + return NCURSES_SP_NAME(slk_noutrefresh) (CURRENT_SCREEN); 17798 } 17799 +#endif 17800 17801 /* 17802 * Refresh the soft labels. 17803 */ 17804 NCURSES_EXPORT(int) 17805 -slk_refresh(void) 17806 +NCURSES_SP_NAME(slk_refresh) (NCURSES_SP_DCL0) 17807 { 17808 T((T_CALLED("slk_refresh()"))); 17809 17810 - if (SP == NULL || SP->_slk == NULL) 17811 + if (SP_PARM == NULL || SP_PARM->_slk == NULL) 17812 returnCode(ERR); 17813 - if (SP->_slk->hidden) 17814 + if (SP_PARM->_slk->hidden) 17815 returnCode(OK); 17816 - slk_intern_refresh(SP->_slk); 17817 + slk_intern_refresh(SP_PARM->_slk); 17818 + 17819 + returnCode(wrefresh(SP_PARM->_slk->win)); 17820 +} 17821 17822 - returnCode(wrefresh(SP->_slk->win)); 17823 +#if NCURSES_SP_FUNCS 17824 +NCURSES_EXPORT(int) 17825 +slk_refresh(void) 17826 +{ 17827 + return NCURSES_SP_NAME(slk_refresh) (CURRENT_SCREEN); 17828 } 17829 +#endif 17830 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkset.c ncurses-5.7/ncurses/base/lib_slkset.c 17831 --- ncurses-5.7.orig/ncurses/base/lib_slkset.c 2007-10-13 13:08:46.000000000 -0700 17832 +++ ncurses-5.7/ncurses/base/lib_slkset.c 2009-02-28 20:38:58.439326442 -0800 17833 @@ -1,5 +1,5 @@ 17834 /**************************************************************************** 17835 - * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc. * 17836 + * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. * 17837 * * 17838 * Permission is hereby granted, free of charge, to any person obtaining a * 17839 * copy of this software and associated documentation files (the * 17840 @@ -44,10 +44,10 @@ 17841 #endif 17842 #endif 17843 17844 -MODULE_ID("$Id: lib_slkset.c,v 1.17 2007/10/13 20:08:46 tom Exp $") 17845 +MODULE_ID("$Id: lib_slkset.c,v 1.19 2009/02/21 17:34:06 tom Exp $") 17846 17847 NCURSES_EXPORT(int) 17848 -slk_set(int i, const char *astr, int format) 17849 +NCURSES_SP_NAME(slk_set) (NCURSES_SP_DCLx int i, const char *astr, int format) 17850 { 17851 SLK *slk; 17852 int offset; 17853 @@ -57,20 +57,20 @@ 17854 const char *str = astr; 17855 const char *p; 17856 17857 - T((T_CALLED("slk_set(%d, \"%s\", %d)"), i, str, format)); 17858 + T((T_CALLED("slk_set(%p, %d, \"%s\", %d)"), SP_PARM, i, str, format)); 17859 17860 - if (SP == 0 17861 - || (slk = SP->_slk) == 0 17862 + if (SP_PARM == 0 17863 + || (slk = SP_PARM->_slk) == 0 17864 || i < 1 17865 || i > slk->labcnt 17866 || format < 0 17867 || format > 2) 17868 returnCode(ERR); 17869 - if (str == NULL) 17870 + if (str == 0) 17871 str = ""; 17872 --i; /* Adjust numbering of labels */ 17873 17874 - limit = MAX_SKEY_LEN(SP->slk_format); 17875 + limit = MAX_SKEY_LEN(SP_PARM->slk_format); 17876 while (isspace(UChar(*str))) 17877 str++; /* skip over leading spaces */ 17878 p = str; 17879 @@ -147,3 +147,11 @@ 17880 slk->ent[i].dirty = TRUE; 17881 returnCode(OK); 17882 } 17883 + 17884 +#if NCURSES_SP_FUNCS 17885 +NCURSES_EXPORT(int) 17886 +slk_set(int i, const char *astr, int format) 17887 +{ 17888 + return NCURSES_SP_NAME(slk_set) (CURRENT_SCREEN, i, astr, format); 17889 +} 17890 +#endif 17891 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slktouch.c ncurses-5.7/ncurses/base/lib_slktouch.c 17892 --- ncurses-5.7.orig/ncurses/base/lib_slktouch.c 2000-12-09 18:43:27.000000000 -0800 17893 +++ ncurses-5.7/ncurses/base/lib_slktouch.c 2009-02-28 20:38:58.439326442 -0800 17894 @@ -1,5 +1,5 @@ 17895 /**************************************************************************** 17896 - * Copyright (c) 1998,2000 Free Software Foundation, Inc. * 17897 + * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc. * 17898 * * 17899 * Permission is hereby granted, free of charge, to any person obtaining a * 17900 * copy of this software and associated documentation files (the * 17901 @@ -27,8 +27,8 @@ 17902 ****************************************************************************/ 17903 17904 /**************************************************************************** 17905 - * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 17906 - * and: Eric S. Raymond <esr@snark.thyrsus.com> * 17907 + * Author: Juergen Pfeifer 1997,2009 * 17908 + * and: Thomas E. Dickey 1996-on * 17909 ****************************************************************************/ 17910 17911 /* 17912 @@ -38,16 +38,24 @@ 17913 */ 17914 #include <curses.priv.h> 17915 17916 -MODULE_ID("$Id: lib_slktouch.c,v 1.5 2000/12/10 02:43:27 tom Exp $") 17917 +MODULE_ID("$Id: lib_slktouch.c,v 1.7 2009/02/21 17:42:59 tom Exp $") 17918 17919 NCURSES_EXPORT(int) 17920 -slk_touch(void) 17921 +NCURSES_SP_NAME(slk_touch) (NCURSES_SP_DCL0) 17922 { 17923 - T((T_CALLED("slk_touch()"))); 17924 + T((T_CALLED("slk_touch(%p)"), SP_PARM)); 17925 17926 - if (SP == NULL || SP->_slk == NULL) 17927 + if (SP_PARM == 0 || SP_PARM->_slk == 0) 17928 returnCode(ERR); 17929 - SP->_slk->dirty = TRUE; 17930 + SP_PARM->_slk->dirty = TRUE; 17931 17932 returnCode(OK); 17933 } 17934 + 17935 +#if NCURSES_SP_FUNCS 17936 +NCURSES_EXPORT(int) 17937 +slk_touch(void) 17938 +{ 17939 + return NCURSES_SP_NAME(slk_touch) (CURRENT_SCREEN); 17940 +} 17941 +#endif 17942 diff -Naur ncurses-5.7.orig/ncurses/base/lib_ungetch.c ncurses-5.7/ncurses/base/lib_ungetch.c 17943 --- ncurses-5.7.orig/ncurses/base/lib_ungetch.c 2008-05-31 09:44:54.000000000 -0700 17944 +++ ncurses-5.7/ncurses/base/lib_ungetch.c 2009-02-28 20:38:57.055236206 -0800 17945 @@ -1,5 +1,5 @@ 17946 /**************************************************************************** 17947 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 17948 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 17949 * * 17950 * Permission is hereby granted, free of charge, to any person obtaining a * 17951 * copy of this software and associated documentation files (the * 17952 @@ -30,6 +30,7 @@ 17953 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 17954 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 17955 * and: Thomas E. Dickey 1996-on * 17956 + * and: Juergen Pfeifer 2009 * 17957 ****************************************************************************/ 17958 17959 /* 17960 @@ -41,7 +42,7 @@ 17961 17962 #include <curses.priv.h> 17963 17964 -MODULE_ID("$Id: lib_ungetch.c,v 1.11 2008/05/31 16:44:54 tom Exp $") 17965 +MODULE_ID("$Id: lib_ungetch.c,v 1.12 2009/02/15 00:46:58 tom Exp $") 17966 17967 #include <fifo_defs.h> 17968 17969 @@ -83,8 +84,16 @@ 17970 } 17971 17972 NCURSES_EXPORT(int) 17973 +NCURSES_SP_NAME(ungetch) (NCURSES_SP_DCLx int ch) 17974 +{ 17975 + T((T_CALLED("ungetch(%s)"), _nc_tracechar(SP_PARM, ch))); 17976 + returnCode(_nc_ungetch(SP_PARM, ch)); 17977 +} 17978 + 17979 +#if NCURSES_SP_FUNCS 17980 +NCURSES_EXPORT(int) 17981 ungetch(int ch) 17982 { 17983 - T((T_CALLED("ungetch(%s)"), _nc_tracechar(SP, ch))); 17984 - returnCode(_nc_ungetch(SP, ch)); 17985 + return NCURSES_SP_NAME(ungetch) (CURRENT_SCREEN, ch); 17986 } 17987 +#endif 17988 diff -Naur ncurses-5.7.orig/ncurses/base/lib_winch.c ncurses-5.7/ncurses/base/lib_winch.c 17989 --- ncurses-5.7.orig/ncurses/base/lib_winch.c 2001-06-02 16:42:08.000000000 -0700 17990 +++ ncurses-5.7/ncurses/base/lib_winch.c 2009-02-28 20:38:58.439326442 -0800 17991 @@ -39,16 +39,16 @@ 17992 17993 #include <curses.priv.h> 17994 17995 -MODULE_ID("$Id: lib_winch.c,v 1.5 2001/06/02 23:42:08 skimo Exp $") 17996 +MODULE_ID("$Id: lib_winch.c,v 1.6 2008/11/16 00:19:59 juergen Exp $") 17997 17998 NCURSES_EXPORT(chtype) 17999 winch(WINDOW *win) 18000 { 18001 T((T_CALLED("winch(%p)"), win)); 18002 if (win != 0) { 18003 - returnChar(CharOf(win->_line[win->_cury].text[win->_curx]) | 18004 - AttrOf(win->_line[win->_cury].text[win->_curx])); 18005 + returnChtype(CharOf(win->_line[win->_cury].text[win->_curx]) | 18006 + AttrOf(win->_line[win->_cury].text[win->_curx])); 18007 } else { 18008 - returnChar(0); 18009 + returnChtype(0); 18010 } 18011 } 18012 diff -Naur ncurses-5.7.orig/ncurses/base/MKkeyname.awk ncurses-5.7/ncurses/base/MKkeyname.awk 18013 --- ncurses-5.7.orig/ncurses/base/MKkeyname.awk 2008-07-12 11:40:00.000000000 -0700 18014 +++ ncurses-5.7/ncurses/base/MKkeyname.awk 2009-02-28 20:38:57.043235088 -0800 18015 @@ -1,6 +1,6 @@ 18016 -# $Id: MKkeyname.awk,v 1.40 2008/07/12 18:40:00 tom Exp $ 18017 +# $Id: MKkeyname.awk,v 1.41 2009/02/15 00:24:58 tom Exp $ 18018 ############################################################################## 18019 -# Copyright (c) 1999-2007,2008 Free Software Foundation, Inc. # 18020 +# Copyright (c) 1999-2008,2009 Free Software Foundation, Inc. # 18021 # # 18022 # Permission is hereby granted, free of charge, to any person obtaining a # 18023 # copy of this software and associated documentation files (the "Software"), # 18024 @@ -141,11 +141,20 @@ 18025 print " return result;" 18026 print "}" 18027 print "" 18028 - print "NCURSES_EXPORT(NCURSES_CONST char *) keyname (int c)" 18029 + print "NCURSES_EXPORT(NCURSES_CONST char *)" 18030 + print "NCURSES_SP_NAME(keyname) (NCURSES_SP_DCLx int c)" 18031 print "{" 18032 - print "\treturn _nc_keyname(SP, c);" 18033 + print "\treturn _nc_keyname(SP_PARM, c);" 18034 print "}" 18035 print "" 18036 + print "#if NCURSES_SP_FUNCS" 18037 + print "NCURSES_EXPORT(NCURSES_CONST char *)" 18038 + print "keyname (int c)" 18039 + print "{" 18040 + print " return NCURSES_SP_NAME(keyname) (CURRENT_SCREEN, c);" 18041 + print "}" 18042 + print "#endif" 18043 + print "" 18044 print "#if NO_LEAKS" 18045 print "void _nc_keyname_leaks(void)" 18046 print "{" 18047 diff -Naur ncurses-5.7.orig/ncurses/base/MKlib_gen.sh ncurses-5.7/ncurses/base/MKlib_gen.sh 18048 --- ncurses-5.7.orig/ncurses/base/MKlib_gen.sh 2008-08-30 12:20:50.000000000 -0700 18049 +++ ncurses-5.7/ncurses/base/MKlib_gen.sh 2009-02-28 20:38:58.435326721 -0800 18050 @@ -2,7 +2,7 @@ 18051 # 18052 # MKlib_gen.sh -- generate sources from curses.h macro definitions 18053 # 18054 -# ($Id: MKlib_gen.sh,v 1.34 2008/08/30 19:20:50 tom Exp $) 18055 +# ($Id: MKlib_gen.sh,v 1.35 2008/11/16 00:19:59 juergen Exp $) 18056 # 18057 ############################################################################## 18058 # Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. # 18059 @@ -199,7 +199,7 @@ 18060 } 18061 second = first + 1; 18062 if ( $first == "chtype" ) { 18063 - returnType = "Char"; 18064 + returnType = "Chtype"; 18065 } else if ( $first == "SCREEN" ) { 18066 returnType = "SP"; 18067 } else if ( $first == "WINDOW" ) { 18068 diff -Naur ncurses-5.7.orig/ncurses/base/tries.c ncurses-5.7/ncurses/base/tries.c 18069 --- ncurses-5.7.orig/ncurses/base/tries.c 2008-08-16 12:22:55.000000000 -0700 18070 +++ ncurses-5.7/ncurses/base/tries.c 2009-02-28 20:38:58.439326442 -0800 18071 @@ -39,7 +39,7 @@ 18072 18073 #include <curses.priv.h> 18074 18075 -MODULE_ID("$Id: tries.c,v 1.27 2008/08/16 19:22:55 tom Exp $") 18076 +MODULE_ID("$Id: tries.c,v 1.28 2008/11/16 00:19:59 juergen Exp $") 18077 18078 /* 18079 * Expand a keycode into the string that it corresponds to, returning null if 18080 @@ -72,7 +72,9 @@ 18081 *((unsigned char *) (result + len)) = 128; 18082 #ifdef TRACE 18083 if (len == 0 && USE_TRACEF(TRACE_MAXIMUM)) { 18084 - _tracef("expand_key %s %s", _nc_tracechar(SP, code), _nc_visbuf(result)); 18085 + _tracef("expand_key %s %s", 18086 + _nc_tracechar(CURRENT_SCREEN, code), 18087 + _nc_visbuf(result)); 18088 _nc_unlock_global(tracef); 18089 } 18090 #endif 18091 diff -Naur ncurses-5.7.orig/ncurses/curses.priv.h ncurses-5.7/ncurses/curses.priv.h 18092 --- ncurses-5.7.orig/ncurses/curses.priv.h 2008-10-04 14:37:45.000000000 -0700 18093 +++ ncurses-5.7/ncurses/curses.priv.h 2009-02-28 20:38:59.859415560 -0800 18094 @@ -1,5 +1,5 @@ 18095 /**************************************************************************** 18096 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 18097 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 18098 * * 18099 * Permission is hereby granted, free of charge, to any person obtaining a * 18100 * copy of this software and associated documentation files (the * 18101 @@ -30,11 +30,12 @@ 18102 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 18103 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 18104 * and: Thomas E. Dickey 1996-on * 18105 + * and: Juergen Pfeifer * 18106 ****************************************************************************/ 14677 18107 14678 18108 14679 18109 /* 14680 18110 - * $Id: curses.priv.h,v 1.394 2008/10/04 21:37:45 tom Exp $ 14681 + * $Id: curses.priv.h,v 1. 396 2009/01/24 23:04:59tom Exp $18111 + * $Id: curses.priv.h,v 1.403 2009/02/28 20:55:48 tom Exp $ 14682 18112 * 14683 18113 * curses.priv.h 14684 18114 * 14685 @@ -404,6 +404,8 @@ 18115 @@ -97,8 +98,6 @@ 18116 extern int errno; 18117 #endif 18118 18119 -#include <nc_panel.h> 18120 - 18121 /* Some systems have a broken 'select()', but workable 'poll()'. Use that */ 18122 #if HAVE_WORKING_POLL 18123 #define USE_FUNC_POLL 1 18124 @@ -257,6 +256,38 @@ 18125 #define NCURSES_OPAQUE 0 18126 18127 #include <curses.h> /* we'll use -Ipath directive to get the right one! */ 18128 + 18129 +/* 18130 + * If curses.h did not expose the SCREEN-functions, then we do not need the 18131 + * parameter in the corresponding unextended functions. 18132 + */ 18133 +#if NCURSES_SP_FUNCS 18134 +#define SP_PARM sp /* use parameter */ 18135 +#define NCURSES_SP_ARG SP_PARM 18136 +#define NCURSES_SP_DCL SCREEN *NCURSES_SP_ARG 18137 +#define NCURSES_SP_DCL0 NCURSES_SP_DCL 18138 +#define NCURSES_SP_ARGx NCURSES_SP_ARG, 18139 +#define NCURSES_SP_DCLx SCREEN *NCURSES_SP_ARGx 18140 +#else 18141 +#define SP_PARM SP /* use global variable */ 18142 +#define NCURSES_SP_ARG 18143 +#define NCURSES_SP_DCL 18144 +#define NCURSES_SP_DCL0 void 18145 +#define NCURSES_SP_ARGx 18146 +#define NCURSES_SP_DCLx 18147 +#endif 18148 + 18149 +#include <nc_panel.h> 18150 + 18151 +#define IsPreScreen(sp) (((sp)!=0) && sp->_prescreen) 18152 +#define HasTerminal(sp) (((sp)!=0) && (0!=((sp)->_term))) 18153 +#define IsValidScreen(sp) (HasTerminal(sp) && !sp->_prescreen) 18154 +#if BROKEN_LINKER || USE_REENTRANT 18155 +#define TerminalOf(sp) ((sp)?((sp)->_term?(sp)->_term:_nc_prescreen._cur_term): _nc_prescreen._cur_term) 18156 +#else 18157 +#define TerminalOf(sp) ((sp)?((sp)->_term?(sp)->_term:cur_term):cur_term) 18158 +#endif 18159 + 18160 #include <term.h> 18161 #include <term_entry.h> 18162 #include <nc_tparm.h> 18163 @@ -289,7 +320,7 @@ 18164 #if NCURSES_NO_PADDING 18165 #define GetNoPadding(sp) ((sp) ? (sp)->_no_padding : _nc_prescreen._no_padding) 18166 #define SetNoPadding(sp) _nc_set_no_padding(sp) 18167 -extern NCURSES_EXPORT(void) _nc_set_no_padding(SCREEN *); 18168 +extern NCURSES_EXPORT(void) _nc_set_no_padding(SCREEN *); 18169 #else 18170 #define GetNoPadding(sp) FALSE 18171 #define SetNoPadding(sp) /*nothing*/ 18172 @@ -404,6 +435,8 @@ 14686 18173 #define C_SHIFT 9 /* we need more bits than there are colors */ 14687 18174 #define C_MASK ((1 << C_SHIFT) - 1) … … 14692 18179 14693 18180 #define COLOR_DEFAULT C_MASK 14694 @@ -794,11 +796,13 @@ 18181 @@ -464,13 +497,13 @@ 18182 } slk_ent; 18183 18184 typedef struct _SLK { 18185 - char dirty; /* all labels have changed */ 18186 - char hidden; /* soft labels are hidden */ 18187 - WINDOW *win; 18188 + bool dirty; /* all labels have changed */ 18189 + bool hidden; /* soft labels are hidden */ 18190 + WINDOW *win; 18191 slk_ent *ent; 18192 - short maxlab; /* number of available labels */ 18193 - short labcnt; /* number of allocated labels */ 18194 - short maxlen; /* length of labels */ 18195 + short maxlab; /* number of available labels */ 18196 + short labcnt; /* number of allocated labels */ 18197 + short maxlen; /* length of labels */ 18198 NCURSES_CH_T attr; /* soft label attribute */ 18199 } SLK; 18200 18201 @@ -703,6 +736,8 @@ 18202 char *_setbuf; /* buffered I/O for output */ 18203 bool _filtered; /* filter() was called */ 18204 bool _buffered; /* setvbuf uses _setbuf data */ 18205 + bool _prescreen; /* is in prescreen phase */ 18206 + bool _use_env; /* LINES & COLS from environment? */ 18207 int _checkfd; /* filedesc for typeahead check */ 18208 TERMINAL *_term; /* terminal type information */ 18209 TTY _saved_tty; /* savetty/resetty information */ 18210 @@ -794,11 +829,13 @@ 14695 18211 int _color_count; /* count of colors in palette */ 14696 18212 colorpair_t *_color_pairs; /* screen's color pair list */ … … 14706 18222 chtype _ok_attributes; /* valid attributes for terminal */ 14707 18223 chtype _xmc_suppress; /* attributes to suppress if xmc */ 14708 @@ -1519,7 +1523,7 @@ 18224 @@ -1263,7 +1300,7 @@ 18225 #define returnBool(code) TRACE_RETURN(code,bool) 18226 #define returnCPtr(code) TRACE_RETURN(code,cptr) 18227 #define returnCVoidPtr(code) TRACE_RETURN(code,cvoid_ptr) 18228 -#define returnChar(code) TRACE_RETURN(code,chtype) 18229 +#define returnChtype(code) TRACE_RETURN(code,chtype) 18230 #define returnCode(code) TRACE_RETURN(code,int) 18231 #define returnPtr(code) TRACE_RETURN(code,ptr) 18232 #define returnSP(code) TRACE_RETURN(code,sp) 18233 @@ -1322,7 +1359,7 @@ 18234 #define returnBool(code) return code 18235 #define returnCPtr(code) return code 18236 #define returnCVoidPtr(code) return code 18237 -#define returnChar(code) return code 18238 +#define returnChtype(code) return code 18239 #define returnCode(code) return code 18240 #define returnPtr(code) return code 18241 #define returnSP(code) return code 18242 @@ -1519,7 +1556,7 @@ 14709 18243 extern NCURSES_EXPORT(void) _nc_screen_wrap (void); 14710 18244 … … 14715 18249 /* lib_mvcur.c */ 14716 18250 #define INFINITY 1000000 /* cost: too high to use */ 18251 @@ -1592,6 +1629,8 @@ 18252 extern NCURSES_EXPORT(int) _nc_keypad (SCREEN *, bool); 18253 extern NCURSES_EXPORT(int) _nc_ospeed (int); 18254 extern NCURSES_EXPORT(int) _nc_outch (int); 18255 +extern NCURSES_EXPORT(int) _nc_putp(const char *, const char *); 18256 +extern NCURSES_EXPORT(int) _nc_putp_flush(const char *, const char *); 18257 extern NCURSES_EXPORT(int) _nc_read_termcap_entry (const char *const, TERMTYPE *const); 18258 extern NCURSES_EXPORT(int) _nc_setupscreen (int, int, FILE *, bool, int); 18259 extern NCURSES_EXPORT(int) _nc_timed_wait (SCREEN *, int, int, int * EVENTLIST_2nd(_nc_eventlist *)); 18260 @@ -1663,7 +1702,7 @@ 18261 18262 #define NC_BUFFERED(flag) _nc_set_buffer(SP->_ofp, flag) 18263 18264 -#define NC_OUTPUT ((SP != 0) ? SP->_ofp : stdout) 18265 +#define NC_OUTPUT ((SP_PARM != 0) ? SP_PARM->_ofp : stdout) 18266 18267 /* 18268 * On systems with a broken linker, define 'SP' as a function to force the 18269 @@ -1681,6 +1720,8 @@ 18270 #define _nc_set_screen(sp) SP = sp 18271 #endif 18272 18273 +#define CURRENT_SCREEN SP 18274 + 18275 /* 18276 * We don't want to use the lines or columns capabilities internally, because 18277 * if the application is running multiple screens under X, it's quite possible 18278 @@ -1715,6 +1756,79 @@ 18279 #define MSG_NO_MEMORY "Out of memory" 18280 #define MSG_NO_INPUTS "Premature EOF" 18281 18282 +/* timed_wait flag definitions */ 18283 +#define TW_NONE 0 18284 +#define TW_INPUT 1 18285 +#define TW_MOUSE 2 18286 +#define TW_ANY (TW_INPUT | TW_MOUSE) 18287 +#define TW_EVENT 4 18288 + 18289 +/* 18290 + * Exported entrypoints beyond the published API 18291 + */ 18292 +#if NCURSES_SP_FUNCS 18293 +extern NCURSES_EXPORT(WINDOW *) _nc_curscr_of(SCREEN*); 18294 +extern NCURSES_EXPORT(WINDOW *) _nc_newscr_of(SCREEN*); 18295 +extern NCURSES_EXPORT(WINDOW *) _nc_stdscr_of(SCREEN*); 18296 +extern NCURSES_EXPORT(int) _nc_outc_wrapper(SCREEN*,int); 18297 + 18298 +extern NCURSES_EXPORT(TERMINAL*) NCURSES_SP_NAME(_nc_set_curterm)(SCREEN*,TERMINAL*); 18299 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_del_curterm)(SCREEN*,TERMINAL*); 18300 + 18301 +#if NCURSES_EXT_FUNCS 18302 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_set_tabsize)(SCREEN*, int); 18303 +#endif 18304 + 18305 +extern NCURSES_EXPORT(chtype) NCURSES_SP_NAME(_nc_acs_char)(SCREEN*,int); 18306 + 18307 +/* 18308 + * We put the safe versions of various calls here as they are not published 18309 + * part of the API up to now 18310 + */ 18311 +extern NCURSES_EXPORT(SCREEN*) _nc_SP(void); 18312 + 18313 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_vidputs)(SCREEN*,chtype,int(*) (SCREEN*, int)); 18314 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_vidattr)(SCREEN *, chtype); 18315 + 18316 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_scr_restore)(SCREEN*, const char*); 18317 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_scr_init)(SCREEN*,const char*); 18318 + 18319 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_restartterm)(SCREEN*,NCURSES_CONST char*,int,int*); 18320 +extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(_nc_is_term_resized)(SCREEN*,int,int); 18321 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_resize_term)(SCREEN*,int,int); 18322 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_resizeterm)(SCREEN*,int,int); 18323 + 18324 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_outch)(SCREEN*, int ch); 18325 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_flush)(SCREEN*); 18326 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_putp)(SCREEN*, const char *, const char *); 18327 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_putp_flush)(SCREEN*, const char *, const char *); 18328 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_tgetent)(SCREEN*,char*,const char *); 18329 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_tputs)(SCREEN*,const char*,int,int(*)(SCREEN*, int)); 18330 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_savetty)(SCREEN*); 18331 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_resetty)(SCREEN*); 18332 + 18333 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_mcprint)(SCREEN*,char*, int); 18334 +extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(_nc_tgetstr)(SCREEN*,NCURSES_CONST char*,char**); 18335 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_tgetflag)(SCREEN*,NCURSES_CONST char*); 18336 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_tgetnum)(SCREEN*,NCURSES_CONST char*); 18337 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_tigetflag)(SCREEN*,NCURSES_CONST char*); 18338 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_tigetnum)(SCREEN*,NCURSES_CONST char*); 18339 +extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(_nc_tigetstr)(SCREEN*, NCURSES_CONST char*); 18340 +extern NCURSES_EXPORT(void) _nc_cookie_init(SCREEN *sp); 18341 +extern NCURSES_EXPORT(int) _nc_tinfo_doupdate(SCREEN *sp); 18342 +extern NCURSES_EXPORT(int) _nc_tinfo_mcprint(SCREEN*,char*,int); 18343 +#if USE_WIDEC_SUPPORT 18344 +extern NCURSES_EXPORT(wchar_t *) NCURSES_SP_NAME(_nc_wunctrl)(SCREEN*, cchar_t *); 18345 +#endif 18346 + 18347 +/* FIXME - move these to curses.h.in */ 18348 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(getmouse) (SCREEN*, MEVENT *); 18349 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(ungetmouse) (SCREEN*, MEVENT *); 18350 +extern NCURSES_EXPORT(mmask_t) NCURSES_SP_NAME(mousemask) (SCREEN*, mmask_t, mmask_t *); 18351 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(mouseinterval) (SCREEN*, int); 18352 +extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(has_mouse) (SCREEN*); 18353 +#endif /* NCURSES_SP_FUNCS */ 18354 + 18355 #ifdef __cplusplus 18356 } 18357 #endif 14717 18358 diff -Naur ncurses-5.7.orig/ncurses/Makefile.in ncurses-5.7/ncurses/Makefile.in 14718 18359 --- ncurses-5.7.orig/ncurses/Makefile.in 2008-10-18 07:11:54.000000000 -0700 14719 +++ ncurses-5.7/ncurses/Makefile.in 2009-0 1-27 16:44:58.028366252 -080018360 +++ ncurses-5.7/ncurses/Makefile.in 2009-02-28 20:38:46.310547562 -0800 14720 18361 @@ -1,6 +1,6 @@ 14721 18362 -# $Id: Makefile.in,v 1.113 2008/10/18 14:11:54 tom Exp $ … … 14738 18379 diff -Naur ncurses-5.7.orig/ncurses/tinfo/entries.c ncurses-5.7/ncurses/tinfo/entries.c 14739 18380 --- ncurses-5.7.orig/ncurses/tinfo/entries.c 2008-09-27 06:11:10.000000000 -0700 14740 +++ ncurses-5.7/ncurses/tinfo/entries.c 2009-0 1-27 16:44:49.391812822-080018381 +++ ncurses-5.7/ncurses/tinfo/entries.c 2009-02-28 20:38:39.770130185 -0800 14741 18382 @@ -37,7 +37,7 @@ 14742 18383 #include <tic.h> … … 14760 18401 diff -Naur ncurses-5.7.orig/ncurses/tinfo/hashed_db.c ncurses-5.7/ncurses/tinfo/hashed_db.c 14761 18402 --- ncurses-5.7.orig/ncurses/tinfo/hashed_db.c 2006-08-19 12:48:38.000000000 -0700 14762 +++ ncurses-5.7/ncurses/tinfo/hashed_db.c 2009-0 1-27 16:44:51.023917306-080018403 +++ ncurses-5.7/ncurses/tinfo/hashed_db.c 2009-02-28 20:38:41.374231037 -0800 14763 18404 @@ -1,5 +1,5 @@ 14764 18405 /**************************************************************************** … … 14864 18505 } 14865 18506 14866 diff -Naur ncurses-5.7.orig/ncurses/t ty/tty_update.c ncurses-5.7/ncurses/tty/tty_update.c14867 --- ncurses-5.7.orig/ncurses/t ty/tty_update.c 2008-08-30 13:08:19.000000000 -070014868 +++ ncurses-5.7/ncurses/t ty/tty_update.c 2009-01-27 16:45:05.088820784-080018507 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_baudrate.c ncurses-5.7/ncurses/tinfo/lib_baudrate.c 18508 --- ncurses-5.7.orig/ncurses/tinfo/lib_baudrate.c 2008-06-28 08:19:24.000000000 -0700 18509 +++ ncurses-5.7/ncurses/tinfo/lib_baudrate.c 2009-02-28 20:38:57.055236206 -0800 14869 18510 @@ -1,5 +1,5 @@ 14870 18511 /**************************************************************************** … … 14874 18515 * Permission is hereby granted, free of charge, to any person obtaining a * 14875 18516 * copy of this software and associated documentation files (the * 14876 @@ -78,7 +78,7 @@ 18517 @@ -80,7 +80,7 @@ 18518 #undef USE_OLD_TTY 18519 #endif /* USE_OLD_TTY */ 18520 18521 -MODULE_ID("$Id: lib_baudrate.c,v 1.27 2008/06/28 15:19:24 tom Exp $") 18522 +MODULE_ID("$Id: lib_baudrate.c,v 1.28 2009/02/14 21:41:22 tom Exp $") 18523 18524 /* 18525 * int 18526 @@ -195,7 +195,7 @@ 18527 } 18528 18529 NCURSES_EXPORT(int) 18530 -baudrate(void) 18531 +NCURSES_SP_NAME(baudrate) (NCURSES_SP_DCL0) 18532 { 18533 int result; 18534 18535 @@ -207,7 +207,7 @@ 18536 * that take into account costs that depend on baudrate. 18537 */ 18538 #ifdef TRACE 18539 - if (!isatty(fileno(SP ? SP->_ofp : stdout)) 18540 + if (!isatty(fileno(SP_PARM ? SP_PARM->_ofp : stdout)) 18541 && getenv("BAUDRATE") != 0) { 18542 int ret; 18543 if ((ret = _nc_getenv_num("BAUDRATE")) <= 0) 18544 @@ -236,3 +236,11 @@ 18545 18546 returnCode(result); 18547 } 18548 + 18549 +#if NCURSES_SP_FUNCS 18550 +NCURSES_EXPORT(int) 18551 +baudrate(void) 18552 +{ 18553 + return NCURSES_SP_NAME(baudrate) (CURRENT_SCREEN); 18554 +} 18555 +#endif 18556 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_cur_term.c ncurses-5.7/ncurses/tinfo/lib_cur_term.c 18557 --- ncurses-5.7.orig/ncurses/tinfo/lib_cur_term.c 2008-08-16 12:22:55.000000000 -0700 18558 +++ ncurses-5.7/ncurses/tinfo/lib_cur_term.c 2009-02-28 20:38:59.859415560 -0800 18559 @@ -1,5 +1,5 @@ 18560 /**************************************************************************** 18561 - * Copyright (c) 1998-2003,2008 Free Software Foundation, Inc. * 18562 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 18563 * * 18564 * Permission is hereby granted, free of charge, to any person obtaining a * 18565 * copy of this software and associated documentation files (the * 18566 @@ -40,12 +40,14 @@ 18567 #include <term_entry.h> /* TTY, cur_term */ 18568 #include <termcap.h> /* ospeed */ 18569 18570 -MODULE_ID("$Id: lib_cur_term.c,v 1.18 2008/08/16 19:22:55 tom Exp $") 18571 +MODULE_ID("$Id: lib_cur_term.c,v 1.19 2009/02/28 15:49:58 tom Exp $") 18572 18573 #undef CUR 18574 #define CUR termp->type. 18575 18576 -#if BROKEN_LINKER || USE_REENTRANT 18577 +#if BROKEN_LINKER && !USE_REENTRANT 18578 +NCURSES_EXPORT_VAR(TERMINAL *) cur_term = 0; 18579 +#elif BROKEN_LINKER || USE_REENTRANT 18580 NCURSES_EXPORT(TERMINAL *) 18581 NCURSES_PUBLIC_VAR(cur_term) (void) 18582 { 18583 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_has_cap.c ncurses-5.7/ncurses/tinfo/lib_has_cap.c 18584 --- ncurses-5.7.orig/ncurses/tinfo/lib_has_cap.c 2003-10-25 12:43:55.000000000 -0700 18585 +++ ncurses-5.7/ncurses/tinfo/lib_has_cap.c 2009-02-28 20:38:57.055236206 -0800 18586 @@ -1,5 +1,5 @@ 18587 /**************************************************************************** 18588 - * Copyright (c) 1998-2000,2003 Free Software Foundation, Inc. * 18589 + * Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. * 18590 * * 18591 * Permission is hereby granted, free of charge, to any person obtaining a * 18592 * copy of this software and associated documentation files (the * 18593 @@ -30,6 +30,7 @@ 18594 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 18595 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 18596 * and: Thomas E. Dickey 1996-2003 * 18597 + * and: Juergen Pfeifer 2009 * 18598 ****************************************************************************/ 18599 18600 /* 18601 @@ -43,10 +44,10 @@ 18602 18603 #include <term.h> 18604 18605 -MODULE_ID("$Id: lib_has_cap.c,v 1.4 2003/10/25 19:43:55 tom Exp $") 18606 +MODULE_ID("$Id: lib_has_cap.c,v 1.5 2009/02/15 00:47:12 tom Exp $") 18607 18608 NCURSES_EXPORT(bool) 18609 -has_ic(void) 18610 +NCURSES_SP_NAME(has_ic) (NCURSES_SP_DCL0) 18611 { 18612 T((T_CALLED("has_ic()"))); 18613 returnCode(cur_term && 18614 @@ -55,11 +56,27 @@ 18615 && (delete_character || parm_dch)); 18616 } 18617 18618 +#if NCURSES_SP_FUNCS 18619 NCURSES_EXPORT(bool) 18620 -has_il(void) 18621 +has_ic(void) 18622 +{ 18623 + return NCURSES_SP_NAME(has_ic) (CURRENT_SCREEN); 18624 +} 18625 +#endif 18626 + 18627 +NCURSES_EXPORT(bool) 18628 +NCURSES_SP_NAME(has_il) (NCURSES_SP_DCL0) 18629 { 18630 T((T_CALLED("has_il()"))); 18631 returnCode(cur_term 18632 && (insert_line || parm_insert_line) 18633 && (delete_line || parm_delete_line)); 18634 } 18635 + 18636 +#if NCURSES_SP_FUNCS 18637 +NCURSES_EXPORT(bool) 18638 +has_il(void) 18639 +{ 18640 + return NCURSES_SP_NAME(has_il) (CURRENT_SCREEN); 18641 +} 18642 +#endif 18643 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_kernel.c ncurses-5.7/ncurses/tinfo/lib_kernel.c 18644 --- ncurses-5.7.orig/ncurses/tinfo/lib_kernel.c 2004-05-08 10:11:21.000000000 -0700 18645 +++ ncurses-5.7/ncurses/tinfo/lib_kernel.c 2009-02-28 20:38:57.055236206 -0800 18646 @@ -1,5 +1,5 @@ 18647 /**************************************************************************** 18648 - * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. * 18649 + * Copyright (c) 1998-2004,2009 Free Software Foundation, Inc. * 18650 * * 18651 * Permission is hereby granted, free of charge, to any person obtaining a * 18652 * copy of this software and associated documentation files (the * 18653 @@ -29,7 +29,8 @@ 18654 /**************************************************************************** 18655 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 18656 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 18657 - * and: Thomas E. Dickey 2002 * 18658 + * and: Thomas E. Dickey 2002 * 18659 + * and: Juergen Pfeifer 2009 * 18660 ****************************************************************************/ 18661 18662 /* 18663 @@ -48,7 +49,7 @@ 18664 #include <curses.priv.h> 18665 #include <term.h> /* cur_term */ 18666 18667 -MODULE_ID("$Id: lib_kernel.c,v 1.24 2004/05/08 17:11:21 tom Exp $") 18668 +MODULE_ID("$Id: lib_kernel.c,v 1.25 2009/02/15 00:47:52 tom Exp $") 18669 18670 static int 18671 _nc_vdisable(void) 18672 @@ -79,7 +80,7 @@ 18673 */ 18674 18675 NCURSES_EXPORT(char) 18676 -erasechar(void) 18677 +NCURSES_SP_NAME(erasechar) (NCURSES_SP_DCL0) 18678 { 18679 int result = ERR; 18680 T((T_CALLED("erasechar()"))); 18681 @@ -96,6 +97,14 @@ 18682 returnCode(result); 18683 } 18684 18685 +#if NCURSES_SP_FUNCS 18686 +NCURSES_EXPORT(char) 18687 +erasechar(void) 18688 +{ 18689 + return NCURSES_SP_NAME(erasechar) (CURRENT_SCREEN); 18690 +} 18691 +#endif 18692 + 18693 /* 18694 * killchar() 18695 * 18696 @@ -104,7 +113,7 @@ 18697 */ 18698 18699 NCURSES_EXPORT(char) 18700 -killchar(void) 18701 +NCURSES_SP_NAME(killchar) (NCURSES_SP_DCL0) 18702 { 18703 int result = ERR; 18704 T((T_CALLED("killchar()"))); 18705 @@ -121,6 +130,14 @@ 18706 returnCode(result); 18707 } 18708 18709 +#if NCURSES_SP_FUNCS 18710 +NCURSES_EXPORT(char) 18711 +killchar(void) 18712 +{ 18713 + return NCURSES_SP_NAME(killchar) (CURRENT_SCREEN); 18714 +} 18715 +#endif 18716 + 18717 /* 18718 * flushinp() 18719 * 18720 @@ -129,7 +146,7 @@ 18721 */ 18722 18723 NCURSES_EXPORT(int) 18724 -flushinp(void) 18725 +NCURSES_SP_NAME(flushinp) (NCURSES_SP_DCL0) 18726 { 18727 T((T_CALLED("flushinp()"))); 18728 18729 @@ -143,12 +160,20 @@ 18730 } while 18731 (errno == EINTR); 18732 #endif 18733 - if (SP) { 18734 - SP->_fifohead = -1; 18735 - SP->_fifotail = 0; 18736 - SP->_fifopeek = 0; 18737 + if (SP_PARM) { 18738 + SP_PARM->_fifohead = -1; 18739 + SP_PARM->_fifotail = 0; 18740 + SP_PARM->_fifopeek = 0; 18741 } 18742 returnCode(OK); 18743 } 18744 returnCode(ERR); 18745 } 18746 + 18747 +#if NCURSES_SP_FUNCS 18748 +NCURSES_EXPORT(int) 18749 +flushinp(void) 18750 +{ 18751 + return NCURSES_SP_NAME(flushinp) (CURRENT_SCREEN); 18752 +} 18753 +#endif 18754 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_longname.c ncurses-5.7/ncurses/tinfo/lib_longname.c 18755 --- ncurses-5.7.orig/ncurses/tinfo/lib_longname.c 2000-12-09 18:55:07.000000000 -0800 18756 +++ ncurses-5.7/ncurses/tinfo/lib_longname.c 2009-02-28 20:38:57.055236206 -0800 18757 @@ -1,5 +1,5 @@ 18758 /**************************************************************************** 18759 - * Copyright (c) 1998,2000 Free Software Foundation, Inc. * 18760 + * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc. * 18761 * * 18762 * Permission is hereby granted, free of charge, to any person obtaining a * 18763 * copy of this software and associated documentation files (the * 18764 @@ -29,6 +29,8 @@ 18765 /**************************************************************************** 18766 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 18767 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 18768 + * and: Thomas E. Dickey 1996-on * 18769 + * and: Juergen Pfeifer 2009 * 18770 ****************************************************************************/ 18771 18772 /* 18773 @@ -40,10 +42,10 @@ 18774 18775 #include <curses.priv.h> 18776 18777 -MODULE_ID("$Id: lib_longname.c,v 1.9 2000/12/10 02:55:07 tom Exp $") 18778 +MODULE_ID("$Id: lib_longname.c,v 1.10 2009/02/15 00:48:15 tom Exp $") 18779 18780 NCURSES_EXPORT(char *) 18781 -longname(void) 18782 +NCURSES_SP_NAME(longname) (NCURSES_SP_DCL0) 18783 { 18784 char *ptr; 18785 18786 @@ -55,3 +57,11 @@ 18787 18788 returnPtr(ttytype); 18789 } 18790 + 18791 +#if NCURSES_SP_FUNCS 18792 +NCURSES_EXPORT(char *) 18793 +longname(void) 18794 +{ 18795 + return NCURSES_SP_NAME(longname) (CURRENT_SCREEN); 18796 +} 18797 +#endif 18798 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_napms.c ncurses-5.7/ncurses/tinfo/lib_napms.c 18799 --- ncurses-5.7.orig/ncurses/tinfo/lib_napms.c 2008-05-03 14:34:13.000000000 -0700 18800 +++ ncurses-5.7/ncurses/tinfo/lib_napms.c 2009-02-28 20:38:57.055236206 -0800 18801 @@ -1,5 +1,5 @@ 18802 /**************************************************************************** 18803 - * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc. * 18804 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 18805 * * 18806 * Permission is hereby granted, free of charge, to any person obtaining a * 18807 * copy of this software and associated documentation files (the * 18808 @@ -29,6 +29,8 @@ 18809 /**************************************************************************** 18810 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 18811 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 18812 + * and: Thomas E. Dickey 1996-on * 18813 + * and: Juergen Pfeifer 2009 * 18814 ****************************************************************************/ 18815 18816 /* 18817 @@ -49,10 +51,10 @@ 18818 #endif 18819 #endif 18820 18821 -MODULE_ID("$Id: lib_napms.c,v 1.17 2008/05/03 21:34:13 tom Exp $") 18822 +MODULE_ID("$Id: lib_napms.c,v 1.18 2009/02/15 00:48:27 tom Exp $") 18823 18824 NCURSES_EXPORT(int) 18825 -napms(int ms) 18826 +NCURSES_SP_NAME(napms) (NCURSES_SP_DCLx int ms) 18827 { 18828 T((T_CALLED("napms(%d)"), ms)); 18829 18830 @@ -72,3 +74,11 @@ 18831 18832 returnCode(OK); 18833 } 18834 + 18835 +#if NCURSES_SP_FUNCS 18836 +NCURSES_EXPORT(int) 18837 +napms(int ms) 18838 +{ 18839 + return NCURSES_SP_NAME(napms) (CURRENT_SCREEN, ms); 18840 +} 18841 +#endif 18842 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_options.c ncurses-5.7/ncurses/tinfo/lib_options.c 18843 --- ncurses-5.7.orig/ncurses/tinfo/lib_options.c 2008-08-16 14:20:48.000000000 -0700 18844 +++ ncurses-5.7/ncurses/tinfo/lib_options.c 2009-02-28 20:38:59.859415560 -0800 18845 @@ -1,5 +1,5 @@ 18846 /**************************************************************************** 18847 - * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. * 18848 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 18849 * * 18850 * Permission is hereby granted, free of charge, to any person obtaining a * 18851 * copy of this software and associated documentation files (the * 18852 @@ -30,6 +30,7 @@ 18853 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 18854 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 18855 * and: Thomas E. Dickey 1996-on * 18856 + * and: Juergen Pfeifer 2009 * 18857 ****************************************************************************/ 18858 18859 /* 18860 @@ -43,7 +44,7 @@ 18861 18862 #include <term.h> 18863 18864 -MODULE_ID("$Id: lib_options.c,v 1.58 2008/08/16 21:20:48 Werner.Fink Exp $") 18865 +MODULE_ID("$Id: lib_options.c,v 1.60 2009/02/28 21:07:56 tom Exp $") 18866 18867 static int _nc_curs_set(SCREEN *, int); 18868 static int _nc_meta(SCREEN *, bool); 18869 @@ -72,18 +73,26 @@ 18870 } 18871 18872 NCURSES_EXPORT(int) 18873 -halfdelay(int t) 18874 +NCURSES_SP_NAME(halfdelay) (NCURSES_SP_DCLx int t) 18875 { 18876 T((T_CALLED("halfdelay(%d)"), t)); 18877 18878 - if (t < 1 || t > 255 || SP == 0) 18879 + if (t < 1 || t > 255 || SP_PARM == 0) 18880 returnCode(ERR); 18881 18882 cbreak(); 18883 - SP->_cbreak = t + 1; 18884 + SP_PARM->_cbreak = t + 1; 18885 returnCode(OK); 18886 } 18887 18888 +#if NCURSES_SP_FUNCS 18889 +NCURSES_EXPORT(int) 18890 +halfdelay(int t) 18891 +{ 18892 + return NCURSES_SP_NAME(halfdelay) (CURRENT_SCREEN, t); 18893 +} 18894 +#endif 18895 + 18896 NCURSES_EXPORT(int) 18897 nodelay(WINDOW *win, bool flag) 18898 { 18899 @@ -158,17 +167,25 @@ 18900 } 18901 18902 NCURSES_EXPORT(int) 18903 -typeahead(int fd) 18904 +NCURSES_SP_NAME(typeahead) (NCURSES_SP_DCLx int fd) 18905 { 18906 T((T_CALLED("typeahead(%d)"), fd)); 18907 - if (SP != 0) { 18908 - SP->_checkfd = fd; 18909 + if (SP_PARM != 0) { 18910 + SP_PARM->_checkfd = fd; 18911 returnCode(OK); 18912 } else { 18913 returnCode(ERR); 18914 } 18915 } 18916 18917 +#if NCURSES_SP_FUNCS 18918 +NCURSES_EXPORT(int) 18919 +typeahead(int fd) 18920 +{ 18921 + return NCURSES_SP_NAME(typeahead) (CURRENT_SCREEN, fd); 18922 +} 18923 +#endif 18924 + 18925 /* 18926 ** has_key() 18927 ** 18928 @@ -204,8 +221,9 @@ 18929 #undef CUR 18930 #define CUR (sp->_term)->type. 18931 18932 -static int 18933 -_nc_putp(const char *name GCC_UNUSED, const char *value) 18934 +NCURSES_EXPORT(int) 18935 +NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_DCLx 18936 + const char *name GCC_UNUSED, const char *value) 18937 { 18938 int rc = ERR; 18939 18940 @@ -216,8 +234,17 @@ 18941 return rc; 18942 } 18943 18944 -static int 18945 -_nc_putp_flush(const char *name, const char *value) 18946 +#if NCURSES_SP_FUNCS 18947 +NCURSES_EXPORT(int) 18948 +_nc_putp(const char *name, const char *value) 18949 +{ 18950 + return NCURSES_SP_NAME(_nc_putp) (CURRENT_SCREEN, name, value); 18951 +} 18952 +#endif 18953 + 18954 +NCURSES_EXPORT(int) 18955 +NCURSES_SP_NAME(_nc_putp_flush) (NCURSES_SP_DCLx 18956 + const char *name, const char *value) 18957 { 18958 int rc = _nc_putp(name, value); 18959 if (rc != ERR) { 18960 @@ -226,6 +253,14 @@ 18961 return rc; 18962 } 18963 18964 +#if NCURSES_SP_FUNCS 18965 +NCURSES_EXPORT(int) 18966 +_nc_putp_flush(const char *name, const char *value) 18967 +{ 18968 + return NCURSES_SP_NAME(_nc_putp_flush) (CURRENT_SCREEN, name, value); 18969 +} 18970 +#endif 18971 + 18972 /* Turn the keypad on/off 18973 * 18974 * Note: we flush the output because changing this mode causes some terminals 18975 @@ -245,12 +280,12 @@ 18976 * has wgetch() reading in more than one thread. putp() and below 18977 * may use SP explicitly. 18978 */ 18979 - if (_nc_use_pthreads && sp != SP) { 18980 + if (_nc_use_pthreads && sp != CURRENT_SCREEN) { 18981 SCREEN *save_sp; 18982 18983 /* cannot use use_screen(), since that is not in tinfo library */ 18984 _nc_lock_global(curses); 18985 - save_sp = SP; 18986 + save_sp = CURRENT_SCREEN; 18987 _nc_set_screen(sp); 18988 rc = _nc_keypad(sp, flag); 18989 _nc_set_screen(save_sp); 18990 @@ -313,8 +348,8 @@ 18991 18992 /* Ok, we stay relaxed and don't signal an error if win is NULL */ 18993 18994 - if (SP != 0) { 18995 - SP->_use_meta = flag; 18996 + if (sp != 0) { 18997 + sp->_use_meta = flag; 18998 18999 if (flag) { 19000 _nc_putp("meta_on", meta_on); 19001 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_raw.c ncurses-5.7/ncurses/tinfo/lib_raw.c 19002 --- ncurses-5.7.orig/ncurses/tinfo/lib_raw.c 2007-09-29 14:50:22.000000000 -0700 19003 +++ ncurses-5.7/ncurses/tinfo/lib_raw.c 2009-02-28 20:38:57.055236206 -0800 19004 @@ -1,5 +1,5 @@ 19005 /**************************************************************************** 19006 - * Copyright (c) 1998-2002,2007 Free Software Foundation, Inc. * 19007 + * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. * 19008 * * 19009 * Permission is hereby granted, free of charge, to any person obtaining a * 19010 * copy of this software and associated documentation files (the * 19011 @@ -29,7 +29,8 @@ 19012 /**************************************************************************** 19013 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 19014 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 19015 - * and: Thomas E. Dickey 1998 on * 19016 + * and: Thomas E. Dickey 1998-on * 19017 + * and: Juergen Pfeifer 2009 * 19018 ****************************************************************************/ 19019 19020 /* 19021 @@ -49,7 +50,7 @@ 19022 #include <curses.priv.h> 19023 #include <term.h> /* cur_term */ 19024 19025 -MODULE_ID("$Id: lib_raw.c,v 1.14 2007/09/29 21:50:22 tom Exp $") 19026 +MODULE_ID("$Id: lib_raw.c,v 1.15 2009/02/15 00:49:02 tom Exp $") 19027 19028 #if SVR4_TERMIO && !defined(_POSIX_SOURCE) 19029 #define _POSIX_SOURCE 19030 @@ -61,7 +62,7 @@ 19031 19032 #ifdef __EMX__ 19033 #include <io.h> 19034 -#define _nc_setmode(mode) setmode(SP->_ifd, mode) 19035 +#define _nc_setmode(mode) setmode(SP_PARM->_ifd, mode) 19036 #else 19037 #define _nc_setmode(mode) /* nothing */ 19038 #endif 19039 @@ -77,13 +78,13 @@ 19040 #endif /* TRACE */ 19041 19042 NCURSES_EXPORT(int) 19043 -raw(void) 19044 +NCURSES_SP_NAME(raw) (NCURSES_SP_DCL0) 19045 { 19046 int result = ERR; 19047 19048 T((T_CALLED("raw()"))); 19049 19050 - if (SP != 0 && cur_term != 0) { 19051 + if (SP_PARM != 0 && cur_term != 0) { 19052 TTY buf; 19053 19054 BEFORE("raw"); 19055 @@ -99,8 +100,8 @@ 19056 buf.sg_flags |= RAW; 19057 #endif 19058 if ((result = _nc_set_tty_mode(&buf)) == OK) { 19059 - SP->_raw = TRUE; 19060 - SP->_cbreak = 1; 19061 + SP_PARM->_raw = TRUE; 19062 + SP_PARM->_cbreak = 1; 19063 cur_term->Nttyb = buf; 19064 } 19065 AFTER("raw"); 19066 @@ -108,14 +109,22 @@ 19067 returnCode(result); 19068 } 19069 19070 +#if NCURSES_SP_FUNCS 19071 NCURSES_EXPORT(int) 19072 -cbreak(void) 19073 +raw(void) 19074 +{ 19075 + return NCURSES_SP_NAME(raw) (CURRENT_SCREEN); 19076 +} 19077 +#endif 19078 + 19079 +NCURSES_EXPORT(int) 19080 +NCURSES_SP_NAME(cbreak) (NCURSES_SP_DCL0) 19081 { 19082 int result = ERR; 19083 19084 T((T_CALLED("cbreak()"))); 19085 19086 - if (SP != 0 && cur_term != 0) { 19087 + if (SP_PARM != 0 && cur_term != 0) { 19088 TTY buf; 19089 19090 BEFORE("cbreak"); 19091 @@ -132,7 +141,7 @@ 19092 buf.sg_flags |= CBREAK; 19093 #endif 19094 if ((result = _nc_set_tty_mode(&buf)) == OK) { 19095 - SP->_cbreak = 1; 19096 + SP_PARM->_cbreak = 1; 19097 cur_term->Nttyb = buf; 19098 } 19099 AFTER("cbreak"); 19100 @@ -140,12 +149,20 @@ 19101 returnCode(result); 19102 } 19103 19104 +#if NCURSES_SP_FUNCS 19105 +NCURSES_EXPORT(int) 19106 +cbreak(void) 19107 +{ 19108 + return NCURSES_SP_NAME(cbreak) (CURRENT_SCREEN); 19109 +} 19110 +#endif 19111 + 19112 /* 19113 * Note: 19114 * this implementation may be wrong. See the comment under intrflush(). 19115 */ 19116 NCURSES_EXPORT(void) 19117 -qiflush(void) 19118 +NCURSES_SP_NAME(qiflush) (NCURSES_SP_DCL0) 19119 { 19120 int result = ERR; 19121 19122 @@ -169,14 +186,22 @@ 19123 returnVoid; 19124 } 19125 19126 +#if NCURSES_SP_FUNCS 19127 +NCURSES_EXPORT(void) 19128 +qiflush(void) 19129 +{ 19130 + NCURSES_SP_NAME(qiflush) (CURRENT_SCREEN); 19131 +} 19132 +#endif 19133 + 19134 NCURSES_EXPORT(int) 19135 -noraw(void) 19136 +NCURSES_SP_NAME(noraw) (NCURSES_SP_DCL0) 19137 { 19138 int result = ERR; 19139 19140 T((T_CALLED("noraw()"))); 19141 19142 - if (SP != 0 && cur_term != 0) { 19143 + if (SP_PARM != 0 && cur_term != 0) { 19144 TTY buf; 19145 19146 BEFORE("noraw"); 19147 @@ -191,8 +216,8 @@ 19148 buf.sg_flags &= ~(RAW | CBREAK); 19149 #endif 19150 if ((result = _nc_set_tty_mode(&buf)) == OK) { 19151 - SP->_raw = FALSE; 19152 - SP->_cbreak = 0; 19153 + SP_PARM->_raw = FALSE; 19154 + SP_PARM->_cbreak = 0; 19155 cur_term->Nttyb = buf; 19156 } 19157 AFTER("noraw"); 19158 @@ -200,14 +225,22 @@ 19159 returnCode(result); 19160 } 19161 19162 +#if NCURSES_SP_FUNCS 19163 NCURSES_EXPORT(int) 19164 -nocbreak(void) 19165 +noraw(void) 19166 +{ 19167 + return NCURSES_SP_NAME(noraw) (CURRENT_SCREEN); 19168 +} 19169 +#endif 19170 + 19171 +NCURSES_EXPORT(int) 19172 +NCURSES_SP_NAME(nocbreak) (NCURSES_SP_DCL0) 19173 { 19174 int result = ERR; 19175 19176 T((T_CALLED("nocbreak()"))); 19177 19178 - if (SP != 0 && cur_term != 0) { 19179 + if (SP_PARM != 0 && cur_term != 0) { 19180 TTY buf; 19181 19182 BEFORE("nocbreak"); 19183 @@ -221,7 +254,7 @@ 19184 buf.sg_flags &= ~CBREAK; 19185 #endif 19186 if ((result = _nc_set_tty_mode(&buf)) == OK) { 19187 - SP->_cbreak = 0; 19188 + SP_PARM->_cbreak = 0; 19189 cur_term->Nttyb = buf; 19190 } 19191 AFTER("nocbreak"); 19192 @@ -229,12 +262,20 @@ 19193 returnCode(result); 19194 } 19195 19196 +#if NCURSES_SP_FUNCS 19197 +NCURSES_EXPORT(int) 19198 +nocbreak(void) 19199 +{ 19200 + return NCURSES_SP_NAME(nocbreak) (CURRENT_SCREEN); 19201 +} 19202 +#endif 19203 + 19204 /* 19205 * Note: 19206 * this implementation may be wrong. See the comment under intrflush(). 19207 */ 19208 NCURSES_EXPORT(void) 19209 -noqiflush(void) 19210 +NCURSES_SP_NAME(noqiflush) (NCURSES_SP_DCL0) 19211 { 19212 int result = ERR; 19213 19214 @@ -259,6 +300,14 @@ 19215 returnVoid; 19216 } 19217 19218 +#if NCURSES_SP_FUNCS 19219 +NCURSES_EXPORT(void) 19220 +noqiflush(void) 19221 +{ 19222 + NCURSES_SP_NAME(noqiflush) (CURRENT_SCREEN); 19223 +} 19224 +#endif 19225 + 19226 /* 19227 * This call does the same thing as the qiflush()/noqiflush() pair. We know 19228 * for certain that SVr3 intrflush() tweaks the NOFLSH bit; on the other hand, 19229 @@ -267,7 +316,7 @@ 19230 * curs_inopts(3x) is too exact to be coincidence. 19231 */ 19232 NCURSES_EXPORT(int) 19233 -intrflush(WINDOW *win GCC_UNUSED, bool flag) 19234 +NCURSES_SP_NAME(intrflush) (NCURSES_SP_DCLx WINDOW *win GCC_UNUSED, bool flag) 19235 { 19236 int result = ERR; 19237 19238 @@ -294,3 +343,11 @@ 19239 } 19240 returnCode(result); 19241 } 19242 + 19243 +#if NCURSES_SP_FUNCS 19244 +NCURSES_EXPORT(int) 19245 +intrflush(WINDOW *win GCC_UNUSED, bool flag) 19246 +{ 19247 + return NCURSES_SP_NAME(intrflush) (CURRENT_SCREEN, win, flag); 19248 +} 19249 +#endif 19250 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_setup.c ncurses-5.7/ncurses/tinfo/lib_setup.c 19251 --- ncurses-5.7.orig/ncurses/tinfo/lib_setup.c 2008-08-03 15:42:33.000000000 -0700 19252 +++ ncurses-5.7/ncurses/tinfo/lib_setup.c 2009-02-28 20:38:57.055236206 -0800 19253 @@ -1,5 +1,5 @@ 19254 /**************************************************************************** 19255 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 19256 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 19257 * * 19258 * Permission is hereby granted, free of charge, to any person obtaining a * 19259 * copy of this software and associated documentation files (the * 19260 @@ -30,6 +30,7 @@ 19261 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 19262 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 19263 * and: Thomas E. Dickey 1996-on * 19264 + * and: Juergen Pfeifer 2009 * 19265 ****************************************************************************/ 19266 19267 /* 19268 @@ -53,7 +54,7 @@ 19269 19270 #include <term.h> /* lines, columns, cur_term */ 19271 19272 -MODULE_ID("$Id: lib_setup.c,v 1.111 2008/08/03 22:42:33 tom Exp $") 19273 +MODULE_ID("$Id: lib_setup.c,v 1.113 2009/02/14 22:21:40 tom Exp $") 19274 19275 /**************************************************************************** 19276 * 19277 @@ -149,21 +150,30 @@ 19278 19279 #if NCURSES_EXT_FUNCS 19280 NCURSES_EXPORT(int) 19281 -set_tabsize(int value) 19282 +NCURSES_SP_NAME(set_tabsize) (NCURSES_SP_DCLx int value) 19283 { 19284 int code = OK; 19285 #if USE_REENTRANT 19286 - if (SP) { 19287 - SP->_TABSIZE = value; 19288 + if (SP_PARM) { 19289 + SP_PARM->_TABSIZE = value; 19290 } else { 19291 code = ERR; 19292 } 19293 #else 19294 + (void) SP_PARM; 19295 TABSIZE = value; 19296 #endif 19297 return code; 19298 } 19299 + 19300 +#if NCURSES_SP_FUNCS 19301 +NCURSES_EXPORT(int) 19302 +set_tabsize(int value) 19303 +{ 19304 + return NCURSES_SP_NAME(set_tabsize) (CURRENT_SCREEN, value); 19305 +} 19306 #endif 19307 +#endif /* NCURSES_EXT_FUNCS */ 19308 19309 #if USE_SIGWINCH 19310 /* 19311 @@ -188,13 +198,25 @@ 19312 #endif 19313 19314 NCURSES_EXPORT(void) 19315 -use_env(bool f) 19316 +NCURSES_SP_NAME(use_env) (NCURSES_SP_DCLx bool f) 19317 { 19318 T((T_CALLED("use_env()"))); 19319 - _nc_prescreen.use_env = f; 19320 + if (IsPreScreen(SP_PARM)) { 19321 + SP_PARM->_use_env = f; 19322 + } else { 19323 + _nc_prescreen.use_env = f; 19324 + } 19325 returnVoid; 19326 } 19327 19328 +#if NCURSES_SP_FUNCS 19329 +NCURSES_EXPORT(void) 19330 +use_env(bool f) 19331 +{ 19332 + NCURSES_SP_NAME(use_env) (CURRENT_SCREEN, f); 19333 +} 19334 +#endif 19335 + 19336 NCURSES_EXPORT(void) 19337 _nc_get_screensize(SCREEN *sp, int *linep, int *colp) 19338 /* Obtain lines/columns values from the environment and/or terminfo entry */ 19339 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_termname.c ncurses-5.7/ncurses/tinfo/lib_termname.c 19340 --- ncurses-5.7.orig/ncurses/tinfo/lib_termname.c 2003-12-27 10:23:01.000000000 -0800 19341 +++ ncurses-5.7/ncurses/tinfo/lib_termname.c 2009-02-28 20:38:58.439326442 -0800 19342 @@ -1,5 +1,5 @@ 19343 /**************************************************************************** 19344 - * Copyright (c) 1998-2001,2003 Free Software Foundation, Inc. * 19345 + * Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. * 19346 * * 19347 * Permission is hereby granted, free of charge, to any person obtaining a * 19348 * copy of this software and associated documentation files (the * 19349 @@ -28,17 +28,31 @@ 19350 19351 #include <curses.priv.h> 19352 19353 -MODULE_ID("$Id: lib_termname.c,v 1.8 2003/12/27 18:23:01 tom Exp $") 19354 +MODULE_ID("$Id: lib_termname.c,v 1.11 2009/02/21 16:37:12 tom Exp $") 19355 19356 NCURSES_EXPORT(char *) 19357 -termname(void) 19358 +NCURSES_SP_NAME(termname) (NCURSES_SP_DCL0) 19359 { 19360 char *name = 0; 19361 19362 - T((T_CALLED("termname()"))); 19363 + T((T_CALLED("termname(%p)"), SP_PARM)); 19364 19365 +#if NCURSES_SP_FUNCS 19366 + if (TerminalOf(SP_PARM) != 0) { 19367 + name = TerminalOf(SP_PARM)->_termname; 19368 + } 19369 +#else 19370 if (cur_term != 0) 19371 name = cur_term->_termname; 19372 +#endif 19373 19374 returnPtr(name); 19375 } 19376 + 19377 +#if NCURSES_SP_FUNCS 19378 +NCURSES_EXPORT(char *) 19379 +termname(void) 19380 +{ 19381 + return NCURSES_SP_NAME(termname) (CURRENT_SCREEN); 19382 +} 19383 +#endif 19384 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_tparm.c ncurses-5.7/ncurses/tinfo/lib_tparm.c 19385 --- ncurses-5.7.orig/ncurses/tinfo/lib_tparm.c 2008-08-16 12:22:55.000000000 -0700 19386 +++ ncurses-5.7/ncurses/tinfo/lib_tparm.c 2009-02-28 20:38:58.439326442 -0800 19387 @@ -40,10 +40,9 @@ 19388 #include <curses.priv.h> 19389 19390 #include <ctype.h> 19391 -#include <term.h> 19392 #include <tic.h> 19393 19394 -MODULE_ID("$Id: lib_tparm.c,v 1.76 2008/08/16 19:22:55 tom Exp $") 19395 +MODULE_ID("$Id: lib_tparm.c,v 1.77 2008/11/16 00:19:59 juergen Exp $") 19396 19397 /* 19398 * char * 19399 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_tputs.c ncurses-5.7/ncurses/tinfo/lib_tputs.c 19400 --- ncurses-5.7.orig/ncurses/tinfo/lib_tputs.c 2008-06-28 06:12:15.000000000 -0700 19401 +++ ncurses-5.7/ncurses/tinfo/lib_tputs.c 2009-02-28 20:38:59.859415560 -0800 19402 @@ -1,5 +1,5 @@ 19403 /**************************************************************************** 19404 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 19405 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 19406 * * 19407 * Permission is hereby granted, free of charge, to any person obtaining a * 19408 * copy of this software and associated documentation files (the * 19409 @@ -30,6 +30,7 @@ 19410 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 19411 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 19412 * and: Thomas E. Dickey 1996-on * 19413 + * and: Juergen Pfeifer 2009 * 19414 ****************************************************************************/ 19415 19416 /* 19417 @@ -46,7 +47,7 @@ 19418 #include <termcap.h> /* ospeed */ 19419 #include <tic.h> 19420 19421 -MODULE_ID("$Id: lib_tputs.c,v 1.66 2008/06/28 13:12:15 tom Exp $") 19422 +MODULE_ID("$Id: lib_tputs.c,v 1.68 2009/02/28 21:08:18 tom Exp $") 19423 19424 NCURSES_EXPORT_VAR(char) PC = 0; /* used by termcap library */ 19425 NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0; /* used by termcap library */ 19426 @@ -72,7 +73,7 @@ 19427 static int (*my_outch) (int c) = _nc_outch; 19428 19429 NCURSES_EXPORT(int) 19430 -delay_output(int ms) 19431 +NCURSES_SP_NAME(delay_output) (NCURSES_SP_DCLx int ms) 19432 { 19433 T((T_CALLED("delay_output(%d)"), ms)); 19434 19435 @@ -92,19 +93,35 @@ 19436 returnCode(OK); 19437 } 19438 19439 +#if NCURSES_SP_FUNCS 19440 +NCURSES_EXPORT(int) 19441 +delay_output(int ms) 19442 +{ 19443 + return NCURSES_SP_NAME(delay_output) (CURRENT_SCREEN, ms); 19444 +} 19445 +#endif 19446 + 19447 NCURSES_EXPORT(void) 19448 -_nc_flush(void) 19449 +NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_DCL0) 19450 { 19451 (void) fflush(NC_OUTPUT); 19452 } 19453 19454 +#if NCURSES_SP_FUNCS 19455 +NCURSES_EXPORT(void) 19456 +_nc_flush(void) 19457 +{ 19458 + NCURSES_SP_NAME(_nc_flush) (CURRENT_SCREEN); 19459 +} 19460 +#endif 19461 + 19462 NCURSES_EXPORT(int) 19463 -_nc_outch(int ch) 19464 +NCURSES_SP_NAME(_nc_outch) (NCURSES_SP_DCLx int ch) 19465 { 19466 COUNT_OUTCHARS(1); 19467 19468 - if (SP != 0 19469 - && SP->_cleanup) { 19470 + if (SP_PARM != 0 19471 + && SP_PARM->_cleanup) { 19472 char tmp = ch; 19473 /* 19474 * POSIX says write() is safe in a signal handler, but the 19475 @@ -117,6 +134,14 @@ 19476 return OK; 19477 } 19478 19479 +#if NCURSES_SP_FUNCS 19480 +NCURSES_EXPORT(int) 19481 +_nc_outch(int ch) 19482 +{ 19483 + return NCURSES_SP_NAME(_nc_outch) (CURRENT_SCREEN, ch); 19484 +} 19485 +#endif 19486 + 19487 NCURSES_EXPORT(int) 19488 putp(const char *string) 19489 { 19490 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_ttyflags.c ncurses-5.7/ncurses/tinfo/lib_ttyflags.c 19491 --- ncurses-5.7.orig/ncurses/tinfo/lib_ttyflags.c 2008-08-03 15:10:44.000000000 -0700 19492 +++ ncurses-5.7/ncurses/tinfo/lib_ttyflags.c 2009-02-28 20:38:57.059236485 -0800 19493 @@ -1,5 +1,5 @@ 19494 /**************************************************************************** 19495 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 19496 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 19497 * * 19498 * Permission is hereby granted, free of charge, to any person obtaining a * 19499 * copy of this software and associated documentation files (the * 19500 @@ -38,7 +38,7 @@ 19501 #include <curses.priv.h> 19502 #include <term.h> /* cur_term */ 19503 19504 -MODULE_ID("$Id: lib_ttyflags.c,v 1.18 2008/08/03 22:10:44 tom Exp $") 19505 +MODULE_ID("$Id: lib_ttyflags.c,v 1.19 2009/02/15 00:33:49 tom Exp $") 19506 19507 NCURSES_EXPORT(int) 19508 _nc_get_tty_mode(TTY * buf) 19509 @@ -101,7 +101,7 @@ 19510 } 19511 19512 NCURSES_EXPORT(int) 19513 -def_shell_mode(void) 19514 +NCURSES_SP_NAME(def_shell_mode) (NCURSES_SP_DCL0) 19515 { 19516 int rc = ERR; 19517 19518 @@ -125,8 +125,16 @@ 19519 returnCode(rc); 19520 } 19521 19522 +#if NCURSES_SP_FUNCS 19523 NCURSES_EXPORT(int) 19524 -def_prog_mode(void) 19525 +def_shell_mode(void) 19526 +{ 19527 + return NCURSES_SP_NAME(def_shell_mode) (CURRENT_SCREEN); 19528 +} 19529 +#endif 19530 + 19531 +NCURSES_EXPORT(int) 19532 +NCURSES_SP_NAME(def_prog_mode) (NCURSES_SP_DCL0) 19533 { 19534 int rc = ERR; 19535 19536 @@ -148,16 +156,24 @@ 19537 returnCode(rc); 19538 } 19539 19540 +#if NCURSES_SP_FUNCS 19541 NCURSES_EXPORT(int) 19542 -reset_prog_mode(void) 19543 +def_prog_mode(void) 19544 +{ 19545 + return NCURSES_SP_NAME(def_prog_mode) (CURRENT_SCREEN); 19546 +} 19547 +#endif 19548 + 19549 +NCURSES_EXPORT(int) 19550 +NCURSES_SP_NAME(reset_prog_mode) (NCURSES_SP_DCL0) 19551 { 19552 T((T_CALLED("reset_prog_mode()"))); 19553 19554 if (cur_term != 0) { 19555 if (_nc_set_tty_mode(&cur_term->Nttyb) == OK) { 19556 - if (SP) { 19557 - if (SP->_keypad_on) 19558 - _nc_keypad(SP, TRUE); 19559 + if (SP_PARM) { 19560 + if (SP_PARM->_keypad_on) 19561 + _nc_keypad(SP_PARM, TRUE); 19562 NC_BUFFERED(TRUE); 19563 } 19564 returnCode(OK); 19565 @@ -166,14 +182,22 @@ 19566 returnCode(ERR); 19567 } 19568 19569 +#if NCURSES_SP_FUNCS 19570 NCURSES_EXPORT(int) 19571 -reset_shell_mode(void) 19572 +reset_prog_mode(void) 19573 +{ 19574 + return NCURSES_SP_NAME(reset_prog_mode) (CURRENT_SCREEN); 19575 +} 19576 +#endif 19577 + 19578 +NCURSES_EXPORT(int) 19579 +NCURSES_SP_NAME(reset_shell_mode) (NCURSES_SP_DCL0) 19580 { 19581 T((T_CALLED("reset_shell_mode()"))); 19582 19583 if (cur_term != 0) { 19584 - if (SP) { 19585 - _nc_keypad(SP, FALSE); 19586 + if (SP_PARM) { 19587 + _nc_keypad(SP_PARM, FALSE); 19588 _nc_flush(); 19589 NC_BUFFERED(FALSE); 19590 } 19591 @@ -182,6 +206,14 @@ 19592 returnCode(ERR); 19593 } 19594 19595 +#if NCURSES_SP_FUNCS 19596 +NCURSES_EXPORT(int) 19597 +reset_shell_mode(void) 19598 +{ 19599 + return NCURSES_SP_NAME(reset_shell_mode) (CURRENT_SCREEN); 19600 +} 19601 +#endif 19602 + 19603 static TTY * 19604 saved_tty(void) 19605 { 19606 diff -Naur ncurses-5.7.orig/ncurses/tinfo/make_keys.c ncurses-5.7/ncurses/tinfo/make_keys.c 19607 --- ncurses-5.7.orig/ncurses/tinfo/make_keys.c 2008-08-03 14:57:22.000000000 -0700 19608 +++ ncurses-5.7/ncurses/tinfo/make_keys.c 2009-02-28 20:38:58.439326442 -0800 19609 @@ -39,16 +39,16 @@ 19610 #define USE_TERMLIB 1 19611 #include <curses.priv.h> 19612 19613 -MODULE_ID("$Id: make_keys.c,v 1.14 2008/08/03 21:57:22 tom Exp $") 19614 +MODULE_ID("$Id: make_keys.c,v 1.15 2008/11/16 00:19:59 juergen Exp $") 19615 19616 #include <names.c> 19617 19618 #define UNKNOWN (SIZEOF(strnames) + SIZEOF(strfnames)) 19619 19620 -static size_t 19621 +static unsigned 19622 lookup(const char *name) 19623 { 19624 - size_t n; 19625 + unsigned n; 19626 bool found = FALSE; 19627 for (n = 0; strnames[n] != 0; n++) { 19628 if (!strcmp(name, strnames[n])) { 19629 @@ -73,7 +73,7 @@ 19630 char buffer[BUFSIZ]; 19631 char from[256]; 19632 char to[256]; 19633 - int maxlen = 16; 19634 + unsigned maxlen = 16; 19635 int scanned; 19636 19637 while (fgets(buffer, sizeof(buffer), ifp) != 0) { 19638 @@ -85,10 +85,10 @@ 19639 19640 scanned = sscanf(buffer, "%255s %255s", to, from); 19641 if (scanned == 2) { 19642 - int code = lookup(from); 19643 + unsigned code = lookup(from); 19644 if (code == UNKNOWN) 19645 continue; 19646 - if ((int) strlen(from) > maxlen) 19647 + if (strlen(from) > maxlen) 19648 maxlen = strlen(from); 19649 fprintf(ofp, "\t{ %4d, %-*.*s },\t/* %s */\n", 19650 code, 19651 diff -Naur ncurses-5.7.orig/ncurses/tinfo/MKnames.awk ncurses-5.7/ncurses/tinfo/MKnames.awk 19652 --- ncurses-5.7.orig/ncurses/tinfo/MKnames.awk 2008-10-11 14:07:56.000000000 -0700 19653 +++ ncurses-5.7/ncurses/tinfo/MKnames.awk 2009-02-28 20:38:58.439326442 -0800 19654 @@ -25,7 +25,7 @@ 19655 # use or other dealings in this Software without prior written # 19656 # authorization. # 19657 ############################################################################## 19658 -# $Id: MKnames.awk,v 1.20 2008/10/11 21:07:56 tom Exp $ 19659 +# $Id: MKnames.awk,v 1.21 2008/11/16 00:19:59 juergen Exp $ 19660 function large_item(value) { 19661 result = sprintf("%d,", offset); 19662 offset = offset + length(value) + 1; 19663 @@ -107,8 +107,6 @@ 19664 print "" 19665 print "#if BROKEN_LINKER || USE_REENTRANT" 19666 print "" 19667 - print "#include <term.h>" 19668 - print "" 19669 if (bigstrings) { 19670 printf "static const char _nc_name_blob[] = \n" 19671 printf "%s;\n", bigstr; 19672 diff -Naur ncurses-5.7.orig/ncurses/tinfo/name_match.c ncurses-5.7/ncurses/tinfo/name_match.c 19673 --- ncurses-5.7.orig/ncurses/tinfo/name_match.c 2008-08-03 12:49:33.000000000 -0700 19674 +++ ncurses-5.7/ncurses/tinfo/name_match.c 2009-02-28 20:38:58.439326442 -0800 19675 @@ -31,10 +31,9 @@ 19676 ****************************************************************************/ 19677 19678 #include <curses.priv.h> 19679 -#include <term.h> 19680 #include <tic.h> 19681 19682 -MODULE_ID("$Id: name_match.c,v 1.17 2008/08/03 19:49:33 tom Exp $") 19683 +MODULE_ID("$Id: name_match.c,v 1.18 2008/11/16 00:19:59 juergen Exp $") 19684 19685 /* 19686 * _nc_first_name(char *names) 19687 diff -Naur ncurses-5.7.orig/ncurses/tinfo/use_screen.c ncurses-5.7/ncurses/tinfo/use_screen.c 19688 --- ncurses-5.7.orig/ncurses/tinfo/use_screen.c 2008-06-07 12:16:56.000000000 -0700 19689 +++ ncurses-5.7/ncurses/tinfo/use_screen.c 2009-02-28 20:38:58.443328118 -0800 19690 @@ -32,7 +32,7 @@ 19691 19692 #include <curses.priv.h> 19693 19694 -MODULE_ID("$Id: use_screen.c,v 1.6 2008/06/07 19:16:56 tom Exp $") 19695 +MODULE_ID("$Id: use_screen.c,v 1.7 2008/11/16 00:19:59 juergen Exp $") 19696 19697 NCURSES_EXPORT(int) 19698 use_screen(SCREEN *screen, NCURSES_SCREEN_CB func, void *data) 19699 @@ -47,7 +47,7 @@ 19700 * recurred through this point, return an error if so. 19701 */ 19702 _nc_lock_global(curses); 19703 - save_SP = SP; 19704 + save_SP = CURRENT_SCREEN; 19705 set_term(screen); 19706 19707 code = func(screen, data); 19708 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_traceatr.c ncurses-5.7/ncurses/trace/lib_traceatr.c 19709 --- ncurses-5.7.orig/ncurses/trace/lib_traceatr.c 2008-08-03 09:24:53.000000000 -0700 19710 +++ ncurses-5.7/ncurses/trace/lib_traceatr.c 2009-02-28 20:38:59.863415840 -0800 19711 @@ -1,5 +1,5 @@ 19712 /**************************************************************************** 19713 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 19714 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 19715 * * 19716 * Permission is hereby granted, free of charge, to any person obtaining a * 19717 * copy of this software and associated documentation files (the * 19718 @@ -30,6 +30,7 @@ 19719 * Author: Thomas Dickey 1996-on * 19720 * and: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 19721 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 19722 + * and: Juergen Pfeifer * 19723 ****************************************************************************/ 19724 19725 /* 19726 @@ -39,7 +40,7 @@ 19727 #include <curses.priv.h> 19728 #include <term.h> /* acs_chars */ 19729 19730 -MODULE_ID("$Id: lib_traceatr.c,v 1.63 2008/08/03 16:24:53 tom Exp $") 19731 +MODULE_ID("$Id: lib_traceatr.c,v 1.64 2009/02/28 21:10:20 tom Exp $") 19732 19733 #define COLOR_OF(c) ((c < 0) ? "default" : (c > 7 ? color_of(c) : colors[c].name)) 19734 19735 @@ -228,7 +229,7 @@ 19736 if ((attr & A_ALTCHARSET) && (acs_chars != 0)) { 19737 char *cp; 19738 char *found = 0; 19739 - const ALT_NAMES *sp; 19740 + const ALT_NAMES *strp; 19741 19742 for (cp = acs_chars; cp[0] && cp[1]; cp += 2) { 19743 if (ChCharOf(cp[1]) == ChCharOf(ch)) { 19744 @@ -239,9 +240,9 @@ 19745 19746 if (found != 0) { 19747 ch = ChCharOf(*found); 19748 - for (sp = names; sp->val; sp++) 19749 - if (sp->val == ch) { 19750 - result = sp->name; 19751 + for (strp = names; strp->val; strp++) 19752 + if (strp->val == ch) { 19753 + result = strp->name; 19754 break; 19755 } 19756 } 19757 @@ -260,7 +261,8 @@ 19758 if ((found = _nc_altcharset_name(ChAttrOf(ch), ch)) != 0) { 19759 (void) _nc_trace_bufcat(bufnum, found); 19760 } else 19761 - (void) _nc_trace_bufcat(bufnum, _nc_tracechar(SP, (int) ChCharOf(ch))); 19762 + (void) _nc_trace_bufcat(bufnum, _nc_tracechar(CURRENT_SCREEN, 19763 + (int) ChCharOf(ch))); 19764 19765 if (ChAttrOf(ch) != A_NORMAL) { 19766 (void) _nc_trace_bufcat(bufnum, " | "); 19767 @@ -320,7 +322,7 @@ 19768 if (PUTC_ch != L'\0') { 19769 /* it could not be a multibyte sequence */ 19770 (void) _nc_trace_bufcat(bufnum, 19771 - _nc_tracechar(SP, 19772 + _nc_tracechar(CURRENT_SCREEN, 19773 UChar(ch->chars[PUTC_i]))); 19774 } 19775 break; 19776 @@ -329,7 +331,7 @@ 19777 if (n) 19778 (void) _nc_trace_bufcat(bufnum, ", "); 19779 (void) _nc_trace_bufcat(bufnum, 19780 - _nc_tracechar(SP, 19781 + _nc_tracechar(CURRENT_SCREEN, 19782 UChar(PUTC_buf[n]))); 19783 } 19784 } 19785 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_tracebits.c ncurses-5.7/ncurses/trace/lib_tracebits.c 19786 --- ncurses-5.7.orig/ncurses/trace/lib_tracebits.c 2008-08-03 09:09:26.000000000 -0700 19787 +++ ncurses-5.7/ncurses/trace/lib_tracebits.c 2009-02-28 20:38:58.443328118 -0800 19788 @@ -33,9 +33,8 @@ 19789 ****************************************************************************/ 19790 19791 #include <curses.priv.h> 19792 -#include <term.h> /* cur_term */ 19793 19794 -MODULE_ID("$Id: lib_tracebits.c,v 1.17 2008/08/03 16:09:26 tom Exp $") 19795 +MODULE_ID("$Id: lib_tracebits.c,v 1.18 2008/11/16 00:19:59 juergen Exp $") 19796 19797 #if SVR4_TERMIO && !defined(_POSIX_SOURCE) 19798 #define _POSIX_SOURCE 19799 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_trace.c ncurses-5.7/ncurses/trace/lib_trace.c 19800 --- ncurses-5.7.orig/ncurses/trace/lib_trace.c 2008-08-23 11:04:29.000000000 -0700 19801 +++ ncurses-5.7/ncurses/trace/lib_trace.c 2009-02-28 20:38:59.859415560 -0800 19802 @@ -1,5 +1,5 @@ 19803 /**************************************************************************** 19804 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 19805 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 19806 * * 19807 * Permission is hereby granted, free of charge, to any person obtaining a * 19808 * copy of this software and associated documentation files (the * 19809 @@ -30,6 +30,7 @@ 19810 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 19811 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 19812 * and: Thomas E. Dickey 1996-on * 19813 + * and: Juergen Pfeifer * 19814 ****************************************************************************/ 19815 19816 /* 19817 @@ -46,7 +47,7 @@ 19818 19819 #include <ctype.h> 19820 19821 -MODULE_ID("$Id: lib_trace.c,v 1.71 2008/08/23 18:04:29 tom Exp $") 19822 +MODULE_ID("$Id: lib_trace.c,v 1.72 2009/02/28 20:37:37 tom Exp $") 19823 19824 NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */ 19825 19826 @@ -56,26 +57,26 @@ 19827 NCURSES_EXPORT(const char *) 19828 NCURSES_PUBLIC_VAR(_nc_tputs_trace) (void) 19829 { 19830 - return SP ? SP->_tputs_trace : _nc_prescreen._tputs_trace; 19831 + return CURRENT_SCREEN ? CURRENT_SCREEN->_tputs_trace : _nc_prescreen._tputs_trace; 19832 } 19833 NCURSES_EXPORT(long) 19834 NCURSES_PUBLIC_VAR(_nc_outchars) (void) 19835 { 19836 - return SP ? SP->_outchars : _nc_prescreen._outchars; 19837 + return CURRENT_SCREEN ? CURRENT_SCREEN->_outchars : _nc_prescreen._outchars; 19838 } 19839 NCURSES_EXPORT(void) 19840 _nc_set_tputs_trace(const char *s) 19841 { 19842 - if (SP) 19843 - SP->_tputs_trace = s; 19844 + if (CURRENT_SCREEN) 19845 + CURRENT_SCREEN->_tputs_trace = s; 19846 else 19847 _nc_prescreen._tputs_trace = s; 19848 } 19849 NCURSES_EXPORT(void) 19850 _nc_count_outchars(long increment) 19851 { 19852 - if (SP) 19853 - SP->_outchars += increment; 19854 + if (CURRENT_SCREEN) 19855 + CURRENT_SCREEN->_outchars += increment; 19856 else 19857 _nc_prescreen._outchars += increment; 19858 } 19859 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_tracemse.c ncurses-5.7/ncurses/trace/lib_tracemse.c 19860 --- ncurses-5.7.orig/ncurses/trace/lib_tracemse.c 2008-08-03 08:39:29.000000000 -0700 19861 +++ ncurses-5.7/ncurses/trace/lib_tracemse.c 2009-02-28 20:38:58.443328118 -0800 19862 @@ -38,7 +38,7 @@ 19863 19864 #include <curses.priv.h> 19865 19866 -MODULE_ID("$Id: lib_tracemse.c,v 1.15 2008/08/03 15:39:29 tom Exp $") 19867 +MODULE_ID("$Id: lib_tracemse.c,v 1.16 2008/11/16 00:19:59 juergen Exp $") 19868 19869 #ifdef TRACE 19870 19871 @@ -117,7 +117,7 @@ 19872 NCURSES_EXPORT(char *) 19873 _tracemouse(MEVENT const *ep) 19874 { 19875 - return _nc_tracemouse(SP, ep); 19876 + return _nc_tracemouse(CURRENT_SCREEN, ep); 19877 } 19878 19879 #else /* !TRACE */ 19880 diff -Naur ncurses-5.7.orig/ncurses/trace/varargs.c ncurses-5.7/ncurses/trace/varargs.c 19881 --- ncurses-5.7.orig/ncurses/trace/varargs.c 2008-08-03 08:42:49.000000000 -0700 19882 +++ ncurses-5.7/ncurses/trace/varargs.c 2009-02-28 20:38:58.443328118 -0800 19883 @@ -34,7 +34,7 @@ 19884 19885 #include <ctype.h> 19886 19887 -MODULE_ID("$Id: varargs.c,v 1.7 2008/08/03 15:42:49 tom Exp $") 19888 +MODULE_ID("$Id: varargs.c,v 1.8 2008/11/16 00:19:59 juergen Exp $") 19889 19890 #ifdef TRACE 19891 19892 @@ -44,7 +44,7 @@ 19893 atUnknown = 0, atInteger, atFloat, atPoint, atString 19894 } ARGTYPE; 19895 19896 -#define VA_INT(type) ival = va_arg(ap, type) 19897 +#define VA_INT(type) ival = (int) va_arg(ap, type) 19898 #define VA_FLT(type) fval = va_arg(ap, type) 19899 #define VA_PTR(type) pval = (char *)va_arg(ap, type) 19900 #define VA_STR(type) sval = va_arg(ap, type) 19901 diff -Naur ncurses-5.7.orig/ncurses/tty/lib_mvcur.c ncurses-5.7/ncurses/tty/lib_mvcur.c 19902 --- ncurses-5.7.orig/ncurses/tty/lib_mvcur.c 2008-08-16 12:30:58.000000000 -0700 19903 +++ ncurses-5.7/ncurses/tty/lib_mvcur.c 2009-02-28 20:38:57.059236485 -0800 19904 @@ -1,5 +1,5 @@ 19905 /**************************************************************************** 19906 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 19907 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 19908 * * 19909 * Permission is hereby granted, free of charge, to any person obtaining a * 19910 * copy of this software and associated documentation files (the * 19911 @@ -30,6 +30,7 @@ 19912 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 19913 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 19914 * and: Thomas E. Dickey 1996-on * 19915 + * and: Juergen Pfeifer 2009 * 19916 ****************************************************************************/ 19917 19918 /* 19919 @@ -155,7 +156,7 @@ 19920 #include <term.h> 19921 #include <ctype.h> 19922 19923 -MODULE_ID("$Id: lib_mvcur.c,v 1.113 2008/08/16 19:30:58 tom Exp $") 19924 +MODULE_ID("$Id: lib_mvcur.c,v 1.114 2009/02/15 00:50:33 tom Exp $") 19925 19926 #define WANT_CHAR(y, x) SP->_newscr->_line[y].text[x] /* desired state */ 19927 #define BAUDRATE cur_term->_baudrate /* bits per second */ 19928 @@ -853,9 +854,10 @@ 19929 return (ERR); 19930 } 19931 19932 -NCURSES_EXPORT(int) 19933 -mvcur(int yold, int xold, int ynew, int xnew) 19934 /* optimized cursor move from (yold, xold) to (ynew, xnew) */ 19935 +NCURSES_EXPORT(int) 19936 +NCURSES_SP_NAME(mvcur) (NCURSES_SP_DCLx 19937 + int yold, int xold, int ynew, int xnew) 19938 { 19939 NCURSES_CH_T oldattr; 19940 int code; 19941 @@ -863,7 +865,7 @@ 19942 TR(TRACE_CALLS | TRACE_MOVE, (T_CALLED("mvcur(%d,%d,%d,%d)"), 19943 yold, xold, ynew, xnew)); 19944 19945 - if (SP == 0) { 19946 + if (SP_PARM == 0) { 19947 code = ERR; 19948 } else if (yold == ynew && xold == xnew) { 19949 code = OK; 19950 @@ -884,7 +886,7 @@ 19951 * character set -- these have a strong tendency to screw up the CR & 19952 * LF used for local character motions! 19953 */ 19954 - oldattr = SCREEN_ATTRS(SP); 19955 + oldattr = SCREEN_ATTRS(SP_PARM); 19956 if ((AttrOf(oldattr) & A_ALTCHARSET) 19957 || (AttrOf(oldattr) && !move_standout_mode)) { 19958 TR(TRACE_CHARPUT, ("turning off (%#lx) %s before move", 19959 @@ -896,7 +898,7 @@ 19960 if (xold >= screen_columns) { 19961 int l; 19962 19963 - if (SP->_nl) { 19964 + if (SP_PARM->_nl) { 19965 l = (xold + 1) / screen_columns; 19966 yold += l; 19967 if (yold >= screen_lines) 19968 @@ -940,7 +942,7 @@ 19969 /* 19970 * Restore attributes if we disabled them before moving. 19971 */ 19972 - if (!SameAttrOf(oldattr, SCREEN_ATTRS(SP))) { 19973 + if (!SameAttrOf(oldattr, SCREEN_ATTRS(SP_PARM))) { 19974 TR(TRACE_CHARPUT, ("turning on (%#lx) %s after move", 19975 (unsigned long) AttrOf(oldattr), 19976 _traceattr(AttrOf(oldattr)))); 19977 @@ -950,6 +952,14 @@ 19978 returnCode(code); 19979 } 19980 19981 +#if NCURSES_SP_FUNCS 19982 +NCURSES_EXPORT(int) 19983 +mvcur(int yold, int xold, int ynew, int xnew) 19984 +{ 19985 + return NCURSES_SP_NAME(mvcur) (CURRENT_SCREEN, yold, xold, ynew, xnew); 19986 +} 19987 +#endif 19988 + 19989 #if defined(TRACE) || defined(NCURSES_TEST) 19990 NCURSES_EXPORT_VAR(int) _nc_optimize_enable = OPTIMIZE_ALL; 19991 #endif 19992 diff -Naur ncurses-5.7.orig/ncurses/tty/lib_vidattr.c ncurses-5.7/ncurses/tty/lib_vidattr.c 19993 --- ncurses-5.7.orig/ncurses/tty/lib_vidattr.c 2007-06-30 14:58:04.000000000 -0700 19994 +++ ncurses-5.7/ncurses/tty/lib_vidattr.c 2009-02-28 20:38:58.443328118 -0800 19995 @@ -1,5 +1,5 @@ 19996 /**************************************************************************** 19997 - * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. * 19998 + * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. * 19999 * * 20000 * Permission is hereby granted, free of charge, to any person obtaining a * 20001 * copy of this software and associated documentation files (the * 20002 @@ -29,7 +29,8 @@ 20003 /**************************************************************************** 20004 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 20005 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 20006 - * and: Thomas E. Dickey 1996 on * 20007 + * and: Thomas E. Dickey 1996-on * 20008 + * and: Juergen Pfeifer 2009 * 20009 ****************************************************************************/ 20010 20011 /* 20012 @@ -65,7 +66,7 @@ 20013 #include <curses.priv.h> 20014 #include <term.h> 20015 20016 -MODULE_ID("$Id: lib_vidattr.c,v 1.49 2007/06/30 21:58:04 tom Exp $") 20017 +MODULE_ID("$Id: lib_vidattr.c,v 1.51 2009/02/21 21:43:40 tom Exp $") 20018 20019 #define doPut(mode) TPUTS_TRACE(#mode); tputs(mode, 1, outc) 20020 20021 @@ -299,7 +300,7 @@ 20022 } 20023 20024 NCURSES_EXPORT(chtype) 20025 -termattrs(void) 20026 +NCURSES_SP_NAME(termattrs) (NCURSES_SP_DCL0) 20027 { 20028 chtype attrs = A_NORMAL; 20029 20030 @@ -331,8 +332,16 @@ 20031 if (enter_underline_mode) 20032 attrs |= A_UNDERLINE; 20033 20034 - if (SP->_coloron) 20035 + if (SP_PARM->_coloron) 20036 attrs |= A_COLOR; 20037 20038 - returnChar(attrs); 20039 + returnChtype(attrs); 20040 } 20041 + 20042 +#if NCURSES_SP_FUNCS 20043 +NCURSES_EXPORT(chtype) 20044 +termattrs(void) 20045 +{ 20046 + return NCURSES_SP_NAME(termattrs) (CURRENT_SCREEN); 20047 +} 20048 +#endif 20049 diff -Naur ncurses-5.7.orig/ncurses/tty/tty_update.c ncurses-5.7/ncurses/tty/tty_update.c 20050 --- ncurses-5.7.orig/ncurses/tty/tty_update.c 2008-08-30 13:08:19.000000000 -0700 20051 +++ ncurses-5.7/ncurses/tty/tty_update.c 2009-02-28 20:38:57.059236485 -0800 20052 @@ -1,5 +1,5 @@ 20053 /**************************************************************************** 20054 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 20055 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 20056 * * 20057 * Permission is hereby granted, free of charge, to any person obtaining a * 20058 * copy of this software and associated documentation files (the * 20059 @@ -30,6 +30,7 @@ 20060 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 20061 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 20062 * and: Thomas E. Dickey 1996-on * 20063 + * and: Juergen Pfeifer 2009 * 20064 ****************************************************************************/ 20065 20066 /*----------------------------------------------------------------- 20067 @@ -78,7 +79,7 @@ 14877 20068 #include <ctype.h> 14878 20069 #include <term.h> 14879 20070 14880 20071 -MODULE_ID("$Id: tty_update.c,v 1.246 2008/08/30 20:08:19 tom Exp $") 14881 +MODULE_ID("$Id: tty_update.c,v 1.24 7 2009/01/25 00:48:36tom Exp $")20072 +MODULE_ID("$Id: tty_update.c,v 1.248 2009/02/15 00:51:22 tom Exp $") 14882 20073 14883 20074 /* 14884 20075 * This define controls the line-breakout optimization. Every once in a 14885 @@ -1165,8 +1165,8 @@ 20076 @@ -618,7 +619,7 @@ 20077 if_USE_SCROLL_HINTS(win->_line[row].oldindex = row) 20078 20079 NCURSES_EXPORT(int) 20080 -doupdate(void) 20081 +NCURSES_SP_NAME(doupdate) (NCURSES_SP_DCL0) 20082 { 20083 int i; 20084 int nonempty; 20085 @@ -645,11 +646,11 @@ 20086 20087 _nc_signal_handler(FALSE); 20088 20089 - if (SP->_fifohold) 20090 - SP->_fifohold--; 20091 + if (SP_PARM->_fifohold) 20092 + SP_PARM->_fifohold--; 20093 20094 #if USE_SIZECHANGE 20095 - if (SP->_endwin || _nc_handle_sigwinch(SP)) { 20096 + if (SP_PARM->_endwin || _nc_handle_sigwinch(SP_PARM)) { 20097 /* 20098 * This is a transparent extension: XSI does not address it, 20099 * and applications need not know that ncurses can do it. 20100 @@ -658,20 +659,20 @@ 20101 * (this can happen in an xterm, for example), and resize the 20102 * ncurses data structures accordingly. 20103 */ 20104 - _nc_update_screensize(SP); 20105 + _nc_update_screensize(SP_PARM); 20106 } 20107 #endif 20108 20109 - if (SP->_endwin) { 20110 + if (SP_PARM->_endwin) { 20111 20112 T(("coming back from shell mode")); 20113 reset_prog_mode(); 20114 20115 _nc_mvcur_resume(); 20116 _nc_screen_resume(); 20117 - SP->_mouse_resume(SP); 20118 + SP_PARM->_mouse_resume(SP_PARM); 20119 20120 - SP->_endwin = FALSE; 20121 + SP_PARM->_endwin = FALSE; 20122 } 20123 #if USE_TRACE_TIMES 20124 /* zero the metering machinery */ 20125 @@ -699,7 +700,7 @@ 20126 for (j = 0; j < screen_columns; j++) { 20127 bool failed = FALSE; 20128 NCURSES_CH_T *thisline = newscr->_line[i].text; 20129 - attr_t thisattr = AttrOf(thisline[j]) & SP->_xmc_triggers; 20130 + attr_t thisattr = AttrOf(thisline[j]) & SP_PARM->_xmc_triggers; 20131 attr_t turnon = thisattr & ~rattr; 20132 20133 /* is an attribute turned on here? */ 20134 @@ -717,7 +718,7 @@ 20135 * there's enough room to set the attribute before the first 20136 * non-blank in the run. 20137 */ 20138 -#define SAFE(a) (!((a) & SP->_xmc_triggers)) 20139 +#define SAFE(a) (!((a) & SP_PARM->_xmc_triggers)) 20140 if (ISBLANK(thisline[j]) && SAFE(turnon)) { 20141 RemAttr(thisline[j], turnon); 20142 continue; 20143 @@ -748,7 +749,7 @@ 20144 for (m = i; m < screen_lines; m++) { 20145 for (; n < screen_columns; n++) { 20146 attr_t testattr = AttrOf(newscr->_line[m].text[n]); 20147 - if ((testattr & SP->_xmc_triggers) == rattr) { 20148 + if ((testattr & SP_PARM->_xmc_triggers) == rattr) { 20149 end_onscreen = TRUE; 20150 TR(TRACE_ATTRS, 20151 ("Range attributed with %s ends at (%d, %d)", 20152 @@ -809,7 +810,7 @@ 20153 for (p = i; p < screen_lines; p++) { 20154 for (; q < screen_columns; q++) { 20155 attr_t testattr = AttrOf(newscr->_line[p].text[q]); 20156 - if ((testattr & SP->_xmc_triggers) == rattr) 20157 + if ((testattr & SP_PARM->_xmc_triggers) == rattr) 20158 goto foundend; 20159 RemAttr(newscr->_line[p].text[q], turnon); 20160 } 20161 @@ -857,7 +858,7 @@ 20162 20163 nonempty = min(screen_lines, newscr->_maxy + 1); 20164 20165 - if (SP->_scrolling) { 20166 + if (SP_PARM->_scrolling) { 20167 _nc_scroll_optimize(); 20168 } 20169 20170 @@ -940,6 +941,14 @@ 20171 returnCode(OK); 20172 } 20173 20174 +#if NCURSES_SP_FUNCS 20175 +NCURSES_EXPORT(int) 20176 +doupdate(void) 20177 +{ 20178 + return NCURSES_SP_NAME(doupdate) (CURRENT_SCREEN); 20179 +} 20180 +#endif 20181 + 20182 /* 20183 * ClrBlank(win) 20184 * 20185 @@ -1165,8 +1174,8 @@ 14886 20186 newPair = GetPair(newLine[n]); 14887 20187 if (oldPair != newPair … … 14894 20194 SetPair(oldLine[n], GetPair(newLine[n])); 14895 20195 } 20196 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_cchar.c ncurses-5.7/ncurses/widechar/lib_cchar.c 20197 --- ncurses-5.7.orig/ncurses/widechar/lib_cchar.c 2007-05-12 12:03:06.000000000 -0700 20198 +++ ncurses-5.7/ncurses/widechar/lib_cchar.c 2009-02-28 20:38:58.443328118 -0800 20199 @@ -1,5 +1,5 @@ 20200 /**************************************************************************** 20201 - * Copyright (c) 2001-2005,2007 Free Software Foundation, Inc. * 20202 + * Copyright (c) 2001-2007,2008 Free Software Foundation, Inc. * 20203 * * 20204 * Permission is hereby granted, free of charge, to any person obtaining a * 20205 * copy of this software and associated documentation files (the * 20206 @@ -35,7 +35,7 @@ 20207 20208 #include <curses.priv.h> 20209 20210 -MODULE_ID("$Id: lib_cchar.c,v 1.12 2007/05/12 19:03:06 tom Exp $") 20211 +MODULE_ID("$Id: lib_cchar.c,v 1.13 2008/11/16 00:19:59 juergen Exp $") 20212 20213 /* 20214 * The SuSv2 description leaves some room for interpretation. We'll assume wch 20215 @@ -50,8 +50,8 @@ 20216 short color_pair, 20217 const void *opts) 20218 { 20219 - int i; 20220 - int len; 20221 + unsigned i; 20222 + unsigned len; 20223 int code = OK; 20224 20225 TR(TRACE_CCALLS, (T_CALLED("setcchar(%p,%s,%lu,%d,%p)"), 20226 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_get_wstr.c ncurses-5.7/ncurses/widechar/lib_get_wstr.c 20227 --- ncurses-5.7.orig/ncurses/widechar/lib_get_wstr.c 2008-08-16 12:25:33.000000000 -0700 20228 +++ ncurses-5.7/ncurses/widechar/lib_get_wstr.c 2009-02-28 20:38:58.443328118 -0800 20229 @@ -38,9 +38,8 @@ 20230 */ 20231 20232 #include <curses.priv.h> 20233 -#include <term.h> 20234 20235 -MODULE_ID("$Id: lib_get_wstr.c,v 1.10 2008/08/16 19:25:33 tom Exp $") 20236 +MODULE_ID("$Id: lib_get_wstr.c,v 1.11 2008/11/16 00:19:59 juergen Exp $") 20237 20238 static int 20239 wadd_wint(WINDOW *win, wint_t *src) 20240 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_wacs.c ncurses-5.7/ncurses/widechar/lib_wacs.c 20241 --- ncurses-5.7.orig/ncurses/widechar/lib_wacs.c 2006-12-17 07:16:17.000000000 -0800 20242 +++ ncurses-5.7/ncurses/widechar/lib_wacs.c 2009-02-28 20:38:58.443328118 -0800 20243 @@ -31,9 +31,8 @@ 20244 ****************************************************************************/ 20245 20246 #include <curses.priv.h> 20247 -#include <term.h> 20248 20249 -MODULE_ID("$Id: lib_wacs.c,v 1.7 2006/12/17 15:16:17 tom Exp $") 20250 +MODULE_ID("$Id: lib_wacs.c,v 1.8 2008/11/16 00:19:59 juergen Exp $") 20251 20252 NCURSES_EXPORT_VAR(cchar_t) * _nc_wacs = 0; 20253 14896 20254 diff -Naur ncurses-5.7.orig/NEWS ncurses-5.7/NEWS 14897 20255 --- ncurses-5.7.orig/NEWS 2008-11-01 17:56:22.000000000 -0700 14898 +++ ncurses-5.7/NEWS 2009-0 1-27 16:45:05.084820505-080020256 +++ ncurses-5.7/NEWS 2009-02-28 20:38:59.855417236 -0800 14899 20257 @@ -1,5 +1,5 @@ 14900 20258 ------------------------------------------------------------------------------- … … 14909 20267 ------------------------------------------------------------------------------- 14910 20268 --- $Id: NEWS,v 1.1320 2008/11/02 00:56:22 tom Exp $ 14911 +-- $Id: NEWS,v 1.136 0 2009/01/24 23:06:51tom Exp $20269 +-- $Id: NEWS,v 1.1367 2009/02/28 22:38:03 tom Exp $ 14912 20270 ------------------------------------------------------------------------------- 14913 20271 14914 20272 This is a log of changes that ncurses has gone through since Zeyd started 14915 @@ -45,6 +45,1 33@@20273 @@ -45,6 +45,158 @@ 14916 20274 Changes through 1.9.9e did not credit all contributions; 14917 20275 it is not possible to add this information. 14918 20276 20277 +20090228 20278 + + continue integrating "sp-funcs" by Juergen Pfeifer (incomplete). 20279 + + modify declaration of cur_term when broken-linker is used, but 20280 + enable-reentrant is not, to match pre-5.7 (report by Charles Wilson). 20281 + 20282 +20090221 20283 + + continue integrating "sp-funcs" by Juergen Pfeifer (incomplete). 20284 + 20285 +20090214 20286 + + add configure script --enable-sp-funcs to enable the new set of 20287 + extended functions. 20288 + + start integrating patches by Juergen Pfeifer: 20289 + + add extended functions which specify the SCREEN pointer for several 20290 + curses functions which use the global SP (these are incomplete; 20291 + some internals work is needed to complete these). 20292 + + add special cases to configure script for MinGW port. 20293 + 20294 +20090207 20295 + + update several configure macros from lynx changes 20296 + + append (not prepend) to CFLAGS/CPPFLAGS 20297 + + change variable from PATHSEP to PATH_SEPARATOR 20298 + + improve install-rules for pc-files (patch by Miroslav Lichvar). 20299 + + make it work with $DESTDIR 20300 + + create the pkg-config library directory if needed. 20301 + 14919 20302 +20090124 14920 20303 + + modify init_pair() to allow caller to create extra color pairs beyond … … 15049 20432 diff -Naur ncurses-5.7.orig/panel/Makefile.in ncurses-5.7/panel/Makefile.in 15050 20433 --- ncurses-5.7.orig/panel/Makefile.in 2007-04-28 07:56:11.000000000 -0700 15051 +++ ncurses-5.7/panel/Makefile.in 2009-0 1-27 16:44:58.028366252 -080020434 +++ ncurses-5.7/panel/Makefile.in 2009-02-28 20:38:46.310547562 -0800 15052 20435 @@ -1,6 +1,6 @@ 15053 20436 -# $Id: Makefile.in,v 1.52 2007/04/28 14:56:11 tom Exp $ … … 15070 20453 diff -Naur ncurses-5.7.orig/progs/Makefile.in ncurses-5.7/progs/Makefile.in 15071 20454 --- ncurses-5.7.orig/progs/Makefile.in 2008-09-07 06:58:55.000000000 -0700 15072 +++ ncurses-5.7/progs/Makefile.in 2009-0 1-27 16:44:45.103540717-080020455 +++ ncurses-5.7/progs/Makefile.in 2009-02-28 20:38:35.789873445 -0800 15073 20456 @@ -1,6 +1,6 @@ 15074 20457 -# $Id: Makefile.in,v 1.79 2008/09/07 13:58:55 tom Exp $ … … 15136 20519 diff -Naur ncurses-5.7.orig/progs/modules ncurses-5.7/progs/modules 15137 20520 --- ncurses-5.7.orig/progs/modules 2006-12-23 16:53:21.000000000 -0800 15138 +++ ncurses-5.7/progs/modules 2009-0 1-27 16:44:45.103540717-080020521 +++ ncurses-5.7/progs/modules 2009-02-28 20:38:35.789873445 -0800 15139 20522 @@ -1,7 +1,7 @@ 15140 20523 -# $Id: modules,v 1.13 2006/12/24 00:53:21 tom Exp $ … … 15157 20540 diff -Naur ncurses-5.7.orig/progs/tabs.c ncurses-5.7/progs/tabs.c 15158 20541 --- ncurses-5.7.orig/progs/tabs.c 1969-12-31 16:00:00.000000000 -0800 15159 +++ ncurses-5.7/progs/tabs.c 2009-0 1-27 16:44:46.515630395-080020542 +++ ncurses-5.7/progs/tabs.c 2009-02-28 20:38:37.161961447 -0800 15160 20543 @@ -0,0 +1,506 @@ 15161 20544 +/**************************************************************************** … … 15667 21050 diff -Naur ncurses-5.7.orig/test/clip_printw.c ncurses-5.7/test/clip_printw.c 15668 21051 --- ncurses-5.7.orig/test/clip_printw.c 1969-12-31 16:00:00.000000000 -0800 15669 +++ ncurses-5.7/test/clip_printw.c 2009-0 1-27 16:44:52.892037156-080021052 +++ ncurses-5.7/test/clip_printw.c 2009-02-28 20:38:42.990334962 -0800 15670 21053 @@ -0,0 +1,360 @@ 15671 21054 +/**************************************************************************** … … 16031 21414 diff -Naur ncurses-5.7.orig/test/demo_forms.c ncurses-5.7/test/demo_forms.c 16032 21415 --- ncurses-5.7.orig/test/demo_forms.c 2008-10-18 13:38:20.000000000 -0700 16033 +++ ncurses-5.7/test/demo_forms.c 2009-0 1-27 16:44:52.892037156-080021416 +++ ncurses-5.7/test/demo_forms.c 2009-02-28 20:38:42.990334962 -0800 16034 21417 @@ -26,7 +26,7 @@ 16035 21418 * authorization. * … … 16066 21449 diff -Naur ncurses-5.7.orig/test/edit_field.c ncurses-5.7/test/edit_field.c 16067 21450 --- ncurses-5.7.orig/test/edit_field.c 2008-10-18 13:40:20.000000000 -0700 16068 +++ ncurses-5.7/test/edit_field.c 2009-0 1-27 16:44:52.892037156-080021451 +++ ncurses-5.7/test/edit_field.c 2009-02-28 20:38:42.990334962 -0800 16069 21452 @@ -26,7 +26,7 @@ 16070 21453 * authorization. * … … 16089 21472 diff -Naur ncurses-5.7.orig/test/edit_field.h ncurses-5.7/test/edit_field.h 16090 21473 --- ncurses-5.7.orig/test/edit_field.h 2006-06-03 09:38:57.000000000 -0700 16091 +++ ncurses-5.7/test/edit_field.h 2009-0 1-27 16:44:52.896037435-080021474 +++ ncurses-5.7/test/edit_field.h 2009-02-28 20:38:42.990334962 -0800 16092 21475 @@ -1,5 +1,5 @@ 16093 21476 /**************************************************************************** … … 16119 21502 diff -Naur ncurses-5.7.orig/test/filter.c ncurses-5.7/test/filter.c 16120 21503 --- ncurses-5.7.orig/test/filter.c 2006-12-09 08:53:47.000000000 -0800 16121 +++ ncurses-5.7/test/filter.c 2009-0 1-27 16:44:49.391812822-080021504 +++ ncurses-5.7/test/filter.c 2009-02-28 20:38:39.770130185 -0800 16122 21505 @@ -1,5 +1,5 @@ 16123 21506 /**************************************************************************** … … 16191 21574 diff -Naur ncurses-5.7.orig/test/insdelln.c ncurses-5.7/test/insdelln.c 16192 21575 --- ncurses-5.7.orig/test/insdelln.c 1969-12-31 16:00:00.000000000 -0800 16193 +++ ncurses-5.7/test/insdelln.c 2009-0 1-27 16:44:52.896037435-080021576 +++ ncurses-5.7/test/insdelln.c 2009-02-28 20:38:42.990334962 -0800 16194 21577 @@ -0,0 +1,380 @@ 16195 21578 +/**************************************************************************** … … 16575 21958 diff -Naur ncurses-5.7.orig/test/modules ncurses-5.7/test/modules 16576 21959 --- ncurses-5.7.orig/test/modules 2007-08-18 10:57:08.000000000 -0700 16577 +++ ncurses-5.7/test/modules 2009-0 1-27 16:44:52.896037435-080021960 +++ ncurses-5.7/test/modules 2009-02-28 20:38:42.990334962 -0800 16578 21961 @@ -1,4 +1,4 @@ 16579 21962 -# $Id: modules,v 1.36 2007/08/18 17:57:08 tom Exp $ … … 16600 21983 diff -Naur ncurses-5.7.orig/test/ncurses.c ncurses-5.7/test/ncurses.c 16601 21984 --- ncurses-5.7.orig/test/ncurses.c 2008-09-27 07:34:58.000000000 -0700 16602 +++ ncurses-5.7/test/ncurses.c 2009-0 1-27 16:45:05.092821064-080021985 +++ ncurses-5.7/test/ncurses.c 2009-02-28 20:38:53.018977231 -0800 16603 21986 @@ -40,7 +40,7 @@ 16604 21987 Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993 … … 17092 22475 diff -Naur ncurses-5.7.orig/test/programs ncurses-5.7/test/programs 17093 22476 --- ncurses-5.7.orig/test/programs 2008-08-16 14:47:39.000000000 -0700 17094 +++ ncurses-5.7/test/programs 2009-0 1-27 16:44:52.896037435-080022477 +++ ncurses-5.7/test/programs 2009-02-28 20:38:42.994335242 -0800 17095 22478 @@ -1,4 +1,4 @@ 17096 22479 -# $Id: programs,v 1.14 2008/08/16 21:47:39 tom Exp $ … … 17115 22498 key_names $(LDFLAGS_CURSES) $(LOCAL_LIBS) key_names 17116 22499 keynames $(LDFLAGS_CURSES) $(LOCAL_LIBS) keynames 22500 diff -Naur ncurses-5.7.orig/test/railroad.c ncurses-5.7/test/railroad.c 22501 --- ncurses-5.7.orig/test/railroad.c 2008-02-09 10:08:43.000000000 -0800 22502 +++ ncurses-5.7/test/railroad.c 2009-02-28 20:38:59.863415840 -0800 22503 @@ -29,7 +29,7 @@ 22504 /* 22505 * Author: Thomas E. Dickey - 2000 22506 * 22507 - * $Id: railroad.c,v 1.16 2008/02/09 18:08:43 tom Exp $ 22508 + * $Id: railroad.c,v 1.17 2008/12/07 02:07:41 juergen Exp $ 22509 * 22510 * A simple demo of the termcap interface. 22511 */ 22512 @@ -82,7 +82,7 @@ 22513 } 22514 22515 static void 22516 -ShowCursor(int flag) 22517 +MyShowCursor(int flag) 22518 { 22519 if (startC != 0 && finisC != 0) { 22520 tputs(flag ? startC : finisC, 1, outc); 22521 @@ -166,7 +166,7 @@ 22522 { 22523 Underline(0); 22524 StandOut(0); 22525 - ShowCursor(1); 22526 + MyShowCursor(1); 22527 } 22528 22529 static void 22530 @@ -214,14 +214,14 @@ 22531 startC = tgetstr("ve", &ap); 22532 finisC = tgetstr("vi", &ap); 22533 22534 - ShowCursor(0); 22535 + MyShowCursor(0); 22536 22537 CATCHALL(onsig); 22538 22539 while (*args) { 22540 ShowSign(*args++); 22541 } 22542 - ShowCursor(1); 22543 + MyShowCursor(1); 22544 } 22545 } 22546 17117 22547 diff -Naur ncurses-5.7.orig/test/README ncurses-5.7/test/README 17118 22548 --- ncurses-5.7.orig/test/README 2008-10-18 14:02:45.000000000 -0700 17119 +++ ncurses-5.7/test/README 2009-0 1-27 16:44:52.892037156-080022549 +++ ncurses-5.7/test/README 2009-02-28 20:38:42.990334962 -0800 17120 22550 @@ -25,7 +25,7 @@ 17121 22551 -- sale, use or other dealings in this Software without prior written -- … … 17413 22843 diff -Naur ncurses-5.7.orig/test/test.priv.h ncurses-5.7/test/test.priv.h 17414 22844 --- ncurses-5.7.orig/test/test.priv.h 2008-10-04 14:53:41.000000000 -0700 17415 +++ ncurses-5.7/test/test.priv.h 2009-0 1-27 16:44:52.896037435-080022845 +++ ncurses-5.7/test/test.priv.h 2009-02-28 20:38:42.994335242 -0800 17416 22846 @@ -29,7 +29,7 @@ 17417 22847 /**************************************************************************** … … 17435 22865 diff -Naur ncurses-5.7.orig/TO-DO ncurses-5.7/TO-DO 17436 22866 --- ncurses-5.7.orig/TO-DO 2008-10-11 12:22:27.000000000 -0700 17437 +++ ncurses-5.7/TO-DO 2009-0 1-27 16:44:48.051726777-080022867 +++ ncurses-5.7/TO-DO 2009-02-28 20:38:38.454044419 -0800 17438 22868 @@ -25,7 +25,7 @@ 17439 22869 -- sale, use or other dealings in this Software without prior written --
Note:
See TracChangeset
for help on using the changeset viewer.
