Changeset 8ec404e6
- Timestamp:
- Jun 5, 2009, 2:04:05 PM (16 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- 613a326
- Parents:
- b057cfe
- File:
-
- 1 moved
-
patches/ncurses-5.7-branch_update-14.patch (moved) (moved from patches/ncurses-5.7-branch_update-11.patch ) (598 diffs)
Legend:
- Unmodified
- Added
- Removed
-
patches/ncurses-5.7-branch_update-14.patch
rb057cfe r8ec404e6 1 1 Submitted By: Jim Gifford (jim at cross-lfs dot org) 2 Date: 0 3-22-20092 Date: 06-05-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 321.7 rechecked periodically. This patch covers up to 5.7-20090530. 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 3-22 21:17:11.616376588-070011 +++ ncurses-5.7/aclocal.m4 2009-06-05 14:01:31.000000000 -0700 12 12 @@ -1,5 +1,5 @@ 13 13 dnl*************************************************************************** … … 22 22 dnl 23 23 -dnl $Id: aclocal.m4,v 1.470 2008/10/25 22:15:32 tom Exp $ 24 +dnl $Id: aclocal.m4,v 1.48 5 2009/03/21 23:15:19tom Exp $24 +dnl $Id: aclocal.m4,v 1.487 2009/04/04 22:32:42 tom Exp $ 25 25 dnl Macros used in NCURSES auto-configuration script. 26 26 dnl … … 297 297 dnl --------------------------------------------------------------------------- 298 298 -dnl CF_LDFLAGS_STATIC version: 4 updated: 2008/10/18 17:58:20 299 +dnl CF_LDFLAGS_STATIC version: 6 updated: 2009/03/14 14:03:25299 +dnl CF_LDFLAGS_STATIC version: 7 updated: 2009/04/04 18:31:04 300 300 dnl ----------------- 301 301 dnl Check for compiler/linker flags used to temporarily force usage of static … … 306 306 case $cf_cv_system_name in #( 307 307 - OS/2*|os2*|aix[[45]]*) #( vi 308 + OS/2*|os2*|aix[[4]]*|solaris2.1[[0-9]] ) #( vi308 + OS/2*|os2*|aix[[4]]*|solaris2.1[[0-9]]|darwin*) #( vi 309 309 LDFLAGS_STATIC= 310 310 LDFLAGS_SHARED= … … 829 829 dnl --------------------------------------------------------------------------- 830 830 -dnl CF_WITH_LIBTOOL version: 19 updated: 2008/03/29 15:46:43 831 +dnl CF_WITH_LIBTOOL version: 2 2 updated: 2009/03/21 19:14:56831 +dnl CF_WITH_LIBTOOL version: 23 updated: 2009/03/28 14:26:27 832 832 dnl --------------- 833 833 dnl Provide a configure option to incorporate libtool. Define several useful … … 856 856 dnl 857 857 AC_DEFUN([CF_WITH_LIBTOOL], 858 @@ -5306,1 5 +5455,15@@858 @@ -5306,17 +5455,17 @@ 859 859 AC_PROG_LIBTOOL 860 860 # missing_content_AC_PROG_LIBTOOL}} … … 876 876 + fi 877 877 ])dnl 878 LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o' 878 - LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o' 879 + LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} -o' 879 880 LIB_OBJECT='${OBJECTS:.o=.lo}' 880 @@ -5331,16 +5480,23 @@ 881 LIB_SUFFIX=.la 882 LIB_CLEAN='${LIBTOOL} --mode=clean' 883 @@ -5331,16 +5480,25 @@ 881 884 882 885 # Save the version in a cache variable - this is not entirely a good … … 891 894 892 895 + # special hack to add -no-undefined (which libtool should do for itself) 896 + LT_UNDEF= 893 897 + case "$cf_cv_system_name" in #(vi 894 898 + cygwin*|mingw32*|uwin*|aix[[456]]) #(vi 895 + L IBTOOL="$LIBTOOL -no-undefined"899 + LT_UNDEF=-no-undefined 896 900 + ;; 897 901 + esac 902 + AC_SUBST([LT_UNDEF]) 898 903 + 899 904 # special hack to add --tag option for C++ compiler … … 901 906 - 1.[[5-9]]*|[[2-9]]*) 902 907 + case $cf_cv_libtool_version in #(vi 903 + 1.[[5-9]]*|[[2-9]] *) #(vi908 + 1.[[5-9]]*|[[2-9]].[[0-9.a-z]]*) #(vi 904 909 LIBTOOL_CXX="$LIBTOOL --tag=CXX" 905 910 LIBTOOL="$LIBTOOL --tag=CC" 906 911 ;; 907 @@ -5393,7 +55 49,7 @@912 @@ -5393,7 +5551,7 @@ 908 913 AC_SUBST($3)dnl 909 914 ])dnl … … 914 919 dnl Process an option specifying a list of colon-separated paths. 915 920 dnl 916 @@ -5409,7 +556 5,7 @@921 @@ -5409,7 +5567,7 @@ 917 922 AC_ARG_WITH($1,[$2 ](default: ifelse($4,,empty,$4)),, 918 923 ifelse($4,,[withval=${$3}],[withval=${$3-ifelse($5,,$4,$5)}]))dnl … … 923 928 for cf_src_path in $withval 924 929 do 925 @@ -5535,7 +569 1,7 @@930 @@ -5535,7 +5693,7 @@ 926 931 [USE_VALGRIND]) 927 932 ])dnl … … 932 937 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, 933 938 dnl or adapt to the vendor's definitions to get equivalent functionality, 934 @@ -5552,7 +57 08,7 @@939 @@ -5552,7 +5710,7 @@ 935 940 cf_POSIX_C_SOURCE=ifelse($2,,199506L,$2) 936 941 … … 941 946 ;; 942 947 freebsd*|dragonfly*) #(vi 943 @@ -5569,7 +572 5,7 @@948 @@ -5569,7 +5727,7 @@ 944 949 irix[[56]].*) #(vi 945 950 CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE" … … 952 957 diff -Naur ncurses-5.7.orig/Ada95/gen/adacurses-config.in ncurses-5.7/Ada95/gen/adacurses-config.in 953 958 --- ncurses-5.7.orig/Ada95/gen/adacurses-config.in 2007-04-07 14:06:50.000000000 -0700 954 +++ ncurses-5.7/Ada95/gen/adacurses-config.in 2009-0 3-22 21:16:59.575606928-0700959 +++ ncurses-5.7/Ada95/gen/adacurses-config.in 2009-06-05 14:01:07.000000000 -0700 955 960 @@ -1,18 +1,47 @@ 956 961 #! /bin/sh … … 1026 1031 diff -Naur ncurses-5.7.orig/Ada95/gen/gen.c ncurses-5.7/Ada95/gen/gen.c 1027 1032 --- ncurses-5.7.orig/Ada95/gen/gen.c 2008-10-04 14:59:37.000000000 -0700 1028 +++ ncurses-5.7/Ada95/gen/gen.c 2009-0 3-22 21:17:11.612376588-07001033 +++ ncurses-5.7/Ada95/gen/gen.c 2009-06-05 14:01:24.000000000 -0700 1029 1034 @@ -1,5 +1,5 @@ 1030 1035 /**************************************************************************** … … 1065 1070 diff -Naur ncurses-5.7.orig/Ada95/gen/Makefile.in ncurses-5.7/Ada95/gen/Makefile.in 1066 1071 --- ncurses-5.7.orig/Ada95/gen/Makefile.in 2008-10-04 15:58:31.000000000 -0700 1067 +++ ncurses-5.7/Ada95/gen/Makefile.in 2009-0 3-22 21:16:59.575606928-07001072 +++ ncurses-5.7/Ada95/gen/Makefile.in 2009-06-05 14:01:07.000000000 -0700 1068 1073 @@ -1,5 +1,5 @@ 1069 1074 ############################################################################## … … 1121 1126 diff -Naur ncurses-5.7.orig/Ada95/samples/Makefile.in ncurses-5.7/Ada95/samples/Makefile.in 1122 1127 --- ncurses-5.7.orig/Ada95/samples/Makefile.in 2006-12-17 08:45:02.000000000 -0800 1123 +++ ncurses-5.7/Ada95/samples/Makefile.in 2009-0 3-22 21:16:59.579606090 -07001128 +++ ncurses-5.7/Ada95/samples/Makefile.in 2009-06-05 14:01:07.000000000 -0700 1124 1129 @@ -1,5 +1,5 @@ 1125 1130 ############################################################################## … … 1160 1165 diff -Naur ncurses-5.7.orig/Ada95/src/Makefile.in ncurses-5.7/Ada95/src/Makefile.in 1161 1166 --- ncurses-5.7.orig/Ada95/src/Makefile.in 2007-09-15 11:22:24.000000000 -0700 1162 +++ ncurses-5.7/Ada95/src/Makefile.in 2009-0 3-22 21:16:59.579606090 -07001167 +++ ncurses-5.7/Ada95/src/Makefile.in 2009-06-05 14:01:07.000000000 -0700 1163 1168 @@ -1,5 +1,5 @@ 1164 1169 ############################################################################## … … 1252 1257 diff -Naur ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb 1253 1258 --- ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb 2008-07-26 11:51:11.000000000 -0700 1254 +++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb 2009-0 3-22 21:16:46.486767984-07001259 +++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb 2009-06-05 14:00:52.000000000 -0700 1255 1260 @@ -35,8 +35,8 @@ 1256 1261 ------------------------------------------------------------------------------ … … 1275 1280 diff -Naur ncurses-5.7.orig/c++/cursesw.cc ncurses-5.7/c++/cursesw.cc 1276 1281 --- ncurses-5.7.orig/c++/cursesw.cc 2007-12-15 15:01:57.000000000 -0800 1277 +++ ncurses-5.7/c++/cursesw.cc 2009-0 3-22 21:16:46.490769660 -07001282 +++ ncurses-5.7/c++/cursesw.cc 2009-06-05 14:01:30.000000000 -0700 1278 1283 @@ -1,6 +1,6 @@ 1279 1284 // * this is for making emacs happy: -*-Mode: C++;-*- 1280 1285 /**************************************************************************** 1281 1286 - * Copyright (c) 2007 Free Software Foundation, Inc. * 1282 + * Copyright (c) 2007 ,2008 Free Software Foundation, Inc.*1287 + * Copyright (c) 2007-2008,2009 Free Software Foundation, Inc. * 1283 1288 * * 1284 1289 * Permission is hereby granted, free of charge, to any person obtaining a * … … 1289 1294 1290 1295 -MODULE_ID("$Id: cursesw.cc,v 1.49 2007/12/15 23:01:57 tom Exp $") 1291 +MODULE_ID("$Id: cursesw.cc,v 1.5 0 2008/11/23 00:17:31 juergenExp $")1296 +MODULE_ID("$Id: cursesw.cc,v 1.51 2009/03/28 21:31:37 tom Exp $") 1292 1297 1293 1298 #define COLORS_NEED_INITIALIZATION -1 … … 1301 1306 1302 1307 int _nc_xx_ripoff_init(WINDOW *w, int ncols) 1303 @@ -464,7 +463,7 @@ 1308 @@ -296,8 +295,7 @@ 1309 1310 RIPOFFINIT init = *prip++; 1311 if (init) { 1312 - NCursesWindow* W = new NCursesWindow(w,ncols); 1313 - res = init(*W); 1314 + res = init(*(new NCursesWindow(w,ncols))); 1315 } 1316 return res; 1317 } 1318 @@ -464,7 +462,7 @@ 1304 1319 #if HAVE_HAS_KEY 1305 1320 bool NCursesWindow::has_mouse() const … … 1310 1325 } 1311 1326 #endif 1327 diff -Naur ncurses-5.7.orig/c++/demo.cc ncurses-5.7/c++/demo.cc 1328 --- ncurses-5.7.orig/c++/demo.cc 2008-08-04 10:16:57.000000000 -0700 1329 +++ ncurses-5.7/c++/demo.cc 2009-06-05 14:01:49.000000000 -0700 1330 @@ -35,7 +35,7 @@ 1331 * Demo code for NCursesMenu and NCursesForm written by 1332 * Juergen Pfeifer 1333 * 1334 - * $Id: demo.cc,v 1.38 2008/08/04 17:16:57 tom Exp $ 1335 + * $Id: demo.cc,v 1.39 2008/12/07 02:07:34 juergen Exp $ 1336 */ 1337 1338 #include "internal.h" 1339 @@ -43,7 +43,13 @@ 1340 #include "cursesm.h" 1341 #include "cursesf.h" 1342 1343 +#ifdef __MINGW32__ 1344 +#undef KEY_EVENT 1345 +#endif 1346 + 1347 +#ifndef __MINGW32__ 1348 extern "C" unsigned int sleep(unsigned int); 1349 +#endif 1350 1351 #undef index // needed for NeXT 1352 1353 diff -Naur ncurses-5.7.orig/c++/internal.h ncurses-5.7/c++/internal.h 1354 --- ncurses-5.7.orig/c++/internal.h 2008-10-25 14:35:44.000000000 -0700 1355 +++ ncurses-5.7/c++/internal.h 2009-06-05 14:01:49.000000000 -0700 1356 @@ -31,7 +31,7 @@ 1357 * Author: Juergen Pfeifer, 1997 * 1358 ****************************************************************************/ 1359 1360 -// $Id: internal.h,v 1.16 2008/10/25 21:35:44 tom Exp $ 1361 +// $Id: internal.h,v 1.17 2008/12/07 02:07:34 juergen Exp $ 1362 1363 #ifndef NCURSES_CPLUS_INTERNAL_H 1364 #define NCURSES_CPLUS_INTERNAL_H 1 1365 @@ -44,6 +44,11 @@ 1366 #define MODULE_ID(id) /*nothing*/ 1367 #endif 1368 1369 +#ifdef __MINGW32__ 1370 +#include <nc_mingw.h> 1371 +#undef KEY_EVENT 1372 +#endif 1373 + 1374 #ifndef _QNX_SOURCE 1375 #include <stdlib.h> 1376 #include <string.h> 1312 1377 diff -Naur ncurses-5.7.orig/c++/Makefile.in ncurses-5.7/c++/Makefile.in 1313 1378 --- ncurses-5.7.orig/c++/Makefile.in 2007-04-28 08:29:12.000000000 -0700 1314 +++ ncurses-5.7/c++/Makefile.in 2009-0 3-22 21:17:11.616376588-07001379 +++ ncurses-5.7/c++/Makefile.in 2009-06-05 14:01:30.000000000 -0700 1315 1380 @@ -1,6 +1,6 @@ 1316 1381 -# $Id: Makefile.in,v 1.84 2007/04/28 15:29:12 tom Exp $ 1317 +# $Id: Makefile.in,v 1.8 6 2009/03/21 20:02:11Charles.Wilson Exp $1382 +# $Id: Makefile.in,v 1.87 2009/03/28 18:22:39 Charles.Wilson Exp $ 1318 1383 ############################################################################## 1319 1384 -# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. # … … 1322 1387 # Permission is hereby granted, free of charge, to any person obtaining a # 1323 1388 # copy of this software and associated documentation files (the "Software"), # 1324 @@ -61,10 +61,10 @@ 1389 @@ -55,16 +55,17 @@ 1390 LIBTOOL_LINK = @LIB_LINK@ 1391 LIBTOOL_INSTALL = @LIB_INSTALL@ 1392 LIBTOOL_UNINSTALL = @LIB_UNINSTALL@ 1393 +LT_UNDEF = @LT_UNDEF@ 1394 1395 INSTALL = @INSTALL@ 1396 INSTALL_LIB = @INSTALL@ @INSTALL_LIB@ 1325 1397 INSTALL_DATA = @INSTALL_DATA@ 1326 1398 … … 1335 1407 1336 1408 CXX = @CXX@ 1337 @@ -95,7 +9 5,7 @@1409 @@ -95,7 +96,7 @@ 1338 1410 1339 1411 LINK = @LINK_PROGS@ $(LIBTOOL_LINK) @CXXLDFLAGS@ … … 1344 1416 LIBROOT = ncurses++ 1345 1417 1346 @@ -153, 7 +153,7@@1418 @@ -153,14 +154,14 @@ 1347 1419 $(MODEL)/cursesmain$o 1348 1420 … … 1353 1425 1354 1426 ../lib/$(LIBNAME_LIBTOOL) : $(LIB_OBJS) 1427 cd ../lib && $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) \ 1428 -o $(LIBNAME) $(LIB_OBJS:$o=.lo) \ 1429 -rpath $(INSTALL_PREFIX)$(libdir) \ 1430 - -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST) 1431 + -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST) 1432 1433 OBJS_DEMO = $(MODEL)/demo$o 1434 1355 1435 diff -Naur ncurses-5.7.orig/config.guess ncurses-5.7/config.guess 1356 1436 --- ncurses-5.7.orig/config.guess 2008-08-30 13:25:07.000000000 -0700 1357 +++ ncurses-5.7/config.guess 2009-0 3-22 21:16:55.651353540 -07001437 +++ ncurses-5.7/config.guess 2009-06-05 14:01:03.000000000 -0700 1358 1438 @@ -4,7 +4,7 @@ 1359 1439 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 … … 1425 1505 diff -Naur ncurses-5.7.orig/config.sub ncurses-5.7/config.sub 1426 1506 --- ncurses-5.7.orig/config.sub 2008-08-30 13:25:02.000000000 -0700 1427 +++ ncurses-5.7/config.sub 2009-0 3-22 21:16:55.651353540 -07001507 +++ ncurses-5.7/config.sub 2009-06-05 14:01:03.000000000 -0700 1428 1508 @@ -4,7 +4,7 @@ 1429 1509 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 … … 1509 1589 diff -Naur ncurses-5.7.orig/configure ncurses-5.7/configure 1510 1590 --- ncurses-5.7.orig/configure 2008-10-25 17:04:38.000000000 -0700 1511 +++ ncurses-5.7/configure 2009-0 3-22 21:17:11.632377985-07001591 +++ ncurses-5.7/configure 2009-06-05 14:01:31.000000000 -0700 1512 1592 @@ -1,7 +1,7 @@ 1513 1593 #! /bin/sh 1514 1594 -# From configure.in Revision: 1.454 . 1515 +# From configure.in Revision: 1.4 69.1595 +# From configure.in Revision: 1.470 . 1516 1596 # Guess values for system-dependent variables and create Makefiles. 1517 1597 -# Generated by Autoconf 2.52.20080325. … … 3820 3900 +echo "${ECHO_T}no" >&6 3821 3901 +fi 3822 + 3902 3903 -if test -z "$AR_OPTS" ; then 3904 - AR_OPTS=rv 3823 3905 +fi 3824 3906 +if test -z "$ac_cv_prog_AR"; then … … 3845 3927 +done 3846 3928 3847 -if test -z "$AR_OPTS" ; then3848 - AR_OPTS=rv3849 3929 + test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="ar" 3850 3930 +fi 3851 +fi3931 fi 3852 3932 +ac_ct_AR=$ac_cv_prog_ac_ct_AR 3853 3933 +if test -n "$ac_ct_AR"; then … … 3858 3938 +echo "${ECHO_T}no" >&6 3859 3939 +fi 3860 3940 + 3861 3941 + AR=$ac_ct_AR 3862 3942 +else 3863 3943 + AR="$ac_cv_prog_AR" 3864 fi 3865 3866 -cf_cv_subst_AR_OPTS=$AR_OPTS 3867 -echo "$as_me:3840: result: $AR_OPTS" >&5 3868 -echo "${ECHO_T}$AR_OPTS" >&6 3944 +fi 3945 + 3869 3946 +echo "$as_me:4048: checking for options to update archives" >&5 3870 3947 +echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 … … 3878 3955 + rm -f conftest.$ac_cv_objext 3879 3956 + rm -f conftest.a 3880 + 3957 3958 -cf_cv_subst_AR_OPTS=$AR_OPTS 3959 -echo "$as_me:3840: result: $AR_OPTS" >&5 3960 -echo "${ECHO_T}$AR_OPTS" >&6 3881 3961 + cat >conftest.$ac_ext <<EOF 3882 3962 +#line 4061 "configure" … … 4093 4173 fi 4094 4174 done 4095 @@ -4106, 19 +4351,19@@4175 @@ -4106,20 +4351,20 @@ 4096 4176 LIBTOOL=$ac_cv_path_LIBTOOL 4097 4177 … … 4115 4195 { (exit 1); exit 1; }; } 4116 4196 - fi 4197 - LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o' 4117 4198 + fi 4118 LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'4199 + LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} -o' 4119 4200 LIB_OBJECT='${OBJECTS:.o=.lo}' 4120 4201 LIB_SUFFIX=.la 4121 @@ -4130,24 +4375,31 @@ 4202 LIB_CLEAN='${LIBTOOL} --mode=clean' 4203 @@ -4130,24 +4375,32 @@ 4122 4204 LIB_PREP=: 4123 4205 … … 4143 4225 4144 4226 + # special hack to add -no-undefined (which libtool should do for itself) 4227 + LT_UNDEF= 4145 4228 + case "$cf_cv_system_name" in #(vi 4146 4229 + cygwin*|mingw32*|uwin*|aix[456]) #(vi 4147 + L IBTOOL="$LIBTOOL -no-undefined"4230 + LT_UNDEF=-no-undefined 4148 4231 + ;; 4149 4232 + esac … … 4153 4236 - 1.[5-9]*|[2-9]*) 4154 4237 + case $cf_cv_libtool_version in #(vi 4155 + 1.[5-9]*|[2-9] *) #(vi4238 + 1.[5-9]*|[2-9].[0-9.a-z]*) #(vi 4156 4239 LIBTOOL_CXX="$LIBTOOL --tag=CXX" 4157 4240 LIBTOOL="$LIBTOOL --tag=CC" 4158 4241 ;; 4159 @@ -4168,7 +442 0,7 @@4242 @@ -4168,7 +4421,7 @@ 4160 4243 4161 4244 else 4162 4245 4163 4246 -echo "$as_me:4171: checking if you want to build shared libraries" >&5 4164 +echo "$as_me:442 3: checking if you want to build shared libraries" >&54247 +echo "$as_me:4424: checking if you want to build shared libraries" >&5 4165 4248 echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6 4166 4249 4167 4250 # Check whether --with-shared or --without-shared was given. 4168 @@ -4178,11 +443 0,11 @@4251 @@ -4178,11 +4431,11 @@ 4169 4252 else 4170 4253 with_shared=no 4171 4254 fi; 4172 4255 -echo "$as_me:4181: result: $with_shared" >&5 4173 +echo "$as_me:443 3: result: $with_shared" >&54256 +echo "$as_me:4434: result: $with_shared" >&5 4174 4257 echo "${ECHO_T}$with_shared" >&6 4175 4258 test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared" 4176 4259 4177 4260 -echo "$as_me:4185: checking if you want to build static libraries" >&5 4178 +echo "$as_me:443 7: checking if you want to build static libraries" >&54261 +echo "$as_me:4438: checking if you want to build static libraries" >&5 4179 4262 echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6 4180 4263 4181 4264 # Check whether --with-normal or --without-normal was given. 4182 @@ -4192,11 +444 4,11 @@4265 @@ -4192,11 +4445,11 @@ 4183 4266 else 4184 4267 with_normal=yes 4185 4268 fi; 4186 4269 -echo "$as_me:4195: result: $with_normal" >&5 4187 +echo "$as_me:444 7: result: $with_normal" >&54270 +echo "$as_me:4448: result: $with_normal" >&5 4188 4271 echo "${ECHO_T}$with_normal" >&6 4189 4272 test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal" 4190 4273 4191 4274 -echo "$as_me:4199: checking if you want to build debug libraries" >&5 4192 +echo "$as_me:445 1: checking if you want to build debug libraries" >&54275 +echo "$as_me:4452: checking if you want to build debug libraries" >&5 4193 4276 echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6 4194 4277 4195 4278 # Check whether --with-debug or --without-debug was given. 4196 @@ -4206,11 +445 8,11 @@4279 @@ -4206,11 +4459,11 @@ 4197 4280 else 4198 4281 with_debug=yes 4199 4282 fi; 4200 4283 -echo "$as_me:4209: result: $with_debug" >&5 4201 +echo "$as_me:446 1: result: $with_debug" >&54284 +echo "$as_me:4462: result: $with_debug" >&5 4202 4285 echo "${ECHO_T}$with_debug" >&6 4203 4286 test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug" 4204 4287 4205 4288 -echo "$as_me:4213: checking if you want to build profiling libraries" >&5 4206 +echo "$as_me:446 5: checking if you want to build profiling libraries" >&54289 +echo "$as_me:4466: checking if you want to build profiling libraries" >&5 4207 4290 echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6 4208 4291 4209 4292 # Check whether --with-profile or --without-profile was given. 4210 @@ -4220,7 +447 2,7 @@4293 @@ -4220,7 +4473,7 @@ 4211 4294 else 4212 4295 with_profile=no 4213 4296 fi; 4214 4297 -echo "$as_me:4223: result: $with_profile" >&5 4215 +echo "$as_me:447 5: result: $with_profile" >&54298 +echo "$as_me:4476: result: $with_profile" >&5 4216 4299 echo "${ECHO_T}$with_profile" >&6 4217 4300 test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile" 4218 4301 4219 @@ -4228,19 +448 0,19 @@4302 @@ -4228,19 +4481,19 @@ 4220 4303 4221 4304 ############################################################################### 4222 4305 4223 4306 -echo "$as_me:4231: checking for specified models" >&5 4224 +echo "$as_me:448 3: checking for specified models" >&54307 +echo "$as_me:4484: checking for specified models" >&5 4225 4308 echo $ECHO_N "checking for specified models... $ECHO_C" >&6 4226 4309 test -z "$cf_list_models" && cf_list_models=normal 4227 4310 test "$with_libtool" != "no" && cf_list_models=libtool 4228 4311 -echo "$as_me:4235: result: $cf_list_models" >&5 4229 +echo "$as_me:448 7: result: $cf_list_models" >&54312 +echo "$as_me:4488: result: $cf_list_models" >&5 4230 4313 echo "${ECHO_T}$cf_list_models" >&6 4231 4314 … … 4233 4316 ### up test-applications. 4234 4317 -echo "$as_me:4240: checking for default model" >&5 4235 +echo "$as_me:449 2: checking for default model" >&54318 +echo "$as_me:4493: checking for default model" >&5 4236 4319 echo $ECHO_N "checking for default model... $ECHO_C" >&6 4237 4320 DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'` 4238 4321 -echo "$as_me:4243: result: $DFT_LWR_MODEL" >&5 4239 +echo "$as_me:449 5: result: $DFT_LWR_MODEL" >&54322 +echo "$as_me:4496: result: $DFT_LWR_MODEL" >&5 4240 4323 echo "${ECHO_T}$DFT_LWR_MODEL" >&6 4241 4324 4242 4325 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 4243 @@ -4269,7 +452 1,7 @@4326 @@ -4269,7 +4522,7 @@ 4244 4327 4245 4328 ############################################################################### 4246 4329 4247 4330 -echo "$as_me:4272: checking if you want to build a separate terminfo library" >&5 4248 +echo "$as_me:452 4: checking if you want to build a separate terminfo library" >&54331 +echo "$as_me:4525: checking if you want to build a separate terminfo library" >&5 4249 4332 echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6 4250 4333 4251 4334 # Check whether --with-termlib or --without-termlib was given. 4252 @@ -4279,10 +453 1,10 @@4335 @@ -4279,10 +4532,10 @@ 4253 4336 else 4254 4337 with_termlib=no 4255 4338 fi; 4256 4339 -echo "$as_me:4282: result: $with_termlib" >&5 4257 +echo "$as_me:453 4: result: $with_termlib" >&54340 +echo "$as_me:4535: result: $with_termlib" >&5 4258 4341 echo "${ECHO_T}$with_termlib" >&6 4259 4342 4260 4343 -echo "$as_me:4285: checking if you want to build a separate tic library" >&5 4261 +echo "$as_me:453 7: checking if you want to build a separate tic library" >&54344 +echo "$as_me:4538: checking if you want to build a separate tic library" >&5 4262 4345 echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6 4263 4346 4264 4347 # Check whether --with-ticlib or --without-ticlib was given. 4265 @@ -4292,13 +454 4,13 @@4348 @@ -4292,13 +4545,13 @@ 4266 4349 else 4267 4350 with_ticlib=no 4268 4351 fi; 4269 4352 -echo "$as_me:4295: result: $with_ticlib" >&5 4270 +echo "$as_me:454 7: result: $with_ticlib" >&54353 +echo "$as_me:4548: result: $with_ticlib" >&5 4271 4354 echo "${ECHO_T}$with_ticlib" >&6 4272 4355 … … 4275 4358 4276 4359 -echo "$as_me:4301: checking if you want to link with the GPM mouse library" >&5 4277 +echo "$as_me:455 3: checking if you want to link with the GPM mouse library" >&54360 +echo "$as_me:4554: checking if you want to link with the GPM mouse library" >&5 4278 4361 echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6 4279 4362 4280 4363 # Check whether --with-gpm or --without-gpm was given. 4281 @@ -4308,27 +456 0,27 @@4364 @@ -4308,27 +4561,27 @@ 4282 4365 else 4283 4366 with_gpm=maybe 4284 4367 fi; 4285 4368 -echo "$as_me:4311: result: $with_gpm" >&5 4286 +echo "$as_me:456 3: result: $with_gpm" >&54369 +echo "$as_me:4564: result: $with_gpm" >&5 4287 4370 echo "${ECHO_T}$with_gpm" >&6 4288 4371 4289 4372 if test "$with_gpm" != no ; then 4290 4373 - echo "$as_me:4315: checking for gpm.h" >&5 4291 + echo "$as_me:456 7: checking for gpm.h" >&54374 + echo "$as_me:4568: checking for gpm.h" >&5 4292 4375 echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6 4293 4376 if test "${ac_cv_header_gpm_h+set}" = set; then … … 4296 4379 cat >conftest.$ac_ext <<_ACEOF 4297 4380 -#line 4321 "configure" 4298 +#line 457 3"configure"4381 +#line 4574 "configure" 4299 4382 #include "confdefs.h" 4300 4383 #include <gpm.h> 4301 4384 _ACEOF 4302 4385 -if { (eval echo "$as_me:4325: \"$ac_cpp conftest.$ac_ext\"") >&5 4303 +if { (eval echo "$as_me:457 7: \"$ac_cpp conftest.$ac_ext\"") >&54386 +if { (eval echo "$as_me:4578: \"$ac_cpp conftest.$ac_ext\"") >&5 4304 4387 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 4305 4388 ac_status=$? … … 4308 4391 cat conftest.err >&5 4309 4392 - echo "$as_me:4331: \$? = $ac_status" >&5 4310 + echo "$as_me:458 3: \$? = $ac_status" >&54393 + echo "$as_me:4584: \$? = $ac_status" >&5 4311 4394 (exit $ac_status); } >/dev/null; then 4312 4395 if test -s conftest.err; then 4313 4396 ac_cpp_err=$ac_c_preproc_warn_flag 4314 @@ -4347,7 +4 599,7 @@4397 @@ -4347,7 +4600,7 @@ 4315 4398 fi 4316 4399 rm -f conftest.err conftest.$ac_ext 4317 4400 fi 4318 4401 -echo "$as_me:4350: result: $ac_cv_header_gpm_h" >&5 4319 +echo "$as_me:460 2: result: $ac_cv_header_gpm_h" >&54402 +echo "$as_me:4603: result: $ac_cv_header_gpm_h" >&5 4320 4403 echo "${ECHO_T}$ac_cv_header_gpm_h" >&6 4321 4404 if test $ac_cv_header_gpm_h = yes; then 4322 4405 4323 @@ -4358,14 +461 0,14 @@4406 @@ -4358,14 +4611,14 @@ 4324 4407 if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then 4325 4408 test -n "$verbose" && echo " assuming we really have GPM library" 1>&6 4326 4409 4327 4410 -echo "${as_me-configure}:4361: testing assuming we really have GPM library ..." 1>&5 4328 +echo "${as_me-configure}:461 3: testing assuming we really have GPM library ..." 1>&54411 +echo "${as_me-configure}:4614: testing assuming we really have GPM library ..." 1>&5 4329 4412 4330 4413 cat >>confdefs.h <<\EOF … … 4334 4417 else 4335 4418 - echo "$as_me:4368: checking for Gpm_Open in -lgpm" >&5 4336 + echo "$as_me:462 0: checking for Gpm_Open in -lgpm" >&54419 + echo "$as_me:4621: checking for Gpm_Open in -lgpm" >&5 4337 4420 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 4338 4421 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then 4339 4422 echo $ECHO_N "(cached) $ECHO_C" >&6 4340 @@ -4373,7 +462 5,7 @@4423 @@ -4373,7 +4626,7 @@ 4341 4424 ac_check_lib_save_LIBS=$LIBS 4342 4425 LIBS="-lgpm $LIBS" 4343 4426 cat >conftest.$ac_ext <<_ACEOF 4344 4427 -#line 4376 "configure" 4345 +#line 462 8"configure"4428 +#line 4629 "configure" 4346 4429 #include "confdefs.h" 4347 4430 4348 4431 /* Override any gcc2 internal prototype to avoid an error. */ 4349 @@ -4392,16 +464 4,16 @@4432 @@ -4392,16 +4645,16 @@ 4350 4433 } 4351 4434 _ACEOF 4352 4435 rm -f conftest.$ac_objext conftest$ac_exeext 4353 4436 -if { (eval echo "$as_me:4395: \"$ac_link\"") >&5 4354 +if { (eval echo "$as_me:464 7: \"$ac_link\"") >&54437 +if { (eval echo "$as_me:4648: \"$ac_link\"") >&5 4355 4438 (eval $ac_link) 2>&5 4356 4439 ac_status=$? 4357 4440 - echo "$as_me:4398: \$? = $ac_status" >&5 4358 + echo "$as_me:465 0: \$? = $ac_status" >&54441 + echo "$as_me:4651: \$? = $ac_status" >&5 4359 4442 (exit $ac_status); } && 4360 4443 { ac_try='test -s conftest$ac_exeext' 4361 4444 - { (eval echo "$as_me:4401: \"$ac_try\"") >&5 4362 + { (eval echo "$as_me:465 3: \"$ac_try\"") >&54445 + { (eval echo "$as_me:4654: \"$ac_try\"") >&5 4363 4446 (eval $ac_try) 2>&5 4364 4447 ac_status=$? 4365 4448 - echo "$as_me:4404: \$? = $ac_status" >&5 4366 + echo "$as_me:465 6: \$? = $ac_status" >&54449 + echo "$as_me:4657: \$? = $ac_status" >&5 4367 4450 (exit $ac_status); }; }; then 4368 4451 ac_cv_lib_gpm_Gpm_Open=yes 4369 4452 else 4370 @@ -4412,13 +466 4,13 @@4453 @@ -4412,13 +4665,13 @@ 4371 4454 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4372 4455 LIBS=$ac_check_lib_save_LIBS 4373 4456 fi 4374 4457 -echo "$as_me:4415: result: $ac_cv_lib_gpm_Gpm_Open" >&5 4375 +echo "$as_me:466 7: result: $ac_cv_lib_gpm_Gpm_Open" >&54458 +echo "$as_me:4668: result: $ac_cv_lib_gpm_Gpm_Open" >&5 4376 4459 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 4377 4460 if test $ac_cv_lib_gpm_Gpm_Open = yes; then … … 4380 4463 4381 4464 - { { echo "$as_me:4421: error: Cannot link with GPM library" >&5 4382 + { { echo "$as_me:467 3: error: Cannot link with GPM library" >&54465 + { { echo "$as_me:4674: error: Cannot link with GPM library" >&5 4383 4466 echo "$as_me: error: Cannot link with GPM library" >&2;} 4384 4467 { (exit 1); exit 1; }; } 4385 4468 fi 4386 @@ -4428,7 +468 0,7 @@4469 @@ -4428,7 +4681,7 @@ 4387 4470 4388 4471 else 4389 4472 4390 4473 - test "$with_gpm" != maybe && { echo "$as_me:4431: WARNING: Cannot find GPM header" >&5 4391 + test "$with_gpm" != maybe && { echo "$as_me:468 3: WARNING: Cannot find GPM header" >&54474 + test "$with_gpm" != maybe && { echo "$as_me:4684: WARNING: Cannot find GPM header" >&5 4392 4475 echo "$as_me: WARNING: Cannot find GPM header" >&2;} 4393 4476 with_gpm=no 4394 4477 4395 @@ -4437,7 +46 89,7 @@4478 @@ -4437,7 +4690,7 @@ 4396 4479 fi 4397 4480 4398 4481 if test "$with_gpm" != no ; then 4399 4482 - echo "$as_me:4440: checking if you want to load GPM dynamically" >&5 4400 + echo "$as_me:469 2: checking if you want to load GPM dynamically" >&54483 + echo "$as_me:4693: checking if you want to load GPM dynamically" >&5 4401 4484 echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6 4402 4485 4403 4486 # Check whether --with-dlsym or --without-dlsym was given. 4404 @@ -4447,18 +4 699,18 @@4487 @@ -4447,18 +4700,18 @@ 4405 4488 else 4406 4489 with_dlsym=yes 4407 4490 fi; 4408 4491 - echo "$as_me:4450: result: $with_dlsym" >&5 4409 + echo "$as_me:470 2: result: $with_dlsym" >&54492 + echo "$as_me:4703: result: $with_dlsym" >&5 4410 4493 echo "${ECHO_T}$with_dlsym" >&6 4411 4494 if test "$with_dlsym" = yes ; then … … 4413 4496 cf_have_dlsym=no 4414 4497 -echo "$as_me:4455: checking for dlsym" >&5 4415 +echo "$as_me:470 7: checking for dlsym" >&54498 +echo "$as_me:4708: checking for dlsym" >&5 4416 4499 echo $ECHO_N "checking for dlsym... $ECHO_C" >&6 4417 4500 if test "${ac_cv_func_dlsym+set}" = set; then … … 4420 4503 cat >conftest.$ac_ext <<_ACEOF 4421 4504 -#line 4461 "configure" 4422 +#line 471 3"configure"4505 +#line 4714 "configure" 4423 4506 #include "confdefs.h" 4424 4507 /* System header to define __stub macros and hopefully few prototypes, 4425 4508 which can conflict with char dlsym (); below. */ 4426 @@ -4489,16 +474 1,16 @@4509 @@ -4489,16 +4742,16 @@ 4427 4510 } 4428 4511 _ACEOF 4429 4512 rm -f conftest.$ac_objext conftest$ac_exeext 4430 4513 -if { (eval echo "$as_me:4492: \"$ac_link\"") >&5 4431 +if { (eval echo "$as_me:474 4: \"$ac_link\"") >&54514 +if { (eval echo "$as_me:4745: \"$ac_link\"") >&5 4432 4515 (eval $ac_link) 2>&5 4433 4516 ac_status=$? 4434 4517 - echo "$as_me:4495: \$? = $ac_status" >&5 4435 + echo "$as_me:474 7: \$? = $ac_status" >&54518 + echo "$as_me:4748: \$? = $ac_status" >&5 4436 4519 (exit $ac_status); } && 4437 4520 { ac_try='test -s conftest$ac_exeext' 4438 4521 - { (eval echo "$as_me:4498: \"$ac_try\"") >&5 4439 + { (eval echo "$as_me:475 0: \"$ac_try\"") >&54522 + { (eval echo "$as_me:4751: \"$ac_try\"") >&5 4440 4523 (eval $ac_try) 2>&5 4441 4524 ac_status=$? 4442 4525 - echo "$as_me:4501: \$? = $ac_status" >&5 4443 + echo "$as_me:475 3: \$? = $ac_status" >&54526 + echo "$as_me:4754: \$? = $ac_status" >&5 4444 4527 (exit $ac_status); }; }; then 4445 4528 ac_cv_func_dlsym=yes 4446 4529 else 4447 @@ -4508,14 +476 0,14 @@4530 @@ -4508,14 +4761,14 @@ 4448 4531 fi 4449 4532 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4450 4533 fi 4451 4534 -echo "$as_me:4511: result: $ac_cv_func_dlsym" >&5 4452 +echo "$as_me:476 3: result: $ac_cv_func_dlsym" >&54535 +echo "$as_me:4764: result: $ac_cv_func_dlsym" >&5 4453 4536 echo "${ECHO_T}$ac_cv_func_dlsym" >&6 4454 4537 if test $ac_cv_func_dlsym = yes; then … … 4458 4541 cf_have_libdl=no 4459 4542 -echo "$as_me:4518: checking for dlsym in -ldl" >&5 4460 +echo "$as_me:477 0: checking for dlsym in -ldl" >&54543 +echo "$as_me:4771: checking for dlsym in -ldl" >&5 4461 4544 echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6 4462 4545 if test "${ac_cv_lib_dl_dlsym+set}" = set; then 4463 4546 echo $ECHO_N "(cached) $ECHO_C" >&6 4464 @@ -4523,7 +477 5,7 @@4547 @@ -4523,7 +4776,7 @@ 4465 4548 ac_check_lib_save_LIBS=$LIBS 4466 4549 LIBS="-ldl $LIBS" 4467 4550 cat >conftest.$ac_ext <<_ACEOF 4468 4551 -#line 4526 "configure" 4469 +#line 477 8"configure"4552 +#line 4779 "configure" 4470 4553 #include "confdefs.h" 4471 4554 4472 4555 /* Override any gcc2 internal prototype to avoid an error. */ 4473 @@ -4542,16 +479 4,16 @@4556 @@ -4542,16 +4795,16 @@ 4474 4557 } 4475 4558 _ACEOF 4476 4559 rm -f conftest.$ac_objext conftest$ac_exeext 4477 4560 -if { (eval echo "$as_me:4545: \"$ac_link\"") >&5 4478 +if { (eval echo "$as_me:479 7: \"$ac_link\"") >&54561 +if { (eval echo "$as_me:4798: \"$ac_link\"") >&5 4479 4562 (eval $ac_link) 2>&5 4480 4563 ac_status=$? 4481 4564 - echo "$as_me:4548: \$? = $ac_status" >&5 4482 + echo "$as_me:480 0: \$? = $ac_status" >&54565 + echo "$as_me:4801: \$? = $ac_status" >&5 4483 4566 (exit $ac_status); } && 4484 4567 { ac_try='test -s conftest$ac_exeext' 4485 4568 - { (eval echo "$as_me:4551: \"$ac_try\"") >&5 4486 + { (eval echo "$as_me:480 3: \"$ac_try\"") >&54569 + { (eval echo "$as_me:4804: \"$ac_try\"") >&5 4487 4570 (eval $ac_try) 2>&5 4488 4571 ac_status=$? 4489 4572 - echo "$as_me:4554: \$? = $ac_status" >&5 4490 + echo "$as_me:480 6: \$? = $ac_status" >&54573 + echo "$as_me:4807: \$? = $ac_status" >&5 4491 4574 (exit $ac_status); }; }; then 4492 4575 ac_cv_lib_dl_dlsym=yes 4493 4576 else 4494 @@ -4562,7 +481 4,7 @@4577 @@ -4562,7 +4815,7 @@ 4495 4578 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4496 4579 LIBS=$ac_check_lib_save_LIBS 4497 4580 fi 4498 4581 -echo "$as_me:4565: result: $ac_cv_lib_dl_dlsym" >&5 4499 +echo "$as_me:481 7: result: $ac_cv_lib_dl_dlsym" >&54582 +echo "$as_me:4818: result: $ac_cv_lib_dl_dlsym" >&5 4500 4583 echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6 4501 4584 if test $ac_cv_lib_dl_dlsym = yes; then 4502 4585 4503 @@ -4575,10 +482 7,10 @@4586 @@ -4575,10 +4828,10 @@ 4504 4587 if test "$cf_have_dlsym" = yes ; then 4505 4588 test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS" 4506 4589 4507 4590 - echo "$as_me:4578: checking whether able to link to dl*() functions" >&5 4508 + echo "$as_me:483 0: checking whether able to link to dl*() functions" >&54591 + echo "$as_me:4831: checking whether able to link to dl*() functions" >&5 4509 4592 echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6 4510 4593 cat >conftest.$ac_ext <<_ACEOF 4511 4594 -#line 4581 "configure" 4512 +#line 483 3"configure"4595 +#line 4834 "configure" 4513 4596 #include "confdefs.h" 4514 4597 #include <dlfcn.h> 4515 4598 int 4516 @@ -4596,16 +484 8,16 @@4599 @@ -4596,16 +4849,16 @@ 4517 4600 } 4518 4601 _ACEOF 4519 4602 rm -f conftest.$ac_objext conftest$ac_exeext 4520 4603 -if { (eval echo "$as_me:4599: \"$ac_link\"") >&5 4521 +if { (eval echo "$as_me:485 1: \"$ac_link\"") >&54604 +if { (eval echo "$as_me:4852: \"$ac_link\"") >&5 4522 4605 (eval $ac_link) 2>&5 4523 4606 ac_status=$? 4524 4607 - echo "$as_me:4602: \$? = $ac_status" >&5 4525 + echo "$as_me:485 4: \$? = $ac_status" >&54608 + echo "$as_me:4855: \$? = $ac_status" >&5 4526 4609 (exit $ac_status); } && 4527 4610 { ac_try='test -s conftest$ac_exeext' 4528 4611 - { (eval echo "$as_me:4605: \"$ac_try\"") >&5 4529 + { (eval echo "$as_me:485 7: \"$ac_try\"") >&54612 + { (eval echo "$as_me:4858: \"$ac_try\"") >&5 4530 4613 (eval $ac_try) 2>&5 4531 4614 ac_status=$? 4532 4615 - echo "$as_me:4608: \$? = $ac_status" >&5 4533 + echo "$as_me:486 0: \$? = $ac_status" >&54616 + echo "$as_me:4861: \$? = $ac_status" >&5 4534 4617 (exit $ac_status); }; }; then 4535 4618 4536 4619 cat >>confdefs.h <<\EOF 4537 @@ -4616,15 +486 8,15 @@4620 @@ -4616,15 +4869,15 @@ 4538 4621 echo "$as_me: failed program was:" >&5 4539 4622 cat conftest.$ac_ext >&5 4540 4623 4541 4624 - { { echo "$as_me:4619: error: Cannot link test program for libdl" >&5 4542 + { { echo "$as_me:487 1: error: Cannot link test program for libdl" >&54625 + { { echo "$as_me:4872: error: Cannot link test program for libdl" >&5 4543 4626 echo "$as_me: error: Cannot link test program for libdl" >&2;} 4544 4627 { (exit 1); exit 1; }; } … … 4546 4629 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4547 4630 - echo "$as_me:4624: result: ok" >&5 4548 + echo "$as_me:487 6: result: ok" >&54631 + echo "$as_me:4877: result: ok" >&5 4549 4632 echo "${ECHO_T}ok" >&6 4550 4633 else 4551 4634 - { { echo "$as_me:4627: error: Cannot find dlsym function" >&5 4552 + { { echo "$as_me:48 79: error: Cannot find dlsym function" >&54635 + { { echo "$as_me:4880: error: Cannot find dlsym function" >&5 4553 4636 echo "$as_me: error: Cannot find dlsym function" >&2;} 4554 4637 { (exit 1); exit 1; }; } 4555 4638 fi 4556 @@ -4632,12 +488 4,12 @@4639 @@ -4632,12 +4885,12 @@ 4557 4640 if test "$with_gpm" != yes ; then 4558 4641 test -n "$verbose" && echo " assuming soname for gpm is $with_gpm" 1>&6 4559 4642 4560 4643 -echo "${as_me-configure}:4635: testing assuming soname for gpm is $with_gpm ..." 1>&5 4561 +echo "${as_me-configure}:488 7: testing assuming soname for gpm is $with_gpm ..." 1>&54644 +echo "${as_me-configure}:4888: testing assuming soname for gpm is $with_gpm ..." 1>&5 4562 4645 4563 4646 cf_cv_gpm_soname="$with_gpm" … … 4565 4648 4566 4649 -echo "$as_me:4640: checking for soname of gpm library" >&5 4567 +echo "$as_me:489 2: checking for soname of gpm library" >&54650 +echo "$as_me:4893: checking for soname of gpm library" >&5 4568 4651 echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6 4569 4652 if test "${cf_cv_gpm_soname+set}" = set; then 4570 4653 echo $ECHO_N "(cached) $ECHO_C" >&6 4571 @@ -4655,15 +490 7,15 @@4654 @@ -4655,15 +4908,15 @@ 4572 4655 CF_EOF 4573 4656 cf_save_LIBS="$LIBS" 4574 4657 LIBS="-lgpm $LIBS" 4575 4658 - if { (eval echo "$as_me:4658: \"$ac_compile\"") >&5 4576 + if { (eval echo "$as_me:491 0: \"$ac_compile\"") >&54659 + if { (eval echo "$as_me:4911: \"$ac_compile\"") >&5 4577 4660 (eval $ac_compile) 2>&5 4578 4661 ac_status=$? 4579 4662 - echo "$as_me:4661: \$? = $ac_status" >&5 4580 + echo "$as_me:491 3: \$? = $ac_status" >&54663 + echo "$as_me:4914: \$? = $ac_status" >&5 4581 4664 (exit $ac_status); } ; then 4582 4665 - if { (eval echo "$as_me:4663: \"$ac_link\"") >&5 4583 + if { (eval echo "$as_me:491 5: \"$ac_link\"") >&54666 + if { (eval echo "$as_me:4916: \"$ac_link\"") >&5 4584 4667 (eval $ac_link) 2>&5 4585 4668 ac_status=$? 4586 4669 - echo "$as_me:4666: \$? = $ac_status" >&5 4587 + echo "$as_me:491 8: \$? = $ac_status" >&54670 + echo "$as_me:4919: \$? = $ac_status" >&5 4588 4671 (exit $ac_status); } ; then 4589 4672 cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.` 4590 4673 test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown 4591 @@ -4674,7 +492 6,7 @@4674 @@ -4674,7 +4927,7 @@ 4592 4675 fi 4593 4676 4594 4677 fi 4595 4678 -echo "$as_me:4677: result: $cf_cv_gpm_soname" >&5 4596 +echo "$as_me:49 29: result: $cf_cv_gpm_soname" >&54679 +echo "$as_me:4930: result: $cf_cv_gpm_soname" >&5 4597 4680 echo "${ECHO_T}$cf_cv_gpm_soname" >&6 4598 4681 4599 4682 fi 4600 @@ -4690,7 +494 2,7 @@4683 @@ -4690,7 +4943,7 @@ 4601 4684 #define HAVE_LIBGPM 1 4602 4685 EOF 4603 4686 4604 4687 -echo "$as_me:4693: checking for Gpm_Wgetch in -lgpm" >&5 4605 +echo "$as_me:494 5: checking for Gpm_Wgetch in -lgpm" >&54688 +echo "$as_me:4946: checking for Gpm_Wgetch in -lgpm" >&5 4606 4689 echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6 4607 4690 if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then 4608 4691 echo $ECHO_N "(cached) $ECHO_C" >&6 4609 @@ -4698,7 +495 0,7 @@4692 @@ -4698,7 +4951,7 @@ 4610 4693 ac_check_lib_save_LIBS=$LIBS 4611 4694 LIBS="-lgpm $LIBS" 4612 4695 cat >conftest.$ac_ext <<_ACEOF 4613 4696 -#line 4701 "configure" 4614 +#line 495 3"configure"4697 +#line 4954 "configure" 4615 4698 #include "confdefs.h" 4616 4699 4617 4700 /* Override any gcc2 internal prototype to avoid an error. */ 4618 @@ -4717,16 +49 69,16 @@4701 @@ -4717,16 +4970,16 @@ 4619 4702 } 4620 4703 _ACEOF 4621 4704 rm -f conftest.$ac_objext conftest$ac_exeext 4622 4705 -if { (eval echo "$as_me:4720: \"$ac_link\"") >&5 4623 +if { (eval echo "$as_me:497 2: \"$ac_link\"") >&54706 +if { (eval echo "$as_me:4973: \"$ac_link\"") >&5 4624 4707 (eval $ac_link) 2>&5 4625 4708 ac_status=$? 4626 4709 - echo "$as_me:4723: \$? = $ac_status" >&5 4627 + echo "$as_me:497 5: \$? = $ac_status" >&54710 + echo "$as_me:4976: \$? = $ac_status" >&5 4628 4711 (exit $ac_status); } && 4629 4712 { ac_try='test -s conftest$ac_exeext' 4630 4713 - { (eval echo "$as_me:4726: \"$ac_try\"") >&5 4631 + { (eval echo "$as_me:497 8: \"$ac_try\"") >&54714 + { (eval echo "$as_me:4979: \"$ac_try\"") >&5 4632 4715 (eval $ac_try) 2>&5 4633 4716 ac_status=$? 4634 4717 - echo "$as_me:4729: \$? = $ac_status" >&5 4635 + echo "$as_me:498 1: \$? = $ac_status" >&54718 + echo "$as_me:4982: \$? = $ac_status" >&5 4636 4719 (exit $ac_status); }; }; then 4637 4720 ac_cv_lib_gpm_Gpm_Wgetch=yes 4638 4721 else 4639 @@ -4737,11 +49 89,11 @@4722 @@ -4737,11 +4990,11 @@ 4640 4723 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4641 4724 LIBS=$ac_check_lib_save_LIBS 4642 4725 fi 4643 4726 -echo "$as_me:4740: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 4644 +echo "$as_me:499 2: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&54727 +echo "$as_me:4993: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 4645 4728 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6 4646 4729 if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then 4647 4730 4648 4731 -echo "$as_me:4744: checking if GPM is weakly bound to curses library" >&5 4649 +echo "$as_me:499 6: checking if GPM is weakly bound to curses library" >&54732 +echo "$as_me:4997: checking if GPM is weakly bound to curses library" >&5 4650 4733 echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6 4651 4734 if test "${cf_cv_check_gpm_wgetch+set}" = set; then 4652 4735 echo $ECHO_N "(cached) $ECHO_C" >&6 4653 @@ -4765,15 +501 7,15 @@4736 @@ -4765,15 +5018,15 @@ 4654 4737 # to rely on the static library, noting that some packagers may not 4655 4738 # include it. 4656 4739 LIBS="-static -lgpm -dynamic $LIBS" 4657 4740 - if { (eval echo "$as_me:4768: \"$ac_compile\"") >&5 4658 + if { (eval echo "$as_me:502 0: \"$ac_compile\"") >&54741 + if { (eval echo "$as_me:5021: \"$ac_compile\"") >&5 4659 4742 (eval $ac_compile) 2>&5 4660 4743 ac_status=$? 4661 4744 - echo "$as_me:4771: \$? = $ac_status" >&5 4662 + echo "$as_me:502 3: \$? = $ac_status" >&54745 + echo "$as_me:5024: \$? = $ac_status" >&5 4663 4746 (exit $ac_status); } ; then 4664 4747 - if { (eval echo "$as_me:4773: \"$ac_link\"") >&5 4665 + if { (eval echo "$as_me:502 5: \"$ac_link\"") >&54748 + if { (eval echo "$as_me:5026: \"$ac_link\"") >&5 4666 4749 (eval $ac_link) 2>&5 4667 4750 ac_status=$? 4668 4751 - echo "$as_me:4776: \$? = $ac_status" >&5 4669 + echo "$as_me:502 8: \$? = $ac_status" >&54752 + echo "$as_me:5029: \$? = $ac_status" >&5 4670 4753 (exit $ac_status); } ; then 4671 4754 cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'` 4672 4755 test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes 4673 @@ -4785,11 +503 7,11 @@4756 @@ -4785,11 +5038,11 @@ 4674 4757 fi 4675 4758 4676 4759 fi 4677 4760 -echo "$as_me:4788: result: $cf_cv_check_gpm_wgetch" >&5 4678 +echo "$as_me:504 0: result: $cf_cv_check_gpm_wgetch" >&54761 +echo "$as_me:5041: result: $cf_cv_check_gpm_wgetch" >&5 4679 4762 echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6 4680 4763 4681 4764 if test "$cf_cv_check_gpm_wgetch" != yes ; then 4682 4765 - { echo "$as_me:4792: WARNING: GPM library is already linked with curses - read the FAQ" >&5 4683 + { echo "$as_me:504 4: WARNING: GPM library is already linked with curses - read the FAQ" >&54766 + { echo "$as_me:5045: WARNING: GPM library is already linked with curses - read the FAQ" >&5 4684 4767 echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;} 4685 4768 fi 4686 4769 4687 @@ -4799,7 +505 1,7 @@4770 @@ -4799,7 +5052,7 @@ 4688 4771 4689 4772 # not everyone has "test -c" 4690 4773 if test -c /dev/sysmouse 2>/dev/null ; then 4691 4774 -echo "$as_me:4802: checking if you want to use sysmouse" >&5 4692 +echo "$as_me:505 4: checking if you want to use sysmouse" >&54775 +echo "$as_me:5055: checking if you want to use sysmouse" >&5 4693 4776 echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6 4694 4777 4695 4778 # Check whether --with-sysmouse or --without-sysmouse was given. 4696 @@ -4811,7 +506 3,7 @@4779 @@ -4811,7 +5064,7 @@ 4697 4780 fi; 4698 4781 if test "$cf_with_sysmouse" != no ; then 4699 4782 cat >conftest.$ac_ext <<_ACEOF 4700 4783 -#line 4814 "configure" 4701 +#line 506 6"configure"4784 +#line 5067 "configure" 4702 4785 #include "confdefs.h" 4703 4786 4704 4787 #include <osreldate.h> 4705 @@ -4834,16 +508 6,16 @@4788 @@ -4834,16 +5087,16 @@ 4706 4789 } 4707 4790 _ACEOF 4708 4791 rm -f conftest.$ac_objext 4709 4792 -if { (eval echo "$as_me:4837: \"$ac_compile\"") >&5 4710 +if { (eval echo "$as_me:50 89: \"$ac_compile\"") >&54793 +if { (eval echo "$as_me:5090: \"$ac_compile\"") >&5 4711 4794 (eval $ac_compile) 2>&5 4712 4795 ac_status=$? 4713 4796 - echo "$as_me:4840: \$? = $ac_status" >&5 4714 + echo "$as_me:509 2: \$? = $ac_status" >&54797 + echo "$as_me:5093: \$? = $ac_status" >&5 4715 4798 (exit $ac_status); } && 4716 4799 { ac_try='test -s conftest.$ac_objext' 4717 4800 - { (eval echo "$as_me:4843: \"$ac_try\"") >&5 4718 + { (eval echo "$as_me:509 5: \"$ac_try\"") >&54801 + { (eval echo "$as_me:5096: \"$ac_try\"") >&5 4719 4802 (eval $ac_try) 2>&5 4720 4803 ac_status=$? 4721 4804 - echo "$as_me:4846: \$? = $ac_status" >&5 4722 + echo "$as_me:509 8: \$? = $ac_status" >&54805 + echo "$as_me:5099: \$? = $ac_status" >&5 4723 4806 (exit $ac_status); }; }; then 4724 4807 cf_with_sysmouse=yes 4725 4808 else 4726 @@ -4853,7 +510 5,7 @@4809 @@ -4853,7 +5106,7 @@ 4727 4810 fi 4728 4811 rm -f conftest.$ac_objext conftest.$ac_ext 4729 4812 fi 4730 4813 -echo "$as_me:4856: result: $cf_with_sysmouse" >&5 4731 +echo "$as_me:510 8: result: $cf_with_sysmouse" >&54814 +echo "$as_me:5109: result: $cf_with_sysmouse" >&5 4732 4815 echo "${ECHO_T}$cf_with_sysmouse" >&6 4733 4816 test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF 4734 4817 #define USE_SYSMOUSE 1 4735 @@ -4871,7 +512 3,7 @@4818 @@ -4871,7 +5124,7 @@ 4736 4819 test -n "$GXX" && test "${ac_cv_prog_cxx_g}" != yes && CXX_G_OPT='' 4737 4820 fi 4738 4821 4739 4822 -echo "$as_me:4874: checking for default loader flags" >&5 4740 +echo "$as_me:512 6: checking for default loader flags" >&54823 +echo "$as_me:5127: checking for default loader flags" >&5 4741 4824 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 4742 4825 case $DFT_LWR_MODEL in 4743 4826 libtool) LD_MODEL='' ;; 4744 @@ -4880,13 +513 2,13 @@4827 @@ -4880,13 +5133,13 @@ 4745 4828 profile) LD_MODEL='-pg';; 4746 4829 shared) LD_MODEL='' ;; 4747 4830 esac 4748 4831 -echo "$as_me:4883: result: $LD_MODEL" >&5 4749 +echo "$as_me:513 5: result: $LD_MODEL" >&54832 +echo "$as_me:5136: result: $LD_MODEL" >&5 4750 4833 echo "${ECHO_T}$LD_MODEL" >&6 4751 4834 … … 4754 4837 4755 4838 -echo "$as_me:4889: checking if rpath option should be used" >&5 4756 +echo "$as_me:514 1: checking if rpath option should be used" >&54839 +echo "$as_me:5142: checking if rpath option should be used" >&5 4757 4840 echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6 4758 4841 4759 4842 # Check whether --enable-rpath or --disable-rpath was given. 4760 @@ -4896,10 +514 8,10 @@4843 @@ -4896,10 +5149,10 @@ 4761 4844 else 4762 4845 cf_cv_ld_rpath=no 4763 4846 fi; 4764 4847 -echo "$as_me:4899: result: $cf_cv_ld_rpath" >&5 4765 +echo "$as_me:515 1: result: $cf_cv_ld_rpath" >&54848 +echo "$as_me:5152: result: $cf_cv_ld_rpath" >&5 4766 4849 echo "${ECHO_T}$cf_cv_ld_rpath" >&6 4767 4850 4768 4851 -echo "$as_me:4902: checking if shared libraries should be relinked during install" >&5 4769 +echo "$as_me:515 4: checking if shared libraries should be relinked during install" >&54852 +echo "$as_me:5155: checking if shared libraries should be relinked during install" >&5 4770 4853 echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6 4771 4854 4772 4855 # Check whether --enable-relink or --disable-relink was given. 4773 @@ -4909,19 +516 1,20 @@4856 @@ -4909,19 +5162,20 @@ 4774 4857 else 4775 4858 cf_cv_do_relink=yes 4776 4859 fi; 4777 4860 -echo "$as_me:4912: result: $cf_cv_do_relink" >&5 4778 +echo "$as_me:516 4: result: $cf_cv_do_relink" >&54861 +echo "$as_me:5165: result: $cf_cv_do_relink" >&5 4779 4862 echo "${ECHO_T}$cf_cv_do_relink" >&6 4780 4863 ;; … … 4790 4873 4791 4874 - echo "$as_me:4924: checking if release/abi version should be used for shared libs" >&5 4792 + echo "$as_me:517 7: checking if release/abi version should be used for shared libs" >&54875 + echo "$as_me:5178: checking if release/abi version should be used for shared libs" >&5 4793 4876 echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 4794 4877 4795 4878 # Check whether --with-shlib-version or --without-shlib-version was given. 4796 @@ -4936,7 +51 89,7 @@4879 @@ -4936,7 +5190,7 @@ 4797 4880 cf_cv_shlib_version=$withval 4798 4881 ;; 4799 4882 *) 4800 4883 - { { echo "$as_me:4939: error: option value must be one of: rel, abi, auto or no" >&5 4801 + { { echo "$as_me:519 2: error: option value must be one of: rel, abi, auto or no" >&54884 + { { echo "$as_me:5193: error: option value must be one of: rel, abi, auto or no" >&5 4802 4885 echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;} 4803 4886 { (exit 1); exit 1; }; } 4804 4887 ;; 4805 @@ -4945,7 +519 8,7 @@4888 @@ -4945,7 +5199,7 @@ 4806 4889 else 4807 4890 cf_cv_shlib_version=auto 4808 4891 fi; 4809 4892 - echo "$as_me:4948: result: $cf_cv_shlib_version" >&5 4810 + echo "$as_me:520 1: result: $cf_cv_shlib_version" >&54893 + echo "$as_me:5202: result: $cf_cv_shlib_version" >&5 4811 4894 echo "${ECHO_T}$cf_cv_shlib_version" >&6 4812 4895 4813 4896 cf_cv_rm_so_locs=no 4814 @@ -4954,14 +520 7,14 @@4897 @@ -4954,14 +5208,14 @@ 4815 4898 CC_SHARED_OPTS= 4816 4899 if test "$GCC" = yes 4817 4900 then 4818 4901 - echo "$as_me:4957: checking which $CC option to use" >&5 4819 + echo "$as_me:521 0: checking which $CC option to use" >&54902 + echo "$as_me:5211: checking which $CC option to use" >&5 4820 4903 echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 4821 4904 cf_save_CFLAGS="$CFLAGS" … … 4825 4908 cat >conftest.$ac_ext <<_ACEOF 4826 4909 -#line 4964 "configure" 4827 +#line 521 7"configure"4910 +#line 5218 "configure" 4828 4911 #include "confdefs.h" 4829 4912 #include <stdio.h> 4830 4913 int 4831 @@ -4973,16 +522 6,16 @@4914 @@ -4973,16 +5227,16 @@ 4832 4915 } 4833 4916 _ACEOF 4834 4917 rm -f conftest.$ac_objext 4835 4918 -if { (eval echo "$as_me:4976: \"$ac_compile\"") >&5 4836 +if { (eval echo "$as_me:52 29: \"$ac_compile\"") >&54919 +if { (eval echo "$as_me:5230: \"$ac_compile\"") >&5 4837 4920 (eval $ac_compile) 2>&5 4838 4921 ac_status=$? 4839 4922 - echo "$as_me:4979: \$? = $ac_status" >&5 4840 + echo "$as_me:523 2: \$? = $ac_status" >&54923 + echo "$as_me:5233: \$? = $ac_status" >&5 4841 4924 (exit $ac_status); } && 4842 4925 { ac_try='test -s conftest.$ac_objext' 4843 4926 - { (eval echo "$as_me:4982: \"$ac_try\"") >&5 4844 + { (eval echo "$as_me:523 5: \"$ac_try\"") >&54927 + { (eval echo "$as_me:5236: \"$ac_try\"") >&5 4845 4928 (eval $ac_try) 2>&5 4846 4929 ac_status=$? 4847 4930 - echo "$as_me:4985: \$? = $ac_status" >&5 4848 + echo "$as_me:523 8: \$? = $ac_status" >&54931 + echo "$as_me:5239: \$? = $ac_status" >&5 4849 4932 (exit $ac_status); }; }; then 4850 4933 break 4851 4934 else 4852 @@ -4991,7 +524 4,7 @@4935 @@ -4991,7 +5245,7 @@ 4853 4936 fi 4854 4937 rm -f conftest.$ac_objext conftest.$ac_ext 4855 4938 done 4856 4939 - echo "$as_me:4994: result: $CC_SHARED_OPTS" >&5 4857 + echo "$as_me:524 7: result: $CC_SHARED_OPTS" >&54940 + echo "$as_me:5248: result: $CC_SHARED_OPTS" >&5 4858 4941 echo "${ECHO_T}$CC_SHARED_OPTS" >&6 4859 4942 CFLAGS="$cf_save_CFLAGS" 4860 4943 fi 4861 @@ -4999,6 +525 2,12 @@4944 @@ -4999,6 +5253,12 @@ 4862 4945 cf_cv_shlib_version_infix=no 4863 4946 … … 4872 4955 MK_SHARED_LIB='${CC} ${CFLAGS} -o $@ -Xlinker -soname=`basename $@` -nostart -e 0' 4873 4956 ;; 4874 @@ -5027,7 +528 6,7 @@4957 @@ -5027,7 +5287,7 @@ 4875 4958 MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' 4876 4959 test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi 4877 4960 cf_cv_shlib_version_infix=yes 4878 4961 - echo "$as_me:5030: checking if ld -search_paths_first works" >&5 4879 + echo "$as_me:52 89: checking if ld -search_paths_first works" >&54962 + echo "$as_me:5290: checking if ld -search_paths_first works" >&5 4880 4963 echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 4881 4964 if test "${cf_cv_ldflags_search_paths_first+set}" = set; then 4882 4965 echo $ECHO_N "(cached) $ECHO_C" >&6 4883 @@ -5036,7 +529 5,7 @@4966 @@ -5036,7 +5296,7 @@ 4884 4967 cf_save_LDFLAGS=$LDFLAGS 4885 4968 LDFLAGS="$LDFLAGS -Wl,-search_paths_first" 4886 4969 cat >conftest.$ac_ext <<_ACEOF 4887 4970 -#line 5039 "configure" 4888 +#line 529 8"configure"4971 +#line 5299 "configure" 4889 4972 #include "confdefs.h" 4890 4973 4891 4974 int 4892 @@ -5048,16 +530 7,16 @@4975 @@ -5048,16 +5308,16 @@ 4893 4976 } 4894 4977 _ACEOF 4895 4978 rm -f conftest.$ac_objext conftest$ac_exeext 4896 4979 -if { (eval echo "$as_me:5051: \"$ac_link\"") >&5 4897 +if { (eval echo "$as_me:531 0: \"$ac_link\"") >&54980 +if { (eval echo "$as_me:5311: \"$ac_link\"") >&5 4898 4981 (eval $ac_link) 2>&5 4899 4982 ac_status=$? 4900 4983 - echo "$as_me:5054: \$? = $ac_status" >&5 4901 + echo "$as_me:531 3: \$? = $ac_status" >&54984 + echo "$as_me:5314: \$? = $ac_status" >&5 4902 4985 (exit $ac_status); } && 4903 4986 { ac_try='test -s conftest$ac_exeext' 4904 4987 - { (eval echo "$as_me:5057: \"$ac_try\"") >&5 4905 + { (eval echo "$as_me:531 6: \"$ac_try\"") >&54988 + { (eval echo "$as_me:5317: \"$ac_try\"") >&5 4906 4989 (eval $ac_try) 2>&5 4907 4990 ac_status=$? 4908 4991 - echo "$as_me:5060: \$? = $ac_status" >&5 4909 + echo "$as_me:53 19: \$? = $ac_status" >&54992 + echo "$as_me:5320: \$? = $ac_status" >&5 4910 4993 (exit $ac_status); }; }; then 4911 4994 cf_cv_ldflags_search_paths_first=yes 4912 4995 else 4913 @@ -5068,7 +532 7,7 @@4996 @@ -5068,7 +5328,7 @@ 4914 4997 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4915 4998 LDFLAGS=$cf_save_LDFLAGS 4916 4999 fi 4917 5000 -echo "$as_me:5071: result: $cf_cv_ldflags_search_paths_first" >&5 4918 +echo "$as_me:533 0: result: $cf_cv_ldflags_search_paths_first" >&55001 +echo "$as_me:5331: result: $cf_cv_ldflags_search_paths_first" >&5 4919 5002 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 4920 5003 if test $cf_cv_ldflags_search_paths_first = yes; then 4921 5004 LDFLAGS="$LDFLAGS -Wl,-search_paths_first" 4922 @@ -5090,10 +53 49,10 @@5005 @@ -5090,10 +5350,10 @@ 4923 5006 irix*) 4924 5007 if test "$cf_cv_ld_rpath" = yes ; then … … 4933 5016 fi 4934 5017 fi 4935 @@ -5112,7 +537 1,7 @@5018 @@ -5112,7 +5372,7 @@ 4936 5019 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" 4937 5020 fi … … 4942 5025 fi 4943 5026 4944 @@ -5131,7 +539 0,7 @@5027 @@ -5131,7 +5391,7 @@ 4945 5028 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" 4946 5029 fi … … 4951 5034 fi 4952 5035 CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" 4953 @@ -5143,7 +540 2,7 @@5036 @@ -5143,7 +5403,7 @@ 4954 5037 cf_cv_shared_soname='`basename $@`' 4955 5038 fi … … 4960 5043 nto-qnx*|openbsd*|freebsd[12].*) 4961 5044 CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" 4962 @@ -5155,7 +541 4,7 @@5045 @@ -5155,7 +5415,7 @@ 4963 5046 if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then 4964 5047 LOCAL_LDFLAGS="-rpath \$(LOCAL_LIBDIR)" … … 4969 5052 fi 4970 5053 4971 @@ -5166,11 +542 5,11 @@5054 @@ -5166,11 +5426,11 @@ 4972 5055 cf_cv_shared_soname='`basename $@`' 4973 5056 fi … … 4983 5066 LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)" 4984 5067 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" 4985 @@ -5192,7 +545 1,7 @@5068 @@ -5192,7 +5452,7 @@ 4986 5069 4987 5070 MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@' … … 4992 5075 ;; 4993 5076 osf*|mls+*) 4994 @@ -5211,7 +547 0,7 @@5077 @@ -5211,7 +5471,7 @@ 4995 5078 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" 4996 5079 fi … … 5001 5084 fi 5002 5085 cf_cv_rm_so_locs=yes 5003 @@ -5246,7 +550 5,7 @@5086 @@ -5246,7 +5506,7 @@ 5004 5087 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" 5005 5088 fi … … 5010 5093 fi 5011 5094 5012 @@ -5258,7 +551 7,43 @@5095 @@ -5258,7 +5518,43 @@ 5013 5096 fi 5014 5097 … … 5020 5103 + CFLAGS="$cf_shared_opts $cf_save_CFLAGS" 5021 5104 + cat >conftest.$ac_ext <<_ACEOF 5022 +#line 552 5"configure"5105 +#line 5526 "configure" 5023 5106 +#include "confdefs.h" 5024 5107 +#include <stdio.h> … … 5032 5115 +_ACEOF 5033 5116 +rm -f conftest.$ac_objext 5034 +if { (eval echo "$as_me:553 7: \"$ac_compile\"") >&55117 +if { (eval echo "$as_me:5538: \"$ac_compile\"") >&5 5035 5118 + (eval $ac_compile) 2>&5 5036 5119 + ac_status=$? 5037 + echo "$as_me:554 0: \$? = $ac_status" >&55120 + echo "$as_me:5541: \$? = $ac_status" >&5 5038 5121 + (exit $ac_status); } && 5039 5122 + { ac_try='test -s conftest.$ac_objext' 5040 + { (eval echo "$as_me:554 3: \"$ac_try\"") >&55123 + { (eval echo "$as_me:5544: \"$ac_try\"") >&5 5041 5124 + (eval $ac_try) 2>&5 5042 5125 + ac_status=$? 5043 + echo "$as_me:554 6: \$? = $ac_status" >&55126 + echo "$as_me:5547: \$? = $ac_status" >&5 5044 5127 + (exit $ac_status); }; }; then 5045 5128 + break … … 5055 5138 else 5056 5139 MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $@' 5057 @@ -5285,20 +558 0,20 @@5140 @@ -5285,20 +5581,20 @@ 5058 5141 test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes 5059 5142 ;; 5060 5143 *) 5061 5144 - { echo "$as_me:5288: WARNING: ignored --with-shlib-version" >&5 5062 + { echo "$as_me:558 3: WARNING: ignored --with-shlib-version" >&55145 + { echo "$as_me:5584: WARNING: ignored --with-shlib-version" >&5 5063 5146 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} 5064 5147 ;; … … 5070 5153 - echo "$as_me:5296: checking if we need a space after rpath option" >&5 5071 5154 + if test -n "$LD_RPATH_OPT" ; then 5072 + echo "$as_me:559 1: checking if we need a space after rpath option" >&55155 + echo "$as_me:5592: checking if we need a space after rpath option" >&5 5073 5156 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 5074 5157 cf_save_LIBS="$LIBS" … … 5077 5160 cat >conftest.$ac_ext <<_ACEOF 5078 5161 -#line 5301 "configure" 5079 +#line 559 6"configure"5162 +#line 5597 "configure" 5080 5163 #include "confdefs.h" 5081 5164 5082 5165 int 5083 @@ -5310,16 +560 5,16 @@5166 @@ -5310,16 +5606,16 @@ 5084 5167 } 5085 5168 _ACEOF 5086 5169 rm -f conftest.$ac_objext conftest$ac_exeext 5087 5170 -if { (eval echo "$as_me:5313: \"$ac_link\"") >&5 5088 +if { (eval echo "$as_me:560 8: \"$ac_link\"") >&55171 +if { (eval echo "$as_me:5609: \"$ac_link\"") >&5 5089 5172 (eval $ac_link) 2>&5 5090 5173 ac_status=$? 5091 5174 - echo "$as_me:5316: \$? = $ac_status" >&5 5092 + echo "$as_me:561 1: \$? = $ac_status" >&55175 + echo "$as_me:5612: \$? = $ac_status" >&5 5093 5176 (exit $ac_status); } && 5094 5177 { ac_try='test -s conftest$ac_exeext' 5095 5178 - { (eval echo "$as_me:5319: \"$ac_try\"") >&5 5096 + { (eval echo "$as_me:561 4: \"$ac_try\"") >&55179 + { (eval echo "$as_me:5615: \"$ac_try\"") >&5 5097 5180 (eval $ac_try) 2>&5 5098 5181 ac_status=$? 5099 5182 - echo "$as_me:5322: \$? = $ac_status" >&5 5100 + echo "$as_me:561 7: \$? = $ac_status" >&55183 + echo "$as_me:5618: \$? = $ac_status" >&5 5101 5184 (exit $ac_status); }; }; then 5102 5185 cf_rpath_space=no 5103 5186 else 5104 @@ -5329,16 +562 4,16 @@5187 @@ -5329,16 +5625,16 @@ 5105 5188 fi 5106 5189 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 5107 5190 LIBS="$cf_save_LIBS" 5108 5191 - echo "$as_me:5332: result: $cf_rpath_space" >&5 5109 + echo "$as_me:562 7: result: $cf_rpath_space" >&55192 + echo "$as_me:5628: result: $cf_rpath_space" >&5 5110 5193 echo "${ECHO_T}$cf_rpath_space" >&6 5111 5194 - test "$cf_rpath_space" = yes && cf_ld_rpath_opt="$cf_ld_rpath_opt " … … 5119 5202 if test "$model" = "shared"; then 5120 5203 - { { echo "$as_me:5341: error: Shared libraries are not supported in this version" >&5 5121 + { { echo "$as_me:563 6: error: Shared libraries are not supported in this version" >&55204 + { { echo "$as_me:5637: error: Shared libraries are not supported in this version" >&5 5122 5205 echo "$as_me: error: Shared libraries are not supported in this version" >&2;} 5123 5206 { (exit 1); exit 1; }; } 5124 5207 fi 5125 @@ -5348,7 +564 3,7 @@5208 @@ -5348,7 +5644,7 @@ 5126 5209 ############################################################################### 5127 5210 5128 5211 ### use option --disable-overwrite to leave out the link to -lcurses 5129 5212 -echo "$as_me:5351: checking if you wish to install ncurses overwriting curses" >&5 5130 +echo "$as_me:564 6: checking if you wish to install ncurses overwriting curses" >&55213 +echo "$as_me:5647: checking if you wish to install ncurses overwriting curses" >&5 5131 5214 echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6 5132 5215 5133 5216 # Check whether --enable-overwrite or --disable-overwrite was given. 5134 @@ -5358,10 +565 3,10 @@5217 @@ -5358,10 +5654,10 @@ 5135 5218 else 5136 5219 if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi 5137 5220 fi; 5138 5221 -echo "$as_me:5361: result: $with_overwrite" >&5 5139 +echo "$as_me:565 6: result: $with_overwrite" >&55222 +echo "$as_me:5657: result: $with_overwrite" >&5 5140 5223 echo "${ECHO_T}$with_overwrite" >&6 5141 5224 5142 5225 -echo "$as_me:5364: checking if external terminfo-database is used" >&5 5143 +echo "$as_me:56 59: checking if external terminfo-database is used" >&55226 +echo "$as_me:5660: checking if external terminfo-database is used" >&5 5144 5227 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 5145 5228 5146 5229 # Check whether --enable-database or --disable-database was given. 5147 @@ -5371,7 +566 6,7 @@5230 @@ -5371,7 +5667,7 @@ 5148 5231 else 5149 5232 use_database=yes 5150 5233 fi; 5151 5234 -echo "$as_me:5374: result: $use_database" >&5 5152 +echo "$as_me:56 69: result: $use_database" >&55235 +echo "$as_me:5670: result: $use_database" >&5 5153 5236 echo "${ECHO_T}$use_database" >&6 5154 5237 5155 5238 case $host_os in #(vi 5156 @@ -5384,8 +56 79,8 @@5239 @@ -5384,8 +5680,8 @@ 5157 5240 esac 5158 5241 … … 5165 5248 5166 5249 if test "$use_database" != no ; then 5167 @@ -5393,7 +568 8,7 @@5250 @@ -5393,7 +5689,7 @@ 5168 5251 #define USE_DATABASE 1 5169 5252 EOF 5170 5253 5171 5254 - echo "$as_me:5396: checking which terminfo source-file will be installed" >&5 5172 + echo "$as_me:569 1: checking which terminfo source-file will be installed" >&55255 + echo "$as_me:5692: checking which terminfo source-file will be installed" >&5 5173 5256 echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6 5174 5257 5175 5258 # Check whether --enable-database or --disable-database was given. 5176 @@ -5401,10 +569 6,10 @@5259 @@ -5401,10 +5697,10 @@ 5177 5260 enableval="$enable_database" 5178 5261 TERMINFO_SRC=$withval 5179 5262 fi; 5180 5263 - echo "$as_me:5404: result: $TERMINFO_SRC" >&5 5181 + echo "$as_me:5 699: result: $TERMINFO_SRC" >&55264 + echo "$as_me:5700: result: $TERMINFO_SRC" >&5 5182 5265 echo "${ECHO_T}$TERMINFO_SRC" >&6 5183 5266 5184 5267 - echo "$as_me:5407: checking whether to use hashed database instead of directory/tree" >&5 5185 + echo "$as_me:570 2: checking whether to use hashed database instead of directory/tree" >&55268 + echo "$as_me:5703: checking whether to use hashed database instead of directory/tree" >&5 5186 5269 echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6 5187 5270 5188 5271 # Check whether --with-hashed-db or --without-hashed-db was given. 5189 @@ -5414,13 +57 09,13 @@5272 @@ -5414,13 +5710,13 @@ 5190 5273 else 5191 5274 with_hashed_db=no 5192 5275 fi; 5193 5276 - echo "$as_me:5417: result: $with_hashed_db" >&5 5194 + echo "$as_me:571 2: result: $with_hashed_db" >&55277 + echo "$as_me:5713: result: $with_hashed_db" >&5 5195 5278 echo "${ECHO_T}$with_hashed_db" >&6 5196 5279 else … … 5199 5282 5200 5283 -echo "$as_me:5423: checking for list of fallback descriptions" >&5 5201 +echo "$as_me:571 8: checking for list of fallback descriptions" >&55284 +echo "$as_me:5719: checking for list of fallback descriptions" >&5 5202 5285 echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6 5203 5286 5204 5287 # Check whether --with-fallbacks or --without-fallbacks was given. 5205 @@ -5430,11 +572 5,11 @@5288 @@ -5430,11 +5726,11 @@ 5206 5289 else 5207 5290 with_fallback= 5208 5291 fi; 5209 5292 -echo "$as_me:5433: result: $with_fallback" >&5 5210 +echo "$as_me:572 8: result: $with_fallback" >&55293 +echo "$as_me:5729: result: $with_fallback" >&5 5211 5294 echo "${ECHO_T}$with_fallback" >&6 5212 5295 FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'` 5213 5296 5214 5297 -echo "$as_me:5437: checking if you want modern xterm or antique" >&5 5215 +echo "$as_me:573 2: checking if you want modern xterm or antique" >&55298 +echo "$as_me:5733: checking if you want modern xterm or antique" >&5 5216 5299 echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6 5217 5300 5218 5301 # Check whether --with-xterm-new or --without-xterm-new was given. 5219 @@ -5448,7 +574 3,7 @@5302 @@ -5448,7 +5744,7 @@ 5220 5303 no) with_xterm_new=xterm-old;; 5221 5304 *) with_xterm_new=xterm-new;; 5222 5305 esac 5223 5306 -echo "$as_me:5451: result: $with_xterm_new" >&5 5224 +echo "$as_me:574 6: result: $with_xterm_new" >&55307 +echo "$as_me:5747: result: $with_xterm_new" >&5 5225 5308 echo "${ECHO_T}$with_xterm_new" >&6 5226 5309 WHICH_XTERM=$with_xterm_new 5227 5310 5228 @@ -5458,7 +575 3,7 @@5311 @@ -5458,7 +5754,7 @@ 5229 5312 MAKE_TERMINFO="#" 5230 5313 else 5231 5314 5232 5315 -echo "$as_me:5461: checking for list of terminfo directories" >&5 5233 +echo "$as_me:575 6: checking for list of terminfo directories" >&55316 +echo "$as_me:5757: checking for list of terminfo directories" >&5 5234 5317 echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6 5235 5318 5236 5319 # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given. 5237 @@ -5468,7 +576 3,7 @@5320 @@ -5468,7 +5764,7 @@ 5238 5321 else 5239 5322 withval=${TERMINFO_DIRS-${datadir}/terminfo} … … 5244 5327 for cf_src_path in $withval 5245 5328 do 5246 @@ -5498,7 +579 3,7 @@5329 @@ -5498,7 +5794,7 @@ 5247 5330 cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` 5248 5331 ;; 5249 5332 *) 5250 5333 - { { echo "$as_me:5501: error: expected a pathname, not \"$cf_src_path\"" >&5 5251 + { { echo "$as_me:579 6: error: expected a pathname, not \"$cf_src_path\"" >&55334 + { { echo "$as_me:5797: error: expected a pathname, not \"$cf_src_path\"" >&5 5252 5335 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} 5253 5336 { (exit 1); exit 1; }; } 5254 5337 ;; 5255 @@ -5511,13 +580 6,13 @@5338 @@ -5511,13 +5807,13 @@ 5256 5339 5257 5340 eval 'TERMINFO_DIRS="$cf_dst_path"' 5258 5341 5259 5342 -echo "$as_me:5514: result: $TERMINFO_DIRS" >&5 5260 +echo "$as_me:58 09: result: $TERMINFO_DIRS" >&55343 +echo "$as_me:5810: result: $TERMINFO_DIRS" >&5 5261 5344 echo "${ECHO_T}$TERMINFO_DIRS" >&6 5262 5345 test -n "$TERMINFO_DIRS" && cat >>confdefs.h <<EOF … … 5265 5348 5266 5349 -echo "$as_me:5520: checking for default terminfo directory" >&5 5267 +echo "$as_me:581 5: checking for default terminfo directory" >&55350 +echo "$as_me:5816: checking for default terminfo directory" >&5 5268 5351 echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6 5269 5352 5270 5353 # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given. 5271 @@ -5553,7 +584 8,7 @@5354 @@ -5553,7 +5849,7 @@ 5272 5355 withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` 5273 5356 ;; 5274 5357 *) 5275 5358 - { { echo "$as_me:5556: error: expected a pathname, not \"$withval\"" >&5 5276 + { { echo "$as_me:585 1: error: expected a pathname, not \"$withval\"" >&55359 + { { echo "$as_me:5852: error: expected a pathname, not \"$withval\"" >&5 5277 5360 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} 5278 5361 { (exit 1); exit 1; }; } 5279 5362 ;; 5280 @@ -5562,7 +585 7,7 @@5363 @@ -5562,7 +5858,7 @@ 5281 5364 fi 5282 5365 TERMINFO="$withval" 5283 5366 5284 5367 -echo "$as_me:5565: result: $TERMINFO" >&5 5285 +echo "$as_me:586 0: result: $TERMINFO" >&55368 +echo "$as_me:5861: result: $TERMINFO" >&5 5286 5369 echo "${ECHO_T}$TERMINFO" >&6 5287 5370 cat >>confdefs.h <<EOF 5288 5371 #define TERMINFO "$TERMINFO" 5289 @@ -5572,7 +586 7,7 @@5372 @@ -5572,7 +5868,7 @@ 5290 5373 5291 5374 ### use option --disable-big-core to make tic run on small machines 5292 5375 ### We need 4Mb, check if we can allocate 50% more than that. 5293 5376 -echo "$as_me:5575: checking if big-core option selected" >&5 5294 +echo "$as_me:587 0: checking if big-core option selected" >&55377 +echo "$as_me:5871: checking if big-core option selected" >&5 5295 5378 echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6 5296 5379 5297 5380 # Check whether --enable-big-core or --disable-big-core was given. 5298 @@ -5584,7 +58 79,7 @@5381 @@ -5584,7 +5880,7 @@ 5299 5382 with_big_core=no 5300 5383 else 5301 5384 cat >conftest.$ac_ext <<_ACEOF 5302 5385 -#line 5587 "configure" 5303 +#line 588 2"configure"5386 +#line 5883 "configure" 5304 5387 #include "confdefs.h" 5305 5388 5306 5389 #include <stdlib.h> 5307 @@ -5598,15 +589 3,15 @@5390 @@ -5598,15 +5894,15 @@ 5308 5391 } 5309 5392 _ACEOF 5310 5393 rm -f conftest$ac_exeext 5311 5394 -if { (eval echo "$as_me:5601: \"$ac_link\"") >&5 5312 +if { (eval echo "$as_me:589 6: \"$ac_link\"") >&55395 +if { (eval echo "$as_me:5897: \"$ac_link\"") >&5 5313 5396 (eval $ac_link) 2>&5 5314 5397 ac_status=$? 5315 5398 - echo "$as_me:5604: \$? = $ac_status" >&5 5316 + echo "$as_me:5 899: \$? = $ac_status" >&55399 + echo "$as_me:5900: \$? = $ac_status" >&5 5317 5400 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 5318 5401 - { (eval echo "$as_me:5606: \"$ac_try\"") >&5 5319 + { (eval echo "$as_me:590 1: \"$ac_try\"") >&55402 + { (eval echo "$as_me:5902: \"$ac_try\"") >&5 5320 5403 (eval $ac_try) 2>&5 5321 5404 ac_status=$? 5322 5405 - echo "$as_me:5609: \$? = $ac_status" >&5 5323 + echo "$as_me:590 4: \$? = $ac_status" >&55406 + echo "$as_me:5905: \$? = $ac_status" >&5 5324 5407 (exit $ac_status); }; }; then 5325 5408 with_big_core=yes 5326 5409 else 5327 @@ -5618,7 +591 3,7 @@5410 @@ -5618,7 +5914,7 @@ 5328 5411 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 5329 5412 fi 5330 5413 fi; 5331 5414 -echo "$as_me:5621: result: $with_big_core" >&5 5332 +echo "$as_me:591 6: result: $with_big_core" >&55415 +echo "$as_me:5917: result: $with_big_core" >&5 5333 5416 echo "${ECHO_T}$with_big_core" >&6 5334 5417 test "$with_big_core" = "yes" && cat >>confdefs.h <<\EOF 5335 5418 #define HAVE_BIG_CORE 1 5336 @@ -5627,7 +592 2,7 @@5419 @@ -5627,7 +5923,7 @@ 5337 5420 ### ISO C only guarantees 512-char strings, we have tables which load faster 5338 5421 ### when constructed using "big" strings. More than the C compiler, the awk 5339 5422 ### program is a limit on most vendor UNIX systems. Check that we can build. 5340 5423 -echo "$as_me:5630: checking if big-strings option selected" >&5 5341 +echo "$as_me:592 5: checking if big-strings option selected" >&55424 +echo "$as_me:5926: checking if big-strings option selected" >&5 5342 5425 echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6 5343 5426 5344 5427 # Check whether --enable-big-strings or --disable-big-strings was given. 5345 @@ -5636,29 +593 1,29 @@5428 @@ -5636,29 +5932,29 @@ 5346 5429 with_big_strings=$enableval 5347 5430 else … … 5376 5459 fi; 5377 5460 -echo "$as_me:5654: result: $with_big_strings" >&5 5378 +echo "$as_me:59 49: result: $with_big_strings" >&55461 +echo "$as_me:5950: result: $with_big_strings" >&5 5379 5462 echo "${ECHO_T}$with_big_strings" >&6 5380 5463 … … 5384 5467 ### use option --enable-termcap to compile in the termcap fallback support 5385 5468 -echo "$as_me:5661: checking if you want termcap-fallback support" >&5 5386 +echo "$as_me:595 6: checking if you want termcap-fallback support" >&55469 +echo "$as_me:5957: checking if you want termcap-fallback support" >&5 5387 5470 echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6 5388 5471 5389 5472 # Check whether --enable-termcap or --disable-termcap was given. 5390 @@ -5668,13 +596 3,13 @@5473 @@ -5668,13 +5964,13 @@ 5391 5474 else 5392 5475 with_termcap=no 5393 5476 fi; 5394 5477 -echo "$as_me:5671: result: $with_termcap" >&5 5395 +echo "$as_me:596 6: result: $with_termcap" >&55478 +echo "$as_me:5967: result: $with_termcap" >&5 5396 5479 echo "${ECHO_T}$with_termcap" >&6 5397 5480 … … 5400 5483 if test -z "$with_fallback" ; then 5401 5484 - { { echo "$as_me:5677: error: You have disabled the database w/o specifying fallbacks" >&5 5402 + { { echo "$as_me:597 2: error: You have disabled the database w/o specifying fallbacks" >&55485 + { { echo "$as_me:5973: error: You have disabled the database w/o specifying fallbacks" >&5 5403 5486 echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;} 5404 5487 { (exit 1); exit 1; }; } 5405 5488 fi 5406 @@ -5686,7 +598 1,7 @@5489 @@ -5686,7 +5982,7 @@ 5407 5490 else 5408 5491 5409 5492 if test "$with_ticlib" != no ; then 5410 5493 - { { echo "$as_me:5689: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 5411 + { { echo "$as_me:598 4: error: Options --with-ticlib and --enable-termcap cannot be combined" >&55494 + { { echo "$as_me:5985: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 5412 5495 echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;} 5413 5496 { (exit 1); exit 1; }; } 5414 5497 fi 5415 @@ -5695,7 +599 0,7 @@5498 @@ -5695,7 +5991,7 @@ 5416 5499 #define USE_TERMCAP 1 5417 5500 EOF 5418 5501 5419 5502 -echo "$as_me:5698: checking for list of termcap files" >&5 5420 +echo "$as_me:599 3: checking for list of termcap files" >&55503 +echo "$as_me:5994: checking for list of termcap files" >&5 5421 5504 echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6 5422 5505 5423 5506 # Check whether --with-termpath or --without-termpath was given. 5424 @@ -5705,7 +600 0,7 @@5507 @@ -5705,7 +6001,7 @@ 5425 5508 else 5426 5509 withval=${TERMPATH-/etc/termcap:/usr/share/misc/termcap} … … 5431 5514 for cf_src_path in $withval 5432 5515 do 5433 @@ -5735,7 +603 0,7 @@5516 @@ -5735,7 +6031,7 @@ 5434 5517 cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` 5435 5518 ;; 5436 5519 *) 5437 5520 - { { echo "$as_me:5738: error: expected a pathname, not \"$cf_src_path\"" >&5 5438 + { { echo "$as_me:603 3: error: expected a pathname, not \"$cf_src_path\"" >&55521 + { { echo "$as_me:6034: error: expected a pathname, not \"$cf_src_path\"" >&5 5439 5522 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} 5440 5523 { (exit 1); exit 1; }; } 5441 5524 ;; 5442 @@ -5748,14 +604 3,14 @@5525 @@ -5748,14 +6044,14 @@ 5443 5526 5444 5527 eval 'TERMPATH="$cf_dst_path"' 5445 5528 5446 5529 -echo "$as_me:5751: result: $TERMPATH" >&5 5447 +echo "$as_me:604 6: result: $TERMPATH" >&55530 +echo "$as_me:6047: result: $TERMPATH" >&5 5448 5531 echo "${ECHO_T}$TERMPATH" >&6 5449 5532 test -n "$TERMPATH" && cat >>confdefs.h <<EOF … … 5453 5536 ### use option --enable-getcap to use a hacked getcap for reading termcaps 5454 5537 -echo "$as_me:5758: checking if fast termcap-loader is needed" >&5 5455 +echo "$as_me:605 3: checking if fast termcap-loader is needed" >&55538 +echo "$as_me:6054: checking if fast termcap-loader is needed" >&5 5456 5539 echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6 5457 5540 5458 5541 # Check whether --enable-getcap or --disable-getcap was given. 5459 @@ -5765,13 +606 0,13 @@5542 @@ -5765,13 +6061,13 @@ 5460 5543 else 5461 5544 with_getcap=no 5462 5545 fi; 5463 5546 -echo "$as_me:5768: result: $with_getcap" >&5 5464 +echo "$as_me:606 3: result: $with_getcap" >&55547 +echo "$as_me:6064: result: $with_getcap" >&5 5465 5548 echo "${ECHO_T}$with_getcap" >&6 5466 5549 test "$with_getcap" = "yes" && cat >>confdefs.h <<\EOF … … 5469 5552 5470 5553 -echo "$as_me:5774: checking if translated termcaps will be cached in ~/.terminfo" >&5 5471 +echo "$as_me:60 69: checking if translated termcaps will be cached in ~/.terminfo" >&55554 +echo "$as_me:6070: checking if translated termcaps will be cached in ~/.terminfo" >&5 5472 5555 echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6 5473 5556 5474 5557 # Check whether --enable-getcap-cache or --disable-getcap-cache was given. 5475 @@ -5781,7 +607 6,7 @@5558 @@ -5781,7 +6077,7 @@ 5476 5559 else 5477 5560 with_getcap_cache=no 5478 5561 fi; 5479 5562 -echo "$as_me:5784: result: $with_getcap_cache" >&5 5480 +echo "$as_me:60 79: result: $with_getcap_cache" >&55563 +echo "$as_me:6080: result: $with_getcap_cache" >&5 5481 5564 echo "${ECHO_T}$with_getcap_cache" >&6 5482 5565 test "$with_getcap_cache" = "yes" && cat >>confdefs.h <<\EOF 5483 5566 #define USE_GETCAP_CACHE 1 5484 @@ -5790,7 +608 5,7 @@5567 @@ -5790,7 +6086,7 @@ 5485 5568 fi 5486 5569 5487 5570 ### Use option --disable-home-terminfo to completely remove ~/.terminfo 5488 5571 -echo "$as_me:5793: checking if ~/.terminfo is wanted" >&5 5489 +echo "$as_me:608 8: checking if ~/.terminfo is wanted" >&55572 +echo "$as_me:6089: checking if ~/.terminfo is wanted" >&5 5490 5573 echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6 5491 5574 5492 5575 # Check whether --enable-home-terminfo or --disable-home-terminfo was given. 5493 @@ -5800,13 +609 5,13 @@5576 @@ -5800,13 +6096,13 @@ 5494 5577 else 5495 5578 with_home_terminfo=yes 5496 5579 fi; 5497 5580 -echo "$as_me:5803: result: $with_home_terminfo" >&5 5498 +echo "$as_me:609 8: result: $with_home_terminfo" >&55581 +echo "$as_me:6099: result: $with_home_terminfo" >&5 5499 5582 echo "${ECHO_T}$with_home_terminfo" >&6 5500 5583 test "$with_home_terminfo" = "yes" && cat >>confdefs.h <<\EOF … … 5503 5586 5504 5587 -echo "$as_me:5809: checking if you want to use restricted environment when running as root" >&5 5505 +echo "$as_me:610 4: checking if you want to use restricted environment when running as root" >&55588 +echo "$as_me:6105: checking if you want to use restricted environment when running as root" >&5 5506 5589 echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6 5507 5590 5508 5591 # Check whether --enable-root-environ or --disable-root-environ was given. 5509 @@ -5816,7 +611 1,7 @@5592 @@ -5816,7 +6112,7 @@ 5510 5593 else 5511 5594 with_root_environ=yes 5512 5595 fi; 5513 5596 -echo "$as_me:5819: result: $with_root_environ" >&5 5514 +echo "$as_me:611 4: result: $with_root_environ" >&55597 +echo "$as_me:6115: result: $with_root_environ" >&5 5515 5598 echo "${ECHO_T}$with_root_environ" >&6 5516 5599 test "$with_root_environ" = yes && cat >>confdefs.h <<\EOF 5517 5600 #define USE_ROOT_ENVIRON 1 5518 @@ -5830,13 +612 5,13 @@5601 @@ -5830,13 +6126,13 @@ 5519 5602 unlink 5520 5603 do 5521 5604 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 5522 5605 -echo "$as_me:5833: checking for $ac_func" >&5 5523 +echo "$as_me:612 8: checking for $ac_func" >&55606 +echo "$as_me:6129: checking for $ac_func" >&5 5524 5607 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 5525 5608 if eval "test \"\${$as_ac_var+set}\" = set"; then … … 5528 5611 cat >conftest.$ac_ext <<_ACEOF 5529 5612 -#line 5839 "configure" 5530 +#line 613 4"configure"5613 +#line 6135 "configure" 5531 5614 #include "confdefs.h" 5532 5615 /* System header to define __stub macros and hopefully few prototypes, 5533 5616 which can conflict with char $ac_func (); below. */ 5534 @@ -5867,16 +616 2,16 @@5617 @@ -5867,16 +6163,16 @@ 5535 5618 } 5536 5619 _ACEOF 5537 5620 rm -f conftest.$ac_objext conftest$ac_exeext 5538 5621 -if { (eval echo "$as_me:5870: \"$ac_link\"") >&5 5539 +if { (eval echo "$as_me:616 5: \"$ac_link\"") >&55622 +if { (eval echo "$as_me:6166: \"$ac_link\"") >&5 5540 5623 (eval $ac_link) 2>&5 5541 5624 ac_status=$? 5542 5625 - echo "$as_me:5873: \$? = $ac_status" >&5 5543 + echo "$as_me:616 8: \$? = $ac_status" >&55626 + echo "$as_me:6169: \$? = $ac_status" >&5 5544 5627 (exit $ac_status); } && 5545 5628 { ac_try='test -s conftest$ac_exeext' 5546 5629 - { (eval echo "$as_me:5876: \"$ac_try\"") >&5 5547 + { (eval echo "$as_me:617 1: \"$ac_try\"") >&55630 + { (eval echo "$as_me:6172: \"$ac_try\"") >&5 5548 5631 (eval $ac_try) 2>&5 5549 5632 ac_status=$? 5550 5633 - echo "$as_me:5879: \$? = $ac_status" >&5 5551 + echo "$as_me:617 4: \$? = $ac_status" >&55634 + echo "$as_me:6175: \$? = $ac_status" >&5 5552 5635 (exit $ac_status); }; }; then 5553 5636 eval "$as_ac_var=yes" 5554 5637 else 5555 @@ -5886,7 +618 1,7 @@5638 @@ -5886,7 +6182,7 @@ 5556 5639 fi 5557 5640 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 5558 5641 fi 5559 5642 -echo "$as_me:5889: result: `eval echo '${'$as_ac_var'}'`" >&5 5560 +echo "$as_me:618 4: result: `eval echo '${'$as_ac_var'}'`" >&55643 +echo "$as_me:6185: result: `eval echo '${'$as_ac_var'}'`" >&5 5561 5644 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 5562 5645 if test `eval echo '${'$as_ac_var'}'` = yes; then 5563 5646 cat >>confdefs.h <<EOF 5564 @@ -5903,13 +619 8,13 @@5647 @@ -5903,13 +6199,13 @@ 5565 5648 symlink 5566 5649 do 5567 5650 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 5568 5651 -echo "$as_me:5906: checking for $ac_func" >&5 5569 +echo "$as_me:620 1: checking for $ac_func" >&55652 +echo "$as_me:6202: checking for $ac_func" >&5 5570 5653 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 5571 5654 if eval "test \"\${$as_ac_var+set}\" = set"; then … … 5574 5657 cat >conftest.$ac_ext <<_ACEOF 5575 5658 -#line 5912 "configure" 5576 +#line 620 7"configure"5659 +#line 6208 "configure" 5577 5660 #include "confdefs.h" 5578 5661 /* System header to define __stub macros and hopefully few prototypes, 5579 5662 which can conflict with char $ac_func (); below. */ 5580 @@ -5940,16 +623 5,16 @@5663 @@ -5940,16 +6236,16 @@ 5581 5664 } 5582 5665 _ACEOF 5583 5666 rm -f conftest.$ac_objext conftest$ac_exeext 5584 5667 -if { (eval echo "$as_me:5943: \"$ac_link\"") >&5 5585 +if { (eval echo "$as_me:623 8: \"$ac_link\"") >&55668 +if { (eval echo "$as_me:6239: \"$ac_link\"") >&5 5586 5669 (eval $ac_link) 2>&5 5587 5670 ac_status=$? 5588 5671 - echo "$as_me:5946: \$? = $ac_status" >&5 5589 + echo "$as_me:624 1: \$? = $ac_status" >&55672 + echo "$as_me:6242: \$? = $ac_status" >&5 5590 5673 (exit $ac_status); } && 5591 5674 { ac_try='test -s conftest$ac_exeext' 5592 5675 - { (eval echo "$as_me:5949: \"$ac_try\"") >&5 5593 + { (eval echo "$as_me:624 4: \"$ac_try\"") >&55676 + { (eval echo "$as_me:6245: \"$ac_try\"") >&5 5594 5677 (eval $ac_try) 2>&5 5595 5678 ac_status=$? 5596 5679 - echo "$as_me:5952: \$? = $ac_status" >&5 5597 + echo "$as_me:624 7: \$? = $ac_status" >&55680 + echo "$as_me:6248: \$? = $ac_status" >&5 5598 5681 (exit $ac_status); }; }; then 5599 5682 eval "$as_ac_var=yes" 5600 5683 else 5601 @@ -5959,7 +625 4,7 @@5684 @@ -5959,7 +6255,7 @@ 5602 5685 fi 5603 5686 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 5604 5687 fi 5605 5688 -echo "$as_me:5962: result: `eval echo '${'$as_ac_var'}'`" >&5 5606 +echo "$as_me:625 7: result: `eval echo '${'$as_ac_var'}'`" >&55689 +echo "$as_me:6258: result: `eval echo '${'$as_ac_var'}'`" >&5 5607 5690 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 5608 5691 if test `eval echo '${'$as_ac_var'}'` = yes; then 5609 5692 cat >>confdefs.h <<EOF 5610 @@ -5970,7 +626 5,7 @@5693 @@ -5970,7 +6266,7 @@ 5611 5694 done 5612 5695 5613 5696 else 5614 5697 - echo "$as_me:5973: checking if link/symlink functions work" >&5 5615 + echo "$as_me:626 8: checking if link/symlink functions work" >&55698 + echo "$as_me:6269: checking if link/symlink functions work" >&5 5616 5699 echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6 5617 5700 if test "${cf_cv_link_funcs+set}" = set; then 5618 5701 echo $ECHO_N "(cached) $ECHO_C" >&6 5619 @@ -5983,7 +627 8,7 @@5702 @@ -5983,7 +6279,7 @@ 5620 5703 eval 'ac_cv_func_'$cf_func'=error' 5621 5704 else 5622 5705 cat >conftest.$ac_ext <<_ACEOF 5623 5706 -#line 5986 "configure" 5624 +#line 628 1"configure"5707 +#line 6282 "configure" 5625 5708 #include "confdefs.h" 5626 5709 5627 5710 #include <sys/types.h> 5628 @@ -6013,15 +630 8,15 @@5711 @@ -6013,15 +6309,15 @@ 5629 5712 5630 5713 _ACEOF 5631 5714 rm -f conftest$ac_exeext 5632 5715 -if { (eval echo "$as_me:6016: \"$ac_link\"") >&5 5633 +if { (eval echo "$as_me:631 1: \"$ac_link\"") >&55716 +if { (eval echo "$as_me:6312: \"$ac_link\"") >&5 5634 5717 (eval $ac_link) 2>&5 5635 5718 ac_status=$? 5636 5719 - echo "$as_me:6019: \$? = $ac_status" >&5 5637 + echo "$as_me:631 4: \$? = $ac_status" >&55720 + echo "$as_me:6315: \$? = $ac_status" >&5 5638 5721 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 5639 5722 - { (eval echo "$as_me:6021: \"$ac_try\"") >&5 5640 + { (eval echo "$as_me:631 6: \"$ac_try\"") >&55723 + { (eval echo "$as_me:6317: \"$ac_try\"") >&5 5641 5724 (eval $ac_try) 2>&5 5642 5725 ac_status=$? 5643 5726 - echo "$as_me:6024: \$? = $ac_status" >&5 5644 + echo "$as_me:63 19: \$? = $ac_status" >&55727 + echo "$as_me:6320: \$? = $ac_status" >&5 5645 5728 (exit $ac_status); }; }; then 5646 5729 5647 5730 cf_cv_link_funcs="$cf_cv_link_funcs $cf_func" 5648 @@ -6039,7 +633 4,7 @@5731 @@ -6039,7 +6335,7 @@ 5649 5732 test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no 5650 5733 5651 5734 fi 5652 5735 -echo "$as_me:6042: result: $cf_cv_link_funcs" >&5 5653 +echo "$as_me:633 7: result: $cf_cv_link_funcs" >&55736 +echo "$as_me:6338: result: $cf_cv_link_funcs" >&5 5654 5737 echo "${ECHO_T}$cf_cv_link_funcs" >&6 5655 5738 test "$ac_cv_func_link" = yes && cat >>confdefs.h <<\EOF 5656 5739 #define HAVE_LINK 1 5657 @@ -6057,7 +635 2,7 @@5740 @@ -6057,7 +6353,7 @@ 5658 5741 # soft links (symbolic links) are useful for some systems where hard links do 5659 5742 # not work, or to make it simpler to copy terminfo trees around. 5660 5743 if test "$ac_cv_func_symlink" = yes ; then 5661 5744 - echo "$as_me:6060: checking if tic should use symbolic links" >&5 5662 + echo "$as_me:635 5: checking if tic should use symbolic links" >&55745 + echo "$as_me:6356: checking if tic should use symbolic links" >&5 5663 5746 echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6 5664 5747 5665 5748 # Check whether --enable-symlinks or --disable-symlinks was given. 5666 @@ -6067,21 +636 2,21 @@5749 @@ -6067,21 +6363,21 @@ 5667 5750 else 5668 5751 with_symlinks=no 5669 5752 fi; 5670 5753 - echo "$as_me:6070: result: $with_symlinks" >&5 5671 + echo "$as_me:636 5: result: $with_symlinks" >&55754 + echo "$as_me:6366: result: $with_symlinks" >&5 5672 5755 echo "${ECHO_T}$with_symlinks" >&6 5673 5756 fi … … 5677 5760 if test "$with_symlinks" = no ; then 5678 5761 - echo "$as_me:6077: checking if tic should use hard links" >&5 5679 + echo "$as_me:637 2: checking if tic should use hard links" >&55762 + echo "$as_me:6373: checking if tic should use hard links" >&5 5680 5763 echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6 5681 5764 if test "$ac_cv_func_link" = yes ; then … … 5685 5768 fi 5686 5769 - echo "$as_me:6084: result: $with_links" >&5 5687 + echo "$as_me:63 79: result: $with_links" >&55770 + echo "$as_me:6380: result: $with_links" >&5 5688 5771 echo "${ECHO_T}$with_links" >&6 5689 5772 fi 5690 5773 5691 @@ -6094,7 +63 89,7 @@5774 @@ -6094,7 +6390,7 @@ 5692 5775 EOF 5693 5776 5694 5777 ### use option --enable-broken-linker to force on use of broken-linker support 5695 5778 -echo "$as_me:6097: checking if you want broken-linker support code" >&5 5696 +echo "$as_me:639 2: checking if you want broken-linker support code" >&55779 +echo "$as_me:6393: checking if you want broken-linker support code" >&5 5697 5780 echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 5698 5781 5699 5782 # Check whether --enable-broken_linker or --disable-broken_linker was given. 5700 @@ -6104,7 +6 399,7 @@5783 @@ -6104,7 +6400,7 @@ 5701 5784 else 5702 5785 with_broken_linker=${BROKEN_LINKER-no} 5703 5786 fi; 5704 5787 -echo "$as_me:6107: result: $with_broken_linker" >&5 5705 +echo "$as_me:640 2: result: $with_broken_linker" >&55788 +echo "$as_me:6403: result: $with_broken_linker" >&5 5706 5789 echo "${ECHO_T}$with_broken_linker" >&6 5707 5790 5708 5791 BROKEN_LINKER=0 5709 @@ -6124,14 +64 19,14 @@5792 @@ -6124,14 +6420,14 @@ 5710 5793 BROKEN_LINKER=1 5711 5794 test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6 5712 5795 5713 5796 -echo "${as_me-configure}:6127: testing cygwin linker is broken anyway ..." 1>&5 5714 +echo "${as_me-configure}:642 2: testing cygwin linker is broken anyway ..." 1>&55797 +echo "${as_me-configure}:6423: testing cygwin linker is broken anyway ..." 1>&5 5715 5798 5716 5799 ;; … … 5720 5803 ### use option --enable-bsdpad to have tputs process BSD-style prefix padding 5721 5804 -echo "$as_me:6134: checking if tputs should process BSD-style prefix padding" >&5 5722 +echo "$as_me:64 29: checking if tputs should process BSD-style prefix padding" >&55805 +echo "$as_me:6430: checking if tputs should process BSD-style prefix padding" >&5 5723 5806 echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6 5724 5807 5725 5808 # Check whether --enable-bsdpad or --disable-bsdpad was given. 5726 @@ -6141,7 +643 6,7 @@5809 @@ -6141,7 +6437,7 @@ 5727 5810 else 5728 5811 with_bsdpad=no 5729 5812 fi; 5730 5813 -echo "$as_me:6144: result: $with_bsdpad" >&5 5731 +echo "$as_me:64 39: result: $with_bsdpad" >&55814 +echo "$as_me:6440: result: $with_bsdpad" >&5 5732 5815 echo "${ECHO_T}$with_bsdpad" >&6 5733 5816 test "$with_bsdpad" = yes && cat >>confdefs.h <<\EOF 5734 5817 #define BSD_TPUTS 1 5735 @@ -6158,7 +645 3,7 @@5818 @@ -6158,7 +6454,7 @@ 5736 5819 5737 5820 # Check to define _XOPEN_SOURCE "automatically" 5738 5821 5739 5822 -echo "$as_me:6161: checking if $CC -U and -D options work together" >&5 5740 +echo "$as_me:645 6: checking if $CC -U and -D options work together" >&55823 +echo "$as_me:6457: checking if $CC -U and -D options work together" >&5 5741 5824 echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6 5742 5825 if test "${cf_cv_cc_u_d_options+set}" = set; then 5743 5826 echo $ECHO_N "(cached) $ECHO_C" >&6 5744 @@ -6167,7 +646 2,7 @@5827 @@ -6167,7 +6463,7 @@ 5745 5828 cf_save_CPPFLAGS="$CPPFLAGS" 5746 5829 CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS" 5747 5830 cat >conftest.$ac_ext <<_ACEOF 5748 5831 -#line 6170 "configure" 5749 +#line 646 5"configure"5832 +#line 6466 "configure" 5750 5833 #include "confdefs.h" 5751 5834 5752 5835 int 5753 @@ -6186,16 +648 1,16 @@5836 @@ -6186,16 +6482,16 @@ 5754 5837 } 5755 5838 _ACEOF 5756 5839 rm -f conftest.$ac_objext 5757 5840 -if { (eval echo "$as_me:6189: \"$ac_compile\"") >&5 5758 +if { (eval echo "$as_me:648 4: \"$ac_compile\"") >&55841 +if { (eval echo "$as_me:6485: \"$ac_compile\"") >&5 5759 5842 (eval $ac_compile) 2>&5 5760 5843 ac_status=$? 5761 5844 - echo "$as_me:6192: \$? = $ac_status" >&5 5762 + echo "$as_me:648 7: \$? = $ac_status" >&55845 + echo "$as_me:6488: \$? = $ac_status" >&5 5763 5846 (exit $ac_status); } && 5764 5847 { ac_try='test -s conftest.$ac_objext' 5765 5848 - { (eval echo "$as_me:6195: \"$ac_try\"") >&5 5766 + { (eval echo "$as_me:649 0: \"$ac_try\"") >&55849 + { (eval echo "$as_me:6491: \"$ac_try\"") >&5 5767 5850 (eval $ac_try) 2>&5 5768 5851 ac_status=$? 5769 5852 - echo "$as_me:6198: \$? = $ac_status" >&5 5770 + echo "$as_me:649 3: \$? = $ac_status" >&55853 + echo "$as_me:6494: \$? = $ac_status" >&5 5771 5854 (exit $ac_status); }; }; then 5772 5855 5773 5856 cf_cv_cc_u_d_options=yes 5774 @@ -6209,14 +650 4,14 @@5857 @@ -6209,14 +6505,14 @@ 5775 5858 CPPFLAGS="$cf_save_CPPFLAGS" 5776 5859 5777 5860 fi 5778 5861 -echo "$as_me:6212: result: $cf_cv_cc_u_d_options" >&5 5779 +echo "$as_me:650 7: result: $cf_cv_cc_u_d_options" >&55862 +echo "$as_me:6508: result: $cf_cv_cc_u_d_options" >&5 5780 5863 echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6 5781 5864 … … 5789 5872 ;; 5790 5873 freebsd*|dragonfly*) #(vi 5791 @@ -6233,16 +652 8,16 @@5874 @@ -6233,16 +6529,16 @@ 5792 5875 irix[56].*) #(vi 5793 5876 CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE" … … 5797 5880 5798 5881 -echo "$as_me:6238: checking if we must define _GNU_SOURCE" >&5 5799 +echo "$as_me:653 3: checking if we must define _GNU_SOURCE" >&55882 +echo "$as_me:6534: checking if we must define _GNU_SOURCE" >&5 5800 5883 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 5801 5884 if test "${cf_cv_gnu_source+set}" = set; then … … 5805 5888 cat >conftest.$ac_ext <<_ACEOF 5806 5889 -#line 6245 "configure" 5807 +#line 654 0"configure"5890 +#line 6541 "configure" 5808 5891 #include "confdefs.h" 5809 5892 #include <sys/types.h> 5810 5893 int 5811 @@ -6257,16 +655 2,16 @@5894 @@ -6257,16 +6553,16 @@ 5812 5895 } 5813 5896 _ACEOF 5814 5897 rm -f conftest.$ac_objext 5815 5898 -if { (eval echo "$as_me:6260: \"$ac_compile\"") >&5 5816 +if { (eval echo "$as_me:655 5: \"$ac_compile\"") >&55899 +if { (eval echo "$as_me:6556: \"$ac_compile\"") >&5 5817 5900 (eval $ac_compile) 2>&5 5818 5901 ac_status=$? 5819 5902 - echo "$as_me:6263: \$? = $ac_status" >&5 5820 + echo "$as_me:655 8: \$? = $ac_status" >&55903 + echo "$as_me:6559: \$? = $ac_status" >&5 5821 5904 (exit $ac_status); } && 5822 5905 { ac_try='test -s conftest.$ac_objext' 5823 5906 - { (eval echo "$as_me:6266: \"$ac_try\"") >&5 5824 + { (eval echo "$as_me:656 1: \"$ac_try\"") >&55907 + { (eval echo "$as_me:6562: \"$ac_try\"") >&5 5825 5908 (eval $ac_try) 2>&5 5826 5909 ac_status=$? 5827 5910 - echo "$as_me:6269: \$? = $ac_status" >&5 5828 + echo "$as_me:656 4: \$? = $ac_status" >&55911 + echo "$as_me:6565: \$? = $ac_status" >&5 5829 5912 (exit $ac_status); }; }; then 5830 5913 cf_cv_gnu_source=no 5831 5914 else 5832 @@ -6275,7 +657 0,7 @@5915 @@ -6275,7 +6571,7 @@ 5833 5916 cf_save="$CPPFLAGS" 5834 5917 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" 5835 5918 cat >conftest.$ac_ext <<_ACEOF 5836 5919 -#line 6278 "configure" 5837 +#line 657 3"configure"5920 +#line 6574 "configure" 5838 5921 #include "confdefs.h" 5839 5922 #include <sys/types.h> 5840 5923 int 5841 @@ -6290,16 +658 5,16 @@5924 @@ -6290,16 +6586,16 @@ 5842 5925 } 5843 5926 _ACEOF 5844 5927 rm -f conftest.$ac_objext 5845 5928 -if { (eval echo "$as_me:6293: \"$ac_compile\"") >&5 5846 +if { (eval echo "$as_me:658 8: \"$ac_compile\"") >&55929 +if { (eval echo "$as_me:6589: \"$ac_compile\"") >&5 5847 5930 (eval $ac_compile) 2>&5 5848 5931 ac_status=$? 5849 5932 - echo "$as_me:6296: \$? = $ac_status" >&5 5850 + echo "$as_me:659 1: \$? = $ac_status" >&55933 + echo "$as_me:6592: \$? = $ac_status" >&5 5851 5934 (exit $ac_status); } && 5852 5935 { ac_try='test -s conftest.$ac_objext' 5853 5936 - { (eval echo "$as_me:6299: \"$ac_try\"") >&5 5854 + { (eval echo "$as_me:659 4: \"$ac_try\"") >&55937 + { (eval echo "$as_me:6595: \"$ac_try\"") >&5 5855 5938 (eval $ac_try) 2>&5 5856 5939 ac_status=$? 5857 5940 - echo "$as_me:6302: \$? = $ac_status" >&5 5858 + echo "$as_me:659 7: \$? = $ac_status" >&55941 + echo "$as_me:6598: \$? = $ac_status" >&5 5859 5942 (exit $ac_status); }; }; then 5860 5943 cf_cv_gnu_source=no 5861 5944 else 5862 @@ -6314,7 +66 09,7 @@5945 @@ -6314,7 +6610,7 @@ 5863 5946 rm -f conftest.$ac_objext conftest.$ac_ext 5864 5947 5865 5948 fi 5866 5949 -echo "$as_me:6317: result: $cf_cv_gnu_source" >&5 5867 +echo "$as_me:661 2: result: $cf_cv_gnu_source" >&55950 +echo "$as_me:6613: result: $cf_cv_gnu_source" >&5 5868 5951 echo "${ECHO_T}$cf_cv_gnu_source" >&6 5869 5952 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" 5870 5953 5871 @@ -6341,14 +663 6,14 @@5954 @@ -6341,14 +6637,14 @@ 5872 5955 CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__" 5873 5956 ;; 5874 5957 *) 5875 5958 - echo "$as_me:6344: checking if we should define _XOPEN_SOURCE" >&5 5876 + echo "$as_me:66 39: checking if we should define _XOPEN_SOURCE" >&55959 + echo "$as_me:6640: checking if we should define _XOPEN_SOURCE" >&5 5877 5960 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 5878 5961 if test "${cf_cv_xopen_source+set}" = set; then … … 5882 5965 cat >conftest.$ac_ext <<_ACEOF 5883 5966 -#line 6351 "configure" 5884 +#line 664 6"configure"5967 +#line 6647 "configure" 5885 5968 #include "confdefs.h" 5886 5969 #include <sys/types.h> 5887 5970 int 5888 @@ -6363,16 +665 8,16 @@5971 @@ -6363,16 +6659,16 @@ 5889 5972 } 5890 5973 _ACEOF 5891 5974 rm -f conftest.$ac_objext 5892 5975 -if { (eval echo "$as_me:6366: \"$ac_compile\"") >&5 5893 +if { (eval echo "$as_me:666 1: \"$ac_compile\"") >&55976 +if { (eval echo "$as_me:6662: \"$ac_compile\"") >&5 5894 5977 (eval $ac_compile) 2>&5 5895 5978 ac_status=$? 5896 5979 - echo "$as_me:6369: \$? = $ac_status" >&5 5897 + echo "$as_me:666 4: \$? = $ac_status" >&55980 + echo "$as_me:6665: \$? = $ac_status" >&5 5898 5981 (exit $ac_status); } && 5899 5982 { ac_try='test -s conftest.$ac_objext' 5900 5983 - { (eval echo "$as_me:6372: \"$ac_try\"") >&5 5901 + { (eval echo "$as_me:666 7: \"$ac_try\"") >&55984 + { (eval echo "$as_me:6668: \"$ac_try\"") >&5 5902 5985 (eval $ac_try) 2>&5 5903 5986 ac_status=$? 5904 5987 - echo "$as_me:6375: \$? = $ac_status" >&5 5905 + echo "$as_me:667 0: \$? = $ac_status" >&55988 + echo "$as_me:6671: \$? = $ac_status" >&5 5906 5989 (exit $ac_status); }; }; then 5907 5990 cf_cv_xopen_source=no 5908 5991 else 5909 @@ -6381,7 +667 6,7 @@5992 @@ -6381,7 +6677,7 @@ 5910 5993 cf_save="$CPPFLAGS" 5911 5994 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" 5912 5995 cat >conftest.$ac_ext <<_ACEOF 5913 5996 -#line 6384 "configure" 5914 +#line 66 79"configure"5997 +#line 6680 "configure" 5915 5998 #include "confdefs.h" 5916 5999 #include <sys/types.h> 5917 6000 int 5918 @@ -6396,16 +669 1,16 @@6001 @@ -6396,16 +6692,16 @@ 5919 6002 } 5920 6003 _ACEOF 5921 6004 rm -f conftest.$ac_objext 5922 6005 -if { (eval echo "$as_me:6399: \"$ac_compile\"") >&5 5923 +if { (eval echo "$as_me:669 4: \"$ac_compile\"") >&56006 +if { (eval echo "$as_me:6695: \"$ac_compile\"") >&5 5924 6007 (eval $ac_compile) 2>&5 5925 6008 ac_status=$? 5926 6009 - echo "$as_me:6402: \$? = $ac_status" >&5 5927 + echo "$as_me:669 7: \$? = $ac_status" >&56010 + echo "$as_me:6698: \$? = $ac_status" >&5 5928 6011 (exit $ac_status); } && 5929 6012 { ac_try='test -s conftest.$ac_objext' 5930 6013 - { (eval echo "$as_me:6405: \"$ac_try\"") >&5 5931 + { (eval echo "$as_me:670 0: \"$ac_try\"") >&56014 + { (eval echo "$as_me:6701: \"$ac_try\"") >&5 5932 6015 (eval $ac_try) 2>&5 5933 6016 ac_status=$? 5934 6017 - echo "$as_me:6408: \$? = $ac_status" >&5 5935 + echo "$as_me:670 3: \$? = $ac_status" >&56018 + echo "$as_me:6704: \$? = $ac_status" >&5 5936 6019 (exit $ac_status); }; }; then 5937 6020 cf_cv_xopen_source=no 5938 6021 else 5939 @@ -6420,7 +671 5,7 @@6022 @@ -6420,7 +6716,7 @@ 5940 6023 rm -f conftest.$ac_objext conftest.$ac_ext 5941 6024 5942 6025 fi 5943 6026 -echo "$as_me:6423: result: $cf_cv_xopen_source" >&5 5944 +echo "$as_me:671 8: result: $cf_cv_xopen_source" >&56027 +echo "$as_me:6719: result: $cf_cv_xopen_source" >&5 5945 6028 echo "${ECHO_T}$cf_cv_xopen_source" >&6 5946 6029 if test "$cf_cv_xopen_source" != no ; then 5947 6030 5948 @@ -6454,16 +67 49,16 @@6031 @@ -6454,16 +6750,16 @@ 5949 6032 sed -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?[ ]/ /g' \ 5950 6033 -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?$//g'` 5951 6034 5952 6035 -echo "$as_me:6457: checking if we should define _POSIX_C_SOURCE" >&5 5953 +echo "$as_me:675 2: checking if we should define _POSIX_C_SOURCE" >&56036 +echo "$as_me:6753: checking if we should define _POSIX_C_SOURCE" >&5 5954 6037 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 5955 6038 if test "${cf_cv_posix_c_source+set}" = set; then … … 5958 6041 5959 6042 -echo "${as_me-configure}:6463: testing if the symbol is already defined go no further ..." 1>&5 5960 +echo "${as_me-configure}:675 8: testing if the symbol is already defined go no further ..." 1>&56043 +echo "${as_me-configure}:6759: testing if the symbol is already defined go no further ..." 1>&5 5961 6044 5962 6045 cat >conftest.$ac_ext <<_ACEOF 5963 6046 -#line 6466 "configure" 5964 +#line 676 1"configure"6047 +#line 6762 "configure" 5965 6048 #include "confdefs.h" 5966 6049 #include <sys/types.h> 5967 6050 int 5968 @@ -6478,16 +677 3,16 @@6051 @@ -6478,16 +6774,16 @@ 5969 6052 } 5970 6053 _ACEOF 5971 6054 rm -f conftest.$ac_objext 5972 6055 -if { (eval echo "$as_me:6481: \"$ac_compile\"") >&5 5973 +if { (eval echo "$as_me:677 6: \"$ac_compile\"") >&56056 +if { (eval echo "$as_me:6777: \"$ac_compile\"") >&5 5974 6057 (eval $ac_compile) 2>&5 5975 6058 ac_status=$? 5976 6059 - echo "$as_me:6484: \$? = $ac_status" >&5 5977 + echo "$as_me:67 79: \$? = $ac_status" >&56060 + echo "$as_me:6780: \$? = $ac_status" >&5 5978 6061 (exit $ac_status); } && 5979 6062 { ac_try='test -s conftest.$ac_objext' 5980 6063 - { (eval echo "$as_me:6487: \"$ac_try\"") >&5 5981 + { (eval echo "$as_me:678 2: \"$ac_try\"") >&56064 + { (eval echo "$as_me:6783: \"$ac_try\"") >&5 5982 6065 (eval $ac_try) 2>&5 5983 6066 ac_status=$? 5984 6067 - echo "$as_me:6490: \$? = $ac_status" >&5 5985 + echo "$as_me:678 5: \$? = $ac_status" >&56068 + echo "$as_me:6786: \$? = $ac_status" >&5 5986 6069 (exit $ac_status); }; }; then 5987 6070 cf_cv_posix_c_source=no 5988 6071 else 5989 @@ -6508,7 +680 3,7 @@6072 @@ -6508,7 +6804,7 @@ 5990 6073 esac 5991 6074 if test "$cf_want_posix_source" = yes ; then 5992 6075 cat >conftest.$ac_ext <<_ACEOF 5993 6076 -#line 6511 "configure" 5994 +#line 680 6"configure"6077 +#line 6807 "configure" 5995 6078 #include "confdefs.h" 5996 6079 #include <sys/types.h> 5997 6080 int 5998 @@ -6523,16 +681 8,16 @@6081 @@ -6523,16 +6819,16 @@ 5999 6082 } 6000 6083 _ACEOF 6001 6084 rm -f conftest.$ac_objext 6002 6085 -if { (eval echo "$as_me:6526: \"$ac_compile\"") >&5 6003 +if { (eval echo "$as_me:682 1: \"$ac_compile\"") >&56086 +if { (eval echo "$as_me:6822: \"$ac_compile\"") >&5 6004 6087 (eval $ac_compile) 2>&5 6005 6088 ac_status=$? 6006 6089 - echo "$as_me:6529: \$? = $ac_status" >&5 6007 + echo "$as_me:682 4: \$? = $ac_status" >&56090 + echo "$as_me:6825: \$? = $ac_status" >&5 6008 6091 (exit $ac_status); } && 6009 6092 { ac_try='test -s conftest.$ac_objext' 6010 6093 - { (eval echo "$as_me:6532: \"$ac_try\"") >&5 6011 + { (eval echo "$as_me:682 7: \"$ac_try\"") >&56094 + { (eval echo "$as_me:6828: \"$ac_try\"") >&5 6012 6095 (eval $ac_try) 2>&5 6013 6096 ac_status=$? 6014 6097 - echo "$as_me:6535: \$? = $ac_status" >&5 6015 + echo "$as_me:683 0: \$? = $ac_status" >&56098 + echo "$as_me:6831: \$? = $ac_status" >&5 6016 6099 (exit $ac_status); }; }; then 6017 6100 : 6018 6101 else 6019 @@ -6543,15 +683 8,15 @@6102 @@ -6543,15 +6839,15 @@ 6020 6103 rm -f conftest.$ac_objext conftest.$ac_ext 6021 6104 fi 6022 6105 6023 6106 -echo "${as_me-configure}:6546: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 6024 +echo "${as_me-configure}:684 1: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&56107 +echo "${as_me-configure}:6842: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 6025 6108 6026 6109 CFLAGS="$cf_trim_CFLAGS" … … 6028 6111 6029 6112 -echo "${as_me-configure}:6551: testing if the second compile does not leave our definition intact error ..." 1>&5 6030 +echo "${as_me-configure}:684 6: testing if the second compile does not leave our definition intact error ..." 1>&56113 +echo "${as_me-configure}:6847: testing if the second compile does not leave our definition intact error ..." 1>&5 6031 6114 6032 6115 cat >conftest.$ac_ext <<_ACEOF 6033 6116 -#line 6554 "configure" 6034 +#line 68 49"configure"6117 +#line 6850 "configure" 6035 6118 #include "confdefs.h" 6036 6119 #include <sys/types.h> 6037 6120 int 6038 @@ -6566,16 +686 1,16 @@6121 @@ -6566,16 +6862,16 @@ 6039 6122 } 6040 6123 _ACEOF 6041 6124 rm -f conftest.$ac_objext 6042 6125 -if { (eval echo "$as_me:6569: \"$ac_compile\"") >&5 6043 +if { (eval echo "$as_me:686 4: \"$ac_compile\"") >&56126 +if { (eval echo "$as_me:6865: \"$ac_compile\"") >&5 6044 6127 (eval $ac_compile) 2>&5 6045 6128 ac_status=$? 6046 6129 - echo "$as_me:6572: \$? = $ac_status" >&5 6047 + echo "$as_me:686 7: \$? = $ac_status" >&56130 + echo "$as_me:6868: \$? = $ac_status" >&5 6048 6131 (exit $ac_status); } && 6049 6132 { ac_try='test -s conftest.$ac_objext' 6050 6133 - { (eval echo "$as_me:6575: \"$ac_try\"") >&5 6051 + { (eval echo "$as_me:687 0: \"$ac_try\"") >&56134 + { (eval echo "$as_me:6871: \"$ac_try\"") >&5 6052 6135 (eval $ac_try) 2>&5 6053 6136 ac_status=$? 6054 6137 - echo "$as_me:6578: \$? = $ac_status" >&5 6055 + echo "$as_me:687 3: \$? = $ac_status" >&56138 + echo "$as_me:6874: \$? = $ac_status" >&5 6056 6139 (exit $ac_status); }; }; then 6057 6140 : 6058 6141 else 6059 @@ -6591,7 +688 6,7 @@6142 @@ -6591,7 +6887,7 @@ 6060 6143 rm -f conftest.$ac_objext conftest.$ac_ext 6061 6144 6062 6145 fi 6063 6146 -echo "$as_me:6594: result: $cf_cv_posix_c_source" >&5 6064 +echo "$as_me:68 89: result: $cf_cv_posix_c_source" >&56147 +echo "$as_me:6890: result: $cf_cv_posix_c_source" >&5 6065 6148 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 6066 6149 6067 6150 if test "$cf_cv_posix_c_source" != no ; then 6068 @@ -6610,14 +690 5,14 @@6151 @@ -6610,14 +6906,14 @@ 6069 6152 6070 6153 # Work around breakage on OS X 6071 6154 6072 6155 -echo "$as_me:6613: checking if SIGWINCH is defined" >&5 6073 +echo "$as_me:690 8: checking if SIGWINCH is defined" >&56156 +echo "$as_me:6909: checking if SIGWINCH is defined" >&5 6074 6157 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6 6075 6158 if test "${cf_cv_define_sigwinch+set}" = set; then … … 6079 6162 cat >conftest.$ac_ext <<_ACEOF 6080 6163 -#line 6620 "configure" 6081 +#line 691 5"configure"6164 +#line 6916 "configure" 6082 6165 #include "confdefs.h" 6083 6166 6084 6167 #include <sys/types.h> 6085 @@ -6632,23 +692 7,23 @@6168 @@ -6632,23 +6928,23 @@ 6086 6169 } 6087 6170 _ACEOF 6088 6171 rm -f conftest.$ac_objext 6089 6172 -if { (eval echo "$as_me:6635: \"$ac_compile\"") >&5 6090 +if { (eval echo "$as_me:693 0: \"$ac_compile\"") >&56173 +if { (eval echo "$as_me:6931: \"$ac_compile\"") >&5 6091 6174 (eval $ac_compile) 2>&5 6092 6175 ac_status=$? 6093 6176 - echo "$as_me:6638: \$? = $ac_status" >&5 6094 + echo "$as_me:693 3: \$? = $ac_status" >&56177 + echo "$as_me:6934: \$? = $ac_status" >&5 6095 6178 (exit $ac_status); } && 6096 6179 { ac_try='test -s conftest.$ac_objext' 6097 6180 - { (eval echo "$as_me:6641: \"$ac_try\"") >&5 6098 + { (eval echo "$as_me:693 6: \"$ac_try\"") >&56181 + { (eval echo "$as_me:6937: \"$ac_try\"") >&5 6099 6182 (eval $ac_try) 2>&5 6100 6183 ac_status=$? 6101 6184 - echo "$as_me:6644: \$? = $ac_status" >&5 6102 + echo "$as_me:69 39: \$? = $ac_status" >&56185 + echo "$as_me:6940: \$? = $ac_status" >&5 6103 6186 (exit $ac_status); }; }; then 6104 6187 cf_cv_define_sigwinch=yes … … 6108 6191 cat >conftest.$ac_ext <<_ACEOF 6109 6192 -#line 6651 "configure" 6110 +#line 694 6"configure"6193 +#line 6947 "configure" 6111 6194 #include "confdefs.h" 6112 6195 6113 6196 #undef _XOPEN_SOURCE 6114 @@ -6666,16 +696 1,16 @@6197 @@ -6666,16 +6962,16 @@ 6115 6198 } 6116 6199 _ACEOF 6117 6200 rm -f conftest.$ac_objext 6118 6201 -if { (eval echo "$as_me:6669: \"$ac_compile\"") >&5 6119 +if { (eval echo "$as_me:696 4: \"$ac_compile\"") >&56202 +if { (eval echo "$as_me:6965: \"$ac_compile\"") >&5 6120 6203 (eval $ac_compile) 2>&5 6121 6204 ac_status=$? 6122 6205 - echo "$as_me:6672: \$? = $ac_status" >&5 6123 + echo "$as_me:696 7: \$? = $ac_status" >&56206 + echo "$as_me:6968: \$? = $ac_status" >&5 6124 6207 (exit $ac_status); } && 6125 6208 { ac_try='test -s conftest.$ac_objext' 6126 6209 - { (eval echo "$as_me:6675: \"$ac_try\"") >&5 6127 + { (eval echo "$as_me:697 0: \"$ac_try\"") >&56210 + { (eval echo "$as_me:6971: \"$ac_try\"") >&5 6128 6211 (eval $ac_try) 2>&5 6129 6212 ac_status=$? 6130 6213 - echo "$as_me:6678: \$? = $ac_status" >&5 6131 + echo "$as_me:697 3: \$? = $ac_status" >&56214 + echo "$as_me:6974: \$? = $ac_status" >&5 6132 6215 (exit $ac_status); }; }; then 6133 6216 cf_cv_define_sigwinch=maybe 6134 6217 else 6135 @@ -6689,11 +698 4,11 @@6218 @@ -6689,11 +6985,11 @@ 6136 6219 rm -f conftest.$ac_objext conftest.$ac_ext 6137 6220 6138 6221 fi 6139 6222 -echo "$as_me:6692: result: $cf_cv_define_sigwinch" >&5 6140 +echo "$as_me:698 7: result: $cf_cv_define_sigwinch" >&56223 +echo "$as_me:6988: result: $cf_cv_define_sigwinch" >&5 6141 6224 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6 6142 6225 6143 6226 if test "$cf_cv_define_sigwinch" = maybe ; then 6144 6227 -echo "$as_me:6696: checking for actual SIGWINCH definition" >&5 6145 +echo "$as_me:699 1: checking for actual SIGWINCH definition" >&56228 +echo "$as_me:6992: checking for actual SIGWINCH definition" >&5 6146 6229 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6 6147 6230 if test "${cf_cv_fixup_sigwinch+set}" = set; then 6148 6231 echo $ECHO_N "(cached) $ECHO_C" >&6 6149 @@ -6704,7 + 6999,7 @@6232 @@ -6704,7 +7000,7 @@ 6150 6233 while test $cf_sigwinch != 1 6151 6234 do 6152 6235 cat >conftest.$ac_ext <<_ACEOF 6153 6236 -#line 6707 "configure" 6154 +#line 700 2"configure"6237 +#line 7003 "configure" 6155 6238 #include "confdefs.h" 6156 6239 6157 6240 #undef _XOPEN_SOURCE 6158 @@ -6726,16 +702 1,16 @@6241 @@ -6726,16 +7022,16 @@ 6159 6242 } 6160 6243 _ACEOF 6161 6244 rm -f conftest.$ac_objext 6162 6245 -if { (eval echo "$as_me:6729: \"$ac_compile\"") >&5 6163 +if { (eval echo "$as_me:702 4: \"$ac_compile\"") >&56246 +if { (eval echo "$as_me:7025: \"$ac_compile\"") >&5 6164 6247 (eval $ac_compile) 2>&5 6165 6248 ac_status=$? 6166 6249 - echo "$as_me:6732: \$? = $ac_status" >&5 6167 + echo "$as_me:702 7: \$? = $ac_status" >&56250 + echo "$as_me:7028: \$? = $ac_status" >&5 6168 6251 (exit $ac_status); } && 6169 6252 { ac_try='test -s conftest.$ac_objext' 6170 6253 - { (eval echo "$as_me:6735: \"$ac_try\"") >&5 6171 + { (eval echo "$as_me:703 0: \"$ac_try\"") >&56254 + { (eval echo "$as_me:7031: \"$ac_try\"") >&5 6172 6255 (eval $ac_try) 2>&5 6173 6256 ac_status=$? 6174 6257 - echo "$as_me:6738: \$? = $ac_status" >&5 6175 + echo "$as_me:703 3: \$? = $ac_status" >&56258 + echo "$as_me:7034: \$? = $ac_status" >&5 6176 6259 (exit $ac_status); }; }; then 6177 6260 cf_cv_fixup_sigwinch=$cf_sigwinch 6178 6261 break 6179 @@ -6749,7 +704 4,7 @@6262 @@ -6749,7 +7045,7 @@ 6180 6263 done 6181 6264 6182 6265 fi 6183 6266 -echo "$as_me:6752: result: $cf_cv_fixup_sigwinch" >&5 6184 +echo "$as_me:704 7: result: $cf_cv_fixup_sigwinch" >&56267 +echo "$as_me:7048: result: $cf_cv_fixup_sigwinch" >&5 6185 6268 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 6186 6269 6187 6270 if test "$cf_cv_fixup_sigwinch" != unknown ; then 6188 @@ -6759,13 +705 4,13 @@6271 @@ -6759,13 +7055,13 @@ 6189 6272 6190 6273 # Checks for CODESET support. 6191 6274 6192 6275 - echo "$as_me:6762: checking for nl_langinfo and CODESET" >&5 6193 + echo "$as_me:705 7: checking for nl_langinfo and CODESET" >&56276 + echo "$as_me:7058: checking for nl_langinfo and CODESET" >&5 6194 6277 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 6195 6278 if test "${am_cv_langinfo_codeset+set}" = set; then … … 6198 6281 cat >conftest.$ac_ext <<_ACEOF 6199 6282 -#line 6768 "configure" 6200 +#line 706 3"configure"6283 +#line 7064 "configure" 6201 6284 #include "confdefs.h" 6202 6285 #include <langinfo.h> 6203 6286 int 6204 @@ -6777,16 +707 2,16 @@6287 @@ -6777,16 +7073,16 @@ 6205 6288 } 6206 6289 _ACEOF 6207 6290 rm -f conftest.$ac_objext conftest$ac_exeext 6208 6291 -if { (eval echo "$as_me:6780: \"$ac_link\"") >&5 6209 +if { (eval echo "$as_me:707 5: \"$ac_link\"") >&56292 +if { (eval echo "$as_me:7076: \"$ac_link\"") >&5 6210 6293 (eval $ac_link) 2>&5 6211 6294 ac_status=$? 6212 6295 - echo "$as_me:6783: \$? = $ac_status" >&5 6213 + echo "$as_me:707 8: \$? = $ac_status" >&56296 + echo "$as_me:7079: \$? = $ac_status" >&5 6214 6297 (exit $ac_status); } && 6215 6298 { ac_try='test -s conftest$ac_exeext' 6216 6299 - { (eval echo "$as_me:6786: \"$ac_try\"") >&5 6217 + { (eval echo "$as_me:708 1: \"$ac_try\"") >&56300 + { (eval echo "$as_me:7082: \"$ac_try\"") >&5 6218 6301 (eval $ac_try) 2>&5 6219 6302 ac_status=$? 6220 6303 - echo "$as_me:6789: \$? = $ac_status" >&5 6221 + echo "$as_me:708 4: \$? = $ac_status" >&56304 + echo "$as_me:7085: \$? = $ac_status" >&5 6222 6305 (exit $ac_status); }; }; then 6223 6306 am_cv_langinfo_codeset=yes 6224 6307 else 6225 @@ -6797,7 +709 2,7 @@6308 @@ -6797,7 +7093,7 @@ 6226 6309 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 6227 6310 6228 6311 fi 6229 6312 -echo "$as_me:6800: result: $am_cv_langinfo_codeset" >&5 6230 +echo "$as_me:709 5: result: $am_cv_langinfo_codeset" >&56313 +echo "$as_me:7096: result: $am_cv_langinfo_codeset" >&5 6231 6314 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 6232 6315 if test $am_cv_langinfo_codeset = yes; then 6233 6316 6234 @@ -6811,7 +710 6,7 @@6317 @@ -6811,7 +7107,7 @@ 6235 6318 NCURSES_OK_WCHAR_T= 6236 6319 NCURSES_OK_WINT_T= 6237 6320 6238 6321 -echo "$as_me:6814: checking if you want wide-character code" >&5 6239 +echo "$as_me:71 09: checking if you want wide-character code" >&56322 +echo "$as_me:7110: checking if you want wide-character code" >&5 6240 6323 echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 6241 6324 6242 6325 # Check whether --enable-widec or --disable-widec was given. 6243 @@ -6821,7 +711 6,7 @@6326 @@ -6821,7 +7117,7 @@ 6244 6327 else 6245 6328 with_widec=no 6246 6329 fi; 6247 6330 -echo "$as_me:6824: result: $with_widec" >&5 6248 +echo "$as_me:71 19: result: $with_widec" >&56331 +echo "$as_me:7120: result: $with_widec" >&5 6249 6332 echo "${ECHO_T}$with_widec" >&6 6250 6333 if test "$with_widec" = yes ; then 6251 6334 LIB_SUFFIX="w${LIB_SUFFIX}" 6252 @@ -6829,10 +712 4,10 @@6335 @@ -6829,10 +7125,10 @@ 6253 6336 #define USE_WIDEC_SUPPORT 1 6254 6337 EOF 6255 6338 6256 6339 -echo "$as_me:6832: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 6257 +echo "$as_me:712 7: checking if we must define _XOPEN_SOURCE_EXTENDED" >&56340 +echo "$as_me:7128: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 6258 6341 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6 6259 6342 cat >conftest.$ac_ext <<_ACEOF 6260 6343 -#line 6835 "configure" 6261 +#line 713 0"configure"6344 +#line 7131 "configure" 6262 6345 #include "confdefs.h" 6263 6346 #include <sys/types.h> 6264 6347 6265 @@ -6848,16 +714 3,16 @@6348 @@ -6848,16 +7144,16 @@ 6266 6349 } 6267 6350 _ACEOF 6268 6351 rm -f conftest.$ac_objext 6269 6352 -if { (eval echo "$as_me:6851: \"$ac_compile\"") >&5 6270 +if { (eval echo "$as_me:714 6: \"$ac_compile\"") >&56353 +if { (eval echo "$as_me:7147: \"$ac_compile\"") >&5 6271 6354 (eval $ac_compile) 2>&5 6272 6355 ac_status=$? 6273 6356 - echo "$as_me:6854: \$? = $ac_status" >&5 6274 + echo "$as_me:71 49: \$? = $ac_status" >&56357 + echo "$as_me:7150: \$? = $ac_status" >&5 6275 6358 (exit $ac_status); } && 6276 6359 { ac_try='test -s conftest.$ac_objext' 6277 6360 - { (eval echo "$as_me:6857: \"$ac_try\"") >&5 6278 + { (eval echo "$as_me:715 2: \"$ac_try\"") >&56361 + { (eval echo "$as_me:7153: \"$ac_try\"") >&5 6279 6362 (eval $ac_try) 2>&5 6280 6363 ac_status=$? 6281 6364 - echo "$as_me:6860: \$? = $ac_status" >&5 6282 + echo "$as_me:715 5: \$? = $ac_status" >&56365 + echo "$as_me:7156: \$? = $ac_status" >&5 6283 6366 (exit $ac_status); }; }; then 6284 6367 cf_result=no 6285 6368 else 6286 @@ -6866,16 +716 1,16 @@6369 @@ -6866,16 +7162,16 @@ 6287 6370 cf_result=yes 6288 6371 fi 6289 6372 rm -f conftest.$ac_objext conftest.$ac_ext 6290 6373 -echo "$as_me:6869: result: $cf_result" >&5 6291 +echo "$as_me:716 4: result: $cf_result" >&56374 +echo "$as_me:7165: result: $cf_result" >&5 6292 6375 echo "${ECHO_T}$cf_result" >&6 6293 6376 … … 6296 6379 elif test "x" != "x" ; then 6297 6380 - echo "$as_me:6875: checking checking for compatible value versus " >&5 6298 + echo "$as_me:717 0: checking checking for compatible value versus " >&56381 + echo "$as_me:7171: checking checking for compatible value versus " >&5 6299 6382 echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6 6300 6383 cat >conftest.$ac_ext <<_ACEOF 6301 6384 -#line 6878 "configure" 6302 +#line 717 3"configure"6385 +#line 7174 "configure" 6303 6386 #include "confdefs.h" 6304 6387 #include <sys/types.h> 6305 6388 6306 @@ -6891,16 +718 6,16 @@6389 @@ -6891,16 +7187,16 @@ 6307 6390 } 6308 6391 _ACEOF 6309 6392 rm -f conftest.$ac_objext 6310 6393 -if { (eval echo "$as_me:6894: \"$ac_compile\"") >&5 6311 +if { (eval echo "$as_me:71 89: \"$ac_compile\"") >&56394 +if { (eval echo "$as_me:7190: \"$ac_compile\"") >&5 6312 6395 (eval $ac_compile) 2>&5 6313 6396 ac_status=$? 6314 6397 - echo "$as_me:6897: \$? = $ac_status" >&5 6315 + echo "$as_me:719 2: \$? = $ac_status" >&56398 + echo "$as_me:7193: \$? = $ac_status" >&5 6316 6399 (exit $ac_status); } && 6317 6400 { ac_try='test -s conftest.$ac_objext' 6318 6401 - { (eval echo "$as_me:6900: \"$ac_try\"") >&5 6319 + { (eval echo "$as_me:719 5: \"$ac_try\"") >&56402 + { (eval echo "$as_me:7196: \"$ac_try\"") >&5 6320 6403 (eval $ac_try) 2>&5 6321 6404 ac_status=$? 6322 6405 - echo "$as_me:6903: \$? = $ac_status" >&5 6323 + echo "$as_me:719 8: \$? = $ac_status" >&56406 + echo "$as_me:7199: \$? = $ac_status" >&5 6324 6407 (exit $ac_status); }; }; then 6325 6408 cf_result=yes 6326 6409 else 6327 @@ -6909,7 +720 4,7 @@6410 @@ -6909,7 +7205,7 @@ 6328 6411 cf_result=no 6329 6412 fi 6330 6413 rm -f conftest.$ac_objext conftest.$ac_ext 6331 6414 - echo "$as_me:6912: result: $cf_result" >&5 6332 + echo "$as_me:720 7: result: $cf_result" >&56415 + echo "$as_me:7208: result: $cf_result" >&5 6333 6416 echo "${ECHO_T}$cf_result" >&6 6334 6417 if test "$cf_result" = no ; then 6335 6418 # perhaps we can override it - try... 6336 @@ -6923,13 +721 8,13 @@6419 @@ -6923,13 +7219,13 @@ 6337 6420 for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs 6338 6421 do 6339 6422 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 6340 6423 -echo "$as_me:6926: checking for $ac_func" >&5 6341 +echo "$as_me:722 1: checking for $ac_func" >&56424 +echo "$as_me:7222: checking for $ac_func" >&5 6342 6425 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 6343 6426 if eval "test \"\${$as_ac_var+set}\" = set"; then … … 6346 6429 cat >conftest.$ac_ext <<_ACEOF 6347 6430 -#line 6932 "configure" 6348 +#line 722 7"configure"6431 +#line 7228 "configure" 6349 6432 #include "confdefs.h" 6350 6433 /* System header to define __stub macros and hopefully few prototypes, 6351 6434 which can conflict with char $ac_func (); below. */ 6352 @@ -6960,16 +725 5,16 @@6435 @@ -6960,16 +7256,16 @@ 6353 6436 } 6354 6437 _ACEOF 6355 6438 rm -f conftest.$ac_objext conftest$ac_exeext 6356 6439 -if { (eval echo "$as_me:6963: \"$ac_link\"") >&5 6357 +if { (eval echo "$as_me:725 8: \"$ac_link\"") >&56440 +if { (eval echo "$as_me:7259: \"$ac_link\"") >&5 6358 6441 (eval $ac_link) 2>&5 6359 6442 ac_status=$? 6360 6443 - echo "$as_me:6966: \$? = $ac_status" >&5 6361 + echo "$as_me:726 1: \$? = $ac_status" >&56444 + echo "$as_me:7262: \$? = $ac_status" >&5 6362 6445 (exit $ac_status); } && 6363 6446 { ac_try='test -s conftest$ac_exeext' 6364 6447 - { (eval echo "$as_me:6969: \"$ac_try\"") >&5 6365 + { (eval echo "$as_me:726 4: \"$ac_try\"") >&56448 + { (eval echo "$as_me:7265: \"$ac_try\"") >&5 6366 6449 (eval $ac_try) 2>&5 6367 6450 ac_status=$? 6368 6451 - echo "$as_me:6972: \$? = $ac_status" >&5 6369 + echo "$as_me:726 7: \$? = $ac_status" >&56452 + echo "$as_me:7268: \$? = $ac_status" >&5 6370 6453 (exit $ac_status); }; }; then 6371 6454 eval "$as_ac_var=yes" 6372 6455 else 6373 @@ -6979,7 +727 4,7 @@6456 @@ -6979,7 +7275,7 @@ 6374 6457 fi 6375 6458 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 6376 6459 fi 6377 6460 -echo "$as_me:6982: result: `eval echo '${'$as_ac_var'}'`" >&5 6378 +echo "$as_me:727 7: result: `eval echo '${'$as_ac_var'}'`" >&56461 +echo "$as_me:7278: result: `eval echo '${'$as_ac_var'}'`" >&5 6379 6462 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 6380 6463 if test `eval echo '${'$as_ac_var'}'` = yes; then 6381 6464 cat >>confdefs.h <<EOF 6382 @@ -6991,7 +728 6,7 @@6465 @@ -6991,7 +7287,7 @@ 6383 6466 6384 6467 if test "$ac_cv_func_putwc" != yes ; then 6385 6468 6386 6469 -echo "$as_me:6994: checking for multibyte character support" >&5 6387 +echo "$as_me:72 89: checking for multibyte character support" >&56470 +echo "$as_me:7290: checking for multibyte character support" >&5 6388 6471 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 6389 6472 if test "${cf_cv_utf8_lib+set}" = set; then 6390 6473 echo $ECHO_N "(cached) $ECHO_C" >&6 6391 @@ -6999,7 +729 4,7 @@6474 @@ -6999,7 +7295,7 @@ 6392 6475 6393 6476 cf_save_LIBS="$LIBS" 6394 6477 cat >conftest.$ac_ext <<_ACEOF 6395 6478 -#line 7002 "configure" 6396 +#line 729 7"configure"6479 +#line 7298 "configure" 6397 6480 #include "confdefs.h" 6398 6481 6399 6482 #include <stdlib.h> 6400 @@ -7012,16 +730 7,16 @@6483 @@ -7012,16 +7308,16 @@ 6401 6484 } 6402 6485 _ACEOF 6403 6486 rm -f conftest.$ac_objext conftest$ac_exeext 6404 6487 -if { (eval echo "$as_me:7015: \"$ac_link\"") >&5 6405 +if { (eval echo "$as_me:731 0: \"$ac_link\"") >&56488 +if { (eval echo "$as_me:7311: \"$ac_link\"") >&5 6406 6489 (eval $ac_link) 2>&5 6407 6490 ac_status=$? 6408 6491 - echo "$as_me:7018: \$? = $ac_status" >&5 6409 + echo "$as_me:731 3: \$? = $ac_status" >&56492 + echo "$as_me:7314: \$? = $ac_status" >&5 6410 6493 (exit $ac_status); } && 6411 6494 { ac_try='test -s conftest$ac_exeext' 6412 6495 - { (eval echo "$as_me:7021: \"$ac_try\"") >&5 6413 + { (eval echo "$as_me:731 6: \"$ac_try\"") >&56496 + { (eval echo "$as_me:7317: \"$ac_try\"") >&5 6414 6497 (eval $ac_try) 2>&5 6415 6498 ac_status=$? 6416 6499 - echo "$as_me:7024: \$? = $ac_status" >&5 6417 + echo "$as_me:73 19: \$? = $ac_status" >&56500 + echo "$as_me:7320: \$? = $ac_status" >&5 6418 6501 (exit $ac_status); }; }; then 6419 6502 cf_cv_utf8_lib=yes 6420 6503 else 6421 @@ -7033,10 +732 8,10 @@6504 @@ -7033,10 +7329,10 @@ 6422 6505 cf_cv_header_path_utf8= 6423 6506 cf_cv_library_path_utf8= 6424 6507 6425 6508 -echo "${as_me-configure}:7036: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 6426 +echo "${as_me-configure}:733 1: testing Starting FIND_LINKAGE(utf8,) ..." 1>&56509 +echo "${as_me-configure}:7332: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 6427 6510 6428 6511 cat >conftest.$ac_ext <<_ACEOF 6429 6512 -#line 7039 "configure" 6430 +#line 733 4"configure"6513 +#line 7335 "configure" 6431 6514 #include "confdefs.h" 6432 6515 6433 6516 #include <libutf8.h> 6434 @@ -7049,16 +734 4,16 @@6517 @@ -7049,16 +7345,16 @@ 6435 6518 } 6436 6519 _ACEOF 6437 6520 rm -f conftest.$ac_objext conftest$ac_exeext 6438 6521 -if { (eval echo "$as_me:7052: \"$ac_link\"") >&5 6439 +if { (eval echo "$as_me:734 7: \"$ac_link\"") >&56522 +if { (eval echo "$as_me:7348: \"$ac_link\"") >&5 6440 6523 (eval $ac_link) 2>&5 6441 6524 ac_status=$? 6442 6525 - echo "$as_me:7055: \$? = $ac_status" >&5 6443 + echo "$as_me:735 0: \$? = $ac_status" >&56526 + echo "$as_me:7351: \$? = $ac_status" >&5 6444 6527 (exit $ac_status); } && 6445 6528 { ac_try='test -s conftest$ac_exeext' 6446 6529 - { (eval echo "$as_me:7058: \"$ac_try\"") >&5 6447 + { (eval echo "$as_me:735 3: \"$ac_try\"") >&56530 + { (eval echo "$as_me:7354: \"$ac_try\"") >&5 6448 6531 (eval $ac_try) 2>&5 6449 6532 ac_status=$? 6450 6533 - echo "$as_me:7061: \$? = $ac_status" >&5 6451 + echo "$as_me:735 6: \$? = $ac_status" >&56534 + echo "$as_me:7357: \$? = $ac_status" >&5 6452 6535 (exit $ac_status); }; }; then 6453 6536 cf_cv_find_linkage_utf8=yes 6454 6537 else 6455 @@ -7067,12 +736 2,41 @@6538 @@ -7067,12 +7363,41 @@ 6456 6539 6457 6540 cf_cv_find_linkage_utf8=no … … 6460 6543 + test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 6461 6544 + 6462 +echo "${as_me-configure}:736 7: testing find linkage for utf8 library ..." 1>&56463 + 6464 +echo "${as_me-configure}:73 69: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&56545 +echo "${as_me-configure}:7368: testing find linkage for utf8 library ..." 1>&5 6546 + 6547 +echo "${as_me-configure}:7370: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 6465 6548 6466 6549 cf_save_CPPFLAGS="$CPPFLAGS" … … 6497 6580 test "/usr" != "$prefix" && \ 6498 6581 test -d "/usr" && \ 6499 @@ -7143,16 +746 7,18 @@6582 @@ -7143,16 +7468,18 @@ 6500 6583 test -d $oldincludedir/utf8 && cf_search="$cf_search $oldincludedir/utf8" 6501 6584 } … … 6509 6592 6510 6593 -echo "${as_me-configure}:7151: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 6511 +echo "${as_me-configure}:747 7: testing ... testing $cf_cv_header_path_utf8 ..." 1>&56594 +echo "${as_me-configure}:7478: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 6512 6595 6513 6596 CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8" 6514 6597 cat >conftest.$ac_ext <<_ACEOF 6515 6598 -#line 7155 "configure" 6516 +#line 748 1"configure"6599 +#line 7482 "configure" 6517 6600 #include "confdefs.h" 6518 6601 6519 6602 #include <libutf8.h> 6520 @@ -7165,21 +749 1,21 @@6603 @@ -7165,21 +7492,21 @@ 6521 6604 } 6522 6605 _ACEOF 6523 6606 rm -f conftest.$ac_objext 6524 6607 -if { (eval echo "$as_me:7168: \"$ac_compile\"") >&5 6525 +if { (eval echo "$as_me:749 4: \"$ac_compile\"") >&56608 +if { (eval echo "$as_me:7495: \"$ac_compile\"") >&5 6526 6609 (eval $ac_compile) 2>&5 6527 6610 ac_status=$? 6528 6611 - echo "$as_me:7171: \$? = $ac_status" >&5 6529 + echo "$as_me:749 7: \$? = $ac_status" >&56612 + echo "$as_me:7498: \$? = $ac_status" >&5 6530 6613 (exit $ac_status); } && 6531 6614 { ac_try='test -s conftest.$ac_objext' 6532 6615 - { (eval echo "$as_me:7174: \"$ac_try\"") >&5 6533 + { (eval echo "$as_me:750 0: \"$ac_try\"") >&56616 + { (eval echo "$as_me:7501: \"$ac_try\"") >&5 6534 6617 (eval $ac_try) 2>&5 6535 6618 ac_status=$? 6536 6619 - echo "$as_me:7177: \$? = $ac_status" >&5 6537 + echo "$as_me:750 3: \$? = $ac_status" >&56620 + echo "$as_me:7504: \$? = $ac_status" >&5 6538 6621 (exit $ac_status); }; }; then 6539 6622 … … 6541 6624 6542 6625 -echo "${as_me-configure}:7182: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 6543 +echo "${as_me-configure}:750 8: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&56626 +echo "${as_me-configure}:7509: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 6544 6627 6545 6628 cf_cv_find_linkage_utf8=maybe 6546 6629 cf_test_CPPFLAGS="$CPPFLAGS" 6547 @@ -7197,13 +752 3,39 @@6630 @@ -7197,13 +7524,39 @@ 6548 6631 6549 6632 if test "$cf_cv_find_linkage_utf8" = maybe ; then 6550 6633 6551 6634 -echo "${as_me-configure}:7200: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 6552 +echo "${as_me-configure}:752 6: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&56635 +echo "${as_me-configure}:7527: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 6553 6636 6554 6637 cf_save_LIBS="$LIBS" … … 6587 6670 test "/usr" != "$prefix" && \ 6588 6671 test -d "/usr" && \ 6589 @@ -7260,18 +761 2,20 @@6672 @@ -7260,18 +7613,20 @@ 6590 6673 test -d $HOME/utf8/lib/utf8 && cf_search="$cf_search $HOME/utf8/lib/utf8" 6591 6674 } … … 6599 6682 6600 6683 -echo "${as_me-configure}:7268: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 6601 +echo "${as_me-configure}:762 2: testing ... testing $cf_cv_library_path_utf8 ..." 1>&56684 +echo "${as_me-configure}:7623: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 6602 6685 6603 6686 CPPFLAGS="$cf_test_CPPFLAGS" … … 6606 6689 cat >conftest.$ac_ext <<_ACEOF 6607 6690 -#line 7274 "configure" 6608 +#line 762 8"configure"6691 +#line 7629 "configure" 6609 6692 #include "confdefs.h" 6610 6693 6611 6694 #include <libutf8.h> 6612 @@ -7284,21 +763 8,21 @@6695 @@ -7284,21 +7639,21 @@ 6613 6696 } 6614 6697 _ACEOF 6615 6698 rm -f conftest.$ac_objext conftest$ac_exeext 6616 6699 -if { (eval echo "$as_me:7287: \"$ac_link\"") >&5 6617 +if { (eval echo "$as_me:764 1: \"$ac_link\"") >&56700 +if { (eval echo "$as_me:7642: \"$ac_link\"") >&5 6618 6701 (eval $ac_link) 2>&5 6619 6702 ac_status=$? 6620 6703 - echo "$as_me:7290: \$? = $ac_status" >&5 6621 + echo "$as_me:764 4: \$? = $ac_status" >&56704 + echo "$as_me:7645: \$? = $ac_status" >&5 6622 6705 (exit $ac_status); } && 6623 6706 { ac_try='test -s conftest$ac_exeext' 6624 6707 - { (eval echo "$as_me:7293: \"$ac_try\"") >&5 6625 + { (eval echo "$as_me:764 7: \"$ac_try\"") >&56708 + { (eval echo "$as_me:7648: \"$ac_try\"") >&5 6626 6709 (eval $ac_try) 2>&5 6627 6710 ac_status=$? 6628 6711 - echo "$as_me:7296: \$? = $ac_status" >&5 6629 + echo "$as_me:765 0: \$? = $ac_status" >&56712 + echo "$as_me:7651: \$? = $ac_status" >&5 6630 6713 (exit $ac_status); }; }; then 6631 6714 … … 6633 6716 6634 6717 -echo "${as_me-configure}:7301: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 6635 +echo "${as_me-configure}:765 5: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&56718 +echo "${as_me-configure}:7656: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 6636 6719 6637 6720 cf_cv_find_linkage_utf8=yes 6638 6721 cf_cv_library_file_utf8="-lutf8" 6639 @@ -7336,7 +769 0,7 @@6722 @@ -7336,7 +7691,7 @@ 6640 6723 fi 6641 6724 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 6642 6725 fi 6643 6726 -echo "$as_me:7339: result: $cf_cv_utf8_lib" >&5 6644 +echo "$as_me:769 3: result: $cf_cv_utf8_lib" >&56727 +echo "$as_me:7694: result: $cf_cv_utf8_lib" >&5 6645 6728 echo "${ECHO_T}$cf_cv_utf8_lib" >&6 6646 6729 6647 6730 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between 6648 @@ -7364,13 +771 8,13 @@6731 @@ -7364,13 +7719,13 @@ 6649 6732 fi 6650 6733 … … 6658 6741 cat >conftest.$ac_ext <<_ACEOF 6659 6742 -#line 7373 "configure" 6660 +#line 772 7"configure"6743 +#line 7728 "configure" 6661 6744 #include "confdefs.h" 6662 6745 #include <stdio.h> 6663 6746 int 6664 @@ -7382,16 +773 6,16 @@6747 @@ -7382,16 +7737,16 @@ 6665 6748 } 6666 6749 _ACEOF 6667 6750 rm -f conftest.$ac_objext 6668 6751 -if { (eval echo "$as_me:7385: \"$ac_compile\"") >&5 6669 +if { (eval echo "$as_me:77 39: \"$ac_compile\"") >&56752 +if { (eval echo "$as_me:7740: \"$ac_compile\"") >&5 6670 6753 (eval $ac_compile) 2>&5 6671 6754 ac_status=$? 6672 6755 - echo "$as_me:7388: \$? = $ac_status" >&5 6673 + echo "$as_me:774 2: \$? = $ac_status" >&56756 + echo "$as_me:7743: \$? = $ac_status" >&5 6674 6757 (exit $ac_status); } && 6675 6758 { ac_try='test -s conftest.$ac_objext' 6676 6759 - { (eval echo "$as_me:7391: \"$ac_try\"") >&5 6677 + { (eval echo "$as_me:774 5: \"$ac_try\"") >&56760 + { (eval echo "$as_me:7746: \"$ac_try\"") >&5 6678 6761 (eval $ac_try) 2>&5 6679 6762 ac_status=$? 6680 6763 - echo "$as_me:7394: \$? = $ac_status" >&5 6681 + echo "$as_me:774 8: \$? = $ac_status" >&56764 + echo "$as_me:7749: \$? = $ac_status" >&5 6682 6765 (exit $ac_status); }; }; then 6683 6766 : 6684 6767 else 6685 @@ -7408,13 +776 2,13 @@6768 @@ -7408,13 +7763,13 @@ 6686 6769 if test "$cf_have_incdir" = no ; then 6687 6770 test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 6688 6771 6689 6772 -echo "${as_me-configure}:7411: testing adding $cf_add_incdir to include-path ..." 1>&5 6690 +echo "${as_me-configure}:776 5: testing adding $cf_add_incdir to include-path ..." 1>&56773 +echo "${as_me-configure}:7766: testing adding $cf_add_incdir to include-path ..." 1>&5 6691 6774 6692 6775 - CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" … … 6702 6785 break 6703 6786 fi 6704 @@ -7442,7 +779 6,7 @@6787 @@ -7442,7 +7797,7 @@ 6705 6788 if test "$cf_have_libdir" = no ; then 6706 6789 test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 6707 6790 6708 6791 -echo "${as_me-configure}:7445: testing adding $cf_add_libdir to library-path ..." 1>&5 6709 +echo "${as_me-configure}:7 799: testing adding $cf_add_libdir to library-path ..." 1>&56792 +echo "${as_me-configure}:7800: testing adding $cf_add_libdir to library-path ..." 1>&5 6710 6793 6711 6794 LDFLAGS="-L$cf_add_libdir $LDFLAGS" 6712 6795 fi 6713 @@ -7459,14 +781 3,14 @@6796 @@ -7459,14 +7814,14 @@ 6714 6797 fi 6715 6798 6716 6799 # This is needed on Tru64 5.0 to declare mbstate_t 6717 6800 -echo "$as_me:7462: checking if we must include wchar.h to declare mbstate_t" >&5 6718 +echo "$as_me:781 6: checking if we must include wchar.h to declare mbstate_t" >&56801 +echo "$as_me:7817: checking if we must include wchar.h to declare mbstate_t" >&5 6719 6802 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6 6720 6803 if test "${cf_cv_mbstate_t+set}" = set; then … … 6724 6807 cat >conftest.$ac_ext <<_ACEOF 6725 6808 -#line 7469 "configure" 6726 +#line 782 3"configure"6809 +#line 7824 "configure" 6727 6810 #include "confdefs.h" 6728 6811 6729 6812 #include <stdlib.h> 6730 @@ -7484,23 +783 8,23 @@6813 @@ -7484,23 +7839,23 @@ 6731 6814 } 6732 6815 _ACEOF 6733 6816 rm -f conftest.$ac_objext 6734 6817 -if { (eval echo "$as_me:7487: \"$ac_compile\"") >&5 6735 +if { (eval echo "$as_me:784 1: \"$ac_compile\"") >&56818 +if { (eval echo "$as_me:7842: \"$ac_compile\"") >&5 6736 6819 (eval $ac_compile) 2>&5 6737 6820 ac_status=$? 6738 6821 - echo "$as_me:7490: \$? = $ac_status" >&5 6739 + echo "$as_me:784 4: \$? = $ac_status" >&56822 + echo "$as_me:7845: \$? = $ac_status" >&5 6740 6823 (exit $ac_status); } && 6741 6824 { ac_try='test -s conftest.$ac_objext' 6742 6825 - { (eval echo "$as_me:7493: \"$ac_try\"") >&5 6743 + { (eval echo "$as_me:784 7: \"$ac_try\"") >&56826 + { (eval echo "$as_me:7848: \"$ac_try\"") >&5 6744 6827 (eval $ac_try) 2>&5 6745 6828 ac_status=$? 6746 6829 - echo "$as_me:7496: \$? = $ac_status" >&5 6747 + echo "$as_me:785 0: \$? = $ac_status" >&56830 + echo "$as_me:7851: \$? = $ac_status" >&5 6748 6831 (exit $ac_status); }; }; then 6749 6832 cf_cv_mbstate_t=no … … 6753 6836 cat >conftest.$ac_ext <<_ACEOF 6754 6837 -#line 7503 "configure" 6755 +#line 785 7"configure"6838 +#line 7858 "configure" 6756 6839 #include "confdefs.h" 6757 6840 6758 6841 #include <stdlib.h> 6759 @@ -7519,16 +787 3,16 @@6842 @@ -7519,16 +7874,16 @@ 6760 6843 } 6761 6844 _ACEOF 6762 6845 rm -f conftest.$ac_objext 6763 6846 -if { (eval echo "$as_me:7522: \"$ac_compile\"") >&5 6764 +if { (eval echo "$as_me:787 6: \"$ac_compile\"") >&56847 +if { (eval echo "$as_me:7877: \"$ac_compile\"") >&5 6765 6848 (eval $ac_compile) 2>&5 6766 6849 ac_status=$? 6767 6850 - echo "$as_me:7525: \$? = $ac_status" >&5 6768 + echo "$as_me:78 79: \$? = $ac_status" >&56851 + echo "$as_me:7880: \$? = $ac_status" >&5 6769 6852 (exit $ac_status); } && 6770 6853 { ac_try='test -s conftest.$ac_objext' 6771 6854 - { (eval echo "$as_me:7528: \"$ac_try\"") >&5 6772 + { (eval echo "$as_me:788 2: \"$ac_try\"") >&56855 + { (eval echo "$as_me:7883: \"$ac_try\"") >&5 6773 6856 (eval $ac_try) 2>&5 6774 6857 ac_status=$? 6775 6858 - echo "$as_me:7531: \$? = $ac_status" >&5 6776 + echo "$as_me:788 5: \$? = $ac_status" >&56859 + echo "$as_me:7886: \$? = $ac_status" >&5 6777 6860 (exit $ac_status); }; }; then 6778 6861 cf_cv_mbstate_t=yes 6779 6862 else 6780 @@ -7540,7 +789 4,7 @@6863 @@ -7540,7 +7895,7 @@ 6781 6864 fi 6782 6865 rm -f conftest.$ac_objext conftest.$ac_ext 6783 6866 fi 6784 6867 -echo "$as_me:7543: result: $cf_cv_mbstate_t" >&5 6785 +echo "$as_me:789 7: result: $cf_cv_mbstate_t" >&56868 +echo "$as_me:7898: result: $cf_cv_mbstate_t" >&5 6786 6869 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 6787 6870 6788 6871 if test "$cf_cv_mbstate_t" = yes ; then 6789 @@ -7557,14 +791 1,14 @@6872 @@ -7557,14 +7912,14 @@ 6790 6873 fi 6791 6874 6792 6875 # This is needed on Tru64 5.0 to declare wchar_t 6793 6876 -echo "$as_me:7560: checking if we must include wchar.h to declare wchar_t" >&5 6794 +echo "$as_me:791 4: checking if we must include wchar.h to declare wchar_t" >&56877 +echo "$as_me:7915: checking if we must include wchar.h to declare wchar_t" >&5 6795 6878 echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6 6796 6879 if test "${cf_cv_wchar_t+set}" = set; then … … 6800 6883 cat >conftest.$ac_ext <<_ACEOF 6801 6884 -#line 7567 "configure" 6802 +#line 792 1"configure"6885 +#line 7922 "configure" 6803 6886 #include "confdefs.h" 6804 6887 6805 6888 #include <stdlib.h> 6806 @@ -7582,23 +793 6,23 @@6889 @@ -7582,23 +7937,23 @@ 6807 6890 } 6808 6891 _ACEOF 6809 6892 rm -f conftest.$ac_objext 6810 6893 -if { (eval echo "$as_me:7585: \"$ac_compile\"") >&5 6811 +if { (eval echo "$as_me:79 39: \"$ac_compile\"") >&56894 +if { (eval echo "$as_me:7940: \"$ac_compile\"") >&5 6812 6895 (eval $ac_compile) 2>&5 6813 6896 ac_status=$? 6814 6897 - echo "$as_me:7588: \$? = $ac_status" >&5 6815 + echo "$as_me:794 2: \$? = $ac_status" >&56898 + echo "$as_me:7943: \$? = $ac_status" >&5 6816 6899 (exit $ac_status); } && 6817 6900 { ac_try='test -s conftest.$ac_objext' 6818 6901 - { (eval echo "$as_me:7591: \"$ac_try\"") >&5 6819 + { (eval echo "$as_me:794 5: \"$ac_try\"") >&56902 + { (eval echo "$as_me:7946: \"$ac_try\"") >&5 6820 6903 (eval $ac_try) 2>&5 6821 6904 ac_status=$? 6822 6905 - echo "$as_me:7594: \$? = $ac_status" >&5 6823 + echo "$as_me:794 8: \$? = $ac_status" >&56906 + echo "$as_me:7949: \$? = $ac_status" >&5 6824 6907 (exit $ac_status); }; }; then 6825 6908 cf_cv_wchar_t=no … … 6829 6912 cat >conftest.$ac_ext <<_ACEOF 6830 6913 -#line 7601 "configure" 6831 +#line 795 5"configure"6914 +#line 7956 "configure" 6832 6915 #include "confdefs.h" 6833 6916 6834 6917 #include <stdlib.h> 6835 @@ -7617,16 +797 1,16 @@6918 @@ -7617,16 +7972,16 @@ 6836 6919 } 6837 6920 _ACEOF 6838 6921 rm -f conftest.$ac_objext 6839 6922 -if { (eval echo "$as_me:7620: \"$ac_compile\"") >&5 6840 +if { (eval echo "$as_me:797 4: \"$ac_compile\"") >&56923 +if { (eval echo "$as_me:7975: \"$ac_compile\"") >&5 6841 6924 (eval $ac_compile) 2>&5 6842 6925 ac_status=$? 6843 6926 - echo "$as_me:7623: \$? = $ac_status" >&5 6844 + echo "$as_me:797 7: \$? = $ac_status" >&56927 + echo "$as_me:7978: \$? = $ac_status" >&5 6845 6928 (exit $ac_status); } && 6846 6929 { ac_try='test -s conftest.$ac_objext' 6847 6930 - { (eval echo "$as_me:7626: \"$ac_try\"") >&5 6848 + { (eval echo "$as_me:798 0: \"$ac_try\"") >&56931 + { (eval echo "$as_me:7981: \"$ac_try\"") >&5 6849 6932 (eval $ac_try) 2>&5 6850 6933 ac_status=$? 6851 6934 - echo "$as_me:7629: \$? = $ac_status" >&5 6852 + echo "$as_me:798 3: \$? = $ac_status" >&56935 + echo "$as_me:7984: \$? = $ac_status" >&5 6853 6936 (exit $ac_status); }; }; then 6854 6937 cf_cv_wchar_t=yes 6855 6938 else 6856 @@ -7638,7 +799 2,7 @@6939 @@ -7638,7 +7993,7 @@ 6857 6940 fi 6858 6941 rm -f conftest.$ac_objext conftest.$ac_ext 6859 6942 fi 6860 6943 -echo "$as_me:7641: result: $cf_cv_wchar_t" >&5 6861 +echo "$as_me:799 5: result: $cf_cv_wchar_t" >&56944 +echo "$as_me:7996: result: $cf_cv_wchar_t" >&5 6862 6945 echo "${ECHO_T}$cf_cv_wchar_t" >&6 6863 6946 6864 6947 if test "$cf_cv_wchar_t" = yes ; then 6865 @@ -7660,14 +801 4,14 @@6948 @@ -7660,14 +8015,14 @@ 6866 6949 fi 6867 6950 6868 6951 # This is needed on Tru64 5.0 to declare wint_t 6869 6952 -echo "$as_me:7663: checking if we must include wchar.h to declare wint_t" >&5 6870 +echo "$as_me:801 7: checking if we must include wchar.h to declare wint_t" >&56953 +echo "$as_me:8018: checking if we must include wchar.h to declare wint_t" >&5 6871 6954 echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6 6872 6955 if test "${cf_cv_wint_t+set}" = set; then … … 6876 6959 cat >conftest.$ac_ext <<_ACEOF 6877 6960 -#line 7670 "configure" 6878 +#line 802 4"configure"6961 +#line 8025 "configure" 6879 6962 #include "confdefs.h" 6880 6963 6881 6964 #include <stdlib.h> 6882 @@ -7685,23 +80 39,23 @@6965 @@ -7685,23 +8040,23 @@ 6883 6966 } 6884 6967 _ACEOF 6885 6968 rm -f conftest.$ac_objext 6886 6969 -if { (eval echo "$as_me:7688: \"$ac_compile\"") >&5 6887 +if { (eval echo "$as_me:804 2: \"$ac_compile\"") >&56970 +if { (eval echo "$as_me:8043: \"$ac_compile\"") >&5 6888 6971 (eval $ac_compile) 2>&5 6889 6972 ac_status=$? 6890 6973 - echo "$as_me:7691: \$? = $ac_status" >&5 6891 + echo "$as_me:804 5: \$? = $ac_status" >&56974 + echo "$as_me:8046: \$? = $ac_status" >&5 6892 6975 (exit $ac_status); } && 6893 6976 { ac_try='test -s conftest.$ac_objext' 6894 6977 - { (eval echo "$as_me:7694: \"$ac_try\"") >&5 6895 + { (eval echo "$as_me:804 8: \"$ac_try\"") >&56978 + { (eval echo "$as_me:8049: \"$ac_try\"") >&5 6896 6979 (eval $ac_try) 2>&5 6897 6980 ac_status=$? 6898 6981 - echo "$as_me:7697: \$? = $ac_status" >&5 6899 + echo "$as_me:805 1: \$? = $ac_status" >&56982 + echo "$as_me:8052: \$? = $ac_status" >&5 6900 6983 (exit $ac_status); }; }; then 6901 6984 cf_cv_wint_t=no … … 6905 6988 cat >conftest.$ac_ext <<_ACEOF 6906 6989 -#line 7704 "configure" 6907 +#line 805 8"configure"6990 +#line 8059 "configure" 6908 6991 #include "confdefs.h" 6909 6992 6910 6993 #include <stdlib.h> 6911 @@ -7720,16 +807 4,16 @@6994 @@ -7720,16 +8075,16 @@ 6912 6995 } 6913 6996 _ACEOF 6914 6997 rm -f conftest.$ac_objext 6915 6998 -if { (eval echo "$as_me:7723: \"$ac_compile\"") >&5 6916 +if { (eval echo "$as_me:807 7: \"$ac_compile\"") >&56999 +if { (eval echo "$as_me:8078: \"$ac_compile\"") >&5 6917 7000 (eval $ac_compile) 2>&5 6918 7001 ac_status=$? 6919 7002 - echo "$as_me:7726: \$? = $ac_status" >&5 6920 + echo "$as_me:808 0: \$? = $ac_status" >&57003 + echo "$as_me:8081: \$? = $ac_status" >&5 6921 7004 (exit $ac_status); } && 6922 7005 { ac_try='test -s conftest.$ac_objext' 6923 7006 - { (eval echo "$as_me:7729: \"$ac_try\"") >&5 6924 + { (eval echo "$as_me:808 3: \"$ac_try\"") >&57007 + { (eval echo "$as_me:8084: \"$ac_try\"") >&5 6925 7008 (eval $ac_try) 2>&5 6926 7009 ac_status=$? 6927 7010 - echo "$as_me:7732: \$? = $ac_status" >&5 6928 + echo "$as_me:808 6: \$? = $ac_status" >&57011 + echo "$as_me:8087: \$? = $ac_status" >&5 6929 7012 (exit $ac_status); }; }; then 6930 7013 cf_cv_wint_t=yes 6931 7014 else 6932 @@ -7741,7 +809 5,7 @@7015 @@ -7741,7 +8096,7 @@ 6933 7016 fi 6934 7017 rm -f conftest.$ac_objext conftest.$ac_ext 6935 7018 fi 6936 7019 -echo "$as_me:7744: result: $cf_cv_wint_t" >&5 6937 +echo "$as_me:809 8: result: $cf_cv_wint_t" >&57020 +echo "$as_me:8099: result: $cf_cv_wint_t" >&5 6938 7021 echo "${ECHO_T}$cf_cv_wint_t" >&6 6939 7022 6940 7023 if test "$cf_cv_wint_t" = yes ; then 6941 @@ -7780,7 +813 4,7 @@7024 @@ -7780,7 +8135,7 @@ 6942 7025 ;; 6943 7026 esac 6944 7027 6945 7028 -echo "$as_me:7783: checking whether to enable _LP64 definition in curses.h" >&5 6946 +echo "$as_me:813 7: checking whether to enable _LP64 definition in curses.h" >&57029 +echo "$as_me:8138: checking whether to enable _LP64 definition in curses.h" >&5 6947 7030 echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6 6948 7031 6949 7032 # Check whether --enable-lp64 or --disable-lp64 was given. 6950 @@ -7790,7 +814 4,7 @@7033 @@ -7790,7 +8145,7 @@ 6951 7034 else 6952 7035 with_lp64=$default_with_lp64 6953 7036 fi; 6954 7037 -echo "$as_me:7793: result: $with_lp64" >&5 6955 +echo "$as_me:814 7: result: $with_lp64" >&57038 +echo "$as_me:8148: result: $with_lp64" >&5 6956 7039 echo "${ECHO_T}$with_lp64" >&6 6957 7040 6958 7041 if test "$with_lp64" = yes ; then 6959 @@ -7806,7 +816 0,7 @@7042 @@ -7806,7 +8161,7 @@ 6960 7043 fi; 6961 7044 if test "$enable_largefile" != no; then 6962 7045 6963 7046 - echo "$as_me:7809: checking for special C compiler options needed for large files" >&5 6964 + echo "$as_me:816 3: checking for special C compiler options needed for large files" >&57047 + echo "$as_me:8164: checking for special C compiler options needed for large files" >&5 6965 7048 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 6966 7049 if test "${ac_cv_sys_largefile_CC+set}" = set; then 6967 7050 echo $ECHO_N "(cached) $ECHO_C" >&6 6968 @@ -7818,7 +817 2,7 @@7051 @@ -7818,7 +8173,7 @@ 6969 7052 # IRIX 6.2 and later do not support large files by default, 6970 7053 # so use the C compiler's -n32 option if that helps. 6971 7054 cat >conftest.$ac_ext <<_ACEOF 6972 7055 -#line 7821 "configure" 6973 +#line 817 5"configure"7056 +#line 8176 "configure" 6974 7057 #include "confdefs.h" 6975 7058 #include <sys/types.h> 6976 7059 /* Check that off_t can represent 2**63 - 1 correctly. 6977 @@ -7838,16 +819 2,16 @@7060 @@ -7838,16 +8193,16 @@ 6978 7061 } 6979 7062 _ACEOF 6980 7063 rm -f conftest.$ac_objext 6981 7064 -if { (eval echo "$as_me:7841: \"$ac_compile\"") >&5 6982 +if { (eval echo "$as_me:819 5: \"$ac_compile\"") >&57065 +if { (eval echo "$as_me:8196: \"$ac_compile\"") >&5 6983 7066 (eval $ac_compile) 2>&5 6984 7067 ac_status=$? 6985 7068 - echo "$as_me:7844: \$? = $ac_status" >&5 6986 + echo "$as_me:819 8: \$? = $ac_status" >&57069 + echo "$as_me:8199: \$? = $ac_status" >&5 6987 7070 (exit $ac_status); } && 6988 7071 { ac_try='test -s conftest.$ac_objext' 6989 7072 - { (eval echo "$as_me:7847: \"$ac_try\"") >&5 6990 + { (eval echo "$as_me:820 1: \"$ac_try\"") >&57073 + { (eval echo "$as_me:8202: \"$ac_try\"") >&5 6991 7074 (eval $ac_try) 2>&5 6992 7075 ac_status=$? 6993 7076 - echo "$as_me:7850: \$? = $ac_status" >&5 6994 + echo "$as_me:820 4: \$? = $ac_status" >&57077 + echo "$as_me:8205: \$? = $ac_status" >&5 6995 7078 (exit $ac_status); }; }; then 6996 7079 break 6997 7080 else 6998 @@ -7857,16 +821 1,16 @@7081 @@ -7857,16 +8212,16 @@ 6999 7082 rm -f conftest.$ac_objext 7000 7083 CC="$CC -n32" 7001 7084 rm -f conftest.$ac_objext 7002 7085 -if { (eval echo "$as_me:7860: \"$ac_compile\"") >&5 7003 +if { (eval echo "$as_me:821 4: \"$ac_compile\"") >&57086 +if { (eval echo "$as_me:8215: \"$ac_compile\"") >&5 7004 7087 (eval $ac_compile) 2>&5 7005 7088 ac_status=$? 7006 7089 - echo "$as_me:7863: \$? = $ac_status" >&5 7007 + echo "$as_me:821 7: \$? = $ac_status" >&57090 + echo "$as_me:8218: \$? = $ac_status" >&5 7008 7091 (exit $ac_status); } && 7009 7092 { ac_try='test -s conftest.$ac_objext' 7010 7093 - { (eval echo "$as_me:7866: \"$ac_try\"") >&5 7011 + { (eval echo "$as_me:822 0: \"$ac_try\"") >&57094 + { (eval echo "$as_me:8221: \"$ac_try\"") >&5 7012 7095 (eval $ac_try) 2>&5 7013 7096 ac_status=$? 7014 7097 - echo "$as_me:7869: \$? = $ac_status" >&5 7015 + echo "$as_me:822 3: \$? = $ac_status" >&57098 + echo "$as_me:8224: \$? = $ac_status" >&5 7016 7099 (exit $ac_status); }; }; then 7017 7100 ac_cv_sys_largefile_CC=' -n32'; break 7018 7101 else 7019 @@ -7880,13 +823 4,13 @@7102 @@ -7880,13 +8235,13 @@ 7020 7103 rm -f conftest.$ac_ext 7021 7104 fi 7022 7105 fi 7023 7106 -echo "$as_me:7883: result: $ac_cv_sys_largefile_CC" >&5 7024 +echo "$as_me:823 7: result: $ac_cv_sys_largefile_CC" >&57107 +echo "$as_me:8238: result: $ac_cv_sys_largefile_CC" >&5 7025 7108 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 7026 7109 if test "$ac_cv_sys_largefile_CC" != no; then … … 7029 7112 7030 7113 - echo "$as_me:7889: checking for _FILE_OFFSET_BITS value needed for large files" >&5 7031 + echo "$as_me:824 3: checking for _FILE_OFFSET_BITS value needed for large files" >&57114 + echo "$as_me:8244: checking for _FILE_OFFSET_BITS value needed for large files" >&5 7032 7115 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 7033 7116 if test "${ac_cv_sys_file_offset_bits+set}" = set; then 7034 7117 echo $ECHO_N "(cached) $ECHO_C" >&6 7035 @@ -7894,7 +824 8,7 @@7118 @@ -7894,7 +8249,7 @@ 7036 7119 while :; do 7037 7120 ac_cv_sys_file_offset_bits=no 7038 7121 cat >conftest.$ac_ext <<_ACEOF 7039 7122 -#line 7897 "configure" 7040 +#line 825 1"configure"7123 +#line 8252 "configure" 7041 7124 #include "confdefs.h" 7042 7125 #include <sys/types.h> 7043 7126 /* Check that off_t can represent 2**63 - 1 correctly. 7044 @@ -7914,16 +826 8,16 @@7127 @@ -7914,16 +8269,16 @@ 7045 7128 } 7046 7129 _ACEOF 7047 7130 rm -f conftest.$ac_objext 7048 7131 -if { (eval echo "$as_me:7917: \"$ac_compile\"") >&5 7049 +if { (eval echo "$as_me:827 1: \"$ac_compile\"") >&57132 +if { (eval echo "$as_me:8272: \"$ac_compile\"") >&5 7050 7133 (eval $ac_compile) 2>&5 7051 7134 ac_status=$? 7052 7135 - echo "$as_me:7920: \$? = $ac_status" >&5 7053 + echo "$as_me:827 4: \$? = $ac_status" >&57136 + echo "$as_me:8275: \$? = $ac_status" >&5 7054 7137 (exit $ac_status); } && 7055 7138 { ac_try='test -s conftest.$ac_objext' 7056 7139 - { (eval echo "$as_me:7923: \"$ac_try\"") >&5 7057 + { (eval echo "$as_me:827 7: \"$ac_try\"") >&57140 + { (eval echo "$as_me:8278: \"$ac_try\"") >&5 7058 7141 (eval $ac_try) 2>&5 7059 7142 ac_status=$? 7060 7143 - echo "$as_me:7926: \$? = $ac_status" >&5 7061 + echo "$as_me:828 0: \$? = $ac_status" >&57144 + echo "$as_me:8281: \$? = $ac_status" >&5 7062 7145 (exit $ac_status); }; }; then 7063 7146 break 7064 7147 else 7065 @@ -7932,7 +828 6,7 @@7148 @@ -7932,7 +8287,7 @@ 7066 7149 fi 7067 7150 rm -f conftest.$ac_objext conftest.$ac_ext 7068 7151 cat >conftest.$ac_ext <<_ACEOF 7069 7152 -#line 7935 "configure" 7070 +#line 82 89"configure"7153 +#line 8290 "configure" 7071 7154 #include "confdefs.h" 7072 7155 #define _FILE_OFFSET_BITS 64 7073 7156 #include <sys/types.h> 7074 @@ -7953,16 +830 7,16 @@7157 @@ -7953,16 +8308,16 @@ 7075 7158 } 7076 7159 _ACEOF 7077 7160 rm -f conftest.$ac_objext 7078 7161 -if { (eval echo "$as_me:7956: \"$ac_compile\"") >&5 7079 +if { (eval echo "$as_me:831 0: \"$ac_compile\"") >&57162 +if { (eval echo "$as_me:8311: \"$ac_compile\"") >&5 7080 7163 (eval $ac_compile) 2>&5 7081 7164 ac_status=$? 7082 7165 - echo "$as_me:7959: \$? = $ac_status" >&5 7083 + echo "$as_me:831 3: \$? = $ac_status" >&57166 + echo "$as_me:8314: \$? = $ac_status" >&5 7084 7167 (exit $ac_status); } && 7085 7168 { ac_try='test -s conftest.$ac_objext' 7086 7169 - { (eval echo "$as_me:7962: \"$ac_try\"") >&5 7087 + { (eval echo "$as_me:831 6: \"$ac_try\"") >&57170 + { (eval echo "$as_me:8317: \"$ac_try\"") >&5 7088 7171 (eval $ac_try) 2>&5 7089 7172 ac_status=$? 7090 7173 - echo "$as_me:7965: \$? = $ac_status" >&5 7091 + echo "$as_me:83 19: \$? = $ac_status" >&57174 + echo "$as_me:8320: \$? = $ac_status" >&5 7092 7175 (exit $ac_status); }; }; then 7093 7176 ac_cv_sys_file_offset_bits=64; break 7094 7177 else 7095 @@ -7973,7 +832 7,7 @@7178 @@ -7973,7 +8328,7 @@ 7096 7179 break 7097 7180 done 7098 7181 fi 7099 7182 -echo "$as_me:7976: result: $ac_cv_sys_file_offset_bits" >&5 7100 +echo "$as_me:833 0: result: $ac_cv_sys_file_offset_bits" >&57183 +echo "$as_me:8331: result: $ac_cv_sys_file_offset_bits" >&5 7101 7184 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 7102 7185 if test "$ac_cv_sys_file_offset_bits" != no; then 7103 7186 7104 @@ -7983,7 +833 7,7 @@7187 @@ -7983,7 +8338,7 @@ 7105 7188 7106 7189 fi 7107 7190 rm -f conftest* 7108 7191 - echo "$as_me:7986: checking for _LARGE_FILES value needed for large files" >&5 7109 + echo "$as_me:834 0: checking for _LARGE_FILES value needed for large files" >&57192 + echo "$as_me:8341: checking for _LARGE_FILES value needed for large files" >&5 7110 7193 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 7111 7194 if test "${ac_cv_sys_large_files+set}" = set; then 7112 7195 echo $ECHO_N "(cached) $ECHO_C" >&6 7113 @@ -7991,7 +834 5,7 @@7196 @@ -7991,7 +8346,7 @@ 7114 7197 while :; do 7115 7198 ac_cv_sys_large_files=no 7116 7199 cat >conftest.$ac_ext <<_ACEOF 7117 7200 -#line 7994 "configure" 7118 +#line 834 8"configure"7201 +#line 8349 "configure" 7119 7202 #include "confdefs.h" 7120 7203 #include <sys/types.h> 7121 7204 /* Check that off_t can represent 2**63 - 1 correctly. 7122 @@ -8011,16 +836 5,16 @@7205 @@ -8011,16 +8366,16 @@ 7123 7206 } 7124 7207 _ACEOF 7125 7208 rm -f conftest.$ac_objext 7126 7209 -if { (eval echo "$as_me:8014: \"$ac_compile\"") >&5 7127 +if { (eval echo "$as_me:836 8: \"$ac_compile\"") >&57210 +if { (eval echo "$as_me:8369: \"$ac_compile\"") >&5 7128 7211 (eval $ac_compile) 2>&5 7129 7212 ac_status=$? 7130 7213 - echo "$as_me:8017: \$? = $ac_status" >&5 7131 + echo "$as_me:837 1: \$? = $ac_status" >&57214 + echo "$as_me:8372: \$? = $ac_status" >&5 7132 7215 (exit $ac_status); } && 7133 7216 { ac_try='test -s conftest.$ac_objext' 7134 7217 - { (eval echo "$as_me:8020: \"$ac_try\"") >&5 7135 + { (eval echo "$as_me:837 4: \"$ac_try\"") >&57218 + { (eval echo "$as_me:8375: \"$ac_try\"") >&5 7136 7219 (eval $ac_try) 2>&5 7137 7220 ac_status=$? 7138 7221 - echo "$as_me:8023: \$? = $ac_status" >&5 7139 + echo "$as_me:837 7: \$? = $ac_status" >&57222 + echo "$as_me:8378: \$? = $ac_status" >&5 7140 7223 (exit $ac_status); }; }; then 7141 7224 break 7142 7225 else 7143 @@ -8029,7 +838 3,7 @@7226 @@ -8029,7 +8384,7 @@ 7144 7227 fi 7145 7228 rm -f conftest.$ac_objext conftest.$ac_ext 7146 7229 cat >conftest.$ac_ext <<_ACEOF 7147 7230 -#line 8032 "configure" 7148 +#line 838 6"configure"7231 +#line 8387 "configure" 7149 7232 #include "confdefs.h" 7150 7233 #define _LARGE_FILES 1 7151 7234 #include <sys/types.h> 7152 @@ -8050,16 +840 4,16 @@7235 @@ -8050,16 +8405,16 @@ 7153 7236 } 7154 7237 _ACEOF 7155 7238 rm -f conftest.$ac_objext 7156 7239 -if { (eval echo "$as_me:8053: \"$ac_compile\"") >&5 7157 +if { (eval echo "$as_me:840 7: \"$ac_compile\"") >&57240 +if { (eval echo "$as_me:8408: \"$ac_compile\"") >&5 7158 7241 (eval $ac_compile) 2>&5 7159 7242 ac_status=$? 7160 7243 - echo "$as_me:8056: \$? = $ac_status" >&5 7161 + echo "$as_me:841 0: \$? = $ac_status" >&57244 + echo "$as_me:8411: \$? = $ac_status" >&5 7162 7245 (exit $ac_status); } && 7163 7246 { ac_try='test -s conftest.$ac_objext' 7164 7247 - { (eval echo "$as_me:8059: \"$ac_try\"") >&5 7165 + { (eval echo "$as_me:841 3: \"$ac_try\"") >&57248 + { (eval echo "$as_me:8414: \"$ac_try\"") >&5 7166 7249 (eval $ac_try) 2>&5 7167 7250 ac_status=$? 7168 7251 - echo "$as_me:8062: \$? = $ac_status" >&5 7169 + echo "$as_me:841 6: \$? = $ac_status" >&57252 + echo "$as_me:8417: \$? = $ac_status" >&5 7170 7253 (exit $ac_status); }; }; then 7171 7254 ac_cv_sys_large_files=1; break 7172 7255 else 7173 @@ -8070,7 +842 4,7 @@7256 @@ -8070,7 +8425,7 @@ 7174 7257 break 7175 7258 done 7176 7259 fi 7177 7260 -echo "$as_me:8073: result: $ac_cv_sys_large_files" >&5 7178 +echo "$as_me:842 7: result: $ac_cv_sys_large_files" >&57261 +echo "$as_me:8428: result: $ac_cv_sys_large_files" >&5 7179 7262 echo "${ECHO_T}$ac_cv_sys_large_files" >&6 7180 7263 if test "$ac_cv_sys_large_files" != no; then 7181 7264 7182 @@ -8083,7 +843 7,7 @@7265 @@ -8083,7 +8438,7 @@ 7183 7266 fi 7184 7267 7185 7268 if test "$enable_largefile" != no ; then 7186 7269 - echo "$as_me:8086: checking for _LARGEFILE_SOURCE value needed for large files" >&5 7187 + echo "$as_me:844 0: checking for _LARGEFILE_SOURCE value needed for large files" >&57270 + echo "$as_me:8441: checking for _LARGEFILE_SOURCE value needed for large files" >&5 7188 7271 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 7189 7272 if test "${ac_cv_sys_largefile_source+set}" = set; then 7190 7273 echo $ECHO_N "(cached) $ECHO_C" >&6 7191 @@ -8091,7 +844 5,7 @@7274 @@ -8091,7 +8446,7 @@ 7192 7275 while :; do 7193 7276 ac_cv_sys_largefile_source=no 7194 7277 cat >conftest.$ac_ext <<_ACEOF 7195 7278 -#line 8094 "configure" 7196 +#line 844 8"configure"7279 +#line 8449 "configure" 7197 7280 #include "confdefs.h" 7198 7281 #include <stdio.h> 7199 7282 int 7200 @@ -8103,16 +845 7,16 @@7283 @@ -8103,16 +8458,16 @@ 7201 7284 } 7202 7285 _ACEOF 7203 7286 rm -f conftest.$ac_objext 7204 7287 -if { (eval echo "$as_me:8106: \"$ac_compile\"") >&5 7205 +if { (eval echo "$as_me:846 0: \"$ac_compile\"") >&57288 +if { (eval echo "$as_me:8461: \"$ac_compile\"") >&5 7206 7289 (eval $ac_compile) 2>&5 7207 7290 ac_status=$? 7208 7291 - echo "$as_me:8109: \$? = $ac_status" >&5 7209 + echo "$as_me:846 3: \$? = $ac_status" >&57292 + echo "$as_me:8464: \$? = $ac_status" >&5 7210 7293 (exit $ac_status); } && 7211 7294 { ac_try='test -s conftest.$ac_objext' 7212 7295 - { (eval echo "$as_me:8112: \"$ac_try\"") >&5 7213 + { (eval echo "$as_me:846 6: \"$ac_try\"") >&57296 + { (eval echo "$as_me:8467: \"$ac_try\"") >&5 7214 7297 (eval $ac_try) 2>&5 7215 7298 ac_status=$? 7216 7299 - echo "$as_me:8115: \$? = $ac_status" >&5 7217 + echo "$as_me:84 69: \$? = $ac_status" >&57300 + echo "$as_me:8470: \$? = $ac_status" >&5 7218 7301 (exit $ac_status); }; }; then 7219 7302 break 7220 7303 else 7221 @@ -8121,7 +847 5,7 @@7304 @@ -8121,7 +8476,7 @@ 7222 7305 fi 7223 7306 rm -f conftest.$ac_objext conftest.$ac_ext 7224 7307 cat >conftest.$ac_ext <<_ACEOF 7225 7308 -#line 8124 "configure" 7226 +#line 847 8"configure"7309 +#line 8479 "configure" 7227 7310 #include "confdefs.h" 7228 7311 #define _LARGEFILE_SOURCE 1 7229 7312 #include <stdio.h> 7230 @@ -8134,16 +848 8,16 @@7313 @@ -8134,16 +8489,16 @@ 7231 7314 } 7232 7315 _ACEOF 7233 7316 rm -f conftest.$ac_objext 7234 7317 -if { (eval echo "$as_me:8137: \"$ac_compile\"") >&5 7235 +if { (eval echo "$as_me:849 1: \"$ac_compile\"") >&57318 +if { (eval echo "$as_me:8492: \"$ac_compile\"") >&5 7236 7319 (eval $ac_compile) 2>&5 7237 7320 ac_status=$? 7238 7321 - echo "$as_me:8140: \$? = $ac_status" >&5 7239 + echo "$as_me:849 4: \$? = $ac_status" >&57322 + echo "$as_me:8495: \$? = $ac_status" >&5 7240 7323 (exit $ac_status); } && 7241 7324 { ac_try='test -s conftest.$ac_objext' 7242 7325 - { (eval echo "$as_me:8143: \"$ac_try\"") >&5 7243 + { (eval echo "$as_me:849 7: \"$ac_try\"") >&57326 + { (eval echo "$as_me:8498: \"$ac_try\"") >&5 7244 7327 (eval $ac_try) 2>&5 7245 7328 ac_status=$? 7246 7329 - echo "$as_me:8146: \$? = $ac_status" >&5 7247 + echo "$as_me:850 0: \$? = $ac_status" >&57330 + echo "$as_me:8501: \$? = $ac_status" >&5 7248 7331 (exit $ac_status); }; }; then 7249 7332 ac_cv_sys_largefile_source=1; break 7250 7333 else 7251 @@ -8154,7 +850 8,7 @@7334 @@ -8154,7 +8509,7 @@ 7252 7335 break 7253 7336 done 7254 7337 fi 7255 7338 -echo "$as_me:8157: result: $ac_cv_sys_largefile_source" >&5 7256 +echo "$as_me:851 1: result: $ac_cv_sys_largefile_source" >&57339 +echo "$as_me:8512: result: $ac_cv_sys_largefile_source" >&5 7257 7340 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 7258 7341 if test "$ac_cv_sys_largefile_source" != no; then 7259 7342 7260 @@ -8168,13 +852 2,13 @@7343 @@ -8168,13 +8523,13 @@ 7261 7344 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug 7262 7345 # in glibc 2.1.3, but that breaks too many other things. 7263 7346 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. 7264 7347 -echo "$as_me:8171: checking for fseeko" >&5 7265 +echo "$as_me:852 5: checking for fseeko" >&57348 +echo "$as_me:8526: checking for fseeko" >&5 7266 7349 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 7267 7350 if test "${ac_cv_func_fseeko+set}" = set; then … … 7270 7353 cat >conftest.$ac_ext <<_ACEOF 7271 7354 -#line 8177 "configure" 7272 +#line 853 1"configure"7355 +#line 8532 "configure" 7273 7356 #include "confdefs.h" 7274 7357 #include <stdio.h> 7275 7358 int 7276 @@ -8186,16 +854 0,16 @@7359 @@ -8186,16 +8541,16 @@ 7277 7360 } 7278 7361 _ACEOF 7279 7362 rm -f conftest.$ac_objext conftest$ac_exeext 7280 7363 -if { (eval echo "$as_me:8189: \"$ac_link\"") >&5 7281 +if { (eval echo "$as_me:854 3: \"$ac_link\"") >&57364 +if { (eval echo "$as_me:8544: \"$ac_link\"") >&5 7282 7365 (eval $ac_link) 2>&5 7283 7366 ac_status=$? 7284 7367 - echo "$as_me:8192: \$? = $ac_status" >&5 7285 + echo "$as_me:854 6: \$? = $ac_status" >&57368 + echo "$as_me:8547: \$? = $ac_status" >&5 7286 7369 (exit $ac_status); } && 7287 7370 { ac_try='test -s conftest$ac_exeext' 7288 7371 - { (eval echo "$as_me:8195: \"$ac_try\"") >&5 7289 + { (eval echo "$as_me:85 49: \"$ac_try\"") >&57372 + { (eval echo "$as_me:8550: \"$ac_try\"") >&5 7290 7373 (eval $ac_try) 2>&5 7291 7374 ac_status=$? 7292 7375 - echo "$as_me:8198: \$? = $ac_status" >&5 7293 + echo "$as_me:855 2: \$? = $ac_status" >&57376 + echo "$as_me:8553: \$? = $ac_status" >&5 7294 7377 (exit $ac_status); }; }; then 7295 7378 ac_cv_func_fseeko=yes 7296 7379 else 7297 @@ -8205,7 +85 59,7 @@7380 @@ -8205,7 +8560,7 @@ 7298 7381 fi 7299 7382 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 7300 7383 fi 7301 7384 -echo "$as_me:8208: result: $ac_cv_func_fseeko" >&5 7302 +echo "$as_me:856 2: result: $ac_cv_func_fseeko" >&57385 +echo "$as_me:8563: result: $ac_cv_func_fseeko" >&5 7303 7386 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 7304 7387 if test $ac_cv_func_fseeko = yes; then 7305 7388 7306 @@ -8226,14 +858 0,14 @@7389 @@ -8226,14 +8581,14 @@ 7307 7390 test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE " 7308 7391 test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits " 7309 7392 7310 7393 - echo "$as_me:8229: checking whether to use struct dirent64" >&5 7311 + echo "$as_me:858 3: checking whether to use struct dirent64" >&57394 + echo "$as_me:8584: checking whether to use struct dirent64" >&5 7312 7395 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 7313 7396 if test "${cf_cv_struct_dirent64+set}" = set; then … … 7317 7400 cat >conftest.$ac_ext <<_ACEOF 7318 7401 -#line 8236 "configure" 7319 +#line 859 0"configure"7402 +#line 8591 "configure" 7320 7403 #include "confdefs.h" 7321 7404 7322 7405 #include <sys/types.h> 7323 @@ -8254,16 +860 8,16 @@7406 @@ -8254,16 +8609,16 @@ 7324 7407 } 7325 7408 _ACEOF 7326 7409 rm -f conftest.$ac_objext 7327 7410 -if { (eval echo "$as_me:8257: \"$ac_compile\"") >&5 7328 +if { (eval echo "$as_me:861 1: \"$ac_compile\"") >&57411 +if { (eval echo "$as_me:8612: \"$ac_compile\"") >&5 7329 7412 (eval $ac_compile) 2>&5 7330 7413 ac_status=$? 7331 7414 - echo "$as_me:8260: \$? = $ac_status" >&5 7332 + echo "$as_me:861 4: \$? = $ac_status" >&57415 + echo "$as_me:8615: \$? = $ac_status" >&5 7333 7416 (exit $ac_status); } && 7334 7417 { ac_try='test -s conftest.$ac_objext' 7335 7418 - { (eval echo "$as_me:8263: \"$ac_try\"") >&5 7336 + { (eval echo "$as_me:861 7: \"$ac_try\"") >&57419 + { (eval echo "$as_me:8618: \"$ac_try\"") >&5 7337 7420 (eval $ac_try) 2>&5 7338 7421 ac_status=$? 7339 7422 - echo "$as_me:8266: \$? = $ac_status" >&5 7340 + echo "$as_me:862 0: \$? = $ac_status" >&57423 + echo "$as_me:8621: \$? = $ac_status" >&5 7341 7424 (exit $ac_status); }; }; then 7342 7425 cf_cv_struct_dirent64=yes 7343 7426 else 7344 @@ -8274,7 +862 8,7 @@7427 @@ -8274,7 +8629,7 @@ 7345 7428 rm -f conftest.$ac_objext conftest.$ac_ext 7346 7429 7347 7430 fi 7348 7431 -echo "$as_me:8277: result: $cf_cv_struct_dirent64" >&5 7349 +echo "$as_me:863 1: result: $cf_cv_struct_dirent64" >&57432 +echo "$as_me:8632: result: $cf_cv_struct_dirent64" >&5 7350 7433 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 7351 7434 test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF 7352 7435 #define HAVE_STRUCT_DIRENT64 1 7353 @@ -8283,7 +863 7,7 @@7436 @@ -8283,7 +8638,7 @@ 7354 7437 fi 7355 7438 7356 7439 ### use option --disable-tparm-varargs to make tparm() conform to X/Open 7357 7440 -echo "$as_me:8286: checking if you want tparm not to use X/Open fixed-parameter list" >&5 7358 +echo "$as_me:864 0: checking if you want tparm not to use X/Open fixed-parameter list" >&57441 +echo "$as_me:8641: checking if you want tparm not to use X/Open fixed-parameter list" >&5 7359 7442 echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6 7360 7443 7361 7444 # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given. 7362 @@ -8293,14 +864 7,14 @@7445 @@ -8293,14 +8648,14 @@ 7363 7446 else 7364 7447 with_tparm_varargs=yes 7365 7448 fi; 7366 7449 -echo "$as_me:8296: result: $with_tparm_varargs" >&5 7367 +echo "$as_me:865 0: result: $with_tparm_varargs" >&57450 +echo "$as_me:8651: result: $with_tparm_varargs" >&5 7368 7451 echo "${ECHO_T}$with_tparm_varargs" >&6 7369 7452 NCURSES_TPARM_VARARGS=0 … … 7373 7456 if test "$with_ticlib" != no ; then 7374 7457 -echo "$as_me:8303: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 7375 +echo "$as_me:865 7: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&57458 +echo "$as_me:8658: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 7376 7459 echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6 7377 7460 7378 7461 # Check whether --enable-tic-depends or --disable-tic-depends was given. 7379 @@ -8310,14 +866 4,14 @@7462 @@ -8310,14 +8665,14 @@ 7380 7463 else 7381 7464 with_tic_depends=yes 7382 7465 fi; 7383 7466 -echo "$as_me:8313: result: $with_tic_depends" >&5 7384 +echo "$as_me:866 7: result: $with_tic_depends" >&57467 +echo "$as_me:8668: result: $with_tic_depends" >&5 7385 7468 echo "${ECHO_T}$with_tic_depends" >&6 7386 7469 else … … 7390 7473 ### use option --with-bool to override bool's type 7391 7474 -echo "$as_me:8320: checking for type of bool" >&5 7392 +echo "$as_me:867 4: checking for type of bool" >&57475 +echo "$as_me:8675: checking for type of bool" >&5 7393 7476 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 7394 7477 7395 7478 # Check whether --with-bool or --without-bool was given. 7396 @@ -8327,10 +868 1,10 @@7479 @@ -8327,10 +8682,10 @@ 7397 7480 else 7398 7481 NCURSES_BOOL=auto 7399 7482 fi; 7400 7483 -echo "$as_me:8330: result: $NCURSES_BOOL" >&5 7401 +echo "$as_me:868 4: result: $NCURSES_BOOL" >&57484 +echo "$as_me:8685: result: $NCURSES_BOOL" >&5 7402 7485 echo "${ECHO_T}$NCURSES_BOOL" >&6 7403 7486 7404 7487 -echo "$as_me:8333: checking for alternate terminal capabilities file" >&5 7405 +echo "$as_me:868 7: checking for alternate terminal capabilities file" >&57488 +echo "$as_me:8688: checking for alternate terminal capabilities file" >&5 7406 7489 echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6 7407 7490 7408 7491 # Check whether --with-caps or --without-caps was given. 7409 @@ -8341,11 +869 5,11 @@7492 @@ -8341,11 +8696,11 @@ 7410 7493 TERMINFO_CAPS=Caps 7411 7494 fi; 7412 7495 test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps 7413 7496 -echo "$as_me:8344: result: $TERMINFO_CAPS" >&5 7414 +echo "$as_me:869 8: result: $TERMINFO_CAPS" >&57497 +echo "$as_me:8699: result: $TERMINFO_CAPS" >&5 7415 7498 echo "${ECHO_T}$TERMINFO_CAPS" >&6 7416 7499 7417 7500 ### use option --with-chtype to override chtype's type 7418 7501 -echo "$as_me:8348: checking for type of chtype" >&5 7419 +echo "$as_me:870 2: checking for type of chtype" >&57502 +echo "$as_me:8703: checking for type of chtype" >&5 7420 7503 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 7421 7504 7422 7505 # Check whether --with-chtype or --without-chtype was given. 7423 @@ -8355,11 +87 09,11 @@7506 @@ -8355,11 +8710,11 @@ 7424 7507 else 7425 7508 NCURSES_CHTYPE=auto 7426 7509 fi; 7427 7510 -echo "$as_me:8358: result: $NCURSES_CHTYPE" >&5 7428 +echo "$as_me:871 2: result: $NCURSES_CHTYPE" >&57511 +echo "$as_me:8713: result: $NCURSES_CHTYPE" >&5 7429 7512 echo "${ECHO_T}$NCURSES_CHTYPE" >&6 7430 7513 7431 7514 ### use option --with-ospeed to override ospeed's type 7432 7515 -echo "$as_me:8362: checking for type of ospeed" >&5 7433 +echo "$as_me:871 6: checking for type of ospeed" >&57516 +echo "$as_me:8717: checking for type of ospeed" >&5 7434 7517 echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6 7435 7518 7436 7519 # Check whether --with-ospeed or --without-ospeed was given. 7437 @@ -8369,11 +872 3,11 @@7520 @@ -8369,11 +8724,11 @@ 7438 7521 else 7439 7522 NCURSES_OSPEED=short 7440 7523 fi; 7441 7524 -echo "$as_me:8372: result: $NCURSES_OSPEED" >&5 7442 +echo "$as_me:872 6: result: $NCURSES_OSPEED" >&57525 +echo "$as_me:8727: result: $NCURSES_OSPEED" >&5 7443 7526 echo "${ECHO_T}$NCURSES_OSPEED" >&6 7444 7527 7445 7528 ### use option --with-mmask-t to override mmask_t's type 7446 7529 -echo "$as_me:8376: checking for type of mmask_t" >&5 7447 +echo "$as_me:873 0: checking for type of mmask_t" >&57530 +echo "$as_me:8731: checking for type of mmask_t" >&5 7448 7531 echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6 7449 7532 7450 7533 # Check whether --with-mmask-t or --without-mmask-t was given. 7451 @@ -8383,11 +873 7,11 @@7534 @@ -8383,11 +8738,11 @@ 7452 7535 else 7453 7536 NCURSES_MMASK_T=auto 7454 7537 fi; 7455 7538 -echo "$as_me:8386: result: $NCURSES_MMASK_T" >&5 7456 +echo "$as_me:874 0: result: $NCURSES_MMASK_T" >&57539 +echo "$as_me:8741: result: $NCURSES_MMASK_T" >&5 7457 7540 echo "${ECHO_T}$NCURSES_MMASK_T" >&6 7458 7541 7459 7542 ### Enable compiling-in rcs id's 7460 7543 -echo "$as_me:8390: checking if RCS identifiers should be compiled-in" >&5 7461 +echo "$as_me:874 4: checking if RCS identifiers should be compiled-in" >&57544 +echo "$as_me:8745: checking if RCS identifiers should be compiled-in" >&5 7462 7545 echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 7463 7546 7464 7547 # Check whether --with-rcs-ids or --without-rcs-ids was given. 7465 @@ -8397,7 +875 1,7 @@7548 @@ -8397,7 +8752,7 @@ 7466 7549 else 7467 7550 with_rcs_ids=no 7468 7551 fi; 7469 7552 -echo "$as_me:8400: result: $with_rcs_ids" >&5 7470 +echo "$as_me:875 4: result: $with_rcs_ids" >&57553 +echo "$as_me:8755: result: $with_rcs_ids" >&5 7471 7554 echo "${ECHO_T}$with_rcs_ids" >&6 7472 7555 test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF 7473 7556 #define USE_RCS_IDS 1 7474 @@ -8405,7 +87 59,7 @@7557 @@ -8405,7 +8760,7 @@ 7475 7558 7476 7559 ############################################################################### 7477 7560 7478 7561 -echo "$as_me:8408: checking format of man-pages" >&5 7479 +echo "$as_me:876 2: checking format of man-pages" >&57562 +echo "$as_me:8763: checking format of man-pages" >&5 7480 7563 echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6 7481 7564 7482 7565 # Check whether --with-manpage-format or --without-manpage-format was given. 7483 @@ -8433,7 +878 7,7 @@7566 @@ -8433,7 +8788,7 @@ 7484 7567 cf_catonly=yes 7485 7568 cf_example=date … … 7490 7573 test -z "$cf_dir" && cf_dir=/usr/man 7491 7574 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 7492 @@ -8494,14 +884 8,14 @@7575 @@ -8494,14 +8849,14 @@ 7493 7576 ;; 7494 7577 esac 7495 7578 7496 7579 -echo "$as_me:8497: result: $MANPAGE_FORMAT" >&5 7497 +echo "$as_me:885 1: result: $MANPAGE_FORMAT" >&57580 +echo "$as_me:8852: result: $MANPAGE_FORMAT" >&5 7498 7581 echo "${ECHO_T}$MANPAGE_FORMAT" >&6 7499 7582 if test -n "$cf_unknown" ; then 7500 7583 - { echo "$as_me:8500: WARNING: Unexpected manpage-format $cf_unknown" >&5 7501 + { echo "$as_me:885 4: WARNING: Unexpected manpage-format $cf_unknown" >&57584 + { echo "$as_me:8855: WARNING: Unexpected manpage-format $cf_unknown" >&5 7502 7585 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;} 7503 7586 fi 7504 7587 7505 7588 -echo "$as_me:8504: checking for manpage renaming" >&5 7506 +echo "$as_me:885 8: checking for manpage renaming" >&57589 +echo "$as_me:8859: checking for manpage renaming" >&5 7507 7590 echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6 7508 7591 7509 7592 # Check whether --with-manpage-renames or --without-manpage-renames was given. 7510 @@ -8529,7 +888 3,7 @@7593 @@ -8529,7 +8884,7 @@ 7511 7594 if test -f $srcdir/man/$MANPAGE_RENAMES ; then 7512 7595 MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES 7513 7596 elif test ! -f $MANPAGE_RENAMES ; then 7514 7597 - { { echo "$as_me:8532: error: not a filename: $MANPAGE_RENAMES" >&5 7515 + { { echo "$as_me:888 6: error: not a filename: $MANPAGE_RENAMES" >&57598 + { { echo "$as_me:8887: error: not a filename: $MANPAGE_RENAMES" >&5 7516 7599 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} 7517 7600 { (exit 1); exit 1; }; } 7518 7601 fi 7519 @@ -8543,10 +889 7,10 @@7602 @@ -8543,10 +8898,10 @@ 7520 7603 fi 7521 7604 fi 7522 7605 7523 7606 -echo "$as_me:8546: result: $MANPAGE_RENAMES" >&5 7524 +echo "$as_me:890 0: result: $MANPAGE_RENAMES" >&57607 +echo "$as_me:8901: result: $MANPAGE_RENAMES" >&5 7525 7608 echo "${ECHO_T}$MANPAGE_RENAMES" >&6 7526 7609 7527 7610 -echo "$as_me:8549: checking if manpage aliases will be installed" >&5 7528 +echo "$as_me:890 3: checking if manpage aliases will be installed" >&57611 +echo "$as_me:8904: checking if manpage aliases will be installed" >&5 7529 7612 echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6 7530 7613 7531 7614 # Check whether --with-manpage-aliases or --without-manpage-aliases was given. 7532 @@ -8557,7 +891 1,7 @@7615 @@ -8557,7 +8912,7 @@ 7533 7616 MANPAGE_ALIASES=yes 7534 7617 fi; 7535 7618 7536 7619 -echo "$as_me:8560: result: $MANPAGE_ALIASES" >&5 7537 +echo "$as_me:891 4: result: $MANPAGE_ALIASES" >&57620 +echo "$as_me:8915: result: $MANPAGE_ALIASES" >&5 7538 7621 echo "${ECHO_T}$MANPAGE_ALIASES" >&6 7539 7622 7540 7623 if test "$LN_S" = "ln -s"; then 7541 @@ -8568,7 +892 2,7 @@7624 @@ -8568,7 +8923,7 @@ 7542 7625 7543 7626 MANPAGE_SYMLINKS=no 7544 7627 if test "$MANPAGE_ALIASES" = yes ; then 7545 7628 -echo "$as_me:8571: checking if manpage symlinks should be used" >&5 7546 +echo "$as_me:892 5: checking if manpage symlinks should be used" >&57629 +echo "$as_me:8926: checking if manpage symlinks should be used" >&5 7547 7630 echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6 7548 7631 7549 7632 # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given. 7550 @@ -8581,17 +893 5,17 @@7633 @@ -8581,17 +8936,17 @@ 7551 7634 7552 7635 if test "$$cf_use_symlinks" = no; then 7553 7636 if test "$MANPAGE_SYMLINKS" = yes ; then 7554 7637 - { echo "$as_me:8584: WARNING: cannot make symlinks" >&5 7555 + { echo "$as_me:893 8: WARNING: cannot make symlinks" >&57638 + { echo "$as_me:8939: WARNING: cannot make symlinks" >&5 7556 7639 echo "$as_me: WARNING: cannot make symlinks" >&2;} 7557 7640 MANPAGE_SYMLINKS=no … … 7560 7643 7561 7644 -echo "$as_me:8590: result: $MANPAGE_SYMLINKS" >&5 7562 +echo "$as_me:894 4: result: $MANPAGE_SYMLINKS" >&57645 +echo "$as_me:8945: result: $MANPAGE_SYMLINKS" >&5 7563 7646 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6 7564 7647 fi 7565 7648 7566 7649 -echo "$as_me:8594: checking for manpage tbl" >&5 7567 +echo "$as_me:894 8: checking for manpage tbl" >&57650 +echo "$as_me:8949: checking for manpage tbl" >&5 7568 7651 echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6 7569 7652 7570 7653 # Check whether --with-manpage-tbl or --without-manpage-tbl was given. 7571 @@ -8602,7 +895 6,7 @@7654 @@ -8602,7 +8957,7 @@ 7572 7655 MANPAGE_TBL=no 7573 7656 fi; 7574 7657 7575 7658 -echo "$as_me:8605: result: $MANPAGE_TBL" >&5 7576 +echo "$as_me:89 59: result: $MANPAGE_TBL" >&57659 +echo "$as_me:8960: result: $MANPAGE_TBL" >&5 7577 7660 echo "${ECHO_T}$MANPAGE_TBL" >&6 7578 7661 7579 7662 if test "$prefix" = "NONE" ; then 7580 @@ -8718,7 +907 2,7 @@7663 @@ -8718,7 +9073,7 @@ 7581 7664 s,@NCURSES_OSPEED@,\$NCURSES_OSPEED,g 7582 7665 CF_EOF … … 7587 7670 cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 7588 7671 cf_name=`echo $cf_name|sed "$program_transform_name"` 7589 @@ -8913,7 +926 7,7 @@7672 @@ -8913,7 +9268,7 @@ 7590 7673 ############################################################################### 7591 7674 7592 7675 ### Note that some functions (such as const) are normally disabled anyway. 7593 7676 -echo "$as_me:8916: checking if you want to build with function extensions" >&5 7594 +echo "$as_me:927 0: checking if you want to build with function extensions" >&57677 +echo "$as_me:9271: checking if you want to build with function extensions" >&5 7595 7678 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 7596 7679 7597 7680 # Check whether --enable-ext-funcs or --disable-ext-funcs was given. 7598 @@ -8923,7 +927 7,7 @@7681 @@ -8923,7 +9278,7 @@ 7599 7682 else 7600 7683 with_ext_funcs=yes 7601 7684 fi; 7602 7685 -echo "$as_me:8926: result: $with_ext_funcs" >&5 7603 +echo "$as_me:928 0: result: $with_ext_funcs" >&57686 +echo "$as_me:9281: result: $with_ext_funcs" >&5 7604 7687 echo "${ECHO_T}$with_ext_funcs" >&6 7605 7688 if test "$with_ext_funcs" = yes ; then 7606 7689 NCURSES_EXT_FUNCS=1 7607 @@ -8955,12 +93 09,38 @@7690 @@ -8955,12 +9310,38 @@ 7608 7691 #define NCURSES_EXT_FUNCS 1 7609 7692 EOF … … 7615 7698 +fi 7616 7699 + 7617 +echo "$as_me:931 8: checking if you want to build with experimental SCREEN extensions" >&57700 +echo "$as_me:9319: checking if you want to build with experimental SCREEN extensions" >&5 7618 7701 +echo $ECHO_N "checking if you want to build with experimental SCREEN extensions... $ECHO_C" >&6 7619 7702 + … … 7625 7708 + with_sp_funcs=no 7626 7709 +fi; 7627 +echo "$as_me:932 8: result: $with_sp_funcs" >&57710 +echo "$as_me:9329: result: $with_sp_funcs" >&5 7628 7711 +echo "${ECHO_T}$with_sp_funcs" >&6 7629 7712 +if test "$with_sp_funcs" = yes ; then … … 7641 7724 ### use option --enable-const to turn on use of const beyond that in XSI. 7642 7725 -echo "$as_me:8963: checking for extended use of const keyword" >&5 7643 +echo "$as_me:934 3: checking for extended use of const keyword" >&57726 +echo "$as_me:9344: checking for extended use of const keyword" >&5 7644 7727 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 7645 7728 7646 7729 # Check whether --enable-const or --disable-const was given. 7647 @@ -8970,7 +935 0,7 @@7730 @@ -8970,7 +9351,7 @@ 7648 7731 else 7649 7732 with_ext_const=no 7650 7733 fi; 7651 7734 -echo "$as_me:8973: result: $with_ext_const" >&5 7652 +echo "$as_me:935 3: result: $with_ext_const" >&57735 +echo "$as_me:9354: result: $with_ext_const" >&5 7653 7736 echo "${ECHO_T}$with_ext_const" >&6 7654 7737 NCURSES_CONST='/*nothing*/' 7655 7738 if test "$with_ext_const" = yes ; then 7656 @@ -8978,7 +935 8,7 @@7739 @@ -8978,7 +9359,7 @@ 7657 7740 fi 7658 7741 7659 7742 ### use option --enable-ext-colors to turn on use of colors beyond 16. 7660 7743 -echo "$as_me:8981: checking if you want to use extended colors" >&5 7661 +echo "$as_me:936 1: checking if you want to use extended colors" >&57744 +echo "$as_me:9362: checking if you want to use extended colors" >&5 7662 7745 echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6 7663 7746 7664 7747 # Check whether --enable-ext-colors or --disable-ext-colors was given. 7665 @@ -8988,12 +936 8,12 @@7748 @@ -8988,12 +9369,12 @@ 7666 7749 else 7667 7750 with_ext_colors=no 7668 7751 fi; 7669 7752 -echo "$as_me:8991: result: $with_ext_colors" >&5 7670 +echo "$as_me:937 1: result: $with_ext_colors" >&57753 +echo "$as_me:9372: result: $with_ext_colors" >&5 7671 7754 echo "${ECHO_T}$with_ext_colors" >&6 7672 7755 NCURSES_EXT_COLORS=0 … … 7674 7757 if test "$with_widec" != yes ; then 7675 7758 - { { echo "$as_me:8996: error: This option applies only to wide-character library" >&5 7676 + { { echo "$as_me:937 6: error: This option applies only to wide-character library" >&57759 + { { echo "$as_me:9377: error: This option applies only to wide-character library" >&5 7677 7760 echo "$as_me: error: This option applies only to wide-character library" >&2;} 7678 7761 { (exit 1); exit 1; }; } 7679 7762 else 7680 @@ -9004,7 +938 4,7 @@7763 @@ -9004,7 +9385,7 @@ 7681 7764 5.*) 7682 7765 cf_cv_rel_version=6.0 7683 7766 cf_cv_abi_version=6 7684 7767 - { echo "$as_me:9007: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 7685 + { echo "$as_me:938 7: WARNING: Overriding ABI version to $cf_cv_abi_version" >&57768 + { echo "$as_me:9388: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 7686 7769 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} 7687 7770 ;; 7688 7771 esac 7689 @@ -9019,7 +9 399,7 @@7772 @@ -9019,7 +9400,7 @@ 7690 7773 fi 7691 7774 7692 7775 ### use option --enable-ext-mouse to modify coding to support 5-button mice 7693 7776 -echo "$as_me:9022: checking if you want to use extended mouse encoding" >&5 7694 +echo "$as_me:940 2: checking if you want to use extended mouse encoding" >&57777 +echo "$as_me:9403: checking if you want to use extended mouse encoding" >&5 7695 7778 echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6 7696 7779 7697 7780 # Check whether --enable-ext-mouse or --disable-ext-mouse was given. 7698 @@ -9029,7 +94 09,7 @@7781 @@ -9029,7 +9410,7 @@ 7699 7782 else 7700 7783 with_ext_mouse=no 7701 7784 fi; 7702 7785 -echo "$as_me:9032: result: $with_ext_mouse" >&5 7703 +echo "$as_me:941 2: result: $with_ext_mouse" >&57786 +echo "$as_me:9413: result: $with_ext_mouse" >&5 7704 7787 echo "${ECHO_T}$with_ext_mouse" >&6 7705 7788 NCURSES_MOUSE_VERSION=1 7706 7789 if test "$with_ext_mouse" = yes ; then 7707 @@ -9040,7 +942 0,7 @@7790 @@ -9040,7 +9421,7 @@ 7708 7791 5.*) 7709 7792 cf_cv_rel_version=6.0 7710 7793 cf_cv_abi_version=6 7711 7794 - { echo "$as_me:9043: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 7712 + { echo "$as_me:942 3: WARNING: Overriding ABI version to $cf_cv_abi_version" >&57795 + { echo "$as_me:9424: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 7713 7796 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} 7714 7797 ;; 7715 7798 esac 7716 @@ -9048,7 +942 8,7 @@7799 @@ -9048,7 +9429,7 @@ 7717 7800 7718 7801 fi 7719 7802 7720 7803 -echo "$as_me:9051: checking if you want \$NCURSES_NO_PADDING code" >&5 7721 +echo "$as_me:943 1: checking if you want \$NCURSES_NO_PADDING code" >&57804 +echo "$as_me:9432: checking if you want \$NCURSES_NO_PADDING code" >&5 7722 7805 echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6 7723 7806 7724 7807 # Check whether --enable-no-padding or --disable-no-padding was given. 7725 @@ -9058,19 +943 8,19 @@7808 @@ -9058,19 +9439,19 @@ 7726 7809 else 7727 7810 with_no_padding=$with_ext_funcs 7728 7811 fi; 7729 7812 -echo "$as_me:9061: result: $with_no_padding" >&5 7730 +echo "$as_me:944 1: result: $with_no_padding" >&57813 +echo "$as_me:9442: result: $with_no_padding" >&5 7731 7814 echo "${ECHO_T}$with_no_padding" >&6 7732 7815 test "$with_no_padding" = yes && cat >>confdefs.h <<\EOF … … 7735 7818 7736 7819 -echo "$as_me:9067: checking for ANSI C header files" >&5 7737 +echo "$as_me:944 7: checking for ANSI C header files" >&57820 +echo "$as_me:9448: checking for ANSI C header files" >&5 7738 7821 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 7739 7822 if test "${ac_cv_header_stdc+set}" = set; then … … 7742 7825 cat >conftest.$ac_ext <<_ACEOF 7743 7826 -#line 9073 "configure" 7744 +#line 945 3"configure"7827 +#line 9454 "configure" 7745 7828 #include "confdefs.h" 7746 7829 #include <stdlib.h> 7747 7830 #include <stdarg.h> 7748 @@ -9078,13 +945 8,13 @@7831 @@ -9078,13 +9459,13 @@ 7749 7832 #include <float.h> 7750 7833 7751 7834 _ACEOF 7752 7835 -if { (eval echo "$as_me:9081: \"$ac_cpp conftest.$ac_ext\"") >&5 7753 +if { (eval echo "$as_me:946 1: \"$ac_cpp conftest.$ac_ext\"") >&57836 +if { (eval echo "$as_me:9462: \"$ac_cpp conftest.$ac_ext\"") >&5 7754 7837 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 7755 7838 ac_status=$? … … 7758 7841 cat conftest.err >&5 7759 7842 - echo "$as_me:9087: \$? = $ac_status" >&5 7760 + echo "$as_me:946 7: \$? = $ac_status" >&57843 + echo "$as_me:9468: \$? = $ac_status" >&5 7761 7844 (exit $ac_status); } >/dev/null; then 7762 7845 if test -s conftest.err; then 7763 7846 ac_cpp_err=$ac_c_preproc_warn_flag 7764 @@ -9106,7 +948 6,7 @@7847 @@ -9106,7 +9487,7 @@ 7765 7848 if test $ac_cv_header_stdc = yes; then 7766 7849 # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 7767 7850 cat >conftest.$ac_ext <<_ACEOF 7768 7851 -#line 9109 "configure" 7769 +#line 94 89"configure"7852 +#line 9490 "configure" 7770 7853 #include "confdefs.h" 7771 7854 #include <string.h> 7772 7855 7773 @@ -9124,7 +950 4,7 @@7856 @@ -9124,7 +9505,7 @@ 7774 7857 if test $ac_cv_header_stdc = yes; then 7775 7858 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 7776 7859 cat >conftest.$ac_ext <<_ACEOF 7777 7860 -#line 9127 "configure" 7778 +#line 950 7"configure"7861 +#line 9508 "configure" 7779 7862 #include "confdefs.h" 7780 7863 #include <stdlib.h> 7781 7864 7782 @@ -9145,7 +952 5,7 @@7865 @@ -9145,7 +9526,7 @@ 7783 7866 : 7784 7867 else 7785 7868 cat >conftest.$ac_ext <<_ACEOF 7786 7869 -#line 9148 "configure" 7787 +#line 952 8"configure"7870 +#line 9529 "configure" 7788 7871 #include "confdefs.h" 7789 7872 #include <ctype.h> 7790 7873 #if ((' ' & 0x0FF) == 0x020) 7791 @@ -9171,15 +955 1,15 @@7874 @@ -9171,15 +9552,15 @@ 7792 7875 } 7793 7876 _ACEOF 7794 7877 rm -f conftest$ac_exeext 7795 7878 -if { (eval echo "$as_me:9174: \"$ac_link\"") >&5 7796 +if { (eval echo "$as_me:955 4: \"$ac_link\"") >&57879 +if { (eval echo "$as_me:9555: \"$ac_link\"") >&5 7797 7880 (eval $ac_link) 2>&5 7798 7881 ac_status=$? 7799 7882 - echo "$as_me:9177: \$? = $ac_status" >&5 7800 + echo "$as_me:955 7: \$? = $ac_status" >&57883 + echo "$as_me:9558: \$? = $ac_status" >&5 7801 7884 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 7802 7885 - { (eval echo "$as_me:9179: \"$ac_try\"") >&5 7803 + { (eval echo "$as_me:95 59: \"$ac_try\"") >&57886 + { (eval echo "$as_me:9560: \"$ac_try\"") >&5 7804 7887 (eval $ac_try) 2>&5 7805 7888 ac_status=$? 7806 7889 - echo "$as_me:9182: \$? = $ac_status" >&5 7807 + echo "$as_me:956 2: \$? = $ac_status" >&57890 + echo "$as_me:9563: \$? = $ac_status" >&5 7808 7891 (exit $ac_status); }; }; then 7809 7892 : 7810 7893 else 7811 @@ -9192,7 +957 2,7 @@7894 @@ -9192,7 +9573,7 @@ 7812 7895 fi 7813 7896 fi 7814 7897 fi 7815 7898 -echo "$as_me:9195: result: $ac_cv_header_stdc" >&5 7816 +echo "$as_me:957 5: result: $ac_cv_header_stdc" >&57899 +echo "$as_me:9576: result: $ac_cv_header_stdc" >&5 7817 7900 echo "${ECHO_T}$ac_cv_header_stdc" >&6 7818 7901 if test $ac_cv_header_stdc = yes; then 7819 7902 7820 @@ -9208,28 +958 8,28 @@7903 @@ -9208,28 +9589,28 @@ 7821 7904 inttypes.h stdint.h unistd.h 7822 7905 do 7823 7906 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 7824 7907 -echo "$as_me:9211: checking for $ac_header" >&5 7825 +echo "$as_me:959 1: checking for $ac_header" >&57908 +echo "$as_me:9592: checking for $ac_header" >&5 7826 7909 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 7827 7910 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 7830 7913 cat >conftest.$ac_ext <<_ACEOF 7831 7914 -#line 9217 "configure" 7832 +#line 959 7"configure"7915 +#line 9598 "configure" 7833 7916 #include "confdefs.h" 7834 7917 $ac_includes_default … … 7837 7920 rm -f conftest.$ac_objext 7838 7921 -if { (eval echo "$as_me:9223: \"$ac_compile\"") >&5 7839 +if { (eval echo "$as_me:960 3: \"$ac_compile\"") >&57922 +if { (eval echo "$as_me:9604: \"$ac_compile\"") >&5 7840 7923 (eval $ac_compile) 2>&5 7841 7924 ac_status=$? 7842 7925 - echo "$as_me:9226: \$? = $ac_status" >&5 7843 + echo "$as_me:960 6: \$? = $ac_status" >&57926 + echo "$as_me:9607: \$? = $ac_status" >&5 7844 7927 (exit $ac_status); } && 7845 7928 { ac_try='test -s conftest.$ac_objext' 7846 7929 - { (eval echo "$as_me:9229: \"$ac_try\"") >&5 7847 + { (eval echo "$as_me:96 09: \"$ac_try\"") >&57930 + { (eval echo "$as_me:9610: \"$ac_try\"") >&5 7848 7931 (eval $ac_try) 2>&5 7849 7932 ac_status=$? 7850 7933 - echo "$as_me:9232: \$? = $ac_status" >&5 7851 + echo "$as_me:961 2: \$? = $ac_status" >&57934 + echo "$as_me:9613: \$? = $ac_status" >&5 7852 7935 (exit $ac_status); }; }; then 7853 7936 eval "$as_ac_Header=yes" 7854 7937 else 7855 @@ -9239,7 +96 19,7 @@7938 @@ -9239,7 +9620,7 @@ 7856 7939 fi 7857 7940 rm -f conftest.$ac_objext conftest.$ac_ext 7858 7941 fi 7859 7942 -echo "$as_me:9242: result: `eval echo '${'$as_ac_Header'}'`" >&5 7860 +echo "$as_me:962 2: result: `eval echo '${'$as_ac_Header'}'`" >&57943 +echo "$as_me:9623: result: `eval echo '${'$as_ac_Header'}'`" >&5 7861 7944 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 7862 7945 if test `eval echo '${'$as_ac_Header'}'` = yes; then 7863 7946 cat >>confdefs.h <<EOF 7864 @@ -9249,13 +96 29,13 @@7947 @@ -9249,13 +9630,13 @@ 7865 7948 fi 7866 7949 done 7867 7950 7868 7951 -echo "$as_me:9252: checking for signed char" >&5 7869 +echo "$as_me:963 2: checking for signed char" >&57952 +echo "$as_me:9633: checking for signed char" >&5 7870 7953 echo $ECHO_N "checking for signed char... $ECHO_C" >&6 7871 7954 if test "${ac_cv_type_signed_char+set}" = set; then … … 7874 7957 cat >conftest.$ac_ext <<_ACEOF 7875 7958 -#line 9258 "configure" 7876 +#line 963 8"configure"7959 +#line 9639 "configure" 7877 7960 #include "confdefs.h" 7878 7961 $ac_includes_default 7879 7962 int 7880 @@ -9270,16 +965 0,16 @@7963 @@ -9270,16 +9651,16 @@ 7881 7964 } 7882 7965 _ACEOF 7883 7966 rm -f conftest.$ac_objext 7884 7967 -if { (eval echo "$as_me:9273: \"$ac_compile\"") >&5 7885 +if { (eval echo "$as_me:965 3: \"$ac_compile\"") >&57968 +if { (eval echo "$as_me:9654: \"$ac_compile\"") >&5 7886 7969 (eval $ac_compile) 2>&5 7887 7970 ac_status=$? 7888 7971 - echo "$as_me:9276: \$? = $ac_status" >&5 7889 + echo "$as_me:965 6: \$? = $ac_status" >&57972 + echo "$as_me:9657: \$? = $ac_status" >&5 7890 7973 (exit $ac_status); } && 7891 7974 { ac_try='test -s conftest.$ac_objext' 7892 7975 - { (eval echo "$as_me:9279: \"$ac_try\"") >&5 7893 + { (eval echo "$as_me:96 59: \"$ac_try\"") >&57976 + { (eval echo "$as_me:9660: \"$ac_try\"") >&5 7894 7977 (eval $ac_try) 2>&5 7895 7978 ac_status=$? 7896 7979 - echo "$as_me:9282: \$? = $ac_status" >&5 7897 + echo "$as_me:966 2: \$? = $ac_status" >&57980 + echo "$as_me:9663: \$? = $ac_status" >&5 7898 7981 (exit $ac_status); }; }; then 7899 7982 ac_cv_type_signed_char=yes 7900 7983 else 7901 @@ -9289,10 +96 69,10 @@7984 @@ -9289,10 +9670,10 @@ 7902 7985 fi 7903 7986 rm -f conftest.$ac_objext conftest.$ac_ext 7904 7987 fi 7905 7988 -echo "$as_me:9292: result: $ac_cv_type_signed_char" >&5 7906 +echo "$as_me:967 2: result: $ac_cv_type_signed_char" >&57989 +echo "$as_me:9673: result: $ac_cv_type_signed_char" >&5 7907 7990 echo "${ECHO_T}$ac_cv_type_signed_char" >&6 7908 7991 7909 7992 -echo "$as_me:9295: checking size of signed char" >&5 7910 +echo "$as_me:967 5: checking size of signed char" >&57993 +echo "$as_me:9676: checking size of signed char" >&5 7911 7994 echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 7912 7995 if test "${ac_cv_sizeof_signed_char+set}" = set; then 7913 7996 echo $ECHO_N "(cached) $ECHO_C" >&6 7914 @@ -9301,7 +968 1,7 @@7997 @@ -9301,7 +9682,7 @@ 7915 7998 if test "$cross_compiling" = yes; then 7916 7999 # Depending upon the size, compute the lo and hi bounds. 7917 8000 cat >conftest.$ac_ext <<_ACEOF 7918 8001 -#line 9304 "configure" 7919 +#line 968 4"configure"8002 +#line 9685 "configure" 7920 8003 #include "confdefs.h" 7921 8004 $ac_includes_default 7922 8005 int 7923 @@ -9313,21 +969 3,21 @@8006 @@ -9313,21 +9694,21 @@ 7924 8007 } 7925 8008 _ACEOF 7926 8009 rm -f conftest.$ac_objext 7927 8010 -if { (eval echo "$as_me:9316: \"$ac_compile\"") >&5 7928 +if { (eval echo "$as_me:969 6: \"$ac_compile\"") >&58011 +if { (eval echo "$as_me:9697: \"$ac_compile\"") >&5 7929 8012 (eval $ac_compile) 2>&5 7930 8013 ac_status=$? 7931 8014 - echo "$as_me:9319: \$? = $ac_status" >&5 7932 + echo "$as_me:9 699: \$? = $ac_status" >&58015 + echo "$as_me:9700: \$? = $ac_status" >&5 7933 8016 (exit $ac_status); } && 7934 8017 { ac_try='test -s conftest.$ac_objext' 7935 8018 - { (eval echo "$as_me:9322: \"$ac_try\"") >&5 7936 + { (eval echo "$as_me:970 2: \"$ac_try\"") >&58019 + { (eval echo "$as_me:9703: \"$ac_try\"") >&5 7937 8020 (eval $ac_try) 2>&5 7938 8021 ac_status=$? 7939 8022 - echo "$as_me:9325: \$? = $ac_status" >&5 7940 + echo "$as_me:970 5: \$? = $ac_status" >&58023 + echo "$as_me:9706: \$? = $ac_status" >&5 7941 8024 (exit $ac_status); }; }; then 7942 8025 ac_lo=0 ac_mid=0 … … 7944 8027 cat >conftest.$ac_ext <<_ACEOF 7945 8028 -#line 9330 "configure" 7946 +#line 971 0"configure"8029 +#line 9711 "configure" 7947 8030 #include "confdefs.h" 7948 8031 $ac_includes_default 7949 8032 int 7950 @@ -9339,16 +97 19,16 @@8033 @@ -9339,16 +9720,16 @@ 7951 8034 } 7952 8035 _ACEOF 7953 8036 rm -f conftest.$ac_objext 7954 8037 -if { (eval echo "$as_me:9342: \"$ac_compile\"") >&5 7955 +if { (eval echo "$as_me:972 2: \"$ac_compile\"") >&58038 +if { (eval echo "$as_me:9723: \"$ac_compile\"") >&5 7956 8039 (eval $ac_compile) 2>&5 7957 8040 ac_status=$? 7958 8041 - echo "$as_me:9345: \$? = $ac_status" >&5 7959 + echo "$as_me:972 5: \$? = $ac_status" >&58042 + echo "$as_me:9726: \$? = $ac_status" >&5 7960 8043 (exit $ac_status); } && 7961 8044 { ac_try='test -s conftest.$ac_objext' 7962 8045 - { (eval echo "$as_me:9348: \"$ac_try\"") >&5 7963 + { (eval echo "$as_me:972 8: \"$ac_try\"") >&58046 + { (eval echo "$as_me:9729: \"$ac_try\"") >&5 7964 8047 (eval $ac_try) 2>&5 7965 8048 ac_status=$? 7966 8049 - echo "$as_me:9351: \$? = $ac_status" >&5 7967 + echo "$as_me:973 1: \$? = $ac_status" >&58050 + echo "$as_me:9732: \$? = $ac_status" >&5 7968 8051 (exit $ac_status); }; }; then 7969 8052 ac_hi=$ac_mid; break 7970 8053 else 7971 @@ -9364,7 +974 4,7 @@8054 @@ -9364,7 +9745,7 @@ 7972 8055 ac_hi=-1 ac_mid=-1 7973 8056 while :; do 7974 8057 cat >conftest.$ac_ext <<_ACEOF 7975 8058 -#line 9367 "configure" 7976 +#line 974 7"configure"8059 +#line 9748 "configure" 7977 8060 #include "confdefs.h" 7978 8061 $ac_includes_default 7979 8062 int 7980 @@ -9376,16 +975 6,16 @@8063 @@ -9376,16 +9757,16 @@ 7981 8064 } 7982 8065 _ACEOF 7983 8066 rm -f conftest.$ac_objext 7984 8067 -if { (eval echo "$as_me:9379: \"$ac_compile\"") >&5 7985 +if { (eval echo "$as_me:97 59: \"$ac_compile\"") >&58068 +if { (eval echo "$as_me:9760: \"$ac_compile\"") >&5 7986 8069 (eval $ac_compile) 2>&5 7987 8070 ac_status=$? 7988 8071 - echo "$as_me:9382: \$? = $ac_status" >&5 7989 + echo "$as_me:976 2: \$? = $ac_status" >&58072 + echo "$as_me:9763: \$? = $ac_status" >&5 7990 8073 (exit $ac_status); } && 7991 8074 { ac_try='test -s conftest.$ac_objext' 7992 8075 - { (eval echo "$as_me:9385: \"$ac_try\"") >&5 7993 + { (eval echo "$as_me:976 5: \"$ac_try\"") >&58076 + { (eval echo "$as_me:9766: \"$ac_try\"") >&5 7994 8077 (eval $ac_try) 2>&5 7995 8078 ac_status=$? 7996 8079 - echo "$as_me:9388: \$? = $ac_status" >&5 7997 + echo "$as_me:976 8: \$? = $ac_status" >&58080 + echo "$as_me:9769: \$? = $ac_status" >&5 7998 8081 (exit $ac_status); }; }; then 7999 8082 ac_lo=$ac_mid; break 8000 8083 else 8001 @@ -9401,7 +978 1,7 @@8084 @@ -9401,7 +9782,7 @@ 8002 8085 while test "x$ac_lo" != "x$ac_hi"; do 8003 8086 ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 8004 8087 cat >conftest.$ac_ext <<_ACEOF 8005 8088 -#line 9404 "configure" 8006 +#line 978 4"configure"8089 +#line 9785 "configure" 8007 8090 #include "confdefs.h" 8008 8091 $ac_includes_default 8009 8092 int 8010 @@ -9413,16 +979 3,16 @@8093 @@ -9413,16 +9794,16 @@ 8011 8094 } 8012 8095 _ACEOF 8013 8096 rm -f conftest.$ac_objext 8014 8097 -if { (eval echo "$as_me:9416: \"$ac_compile\"") >&5 8015 +if { (eval echo "$as_me:979 6: \"$ac_compile\"") >&58098 +if { (eval echo "$as_me:9797: \"$ac_compile\"") >&5 8016 8099 (eval $ac_compile) 2>&5 8017 8100 ac_status=$? 8018 8101 - echo "$as_me:9419: \$? = $ac_status" >&5 8019 + echo "$as_me:9 799: \$? = $ac_status" >&58102 + echo "$as_me:9800: \$? = $ac_status" >&5 8020 8103 (exit $ac_status); } && 8021 8104 { ac_try='test -s conftest.$ac_objext' 8022 8105 - { (eval echo "$as_me:9422: \"$ac_try\"") >&5 8023 + { (eval echo "$as_me:980 2: \"$ac_try\"") >&58106 + { (eval echo "$as_me:9803: \"$ac_try\"") >&5 8024 8107 (eval $ac_try) 2>&5 8025 8108 ac_status=$? 8026 8109 - echo "$as_me:9425: \$? = $ac_status" >&5 8027 + echo "$as_me:980 5: \$? = $ac_status" >&58110 + echo "$as_me:9806: \$? = $ac_status" >&5 8028 8111 (exit $ac_status); }; }; then 8029 8112 ac_hi=$ac_mid 8030 8113 else 8031 @@ -9435,12 +981 5,12 @@8114 @@ -9435,12 +9816,12 @@ 8032 8115 ac_cv_sizeof_signed_char=$ac_lo 8033 8116 else 8034 8117 if test "$cross_compiling" = yes; then 8035 8118 - { { echo "$as_me:9438: error: cannot run test program while cross compiling" >&5 8036 + { { echo "$as_me:981 8: error: cannot run test program while cross compiling" >&58119 + { { echo "$as_me:9819: error: cannot run test program while cross compiling" >&5 8037 8120 echo "$as_me: error: cannot run test program while cross compiling" >&2;} 8038 8121 { (exit 1); exit 1; }; } … … 8040 8123 cat >conftest.$ac_ext <<_ACEOF 8041 8124 -#line 9443 "configure" 8042 +#line 982 3"configure"8125 +#line 9824 "configure" 8043 8126 #include "confdefs.h" 8044 8127 $ac_includes_default 8045 8128 int 8046 @@ -9456,15 +983 6,15 @@8129 @@ -9456,15 +9837,15 @@ 8047 8130 } 8048 8131 _ACEOF 8049 8132 rm -f conftest$ac_exeext 8050 8133 -if { (eval echo "$as_me:9459: \"$ac_link\"") >&5 8051 +if { (eval echo "$as_me:98 39: \"$ac_link\"") >&58134 +if { (eval echo "$as_me:9840: \"$ac_link\"") >&5 8052 8135 (eval $ac_link) 2>&5 8053 8136 ac_status=$? 8054 8137 - echo "$as_me:9462: \$? = $ac_status" >&5 8055 + echo "$as_me:984 2: \$? = $ac_status" >&58138 + echo "$as_me:9843: \$? = $ac_status" >&5 8056 8139 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 8057 8140 - { (eval echo "$as_me:9464: \"$ac_try\"") >&5 8058 + { (eval echo "$as_me:984 4: \"$ac_try\"") >&58141 + { (eval echo "$as_me:9845: \"$ac_try\"") >&5 8059 8142 (eval $ac_try) 2>&5 8060 8143 ac_status=$? 8061 8144 - echo "$as_me:9467: \$? = $ac_status" >&5 8062 + echo "$as_me:984 7: \$? = $ac_status" >&58145 + echo "$as_me:9848: \$? = $ac_status" >&5 8063 8146 (exit $ac_status); }; }; then 8064 8147 ac_cv_sizeof_signed_char=`cat conftest.val` 8065 8148 else 8066 @@ -9480,7 +986 0,7 @@8149 @@ -9480,7 +9861,7 @@ 8067 8150 ac_cv_sizeof_signed_char=0 8068 8151 fi 8069 8152 fi 8070 8153 -echo "$as_me:9483: result: $ac_cv_sizeof_signed_char" >&5 8071 +echo "$as_me:986 3: result: $ac_cv_sizeof_signed_char" >&58154 +echo "$as_me:9864: result: $ac_cv_sizeof_signed_char" >&5 8072 8155 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 8073 8156 cat >>confdefs.h <<EOF 8074 8157 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char 8075 @@ -9491,7 +987 1,7 @@8158 @@ -9491,7 +9872,7 @@ 8076 8159 else 8077 8160 NCURSES_SBOOL="char" 8078 8161 fi 8079 8162 -echo "$as_me:9494: checking if you want to use signed Boolean array in term.h" >&5 8080 +echo "$as_me:987 4: checking if you want to use signed Boolean array in term.h" >&58163 +echo "$as_me:9875: checking if you want to use signed Boolean array in term.h" >&5 8081 8164 echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6 8082 8165 8083 8166 # Check whether --enable-signed-char or --disable-signed-char was given. 8084 @@ -9501,12 +988 1,12 @@8167 @@ -9501,12 +9882,12 @@ 8085 8168 else 8086 8169 with_signed_char=no 8087 8170 fi; 8088 8171 -echo "$as_me:9504: result: $with_signed_char" >&5 8089 +echo "$as_me:988 4: result: $with_signed_char" >&58172 +echo "$as_me:9885: result: $with_signed_char" >&5 8090 8173 echo "${ECHO_T}$with_signed_char" >&6 8091 8174 test "$with_signed_char" != yes && NCURSES_SBOOL="char" … … 8093 8176 ### use option --enable-sigwinch to turn on use of SIGWINCH logic 8094 8177 -echo "$as_me:9509: checking if you want SIGWINCH handler" >&5 8095 +echo "$as_me:98 89: checking if you want SIGWINCH handler" >&58178 +echo "$as_me:9890: checking if you want SIGWINCH handler" >&5 8096 8179 echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6 8097 8180 8098 8181 # Check whether --enable-sigwinch or --disable-sigwinch was given. 8099 @@ -9516,14 +989 6,14 @@8182 @@ -9516,14 +9897,14 @@ 8100 8183 else 8101 8184 with_sigwinch=$with_ext_funcs 8102 8185 fi; 8103 8186 -echo "$as_me:9519: result: $with_sigwinch" >&5 8104 +echo "$as_me:9 899: result: $with_sigwinch" >&58187 +echo "$as_me:9900: result: $with_sigwinch" >&5 8105 8188 echo "${ECHO_T}$with_sigwinch" >&6 8106 8189 test "$with_sigwinch" = yes && cat >>confdefs.h <<\EOF … … 8110 8193 ### use option --enable-tcap-names to allow user to define new capabilities 8111 8194 -echo "$as_me:9526: checking if you want user-definable terminal capabilities like termcap" >&5 8112 +echo "$as_me:990 6: checking if you want user-definable terminal capabilities like termcap" >&58195 +echo "$as_me:9907: checking if you want user-definable terminal capabilities like termcap" >&5 8113 8196 echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6 8114 8197 8115 8198 # Check whether --enable-tcap-names or --disable-tcap-names was given. 8116 @@ -9533,7 +991 3,7 @@8199 @@ -9533,7 +9914,7 @@ 8117 8200 else 8118 8201 with_tcap_names=$with_ext_funcs 8119 8202 fi; 8120 8203 -echo "$as_me:9536: result: $with_tcap_names" >&5 8121 +echo "$as_me:991 6: result: $with_tcap_names" >&58204 +echo "$as_me:9917: result: $with_tcap_names" >&5 8122 8205 echo "${ECHO_T}$with_tcap_names" >&6 8123 8206 NCURSES_XNAMES=0 8124 8207 test "$with_tcap_names" = yes && NCURSES_XNAMES=1 8125 @@ -9541,7 +992 1,7 @@8208 @@ -9541,7 +9922,7 @@ 8126 8209 ############################################################################### 8127 8210 # These options are relatively safe to experiment with. 8128 8211 8129 8212 -echo "$as_me:9544: checking if you want all development code" >&5 8130 +echo "$as_me:992 4: checking if you want all development code" >&58213 +echo "$as_me:9925: checking if you want all development code" >&5 8131 8214 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 8132 8215 8133 8216 # Check whether --with-develop or --without-develop was given. 8134 @@ -9551,11 +993 1,11 @@8217 @@ -9551,11 +9932,11 @@ 8135 8218 else 8136 8219 with_develop=no 8137 8220 fi; 8138 8221 -echo "$as_me:9554: result: $with_develop" >&5 8139 +echo "$as_me:993 4: result: $with_develop" >&58222 +echo "$as_me:9935: result: $with_develop" >&5 8140 8223 echo "${ECHO_T}$with_develop" >&6 8141 8224 8142 8225 ### use option --enable-hard-tabs to turn on use of hard-tabs optimize 8143 8226 -echo "$as_me:9558: checking if you want hard-tabs code" >&5 8144 +echo "$as_me:993 8: checking if you want hard-tabs code" >&58227 +echo "$as_me:9939: checking if you want hard-tabs code" >&5 8145 8228 echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6 8146 8229 8147 8230 # Check whether --enable-hard-tabs or --disable-hard-tabs was given. 8148 @@ -9565,14 +994 5,14 @@8231 @@ -9565,14 +9946,14 @@ 8149 8232 else 8150 8233 enable_hard_tabs=$with_develop 8151 8234 fi; 8152 8235 -echo "$as_me:9568: result: $enable_hard_tabs" >&5 8153 +echo "$as_me:994 8: result: $enable_hard_tabs" >&58236 +echo "$as_me:9949: result: $enable_hard_tabs" >&5 8154 8237 echo "${ECHO_T}$enable_hard_tabs" >&6 8155 8238 test "$enable_hard_tabs" = yes && cat >>confdefs.h <<\EOF … … 8159 8242 ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize 8160 8243 -echo "$as_me:9575: checking if you want limited support for xmc" >&5 8161 +echo "$as_me:995 5: checking if you want limited support for xmc" >&58244 +echo "$as_me:9956: checking if you want limited support for xmc" >&5 8162 8245 echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6 8163 8246 8164 8247 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. 8165 @@ -9582,7 +996 2,7 @@8248 @@ -9582,7 +9963,7 @@ 8166 8249 else 8167 8250 enable_xmc_glitch=$with_develop 8168 8251 fi; 8169 8252 -echo "$as_me:9585: result: $enable_xmc_glitch" >&5 8170 +echo "$as_me:996 5: result: $enable_xmc_glitch" >&58253 +echo "$as_me:9966: result: $enable_xmc_glitch" >&5 8171 8254 echo "${ECHO_T}$enable_xmc_glitch" >&6 8172 8255 test "$enable_xmc_glitch" = yes && cat >>confdefs.h <<\EOF 8173 8256 #define USE_XMC_SUPPORT 1 8174 @@ -9591,7 +997 1,7 @@8257 @@ -9591,7 +9972,7 @@ 8175 8258 ############################################################################### 8176 8259 # These are just experimental, probably should not be in a package: 8177 8260 8178 8261 -echo "$as_me:9594: checking if you do not want to assume colors are white-on-black" >&5 8179 +echo "$as_me:997 4: checking if you do not want to assume colors are white-on-black" >&58262 +echo "$as_me:9975: checking if you do not want to assume colors are white-on-black" >&5 8180 8263 echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6 8181 8264 8182 8265 # Check whether --enable-assumed-color or --disable-assumed-color was given. 8183 @@ -9601,14 +998 1,14 @@8266 @@ -9601,14 +9982,14 @@ 8184 8267 else 8185 8268 with_assumed_color=yes 8186 8269 fi; 8187 8270 -echo "$as_me:9604: result: $with_assumed_color" >&5 8188 +echo "$as_me:998 4: result: $with_assumed_color" >&58271 +echo "$as_me:9985: result: $with_assumed_color" >&5 8189 8272 echo "${ECHO_T}$with_assumed_color" >&6 8190 8273 test "$with_assumed_color" = yes && cat >>confdefs.h <<\EOF … … 8194 8277 ### use option --enable-hashmap to turn on use of hashmap scrolling logic 8195 8278 -echo "$as_me:9611: checking if you want hashmap scrolling-optimization code" >&5 8196 +echo "$as_me:999 1: checking if you want hashmap scrolling-optimization code" >&58279 +echo "$as_me:9992: checking if you want hashmap scrolling-optimization code" >&5 8197 8280 echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6 8198 8281 8199 8282 # Check whether --enable-hashmap or --disable-hashmap was given. 8200 @@ -9618,14 +999 8,14 @@8283 @@ -9618,14 +9999,14 @@ 8201 8284 else 8202 8285 with_hashmap=yes 8203 8286 fi; 8204 8287 -echo "$as_me:9621: result: $with_hashmap" >&5 8205 +echo "$as_me:1000 1: result: $with_hashmap" >&58288 +echo "$as_me:10002: result: $with_hashmap" >&5 8206 8289 echo "${ECHO_T}$with_hashmap" >&6 8207 8290 test "$with_hashmap" = yes && cat >>confdefs.h <<\EOF … … 8211 8294 ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment 8212 8295 -echo "$as_me:9628: checking if you want colorfgbg code" >&5 8213 +echo "$as_me:1000 8: checking if you want colorfgbg code" >&58296 +echo "$as_me:10009: checking if you want colorfgbg code" >&5 8214 8297 echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6 8215 8298 8216 8299 # Check whether --enable-colorfgbg or --disable-colorfgbg was given. 8217 @@ -9635,7 +1001 5,7 @@8300 @@ -9635,7 +10016,7 @@ 8218 8301 else 8219 8302 with_colorfgbg=no 8220 8303 fi; 8221 8304 -echo "$as_me:9638: result: $with_colorfgbg" >&5 8222 +echo "$as_me:1001 8: result: $with_colorfgbg" >&58305 +echo "$as_me:10019: result: $with_colorfgbg" >&5 8223 8306 echo "${ECHO_T}$with_colorfgbg" >&6 8224 8307 test "$with_colorfgbg" = yes && cat >>confdefs.h <<\EOF 8225 8308 #define USE_COLORFGBG 1 8226 @@ -9644,7 +1002 4,7 @@8309 @@ -9644,7 +10025,7 @@ 8227 8310 # This is still experimental (20080329), but should ultimately be moved to 8228 8311 # the script-block --with-normal, etc. 8229 8312 8230 8313 -echo "$as_me:9647: checking if you want to link with the pthread library" >&5 8231 +echo "$as_me:1002 7: checking if you want to link with the pthread library" >&58314 +echo "$as_me:10028: checking if you want to link with the pthread library" >&5 8232 8315 echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 8233 8316 8234 8317 # Check whether --with-pthread or --without-pthread was given. 8235 @@ -9654,27 +1003 4,27 @@8318 @@ -9654,27 +10035,27 @@ 8236 8319 else 8237 8320 with_pthread=no 8238 8321 fi; 8239 8322 -echo "$as_me:9657: result: $with_pthread" >&5 8240 +echo "$as_me:1003 7: result: $with_pthread" >&58323 +echo "$as_me:10038: result: $with_pthread" >&5 8241 8324 echo "${ECHO_T}$with_pthread" >&6 8242 8325 8243 8326 if test "$with_pthread" != no ; then 8244 8327 - echo "$as_me:9661: checking for pthread.h" >&5 8245 + echo "$as_me:1004 1: checking for pthread.h" >&58328 + echo "$as_me:10042: checking for pthread.h" >&5 8246 8329 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 8247 8330 if test "${ac_cv_header_pthread_h+set}" = set; then … … 8250 8333 cat >conftest.$ac_ext <<_ACEOF 8251 8334 -#line 9667 "configure" 8252 +#line 1004 7"configure"8335 +#line 10048 "configure" 8253 8336 #include "confdefs.h" 8254 8337 #include <pthread.h> 8255 8338 _ACEOF 8256 8339 -if { (eval echo "$as_me:9671: \"$ac_cpp conftest.$ac_ext\"") >&5 8257 +if { (eval echo "$as_me:1005 1: \"$ac_cpp conftest.$ac_ext\"") >&58340 +if { (eval echo "$as_me:10052: \"$ac_cpp conftest.$ac_ext\"") >&5 8258 8341 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 8259 8342 ac_status=$? … … 8262 8345 cat conftest.err >&5 8263 8346 - echo "$as_me:9677: \$? = $ac_status" >&5 8264 + echo "$as_me:1005 7: \$? = $ac_status" >&58347 + echo "$as_me:10058: \$? = $ac_status" >&5 8265 8348 (exit $ac_status); } >/dev/null; then 8266 8349 if test -s conftest.err; then 8267 8350 ac_cpp_err=$ac_c_preproc_warn_flag 8268 @@ -9693,7 +1007 3,7 @@8351 @@ -9693,7 +10074,7 @@ 8269 8352 fi 8270 8353 rm -f conftest.err conftest.$ac_ext 8271 8354 fi 8272 8355 -echo "$as_me:9696: result: $ac_cv_header_pthread_h" >&5 8273 +echo "$as_me:1007 6: result: $ac_cv_header_pthread_h" >&58356 +echo "$as_me:10077: result: $ac_cv_header_pthread_h" >&5 8274 8357 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 8275 8358 if test $ac_cv_header_pthread_h = yes; then 8276 8359 8277 @@ -9701,12 +1008 1,12 @@8360 @@ -9701,12 +10082,12 @@ 8278 8361 #define HAVE_PTHREADS_H 1 8279 8362 EOF 8280 8363 8281 8364 - echo "$as_me:9704: checking if we can link with the pthread library" >&5 8282 + echo "$as_me:1008 4: checking if we can link with the pthread library" >&58365 + echo "$as_me:10085: checking if we can link with the pthread library" >&5 8283 8366 echo $ECHO_N "checking if we can link with the pthread library... $ECHO_C" >&6 8284 8367 cf_save_LIBS="$LIBS" … … 8286 8369 cat >conftest.$ac_ext <<_ACEOF 8287 8370 -#line 9709 "configure" 8288 +#line 100 89"configure"8371 +#line 10090 "configure" 8289 8372 #include "confdefs.h" 8290 8373 8291 8374 #include <pthread.h> 8292 @@ -9722,16 +1010 2,16 @@8375 @@ -9722,16 +10103,16 @@ 8293 8376 } 8294 8377 _ACEOF 8295 8378 rm -f conftest.$ac_objext conftest$ac_exeext 8296 8379 -if { (eval echo "$as_me:9725: \"$ac_link\"") >&5 8297 +if { (eval echo "$as_me:1010 5: \"$ac_link\"") >&58380 +if { (eval echo "$as_me:10106: \"$ac_link\"") >&5 8298 8381 (eval $ac_link) 2>&5 8299 8382 ac_status=$? 8300 8383 - echo "$as_me:9728: \$? = $ac_status" >&5 8301 + echo "$as_me:1010 8: \$? = $ac_status" >&58384 + echo "$as_me:10109: \$? = $ac_status" >&5 8302 8385 (exit $ac_status); } && 8303 8386 { ac_try='test -s conftest$ac_exeext' 8304 8387 - { (eval echo "$as_me:9731: \"$ac_try\"") >&5 8305 + { (eval echo "$as_me:1011 1: \"$ac_try\"") >&58388 + { (eval echo "$as_me:10112: \"$ac_try\"") >&5 8306 8389 (eval $ac_try) 2>&5 8307 8390 ac_status=$? 8308 8391 - echo "$as_me:9734: \$? = $ac_status" >&5 8309 + echo "$as_me:1011 4: \$? = $ac_status" >&58392 + echo "$as_me:10115: \$? = $ac_status" >&5 8310 8393 (exit $ac_status); }; }; then 8311 8394 with_pthread=yes 8312 8395 else 8313 @@ -9741,7 +1012 1,7 @@8396 @@ -9741,7 +10122,7 @@ 8314 8397 fi 8315 8398 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 8316 8399 LIBS="$cf_save_LIBS" 8317 8400 - echo "$as_me:9744: result: $with_pthread" >&5 8318 + echo "$as_me:1012 4: result: $with_pthread" >&58401 + echo "$as_me:10125: result: $with_pthread" >&5 8319 8402 echo "${ECHO_T}$with_pthread" >&6 8320 8403 8321 8404 if test "$with_pthread" = yes ; then 8322 @@ -9751,7 +1013 1,7 @@8405 @@ -9751,7 +10132,7 @@ 8323 8406 EOF 8324 8407 8325 8408 else 8326 8409 - { { echo "$as_me:9754: error: Cannot link with pthread library" >&5 8327 + { { echo "$as_me:1013 4: error: Cannot link with pthread library" >&58410 + { { echo "$as_me:10135: error: Cannot link with pthread library" >&5 8328 8411 echo "$as_me: error: Cannot link with pthread library" >&2;} 8329 8412 { (exit 1); exit 1; }; } 8330 8413 fi 8331 @@ -9760,7 +1014 0,7 @@8414 @@ -9760,7 +10141,7 @@ 8332 8415 8333 8416 fi 8334 8417 8335 8418 -echo "$as_me:9763: checking if you want to use weak-symbols for pthreads" >&5 8336 +echo "$as_me:1014 3: checking if you want to use weak-symbols for pthreads" >&58419 +echo "$as_me:10144: checking if you want to use weak-symbols for pthreads" >&5 8337 8420 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 8338 8421 8339 8422 # Check whether --enable-weak-symbols or --disable-weak-symbols was given. 8340 @@ -9770,18 +1015 0,18 @@8423 @@ -9770,18 +10151,18 @@ 8341 8424 else 8342 8425 use_weak_symbols=no 8343 8426 fi; 8344 8427 -echo "$as_me:9773: result: $use_weak_symbols" >&5 8345 +echo "$as_me:1015 3: result: $use_weak_symbols" >&58428 +echo "$as_me:10154: result: $use_weak_symbols" >&5 8346 8429 echo "${ECHO_T}$use_weak_symbols" >&6 8347 8430 if test "$use_weak_symbols" = yes ; then 8348 8431 8349 8432 -echo "$as_me:9777: checking if $CC supports weak symbols" >&5 8350 +echo "$as_me:1015 7: checking if $CC supports weak symbols" >&58433 +echo "$as_me:10158: checking if $CC supports weak symbols" >&5 8351 8434 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 8352 8435 if test "${cf_cv_weak_symbols+set}" = set; then … … 8356 8439 cat >conftest.$ac_ext <<_ACEOF 8357 8440 -#line 9784 "configure" 8358 +#line 1016 4"configure"8441 +#line 10165 "configure" 8359 8442 #include "confdefs.h" 8360 8443 8361 8444 #include <stdio.h> 8362 @@ -9807,16 +1018 7,16 @@8445 @@ -9807,16 +10188,16 @@ 8363 8446 } 8364 8447 _ACEOF 8365 8448 rm -f conftest.$ac_objext 8366 8449 -if { (eval echo "$as_me:9810: \"$ac_compile\"") >&5 8367 +if { (eval echo "$as_me:1019 0: \"$ac_compile\"") >&58450 +if { (eval echo "$as_me:10191: \"$ac_compile\"") >&5 8368 8451 (eval $ac_compile) 2>&5 8369 8452 ac_status=$? 8370 8453 - echo "$as_me:9813: \$? = $ac_status" >&5 8371 + echo "$as_me:1019 3: \$? = $ac_status" >&58454 + echo "$as_me:10194: \$? = $ac_status" >&5 8372 8455 (exit $ac_status); } && 8373 8456 { ac_try='test -s conftest.$ac_objext' 8374 8457 - { (eval echo "$as_me:9816: \"$ac_try\"") >&5 8375 + { (eval echo "$as_me:1019 6: \"$ac_try\"") >&58458 + { (eval echo "$as_me:10197: \"$ac_try\"") >&5 8376 8459 (eval $ac_try) 2>&5 8377 8460 ac_status=$? 8378 8461 - echo "$as_me:9819: \$? = $ac_status" >&5 8379 + echo "$as_me:10 199: \$? = $ac_status" >&58462 + echo "$as_me:10200: \$? = $ac_status" >&5 8380 8463 (exit $ac_status); }; }; then 8381 8464 cf_cv_weak_symbols=yes 8382 8465 else 8383 @@ -9827,7 +1020 7,7 @@8466 @@ -9827,7 +10208,7 @@ 8384 8467 rm -f conftest.$ac_objext conftest.$ac_ext 8385 8468 8386 8469 fi 8387 8470 -echo "$as_me:9830: result: $cf_cv_weak_symbols" >&5 8388 +echo "$as_me:1021 0: result: $cf_cv_weak_symbols" >&58471 +echo "$as_me:10211: result: $cf_cv_weak_symbols" >&5 8389 8472 echo "${ECHO_T}$cf_cv_weak_symbols" >&6 8390 8473 8391 8474 else 8392 @@ -9857,7 +1023 7,7 @@8475 @@ -9857,7 +10238,7 @@ 8393 8476 # opaque outside of that, so there is no --enable-opaque option. We can use 8394 8477 # this option without --with-pthreads, but this will be always set for 8395 8478 # pthreads. 8396 8479 -echo "$as_me:9860: checking if you want experimental reentrant code" >&5 8397 +echo "$as_me:1024 0: checking if you want experimental reentrant code" >&58480 +echo "$as_me:10241: checking if you want experimental reentrant code" >&5 8398 8481 echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6 8399 8482 8400 8483 # Check whether --enable-reentrant or --disable-reentrant was given. 8401 @@ -9867,21 +1024 7,21 @@8484 @@ -9867,21 +10248,21 @@ 8402 8485 else 8403 8486 with_reentrant=no 8404 8487 fi; 8405 8488 -echo "$as_me:9870: result: $with_reentrant" >&5 8406 +echo "$as_me:1025 0: result: $with_reentrant" >&58489 +echo "$as_me:10251: result: $with_reentrant" >&5 8407 8490 echo "${ECHO_T}$with_reentrant" >&6 8408 8491 if test "$with_reentrant" = yes ; then … … 8426 8509 #define USE_REENTRANT 1 8427 8510 EOF 8428 @@ -9891,7 +1027 1,7 @@8511 @@ -9891,7 +10272,7 @@ 8429 8512 5.*) 8430 8513 cf_cv_rel_version=6.0 8431 8514 cf_cv_abi_version=6 8432 8515 - { echo "$as_me:9894: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 8433 + { echo "$as_me:1027 4: WARNING: Overriding ABI version to $cf_cv_abi_version" >&58516 + { echo "$as_me:10275: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 8434 8517 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} 8435 8518 ;; 8436 8519 esac 8437 @@ -9904,7 +1028 4,29 @@8520 @@ -9904,7 +10285,29 @@ 8438 8521 NCURSES_SIZE_T=short 8439 8522 fi … … 8441 8524 -echo "$as_me:9907: checking if you want experimental safe-sprintf code" >&5 8442 8525 +### Allow using a different wrap-prefix 8443 +if test "$cf_cv_enable_reentrant" != 0 ; then8444 + echo "$as_me:102 89: checking for prefix used to wrap public variables" >&58526 +if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then 8527 + echo "$as_me:10290: checking for prefix used to wrap public variables" >&5 8445 8528 +echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 8446 8529 + … … 8452 8535 + NCURSES_WRAP_PREFIX=_nc_ 8453 8536 +fi; 8454 + echo "$as_me:10 299: result: $NCURSES_WRAP_PREFIX" >&58537 + echo "$as_me:10300: result: $NCURSES_WRAP_PREFIX" >&5 8455 8538 +echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 8456 8539 +else … … 8462 8545 +EOF 8463 8546 + 8464 +echo "$as_me:103 09: checking if you want experimental safe-sprintf code" >&58547 +echo "$as_me:10310: checking if you want experimental safe-sprintf code" >&5 8465 8548 echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6 8466 8549 8467 8550 # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given. 8468 @@ -9914,7 +1031 6,7 @@8551 @@ -9914,7 +10317,7 @@ 8469 8552 else 8470 8553 with_safe_sprintf=no 8471 8554 fi; 8472 8555 -echo "$as_me:9917: result: $with_safe_sprintf" >&5 8473 +echo "$as_me:103 19: result: $with_safe_sprintf" >&58556 +echo "$as_me:10320: result: $with_safe_sprintf" >&5 8474 8557 echo "${ECHO_T}$with_safe_sprintf" >&6 8475 8558 test "$with_safe_sprintf" = yes && cat >>confdefs.h <<\EOF 8476 8559 #define USE_SAFE_SPRINTF 1 8477 @@ -9923,7 +1032 5,7 @@8560 @@ -9923,7 +10326,7 @@ 8478 8561 ### use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic 8479 8562 # when hashmap is used scroll hints are useless 8480 8563 if test "$with_hashmap" = no ; then 8481 8564 -echo "$as_me:9926: checking if you want to experiment without scrolling-hints code" >&5 8482 +echo "$as_me:1032 8: checking if you want to experiment without scrolling-hints code" >&58565 +echo "$as_me:10329: checking if you want to experiment without scrolling-hints code" >&5 8483 8566 echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6 8484 8567 8485 8568 # Check whether --enable-scroll-hints or --disable-scroll-hints was given. 8486 @@ -9933,7 +1033 5,7 @@8569 @@ -9933,7 +10336,7 @@ 8487 8570 else 8488 8571 with_scroll_hints=yes 8489 8572 fi; 8490 8573 -echo "$as_me:9936: result: $with_scroll_hints" >&5 8491 +echo "$as_me:1033 8: result: $with_scroll_hints" >&58574 +echo "$as_me:10339: result: $with_scroll_hints" >&5 8492 8575 echo "${ECHO_T}$with_scroll_hints" >&6 8493 8576 test "$with_scroll_hints" = yes && cat >>confdefs.h <<\EOF 8494 8577 #define USE_SCROLL_HINTS 1 8495 @@ -9941,7 +1034 3,7 @@8578 @@ -9941,7 +10344,7 @@ 8496 8579 8497 8580 fi 8498 8581 8499 8582 -echo "$as_me:9944: checking if you want experimental wgetch-events code" >&5 8500 +echo "$as_me:1034 6: checking if you want experimental wgetch-events code" >&58583 +echo "$as_me:10347: checking if you want experimental wgetch-events code" >&5 8501 8584 echo $ECHO_N "checking if you want experimental wgetch-events code... $ECHO_C" >&6 8502 8585 8503 8586 # Check whether --enable-wgetch-events or --disable-wgetch-events was given. 8504 @@ -9951,7 +1035 3,7 @@8587 @@ -9951,7 +10354,7 @@ 8505 8588 else 8506 8589 with_wgetch_events=no 8507 8590 fi; 8508 8591 -echo "$as_me:9954: result: $with_wgetch_events" >&5 8509 +echo "$as_me:1035 6: result: $with_wgetch_events" >&58592 +echo "$as_me:10357: result: $with_wgetch_events" >&5 8510 8593 echo "${ECHO_T}$with_wgetch_events" >&6 8511 8594 test "$with_wgetch_events" = yes && cat >>confdefs.h <<\EOF 8512 8595 #define NCURSES_WGETCH_EVENTS 1 8513 @@ -9960,7 +1036 2,7 @@8596 @@ -9960,7 +10363,7 @@ 8514 8597 ############################################################################### 8515 8598 8516 8599 ### use option --disable-echo to suppress full display compiling commands 8517 8600 -echo "$as_me:9963: checking if you want to display full commands during build" >&5 8518 +echo "$as_me:1036 5: checking if you want to display full commands during build" >&58601 +echo "$as_me:10366: checking if you want to display full commands during build" >&5 8519 8602 echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6 8520 8603 8521 8604 # Check whether --enable-echo or --disable-echo was given. 8522 @@ -9977,11 +103 79,11 @@8605 @@ -9977,11 +10380,11 @@ 8523 8606 test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent" 8524 8607 test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent" 8525 8608 fi 8526 8609 -echo "$as_me:9980: result: $with_echo" >&5 8527 +echo "$as_me:1038 2: result: $with_echo" >&58610 +echo "$as_me:10383: result: $with_echo" >&5 8528 8611 echo "${ECHO_T}$with_echo" >&6 8529 8612 8530 8613 ### use option --enable-warnings to turn on all gcc warnings 8531 8614 -echo "$as_me:9984: checking if you want to see compiler warnings" >&5 8532 +echo "$as_me:1038 6: checking if you want to see compiler warnings" >&58615 +echo "$as_me:10387: checking if you want to see compiler warnings" >&5 8533 8616 echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6 8534 8617 8535 8618 # Check whether --enable-warnings or --disable-warnings was given. 8536 @@ -9989,7 +1039 1,7 @@8619 @@ -9989,7 +10392,7 @@ 8537 8620 enableval="$enable_warnings" 8538 8621 with_warnings=$enableval 8539 8622 fi; 8540 8623 -echo "$as_me:9992: result: $with_warnings" >&5 8541 +echo "$as_me:1039 4: result: $with_warnings" >&58624 +echo "$as_me:10395: result: $with_warnings" >&5 8542 8625 echo "${ECHO_T}$with_warnings" >&6 8543 8626 8544 8627 if test "x$with_warnings" = "xyes"; then 8545 @@ -10000,12 +1040 2,12 @@8628 @@ -10000,12 +10403,12 @@ 8546 8629 if test "$GCC" = yes ; then 8547 8630 case $host_os in 8548 8631 linux*|gnu*) 8549 8632 - echo "$as_me:10003: checking if this is really Intel C compiler" >&5 8550 + echo "$as_me:1040 5: checking if this is really Intel C compiler" >&58633 + echo "$as_me:10406: checking if this is really Intel C compiler" >&5 8551 8634 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 8552 8635 cf_save_CFLAGS="$CFLAGS" … … 8554 8637 cat >conftest.$ac_ext <<_ACEOF 8555 8638 -#line 10008 "configure" 8556 +#line 1041 0"configure"8639 +#line 10411 "configure" 8557 8640 #include "confdefs.h" 8558 8641 8559 8642 int 8560 @@ -10022,16 +1042 4,16 @@8643 @@ -10022,16 +10425,16 @@ 8561 8644 } 8562 8645 _ACEOF 8563 8646 rm -f conftest.$ac_objext 8564 8647 -if { (eval echo "$as_me:10025: \"$ac_compile\"") >&5 8565 +if { (eval echo "$as_me:1042 7: \"$ac_compile\"") >&58648 +if { (eval echo "$as_me:10428: \"$ac_compile\"") >&5 8566 8649 (eval $ac_compile) 2>&5 8567 8650 ac_status=$? 8568 8651 - echo "$as_me:10028: \$? = $ac_status" >&5 8569 + echo "$as_me:1043 0: \$? = $ac_status" >&58652 + echo "$as_me:10431: \$? = $ac_status" >&5 8570 8653 (exit $ac_status); } && 8571 8654 { ac_try='test -s conftest.$ac_objext' 8572 8655 - { (eval echo "$as_me:10031: \"$ac_try\"") >&5 8573 + { (eval echo "$as_me:1043 3: \"$ac_try\"") >&58656 + { (eval echo "$as_me:10434: \"$ac_try\"") >&5 8574 8657 (eval $ac_try) 2>&5 8575 8658 ac_status=$? 8576 8659 - echo "$as_me:10034: \$? = $ac_status" >&5 8577 + echo "$as_me:1043 6: \$? = $ac_status" >&58660 + echo "$as_me:10437: \$? = $ac_status" >&5 8578 8661 (exit $ac_status); }; }; then 8579 8662 INTEL_COMPILER=yes 8580 8663 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" 8581 @@ -10042,14 +1044 4,14 @@8664 @@ -10042,14 +10445,14 @@ 8582 8665 fi 8583 8666 rm -f conftest.$ac_objext conftest.$ac_ext 8584 8667 CFLAGS="$cf_save_CFLAGS" 8585 8668 - echo "$as_me:10045: result: $INTEL_COMPILER" >&5 8586 + echo "$as_me:1044 7: result: $INTEL_COMPILER" >&58669 + echo "$as_me:10448: result: $INTEL_COMPILER" >&5 8587 8670 echo "${ECHO_T}$INTEL_COMPILER" >&6 8588 8671 ;; … … 8592 8675 cat > conftest.$ac_ext <<EOF 8593 8676 -#line 10052 "${as_me-configure}" 8594 +#line 1045 4"${as_me-configure}"8677 +#line 10455 "${as_me-configure}" 8595 8678 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } 8596 8679 EOF 8597 8680 8598 @@ -10057,7 +104 59,6 @@8681 @@ -10057,7 +10460,6 @@ 8599 8682 then 8600 8683 # The "-wdXXX" options suppress warnings: … … 8604 8687 # remark #1684: conversion from pointer to same-sized integral type (potential portability problem) 8605 8688 # remark #193: zero used for undefined preprocessing identifier 8606 @@ -10065,31 +1046 6,30 @@8689 @@ -10065,31 +10467,30 @@ 8607 8690 # remark #810: conversion from "int" to "Dimension={unsigned short}" may lose significant bits 8608 8691 # remark #869: parameter "tw" was never referenced … … 8612 8695 8613 8696 - { echo "$as_me:10070: checking for $CC warning options..." >&5 8614 + { echo "$as_me:1047 1: checking for $CC warning options..." >&58697 + { echo "$as_me:10472: checking for $CC warning options..." >&5 8615 8698 echo "$as_me: checking for $CC warning options..." >&6;} 8616 8699 cf_save_CFLAGS="$CFLAGS" … … 8631 8714 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" 8632 8715 - if { (eval echo "$as_me:10087: \"$ac_compile\"") >&5 8633 + if { (eval echo "$as_me:1048 7: \"$ac_compile\"") >&58716 + if { (eval echo "$as_me:10488: \"$ac_compile\"") >&5 8634 8717 (eval $ac_compile) 2>&5 8635 8718 ac_status=$? 8636 8719 - echo "$as_me:10090: \$? = $ac_status" >&5 8637 + echo "$as_me:1049 0: \$? = $ac_status" >&58720 + echo "$as_me:10491: \$? = $ac_status" >&5 8638 8721 (exit $ac_status); }; then 8639 8722 - test -n "$verbose" && echo "$as_me:10092: result: ... -$cf_opt" >&5 8640 + test -n "$verbose" && echo "$as_me:1049 2: result: ... -$cf_opt" >&58723 + test -n "$verbose" && echo "$as_me:10493: result: ... -$cf_opt" >&5 8641 8724 echo "${ECHO_T}... -$cf_opt" >&6 8642 8725 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" 8643 8726 fi 8644 @@ -10098,7 +1049 8,7 @@8727 @@ -10098,7 +10499,7 @@ 8645 8728 8646 8729 elif test "$GCC" = yes 8647 8730 then 8648 8731 - { echo "$as_me:10101: checking for $CC warning options..." >&5 8649 + { echo "$as_me:1050 1: checking for $CC warning options..." >&58732 + { echo "$as_me:10502: checking for $CC warning options..." >&5 8650 8733 echo "$as_me: checking for $CC warning options..." >&6;} 8651 8734 cf_save_CFLAGS="$CFLAGS" 8652 8735 EXTRA_CFLAGS="-W -Wall" 8653 @@ -10118,12 +1051 8,12 @@8736 @@ -10118,12 +10519,12 @@ 8654 8737 Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum 8655 8738 do 8656 8739 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" 8657 8740 - if { (eval echo "$as_me:10121: \"$ac_compile\"") >&5 8658 + if { (eval echo "$as_me:1052 1: \"$ac_compile\"") >&58741 + if { (eval echo "$as_me:10522: \"$ac_compile\"") >&5 8659 8742 (eval $ac_compile) 2>&5 8660 8743 ac_status=$? 8661 8744 - echo "$as_me:10124: \$? = $ac_status" >&5 8662 + echo "$as_me:1052 4: \$? = $ac_status" >&58745 + echo "$as_me:10525: \$? = $ac_status" >&5 8663 8746 (exit $ac_status); }; then 8664 8747 - test -n "$verbose" && echo "$as_me:10126: result: ... -$cf_opt" >&5 8665 + test -n "$verbose" && echo "$as_me:1052 6: result: ... -$cf_opt" >&58748 + test -n "$verbose" && echo "$as_me:10527: result: ... -$cf_opt" >&5 8666 8749 echo "${ECHO_T}... -$cf_opt" >&6 8667 8750 case $cf_opt in #(vi 8668 8751 Wcast-qual) #(vi 8669 @@ -10134,7 +1053 4,7 @@8752 @@ -10134,7 +10535,7 @@ 8670 8753 [34].*) 8671 8754 test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 8672 8755 8673 8756 -echo "${as_me-configure}:10137: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 8674 +echo "${as_me-configure}:1053 7: testing feature is broken in gcc $GCC_VERSION ..." 1>&58757 +echo "${as_me-configure}:10538: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 8675 8758 8676 8759 continue;; 8677 8760 esac 8678 @@ -10154,12 +1055 4,12 @@8761 @@ -10154,12 +10555,12 @@ 8679 8762 if test "$GCC" = yes ; then 8680 8763 case $host_os in 8681 8764 linux*|gnu*) 8682 8765 - echo "$as_me:10157: checking if this is really Intel C++ compiler" >&5 8683 + echo "$as_me:1055 7: checking if this is really Intel C++ compiler" >&58766 + echo "$as_me:10558: checking if this is really Intel C++ compiler" >&5 8684 8767 echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6 8685 8768 cf_save_CFLAGS="$CXXFLAGS" … … 8687 8770 cat >conftest.$ac_ext <<_ACEOF 8688 8771 -#line 10162 "configure" 8689 +#line 1056 2"configure"8772 +#line 10563 "configure" 8690 8773 #include "confdefs.h" 8691 8774 8692 8775 int 8693 @@ -10176,16 +1057 6,16 @@8776 @@ -10176,16 +10577,16 @@ 8694 8777 } 8695 8778 _ACEOF 8696 8779 rm -f conftest.$ac_objext 8697 8780 -if { (eval echo "$as_me:10179: \"$ac_compile\"") >&5 8698 +if { (eval echo "$as_me:105 79: \"$ac_compile\"") >&58781 +if { (eval echo "$as_me:10580: \"$ac_compile\"") >&5 8699 8782 (eval $ac_compile) 2>&5 8700 8783 ac_status=$? 8701 8784 - echo "$as_me:10182: \$? = $ac_status" >&5 8702 + echo "$as_me:1058 2: \$? = $ac_status" >&58785 + echo "$as_me:10583: \$? = $ac_status" >&5 8703 8786 (exit $ac_status); } && 8704 8787 { ac_try='test -s conftest.$ac_objext' 8705 8788 - { (eval echo "$as_me:10185: \"$ac_try\"") >&5 8706 + { (eval echo "$as_me:1058 5: \"$ac_try\"") >&58789 + { (eval echo "$as_me:10586: \"$ac_try\"") >&5 8707 8790 (eval $ac_try) 2>&5 8708 8791 ac_status=$? 8709 8792 - echo "$as_me:10188: \$? = $ac_status" >&5 8710 + echo "$as_me:1058 8: \$? = $ac_status" >&58793 + echo "$as_me:10589: \$? = $ac_status" >&5 8711 8794 (exit $ac_status); }; }; then 8712 8795 INTEL_CPLUSPLUS=yes 8713 8796 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" 8714 @@ -10196,7 +1059 6,7 @@8797 @@ -10196,7 +10597,7 @@ 8715 8798 fi 8716 8799 rm -f conftest.$ac_objext conftest.$ac_ext 8717 8800 CXXFLAGS="$cf_save_CFLAGS" 8718 8801 - echo "$as_me:10199: result: $INTEL_CPLUSPLUS" >&5 8719 + echo "$as_me:10 599: result: $INTEL_CPLUSPLUS" >&58802 + echo "$as_me:10600: result: $INTEL_CPLUSPLUS" >&5 8720 8803 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 8721 8804 ;; 8722 8805 esac 8723 @@ -10210,7 +1061 0,7 @@8806 @@ -10210,7 +10611,7 @@ 8724 8807 ac_main_return=return 8725 8808 8726 8809 cat > conftest.$ac_ext <<EOF 8727 8810 -#line 10213 "configure" 8728 +#line 1061 3"configure"8811 +#line 10614 "configure" 8729 8812 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } 8730 8813 EOF 8731 8814 8732 @@ -10228,7 +1062 8,7 @@8815 @@ -10228,7 +10629,7 @@ 8733 8816 # remark #981: operands are evaluated in unspecified order 8734 8817 # warning #269: invalid format string conversion 8735 8818 8736 8819 - { echo "$as_me:10231: checking for $CC warning options..." >&5 8737 + { echo "$as_me:1063 1: checking for $CC warning options..." >&58820 + { echo "$as_me:10632: checking for $CC warning options..." >&5 8738 8821 echo "$as_me: checking for $CC warning options..." >&6;} 8739 8822 cf_save_CXXFLAGS="$CXXFLAGS" 8740 8823 EXTRA_CXXFLAGS="-Wall" 8741 @@ -10245,12 +1064 5,12 @@8824 @@ -10245,12 +10646,12 @@ 8742 8825 wd981 8743 8826 do 8744 8827 CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt" 8745 8828 - if { (eval echo "$as_me:10248: \"$ac_compile\"") >&5 8746 + if { (eval echo "$as_me:1064 8: \"$ac_compile\"") >&58829 + if { (eval echo "$as_me:10649: \"$ac_compile\"") >&5 8747 8830 (eval $ac_compile) 2>&5 8748 8831 ac_status=$? 8749 8832 - echo "$as_me:10251: \$? = $ac_status" >&5 8750 + echo "$as_me:1065 1: \$? = $ac_status" >&58833 + echo "$as_me:10652: \$? = $ac_status" >&5 8751 8834 (exit $ac_status); }; then 8752 8835 - test -n "$verbose" && echo "$as_me:10253: result: ... -$cf_opt" >&5 8753 + test -n "$verbose" && echo "$as_me:1065 3: result: ... -$cf_opt" >&58836 + test -n "$verbose" && echo "$as_me:10654: result: ... -$cf_opt" >&5 8754 8837 echo "${ECHO_T}... -$cf_opt" >&6 8755 8838 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" 8756 8839 fi 8757 @@ -10259,7 +106 59,7 @@8840 @@ -10259,7 +10660,7 @@ 8758 8841 8759 8842 elif test "$GXX" = yes 8760 8843 then 8761 8844 - { echo "$as_me:10262: checking for $CXX warning options..." >&5 8762 + { echo "$as_me:1066 2: checking for $CXX warning options..." >&58845 + { echo "$as_me:10663: checking for $CXX warning options..." >&5 8763 8846 echo "$as_me: checking for $CXX warning options..." >&6;} 8764 8847 cf_save_CXXFLAGS="$CXXFLAGS" 8765 8848 EXTRA_CXXFLAGS="-W -Wall" 8766 @@ -10288,16 +1068 8,16 @@8849 @@ -10288,16 +10689,16 @@ 8767 8850 Wundef $cf_gxx_extra_warnings Wno-unused 8768 8851 do 8769 8852 CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt" 8770 8853 - if { (eval echo "$as_me:10291: \"$ac_compile\"") >&5 8771 + if { (eval echo "$as_me:1069 1: \"$ac_compile\"") >&58854 + if { (eval echo "$as_me:10692: \"$ac_compile\"") >&5 8772 8855 (eval $ac_compile) 2>&5 8773 8856 ac_status=$? 8774 8857 - echo "$as_me:10294: \$? = $ac_status" >&5 8775 + echo "$as_me:1069 4: \$? = $ac_status" >&58858 + echo "$as_me:10695: \$? = $ac_status" >&5 8776 8859 (exit $ac_status); }; then 8777 8860 - test -n "$verbose" && echo "$as_me:10296: result: ... -$cf_opt" >&5 8778 + test -n "$verbose" && echo "$as_me:1069 6: result: ... -$cf_opt" >&58861 + test -n "$verbose" && echo "$as_me:10697: result: ... -$cf_opt" >&5 8779 8862 echo "${ECHO_T}... -$cf_opt" >&6 8780 8863 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" 8781 8864 else 8782 8865 - test -n "$verbose" && echo "$as_me:10300: result: ... no -$cf_opt" >&5 8783 + test -n "$verbose" && echo "$as_me:1070 0: result: ... no -$cf_opt" >&58866 + test -n "$verbose" && echo "$as_me:10701: result: ... no -$cf_opt" >&5 8784 8867 echo "${ECHO_T}... no -$cf_opt" >&6 8785 8868 fi 8786 8869 done 8787 @@ -10333,10 +1073 3,10 @@8870 @@ -10333,10 +10734,10 @@ 8788 8871 EOF 8789 8872 if test "$GCC" = yes 8790 8873 then 8791 8874 - { echo "$as_me:10336: checking for $CC __attribute__ directives..." >&5 8792 + { echo "$as_me:1073 6: checking for $CC __attribute__ directives..." >&58875 + { echo "$as_me:10737: checking for $CC __attribute__ directives..." >&5 8793 8876 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} 8794 8877 cat > conftest.$ac_ext <<EOF 8795 8878 -#line 10339 "${as_me-configure}" 8796 +#line 107 39"${as_me-configure}"8879 +#line 10740 "${as_me-configure}" 8797 8880 #include "confdefs.h" 8798 8881 #include "conftest.h" 8799 8882 #include "conftest.i" 8800 @@ -10374,12 +1077 4,12 @@8883 @@ -10374,12 +10775,12 @@ 8801 8884 EOF 8802 8885 ;; 8803 8886 esac 8804 8887 - if { (eval echo "$as_me:10377: \"$ac_compile\"") >&5 8805 + if { (eval echo "$as_me:1077 7: \"$ac_compile\"") >&58888 + if { (eval echo "$as_me:10778: \"$ac_compile\"") >&5 8806 8889 (eval $ac_compile) 2>&5 8807 8890 ac_status=$? 8808 8891 - echo "$as_me:10380: \$? = $ac_status" >&5 8809 + echo "$as_me:1078 0: \$? = $ac_status" >&58892 + echo "$as_me:10781: \$? = $ac_status" >&5 8810 8893 (exit $ac_status); }; then 8811 8894 - test -n "$verbose" && echo "$as_me:10382: result: ... $cf_attribute" >&5 8812 + test -n "$verbose" && echo "$as_me:1078 2: result: ... $cf_attribute" >&58895 + test -n "$verbose" && echo "$as_me:10783: result: ... $cf_attribute" >&5 8813 8896 echo "${ECHO_T}... $cf_attribute" >&6 8814 8897 cat conftest.h >>confdefs.h 8815 8898 fi 8816 @@ -10391,7 +1079 1,7 @@8899 @@ -10391,7 +10792,7 @@ 8817 8900 fi 8818 8901 8819 8902 ### use option --enable-assertions to turn on generation of assertion code 8820 8903 -echo "$as_me:10394: checking if you want to enable runtime assertions" >&5 8821 +echo "$as_me:1079 4: checking if you want to enable runtime assertions" >&58904 +echo "$as_me:10795: checking if you want to enable runtime assertions" >&5 8822 8905 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 8823 8906 8824 8907 # Check whether --enable-assertions or --disable-assertions was given. 8825 @@ -10401,7 +1080 1,7 @@8908 @@ -10401,7 +10802,7 @@ 8826 8909 else 8827 8910 with_assertions=no 8828 8911 fi; 8829 8912 -echo "$as_me:10404: result: $with_assertions" >&5 8830 +echo "$as_me:1080 4: result: $with_assertions" >&58913 +echo "$as_me:10805: result: $with_assertions" >&5 8831 8914 echo "${ECHO_T}$with_assertions" >&6 8832 8915 if test -n "$GCC" 8833 8916 then 8834 @@ -10419,7 +108 19,7 @@8917 @@ -10419,7 +10820,7 @@ 8835 8918 8836 8919 ### use option --disable-leaks to suppress "permanent" leaks, for testing 8837 8920 8838 8921 -echo "$as_me:10422: checking if you want to use dmalloc for testing" >&5 8839 +echo "$as_me:1082 2: checking if you want to use dmalloc for testing" >&58922 +echo "$as_me:10823: checking if you want to use dmalloc for testing" >&5 8840 8923 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 8841 8924 8842 8925 # Check whether --with-dmalloc or --without-dmalloc was given. 8843 @@ -10435,7 +1083 5,7 @@8926 @@ -10435,7 +10836,7 @@ 8844 8927 else 8845 8928 with_dmalloc= 8846 8929 fi; 8847 8930 -echo "$as_me:10438: result: ${with_dmalloc:-no}" >&5 8848 +echo "$as_me:1083 8: result: ${with_dmalloc:-no}" >&58931 +echo "$as_me:10839: result: ${with_dmalloc:-no}" >&5 8849 8932 echo "${ECHO_T}${with_dmalloc:-no}" >&6 8850 8933 8851 8934 case .$with_cflags in #(vi 8852 @@ -10505,7 +1090 5,7 @@8935 @@ -10505,7 +10906,7 @@ 8853 8936 8854 8937 if test -n "$cf_new_cppflags" ; then … … 8859 8942 8860 8943 if test -n "$cf_new_extra_cppflags" ; then 8861 @@ -10519,23 +109 19,23 @@8944 @@ -10519,23 +10920,23 @@ 8862 8945 esac 8863 8946 8864 8947 if test "$with_dmalloc" = yes ; then 8865 8948 - echo "$as_me:10522: checking for dmalloc.h" >&5 8866 + echo "$as_me:1092 2: checking for dmalloc.h" >&58949 + echo "$as_me:10923: checking for dmalloc.h" >&5 8867 8950 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6 8868 8951 if test "${ac_cv_header_dmalloc_h+set}" = set; then … … 8871 8954 cat >conftest.$ac_ext <<_ACEOF 8872 8955 -#line 10528 "configure" 8873 +#line 1092 8"configure"8956 +#line 10929 "configure" 8874 8957 #include "confdefs.h" 8875 8958 #include <dmalloc.h> 8876 8959 _ACEOF 8877 8960 -if { (eval echo "$as_me:10532: \"$ac_cpp conftest.$ac_ext\"") >&5 8878 +if { (eval echo "$as_me:1093 2: \"$ac_cpp conftest.$ac_ext\"") >&58961 +if { (eval echo "$as_me:10933: \"$ac_cpp conftest.$ac_ext\"") >&5 8879 8962 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 8880 8963 ac_status=$? … … 8883 8966 cat conftest.err >&5 8884 8967 - echo "$as_me:10538: \$? = $ac_status" >&5 8885 + echo "$as_me:1093 8: \$? = $ac_status" >&58968 + echo "$as_me:10939: \$? = $ac_status" >&5 8886 8969 (exit $ac_status); } >/dev/null; then 8887 8970 if test -s conftest.err; then 8888 8971 ac_cpp_err=$ac_c_preproc_warn_flag 8889 @@ -10554,11 +1095 4,11 @@8972 @@ -10554,11 +10955,11 @@ 8890 8973 fi 8891 8974 rm -f conftest.err conftest.$ac_ext 8892 8975 fi 8893 8976 -echo "$as_me:10557: result: $ac_cv_header_dmalloc_h" >&5 8894 +echo "$as_me:1095 7: result: $ac_cv_header_dmalloc_h" >&58977 +echo "$as_me:10958: result: $ac_cv_header_dmalloc_h" >&5 8895 8978 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6 8896 8979 if test $ac_cv_header_dmalloc_h = yes; then 8897 8980 8898 8981 -echo "$as_me:10561: checking for dmalloc_debug in -ldmalloc" >&5 8899 +echo "$as_me:1096 1: checking for dmalloc_debug in -ldmalloc" >&58982 +echo "$as_me:10962: checking for dmalloc_debug in -ldmalloc" >&5 8900 8983 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 8901 8984 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then 8902 8985 echo $ECHO_N "(cached) $ECHO_C" >&6 8903 @@ -10566,7 +1096 6,7 @@8986 @@ -10566,7 +10967,7 @@ 8904 8987 ac_check_lib_save_LIBS=$LIBS 8905 8988 LIBS="-ldmalloc $LIBS" 8906 8989 cat >conftest.$ac_ext <<_ACEOF 8907 8990 -#line 10569 "configure" 8908 +#line 109 69"configure"8991 +#line 10970 "configure" 8909 8992 #include "confdefs.h" 8910 8993 8911 8994 /* Override any gcc2 internal prototype to avoid an error. */ 8912 @@ -10585,16 +1098 5,16 @@8995 @@ -10585,16 +10986,16 @@ 8913 8996 } 8914 8997 _ACEOF 8915 8998 rm -f conftest.$ac_objext conftest$ac_exeext 8916 8999 -if { (eval echo "$as_me:10588: \"$ac_link\"") >&5 8917 +if { (eval echo "$as_me:1098 8: \"$ac_link\"") >&59000 +if { (eval echo "$as_me:10989: \"$ac_link\"") >&5 8918 9001 (eval $ac_link) 2>&5 8919 9002 ac_status=$? 8920 9003 - echo "$as_me:10591: \$? = $ac_status" >&5 8921 + echo "$as_me:1099 1: \$? = $ac_status" >&59004 + echo "$as_me:10992: \$? = $ac_status" >&5 8922 9005 (exit $ac_status); } && 8923 9006 { ac_try='test -s conftest$ac_exeext' 8924 9007 - { (eval echo "$as_me:10594: \"$ac_try\"") >&5 8925 + { (eval echo "$as_me:1099 4: \"$ac_try\"") >&59008 + { (eval echo "$as_me:10995: \"$ac_try\"") >&5 8926 9009 (eval $ac_try) 2>&5 8927 9010 ac_status=$? 8928 9011 - echo "$as_me:10597: \$? = $ac_status" >&5 8929 + echo "$as_me:1099 7: \$? = $ac_status" >&59012 + echo "$as_me:10998: \$? = $ac_status" >&5 8930 9013 (exit $ac_status); }; }; then 8931 9014 ac_cv_lib_dmalloc_dmalloc_debug=yes 8932 9015 else 8933 @@ -10605,7 +1100 5,7 @@9016 @@ -10605,7 +11006,7 @@ 8934 9017 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 8935 9018 LIBS=$ac_check_lib_save_LIBS 8936 9019 fi 8937 9020 -echo "$as_me:10608: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 8938 +echo "$as_me:1100 8: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&59021 +echo "$as_me:11009: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 8939 9022 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 8940 9023 if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then 8941 9024 cat >>confdefs.h <<EOF 8942 @@ -10620,7 +1102 0,7 @@9025 @@ -10620,7 +11021,7 @@ 8943 9026 8944 9027 fi 8945 9028 8946 9029 -echo "$as_me:10623: checking if you want to use dbmalloc for testing" >&5 8947 +echo "$as_me:1102 3: checking if you want to use dbmalloc for testing" >&59030 +echo "$as_me:11024: checking if you want to use dbmalloc for testing" >&5 8948 9031 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 8949 9032 8950 9033 # Check whether --with-dbmalloc or --without-dbmalloc was given. 8951 @@ -10636,7 +1103 6,7 @@9034 @@ -10636,7 +11037,7 @@ 8952 9035 else 8953 9036 with_dbmalloc= 8954 9037 fi; 8955 9038 -echo "$as_me:10639: result: ${with_dbmalloc:-no}" >&5 8956 +echo "$as_me:110 39: result: ${with_dbmalloc:-no}" >&59039 +echo "$as_me:11040: result: ${with_dbmalloc:-no}" >&5 8957 9040 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 8958 9041 8959 9042 case .$with_cflags in #(vi 8960 @@ -10706,7 +1110 6,7 @@9043 @@ -10706,7 +11107,7 @@ 8961 9044 8962 9045 if test -n "$cf_new_cppflags" ; then … … 8967 9050 8968 9051 if test -n "$cf_new_extra_cppflags" ; then 8969 @@ -10720,23 +1112 0,23 @@9052 @@ -10720,23 +11121,23 @@ 8970 9053 esac 8971 9054 8972 9055 if test "$with_dbmalloc" = yes ; then 8973 9056 - echo "$as_me:10723: checking for dbmalloc.h" >&5 8974 + echo "$as_me:1112 3: checking for dbmalloc.h" >&59057 + echo "$as_me:11124: checking for dbmalloc.h" >&5 8975 9058 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6 8976 9059 if test "${ac_cv_header_dbmalloc_h+set}" = set; then … … 8979 9062 cat >conftest.$ac_ext <<_ACEOF 8980 9063 -#line 10729 "configure" 8981 +#line 111 29"configure"9064 +#line 11130 "configure" 8982 9065 #include "confdefs.h" 8983 9066 #include <dbmalloc.h> 8984 9067 _ACEOF 8985 9068 -if { (eval echo "$as_me:10733: \"$ac_cpp conftest.$ac_ext\"") >&5 8986 +if { (eval echo "$as_me:1113 3: \"$ac_cpp conftest.$ac_ext\"") >&59069 +if { (eval echo "$as_me:11134: \"$ac_cpp conftest.$ac_ext\"") >&5 8987 9070 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 8988 9071 ac_status=$? … … 8991 9074 cat conftest.err >&5 8992 9075 - echo "$as_me:10739: \$? = $ac_status" >&5 8993 + echo "$as_me:111 39: \$? = $ac_status" >&59076 + echo "$as_me:11140: \$? = $ac_status" >&5 8994 9077 (exit $ac_status); } >/dev/null; then 8995 9078 if test -s conftest.err; then 8996 9079 ac_cpp_err=$ac_c_preproc_warn_flag 8997 @@ -10755,11 +1115 5,11 @@9080 @@ -10755,11 +11156,11 @@ 8998 9081 fi 8999 9082 rm -f conftest.err conftest.$ac_ext 9000 9083 fi 9001 9084 -echo "$as_me:10758: result: $ac_cv_header_dbmalloc_h" >&5 9002 +echo "$as_me:1115 8: result: $ac_cv_header_dbmalloc_h" >&59085 +echo "$as_me:11159: result: $ac_cv_header_dbmalloc_h" >&5 9003 9086 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6 9004 9087 if test $ac_cv_header_dbmalloc_h = yes; then 9005 9088 9006 9089 -echo "$as_me:10762: checking for debug_malloc in -ldbmalloc" >&5 9007 +echo "$as_me:1116 2: checking for debug_malloc in -ldbmalloc" >&59090 +echo "$as_me:11163: checking for debug_malloc in -ldbmalloc" >&5 9008 9091 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 9009 9092 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then 9010 9093 echo $ECHO_N "(cached) $ECHO_C" >&6 9011 @@ -10767,7 +1116 7,7 @@9094 @@ -10767,7 +11168,7 @@ 9012 9095 ac_check_lib_save_LIBS=$LIBS 9013 9096 LIBS="-ldbmalloc $LIBS" 9014 9097 cat >conftest.$ac_ext <<_ACEOF 9015 9098 -#line 10770 "configure" 9016 +#line 1117 0"configure"9099 +#line 11171 "configure" 9017 9100 #include "confdefs.h" 9018 9101 9019 9102 /* Override any gcc2 internal prototype to avoid an error. */ 9020 @@ -10786,16 +1118 6,16 @@9103 @@ -10786,16 +11187,16 @@ 9021 9104 } 9022 9105 _ACEOF 9023 9106 rm -f conftest.$ac_objext conftest$ac_exeext 9024 9107 -if { (eval echo "$as_me:10789: \"$ac_link\"") >&5 9025 +if { (eval echo "$as_me:111 89: \"$ac_link\"") >&59108 +if { (eval echo "$as_me:11190: \"$ac_link\"") >&5 9026 9109 (eval $ac_link) 2>&5 9027 9110 ac_status=$? 9028 9111 - echo "$as_me:10792: \$? = $ac_status" >&5 9029 + echo "$as_me:1119 2: \$? = $ac_status" >&59112 + echo "$as_me:11193: \$? = $ac_status" >&5 9030 9113 (exit $ac_status); } && 9031 9114 { ac_try='test -s conftest$ac_exeext' 9032 9115 - { (eval echo "$as_me:10795: \"$ac_try\"") >&5 9033 + { (eval echo "$as_me:1119 5: \"$ac_try\"") >&59116 + { (eval echo "$as_me:11196: \"$ac_try\"") >&5 9034 9117 (eval $ac_try) 2>&5 9035 9118 ac_status=$? 9036 9119 - echo "$as_me:10798: \$? = $ac_status" >&5 9037 + echo "$as_me:1119 8: \$? = $ac_status" >&59120 + echo "$as_me:11199: \$? = $ac_status" >&5 9038 9121 (exit $ac_status); }; }; then 9039 9122 ac_cv_lib_dbmalloc_debug_malloc=yes 9040 9123 else 9041 @@ -10806,7 +1120 6,7 @@9124 @@ -10806,7 +11207,7 @@ 9042 9125 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 9043 9126 LIBS=$ac_check_lib_save_LIBS 9044 9127 fi 9045 9128 -echo "$as_me:10809: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 9046 +echo "$as_me:112 09: result: $ac_cv_lib_dbmalloc_debug_malloc" >&59129 +echo "$as_me:11210: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 9047 9130 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 9048 9131 if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then 9049 9132 cat >>confdefs.h <<EOF 9050 @@ -10821,7 +1122 1,7 @@9133 @@ -10821,7 +11222,7 @@ 9051 9134 9052 9135 fi 9053 9136 9054 9137 -echo "$as_me:10824: checking if you want to use valgrind for testing" >&5 9055 +echo "$as_me:1122 4: checking if you want to use valgrind for testing" >&59138 +echo "$as_me:11225: checking if you want to use valgrind for testing" >&5 9056 9139 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6 9057 9140 9058 9141 # Check whether --with-valgrind or --without-valgrind was given. 9059 @@ -10837,7 +1123 7,7 @@9142 @@ -10837,7 +11238,7 @@ 9060 9143 else 9061 9144 with_valgrind= 9062 9145 fi; 9063 9146 -echo "$as_me:10840: result: ${with_valgrind:-no}" >&5 9064 +echo "$as_me:1124 0: result: ${with_valgrind:-no}" >&59147 +echo "$as_me:11241: result: ${with_valgrind:-no}" >&5 9065 9148 echo "${ECHO_T}${with_valgrind:-no}" >&6 9066 9149 9067 9150 case .$with_cflags in #(vi 9068 @@ -10907,7 +1130 7,7 @@9151 @@ -10907,7 +11308,7 @@ 9069 9152 9070 9153 if test -n "$cf_new_cppflags" ; then … … 9075 9158 9076 9159 if test -n "$cf_new_extra_cppflags" ; then 9077 @@ -10920,7 +1132 0,7 @@9160 @@ -10920,7 +11321,7 @@ 9078 9161 ;; 9079 9162 esac 9080 9163 9081 9164 -echo "$as_me:10923: checking if you want to perform memory-leak testing" >&5 9082 +echo "$as_me:1132 3: checking if you want to perform memory-leak testing" >&59165 +echo "$as_me:11324: checking if you want to perform memory-leak testing" >&5 9083 9166 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 9084 9167 9085 9168 # Check whether --enable-leaks or --disable-leaks was given. 9086 @@ -10930,7 +1133 0,7 @@9169 @@ -10930,7 +11331,7 @@ 9087 9170 else 9088 9171 : ${with_no_leaks:=no} 9089 9172 fi; 9090 9173 -echo "$as_me:10933: result: $with_no_leaks" >&5 9091 +echo "$as_me:1133 3: result: $with_no_leaks" >&59174 +echo "$as_me:11334: result: $with_no_leaks" >&5 9092 9175 echo "${ECHO_T}$with_no_leaks" >&6 9093 9176 9094 9177 if test "$with_no_leaks" = yes ; then 9095 @@ -10975,7 +1137 5,7 @@9178 @@ -10975,7 +11376,7 @@ 9096 9179 ;; 9097 9180 esac 9098 9181 9099 9182 -echo "$as_me:10978: checking whether to add trace feature to all models" >&5 9100 +echo "$as_me:1137 8: checking whether to add trace feature to all models" >&59183 +echo "$as_me:11379: checking whether to add trace feature to all models" >&5 9101 9184 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 9102 9185 9103 9186 # Check whether --with-trace or --without-trace was given. 9104 @@ -10985,7 +1138 5,7 @@9187 @@ -10985,7 +11386,7 @@ 9105 9188 else 9106 9189 cf_with_trace=$cf_all_traces 9107 9190 fi; 9108 9191 -echo "$as_me:10988: result: $cf_with_trace" >&5 9109 +echo "$as_me:1138 8: result: $cf_with_trace" >&59192 +echo "$as_me:11389: result: $cf_with_trace" >&5 9110 9193 echo "${ECHO_T}$cf_with_trace" >&6 9111 9194 9112 9195 if test "$cf_with_trace" = yes ; then 9113 @@ -11052,7 +1145 2,7 @@9196 @@ -11052,7 +11453,7 @@ 9114 9197 9115 9198 if test -n "$cf_new_cppflags" ; then … … 9120 9203 9121 9204 if test -n "$cf_new_extra_cppflags" ; then 9122 @@ -11066,13 +1146 6,17 @@9205 @@ -11066,13 +11467,17 @@ 9123 9206 fi 9124 9207 … … 9129 9212 + ;; 9130 9213 +*) 9131 +echo "$as_me:1147 3: checking for gettimeofday" >&59214 +echo "$as_me:11474: checking for gettimeofday" >&5 9132 9215 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 9133 9216 if test "${ac_cv_func_gettimeofday+set}" = set; then … … 9136 9219 cat >conftest.$ac_ext <<_ACEOF 9137 9220 -#line 11075 "configure" 9138 +#line 114 79"configure"9221 +#line 11480 "configure" 9139 9222 #include "confdefs.h" 9140 9223 /* System header to define __stub macros and hopefully few prototypes, 9141 9224 which can conflict with char gettimeofday (); below. */ 9142 @@ -11103,16 +1150 7,16 @@9225 @@ -11103,16 +11508,16 @@ 9143 9226 } 9144 9227 _ACEOF 9145 9228 rm -f conftest.$ac_objext conftest$ac_exeext 9146 9229 -if { (eval echo "$as_me:11106: \"$ac_link\"") >&5 9147 +if { (eval echo "$as_me:1151 0: \"$ac_link\"") >&59230 +if { (eval echo "$as_me:11511: \"$ac_link\"") >&5 9148 9231 (eval $ac_link) 2>&5 9149 9232 ac_status=$? 9150 9233 - echo "$as_me:11109: \$? = $ac_status" >&5 9151 + echo "$as_me:1151 3: \$? = $ac_status" >&59234 + echo "$as_me:11514: \$? = $ac_status" >&5 9152 9235 (exit $ac_status); } && 9153 9236 { ac_try='test -s conftest$ac_exeext' 9154 9237 - { (eval echo "$as_me:11112: \"$ac_try\"") >&5 9155 + { (eval echo "$as_me:1151 6: \"$ac_try\"") >&59238 + { (eval echo "$as_me:11517: \"$ac_try\"") >&5 9156 9239 (eval $ac_try) 2>&5 9157 9240 ac_status=$? 9158 9241 - echo "$as_me:11115: \$? = $ac_status" >&5 9159 + echo "$as_me:115 19: \$? = $ac_status" >&59242 + echo "$as_me:11520: \$? = $ac_status" >&5 9160 9243 (exit $ac_status); }; }; then 9161 9244 ac_cv_func_gettimeofday=yes 9162 9245 else 9163 @@ -11122,7 +1152 6,7 @@9246 @@ -11122,7 +11527,7 @@ 9164 9247 fi 9165 9248 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 9166 9249 fi 9167 9250 -echo "$as_me:11125: result: $ac_cv_func_gettimeofday" >&5 9168 +echo "$as_me:115 29: result: $ac_cv_func_gettimeofday" >&59251 +echo "$as_me:11530: result: $ac_cv_func_gettimeofday" >&5 9169 9252 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 9170 9253 if test $ac_cv_func_gettimeofday = yes; then 9171 9254 cat >>confdefs.h <<\EOF 9172 @@ -11131,7 +1153 5,7 @@9255 @@ -11131,7 +11536,7 @@ 9173 9256 9174 9257 else 9175 9258 9176 9259 -echo "$as_me:11134: checking for gettimeofday in -lbsd" >&5 9177 +echo "$as_me:1153 8: checking for gettimeofday in -lbsd" >&59260 +echo "$as_me:11539: checking for gettimeofday in -lbsd" >&5 9178 9261 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 9179 9262 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then 9180 9263 echo $ECHO_N "(cached) $ECHO_C" >&6 9181 @@ -11139,7 +1154 3,7 @@9264 @@ -11139,7 +11544,7 @@ 9182 9265 ac_check_lib_save_LIBS=$LIBS 9183 9266 LIBS="-lbsd $LIBS" 9184 9267 cat >conftest.$ac_ext <<_ACEOF 9185 9268 -#line 11142 "configure" 9186 +#line 1154 6"configure"9269 +#line 11547 "configure" 9187 9270 #include "confdefs.h" 9188 9271 9189 9272 /* Override any gcc2 internal prototype to avoid an error. */ 9190 @@ -11158,16 +1156 2,16 @@9273 @@ -11158,16 +11563,16 @@ 9191 9274 } 9192 9275 _ACEOF 9193 9276 rm -f conftest.$ac_objext conftest$ac_exeext 9194 9277 -if { (eval echo "$as_me:11161: \"$ac_link\"") >&5 9195 +if { (eval echo "$as_me:1156 5: \"$ac_link\"") >&59278 +if { (eval echo "$as_me:11566: \"$ac_link\"") >&5 9196 9279 (eval $ac_link) 2>&5 9197 9280 ac_status=$? 9198 9281 - echo "$as_me:11164: \$? = $ac_status" >&5 9199 + echo "$as_me:1156 8: \$? = $ac_status" >&59282 + echo "$as_me:11569: \$? = $ac_status" >&5 9200 9283 (exit $ac_status); } && 9201 9284 { ac_try='test -s conftest$ac_exeext' 9202 9285 - { (eval echo "$as_me:11167: \"$ac_try\"") >&5 9203 + { (eval echo "$as_me:1157 1: \"$ac_try\"") >&59286 + { (eval echo "$as_me:11572: \"$ac_try\"") >&5 9204 9287 (eval $ac_try) 2>&5 9205 9288 ac_status=$? 9206 9289 - echo "$as_me:11170: \$? = $ac_status" >&5 9207 + echo "$as_me:1157 4: \$? = $ac_status" >&59290 + echo "$as_me:11575: \$? = $ac_status" >&5 9208 9291 (exit $ac_status); }; }; then 9209 9292 ac_cv_lib_bsd_gettimeofday=yes 9210 9293 else 9211 @@ -11178,7 +1158 2,7 @@9294 @@ -11178,7 +11583,7 @@ 9212 9295 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 9213 9296 LIBS=$ac_check_lib_save_LIBS 9214 9297 fi 9215 9298 -echo "$as_me:11181: result: $ac_cv_lib_bsd_gettimeofday" >&5 9216 +echo "$as_me:1158 5: result: $ac_cv_lib_bsd_gettimeofday" >&59299 +echo "$as_me:11586: result: $ac_cv_lib_bsd_gettimeofday" >&5 9217 9300 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 9218 9301 if test $ac_cv_lib_bsd_gettimeofday = yes; then 9219 9302 cat >>confdefs.h <<\EOF 9220 @@ -11189,15 +1159 3,17 @@9303 @@ -11189,15 +11594,17 @@ 9221 9304 fi 9222 9305 … … 9226 9309 9227 9310 -echo "$as_me:11193: checking if -lm needed for math functions" >&5 9228 +echo "$as_me:11 599: checking if -lm needed for math functions" >&59311 +echo "$as_me:11600: checking if -lm needed for math functions" >&5 9229 9312 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6 9230 9313 if test "${cf_cv_need_libm+set}" = set; then … … 9234 9317 cat >conftest.$ac_ext <<_ACEOF 9235 9318 -#line 11200 "configure" 9236 +#line 1160 6"configure"9319 +#line 11607 "configure" 9237 9320 #include "confdefs.h" 9238 9321 9239 9322 #include <stdio.h> 9240 @@ -11212,16 +1161 8,16 @@9323 @@ -11212,16 +11619,16 @@ 9241 9324 } 9242 9325 _ACEOF 9243 9326 rm -f conftest.$ac_objext conftest$ac_exeext 9244 9327 -if { (eval echo "$as_me:11215: \"$ac_link\"") >&5 9245 +if { (eval echo "$as_me:1162 1: \"$ac_link\"") >&59328 +if { (eval echo "$as_me:11622: \"$ac_link\"") >&5 9246 9329 (eval $ac_link) 2>&5 9247 9330 ac_status=$? 9248 9331 - echo "$as_me:11218: \$? = $ac_status" >&5 9249 + echo "$as_me:1162 4: \$? = $ac_status" >&59332 + echo "$as_me:11625: \$? = $ac_status" >&5 9250 9333 (exit $ac_status); } && 9251 9334 { ac_try='test -s conftest$ac_exeext' 9252 9335 - { (eval echo "$as_me:11221: \"$ac_try\"") >&5 9253 + { (eval echo "$as_me:1162 7: \"$ac_try\"") >&59336 + { (eval echo "$as_me:11628: \"$ac_try\"") >&5 9254 9337 (eval $ac_try) 2>&5 9255 9338 ac_status=$? 9256 9339 - echo "$as_me:11224: \$? = $ac_status" >&5 9257 + echo "$as_me:1163 0: \$? = $ac_status" >&59340 + echo "$as_me:11631: \$? = $ac_status" >&5 9258 9341 (exit $ac_status); }; }; then 9259 9342 cf_cv_need_libm=no 9260 9343 else 9261 @@ -11231,7 +1163 7,7 @@9344 @@ -11231,7 +11638,7 @@ 9262 9345 fi 9263 9346 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 9264 9347 fi 9265 9348 -echo "$as_me:11234: result: $cf_cv_need_libm" >&5 9266 +echo "$as_me:1164 0: result: $cf_cv_need_libm" >&59349 +echo "$as_me:11641: result: $cf_cv_need_libm" >&5 9267 9350 echo "${ECHO_T}$cf_cv_need_libm" >&6 9268 9351 if test "$cf_cv_need_libm" = yes 9269 9352 then 9270 @@ -11239,13 +1164 5,13 @@9353 @@ -11239,13 +11646,13 @@ 9271 9354 fi 9272 9355 9273 9356 ### Checks for header files. 9274 9357 -echo "$as_me:11242: checking for ANSI C header files" >&5 9275 +echo "$as_me:1164 8: checking for ANSI C header files" >&59358 +echo "$as_me:11649: checking for ANSI C header files" >&5 9276 9359 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 9277 9360 if test "${ac_cv_header_stdc+set}" = set; then … … 9280 9363 cat >conftest.$ac_ext <<_ACEOF 9281 9364 -#line 11248 "configure" 9282 +#line 1165 4"configure"9365 +#line 11655 "configure" 9283 9366 #include "confdefs.h" 9284 9367 #include <stdlib.h> 9285 9368 #include <stdarg.h> 9286 @@ -11253,13 +116 59,13 @@9369 @@ -11253,13 +11660,13 @@ 9287 9370 #include <float.h> 9288 9371 9289 9372 _ACEOF 9290 9373 -if { (eval echo "$as_me:11256: \"$ac_cpp conftest.$ac_ext\"") >&5 9291 +if { (eval echo "$as_me:1166 2: \"$ac_cpp conftest.$ac_ext\"") >&59374 +if { (eval echo "$as_me:11663: \"$ac_cpp conftest.$ac_ext\"") >&5 9292 9375 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 9293 9376 ac_status=$? … … 9296 9379 cat conftest.err >&5 9297 9380 - echo "$as_me:11262: \$? = $ac_status" >&5 9298 + echo "$as_me:1166 8: \$? = $ac_status" >&59381 + echo "$as_me:11669: \$? = $ac_status" >&5 9299 9382 (exit $ac_status); } >/dev/null; then 9300 9383 if test -s conftest.err; then 9301 9384 ac_cpp_err=$ac_c_preproc_warn_flag 9302 @@ -11281,7 +1168 7,7 @@9385 @@ -11281,7 +11688,7 @@ 9303 9386 if test $ac_cv_header_stdc = yes; then 9304 9387 # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 9305 9388 cat >conftest.$ac_ext <<_ACEOF 9306 9389 -#line 11284 "configure" 9307 +#line 1169 0"configure"9390 +#line 11691 "configure" 9308 9391 #include "confdefs.h" 9309 9392 #include <string.h> 9310 9393 9311 @@ -11299,7 +1170 5,7 @@9394 @@ -11299,7 +11706,7 @@ 9312 9395 if test $ac_cv_header_stdc = yes; then 9313 9396 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 9314 9397 cat >conftest.$ac_ext <<_ACEOF 9315 9398 -#line 11302 "configure" 9316 +#line 1170 8"configure"9399 +#line 11709 "configure" 9317 9400 #include "confdefs.h" 9318 9401 #include <stdlib.h> 9319 9402 9320 @@ -11320,7 +1172 6,7 @@9403 @@ -11320,7 +11727,7 @@ 9321 9404 : 9322 9405 else 9323 9406 cat >conftest.$ac_ext <<_ACEOF 9324 9407 -#line 11323 "configure" 9325 +#line 117 29"configure"9408 +#line 11730 "configure" 9326 9409 #include "confdefs.h" 9327 9410 #include <ctype.h> 9328 9411 #if ((' ' & 0x0FF) == 0x020) 9329 @@ -11346,15 +1175 2,15 @@9412 @@ -11346,15 +11753,15 @@ 9330 9413 } 9331 9414 _ACEOF 9332 9415 rm -f conftest$ac_exeext 9333 9416 -if { (eval echo "$as_me:11349: \"$ac_link\"") >&5 9334 +if { (eval echo "$as_me:1175 5: \"$ac_link\"") >&59417 +if { (eval echo "$as_me:11756: \"$ac_link\"") >&5 9335 9418 (eval $ac_link) 2>&5 9336 9419 ac_status=$? 9337 9420 - echo "$as_me:11352: \$? = $ac_status" >&5 9338 + echo "$as_me:1175 8: \$? = $ac_status" >&59421 + echo "$as_me:11759: \$? = $ac_status" >&5 9339 9422 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 9340 9423 - { (eval echo "$as_me:11354: \"$ac_try\"") >&5 9341 + { (eval echo "$as_me:1176 0: \"$ac_try\"") >&59424 + { (eval echo "$as_me:11761: \"$ac_try\"") >&5 9342 9425 (eval $ac_try) 2>&5 9343 9426 ac_status=$? 9344 9427 - echo "$as_me:11357: \$? = $ac_status" >&5 9345 + echo "$as_me:1176 3: \$? = $ac_status" >&59428 + echo "$as_me:11764: \$? = $ac_status" >&5 9346 9429 (exit $ac_status); }; }; then 9347 9430 : 9348 9431 else 9349 @@ -11367,7 +1177 3,7 @@9432 @@ -11367,7 +11774,7 @@ 9350 9433 fi 9351 9434 fi 9352 9435 fi 9353 9436 -echo "$as_me:11370: result: $ac_cv_header_stdc" >&5 9354 +echo "$as_me:1177 6: result: $ac_cv_header_stdc" >&59437 +echo "$as_me:11777: result: $ac_cv_header_stdc" >&5 9355 9438 echo "${ECHO_T}$ac_cv_header_stdc" >&6 9356 9439 if test $ac_cv_header_stdc = yes; then 9357 9440 9358 @@ -11380,13 +1178 6,13 @@9441 @@ -11380,13 +11787,13 @@ 9359 9442 ac_header_dirent=no 9360 9443 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do 9361 9444 as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` 9362 9445 -echo "$as_me:11383: checking for $ac_hdr that defines DIR" >&5 9363 +echo "$as_me:117 89: checking for $ac_hdr that defines DIR" >&59446 +echo "$as_me:11790: checking for $ac_hdr that defines DIR" >&5 9364 9447 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 9365 9448 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 9368 9451 cat >conftest.$ac_ext <<_ACEOF 9369 9452 -#line 11389 "configure" 9370 +#line 1179 5"configure"9453 +#line 11796 "configure" 9371 9454 #include "confdefs.h" 9372 9455 #include <sys/types.h> 9373 9456 #include <$ac_hdr> 9374 @@ -11401,16 +1180 7,16 @@9457 @@ -11401,16 +11808,16 @@ 9375 9458 } 9376 9459 _ACEOF 9377 9460 rm -f conftest.$ac_objext 9378 9461 -if { (eval echo "$as_me:11404: \"$ac_compile\"") >&5 9379 +if { (eval echo "$as_me:1181 0: \"$ac_compile\"") >&59462 +if { (eval echo "$as_me:11811: \"$ac_compile\"") >&5 9380 9463 (eval $ac_compile) 2>&5 9381 9464 ac_status=$? 9382 9465 - echo "$as_me:11407: \$? = $ac_status" >&5 9383 + echo "$as_me:1181 3: \$? = $ac_status" >&59466 + echo "$as_me:11814: \$? = $ac_status" >&5 9384 9467 (exit $ac_status); } && 9385 9468 { ac_try='test -s conftest.$ac_objext' 9386 9469 - { (eval echo "$as_me:11410: \"$ac_try\"") >&5 9387 + { (eval echo "$as_me:1181 6: \"$ac_try\"") >&59470 + { (eval echo "$as_me:11817: \"$ac_try\"") >&5 9388 9471 (eval $ac_try) 2>&5 9389 9472 ac_status=$? 9390 9473 - echo "$as_me:11413: \$? = $ac_status" >&5 9391 + echo "$as_me:118 19: \$? = $ac_status" >&59474 + echo "$as_me:11820: \$? = $ac_status" >&5 9392 9475 (exit $ac_status); }; }; then 9393 9476 eval "$as_ac_Header=yes" 9394 9477 else 9395 @@ -11420,7 +1182 6,7 @@9478 @@ -11420,7 +11827,7 @@ 9396 9479 fi 9397 9480 rm -f conftest.$ac_objext conftest.$ac_ext 9398 9481 fi 9399 9482 -echo "$as_me:11423: result: `eval echo '${'$as_ac_Header'}'`" >&5 9400 +echo "$as_me:118 29: result: `eval echo '${'$as_ac_Header'}'`" >&59483 +echo "$as_me:11830: result: `eval echo '${'$as_ac_Header'}'`" >&5 9401 9484 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 9402 9485 if test `eval echo '${'$as_ac_Header'}'` = yes; then 9403 9486 cat >>confdefs.h <<EOF 9404 @@ -11433,7 +118 39,7 @@9487 @@ -11433,7 +11840,7 @@ 9405 9488 done 9406 9489 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. 9407 9490 if test $ac_header_dirent = dirent.h; then 9408 9491 - echo "$as_me:11436: checking for opendir in -ldir" >&5 9409 + echo "$as_me:1184 2: checking for opendir in -ldir" >&59492 + echo "$as_me:11843: checking for opendir in -ldir" >&5 9410 9493 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 9411 9494 if test "${ac_cv_lib_dir_opendir+set}" = set; then 9412 9495 echo $ECHO_N "(cached) $ECHO_C" >&6 9413 @@ -11441,7 +1184 7,7 @@9496 @@ -11441,7 +11848,7 @@ 9414 9497 ac_check_lib_save_LIBS=$LIBS 9415 9498 LIBS="-ldir $LIBS" 9416 9499 cat >conftest.$ac_ext <<_ACEOF 9417 9500 -#line 11444 "configure" 9418 +#line 1185 0"configure"9501 +#line 11851 "configure" 9419 9502 #include "confdefs.h" 9420 9503 9421 9504 /* Override any gcc2 internal prototype to avoid an error. */ 9422 @@ -11460,16 +1186 6,16 @@9505 @@ -11460,16 +11867,16 @@ 9423 9506 } 9424 9507 _ACEOF 9425 9508 rm -f conftest.$ac_objext conftest$ac_exeext 9426 9509 -if { (eval echo "$as_me:11463: \"$ac_link\"") >&5 9427 +if { (eval echo "$as_me:118 69: \"$ac_link\"") >&59510 +if { (eval echo "$as_me:11870: \"$ac_link\"") >&5 9428 9511 (eval $ac_link) 2>&5 9429 9512 ac_status=$? 9430 9513 - echo "$as_me:11466: \$? = $ac_status" >&5 9431 + echo "$as_me:1187 2: \$? = $ac_status" >&59514 + echo "$as_me:11873: \$? = $ac_status" >&5 9432 9515 (exit $ac_status); } && 9433 9516 { ac_try='test -s conftest$ac_exeext' 9434 9517 - { (eval echo "$as_me:11469: \"$ac_try\"") >&5 9435 + { (eval echo "$as_me:1187 5: \"$ac_try\"") >&59518 + { (eval echo "$as_me:11876: \"$ac_try\"") >&5 9436 9519 (eval $ac_try) 2>&5 9437 9520 ac_status=$? 9438 9521 - echo "$as_me:11472: \$? = $ac_status" >&5 9439 + echo "$as_me:1187 8: \$? = $ac_status" >&59522 + echo "$as_me:11879: \$? = $ac_status" >&5 9440 9523 (exit $ac_status); }; }; then 9441 9524 ac_cv_lib_dir_opendir=yes 9442 9525 else 9443 @@ -11480,14 +1188 6,14 @@9526 @@ -11480,14 +11887,14 @@ 9444 9527 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 9445 9528 LIBS=$ac_check_lib_save_LIBS 9446 9529 fi 9447 9530 -echo "$as_me:11483: result: $ac_cv_lib_dir_opendir" >&5 9448 +echo "$as_me:118 89: result: $ac_cv_lib_dir_opendir" >&59531 +echo "$as_me:11890: result: $ac_cv_lib_dir_opendir" >&5 9449 9532 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 9450 9533 if test $ac_cv_lib_dir_opendir = yes; then … … 9454 9537 else 9455 9538 - echo "$as_me:11490: checking for opendir in -lx" >&5 9456 + echo "$as_me:1189 6: checking for opendir in -lx" >&59539 + echo "$as_me:11897: checking for opendir in -lx" >&5 9457 9540 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 9458 9541 if test "${ac_cv_lib_x_opendir+set}" = set; then 9459 9542 echo $ECHO_N "(cached) $ECHO_C" >&6 9460 @@ -11495,7 +1190 1,7 @@9543 @@ -11495,7 +11902,7 @@ 9461 9544 ac_check_lib_save_LIBS=$LIBS 9462 9545 LIBS="-lx $LIBS" 9463 9546 cat >conftest.$ac_ext <<_ACEOF 9464 9547 -#line 11498 "configure" 9465 +#line 1190 4"configure"9548 +#line 11905 "configure" 9466 9549 #include "confdefs.h" 9467 9550 9468 9551 /* Override any gcc2 internal prototype to avoid an error. */ 9469 @@ -11514,16 +1192 0,16 @@9552 @@ -11514,16 +11921,16 @@ 9470 9553 } 9471 9554 _ACEOF 9472 9555 rm -f conftest.$ac_objext conftest$ac_exeext 9473 9556 -if { (eval echo "$as_me:11517: \"$ac_link\"") >&5 9474 +if { (eval echo "$as_me:1192 3: \"$ac_link\"") >&59557 +if { (eval echo "$as_me:11924: \"$ac_link\"") >&5 9475 9558 (eval $ac_link) 2>&5 9476 9559 ac_status=$? 9477 9560 - echo "$as_me:11520: \$? = $ac_status" >&5 9478 + echo "$as_me:1192 6: \$? = $ac_status" >&59561 + echo "$as_me:11927: \$? = $ac_status" >&5 9479 9562 (exit $ac_status); } && 9480 9563 { ac_try='test -s conftest$ac_exeext' 9481 9564 - { (eval echo "$as_me:11523: \"$ac_try\"") >&5 9482 + { (eval echo "$as_me:119 29: \"$ac_try\"") >&59565 + { (eval echo "$as_me:11930: \"$ac_try\"") >&5 9483 9566 (eval $ac_try) 2>&5 9484 9567 ac_status=$? 9485 9568 - echo "$as_me:11526: \$? = $ac_status" >&5 9486 + echo "$as_me:1193 2: \$? = $ac_status" >&59569 + echo "$as_me:11933: \$? = $ac_status" >&5 9487 9570 (exit $ac_status); }; }; then 9488 9571 ac_cv_lib_x_opendir=yes 9489 9572 else 9490 @@ -11534,7 +1194 0,7 @@9573 @@ -11534,7 +11941,7 @@ 9491 9574 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 9492 9575 LIBS=$ac_check_lib_save_LIBS 9493 9576 fi 9494 9577 -echo "$as_me:11537: result: $ac_cv_lib_x_opendir" >&5 9495 +echo "$as_me:1194 3: result: $ac_cv_lib_x_opendir" >&59578 +echo "$as_me:11944: result: $ac_cv_lib_x_opendir" >&5 9496 9579 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 9497 9580 if test $ac_cv_lib_x_opendir = yes; then 9498 9581 LIBS="$LIBS -lx" 9499 @@ -11542,13 +1194 8,13 @@9582 @@ -11542,13 +11949,13 @@ 9500 9583 9501 9584 fi 9502 9585 9503 9586 -echo "$as_me:11545: checking whether time.h and sys/time.h may both be included" >&5 9504 +echo "$as_me:1195 1: checking whether time.h and sys/time.h may both be included" >&59587 +echo "$as_me:11952: checking whether time.h and sys/time.h may both be included" >&5 9505 9588 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 9506 9589 if test "${ac_cv_header_time+set}" = set; then … … 9509 9592 cat >conftest.$ac_ext <<_ACEOF 9510 9593 -#line 11551 "configure" 9511 +#line 1195 7"configure"9594 +#line 11958 "configure" 9512 9595 #include "confdefs.h" 9513 9596 #include <sys/types.h> 9514 9597 #include <sys/time.h> 9515 @@ -11564,16 +1197 0,16 @@9598 @@ -11564,16 +11971,16 @@ 9516 9599 } 9517 9600 _ACEOF 9518 9601 rm -f conftest.$ac_objext 9519 9602 -if { (eval echo "$as_me:11567: \"$ac_compile\"") >&5 9520 +if { (eval echo "$as_me:1197 3: \"$ac_compile\"") >&59603 +if { (eval echo "$as_me:11974: \"$ac_compile\"") >&5 9521 9604 (eval $ac_compile) 2>&5 9522 9605 ac_status=$? 9523 9606 - echo "$as_me:11570: \$? = $ac_status" >&5 9524 + echo "$as_me:1197 6: \$? = $ac_status" >&59607 + echo "$as_me:11977: \$? = $ac_status" >&5 9525 9608 (exit $ac_status); } && 9526 9609 { ac_try='test -s conftest.$ac_objext' 9527 9610 - { (eval echo "$as_me:11573: \"$ac_try\"") >&5 9528 + { (eval echo "$as_me:119 79: \"$ac_try\"") >&59611 + { (eval echo "$as_me:11980: \"$ac_try\"") >&5 9529 9612 (eval $ac_try) 2>&5 9530 9613 ac_status=$? 9531 9614 - echo "$as_me:11576: \$? = $ac_status" >&5 9532 + echo "$as_me:1198 2: \$? = $ac_status" >&59615 + echo "$as_me:11983: \$? = $ac_status" >&5 9533 9616 (exit $ac_status); }; }; then 9534 9617 ac_cv_header_time=yes 9535 9618 else 9536 @@ -11583,7 +119 89,7 @@9619 @@ -11583,7 +11990,7 @@ 9537 9620 fi 9538 9621 rm -f conftest.$ac_objext conftest.$ac_ext 9539 9622 fi 9540 9623 -echo "$as_me:11586: result: $ac_cv_header_time" >&5 9541 +echo "$as_me:1199 2: result: $ac_cv_header_time" >&59624 +echo "$as_me:11993: result: $ac_cv_header_time" >&5 9542 9625 echo "${ECHO_T}$ac_cv_header_time" >&6 9543 9626 if test $ac_cv_header_time = yes; then 9544 9627 9545 @@ -11593,14 +1 1999,14 @@9628 @@ -11593,14 +12000,14 @@ 9546 9629 9547 9630 fi 9548 9631 9549 9632 -echo "$as_me:11596: checking for regular-expression headers" >&5 9550 +echo "$as_me:1200 2: checking for regular-expression headers" >&59633 +echo "$as_me:12003: checking for regular-expression headers" >&5 9551 9634 echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6 9552 9635 if test "${cf_cv_regex+set}" = set; then … … 9556 9639 cat >conftest.$ac_ext <<_ACEOF 9557 9640 -#line 11603 "configure" 9558 +#line 120 09"configure"9641 +#line 12010 "configure" 9559 9642 #include "confdefs.h" 9560 9643 #include <sys/types.h> 9561 9644 #include <regex.h> 9562 @@ -11618,16 +1202 4,16 @@9645 @@ -11618,16 +12025,16 @@ 9563 9646 } 9564 9647 _ACEOF 9565 9648 rm -f conftest.$ac_objext conftest$ac_exeext 9566 9649 -if { (eval echo "$as_me:11621: \"$ac_link\"") >&5 9567 +if { (eval echo "$as_me:1202 7: \"$ac_link\"") >&59650 +if { (eval echo "$as_me:12028: \"$ac_link\"") >&5 9568 9651 (eval $ac_link) 2>&5 9569 9652 ac_status=$? 9570 9653 - echo "$as_me:11624: \$? = $ac_status" >&5 9571 + echo "$as_me:1203 0: \$? = $ac_status" >&59654 + echo "$as_me:12031: \$? = $ac_status" >&5 9572 9655 (exit $ac_status); } && 9573 9656 { ac_try='test -s conftest$ac_exeext' 9574 9657 - { (eval echo "$as_me:11627: \"$ac_try\"") >&5 9575 + { (eval echo "$as_me:1203 3: \"$ac_try\"") >&59658 + { (eval echo "$as_me:12034: \"$ac_try\"") >&5 9576 9659 (eval $ac_try) 2>&5 9577 9660 ac_status=$? 9578 9661 - echo "$as_me:11630: \$? = $ac_status" >&5 9579 + echo "$as_me:1203 6: \$? = $ac_status" >&59662 + echo "$as_me:12037: \$? = $ac_status" >&5 9580 9663 (exit $ac_status); }; }; then 9581 9664 cf_cv_regex="regex.h" 9582 9665 else 9583 @@ -11635,7 +1204 1,7 @@9666 @@ -11635,7 +12042,7 @@ 9584 9667 cat conftest.$ac_ext >&5 9585 9668 9586 9669 cat >conftest.$ac_ext <<_ACEOF 9587 9670 -#line 11638 "configure" 9588 +#line 1204 4"configure"9671 +#line 12045 "configure" 9589 9672 #include "confdefs.h" 9590 9673 #include <regexp.h> 9591 9674 int 9592 @@ -11650,16 +1205 6,16 @@9675 @@ -11650,16 +12057,16 @@ 9593 9676 } 9594 9677 _ACEOF 9595 9678 rm -f conftest.$ac_objext conftest$ac_exeext 9596 9679 -if { (eval echo "$as_me:11653: \"$ac_link\"") >&5 9597 +if { (eval echo "$as_me:120 59: \"$ac_link\"") >&59680 +if { (eval echo "$as_me:12060: \"$ac_link\"") >&5 9598 9681 (eval $ac_link) 2>&5 9599 9682 ac_status=$? 9600 9683 - echo "$as_me:11656: \$? = $ac_status" >&5 9601 + echo "$as_me:1206 2: \$? = $ac_status" >&59684 + echo "$as_me:12063: \$? = $ac_status" >&5 9602 9685 (exit $ac_status); } && 9603 9686 { ac_try='test -s conftest$ac_exeext' 9604 9687 - { (eval echo "$as_me:11659: \"$ac_try\"") >&5 9605 + { (eval echo "$as_me:1206 5: \"$ac_try\"") >&59688 + { (eval echo "$as_me:12066: \"$ac_try\"") >&5 9606 9689 (eval $ac_try) 2>&5 9607 9690 ac_status=$? 9608 9691 - echo "$as_me:11662: \$? = $ac_status" >&5 9609 + echo "$as_me:1206 8: \$? = $ac_status" >&59692 + echo "$as_me:12069: \$? = $ac_status" >&5 9610 9693 (exit $ac_status); }; }; then 9611 9694 cf_cv_regex="regexp.h" 9612 9695 else 9613 @@ -11669,7 +1207 5,7 @@9696 @@ -11669,7 +12076,7 @@ 9614 9697 cf_save_LIBS="$LIBS" 9615 9698 LIBS="-lgen $LIBS" 9616 9699 cat >conftest.$ac_ext <<_ACEOF 9617 9700 -#line 11672 "configure" 9618 +#line 1207 8"configure"9701 +#line 12079 "configure" 9619 9702 #include "confdefs.h" 9620 9703 #include <regexpr.h> 9621 9704 int 9622 @@ -11684,16 +1209 0,16 @@9705 @@ -11684,16 +12091,16 @@ 9623 9706 } 9624 9707 _ACEOF 9625 9708 rm -f conftest.$ac_objext conftest$ac_exeext 9626 9709 -if { (eval echo "$as_me:11687: \"$ac_link\"") >&5 9627 +if { (eval echo "$as_me:1209 3: \"$ac_link\"") >&59710 +if { (eval echo "$as_me:12094: \"$ac_link\"") >&5 9628 9711 (eval $ac_link) 2>&5 9629 9712 ac_status=$? 9630 9713 - echo "$as_me:11690: \$? = $ac_status" >&5 9631 + echo "$as_me:1209 6: \$? = $ac_status" >&59714 + echo "$as_me:12097: \$? = $ac_status" >&5 9632 9715 (exit $ac_status); } && 9633 9716 { ac_try='test -s conftest$ac_exeext' 9634 9717 - { (eval echo "$as_me:11693: \"$ac_try\"") >&5 9635 + { (eval echo "$as_me:12 099: \"$ac_try\"") >&59718 + { (eval echo "$as_me:12100: \"$ac_try\"") >&5 9636 9719 (eval $ac_try) 2>&5 9637 9720 ac_status=$? 9638 9721 - echo "$as_me:11696: \$? = $ac_status" >&5 9639 + echo "$as_me:1210 2: \$? = $ac_status" >&59722 + echo "$as_me:12103: \$? = $ac_status" >&5 9640 9723 (exit $ac_status); }; }; then 9641 9724 cf_cv_regex="regexpr.h" 9642 9725 else 9643 @@ -11709,7 +1211 5,7 @@9726 @@ -11709,7 +12116,7 @@ 9644 9727 9645 9728 fi 9646 9729 9647 9730 -echo "$as_me:11712: result: $cf_cv_regex" >&5 9648 +echo "$as_me:1211 8: result: $cf_cv_regex" >&59731 +echo "$as_me:12119: result: $cf_cv_regex" >&5 9649 9732 echo "${ECHO_T}$cf_cv_regex" >&6 9650 9733 case $cf_cv_regex in 9651 9734 regex.h) cat >>confdefs.h <<\EOF 9652 @@ -11745,23 +1215 1,23 @@9735 @@ -11745,23 +12152,23 @@ 9653 9736 9654 9737 do 9655 9738 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 9656 9739 -echo "$as_me:11748: checking for $ac_header" >&5 9657 +echo "$as_me:1215 4: checking for $ac_header" >&59740 +echo "$as_me:12155: checking for $ac_header" >&5 9658 9741 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 9659 9742 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 9662 9745 cat >conftest.$ac_ext <<_ACEOF 9663 9746 -#line 11754 "configure" 9664 +#line 1216 0"configure"9747 +#line 12161 "configure" 9665 9748 #include "confdefs.h" 9666 9749 #include <$ac_header> 9667 9750 _ACEOF 9668 9751 -if { (eval echo "$as_me:11758: \"$ac_cpp conftest.$ac_ext\"") >&5 9669 +if { (eval echo "$as_me:1216 4: \"$ac_cpp conftest.$ac_ext\"") >&59752 +if { (eval echo "$as_me:12165: \"$ac_cpp conftest.$ac_ext\"") >&5 9670 9753 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 9671 9754 ac_status=$? … … 9674 9757 cat conftest.err >&5 9675 9758 - echo "$as_me:11764: \$? = $ac_status" >&5 9676 + echo "$as_me:1217 0: \$? = $ac_status" >&59759 + echo "$as_me:12171: \$? = $ac_status" >&5 9677 9760 (exit $ac_status); } >/dev/null; then 9678 9761 if test -s conftest.err; then 9679 9762 ac_cpp_err=$ac_c_preproc_warn_flag 9680 @@ -11780,7 +1218 6,7 @@9763 @@ -11780,7 +12187,7 @@ 9681 9764 fi 9682 9765 rm -f conftest.err conftest.$ac_ext 9683 9766 fi 9684 9767 -echo "$as_me:11783: result: `eval echo '${'$as_ac_Header'}'`" >&5 9685 +echo "$as_me:121 89: result: `eval echo '${'$as_ac_Header'}'`" >&59768 +echo "$as_me:12190: result: `eval echo '${'$as_ac_Header'}'`" >&5 9686 9769 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 9687 9770 if test `eval echo '${'$as_ac_Header'}'` = yes; then 9688 9771 cat >>confdefs.h <<EOF 9689 @@ -11794,7 +1220 0,7 @@9772 @@ -11794,7 +12201,7 @@ 9690 9773 # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set 9691 9774 if test "$ISC" = yes ; then 9692 9775 9693 9776 -echo "$as_me:11797: checking for main in -lcposix" >&5 9694 +echo "$as_me:1220 3: checking for main in -lcposix" >&59777 +echo "$as_me:12204: checking for main in -lcposix" >&5 9695 9778 echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6 9696 9779 if test "${ac_cv_lib_cposix_main+set}" = set; then 9697 9780 echo $ECHO_N "(cached) $ECHO_C" >&6 9698 @@ -11802,7 +1220 8,7 @@9781 @@ -11802,7 +12209,7 @@ 9699 9782 ac_check_lib_save_LIBS=$LIBS 9700 9783 LIBS="-lcposix $LIBS" 9701 9784 cat >conftest.$ac_ext <<_ACEOF 9702 9785 -#line 11805 "configure" 9703 +#line 1221 1"configure"9786 +#line 12212 "configure" 9704 9787 #include "confdefs.h" 9705 9788 9706 9789 int 9707 @@ -11814,16 +1222 0,16 @@9790 @@ -11814,16 +12221,16 @@ 9708 9791 } 9709 9792 _ACEOF 9710 9793 rm -f conftest.$ac_objext conftest$ac_exeext 9711 9794 -if { (eval echo "$as_me:11817: \"$ac_link\"") >&5 9712 +if { (eval echo "$as_me:1222 3: \"$ac_link\"") >&59795 +if { (eval echo "$as_me:12224: \"$ac_link\"") >&5 9713 9796 (eval $ac_link) 2>&5 9714 9797 ac_status=$? 9715 9798 - echo "$as_me:11820: \$? = $ac_status" >&5 9716 + echo "$as_me:1222 6: \$? = $ac_status" >&59799 + echo "$as_me:12227: \$? = $ac_status" >&5 9717 9800 (exit $ac_status); } && 9718 9801 { ac_try='test -s conftest$ac_exeext' 9719 9802 - { (eval echo "$as_me:11823: \"$ac_try\"") >&5 9720 + { (eval echo "$as_me:122 29: \"$ac_try\"") >&59803 + { (eval echo "$as_me:12230: \"$ac_try\"") >&5 9721 9804 (eval $ac_try) 2>&5 9722 9805 ac_status=$? 9723 9806 - echo "$as_me:11826: \$? = $ac_status" >&5 9724 + echo "$as_me:1223 2: \$? = $ac_status" >&59807 + echo "$as_me:12233: \$? = $ac_status" >&5 9725 9808 (exit $ac_status); }; }; then 9726 9809 ac_cv_lib_cposix_main=yes 9727 9810 else 9728 @@ -11834,7 +1224 0,7 @@9811 @@ -11834,7 +12241,7 @@ 9729 9812 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 9730 9813 LIBS=$ac_check_lib_save_LIBS 9731 9814 fi 9732 9815 -echo "$as_me:11837: result: $ac_cv_lib_cposix_main" >&5 9733 +echo "$as_me:1224 3: result: $ac_cv_lib_cposix_main" >&59816 +echo "$as_me:12244: result: $ac_cv_lib_cposix_main" >&5 9734 9817 echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6 9735 9818 if test $ac_cv_lib_cposix_main = yes; then 9736 9819 cat >>confdefs.h <<EOF 9737 @@ -11845,7 +1225 1,7 @@9820 @@ -11845,7 +12252,7 @@ 9738 9821 9739 9822 fi 9740 9823 9741 9824 - echo "$as_me:11848: checking for bzero in -linet" >&5 9742 + echo "$as_me:1225 4: checking for bzero in -linet" >&59825 + echo "$as_me:12255: checking for bzero in -linet" >&5 9743 9826 echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6 9744 9827 if test "${ac_cv_lib_inet_bzero+set}" = set; then 9745 9828 echo $ECHO_N "(cached) $ECHO_C" >&6 9746 @@ -11853,7 +122 59,7 @@9829 @@ -11853,7 +12260,7 @@ 9747 9830 ac_check_lib_save_LIBS=$LIBS 9748 9831 LIBS="-linet $LIBS" 9749 9832 cat >conftest.$ac_ext <<_ACEOF 9750 9833 -#line 11856 "configure" 9751 +#line 1226 2"configure"9834 +#line 12263 "configure" 9752 9835 #include "confdefs.h" 9753 9836 9754 9837 /* Override any gcc2 internal prototype to avoid an error. */ 9755 @@ -11872,16 +1227 8,16 @@9838 @@ -11872,16 +12279,16 @@ 9756 9839 } 9757 9840 _ACEOF 9758 9841 rm -f conftest.$ac_objext conftest$ac_exeext 9759 9842 -if { (eval echo "$as_me:11875: \"$ac_link\"") >&5 9760 +if { (eval echo "$as_me:1228 1: \"$ac_link\"") >&59843 +if { (eval echo "$as_me:12282: \"$ac_link\"") >&5 9761 9844 (eval $ac_link) 2>&5 9762 9845 ac_status=$? 9763 9846 - echo "$as_me:11878: \$? = $ac_status" >&5 9764 + echo "$as_me:1228 4: \$? = $ac_status" >&59847 + echo "$as_me:12285: \$? = $ac_status" >&5 9765 9848 (exit $ac_status); } && 9766 9849 { ac_try='test -s conftest$ac_exeext' 9767 9850 - { (eval echo "$as_me:11881: \"$ac_try\"") >&5 9768 + { (eval echo "$as_me:1228 7: \"$ac_try\"") >&59851 + { (eval echo "$as_me:12288: \"$ac_try\"") >&5 9769 9852 (eval $ac_try) 2>&5 9770 9853 ac_status=$? 9771 9854 - echo "$as_me:11884: \$? = $ac_status" >&5 9772 + echo "$as_me:1229 0: \$? = $ac_status" >&59855 + echo "$as_me:12291: \$? = $ac_status" >&5 9773 9856 (exit $ac_status); }; }; then 9774 9857 ac_cv_lib_inet_bzero=yes 9775 9858 else 9776 @@ -11892,21 +1229 8,21 @@9859 @@ -11892,21 +12299,21 @@ 9777 9860 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 9778 9861 LIBS=$ac_check_lib_save_LIBS 9779 9862 fi 9780 9863 -echo "$as_me:11895: result: $ac_cv_lib_inet_bzero" >&5 9781 +echo "$as_me:1230 1: result: $ac_cv_lib_inet_bzero" >&59864 +echo "$as_me:12302: result: $ac_cv_lib_inet_bzero" >&5 9782 9865 echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6 9783 9866 if test $ac_cv_lib_inet_bzero = yes; then … … 9787 9870 9788 9871 -echo "$as_me:11902: checking if sys/time.h works with sys/select.h" >&5 9789 +echo "$as_me:1230 8: checking if sys/time.h works with sys/select.h" >&59872 +echo "$as_me:12309: checking if sys/time.h works with sys/select.h" >&5 9790 9873 echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6 9791 9874 if test "${cf_cv_sys_time_select+set}" = set; then … … 9795 9878 cat >conftest.$ac_ext <<_ACEOF 9796 9879 -#line 11909 "configure" 9797 +#line 1231 5"configure"9880 +#line 12316 "configure" 9798 9881 #include "confdefs.h" 9799 9882 9800 9883 #include <sys/types.h> 9801 @@ -11926,16 +1233 2,16 @@9884 @@ -11926,16 +12333,16 @@ 9802 9885 } 9803 9886 _ACEOF 9804 9887 rm -f conftest.$ac_objext 9805 9888 -if { (eval echo "$as_me:11929: \"$ac_compile\"") >&5 9806 +if { (eval echo "$as_me:1233 5: \"$ac_compile\"") >&59889 +if { (eval echo "$as_me:12336: \"$ac_compile\"") >&5 9807 9890 (eval $ac_compile) 2>&5 9808 9891 ac_status=$? 9809 9892 - echo "$as_me:11932: \$? = $ac_status" >&5 9810 + echo "$as_me:1233 8: \$? = $ac_status" >&59893 + echo "$as_me:12339: \$? = $ac_status" >&5 9811 9894 (exit $ac_status); } && 9812 9895 { ac_try='test -s conftest.$ac_objext' 9813 9896 - { (eval echo "$as_me:11935: \"$ac_try\"") >&5 9814 + { (eval echo "$as_me:1234 1: \"$ac_try\"") >&59897 + { (eval echo "$as_me:12342: \"$ac_try\"") >&5 9815 9898 (eval $ac_try) 2>&5 9816 9899 ac_status=$? 9817 9900 - echo "$as_me:11938: \$? = $ac_status" >&5 9818 + echo "$as_me:1234 4: \$? = $ac_status" >&59901 + echo "$as_me:12345: \$? = $ac_status" >&5 9819 9902 (exit $ac_status); }; }; then 9820 9903 cf_cv_sys_time_select=yes 9821 9904 else 9822 @@ -11947,7 +1235 3,7 @@9905 @@ -11947,7 +12354,7 @@ 9823 9906 9824 9907 fi 9825 9908 9826 9909 -echo "$as_me:11950: result: $cf_cv_sys_time_select" >&5 9827 +echo "$as_me:1235 6: result: $cf_cv_sys_time_select" >&59910 +echo "$as_me:12357: result: $cf_cv_sys_time_select" >&5 9828 9911 echo "${ECHO_T}$cf_cv_sys_time_select" >&6 9829 9912 test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF 9830 9913 #define HAVE_SYS_TIME_SELECT 1 9831 @@ -11961,7 +1236 7,7 @@9914 @@ -11961,7 +12368,7 @@ 9832 9915 ac_compiler_gnu=$ac_cv_c_compiler_gnu 9833 9916 ac_main_return=return 9834 9917 9835 9918 -echo "$as_me:11964: checking for $CC option to accept ANSI C" >&5 9836 +echo "$as_me:1237 0: checking for $CC option to accept ANSI C" >&59919 +echo "$as_me:12371: checking for $CC option to accept ANSI C" >&5 9837 9920 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 9838 9921 if test "${ac_cv_prog_cc_stdc+set}" = set; then 9839 9922 echo $ECHO_N "(cached) $ECHO_C" >&6 9840 @@ -11969,7 +1237 5,7 @@9923 @@ -11969,7 +12376,7 @@ 9841 9924 ac_cv_prog_cc_stdc=no 9842 9925 ac_save_CC=$CC 9843 9926 cat >conftest.$ac_ext <<_ACEOF 9844 9927 -#line 11972 "configure" 9845 +#line 1237 8"configure"9928 +#line 12379 "configure" 9846 9929 #include "confdefs.h" 9847 9930 #include <stdarg.h> 9848 9931 #include <stdio.h> 9849 @@ -12018,16 +1242 4,16 @@9932 @@ -12018,16 +12425,16 @@ 9850 9933 do 9851 9934 CC="$ac_save_CC $ac_arg" 9852 9935 rm -f conftest.$ac_objext 9853 9936 -if { (eval echo "$as_me:12021: \"$ac_compile\"") >&5 9854 +if { (eval echo "$as_me:1242 7: \"$ac_compile\"") >&59937 +if { (eval echo "$as_me:12428: \"$ac_compile\"") >&5 9855 9938 (eval $ac_compile) 2>&5 9856 9939 ac_status=$? 9857 9940 - echo "$as_me:12024: \$? = $ac_status" >&5 9858 + echo "$as_me:1243 0: \$? = $ac_status" >&59941 + echo "$as_me:12431: \$? = $ac_status" >&5 9859 9942 (exit $ac_status); } && 9860 9943 { ac_try='test -s conftest.$ac_objext' 9861 9944 - { (eval echo "$as_me:12027: \"$ac_try\"") >&5 9862 + { (eval echo "$as_me:1243 3: \"$ac_try\"") >&59945 + { (eval echo "$as_me:12434: \"$ac_try\"") >&5 9863 9946 (eval $ac_try) 2>&5 9864 9947 ac_status=$? 9865 9948 - echo "$as_me:12030: \$? = $ac_status" >&5 9866 + echo "$as_me:1243 6: \$? = $ac_status" >&59949 + echo "$as_me:12437: \$? = $ac_status" >&5 9867 9950 (exit $ac_status); }; }; then 9868 9951 ac_cv_prog_cc_stdc=$ac_arg 9869 9952 break 9870 @@ -12044,21 +1245 0,21 @@9953 @@ -12044,21 +12451,21 @@ 9871 9954 9872 9955 case "x$ac_cv_prog_cc_stdc" in 9873 9956 x|xno) 9874 9957 - echo "$as_me:12047: result: none needed" >&5 9875 + echo "$as_me:1245 3: result: none needed" >&59958 + echo "$as_me:12454: result: none needed" >&5 9876 9959 echo "${ECHO_T}none needed" >&6 ;; 9877 9960 *) 9878 9961 - echo "$as_me:12050: result: $ac_cv_prog_cc_stdc" >&5 9879 + echo "$as_me:1245 6: result: $ac_cv_prog_cc_stdc" >&59962 + echo "$as_me:12457: result: $ac_cv_prog_cc_stdc" >&5 9880 9963 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 9881 9964 CC="$CC $ac_cv_prog_cc_stdc" ;; … … 9883 9966 9884 9967 -echo "$as_me:12055: checking for an ANSI C-conforming const" >&5 9885 +echo "$as_me:1246 1: checking for an ANSI C-conforming const" >&59968 +echo "$as_me:12462: checking for an ANSI C-conforming const" >&5 9886 9969 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 9887 9970 if test "${ac_cv_c_const+set}" = set; then … … 9890 9973 cat >conftest.$ac_ext <<_ACEOF 9891 9974 -#line 12061 "configure" 9892 +#line 1246 7"configure"9975 +#line 12468 "configure" 9893 9976 #include "confdefs.h" 9894 9977 9895 9978 int 9896 @@ -12116,16 +1252 2,16 @@9979 @@ -12116,16 +12523,16 @@ 9897 9980 } 9898 9981 _ACEOF 9899 9982 rm -f conftest.$ac_objext 9900 9983 -if { (eval echo "$as_me:12119: \"$ac_compile\"") >&5 9901 +if { (eval echo "$as_me:1252 5: \"$ac_compile\"") >&59984 +if { (eval echo "$as_me:12526: \"$ac_compile\"") >&5 9902 9985 (eval $ac_compile) 2>&5 9903 9986 ac_status=$? 9904 9987 - echo "$as_me:12122: \$? = $ac_status" >&5 9905 + echo "$as_me:1252 8: \$? = $ac_status" >&59988 + echo "$as_me:12529: \$? = $ac_status" >&5 9906 9989 (exit $ac_status); } && 9907 9990 { ac_try='test -s conftest.$ac_objext' 9908 9991 - { (eval echo "$as_me:12125: \"$ac_try\"") >&5 9909 + { (eval echo "$as_me:1253 1: \"$ac_try\"") >&59992 + { (eval echo "$as_me:12532: \"$ac_try\"") >&5 9910 9993 (eval $ac_try) 2>&5 9911 9994 ac_status=$? 9912 9995 - echo "$as_me:12128: \$? = $ac_status" >&5 9913 + echo "$as_me:1253 4: \$? = $ac_status" >&59996 + echo "$as_me:12535: \$? = $ac_status" >&5 9914 9997 (exit $ac_status); }; }; then 9915 9998 ac_cv_c_const=yes 9916 9999 else 9917 @@ -12135,7 +1254 1,7 @@10000 @@ -12135,7 +12542,7 @@ 9918 10001 fi 9919 10002 rm -f conftest.$ac_objext conftest.$ac_ext 9920 10003 fi 9921 10004 -echo "$as_me:12138: result: $ac_cv_c_const" >&5 9922 +echo "$as_me:1254 4: result: $ac_cv_c_const" >&510005 +echo "$as_me:12545: result: $ac_cv_c_const" >&5 9923 10006 echo "${ECHO_T}$ac_cv_c_const" >&6 9924 10007 if test $ac_cv_c_const = no; then 9925 10008 9926 @@ -12145,7 +1255 1,7 @@10009 @@ -12145,7 +12552,7 @@ 9927 10010 9928 10011 fi 9929 10012 9930 10013 -echo "$as_me:12148: checking for inline" >&5 9931 +echo "$as_me:1255 4: checking for inline" >&510014 +echo "$as_me:12555: checking for inline" >&5 9932 10015 echo $ECHO_N "checking for inline... $ECHO_C" >&6 9933 10016 if test "${ac_cv_c_inline+set}" = set; then 9934 10017 echo $ECHO_N "(cached) $ECHO_C" >&6 9935 @@ -12153,7 +125 59,7 @@10018 @@ -12153,7 +12560,7 @@ 9936 10019 ac_cv_c_inline=no 9937 10020 for ac_kw in inline __inline__ __inline; do 9938 10021 cat >conftest.$ac_ext <<_ACEOF 9939 10022 -#line 12156 "configure" 9940 +#line 1256 2"configure"10023 +#line 12563 "configure" 9941 10024 #include "confdefs.h" 9942 10025 #ifndef __cplusplus 9943 10026 static $ac_kw int static_foo () {return 0; } 9944 @@ -12162,16 +1256 8,16 @@10027 @@ -12162,16 +12569,16 @@ 9945 10028 9946 10029 _ACEOF 9947 10030 rm -f conftest.$ac_objext 9948 10031 -if { (eval echo "$as_me:12165: \"$ac_compile\"") >&5 9949 +if { (eval echo "$as_me:1257 1: \"$ac_compile\"") >&510032 +if { (eval echo "$as_me:12572: \"$ac_compile\"") >&5 9950 10033 (eval $ac_compile) 2>&5 9951 10034 ac_status=$? 9952 10035 - echo "$as_me:12168: \$? = $ac_status" >&5 9953 + echo "$as_me:1257 4: \$? = $ac_status" >&510036 + echo "$as_me:12575: \$? = $ac_status" >&5 9954 10037 (exit $ac_status); } && 9955 10038 { ac_try='test -s conftest.$ac_objext' 9956 10039 - { (eval echo "$as_me:12171: \"$ac_try\"") >&5 9957 + { (eval echo "$as_me:1257 7: \"$ac_try\"") >&510040 + { (eval echo "$as_me:12578: \"$ac_try\"") >&5 9958 10041 (eval $ac_try) 2>&5 9959 10042 ac_status=$? 9960 10043 - echo "$as_me:12174: \$? = $ac_status" >&5 9961 + echo "$as_me:1258 0: \$? = $ac_status" >&510044 + echo "$as_me:12581: \$? = $ac_status" >&5 9962 10045 (exit $ac_status); }; }; then 9963 10046 ac_cv_c_inline=$ac_kw; break 9964 10047 else 9965 @@ -12182,7 +1258 8,7 @@10048 @@ -12182,7 +12589,7 @@ 9966 10049 done 9967 10050 9968 10051 fi 9969 10052 -echo "$as_me:12185: result: $ac_cv_c_inline" >&5 9970 +echo "$as_me:1259 1: result: $ac_cv_c_inline" >&510053 +echo "$as_me:12592: result: $ac_cv_c_inline" >&5 9971 10054 echo "${ECHO_T}$ac_cv_c_inline" >&6 9972 10055 case $ac_cv_c_inline in 9973 10056 inline | yes) ;; 9974 @@ -12205,7 +1261 1,7 @@10057 @@ -12205,7 +12612,7 @@ 9975 10058 : 9976 10059 elif test "$GCC" = yes 9977 10060 then 9978 10061 - echo "$as_me:12208: checking if gcc supports options to tune inlining" >&5 9979 + echo "$as_me:1261 4: checking if gcc supports options to tune inlining" >&510062 + echo "$as_me:12615: checking if gcc supports options to tune inlining" >&5 9980 10063 echo $ECHO_N "checking if gcc supports options to tune inlining... $ECHO_C" >&6 9981 10064 if test "${cf_cv_gcc_inline+set}" = set; then 9982 10065 echo $ECHO_N "(cached) $ECHO_C" >&6 9983 @@ -12214,7 +1262 0,7 @@10066 @@ -12214,7 +12621,7 @@ 9984 10067 cf_save_CFLAGS=$CFLAGS 9985 10068 CFLAGS="$CFLAGS --param max-inline-insns-single=1200" 9986 10069 cat >conftest.$ac_ext <<_ACEOF 9987 10070 -#line 12217 "configure" 9988 +#line 1262 3"configure"10071 +#line 12624 "configure" 9989 10072 #include "confdefs.h" 9990 10073 inline int foo(void) { return 1; } 9991 10074 int 9992 @@ -12226,16 +1263 2,16 @@10075 @@ -12226,16 +12633,16 @@ 9993 10076 } 9994 10077 _ACEOF 9995 10078 rm -f conftest.$ac_objext 9996 10079 -if { (eval echo "$as_me:12229: \"$ac_compile\"") >&5 9997 +if { (eval echo "$as_me:1263 5: \"$ac_compile\"") >&510080 +if { (eval echo "$as_me:12636: \"$ac_compile\"") >&5 9998 10081 (eval $ac_compile) 2>&5 9999 10082 ac_status=$? 10000 10083 - echo "$as_me:12232: \$? = $ac_status" >&5 10001 + echo "$as_me:1263 8: \$? = $ac_status" >&510084 + echo "$as_me:12639: \$? = $ac_status" >&5 10002 10085 (exit $ac_status); } && 10003 10086 { ac_try='test -s conftest.$ac_objext' 10004 10087 - { (eval echo "$as_me:12235: \"$ac_try\"") >&5 10005 + { (eval echo "$as_me:1264 1: \"$ac_try\"") >&510088 + { (eval echo "$as_me:12642: \"$ac_try\"") >&5 10006 10089 (eval $ac_try) 2>&5 10007 10090 ac_status=$? 10008 10091 - echo "$as_me:12238: \$? = $ac_status" >&5 10009 + echo "$as_me:1264 4: \$? = $ac_status" >&510092 + echo "$as_me:12645: \$? = $ac_status" >&5 10010 10093 (exit $ac_status); }; }; then 10011 10094 cf_cv_gcc_inline=yes 10012 10095 else 10013 @@ -12247,7 +1265 3,7 @@10096 @@ -12247,7 +12654,7 @@ 10014 10097 CFLAGS=$cf_save_CFLAGS 10015 10098 10016 10099 fi 10017 10100 -echo "$as_me:12250: result: $cf_cv_gcc_inline" >&5 10018 +echo "$as_me:1265 6: result: $cf_cv_gcc_inline" >&510101 +echo "$as_me:12657: result: $cf_cv_gcc_inline" >&5 10019 10102 echo "${ECHO_T}$cf_cv_gcc_inline" >&6 10020 10103 if test "$cf_cv_gcc_inline" = yes ; then 10021 10104 10022 @@ -12311,7 +1271 7,7 @@10105 @@ -12311,7 +12718,7 @@ 10023 10106 10024 10107 if test -n "$cf_new_cppflags" ; then … … 10029 10112 10030 10113 if test -n "$cf_new_extra_cppflags" ; then 10031 @@ -12323,7 +127 29,7 @@10114 @@ -12323,7 +12730,7 @@ 10032 10115 fi 10033 10116 fi 10034 10117 10035 10118 -echo "$as_me:12326: checking for signal global datatype" >&5 10036 +echo "$as_me:1273 2: checking for signal global datatype" >&510119 +echo "$as_me:12733: checking for signal global datatype" >&5 10037 10120 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 10038 10121 if test "${cf_cv_sig_atomic_t+set}" = set; then 10039 10122 echo $ECHO_N "(cached) $ECHO_C" >&6 10040 @@ -12335,7 +1274 1,7 @@10123 @@ -12335,7 +12742,7 @@ 10041 10124 "int" 10042 10125 do 10043 10126 cat >conftest.$ac_ext <<_ACEOF 10044 10127 -#line 12338 "configure" 10045 +#line 1274 4"configure"10128 +#line 12745 "configure" 10046 10129 #include "confdefs.h" 10047 10130 10048 10131 #include <sys/types.h> 10049 @@ -12358,16 +1276 4,16 @@10132 @@ -12358,16 +12765,16 @@ 10050 10133 } 10051 10134 _ACEOF 10052 10135 rm -f conftest.$ac_objext 10053 10136 -if { (eval echo "$as_me:12361: \"$ac_compile\"") >&5 10054 +if { (eval echo "$as_me:1276 7: \"$ac_compile\"") >&510137 +if { (eval echo "$as_me:12768: \"$ac_compile\"") >&5 10055 10138 (eval $ac_compile) 2>&5 10056 10139 ac_status=$? 10057 10140 - echo "$as_me:12364: \$? = $ac_status" >&5 10058 + echo "$as_me:1277 0: \$? = $ac_status" >&510141 + echo "$as_me:12771: \$? = $ac_status" >&5 10059 10142 (exit $ac_status); } && 10060 10143 { ac_try='test -s conftest.$ac_objext' 10061 10144 - { (eval echo "$as_me:12367: \"$ac_try\"") >&5 10062 + { (eval echo "$as_me:1277 3: \"$ac_try\"") >&510145 + { (eval echo "$as_me:12774: \"$ac_try\"") >&5 10063 10146 (eval $ac_try) 2>&5 10064 10147 ac_status=$? 10065 10148 - echo "$as_me:12370: \$? = $ac_status" >&5 10066 + echo "$as_me:1277 6: \$? = $ac_status" >&510149 + echo "$as_me:12777: \$? = $ac_status" >&5 10067 10150 (exit $ac_status); }; }; then 10068 10151 cf_cv_sig_atomic_t=$cf_type 10069 10152 else 10070 @@ -12381,7 +1278 7,7 @@10153 @@ -12381,7 +12788,7 @@ 10071 10154 10072 10155 fi 10073 10156 10074 10157 -echo "$as_me:12384: result: $cf_cv_sig_atomic_t" >&5 10075 +echo "$as_me:1279 0: result: $cf_cv_sig_atomic_t" >&510158 +echo "$as_me:12791: result: $cf_cv_sig_atomic_t" >&5 10076 10159 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 10077 10160 test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <<EOF 10078 10161 #define SIG_ATOMIC_T $cf_cv_sig_atomic_t 10079 @@ -12389,7 +1279 5,7 @@10162 @@ -12389,7 +12796,7 @@ 10080 10163 10081 10164 if test $NCURSES_CHTYPE = auto ; then 10082 10165 10083 10166 -echo "$as_me:12392: checking for type of chtype" >&5 10084 +echo "$as_me:1279 8: checking for type of chtype" >&510167 +echo "$as_me:12799: checking for type of chtype" >&5 10085 10168 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 10086 10169 if test "${cf_cv_typeof_chtype+set}" = set; then 10087 10170 echo $ECHO_N "(cached) $ECHO_C" >&6 10088 @@ -12399,7 +1280 5,7 @@10171 @@ -12399,7 +12806,7 @@ 10089 10172 cf_cv_typeof_chtype=long 10090 10173 else 10091 10174 cat >conftest.$ac_ext <<_ACEOF 10092 10175 -#line 12402 "configure" 10093 +#line 1280 8"configure"10176 +#line 12809 "configure" 10094 10177 #include "confdefs.h" 10095 10178 10096 10179 #define WANT_BITS 31 10097 @@ -12434,15 +1284 0,15 @@10180 @@ -12434,15 +12841,15 @@ 10098 10181 10099 10182 _ACEOF 10100 10183 rm -f conftest$ac_exeext 10101 10184 -if { (eval echo "$as_me:12437: \"$ac_link\"") >&5 10102 +if { (eval echo "$as_me:1284 3: \"$ac_link\"") >&510185 +if { (eval echo "$as_me:12844: \"$ac_link\"") >&5 10103 10186 (eval $ac_link) 2>&5 10104 10187 ac_status=$? 10105 10188 - echo "$as_me:12440: \$? = $ac_status" >&5 10106 + echo "$as_me:1284 6: \$? = $ac_status" >&510189 + echo "$as_me:12847: \$? = $ac_status" >&5 10107 10190 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 10108 10191 - { (eval echo "$as_me:12442: \"$ac_try\"") >&5 10109 + { (eval echo "$as_me:1284 8: \"$ac_try\"") >&510192 + { (eval echo "$as_me:12849: \"$ac_try\"") >&5 10110 10193 (eval $ac_try) 2>&5 10111 10194 ac_status=$? 10112 10195 - echo "$as_me:12445: \$? = $ac_status" >&5 10113 + echo "$as_me:1285 1: \$? = $ac_status" >&510196 + echo "$as_me:12852: \$? = $ac_status" >&5 10114 10197 (exit $ac_status); }; }; then 10115 10198 cf_cv_typeof_chtype=`cat cf_test.out` 10116 10199 else 10117 @@ -12457,7 +1286 3,7 @@10200 @@ -12457,7 +12864,7 @@ 10118 10201 10119 10202 fi 10120 10203 10121 10204 -echo "$as_me:12460: result: $cf_cv_typeof_chtype" >&5 10122 +echo "$as_me:1286 6: result: $cf_cv_typeof_chtype" >&510205 +echo "$as_me:12867: result: $cf_cv_typeof_chtype" >&5 10123 10206 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 10124 10207 10125 10208 cat >>confdefs.h <<EOF 10126 @@ -12469,14 +1287 5,14 @@10209 @@ -12469,14 +12876,14 @@ 10127 10210 fi 10128 10211 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype="" 10129 10212 10130 10213 -echo "$as_me:12472: checking if unsigned literals are legal" >&5 10131 +echo "$as_me:1287 8: checking if unsigned literals are legal" >&510214 +echo "$as_me:12879: checking if unsigned literals are legal" >&5 10132 10215 echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6 10133 10216 if test "${cf_cv_unsigned_literals+set}" = set; then … … 10137 10220 cat >conftest.$ac_ext <<_ACEOF 10138 10221 -#line 12479 "configure" 10139 +#line 1288 5"configure"10222 +#line 12886 "configure" 10140 10223 #include "confdefs.h" 10141 10224 10142 10225 int 10143 @@ -12488,16 +1289 4,16 @@10226 @@ -12488,16 +12895,16 @@ 10144 10227 } 10145 10228 _ACEOF 10146 10229 rm -f conftest.$ac_objext 10147 10230 -if { (eval echo "$as_me:12491: \"$ac_compile\"") >&5 10148 +if { (eval echo "$as_me:1289 7: \"$ac_compile\"") >&510231 +if { (eval echo "$as_me:12898: \"$ac_compile\"") >&5 10149 10232 (eval $ac_compile) 2>&5 10150 10233 ac_status=$? 10151 10234 - echo "$as_me:12494: \$? = $ac_status" >&5 10152 + echo "$as_me:1290 0: \$? = $ac_status" >&510235 + echo "$as_me:12901: \$? = $ac_status" >&5 10153 10236 (exit $ac_status); } && 10154 10237 { ac_try='test -s conftest.$ac_objext' 10155 10238 - { (eval echo "$as_me:12497: \"$ac_try\"") >&5 10156 + { (eval echo "$as_me:1290 3: \"$ac_try\"") >&510239 + { (eval echo "$as_me:12904: \"$ac_try\"") >&5 10157 10240 (eval $ac_try) 2>&5 10158 10241 ac_status=$? 10159 10242 - echo "$as_me:12500: \$? = $ac_status" >&5 10160 + echo "$as_me:1290 6: \$? = $ac_status" >&510243 + echo "$as_me:12907: \$? = $ac_status" >&5 10161 10244 (exit $ac_status); }; }; then 10162 10245 cf_cv_unsigned_literals=yes 10163 10246 else 10164 @@ -12509,7 +1291 5,7 @@10247 @@ -12509,7 +12916,7 @@ 10165 10248 10166 10249 fi 10167 10250 10168 10251 -echo "$as_me:12512: result: $cf_cv_unsigned_literals" >&5 10169 +echo "$as_me:1291 8: result: $cf_cv_unsigned_literals" >&510252 +echo "$as_me:12919: result: $cf_cv_unsigned_literals" >&5 10170 10253 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 10171 10254 10172 10255 cf_cv_1UL="1" 10173 @@ -12525,14 +1293 1,14 @@10256 @@ -12525,14 +12932,14 @@ 10174 10257 10175 10258 ### Checks for external-data 10176 10259 10177 10260 -echo "$as_me:12528: checking if external errno is declared" >&5 10178 +echo "$as_me:1293 4: checking if external errno is declared" >&510261 +echo "$as_me:12935: checking if external errno is declared" >&5 10179 10262 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 10180 10263 if test "${cf_cv_dcl_errno+set}" = set; then … … 10184 10267 cat >conftest.$ac_ext <<_ACEOF 10185 10268 -#line 12535 "configure" 10186 +#line 1294 1"configure"10269 +#line 12942 "configure" 10187 10270 #include "confdefs.h" 10188 10271 10189 10272 #ifdef HAVE_STDLIB_H 10190 @@ -12550,16 +1295 6,16 @@10273 @@ -12550,16 +12957,16 @@ 10191 10274 } 10192 10275 _ACEOF 10193 10276 rm -f conftest.$ac_objext 10194 10277 -if { (eval echo "$as_me:12553: \"$ac_compile\"") >&5 10195 +if { (eval echo "$as_me:129 59: \"$ac_compile\"") >&510278 +if { (eval echo "$as_me:12960: \"$ac_compile\"") >&5 10196 10279 (eval $ac_compile) 2>&5 10197 10280 ac_status=$? 10198 10281 - echo "$as_me:12556: \$? = $ac_status" >&5 10199 + echo "$as_me:1296 2: \$? = $ac_status" >&510282 + echo "$as_me:12963: \$? = $ac_status" >&5 10200 10283 (exit $ac_status); } && 10201 10284 { ac_try='test -s conftest.$ac_objext' 10202 10285 - { (eval echo "$as_me:12559: \"$ac_try\"") >&5 10203 + { (eval echo "$as_me:1296 5: \"$ac_try\"") >&510286 + { (eval echo "$as_me:12966: \"$ac_try\"") >&5 10204 10287 (eval $ac_try) 2>&5 10205 10288 ac_status=$? 10206 10289 - echo "$as_me:12562: \$? = $ac_status" >&5 10207 + echo "$as_me:1296 8: \$? = $ac_status" >&510290 + echo "$as_me:12969: \$? = $ac_status" >&5 10208 10291 (exit $ac_status); }; }; then 10209 10292 cf_cv_dcl_errno=yes 10210 10293 else 10211 @@ -12570,7 +1297 6,7 @@10294 @@ -12570,7 +12977,7 @@ 10212 10295 rm -f conftest.$ac_objext conftest.$ac_ext 10213 10296 10214 10297 fi 10215 10298 -echo "$as_me:12573: result: $cf_cv_dcl_errno" >&5 10216 +echo "$as_me:129 79: result: $cf_cv_dcl_errno" >&510299 +echo "$as_me:12980: result: $cf_cv_dcl_errno" >&5 10217 10300 echo "${ECHO_T}$cf_cv_dcl_errno" >&6 10218 10301 10219 10302 if test "$cf_cv_dcl_errno" = no ; then 10220 @@ -12585,14 +1299 1,14 @@10303 @@ -12585,14 +12992,14 @@ 10221 10304 10222 10305 # It's possible (for near-UNIX clones) that the data doesn't exist 10223 10306 10224 10307 -echo "$as_me:12588: checking if external errno exists" >&5 10225 +echo "$as_me:1299 4: checking if external errno exists" >&510308 +echo "$as_me:12995: checking if external errno exists" >&5 10226 10309 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 10227 10310 if test "${cf_cv_have_errno+set}" = set; then … … 10231 10314 cat >conftest.$ac_ext <<_ACEOF 10232 10315 -#line 12595 "configure" 10233 +#line 1300 1"configure"10316 +#line 13002 "configure" 10234 10317 #include "confdefs.h" 10235 10318 10236 10319 #undef errno 10237 @@ -12607,16 +1301 3,16 @@10320 @@ -12607,16 +13014,16 @@ 10238 10321 } 10239 10322 _ACEOF 10240 10323 rm -f conftest.$ac_objext conftest$ac_exeext 10241 10324 -if { (eval echo "$as_me:12610: \"$ac_link\"") >&5 10242 +if { (eval echo "$as_me:1301 6: \"$ac_link\"") >&510325 +if { (eval echo "$as_me:13017: \"$ac_link\"") >&5 10243 10326 (eval $ac_link) 2>&5 10244 10327 ac_status=$? 10245 10328 - echo "$as_me:12613: \$? = $ac_status" >&5 10246 + echo "$as_me:130 19: \$? = $ac_status" >&510329 + echo "$as_me:13020: \$? = $ac_status" >&5 10247 10330 (exit $ac_status); } && 10248 10331 { ac_try='test -s conftest$ac_exeext' 10249 10332 - { (eval echo "$as_me:12616: \"$ac_try\"") >&5 10250 + { (eval echo "$as_me:1302 2: \"$ac_try\"") >&510333 + { (eval echo "$as_me:13023: \"$ac_try\"") >&5 10251 10334 (eval $ac_try) 2>&5 10252 10335 ac_status=$? 10253 10336 - echo "$as_me:12619: \$? = $ac_status" >&5 10254 + echo "$as_me:1302 5: \$? = $ac_status" >&510337 + echo "$as_me:13026: \$? = $ac_status" >&5 10255 10338 (exit $ac_status); }; }; then 10256 10339 cf_cv_have_errno=yes 10257 10340 else 10258 @@ -12627,7 +1303 3,7 @@10341 @@ -12627,7 +13034,7 @@ 10259 10342 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 10260 10343 10261 10344 fi 10262 10345 -echo "$as_me:12630: result: $cf_cv_have_errno" >&5 10263 +echo "$as_me:1303 6: result: $cf_cv_have_errno" >&510346 +echo "$as_me:13037: result: $cf_cv_have_errno" >&5 10264 10347 echo "${ECHO_T}$cf_cv_have_errno" >&6 10265 10348 10266 10349 if test "$cf_cv_have_errno" = yes ; then 10267 @@ -12640,7 +1304 6,7 @@10350 @@ -12640,7 +13047,7 @@ 10268 10351 10269 10352 fi 10270 10353 10271 10354 -echo "$as_me:12643: checking if data-only library module links" >&5 10272 +echo "$as_me:130 49: checking if data-only library module links" >&510355 +echo "$as_me:13050: checking if data-only library module links" >&5 10273 10356 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 10274 10357 if test "${cf_cv_link_dataonly+set}" = set; then 10275 10358 echo $ECHO_N "(cached) $ECHO_C" >&6 10276 @@ -12648,20 +1305 4,20 @@10359 @@ -12648,20 +13055,20 @@ 10277 10360 10278 10361 rm -f conftest.a 10279 10362 cat >conftest.$ac_ext <<EOF 10280 10363 -#line 12651 "configure" 10281 +#line 1305 7"configure"10364 +#line 13058 "configure" 10282 10365 int testdata[3] = { 123, 456, 789 }; 10283 10366 EOF 10284 10367 - if { (eval echo "$as_me:12654: \"$ac_compile\"") >&5 10285 + if { (eval echo "$as_me:1306 0: \"$ac_compile\"") >&510368 + if { (eval echo "$as_me:13061: \"$ac_compile\"") >&5 10286 10369 (eval $ac_compile) 2>&5 10287 10370 ac_status=$? 10288 10371 - echo "$as_me:12657: \$? = $ac_status" >&5 10289 + echo "$as_me:1306 3: \$? = $ac_status" >&510372 + echo "$as_me:13064: \$? = $ac_status" >&5 10290 10373 (exit $ac_status); } ; then 10291 10374 mv conftest.o data.o && \ … … 10296 10379 cat >conftest.$ac_ext <<EOF 10297 10380 -#line 12664 "configure" 10298 +#line 1307 0"configure"10381 +#line 13071 "configure" 10299 10382 int testfunc() 10300 10383 { 10301 10384 #if defined(NeXT) 10302 @@ -12674,13 +1308 0,13 @@10385 @@ -12674,13 +13081,13 @@ 10303 10386 #endif 10304 10387 } 10305 10388 EOF 10306 10389 - if { (eval echo "$as_me:12677: \"$ac_compile\"") >&5 10307 + if { (eval echo "$as_me:1308 3: \"$ac_compile\"") >&510390 + if { (eval echo "$as_me:13084: \"$ac_compile\"") >&5 10308 10391 (eval $ac_compile) 2>&5 10309 10392 ac_status=$? 10310 10393 - echo "$as_me:12680: \$? = $ac_status" >&5 10311 + echo "$as_me:1308 6: \$? = $ac_status" >&510394 + echo "$as_me:13087: \$? = $ac_status" >&5 10312 10395 (exit $ac_status); }; then 10313 10396 mv conftest.o func.o && \ … … 10317 10400 rm -f conftest.$ac_ext func.o 10318 10401 ( eval $RANLIB conftest.a ) 2>&5 >/dev/null 10319 @@ -12690,7 +1309 6,7 @@10402 @@ -12690,7 +13097,7 @@ 10320 10403 cf_cv_link_dataonly=unknown 10321 10404 else 10322 10405 cat >conftest.$ac_ext <<_ACEOF 10323 10406 -#line 12693 "configure" 10324 +#line 13 099"configure"10407 +#line 13100 "configure" 10325 10408 #include "confdefs.h" 10326 10409 10327 10410 int main() 10328 @@ -12701,15 +1310 7,15 @@10411 @@ -12701,15 +13108,15 @@ 10329 10412 10330 10413 _ACEOF 10331 10414 rm -f conftest$ac_exeext 10332 10415 -if { (eval echo "$as_me:12704: \"$ac_link\"") >&5 10333 +if { (eval echo "$as_me:1311 0: \"$ac_link\"") >&510416 +if { (eval echo "$as_me:13111: \"$ac_link\"") >&5 10334 10417 (eval $ac_link) 2>&5 10335 10418 ac_status=$? 10336 10419 - echo "$as_me:12707: \$? = $ac_status" >&5 10337 + echo "$as_me:1311 3: \$? = $ac_status" >&510420 + echo "$as_me:13114: \$? = $ac_status" >&5 10338 10421 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 10339 10422 - { (eval echo "$as_me:12709: \"$ac_try\"") >&5 10340 + { (eval echo "$as_me:1311 5: \"$ac_try\"") >&510423 + { (eval echo "$as_me:13116: \"$ac_try\"") >&5 10341 10424 (eval $ac_try) 2>&5 10342 10425 ac_status=$? 10343 10426 - echo "$as_me:12712: \$? = $ac_status" >&5 10344 + echo "$as_me:1311 8: \$? = $ac_status" >&510427 + echo "$as_me:13119: \$? = $ac_status" >&5 10345 10428 (exit $ac_status); }; }; then 10346 10429 cf_cv_link_dataonly=yes 10347 10430 else 10348 @@ -12724,7 +1313 0,7 @@10431 @@ -12724,7 +13131,7 @@ 10349 10432 10350 10433 fi 10351 10434 10352 10435 -echo "$as_me:12727: result: $cf_cv_link_dataonly" >&5 10353 +echo "$as_me:1313 3: result: $cf_cv_link_dataonly" >&510436 +echo "$as_me:13134: result: $cf_cv_link_dataonly" >&5 10354 10437 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 10355 10438 10356 10439 if test "$cf_cv_link_dataonly" = no ; then 10357 @@ -12759,13 +1316 5,13 @@10440 @@ -12759,13 +13166,13 @@ 10358 10441 10359 10442 do 10360 10443 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 10361 10444 -echo "$as_me:12762: checking for $ac_func" >&5 10362 +echo "$as_me:1316 8: checking for $ac_func" >&510445 +echo "$as_me:13169: checking for $ac_func" >&5 10363 10446 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 10364 10447 if eval "test \"\${$as_ac_var+set}\" = set"; then … … 10367 10450 cat >conftest.$ac_ext <<_ACEOF 10368 10451 -#line 12768 "configure" 10369 +#line 1317 4"configure"10452 +#line 13175 "configure" 10370 10453 #include "confdefs.h" 10371 10454 /* System header to define __stub macros and hopefully few prototypes, 10372 10455 which can conflict with char $ac_func (); below. */ 10373 @@ -12796,16 +1320 2,16 @@10456 @@ -12796,16 +13203,16 @@ 10374 10457 } 10375 10458 _ACEOF 10376 10459 rm -f conftest.$ac_objext conftest$ac_exeext 10377 10460 -if { (eval echo "$as_me:12799: \"$ac_link\"") >&5 10378 +if { (eval echo "$as_me:1320 5: \"$ac_link\"") >&510461 +if { (eval echo "$as_me:13206: \"$ac_link\"") >&5 10379 10462 (eval $ac_link) 2>&5 10380 10463 ac_status=$? 10381 10464 - echo "$as_me:12802: \$? = $ac_status" >&5 10382 + echo "$as_me:1320 8: \$? = $ac_status" >&510465 + echo "$as_me:13209: \$? = $ac_status" >&5 10383 10466 (exit $ac_status); } && 10384 10467 { ac_try='test -s conftest$ac_exeext' 10385 10468 - { (eval echo "$as_me:12805: \"$ac_try\"") >&5 10386 + { (eval echo "$as_me:1321 1: \"$ac_try\"") >&510469 + { (eval echo "$as_me:13212: \"$ac_try\"") >&5 10387 10470 (eval $ac_try) 2>&5 10388 10471 ac_status=$? 10389 10472 - echo "$as_me:12808: \$? = $ac_status" >&5 10390 + echo "$as_me:1321 4: \$? = $ac_status" >&510473 + echo "$as_me:13215: \$? = $ac_status" >&5 10391 10474 (exit $ac_status); }; }; then 10392 10475 eval "$as_ac_var=yes" 10393 10476 else 10394 @@ -12815,7 +1322 1,7 @@10477 @@ -12815,7 +13222,7 @@ 10395 10478 fi 10396 10479 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 10397 10480 fi 10398 10481 -echo "$as_me:12818: result: `eval echo '${'$as_ac_var'}'`" >&5 10399 +echo "$as_me:1322 4: result: `eval echo '${'$as_ac_var'}'`" >&510482 +echo "$as_me:13225: result: `eval echo '${'$as_ac_var'}'`" >&5 10400 10483 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 10401 10484 if test `eval echo '${'$as_ac_var'}'` = yes; then 10402 10485 cat >>confdefs.h <<EOF 10403 @@ -12827,14 +1323 3,14 @@10486 @@ -12827,14 +13234,14 @@ 10404 10487 10405 10488 if test "$with_getcap" = "yes" ; then 10406 10489 10407 10490 -echo "$as_me:12830: checking for terminal-capability database functions" >&5 10408 +echo "$as_me:1323 6: checking for terminal-capability database functions" >&510491 +echo "$as_me:13237: checking for terminal-capability database functions" >&5 10409 10492 echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6 10410 10493 if test "${cf_cv_cgetent+set}" = set; then … … 10414 10497 cat >conftest.$ac_ext <<_ACEOF 10415 10498 -#line 12837 "configure" 10416 +#line 1324 3"configure"10499 +#line 13244 "configure" 10417 10500 #include "confdefs.h" 10418 10501 10419 10502 #include <stdlib.h> 10420 @@ -12854,16 +1326 0,16 @@10503 @@ -12854,16 +13261,16 @@ 10421 10504 } 10422 10505 _ACEOF 10423 10506 rm -f conftest.$ac_objext conftest$ac_exeext 10424 10507 -if { (eval echo "$as_me:12857: \"$ac_link\"") >&5 10425 +if { (eval echo "$as_me:1326 3: \"$ac_link\"") >&510508 +if { (eval echo "$as_me:13264: \"$ac_link\"") >&5 10426 10509 (eval $ac_link) 2>&5 10427 10510 ac_status=$? 10428 10511 - echo "$as_me:12860: \$? = $ac_status" >&5 10429 + echo "$as_me:1326 6: \$? = $ac_status" >&510512 + echo "$as_me:13267: \$? = $ac_status" >&5 10430 10513 (exit $ac_status); } && 10431 10514 { ac_try='test -s conftest$ac_exeext' 10432 10515 - { (eval echo "$as_me:12863: \"$ac_try\"") >&5 10433 + { (eval echo "$as_me:132 69: \"$ac_try\"") >&510516 + { (eval echo "$as_me:13270: \"$ac_try\"") >&5 10434 10517 (eval $ac_try) 2>&5 10435 10518 ac_status=$? 10436 10519 - echo "$as_me:12866: \$? = $ac_status" >&5 10437 + echo "$as_me:1327 2: \$? = $ac_status" >&510520 + echo "$as_me:13273: \$? = $ac_status" >&5 10438 10521 (exit $ac_status); }; }; then 10439 10522 cf_cv_cgetent=yes 10440 10523 else 10441 @@ -12875,7 +1328 1,7 @@10524 @@ -12875,7 +13282,7 @@ 10442 10525 10443 10526 fi 10444 10527 10445 10528 -echo "$as_me:12878: result: $cf_cv_cgetent" >&5 10446 +echo "$as_me:1328 4: result: $cf_cv_cgetent" >&510529 +echo "$as_me:13285: result: $cf_cv_cgetent" >&5 10447 10530 echo "${ECHO_T}$cf_cv_cgetent" >&6 10448 10531 test "$cf_cv_cgetent" = yes && cat >>confdefs.h <<\EOF 10449 10532 #define HAVE_BSD_CGETENT 1 10450 @@ -12883,14 +132 89,14 @@10533 @@ -12883,14 +13290,14 @@ 10451 10534 10452 10535 fi 10453 10536 10454 10537 -echo "$as_me:12886: checking for isascii" >&5 10455 +echo "$as_me:1329 2: checking for isascii" >&510538 +echo "$as_me:13293: checking for isascii" >&5 10456 10539 echo $ECHO_N "checking for isascii... $ECHO_C" >&6 10457 10540 if test "${cf_cv_have_isascii+set}" = set; then … … 10461 10544 cat >conftest.$ac_ext <<_ACEOF 10462 10545 -#line 12893 "configure" 10463 +#line 13 299"configure"10546 +#line 13300 "configure" 10464 10547 #include "confdefs.h" 10465 10548 #include <ctype.h> 10466 10549 int 10467 @@ -12902,16 +1330 8,16 @@10550 @@ -12902,16 +13309,16 @@ 10468 10551 } 10469 10552 _ACEOF 10470 10553 rm -f conftest.$ac_objext conftest$ac_exeext 10471 10554 -if { (eval echo "$as_me:12905: \"$ac_link\"") >&5 10472 +if { (eval echo "$as_me:1331 1: \"$ac_link\"") >&510555 +if { (eval echo "$as_me:13312: \"$ac_link\"") >&5 10473 10556 (eval $ac_link) 2>&5 10474 10557 ac_status=$? 10475 10558 - echo "$as_me:12908: \$? = $ac_status" >&5 10476 + echo "$as_me:1331 4: \$? = $ac_status" >&510559 + echo "$as_me:13315: \$? = $ac_status" >&5 10477 10560 (exit $ac_status); } && 10478 10561 { ac_try='test -s conftest$ac_exeext' 10479 10562 - { (eval echo "$as_me:12911: \"$ac_try\"") >&5 10480 + { (eval echo "$as_me:1331 7: \"$ac_try\"") >&510563 + { (eval echo "$as_me:13318: \"$ac_try\"") >&5 10481 10564 (eval $ac_try) 2>&5 10482 10565 ac_status=$? 10483 10566 - echo "$as_me:12914: \$? = $ac_status" >&5 10484 + echo "$as_me:1332 0: \$? = $ac_status" >&510567 + echo "$as_me:13321: \$? = $ac_status" >&5 10485 10568 (exit $ac_status); }; }; then 10486 10569 cf_cv_have_isascii=yes 10487 10570 else 10488 @@ -12922,17 +1332 8,17 @@10571 @@ -12922,17 +13329,17 @@ 10489 10572 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 10490 10573 10491 10574 fi 10492 10575 -echo "$as_me:12925: result: $cf_cv_have_isascii" >&5 10493 +echo "$as_me:1333 1: result: $cf_cv_have_isascii" >&510576 +echo "$as_me:13332: result: $cf_cv_have_isascii" >&5 10494 10577 echo "${ECHO_T}$cf_cv_have_isascii" >&6 10495 10578 test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF … … 10499 10582 if test "$ac_cv_func_sigaction" = yes; then 10500 10583 -echo "$as_me:12932: checking whether sigaction needs _POSIX_SOURCE" >&5 10501 +echo "$as_me:1333 8: checking whether sigaction needs _POSIX_SOURCE" >&510584 +echo "$as_me:13339: checking whether sigaction needs _POSIX_SOURCE" >&5 10502 10585 echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6 10503 10586 cat >conftest.$ac_ext <<_ACEOF 10504 10587 -#line 12935 "configure" 10505 +#line 1334 1"configure"10588 +#line 13342 "configure" 10506 10589 #include "confdefs.h" 10507 10590 10508 10591 #include <sys/types.h> 10509 @@ -12946,16 +1335 2,16 @@10592 @@ -12946,16 +13353,16 @@ 10510 10593 } 10511 10594 _ACEOF 10512 10595 rm -f conftest.$ac_objext 10513 10596 -if { (eval echo "$as_me:12949: \"$ac_compile\"") >&5 10514 +if { (eval echo "$as_me:1335 5: \"$ac_compile\"") >&510597 +if { (eval echo "$as_me:13356: \"$ac_compile\"") >&5 10515 10598 (eval $ac_compile) 2>&5 10516 10599 ac_status=$? 10517 10600 - echo "$as_me:12952: \$? = $ac_status" >&5 10518 + echo "$as_me:1335 8: \$? = $ac_status" >&510601 + echo "$as_me:13359: \$? = $ac_status" >&5 10519 10602 (exit $ac_status); } && 10520 10603 { ac_try='test -s conftest.$ac_objext' 10521 10604 - { (eval echo "$as_me:12955: \"$ac_try\"") >&5 10522 + { (eval echo "$as_me:1336 1: \"$ac_try\"") >&510605 + { (eval echo "$as_me:13362: \"$ac_try\"") >&5 10523 10606 (eval $ac_try) 2>&5 10524 10607 ac_status=$? 10525 10608 - echo "$as_me:12958: \$? = $ac_status" >&5 10526 + echo "$as_me:1336 4: \$? = $ac_status" >&510609 + echo "$as_me:13365: \$? = $ac_status" >&5 10527 10610 (exit $ac_status); }; }; then 10528 10611 sigact_bad=no 10529 10612 else 10530 @@ -12963,7 +133 69,7 @@10613 @@ -12963,7 +13370,7 @@ 10531 10614 cat conftest.$ac_ext >&5 10532 10615 10533 10616 cat >conftest.$ac_ext <<_ACEOF 10534 10617 -#line 12966 "configure" 10535 +#line 1337 2"configure"10618 +#line 13373 "configure" 10536 10619 #include "confdefs.h" 10537 10620 10538 10621 #define _POSIX_SOURCE 10539 @@ -12978,16 +1338 4,16 @@10622 @@ -12978,16 +13385,16 @@ 10540 10623 } 10541 10624 _ACEOF 10542 10625 rm -f conftest.$ac_objext 10543 10626 -if { (eval echo "$as_me:12981: \"$ac_compile\"") >&5 10544 +if { (eval echo "$as_me:1338 7: \"$ac_compile\"") >&510627 +if { (eval echo "$as_me:13388: \"$ac_compile\"") >&5 10545 10628 (eval $ac_compile) 2>&5 10546 10629 ac_status=$? 10547 10630 - echo "$as_me:12984: \$? = $ac_status" >&5 10548 + echo "$as_me:1339 0: \$? = $ac_status" >&510631 + echo "$as_me:13391: \$? = $ac_status" >&5 10549 10632 (exit $ac_status); } && 10550 10633 { ac_try='test -s conftest.$ac_objext' 10551 10634 - { (eval echo "$as_me:12987: \"$ac_try\"") >&5 10552 + { (eval echo "$as_me:1339 3: \"$ac_try\"") >&510635 + { (eval echo "$as_me:13394: \"$ac_try\"") >&5 10553 10636 (eval $ac_try) 2>&5 10554 10637 ac_status=$? 10555 10638 - echo "$as_me:12990: \$? = $ac_status" >&5 10556 + echo "$as_me:1339 6: \$? = $ac_status" >&510639 + echo "$as_me:13397: \$? = $ac_status" >&5 10557 10640 (exit $ac_status); }; }; then 10558 10641 sigact_bad=yes 10559 10642 cat >>confdefs.h <<\EOF 10560 @@ -13002,11 +1340 8,11 @@10643 @@ -13002,11 +13409,11 @@ 10561 10644 rm -f conftest.$ac_objext conftest.$ac_ext 10562 10645 fi 10563 10646 rm -f conftest.$ac_objext conftest.$ac_ext 10564 10647 -echo "$as_me:13005: result: $sigact_bad" >&5 10565 +echo "$as_me:1341 1: result: $sigact_bad" >&510648 +echo "$as_me:13412: result: $sigact_bad" >&5 10566 10649 echo "${ECHO_T}$sigact_bad" >&6 10567 10650 fi 10568 10651 10569 10652 -echo "$as_me:13009: checking if nanosleep really works" >&5 10570 +echo "$as_me:1341 5: checking if nanosleep really works" >&510653 +echo "$as_me:13416: checking if nanosleep really works" >&5 10571 10654 echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6 10572 10655 if test "${cf_cv_func_nanosleep+set}" = set; then 10573 10656 echo $ECHO_N "(cached) $ECHO_C" >&6 10574 @@ -13016,7 +1342 2,7 @@10657 @@ -13016,7 +13423,7 @@ 10575 10658 cf_cv_func_nanosleep=unknown 10576 10659 else 10577 10660 cat >conftest.$ac_ext <<_ACEOF 10578 10661 -#line 13019 "configure" 10579 +#line 1342 5"configure"10662 +#line 13426 "configure" 10580 10663 #include "confdefs.h" 10581 10664 10582 10665 #include <stdio.h> 10583 @@ -13041,15 +1344 7,15 @@10666 @@ -13041,15 +13448,15 @@ 10584 10667 10585 10668 _ACEOF 10586 10669 rm -f conftest$ac_exeext 10587 10670 -if { (eval echo "$as_me:13044: \"$ac_link\"") >&5 10588 +if { (eval echo "$as_me:1345 0: \"$ac_link\"") >&510671 +if { (eval echo "$as_me:13451: \"$ac_link\"") >&5 10589 10672 (eval $ac_link) 2>&5 10590 10673 ac_status=$? 10591 10674 - echo "$as_me:13047: \$? = $ac_status" >&5 10592 + echo "$as_me:1345 3: \$? = $ac_status" >&510675 + echo "$as_me:13454: \$? = $ac_status" >&5 10593 10676 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 10594 10677 - { (eval echo "$as_me:13049: \"$ac_try\"") >&5 10595 + { (eval echo "$as_me:1345 5: \"$ac_try\"") >&510678 + { (eval echo "$as_me:13456: \"$ac_try\"") >&5 10596 10679 (eval $ac_try) 2>&5 10597 10680 ac_status=$? 10598 10681 - echo "$as_me:13052: \$? = $ac_status" >&5 10599 + echo "$as_me:1345 8: \$? = $ac_status" >&510682 + echo "$as_me:13459: \$? = $ac_status" >&5 10600 10683 (exit $ac_status); }; }; then 10601 10684 cf_cv_func_nanosleep=yes 10602 10685 else 10603 @@ -13061,7 +1346 7,7 @@10686 @@ -13061,7 +13468,7 @@ 10604 10687 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 10605 10688 fi 10606 10689 fi 10607 10690 -echo "$as_me:13064: result: $cf_cv_func_nanosleep" >&5 10608 +echo "$as_me:1347 0: result: $cf_cv_func_nanosleep" >&510691 +echo "$as_me:13471: result: $cf_cv_func_nanosleep" >&5 10609 10692 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 10610 10693 10611 10694 test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF 10612 @@ -13075,23 +1348 1,23 @@10695 @@ -13075,23 +13482,23 @@ 10613 10696 10614 10697 do 10615 10698 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 10616 10699 -echo "$as_me:13078: checking for $ac_header" >&5 10617 +echo "$as_me:1348 4: checking for $ac_header" >&510700 +echo "$as_me:13485: checking for $ac_header" >&5 10618 10701 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 10619 10702 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 10622 10705 cat >conftest.$ac_ext <<_ACEOF 10623 10706 -#line 13084 "configure" 10624 +#line 1349 0"configure"10707 +#line 13491 "configure" 10625 10708 #include "confdefs.h" 10626 10709 #include <$ac_header> 10627 10710 _ACEOF 10628 10711 -if { (eval echo "$as_me:13088: \"$ac_cpp conftest.$ac_ext\"") >&5 10629 +if { (eval echo "$as_me:1349 4: \"$ac_cpp conftest.$ac_ext\"") >&510712 +if { (eval echo "$as_me:13495: \"$ac_cpp conftest.$ac_ext\"") >&5 10630 10713 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 10631 10714 ac_status=$? … … 10634 10717 cat conftest.err >&5 10635 10718 - echo "$as_me:13094: \$? = $ac_status" >&5 10636 + echo "$as_me:1350 0: \$? = $ac_status" >&510719 + echo "$as_me:13501: \$? = $ac_status" >&5 10637 10720 (exit $ac_status); } >/dev/null; then 10638 10721 if test -s conftest.err; then 10639 10722 ac_cpp_err=$ac_c_preproc_warn_flag 10640 @@ -13110,7 +1351 6,7 @@10723 @@ -13110,7 +13517,7 @@ 10641 10724 fi 10642 10725 rm -f conftest.err conftest.$ac_ext 10643 10726 fi 10644 10727 -echo "$as_me:13113: result: `eval echo '${'$as_ac_Header'}'`" >&5 10645 +echo "$as_me:135 19: result: `eval echo '${'$as_ac_Header'}'`" >&510728 +echo "$as_me:13520: result: `eval echo '${'$as_ac_Header'}'`" >&5 10646 10729 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 10647 10730 if test `eval echo '${'$as_ac_Header'}'` = yes; then 10648 10731 cat >>confdefs.h <<EOF 10649 @@ -13125,23 +1353 1,23 @@10732 @@ -13125,23 +13532,23 @@ 10650 10733 for ac_header in sys/termio.h 10651 10734 do 10652 10735 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 10653 10736 -echo "$as_me:13128: checking for $ac_header" >&5 10654 +echo "$as_me:1353 4: checking for $ac_header" >&510737 +echo "$as_me:13535: checking for $ac_header" >&5 10655 10738 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 10656 10739 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 10659 10742 cat >conftest.$ac_ext <<_ACEOF 10660 10743 -#line 13134 "configure" 10661 +#line 1354 0"configure"10744 +#line 13541 "configure" 10662 10745 #include "confdefs.h" 10663 10746 #include <$ac_header> 10664 10747 _ACEOF 10665 10748 -if { (eval echo "$as_me:13138: \"$ac_cpp conftest.$ac_ext\"") >&5 10666 +if { (eval echo "$as_me:1354 4: \"$ac_cpp conftest.$ac_ext\"") >&510749 +if { (eval echo "$as_me:13545: \"$ac_cpp conftest.$ac_ext\"") >&5 10667 10750 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 10668 10751 ac_status=$? … … 10671 10754 cat conftest.err >&5 10672 10755 - echo "$as_me:13144: \$? = $ac_status" >&5 10673 + echo "$as_me:1355 0: \$? = $ac_status" >&510756 + echo "$as_me:13551: \$? = $ac_status" >&5 10674 10757 (exit $ac_status); } >/dev/null; then 10675 10758 if test -s conftest.err; then 10676 10759 ac_cpp_err=$ac_c_preproc_warn_flag 10677 @@ -13160,7 +1356 6,7 @@10760 @@ -13160,7 +13567,7 @@ 10678 10761 fi 10679 10762 rm -f conftest.err conftest.$ac_ext 10680 10763 fi 10681 10764 -echo "$as_me:13163: result: `eval echo '${'$as_ac_Header'}'`" >&5 10682 +echo "$as_me:135 69: result: `eval echo '${'$as_ac_Header'}'`" >&510765 +echo "$as_me:13570: result: `eval echo '${'$as_ac_Header'}'`" >&5 10683 10766 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 10684 10767 if test `eval echo '${'$as_ac_Header'}'` = yes; then 10685 10768 cat >>confdefs.h <<EOF 10686 @@ -13178,10 +1358 4,10 @@10769 @@ -13178,10 +13585,10 @@ 10687 10770 *) termios_bad=maybe ;; 10688 10771 esac 10689 10772 if test "$termios_bad" = maybe ; then 10690 10773 - echo "$as_me:13181: checking whether termios.h needs _POSIX_SOURCE" >&5 10691 + echo "$as_me:1358 7: checking whether termios.h needs _POSIX_SOURCE" >&510774 + echo "$as_me:13588: checking whether termios.h needs _POSIX_SOURCE" >&5 10692 10775 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6 10693 10776 cat >conftest.$ac_ext <<_ACEOF 10694 10777 -#line 13184 "configure" 10695 +#line 1359 0"configure"10778 +#line 13591 "configure" 10696 10779 #include "confdefs.h" 10697 10780 #include <termios.h> 10698 10781 int 10699 @@ -13193,16 +13 599,16 @@10782 @@ -13193,16 +13600,16 @@ 10700 10783 } 10701 10784 _ACEOF 10702 10785 rm -f conftest.$ac_objext 10703 10786 -if { (eval echo "$as_me:13196: \"$ac_compile\"") >&5 10704 +if { (eval echo "$as_me:1360 2: \"$ac_compile\"") >&510787 +if { (eval echo "$as_me:13603: \"$ac_compile\"") >&5 10705 10788 (eval $ac_compile) 2>&5 10706 10789 ac_status=$? 10707 10790 - echo "$as_me:13199: \$? = $ac_status" >&5 10708 + echo "$as_me:1360 5: \$? = $ac_status" >&510791 + echo "$as_me:13606: \$? = $ac_status" >&5 10709 10792 (exit $ac_status); } && 10710 10793 { ac_try='test -s conftest.$ac_objext' 10711 10794 - { (eval echo "$as_me:13202: \"$ac_try\"") >&5 10712 + { (eval echo "$as_me:1360 8: \"$ac_try\"") >&510795 + { (eval echo "$as_me:13609: \"$ac_try\"") >&5 10713 10796 (eval $ac_try) 2>&5 10714 10797 ac_status=$? 10715 10798 - echo "$as_me:13205: \$? = $ac_status" >&5 10716 + echo "$as_me:1361 1: \$? = $ac_status" >&510799 + echo "$as_me:13612: \$? = $ac_status" >&5 10717 10800 (exit $ac_status); }; }; then 10718 10801 termios_bad=no 10719 10802 else 10720 @@ -13210,7 +1361 6,7 @@10803 @@ -13210,7 +13617,7 @@ 10721 10804 cat conftest.$ac_ext >&5 10722 10805 10723 10806 cat >conftest.$ac_ext <<_ACEOF 10724 10807 -#line 13213 "configure" 10725 +#line 136 19"configure"10808 +#line 13620 "configure" 10726 10809 #include "confdefs.h" 10727 10810 10728 10811 #define _POSIX_SOURCE 10729 @@ -13224,16 +1363 0,16 @@10812 @@ -13224,16 +13631,16 @@ 10730 10813 } 10731 10814 _ACEOF 10732 10815 rm -f conftest.$ac_objext 10733 10816 -if { (eval echo "$as_me:13227: \"$ac_compile\"") >&5 10734 +if { (eval echo "$as_me:1363 3: \"$ac_compile\"") >&510817 +if { (eval echo "$as_me:13634: \"$ac_compile\"") >&5 10735 10818 (eval $ac_compile) 2>&5 10736 10819 ac_status=$? 10737 10820 - echo "$as_me:13230: \$? = $ac_status" >&5 10738 + echo "$as_me:1363 6: \$? = $ac_status" >&510821 + echo "$as_me:13637: \$? = $ac_status" >&5 10739 10822 (exit $ac_status); } && 10740 10823 { ac_try='test -s conftest.$ac_objext' 10741 10824 - { (eval echo "$as_me:13233: \"$ac_try\"") >&5 10742 + { (eval echo "$as_me:136 39: \"$ac_try\"") >&510825 + { (eval echo "$as_me:13640: \"$ac_try\"") >&5 10743 10826 (eval $ac_try) 2>&5 10744 10827 ac_status=$? 10745 10828 - echo "$as_me:13236: \$? = $ac_status" >&5 10746 + echo "$as_me:1364 2: \$? = $ac_status" >&510829 + echo "$as_me:13643: \$? = $ac_status" >&5 10747 10830 (exit $ac_status); }; }; then 10748 10831 termios_bad=unknown 10749 10832 else 10750 @@ -13248,19 +1365 4,19 @@10833 @@ -13248,19 +13655,19 @@ 10751 10834 10752 10835 fi 10753 10836 rm -f conftest.$ac_objext conftest.$ac_ext 10754 10837 - echo "$as_me:13251: result: $termios_bad" >&5 10755 + echo "$as_me:1365 7: result: $termios_bad" >&510838 + echo "$as_me:13658: result: $termios_bad" >&5 10756 10839 echo "${ECHO_T}$termios_bad" >&6 10757 10840 fi … … 10759 10842 10760 10843 -echo "$as_me:13256: checking for tcgetattr" >&5 10761 +echo "$as_me:1366 2: checking for tcgetattr" >&510844 +echo "$as_me:13663: checking for tcgetattr" >&5 10762 10845 echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6 10763 10846 if test "${cf_cv_have_tcgetattr+set}" = set; then … … 10767 10850 cat >conftest.$ac_ext <<_ACEOF 10768 10851 -#line 13263 "configure" 10769 +#line 136 69"configure"10852 +#line 13670 "configure" 10770 10853 #include "confdefs.h" 10771 10854 10772 10855 #include <sys/types.h> 10773 @@ -13288,16 +1369 4,16 @@10856 @@ -13288,16 +13695,16 @@ 10774 10857 } 10775 10858 _ACEOF 10776 10859 rm -f conftest.$ac_objext conftest$ac_exeext 10777 10860 -if { (eval echo "$as_me:13291: \"$ac_link\"") >&5 10778 +if { (eval echo "$as_me:1369 7: \"$ac_link\"") >&510861 +if { (eval echo "$as_me:13698: \"$ac_link\"") >&5 10779 10862 (eval $ac_link) 2>&5 10780 10863 ac_status=$? 10781 10864 - echo "$as_me:13294: \$? = $ac_status" >&5 10782 + echo "$as_me:1370 0: \$? = $ac_status" >&510865 + echo "$as_me:13701: \$? = $ac_status" >&5 10783 10866 (exit $ac_status); } && 10784 10867 { ac_try='test -s conftest$ac_exeext' 10785 10868 - { (eval echo "$as_me:13297: \"$ac_try\"") >&5 10786 + { (eval echo "$as_me:1370 3: \"$ac_try\"") >&510869 + { (eval echo "$as_me:13704: \"$ac_try\"") >&5 10787 10870 (eval $ac_try) 2>&5 10788 10871 ac_status=$? 10789 10872 - echo "$as_me:13300: \$? = $ac_status" >&5 10790 + echo "$as_me:1370 6: \$? = $ac_status" >&510873 + echo "$as_me:13707: \$? = $ac_status" >&5 10791 10874 (exit $ac_status); }; }; then 10792 10875 cf_cv_have_tcgetattr=yes 10793 10876 else 10794 @@ -13307,20 +1371 3,20 @@10877 @@ -13307,20 +13714,20 @@ 10795 10878 fi 10796 10879 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 10797 10880 fi 10798 10881 -echo "$as_me:13310: result: $cf_cv_have_tcgetattr" >&5 10799 +echo "$as_me:1371 6: result: $cf_cv_have_tcgetattr" >&510882 +echo "$as_me:13717: result: $cf_cv_have_tcgetattr" >&5 10800 10883 echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6 10801 10884 test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF … … 10804 10887 10805 10888 -echo "$as_me:13316: checking for vsscanf function or workaround" >&5 10806 +echo "$as_me:1372 2: checking for vsscanf function or workaround" >&510889 +echo "$as_me:13723: checking for vsscanf function or workaround" >&5 10807 10890 echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6 10808 10891 if test "${cf_cv_func_vsscanf+set}" = set; then … … 10812 10895 cat >conftest.$ac_ext <<_ACEOF 10813 10896 -#line 13323 "configure" 10814 +#line 137 29"configure"10897 +#line 13730 "configure" 10815 10898 #include "confdefs.h" 10816 10899 10817 10900 #include <stdarg.h> 10818 @@ -13336,16 +1374 2,16 @@10901 @@ -13336,16 +13743,16 @@ 10819 10902 } 10820 10903 _ACEOF 10821 10904 rm -f conftest.$ac_objext conftest$ac_exeext 10822 10905 -if { (eval echo "$as_me:13339: \"$ac_link\"") >&5 10823 +if { (eval echo "$as_me:1374 5: \"$ac_link\"") >&510906 +if { (eval echo "$as_me:13746: \"$ac_link\"") >&5 10824 10907 (eval $ac_link) 2>&5 10825 10908 ac_status=$? 10826 10909 - echo "$as_me:13342: \$? = $ac_status" >&5 10827 + echo "$as_me:1374 8: \$? = $ac_status" >&510910 + echo "$as_me:13749: \$? = $ac_status" >&5 10828 10911 (exit $ac_status); } && 10829 10912 { ac_try='test -s conftest$ac_exeext' 10830 10913 - { (eval echo "$as_me:13345: \"$ac_try\"") >&5 10831 + { (eval echo "$as_me:1375 1: \"$ac_try\"") >&510914 + { (eval echo "$as_me:13752: \"$ac_try\"") >&5 10832 10915 (eval $ac_try) 2>&5 10833 10916 ac_status=$? 10834 10917 - echo "$as_me:13348: \$? = $ac_status" >&5 10835 + echo "$as_me:1375 4: \$? = $ac_status" >&510918 + echo "$as_me:13755: \$? = $ac_status" >&5 10836 10919 (exit $ac_status); }; }; then 10837 10920 cf_cv_func_vsscanf=vsscanf 10838 10921 else 10839 @@ -13353,7 +137 59,7 @@10922 @@ -13353,7 +13760,7 @@ 10840 10923 cat conftest.$ac_ext >&5 10841 10924 10842 10925 cat >conftest.$ac_ext <<_ACEOF 10843 10926 -#line 13356 "configure" 10844 +#line 1376 2"configure"10927 +#line 13763 "configure" 10845 10928 #include "confdefs.h" 10846 10929 10847 10930 #include <stdarg.h> 10848 @@ -13375,16 +1378 1,16 @@10931 @@ -13375,16 +13782,16 @@ 10849 10932 } 10850 10933 _ACEOF 10851 10934 rm -f conftest.$ac_objext conftest$ac_exeext 10852 10935 -if { (eval echo "$as_me:13378: \"$ac_link\"") >&5 10853 +if { (eval echo "$as_me:1378 4: \"$ac_link\"") >&510936 +if { (eval echo "$as_me:13785: \"$ac_link\"") >&5 10854 10937 (eval $ac_link) 2>&5 10855 10938 ac_status=$? 10856 10939 - echo "$as_me:13381: \$? = $ac_status" >&5 10857 + echo "$as_me:1378 7: \$? = $ac_status" >&510940 + echo "$as_me:13788: \$? = $ac_status" >&5 10858 10941 (exit $ac_status); } && 10859 10942 { ac_try='test -s conftest$ac_exeext' 10860 10943 - { (eval echo "$as_me:13384: \"$ac_try\"") >&5 10861 + { (eval echo "$as_me:1379 0: \"$ac_try\"") >&510944 + { (eval echo "$as_me:13791: \"$ac_try\"") >&5 10862 10945 (eval $ac_try) 2>&5 10863 10946 ac_status=$? 10864 10947 - echo "$as_me:13387: \$? = $ac_status" >&5 10865 + echo "$as_me:1379 3: \$? = $ac_status" >&510948 + echo "$as_me:13794: \$? = $ac_status" >&5 10866 10949 (exit $ac_status); }; }; then 10867 10950 cf_cv_func_vsscanf=vfscanf 10868 10951 else 10869 @@ -13392,7 +1379 8,7 @@10952 @@ -13392,7 +13799,7 @@ 10870 10953 cat conftest.$ac_ext >&5 10871 10954 10872 10955 cat >conftest.$ac_ext <<_ACEOF 10873 10956 -#line 13395 "configure" 10874 +#line 1380 1"configure"10957 +#line 13802 "configure" 10875 10958 #include "confdefs.h" 10876 10959 10877 10960 #include <stdarg.h> 10878 @@ -13414,16 +1382 0,16 @@10961 @@ -13414,16 +13821,16 @@ 10879 10962 } 10880 10963 _ACEOF 10881 10964 rm -f conftest.$ac_objext conftest$ac_exeext 10882 10965 -if { (eval echo "$as_me:13417: \"$ac_link\"") >&5 10883 +if { (eval echo "$as_me:1382 3: \"$ac_link\"") >&510966 +if { (eval echo "$as_me:13824: \"$ac_link\"") >&5 10884 10967 (eval $ac_link) 2>&5 10885 10968 ac_status=$? 10886 10969 - echo "$as_me:13420: \$? = $ac_status" >&5 10887 + echo "$as_me:1382 6: \$? = $ac_status" >&510970 + echo "$as_me:13827: \$? = $ac_status" >&5 10888 10971 (exit $ac_status); } && 10889 10972 { ac_try='test -s conftest$ac_exeext' 10890 10973 - { (eval echo "$as_me:13423: \"$ac_try\"") >&5 10891 + { (eval echo "$as_me:138 29: \"$ac_try\"") >&510974 + { (eval echo "$as_me:13830: \"$ac_try\"") >&5 10892 10975 (eval $ac_try) 2>&5 10893 10976 ac_status=$? 10894 10977 - echo "$as_me:13426: \$? = $ac_status" >&5 10895 + echo "$as_me:1383 2: \$? = $ac_status" >&510978 + echo "$as_me:13833: \$? = $ac_status" >&5 10896 10979 (exit $ac_status); }; }; then 10897 10980 cf_cv_func_vsscanf=_doscan 10898 10981 else 10899 @@ -13438,7 +1384 4,7 @@10982 @@ -13438,7 +13845,7 @@ 10900 10983 fi 10901 10984 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 10902 10985 fi 10903 10986 -echo "$as_me:13441: result: $cf_cv_func_vsscanf" >&5 10904 +echo "$as_me:1384 7: result: $cf_cv_func_vsscanf" >&510987 +echo "$as_me:13848: result: $cf_cv_func_vsscanf" >&5 10905 10988 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 10906 10989 10907 10990 case $cf_cv_func_vsscanf in #(vi 10908 @@ -13456,7 +1386 2,7 @@10991 @@ -13456,7 +13863,7 @@ 10909 10992 ;; 10910 10993 esac 10911 10994 10912 10995 -echo "$as_me:13459: checking for working mkstemp" >&5 10913 +echo "$as_me:1386 5: checking for working mkstemp" >&510996 +echo "$as_me:13866: checking for working mkstemp" >&5 10914 10997 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 10915 10998 if test "${cf_cv_func_mkstemp+set}" = set; then 10916 10999 echo $ECHO_N "(cached) $ECHO_C" >&6 10917 @@ -13464,13 +1387 0,13 @@11000 @@ -13464,13 +13871,13 @@ 10918 11001 10919 11002 rm -f conftest* 10920 11003 if test "$cross_compiling" = yes; then 10921 11004 - echo "$as_me:13467: checking for mkstemp" >&5 10922 + echo "$as_me:1387 3: checking for mkstemp" >&511005 + echo "$as_me:13874: checking for mkstemp" >&5 10923 11006 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 10924 11007 if test "${ac_cv_func_mkstemp+set}" = set; then … … 10927 11010 cat >conftest.$ac_ext <<_ACEOF 10928 11011 -#line 13473 "configure" 10929 +#line 138 79"configure"11012 +#line 13880 "configure" 10930 11013 #include "confdefs.h" 10931 11014 /* System header to define __stub macros and hopefully few prototypes, 10932 11015 which can conflict with char mkstemp (); below. */ 10933 @@ -13501,16 +1390 7,16 @@11016 @@ -13501,16 +13908,16 @@ 10934 11017 } 10935 11018 _ACEOF 10936 11019 rm -f conftest.$ac_objext conftest$ac_exeext 10937 11020 -if { (eval echo "$as_me:13504: \"$ac_link\"") >&5 10938 +if { (eval echo "$as_me:1391 0: \"$ac_link\"") >&511021 +if { (eval echo "$as_me:13911: \"$ac_link\"") >&5 10939 11022 (eval $ac_link) 2>&5 10940 11023 ac_status=$? 10941 11024 - echo "$as_me:13507: \$? = $ac_status" >&5 10942 + echo "$as_me:1391 3: \$? = $ac_status" >&511025 + echo "$as_me:13914: \$? = $ac_status" >&5 10943 11026 (exit $ac_status); } && 10944 11027 { ac_try='test -s conftest$ac_exeext' 10945 11028 - { (eval echo "$as_me:13510: \"$ac_try\"") >&5 10946 + { (eval echo "$as_me:1391 6: \"$ac_try\"") >&511029 + { (eval echo "$as_me:13917: \"$ac_try\"") >&5 10947 11030 (eval $ac_try) 2>&5 10948 11031 ac_status=$? 10949 11032 - echo "$as_me:13513: \$? = $ac_status" >&5 10950 + echo "$as_me:139 19: \$? = $ac_status" >&511033 + echo "$as_me:13920: \$? = $ac_status" >&5 10951 11034 (exit $ac_status); }; }; then 10952 11035 ac_cv_func_mkstemp=yes 10953 11036 else 10954 @@ -13520,12 +1392 6,12 @@11037 @@ -13520,12 +13927,12 @@ 10955 11038 fi 10956 11039 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 10957 11040 fi 10958 11041 -echo "$as_me:13523: result: $ac_cv_func_mkstemp" >&5 10959 +echo "$as_me:139 29: result: $ac_cv_func_mkstemp" >&511042 +echo "$as_me:13930: result: $ac_cv_func_mkstemp" >&5 10960 11043 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 10961 11044 … … 10963 11046 cat >conftest.$ac_ext <<_ACEOF 10964 11047 -#line 13528 "configure" 10965 +#line 1393 4"configure"11048 +#line 13935 "configure" 10966 11049 #include "confdefs.h" 10967 11050 10968 11051 #include <sys/types.h> 10969 @@ -13563,15 +139 69,15 @@11052 @@ -13563,15 +13970,15 @@ 10970 11053 10971 11054 _ACEOF 10972 11055 rm -f conftest$ac_exeext 10973 11056 -if { (eval echo "$as_me:13566: \"$ac_link\"") >&5 10974 +if { (eval echo "$as_me:1397 2: \"$ac_link\"") >&511057 +if { (eval echo "$as_me:13973: \"$ac_link\"") >&5 10975 11058 (eval $ac_link) 2>&5 10976 11059 ac_status=$? 10977 11060 - echo "$as_me:13569: \$? = $ac_status" >&5 10978 + echo "$as_me:1397 5: \$? = $ac_status" >&511061 + echo "$as_me:13976: \$? = $ac_status" >&5 10979 11062 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 10980 11063 - { (eval echo "$as_me:13571: \"$ac_try\"") >&5 10981 + { (eval echo "$as_me:1397 7: \"$ac_try\"") >&511064 + { (eval echo "$as_me:13978: \"$ac_try\"") >&5 10982 11065 (eval $ac_try) 2>&5 10983 11066 ac_status=$? 10984 11067 - echo "$as_me:13574: \$? = $ac_status" >&5 10985 + echo "$as_me:1398 0: \$? = $ac_status" >&511068 + echo "$as_me:13981: \$? = $ac_status" >&5 10986 11069 (exit $ac_status); }; }; then 10987 11070 cf_cv_func_mkstemp=yes 10988 11071 10989 @@ -13586,7 +1399 2,7 @@11072 @@ -13586,7 +13993,7 @@ 10990 11073 fi 10991 11074 10992 11075 fi 10993 11076 -echo "$as_me:13589: result: $cf_cv_func_mkstemp" >&5 10994 +echo "$as_me:1399 5: result: $cf_cv_func_mkstemp" >&511077 +echo "$as_me:13996: result: $cf_cv_func_mkstemp" >&5 10995 11078 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 10996 11079 if test "$cf_cv_func_mkstemp" = yes ; then 10997 11080 cat >>confdefs.h <<\EOF 10998 @@ -13604,21 +1401 0,21 @@11081 @@ -13604,21 +14011,21 @@ 10999 11082 fi 11000 11083 11001 11084 if test "$cross_compiling" = yes ; then 11002 11085 - { echo "$as_me:13607: WARNING: cross compiling: assume setvbuf params not reversed" >&5 11003 + { echo "$as_me:1401 3: WARNING: cross compiling: assume setvbuf params not reversed" >&511086 + { echo "$as_me:14014: WARNING: cross compiling: assume setvbuf params not reversed" >&5 11004 11087 echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;} 11005 11088 else 11006 11089 - echo "$as_me:13610: checking whether setvbuf arguments are reversed" >&5 11007 + echo "$as_me:1401 6: checking whether setvbuf arguments are reversed" >&511090 + echo "$as_me:14017: checking whether setvbuf arguments are reversed" >&5 11008 11091 echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 11009 11092 if test "${ac_cv_func_setvbuf_reversed+set}" = set; then … … 11012 11095 if test "$cross_compiling" = yes; then 11013 11096 - { { echo "$as_me:13616: error: cannot run test program while cross compiling" >&5 11014 + { { echo "$as_me:1402 2: error: cannot run test program while cross compiling" >&511097 + { { echo "$as_me:14023: error: cannot run test program while cross compiling" >&5 11015 11098 echo "$as_me: error: cannot run test program while cross compiling" >&2;} 11016 11099 { (exit 1); exit 1; }; } … … 11018 11101 cat >conftest.$ac_ext <<_ACEOF 11019 11102 -#line 13621 "configure" 11020 +#line 1402 7"configure"11103 +#line 14028 "configure" 11021 11104 #include "confdefs.h" 11022 11105 #include <stdio.h> 11023 11106 /* If setvbuf has the reversed format, exit 0. */ 11024 @@ -13635,15 +1404 1,15 @@11107 @@ -13635,15 +14042,15 @@ 11025 11108 } 11026 11109 _ACEOF 11027 11110 rm -f conftest$ac_exeext 11028 11111 -if { (eval echo "$as_me:13638: \"$ac_link\"") >&5 11029 +if { (eval echo "$as_me:1404 4: \"$ac_link\"") >&511112 +if { (eval echo "$as_me:14045: \"$ac_link\"") >&5 11030 11113 (eval $ac_link) 2>&5 11031 11114 ac_status=$? 11032 11115 - echo "$as_me:13641: \$? = $ac_status" >&5 11033 + echo "$as_me:1404 7: \$? = $ac_status" >&511116 + echo "$as_me:14048: \$? = $ac_status" >&5 11034 11117 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 11035 11118 - { (eval echo "$as_me:13643: \"$ac_try\"") >&5 11036 + { (eval echo "$as_me:140 49: \"$ac_try\"") >&511119 + { (eval echo "$as_me:14050: \"$ac_try\"") >&5 11037 11120 (eval $ac_try) 2>&5 11038 11121 ac_status=$? 11039 11122 - echo "$as_me:13646: \$? = $ac_status" >&5 11040 + echo "$as_me:1405 2: \$? = $ac_status" >&511123 + echo "$as_me:14053: \$? = $ac_status" >&5 11041 11124 (exit $ac_status); }; }; then 11042 11125 ac_cv_func_setvbuf_reversed=yes 11043 11126 else 11044 @@ -13656,7 +1406 2,7 @@11127 @@ -13656,7 +14063,7 @@ 11045 11128 fi 11046 11129 rm -f core core.* *.core 11047 11130 fi 11048 11131 -echo "$as_me:13659: result: $ac_cv_func_setvbuf_reversed" >&5 11049 +echo "$as_me:1406 5: result: $ac_cv_func_setvbuf_reversed" >&511132 +echo "$as_me:14066: result: $ac_cv_func_setvbuf_reversed" >&5 11050 11133 echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 11051 11134 if test $ac_cv_func_setvbuf_reversed = yes; then 11052 11135 11053 @@ -13667,13 +1407 3,13 @@11136 @@ -13667,13 +14074,13 @@ 11054 11137 fi 11055 11138 11056 11139 fi 11057 11140 -echo "$as_me:13670: checking return type of signal handlers" >&5 11058 +echo "$as_me:1407 6: checking return type of signal handlers" >&511141 +echo "$as_me:14077: checking return type of signal handlers" >&5 11059 11142 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 11060 11143 if test "${ac_cv_type_signal+set}" = set; then … … 11063 11146 cat >conftest.$ac_ext <<_ACEOF 11064 11147 -#line 13676 "configure" 11065 +#line 1408 2"configure"11148 +#line 14083 "configure" 11066 11149 #include "confdefs.h" 11067 11150 #include <sys/types.h> 11068 11151 #include <signal.h> 11069 @@ -13695,16 +1410 1,16 @@11152 @@ -13695,16 +14102,16 @@ 11070 11153 } 11071 11154 _ACEOF 11072 11155 rm -f conftest.$ac_objext 11073 11156 -if { (eval echo "$as_me:13698: \"$ac_compile\"") >&5 11074 +if { (eval echo "$as_me:1410 4: \"$ac_compile\"") >&511157 +if { (eval echo "$as_me:14105: \"$ac_compile\"") >&5 11075 11158 (eval $ac_compile) 2>&5 11076 11159 ac_status=$? 11077 11160 - echo "$as_me:13701: \$? = $ac_status" >&5 11078 + echo "$as_me:1410 7: \$? = $ac_status" >&511161 + echo "$as_me:14108: \$? = $ac_status" >&5 11079 11162 (exit $ac_status); } && 11080 11163 { ac_try='test -s conftest.$ac_objext' 11081 11164 - { (eval echo "$as_me:13704: \"$ac_try\"") >&5 11082 + { (eval echo "$as_me:1411 0: \"$ac_try\"") >&511165 + { (eval echo "$as_me:14111: \"$ac_try\"") >&5 11083 11166 (eval $ac_try) 2>&5 11084 11167 ac_status=$? 11085 11168 - echo "$as_me:13707: \$? = $ac_status" >&5 11086 + echo "$as_me:1411 3: \$? = $ac_status" >&511169 + echo "$as_me:14114: \$? = $ac_status" >&5 11087 11170 (exit $ac_status); }; }; then 11088 11171 ac_cv_type_signal=void 11089 11172 else 11090 @@ -13714,21 +1412 0,21 @@11173 @@ -13714,21 +14121,21 @@ 11091 11174 fi 11092 11175 rm -f conftest.$ac_objext conftest.$ac_ext 11093 11176 fi 11094 11177 -echo "$as_me:13717: result: $ac_cv_type_signal" >&5 11095 +echo "$as_me:1412 3: result: $ac_cv_type_signal" >&511178 +echo "$as_me:14124: result: $ac_cv_type_signal" >&5 11096 11179 echo "${ECHO_T}$ac_cv_type_signal" >&6 11097 11180 … … 11101 11184 11102 11185 -echo "$as_me:13724: checking for type sigaction_t" >&5 11103 +echo "$as_me:1413 0: checking for type sigaction_t" >&511186 +echo "$as_me:14131: checking for type sigaction_t" >&5 11104 11187 echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6 11105 11188 if test "${cf_cv_type_sigaction+set}" = set; then … … 11109 11192 cat >conftest.$ac_ext <<_ACEOF 11110 11193 -#line 13731 "configure" 11111 +#line 1413 7"configure"11194 +#line 14138 "configure" 11112 11195 #include "confdefs.h" 11113 11196 11114 11197 #include <signal.h> 11115 @@ -13741,16 +1414 7,16 @@11198 @@ -13741,16 +14148,16 @@ 11116 11199 } 11117 11200 _ACEOF 11118 11201 rm -f conftest.$ac_objext 11119 11202 -if { (eval echo "$as_me:13744: \"$ac_compile\"") >&5 11120 +if { (eval echo "$as_me:1415 0: \"$ac_compile\"") >&511203 +if { (eval echo "$as_me:14151: \"$ac_compile\"") >&5 11121 11204 (eval $ac_compile) 2>&5 11122 11205 ac_status=$? 11123 11206 - echo "$as_me:13747: \$? = $ac_status" >&5 11124 + echo "$as_me:1415 3: \$? = $ac_status" >&511207 + echo "$as_me:14154: \$? = $ac_status" >&5 11125 11208 (exit $ac_status); } && 11126 11209 { ac_try='test -s conftest.$ac_objext' 11127 11210 - { (eval echo "$as_me:13750: \"$ac_try\"") >&5 11128 + { (eval echo "$as_me:1415 6: \"$ac_try\"") >&511211 + { (eval echo "$as_me:14157: \"$ac_try\"") >&5 11129 11212 (eval $ac_try) 2>&5 11130 11213 ac_status=$? 11131 11214 - echo "$as_me:13753: \$? = $ac_status" >&5 11132 + echo "$as_me:141 59: \$? = $ac_status" >&511215 + echo "$as_me:14160: \$? = $ac_status" >&5 11133 11216 (exit $ac_status); }; }; then 11134 11217 cf_cv_type_sigaction=yes 11135 11218 else 11136 @@ -13761,13 +1416 7,13 @@11219 @@ -13761,13 +14168,13 @@ 11137 11220 rm -f conftest.$ac_objext conftest.$ac_ext 11138 11221 fi 11139 11222 11140 11223 -echo "$as_me:13764: result: $cf_cv_type_sigaction" >&5 11141 +echo "$as_me:1417 0: result: $cf_cv_type_sigaction" >&511224 +echo "$as_me:14171: result: $cf_cv_type_sigaction" >&5 11142 11225 echo "${ECHO_T}$cf_cv_type_sigaction" >&6 11143 11226 test "$cf_cv_type_sigaction" = yes && cat >>confdefs.h <<\EOF … … 11146 11229 11147 11230 -echo "$as_me:13770: checking declaration of size-change" >&5 11148 +echo "$as_me:1417 6: checking declaration of size-change" >&511231 +echo "$as_me:14177: checking declaration of size-change" >&5 11149 11232 echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6 11150 11233 if test "${cf_cv_sizechange+set}" = set; then 11151 11234 echo $ECHO_N "(cached) $ECHO_C" >&6 11152 @@ -13782,7 +1418 8,7 @@11235 @@ -13782,7 +14189,7 @@ 11153 11236 CPPFLAGS="$cf_save_CPPFLAGS" 11154 11237 test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" 11155 11238 cat >conftest.$ac_ext <<_ACEOF 11156 11239 -#line 13785 "configure" 11157 +#line 1419 1"configure"11240 +#line 14192 "configure" 11158 11241 #include "confdefs.h" 11159 11242 #include <sys/types.h> 11160 11243 #ifdef HAVE_TERMIOS_H 11161 @@ -13826,16 +1423 2,16 @@11244 @@ -13826,16 +14233,16 @@ 11162 11245 } 11163 11246 _ACEOF 11164 11247 rm -f conftest.$ac_objext 11165 11248 -if { (eval echo "$as_me:13829: \"$ac_compile\"") >&5 11166 +if { (eval echo "$as_me:1423 5: \"$ac_compile\"") >&511249 +if { (eval echo "$as_me:14236: \"$ac_compile\"") >&5 11167 11250 (eval $ac_compile) 2>&5 11168 11251 ac_status=$? 11169 11252 - echo "$as_me:13832: \$? = $ac_status" >&5 11170 + echo "$as_me:1423 8: \$? = $ac_status" >&511253 + echo "$as_me:14239: \$? = $ac_status" >&5 11171 11254 (exit $ac_status); } && 11172 11255 { ac_try='test -s conftest.$ac_objext' 11173 11256 - { (eval echo "$as_me:13835: \"$ac_try\"") >&5 11174 + { (eval echo "$as_me:1424 1: \"$ac_try\"") >&511257 + { (eval echo "$as_me:14242: \"$ac_try\"") >&5 11175 11258 (eval $ac_try) 2>&5 11176 11259 ac_status=$? 11177 11260 - echo "$as_me:13838: \$? = $ac_status" >&5 11178 + echo "$as_me:1424 4: \$? = $ac_status" >&511261 + echo "$as_me:14245: \$? = $ac_status" >&5 11179 11262 (exit $ac_status); }; }; then 11180 11263 cf_cv_sizechange=yes 11181 11264 else 11182 @@ -13854,7 +1426 0,7 @@11265 @@ -13854,7 +14261,7 @@ 11183 11266 done 11184 11267 11185 11268 fi 11186 11269 -echo "$as_me:13857: result: $cf_cv_sizechange" >&5 11187 +echo "$as_me:1426 3: result: $cf_cv_sizechange" >&511270 +echo "$as_me:14264: result: $cf_cv_sizechange" >&5 11188 11271 echo "${ECHO_T}$cf_cv_sizechange" >&6 11189 11272 if test "$cf_cv_sizechange" != no ; then 11190 11273 cat >>confdefs.h <<\EOF 11191 @@ -13871,13 +1427 7,13 @@11274 @@ -13871,13 +14278,13 @@ 11192 11275 esac 11193 11276 fi 11194 11277 11195 11278 -echo "$as_me:13874: checking for memmove" >&5 11196 +echo "$as_me:1428 0: checking for memmove" >&511279 +echo "$as_me:14281: checking for memmove" >&5 11197 11280 echo $ECHO_N "checking for memmove... $ECHO_C" >&6 11198 11281 if test "${ac_cv_func_memmove+set}" = set; then … … 11201 11284 cat >conftest.$ac_ext <<_ACEOF 11202 11285 -#line 13880 "configure" 11203 +#line 1428 6"configure"11286 +#line 14287 "configure" 11204 11287 #include "confdefs.h" 11205 11288 /* System header to define __stub macros and hopefully few prototypes, 11206 11289 which can conflict with char memmove (); below. */ 11207 @@ -13908,16 +1431 4,16 @@11290 @@ -13908,16 +14315,16 @@ 11208 11291 } 11209 11292 _ACEOF 11210 11293 rm -f conftest.$ac_objext conftest$ac_exeext 11211 11294 -if { (eval echo "$as_me:13911: \"$ac_link\"") >&5 11212 +if { (eval echo "$as_me:1431 7: \"$ac_link\"") >&511295 +if { (eval echo "$as_me:14318: \"$ac_link\"") >&5 11213 11296 (eval $ac_link) 2>&5 11214 11297 ac_status=$? 11215 11298 - echo "$as_me:13914: \$? = $ac_status" >&5 11216 + echo "$as_me:1432 0: \$? = $ac_status" >&511299 + echo "$as_me:14321: \$? = $ac_status" >&5 11217 11300 (exit $ac_status); } && 11218 11301 { ac_try='test -s conftest$ac_exeext' 11219 11302 - { (eval echo "$as_me:13917: \"$ac_try\"") >&5 11220 + { (eval echo "$as_me:1432 3: \"$ac_try\"") >&511303 + { (eval echo "$as_me:14324: \"$ac_try\"") >&5 11221 11304 (eval $ac_try) 2>&5 11222 11305 ac_status=$? 11223 11306 - echo "$as_me:13920: \$? = $ac_status" >&5 11224 + echo "$as_me:1432 6: \$? = $ac_status" >&511307 + echo "$as_me:14327: \$? = $ac_status" >&5 11225 11308 (exit $ac_status); }; }; then 11226 11309 ac_cv_func_memmove=yes 11227 11310 else 11228 @@ -13927,19 +1433 3,19 @@11311 @@ -13927,19 +14334,19 @@ 11229 11312 fi 11230 11313 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 11231 11314 fi 11232 11315 -echo "$as_me:13930: result: $ac_cv_func_memmove" >&5 11233 +echo "$as_me:1433 6: result: $ac_cv_func_memmove" >&511316 +echo "$as_me:14337: result: $ac_cv_func_memmove" >&5 11234 11317 echo "${ECHO_T}$ac_cv_func_memmove" >&6 11235 11318 if test $ac_cv_func_memmove = yes; then … … 11238 11321 11239 11322 -echo "$as_me:13936: checking for bcopy" >&5 11240 +echo "$as_me:1434 2: checking for bcopy" >&511323 +echo "$as_me:14343: checking for bcopy" >&5 11241 11324 echo $ECHO_N "checking for bcopy... $ECHO_C" >&6 11242 11325 if test "${ac_cv_func_bcopy+set}" = set; then … … 11245 11328 cat >conftest.$ac_ext <<_ACEOF 11246 11329 -#line 13942 "configure" 11247 +#line 1434 8"configure"11330 +#line 14349 "configure" 11248 11331 #include "confdefs.h" 11249 11332 /* System header to define __stub macros and hopefully few prototypes, 11250 11333 which can conflict with char bcopy (); below. */ 11251 @@ -13970,16 +1437 6,16 @@11334 @@ -13970,16 +14377,16 @@ 11252 11335 } 11253 11336 _ACEOF 11254 11337 rm -f conftest.$ac_objext conftest$ac_exeext 11255 11338 -if { (eval echo "$as_me:13973: \"$ac_link\"") >&5 11256 +if { (eval echo "$as_me:143 79: \"$ac_link\"") >&511339 +if { (eval echo "$as_me:14380: \"$ac_link\"") >&5 11257 11340 (eval $ac_link) 2>&5 11258 11341 ac_status=$? 11259 11342 - echo "$as_me:13976: \$? = $ac_status" >&5 11260 + echo "$as_me:1438 2: \$? = $ac_status" >&511343 + echo "$as_me:14383: \$? = $ac_status" >&5 11261 11344 (exit $ac_status); } && 11262 11345 { ac_try='test -s conftest$ac_exeext' 11263 11346 - { (eval echo "$as_me:13979: \"$ac_try\"") >&5 11264 + { (eval echo "$as_me:1438 5: \"$ac_try\"") >&511347 + { (eval echo "$as_me:14386: \"$ac_try\"") >&5 11265 11348 (eval $ac_try) 2>&5 11266 11349 ac_status=$? 11267 11350 - echo "$as_me:13982: \$? = $ac_status" >&5 11268 + echo "$as_me:1438 8: \$? = $ac_status" >&511351 + echo "$as_me:14389: \$? = $ac_status" >&5 11269 11352 (exit $ac_status); }; }; then 11270 11353 ac_cv_func_bcopy=yes 11271 11354 else 11272 @@ -13989,11 +1439 5,11 @@11355 @@ -13989,11 +14396,11 @@ 11273 11356 fi 11274 11357 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 11275 11358 fi 11276 11359 -echo "$as_me:13992: result: $ac_cv_func_bcopy" >&5 11277 +echo "$as_me:1439 8: result: $ac_cv_func_bcopy" >&511360 +echo "$as_me:14399: result: $ac_cv_func_bcopy" >&5 11278 11361 echo "${ECHO_T}$ac_cv_func_bcopy" >&6 11279 11362 if test $ac_cv_func_bcopy = yes; then 11280 11363 11281 11364 - echo "$as_me:13996: checking if bcopy does overlapping moves" >&5 11282 + echo "$as_me:1440 2: checking if bcopy does overlapping moves" >&511365 + echo "$as_me:14403: checking if bcopy does overlapping moves" >&5 11283 11366 echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6 11284 11367 if test "${cf_cv_good_bcopy+set}" = set; then 11285 11368 echo $ECHO_N "(cached) $ECHO_C" >&6 11286 @@ -14003,7 +144 09,7 @@11369 @@ -14003,7 +14410,7 @@ 11287 11370 cf_cv_good_bcopy=unknown 11288 11371 else 11289 11372 cat >conftest.$ac_ext <<_ACEOF 11290 11373 -#line 14006 "configure" 11291 +#line 1441 2"configure"11374 +#line 14413 "configure" 11292 11375 #include "confdefs.h" 11293 11376 11294 11377 int main() { 11295 @@ -14017,15 +1442 3,15 @@11378 @@ -14017,15 +14424,15 @@ 11296 11379 11297 11380 _ACEOF 11298 11381 rm -f conftest$ac_exeext 11299 11382 -if { (eval echo "$as_me:14020: \"$ac_link\"") >&5 11300 +if { (eval echo "$as_me:1442 6: \"$ac_link\"") >&511383 +if { (eval echo "$as_me:14427: \"$ac_link\"") >&5 11301 11384 (eval $ac_link) 2>&5 11302 11385 ac_status=$? 11303 11386 - echo "$as_me:14023: \$? = $ac_status" >&5 11304 + echo "$as_me:144 29: \$? = $ac_status" >&511387 + echo "$as_me:14430: \$? = $ac_status" >&5 11305 11388 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 11306 11389 - { (eval echo "$as_me:14025: \"$ac_try\"") >&5 11307 + { (eval echo "$as_me:1443 1: \"$ac_try\"") >&511390 + { (eval echo "$as_me:14432: \"$ac_try\"") >&5 11308 11391 (eval $ac_try) 2>&5 11309 11392 ac_status=$? 11310 11393 - echo "$as_me:14028: \$? = $ac_status" >&5 11311 + echo "$as_me:1443 4: \$? = $ac_status" >&511394 + echo "$as_me:14435: \$? = $ac_status" >&5 11312 11395 (exit $ac_status); }; }; then 11313 11396 cf_cv_good_bcopy=yes 11314 11397 else 11315 @@ -14038,7 +1444 4,7 @@11398 @@ -14038,7 +14445,7 @@ 11316 11399 fi 11317 11400 11318 11401 fi 11319 11402 -echo "$as_me:14041: result: $cf_cv_good_bcopy" >&5 11320 +echo "$as_me:1444 7: result: $cf_cv_good_bcopy" >&511403 +echo "$as_me:14448: result: $cf_cv_good_bcopy" >&5 11321 11404 echo "${ECHO_T}$cf_cv_good_bcopy" >&6 11322 11405 11323 11406 else 11324 @@ -14059,7 +1446 5,7 @@11407 @@ -14059,7 +14466,7 @@ 11325 11408 11326 11409 fi 11327 11410 11328 11411 -echo "$as_me:14062: checking if poll really works" >&5 11329 +echo "$as_me:1446 8: checking if poll really works" >&511412 +echo "$as_me:14469: checking if poll really works" >&5 11330 11413 echo $ECHO_N "checking if poll really works... $ECHO_C" >&6 11331 11414 if test "${cf_cv_working_poll+set}" = set; then 11332 11415 echo $ECHO_N "(cached) $ECHO_C" >&6 11333 @@ -14069,7 +1447 5,7 @@11416 @@ -14069,7 +14476,7 @@ 11334 11417 cf_cv_working_poll=unknown 11335 11418 else 11336 11419 cat >conftest.$ac_ext <<_ACEOF 11337 11420 -#line 14072 "configure" 11338 +#line 1447 8"configure"11421 +#line 14479 "configure" 11339 11422 #include "confdefs.h" 11340 11423 11341 11424 #include <stdio.h> 11342 @@ -14090,15 +1449 6,15 @@11425 @@ -14090,15 +14497,15 @@ 11343 11426 } 11344 11427 _ACEOF 11345 11428 rm -f conftest$ac_exeext 11346 11429 -if { (eval echo "$as_me:14093: \"$ac_link\"") >&5 11347 +if { (eval echo "$as_me:14 499: \"$ac_link\"") >&511430 +if { (eval echo "$as_me:14500: \"$ac_link\"") >&5 11348 11431 (eval $ac_link) 2>&5 11349 11432 ac_status=$? 11350 11433 - echo "$as_me:14096: \$? = $ac_status" >&5 11351 + echo "$as_me:1450 2: \$? = $ac_status" >&511434 + echo "$as_me:14503: \$? = $ac_status" >&5 11352 11435 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 11353 11436 - { (eval echo "$as_me:14098: \"$ac_try\"") >&5 11354 + { (eval echo "$as_me:1450 4: \"$ac_try\"") >&511437 + { (eval echo "$as_me:14505: \"$ac_try\"") >&5 11355 11438 (eval $ac_try) 2>&5 11356 11439 ac_status=$? 11357 11440 - echo "$as_me:14101: \$? = $ac_status" >&5 11358 + echo "$as_me:1450 7: \$? = $ac_status" >&511441 + echo "$as_me:14508: \$? = $ac_status" >&5 11359 11442 (exit $ac_status); }; }; then 11360 11443 cf_cv_working_poll=yes 11361 11444 else 11362 @@ -14110,7 +1451 6,7 @@11445 @@ -14110,7 +14517,7 @@ 11363 11446 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 11364 11447 fi 11365 11448 fi 11366 11449 -echo "$as_me:14113: result: $cf_cv_working_poll" >&5 11367 +echo "$as_me:145 19: result: $cf_cv_working_poll" >&511450 +echo "$as_me:14520: result: $cf_cv_working_poll" >&5 11368 11451 echo "${ECHO_T}$cf_cv_working_poll" >&6 11369 11452 test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF 11370 11453 #define HAVE_WORKING_POLL 1 11371 @@ -14118,7 +1452 4,7 @@11454 @@ -14118,7 +14525,7 @@ 11372 11455 11373 11456 # special check for test/ditto.c 11374 11457 11375 11458 -echo "$as_me:14121: checking for openpty in -lutil" >&5 11376 +echo "$as_me:1452 7: checking for openpty in -lutil" >&511459 +echo "$as_me:14528: checking for openpty in -lutil" >&5 11377 11460 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 11378 11461 if test "${ac_cv_lib_util_openpty+set}" = set; then 11379 11462 echo $ECHO_N "(cached) $ECHO_C" >&6 11380 @@ -14126,7 +1453 2,7 @@11463 @@ -14126,7 +14533,7 @@ 11381 11464 ac_check_lib_save_LIBS=$LIBS 11382 11465 LIBS="-lutil $LIBS" 11383 11466 cat >conftest.$ac_ext <<_ACEOF 11384 11467 -#line 14129 "configure" 11385 +#line 1453 5"configure"11468 +#line 14536 "configure" 11386 11469 #include "confdefs.h" 11387 11470 11388 11471 /* Override any gcc2 internal prototype to avoid an error. */ 11389 @@ -14145,16 +1455 1,16 @@11472 @@ -14145,16 +14552,16 @@ 11390 11473 } 11391 11474 _ACEOF 11392 11475 rm -f conftest.$ac_objext conftest$ac_exeext 11393 11476 -if { (eval echo "$as_me:14148: \"$ac_link\"") >&5 11394 +if { (eval echo "$as_me:1455 4: \"$ac_link\"") >&511477 +if { (eval echo "$as_me:14555: \"$ac_link\"") >&5 11395 11478 (eval $ac_link) 2>&5 11396 11479 ac_status=$? 11397 11480 - echo "$as_me:14151: \$? = $ac_status" >&5 11398 + echo "$as_me:1455 7: \$? = $ac_status" >&511481 + echo "$as_me:14558: \$? = $ac_status" >&5 11399 11482 (exit $ac_status); } && 11400 11483 { ac_try='test -s conftest$ac_exeext' 11401 11484 - { (eval echo "$as_me:14154: \"$ac_try\"") >&5 11402 + { (eval echo "$as_me:1456 0: \"$ac_try\"") >&511485 + { (eval echo "$as_me:14561: \"$ac_try\"") >&5 11403 11486 (eval $ac_try) 2>&5 11404 11487 ac_status=$? 11405 11488 - echo "$as_me:14157: \$? = $ac_status" >&5 11406 + echo "$as_me:1456 3: \$? = $ac_status" >&511489 + echo "$as_me:14564: \$? = $ac_status" >&5 11407 11490 (exit $ac_status); }; }; then 11408 11491 ac_cv_lib_util_openpty=yes 11409 11492 else 11410 @@ -14165,7 +1457 1,7 @@11493 @@ -14165,7 +14572,7 @@ 11411 11494 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 11412 11495 LIBS=$ac_check_lib_save_LIBS 11413 11496 fi 11414 11497 -echo "$as_me:14168: result: $ac_cv_lib_util_openpty" >&5 11415 +echo "$as_me:1457 4: result: $ac_cv_lib_util_openpty" >&511498 +echo "$as_me:14575: result: $ac_cv_lib_util_openpty" >&5 11416 11499 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 11417 11500 if test $ac_cv_lib_util_openpty = yes; then 11418 11501 cf_cv_lib_util=yes 11419 @@ -14173,7 +145 79,7 @@11502 @@ -14173,7 +14580,7 @@ 11420 11503 cf_cv_lib_util=no 11421 11504 fi 11422 11505 11423 11506 -echo "$as_me:14176: checking for openpty header" >&5 11424 +echo "$as_me:1458 2: checking for openpty header" >&511507 +echo "$as_me:14583: checking for openpty header" >&5 11425 11508 echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 11426 11509 if test "${cf_cv_func_openpty+set}" = set; then 11427 11510 echo $ECHO_N "(cached) $ECHO_C" >&6 11428 @@ -14184,7 +1459 0,7 @@11511 @@ -14184,7 +14591,7 @@ 11429 11512 for cf_header in pty.h libutil.h util.h 11430 11513 do 11431 11514 cat >conftest.$ac_ext <<_ACEOF 11432 11515 -#line 14187 "configure" 11433 +#line 1459 3"configure"11516 +#line 14594 "configure" 11434 11517 #include "confdefs.h" 11435 11518 11436 11519 #include <$cf_header> 11437 @@ -14201,16 +1460 7,16 @@11520 @@ -14201,16 +14608,16 @@ 11438 11521 } 11439 11522 _ACEOF 11440 11523 rm -f conftest.$ac_objext conftest$ac_exeext 11441 11524 -if { (eval echo "$as_me:14204: \"$ac_link\"") >&5 11442 +if { (eval echo "$as_me:1461 0: \"$ac_link\"") >&511525 +if { (eval echo "$as_me:14611: \"$ac_link\"") >&5 11443 11526 (eval $ac_link) 2>&5 11444 11527 ac_status=$? 11445 11528 - echo "$as_me:14207: \$? = $ac_status" >&5 11446 + echo "$as_me:1461 3: \$? = $ac_status" >&511529 + echo "$as_me:14614: \$? = $ac_status" >&5 11447 11530 (exit $ac_status); } && 11448 11531 { ac_try='test -s conftest$ac_exeext' 11449 11532 - { (eval echo "$as_me:14210: \"$ac_try\"") >&5 11450 + { (eval echo "$as_me:1461 6: \"$ac_try\"") >&511533 + { (eval echo "$as_me:14617: \"$ac_try\"") >&5 11451 11534 (eval $ac_try) 2>&5 11452 11535 ac_status=$? 11453 11536 - echo "$as_me:14213: \$? = $ac_status" >&5 11454 + echo "$as_me:146 19: \$? = $ac_status" >&511537 + echo "$as_me:14620: \$? = $ac_status" >&5 11455 11538 (exit $ac_status); }; }; then 11456 11539 11457 11540 cf_cv_func_openpty=$cf_header 11458 @@ -14228,7 +1463 4,7 @@11541 @@ -14228,7 +14635,7 @@ 11459 11542 LIBS="$cf_save_LIBS" 11460 11543 11461 11544 fi 11462 11545 -echo "$as_me:14231: result: $cf_cv_func_openpty" >&5 11463 +echo "$as_me:1463 7: result: $cf_cv_func_openpty" >&511546 +echo "$as_me:14638: result: $cf_cv_func_openpty" >&5 11464 11547 echo "${ECHO_T}$cf_cv_func_openpty" >&6 11465 11548 11466 11549 if test "$cf_cv_func_openpty" != no ; then 11467 @@ -14274,13 +1468 0,13 @@11550 @@ -14274,13 +14681,13 @@ 11468 11551 fi 11469 11552 … … 11477 11560 cat >conftest.$ac_ext <<_ACEOF 11478 11561 -#line 14283 "configure" 11479 +#line 146 89"configure"11562 +#line 14690 "configure" 11480 11563 #include "confdefs.h" 11481 11564 #include <stdio.h> 11482 11565 int 11483 @@ -14292,16 +1469 8,16 @@11566 @@ -14292,16 +14699,16 @@ 11484 11567 } 11485 11568 _ACEOF 11486 11569 rm -f conftest.$ac_objext 11487 11570 -if { (eval echo "$as_me:14295: \"$ac_compile\"") >&5 11488 +if { (eval echo "$as_me:1470 1: \"$ac_compile\"") >&511571 +if { (eval echo "$as_me:14702: \"$ac_compile\"") >&5 11489 11572 (eval $ac_compile) 2>&5 11490 11573 ac_status=$? 11491 11574 - echo "$as_me:14298: \$? = $ac_status" >&5 11492 + echo "$as_me:1470 4: \$? = $ac_status" >&511575 + echo "$as_me:14705: \$? = $ac_status" >&5 11493 11576 (exit $ac_status); } && 11494 11577 { ac_try='test -s conftest.$ac_objext' 11495 11578 - { (eval echo "$as_me:14301: \"$ac_try\"") >&5 11496 + { (eval echo "$as_me:1470 7: \"$ac_try\"") >&511579 + { (eval echo "$as_me:14708: \"$ac_try\"") >&5 11497 11580 (eval $ac_try) 2>&5 11498 11581 ac_status=$? 11499 11582 - echo "$as_me:14304: \$? = $ac_status" >&5 11500 + echo "$as_me:1471 0: \$? = $ac_status" >&511583 + echo "$as_me:14711: \$? = $ac_status" >&5 11501 11584 (exit $ac_status); }; }; then 11502 11585 : 11503 11586 else 11504 @@ -14318,13 +1472 4,13 @@11587 @@ -14318,13 +14725,13 @@ 11505 11588 if test "$cf_have_incdir" = no ; then 11506 11589 test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 11507 11590 11508 11591 -echo "${as_me-configure}:14321: testing adding $cf_add_incdir to include-path ..." 1>&5 11509 +echo "${as_me-configure}:1472 7: testing adding $cf_add_incdir to include-path ..." 1>&511592 +echo "${as_me-configure}:14728: testing adding $cf_add_incdir to include-path ..." 1>&5 11510 11593 11511 11594 - CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" … … 11521 11604 break 11522 11605 fi 11523 @@ -14352,7 +1475 8,7 @@11606 @@ -14352,7 +14759,7 @@ 11524 11607 if test "$cf_have_libdir" = no ; then 11525 11608 test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 11526 11609 11527 11610 -echo "${as_me-configure}:14355: testing adding $cf_add_libdir to library-path ..." 1>&5 11528 +echo "${as_me-configure}:1476 1: testing adding $cf_add_libdir to library-path ..." 1>&511611 +echo "${as_me-configure}:14762: testing adding $cf_add_libdir to library-path ..." 1>&5 11529 11612 11530 11613 LDFLAGS="-L$cf_add_libdir $LDFLAGS" 11531 11614 fi 11532 @@ -14363,23 +147 69,23 @@11615 @@ -14363,23 +14770,23 @@ 11533 11616 fi 11534 11617 esac 11535 11618 11536 11619 -echo "$as_me:14366: checking for db.h" >&5 11537 +echo "$as_me:1477 2: checking for db.h" >&511620 +echo "$as_me:14773: checking for db.h" >&5 11538 11621 echo $ECHO_N "checking for db.h... $ECHO_C" >&6 11539 11622 if test "${ac_cv_header_db_h+set}" = set; then … … 11542 11625 cat >conftest.$ac_ext <<_ACEOF 11543 11626 -#line 14372 "configure" 11544 +#line 1477 8"configure"11627 +#line 14779 "configure" 11545 11628 #include "confdefs.h" 11546 11629 #include <db.h> 11547 11630 _ACEOF 11548 11631 -if { (eval echo "$as_me:14376: \"$ac_cpp conftest.$ac_ext\"") >&5 11549 +if { (eval echo "$as_me:1478 2: \"$ac_cpp conftest.$ac_ext\"") >&511632 +if { (eval echo "$as_me:14783: \"$ac_cpp conftest.$ac_ext\"") >&5 11550 11633 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 11551 11634 ac_status=$? … … 11554 11637 cat conftest.err >&5 11555 11638 - echo "$as_me:14382: \$? = $ac_status" >&5 11556 + echo "$as_me:1478 8: \$? = $ac_status" >&511639 + echo "$as_me:14789: \$? = $ac_status" >&5 11557 11640 (exit $ac_status); } >/dev/null; then 11558 11641 if test -s conftest.err; then 11559 11642 ac_cpp_err=$ac_c_preproc_warn_flag 11560 @@ -14398,11 +1480 4,11 @@11643 @@ -14398,11 +14805,11 @@ 11561 11644 fi 11562 11645 rm -f conftest.err conftest.$ac_ext 11563 11646 fi 11564 11647 -echo "$as_me:14401: result: $ac_cv_header_db_h" >&5 11565 +echo "$as_me:1480 7: result: $ac_cv_header_db_h" >&511648 +echo "$as_me:14808: result: $ac_cv_header_db_h" >&5 11566 11649 echo "${ECHO_T}$ac_cv_header_db_h" >&6 11567 11650 if test $ac_cv_header_db_h = yes; then 11568 11651 11569 11652 -echo "$as_me:14405: checking for version of db" >&5 11570 +echo "$as_me:1481 1: checking for version of db" >&511653 +echo "$as_me:14812: checking for version of db" >&5 11571 11654 echo $ECHO_N "checking for version of db... $ECHO_C" >&6 11572 11655 if test "${cf_cv_hashed_db_version+set}" = set; then 11573 11656 echo $ECHO_N "(cached) $ECHO_C" >&6 11574 @@ -14413,10 +148 19,10 @@11657 @@ -14413,10 +14820,10 @@ 11575 11658 for cf_db_version in 1 2 3 4 5 11576 11659 do 11577 11660 11578 11661 -echo "${as_me-configure}:14416: testing checking for db version $cf_db_version ..." 1>&5 11579 +echo "${as_me-configure}:1482 2: testing checking for db version $cf_db_version ..." 1>&511662 +echo "${as_me-configure}:14823: testing checking for db version $cf_db_version ..." 1>&5 11580 11663 11581 11664 cat >conftest.$ac_ext <<_ACEOF 11582 11665 -#line 14419 "configure" 11583 +#line 1482 5"configure"11666 +#line 14826 "configure" 11584 11667 #include "confdefs.h" 11585 11668 11586 11669 $ac_includes_default 11587 @@ -14446,16 +1485 2,16 @@11670 @@ -14446,16 +14853,16 @@ 11588 11671 } 11589 11672 _ACEOF 11590 11673 rm -f conftest.$ac_objext 11591 11674 -if { (eval echo "$as_me:14449: \"$ac_compile\"") >&5 11592 +if { (eval echo "$as_me:1485 5: \"$ac_compile\"") >&511675 +if { (eval echo "$as_me:14856: \"$ac_compile\"") >&5 11593 11676 (eval $ac_compile) 2>&5 11594 11677 ac_status=$? 11595 11678 - echo "$as_me:14452: \$? = $ac_status" >&5 11596 + echo "$as_me:1485 8: \$? = $ac_status" >&511679 + echo "$as_me:14859: \$? = $ac_status" >&5 11597 11680 (exit $ac_status); } && 11598 11681 { ac_try='test -s conftest.$ac_objext' 11599 11682 - { (eval echo "$as_me:14455: \"$ac_try\"") >&5 11600 + { (eval echo "$as_me:1486 1: \"$ac_try\"") >&511683 + { (eval echo "$as_me:14862: \"$ac_try\"") >&5 11601 11684 (eval $ac_try) 2>&5 11602 11685 ac_status=$? 11603 11686 - echo "$as_me:14458: \$? = $ac_status" >&5 11604 + echo "$as_me:1486 4: \$? = $ac_status" >&511687 + echo "$as_me:14865: \$? = $ac_status" >&5 11605 11688 (exit $ac_status); }; }; then 11606 11689 11607 11690 cf_cv_hashed_db_version=$cf_db_version 11608 @@ -14469,16 +1487 5,16 @@11691 @@ -14469,16 +14876,16 @@ 11609 11692 done 11610 11693 11611 11694 fi 11612 11695 -echo "$as_me:14472: result: $cf_cv_hashed_db_version" >&5 11613 +echo "$as_me:1487 8: result: $cf_cv_hashed_db_version" >&511696 +echo "$as_me:14879: result: $cf_cv_hashed_db_version" >&5 11614 11697 echo "${ECHO_T}$cf_cv_hashed_db_version" >&6 11615 11698 11616 11699 if test "$cf_cv_hashed_db_version" = unknown ; then 11617 11700 - { { echo "$as_me:14476: error: Cannot determine version of db" >&5 11618 + { { echo "$as_me:1488 2: error: Cannot determine version of db" >&511701 + { { echo "$as_me:14883: error: Cannot determine version of db" >&5 11619 11702 echo "$as_me: error: Cannot determine version of db" >&2;} 11620 11703 { (exit 1); exit 1; }; } … … 11622 11705 11623 11706 -echo "$as_me:14481: checking for db libraries" >&5 11624 +echo "$as_me:1488 7: checking for db libraries" >&511707 +echo "$as_me:14888: checking for db libraries" >&5 11625 11708 echo $ECHO_N "checking for db libraries... $ECHO_C" >&6 11626 11709 if test "${cf_cv_hashed_db_libs+set}" = set; then 11627 11710 echo $ECHO_N "(cached) $ECHO_C" >&6 11628 @@ -14492,10 +1489 8,10 @@11711 @@ -14492,10 +14899,10 @@ 11629 11712 LIBS="-l$cf_db_libs $LIBS" 11630 11713 fi 11631 11714 11632 11715 -echo "${as_me-configure}:14495: testing checking for library "$cf_db_libs" ..." 1>&5 11633 +echo "${as_me-configure}:1490 1: testing checking for library "$cf_db_libs" ..." 1>&511716 +echo "${as_me-configure}:14902: testing checking for library "$cf_db_libs" ..." 1>&5 11634 11717 11635 11718 cat >conftest.$ac_ext <<_ACEOF 11636 11719 -#line 14498 "configure" 11637 +#line 1490 4"configure"11720 +#line 14905 "configure" 11638 11721 #include "confdefs.h" 11639 11722 11640 11723 $ac_includes_default 11641 @@ -14550,16 +1495 6,16 @@11724 @@ -14550,16 +14957,16 @@ 11642 11725 } 11643 11726 _ACEOF 11644 11727 rm -f conftest.$ac_objext conftest$ac_exeext 11645 11728 -if { (eval echo "$as_me:14553: \"$ac_link\"") >&5 11646 +if { (eval echo "$as_me:149 59: \"$ac_link\"") >&511729 +if { (eval echo "$as_me:14960: \"$ac_link\"") >&5 11647 11730 (eval $ac_link) 2>&5 11648 11731 ac_status=$? 11649 11732 - echo "$as_me:14556: \$? = $ac_status" >&5 11650 + echo "$as_me:1496 2: \$? = $ac_status" >&511733 + echo "$as_me:14963: \$? = $ac_status" >&5 11651 11734 (exit $ac_status); } && 11652 11735 { ac_try='test -s conftest$ac_exeext' 11653 11736 - { (eval echo "$as_me:14559: \"$ac_try\"") >&5 11654 + { (eval echo "$as_me:1496 5: \"$ac_try\"") >&511737 + { (eval echo "$as_me:14966: \"$ac_try\"") >&5 11655 11738 (eval $ac_try) 2>&5 11656 11739 ac_status=$? 11657 11740 - echo "$as_me:14562: \$? = $ac_status" >&5 11658 + echo "$as_me:1496 8: \$? = $ac_status" >&511741 + echo "$as_me:14969: \$? = $ac_status" >&5 11659 11742 (exit $ac_status); }; }; then 11660 11743 11661 11744 if test -n "$cf_db_libs" ; then 11662 @@ -14579,11 +1498 5,11 @@11745 @@ -14579,11 +14986,11 @@ 11663 11746 done 11664 11747 11665 11748 fi 11666 11749 -echo "$as_me:14582: result: $cf_cv_hashed_db_libs" >&5 11667 +echo "$as_me:1498 8: result: $cf_cv_hashed_db_libs" >&511750 +echo "$as_me:14989: result: $cf_cv_hashed_db_libs" >&5 11668 11751 echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6 11669 11752 11670 11753 if test "$cf_cv_hashed_db_libs" = unknown ; then 11671 11754 - { { echo "$as_me:14586: error: Cannot determine library for db" >&5 11672 + { { echo "$as_me:1499 2: error: Cannot determine library for db" >&511755 + { { echo "$as_me:14993: error: Cannot determine library for db" >&5 11673 11756 echo "$as_me: error: Cannot determine library for db" >&2;} 11674 11757 { (exit 1); exit 1; }; } 11675 11758 elif test "$cf_cv_hashed_db_libs" != default ; then 11676 @@ -14593,7 +1 4999,7 @@11759 @@ -14593,7 +15000,7 @@ 11677 11760 11678 11761 else 11679 11762 11680 11763 - { { echo "$as_me:14596: error: Cannot find db.h" >&5 11681 + { { echo "$as_me:1500 2: error: Cannot find db.h" >&511764 + { { echo "$as_me:15003: error: Cannot find db.h" >&5 11682 11765 echo "$as_me: error: Cannot find db.h" >&2;} 11683 11766 { (exit 1); exit 1; }; } 11684 11767 11685 @@ -14608,7 +1501 4,7 @@11768 @@ -14608,7 +15015,7 @@ 11686 11769 11687 11770 # Just in case, check if the C compiler has a bool type. 11688 11771 11689 11772 -echo "$as_me:14611: checking if we should include stdbool.h" >&5 11690 +echo "$as_me:1501 7: checking if we should include stdbool.h" >&511773 +echo "$as_me:15018: checking if we should include stdbool.h" >&5 11691 11774 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 11692 11775 11693 11776 if test "${cf_cv_header_stdbool_h+set}" = set; then 11694 @@ -14616,7 +1502 2,7 @@11777 @@ -14616,7 +15023,7 @@ 11695 11778 else 11696 11779 11697 11780 cat >conftest.$ac_ext <<_ACEOF 11698 11781 -#line 14619 "configure" 11699 +#line 1502 5"configure"11782 +#line 15026 "configure" 11700 11783 #include "confdefs.h" 11701 11784 11702 11785 int 11703 @@ -14628,23 +1503 4,23 @@11786 @@ -14628,23 +15035,23 @@ 11704 11787 } 11705 11788 _ACEOF 11706 11789 rm -f conftest.$ac_objext 11707 11790 -if { (eval echo "$as_me:14631: \"$ac_compile\"") >&5 11708 +if { (eval echo "$as_me:1503 7: \"$ac_compile\"") >&511791 +if { (eval echo "$as_me:15038: \"$ac_compile\"") >&5 11709 11792 (eval $ac_compile) 2>&5 11710 11793 ac_status=$? 11711 11794 - echo "$as_me:14634: \$? = $ac_status" >&5 11712 + echo "$as_me:1504 0: \$? = $ac_status" >&511795 + echo "$as_me:15041: \$? = $ac_status" >&5 11713 11796 (exit $ac_status); } && 11714 11797 { ac_try='test -s conftest.$ac_objext' 11715 11798 - { (eval echo "$as_me:14637: \"$ac_try\"") >&5 11716 + { (eval echo "$as_me:1504 3: \"$ac_try\"") >&511799 + { (eval echo "$as_me:15044: \"$ac_try\"") >&5 11717 11800 (eval $ac_try) 2>&5 11718 11801 ac_status=$? 11719 11802 - echo "$as_me:14640: \$? = $ac_status" >&5 11720 + echo "$as_me:1504 6: \$? = $ac_status" >&511803 + echo "$as_me:15047: \$? = $ac_status" >&5 11721 11804 (exit $ac_status); }; }; then 11722 11805 cf_cv_header_stdbool_h=0 … … 11726 11809 cat >conftest.$ac_ext <<_ACEOF 11727 11810 -#line 14647 "configure" 11728 +#line 1505 3"configure"11811 +#line 15054 "configure" 11729 11812 #include "confdefs.h" 11730 11813 11731 11814 #ifndef __BEOS__ 11732 @@ -14660,16 +1506 6,16 @@11815 @@ -14660,16 +15067,16 @@ 11733 11816 } 11734 11817 _ACEOF 11735 11818 rm -f conftest.$ac_objext 11736 11819 -if { (eval echo "$as_me:14663: \"$ac_compile\"") >&5 11737 +if { (eval echo "$as_me:150 69: \"$ac_compile\"") >&511820 +if { (eval echo "$as_me:15070: \"$ac_compile\"") >&5 11738 11821 (eval $ac_compile) 2>&5 11739 11822 ac_status=$? 11740 11823 - echo "$as_me:14666: \$? = $ac_status" >&5 11741 + echo "$as_me:1507 2: \$? = $ac_status" >&511824 + echo "$as_me:15073: \$? = $ac_status" >&5 11742 11825 (exit $ac_status); } && 11743 11826 { ac_try='test -s conftest.$ac_objext' 11744 11827 - { (eval echo "$as_me:14669: \"$ac_try\"") >&5 11745 + { (eval echo "$as_me:1507 5: \"$ac_try\"") >&511828 + { (eval echo "$as_me:15076: \"$ac_try\"") >&5 11746 11829 (eval $ac_try) 2>&5 11747 11830 ac_status=$? 11748 11831 - echo "$as_me:14672: \$? = $ac_status" >&5 11749 + echo "$as_me:1507 8: \$? = $ac_status" >&511832 + echo "$as_me:15079: \$? = $ac_status" >&5 11750 11833 (exit $ac_status); }; }; then 11751 11834 cf_cv_header_stdbool_h=1 11752 11835 else 11753 @@ -14683,13 +150 89,13 @@11836 @@ -14683,13 +15090,13 @@ 11754 11837 fi 11755 11838 11756 11839 if test "$cf_cv_header_stdbool_h" = 1 11757 11840 -then echo "$as_me:14686: result: yes" >&5 11758 +then echo "$as_me:1509 2: result: yes" >&511841 +then echo "$as_me:15093: result: yes" >&5 11759 11842 echo "${ECHO_T}yes" >&6 11760 11843 -else echo "$as_me:14688: result: no" >&5 11761 +else echo "$as_me:1509 4: result: no" >&511844 +else echo "$as_me:15095: result: no" >&5 11762 11845 echo "${ECHO_T}no" >&6 11763 11846 fi 11764 11847 11765 11848 -echo "$as_me:14692: checking for builtin bool type" >&5 11766 +echo "$as_me:1509 8: checking for builtin bool type" >&511849 +echo "$as_me:15099: checking for builtin bool type" >&5 11767 11850 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 11768 11851 11769 11852 if test "${cf_cv_cc_bool_type+set}" = set; then 11770 @@ -14697,7 +1510 3,7 @@11853 @@ -14697,7 +15104,7 @@ 11771 11854 else 11772 11855 11773 11856 cat >conftest.$ac_ext <<_ACEOF 11774 11857 -#line 14700 "configure" 11775 +#line 1510 6"configure"11858 +#line 15107 "configure" 11776 11859 #include "confdefs.h" 11777 11860 11778 11861 #include <stdio.h> 11779 @@ -14712,16 +1511 8,16 @@11862 @@ -14712,16 +15119,16 @@ 11780 11863 } 11781 11864 _ACEOF 11782 11865 rm -f conftest.$ac_objext 11783 11866 -if { (eval echo "$as_me:14715: \"$ac_compile\"") >&5 11784 +if { (eval echo "$as_me:1512 1: \"$ac_compile\"") >&511867 +if { (eval echo "$as_me:15122: \"$ac_compile\"") >&5 11785 11868 (eval $ac_compile) 2>&5 11786 11869 ac_status=$? 11787 11870 - echo "$as_me:14718: \$? = $ac_status" >&5 11788 + echo "$as_me:1512 4: \$? = $ac_status" >&511871 + echo "$as_me:15125: \$? = $ac_status" >&5 11789 11872 (exit $ac_status); } && 11790 11873 { ac_try='test -s conftest.$ac_objext' 11791 11874 - { (eval echo "$as_me:14721: \"$ac_try\"") >&5 11792 + { (eval echo "$as_me:1512 7: \"$ac_try\"") >&511875 + { (eval echo "$as_me:15128: \"$ac_try\"") >&5 11793 11876 (eval $ac_try) 2>&5 11794 11877 ac_status=$? 11795 11878 - echo "$as_me:14724: \$? = $ac_status" >&5 11796 + echo "$as_me:1513 0: \$? = $ac_status" >&511879 + echo "$as_me:15131: \$? = $ac_status" >&5 11797 11880 (exit $ac_status); }; }; then 11798 11881 cf_cv_cc_bool_type=1 11799 11882 else 11800 @@ -14734,9 +1514 0,9 @@11883 @@ -14734,9 +15141,9 @@ 11801 11884 fi 11802 11885 11803 11886 if test "$cf_cv_cc_bool_type" = 1 11804 11887 -then echo "$as_me:14737: result: yes" >&5 11805 +then echo "$as_me:1514 3: result: yes" >&511888 +then echo "$as_me:15144: result: yes" >&5 11806 11889 echo "${ECHO_T}yes" >&6 11807 11890 -else echo "$as_me:14739: result: no" >&5 11808 +else echo "$as_me:1514 5: result: no" >&511891 +else echo "$as_me:15146: result: no" >&5 11809 11892 echo "${ECHO_T}no" >&6 11810 11893 fi 11811 11894 11812 @@ -14758,7 +1516 4,7 @@11895 @@ -14758,7 +15165,7 @@ 11813 11896 cf_stdcpp_libname=stdc++ 11814 11897 ;; 11815 11898 esac 11816 11899 -echo "$as_me:14761: checking for library $cf_stdcpp_libname" >&5 11817 +echo "$as_me:1516 7: checking for library $cf_stdcpp_libname" >&511900 +echo "$as_me:15168: checking for library $cf_stdcpp_libname" >&5 11818 11901 echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6 11819 11902 if test "${cf_cv_libstdcpp+set}" = set; then 11820 11903 echo $ECHO_N "(cached) $ECHO_C" >&6 11821 @@ -14767,7 +1517 3,7 @@11904 @@ -14767,7 +15174,7 @@ 11822 11905 cf_save="$LIBS" 11823 11906 LIBS="$LIBS -l$cf_stdcpp_libname" 11824 11907 cat >conftest.$ac_ext <<_ACEOF 11825 11908 -#line 14770 "configure" 11826 +#line 1517 6"configure"11909 +#line 15177 "configure" 11827 11910 #include "confdefs.h" 11828 11911 11829 11912 #include <strstream.h> 11830 @@ -14783,16 +151 89,16 @@11913 @@ -14783,16 +15190,16 @@ 11831 11914 } 11832 11915 _ACEOF 11833 11916 rm -f conftest.$ac_objext conftest$ac_exeext 11834 11917 -if { (eval echo "$as_me:14786: \"$ac_link\"") >&5 11835 +if { (eval echo "$as_me:1519 2: \"$ac_link\"") >&511918 +if { (eval echo "$as_me:15193: \"$ac_link\"") >&5 11836 11919 (eval $ac_link) 2>&5 11837 11920 ac_status=$? 11838 11921 - echo "$as_me:14789: \$? = $ac_status" >&5 11839 + echo "$as_me:1519 5: \$? = $ac_status" >&511922 + echo "$as_me:15196: \$? = $ac_status" >&5 11840 11923 (exit $ac_status); } && 11841 11924 { ac_try='test -s conftest$ac_exeext' 11842 11925 - { (eval echo "$as_me:14792: \"$ac_try\"") >&5 11843 + { (eval echo "$as_me:1519 8: \"$ac_try\"") >&511926 + { (eval echo "$as_me:15199: \"$ac_try\"") >&5 11844 11927 (eval $ac_try) 2>&5 11845 11928 ac_status=$? 11846 11929 - echo "$as_me:14795: \$? = $ac_status" >&5 11847 + echo "$as_me:1520 1: \$? = $ac_status" >&511930 + echo "$as_me:15202: \$? = $ac_status" >&5 11848 11931 (exit $ac_status); }; }; then 11849 11932 cf_cv_libstdcpp=yes 11850 11933 else 11851 @@ -14804,12 +1521 0,12 @@11934 @@ -14804,12 +15211,12 @@ 11852 11935 LIBS="$cf_save" 11853 11936 11854 11937 fi 11855 11938 -echo "$as_me:14807: result: $cf_cv_libstdcpp" >&5 11856 +echo "$as_me:1521 3: result: $cf_cv_libstdcpp" >&511939 +echo "$as_me:15214: result: $cf_cv_libstdcpp" >&5 11857 11940 echo "${ECHO_T}$cf_cv_libstdcpp" >&6 11858 11941 test "$cf_cv_libstdcpp" = yes && CXXLIBS="$CXXLIBS -l$cf_stdcpp_libname" … … 11860 11943 11861 11944 - echo "$as_me:14812: checking whether $CXX understands -c and -o together" >&5 11862 + echo "$as_me:1521 8: checking whether $CXX understands -c and -o together" >&511945 + echo "$as_me:15219: checking whether $CXX understands -c and -o together" >&5 11863 11946 echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6 11864 11947 if test "${cf_cv_prog_CXX_c_o+set}" = set; then 11865 11948 echo $ECHO_N "(cached) $ECHO_C" >&6 11866 @@ -14825,15 +1523 1,15 @@11949 @@ -14825,15 +15232,15 @@ 11867 11950 # We do the test twice because some compilers refuse to overwrite an 11868 11951 # existing .o file with -o, though they will create one. 11869 11952 ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5' 11870 11953 -if { (eval echo "$as_me:14828: \"$ac_try\"") >&5 11871 +if { (eval echo "$as_me:1523 4: \"$ac_try\"") >&511954 +if { (eval echo "$as_me:15235: \"$ac_try\"") >&5 11872 11955 (eval $ac_try) 2>&5 11873 11956 ac_status=$? 11874 11957 - echo "$as_me:14831: \$? = $ac_status" >&5 11875 + echo "$as_me:1523 7: \$? = $ac_status" >&511958 + echo "$as_me:15238: \$? = $ac_status" >&5 11876 11959 (exit $ac_status); } && 11877 11960 - test -f conftest2.$ac_objext && { (eval echo "$as_me:14833: \"$ac_try\"") >&5 11878 + test -f conftest2.$ac_objext && { (eval echo "$as_me:152 39: \"$ac_try\"") >&511961 + test -f conftest2.$ac_objext && { (eval echo "$as_me:15240: \"$ac_try\"") >&5 11879 11962 (eval $ac_try) 2>&5 11880 11963 ac_status=$? 11881 11964 - echo "$as_me:14836: \$? = $ac_status" >&5 11882 + echo "$as_me:1524 2: \$? = $ac_status" >&511965 + echo "$as_me:15243: \$? = $ac_status" >&5 11883 11966 (exit $ac_status); }; 11884 11967 then 11885 11968 eval cf_cv_prog_CXX_c_o=yes 11886 @@ -14844,10 +1525 0,10 @@11969 @@ -14844,10 +15251,10 @@ 11887 11970 11888 11971 fi 11889 11972 if test $cf_cv_prog_CXX_c_o = yes; then 11890 11973 - echo "$as_me:14847: result: yes" >&5 11891 + echo "$as_me:1525 3: result: yes" >&511974 + echo "$as_me:15254: result: yes" >&5 11892 11975 echo "${ECHO_T}yes" >&6 11893 11976 else 11894 11977 - echo "$as_me:14850: result: no" >&5 11895 + echo "$as_me:1525 6: result: no" >&511978 + echo "$as_me:15257: result: no" >&5 11896 11979 echo "${ECHO_T}no" >&6 11897 11980 fi 11898 11981 11899 @@ -14867,12 +1527 3,12 @@11982 @@ -14867,12 +15274,12 @@ 11900 11983 ;; 11901 11984 esac 11902 11985 if test "$GXX" = yes; then 11903 11986 - echo "$as_me:14870: checking for lib$cf_gpp_libname" >&5 11904 + echo "$as_me:1527 6: checking for lib$cf_gpp_libname" >&511987 + echo "$as_me:15277: checking for lib$cf_gpp_libname" >&5 11905 11988 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 11906 11989 cf_save="$LIBS" … … 11908 11991 cat >conftest.$ac_ext <<_ACEOF 11909 11992 -#line 14875 "configure" 11910 +#line 1528 1"configure"11993 +#line 15282 "configure" 11911 11994 #include "confdefs.h" 11912 11995 11913 11996 #include <$cf_gpp_libname/builtin.h> 11914 @@ -14886,16 +1529 2,16 @@11997 @@ -14886,16 +15293,16 @@ 11915 11998 } 11916 11999 _ACEOF 11917 12000 rm -f conftest.$ac_objext conftest$ac_exeext 11918 12001 -if { (eval echo "$as_me:14889: \"$ac_link\"") >&5 11919 +if { (eval echo "$as_me:1529 5: \"$ac_link\"") >&512002 +if { (eval echo "$as_me:15296: \"$ac_link\"") >&5 11920 12003 (eval $ac_link) 2>&5 11921 12004 ac_status=$? 11922 12005 - echo "$as_me:14892: \$? = $ac_status" >&5 11923 + echo "$as_me:1529 8: \$? = $ac_status" >&512006 + echo "$as_me:15299: \$? = $ac_status" >&5 11924 12007 (exit $ac_status); } && 11925 12008 { ac_try='test -s conftest$ac_exeext' 11926 12009 - { (eval echo "$as_me:14895: \"$ac_try\"") >&5 11927 + { (eval echo "$as_me:1530 1: \"$ac_try\"") >&512010 + { (eval echo "$as_me:15302: \"$ac_try\"") >&5 11928 12011 (eval $ac_try) 2>&5 11929 12012 ac_status=$? 11930 12013 - echo "$as_me:14898: \$? = $ac_status" >&5 11931 + echo "$as_me:1530 4: \$? = $ac_status" >&512014 + echo "$as_me:15305: \$? = $ac_status" >&5 11932 12015 (exit $ac_status); }; }; then 11933 12016 cf_cxx_library=yes 11934 12017 CXXLIBS="$CXXLIBS -l$cf_gpp_libname" 11935 @@ -14914,7 +1532 0,7 @@12018 @@ -14914,7 +15321,7 @@ 11936 12019 echo "$as_me: failed program was:" >&5 11937 12020 cat conftest.$ac_ext >&5 11938 12021 cat >conftest.$ac_ext <<_ACEOF 11939 12022 -#line 14917 "configure" 11940 +#line 1532 3"configure"12023 +#line 15324 "configure" 11941 12024 #include "confdefs.h" 11942 12025 11943 12026 #include <builtin.h> 11944 @@ -14928,16 +1533 4,16 @@12027 @@ -14928,16 +15335,16 @@ 11945 12028 } 11946 12029 _ACEOF 11947 12030 rm -f conftest.$ac_objext conftest$ac_exeext 11948 12031 -if { (eval echo "$as_me:14931: \"$ac_link\"") >&5 11949 +if { (eval echo "$as_me:1533 7: \"$ac_link\"") >&512032 +if { (eval echo "$as_me:15338: \"$ac_link\"") >&5 11950 12033 (eval $ac_link) 2>&5 11951 12034 ac_status=$? 11952 12035 - echo "$as_me:14934: \$? = $ac_status" >&5 11953 + echo "$as_me:1534 0: \$? = $ac_status" >&512036 + echo "$as_me:15341: \$? = $ac_status" >&5 11954 12037 (exit $ac_status); } && 11955 12038 { ac_try='test -s conftest$ac_exeext' 11956 12039 - { (eval echo "$as_me:14937: \"$ac_try\"") >&5 11957 + { (eval echo "$as_me:1534 3: \"$ac_try\"") >&512040 + { (eval echo "$as_me:15344: \"$ac_try\"") >&5 11958 12041 (eval $ac_try) 2>&5 11959 12042 ac_status=$? 11960 12043 - echo "$as_me:14940: \$? = $ac_status" >&5 11961 + echo "$as_me:1534 6: \$? = $ac_status" >&512044 + echo "$as_me:15347: \$? = $ac_status" >&5 11962 12045 (exit $ac_status); }; }; then 11963 12046 cf_cxx_library=yes 11964 12047 CXXLIBS="$CXXLIBS -l$cf_gpp_libname" 11965 @@ -14954,7 +1536 0,7 @@12048 @@ -14954,7 +15361,7 @@ 11966 12049 fi 11967 12050 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 11968 12051 LIBS="$cf_save" 11969 12052 - echo "$as_me:14957: result: $cf_cxx_library" >&5 11970 + echo "$as_me:1536 3: result: $cf_cxx_library" >&512053 + echo "$as_me:15364: result: $cf_cxx_library" >&5 11971 12054 echo "${ECHO_T}$cf_cxx_library" >&6 11972 12055 fi 11973 12056 11974 @@ -14970,7 +1537 6,7 @@12057 @@ -14970,7 +15377,7 @@ 11975 12058 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 11976 12059 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 11977 12060 ac_main_return=return 11978 12061 -echo "$as_me:14973: checking how to run the C++ preprocessor" >&5 11979 +echo "$as_me:153 79: checking how to run the C++ preprocessor" >&512062 +echo "$as_me:15380: checking how to run the C++ preprocessor" >&5 11980 12063 echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 11981 12064 if test -z "$CXXCPP"; then 11982 12065 if test "${ac_cv_prog_CXXCPP+set}" = set; then 11983 @@ -14987,18 +1539 3,18 @@12066 @@ -14987,18 +15394,18 @@ 11984 12067 # On the NeXT, cc -E runs the code through the compiler's parser, 11985 12068 # not just through cpp. "Syntax error" is here to catch this case. 11986 12069 cat >conftest.$ac_ext <<_ACEOF 11987 12070 -#line 14990 "configure" 11988 +#line 1539 6"configure"12071 +#line 15397 "configure" 11989 12072 #include "confdefs.h" 11990 12073 #include <assert.h> … … 11992 12075 _ACEOF 11993 12076 -if { (eval echo "$as_me:14995: \"$ac_cpp conftest.$ac_ext\"") >&5 11994 +if { (eval echo "$as_me:1540 1: \"$ac_cpp conftest.$ac_ext\"") >&512077 +if { (eval echo "$as_me:15402: \"$ac_cpp conftest.$ac_ext\"") >&5 11995 12078 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 11996 12079 ac_status=$? … … 11999 12082 cat conftest.err >&5 12000 12083 - echo "$as_me:15001: \$? = $ac_status" >&5 12001 + echo "$as_me:1540 7: \$? = $ac_status" >&512084 + echo "$as_me:15408: \$? = $ac_status" >&5 12002 12085 (exit $ac_status); } >/dev/null; then 12003 12086 if test -s conftest.err; then 12004 12087 ac_cpp_err=$ac_cxx_preproc_warn_flag 12005 @@ -15021,17 +1542 7,17 @@12088 @@ -15021,17 +15428,17 @@ 12006 12089 # OK, works on sane cases. Now check whether non-existent headers 12007 12090 # can be detected and how. 12008 12091 cat >conftest.$ac_ext <<_ACEOF 12009 12092 -#line 15024 "configure" 12010 +#line 1543 0"configure"12093 +#line 15431 "configure" 12011 12094 #include "confdefs.h" 12012 12095 #include <ac_nonexistent.h> 12013 12096 _ACEOF 12014 12097 -if { (eval echo "$as_me:15028: \"$ac_cpp conftest.$ac_ext\"") >&5 12015 +if { (eval echo "$as_me:1543 4: \"$ac_cpp conftest.$ac_ext\"") >&512098 +if { (eval echo "$as_me:15435: \"$ac_cpp conftest.$ac_ext\"") >&5 12016 12099 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 12017 12100 ac_status=$? … … 12020 12103 cat conftest.err >&5 12021 12104 - echo "$as_me:15034: \$? = $ac_status" >&5 12022 + echo "$as_me:1544 0: \$? = $ac_status" >&512105 + echo "$as_me:15441: \$? = $ac_status" >&5 12023 12106 (exit $ac_status); } >/dev/null; then 12024 12107 if test -s conftest.err; then 12025 12108 ac_cpp_err=$ac_cxx_preproc_warn_flag 12026 @@ -15068,7 +1547 4,7 @@12109 @@ -15068,7 +15475,7 @@ 12027 12110 else 12028 12111 ac_cv_prog_CXXCPP=$CXXCPP 12029 12112 fi 12030 12113 -echo "$as_me:15071: result: $CXXCPP" >&5 12031 +echo "$as_me:1547 7: result: $CXXCPP" >&512114 +echo "$as_me:15478: result: $CXXCPP" >&5 12032 12115 echo "${ECHO_T}$CXXCPP" >&6 12033 12116 ac_preproc_ok=false 12034 12117 for ac_cxx_preproc_warn_flag in '' yes 12035 @@ -15078,18 +1548 4,18 @@12118 @@ -15078,18 +15485,18 @@ 12036 12119 # On the NeXT, cc -E runs the code through the compiler's parser, 12037 12120 # not just through cpp. "Syntax error" is here to catch this case. 12038 12121 cat >conftest.$ac_ext <<_ACEOF 12039 12122 -#line 15081 "configure" 12040 +#line 1548 7"configure"12123 +#line 15488 "configure" 12041 12124 #include "confdefs.h" 12042 12125 #include <assert.h> … … 12044 12127 _ACEOF 12045 12128 -if { (eval echo "$as_me:15086: \"$ac_cpp conftest.$ac_ext\"") >&5 12046 +if { (eval echo "$as_me:1549 2: \"$ac_cpp conftest.$ac_ext\"") >&512129 +if { (eval echo "$as_me:15493: \"$ac_cpp conftest.$ac_ext\"") >&5 12047 12130 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 12048 12131 ac_status=$? … … 12051 12134 cat conftest.err >&5 12052 12135 - echo "$as_me:15092: \$? = $ac_status" >&5 12053 + echo "$as_me:1549 8: \$? = $ac_status" >&512136 + echo "$as_me:15499: \$? = $ac_status" >&5 12054 12137 (exit $ac_status); } >/dev/null; then 12055 12138 if test -s conftest.err; then 12056 12139 ac_cpp_err=$ac_cxx_preproc_warn_flag 12057 @@ -15112,17 +1551 8,17 @@12140 @@ -15112,17 +15519,17 @@ 12058 12141 # OK, works on sane cases. Now check whether non-existent headers 12059 12142 # can be detected and how. 12060 12143 cat >conftest.$ac_ext <<_ACEOF 12061 12144 -#line 15115 "configure" 12062 +#line 1552 1"configure"12145 +#line 15522 "configure" 12063 12146 #include "confdefs.h" 12064 12147 #include <ac_nonexistent.h> 12065 12148 _ACEOF 12066 12149 -if { (eval echo "$as_me:15119: \"$ac_cpp conftest.$ac_ext\"") >&5 12067 +if { (eval echo "$as_me:1552 5: \"$ac_cpp conftest.$ac_ext\"") >&512150 +if { (eval echo "$as_me:15526: \"$ac_cpp conftest.$ac_ext\"") >&5 12068 12151 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 12069 12152 ac_status=$? … … 12072 12155 cat conftest.err >&5 12073 12156 - echo "$as_me:15125: \$? = $ac_status" >&5 12074 + echo "$as_me:1553 1: \$? = $ac_status" >&512157 + echo "$as_me:15532: \$? = $ac_status" >&5 12075 12158 (exit $ac_status); } >/dev/null; then 12076 12159 if test -s conftest.err; then 12077 12160 ac_cpp_err=$ac_cxx_preproc_warn_flag 12078 @@ -15150,7 +1555 6,7 @@12161 @@ -15150,7 +15557,7 @@ 12079 12162 if $ac_preproc_ok; then 12080 12163 : 12081 12164 else 12082 12165 - { { echo "$as_me:15153: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 12083 + { { echo "$as_me:155 59: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&512166 + { { echo "$as_me:15560: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 12084 12167 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} 12085 12168 { (exit 1); exit 1; }; } 12086 12169 fi 12087 @@ -15165,23 +1557 1,23 @@12170 @@ -15165,23 +15572,23 @@ 12088 12171 for ac_header in iostream typeinfo 12089 12172 do 12090 12173 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 12091 12174 -echo "$as_me:15168: checking for $ac_header" >&5 12092 +echo "$as_me:1557 4: checking for $ac_header" >&512175 +echo "$as_me:15575: checking for $ac_header" >&5 12093 12176 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 12094 12177 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 12097 12180 cat >conftest.$ac_ext <<_ACEOF 12098 12181 -#line 15174 "configure" 12099 +#line 1558 0"configure"12182 +#line 15581 "configure" 12100 12183 #include "confdefs.h" 12101 12184 #include <$ac_header> 12102 12185 _ACEOF 12103 12186 -if { (eval echo "$as_me:15178: \"$ac_cpp conftest.$ac_ext\"") >&5 12104 +if { (eval echo "$as_me:1558 4: \"$ac_cpp conftest.$ac_ext\"") >&512187 +if { (eval echo "$as_me:15585: \"$ac_cpp conftest.$ac_ext\"") >&5 12105 12188 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 12106 12189 ac_status=$? … … 12109 12192 cat conftest.err >&5 12110 12193 - echo "$as_me:15184: \$? = $ac_status" >&5 12111 + echo "$as_me:1559 0: \$? = $ac_status" >&512194 + echo "$as_me:15591: \$? = $ac_status" >&5 12112 12195 (exit $ac_status); } >/dev/null; then 12113 12196 if test -s conftest.err; then 12114 12197 ac_cpp_err=$ac_cxx_preproc_warn_flag 12115 @@ -15200,7 +1560 6,7 @@12198 @@ -15200,7 +15607,7 @@ 12116 12199 fi 12117 12200 rm -f conftest.err conftest.$ac_ext 12118 12201 fi 12119 12202 -echo "$as_me:15203: result: `eval echo '${'$as_ac_Header'}'`" >&5 12120 +echo "$as_me:156 09: result: `eval echo '${'$as_ac_Header'}'`" >&512203 +echo "$as_me:15610: result: `eval echo '${'$as_ac_Header'}'`" >&5 12121 12204 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 12122 12205 if test `eval echo '${'$as_ac_Header'}'` = yes; then 12123 12206 cat >>confdefs.h <<EOF 12124 @@ -15211,10 +1561 7,10 @@12207 @@ -15211,10 +15618,10 @@ 12125 12208 done 12126 12209 12127 12210 if test x"$ac_cv_header_iostream" = xyes ; then 12128 12211 - echo "$as_me:15214: checking if iostream uses std-namespace" >&5 12129 + echo "$as_me:1562 0: checking if iostream uses std-namespace" >&512212 + echo "$as_me:15621: checking if iostream uses std-namespace" >&5 12130 12213 echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6 12131 12214 cat >conftest.$ac_ext <<_ACEOF 12132 12215 -#line 15217 "configure" 12133 +#line 1562 3"configure"12216 +#line 15624 "configure" 12134 12217 #include "confdefs.h" 12135 12218 12136 12219 #include <iostream> 12137 @@ -15231,16 +1563 7,16 @@12220 @@ -15231,16 +15638,16 @@ 12138 12221 } 12139 12222 _ACEOF 12140 12223 rm -f conftest.$ac_objext 12141 12224 -if { (eval echo "$as_me:15234: \"$ac_compile\"") >&5 12142 +if { (eval echo "$as_me:1564 0: \"$ac_compile\"") >&512225 +if { (eval echo "$as_me:15641: \"$ac_compile\"") >&5 12143 12226 (eval $ac_compile) 2>&5 12144 12227 ac_status=$? 12145 12228 - echo "$as_me:15237: \$? = $ac_status" >&5 12146 + echo "$as_me:1564 3: \$? = $ac_status" >&512229 + echo "$as_me:15644: \$? = $ac_status" >&5 12147 12230 (exit $ac_status); } && 12148 12231 { ac_try='test -s conftest.$ac_objext' 12149 12232 - { (eval echo "$as_me:15240: \"$ac_try\"") >&5 12150 + { (eval echo "$as_me:1564 6: \"$ac_try\"") >&512233 + { (eval echo "$as_me:15647: \"$ac_try\"") >&5 12151 12234 (eval $ac_try) 2>&5 12152 12235 ac_status=$? 12153 12236 - echo "$as_me:15243: \$? = $ac_status" >&5 12154 + echo "$as_me:156 49: \$? = $ac_status" >&512237 + echo "$as_me:15650: \$? = $ac_status" >&5 12155 12238 (exit $ac_status); }; }; then 12156 12239 cf_iostream_namespace=yes 12157 12240 else 12158 @@ -15249,7 +1565 5,7 @@12241 @@ -15249,7 +15656,7 @@ 12159 12242 cf_iostream_namespace=no 12160 12243 fi 12161 12244 rm -f conftest.$ac_objext conftest.$ac_ext 12162 12245 - echo "$as_me:15252: result: $cf_iostream_namespace" >&5 12163 + echo "$as_me:1565 8: result: $cf_iostream_namespace" >&512246 + echo "$as_me:15659: result: $cf_iostream_namespace" >&5 12164 12247 echo "${ECHO_T}$cf_iostream_namespace" >&6 12165 12248 if test "$cf_iostream_namespace" = yes ; then 12166 12249 cat >>confdefs.h <<\EOF 12167 @@ -15259,7 +1566 5,7 @@12250 @@ -15259,7 +15666,7 @@ 12168 12251 fi 12169 12252 fi 12170 12253 12171 12254 -echo "$as_me:15262: checking if we should include stdbool.h" >&5 12172 +echo "$as_me:1566 8: checking if we should include stdbool.h" >&512255 +echo "$as_me:15669: checking if we should include stdbool.h" >&5 12173 12256 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 12174 12257 12175 12258 if test "${cf_cv_header_stdbool_h+set}" = set; then 12176 @@ -15267,7 +1567 3,7 @@12259 @@ -15267,7 +15674,7 @@ 12177 12260 else 12178 12261 12179 12262 cat >conftest.$ac_ext <<_ACEOF 12180 12263 -#line 15270 "configure" 12181 +#line 1567 6"configure"12264 +#line 15677 "configure" 12182 12265 #include "confdefs.h" 12183 12266 12184 12267 int 12185 @@ -15279,23 +1568 5,23 @@12268 @@ -15279,23 +15686,23 @@ 12186 12269 } 12187 12270 _ACEOF 12188 12271 rm -f conftest.$ac_objext 12189 12272 -if { (eval echo "$as_me:15282: \"$ac_compile\"") >&5 12190 +if { (eval echo "$as_me:1568 8: \"$ac_compile\"") >&512273 +if { (eval echo "$as_me:15689: \"$ac_compile\"") >&5 12191 12274 (eval $ac_compile) 2>&5 12192 12275 ac_status=$? 12193 12276 - echo "$as_me:15285: \$? = $ac_status" >&5 12194 + echo "$as_me:1569 1: \$? = $ac_status" >&512277 + echo "$as_me:15692: \$? = $ac_status" >&5 12195 12278 (exit $ac_status); } && 12196 12279 { ac_try='test -s conftest.$ac_objext' 12197 12280 - { (eval echo "$as_me:15288: \"$ac_try\"") >&5 12198 + { (eval echo "$as_me:1569 4: \"$ac_try\"") >&512281 + { (eval echo "$as_me:15695: \"$ac_try\"") >&5 12199 12282 (eval $ac_try) 2>&5 12200 12283 ac_status=$? 12201 12284 - echo "$as_me:15291: \$? = $ac_status" >&5 12202 + echo "$as_me:1569 7: \$? = $ac_status" >&512285 + echo "$as_me:15698: \$? = $ac_status" >&5 12203 12286 (exit $ac_status); }; }; then 12204 12287 cf_cv_header_stdbool_h=0 … … 12208 12291 cat >conftest.$ac_ext <<_ACEOF 12209 12292 -#line 15298 "configure" 12210 +#line 1570 4"configure"12293 +#line 15705 "configure" 12211 12294 #include "confdefs.h" 12212 12295 12213 12296 #ifndef __BEOS__ 12214 @@ -15311,16 +1571 7,16 @@12297 @@ -15311,16 +15718,16 @@ 12215 12298 } 12216 12299 _ACEOF 12217 12300 rm -f conftest.$ac_objext 12218 12301 -if { (eval echo "$as_me:15314: \"$ac_compile\"") >&5 12219 +if { (eval echo "$as_me:1572 0: \"$ac_compile\"") >&512302 +if { (eval echo "$as_me:15721: \"$ac_compile\"") >&5 12220 12303 (eval $ac_compile) 2>&5 12221 12304 ac_status=$? 12222 12305 - echo "$as_me:15317: \$? = $ac_status" >&5 12223 + echo "$as_me:1572 3: \$? = $ac_status" >&512306 + echo "$as_me:15724: \$? = $ac_status" >&5 12224 12307 (exit $ac_status); } && 12225 12308 { ac_try='test -s conftest.$ac_objext' 12226 12309 - { (eval echo "$as_me:15320: \"$ac_try\"") >&5 12227 + { (eval echo "$as_me:1572 6: \"$ac_try\"") >&512310 + { (eval echo "$as_me:15727: \"$ac_try\"") >&5 12228 12311 (eval $ac_try) 2>&5 12229 12312 ac_status=$? 12230 12313 - echo "$as_me:15323: \$? = $ac_status" >&5 12231 + echo "$as_me:157 29: \$? = $ac_status" >&512314 + echo "$as_me:15730: \$? = $ac_status" >&5 12232 12315 (exit $ac_status); }; }; then 12233 12316 cf_cv_header_stdbool_h=1 12234 12317 else 12235 @@ -15334,13 +1574 0,13 @@12318 @@ -15334,13 +15741,13 @@ 12236 12319 fi 12237 12320 12238 12321 if test "$cf_cv_header_stdbool_h" = 1 12239 12322 -then echo "$as_me:15337: result: yes" >&5 12240 +then echo "$as_me:1574 3: result: yes" >&512323 +then echo "$as_me:15744: result: yes" >&5 12241 12324 echo "${ECHO_T}yes" >&6 12242 12325 -else echo "$as_me:15339: result: no" >&5 12243 +else echo "$as_me:1574 5: result: no" >&512326 +else echo "$as_me:15746: result: no" >&5 12244 12327 echo "${ECHO_T}no" >&6 12245 12328 fi 12246 12329 12247 12330 -echo "$as_me:15343: checking for builtin bool type" >&5 12248 +echo "$as_me:157 49: checking for builtin bool type" >&512331 +echo "$as_me:15750: checking for builtin bool type" >&5 12249 12332 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 12250 12333 12251 12334 if test "${cf_cv_builtin_bool+set}" = set; then 12252 @@ -15348,7 +1575 4,7 @@12335 @@ -15348,7 +15755,7 @@ 12253 12336 else 12254 12337 12255 12338 cat >conftest.$ac_ext <<_ACEOF 12256 12339 -#line 15351 "configure" 12257 +#line 1575 7"configure"12340 +#line 15758 "configure" 12258 12341 #include "confdefs.h" 12259 12342 12260 12343 #include <stdio.h> 12261 @@ -15363,16 +157 69,16 @@12344 @@ -15363,16 +15770,16 @@ 12262 12345 } 12263 12346 _ACEOF 12264 12347 rm -f conftest.$ac_objext 12265 12348 -if { (eval echo "$as_me:15366: \"$ac_compile\"") >&5 12266 +if { (eval echo "$as_me:1577 2: \"$ac_compile\"") >&512349 +if { (eval echo "$as_me:15773: \"$ac_compile\"") >&5 12267 12350 (eval $ac_compile) 2>&5 12268 12351 ac_status=$? 12269 12352 - echo "$as_me:15369: \$? = $ac_status" >&5 12270 + echo "$as_me:1577 5: \$? = $ac_status" >&512353 + echo "$as_me:15776: \$? = $ac_status" >&5 12271 12354 (exit $ac_status); } && 12272 12355 { ac_try='test -s conftest.$ac_objext' 12273 12356 - { (eval echo "$as_me:15372: \"$ac_try\"") >&5 12274 + { (eval echo "$as_me:1577 8: \"$ac_try\"") >&512357 + { (eval echo "$as_me:15779: \"$ac_try\"") >&5 12275 12358 (eval $ac_try) 2>&5 12276 12359 ac_status=$? 12277 12360 - echo "$as_me:15375: \$? = $ac_status" >&5 12278 + echo "$as_me:1578 1: \$? = $ac_status" >&512361 + echo "$as_me:15782: \$? = $ac_status" >&5 12279 12362 (exit $ac_status); }; }; then 12280 12363 cf_cv_builtin_bool=1 12281 12364 else 12282 @@ -15385,13 +1579 1,13 @@12365 @@ -15385,13 +15792,13 @@ 12283 12366 fi 12284 12367 12285 12368 if test "$cf_cv_builtin_bool" = 1 12286 12369 -then echo "$as_me:15388: result: yes" >&5 12287 +then echo "$as_me:1579 4: result: yes" >&512370 +then echo "$as_me:15795: result: yes" >&5 12288 12371 echo "${ECHO_T}yes" >&6 12289 12372 -else echo "$as_me:15390: result: no" >&5 12290 +else echo "$as_me:1579 6: result: no" >&512373 +else echo "$as_me:15797: result: no" >&5 12291 12374 echo "${ECHO_T}no" >&6 12292 12375 fi 12293 12376 12294 12377 -echo "$as_me:15394: checking for size of bool" >&5 12295 +echo "$as_me:1580 0: checking for size of bool" >&512378 +echo "$as_me:15801: checking for size of bool" >&5 12296 12379 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 12297 12380 if test "${cf_cv_type_of_bool+set}" = set; then 12298 12381 echo $ECHO_N "(cached) $ECHO_C" >&6 12299 @@ -15402,7 +1580 8,7 @@12382 @@ -15402,7 +15809,7 @@ 12300 12383 cf_cv_type_of_bool=unknown 12301 12384 else 12302 12385 cat >conftest.$ac_ext <<_ACEOF 12303 12386 -#line 15405 "configure" 12304 +#line 1581 1"configure"12387 +#line 15812 "configure" 12305 12388 #include "confdefs.h" 12306 12389 12307 12390 #include <stdlib.h> 12308 @@ -15444,15 +1585 0,15 @@12391 @@ -15444,15 +15851,15 @@ 12309 12392 12310 12393 _ACEOF 12311 12394 rm -f conftest$ac_exeext 12312 12395 -if { (eval echo "$as_me:15447: \"$ac_link\"") >&5 12313 +if { (eval echo "$as_me:1585 3: \"$ac_link\"") >&512396 +if { (eval echo "$as_me:15854: \"$ac_link\"") >&5 12314 12397 (eval $ac_link) 2>&5 12315 12398 ac_status=$? 12316 12399 - echo "$as_me:15450: \$? = $ac_status" >&5 12317 + echo "$as_me:1585 6: \$? = $ac_status" >&512400 + echo "$as_me:15857: \$? = $ac_status" >&5 12318 12401 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 12319 12402 - { (eval echo "$as_me:15452: \"$ac_try\"") >&5 12320 + { (eval echo "$as_me:1585 8: \"$ac_try\"") >&512403 + { (eval echo "$as_me:15859: \"$ac_try\"") >&5 12321 12404 (eval $ac_try) 2>&5 12322 12405 ac_status=$? 12323 12406 - echo "$as_me:15455: \$? = $ac_status" >&5 12324 + echo "$as_me:1586 1: \$? = $ac_status" >&512407 + echo "$as_me:15862: \$? = $ac_status" >&5 12325 12408 (exit $ac_status); }; }; then 12326 12409 cf_cv_type_of_bool=`cat cf_test.out` 12327 12410 if test -z "$cf_cv_type_of_bool"; then 12328 @@ -15470,18 +1587 6,18 @@12411 @@ -15470,18 +15877,18 @@ 12329 12412 fi 12330 12413 12331 12414 rm -f cf_test.out 12332 12415 -echo "$as_me:15473: result: $cf_cv_type_of_bool" >&5 12333 +echo "$as_me:158 79: result: $cf_cv_type_of_bool" >&512416 +echo "$as_me:15880: result: $cf_cv_type_of_bool" >&5 12334 12417 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 12335 12418 if test "$cf_cv_type_of_bool" = unknown ; then … … 12338 12421 esac 12339 12422 - { echo "$as_me:15479: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 12340 + { echo "$as_me:1588 5: WARNING: Assuming $NCURSES_BOOL for type of bool" >&512423 + { echo "$as_me:15886: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 12341 12424 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} 12342 12425 cf_cv_type_of_bool=$NCURSES_BOOL … … 12344 12427 12345 12428 -echo "$as_me:15484: checking for special defines needed for etip.h" >&5 12346 +echo "$as_me:1589 0: checking for special defines needed for etip.h" >&512429 +echo "$as_me:15891: checking for special defines needed for etip.h" >&5 12347 12430 echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6 12348 12431 cf_save_CXXFLAGS="$CXXFLAGS" 12349 12432 cf_result="none" 12350 @@ -15493,7 +15 899,7 @@12433 @@ -15493,7 +15900,7 @@ 12351 12434 test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" 12352 12435 test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" 12353 12436 cat >conftest.$ac_ext <<_ACEOF 12354 12437 -#line 15496 "configure" 12355 +#line 1590 2"configure"12438 +#line 15903 "configure" 12356 12439 #include "confdefs.h" 12357 12440 12358 12441 #include <etip.h.in> 12359 @@ -15507,16 +1591 3,16 @@12442 @@ -15507,16 +15914,16 @@ 12360 12443 } 12361 12444 _ACEOF 12362 12445 rm -f conftest.$ac_objext 12363 12446 -if { (eval echo "$as_me:15510: \"$ac_compile\"") >&5 12364 +if { (eval echo "$as_me:1591 6: \"$ac_compile\"") >&512447 +if { (eval echo "$as_me:15917: \"$ac_compile\"") >&5 12365 12448 (eval $ac_compile) 2>&5 12366 12449 ac_status=$? 12367 12450 - echo "$as_me:15513: \$? = $ac_status" >&5 12368 + echo "$as_me:159 19: \$? = $ac_status" >&512451 + echo "$as_me:15920: \$? = $ac_status" >&5 12369 12452 (exit $ac_status); } && 12370 12453 { ac_try='test -s conftest.$ac_objext' 12371 12454 - { (eval echo "$as_me:15516: \"$ac_try\"") >&5 12372 + { (eval echo "$as_me:1592 2: \"$ac_try\"") >&512455 + { (eval echo "$as_me:15923: \"$ac_try\"") >&5 12373 12456 (eval $ac_try) 2>&5 12374 12457 ac_status=$? 12375 12458 - echo "$as_me:15519: \$? = $ac_status" >&5 12376 + echo "$as_me:1592 5: \$? = $ac_status" >&512459 + echo "$as_me:15926: \$? = $ac_status" >&5 12377 12460 (exit $ac_status); }; }; then 12378 12461 12379 12462 test -n "$cf_math" && cat >>confdefs.h <<EOF 12380 @@ -15537,12 +1594 3,12 @@12463 @@ -15537,12 +15944,12 @@ 12381 12464 rm -f conftest.$ac_objext conftest.$ac_ext 12382 12465 done 12383 12466 done 12384 12467 -echo "$as_me:15540: result: $cf_result" >&5 12385 +echo "$as_me:1594 6: result: $cf_result" >&512468 +echo "$as_me:15947: result: $cf_result" >&5 12386 12469 echo "${ECHO_T}$cf_result" >&6 12387 12470 CXXFLAGS="$cf_save_CXXFLAGS" … … 12389 12472 if test -n "$CXX"; then 12390 12473 -echo "$as_me:15545: checking if $CXX accepts parameter initialization" >&5 12391 +echo "$as_me:1595 1: checking if $CXX accepts parameter initialization" >&512474 +echo "$as_me:15952: checking if $CXX accepts parameter initialization" >&5 12392 12475 echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6 12393 12476 if test "${cf_cv_cpp_param_init+set}" = set; then 12394 12477 echo $ECHO_N "(cached) $ECHO_C" >&6 12395 @@ -15559,7 +1596 5,7 @@12478 @@ -15559,7 +15966,7 @@ 12396 12479 cf_cv_cpp_param_init=unknown 12397 12480 else 12398 12481 cat >conftest.$ac_ext <<_ACEOF 12399 12482 -#line 15562 "configure" 12400 +#line 1596 8"configure"12483 +#line 15969 "configure" 12401 12484 #include "confdefs.h" 12402 12485 12403 12486 class TEST { 12404 @@ -15578,15 +1598 4,15 @@12487 @@ -15578,15 +15985,15 @@ 12405 12488 12406 12489 _ACEOF 12407 12490 rm -f conftest$ac_exeext 12408 12491 -if { (eval echo "$as_me:15581: \"$ac_link\"") >&5 12409 +if { (eval echo "$as_me:1598 7: \"$ac_link\"") >&512492 +if { (eval echo "$as_me:15988: \"$ac_link\"") >&5 12410 12493 (eval $ac_link) 2>&5 12411 12494 ac_status=$? 12412 12495 - echo "$as_me:15584: \$? = $ac_status" >&5 12413 + echo "$as_me:1599 0: \$? = $ac_status" >&512496 + echo "$as_me:15991: \$? = $ac_status" >&5 12414 12497 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 12415 12498 - { (eval echo "$as_me:15586: \"$ac_try\"") >&5 12416 + { (eval echo "$as_me:1599 2: \"$ac_try\"") >&512499 + { (eval echo "$as_me:15993: \"$ac_try\"") >&5 12417 12500 (eval $ac_try) 2>&5 12418 12501 ac_status=$? 12419 12502 - echo "$as_me:15589: \$? = $ac_status" >&5 12420 + echo "$as_me:1599 5: \$? = $ac_status" >&512503 + echo "$as_me:15996: \$? = $ac_status" >&5 12421 12504 (exit $ac_status); }; }; then 12422 12505 cf_cv_cpp_param_init=yes 12423 12506 else 12424 @@ -15605,7 +1601 1,7 @@12507 @@ -15605,7 +16012,7 @@ 12425 12508 ac_main_return=return 12426 12509 12427 12510 fi 12428 12511 -echo "$as_me:15608: result: $cf_cv_cpp_param_init" >&5 12429 +echo "$as_me:1601 4: result: $cf_cv_cpp_param_init" >&512512 +echo "$as_me:16015: result: $cf_cv_cpp_param_init" >&5 12430 12513 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 12431 12514 fi 12432 12515 test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF 12433 @@ -15614,7 +1602 0,7 @@12516 @@ -15614,7 +16021,7 @@ 12434 12517 12435 12518 if test -n "$CXX"; then 12436 12519 12437 12520 -echo "$as_me:15617: checking if $CXX accepts static_cast" >&5 12438 +echo "$as_me:1602 3: checking if $CXX accepts static_cast" >&512521 +echo "$as_me:16024: checking if $CXX accepts static_cast" >&5 12439 12522 echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6 12440 12523 if test "${cf_cv_cpp_static_cast+set}" = set; then 12441 12524 echo $ECHO_N "(cached) $ECHO_C" >&6 12442 @@ -15628,7 +1603 4,7 @@12525 @@ -15628,7 +16035,7 @@ 12443 12526 ac_main_return=return 12444 12527 12445 12528 cat >conftest.$ac_ext <<_ACEOF 12446 12529 -#line 15631 "configure" 12447 +#line 1603 7"configure"12530 +#line 16038 "configure" 12448 12531 #include "confdefs.h" 12449 12532 12450 12533 class NCursesPanel 12451 @@ -15672,16 +1607 8,16 @@12534 @@ -15672,16 +16079,16 @@ 12452 12535 } 12453 12536 _ACEOF 12454 12537 rm -f conftest.$ac_objext 12455 12538 -if { (eval echo "$as_me:15675: \"$ac_compile\"") >&5 12456 +if { (eval echo "$as_me:1608 1: \"$ac_compile\"") >&512539 +if { (eval echo "$as_me:16082: \"$ac_compile\"") >&5 12457 12540 (eval $ac_compile) 2>&5 12458 12541 ac_status=$? 12459 12542 - echo "$as_me:15678: \$? = $ac_status" >&5 12460 + echo "$as_me:1608 4: \$? = $ac_status" >&512543 + echo "$as_me:16085: \$? = $ac_status" >&5 12461 12544 (exit $ac_status); } && 12462 12545 { ac_try='test -s conftest.$ac_objext' 12463 12546 - { (eval echo "$as_me:15681: \"$ac_try\"") >&5 12464 + { (eval echo "$as_me:1608 7: \"$ac_try\"") >&512547 + { (eval echo "$as_me:16088: \"$ac_try\"") >&5 12465 12548 (eval $ac_try) 2>&5 12466 12549 ac_status=$? 12467 12550 - echo "$as_me:15684: \$? = $ac_status" >&5 12468 + echo "$as_me:1609 0: \$? = $ac_status" >&512551 + echo "$as_me:16091: \$? = $ac_status" >&5 12469 12552 (exit $ac_status); }; }; then 12470 12553 cf_cv_cpp_static_cast=yes 12471 12554 else 12472 @@ -15699,7 +1610 5,7 @@12555 @@ -15699,7 +16106,7 @@ 12473 12556 ac_main_return=return 12474 12557 12475 12558 fi 12476 12559 -echo "$as_me:15702: result: $cf_cv_cpp_static_cast" >&5 12477 +echo "$as_me:1610 8: result: $cf_cv_cpp_static_cast" >&512560 +echo "$as_me:16109: result: $cf_cv_cpp_static_cast" >&5 12478 12561 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 12479 12562 12480 12563 fi 12481 @@ -15709,12 +1611 5,12 @@12564 @@ -15709,12 +16116,12 @@ 12482 12565 EOF 12483 12566 … … 12494 12577 ;; 12495 12578 sco3.2v5*) #(vi 12496 @@ -15723,7 +161 29,7 @@12579 @@ -15723,7 +16130,7 @@ 12497 12580 solaris2*) 12498 12581 if test "$GXX" != yes ; then … … 12503 12586 ;; 12504 12587 esac 12505 @@ -15747,7 +1615 3,7 @@12588 @@ -15747,7 +16154,7 @@ 12506 12589 else 12507 12590 if test "$cf_cv_header_stdbool_h" = 1 ; then 12508 12591 12509 12592 -echo "$as_me:15750: checking for size of bool" >&5 12510 +echo "$as_me:1615 6: checking for size of bool" >&512593 +echo "$as_me:16157: checking for size of bool" >&5 12511 12594 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 12512 12595 if test "${cf_cv_type_of_bool+set}" = set; then 12513 12596 echo $ECHO_N "(cached) $ECHO_C" >&6 12514 @@ -15758,7 +1616 4,7 @@12597 @@ -15758,7 +16165,7 @@ 12515 12598 cf_cv_type_of_bool=unknown 12516 12599 else 12517 12600 cat >conftest.$ac_ext <<_ACEOF 12518 12601 -#line 15761 "configure" 12519 +#line 1616 7"configure"12602 +#line 16168 "configure" 12520 12603 #include "confdefs.h" 12521 12604 12522 12605 #include <stdlib.h> 12523 @@ -15800,15 +1620 6,15 @@12606 @@ -15800,15 +16207,15 @@ 12524 12607 12525 12608 _ACEOF 12526 12609 rm -f conftest$ac_exeext 12527 12610 -if { (eval echo "$as_me:15803: \"$ac_link\"") >&5 12528 +if { (eval echo "$as_me:162 09: \"$ac_link\"") >&512611 +if { (eval echo "$as_me:16210: \"$ac_link\"") >&5 12529 12612 (eval $ac_link) 2>&5 12530 12613 ac_status=$? 12531 12614 - echo "$as_me:15806: \$? = $ac_status" >&5 12532 + echo "$as_me:1621 2: \$? = $ac_status" >&512615 + echo "$as_me:16213: \$? = $ac_status" >&5 12533 12616 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 12534 12617 - { (eval echo "$as_me:15808: \"$ac_try\"") >&5 12535 + { (eval echo "$as_me:1621 4: \"$ac_try\"") >&512618 + { (eval echo "$as_me:16215: \"$ac_try\"") >&5 12536 12619 (eval $ac_try) 2>&5 12537 12620 ac_status=$? 12538 12621 - echo "$as_me:15811: \$? = $ac_status" >&5 12539 + echo "$as_me:1621 7: \$? = $ac_status" >&512622 + echo "$as_me:16218: \$? = $ac_status" >&5 12540 12623 (exit $ac_status); }; }; then 12541 12624 cf_cv_type_of_bool=`cat cf_test.out` 12542 12625 if test -z "$cf_cv_type_of_bool"; then 12543 @@ -15826,25 +1623 2,25 @@12626 @@ -15826,25 +16233,25 @@ 12544 12627 fi 12545 12628 12546 12629 rm -f cf_test.out 12547 12630 -echo "$as_me:15829: result: $cf_cv_type_of_bool" >&5 12548 +echo "$as_me:1623 5: result: $cf_cv_type_of_bool" >&512631 +echo "$as_me:16236: result: $cf_cv_type_of_bool" >&5 12549 12632 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 12550 12633 if test "$cf_cv_type_of_bool" = unknown ; then … … 12553 12636 esac 12554 12637 - { echo "$as_me:15835: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 12555 + { echo "$as_me:1624 1: WARNING: Assuming $NCURSES_BOOL for type of bool" >&512638 + { echo "$as_me:16242: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 12556 12639 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} 12557 12640 cf_cv_type_of_bool=$NCURSES_BOOL … … 12560 12643 else 12561 12644 - echo "$as_me:15841: checking for fallback type of bool" >&5 12562 + echo "$as_me:1624 7: checking for fallback type of bool" >&512645 + echo "$as_me:16248: checking for fallback type of bool" >&5 12563 12646 echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6 12564 12647 case "$host_cpu" in #(vi … … 12567 12650 esac 12568 12651 - echo "$as_me:15847: result: $cf_cv_type_of_bool" >&5 12569 + echo "$as_me:1625 3: result: $cf_cv_type_of_bool" >&512652 + echo "$as_me:16254: result: $cf_cv_type_of_bool" >&5 12570 12653 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 12571 12654 fi 12572 12655 fi 12573 @@ -15873,7 +162 79,7 @@12656 @@ -15873,7 +16280,7 @@ 12574 12657 12575 12658 if test "$cf_with_ada" != "no" ; then 12576 12659 if test "$with_libtool" != "no"; then 12577 12660 - { echo "$as_me:15876: WARNING: libtool does not support Ada - disabling feature" >&5 12578 + { echo "$as_me:1628 2: WARNING: libtool does not support Ada - disabling feature" >&512661 + { echo "$as_me:16283: WARNING: libtool does not support Ada - disabling feature" >&5 12579 12662 echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} 12580 12663 cf_with_ada=no 12581 12664 fi 12582 @@ -15883,7 +162 89,7 @@12665 @@ -15883,7 +16290,7 @@ 12583 12666 cf_ada_make=gnatmake 12584 12667 # Extract the first word of "$cf_ada_make", so it can be a program name with args. 12585 12668 set dummy $cf_ada_make; ac_word=$2 12586 12669 -echo "$as_me:15886: checking for $ac_word" >&5 12587 +echo "$as_me:1629 2: checking for $ac_word" >&512670 +echo "$as_me:16293: checking for $ac_word" >&5 12588 12671 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 12589 12672 if test "${ac_cv_prog_gnat_exists+set}" = set; then 12590 12673 echo $ECHO_N "(cached) $ECHO_C" >&6 12591 @@ -15898,7 +1630 4,7 @@12674 @@ -15898,7 +16305,7 @@ 12592 12675 test -z "$ac_dir" && ac_dir=. 12593 12676 $as_executable_p "$ac_dir/$ac_word" || continue 12594 12677 ac_cv_prog_gnat_exists="yes" 12595 12678 -echo "$as_me:15901: found $ac_dir/$ac_word" >&5 12596 +echo "$as_me:1630 7: found $ac_dir/$ac_word" >&512679 +echo "$as_me:16308: found $ac_dir/$ac_word" >&5 12597 12680 break 12598 12681 done 12599 12682 12600 @@ -15907,10 +1631 3,10 @@12683 @@ -15907,10 +16314,10 @@ 12601 12684 fi 12602 12685 gnat_exists=$ac_cv_prog_gnat_exists 12603 12686 if test -n "$gnat_exists"; then 12604 12687 - echo "$as_me:15910: result: $gnat_exists" >&5 12605 + echo "$as_me:1631 6: result: $gnat_exists" >&512688 + echo "$as_me:16317: result: $gnat_exists" >&5 12606 12689 echo "${ECHO_T}$gnat_exists" >&6 12607 12690 else 12608 12691 - echo "$as_me:15913: result: no" >&5 12609 + echo "$as_me:163 19: result: no" >&512692 + echo "$as_me:16320: result: no" >&5 12610 12693 echo "${ECHO_T}no" >&6 12611 12694 fi 12612 12695 12613 @@ -15918,11 +1632 4,11 @@12696 @@ -15918,11 +16325,11 @@ 12614 12697 cf_ada_make= 12615 12698 else 12616 12699 12617 12700 -echo "$as_me:15921: checking for gnat version" >&5 12618 +echo "$as_me:1632 7: checking for gnat version" >&512701 +echo "$as_me:16328: checking for gnat version" >&5 12619 12702 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 12620 12703 cf_gnat_version=`${cf_ada_make-gnatmake} -v 2>&1 | grep '[0-9].[0-9][0-9]*' |\ 12621 12704 sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` 12622 12705 -echo "$as_me:15925: result: $cf_gnat_version" >&5 12623 +echo "$as_me:1633 1: result: $cf_gnat_version" >&512706 +echo "$as_me:16332: result: $cf_gnat_version" >&5 12624 12707 echo "${ECHO_T}$cf_gnat_version" >&6 12625 12708 12626 12709 case $cf_gnat_version in 12627 @@ -15945,7 +1635 1,7 @@12710 @@ -15945,7 +16352,7 @@ 12628 12711 12629 12712 # Extract the first word of "m4", so it can be a program name with args. 12630 12713 set dummy m4; ac_word=$2 12631 12714 -echo "$as_me:15948: checking for $ac_word" >&5 12632 +echo "$as_me:1635 4: checking for $ac_word" >&512715 +echo "$as_me:16355: checking for $ac_word" >&5 12633 12716 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 12634 12717 if test "${ac_cv_prog_M4_exists+set}" = set; then 12635 12718 echo $ECHO_N "(cached) $ECHO_C" >&6 12636 @@ -15960,7 +1636 6,7 @@12719 @@ -15960,7 +16367,7 @@ 12637 12720 test -z "$ac_dir" && ac_dir=. 12638 12721 $as_executable_p "$ac_dir/$ac_word" || continue 12639 12722 ac_cv_prog_M4_exists="yes" 12640 12723 -echo "$as_me:15963: found $ac_dir/$ac_word" >&5 12641 +echo "$as_me:163 69: found $ac_dir/$ac_word" >&512724 +echo "$as_me:16370: found $ac_dir/$ac_word" >&5 12642 12725 break 12643 12726 done 12644 12727 12645 @@ -15969,10 +1637 5,10 @@12728 @@ -15969,10 +16376,10 @@ 12646 12729 fi 12647 12730 M4_exists=$ac_cv_prog_M4_exists 12648 12731 if test -n "$M4_exists"; then 12649 12732 - echo "$as_me:15972: result: $M4_exists" >&5 12650 + echo "$as_me:1637 8: result: $M4_exists" >&512733 + echo "$as_me:16379: result: $M4_exists" >&5 12651 12734 echo "${ECHO_T}$M4_exists" >&6 12652 12735 else 12653 12736 - echo "$as_me:15975: result: no" >&5 12654 + echo "$as_me:1638 1: result: no" >&512737 + echo "$as_me:16382: result: no" >&5 12655 12738 echo "${ECHO_T}no" >&6 12656 12739 fi 12657 12740 12658 @@ -15981,7 +1638 7,7 @@12741 @@ -15981,7 +16388,7 @@ 12659 12742 echo Ada95 binding required program m4 not found. Ada95 binding disabled. 12660 12743 fi 12661 12744 if test "$cf_cv_prog_gnat_correct" = yes; then 12662 12745 - echo "$as_me:15984: checking if GNAT works" >&5 12663 + echo "$as_me:1639 0: checking if GNAT works" >&512746 + echo "$as_me:16391: checking if GNAT works" >&5 12664 12747 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 12665 12748 12666 12749 rm -f conftest* 12667 @@ -16009,14 +1641 5,14 @@12750 @@ -16009,14 +16416,14 @@ 12668 12751 fi 12669 12752 rm -f conftest* 12670 12753 12671 12754 - echo "$as_me:16012: result: $cf_cv_prog_gnat_correct" >&5 12672 + echo "$as_me:1641 8: result: $cf_cv_prog_gnat_correct" >&512755 + echo "$as_me:16419: result: $cf_cv_prog_gnat_correct" >&5 12673 12756 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 12674 12757 fi … … 12678 12761 12679 12762 - echo "$as_me:16019: checking if GNAT pragma Unreferenced works" >&5 12680 + echo "$as_me:1642 5: checking if GNAT pragma Unreferenced works" >&512763 + echo "$as_me:16426: checking if GNAT pragma Unreferenced works" >&5 12681 12764 echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6 12682 12765 12683 12766 rm -f conftest* 12684 @@ -16043,7 +164 49,7 @@12767 @@ -16043,7 +16450,7 @@ 12685 12768 fi 12686 12769 rm -f conftest* 12687 12770 12688 12771 - echo "$as_me:16046: result: $cf_cv_pragma_unreferenced" >&5 12689 + echo "$as_me:1645 2: result: $cf_cv_pragma_unreferenced" >&512772 + echo "$as_me:16453: result: $cf_cv_pragma_unreferenced" >&5 12690 12773 echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6 12691 12774 12692 12775 # if the pragma is supported, use it (needed in the Trace code). 12693 @@ -16096,7 +1650 2,7 @@12776 @@ -16096,7 +16503,7 @@ 12694 12777 withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` 12695 12778 ;; 12696 12779 *) 12697 12780 - { { echo "$as_me:16099: error: expected a pathname, not \"$withval\"" >&5 12698 + { { echo "$as_me:1650 5: error: expected a pathname, not \"$withval\"" >&512781 + { { echo "$as_me:16506: error: expected a pathname, not \"$withval\"" >&5 12699 12782 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} 12700 12783 { (exit 1); exit 1; }; } 12701 12784 ;; 12702 @@ -16138,7 +1654 4,7 @@12785 @@ -16138,7 +16545,7 @@ 12703 12786 withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` 12704 12787 ;; 12705 12788 *) 12706 12789 - { { echo "$as_me:16141: error: expected a pathname, not \"$withval\"" >&5 12707 + { { echo "$as_me:1654 7: error: expected a pathname, not \"$withval\"" >&512790 + { { echo "$as_me:16548: error: expected a pathname, not \"$withval\"" >&5 12708 12791 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} 12709 12792 { (exit 1); exit 1; }; } 12710 12793 ;; 12711 @@ -16163,7 +165 69,7 @@12794 @@ -16163,7 +16570,7 @@ 12712 12795 ### chooses to split module lists into libraries. 12713 12796 ### 12714 12797 ### (see CF_LIB_RULES). 12715 12798 -echo "$as_me:16166: checking for library subsets" >&5 12716 +echo "$as_me:1657 2: checking for library subsets" >&512799 +echo "$as_me:16573: checking for library subsets" >&5 12717 12800 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 12718 12801 LIB_SUBSETS= 12719 12802 12720 @@ -16176,7 +1658 2,17 @@12803 @@ -16176,7 +16583,17 @@ 12721 12804 fi 12722 12805 fi … … 12737 12820 if test "$with_termlib" != no ; then 12738 12821 LIB_SUBSETS="${LIB_SUBSETS} " 12739 @@ -16185,17 +1660 1,18 @@12822 @@ -16185,17 +16602,18 @@ 12740 12823 fi 12741 12824 … … 12746 12829 12747 12830 -echo "$as_me:16191: result: $LIB_SUBSETS" >&5 12748 +echo "$as_me:1660 8: result: $LIB_SUBSETS" >&512831 +echo "$as_me:16609: result: $LIB_SUBSETS" >&5 12749 12832 echo "${ECHO_T}$LIB_SUBSETS" >&6 12750 12833 … … 12759 12842 if test "$GCC" != yes; then 12760 12843 CPPFLAGS="$CPPFLAGS -I\${includedir}" 12761 @@ -16226,7 +1664 3,7 @@12844 @@ -16226,7 +16644,7 @@ 12762 12845 fi 12763 12846 12764 12847 ### Build up pieces for makefile rules 12765 12848 -echo "$as_me:16229: checking default library suffix" >&5 12766 +echo "$as_me:1664 6: checking default library suffix" >&512849 +echo "$as_me:16647: checking default library suffix" >&5 12767 12850 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 12768 12851 12769 12852 case $DFT_LWR_MODEL in 12770 @@ -16237,46 +1665 4,50 @@12853 @@ -16237,46 +16655,50 @@ 12771 12854 shared) DFT_ARG_SUFFIX='' ;; 12772 12855 esac 12773 12856 test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" 12774 12857 -echo "$as_me:16240: result: $DFT_ARG_SUFFIX" >&5 12775 +echo "$as_me:1665 7: result: $DFT_ARG_SUFFIX" >&512858 +echo "$as_me:16658: result: $DFT_ARG_SUFFIX" >&5 12776 12859 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 12777 12860 12778 12861 -echo "$as_me:16243: checking default library-dependency suffix" >&5 12779 +echo "$as_me:1666 0: checking default library-dependency suffix" >&512862 +echo "$as_me:16661: checking default library-dependency suffix" >&5 12780 12863 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 12781 12864 … … 12832 12915 DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX 12833 12916 ;; 12834 @@ -16289,10 +1671 0,10 @@12917 @@ -16289,10 +16711,10 @@ 12835 12918 esac 12836 12919 test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}" 12837 12920 test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}" 12838 12921 -echo "$as_me:16292: result: $DFT_DEP_SUFFIX" >&5 12839 +echo "$as_me:1671 3: result: $DFT_DEP_SUFFIX" >&512922 +echo "$as_me:16714: result: $DFT_DEP_SUFFIX" >&5 12840 12923 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 12841 12924 12842 12925 -echo "$as_me:16295: checking default object directory" >&5 12843 +echo "$as_me:1671 6: checking default object directory" >&512926 +echo "$as_me:16717: checking default object directory" >&5 12844 12927 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 12845 12928 12846 12929 case $DFT_LWR_MODEL in 12847 @@ -16308,51 +167 29,55 @@12930 @@ -16308,51 +16730,55 @@ 12848 12931 DFT_OBJ_SUBDIR='obj_s' ;; 12849 12932 esac 12850 12933 esac 12851 12934 -echo "$as_me:16311: result: $DFT_OBJ_SUBDIR" >&5 12852 +echo "$as_me:1673 2: result: $DFT_OBJ_SUBDIR" >&512935 +echo "$as_me:16733: result: $DFT_OBJ_SUBDIR" >&5 12853 12936 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 12854 12937 … … 12856 12939 if test "$cf_with_cxx" = yes ; then 12857 12940 -echo "$as_me:16316: checking c++ library-dependency suffix" >&5 12858 +echo "$as_me:1673 7: checking c++ library-dependency suffix" >&512941 +echo "$as_me:16738: checking c++ library-dependency suffix" >&5 12859 12942 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 12860 12943 if test "$with_libtool" != "no"; then … … 12914 12997 CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX 12915 12998 ;; 12916 @@ -16366,7 +1679 1,7 @@12999 @@ -16366,7 +16792,7 @@ 12917 13000 test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}" 12918 13001 test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}" 12919 13002 fi 12920 13003 -echo "$as_me:16369: result: $CXX_LIB_SUFFIX" >&5 12921 +echo "$as_me:1679 4: result: $CXX_LIB_SUFFIX" >&513004 +echo "$as_me:16795: result: $CXX_LIB_SUFFIX" >&5 12922 13005 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 12923 13006 12924 13007 fi 12925 @@ -16431,6 +1685 6,8 @@13008 @@ -16431,6 +16857,8 @@ 12926 13009 TEST_ARGS="${TEST_DEPS}" 12927 13010 TEST_ARG2="${TEST_DEP2}" … … 12932 13015 TEST_ARGS="-l${TINFO_ARG_SUFFIX}" 12933 13016 TEST_ARG2="-l${TINFO_ARG_SUFFIX}" 12934 @@ -16480,7 +1690 7,7 @@13017 @@ -16480,7 +16908,7 @@ 12935 13018 12936 13019 if test "$GCC" = yes ; then 12937 13020 case $cf_cv_system_name in #( 12938 13021 - OS/2*|os2*|aix[45]*) #( vi 12939 + OS/2*|os2*|aix[4]*|solaris2.1[0-9] ) #( vi13022 + OS/2*|os2*|aix[4]*|solaris2.1[0-9]|darwin*) #( vi 12940 13023 LDFLAGS_STATIC= 12941 13024 LDFLAGS_SHARED= 12942 13025 ;; 12943 @@ -16491,7 +1691 8,7 @@13026 @@ -16491,7 +16919,7 @@ 12944 13027 esac 12945 13028 else … … 12950 13033 LDFLAGS_SHARED=-bdynamic 12951 13034 ;; 12952 @@ -16519,12 +1694 6,12 @@13035 @@ -16519,12 +16947,12 @@ 12953 13036 ;; 12954 13037 esac 12955 13038 12956 13039 -echo "$as_me:16522: checking where we will install curses.h" >&5 12957 +echo "$as_me:169 49: checking where we will install curses.h" >&513040 +echo "$as_me:16950: checking where we will install curses.h" >&5 12958 13041 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 12959 13042 test "$with_overwrite" = no && \ … … 12961 13044 includedir='${prefix}/include/ncurses'${LIB_SUFFIX} 12962 13045 -echo "$as_me:16527: result: $includedir" >&5 12963 +echo "$as_me:1695 4: result: $includedir" >&513046 +echo "$as_me:16955: result: $includedir" >&5 12964 13047 echo "${ECHO_T}$includedir" >&6 12965 13048 12966 13049 ### Resolve a conflict between normal and wide-curses by forcing applications 12967 @@ -16532,10 +169 59,11 @@13050 @@ -16532,10 +16960,11 @@ 12968 13051 if test "$with_overwrite" != no ; then 12969 13052 if test "$NCURSES_LIBUTF8" = 1 ; then 12970 13053 NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' 12971 13054 - { echo "$as_me:16535: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 12972 + { echo "$as_me:1696 2: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&513055 + { echo "$as_me:16963: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 12973 13056 echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;} 12974 13057 fi … … 12978 13061 # used to separate tack out of the tree 12979 13062 NCURSES_TREE= 12980 @@ -16548,7 +1697 6,7 @@13063 @@ -16548,7 +16977,7 @@ 12981 13064 ### Construct the list of subdirectories for which we'll customize makefiles 12982 13065 ### with the appropriate compile-rules. 12983 13066 12984 13067 -echo "$as_me:16551: checking for src modules" >&5 12985 +echo "$as_me:169 79: checking for src modules" >&513068 +echo "$as_me:16980: checking for src modules" >&5 12986 13069 echo $ECHO_N "checking for src modules... $ECHO_C" >&6 12987 13070 12988 13071 # dependencies and linker-arguments for test-programs 12989 @@ -16611,13 +170 39,17 @@13072 @@ -16611,13 +17040,17 @@ 12990 13073 fi 12991 13074 fi 12992 13075 done 12993 13076 -echo "$as_me:16614: result: $cf_cv_src_modules" >&5 12994 +echo "$as_me:1704 2: result: $cf_cv_src_modules" >&513077 +echo "$as_me:17043: result: $cf_cv_src_modules" >&5 12995 13078 echo "${ECHO_T}$cf_cv_src_modules" >&6 12996 13079 … … 13007 13090 do 13008 13091 SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir" 13009 @@ -16628,8 +1706 0,8 @@13092 @@ -16628,8 +17061,8 @@ 13010 13093 13011 13094 ADA_SUBDIRS= … … 13018 13101 13019 13102 SUB_MAKEFILES= 13020 @@ -16639,15 +1707 1,15 @@13103 @@ -16639,15 +17072,15 @@ 13021 13104 done 13022 13105 … … 13039 13122 13040 13123 DIRS_TO_MAKE="lib" 13041 @@ -16680,7 +1711 2,7 @@13124 @@ -16680,7 +17113,7 @@ 13042 13125 done 13043 13126 … … 13048 13131 13049 13132 cat >>confdefs.h <<EOF 13050 @@ -16749,7 +1718 1,7 @@13133 @@ -16749,7 +17182,7 @@ 13051 13134 13052 13135 if test -n "$cf_new_cppflags" ; then … … 13057 13140 13058 13141 if test -n "$cf_new_extra_cppflags" ; then 13059 @@ -16760,18 +1719 2,18 @@13142 @@ -16760,18 +17193,18 @@ 13060 13143 ### If we're building with rpath, try to link non-standard libs that way too. 13061 13144 if test "$DFT_LWR_MODEL" = "shared"; then 13062 13145 13063 13146 -echo "$as_me:16763: checking for updated LDFLAGS" >&5 13064 +echo "$as_me:1719 5: checking for updated LDFLAGS" >&513147 +echo "$as_me:17196: checking for updated LDFLAGS" >&5 13065 13148 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6 13066 13149 if test -n "$LDFLAGS" ; then 13067 13150 -echo "$as_me:16766: result: maybe" >&5 13068 +echo "$as_me:1719 8: result: maybe" >&513151 +echo "$as_me:17199: result: maybe" >&5 13069 13152 echo "${ECHO_T}maybe" >&6 13070 13153 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 13071 13154 13072 13155 -echo "${as_me-configure}:16770: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 13073 +echo "${as_me-configure}:1720 2: testing ...checking LDFLAGS $LDFLAGS ..." 1>&513156 +echo "${as_me-configure}:17203: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 13074 13157 13075 13158 test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 13076 13159 13077 13160 -echo "${as_me-configure}:16774: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 13078 +echo "${as_me-configure}:1720 6: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&513161 +echo "${as_me-configure}:17207: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 13079 13162 13080 13163 case "$EXTRA_LDFLAGS" in #(vi 13081 13164 -Wl,-rpath,*) #(vi 13082 @@ -16793,7 +1722 5,7 @@13165 @@ -16793,7 +17226,7 @@ 13083 13166 do 13084 13167 test -n "$verbose" && echo " Filtering $cf_rpath_src" 1>&6 13085 13168 13086 13169 -echo "${as_me-configure}:16796: testing Filtering $cf_rpath_src ..." 1>&5 13087 +echo "${as_me-configure}:1722 8: testing Filtering $cf_rpath_src ..." 1>&513170 +echo "${as_me-configure}:17229: testing Filtering $cf_rpath_src ..." 1>&5 13088 13171 13089 13172 case $cf_rpath_src in #(vi 13090 13173 -L*) #(vi 13091 @@ -16804,7 +1723 6,7 @@13174 @@ -16804,7 +17237,7 @@ 13092 13175 fi 13093 13176 test -n "$verbose" && echo " ...Filter $cf_rpath_tmp" 1>&6 13094 13177 13095 13178 -echo "${as_me-configure}:16807: testing ...Filter $cf_rpath_tmp ..." 1>&5 13096 +echo "${as_me-configure}:172 39: testing ...Filter $cf_rpath_tmp ..." 1>&513179 +echo "${as_me-configure}:17240: testing ...Filter $cf_rpath_tmp ..." 1>&5 13097 13180 13098 13181 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" 13099 13182 ;; 13100 @@ -16814,15 +1724 6,15 @@13183 @@ -16814,15 +17247,15 @@ 13101 13184 LDFLAGS=$cf_rpath_dst 13102 13185 test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 13103 13186 13104 13187 -echo "${as_me-configure}:16817: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 13105 +echo "${as_me-configure}:172 49: testing ...checked LDFLAGS $LDFLAGS ..." 1>&513188 +echo "${as_me-configure}:17250: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 13106 13189 13107 13190 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 13108 13191 13109 13192 -echo "${as_me-configure}:16821: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 13110 +echo "${as_me-configure}:1725 3: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&513193 +echo "${as_me-configure}:17254: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 13111 13194 13112 13195 fi 13113 13196 else 13114 13197 -echo "$as_me:16825: result: no" >&5 13115 +echo "$as_me:1725 7: result: no" >&513198 +echo "$as_me:17258: result: no" >&5 13116 13199 echo "${ECHO_T}no" >&6 13117 13200 fi 13118 13201 13119 @@ -16849,8 +1728 1,18 @@13202 @@ -16849,8 +17282,18 @@ 13120 13203 fi 13121 13204 … … 13137 13220 ac_config_commands="$ac_config_commands default" 13138 13221 cat >confcache <<\_ACEOF 13139 @@ -16932,7 +1737 4,7 @@13222 @@ -16932,7 +17375,7 @@ 13140 13223 : ${CONFIG_STATUS=./config.status} 13141 13224 ac_clean_files_save=$ac_clean_files 13142 13225 ac_clean_files="$ac_clean_files $CONFIG_STATUS" 13143 13226 -{ echo "$as_me:16935: creating $CONFIG_STATUS" >&5 13144 +{ echo "$as_me:1737 7: creating $CONFIG_STATUS" >&513227 +{ echo "$as_me:17378: creating $CONFIG_STATUS" >&5 13145 13228 echo "$as_me: creating $CONFIG_STATUS" >&6;} 13146 13229 cat >$CONFIG_STATUS <<_ACEOF 13147 13230 #! $SHELL 13148 @@ -17064,7 +1750 6,7 @@13231 @@ -17064,7 +17507,7 @@ 13149 13232 cat >>$CONFIG_STATUS <<EOF 13150 13233 ac_cs_version="\\ … … 13155 13238 13156 13239 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 13157 @@ -17108,7 +1755 0,7 @@13240 @@ -17108,7 +17551,7 @@ 13158 13241 echo "$ac_cs_version"; exit 0 ;; 13159 13242 --he | --h) 13160 13243 # Conflict between --help and --header 13161 13244 - { { echo "$as_me:17111: error: ambiguous option: $1 13162 + { { echo "$as_me:1755 3: error: ambiguous option: $113245 + { { echo "$as_me:17554: error: ambiguous option: $1 13163 13246 Try \`$0 --help' for more information." >&5 13164 13247 echo "$as_me: error: ambiguous option: $1 13165 13248 Try \`$0 --help' for more information." >&2;} 13166 @@ -17127,7 +175 69,7 @@13249 @@ -17127,7 +17570,7 @@ 13167 13250 ac_need_defaults=false;; 13168 13251 13169 13252 # This is an error. 13170 13253 - -*) { { echo "$as_me:17130: error: unrecognized option: $1 13171 + -*) { { echo "$as_me:1757 2: error: unrecognized option: $113254 + -*) { { echo "$as_me:17573: error: unrecognized option: $1 13172 13255 Try \`$0 --help' for more information." >&5 13173 13256 echo "$as_me: error: unrecognized option: $1 13174 13257 Try \`$0 --help' for more information." >&2;} 13175 @@ -17146,7 +1758 8,7 @@13258 @@ -17146,7 +17589,7 @@ 13176 13259 ## Running config.status. ## 13177 13260 ## ----------------------- ## … … 13182 13265 CONFIG_HEADERS = $CONFIG_HEADERS 13183 13266 CONFIG_LINKS = $CONFIG_LINKS 13184 @@ -17181,13 +1762 3,13 @@13267 @@ -17181,13 +17624,13 @@ 13185 13268 NCURSES_PATCH="$NCURSES_PATCH" 13186 13269 SRC_SUBDIRS="$SRC_SUBDIRS" … … 13199 13282 WITH_ECHO="$with_echo" 13200 13283 WITH_OVERWRITE="$with_overwrite" 13201 @@ -17206,6 +1764 8,7 @@13284 @@ -17206,6 +17649,7 @@ 13202 13285 cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix" 13203 13286 cf_cv_system_name="$cf_cv_system_name" … … 13207 13290 target="$target" 13208 13291 13209 @@ -17224,7 +1766 7,7 @@13292 @@ -17224,7 +17668,7 @@ 13210 13293 "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; 13211 13294 "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; 13212 13295 "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; 13213 13296 - *) { { echo "$as_me:17227: error: invalid argument: $ac_config_target" >&5 13214 + *) { { echo "$as_me:1767 0: error: invalid argument: $ac_config_target" >&513297 + *) { { echo "$as_me:17671: error: invalid argument: $ac_config_target" >&5 13215 13298 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} 13216 13299 { (exit 1); exit 1; }; };; 13217 13300 esac 13218 @@ -17349,6 +1779 2,8 @@13301 @@ -17349,6 +17793,8 @@ 13219 13302 s,@LINT@,$LINT,;t t 13220 13303 s,@LINT_OPTS@,$LINT_OPTS,;t t … … 13225 13308 s,@MAKE_LOWER_TAGS@,$MAKE_LOWER_TAGS,;t t 13226 13309 s,@MAKE_UPPER_TAGS@,$MAKE_UPPER_TAGS,;t t 13227 @@ -17359,7 +1780 4,7 @@13310 @@ -17359,7 +17805,7 @@ 13228 13311 s,@ac_ct_LD@,$ac_ct_LD,;t t 13229 13312 s,@AR@,$AR,;t t … … 13234 13317 s,@BUILD_CC@,$BUILD_CC,;t t 13235 13318 s,@BUILD_CPP@,$BUILD_CPP,;t t 13236 @@ -17392,6 +17837,7 @@ 13319 @@ -17371,6 +17817,7 @@ 13320 s,@BUILD_OBJEXT@,$BUILD_OBJEXT,;t t 13321 s,@cf_list_models@,$cf_list_models,;t t 13322 s,@LIBTOOL@,$LIBTOOL,;t t 13323 +s,@LT_UNDEF@,$LT_UNDEF,;t t 13324 s,@LIBTOOL_CXX@,$LIBTOOL_CXX,;t t 13325 s,@LIBTOOL_OPTS@,$LIBTOOL_OPTS,;t t 13326 s,@LIB_CREATE@,$LIB_CREATE,;t t 13327 @@ -17392,6 +17839,7 @@ 13237 13328 s,@CXX_G_OPT@,$CXX_G_OPT,;t t 13238 13329 s,@LD_MODEL@,$LD_MODEL,;t t … … 13242 13333 s,@MK_SHARED_LIB@,$MK_SHARED_LIB,;t t 13243 13334 s,@LINK_PROGS@,$LINK_PROGS,;t t 13244 @@ -17401,7 +1784 7,6 @@13335 @@ -17401,7 +17849,6 @@ 13245 13336 s,@LOCAL_LDFLAGS2@,$LOCAL_LDFLAGS2,;t t 13246 13337 s,@INSTALL_LIB@,$INSTALL_LIB,;t t … … 13250 13341 s,@WHICH_XTERM@,$WHICH_XTERM,;t t 13251 13342 s,@TERMINFO_DIRS@,$TERMINFO_DIRS,;t t 13252 @@ -17425,6 +1787 0,9 @@13343 @@ -17425,6 +17872,9 @@ 13253 13344 s,@NCURSES_OSPEED@,$NCURSES_OSPEED,;t t 13254 13345 s,@MANPAGE_RENAMES@,$MANPAGE_RENAMES,;t t … … 13260 13351 s,@NCURSES_EXT_COLORS@,$NCURSES_EXT_COLORS,;t t 13261 13352 s,@NCURSES_MOUSE_VERSION@,$NCURSES_MOUSE_VERSION,;t t 13262 @@ -17435,6 +1788 3,7 @@13353 @@ -17435,6 +17885,7 @@ 13263 13354 s,@cf_cv_enable_opaque@,$cf_cv_enable_opaque,;t t 13264 13355 s,@NCURSES_OPAQUE@,$NCURSES_OPAQUE,;t t … … 13268 13359 s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t 13269 13360 s,@EXTRA_CXXFLAGS@,$EXTRA_CXXFLAGS,;t t 13270 @@ -17449,7 +17 898,7 @@13361 @@ -17449,7 +17900,7 @@ 13271 13362 s,@CXXCPP@,$CXXCPP,;t t 13272 13363 s,@CXXLDFLAGS@,$CXXLDFLAGS,;t t … … 13277 13368 s,@USE_CXX_BOOL@,$USE_CXX_BOOL,;t t 13278 13369 s,@gnat_exists@,$gnat_exists,;t t 13279 @@ -17493,6 +1794 2,7 @@13370 @@ -17493,6 +17944,7 @@ 13280 13371 s,@HAVE_TCGETATTR@,$HAVE_TCGETATTR,;t t 13281 13372 s,@HAVE_TERMIO_H@,$HAVE_TERMIO_H,;t t … … 13285 13376 13286 13377 EOF 13287 @@ -17607,7 +1805 7,7 @@13378 @@ -17607,7 +18059,7 @@ 13288 13379 esac 13289 13380 13290 13381 if test x"$ac_file" != x-; then 13291 13382 - { echo "$as_me:17610: creating $ac_file" >&5 13292 + { echo "$as_me:1806 0: creating $ac_file" >&513383 + { echo "$as_me:18062: creating $ac_file" >&5 13293 13384 echo "$as_me: creating $ac_file" >&6;} 13294 13385 rm -f "$ac_file" 13295 13386 fi 13296 @@ -17625,7 +1807 5,7 @@13387 @@ -17625,7 +18077,7 @@ 13297 13388 -) echo $tmp/stdin ;; 13298 13389 [\\/$]*) 13299 13390 # Absolute (can't be DOS-style, as IFS=:) 13300 13391 - test -f "$f" || { { echo "$as_me:17628: error: cannot find input file: $f" >&5 13301 + test -f "$f" || { { echo "$as_me:180 78: error: cannot find input file: $f" >&513392 + test -f "$f" || { { echo "$as_me:18080: error: cannot find input file: $f" >&5 13302 13393 echo "$as_me: error: cannot find input file: $f" >&2;} 13303 13394 { (exit 1); exit 1; }; } 13304 13395 echo $f;; 13305 @@ -17638,7 +180 88,7 @@13396 @@ -17638,7 +18090,7 @@ 13306 13397 echo $srcdir/$f 13307 13398 else 13308 13399 # /dev/null tree 13309 13400 - { { echo "$as_me:17641: error: cannot find input file: $f" >&5 13310 + { { echo "$as_me:1809 1: error: cannot find input file: $f" >&513401 + { { echo "$as_me:18093: error: cannot find input file: $f" >&5 13311 13402 echo "$as_me: error: cannot find input file: $f" >&2;} 13312 13403 { (exit 1); exit 1; }; } 13313 13404 fi;; 13314 @@ -17704,7 +1815 4,7 @@13405 @@ -17704,7 +18156,7 @@ 13315 13406 * ) ac_file_in=$ac_file.in ;; 13316 13407 esac 13317 13408 13318 13409 - test x"$ac_file" != x- && { echo "$as_me:17707: creating $ac_file" >&5 13319 + test x"$ac_file" != x- && { echo "$as_me:1815 7: creating $ac_file" >&513410 + test x"$ac_file" != x- && { echo "$as_me:18159: creating $ac_file" >&5 13320 13411 echo "$as_me: creating $ac_file" >&6;} 13321 13412 13322 13413 # First look for the input files in the build tree, otherwise in the 13323 @@ -17715,7 +1816 5,7 @@13414 @@ -17715,7 +18167,7 @@ 13324 13415 -) echo $tmp/stdin ;; 13325 13416 [\\/$]*) 13326 13417 # Absolute (can't be DOS-style, as IFS=:) 13327 13418 - test -f "$f" || { { echo "$as_me:17718: error: cannot find input file: $f" >&5 13328 + test -f "$f" || { { echo "$as_me:181 68: error: cannot find input file: $f" >&513419 + test -f "$f" || { { echo "$as_me:18170: error: cannot find input file: $f" >&5 13329 13420 echo "$as_me: error: cannot find input file: $f" >&2;} 13330 13421 { (exit 1); exit 1; }; } 13331 13422 echo $f;; 13332 @@ -17728,7 +181 78,7 @@13423 @@ -17728,7 +18180,7 @@ 13333 13424 echo $srcdir/$f 13334 13425 else 13335 13426 # /dev/null tree 13336 13427 - { { echo "$as_me:17731: error: cannot find input file: $f" >&5 13337 + { { echo "$as_me:1818 1: error: cannot find input file: $f" >&513428 + { { echo "$as_me:18183: error: cannot find input file: $f" >&5 13338 13429 echo "$as_me: error: cannot find input file: $f" >&2;} 13339 13430 { (exit 1); exit 1; }; } 13340 13431 fi;; 13341 @@ -17786,7 +1823 6,7 @@13432 @@ -17786,7 +18238,7 @@ 13342 13433 rm -f $tmp/in 13343 13434 if test x"$ac_file" != x-; then 13344 13435 if cmp -s $ac_file $tmp/config.h 2>/dev/null; then 13345 13436 - { echo "$as_me:17789: $ac_file is unchanged" >&5 13346 + { echo "$as_me:182 39: $ac_file is unchanged" >&513437 + { echo "$as_me:18241: $ac_file is unchanged" >&5 13347 13438 echo "$as_me: $ac_file is unchanged" >&6;} 13348 13439 else 13349 13440 ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 13350 @@ -17873,40 +1832 3,44 @@13441 @@ -17873,40 +18325,44 @@ 13351 13442 for cf_item in $cf_LIST_MODELS 13352 13443 do … … 13404 13495 cf_depsuf=$cf_suffix 13405 13496 ;; 13406 @@ -18020,40 +1847 4,44 @@13497 @@ -18020,40 +18476,44 @@ 13407 13498 13408 13499 cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` … … 13460 13551 cf_depsuf=$cf_suffix 13461 13552 ;; 13462 @@ -18234,18 +1869 2,28 @@13553 @@ -18234,18 +18694,28 @@ 13463 13554 install.libs uninstall.libs \\ 13464 13555 install.data uninstall.data :: … … 13489 13580 if test -f $srcdir/$tack.h; then 13490 13581 cat >> Makefile <<CF_EOF 13491 @@ -18256,6 +1872 4,7 @@13582 @@ -18256,6 +18726,7 @@ 13492 13583 CF_EOF 13493 13584 fi … … 13499 13590 diff -Naur ncurses-5.7.orig/configure.in ncurses-5.7/configure.in 13500 13591 --- ncurses-5.7.orig/configure.in 2008-10-18 07:53:32.000000000 -0700 13501 +++ ncurses-5.7/configure.in 2009-0 3-22 21:17:11.636377985-070013592 +++ ncurses-5.7/configure.in 2009-06-05 14:01:30.000000000 -0700 13502 13593 @@ -1,5 +1,5 @@ 13503 13594 dnl*************************************************************************** … … 13512 13603 dnl 13513 13604 -dnl $Id: configure.in,v 1.454 2008/10/18 14:53:32 tom Exp $ 13514 +dnl $Id: configure.in,v 1.4 69 2009/03/21 21:45:29 Charles.Wilson Exp $13605 +dnl $Id: configure.in,v 1.470 2009/03/28 18:22:39 Charles.Wilson Exp $ 13515 13606 dnl Process this file with autoconf to produce a configure script. 13516 13607 dnl … … 13520 13611 AC_PREREQ(2.13.20020210) 13521 13612 -AC_REVISION($Revision: 1.454 $) 13522 +AC_REVISION($Revision: 1.4 69$)13613 +AC_REVISION($Revision: 1.470 $) 13523 13614 AC_INIT(ncurses/base/lib_initscr.c) 13524 13615 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) … … 13641 13732 13642 13733 +### Allow using a different wrap-prefix 13643 +if test "$cf_cv_enable_reentrant" != 0 ; then13734 +if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then 13644 13735 + AC_MSG_CHECKING(for prefix used to wrap public variables) 13645 13736 + AC_ARG_WITH(wrap-prefix, … … 13814 13905 diff -Naur ncurses-5.7.orig/dist.mk ncurses-5.7/dist.mk 13815 13906 --- ncurses-5.7.orig/dist.mk 2008-11-01 17:58:38.000000000 -0700 13816 +++ ncurses-5.7/dist.mk 2009-0 3-22 21:17:11.636377985-070013907 +++ ncurses-5.7/dist.mk 2009-06-05 14:01:55.000000000 -0700 13817 13908 @@ -25,7 +25,7 @@ 13818 13909 # use or other dealings in this Software without prior written # … … 13820 13911 ############################################################################## 13821 13912 -# $Id: dist.mk,v 1.671 2008/11/02 00:58:38 tom Exp $ 13822 +# $Id: dist.mk,v 1. 690 2009/03/21 18:31:13tom Exp $13913 +# $Id: dist.mk,v 1.702 2009/05/30 13:36:52 tom Exp $ 13823 13914 # Makefile for creating ncurses distributions. 13824 13915 # … … 13829 13920 NCURSES_MINOR = 7 13830 13921 -NCURSES_PATCH = 20081102 13831 +NCURSES_PATCH = 20090 32113922 +NCURSES_PATCH = 20090530 13832 13923 13833 13924 # We don't append the patch to the version, since this only applies to releases … … 13835 13926 diff -Naur ncurses-5.7.orig/form/fld_def.c ncurses-5.7/form/fld_def.c 13836 13927 --- ncurses-5.7.orig/form/fld_def.c 2007-10-13 12:29:58.000000000 -0700 13837 +++ ncurses-5.7/form/fld_def.c 2009-0 3-22 21:17:08.396170694-070013928 +++ ncurses-5.7/form/fld_def.c 2009-06-05 14:01:18.000000000 -0700 13838 13929 @@ -32,7 +32,7 @@ 13839 13930 … … 13855 13946 13856 13947 /*--------------------------------------------------------------------------- 13948 diff -Naur ncurses-5.7.orig/form/fld_newftyp.c ncurses-5.7/form/fld_newftyp.c 13949 --- ncurses-5.7.orig/form/fld_newftyp.c 2007-10-13 12:30:55.000000000 -0700 13950 +++ ncurses-5.7/form/fld_newftyp.c 2009-06-05 14:01:33.000000000 -0700 13951 @@ -1,5 +1,5 @@ 13952 /**************************************************************************** 13953 - * Copyright (c) 1998-2004,2007 Free Software Foundation, Inc. * 13954 + * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. * 13955 * * 13956 * Permission is hereby granted, free of charge, to any person obtaining a * 13957 * copy of this software and associated documentation files (the * 13958 @@ -32,9 +32,9 @@ 13959 13960 #include "form.priv.h" 13961 13962 -MODULE_ID("$Id: fld_newftyp.c,v 1.15 2007/10/13 19:30:55 tom Exp $") 13963 +MODULE_ID("$Id: fld_newftyp.c,v 1.16 2009/04/11 21:27:33 tom Exp $") 13964 13965 -static FIELDTYPE const default_fieldtype = 13966 +static FIELDTYPE default_fieldtype = 13967 { 13968 0, /* status */ 13969 0L, /* reference count */ 13970 @@ -49,7 +49,7 @@ 13971 NULL /* enumerate previous function */ 13972 }; 13973 13974 -NCURSES_EXPORT_VAR(const FIELDTYPE *) 13975 +NCURSES_EXPORT_VAR(FIELDTYPE *) 13976 _nc_Default_FieldType = &default_fieldtype; 13977 13978 /*--------------------------------------------------------------------------- 13979 diff -Naur ncurses-5.7.orig/form/form.priv.h ncurses-5.7/form/form.priv.h 13980 --- ncurses-5.7.orig/form/form.priv.h 2008-09-08 13:29:05.000000000 -0700 13981 +++ ncurses-5.7/form/form.priv.h 2009-06-05 14:01:33.000000000 -0700 13982 @@ -1,5 +1,5 @@ 13983 /**************************************************************************** 13984 - * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. * 13985 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 13986 * * 13987 * Permission is hereby granted, free of charge, to any person obtaining a * 13988 * copy of this software and associated documentation files (the * 13989 @@ -30,7 +30,7 @@ 13990 * Author: Juergen Pfeifer, 1995,1997 * 13991 ****************************************************************************/ 13992 13993 -/* $Id: form.priv.h,v 0.27 2008/09/08 20:29:05 tom Exp $ */ 13994 +/* $Id: form.priv.h,v 0.28 2009/04/11 21:27:04 tom Exp $ */ 13995 13996 #ifndef FORM_PRIV_H 13997 #define FORM_PRIV_H 1 13998 @@ -62,6 +62,13 @@ 13999 14000 #include "form.h" 14001 14002 + /*********************** 14003 + * Default objects * 14004 + ***********************/ 14005 +extern NCURSES_EXPORT_VAR(FORM *) _nc_Default_Form; 14006 +extern NCURSES_EXPORT_VAR(FIELD *) _nc_Default_Field; 14007 +extern NCURSES_EXPORT_VAR(FIELDTYPE *) _nc_Default_FieldType; 14008 + 14009 /* form status values */ 14010 #define _OVLMODE (0x04U) /* Form is in overlay mode */ 14011 #define _WINDOW_MODIFIED (0x10U) /* Current field window has been modified */ 14012 @@ -91,6 +98,11 @@ 14013 #define Normalize_Field(field) \ 14014 ((field) = (field != 0) ? (field) : _nc_Default_Field) 14015 14016 +#if NCURSES_SP_FUNCS 14017 +#define Get_Form_Screen(form) \ 14018 + ((form)->win ? _nc_screen_of((form->win)):CURRENT_SCREEN) 14019 +#endif 14020 + 14021 /* Retrieve forms window */ 14022 #define Get_Form_Window(form) \ 14023 ((form)->sub?(form)->sub:((form)->win?(form)->win:stdscr)) 14024 @@ -144,8 +156,6 @@ 14025 14026 #define C_ZEROS '\0' 14027 14028 -extern NCURSES_EXPORT_VAR(const FIELDTYPE *) _nc_Default_FieldType; 14029 - 14030 extern NCURSES_EXPORT(TypeArgument *) _nc_Make_Argument (const FIELDTYPE*, va_list*, int*); 14031 extern NCURSES_EXPORT(TypeArgument *) _nc_Copy_Argument (const FIELDTYPE*, const TypeArgument*, int*); 14032 extern NCURSES_EXPORT(void) _nc_Free_Argument (const FIELDTYPE*, TypeArgument*); 14033 @@ -176,8 +186,8 @@ 14034 extern NCURSES_EXPORT(FIELD **) _nc_retrace_field_ptr (FIELD **); 14035 extern NCURSES_EXPORT(FIELD *) _nc_retrace_field (FIELD *); 14036 extern NCURSES_EXPORT(FIELDTYPE *) _nc_retrace_field_type (FIELDTYPE *); 14037 -extern NCURSES_EXPORT(FORM *) _nc_retrace_form (FORM *); 14038 -extern NCURSES_EXPORT(Form_Hook) _nc_retrace_form_hook (Form_Hook); 14039 +extern NCURSES_EXPORT(FORM *) _nc_retrace_form (FORM *); 14040 +extern NCURSES_EXPORT(Form_Hook) _nc_retrace_form_hook (Form_Hook); 14041 14042 #else /* !TRACE */ 14043 13857 14044 diff -Naur ncurses-5.7.orig/form/frm_driver.c ncurses-5.7/form/frm_driver.c 13858 14045 --- ncurses-5.7.orig/form/frm_driver.c 2008-10-18 09:25:00.000000000 -0700 13859 +++ ncurses-5.7/form/frm_driver.c 2009-0 3-22 21:16:49.034929738-070014046 +++ ncurses-5.7/form/frm_driver.c 2009-06-05 14:00:55.000000000 -0700 13860 14047 @@ -32,7 +32,7 @@ 13861 14048 … … 13875 14062 mvwaddstr(field->working, 0, 0, value); 13876 14063 14064 diff -Naur ncurses-5.7.orig/form/frm_sub.c ncurses-5.7/form/frm_sub.c 14065 --- ncurses-5.7.orig/form/frm_sub.c 2004-12-11 14:13:39.000000000 -0800 14066 +++ ncurses-5.7/form/frm_sub.c 2009-06-05 14:01:33.000000000 -0700 14067 @@ -1,5 +1,5 @@ 14068 /**************************************************************************** 14069 - * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. * 14070 + * Copyright (c) 1998-2004,2009 Free Software Foundation, Inc. * 14071 * * 14072 * Permission is hereby granted, free of charge, to any person obtaining a * 14073 * copy of this software and associated documentation files (the * 14074 @@ -27,12 +27,12 @@ 14075 ****************************************************************************/ 14076 14077 /**************************************************************************** 14078 - * Author: Juergen Pfeifer, 1995,1997 * 14079 + * Author: Juergen Pfeifer, 1995-1997,2009 * 14080 ****************************************************************************/ 14081 14082 #include "form.priv.h" 14083 14084 -MODULE_ID("$Id: frm_sub.c,v 1.9 2004/12/11 22:13:39 tom Exp $") 14085 +MODULE_ID("$Id: frm_sub.c,v 1.10 2009/04/11 18:32:47 tom Exp $") 14086 14087 /*--------------------------------------------------------------------------- 14088 | Facility : libnform 14089 @@ -50,9 +50,18 @@ 14090 14091 if (form && (form->status & _POSTED)) 14092 RETURN(E_POSTED); 14093 - 14094 - Normalize_Form(form)->sub = win; 14095 - RETURN(E_OK); 14096 + else 14097 + { 14098 +#if NCURSES_SP_FUNCS 14099 + FORM *f = Normalize_Form(form); 14100 + 14101 + f->sub = win ? win : Get_Form_Screen(f)->_stdscr; 14102 + RETURN(E_OK); 14103 +#else 14104 + Normalize_Form(form)->sub = win; 14105 + RETURN(E_OK); 14106 +#endif 14107 + } 14108 } 14109 14110 /*--------------------------------------------------------------------------- 14111 diff -Naur ncurses-5.7.orig/form/frm_win.c ncurses-5.7/form/frm_win.c 14112 --- ncurses-5.7.orig/form/frm_win.c 2004-12-11 14:15:27.000000000 -0800 14113 +++ ncurses-5.7/form/frm_win.c 2009-06-05 14:01:44.000000000 -0700 14114 @@ -1,5 +1,5 @@ 14115 /**************************************************************************** 14116 - * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. * 14117 + * Copyright (c) 1998-2004,2009 Free Software Foundation, Inc. * 14118 * * 14119 * Permission is hereby granted, free of charge, to any person obtaining a * 14120 * copy of this software and associated documentation files (the * 14121 @@ -32,7 +32,7 @@ 14122 14123 #include "form.priv.h" 14124 14125 -MODULE_ID("$Id: frm_win.c,v 1.13 2004/12/11 22:15:27 tom Exp $") 14126 +MODULE_ID("$Id: frm_win.c,v 1.14 2009/04/18 18:38:57 tom Exp $") 14127 14128 /*--------------------------------------------------------------------------- 14129 | Facility : libnform 14130 @@ -50,9 +50,18 @@ 14131 14132 if (form && (form->status & _POSTED)) 14133 RETURN(E_POSTED); 14134 - 14135 - Normalize_Form(form)->win = win; 14136 - RETURN(E_OK); 14137 + else 14138 + { 14139 +#if NCURSES_SP_FUNCS 14140 + FORM *f = Normalize_Form(form); 14141 + 14142 + f->win = win ? win : Get_Form_Screen(f)->_stdscr; 14143 + RETURN(E_OK); 14144 +#else 14145 + Normalize_Form(form)->win = win; 14146 + RETURN(E_OK); 14147 +#endif 14148 + } 14149 } 14150 14151 /*--------------------------------------------------------------------------- 14152 @@ -66,12 +75,18 @@ 14153 NCURSES_EXPORT(WINDOW *) 14154 form_win(const FORM *form) 14155 { 14156 + WINDOW *result; 14157 const FORM *f; 14158 14159 T((T_CALLED("form_win(%p)"), form)); 14160 14161 f = Normalize_Form(form); 14162 - returnWin(f->win ? f->win : stdscr); 14163 +#if NCURSES_SP_FUNCS 14164 + result = (f->win ? f->win : Get_Form_Screen(f)->_stdscr); 14165 +#else 14166 + result = (f->win ? f->win : stdscr); 14167 +#endif 14168 + returnWin(result); 14169 } 14170 14171 /* frm_win.c ends here */ 13877 14172 diff -Naur ncurses-5.7.orig/form/Makefile.in ncurses-5.7/form/Makefile.in 13878 14173 --- ncurses-5.7.orig/form/Makefile.in 2007-04-28 07:56:11.000000000 -0700 13879 +++ ncurses-5.7/form/Makefile.in 2009-0 3-22 21:16:55.671355217-070014174 +++ ncurses-5.7/form/Makefile.in 2009-06-05 14:01:30.000000000 -0700 13880 14175 @@ -1,6 +1,6 @@ 13881 14176 -# $Id: Makefile.in,v 1.47 2007/04/28 14:56:11 tom Exp $ 13882 +# $Id: Makefile.in,v 1.4 8 2009/01/03 19:09:26 tomExp $14177 +# $Id: Makefile.in,v 1.49 2009/03/28 18:22:39 Charles.Wilson Exp $ 13883 14178 ############################################################################## 13884 14179 -# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. # … … 13887 14182 # Permission is hereby granted, free of charge, to any person obtaining a # 13888 14183 # copy of this software and associated documentation files (the "Software"), # 13889 @@ -70,7 +70,7 @@ 14184 @@ -63,6 +63,7 @@ 14185 LIBTOOL_LINK = @LIB_LINK@ 14186 LIBTOOL_INSTALL = @LIB_INSTALL@ 14187 LIBTOOL_UNINSTALL = @LIB_UNINSTALL@ 14188 +LT_UNDEF = @LT_UNDEF@ 14189 14190 INSTALL = @INSTALL@ 14191 INSTALL_LIB = @INSTALL@ @INSTALL_LIB@ 14192 @@ -70,7 +71,7 @@ 13890 14193 INSTALL_DATA = @INSTALL_DATA@ 13891 14194 … … 13898 14201 diff -Naur ncurses-5.7.orig/include/capdefaults.c ncurses-5.7/include/capdefaults.c 13899 14202 --- ncurses-5.7.orig/include/capdefaults.c 2008-08-04 05:33:42.000000000 -0700 13900 +++ ncurses-5.7/include/capdefaults.c 2009-0 3-22 21:17:07.012081575-070014203 +++ ncurses-5.7/include/capdefaults.c 2009-06-05 14:01:16.000000000 -0700 13901 14204 @@ -32,7 +32,7 @@ 13902 14205 * and: Thomas E. Dickey 1996-on * … … 13924 14227 diff -Naur ncurses-5.7.orig/include/curses.h.in ncurses-5.7/include/curses.h.in 13925 14228 --- ncurses-5.7.orig/include/curses.h.in 2008-08-30 13:11:29.000000000 -0700 13926 +++ ncurses-5.7/include/curses.h.in 2009-0 3-22 21:17:11.636377985-070014229 +++ ncurses-5.7/include/curses.h.in 2009-06-05 14:01:54.000000000 -0700 13927 14230 @@ -1,5 +1,5 @@ 13928 14231 /**************************************************************************** … … 13937 14240 13938 14241 -/* $Id: curses.h.in,v 1.187 2008/08/30 20:11:29 tom Exp $ */ 13939 +/* $Id: curses.h.in,v 1. 195 2009/03/21 21:04:57tom Exp $ */14242 +/* $Id: curses.h.in,v 1.201 2009/05/23 21:31:35 tom Exp $ */ 13940 14243 13941 14244 #ifndef __NCURSES_H … … 13975 14278 */ 13976 14279 #undef NCURSES_SIZE_T 13977 @@ -224,9 +232,9 @@ 14280 @@ -138,7 +146,6 @@ 14281 #endif 14282 14283 #include <stdio.h> 14284 -#include <unctrl.h> 14285 #include <stdarg.h> /* we need va_list */ 14286 #ifdef _XOPEN_SOURCE_EXTENDED 14287 #include <stddef.h> /* we want wchar_t */ 14288 @@ -224,9 +231,9 @@ 13978 14289 13979 14290 /* line graphics */ … … 13987 14298 extern NCURSES_EXPORT_VAR(chtype) acs_map[]; 13988 14299 #endif 13989 @@ -646,7 +654,7 @@ 14300 @@ -511,6 +518,12 @@ 14301 #endif 14302 14303 /* 14304 + * Curses uses a helper function. Define our type for this to simplify 14305 + * extending it for the sp-funcs feature. 14306 + */ 14307 +typedef int (*NCURSES_OUTC)(int); 14308 + 14309 +/* 14310 * Function prototypes. This is the complete X/Open Curses list of required 14311 * functions. Those marked `generated' will have sources generated from the 14312 * macro definitions later in this file, in order to satisfy XPG4.2 14313 @@ -646,7 +659,7 @@ 13990 14314 extern NCURSES_EXPORT(int) mvwinnstr (WINDOW *, int, int, char *, int); /* generated */ 13991 14315 extern NCURSES_EXPORT(int) mvwinsch (WINDOW *, int, int, chtype); /* generated */ … … 13996 14320 extern NCURSES_EXPORT(int) mvwprintw (WINDOW*,int,int, const char *,...) /* implemented */ 13997 14321 GCC_PRINTFLIKE(4,5); 13998 @@ -654,9 +66 2,9 @@14322 @@ -654,9 +667,9 @@ 13999 14323 GCC_SCANFLIKE(4,5); 14000 14324 extern NCURSES_EXPORT(int) mvwvline (WINDOW *,int, int, chtype, int); /* generated */ … … 14008 14332 extern NCURSES_EXPORT(int) nocbreak (void); /* implemented */ 14009 14333 extern NCURSES_EXPORT(int) nodelay (WINDOW *,bool); /* implemented */ 14010 @@ -710,7 +7 18,7 @@14334 @@ -710,7 +723,7 @@ 14011 14335 extern NCURSES_EXPORT(int) slk_refresh (void); /* implemented */ 14012 14336 extern NCURSES_EXPORT(int) slk_restore (void); /* implemented */ … … 14017 14341 extern NCURSES_EXPORT(int) standend (void); /* generated */ 14018 14342 extern NCURSES_EXPORT(int) start_color (void); /* implemented */ 14019 @@ -856,23 +864,119 @@ 14343 @@ -727,7 +740,7 @@ 14344 extern NCURSES_EXPORT(int) untouchwin (WINDOW *); /* generated */ 14345 extern NCURSES_EXPORT(void) use_env (bool); /* implemented */ 14346 extern NCURSES_EXPORT(int) vidattr (chtype); /* implemented */ 14347 -extern NCURSES_EXPORT(int) vidputs (chtype, int (*)(int)); /* implemented */ 14348 +extern NCURSES_EXPORT(int) vidputs (chtype, NCURSES_OUTC); /* implemented */ 14349 extern NCURSES_EXPORT(int) vline (chtype, int); /* generated */ 14350 extern NCURSES_EXPORT(int) vwprintw (WINDOW *, const char *,va_list); /* implemented */ 14351 extern NCURSES_EXPORT(int) vw_printw (WINDOW *, const char *,va_list); /* generated */ 14352 @@ -856,23 +869,133 @@ 14020 14353 * These extensions provide access to information stored in the WINDOW even 14021 14354 * when NCURSES_OPAQUE is set: … … 14059 14392 +#define NCURSES_SP_NAME(name) name##_sp 14060 14393 + 14394 +/* Define the sp-funcs helper function */ 14395 +#define NCURSES_SP_OUTC NCURSES_SP_NAME(NCURSES_OUTC) 14396 +typedef int (*NCURSES_SP_OUTC)(SCREEN*, int); 14397 + 14061 14398 +extern NCURSES_EXPORT(SCREEN*) new_prescr(void); /* implemented */ 14062 14399 + … … 14065 14402 +extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(can_change_color) (SCREEN*); /* implemented */ 14066 14403 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(cbreak) (SCREEN*); /* implemented */ 14404 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(curs_set) (SCREEN*, int); /* implemented */ 14067 14405 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(color_content) (SCREEN*, short, short*, short*, short*); /* implemented */ 14068 14406 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(def_prog_mode) (SCREEN*); /* implemented */ … … 14076 14414 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(flash) (SCREEN*); /* implemented */ 14077 14415 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(flushinp) (SCREEN*); /* implemented */ 14416 +extern NCURSES_EXPORT(WINDOW *) NCURSES_SP_NAME(getwin) (SCREEN*, FILE *); /* implemented */ 14078 14417 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(halfdelay)(SCREEN*, int); /* implemented */ 14079 14418 +extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(has_colors) (SCREEN*); /* implemented */ … … 14090 14429 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(napms) (SCREEN*, int); /* implemented */ 14091 14430 +extern NCURSES_EXPORT(WINDOW *) NCURSES_SP_NAME(newpad) (SCREEN*, int, int); /* implemented */ 14092 +extern NCURSES_EXPORT(SCREEN 14431 +extern NCURSES_EXPORT(SCREEN*) NCURSES_SP_NAME(newterm) (SCREEN*, NCURSES_CONST char *, FILE *, FILE *); /* implemented */ 14093 14432 +extern NCURSES_EXPORT(WINDOW *) NCURSES_SP_NAME(newwin) (SCREEN*, int, int, int, int); /* implemented */ 14094 14433 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(nl) (SCREEN*); /* implemented */ 14095 14434 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(nocbreak) (SCREEN*); /* implemented */ 14096 14435 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(noecho) (SCREEN*); /* implemented */ 14097 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(nofilter) (SCREEN*); /* implemented */14098 14436 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(nonl) (SCREEN*); /* implemented */ 14099 14437 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(noqiflush) (SCREEN*); /* implemented */ … … 14104 14442 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(reset_prog_mode) (SCREEN*); /* implemented */ 14105 14443 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(reset_shell_mode) (SCREEN*); /* implemented */ 14444 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(resetty) (SCREEN*); /* implemented */ 14106 14445 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(ripoffline) (SCREEN*, int, int (*)(WINDOW *, int)); /* implemented */ 14446 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(savetty) (SCREEN*); /* implemented */ 14107 14447 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(scr_init) (SCREEN*, const char *); /* implemented */ 14108 14448 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(scr_restore) (SCREEN*, const char *); /* implemented */ … … 14128 14468 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(ungetch) (SCREEN*, int); /* implemented */ 14129 14469 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(use_env) (SCREEN*, bool); /* implemented */ 14470 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(vidattr) (SCREEN*, chtype); /* implemented */ 14471 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(vidputs) (SCREEN*, chtype, NCURSES_SP_OUTC); /* implemented */ 14130 14472 +#if @NCURSES_EXT_FUNCS@ 14131 14473 +extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(keybound) (SCREEN*, int, int); … … 14133 14475 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(define_key) (SCREEN*, const char *, int); 14134 14476 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(get_escdelay) (SCREEN*); 14477 +extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(is_term_resized) (SCREEN*, int, int); 14135 14478 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(key_defined)(SCREEN*, const char *); 14136 14479 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(keyok) (SCREEN*, int, bool); 14480 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(nofilter) (SCREEN*); /* implemented */ 14481 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(resize_term) (SCREEN*, int, int); 14482 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(resizeterm) (SCREEN*, int, int); 14137 14483 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(set_escdelay) (SCREEN*, int); 14138 14484 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(set_tabsize) (SCREEN*, int); … … 14144 14490 +#define NCURSES_SP_FUNCS 0 14145 14491 +#define NCURSES_SP_NAME(name) name 14492 +#define NCURSES_SP_OUTC NCURSES_OUTC 14146 14493 +#endif 14147 14494 + … … 14149 14496 14150 14497 #define NCURSES_ATTR_SHIFT 8 14151 @@ -1173,7 +1277,7 @@ 14498 @@ -971,9 +1094,9 @@ 14499 #if !NCURSES_OPAQUE 14500 #if defined(_XOPEN_SOURCE_EXTENDED) && @NCURSES_EXT_COLORS@ 14501 #define wattrset(win,at) ((win)->_color = PAIR_NUMBER(at), \ 14502 - (win)->_attrs = (at)) 14503 + NCURSES_CAST(int, (win)->_attrs = (at))) 14504 #else 14505 -#define wattrset(win,at) ((win)->_attrs = (at)) 14506 +#define wattrset(win,at) NCURSES_CAST(int, (win)->_attrs = (at)) 14507 #endif 14508 #endif /* NCURSES_OPAQUE */ 14509 14510 @@ -1173,7 +1296,7 @@ 14152 14511 * It gives the ESC expire time in milliseconds. 14153 14512 * b. ttytype is needed for backward compatibility … … 14160 14519 diff -Naur ncurses-5.7.orig/include/curses.tail ncurses-5.7/include/curses.tail 14161 14520 --- ncurses-5.7.orig/include/curses.tail 2008-07-05 13:20:38.000000000 -0700 14162 +++ ncurses-5.7/include/curses.tail 2009-0 3-22 21:16:46.494768822-070014521 +++ ncurses-5.7/include/curses.tail 2009-06-05 14:01:54.000000000 -0700 14163 14522 @@ -1,4 +1,4 @@ 14164 14523 -/* $Id: curses.tail,v 1.16 2008/07/05 20:20:38 tom Exp $ */ 14165 +/* $Id: curses.tail,v 1.1 7 2008/11/23 00:12:12tom Exp $ */14524 +/* $Id: curses.tail,v 1.19 2009/05/23 19:19:43 tom Exp $ */ 14166 14525 /* 14167 14526 * vile:cmode: 14168 14527 * This file is part of ncurses, designed to be appended after curses.h.in 14169 @@ -94, 6 +94,7@@14528 @@ -94,13 +94,22 @@ 14170 14529 } 14171 14530 MEVENT; 14172 14531 14173 +extern NCURSES_EXPORT(bool) has_mouse (void); 14174 extern NCURSES_EXPORT(int) getmouse (MEVENT *); 14175 extern NCURSES_EXPORT(int) ungetmouse (MEVENT *); 14532 -extern NCURSES_EXPORT(int) getmouse (MEVENT *); 14533 -extern NCURSES_EXPORT(int) ungetmouse (MEVENT *); 14534 +extern NCURSES_EXPORT(bool) has_mouse(void); 14535 +extern NCURSES_EXPORT(int) getmouse (MEVENT *); 14536 +extern NCURSES_EXPORT(int) ungetmouse (MEVENT *); 14176 14537 extern NCURSES_EXPORT(mmask_t) mousemask (mmask_t, mmask_t *); 14538 -extern NCURSES_EXPORT(bool) wenclose (const WINDOW *, int, int); 14539 -extern NCURSES_EXPORT(int) mouseinterval (int); 14540 -extern NCURSES_EXPORT(bool) wmouse_trafo (const WINDOW*, int*, int*, bool); 14541 -extern NCURSES_EXPORT(bool) mouse_trafo (int*, int*, bool); /* generated */ 14542 +extern NCURSES_EXPORT(bool) wenclose (const WINDOW *, int, int); 14543 +extern NCURSES_EXPORT(int) mouseinterval (int); 14544 +extern NCURSES_EXPORT(bool) wmouse_trafo (const WINDOW*, int*, int*, bool); 14545 +extern NCURSES_EXPORT(bool) mouse_trafo (int*, int*, bool); /* generated */ 14546 + 14547 +#if NCURSES_SP_FUNCS 14548 +extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(has_mouse) (SCREEN*); 14549 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(getmouse) (SCREEN*, MEVENT *); 14550 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(ungetmouse) (SCREEN*,MEVENT *); 14551 +extern NCURSES_EXPORT(mmask_t) NCURSES_SP_NAME(mousemask) (SCREEN*, mmask_t, mmask_t *); 14552 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(mouseinterval) (SCREEN*, int); 14553 +#endif 14554 14555 #define mouse_trafo(y,x,to_screen) wmouse_trafo(stdscr,y,x,to_screen) 14556 14557 @@ -109,6 +118,11 @@ 14558 extern NCURSES_EXPORT(int) mcprint (char *, int); /* direct data to printer */ 14559 extern NCURSES_EXPORT(int) has_key (int); /* do we have given key? */ 14560 14561 +#if NCURSES_SP_FUNCS 14562 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(has_key) (SCREEN*, int); /* do we have given key? */ 14563 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(mcprint) (SCREEN*, char *, int); /* direct data to printer */ 14564 +#endif 14565 + 14566 /* Debugging : use with libncurses_g.a */ 14567 14568 extern NCURSES_EXPORT(void) _tracef (const char *, ...) GCC_PRINTFLIKE(1,2); 14569 @@ -160,6 +174,8 @@ 14570 #define OPTIMIZE_ALL 0xff /* enable all optimizations (dflt) */ 14571 #endif 14572 14573 +#include <unctrl.h> 14574 + 14575 #ifdef __cplusplus 14576 14577 #ifndef NCURSES_NOMACROS 14177 14578 diff -Naur ncurses-5.7.orig/include/curses.wide ncurses-5.7/include/curses.wide 14178 14579 --- ncurses-5.7.orig/include/curses.wide 2007-03-10 09:52:23.000000000 -0800 14179 +++ ncurses-5.7/include/curses.wide 2009-0 3-22 21:16:47.770848442-070014580 +++ ncurses-5.7/include/curses.wide 2009-06-05 14:01:51.000000000 -0700 14180 14581 @@ -1,9 +1,11 @@ 14181 14582 -/* $Id: curses.wide,v 1.34 2007/03/10 17:52:23 tom Exp $ */ 14182 +/* $Id: curses.wide,v 1.3 6 2008/11/29 18:44:08tom Exp $ */14583 +/* $Id: curses.wide,v 1.39 2009/05/09 15:43:00 tom Exp $ */ 14183 14584 /* 14184 14585 * vile:cmode: … … 14191 14592 14192 14593 extern NCURSES_EXPORT_VAR(cchar_t *) _nc_wacs; 14594 @@ -138,7 +140,7 @@ 14595 extern NCURSES_EXPORT(attr_t) term_attrs (void); /* implemented */ 14596 extern NCURSES_EXPORT(int) unget_wch (const wchar_t); /* implemented */ 14597 extern NCURSES_EXPORT(int) vid_attr (attr_t, short, void *); /* implemented */ 14598 -extern NCURSES_EXPORT(int) vid_puts (attr_t, short, void *, int (*)(int)); /* implemented */ 14599 +extern NCURSES_EXPORT(int) vid_puts (attr_t, short, void *, NCURSES_OUTC); /* implemented */ 14600 extern NCURSES_EXPORT(int) vline_set (const cchar_t *, int); /* generated:WIDEC */ 14601 extern NCURSES_EXPORT(int) wadd_wch (WINDOW *,const cchar_t *); /* implemented */ 14602 extern NCURSES_EXPORT(int) wadd_wchnstr (WINDOW *,const cchar_t *,int); /* implemented */ 14603 @@ -165,6 +167,14 @@ 14604 extern NCURSES_EXPORT(wchar_t*) wunctrl (cchar_t *); /* implemented */ 14605 extern NCURSES_EXPORT(int) wvline_set (WINDOW *, const cchar_t *, int); /* implemented */ 14606 14607 +#if NCURSES_SP_FUNCS 14608 +extern NCURSES_EXPORT(attr_t) NCURSES_SP_NAME(term_attrs) (SCREEN*); /* implemented */ 14609 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(unget_wch) (SCREEN*, const wchar_t); /* implemented */ 14610 +extern NCURSES_EXPORT(wchar_t*) NCURSES_SP_NAME(wunctrl) (SCREEN*, cchar_t *); /* implemented */ 14611 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(vid_attr) (SCREEN*, attr_t, short, void *); 14612 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(vid_puts) (SCREEN*, attr_t, short, void *, NCURSES_SP_OUTC); 14613 +#endif 14614 + 14615 #ifndef NCURSES_NOMACROS 14616 14617 /* 14193 14618 diff -Naur ncurses-5.7.orig/include/MKterm.h.awk.in ncurses-5.7/include/MKterm.h.awk.in 14194 14619 --- ncurses-5.7.orig/include/MKterm.h.awk.in 2008-05-24 16:13:59.000000000 -0700 14195 +++ ncurses-5.7/include/MKterm.h.awk.in 2009-0 3-22 21:17:08.396170694-070014620 +++ ncurses-5.7/include/MKterm.h.awk.in 2009-06-05 14:01:51.000000000 -0700 14196 14621 @@ -1,7 +1,7 @@ 14197 14622 # vile:awkmode … … 14208 14633 print "" 14209 14634 - print "/* $Id: MKterm.h.awk.in,v 1.50 2008/05/24 23:13:59 tom Exp $ */" 14210 + print "/* $Id: MKterm.h.awk.in,v 1.5 3 2009/02/28 21:27:45tom Exp $ */"14635 + print "/* $Id: MKterm.h.awk.in,v 1.57 2009/05/09 15:54:50 tom Exp $ */" 14211 14636 print "" 14212 14637 print "/*" 14213 14638 print "** term.h -- Definition of struct term" 14214 @@ -228,8 +228,16 @@ 14639 @@ -130,11 +130,15 @@ 14640 print "" 14641 print "#else /* !HAVE_TERMIO_H */" 14642 print "" 14643 + print "#if __MINGW32__" 14644 + print "# include <ncurses_mingw.h>" 14645 + print "# define TTY struct termios" 14646 + print "#else" 14647 print "#undef TERMIOS" 14648 print "#include <sgtty.h>" 14649 print "#include <sys/ioctl.h>" 14650 print "#define TTY struct sgttyb" 14651 - print "" 14652 + print "#endif /* MINGW32 */" 14653 print "#endif /* HAVE_TERMIO_H */" 14654 print "" 14655 print "#endif /* HAVE_TERMIOS_H */" 14656 @@ -228,8 +232,16 @@ 14215 14657 print " char * _termname; /* used for termname() */" 14216 14658 print "} TERMINAL;" … … 14230 14672 print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolcodes);" 14231 14673 print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolfnames);" 14232 @@ -240,7 +2 48,6 @@14674 @@ -240,7 +252,6 @@ 14233 14675 print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strcodes);" 14234 14676 print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strfnames);" … … 14238 14680 print "#define boolcodes NCURSES_PUBLIC_VAR(boolcodes())" 14239 14681 print "#define boolfnames NCURSES_PUBLIC_VAR(boolfnames())" 14240 @@ -253,8 +26 0,6 @@14682 @@ -253,8 +264,6 @@ 14241 14683 print "" 14242 14684 print "#else" … … 14247 14689 print "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolcodes[];" 14248 14690 print "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolfnames[];" 14691 @@ -312,6 +321,37 @@ 14692 print "extern NCURSES_EXPORT(int) tputs (const char *, int, int (*)(int));" 14693 print "#endif /* NCURSES_TERMCAP_H_incl */" 14694 print "" 14695 + print "/*" 14696 + print " * Include curses.h before term.h to enable these extensions." 14697 + print " */" 14698 + print "#if defined(NCURSES_SP_FUNCS) && (NCURSES_SP_FUNCS != 0)" 14699 + print "" 14700 + print "extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(tigetstr) (SCREEN*, NCURSES_CONST char *);" 14701 + print "extern NCURSES_EXPORT(int) NCURSES_SP_NAME(putp) (SCREEN*, const char *);" 14702 + print "extern NCURSES_EXPORT(int) NCURSES_SP_NAME(tigetflag) (SCREEN*, NCURSES_CONST char *);" 14703 + print "extern NCURSES_EXPORT(int) NCURSES_SP_NAME(tigetnum) (SCREEN*, NCURSES_CONST char *);" 14704 + print "" 14705 + print "#if @NCURSES_TPARM_VARARGS@ /* NCURSES_TPARM_VARARGS */" 14706 + print "extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(tparm) (SCREEN*, NCURSES_CONST char *, ...); /* special */" 14707 + print "#else" 14708 + print "extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(tparm) (SCREEN*, NCURSES_CONST char *, long,long,long,long,long,long,long,long,long); /* special */" 14709 + print "extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(tparm_varargs) (SCREEN*, NCURSES_CONST char *, ...); /* special */" 14710 + print "#endif" 14711 + print "" 14712 + print "/* termcap database emulation (XPG4 uses const only for 2nd param of tgetent) */" 14713 + print "extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(tgetstr) (SCREEN*, NCURSES_CONST char *, char **);" 14714 + print "extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(tgoto) (SCREEN*, const char *, int, int);" 14715 + print "extern NCURSES_EXPORT(int) NCURSES_SP_NAME(tgetent) (SCREEN*, char *, const char *);" 14716 + print "extern NCURSES_EXPORT(int) NCURSES_SP_NAME(tgetflag) (SCREEN*, NCURSES_CONST char *);" 14717 + print "extern NCURSES_EXPORT(int) NCURSES_SP_NAME(tgetnum) (SCREEN*, NCURSES_CONST char *);" 14718 + print "extern NCURSES_EXPORT(int) NCURSES_SP_NAME(tputs) (SCREEN*, const char *, int, NCURSES_SP_OUTC);" 14719 + print "" 14720 + print "extern NCURSES_EXPORT(TERMINAL *) NCURSES_SP_NAME(set_curterm) (SCREEN*, TERMINAL *);" 14721 + print "extern NCURSES_EXPORT(int) NCURSES_SP_NAME(del_curterm) (SCREEN*, TERMINAL *);" 14722 + print "" 14723 + print "extern NCURSES_EXPORT(int) NCURSES_SP_NAME(restartterm) (SCREEN*, NCURSES_CONST char *, int, int *);" 14724 + print "#endif /* NCURSES_SP_FUNCS */" 14725 + print "" 14726 print "#ifdef __cplusplus" 14727 print "}" 14728 print "#endif" 14729 diff -Naur ncurses-5.7.orig/include/nc_alloc.h ncurses-5.7/include/nc_alloc.h 14730 --- ncurses-5.7.orig/include/nc_alloc.h 2008-09-27 15:30:33.000000000 -0700 14731 +++ ncurses-5.7/include/nc_alloc.h 2009-06-05 14:01:44.000000000 -0700 14732 @@ -1,5 +1,5 @@ 14733 /**************************************************************************** 14734 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 14735 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 14736 * * 14737 * Permission is hereby granted, free of charge, to any person obtaining a * 14738 * copy of this software and associated documentation files (the * 14739 @@ -29,7 +29,7 @@ 14740 /**************************************************************************** 14741 * Author: Thomas E. Dickey 1996-on * 14742 ****************************************************************************/ 14743 -/* $Id: nc_alloc.h,v 1.16 2008/09/27 22:30:33 tom Exp $ */ 14744 +/* $Id: nc_alloc.h,v 1.17 2009/04/18 20:48:19 tom Exp $ */ 14745 14746 #ifndef NC_ALLOC_included 14747 #define NC_ALLOC_included 1 14748 @@ -74,9 +74,15 @@ 14749 extern NCURSES_EXPORT(void) _nc_free_tparm(void); 14750 extern NCURSES_EXPORT(void) _nc_leaks_dump_entry(void); 14751 extern NCURSES_EXPORT(void) _nc_leaks_tic(void); 14752 -#define ExitProgram(code) _nc_free_and_exit(code) 14753 + 14754 +#if NCURSES_SP_FUNCS 14755 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_free_and_exit)(SCREEN*, int) GCC_NORETURN; 14756 #endif 14757 14758 +#define ExitProgram(code) _nc_free_and_exit(code) 14759 + 14760 +#endif /* NO_LEAKS, etc */ 14761 + 14762 #ifndef HAVE_NC_FREEALL 14763 #define HAVE_NC_FREEALL 0 14764 #endif 14765 diff -Naur ncurses-5.7.orig/include/nc_panel.h ncurses-5.7/include/nc_panel.h 14766 --- ncurses-5.7.orig/include/nc_panel.h 2008-08-04 11:26:46.000000000 -0700 14767 +++ ncurses-5.7/include/nc_panel.h 2009-06-05 14:01:33.000000000 -0700 14768 @@ -1,5 +1,5 @@ 14769 /**************************************************************************** 14770 - * Copyright (c) 1998-2000,2008 Free Software Foundation, Inc. * 14771 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 14772 * * 14773 * Permission is hereby granted, free of charge, to any person obtaining a * 14774 * copy of this software and associated documentation files (the * 14775 @@ -33,7 +33,7 @@ 14776 14777 14778 /* 14779 - * $Id: nc_panel.h,v 1.5 2008/08/04 18:26:46 tom Exp $ 14780 + * $Id: nc_panel.h,v 1.6 2009/04/11 21:17:57 tom Exp $ 14781 * 14782 * nc_panel.h 14783 * 14784 @@ -62,6 +62,10 @@ 14785 /* Retrieve the panelhook of the current screen */ 14786 extern NCURSES_EXPORT(struct panelhook*) _nc_panelhook (void); 14787 14788 +#if NCURSES_SP_FUNCS 14789 +extern NCURSES_EXPORT(struct panelhook*) NCURSES_SP_NAME(_nc_panelhook) (SCREEN *); 14790 +#endif 14791 + 14792 #ifdef __cplusplus 14793 } 14794 #endif 14795 diff -Naur ncurses-5.7.orig/include/ncurses_defs ncurses-5.7/include/ncurses_defs 14796 --- ncurses-5.7.orig/include/ncurses_defs 2008-09-06 08:57:41.000000000 -0700 14797 +++ ncurses-5.7/include/ncurses_defs 2009-06-05 14:01:49.000000000 -0700 14798 @@ -1,4 +1,4 @@ 14799 -# $Id: ncurses_defs,v 1.40 2008/09/06 15:57:41 tom Exp $ 14800 +# $Id: ncurses_defs,v 1.41 2008/11/16 00:19:59 juergen Exp $ 14801 ############################################################################## 14802 # Copyright (c) 2000-2007,2008 Free Software Foundation, Inc. # 14803 # # 14804 @@ -171,7 +171,6 @@ 14805 NCURSES_EXT_FUNCS 14806 NCURSES_NO_PADDING 14807 NCURSES_PATHSEP ':' 14808 -NDEBUG 14809 NEED_PTEM_H 14810 NO_LEAKS 14811 PURE_TERMINFO 14249 14812 diff -Naur ncurses-5.7.orig/include/ncurses_dll.h ncurses-5.7/include/ncurses_dll.h 14250 14813 --- ncurses-5.7.orig/include/ncurses_dll.h 2007-03-10 11:21:49.000000000 -0800 14251 +++ ncurses-5.7/include/ncurses_dll.h 2009-0 3-22 21:17:11.636377985-070014814 +++ ncurses-5.7/include/ncurses_dll.h 2009-06-05 14:01:44.000000000 -0700 14252 14815 @@ -1,5 +1,5 @@ 14253 14816 /**************************************************************************** … … 14262 14825 ****************************************************************************/ 14263 14826 -/* $Id: ncurses_dll.h,v 1.6 2007/03/10 19:21:49 tom Exp $ */ 14264 +/* $Id: ncurses_dll.h,v 1. 7 2009/03/21 18:55:22tom Exp $ */14827 +/* $Id: ncurses_dll.h,v 1.8 2009/04/04 22:26:27 tom Exp $ */ 14265 14828 14266 14829 #ifndef NCURSES_DLL_H_incl 14267 14830 #define NCURSES_DLL_H_incl 1 14831 @@ -37,7 +37,7 @@ 14832 #undef NCURSES_DLL 14833 #define NCURSES_STATIC 14834 14835 -#if defined(__CYGWIN__) 14836 +#if defined(__CYGWIN__) || defined(__MINGW32__) 14837 # if defined(NCURSES_DLL) 14838 # if defined(NCURSES_STATIC) 14839 # undef NCURSES_STATIC 14268 14840 @@ -76,11 +76,4 @@ 14269 14841 # define NCURSES_EXPORT_VAR(type) NCURSES_IMPEXP type … … 14278 14850 - 14279 14851 #endif /* NCURSES_DLL_H_incl */ 14852 diff -Naur ncurses-5.7.orig/include/term_entry.h ncurses-5.7/include/term_entry.h 14853 --- ncurses-5.7.orig/include/term_entry.h 2008-08-16 09:16:03.000000000 -0700 14854 +++ ncurses-5.7/include/term_entry.h 2009-06-05 14:01:33.000000000 -0700 14855 @@ -32,7 +32,7 @@ 14856 * and: Thomas E. Dickey 1998-on * 14857 ****************************************************************************/ 14858 14859 -/* $Id: term_entry.h,v 1.35 2008/08/16 16:16:03 tom Exp $ */ 14860 +/* $Id: term_entry.h,v 1.36 2008/11/16 00:19:59 juergen Exp $ */ 14861 14862 /* 14863 * term_entry.h -- interface to entry-manipulation code 14864 @@ -81,7 +81,7 @@ 14865 #define EXT_NAMES(tp,i,limit,index,table) table[i] 14866 #endif 14867 14868 -#define NUM_EXT_NAMES(tp) ((tp)->ext_Booleans + (tp)->ext_Numbers + (tp)->ext_Strings) 14869 +#define NUM_EXT_NAMES(tp) (unsigned) ((tp)->ext_Booleans + (tp)->ext_Numbers + (tp)->ext_Strings) 14870 14871 #define for_each_boolean(n,tp) for(n = 0; n < NUM_BOOLEANS(tp); n++) 14872 #define for_each_number(n,tp) for(n = 0; n < NUM_NUMBERS(tp); n++) 14873 diff -Naur ncurses-5.7.orig/include/unctrl.h.in ncurses-5.7/include/unctrl.h.in 14874 --- ncurses-5.7.orig/include/unctrl.h.in 2001-03-24 13:53:25.000000000 -0800 14875 +++ ncurses-5.7/include/unctrl.h.in 2009-06-05 14:01:44.000000000 -0700 14876 @@ -1,5 +1,5 @@ 14877 /**************************************************************************** 14878 - * Copyright (c) 1998,2000 Free Software Foundation, Inc. * 14879 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 14880 * * 14881 * Permission is hereby granted, free of charge, to any person obtaining a * 14882 * copy of this software and associated documentation files (the * 14883 @@ -39,7 +39,7 @@ 14884 * as ^?. Printable characters are displayed as is. 14885 */ 14886 14887 -/* $Id: unctrl.h.in,v 1.10 2001/03/24 21:53:25 tom Exp $ */ 14888 +/* $Id: unctrl.h.in,v 1.11 2009/04/18 21:00:52 tom Exp $ */ 14889 14890 #ifndef NCURSES_UNCTRL_H_incl 14891 #define NCURSES_UNCTRL_H_incl 1 14892 @@ -56,6 +56,10 @@ 14893 #undef unctrl 14894 NCURSES_EXPORT(NCURSES_CONST char *) unctrl (chtype); 14895 14896 +#if @NCURSES_SP_FUNCS@ 14897 +NCURSES_EXPORT(NCURSES_CONST char *) NCURSES_SP_NAME(unctrl) (SCREEN*, chtype); 14898 +#endif 14899 + 14900 #ifdef __cplusplus 14901 } 14902 #endif 14280 14903 diff -Naur ncurses-5.7.orig/INSTALL ncurses-5.7/INSTALL 14281 14904 --- ncurses-5.7.orig/INSTALL 2008-11-02 13:13:51.000000000 -0800 14282 +++ ncurses-5.7/INSTALL 2009-0 3-22 21:17:11.612376588-070014905 +++ ncurses-5.7/INSTALL 2009-06-05 14:01:24.000000000 -0700 14283 14906 @@ -1,5 +1,5 @@ 14284 14907 ------------------------------------------------------------------------------- … … 14349 14972 diff -Naur ncurses-5.7.orig/man/curs_color.3x ncurses-5.7/man/curs_color.3x 14350 14973 --- ncurses-5.7.orig/man/curs_color.3x 2005-12-17 16:00:37.000000000 -0800 14351 +++ ncurses-5.7/man/curs_color.3x 2009-0 3-22 21:17:02.195775108-070014974 +++ ncurses-5.7/man/curs_color.3x 2009-06-05 14:01:11.000000000 -0700 14352 14975 @@ -1,5 +1,5 @@ 14353 14976 .\"*************************************************************************** … … 14380 15003 diff -Naur ncurses-5.7.orig/man/curs_mouse.3x ncurses-5.7/man/curs_mouse.3x 14381 15004 --- ncurses-5.7.orig/man/curs_mouse.3x 2006-12-30 15:43:34.000000000 -0800 14382 +++ ncurses-5.7/man/curs_mouse.3x 2009-0 3-22 21:16:46.494768822-070015005 +++ ncurses-5.7/man/curs_mouse.3x 2009-06-05 14:00:52.000000000 -0700 14383 15006 @@ -1,6 +1,6 @@ 14384 15007 '\" t … … 14424 15047 cause an error beep when cooked mode is being simulated in a window by a 14425 15048 function such as \fBgetstr\fR that expects a linefeed for input-loop 15049 diff -Naur ncurses-5.7.orig/man/form_field_validation.3x ncurses-5.7/man/form_field_validation.3x 15050 --- ncurses-5.7.orig/man/form_field_validation.3x 2006-12-24 08:08:08.000000000 -0800 15051 +++ ncurses-5.7/man/form_field_validation.3x 2009-06-05 14:01:33.000000000 -0700 15052 @@ -26,7 +26,7 @@ 15053 .\" authorization. * 15054 .\"*************************************************************************** 15055 .\" 15056 -.\" $Id: form_field_validation.3x,v 1.16 2006/12/24 16:08:08 tom Exp $ 15057 +.\" $Id: form_field_validation.3x,v 1.17 2008/12/14 19:22:16 juergen Exp $ 15058 .TH form_field_validation 3X "" 15059 .SH NAME 15060 \fBform_field_validation\fR - data type validation for fields 15061 @@ -70,9 +70,7 @@ 15062 case-sensitivity; and a fifth \fBint\fR flag argument specifying whether a partial 15063 match must be a unique one (if this flag is off, a prefix matches the first 15064 of any set of more than one list elements with that prefix). Please notice 15065 -that the string list is not copied, only a reference to it is stored in the 15066 -field. So you should avoid using a list that lives in automatic variables 15067 -on the stack. 15068 +that the string list is copied. So you may use a list that lives in automatic variables on the stack. 15069 .TP 5 15070 TYPE_INTEGER 15071 Integer data, parsable to an integer by \fBatoi(3)\fR. Requires a third 14426 15072 diff -Naur ncurses-5.7.orig/man/keybound.3x ncurses-5.7/man/keybound.3x 14427 15073 --- ncurses-5.7.orig/man/keybound.3x 2006-02-25 13:47:06.000000000 -0800 14428 +++ ncurses-5.7/man/keybound.3x 2009-0 3-22 21:16:50.643032825-070015074 +++ ncurses-5.7/man/keybound.3x 2009-06-05 14:00:57.000000000 -0700 14429 15075 @@ -1,5 +1,5 @@ 14430 15076 .\"*************************************************************************** … … 14447 15093 diff -Naur ncurses-5.7.orig/man/tabs.1 ncurses-5.7/man/tabs.1 14448 15094 --- ncurses-5.7.orig/man/tabs.1 1969-12-31 16:00:00.000000000 -0800 14449 +++ ncurses-5.7/man/tabs.1 2009-0 3-22 21:16:45.114678865-070015095 +++ ncurses-5.7/man/tabs.1 2009-06-05 14:00:50.000000000 -0700 14450 15096 @@ -0,0 +1,143 @@ 14451 15097 +.\"*************************************************************************** … … 14594 15240 diff -Naur ncurses-5.7.orig/man/tset.1 ncurses-5.7/man/tset.1 14595 15241 --- ncurses-5.7.orig/man/tset.1 2006-12-24 07:00:30.000000000 -0800 14596 +++ ncurses-5.7/man/tset.1 2009-0 3-22 21:16:45.114678865-070015242 +++ ncurses-5.7/man/tset.1 2009-06-05 14:00:50.000000000 -0700 14597 15243 @@ -1,5 +1,5 @@ 14598 15244 .\"*************************************************************************** … … 14615 15261 diff -Naur ncurses-5.7.orig/MANIFEST ncurses-5.7/MANIFEST 14616 15262 --- ncurses-5.7.orig/MANIFEST 2008-10-25 16:47:24.000000000 -0700 14617 +++ ncurses-5.7/MANIFEST 2009-0 3-22 21:17:09.900267355-070015263 +++ ncurses-5.7/MANIFEST 2009-06-05 14:01:21.000000000 -0700 14618 15264 @@ -640,6 +640,7 @@ 14619 15265 ./man/ncurses.3x … … 14662 15308 diff -Naur ncurses-5.7.orig/menu/Makefile.in ncurses-5.7/menu/Makefile.in 14663 15309 --- ncurses-5.7.orig/menu/Makefile.in 2007-04-28 07:56:11.000000000 -0700 14664 +++ ncurses-5.7/menu/Makefile.in 2009-0 3-22 21:16:55.671355217-070015310 +++ ncurses-5.7/menu/Makefile.in 2009-06-05 14:01:30.000000000 -0700 14665 15311 @@ -1,6 +1,6 @@ 14666 15312 -# $Id: Makefile.in,v 1.48 2007/04/28 14:56:11 tom Exp $ 14667 +# $Id: Makefile.in,v 1. 49 2009/01/03 19:09:26 tomExp $15313 +# $Id: Makefile.in,v 1.50 2009/03/28 18:22:39 Charles.Wilson Exp $ 14668 15314 ############################################################################## 14669 15315 -# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. # … … 14672 15318 # Permission is hereby granted, free of charge, to any person obtaining a # 14673 15319 # copy of this software and associated documentation files (the "Software"), # 14674 @@ -70,7 +70,7 @@ 15320 @@ -63,6 +63,7 @@ 15321 LIBTOOL_LINK = @LIB_LINK@ 15322 LIBTOOL_INSTALL = @LIB_INSTALL@ 15323 LIBTOOL_UNINSTALL = @LIB_UNINSTALL@ 15324 +LT_UNDEF = @LT_UNDEF@ 15325 15326 INSTALL = @INSTALL@ 15327 INSTALL_LIB = @INSTALL@ @INSTALL_LIB@ 15328 @@ -70,7 +71,7 @@ 14675 15329 INSTALL_DATA = @INSTALL_DATA@ 14676 15330 … … 14681 15335 LD = @LD@ 14682 15336 LN_S = @LN_S@ 15337 diff -Naur ncurses-5.7.orig/menu/m_attribs.c ncurses-5.7/menu/m_attribs.c 15338 --- ncurses-5.7.orig/menu/m_attribs.c 2004-12-11 15:29:12.000000000 -0800 15339 +++ ncurses-5.7/menu/m_attribs.c 2009-06-05 14:01:33.000000000 -0700 15340 @@ -37,7 +37,7 @@ 15341 15342 #include "menu.priv.h" 15343 15344 -MODULE_ID("$Id: m_attribs.c,v 1.14 2004/12/11 23:29:12 tom Exp $") 15345 +MODULE_ID("$Id: m_attribs.c,v 1.15 2008/11/16 00:19:59 juergen Exp $") 15346 15347 /* Macro to redraw menu if it is posted and changed */ 15348 #define Refresh_Menu(menu) \ 15349 @@ -49,9 +49,9 @@ 15350 15351 /* "Template" macro to generate a function to set a menus attribute */ 15352 #define GEN_MENU_ATTR_SET_FCT( name ) \ 15353 -NCURSES_IMPEXP int NCURSES_API set_menu_ ## name (MENU * menu, chtype attr)\ 15354 +NCURSES_IMPEXP int NCURSES_API set_menu_ ## name (MENU* menu, chtype attr) \ 15355 {\ 15356 - T((T_CALLED("set_menu_" #name "(%p,%s)"), menu, _traceattr(attr)));\ 15357 + T((T_CALLED("set_menu_" #name "(%p,%s)"), menu, _traceattr(attr))); \ 15358 if (!(attr==A_NORMAL || (attr & A_ATTRIBUTES)==attr))\ 15359 RETURN(E_BAD_ARGUMENT);\ 15360 if (menu && ( menu -> name != attr))\ 15361 @@ -140,4 +140,5 @@ 15362 | Return Values : Attribute value 15363 +--------------------------------------------------------------------------*/ 15364 GEN_MENU_ATTR_GET_FCT(grey) 15365 + 15366 /* m_attribs.c ends here */ 14683 15367 diff -Naur ncurses-5.7.orig/menu/m_cursor.c ncurses-5.7/menu/m_cursor.c 14684 15368 --- ncurses-5.7.orig/menu/m_cursor.c 2005-10-22 16:03:32.000000000 -0700 14685 +++ ncurses-5.7/menu/m_cursor.c 2009-0 3-22 21:17:08.396170694-070015369 +++ ncurses-5.7/menu/m_cursor.c 2009-06-05 14:01:18.000000000 -0700 14686 15370 @@ -1,5 +1,5 @@ 14687 15371 /**************************************************************************** … … 14711 15395 diff -Naur ncurses-5.7.orig/menu/m_driver.c ncurses-5.7/menu/m_driver.c 14712 15396 --- ncurses-5.7.orig/menu/m_driver.c 2008-08-03 15:08:22.000000000 -0700 14713 +++ ncurses-5.7/menu/m_driver.c 2009-0 3-22 21:17:08.396170694-070015397 +++ ncurses-5.7/menu/m_driver.c 2009-06-05 14:01:18.000000000 -0700 14714 15398 @@ -1,5 +1,5 @@ 14715 15399 /**************************************************************************** … … 14737 15421 | Description : Central dispatcher for the menu. Translates the logical 14738 15422 | request 'c' into a menu action. 15423 diff -Naur ncurses-5.7.orig/menu/menu.h ncurses-5.7/menu/menu.h 15424 --- ncurses-5.7.orig/menu/menu.h 2007-02-24 09:32:13.000000000 -0800 15425 +++ ncurses-5.7/menu/menu.h 2009-06-05 14:01:33.000000000 -0700 15426 @@ -1,5 +1,5 @@ 15427 /**************************************************************************** 15428 - * Copyright (c) 1998-2003,2007 Free Software Foundation, Inc. * 15429 + * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. * 15430 * * 15431 * Permission is hereby granted, free of charge, to any person obtaining a * 15432 * copy of this software and associated documentation files (the * 15433 @@ -30,7 +30,7 @@ 15434 * Author: Juergen Pfeifer, 1995,1997 * 15435 ****************************************************************************/ 15436 15437 -/* $Id: menu.h,v 1.19 2007/02/24 17:32:13 tom Exp $ */ 15438 +/* $Id: menu.h,v 1.20 2009/04/05 00:28:07 tom Exp $ */ 15439 15440 #ifndef ETI_MENU 15441 #define ETI_MENU 15442 @@ -249,6 +249,10 @@ 15443 15444 extern NCURSES_EXPORT(void) menu_format (const MENU *,int *,int *); 15445 15446 +#if NCURSES_SP_FUNCS 15447 +extern NCURSES_EXPORT(MENU *) NCURSES_SP_NAME(new_menu) (SCREEN*, ITEM **); 15448 +#endif 15449 + 15450 #ifdef __cplusplus 15451 } 15452 #endif 14739 15453 diff -Naur ncurses-5.7.orig/menu/menu.priv.h ncurses-5.7/menu/menu.priv.h 14740 15454 --- ncurses-5.7.orig/menu/menu.priv.h 2005-01-15 17:02:23.000000000 -0800 14741 +++ ncurses-5.7/menu/menu.priv.h 2009-0 3-22 21:17:08.396170694-070015455 +++ ncurses-5.7/menu/menu.priv.h 2009-06-05 14:01:18.000000000 -0700 14742 15456 @@ -1,5 +1,5 @@ 14743 15457 /**************************************************************************** … … 14772 15486 diff -Naur ncurses-5.7.orig/menu/m_global.c ncurses-5.7/menu/m_global.c 14773 15487 --- ncurses-5.7.orig/menu/m_global.c 2005-12-31 13:51:52.000000000 -0800 14774 +++ ncurses-5.7/menu/m_global.c 2009-0 3-22 21:17:08.396170694-070015488 +++ ncurses-5.7/menu/m_global.c 2009-06-05 14:01:18.000000000 -0700 14775 15489 @@ -1,5 +1,5 @@ 14776 15490 /**************************************************************************** … … 14811 15525 ITEM *cur_item; 14812 15526 bool mterm_called = FALSE; 15527 diff -Naur ncurses-5.7.orig/menu/m_new.c ncurses-5.7/menu/m_new.c 15528 --- ncurses-5.7.orig/menu/m_new.c 2006-11-04 11:04:06.000000000 -0800 15529 +++ ncurses-5.7/menu/m_new.c 2009-06-05 14:01:33.000000000 -0700 15530 @@ -1,5 +1,5 @@ 15531 /**************************************************************************** 15532 - * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. * 15533 + * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. * 15534 * * 15535 * Permission is hereby granted, free of charge, to any person obtaining a * 15536 * copy of this software and associated documentation files (the * 15537 @@ -37,11 +37,11 @@ 15538 15539 #include "menu.priv.h" 15540 15541 -MODULE_ID("$Id: m_new.c,v 1.18 2006/11/04 19:04:06 tom Exp $") 15542 +MODULE_ID("$Id: m_new.c,v 1.19 2009/04/05 00:32:13 tom Exp $") 15543 15544 /*--------------------------------------------------------------------------- 15545 | Facility : libnmenu 15546 -| Function : MENU *new_menu(ITEM **items) 15547 +| Function : MENU* _nc_new_menu(SCREEN*, ITEM **items) 15548 | 15549 | Description : Creates a new menu connected to the item pointer 15550 | array items and returns a pointer to the new menu. 15551 @@ -51,18 +51,25 @@ 15552 | Return Values : NULL on error 15553 +--------------------------------------------------------------------------*/ 15554 NCURSES_EXPORT(MENU *) 15555 -new_menu(ITEM ** items) 15556 +NCURSES_SP_NAME(new_menu) (NCURSES_SP_DCLx ITEM ** items) 15557 { 15558 int err = E_SYSTEM_ERROR; 15559 MENU *menu = (MENU *) calloc(1, sizeof(MENU)); 15560 15561 - T((T_CALLED("new_menu(%p)"), items)); 15562 + T((T_CALLED("new_menu(%p,%p)"), SP_PARM, items)); 15563 if (menu) 15564 { 15565 *menu = _nc_Default_Menu; 15566 menu->status = 0; 15567 menu->rows = menu->frows; 15568 menu->cols = menu->fcols; 15569 +#if NCURSES_SP_FUNCS 15570 + /* This ensures userwin and usersub are always non-null, 15571 + so we can derive always the SCREEN that this menu is 15572 + running on. */ 15573 + menu->userwin = SP_PARM->_stdscr; 15574 + menu->usersub = SP_PARM->_stdscr; 15575 +#endif 15576 if (items && *items) 15577 { 15578 if (!_nc_Connect_Items(menu, items)) 15579 @@ -71,6 +78,8 @@ 15580 free(menu); 15581 menu = (MENU *) 0; 15582 } 15583 + else 15584 + err = E_OK; 15585 } 15586 } 15587 15588 @@ -82,6 +91,25 @@ 15589 15590 /*--------------------------------------------------------------------------- 15591 | Facility : libnmenu 15592 +| Function : MENU *new_menu(ITEM **items) 15593 +| 15594 +| Description : Creates a new menu connected to the item pointer 15595 +| array items and returns a pointer to the new menu. 15596 +| The new menu is initialized with the values from the 15597 +| default menu. 15598 +| 15599 +| Return Values : NULL on error 15600 ++--------------------------------------------------------------------------*/ 15601 +#if NCURSES_SP_FUNCS 15602 +NCURSES_EXPORT(MENU *) 15603 +new_menu(ITEM ** items) 15604 +{ 15605 + return NCURSES_SP_NAME(new_menu) (CURRENT_SCREEN, items); 15606 +} 15607 +#endif 15608 + 15609 +/*--------------------------------------------------------------------------- 15610 +| Facility : libnmenu 15611 | Function : int free_menu(MENU *menu) 15612 | 15613 | Description : Disconnects menu from its associated item pointer 15614 diff -Naur ncurses-5.7.orig/menu/m_pad.c ncurses-5.7/menu/m_pad.c 15615 --- ncurses-5.7.orig/menu/m_pad.c 2004-12-25 13:40:58.000000000 -0800 15616 +++ ncurses-5.7/menu/m_pad.c 2009-06-05 14:01:33.000000000 -0700 15617 @@ -37,19 +37,19 @@ 15618 15619 #include "menu.priv.h" 15620 15621 -MODULE_ID("$Id: m_pad.c,v 1.10 2004/12/25 21:40:58 tom Exp $") 15622 +MODULE_ID("$Id: m_pad.c,v 1.11 2009/02/07 23:11:44 tom Exp $") 15623 15624 /* Macro to redraw menu if it is posted and changed */ 15625 #define Refresh_Menu(menu) \ 15626 if ( (menu) && ((menu)->status & _POSTED) )\ 15627 {\ 15628 _nc_Draw_Menu( menu );\ 15629 - _nc_Show_Menu( menu );\ 15630 + _nc_Show_Menu( menu ); \ 15631 } 15632 15633 /*--------------------------------------------------------------------------- 15634 | Facility : libnmenu 15635 -| Function : int set_menu_pad(MENU *menu, int pad) 15636 +| Function : int set_menu_pad(MENU* menu, int pad) 15637 | 15638 | Description : Set the character to be used to separate the item name 15639 | from its description. This must be a printable 14813 15640 diff -Naur ncurses-5.7.orig/menu/m_post.c ncurses-5.7/menu/m_post.c 14814 15641 --- ncurses-5.7.orig/menu/m_post.c 2004-12-25 15:57:04.000000000 -0800 14815 +++ ncurses-5.7/menu/m_post.c 2009-0 3-22 21:17:08.396170694-070015642 +++ ncurses-5.7/menu/m_post.c 2009-06-05 14:01:18.000000000 -0700 14816 15643 @@ -1,5 +1,5 @@ 14817 15644 /**************************************************************************** … … 14848 15675 | Description : Detach menu from screen 14849 15676 | 15677 diff -Naur ncurses-5.7.orig/menu/m_sub.c ncurses-5.7/menu/m_sub.c 15678 --- ncurses-5.7.orig/menu/m_sub.c 2004-12-25 13:38:31.000000000 -0800 15679 +++ ncurses-5.7/menu/m_sub.c 2009-06-05 14:01:33.000000000 -0700 15680 @@ -37,7 +37,7 @@ 15681 15682 #include "menu.priv.h" 15683 15684 -MODULE_ID("$Id: m_sub.c,v 1.10 2004/12/25 21:38:31 tom Exp $") 15685 +MODULE_ID("$Id: m_sub.c,v 1.11 2009/04/05 00:35:51 tom Exp $") 15686 15687 /*--------------------------------------------------------------------------- 15688 | Facility : libnmenu 15689 @@ -57,8 +57,22 @@ 15690 { 15691 if (menu->status & _POSTED) 15692 RETURN(E_POSTED); 15693 - menu->usersub = win; 15694 - _nc_Calculate_Item_Length_and_Width(menu); 15695 + else 15696 +#if NCURSES_SP_FUNCS 15697 + { 15698 + /* We ensure that usersub is never null. So even if a null 15699 + WINDOW parameter is passed, we store the SCREENS stdscr. 15700 + The only MENU that can have a null usersub is the static 15701 + _nc_default_Menu. 15702 + */ 15703 + SCREEN *sp = _nc_screen_of(menu->usersub); 15704 + 15705 + menu->usersub = win ? win : sp->_stdscr; 15706 + _nc_Calculate_Item_Length_and_Width(menu); 15707 + } 15708 +#else 15709 + menu->usersub = win; 15710 +#endif 15711 } 15712 else 15713 _nc_Default_Menu.usersub = win; 15714 @@ -68,7 +82,7 @@ 15715 15716 /*--------------------------------------------------------------------------- 15717 | Facility : libnmenu 15718 -| Function : WINDOW *menu_sub(const MENU *menu) 15719 +| Function : WINDOW* menu_sub(const MENU *menu) 15720 | 15721 | Description : Returns a pointer to the subwindow of the menu 15722 | 15723 diff -Naur ncurses-5.7.orig/menu/m_win.c ncurses-5.7/menu/m_win.c 15724 --- ncurses-5.7.orig/menu/m_win.c 2004-12-25 13:39:20.000000000 -0800 15725 +++ ncurses-5.7/menu/m_win.c 2009-06-05 14:01:33.000000000 -0700 15726 @@ -37,7 +37,7 @@ 15727 15728 #include "menu.priv.h" 15729 15730 -MODULE_ID("$Id: m_win.c,v 1.15 2004/12/25 21:39:20 tom Exp $") 15731 +MODULE_ID("$Id: m_win.c,v 1.16 2009/04/05 00:38:22 tom Exp $") 15732 15733 /*--------------------------------------------------------------------------- 15734 | Facility : libnmenu 15735 @@ -57,8 +57,22 @@ 15736 { 15737 if (menu->status & _POSTED) 15738 RETURN(E_POSTED); 15739 - menu->userwin = win; 15740 - _nc_Calculate_Item_Length_and_Width(menu); 15741 + else 15742 +#if NCURSES_SP_FUNCS 15743 + { 15744 + /* We ensure that userwin is never null. So even if a null 15745 + WINDOW parameter is passed, we store the SCREENS stdscr. 15746 + The only MENU that can have a null userwin is the static 15747 + _nc_default_Menu. 15748 + */ 15749 + SCREEN *sp = _nc_screen_of(menu->userwin); 15750 + 15751 + menu->userwin = win ? win : sp->_stdscr; 15752 + _nc_Calculate_Item_Length_and_Width(menu); 15753 + } 15754 +#else 15755 + menu->userwin = win; 15756 +#endif 15757 } 15758 else 15759 _nc_Default_Menu.userwin = win; 15760 @@ -68,7 +82,7 @@ 15761 15762 /*--------------------------------------------------------------------------- 15763 | Facility : libnmenu 15764 -| Function : WINDOW *menu_win(const MENU *) 15765 +| Function : WINDOW* menu_win(const MENU*) 15766 | 15767 | Description : Returns pointer to the window of the menu 15768 | 15769 @@ -80,7 +94,7 @@ 15770 const MENU *m = Normalize_Menu(menu); 15771 15772 T((T_CALLED("menu_win(%p)"), menu)); 15773 - returnWin(m->userwin ? m->userwin : stdscr); 15774 + returnWin(Get_Menu_UserWin(m)); 15775 } 15776 15777 /* m_win.c ends here */ 14850 15778 diff -Naur ncurses-5.7.orig/misc/gen-pkgconfig.in ncurses-5.7/misc/gen-pkgconfig.in 14851 15779 --- ncurses-5.7.orig/misc/gen-pkgconfig.in 1969-12-31 16:00:00.000000000 -0800 14852 +++ ncurses-5.7/misc/gen-pkgconfig.in 2009-0 3-22 21:17:09.916267635-070015780 +++ ncurses-5.7/misc/gen-pkgconfig.in 2009-06-05 14:01:21.000000000 -0700 14853 15781 @@ -0,0 +1,140 @@ 14854 15782 +#!@SHELL@ … … 14994 15922 diff -Naur ncurses-5.7.orig/misc/Makefile.in ncurses-5.7/misc/Makefile.in 14995 15923 --- ncurses-5.7.orig/misc/Makefile.in 2007-03-31 08:54:17.000000000 -0700 14996 +++ ncurses-5.7/misc/Makefile.in 2009-0 3-22 21:17:03.943886576-070015924 +++ ncurses-5.7/misc/Makefile.in 2009-06-05 14:01:12.000000000 -0700 14997 15925 @@ -1,6 +1,6 @@ 14998 15926 -# $Id: Makefile.in,v 1.43 2007/03/31 15:54:17 tom Exp $ … … 15077 16005 diff -Naur ncurses-5.7.orig/misc/ncu-indent ncurses-5.7/misc/ncu-indent 15078 16006 --- ncurses-5.7.orig/misc/ncu-indent 2008-08-03 08:46:44.000000000 -0700 15079 +++ ncurses-5.7/misc/ncu-indent 2009-0 3-22 21:17:08.396170694-070016007 +++ ncurses-5.7/misc/ncu-indent 2009-06-05 14:01:18.000000000 -0700 15080 16008 @@ -26,7 +26,7 @@ 15081 16009 #* sale, use or other dealings in this Software without prior written * … … 15126 16054 diff -Naur ncurses-5.7.orig/misc/ncurses-config.in ncurses-5.7/misc/ncurses-config.in 15127 16055 --- ncurses-5.7.orig/misc/ncurses-config.in 2007-03-17 13:02:19.000000000 -0700 15128 +++ ncurses-5.7/misc/ncurses-config.in 2009-0 3-22 21:17:09.916267635-070016056 +++ ncurses-5.7/misc/ncurses-config.in 2009-06-05 14:01:21.000000000 -0700 15129 16057 @@ -1,7 +1,7 @@ 15130 16058 #!@SHELL@ … … 15261 16189 diff -Naur ncurses-5.7.orig/misc/terminfo.src ncurses-5.7/misc/terminfo.src 15262 16190 --- ncurses-5.7.orig/misc/terminfo.src 2008-10-12 16:03:54.000000000 -0700 15263 +++ ncurses-5.7/misc/terminfo.src 2009-0 3-22 21:16:59.595606369-070016191 +++ ncurses-5.7/misc/terminfo.src 2009-06-05 14:01:49.000000000 -0700 15264 16192 @@ -6,8 +6,8 @@ 15265 16193 # Report bugs and new terminal descriptions to … … 15268 16196 -# $Revision: 1.341 $ 15269 16197 -# $Date: 2008/10/12 23:03:54 $ 15270 +# $Revision: 1.34 5$15271 +# $Date: 2009/0 1/11 00:47:37$16198 +# $Revision: 1.348 $ 16199 +# $Date: 2009/05/02 22:23:20 $ 15272 16200 # 15273 16201 # The original header is preserved below for reference. It is noted that there … … 15300 16228 15301 16229 ansi+enq|ncurses extension for ANSI ENQ, 15302 @@ -1005,7 +1005,7 @@ 16230 @@ -617,11 +617,45 @@ 16231 clear=\E[2J, cub1=^H, cud1=\E[B, cuf1=\E[C, 16232 cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, el=\E[k, home=\E[H, 16233 is2=\E[m\E[?7h, kcub1=^H, kcud1=^J, kcuf1=^L, kcuu1=^K, 16234 - khome=^^, pfkey=\E[0;%p1%{58}%+%d;%p2"%s", rc=\E[u, 16235 + khome=^^, pfkey=\E[0;%p1%{58}%+%d;%p2"%s"p, rc=\E[u, 16236 rmam=\E[?7l, sc=\E[s, smam=\E[?7h, u6=\E[%i%d;%dR, 16237 u7=\E[6n, use=klone+color, use=klone+sgr8, 16238 + 16239 +# Keypad: Home=\0G Up=\0H PrPag=\0I 16240 +# ka1,kh kcuu1 kpp,ka3 16241 +# 16242 +# Left=\0K 5=\0L Right=\0M 16243 +# kcub1 kb2 kcuf1 16244 +# 16245 +# End=\0O Down=\0P NxPag=\0Q 16246 +# kc1,kend kcud1 kc3,knp 16247 +# 16248 +# Ins=\0R Del=\0S 16249 +# kich1 kdch1 16250 +# 16251 +# On keyboard with 12 function keys, 16252 +# shifted f-keys: F13-F24 16253 +# control f-keys: F25-F36 16254 +# alt f-keys: F37-F48 16255 +# The shift/control/alt keys do not modify each other, but alt overrides both, 16256 +# and control overrides shift. 16257 +# 16258 +# <pfkey> capability for F1-F48 -TD 16259 ansi.sys|ANSI.SYS 3.1 and later versions, 16260 - el=\E[K, use=ansi.sys-old, 16261 + el=\E[K, ka1=\0G, ka3=\0I, kb2=\0L, kbs=^H, kc1=\0O, kc3=\0Q, 16262 + kcbt=\0^O, kcub1=\0K, kcud1=\0P, kcuf1=\0M, kcuu1=\0H, 16263 + kdch1=\0S, kend=\0O, kf1=\0;, kf10=\0D, kf11=\0\205, 16264 + kf12=\0\206, kf13=\0T, kf14=\0U, kf15=\0V, kf16=\0W, 16265 + kf17=\0X, kf18=\0Y, kf19=\0Z, kf2=\0<, kf20=\0[, kf21=\0\\, 16266 + kf22=\0], kf23=\0\207, kf24=\0\210, kf25=\0\^, kf26=\0_, 16267 + kf27=\0`, kf28=\0a, kf29=\0b, kf3=\0=, kf30=\0c, kf31=\0d, 16268 + kf32=\0e, kf33=\0f, kf34=\0g, kf35=\0\211, kf36=\0\212, 16269 + kf37=\0h, kf38=\0i, kf39=\0j, kf4=\0>, kf40=\0k, kf41=\0l, 16270 + kf42=\0m, kf43=\0n, kf44=\0o, kf45=\0p, kf46=\0q, 16271 + kf47=\0\213, kf48=\0\214, kf5=\0?, kf6=\0@, kf7=\0A, kf8=\0B, 16272 + kf9=\0C, khome=\0G, kich1=\0R, knp=\0Q, kpp=\0I, 16273 + pfkey=\E[0;%?%p1%{11}%<%t%'\:'%e%?%p1%{13}%<%t%'z'%e%?%p1%{23}%<%t%'G'%e%?%p1%{25}%<%t%'p'%e%?%p1%'#'%<%t%'E'%e%?%p1%'%'%<%t%'f'%e%?%p1%'/'%<%t%'C'%e%{92}%;%;%;%;%;%;%;%p1%+%d;%p2"%s"p, 16274 + use=ansi.sys-old, 16275 16276 # 16277 # Define IBM PC keypad keys for vi as per MS-Kermit while using ANSI.SYS. 16278 @@ -1005,7 +1039,7 @@ 15303 16279 sc=\E7, 15304 16280 sgr=\E[10m\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p9%t;12%e;10%;%?%p7%t;9%;m, … … 15309 16285 pc6300plus|AT&T 6300 plus, 15310 16286 OTbs, am, xon, 15311 @@ -1416,7 +14 16,7 @@16287 @@ -1416,7 +1450,7 @@ 15312 16288 setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m, 15313 16289 sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%t;7%;%?%p7%t;9%;m%?%p9%t\016%e\017%;, … … 15318 16294 # 15319 16295 qansi|QNX ansi with console writes, 15320 @@ -4357,6 +4357,26 @@ 16296 @@ -4285,6 +4319,30 @@ 16297 smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, u6=\E[%i%d;%dR, 16298 u7=\E[6n, vpa=\E[%i%p1%dd, 16299 16300 +#### VWM 16301 +# 16302 +# vwmterm is a terminal emulator written for the VWM console window manager 16303 +# 16304 +vwmterm|(vwm term), 16305 + am, bce, ccc, mir, msgr, npc, xenl, xon, 16306 + colors#8, pairs#64, 16307 + acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, 16308 + bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l, 16309 + clear=\E[H\E[J, cnorm=\E[?25h, cr=^M, cub1=^H, 16310 + cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, 16311 + cvvis=\E[?25h, dim=\E[2m, ed=\E[J, el=\E[K, home=\E[H, 16312 + il1=\E[L, ind=^J, invis=\E[8m, kcub1=\E[D, kcud1=\E[B, 16313 + kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kend=\E[4~, kf1=\E[[A, 16314 + kf10=\E[21~, kf11=\E[22~, kf12=\E[23~, kf2=\E[[B, 16315 + kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, 16316 + kf8=\E[19~, kf9=\E[20~, khome=\E[1~, knp=\E[6~, kpp=\E[5~, 16317 + rev=\E[7m, rmacs=\E[10m, rmam=\E[?7l, rmcup=\E[?1049l, 16318 + rs1=\E[H\E[J\E[m\Ec, setab=\E[4%p1%dm, 16319 + setaf=\E[3%p1%dm, 16320 + sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m, 16321 + sgr0=\E[0;10m, smacs=\E[11m, smam=\E[?7h, 16322 + smcup=\E[?1049h, smso=\E[3m, smul=\E[4m, 16323 + 16324 #### MGR 16325 # 16326 # MGR is a Bell Labs window system lighter-weight than X. 16327 @@ -4357,6 +4415,26 @@ 15321 16328 sgr0=\E[m, smcup=\E7\E[?47h, smir=\E[4h, smso=\E[7m, 15322 16329 smul=\E[4m, … … 15345 16352 # Michael Schroeder, Oliver Laumann. The screen and 15346 16353 # screen-w entries came with version 3.7.1. The screen2 and screen3 entries 15347 @@ -4497,6 +45 17,8 @@16354 @@ -4497,6 +4575,8 @@ 15348 16355 cvvis@, flash@, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, 15349 16356 kcuu1=\EOA, use=screen+fkeys, use=vt100+enq, … … 15354 16361 screen.linux|screen in linux console, 15355 16362 bw, 15356 @@ -5247,7 +5269,7 @@ 16363 @@ -5042,44 +5122,13 @@ 16364 16365 ### EMX termcap.dat compatibility modes 16366 # 16367 -# Keypad: Home=\0G Up=\0H PrPag=\0I 16368 -# ka1,kh kcuu1 kpp,ka3 16369 -# 16370 -# Left=\0K 5=\0L Right=\0M 16371 -# kcub1 kb2 kcuf1 16372 -# 16373 -# End=\0O Down=\0P NxPag=\0Q 16374 -# kc1,kend kcud1 kc3,knp 16375 -# 16376 -# Ins=\0R Del=\0S 16377 -# kich1 kdch1 16378 -# 16379 -# On keyboard with 12 function keys, 16380 -# shifted f-keys: F13-F24 16381 -# control f-keys: F25-F36 16382 -# alt f-keys: F37-F48 16383 -# The shift/control/alt keys do not modify each other, but alt overrides both, 16384 -# and control overrides shift. 16385 -# 16386 # Also (possibly only EMX, so we don't put it in ansi.sys, etc): set the 16387 # no_color_video to inform the application that standout(1), underline(2) 16388 # reverse(4) and invisible(64) don't work with color. 16389 emx-base|DOS special keys, 16390 bce, bw, 16391 it#8, ncv#71, 16392 - bel=^G, ka1=\0G, ka3=\0I, kb2=\0L, kbs=^H, kc1=\0O, kc3=\0Q, 16393 - kcbt=\0^O, kcub1=\0K, kcud1=\0P, kcuf1=\0M, kcuu1=\0H, 16394 - kdch1=\0S, kend=\0O, kf1=\0;, kf10=\0D, kf11=\0\205, 16395 - kf12=\0\206, kf13=\0T, kf14=\0U, kf15=\0V, kf16=\0W, 16396 - kf17=\0X, kf18=\0Y, kf19=\0Z, kf2=\0<, kf20=\0[, kf21=\0\\, 16397 - kf22=\0], kf23=\0\207, kf24=\0\210, kf25=\0\^, kf26=\0_, 16398 - kf27=\0`, kf28=\0a, kf29=\0b, kf3=\0=, kf30=\0c, kf31=\0d, 16399 - kf32=\0e, kf33=\0f, kf34=\0g, kf35=\0\211, kf36=\0\212, 16400 - kf37=\0h, kf38=\0i, kf39=\0j, kf4=\0>, kf40=\0k, kf41=\0l, 16401 - kf42=\0m, kf43=\0n, kf44=\0o, kf45=\0p, kf46=\0q, 16402 - kf47=\0\213, kf48=\0\214, kf5=\0?, kf6=\0@, kf7=\0A, kf8=\0B, 16403 - kf9=\0C, khome=\0G, kich1=\0R, knp=\0Q, kpp=\0I, 16404 - use=ansi.sys, 16405 + bel=^G, use=ansi.sys, 16406 16407 # Except for the "-emx" suffixes, these are as distributed with EMX 0.9b, 16408 # a Unix-style environment used on OS/2. (Note that the suffix makes some 16409 @@ -5247,7 +5296,7 @@ 15357 16410 setab=\E[4%p1%dm, setaf=\E[3%p1%dm, 15358 16411 sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;12%;m, … … 15363 16416 # Key definitions: 15364 16417 # The encodings for unshifted arrow keys, F1-F12, Home, Insert, etc. match the 15365 @@ -11060,7 +11 082,7 @@16418 @@ -11060,7 +11109,7 @@ 15366 16419 sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m, 15367 16420 sgr0=\E[m, … … 15372 16425 15373 16426 aaa+rv|ann arbor ambassador in reverse video, 15374 @@ -12147,7 +121 69,7 @@16427 @@ -12147,7 +12196,7 @@ 15375 16428 sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m, 15376 16429 sgr0=\E[m, smacs=\017$<1>, smcup=\E[=4l\E[1;24w\E2\r, … … 15381 16434 flash=\E[=205l$<200>\E[=205h, is1=\E[=103l\E[=205h, 15382 16435 use=avt-ns, 15383 @@ -14584,7 +146 06,7 @@16436 @@ -14584,7 +14633,7 @@ 15384 16437 sc=\E[%y, 15385 16438 sgr=\E[%{0}%?%p1%p3%|%t%{7}%+%;%?%p2%t%{2}%+%;%?%p4%t%{5}%+%;%?%p6%t%{1}%+%;m%?%p8%t\E[%{32}%+%d%%{%;%?%p9%t\016%e\017%;, … … 15390 16443 # p9-w: Prism-9 in 132 column mode 15391 16444 # -------------------------------- 15392 @@ -16037,7 +160 59,7 @@16445 @@ -16037,7 +16086,7 @@ 15393 16446 rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, rmam=\E[?7l, 15394 16447 rmso=\E[m, rmul=\E[m, … … 15399 16452 # The tek4125 emulates a vt100 incorrectly - the scrolling region 15400 16453 # command is ignored. The following entry replaces <csr> with the needed 15401 @@ -17729,7 +177 51,7 @@16454 @@ -17729,7 +17778,7 @@ 15402 16455 rmul=\E[m, rs2=\E[?=h\Ec, s0ds=^O, s1ds=^N, 15403 16456 sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, … … 15408 16461 tws2102-sna|dku7102-sna|BULL Questar tws2102 for SNA, 15409 16462 dsl=\E[0;98v\E[2J\E[v, fsl=\E[v, is3=\Eb, tsl=\E[0;98v, 15410 @@ -21791,6 +218 13,16@@16463 @@ -21791,6 +21840,25 @@ 15411 16464 # * add "aterm" -TD 15412 16465 # * add "linux2.6.26" -TD … … 15422 16475 +# * add screen.Eterm -TD 15423 16476 +# 16477 +# 2009-03-28 16478 +# * correct typo in pfkey of ansi.sys-old 16479 +# (report by Kalle Olavi Niemitalo) 16480 +# * move function- and cursor-keys from emx-base to ansi.sys, and create 16481 +# a pfkey capability which handles F1-F48 -TD 16482 +# 16483 +# 2009-05-02 16484 +# * add vwmterm entry (Bryan Christ) 16485 +# 15424 16486 # The following sets edit modes for GNU EMACS. 15425 16487 # Local Variables: … … 15427 16489 diff -Naur ncurses-5.7.orig/mk-1st.awk ncurses-5.7/mk-1st.awk 15428 16490 --- ncurses-5.7.orig/mk-1st.awk 2007-03-24 15:10:55.000000000 -0700 15429 +++ ncurses-5.7/mk-1st.awk 2009-0 3-22 21:16:56.935437910 -070016491 +++ ncurses-5.7/mk-1st.awk 2009-06-05 14:01:30.000000000 -0700 15430 16492 @@ -1,6 +1,6 @@ 15431 16493 -# $Id: mk-1st.awk,v 1.78 2007/03/24 22:10:55 tom Exp $ 15432 +# $Id: mk-1st.awk,v 1.8 0 2009/01/04 21:51:38 tomExp $16494 +# $Id: mk-1st.awk,v 1.81 2009/03/28 18:59:51 Charles.Wilson Exp $ 15433 16495 ############################################################################## 15434 16496 -# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. # 15435 +# Copyright (c) 1998-200 7,2008Free Software Foundation, Inc. #16497 +# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. # 15436 16498 # # 15437 16499 # Permission is hereby granted, free of charge, to any person obtaining a # … … 15446 16508 # see lib_name 15447 16509 function lib_name_of(a_name) { 15448 @@ -404,7 +404,7 @@ 16510 @@ -386,7 +386,13 @@ 16511 } 16512 end_name = lib_name; 16513 printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS 16514 - printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST)\n", compile, lib_name, OBJS 16515 + if ( is_ticlib() ) { 16516 + printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TICS_LIST)\n", compile, lib_name, OBJS 16517 + } else if ( is_termlib() ) { 16518 + printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TINFO_LIST)\n", compile, lib_name, OBJS 16519 + } else { 16520 + printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST)\n", compile, lib_name, OBJS 16521 + } 16522 print "" 16523 print "install \\" 16524 print "install.libs \\" 16525 @@ -404,7 +410,7 @@ 15449 16526 { 15450 16527 end_name = lib_name; … … 15457 16534 diff -Naur ncurses-5.7.orig/ncurses/base/define_key.c ncurses-5.7/ncurses/base/define_key.c 15458 16535 --- ncurses-5.7.orig/ncurses/base/define_key.c 2006-12-30 15:23:31.000000000 -0800 15459 +++ ncurses-5.7/ncurses/base/define_key.c 2009-0 3-22 21:17:05.639993853-070016536 +++ ncurses-5.7/ncurses/base/define_key.c 2009-06-05 14:01:51.000000000 -0700 15460 16537 @@ -1,5 +1,5 @@ 15461 16538 /**************************************************************************** … … 15465 16542 * Permission is hereby granted, free of charge, to any person obtaining a * 15466 16543 * copy of this software and associated documentation files (the * 15467 @@ -27, 20 +27,21@@16544 @@ -27,33 +27,34 @@ 15468 16545 ****************************************************************************/ 15469 16546 … … 15477 16554 15478 16555 -MODULE_ID("$Id: define_key.c,v 1.13 2006/12/30 23:23:31 tom Exp $") 15479 +MODULE_ID("$Id: define_key.c,v 1.1 5 2009/02/15 00:30:40tom Exp $")16556 +MODULE_ID("$Id: define_key.c,v 1.17 2009/05/09 18:30:16 tom Exp $") 15480 16557 15481 16558 NCURSES_EXPORT(int) … … 15485 16562 int code = ERR; 15486 16563 15487 16564 - T((T_CALLED("define_key(%s,%d)"), _nc_visbuf(str), keycode)); 15488 16565 - if (SP == 0) { 15489 + if (SP_PARM == 0) { 16566 + T((T_CALLED("define_key(%p, %s,%d)"), SP_PARM, _nc_visbuf(str), keycode)); 16567 + if (SP_PARM == 0 || !HasTInfoTerminal(SP_PARM)) { 15490 16568 code = ERR; 15491 16569 } else if (keycode > 0) { 15492 16570 unsigned ukey = (unsigned) keycode; 15493 @@ -48,12 +49,12 @@ 16571 15494 16572 if (str != 0) { 15495 15496 16573 - define_key(str, 0); 16574 - } else if (has_key(keycode)) { 15497 16575 - while (_nc_remove_key(&(SP->_keytry), ukey)) 16576 + NCURSES_SP_NAME(define_key) (NCURSES_SP_ARGx str, 0); 16577 + } else if (NCURSES_SP_NAME(has_key) (NCURSES_SP_ARGx keycode)) { 15498 16578 + while (_nc_remove_key(&(SP_PARM->_keytry), ukey)) 15499 16579 code = OK; 15500 16580 } 15501 16581 if (str != 0) { 15502 16582 - if (key_defined(str) == 0) { 15503 16583 - if (_nc_add_to_try(&(SP->_keytry), str, ukey) == OK) { 16584 + if (NCURSES_SP_NAME(key_defined) (NCURSES_SP_ARGx str) == 0) { 15504 16585 + if (_nc_add_to_try(&(SP_PARM->_keytry), str, ukey) == OK) { 15505 16586 code = OK; … … 15526 16607 diff -Naur ncurses-5.7.orig/ncurses/base/keybound.c ncurses-5.7/ncurses/base/keybound.c 15527 16608 --- ncurses-5.7.orig/ncurses/base/keybound.c 2006-06-17 11:19:24.000000000 -0700 15528 +++ ncurses-5.7/ncurses/base/keybound.c 2009-0 3-22 21:17:07.012081575-070016609 +++ ncurses-5.7/ncurses/base/keybound.c 2009-06-05 14:01:16.000000000 -0700 15529 16610 @@ -1,5 +1,5 @@ 15530 16611 /**************************************************************************** … … 15577 16658 diff -Naur ncurses-5.7.orig/ncurses/base/key_defined.c ncurses-5.7/ncurses/base/key_defined.c 15578 16659 --- ncurses-5.7.orig/ncurses/base/key_defined.c 2006-12-30 15:22:55.000000000 -0800 15579 +++ ncurses-5.7/ncurses/base/key_defined.c 2009-0 3-22 21:17:07.012081575-070016660 +++ ncurses-5.7/ncurses/base/key_defined.c 2009-06-05 14:01:16.000000000 -0700 15580 16661 @@ -1,5 +1,5 @@ 15581 16662 /**************************************************************************** … … 15623 16704 diff -Naur ncurses-5.7.orig/ncurses/base/keyok.c ncurses-5.7/ncurses/base/keyok.c 15624 16705 --- ncurses-5.7.orig/ncurses/base/keyok.c 2006-12-30 08:22:33.000000000 -0800 15625 +++ ncurses-5.7/ncurses/base/keyok.c 2009-0 3-22 21:17:05.639993853-070016706 +++ ncurses-5.7/ncurses/base/keyok.c 2009-06-05 14:01:14.000000000 -0700 15626 16707 @@ -1,5 +1,5 @@ 15627 16708 /**************************************************************************** … … 15695 16776 diff -Naur ncurses-5.7.orig/ncurses/base/legacy_coding.c ncurses-5.7/ncurses/base/legacy_coding.c 15696 16777 --- ncurses-5.7.orig/ncurses/base/legacy_coding.c 2005-12-17 15:38:17.000000000 -0800 15697 +++ ncurses-5.7/ncurses/base/legacy_coding.c 2009-0 3-22 21:17:07.012081575-070016778 +++ ncurses-5.7/ncurses/base/legacy_coding.c 2009-06-05 14:01:16.000000000 -0700 15698 16779 @@ -1,5 +1,5 @@ 15699 16780 /**************************************************************************** … … 15744 16825 diff -Naur ncurses-5.7.orig/ncurses/base/lib_addch.c ncurses-5.7/ncurses/base/lib_addch.c 15745 16826 --- ncurses-5.7.orig/ncurses/base/lib_addch.c 2008-08-16 12:20:04.000000000 -0700 15746 +++ ncurses-5.7/ncurses/base/lib_addch.c 2009-0 3-22 21:17:00.859689900 -070016827 +++ ncurses-5.7/ncurses/base/lib_addch.c 2009-06-05 14:01:52.000000000 -0700 15747 16828 @@ -1,5 +1,5 @@ 15748 16829 /**************************************************************************** … … 15757 16838 15758 16839 -MODULE_ID("$Id: lib_addch.c,v 1.113 2008/08/16 19:20:04 tom Exp $") 15759 +MODULE_ID("$Id: lib_addch.c,v 1.11 5 2009/01/17 20:37:32tom Exp $")16840 +MODULE_ID("$Id: lib_addch.c,v 1.119 2009/05/15 23:47:26 tom Exp $") 15760 16841 15761 16842 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT); 15762 16843 15763 @@ -265,15 +265,25 @@ 16844 @@ -260,20 +260,37 @@ 16845 /* 16846 * Build up multibyte characters until we have a wide-character. 16847 */ 16848 +#if NCURSES_SP_FUNCS 16849 +#define DeriveSP() SCREEN *sp = _nc_screen_of(win); 16850 +#else 16851 +#define DeriveSP() /*nothing*/ 16852 +#endif 16853 if_WIDEC({ 16854 + DeriveSP(); 16855 if (WINDOW_EXT(win, addch_used) != 0 || !Charable(ch)) { 15764 16856 int len = _nc_build_wch(win, CHREF(ch)); 15765 16857 … … 15770 16862 + /* handle EILSEQ (i.e., when len >= -1) */ 15771 16863 if (is8bits(CharOf(ch))) { 15772 + int rc = OK; 15773 const char *s = unctrl((chtype) CharOf(ch)); 16864 - const char *s = unctrl((chtype) CharOf(ch)); 15774 16865 - if (s[1] != 0) { 15775 16866 - return waddstr(win, s); 16867 + int rc = OK; 16868 + const char *s = NCURSES_SP_NAME(unctrl) 16869 + (NCURSES_SP_ARGx (chtype) CharOf(ch)); 15776 16870 + 15777 16871 + if (s[1] != '\0') { … … 15791 16885 return OK; 15792 16886 } 15793 @@ -327,6 +3 37,7 @@16887 @@ -327,6 +344,7 @@ 15794 16888 return ERR; 15795 16889 x = win->_curx; … … 15799 16893 /* 15800 16894 * Check for cells which are orphaned by adding this character, set 16895 @@ -394,8 +412,11 @@ 16896 { 16897 NCURSES_SIZE_T x, y; 16898 chtype t = CharOf(ch); 16899 - const char *s = unctrl(t); 16900 - 16901 +#if USE_WIDEC_SUPPORT || NCURSES_SP_FUNCS || USE_REENTRANT 16902 + SCREEN *sp = _nc_screen_of(win); 16903 +#endif 16904 + const char *s = NCURSES_SP_NAME(unctrl) (NCURSES_SP_ARGx t); 16905 + int tabsize = 8; 16906 /* 16907 * If we are using the alternate character set, forget about locale. 16908 * Otherwise, if unctrl() returns a single-character or the locale 16909 @@ -404,14 +425,14 @@ 16910 if ((AttrOf(ch) & A_ALTCHARSET) 16911 || ( 16912 #if USE_WIDEC_SUPPORT 16913 - (SP != 0 && SP->_legacy_coding) && 16914 + (sp != 0 && sp->_legacy_coding) && 16915 #endif 16916 s[1] == 0 16917 ) 16918 || ( 16919 isprint(t) 16920 #if USE_WIDEC_SUPPORT 16921 - || ((SP == 0 || !SP->_legacy_coding) && 16922 + || ((sp == 0 || !sp->_legacy_coding) && 16923 (WINDOW_EXT(win, addch_used) 16924 || !_nc_is_charable(CharOf(ch)))) 16925 #endif 16926 @@ -427,8 +448,12 @@ 16927 16928 switch (t) { 16929 case '\t': 16930 - x += (TABSIZE - (x % TABSIZE)); 16931 - 16932 +#if USE_REENTRANT 16933 + tabsize = sp->_TABSIZE; 16934 +#else 16935 + tabsize = TABSIZE; 16936 +#endif 16937 + x += (tabsize - (x % tabsize)); 16938 /* 16939 * Space-fill the tab on the bottom line so that we'll get the 16940 * "correct" cursor position. 15801 16941 diff -Naur ncurses-5.7.orig/ncurses/base/lib_beep.c ncurses-5.7/ncurses/base/lib_beep.c 15802 16942 --- ncurses-5.7.orig/ncurses/base/lib_beep.c 2005-04-09 08:20:04.000000000 -0700 15803 +++ ncurses-5.7/ncurses/base/lib_beep.c 2009-0 3-22 21:17:05.639993853-070016943 +++ ncurses-5.7/ncurses/base/lib_beep.c 2009-06-05 14:01:54.000000000 -0700 15804 16944 @@ -1,5 +1,5 @@ 15805 16945 /**************************************************************************** 15806 16946 - * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc. * 15807 + * Copyright (c) 1998-200 5,2009 Free Software Foundation, Inc. *16947 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 15808 16948 * * 15809 16949 * Permission is hereby granted, free of charge, to any person obtaining a * … … 15817 16957 15818 16958 /* 15819 @@ -42,7 +43,7 @@ 16959 @@ -40,9 +41,12 @@ 16960 */ 16961 15820 16962 #include <curses.priv.h> 15821 16963 -#include <term.h> /* beep, flash */ 15822 16964 15823 16965 -MODULE_ID("$Id: lib_beep.c,v 1.10 2005/04/09 15:20:04 tom Exp $") 15824 +MODULE_ID("$Id: lib_beep.c,v 1.11 2009/02/15 00:32:06 tom Exp $") 16966 +#ifndef CUR 16967 +#define CUR SP_TERMTYPE 16968 +#endif 16969 + 16970 +MODULE_ID("$Id: lib_beep.c,v 1.14 2009/05/23 19:33:20 tom Exp $") 15825 16971 15826 16972 /* 15827 16973 * beep() 15828 @@ -53, 7 +54,7@@16974 @@ -53,12 +57,16 @@ 15829 16975 */ 15830 16976 … … 15835 16981 int res = ERR; 15836 16982 15837 @@ -74,3 +75,11 @@ 16983 - T((T_CALLED("beep()"))); 16984 + T((T_CALLED("beep(%p)"), SP_PARM)); 16985 16986 +#ifdef USE_TERM_DRIVER 16987 + if (SP_PARM != 0) 16988 + res = CallDriver_1(SP_PARM, doBeepOrFlash, TRUE); 16989 +#else 16990 /* FIXME: should make sure that we are not in altchar mode */ 16991 if (cur_term == 0) { 16992 res = ERR; 16993 @@ -71,6 +79,15 @@ 16994 res = putp(flash_screen); 16995 _nc_flush(); 16996 } 16997 +#endif 15838 16998 15839 16999 returnCode(res); … … 15849 17009 diff -Naur ncurses-5.7.orig/ncurses/base/lib_color.c ncurses-5.7/ncurses/base/lib_color.c 15850 17010 --- ncurses-5.7.orig/ncurses/base/lib_color.c 2007-04-07 10:07:28.000000000 -0700 15851 +++ ncurses-5.7/ncurses/base/lib_color.c 2009-0 3-22 21:17:05.643993853-070017011 +++ ncurses-5.7/ncurses/base/lib_color.c 2009-06-05 14:01:51.000000000 -0700 15852 17012 @@ -1,5 +1,5 @@ 15853 17013 /**************************************************************************** … … 15865 17025 15866 17026 /* lib_color.c 15867 @@ -42,7 +43, 7@@17027 @@ -42,7 +43,11 @@ 15868 17028 #include <term.h> 15869 17029 #include <tic.h> 15870 17030 15871 17031 -MODULE_ID("$Id: lib_color.c,v 1.85 2007/04/07 17:07:28 tom Exp $") 15872 +MODULE_ID("$Id: lib_color.c,v 1.88 2009/02/15 00:33:02 tom Exp $") 17032 +#ifndef CUR 17033 +#define CUR SP_TERMTYPE 17034 +#endif 17035 + 17036 +MODULE_ID("$Id: lib_color.c,v 1.91 2009/05/10 00:48:29 tom Exp $") 15873 17037 15874 17038 /* 15875 17039 * These should be screen structure members. They need to be globals for 15876 @@ -108,6 +1 09,13 @@17040 @@ -108,6 +113,13 @@ 15877 17041 }; 15878 17042 /* *INDENT-ON* */ … … 15888 17052 /* 15889 17053 * These are called from _nc_do_color(), which in turn is called from 15890 @@ -237,15 +245,15 @@ 17054 @@ -147,31 +159,39 @@ 17055 } 17056 17057 static void 17058 -set_background_color(int bg, int (*outc) (int)) 17059 +set_background_color(NCURSES_SP_DCLx int bg, NCURSES_SP_OUTC outc) 17060 { 17061 if (set_a_background) { 17062 TPUTS_TRACE("set_a_background"); 17063 - tputs(TPARM_1(set_a_background, bg), 1, outc); 17064 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx 17065 + TPARM_1(set_a_background, bg), 17066 + 1, outc); 17067 } else { 17068 TPUTS_TRACE("set_background"); 17069 - tputs(TPARM_1(set_background, toggled_colors(bg)), 1, outc); 17070 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx 17071 + TPARM_1(set_background, toggled_colors(bg)), 17072 + 1, outc); 17073 } 17074 } 17075 17076 static void 17077 -set_foreground_color(int fg, int (*outc) (int)) 17078 +set_foreground_color(NCURSES_SP_DCLx int fg, NCURSES_SP_OUTC outc) 17079 { 17080 if (set_a_foreground) { 17081 TPUTS_TRACE("set_a_foreground"); 17082 - tputs(TPARM_1(set_a_foreground, fg), 1, outc); 17083 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx 17084 + TPARM_1(set_a_foreground, fg), 17085 + 1, outc); 17086 } else { 17087 TPUTS_TRACE("set_foreground"); 17088 - tputs(TPARM_1(set_foreground, toggled_colors(fg)), 1, outc); 17089 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx 17090 + TPARM_1(set_foreground, toggled_colors(fg)), 17091 + 1, outc); 17092 } 17093 } 17094 17095 static void 17096 -init_color_table(void) 17097 +init_color_table(NCURSES_SP_DCL0) 17098 { 17099 const color_t *tp; 17100 int n; 17101 @@ -200,7 +220,7 @@ 17102 * Reset the color pair, e.g., to whatever color pair 0 is. 17103 */ 17104 static bool 17105 -reset_color_pair(void) 17106 +reset_color_pair(NCURSES_SP_DCL0) 17107 { 17108 bool result = FALSE; 17109 17110 @@ -220,13 +240,16 @@ 17111 bool 17112 _nc_reset_colors(void) 17113 { 17114 +#if NCURSES_SP_FUNCS 17115 + SCREEN *sp = CURRENT_SCREEN; 17116 +#endif 17117 int result = FALSE; 17118 17119 T((T_CALLED("_nc_reset_colors()"))); 17120 if (SP->_color_defs > 0) 17121 SP->_color_defs = -(SP->_color_defs); 17122 17123 - if (reset_color_pair()) 17124 + if (reset_color_pair(NCURSES_SP_ARG)) 17125 result = TRUE; 17126 if (orig_colors != 0) { 17127 TPUTS_TRACE("orig_colors"); 17128 @@ -237,45 +260,60 @@ 15891 17129 } 15892 17130 … … 15907 17145 } else { 15908 17146 15909 @@ -255,27 +263,38 @@ 17147 - if (reset_color_pair() != TRUE) { 17148 - set_foreground_color(default_fg(), _nc_outch); 17149 - set_background_color(default_bg(), _nc_outch); 17150 + if (reset_color_pair(NCURSES_SP_ARG) != TRUE) { 17151 + set_foreground_color(NCURSES_SP_ARGx 17152 + default_fg(), 17153 + NCURSES_SP_NAME(_nc_outch)); 17154 + set_background_color(NCURSES_SP_ARGx 17155 + default_bg(), 17156 + NCURSES_SP_NAME(_nc_outch)); 15910 17157 } 15911 17158 … … 15934 17181 - max_colors)) != 0) { 15935 17182 - SP->_color_pairs[0] = PAIR_OF(default_fg(), default_bg()); 17183 - init_color_table(); 15936 17184 + SP_PARM->_color_pairs = TYPE_CALLOC(colorpair_t, 15937 17185 + SP_PARM->_pair_limit); … … 15941 17189 + SP_PARM->_color_pairs[0] = PAIR_OF(default_fg(), 15942 17190 + default_bg()); 15943 init_color_table();17191 + init_color_table(NCURSES_SP_ARG); 15944 17192 15945 17193 T(("started color: COLORS = %d, COLOR_PAIRS = %d", … … 15956 17204 } 15957 17205 } else { 15958 @@ -285,6 +3 04,14 @@17206 @@ -285,6 +323,14 @@ 15959 17207 returnCode(result); 15960 17208 } … … 15971 17219 static void 15972 17220 rgb2hls(short r, short g, short b, short *h, short *l, short *s) 15973 @@ -328,24 +3 55,72 @@17221 @@ -328,24 +374,72 @@ 15974 17222 * values. 15975 17223 */ … … 16051 17299 #endif 16052 17300 { 16053 @@ -361,8 +4 36,8 @@17301 @@ -361,8 +455,8 @@ 16054 17302 * pair colors with the new ones). 16055 17303 */ … … 16062 17310 16063 17311 for (y = 0; y <= curscr->_maxy; y++) { 16064 @@ -381,9 +4 56,9 @@17312 @@ -381,9 +475,9 @@ 16065 17313 _nc_make_oldhash(y); 16066 17314 } … … 16075 17323 if (initialize_pair && InPalette(f) && InPalette(b)) { 16076 17324 const color_t *tp = hue_lightness_saturation ? hls_palette : cga_palette; 16077 @@ -404,54 +4 79,79 @@17325 @@ -404,54 +498,79 @@ 16078 17326 returnCode(OK); 16079 17327 } … … 16171 17419 T((T_CALLED("has_colors()"))); 16172 17420 returnCode((VALID_NUMERIC(max_colors) && VALID_NUMERIC(max_pairs) 16173 @@ -462,18 +5 62,27 @@17421 @@ -462,18 +581,27 @@ 16174 17422 || set_color_pair)) ? TRUE : FALSE); 16175 17423 } … … 16204 17452 if (r) 16205 17453 *r = c_r; 16206 @@ -489,18 + 598,27 @@17454 @@ -489,18 +617,27 @@ 16207 17455 returnCode(result); 16208 17456 } … … 16236 17484 #if NCURSES_EXT_FUNCS 16237 17485 if (fg == COLOR_DEFAULT) 16238 @@ -520, 6 +638,14@@17486 @@ -520,19 +657,33 @@ 16239 17487 returnCode(result); 16240 17488 } … … 16249 17497 + 16250 17498 NCURSES_EXPORT(void) 16251 _nc_do_color(short old_pair, short pair, bool reverse, int (*outc) (int)) 17499 -_nc_do_color(short old_pair, short pair, bool reverse, int (*outc) (int)) 17500 +NCURSES_SP_NAME(_nc_do_color) (NCURSES_SP_DCLx 17501 + short old_pair, 17502 + short pair, 17503 + bool reverse, 17504 + NCURSES_SP_OUTC outc) 16252 17505 { 16253 @@ -527,7 +653,7 @@ 17506 NCURSES_COLOR_T fg = COLOR_DEFAULT; 16254 17507 NCURSES_COLOR_T bg = COLOR_DEFAULT; 16255 17508 NCURSES_COLOR_T old_fg, old_bg; … … 16260 17513 } else if (pair != 0) { 16261 17514 if (set_color_pair) { 17515 TPUTS_TRACE("set_color_pair"); 17516 - tputs(TPARM_1(set_color_pair, pair), 1, outc); 17517 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx 17518 + TPARM_1(set_color_pair, pair), 17519 + 1, outc); 17520 return; 17521 } else if (SP != 0) { 17522 pair_content((short) pair, &fg, &bg); 17523 @@ -553,17 +704,17 @@ 17524 if (SP->_has_sgr_39_49 17525 && isDefaultColor(old_bg) 17526 && !isDefaultColor(old_fg)) { 17527 - tputs("\033[39m", 1, outc); 17528 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx "\033[39m", 1, outc); 17529 } else if (SP->_has_sgr_39_49 17530 && isDefaultColor(old_fg) 17531 && !isDefaultColor(old_bg)) { 17532 - tputs("\033[49m", 1, outc); 17533 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx "\033[49m", 1, outc); 17534 } else 17535 #endif 17536 - reset_color_pair(); 17537 + reset_color_pair(NCURSES_SP_ARG); 17538 } 17539 } else { 17540 - reset_color_pair(); 17541 + reset_color_pair(NCURSES_SP_ARG); 17542 if (old_pair < 0) 17543 return; 17544 } 17545 @@ -585,9 +736,22 @@ 17546 fg, bg)); 17547 17548 if (!isDefaultColor(fg)) { 17549 - set_foreground_color(fg, outc); 17550 + set_foreground_color(NCURSES_SP_ARGx fg, outc); 17551 } 17552 if (!isDefaultColor(bg)) { 17553 - set_background_color(bg, outc); 17554 + set_background_color(NCURSES_SP_ARGx bg, outc); 17555 } 17556 } 17557 + 17558 +#if NCURSES_SP_FUNCS 17559 +NCURSES_EXPORT(void) 17560 +_nc_do_color(short old_pair, short pair, bool reverse, NCURSES_OUTC outc) 17561 +{ 17562 + SetSafeOutcWrapper(outc); 17563 + NCURSES_SP_NAME(_nc_do_color) (CURRENT_SCREEN, 17564 + old_pair, 17565 + pair, 17566 + reverse, 17567 + _nc_outc_wrapper); 17568 +} 17569 +#endif 16262 17570 diff -Naur ncurses-5.7.orig/ncurses/base/lib_colorset.c ncurses-5.7/ncurses/base/lib_colorset.c 16263 17571 --- ncurses-5.7.orig/ncurses/base/lib_colorset.c 2005-01-29 13:40:51.000000000 -0800 16264 +++ ncurses-5.7/ncurses/base/lib_colorset.c 2009-0 3-22 21:17:02.195775108-070017572 +++ ncurses-5.7/ncurses/base/lib_colorset.c 2009-06-05 14:01:11.000000000 -0700 16265 17573 @@ -1,5 +1,5 @@ 16266 17574 /**************************************************************************** … … 16308 17616 + returnCode(code); 16309 17617 } 17618 diff -Naur ncurses-5.7.orig/ncurses/base/lib_delwin.c ncurses-5.7/ncurses/base/lib_delwin.c 17619 --- ncurses-5.7.orig/ncurses/base/lib_delwin.c 2008-06-07 07:10:56.000000000 -0700 17620 +++ ncurses-5.7/ncurses/base/lib_delwin.c 2009-06-05 14:01:54.000000000 -0700 17621 @@ -1,5 +1,5 @@ 17622 /**************************************************************************** 17623 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 17624 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 17625 * * 17626 * Permission is hereby granted, free of charge, to any person obtaining a * 17627 * copy of this software and associated documentation files (the * 17628 @@ -29,6 +29,8 @@ 17629 /**************************************************************************** 17630 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 17631 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 17632 + * and: Thomas E. Dickey 1996-on * 17633 + * and: Juergen Pfeifer 2008 * 17634 ****************************************************************************/ 17635 17636 /* 17637 @@ -40,15 +42,18 @@ 17638 17639 #include <curses.priv.h> 17640 17641 -MODULE_ID("$Id: lib_delwin.c,v 1.17 2008/06/07 14:10:56 tom Exp $") 17642 +MODULE_ID("$Id: lib_delwin.c,v 1.19 2009/05/23 19:56:55 tom Exp $") 17643 17644 static bool 17645 cannot_delete(WINDOW *win) 17646 { 17647 WINDOWLIST *p; 17648 bool result = TRUE; 17649 +#ifdef USE_SP_WINDOWLIST 17650 + SCREEN *sp = _nc_screen_of(win); 17651 +#endif 17652 17653 - for (each_window(p)) { 17654 + for (each_window(SP_PARM, p)) { 17655 if (&(p->win) == win) { 17656 result = FALSE; 17657 } else if ((p->win._flags & _SUBWIN) != 0 17658 @@ -72,11 +77,13 @@ 17659 || cannot_delete(win)) { 17660 result = ERR; 17661 } else { 17662 - 17663 +#if NCURSES_SP_FUNCS 17664 + SCREEN *sp = _nc_screen_of(win); 17665 +#endif 17666 if (win->_flags & _SUBWIN) 17667 touchwin(win->_parent); 17668 - else if (curscr != 0) 17669 - touchwin(curscr); 17670 + else if (CurScreen(SP_PARM) != 0) 17671 + touchwin(CurScreen(SP_PARM)); 17672 17673 result = _nc_freewin(win); 17674 } 16310 17675 diff -Naur ncurses-5.7.orig/ncurses/base/lib_dft_fgbg.c ncurses-5.7/ncurses/base/lib_dft_fgbg.c 16311 17676 --- ncurses-5.7.orig/ncurses/base/lib_dft_fgbg.c 2005-11-26 12:03:38.000000000 -0800 16312 +++ ncurses-5.7/ncurses/base/lib_dft_fgbg.c 2009-0 3-22 21:17:05.643993853-070017677 +++ ncurses-5.7/ncurses/base/lib_dft_fgbg.c 2009-06-05 14:01:55.000000000 -0700 16313 17678 @@ -1,5 +1,5 @@ 16314 17679 /**************************************************************************** … … 16318 17683 * Permission is hereby granted, free of charge, to any person obtaining a * 16319 17684 * copy of this software and associated documentation files (the * 16320 @@ -27, 31 +27,40@@17685 @@ -27,49 +27,73 @@ 16321 17686 ****************************************************************************/ 16322 17687 … … 16328 17693 16329 17694 #include <curses.priv.h> 16330 17695 -#include <term.h> 16331 17696 16332 17697 -MODULE_ID("$Id: lib_dft_fgbg.c,v 1.18 2005/11/26 20:03:38 tom Exp $") 16333 +MODULE_ID("$Id: lib_dft_fgbg.c,v 1.19 2009/02/14 21:53:21 tom Exp $") 17698 +#ifndef CUR 17699 +#define CUR SP_TERMTYPE 17700 +#endif 17701 + 17702 +MODULE_ID("$Id: lib_dft_fgbg.c,v 1.24 2009/05/30 20:00:00 tom Exp $") 16334 17703 16335 17704 /* … … 16338 17707 */ 16339 17708 NCURSES_EXPORT(int) 16340 -use_default_colors(void)16341 17709 +NCURSES_SP_NAME(use_default_colors) (NCURSES_SP_DCL0) 16342 { 16343 T((T_CALLED("use_default_colors()"))); 16344 - returnCode(assume_default_colors(-1, -1)); 16345 + returnCode(NCURSES_SP_NAME(assume_default_colors) (NCURSES_SP_ARGx - 1, -1)); 17710 +{ 17711 + T((T_CALLED("use_default_colors(%p)"), SP_PARM)); 17712 + returnCode(NCURSES_SP_NAME(assume_default_colors) (NCURSES_SP_ARGx -1, -1)); 16346 17713 +} 16347 17714 + 16348 17715 +#if NCURSES_SP_FUNCS 16349 17716 +NCURSES_EXPORT(int) 16350 +use_default_colors(void) 16351 +{ 17717 use_default_colors(void) 17718 { 17719 - T((T_CALLED("use_default_colors()"))); 17720 - returnCode(assume_default_colors(-1, -1)); 16352 17721 + return NCURSES_SP_NAME(use_default_colors) (CURRENT_SCREEN); 16353 17722 } … … 16362 17731 +NCURSES_SP_NAME(assume_default_colors) (NCURSES_SP_DCLx int fg, int bg) 16363 17732 { 16364 T((T_CALLED("assume_default_colors(%d,%d)"), fg, bg)); 16365 16366 @@ -61,15 +70,23 @@ 16367 if (initialize_pair) /* don't know how to handle this */ 16368 returnCode(ERR); 16369 17733 - T((T_CALLED("assume_default_colors(%d,%d)"), fg, bg)); 17734 - 17735 - if (!orig_pair && !orig_colors) 17736 - returnCode(ERR); 17737 + int code = ERR; 17738 17739 - if (initialize_pair) /* don't know how to handle this */ 17740 - returnCode(ERR); 17741 - 16370 17742 - SP->_default_color = isDefaultColor(fg) || isDefaultColor(bg); 16371 17743 - SP->_has_sgr_39_49 = (tigetflag("AX") == TRUE); … … 16375 17747 - bool save = SP->_default_color; 16376 17748 - SP->_default_color = TRUE; 16377 + SP_PARM->_default_color = isDefaultColor(fg) || isDefaultColor(bg); 16378 + SP_PARM->_has_sgr_39_49 = (tigetflag("AX") == TRUE); 16379 + SP_PARM->_default_fg = isDefaultColor(fg) ? COLOR_DEFAULT : (fg & C_MASK); 16380 + SP_PARM->_default_bg = isDefaultColor(bg) ? COLOR_DEFAULT : (bg & C_MASK); 16381 + if (SP_PARM->_color_pairs != 0) { 16382 + bool save = SP_PARM->_default_color; 16383 + SP_PARM->_default_color = TRUE; 16384 init_pair(0, (short) fg, (short) bg); 17749 - init_pair(0, (short) fg, (short) bg); 16385 17750 - SP->_default_color = save; 16386 + SP_PARM->_default_color = save; 17751 + T((T_CALLED("assume_default_colors(%p,%d,%d)"), SP_PARM, fg, bg)); 17752 +#ifdef USE_TERM_DRIVER 17753 + if (sp != 0) 17754 + code = CallDriver_2(sp, defaultcolors, fg, bg); 17755 +#else 17756 + if ((orig_pair || orig_colors) && !initialize_pair) { 17757 + 17758 + SP_PARM->_default_color = isDefaultColor(fg) || isDefaultColor(bg); 17759 + SP_PARM->_has_sgr_39_49 = (tigetflag("AX") == TRUE); 17760 + SP_PARM->_default_fg = isDefaultColor(fg) ? COLOR_DEFAULT : (fg & C_MASK); 17761 + SP_PARM->_default_bg = isDefaultColor(bg) ? COLOR_DEFAULT : (bg & C_MASK); 17762 + if (SP_PARM->_color_pairs != 0) { 17763 + bool save = SP_PARM->_default_color; 17764 + SP_PARM->_default_color = TRUE; 17765 + init_pair(0, (short) fg, (short) bg); 17766 + SP_PARM->_default_color = save; 17767 + } 17768 + code = OK; 16387 17769 } 16388 returnCode(OK); 16389 } 17770 - returnCode(OK); 17771 +#endif 17772 + returnCode(code); 17773 +} 16390 17774 + 16391 17775 +#if NCURSES_SP_FUNCS … … 16394 17778 +{ 16395 17779 + return NCURSES_SP_NAME(assume_default_colors) (CURRENT_SCREEN, fg, bg); 16396 +}17780 } 16397 17781 +#endif 16398 17782 diff -Naur ncurses-5.7.orig/ncurses/base/lib_echo.c ncurses-5.7/ncurses/base/lib_echo.c 16399 17783 --- ncurses-5.7.orig/ncurses/base/lib_echo.c 2000-12-09 18:43:27.000000000 -0800 16400 +++ ncurses-5.7/ncurses/base/lib_echo.c 2009-0 3-22 21:17:07.012081575-070017784 +++ ncurses-5.7/ncurses/base/lib_echo.c 2009-06-05 14:01:16.000000000 -0700 16401 17785 @@ -1,5 +1,5 @@ 16402 17786 /**************************************************************************** … … 16464 17848 diff -Naur ncurses-5.7.orig/ncurses/base/lib_endwin.c ncurses-5.7/ncurses/base/lib_endwin.c 16465 17849 --- ncurses-5.7.orig/ncurses/base/lib_endwin.c 2000-12-09 18:43:27.000000000 -0800 16466 +++ ncurses-5.7/ncurses/base/lib_endwin.c 2009-0 3-22 21:17:05.643993853-070017850 +++ ncurses-5.7/ncurses/base/lib_endwin.c 2009-06-05 14:01:14.000000000 -0700 16467 17851 @@ -1,5 +1,5 @@ 16468 17852 /**************************************************************************** … … 16517 17901 diff -Naur ncurses-5.7.orig/ncurses/base/lib_flash.c ncurses-5.7/ncurses/base/lib_flash.c 16518 17902 --- ncurses-5.7.orig/ncurses/base/lib_flash.c 2000-12-09 18:43:27.000000000 -0800 16519 +++ ncurses-5.7/ncurses/base/lib_flash.c 2009-0 3-22 21:17:05.643993853-070017903 +++ ncurses-5.7/ncurses/base/lib_flash.c 2009-06-05 14:01:54.000000000 -0700 16520 17904 @@ -1,5 +1,5 @@ 16521 17905 /**************************************************************************** … … 16534 17918 16535 17919 /* 16536 @@ -41,7 +43,7 @@ 17920 @@ -39,9 +41,12 @@ 17921 */ 17922 16537 17923 #include <curses.priv.h> 16538 17924 -#include <term.h> /* beep, flash */ 16539 17925 16540 17926 -MODULE_ID("$Id: lib_flash.c,v 1.6 2000/12/10 02:43:27 tom Exp $") 16541 +MODULE_ID("$Id: lib_flash.c,v 1.7 2009/02/15 00:35:15 tom Exp $") 17927 +#ifndef CUR 17928 +#define CUR SP_TERMTYPE 17929 +#endif 17930 + 17931 +MODULE_ID("$Id: lib_flash.c,v 1.10 2009/05/23 19:37:09 tom Exp $") 16542 17932 16543 17933 /* 16544 17934 * flash() 16545 @@ -52, 7 +54,7@@17935 @@ -52,12 +57,15 @@ 16546 17936 */ 16547 17937 … … 16552 17942 int res = ERR; 16553 17943 16554 @@ -71,3 +73,11 @@ 16555 17944 - T((T_CALLED("flash()"))); 17945 - 17946 + T((T_CALLED("flash(%p)"), SP_PARM)); 17947 +#ifdef USE_TERM_DRIVER 17948 + if (SP_PARM != 0) 17949 + res = CallDriver_1(SP_PARM, doBeepOrFlash, FALSE); 17950 +#else 17951 /* FIXME: should make sure that we are not in altchar mode */ 17952 if (flash_screen) { 17953 TPUTS_TRACE("flash_screen"); 17954 @@ -68,6 +76,14 @@ 17955 res = putp(bell); 17956 _nc_flush(); 17957 } 17958 - 17959 +#endif 16556 17960 returnCode(res); 16557 17961 } … … 16566 17970 diff -Naur ncurses-5.7.orig/ncurses/base/lib_freeall.c ncurses-5.7/ncurses/base/lib_freeall.c 16567 17971 --- ncurses-5.7.orig/ncurses/base/lib_freeall.c 2008-09-27 06:09:57.000000000 -0700 16568 +++ ncurses-5.7/ncurses/base/lib_freeall.c 2009-03-22 21:16:49.034929738 -0700 16569 @@ -40,7 +40,7 @@ 17972 +++ ncurses-5.7/ncurses/base/lib_freeall.c 2009-06-05 14:01:51.000000000 -0700 17973 @@ -1,5 +1,5 @@ 17974 /**************************************************************************** 17975 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 17976 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 17977 * * 17978 * Permission is hereby granted, free of charge, to any person obtaining a * 17979 * copy of this software and associated documentation files (the * 17980 @@ -40,40 +40,40 @@ 16570 17981 extern int malloc_errfd; /* FIXME */ 16571 17982 #endif 16572 17983 16573 17984 -MODULE_ID("$Id: lib_freeall.c,v 1.54 2008/09/27 13:09:57 tom Exp $") 16574 +MODULE_ID("$Id: lib_freeall.c,v 1.5 5 2008/12/06 23:52:29tom Exp $")17985 +MODULE_ID("$Id: lib_freeall.c,v 1.58 2009/05/09 18:34:30 tom Exp $") 16575 17986 16576 17987 /* 16577 17988 * Free all ncurses data. This is used for testing only (there's no practical 16578 @@ -98,8 +98,6 @@ 16579 delscreen(SP); 17989 * use for it as an extension). 17990 */ 17991 NCURSES_EXPORT(void) 17992 -_nc_freeall(void) 17993 +NCURSES_SP_NAME(_nc_freeall) (NCURSES_SP_DCL0) 17994 { 17995 WINDOWLIST *p, *q; 17996 static va_list empty_va; 17997 17998 T((T_CALLED("_nc_freeall()"))); 17999 #if NO_LEAKS 18000 - if (SP != 0) { 18001 - if (SP->_oldnum_list != 0) { 18002 - FreeAndNull(SP->_oldnum_list); 18003 + if (SP_PARM != 0) { 18004 + if (SP_PARM->_oldnum_list != 0) { 18005 + FreeAndNull(SP_PARM->_oldnum_list); 18006 } 18007 - if (SP->_panelHook.destroy != 0) { 18008 - SP->_panelHook.destroy(SP->_panelHook.stdscr_pseudo_panel); 18009 + if (SP_PARM->_panelHook.destroy != 0) { 18010 + SP_PARM->_panelHook.destroy(SP_PARM->_panelHook.stdscr_pseudo_panel); 18011 } 18012 } 18013 #endif 18014 - if (SP != 0) { 18015 + if (SP_PARM != 0) { 18016 _nc_lock_global(curses); 18017 18018 - while (_nc_windows != 0) { 18019 + while (WindowList(SP_PARM) != 0) { 18020 bool deleted = FALSE; 18021 18022 /* Delete only windows that're not a parent */ 18023 - for (each_window(p)) { 18024 + for (each_window(SP_PARM, p)) { 18025 bool found = FALSE; 18026 18027 - for (each_window(q)) { 18028 + for (each_window(SP_PARM, q)) { 18029 if ((p != q) 18030 && (q->win._flags & _SUBWIN) 18031 && (&(p->win) == q->win._parent)) { 18032 @@ -95,11 +95,9 @@ 18033 if (!deleted) 18034 break; 18035 } 18036 - delscreen(SP); 18037 + delscreen(SP_PARM); 16580 18038 _nc_unlock_global(curses); 16581 18039 } … … 16585 18043 (void) _nc_printf_string(0, empty_va); 16586 18044 #ifdef TRACE 18045 @@ -121,12 +119,20 @@ 18046 returnVoid; 18047 } 18048 18049 +#if NCURSES_SP_FUNCS 18050 NCURSES_EXPORT(void) 18051 -_nc_free_and_exit(int code) 18052 +_nc_freeall(void) 18053 +{ 18054 + NCURSES_SP_NAME(_nc_freeall) (CURRENT_SCREEN); 18055 +} 18056 +#endif 18057 + 18058 +NCURSES_EXPORT(void) 18059 +NCURSES_SP_NAME(_nc_free_and_exit) (NCURSES_SP_DCLx int code) 18060 { 18061 - char *last_setbuf = (SP != 0) ? SP->_setbuf : 0; 18062 + char *last_setbuf = (SP_PARM != 0) ? SP_PARM->_setbuf : 0; 18063 18064 - _nc_freeall(); 18065 + NCURSES_SP_NAME(_nc_freeall) (NCURSES_SP_ARG); 18066 #ifdef TRACE 18067 trace(0); /* close trace file, freeing its setbuf */ 18068 { 18069 @@ -146,12 +152,21 @@ 18070 } 18071 18072 NCURSES_EXPORT(void) 18073 -_nc_free_and_exit(int code) 18074 +NCURSES_SP_NAME(_nc_free_and_exit) (NCURSES_SP_DCLx int code) 18075 { 18076 - if (SP) 18077 - delscreen(SP); 18078 - if (cur_term != 0) 18079 - del_curterm(cur_term); 18080 + if (SP_PARM) { 18081 + delscreen(SP_PARM); 18082 + if (SP_PARM->_term) 18083 + NCURSES_SP_NAME(del_curterm) (NCURSES_SP_ARGx SP_PARM->_term); 18084 + } 18085 exit(code); 18086 } 18087 #endif 18088 + 18089 +#if NCURSES_SP_FUNCS 18090 +NCURSES_EXPORT(void) 18091 +_nc_free_and_exit(int code) 18092 +{ 18093 + NCURSES_SP_NAME(_nc_free_and_exit) (CURRENT_SCREEN, code); 18094 +} 18095 +#endif 16587 18096 diff -Naur ncurses-5.7.orig/ncurses/base/lib_getch.c ncurses-5.7/ncurses/base/lib_getch.c 16588 18097 --- ncurses-5.7.orig/ncurses/base/lib_getch.c 2008-09-20 12:46:13.000000000 -0700 16589 +++ ncurses-5.7/ncurses/base/lib_getch.c 2009-0 3-22 21:17:08.396170694-070018098 +++ ncurses-5.7/ncurses/base/lib_getch.c 2009-06-05 14:01:55.000000000 -0700 16590 18099 @@ -1,5 +1,5 @@ 16591 18100 /**************************************************************************** … … 16603 18112 16604 18113 /* 16605 @@ -41, 7 +42,7@@18114 @@ -41,40 +42,54 @@ 16606 18115 16607 18116 #include <curses.priv.h> 16608 18117 16609 18118 -MODULE_ID("$Id: lib_getch.c,v 1.99 2008/09/20 19:46:13 tom Exp $") 16610 +MODULE_ID("$Id: lib_getch.c,v 1.10 1 2009/02/28 19:16:40tom Exp $")18119 +MODULE_ID("$Id: lib_getch.c,v 1.103 2009/05/30 15:50:47 tom Exp $") 16611 18120 16612 18121 #include <fifo_defs.h> 16613 18122 16614 @@ -54,27 +55,36 @@ 18123 #if USE_REENTRANT 18124 #define GetEscdelay(sp) (sp)->_ESCDELAY 18125 +NCURSES_EXPORT(int *) 18126 +_nc_ptr_Escdelay(SCREEN *sp) 18127 +{ 18128 + return ptrEscdelay(sp); 18129 +} 18130 NCURSES_EXPORT(int) 18131 NCURSES_PUBLIC_VAR(ESCDELAY) (void) 18132 { 18133 - return SP ? GetEscdelay(SP) : 1000; 18134 + return *_nc_ptr_Escdelay(CURRENT_SCREEN); 16615 18135 } 16616 18136 #else … … 16654 18174 static int 16655 18175 _nc_use_meta(WINDOW *win) 16656 @@ -84,9 +9 4,9 @@18176 @@ -84,9 +99,9 @@ 16657 18177 } 16658 18178 … … 16666 18186 16667 18187 /* 16668 @@ -109,7 +1 19,7 @@18188 @@ -109,7 +124,7 @@ 16669 18189 && (sp->_sysmouse_head < sp->_sysmouse_tail) 16670 18190 && (rc == 0) … … 16675 18195 #endif 16676 18196 return rc; 16677 @@ -173, 7 +183,7@@18197 @@ -173,9 +188,9 @@ 16678 18198 } else 16679 18199 mask = 0; … … 16682 18202 + if (mask & TW_EVENT) { 16683 18203 T(("fifo_push: ungetch KEY_EVENT")); 16684 _nc_ungetch(sp, KEY_EVENT); 18204 - _nc_ungetch(sp, KEY_EVENT); 18205 + safe_ungetch(sp, KEY_EVENT); 16685 18206 return KEY_EVENT; 16686 @@ -185,7 +195,7 @@ 18207 } 18208 #elif USE_GPM_SUPPORT || USE_EMX_MOUSE || USE_SYSMOUSE 18209 @@ -185,7 +200,7 @@ 16687 18210 #endif 16688 18211 … … 16693 18216 ch = KEY_MOUSE; 16694 18217 n = 1; 16695 @@ -260,12 +27 0,12 @@18218 @@ -260,12 +275,12 @@ 16696 18219 { 16697 18220 #ifdef USE_PTHREADS … … 16708 18231 recur_wrefresh(win); 16709 18232 _nc_set_screen(save_SP); 16710 @@ -286,12 + 296,12 @@18233 @@ -286,12 +301,12 @@ 16711 18234 16712 18235 if (sp != 0) { … … 16723 18246 rc = recur_wgetnstr(win, buf); 16724 18247 _nc_set_screen(save_SP); 16725 @@ -402,7 +412,7 @@ 18248 @@ -362,9 +377,9 @@ 18249 #ifdef NCURSES_WGETCH_EVENTS 18250 if (rc != KEY_EVENT) 18251 #endif 18252 - _nc_ungetch(sp, '\n'); 18253 + safe_ungetch(sp, '\n'); 18254 for (bufp = buf + strlen(buf); bufp > buf; bufp--) 18255 - _nc_ungetch(sp, bufp[-1]); 18256 + safe_ungetch(sp, bufp[-1]); 18257 18258 #ifdef NCURSES_WGETCH_EVENTS 18259 /* Return it first */ 18260 @@ -402,7 +417,7 @@ 16726 18261 rc = check_mouse_activity(sp, delay EVENTLIST_2nd(evl)); 16727 18262 … … 16732 18267 returnCode(KEY_CODE_YES); 16733 18268 } 16734 @@ -427,7 +4 37,7 @@18269 @@ -427,7 +442,7 @@ 16735 18270 * increase the wait with mouseinterval(). 16736 18271 */ … … 16741 18276 do { 16742 18277 ch = kgetch(sp EVENTLIST_2nd(evl)); 16743 @@ -442,1 0 +452,10@@18278 @@ -442,11 +457,11 @@ 16744 18279 (ch == KEY_MOUSE 16745 18280 && (((rc = check_mouse_activity(sp, sp->_maxclick … … 16750 18285 #ifdef NCURSES_WGETCH_EVENTS 16751 18286 - if ((rc & 4) && !ch == KEY_EVENT) { 18287 - _nc_ungetch(sp, ch); 16752 18288 + if ((rc & TW_EVENT) && !(ch == KEY_EVENT)) { 16753 _nc_ungetch(sp, ch);18289 + safe_ungetch(sp, ch); 16754 18290 ch = KEY_EVENT; 16755 18291 } 16756 @@ -645,7 +655,7 @@ 18292 #endif 18293 @@ -454,12 +469,12 @@ 18294 #ifdef NCURSES_WGETCH_EVENTS 18295 /* mouse event sequence ended by an event, report event */ 18296 if (ch == KEY_EVENT) { 18297 - _nc_ungetch(sp, KEY_MOUSE); /* FIXME This interrupts a gesture... */ 18298 + safe_ungetch(sp, KEY_MOUSE); /* FIXME This interrupts a gesture... */ 18299 } else 18300 #endif 18301 { 18302 /* mouse event sequence ended by keystroke, store keystroke */ 18303 - _nc_ungetch(sp, ch); 18304 + safe_ungetch(sp, ch); 18305 ch = KEY_MOUSE; 18306 } 18307 } 18308 @@ -645,7 +660,7 @@ 16757 18309 TR(TRACE_IEVENT, ("waiting for rest of sequence")); 16758 18310 rc = check_mouse_activity(sp, timeleft EVENTLIST_2nd(evl)); … … 16763 18315 /* FIXME Should have preserved remainder timeleft for reuse... */ 16764 18316 peek = head; /* Restart interpreting later */ 18317 diff -Naur ncurses-5.7.orig/ncurses/base/lib_getstr.c ncurses-5.7/ncurses/base/lib_getstr.c 18318 --- ncurses-5.7.orig/ncurses/base/lib_getstr.c 2008-08-16 12:20:04.000000000 -0700 18319 +++ ncurses-5.7/ncurses/base/lib_getstr.c 2009-06-05 14:01:51.000000000 -0700 18320 @@ -1,5 +1,5 @@ 18321 /**************************************************************************** 18322 - * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. * 18323 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 18324 * * 18325 * Permission is hereby granted, free of charge, to any person obtaining a * 18326 * copy of this software and associated documentation files (the * 18327 @@ -39,9 +39,8 @@ 18328 */ 18329 18330 #include <curses.priv.h> 18331 -#include <term.h> 18332 18333 -MODULE_ID("$Id: lib_getstr.c,v 1.27 2008/08/16 19:20:04 tom Exp $") 18334 +MODULE_ID("$Id: lib_getstr.c,v 1.28 2009/05/09 17:02:41 tom Exp $") 18335 18336 /* 18337 * This wipes out the last character, no matter whether it was a tab, control 18338 @@ -89,19 +88,19 @@ 18339 if (!win) 18340 returnCode(ERR); 18341 18342 - _nc_get_tty_mode(&buf); 18343 + NCURSES_SP_NAME(_nc_get_tty_mode) (NCURSES_SP_ARGx &buf); 18344 18345 oldnl = sp->_nl; 18346 oldecho = sp->_echo; 18347 oldraw = sp->_raw; 18348 oldcbreak = sp->_cbreak; 18349 - nl(); 18350 - noecho(); 18351 - noraw(); 18352 - cbreak(); 18353 + NCURSES_SP_NAME(nl) (NCURSES_SP_ARG); 18354 + NCURSES_SP_NAME(noecho) (NCURSES_SP_ARG); 18355 + NCURSES_SP_NAME(noraw) (NCURSES_SP_ARG); 18356 + NCURSES_SP_NAME(cbreak) (NCURSES_SP_ARG); 18357 18358 - erasec = erasechar(); 18359 - killc = killchar(); 18360 + erasec = NCURSES_SP_NAME(erasechar) (NCURSES_SP_ARG); 18361 + killc = NCURSES_SP_NAME(killchar) (NCURSES_SP_ARG); 18362 18363 oldstr = str; 18364 getyx(win, y, x); 18365 @@ -144,7 +143,7 @@ 18366 } 18367 } else if (ch >= KEY_MIN 18368 || (maxlen >= 0 && str - oldstr >= maxlen)) { 18369 - beep(); 18370 + NCURSES_SP_NAME(beep) (NCURSES_SP_ARG); 18371 } else { 18372 *str++ = (char) ch; 18373 if (oldecho == TRUE) { 18374 @@ -193,7 +192,7 @@ 18375 sp->_raw = oldraw; 18376 sp->_cbreak = oldcbreak; 18377 18378 - _nc_set_tty_mode(&buf); 18379 + NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_ARGx &buf); 18380 18381 *str = '\0'; 18382 if (ch == ERR) 18383 diff -Naur ncurses-5.7.orig/ncurses/base/lib_initscr.c ncurses-5.7/ncurses/base/lib_initscr.c 18384 --- ncurses-5.7.orig/ncurses/base/lib_initscr.c 2008-08-16 14:20:48.000000000 -0700 18385 +++ ncurses-5.7/ncurses/base/lib_initscr.c 2009-06-05 14:01:33.000000000 -0700 18386 @@ -1,5 +1,5 @@ 18387 /**************************************************************************** 18388 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 18389 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 18390 * * 18391 * Permission is hereby granted, free of charge, to any person obtaining a * 18392 * copy of this software and associated documentation files (the * 18393 @@ -45,7 +45,7 @@ 18394 #include <sys/termio.h> /* needed for ISC */ 18395 #endif 18396 18397 -MODULE_ID("$Id: lib_initscr.c,v 1.38 2008/08/16 21:20:48 Werner.Fink Exp $") 18398 +MODULE_ID("$Id: lib_initscr.c,v 1.39 2009/02/14 20:55:49 tom Exp $") 18399 18400 NCURSES_EXPORT(WINDOW *) 18401 initscr(void) 18402 @@ -90,7 +90,11 @@ 18403 } 18404 18405 /* def_shell_mode - done in newterm/_nc_setupscreen */ 18406 +#if NCURSES_SP_FUNCS 18407 + NCURSES_SP_NAME(def_prog_mode) (CURRENT_SCREEN); 18408 +#else 18409 def_prog_mode(); 18410 +#endif 18411 } 18412 result = stdscr; 18413 _nc_unlock_global(curses); 18414 diff -Naur ncurses-5.7.orig/ncurses/base/lib_insch.c ncurses-5.7/ncurses/base/lib_insch.c 18415 --- ncurses-5.7.orig/ncurses/base/lib_insch.c 2008-02-02 16:14:37.000000000 -0800 18416 +++ ncurses-5.7/ncurses/base/lib_insch.c 2009-06-05 14:01:55.000000000 -0700 18417 @@ -1,5 +1,5 @@ 18418 /**************************************************************************** 18419 - * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc. * 18420 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 18421 * * 18422 * Permission is hereby granted, free of charge, to any person obtaining a * 18423 * copy of this software and associated documentation files (the * 18424 @@ -43,24 +43,31 @@ 18425 #include <curses.priv.h> 18426 #include <ctype.h> 18427 18428 -MODULE_ID("$Id: lib_insch.c,v 1.25 2008/02/03 00:14:37 tom Exp $") 18429 +MODULE_ID("$Id: lib_insch.c,v 1.29 2009/05/30 16:45:16 tom Exp $") 18430 18431 /* 18432 * Insert the given character, updating the current location to simplify 18433 * inserting a string. 18434 */ 18435 NCURSES_EXPORT(int) 18436 -_nc_insert_ch(WINDOW *win, chtype ch) 18437 +_nc_insert_ch(SCREEN *sp, WINDOW *win, chtype ch) 18438 { 18439 int code = OK; 18440 NCURSES_CH_T wch; 18441 int count; 18442 NCURSES_CONST char *s; 18443 + int tabsize = 18444 +#if USE_REENTRANT 18445 + sp->_TABSIZE 18446 +#else 18447 + TABSIZE 18448 +#endif 18449 + ; 18450 18451 switch (ch) { 18452 case '\t': 18453 - for (count = (TABSIZE - (win->_curx % TABSIZE)); count > 0; count--) { 18454 - if ((code = _nc_insert_ch(win, ' ')) != OK) 18455 + for (count = (tabsize - (win->_curx % tabsize)); count > 0; count--) { 18456 + if ((code = _nc_insert_ch(sp, win, ' ')) != OK) 18457 break; 18458 } 18459 break; 18460 @@ -76,7 +83,9 @@ 18461 WINDOW_EXT(win, addch_used) == 0 && 18462 #endif 18463 is8bits(ChCharOf(ch)) && 18464 - isprint(ChCharOf(ch))) { 18465 + (isprint(ChCharOf(ch)) || 18466 + (ChAttrOf(ch) & A_ALTCHARSET) || 18467 + (sp != 0 && sp->_legacy_coding && !iscntrl(ChCharOf(ch))))) { 18468 if (win->_curx <= win->_maxx) { 18469 struct ldat *line = &(win->_line[win->_cury]); 18470 NCURSES_CH_T *end = &(line->text[win->_curx]); 18471 @@ -93,9 +102,9 @@ 18472 win->_curx++; 18473 } 18474 } else if (is8bits(ChCharOf(ch)) && iscntrl(ChCharOf(ch))) { 18475 - s = unctrl(ChCharOf(ch)); 18476 + s = NCURSES_SP_NAME(unctrl) (NCURSES_SP_ARGx ChCharOf(ch)); 18477 while (*s != '\0') { 18478 - code = _nc_insert_ch(win, ChAttrOf(ch) | UChar(*s)); 18479 + code = _nc_insert_ch(sp, win, ChAttrOf(ch) | UChar(*s)); 18480 if (code != OK) 18481 break; 18482 ++s; 18483 @@ -114,12 +123,17 @@ 18484 } else if (count == -1) { 18485 /* handle EILSEQ */ 18486 if (is8bits(ch)) { 18487 - s = unctrl(ChCharOf(ch)); 18488 - while (*s != '\0') { 18489 - code = _nc_insert_ch(win, ChAttrOf(ch) | UChar(*s)); 18490 - if (code != OK) 18491 - break; 18492 - ++s; 18493 + s = NCURSES_SP_NAME(unctrl) (NCURSES_SP_ARGx ChCharOf(ch)); 18494 + if (strlen(s) > 1) { 18495 + while (*s != '\0') { 18496 + code = _nc_insert_ch(sp, win, 18497 + ChAttrOf(ch) | UChar(*s)); 18498 + if (code != OK) 18499 + break; 18500 + ++s; 18501 + } 18502 + } else { 18503 + code = ERR; 18504 } 18505 } else { 18506 code = ERR; 18507 @@ -145,7 +159,7 @@ 18508 oy = win->_cury; 18509 ox = win->_curx; 18510 18511 - code = _nc_insert_ch(win, c); 18512 + code = _nc_insert_ch(_nc_screen_of(win), win, c); 18513 18514 win->_curx = ox; 18515 win->_cury = oy; 18516 diff -Naur ncurses-5.7.orig/ncurses/base/lib_insnstr.c ncurses-5.7/ncurses/base/lib_insnstr.c 18517 --- ncurses-5.7.orig/ncurses/base/lib_insnstr.c 2004-02-28 15:44:56.000000000 -0800 18518 +++ ncurses-5.7/ncurses/base/lib_insnstr.c 2009-06-05 14:01:55.000000000 -0700 18519 @@ -1,5 +1,5 @@ 18520 /**************************************************************************** 18521 - * Copyright (c) 2004 Free Software Foundation, Inc. * 18522 + * Copyright (c) 2004,2009 Free Software Foundation, Inc. * 18523 * * 18524 * Permission is hereby granted, free of charge, to any person obtaining a * 18525 * copy of this software and associated documentation files (the * 18526 @@ -40,7 +40,7 @@ 18527 #include <curses.priv.h> 18528 #include <ctype.h> 18529 18530 -MODULE_ID("$Id: lib_insnstr.c,v 1.1 2004/02/28 23:44:56 tom Exp $") 18531 +MODULE_ID("$Id: lib_insnstr.c,v 1.2 2009/05/30 14:53:49 tom Exp $") 18532 18533 NCURSES_EXPORT(int) 18534 winsnstr(WINDOW *win, const char *s, int n) 18535 @@ -54,10 +54,12 @@ 18536 T((T_CALLED("winsnstr(%p,%s,%d)"), win, _nc_visbufn(s, n), n)); 18537 18538 if (win != 0 && str != 0) { 18539 + SCREEN *sp = _nc_screen_of(win); 18540 + 18541 oy = win->_cury; 18542 ox = win->_curx; 18543 for (cp = str; *cp && (n <= 0 || (cp - str) < n); cp++) { 18544 - _nc_insert_ch(win, (chtype) UChar(*cp)); 18545 + _nc_insert_ch(sp, win, (chtype) UChar(*cp)); 18546 } 18547 win->_curx = ox; 18548 win->_cury = oy; 16765 18549 diff -Naur ncurses-5.7.orig/ncurses/base/lib_isendwin.c ncurses-5.7/ncurses/base/lib_isendwin.c 16766 18550 --- ncurses-5.7.orig/ncurses/base/lib_isendwin.c 2000-12-09 18:43:27.000000000 -0800 16767 +++ ncurses-5.7/ncurses/base/lib_isendwin.c 2009-0 3-22 21:17:05.643993853-070018551 +++ ncurses-5.7/ncurses/base/lib_isendwin.c 2009-06-05 14:01:14.000000000 -0700 16768 18552 @@ -1,5 +1,5 @@ 16769 18553 /**************************************************************************** … … 16809 18593 diff -Naur ncurses-5.7.orig/ncurses/base/lib_mouse.c ncurses-5.7/ncurses/base/lib_mouse.c 16810 18594 --- ncurses-5.7.orig/ncurses/base/lib_mouse.c 2008-10-18 14:48:55.000000000 -0700 16811 +++ ncurses-5.7/ncurses/base/lib_mouse.c 2009-0 3-22 21:17:08.400170414-070018595 +++ ncurses-5.7/ncurses/base/lib_mouse.c 2009-06-05 14:01:51.000000000 -0700 16812 18596 @@ -1,5 +1,5 @@ 16813 18597 /**************************************************************************** … … 16817 18601 * Permission is hereby granted, free of charge, to any person obtaining a * 16818 18602 * copy of this software and associated documentation files (the * 16819 @@ -79,9 +79, 8@@18603 @@ -79,9 +79,12 @@ 16820 18604 16821 18605 #include <curses.priv.h> 16822 18606 16823 18607 -MODULE_ID("$Id: lib_mouse.c,v 1.102 2008/10/18 21:48:55 tom Exp $") 16824 +MODULE_ID("$Id: lib_mouse.c,v 1.105 2009/02/28 21:09:20 tom Exp $") 18608 +#ifndef CUR 18609 +#define CUR SP_TERMTYPE 18610 +#endif 18611 + 18612 +MODULE_ID("$Id: lib_mouse.c,v 1.107 2009/05/10 00:48:29 tom Exp $") 16825 18613 16826 18614 -#include <term.h> … … 16828 18616 16829 18617 #if USE_GPM_SUPPORT 16830 @@ -150,7 +1 49,7 @@18618 @@ -150,7 +153,7 @@ 16831 18619 #define LIBGPM_SONAME "libgpm.so" 16832 18620 #endif … … 16837 18625 #endif /* USE_GPM_SUPPORT */ 16838 18626 16839 @@ -164,13 +16 3,13 @@18627 @@ -164,13 +167,13 @@ 16840 18628 #define LastEV(sp) ((sp)->_mouse_events + EV_MAX - 1) 16841 18629 … … 16855 18643 16856 18644 #define IndexEV(sp, ep) (ep - FirstEV(sp)) 16857 @@ -340,7 +3 39,7 @@18645 @@ -340,7 +343,7 @@ 16858 18646 static void 16859 18647 handle_sysmouse(int sig GCC_UNUSED) … … 16864 18652 #endif /* USE_SYSMOUSE */ 16865 18653 16866 @@ -359,7 +3 58,9 @@18654 @@ -359,7 +362,9 @@ 16867 18655 #if USE_EMX_MOUSE 16868 18656 sp->_emxmouse_activated = enable; … … 16875 18663 sp->_mouse_active = enable; 16876 18664 } 16877 @@ -398,7 + 399,7 @@18665 @@ -398,7 +403,7 @@ 16878 18666 static void 16879 18667 unload_gpm_library(SCREEN *sp) … … 16884 18672 sp->_mouse_gpm_loaded = FALSE; 16885 18673 sp->_mouse_fd = -1; 16886 @@ -694,11 +69 5,16 @@18674 @@ -694,11 +699,16 @@ 16887 18675 16888 18676 #if USE_GPM_SUPPORT … … 16903 18691 eventp->id = NORMAL_EVENT; 16904 18692 16905 @@ -731,6 +7 37,7 @@18693 @@ -731,6 +741,7 @@ 16906 18694 /* bump the next-free pointer into the circular list */ 16907 18695 sp->_mouse_eventp = eventp = NEXT(eventp); … … 16911 18699 } 16912 18700 break; 16913 @@ -937,7 +94 4,7 @@18701 @@ -937,7 +948,7 @@ 16914 18702 switch (sp->_mouse_type) { 16915 18703 case M_XTERM: … … 16920 18708 TPUTS_TRACE("xterm mouse initialization"); 16921 18709 enable_xterm_mouse(sp, 1); 16922 @@ -989,7 + 996,7 @@18710 @@ -989,7 +1000,7 @@ 16923 18711 return; 16924 18712 } … … 16929 18717 16930 18718 /************************************************************************** 16931 @@ -1264,13 +127 1,13 @@18719 @@ -1264,13 +1275,13 @@ 16932 18720 * 16933 18721 **************************************************************************/ … … 16948 18736 MEVENT *prev = PREV(eventp); 16949 18737 16950 @@ -1278,8 +128 5,8 @@18738 @@ -1278,8 +1289,8 @@ 16951 18739 *aevent = *prev; 16952 18740 … … 16959 18747 prev->id = INVALID_EVENT; /* so the queue slot becomes free */ 16960 18748 returnCode(OK); 16961 @@ -1287,57 +129 4,61 @@18749 @@ -1287,57 +1298,61 @@ 16962 18750 returnCode(ERR); 16963 18751 } … … 17037 18825 (REPORT_MOUSE_POSITION 17038 18826 | BUTTON_ALT 17039 @@ -1349,15 +136 0,23 @@18827 @@ -1349,15 +1364,23 @@ 17040 18828 | BUTTON_DOUBLE_CLICKED 17041 18829 | BUTTON_TRIPLE_CLICKED); … … 17063 18851 wenclose(const WINDOW *win, int y, int x) 17064 18852 /* check to see if given window encloses given screen location */ 17065 @@ -1377,17 +1 396,17 @@18853 @@ -1377,17 +1400,17 @@ 17066 18854 } 17067 18855 … … 17086 18874 oldval = DEFAULT_MAXCLICK; 17087 18875 } 17088 @@ -1395,15 +141 4,37 @@18876 @@ -1395,15 +1418,37 @@ 17089 18877 returnCode(oldval); 17090 18878 } … … 17127 18915 { 17128 18916 bool result = FALSE; 18917 diff -Naur ncurses-5.7.orig/ncurses/base/lib_mvwin.c ncurses-5.7/ncurses/base/lib_mvwin.c 18918 --- ncurses-5.7.orig/ncurses/base/lib_mvwin.c 2006-02-25 14:53:46.000000000 -0800 18919 +++ ncurses-5.7/ncurses/base/lib_mvwin.c 2009-06-05 14:01:44.000000000 -0700 18920 @@ -1,5 +1,5 @@ 18921 /**************************************************************************** 18922 - * Copyright (c) 1998-2001,2006 Free Software Foundation, Inc. * 18923 + * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. * 18924 * * 18925 * Permission is hereby granted, free of charge, to any person obtaining a * 18926 * copy of this software and associated documentation files (the * 18927 @@ -40,7 +40,7 @@ 18928 18929 #include <curses.priv.h> 18930 18931 -MODULE_ID("$Id: lib_mvwin.c,v 1.14 2006/02/25 22:53:46 tom Exp $") 18932 +MODULE_ID("$Id: lib_mvwin.c,v 1.15 2009/04/18 18:25:37 tom Exp $") 18933 18934 NCURSES_EXPORT(int) 18935 mvwin(WINDOW *win, int by, int bx) 18936 @@ -96,8 +96,8 @@ 18937 } 18938 #endif 18939 18940 - if (by + win->_maxy > screen_lines - 1 18941 - || bx + win->_maxx > screen_columns - 1 18942 + if (by + win->_maxy > screen_lines(CURRENT_SCREEN) - 1 18943 + || bx + win->_maxx > screen_columns(CURRENT_SCREEN) - 1 18944 || by < 0 18945 || bx < 0) 18946 returnCode(ERR); 17129 18947 diff -Naur ncurses-5.7.orig/ncurses/base/lib_newterm.c ncurses-5.7/ncurses/base/lib_newterm.c 17130 18948 --- ncurses-5.7.orig/ncurses/base/lib_newterm.c 2008-08-16 14:20:48.000000000 -0700 17131 +++ ncurses-5.7/ncurses/base/lib_newterm.c 2009-0 3-22 21:17:05.643993853-070018949 +++ ncurses-5.7/ncurses/base/lib_newterm.c 2009-06-05 14:01:51.000000000 -0700 17132 18950 @@ -1,5 +1,5 @@ 17133 18951 /**************************************************************************** … … 17145 18963 17146 18964 /* 17147 @@ -48,7 +49,7 @@ 18965 @@ -45,10 +46,14 @@ 18966 #define _POSIX_SOURCE 18967 #endif 18968 18969 +#ifndef CUR 18970 +#define CUR SP_TERMTYPE 18971 +#endif 18972 + 17148 18973 #include <term.h> /* clear_screen, cup & friends, cur_term */ 17149 18974 #include <tic.h> 17150 18975 17151 18976 -MODULE_ID("$Id: lib_newterm.c,v 1.73 2008/08/16 21:20:48 Werner.Fink Exp $") 17152 +MODULE_ID("$Id: lib_newterm.c,v 1.7 4 2009/02/15 00:37:10tom Exp $")18977 +MODULE_ID("$Id: lib_newterm.c,v 1.77 2009/05/10 00:48:29 tom Exp $") 17153 18978 17154 18979 #ifndef ONLCR /* Allows compilation under the QNX 4.2 OS */ 17155 18980 #define ONLCR 0 17156 @@ -95,7 + 96,7 @@18981 @@ -95,7 +100,7 @@ 17157 18982 * initialized. 17158 18983 */ … … 17163 18988 START_TRACE(); 17164 18989 T((T_CALLED("filter"))); 17165 @@ -103,23 +10 4,40@@18990 @@ -103,23 +108,42 @@ 17166 18991 returnVoid; 17167 18992 } … … 17201 19026 NCURSES_EXPORT(SCREEN *) 17202 19027 -newterm(NCURSES_CONST char *name, FILE *ofp, FILE *ifp) 17203 +NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx NCURSES_CONST char *name, FILE 17204 + *ofp, FILE *ifp) 19028 +NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx 19029 + NCURSES_CONST char *name, 19030 + FILE *ofp, 19031 + FILE *ifp) 17205 19032 { 17206 19033 int value; 17207 19034 int errret; 17208 @@ -133,8 +15 1,8 @@19035 @@ -133,8 +157,8 @@ 17209 19036 _nc_init_pthreads(); 17210 19037 _nc_lock_global(curses); … … 17217 19044 /* this loads the capability entry, then sets LINES and COLS */ 17218 19045 if (setupterm(name, fileno(ofp), &errret) != ERR) { 17219 @@ -159,7 +1 77,7 @@19046 @@ -159,7 +183,7 @@ 17220 19047 _nc_set_screen(current); 17221 19048 result = 0; … … 17226 19053 * In setupterm() we did a set_curterm(), but it was before we set 17227 19054 * SP. So the "current" screen's terminal pointer was overwritten 17228 @@ -233,3 +25 1,11 @@19055 @@ -233,3 +257,11 @@ 17229 19056 _nc_unlock_global(curses); 17230 19057 returnSP(result); … … 17240 19067 diff -Naur ncurses-5.7.orig/ncurses/base/lib_newwin.c ncurses-5.7/ncurses/base/lib_newwin.c 17241 19068 --- ncurses-5.7.orig/ncurses/base/lib_newwin.c 2008-06-07 06:58:09.000000000 -0700 17242 +++ ncurses-5.7/ncurses/base/lib_newwin.c 2009-0 3-22 21:17:05.643993853-070019069 +++ ncurses-5.7/ncurses/base/lib_newwin.c 2009-06-05 14:01:51.000000000 -0700 17243 19070 @@ -1,5 +1,5 @@ 17244 19071 /**************************************************************************** … … 17261 19088 17262 19089 -MODULE_ID("$Id: lib_newwin.c,v 1.52 2008/06/07 13:58:09 tom Exp $") 17263 +MODULE_ID("$Id: lib_newwin.c,v 1.5 3 2009/02/15 00:38:00tom Exp $")19090 +MODULE_ID("$Id: lib_newwin.c,v 1.57 2009/05/09 23:40:03 tom Exp $") 17264 19091 17265 19092 #define window_is(name) ((sp)->_##name == win) 19093 19094 @@ -87,11 +88,11 @@ 19095 if (win != 0) { 19096 if (_nc_try_global(curses) == 0) { 19097 q = 0; 19098 - for (each_window(p)) { 19099 + for (each_window(SP, p)) { 19100 if (&(p->win) == win) { 19101 remove_window_from_screen(win); 19102 if (q == 0) 19103 - _nc_windows = p->next; 19104 + WindowList(SP) = p->next; 19105 else 19106 q->next = p->next; 17266 19107 17267 19108 @@ -115,7 +116,8 @@ … … 17275 19116 WINDOW *win; 17276 19117 NCURSES_CH_T *ptr; 17277 @@ -127, 7 +129,7@@19118 @@ -127,11 +129,13 @@ 17278 19119 returnWin(0); 17279 19120 … … 17282 19123 + num_lines = SP_PARM->_lines_avail - begy; 17283 19124 if (num_columns == 0) 17284 num_columns = screen_columns - begx; 17285 17286 @@ -149,6 +151,15 @@ 19125 - num_columns = screen_columns - begx; 19126 + num_columns = screen_columns(SP_PARM) - begx; 19127 19128 - if ((win = _nc_makenew(num_lines, num_columns, begy, begx, 0)) == 0) 19129 + win = NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_ARGx 19130 + num_lines, num_columns, begy, begx, 0); 19131 + if (win == 0) 19132 returnWin(0); 19133 19134 for (i = 0; i < num_lines; i++) { 19135 @@ -149,9 +153,22 @@ 17287 19136 returnWin(win); 17288 19137 } … … 17292 19141 +newwin(int num_lines, int num_columns, int begy, int begx) 17293 19142 +{ 17294 + return NCURSES_SP_NAME(newwin) (CURRENT_SCREEN, num_lines, num_columns, 19143 + return NCURSES_SP_NAME(newwin) (CURRENT_SCREEN, 19144 + num_lines, num_columns, 17295 19145 + begy, begx); 17296 19146 +} … … 17300 19150 derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int begx) 17301 19151 { 19152 +#if NCURSES_SP_FUNCS 19153 + SCREEN *sp = CURRENT_SCREEN; 19154 +#endif 19155 WINDOW *win; 19156 int i; 19157 int flags = _SUBWIN; 19158 @@ -177,8 +194,10 @@ 19159 if (orig->_flags & _ISPAD) 19160 flags |= _ISPAD; 19161 19162 - if ((win = _nc_makenew(num_lines, num_columns, orig->_begy + begy, 19163 - orig->_begx + begx, flags)) == 0) 19164 + win = NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_ARGx num_lines, num_columns, 19165 + orig->_begy + begy, 19166 + orig->_begx + begx, flags); 19167 + if (win == 0) 19168 returnWin(0); 19169 19170 win->_pary = begy; 19171 @@ -211,16 +230,22 @@ 19172 } 19173 19174 NCURSES_EXPORT(WINDOW *) 19175 -_nc_makenew(int num_lines, int num_columns, int begy, int begx, int flags) 19176 +NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_DCLx 19177 + int num_lines, 19178 + int num_columns, 19179 + int begy, 19180 + int begx, 19181 + int flags) 19182 { 19183 int i; 19184 WINDOWLIST *wp; 19185 WINDOW *win; 19186 bool is_pad = (flags & _ISPAD); 19187 19188 - T((T_CALLED("_nc_makenew(%d,%d,%d,%d)"), num_lines, num_columns, begy, begx)); 19189 + T((T_CALLED("_nc_makenew(%p,%d,%d,%d,%d)"), 19190 + SP_PARM, num_lines, num_columns, begy, begx)); 19191 19192 - if (SP == 0) 19193 + if (SP_PARM == 0) 19194 returnWin(0); 19195 19196 if (!dimension_limit(num_lines) || !dimension_limit(num_columns)) 19197 @@ -244,14 +269,16 @@ 19198 win->_maxx = num_columns - 1; 19199 win->_begy = begy; 19200 win->_begx = begx; 19201 - win->_yoffset = SP->_topstolen; 19202 + win->_yoffset = SP_PARM->_topstolen; 19203 19204 win->_flags = flags; 19205 WINDOW_ATTRS(win) = A_NORMAL; 19206 SetChar(win->_nc_bkgd, BLANK_TEXT, BLANK_ATTR); 19207 19208 - win->_clear = is_pad ? FALSE : (num_lines == screen_lines 19209 - && num_columns == screen_columns); 19210 + win->_clear = (is_pad 19211 + ? FALSE 19212 + : (num_lines == screen_lines(SP_PARM) 19213 + && num_columns == screen_columns(SP_PARM))); 19214 win->_idlok = FALSE; 19215 win->_idcok = TRUE; 19216 win->_scroll = FALSE; 19217 @@ -300,19 +327,19 @@ 19218 if_USE_SCROLL_HINTS(win->_line[i].oldindex = i); 19219 } 19220 19221 - if (!is_pad && (begx + num_columns == screen_columns)) { 19222 + if (!is_pad && (begx + num_columns == screen_columns(SP_PARM))) { 19223 win->_flags |= _ENDLINE; 19224 19225 - if (begx == 0 && num_lines == screen_lines && begy == 0) 19226 + if (begx == 0 && num_lines == screen_lines(SP_PARM) && begy == 0) 19227 win->_flags |= _FULLWIN; 19228 19229 - if (begy + num_lines == screen_lines) 19230 + if (begy + num_lines == screen_lines(SP_PARM)) 19231 win->_flags |= _SCROLLWIN; 19232 } 19233 19234 - wp->next = _nc_windows; 19235 - wp->screen = SP; 19236 - _nc_windows = wp; 19237 + wp->next = WindowList(SP_PARM); 19238 + wp->screen = SP_PARM; 19239 + WindowList(SP_PARM) = wp; 19240 19241 T((T_CREATE("window %p"), win)); 19242 19243 @@ -320,6 +347,16 @@ 19244 returnWin(win); 19245 } 19246 19247 +#if NCURSES_SP_FUNCS 19248 +NCURSES_EXPORT(WINDOW *) 19249 +_nc_makenew(int num_lines, int num_columns, int begy, int begx, int flags) 19250 +{ 19251 + return NCURSES_SP_NAME(_nc_makenew) (CURRENT_SCREEN, 19252 + num_lines, num_columns, 19253 + begy, begx, flags); 19254 +} 19255 +#endif 19256 + 19257 /* 19258 * wgetch() and other functions with a WINDOW* parameter may use a SCREEN* 19259 * internally, and it is useful to allow those to be invoked without switching 19260 @@ -336,3 +373,23 @@ 19261 } 19262 return (sp); 19263 } 19264 + 19265 +#if NCURSES_SP_FUNCS 19266 +NCURSES_EXPORT(WINDOW *) 19267 +_nc_curscr_of(SCREEN *sp) 19268 +{ 19269 + return sp == 0 ? 0 : sp->_curscr; 19270 +} 19271 + 19272 +NCURSES_EXPORT(WINDOW *) 19273 +_nc_newscr_of(SCREEN *sp) 19274 +{ 19275 + return sp == 0 ? 0 : sp->_newscr; 19276 +} 19277 + 19278 +NCURSES_EXPORT(WINDOW *) 19279 +_nc_stdscr_of(SCREEN *sp) 19280 +{ 19281 + return sp == 0 ? 0 : sp->_stdscr; 19282 +} 19283 +#endif 17302 19284 diff -Naur ncurses-5.7.orig/ncurses/base/lib_nl.c ncurses-5.7/ncurses/base/lib_nl.c 17303 19285 --- ncurses-5.7.orig/ncurses/base/lib_nl.c 2000-12-09 18:43:27.000000000 -0800 17304 +++ ncurses-5.7/ncurses/base/lib_nl.c 2009-0 3-22 21:17:07.012081575-070019286 +++ ncurses-5.7/ncurses/base/lib_nl.c 2009-06-05 14:01:16.000000000 -0700 17305 19287 @@ -1,5 +1,5 @@ 17306 19288 /**************************************************************************** … … 17386 19368 diff -Naur ncurses-5.7.orig/ncurses/base/lib_pad.c ncurses-5.7/ncurses/base/lib_pad.c 17387 19369 --- ncurses-5.7.orig/ncurses/base/lib_pad.c 2006-10-14 13:47:13.000000000 -0700 17388 +++ ncurses-5.7/ncurses/base/lib_pad.c 2009-0 3-22 21:17:05.643993853-070019370 +++ ncurses-5.7/ncurses/base/lib_pad.c 2009-06-05 14:01:44.000000000 -0700 17389 19371 @@ -1,5 +1,5 @@ 17390 19372 /**************************************************************************** 17391 19373 - * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. * 17392 + * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. 19374 + * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. * 17393 19375 * * 17394 19376 * Permission is hereby granted, free of charge, to any person obtaining a * … … 17408 19390 17409 19391 -MODULE_ID("$Id: lib_pad.c,v 1.41 2006/10/14 20:47:13 tom Exp $") 17410 +MODULE_ID("$Id: lib_pad.c,v 1.4 2 2009/02/15 00:38:48tom Exp $")19392 +MODULE_ID("$Id: lib_pad.c,v 1.43 2009/04/18 18:25:37 tom Exp $") 17411 19393 17412 19394 NCURSES_EXPORT(WINDOW *) … … 17431 19413 subpad(WINDOW *orig, int l, int c, int begy, int begx) 17432 19414 { 17433 diff -Naur ncurses-5.7.orig/ncurses/base/lib_screen.c ncurses-5.7/ncurses/base/lib_screen.c 17434 --- ncurses-5.7.orig/ncurses/base/lib_screen.c 2008-08-16 12:05:37.000000000 -0700 17435 +++ ncurses-5.7/ncurses/base/lib_screen.c 2009-03-22 21:17:05.647994412 -0700 19415 @@ -162,8 +172,8 @@ 19416 pmaxcol = pmincol + smaxcol - smincol; 19417 } 19418 19419 - if (smaxrow >= screen_lines 19420 - || smaxcol >= screen_columns 19421 + if (smaxrow >= screen_lines(CURRENT_SCREEN) 19422 + || smaxcol >= screen_columns(CURRENT_SCREEN) 19423 || sminrow > smaxrow 19424 || smincol > smaxcol) 19425 returnCode(ERR); 19426 diff -Naur ncurses-5.7.orig/ncurses/base/lib_printw.c ncurses-5.7/ncurses/base/lib_printw.c 19427 --- ncurses-5.7.orig/ncurses/base/lib_printw.c 2006-12-17 11:21:39.000000000 -0800 19428 +++ ncurses-5.7/ncurses/base/lib_printw.c 2009-06-05 14:01:44.000000000 -0700 19429 @@ -1,5 +1,5 @@ 19430 /**************************************************************************** 19431 - * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc. * 19432 + * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * 19433 * * 19434 * Permission is hereby granted, free of charge, to any person obtaining a * 19435 * copy of this software and associated documentation files (the * 19436 @@ -39,7 +39,7 @@ 19437 19438 #include <curses.priv.h> 19439 19440 -MODULE_ID("$Id: lib_printw.c,v 1.18 2006/12/17 19:21:39 tom Exp $") 19441 +MODULE_ID("$Id: lib_printw.c,v 1.19 2009/04/18 18:45:55 tom Exp $") 19442 19443 NCURSES_EXPORT(int) 19444 printw(const char *fmt,...) 19445 @@ -128,10 +128,14 @@ 19446 { 19447 char *buf; 19448 int code = ERR; 19449 +#if NCURSES_SP_FUNCS 19450 + SCREEN *sp = _nc_screen_of(win); 19451 +#endif 19452 19453 T((T_CALLED("vwprintw(%p,%s,va_list)"), win, _nc_visbuf(fmt))); 19454 19455 - if ((buf = _nc_printf_string(fmt, argp)) != 0) { 19456 + buf = NCURSES_SP_NAME(_nc_printf_string) (NCURSES_SP_ARGx fmt, argp); 19457 + if (buf != 0) { 19458 code = waddstr(win, buf); 19459 } 19460 returnCode(code); 19461 diff -Naur ncurses-5.7.orig/ncurses/base/lib_redrawln.c ncurses-5.7/ncurses/base/lib_redrawln.c 19462 --- ncurses-5.7.orig/ncurses/base/lib_redrawln.c 2007-10-13 13:08:56.000000000 -0700 19463 +++ ncurses-5.7/ncurses/base/lib_redrawln.c 2009-06-05 14:01:44.000000000 -0700 19464 @@ -1,5 +1,5 @@ 19465 /**************************************************************************** 19466 - * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. * 19467 + * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. * 19468 * * 19469 * Permission is hereby granted, free of charge, to any person obtaining a * 19470 * copy of this software and associated documentation files (the * 19471 @@ -39,7 +39,7 @@ 19472 19473 #include <curses.priv.h> 19474 19475 -MODULE_ID("$Id: lib_redrawln.c,v 1.12 2007/10/13 20:08:56 tom Exp $") 19476 +MODULE_ID("$Id: lib_redrawln.c,v 1.13 2009/04/18 18:46:00 tom Exp $") 19477 19478 NCURSES_EXPORT(int) 19479 wredrawln(WINDOW *win, int beg, int num) 19480 @@ -47,37 +47,40 @@ 19481 int i; 19482 int end; 19483 size_t len; 19484 + SCREEN *sp; 19485 19486 T((T_CALLED("wredrawln(%p,%d,%d)"), win, beg, num)); 19487 19488 if (win == 0) 19489 returnCode(ERR); 19490 19491 + sp = _nc_screen_of(win); 19492 + 19493 if (beg < 0) 19494 beg = 0; 19495 19496 if (touchline(win, beg, num) == ERR) 19497 returnCode(ERR); 19498 19499 - if (touchline(curscr, beg + win->_begy, num) == ERR) 19500 + if (touchline(sp->_curscr, beg + win->_begy, num) == ERR) 19501 returnCode(ERR); 19502 19503 end = beg + num; 19504 - if (end > curscr->_maxy + 1) 19505 - end = curscr->_maxy + 1; 19506 + if (end > sp->_curscr->_maxy + 1) 19507 + end = sp->_curscr->_maxy + 1; 19508 if (end > win->_maxy + 1) 19509 end = win->_maxy + 1; 19510 19511 len = (win->_maxx + 1); 19512 - if (len > (size_t) (curscr->_maxx + 1)) 19513 - len = (size_t) (curscr->_maxx + 1); 19514 - len *= sizeof(curscr->_line[0].text[0]); 19515 + if (len > (size_t) (sp->_curscr->_maxx + 1)) 19516 + len = (size_t) (sp->_curscr->_maxx + 1); 19517 + len *= sizeof(sp->_curscr->_line[0].text[0]); 19518 19519 for (i = beg; i < end; i++) { 19520 int crow = i + win->_begy; 19521 19522 - memset(curscr->_line[crow].text + win->_begx, 0, len); 19523 - _nc_make_oldhash(crow); 19524 + memset(sp->_curscr->_line[crow].text + win->_begx, 0, len); 19525 + NCURSES_SP_NAME(_nc_make_oldhash) (NCURSES_SP_ARGx crow); 19526 } 19527 19528 returnCode(OK); 19529 diff -Naur ncurses-5.7.orig/ncurses/base/lib_restart.c ncurses-5.7/ncurses/base/lib_restart.c 19530 --- ncurses-5.7.orig/ncurses/base/lib_restart.c 2008-06-21 10:31:22.000000000 -0700 19531 +++ ncurses-5.7/ncurses/base/lib_restart.c 2009-06-05 14:01:49.000000000 -0700 17436 19532 @@ -1,5 +1,5 @@ 17437 19533 /**************************************************************************** … … 17441 19537 * Permission is hereby granted, free of charge, to any person obtaining a * 17442 19538 * copy of this software and associated documentation files (the * 17443 @@ -30,11 +30,12 @@ 19539 @@ -30,6 +30,7 @@ 19540 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 19541 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 19542 * and: Thomas E. Dickey 1996-on * 19543 + * and: Juergen Pfeifer 2008 * 19544 ****************************************************************************/ 19545 19546 /* 19547 @@ -44,49 +45,52 @@ 19548 #define _POSIX_SOURCE 19549 #endif 19550 19551 -#include <term.h> /* lines, columns, cur_term */ 19552 - 19553 -MODULE_ID("$Id: lib_restart.c,v 1.10 2008/06/21 17:31:22 tom Exp $") 19554 +MODULE_ID("$Id: lib_restart.c,v 1.11 2009/05/02 20:47:42 tom Exp $") 19555 19556 NCURSES_EXPORT(int) 19557 -restartterm(NCURSES_CONST char *termp, int filenum, int *errret) 19558 +NCURSES_SP_NAME(restartterm) (NCURSES_SP_DCLx 19559 + NCURSES_CONST char *termp, 19560 + int filenum, 19561 + int *errret) 19562 { 19563 int result; 19564 19565 - T((T_CALLED("restartterm(%s,%d,%p)"), termp, filenum, errret)); 19566 + T((T_CALLED("restartterm(%p,%s,%d,%p)"), SP_PARM, termp, filenum, errret)); 19567 19568 if (setupterm(termp, filenum, errret) != OK) { 19569 result = ERR; 19570 - } else if (SP != 0) { 19571 - int saveecho = SP->_echo; 19572 - int savecbreak = SP->_cbreak; 19573 - int saveraw = SP->_raw; 19574 - int savenl = SP->_nl; 19575 - 19576 - if (saveecho) 19577 - echo(); 19578 - else 19579 - noecho(); 19580 + } else if (SP_PARM != 0) { 19581 + int saveecho = SP_PARM->_echo; 19582 + int savecbreak = SP_PARM->_cbreak; 19583 + int saveraw = SP_PARM->_raw; 19584 + int savenl = SP_PARM->_nl; 19585 + 19586 + if (saveecho) { 19587 + NCURSES_SP_NAME(echo) (NCURSES_SP_ARG); 19588 + } else { 19589 + NCURSES_SP_NAME(noecho) (NCURSES_SP_ARG); 19590 + } 19591 19592 if (savecbreak) { 19593 - cbreak(); 19594 - noraw(); 19595 + NCURSES_SP_NAME(cbreak) (NCURSES_SP_ARG); 19596 + NCURSES_SP_NAME(noraw) (NCURSES_SP_ARG); 19597 } else if (saveraw) { 19598 - nocbreak(); 19599 - raw(); 19600 + NCURSES_SP_NAME(nocbreak) (NCURSES_SP_ARG); 19601 + NCURSES_SP_NAME(raw) (NCURSES_SP_ARG); 19602 + } else { 19603 + NCURSES_SP_NAME(nocbreak) (NCURSES_SP_ARG); 19604 + NCURSES_SP_NAME(noraw) (NCURSES_SP_ARG); 19605 + } 19606 + if (savenl) { 19607 + NCURSES_SP_NAME(nl) (NCURSES_SP_ARG); 19608 } else { 19609 - nocbreak(); 19610 - noraw(); 19611 + NCURSES_SP_NAME(nonl) (NCURSES_SP_ARG); 19612 } 19613 - if (savenl) 19614 - nl(); 19615 - else 19616 - nonl(); 19617 19618 - reset_prog_mode(); 19619 + NCURSES_SP_NAME(reset_prog_mode) (NCURSES_SP_ARG); 19620 19621 #if USE_SIZECHANGE 19622 - _nc_update_screensize(SP); 19623 + _nc_update_screensize(SP_PARM); 19624 #endif 19625 19626 result = OK; 19627 @@ -95,3 +99,11 @@ 19628 } 19629 returnCode(result); 19630 } 19631 + 19632 +#if NCURSES_SP_FUNCS 19633 +NCURSES_EXPORT(int) 19634 +restartterm(NCURSES_CONST char *termp, int filenum, int *errret) 19635 +{ 19636 + return NCURSES_SP_NAME(restartterm) (CURRENT_SCREEN, termp, filenum, errret); 19637 +} 19638 +#endif 19639 diff -Naur ncurses-5.7.orig/ncurses/base/lib_screen.c ncurses-5.7/ncurses/base/lib_screen.c 19640 --- ncurses-5.7.orig/ncurses/base/lib_screen.c 2008-08-16 12:05:37.000000000 -0700 19641 +++ ncurses-5.7/ncurses/base/lib_screen.c 2009-06-05 14:01:51.000000000 -0700 19642 @@ -1,5 +1,5 @@ 19643 /**************************************************************************** 19644 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 19645 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 19646 * * 19647 * Permission is hereby granted, free of charge, to any person obtaining a * 19648 * copy of this software and associated documentation files (the * 19649 @@ -30,11 +30,16 @@ 17444 19650 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 17445 19651 * and: Eric S. Raymond <esr@snark.thyrsus.com> * … … 17451 19657 17452 19658 -MODULE_ID("$Id: lib_screen.c,v 1.31 2008/08/16 19:05:37 tom Exp $") 17453 +MODULE_ID("$Id: lib_screen.c,v 1.32 2009/02/15 00:39:13 tom Exp $") 19659 +#ifndef CUR 19660 +#define CUR SP_TERMTYPE 19661 +#endif 19662 + 19663 +MODULE_ID("$Id: lib_screen.c,v 1.34 2009/05/10 00:48:29 tom Exp $") 17454 19664 17455 19665 #define MAX_SIZE 0x3fff /* 16k is big enough for a window or pad */ 17456 19666 17457 @@ -141,7 +14 2,7 @@19667 @@ -141,7 +146,7 @@ 17458 19668 } 17459 19669 … … 17464 19674 FILE *fp = 0; 17465 19675 17466 @@ -152,15 +15 3,23 @@19676 @@ -152,15 +157,23 @@ 17467 19677 returnCode(ERR); 17468 19678 } else { … … 17490 19700 scr_dump(const char *file) 17491 19701 { 17492 @@ -179,7 +1 88,7 @@19702 @@ -179,7 +192,7 @@ 17493 19703 } 17494 19704 … … 17499 19709 FILE *fp = 0; 17500 19710 17501 @@ -193,17 +20 2,25 @@19711 @@ -193,17 +206,25 @@ 17502 19712 returnCode(ERR); 17503 19713 } else { … … 17528 19738 T((T_CALLED("scr_set(%s)"), _nc_visbuf(file))); 17529 19739 17530 @@ -211,10 +2 28,18 @@19740 @@ -211,10 +232,18 @@ 17531 19741 returnCode(ERR); 17532 19742 } else { … … 17551 19761 diff -Naur ncurses-5.7.orig/ncurses/base/lib_set_term.c ncurses-5.7/ncurses/base/lib_set_term.c 17552 19762 --- ncurses-5.7.orig/ncurses/base/lib_set_term.c 2008-08-04 11:11:12.000000000 -0700 17553 +++ ncurses-5.7/ncurses/base/lib_set_term.c 2009-0 3-22 21:17:05.647994412-070019763 +++ ncurses-5.7/ncurses/base/lib_set_term.c 2009-06-05 14:01:51.000000000 -0700 17554 19764 @@ -1,5 +1,5 @@ 17555 19765 /**************************************************************************** … … 17567 19777 17568 19778 /* 17569 @@ -44,7 +45, 7@@19779 @@ -44,7 +45,11 @@ 17570 19780 #include <term.h> /* cur_term */ 17571 19781 #include <tic.h> 17572 19782 17573 19783 -MODULE_ID("$Id: lib_set_term.c,v 1.117 2008/08/04 18:11:12 tom Exp $") 17574 +MODULE_ID("$Id: lib_set_term.c,v 1.118 2009/02/15 00:39:46 tom Exp $") 19784 +#ifndef CUR 19785 +#define CUR SP_TERMTYPE 19786 +#endif 19787 + 19788 +MODULE_ID("$Id: lib_set_term.c,v 1.122 2009/05/10 00:48:29 tom Exp $") 17575 19789 17576 19790 NCURSES_EXPORT(SCREEN *) 17577 19791 set_term(SCREEN *screenp) 17578 @@ -635,7 +636,9 @@ 19792 @@ -256,6 +261,9 @@ 19793 bool filtered, 19794 int slk_format) 19795 { 19796 +#if NCURSES_SP_FUNCS 19797 + SCREEN *sp = CURRENT_SCREEN; 19798 +#endif 19799 char *env; 19800 int bottom_stolen = 0; 19801 bool support_cookies = USE_XMC_SUPPORT; 19802 @@ -555,8 +563,8 @@ 19803 def_shell_mode(); 19804 def_prog_mode(); 19805 19806 - for (rop = ripoff_stack; 19807 - rop != ripoff_sp && (rop - ripoff_stack) < N_RIPS; 19808 + for (rop = safe_ripoff_stack; 19809 + rop != safe_ripoff_sp && (rop - safe_ripoff_stack) < N_RIPS; 19810 rop++) { 19811 19812 /* If we must simulate soft labels, grab off the line to be used. 19813 @@ -595,7 +603,7 @@ 19814 } 19815 } 19816 /* reset the stack */ 19817 - ripoff_sp = ripoff_stack; 19818 + safe_ripoff_sp = safe_ripoff_stack; 19819 19820 T(("creating stdscr")); 19821 assert((SP->_lines_avail + SP->_topstolen + bottom_stolen) == slines); 19822 @@ -615,27 +623,39 @@ 19823 * off from the top or bottom. 19824 */ 19825 NCURSES_EXPORT(int) 19826 -_nc_ripoffline(int line, int (*init) (WINDOW *, int)) 19827 +NCURSES_SP_NAME(_nc_ripoffline) (NCURSES_SP_DCLx 19828 + int line, 19829 + int (*init) (WINDOW *, int)) 19830 { 19831 T((T_CALLED("_nc_ripoffline(%d, %p)"), line, init)); 19832 19833 if (line != 0) { 19834 19835 - if (ripoff_sp == 0) 19836 - ripoff_sp = ripoff_stack; 19837 - if (ripoff_sp >= ripoff_stack + N_RIPS) 19838 + if (safe_ripoff_sp == 0) 19839 + safe_ripoff_sp = safe_ripoff_stack; 19840 + if (safe_ripoff_sp >= safe_ripoff_stack + N_RIPS) 19841 returnCode(ERR); 19842 19843 - ripoff_sp->line = line; 19844 - ripoff_sp->hook = init; 19845 - ripoff_sp++; 19846 + safe_ripoff_sp->line = line; 19847 + safe_ripoff_sp->hook = init; 19848 + safe_ripoff_sp++; 19849 } 19850 19851 returnCode(OK); 17579 19852 } 17580 19853 19854 +#if NCURSES_SP_FUNCS 17581 19855 NCURSES_EXPORT(int) 17582 19856 -ripoffline(int line, int (*init) (WINDOW *, int)) 19857 +_nc_ripoffline(int line, int (*init) (WINDOW *, int)) 19858 +{ 19859 + return NCURSES_SP_NAME(_nc_ripoffline) (CURRENT_SCREEN, line, init); 19860 +} 19861 +#endif 19862 + 19863 +NCURSES_EXPORT(int) 17583 19864 +NCURSES_SP_NAME(ripoffline) (NCURSES_SP_DCLx 17584 19865 + int line, … … 17587 19868 START_TRACE(); 17588 19869 T((T_CALLED("ripoffline(%d,%p)"), line, init)); 17589 @@ -645,3 +648,11 @@ 17590 17591 returnCode(_nc_ripoffline((line < 0) ? -1 : 1, init)); 17592 } 19870 @@ -643,5 +663,15 @@ 19871 if (line == 0) 19872 returnCode(OK); 19873 19874 - returnCode(_nc_ripoffline((line < 0) ? -1 : 1, init)); 19875 + returnCode(NCURSES_SP_NAME(_nc_ripoffline) (NCURSES_SP_ARGx 19876 + (line < 0) ? -1 : 1, 19877 + init)); 19878 +} 17593 19879 + 17594 19880 +#if NCURSES_SP_FUNCS … … 17597 19883 +{ 17598 19884 + return NCURSES_SP_NAME(ripoffline) (CURRENT_SCREEN, line, init); 17599 +}19885 } 17600 19886 +#endif 17601 19887 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatrof.c ncurses-5.7/ncurses/base/lib_slkatrof.c 17602 19888 --- ncurses-5.7.orig/ncurses/base/lib_slkatrof.c 2005-01-08 15:01:32.000000000 -0800 17603 +++ ncurses-5.7/ncurses/base/lib_slkatrof.c 2009-0 3-22 21:17:07.016081855-070019889 +++ ncurses-5.7/ncurses/base/lib_slkatrof.c 2009-06-05 14:01:16.000000000 -0700 17604 19890 @@ -1,5 +1,5 @@ 17605 19891 /**************************************************************************** … … 17649 19935 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatron.c ncurses-5.7/ncurses/base/lib_slkatron.c 17650 19936 --- ncurses-5.7.orig/ncurses/base/lib_slkatron.c 2005-01-08 15:02:01.000000000 -0800 17651 +++ ncurses-5.7/ncurses/base/lib_slkatron.c 2009-0 3-22 21:17:07.016081855-070019937 +++ ncurses-5.7/ncurses/base/lib_slkatron.c 2009-06-05 14:01:16.000000000 -0700 17652 19938 @@ -1,5 +1,5 @@ 17653 19939 /**************************************************************************** … … 17697 19983 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatr_set.c ncurses-5.7/ncurses/base/lib_slkatr_set.c 17698 19984 --- ncurses-5.7.orig/ncurses/base/lib_slkatr_set.c 2005-01-28 13:11:53.000000000 -0800 17699 +++ ncurses-5.7/ncurses/base/lib_slkatr_set.c 2009-0 3-22 21:17:07.016081855-070019985 +++ ncurses-5.7/ncurses/base/lib_slkatr_set.c 2009-06-05 14:01:16.000000000 -0700 17700 19986 @@ -1,5 +1,5 @@ 17701 19987 /**************************************************************************** … … 17768 20054 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatrset.c ncurses-5.7/ncurses/base/lib_slkatrset.c 17769 20055 --- ncurses-5.7.orig/ncurses/base/lib_slkatrset.c 2005-01-08 13:46:47.000000000 -0800 17770 +++ ncurses-5.7/ncurses/base/lib_slkatrset.c 2009-0 3-22 21:17:07.016081855-070020056 +++ ncurses-5.7/ncurses/base/lib_slkatrset.c 2009-06-05 14:01:16.000000000 -0700 17771 20057 @@ -1,5 +1,5 @@ 17772 20058 /**************************************************************************** … … 17808 20094 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkattr.c ncurses-5.7/ncurses/base/lib_slkattr.c 17809 20095 --- ncurses-5.7.orig/ncurses/base/lib_slkattr.c 2005-01-08 13:44:28.000000000 -0800 17810 +++ ncurses-5.7/ncurses/base/lib_slkattr.c 2009-0 3-22 21:17:07.016081855-070020096 +++ ncurses-5.7/ncurses/base/lib_slkattr.c 2009-06-05 14:01:16.000000000 -0700 17811 20097 @@ -1,5 +1,5 @@ 17812 20098 /**************************************************************************** … … 17852 20138 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slk.c ncurses-5.7/ncurses/base/lib_slk.c 17853 20139 --- ncurses-5.7.orig/ncurses/base/lib_slk.c 2008-09-27 07:07:33.000000000 -0700 17854 +++ ncurses-5.7/ncurses/base/lib_slk.c 2009-0 3-22 21:17:05.647994412-070020140 +++ ncurses-5.7/ncurses/base/lib_slk.c 2009-06-05 14:01:51.000000000 -0700 17855 20141 @@ -1,5 +1,5 @@ 17856 20142 /**************************************************************************** … … 17860 20146 * Permission is hereby granted, free of charge, to any person obtaining a * 17861 20147 * copy of this software and associated documentation files (the * 17862 @@ -45,7 +45, 7@@20148 @@ -45,7 +45,11 @@ 17863 20149 #include <ctype.h> 17864 20150 #include <term.h> /* num_labels, label_*, plab_norm */ 17865 20151 17866 20152 -MODULE_ID("$Id: lib_slk.c,v 1.35 2008/09/27 14:07:33 juergen Exp $") 17867 +MODULE_ID("$Id: lib_slk.c,v 1.36 2009/02/15 00:33:48 tom Exp $") 20153 +#ifndef CUR 20154 +#define CUR SP_TERMTYPE 20155 +#endif 20156 + 20157 +MODULE_ID("$Id: lib_slk.c,v 1.38 2009/05/10 00:48:29 tom Exp $") 17868 20158 17869 20159 /* 17870 20160 * Free any memory related to soft labels, return an error. 17871 @@ -178,14 +178,22 @@ 20161 @@ -68,6 +72,9 @@ 20162 NCURSES_EXPORT(int) 20163 _nc_slk_initialize(WINDOW *stwin, int cols) 20164 { 20165 +#if NCURSES_SP_FUNCS 20166 + SCREEN *sp = CURRENT_SCREEN; 20167 +#endif 20168 int i, x; 20169 int res = OK; 20170 unsigned max_length; 20171 @@ -178,14 +185,22 @@ 17872 20172 * Restore the soft labels on the screen. 17873 20173 */ … … 17898 20198 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkclear.c ncurses-5.7/ncurses/base/lib_slkclear.c 17899 20199 --- ncurses-5.7.orig/ncurses/base/lib_slkclear.c 2007-12-29 09:51:47.000000000 -0800 17900 +++ ncurses-5.7/ncurses/base/lib_slkclear.c 2009-0 3-22 21:17:07.016081855-070020200 +++ ncurses-5.7/ncurses/base/lib_slkclear.c 2009-06-05 14:01:16.000000000 -0700 17901 20201 @@ -1,5 +1,5 @@ 17902 20202 /**************************************************************************** … … 17954 20254 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkcolor.c ncurses-5.7/ncurses/base/lib_slkcolor.c 17955 20255 --- ncurses-5.7.orig/ncurses/base/lib_slkcolor.c 2005-01-28 13:11:53.000000000 -0800 17956 +++ ncurses-5.7/ncurses/base/lib_slkcolor.c 2009-0 3-22 21:17:07.016081855-070020256 +++ ncurses-5.7/ncurses/base/lib_slkcolor.c 2009-06-05 14:01:16.000000000 -0700 17957 20257 @@ -1,5 +1,5 @@ 17958 20258 /**************************************************************************** … … 18018 20318 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkinit.c ncurses-5.7/ncurses/base/lib_slkinit.c 18019 20319 --- ncurses-5.7.orig/ncurses/base/lib_slkinit.c 2008-01-12 12:23:39.000000000 -0800 18020 +++ ncurses-5.7/ncurses/base/lib_slkinit.c 2009-0 3-22 21:17:05.647994412-070020320 +++ ncurses-5.7/ncurses/base/lib_slkinit.c 2009-06-05 14:01:54.000000000 -0700 18021 20321 @@ -1,5 +1,5 @@ 18022 20322 /**************************************************************************** … … 18034 20334 18035 20335 /* 18036 @@ -39,1 0 +40,10 @@20336 @@ -39,17 +40,40 @@ 18037 20337 */ 18038 20338 #include <curses.priv.h> 18039 20339 18040 20340 -MODULE_ID("$Id: lib_slkinit.c,v 1.7 2008/01/12 20:23:39 tom Exp $") 18041 +MODULE_ID("$Id: lib_slkinit.c,v 1.8 2009/02/15 00:42:36 tom Exp $") 20341 +MODULE_ID("$Id: lib_slkinit.c,v 1.11 2009/05/23 23:32:57 tom Exp $") 20342 + 20343 +#ifdef USE_SP_RIPOFF 20344 +#define SoftkeyFormat SP_PARM->slk_format 20345 +#else 20346 +#define SoftkeyFormat _nc_globals.slk_format 20347 +#endif 18042 20348 18043 20349 NCURSES_EXPORT(int) … … 18047 20353 int code = ERR; 18048 20354 18049 @@ -53,3 +54,11 @@ 20355 - T((T_CALLED("slk_init(%d)"), format)); 20356 - if (format >= 0 && format <= 3 && !_nc_globals.slk_format) { 20357 - _nc_globals.slk_format = 1 + format; 20358 - code = _nc_ripoffline(-SLK_LINES(_nc_globals.slk_format), _nc_slk_initialize); 20359 + T((T_CALLED("slk_init(%p,%d)"), SP_PARM, format)); 20360 + 20361 + if (format >= 0 20362 + && format <= 3 20363 +#ifdef USE_SP_RIPOFF 20364 + && SP_PARM 20365 + && SP_PARM->_prescreen 20366 +#endif 20367 + && !SoftkeyFormat) { 20368 + SoftkeyFormat = 1 + format; 20369 + code = NCURSES_SP_NAME(_nc_ripoffline) (NCURSES_SP_ARGx 20370 + -SLK_LINES(SoftkeyFormat), 20371 + _nc_slk_initialize); 18050 20372 } 18051 20373 returnCode(code); … … 18056 20378 +slk_init(int format) 18057 20379 +{ 18058 + return NCURSES_SP_NAME(slk_init) (CURRENT_SCREEN , format);20380 + return NCURSES_SP_NAME(slk_init) (CURRENT_SCREEN_PRE, format); 18059 20381 +} 18060 20382 +#endif 18061 20383 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slklab.c ncurses-5.7/ncurses/base/lib_slklab.c 18062 20384 --- ncurses-5.7.orig/ncurses/base/lib_slklab.c 2003-03-29 14:53:48.000000000 -0800 18063 +++ ncurses-5.7/ncurses/base/lib_slklab.c 2009-0 3-22 21:17:07.016081855-070020385 +++ ncurses-5.7/ncurses/base/lib_slklab.c 2009-06-05 14:01:16.000000000 -0700 18064 20386 @@ -1,5 +1,5 @@ 18065 20387 /**************************************************************************** … … 18108 20430 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkrefr.c ncurses-5.7/ncurses/base/lib_slkrefr.c 18109 20431 --- ncurses-5.7.orig/ncurses/base/lib_slkrefr.c 2008-09-27 07:07:53.000000000 -0700 18110 +++ ncurses-5.7/ncurses/base/lib_slkrefr.c 2009-0 3-22 21:17:05.647994412-070020432 +++ ncurses-5.7/ncurses/base/lib_slkrefr.c 2009-06-05 14:01:51.000000000 -0700 18111 20433 @@ -1,5 +1,5 @@ 18112 20434 /**************************************************************************** … … 18116 20438 * Permission is hereby granted, free of charge, to any person obtaining a * 18117 20439 * copy of this software and associated documentation files (the * 18118 @@ -40,7 +40, 7@@20440 @@ -40,7 +40,11 @@ 18119 20441 #include <curses.priv.h> 18120 20442 #include <term.h> /* num_labels, label_*, plab_norm */ 18121 20443 18122 20444 -MODULE_ID("$Id: lib_slkrefr.c,v 1.17 2008/09/27 14:07:53 juergen Exp $") 18123 +MODULE_ID("$Id: lib_slkrefr.c,v 1.18 2009/02/15 00:33:48 tom Exp $") 20445 +#ifndef CUR 20446 +#define CUR SP_TERMTYPE 20447 +#endif 20448 + 20449 +MODULE_ID("$Id: lib_slkrefr.c,v 1.20 2009/05/10 00:48:29 tom Exp $") 18124 20450 18125 20451 /* 18126 20452 * Paint the info line for the PC style SLK emulation. 18127 @@ -113,32 +113,48 @@ 20453 @@ -68,6 +72,9 @@ 20454 static void 20455 slk_intern_refresh(SLK * slk) 20456 { 20457 +#if NCURSES_SP_FUNCS 20458 + SCREEN *sp = CURRENT_SCREEN; 20459 +#endif 20460 int i; 20461 int fmt = SP->slk_format; 20462 20463 @@ -113,32 +120,48 @@ 18128 20464 * Refresh the soft labels. 18129 20465 */ … … 18186 20522 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkset.c ncurses-5.7/ncurses/base/lib_slkset.c 18187 20523 --- ncurses-5.7.orig/ncurses/base/lib_slkset.c 2007-10-13 13:08:46.000000000 -0700 18188 +++ ncurses-5.7/ncurses/base/lib_slkset.c 2009-0 3-22 21:17:07.016081855-070020524 +++ ncurses-5.7/ncurses/base/lib_slkset.c 2009-06-05 14:01:16.000000000 -0700 18189 20525 @@ -1,5 +1,5 @@ 18190 20526 /**************************************************************************** … … 18247 20583 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slktouch.c ncurses-5.7/ncurses/base/lib_slktouch.c 18248 20584 --- ncurses-5.7.orig/ncurses/base/lib_slktouch.c 2000-12-09 18:43:27.000000000 -0800 18249 +++ ncurses-5.7/ncurses/base/lib_slktouch.c 2009-0 3-22 21:17:07.016081855-070020585 +++ ncurses-5.7/ncurses/base/lib_slktouch.c 2009-06-05 14:01:16.000000000 -0700 18250 20586 @@ -1,5 +1,5 @@ 18251 20587 /**************************************************************************** … … 18298 20634 diff -Naur ncurses-5.7.orig/ncurses/base/lib_ungetch.c ncurses-5.7/ncurses/base/lib_ungetch.c 18299 20635 --- ncurses-5.7.orig/ncurses/base/lib_ungetch.c 2008-05-31 09:44:54.000000000 -0700 18300 +++ ncurses-5.7/ncurses/base/lib_ungetch.c 2009-0 3-22 21:17:05.651994412-070020636 +++ ncurses-5.7/ncurses/base/lib_ungetch.c 2009-06-05 14:01:44.000000000 -0700 18301 20637 @@ -1,5 +1,5 @@ 18302 20638 /**************************************************************************** … … 18319 20655 18320 20656 -MODULE_ID("$Id: lib_ungetch.c,v 1.11 2008/05/31 16:44:54 tom Exp $") 18321 +MODULE_ID("$Id: lib_ungetch.c,v 1.1 2 2009/02/15 00:46:58tom Exp $")20657 +MODULE_ID("$Id: lib_ungetch.c,v 1.13 2009/04/18 20:30:12 tom Exp $") 18322 20658 18323 20659 #include <fifo_defs.h> 18324 20660 18325 @@ -83,8 +84,16 @@ 20661 @@ -57,10 +58,12 @@ 20662 #endif /* TRACE */ 20663 20664 NCURSES_EXPORT(int) 20665 -_nc_ungetch(SCREEN *sp, int ch) 20666 +safe_ungetch(SCREEN *sp, int ch) 20667 { 20668 int rc = ERR; 20669 20670 + T((T_CALLED("ungetch(%p,%s)"), sp, _nc_tracechar(sp, ch))); 20671 + 20672 if (tail != -1) { 20673 if (head == -1) { 20674 head = 0; 20675 @@ -79,12 +82,11 @@ 20676 #endif 20677 rc = OK; 20678 } 20679 - return rc; 20680 + returnCode(rc); 18326 20681 } 18327 20682 18328 20683 NCURSES_EXPORT(int) 18329 +NCURSES_SP_NAME(ungetch) (NCURSES_SP_DCLx int ch)18330 +{18331 + T((T_CALLED("ungetch(%s)"), _nc_tracechar(SP_PARM, ch)));18332 + returnCode(_nc_ungetch(SP_PARM, ch));18333 +}18334 +18335 +#if NCURSES_SP_FUNCS18336 +NCURSES_EXPORT(int)18337 20684 ungetch(int ch) 18338 20685 { 18339 20686 - T((T_CALLED("ungetch(%s)"), _nc_tracechar(SP, ch))); 18340 20687 - returnCode(_nc_ungetch(SP, ch)); 18341 + return NCURSES_SP_NAME(ungetch)(CURRENT_SCREEN, ch);20688 + return safe_ungetch(CURRENT_SCREEN, ch); 18342 20689 } 18343 +#endif18344 20690 diff -Naur ncurses-5.7.orig/ncurses/base/lib_winch.c ncurses-5.7/ncurses/base/lib_winch.c 18345 20691 --- ncurses-5.7.orig/ncurses/base/lib_winch.c 2001-06-02 16:42:08.000000000 -0700 18346 +++ ncurses-5.7/ncurses/base/lib_winch.c 2009-0 3-22 21:17:07.016081855-070020692 +++ ncurses-5.7/ncurses/base/lib_winch.c 2009-06-05 14:01:16.000000000 -0700 18347 20693 @@ -39,16 +39,16 @@ 18348 20694 … … 18366 20712 } 18367 20713 } 20714 diff -Naur ncurses-5.7.orig/ncurses/base/lib_window.c ncurses-5.7/ncurses/base/lib_window.c 20715 --- ncurses-5.7.orig/ncurses/base/lib_window.c 2008-06-07 07:12:56.000000000 -0700 20716 +++ ncurses-5.7/ncurses/base/lib_window.c 2009-06-05 14:01:44.000000000 -0700 20717 @@ -1,5 +1,5 @@ 20718 /**************************************************************************** 20719 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 20720 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 20721 * * 20722 * Permission is hereby granted, free of charge, to any person obtaining a * 20723 * copy of this software and associated documentation files (the * 20724 @@ -39,7 +39,7 @@ 20725 20726 #include <curses.priv.h> 20727 20728 -MODULE_ID("$Id: lib_window.c,v 1.25 2008/06/07 14:12:56 tom Exp $") 20729 +MODULE_ID("$Id: lib_window.c,v 1.26 2009/04/18 18:46:09 tom Exp $") 20730 20731 NCURSES_EXPORT(void) 20732 _nc_synchook(WINDOW *win) 20733 @@ -185,16 +185,20 @@ 20734 T((T_CALLED("dupwin(%p)"), win)); 20735 20736 if (win != 0) { 20737 - 20738 +#if NCURSES_SP_FUNCS 20739 + SCREEN *sp = _nc_screen_of(win); 20740 +#endif 20741 _nc_lock_global(curses); 20742 if (win->_flags & _ISPAD) { 20743 - nwin = newpad(win->_maxy + 1, 20744 - win->_maxx + 1); 20745 + nwin = NCURSES_SP_NAME(newpad) (NCURSES_SP_ARGx 20746 + win->_maxy + 1, 20747 + win->_maxx + 1); 20748 } else { 20749 - nwin = newwin(win->_maxy + 1, 20750 - win->_maxx + 1, 20751 - win->_begy, 20752 - win->_begx); 20753 + nwin = NCURSES_SP_NAME(newwin) (NCURSES_SP_ARGx 20754 + win->_maxy + 1, 20755 + win->_maxx + 1, 20756 + win->_begy, 20757 + win->_begx); 20758 } 20759 20760 if (nwin != 0) { 18368 20761 diff -Naur ncurses-5.7.orig/ncurses/base/MKkeyname.awk ncurses-5.7/ncurses/base/MKkeyname.awk 18369 20762 --- ncurses-5.7.orig/ncurses/base/MKkeyname.awk 2008-07-12 11:40:00.000000000 -0700 18370 +++ ncurses-5.7/ncurses/base/MKkeyname.awk 2009-0 3-22 21:17:05.639993853-070020763 +++ ncurses-5.7/ncurses/base/MKkeyname.awk 2009-06-05 14:01:51.000000000 -0700 18371 20764 @@ -1,6 +1,6 @@ 18372 20765 -# $Id: MKkeyname.awk,v 1.40 2008/07/12 18:40:00 tom Exp $ 18373 +# $Id: MKkeyname.awk,v 1.4 1 2009/02/15 00:24:58tom Exp $20766 +# $Id: MKkeyname.awk,v 1.43 2009/05/09 19:01:49 tom Exp $ 18374 20767 ############################################################################## 18375 20768 -# Copyright (c) 1999-2007,2008 Free Software Foundation, Inc. # … … 18378 20771 # Permission is hereby granted, free of charge, to any person obtaining a # 18379 20772 # copy of this software and associated documentation files (the "Software"), # 18380 @@ -141,11 +141,20 @@ 20773 @@ -67,7 +67,8 @@ 20774 print "#define SIZEOF_TABLE 256" 20775 print "#define MyTable _nc_globals.keyname_table" 20776 print "" 20777 - print "NCURSES_EXPORT(NCURSES_CONST char *) _nc_keyname (SCREEN *sp, int c)" 20778 + print "NCURSES_EXPORT(NCURSES_CONST char *)" 20779 + print "safe_keyname (SCREEN *sp, int c)" 20780 print "{" 20781 print " int i;" 20782 print " char name[20];" 20783 @@ -116,14 +117,14 @@ 20784 print " result = MyTable[c];" 20785 print " }" 20786 print "#if NCURSES_EXT_FUNCS && NCURSES_XNAMES" 20787 - print " } else if (result == 0 && cur_term != 0) {" 20788 + print " } else if (result == 0 && HasTerminal(sp)) {" 20789 print " int j, k;" 20790 print " char * bound;" 20791 - print " TERMTYPE *tp = &(cur_term->type);" 20792 + print " TERMTYPE *tp = &(TerminalOf(sp)->type);" 20793 print " int save_trace = _nc_tracing;" 20794 print "" 20795 print " _nc_tracing = 0; /* prevent recursion via keybound() */" 20796 - print " for (j = 0; (bound = keybound(c, j)) != 0; ++j) {" 20797 + print " for (j = 0; (bound = NCURSES_SP_NAME(keybound)(NCURSES_SP_ARGx c, j)) != 0; ++j) {" 20798 print " for(k = STRCOUNT; k < (int) NUM_STRINGS(tp); k++) {" 20799 print " if (tp->Strings[k] != 0 && !strcmp(bound, tp->Strings[k])) {" 20800 print " result = ExtStrname(tp, k, strnames);" 20801 @@ -141,9 +142,10 @@ 18381 20802 print " return result;" 18382 20803 print "}" … … 18384 20805 - print "NCURSES_EXPORT(NCURSES_CONST char *) keyname (int c)" 18385 20806 + print "NCURSES_EXPORT(NCURSES_CONST char *)" 18386 + print " NCURSES_SP_NAME(keyname) (NCURSES_SP_DCLxint c)"20807 + print "keyname (int c)" 18387 20808 print "{" 18388 20809 - print "\treturn _nc_keyname(SP, c);" 18389 + print " \treturn _nc_keyname(SP_PARM, c);"20810 + print " return safe_keyname (CURRENT_SCREEN, c);" 18390 20811 print "}" 18391 20812 print "" 18392 + print "#if NCURSES_SP_FUNCS"18393 + print "NCURSES_EXPORT(NCURSES_CONST char *)"18394 + print "keyname (int c)"18395 + print "{"18396 + print " return NCURSES_SP_NAME(keyname) (CURRENT_SCREEN, c);"18397 + print "}"18398 + print "#endif"18399 + print ""18400 20813 print "#if NO_LEAKS" 18401 print "void _nc_keyname_leaks(void)"18402 print "{"18403 20814 diff -Naur ncurses-5.7.orig/ncurses/base/MKlib_gen.sh ncurses-5.7/ncurses/base/MKlib_gen.sh 18404 20815 --- ncurses-5.7.orig/ncurses/base/MKlib_gen.sh 2008-08-30 12:20:50.000000000 -0700 18405 +++ ncurses-5.7/ncurses/base/MKlib_gen.sh 2009-0 3-22 21:17:07.012081575-070020816 +++ ncurses-5.7/ncurses/base/MKlib_gen.sh 2009-06-05 14:01:16.000000000 -0700 18406 20817 @@ -2,7 +2,7 @@ 18407 20818 # … … 18422 20833 returnType = "SP"; 18423 20834 } else if ( $first == "WINDOW" ) { 20835 diff -Naur ncurses-5.7.orig/ncurses/base/MKunctrl.awk ncurses-5.7/ncurses/base/MKunctrl.awk 20836 --- ncurses-5.7.orig/ncurses/base/MKunctrl.awk 2008-10-04 14:40:24.000000000 -0700 20837 +++ ncurses-5.7/ncurses/base/MKunctrl.awk 2009-06-05 14:01:44.000000000 -0700 20838 @@ -1,6 +1,6 @@ 20839 -# $Id: MKunctrl.awk,v 1.23 2008/10/04 21:40:24 tom Exp $ 20840 +# $Id: MKunctrl.awk,v 1.25 2009/04/18 23:43:49 tom Exp $ 20841 ############################################################################## 20842 -# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. # 20843 +# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. # 20844 # # 20845 # Permission is hereby granted, free of charge, to any person obtaining a # 20846 # copy of this software and associated documentation files (the "Software"), # 20847 @@ -46,9 +46,8 @@ 20848 print "" 20849 } 20850 END { 20851 - print "NCURSES_EXPORT(NCURSES_CONST char *) _nc_unctrl (SCREEN *sp, chtype ch)" 20852 + print "NCURSES_EXPORT(NCURSES_CONST char *) safe_unctrl(SCREEN *sp, chtype ch)" 20853 print "{" 20854 - 20855 blob="" 20856 offset=0 20857 if (bigstrings) { 20858 @@ -187,6 +186,6 @@ 20859 print "" 20860 print "NCURSES_EXPORT(NCURSES_CONST char *) unctrl (chtype ch)" 20861 print "{" 20862 - print "\treturn _nc_unctrl(SP, ch);" 20863 + print "\treturn safe_unctrl(CURRENT_SCREEN, ch);" 20864 print "}" 20865 } 20866 diff -Naur ncurses-5.7.orig/ncurses/base/nc_panel.c ncurses-5.7/ncurses/base/nc_panel.c 20867 --- ncurses-5.7.orig/ncurses/base/nc_panel.c 2000-12-09 18:43:28.000000000 -0800 20868 +++ ncurses-5.7/ncurses/base/nc_panel.c 2009-06-05 14:01:33.000000000 -0700 20869 @@ -1,5 +1,5 @@ 20870 /**************************************************************************** 20871 - * Copyright (c) 1998,2000 Free Software Foundation, Inc. * 20872 + * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc. * 20873 * * 20874 * Permission is hereby granted, free of charge, to any person obtaining a * 20875 * copy of this software and associated documentation files (the * 20876 @@ -32,10 +32,22 @@ 20877 20878 #include <curses.priv.h> 20879 20880 -MODULE_ID("$Id: nc_panel.c,v 1.4 2000/12/10 02:43:28 tom Exp $") 20881 +MODULE_ID("$Id: nc_panel.c,v 1.5 2009/04/11 21:05:10 tom Exp $") 20882 20883 NCURSES_EXPORT(struct panelhook *) 20884 +NCURSES_SP_NAME(_nc_panelhook) (NCURSES_SP_DCL0) 20885 +{ 20886 + return (SP_PARM 20887 + ? &(SP_PARM->_panelHook) 20888 + : (CURRENT_SCREEN 20889 + ? &(CURRENT_SCREEN->_panelHook) 20890 + : 0)); 20891 +} 20892 + 20893 +#if NCURSES_SP_FUNCS 20894 +NCURSES_EXPORT(struct panelhook *) 20895 _nc_panelhook(void) 20896 { 20897 - return (SP ? &(SP->_panelHook) : NULL); 20898 + return NCURSES_SP_NAME(_nc_panelhook) (CURRENT_SCREEN); 20899 } 20900 +#endif 20901 diff -Naur ncurses-5.7.orig/ncurses/base/resizeterm.c ncurses-5.7/ncurses/base/resizeterm.c 20902 --- ncurses-5.7.orig/ncurses/base/resizeterm.c 2008-06-07 06:58:40.000000000 -0700 20903 +++ ncurses-5.7/ncurses/base/resizeterm.c 2009-06-05 14:01:51.000000000 -0700 20904 @@ -1,5 +1,5 @@ 20905 /**************************************************************************** 20906 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 20907 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 20908 * * 20909 * Permission is hereby granted, free of charge, to any person obtaining a * 20910 * copy of this software and associated documentation files (the * 20911 @@ -41,7 +41,11 @@ 20912 #include <curses.priv.h> 20913 #include <term.h> 20914 20915 -MODULE_ID("$Id: resizeterm.c,v 1.34 2008/06/07 13:58:40 tom Exp $") 20916 +#ifndef CUR 20917 +#define CUR SP_TERMTYPE 20918 +#endif 20919 + 20920 +MODULE_ID("$Id: resizeterm.c,v 1.39 2009/05/10 00:48:29 tom Exp $") 20921 20922 #define stolen_lines (screen_lines - SP->_lines_avail) 20923 20924 @@ -64,18 +68,23 @@ 20925 static void 20926 show_window_sizes(const char *name) 20927 { 20928 + SCREEN *sp; 20929 WINDOWLIST *wp; 20930 20931 _nc_lock_global(curses); 20932 - _tracef("%s resizing: %2d x %2d (%2d x %2d)", name, LINES, COLS, 20933 - screen_lines, screen_columns); 20934 - for (each_window(wp)) { 20935 - _tracef(" window %p is %2ld x %2ld at %2ld,%2ld", 20936 - &(wp->win), 20937 - (long) wp->win._maxy + 1, 20938 - (long) wp->win._maxx + 1, 20939 - (long) wp->win._begy, 20940 - (long) wp->win._begx); 20941 + for (each_screen(sp)) { 20942 + _tracef("%s resizing: %p: %2d x %2d (%2d x %2d)", name, sp, 20943 + *(ptrLines(sp)), 20944 + *(ptrCols(sp)), 20945 + screen_lines(sp), screen_columns(sp)); 20946 + for (each_window(sp, wp)) { 20947 + _tracef(" window %p is %2ld x %2ld at %2ld,%2ld", 20948 + &(wp->win), 20949 + (long) wp->win._maxy + 1, 20950 + (long) wp->win._maxx + 1, 20951 + (long) wp->win._begy, 20952 + (long) wp->win._begx); 20953 + } 20954 } 20955 _nc_unlock_global(curses); 20956 } 20957 @@ -86,15 +95,23 @@ 20958 * structure's size. 20959 */ 20960 NCURSES_EXPORT(bool) 20961 -is_term_resized(int ToLines, int ToCols) 20962 +NCURSES_SP_NAME(is_term_resized) (NCURSES_SP_DCLx int ToLines, int ToCols) 20963 { 20964 - T((T_CALLED("is_term_resized(%d, %d)"), ToLines, ToCols)); 20965 + T((T_CALLED("is_term_resized(%p, %d, %d)"), SP_PARM, ToLines, ToCols)); 20966 returnCode(ToLines > 0 20967 && ToCols > 0 20968 - && (ToLines != screen_lines 20969 - || ToCols != screen_columns)); 20970 + && (ToLines != screen_lines(SP_PARM) 20971 + || ToCols != screen_columns(SP_PARM))); 20972 } 20973 20974 +#if NCURSES_SP_FUNCS 20975 +NCURSES_EXPORT(bool) 20976 +is_term_resized(int ToLines, int ToCols) 20977 +{ 20978 + return NCURSES_SP_NAME(is_term_resized) (CURRENT_SCREEN, ToLines, ToCols); 20979 +} 20980 +#endif 20981 + 20982 /* 20983 */ 20984 static ripoff_t * 20985 @@ -104,6 +121,9 @@ 20986 ripoff_t *rop; 20987 20988 if (win != 0) { 20989 +#if NCURSES_SP_FUNCS 20990 + SCREEN *sp = _nc_screen_of(win); 20991 +#endif 20992 for (each_ripoff(rop)) { 20993 if (rop->win == win && rop->line != 0) { 20994 result = rop; 20995 @@ -125,6 +145,9 @@ 20996 ripoff_t *rop; 20997 20998 if (win != 0) { 20999 +#if NCURSES_SP_FUNCS 21000 + SCREEN *sp = _nc_screen_of(win); 21001 +#endif 21002 for (each_ripoff(rop)) { 21003 if (rop->line < 0) { 21004 result -= rop->line; 21005 @@ -146,9 +169,12 @@ 21006 int depth = 0; 21007 21008 if (cmp != 0) { 21009 +#if NCURSES_SP_FUNCS 21010 + SCREEN *sp = _nc_screen_of(cmp); 21011 +#endif 21012 WINDOWLIST *wp; 21013 21014 - for (each_window(wp)) { 21015 + for (each_window(sp, wp)) { 21016 WINDOW *tst = &(wp->win); 21017 if (tst->_parent == cmp) { 21018 depth = 1 + child_depth(tst); 21019 @@ -184,7 +210,7 @@ 21020 adjust_window(WINDOW *win, int ToLines, int ToCols, int stolen EXTRA_DCLS) 21021 { 21022 int result; 21023 - int bottom = CurLines + SP->_topstolen - stolen; 21024 + int bottom = CurLines + _nc_screen_of(win)->_topstolen - stolen; 21025 int myLines = win->_maxy + 1; 21026 int myCols = win->_maxx + 1; 21027 ripoff_t *rop = ripped_window(win); 21028 @@ -239,19 +265,19 @@ 21029 * children, decrease those to fit, then decrease the containing window, etc. 21030 */ 21031 static int 21032 -decrease_size(int ToLines, int ToCols, int stolen EXTRA_DCLS) 21033 +decrease_size(NCURSES_SP_DCLx int ToLines, int ToCols, int stolen EXTRA_DCLS) 21034 { 21035 bool found; 21036 int depth = 0; 21037 WINDOWLIST *wp; 21038 21039 - T((T_CALLED("decrease_size(%d, %d)"), ToLines, ToCols)); 21040 + T((T_CALLED("decrease_size(%p, %d, %d)"), SP_PARM, ToLines, ToCols)); 21041 21042 do { 21043 found = FALSE; 21044 TR(TRACE_UPDATE, ("decreasing size of windows to %dx%d, depth=%d", 21045 ToLines, ToCols, depth)); 21046 - for (each_window(wp)) { 21047 + for (each_window(SP_PARM, wp)) { 21048 WINDOW *win = &(wp->win); 21049 21050 if (!(win->_flags & _ISPAD)) { 21051 @@ -273,19 +299,19 @@ 21052 * parent, increase those to fit, then increase the contained window, etc. 21053 */ 21054 static int 21055 -increase_size(int ToLines, int ToCols, int stolen EXTRA_DCLS) 21056 +increase_size(NCURSES_SP_DCLx int ToLines, int ToCols, int stolen EXTRA_DCLS) 21057 { 21058 bool found; 21059 int depth = 0; 21060 WINDOWLIST *wp; 21061 21062 - T((T_CALLED("increase_size(%d, %d)"), ToLines, ToCols)); 21063 + T((T_CALLED("increase_size(%p, %d, %d)"), SP_PARM, ToLines, ToCols)); 21064 21065 do { 21066 found = FALSE; 21067 TR(TRACE_UPDATE, ("increasing size of windows to %dx%d, depth=%d", 21068 ToLines, ToCols, depth)); 21069 - for (each_window(wp)) { 21070 + for (each_window(SP_PARM, wp)) { 21071 WINDOW *win = &(wp->win); 21072 21073 if (!(win->_flags & _ISPAD)) { 21074 @@ -307,25 +333,26 @@ 21075 * such as ungetch(). 21076 */ 21077 NCURSES_EXPORT(int) 21078 -resize_term(int ToLines, int ToCols) 21079 +NCURSES_SP_NAME(resize_term) (NCURSES_SP_DCLx int ToLines, int ToCols) 21080 { 21081 int result = OK EXTRA_ARGS; 21082 int was_stolen; 21083 21084 - T((T_CALLED("resize_term(%d,%d) old(%d,%d)"), 21085 - ToLines, ToCols, 21086 - screen_lines, screen_columns)); 21087 + T((T_CALLED("resize_term(%p,%d,%d) old(%d,%d)"), 21088 + SP_PARM, ToLines, ToCols, 21089 + SP_PARM == 0 ? -1 : screen_lines(SP_PARM), 21090 + SP_PARM == 0 ? -1 : screen_columns(SP_PARM))); 21091 21092 - if (SP == 0) { 21093 + if (SP_PARM == 0) { 21094 returnCode(ERR); 21095 } 21096 21097 _nc_lock_global(curses); 21098 21099 - was_stolen = (screen_lines - SP->_lines_avail); 21100 - if (is_term_resized(ToLines, ToCols)) { 21101 - int myLines = CurLines = screen_lines; 21102 - int myCols = CurCols = screen_columns; 21103 + was_stolen = (screen_lines(SP_PARM) - SP_PARM->_lines_avail); 21104 + if (NCURSES_SP_NAME(is_term_resized) (NCURSES_SP_ARGx ToLines, ToCols)) { 21105 + int myLines = CurLines = screen_lines(SP_PARM); 21106 + int myCols = CurCols = screen_columns(SP_PARM); 21107 21108 #ifdef TRACE 21109 if (USE_TRACEF(TRACE_UPDATE)) { 21110 @@ -333,33 +360,35 @@ 21111 _nc_unlock_global(tracef); 21112 } 21113 #endif 21114 - if (ToLines > screen_lines) { 21115 - increase_size(myLines = ToLines, myCols, was_stolen EXTRA_ARGS); 21116 + if (ToLines > screen_lines(SP_PARM)) { 21117 + increase_size(NCURSES_SP_ARGx 21118 + myLines = ToLines, myCols, was_stolen EXTRA_ARGS); 21119 CurLines = myLines; 21120 CurCols = myCols; 21121 } 21122 21123 - if (ToCols > screen_columns) { 21124 - increase_size(myLines, myCols = ToCols, was_stolen EXTRA_ARGS); 21125 + if (ToCols > screen_columns(SP_PARM)) { 21126 + increase_size(NCURSES_SP_ARGx 21127 + myLines, myCols = ToCols, was_stolen EXTRA_ARGS); 21128 CurLines = myLines; 21129 CurCols = myCols; 21130 } 21131 21132 if (ToLines < myLines || 21133 ToCols < myCols) { 21134 - decrease_size(ToLines, ToCols, was_stolen EXTRA_ARGS); 21135 + decrease_size(NCURSES_SP_ARGx ToLines, ToCols, was_stolen EXTRA_ARGS); 21136 } 21137 21138 - screen_lines = lines = ToLines; 21139 - screen_columns = columns = ToCols; 21140 + screen_lines(SP_PARM) = lines = ToLines; 21141 + screen_columns(SP_PARM) = columns = ToCols; 21142 21143 - SP->_lines_avail = lines - was_stolen; 21144 + SP_PARM->_lines_avail = lines - was_stolen; 21145 21146 - if (SP->oldhash) { 21147 - FreeAndNull(SP->oldhash); 21148 + if (SP_PARM->oldhash) { 21149 + FreeAndNull(SP_PARM->oldhash); 21150 } 21151 - if (SP->newhash) { 21152 - FreeAndNull(SP->newhash); 21153 + if (SP_PARM->newhash) { 21154 + FreeAndNull(SP_PARM->newhash); 21155 } 21156 #ifdef TRACE 21157 if (USE_TRACEF(TRACE_UPDATE)) { 21158 @@ -383,6 +412,18 @@ 21159 returnCode(result); 21160 } 21161 21162 +#if NCURSES_SP_FUNCS 21163 +NCURSES_EXPORT(int) 21164 +resize_term(int ToLines, int ToCols) 21165 +{ 21166 + int res = ERR; 21167 + _nc_lock_global(curses); 21168 + res = NCURSES_SP_NAME(resize_term) (CURRENT_SCREEN, ToLines, ToCols); 21169 + _nc_unlock_global(curses); 21170 + return (res); 21171 +} 21172 +#endif 21173 + 21174 /* 21175 * This function reallocates NCURSES window structures. It is invoked in 21176 * response to a SIGWINCH interrupt. Other user-defined windows may also need 21177 @@ -392,34 +433,34 @@ 21178 * invoked directly from the signal handler. 21179 */ 21180 NCURSES_EXPORT(int) 21181 -resizeterm(int ToLines, int ToCols) 21182 +NCURSES_SP_NAME(resizeterm) (NCURSES_SP_DCLx int ToLines, int ToCols) 21183 { 21184 int result = ERR; 21185 21186 - T((T_CALLED("resizeterm(%d,%d) old(%d,%d)"), 21187 - ToLines, ToCols, 21188 - screen_lines, screen_columns)); 21189 + T((T_CALLED("resizeterm(%p, %d,%d) old(%d,%d)"), 21190 + SP_PARM, ToLines, ToCols, 21191 + SP_PARM == 0 ? -1 : screen_lines(SP_PARM), screen_columns(SP_PARM))); 21192 21193 - if (SP != 0) { 21194 + if (SP_PARM != 0) { 21195 result = OK; 21196 - SP->_sig_winch = FALSE; 21197 + SP_PARM->_sig_winch = FALSE; 21198 21199 - if (is_term_resized(ToLines, ToCols)) { 21200 + if (NCURSES_SP_NAME(is_term_resized) (NCURSES_SP_ARGx ToLines, ToCols)) { 21201 #if USE_SIGWINCH 21202 ripoff_t *rop; 21203 - bool slk_visible = (SP != 0 21204 - && SP->_slk != 0 21205 - && !(SP->_slk->hidden)); 21206 + bool slk_visible = (SP_PARM != 0 21207 + && SP_PARM->_slk != 0 21208 + && !(SP_PARM->_slk->hidden)); 21209 21210 if (slk_visible) { 21211 slk_clear(); 21212 } 21213 #endif 21214 - result = resize_term(ToLines, ToCols); 21215 + result = NCURSES_SP_NAME(resize_term) (NCURSES_SP_ARGx ToLines, ToCols); 21216 21217 #if USE_SIGWINCH 21218 - _nc_ungetch(SP, KEY_RESIZE); /* so application can know this */ 21219 - clearok(curscr, TRUE); /* screen contents are unknown */ 21220 + safe_ungetch(SP_PARM, KEY_RESIZE); /* so application can know this */ 21221 + clearok(CurScreen(SP_PARM), TRUE); /* screen contents are unknown */ 21222 21223 /* ripped-off lines are a special case: if we did not lengthen 21224 * them, we haven't moved them either. repaint them, too. 21225 @@ -429,7 +470,7 @@ 21226 * not know which are really on top. 21227 */ 21228 for (each_ripoff(rop)) { 21229 - if (rop->win != stdscr 21230 + if (rop->win != StdScreen(SP_PARM) 21231 && rop->win != 0 21232 && rop->line < 0) { 21233 21234 @@ -442,10 +483,9 @@ 21235 21236 /* soft-keys are a special case: we _know_ how to repaint them */ 21237 if (slk_visible) { 21238 - slk_restore(); 21239 - slk_touch(); 21240 - 21241 - slk_refresh(); 21242 + NCURSES_SP_NAME(slk_restore) (NCURSES_SP_ARG); 21243 + NCURSES_SP_NAME(slk_touch) (NCURSES_SP_ARG); 21244 + NCURSES_SP_NAME(slk_refresh) (NCURSES_SP_ARG); 21245 } 21246 #endif 21247 } 21248 @@ -453,3 +493,11 @@ 21249 21250 returnCode(result); 21251 } 21252 + 21253 +#if NCURSES_SP_FUNCS 21254 +NCURSES_EXPORT(int) 21255 +resizeterm(int ToLines, int ToCols) 21256 +{ 21257 + return NCURSES_SP_NAME(resizeterm) (CURRENT_SCREEN, ToLines, ToCols); 21258 +} 21259 +#endif 21260 diff -Naur ncurses-5.7.orig/ncurses/base/safe_sprintf.c ncurses-5.7/ncurses/base/safe_sprintf.c 21261 --- ncurses-5.7.orig/ncurses/base/safe_sprintf.c 2007-04-21 15:28:06.000000000 -0700 21262 +++ ncurses-5.7/ncurses/base/safe_sprintf.c 2009-06-05 14:01:44.000000000 -0700 21263 @@ -1,5 +1,5 @@ 21264 /**************************************************************************** 21265 - * Copyright (c) 1998-2003,2007 Free Software Foundation, Inc. * 21266 + * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. * 21267 * * 21268 * Permission is hereby granted, free of charge, to any person obtaining a * 21269 * copy of this software and associated documentation files (the * 21270 @@ -33,7 +33,7 @@ 21271 #include <curses.priv.h> 21272 #include <ctype.h> 21273 21274 -MODULE_ID("$Id: safe_sprintf.c,v 1.20 2007/04/21 22:28:06 tom Exp $") 21275 +MODULE_ID("$Id: safe_sprintf.c,v 1.22 2009/04/18 18:46:46 tom Exp $") 21276 21277 #if USE_SAFE_SPRINTF 21278 21279 @@ -111,7 +111,7 @@ 21280 } 21281 sprintf(fmt_arg, "%d", ival); 21282 fmt_len += strlen(fmt_arg); 21283 - if ((format = realloc(format, fmt_len)) == 0) { 21284 + if ((format = _nc_doalloc(format, fmt_len)) == 0) { 21285 return -1; 21286 } 21287 strcpy(&format[--f], fmt_arg); 21288 @@ -214,7 +214,9 @@ 21289 * Wrapper for vsprintf that allocates a buffer big enough to hold the result. 21290 */ 21291 NCURSES_EXPORT(char *) 21292 -_nc_printf_string(const char *fmt, va_list ap) 21293 +NCURSES_SP_NAME(_nc_printf_string) (NCURSES_SP_DCLx 21294 + const char *fmt, 21295 + va_list ap) 21296 { 21297 char *result = 0; 21298 21299 @@ -237,11 +239,11 @@ 21300 #define MyCols _nc_globals.safeprint_cols 21301 #define MyRows _nc_globals.safeprint_rows 21302 21303 - if (screen_lines > MyRows || screen_columns > MyCols) { 21304 - if (screen_lines > MyRows) 21305 - MyRows = screen_lines; 21306 - if (screen_columns > MyCols) 21307 - MyCols = screen_columns; 21308 + if (screen_lines(SP_PARM) > MyRows || screen_columns(SP_PARM) > MyCols) { 21309 + if (screen_lines(SP_PARM) > MyRows) 21310 + MyRows = screen_lines(SP_PARM); 21311 + if (screen_columns(SP_PARM) > MyCols) 21312 + MyCols = screen_columns(SP_PARM); 21313 my_length = (MyRows * (MyCols + 1)) + 1; 21314 my_buffer = typeRealloc(char, my_length, my_buffer); 21315 } 21316 @@ -262,3 +264,11 @@ 21317 } 21318 return result; 21319 } 21320 + 21321 +#if NCURSES_SP_FUNCS 21322 +NCURSES_EXPORT(char *) 21323 +_nc_printf_string(const char *fmt, va_list ap) 21324 +{ 21325 + return NCURSES_SP_NAME(_nc_printf_string) (CURRENT_SCREEN, fmt, ap); 21326 +} 21327 +#endif 18424 21328 diff -Naur ncurses-5.7.orig/ncurses/base/tries.c ncurses-5.7/ncurses/base/tries.c 18425 21329 --- ncurses-5.7.orig/ncurses/base/tries.c 2008-08-16 12:22:55.000000000 -0700 18426 +++ ncurses-5.7/ncurses/base/tries.c 2009-0 3-22 21:17:07.016081855-070021330 +++ ncurses-5.7/ncurses/base/tries.c 2009-06-05 14:01:16.000000000 -0700 18427 21331 @@ -39,7 +39,7 @@ 18428 21332 … … 18445 21349 } 18446 21350 #endif 21351 diff -Naur ncurses-5.7.orig/ncurses/base/wresize.c ncurses-5.7/ncurses/base/wresize.c 21352 --- ncurses-5.7.orig/ncurses/base/wresize.c 2008-06-07 06:59:01.000000000 -0700 21353 +++ ncurses-5.7/ncurses/base/wresize.c 2009-06-05 14:01:54.000000000 -0700 21354 @@ -1,5 +1,5 @@ 21355 /**************************************************************************** 21356 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 21357 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 21358 * * 21359 * Permission is hereby granted, free of charge, to any person obtaining a * 21360 * copy of this software and associated documentation files (the * 21361 @@ -27,12 +27,13 @@ 21362 ****************************************************************************/ 21363 21364 /**************************************************************************** 21365 - * Author: Thomas E. Dickey 1996-2002 * 21366 + * Author: Thomas E. Dickey 1996-on * 21367 + * and: Juergen Pfeifer * 21368 ****************************************************************************/ 21369 21370 #include <curses.priv.h> 21371 21372 -MODULE_ID("$Id: wresize.c,v 1.29 2008/06/07 13:59:01 tom Exp $") 21373 +MODULE_ID("$Id: wresize.c,v 1.31 2009/05/23 19:50:16 tom Exp $") 21374 21375 static int 21376 cleanup_lines(struct ldat *data, int length) 21377 @@ -53,10 +54,13 @@ 21378 WINDOWLIST *wp; 21379 struct ldat *pline = cmp->_line; 21380 int row; 21381 +#ifdef USE_SP_WINDOWLIST 21382 + SCREEN *sp = _nc_screen_of(cmp); 21383 +#endif 21384 21385 _nc_lock_global(curses); 21386 21387 - for (each_window(wp)) { 21388 + for (each_window(SP_PARM, wp)) { 21389 WINDOW *tst = &(wp->win); 21390 21391 if (tst->_parent == cmp) { 18447 21392 diff -Naur ncurses-5.7.orig/ncurses/curses.priv.h ncurses-5.7/ncurses/curses.priv.h 18448 21393 --- ncurses-5.7.orig/ncurses/curses.priv.h 2008-10-04 14:37:45.000000000 -0700 18449 +++ ncurses-5.7/ncurses/curses.priv.h 2009-0 3-22 21:17:08.400170414-070021394 +++ ncurses-5.7/ncurses/curses.priv.h 2009-06-05 14:01:55.000000000 -0700 18450 21395 @@ -1,5 +1,5 @@ 18451 21396 /**************************************************************************** … … 18465 21410 /* 18466 21411 - * $Id: curses.priv.h,v 1.394 2008/10/04 21:37:45 tom Exp $ 18467 + * $Id: curses.priv.h,v 1.4 03 2009/02/28 20:55:48tom Exp $21412 + * $Id: curses.priv.h,v 1.420 2009/05/30 15:53:46 tom Exp $ 18468 21413 * 18469 21414 * curses.priv.h … … 18478 21423 #if HAVE_WORKING_POLL 18479 21424 #define USE_FUNC_POLL 1 18480 @@ -257,6 +256,38 @@ 21425 @@ -195,6 +194,16 @@ 21426 #endif 21427 21428 /* 21429 + * Options for terminal drivers, etc... 21430 + */ 21431 +#if 0 21432 +#define USE_SP_RIPOFF 1 21433 +#define USE_SP_TERMTYPE 1 21434 +#define USE_SP_WINDOWLIST 1 21435 +#define USE_TERM_DRIVER 1 21436 +#endif 21437 + 21438 +/* 21439 * Note: ht/cbt expansion flakes out randomly under Linux 1.1.47, but only 21440 * when we're throwing control codes at the screen at high volume. To see 21441 * this, re-enable USE_HARD_TABS and run worm for a while. Other systems 21442 @@ -257,8 +266,59 @@ 18481 21443 #define NCURSES_OPAQUE 0 18482 21444 … … 18505 21467 +#include <nc_panel.h> 18506 21468 + 18507 +#define IsPreScreen(sp) (((sp)!=0) && sp->_prescreen) 18508 +#define HasTerminal(sp) (((sp)!=0) && (0!=((sp)->_term))) 18509 +#define IsValidScreen(sp) (HasTerminal(sp) && !sp->_prescreen) 21469 +#define IsPreScreen(sp) (((sp) != 0) && sp->_prescreen) 21470 +#define HasTerminal(sp) (((sp) != 0) && (0 != ((sp)->_term))) 21471 +#define IsValidScreen(sp) (HasTerminal(sp) && !IsPreScreen(sp)) 21472 + 18510 21473 +#if BROKEN_LINKER || USE_REENTRANT 18511 +#define TerminalOf(sp) ((sp)?((sp)->_term?(sp)->_term:_nc_prescreen._cur_term): _nc_prescreen._cur_term)21474 +#define CurTerm _nc_prescreen._cur_term 18512 21475 +#else 18513 +#define TerminalOf(sp) ((sp)?((sp)->_term?(sp)->_term:cur_term):cur_term)21476 +#define CurTerm cur_term 18514 21477 +#endif 18515 21478 + 21479 +#if NCURSES_SP_FUNCS 21480 +#define TerminalOf(sp) ((sp) ? ((sp)->_term ? (sp)->_term : CurTerm) : CurTerm) 21481 +#else 21482 +#define TerminalOf(sp) CurTerm 21483 +#endif 21484 + 18516 21485 #include <term.h> 21486 + 21487 +/* 21488 + * Reduce dependency on cur_term global by using terminfo data from SCREEN's 21489 + * pointer to this data. 21490 + */ 21491 +#ifdef USE_SP_TERMTYPE 21492 +#undef CUR 21493 +#endif 21494 + 21495 +#define SP_TERMTYPE TerminalOf(sp)->type. 21496 + 18517 21497 #include <term_entry.h> 21498 + 18518 21499 #include <nc_tparm.h> 18519 @@ -289,7 +320,7 @@ 21500 21501 #if NCURSES_EXT_COLORS && USE_WIDEC_SUPPORT 21502 @@ -272,8 +332,14 @@ 21503 #define GET_WINDOW_PAIR(w) (w)->_color 21504 #define SET_WINDOW_PAIR(w,p) (w)->_color = (p) 21505 #define SameAttrOf(a,b) (AttrOf(a) == AttrOf(b) && GetPair(a) == GetPair(b)) 21506 -#define VIDATTR(attr, pair) vid_attr(attr, pair, 0) 21507 + 21508 +#if NCURSES_SP_FUNCS 21509 +#define VIDATTR(sp,attr,pair) NCURSES_SP_NAME(vid_attr)(sp, attr, pair, 0) 21510 #else 21511 +#define VIDATTR(sp,attr,pair) vid_attr(attr, pair, 0) 21512 +#endif 21513 + 21514 +#else /* !(NCURSES_EXT_COLORS && USE_WIDEC_SUPPORT) */ 21515 #define if_EXT_COLORS(stmt) /* nothing */ 21516 #define SetPair(value,p) RemAttr(value, A_COLOR), \ 21517 SetAttr(value, AttrOf(value) | (A_COLOR & COLOR_PAIR(p))) 21518 @@ -283,13 +349,19 @@ 21519 #define SET_WINDOW_PAIR(w,p) WINDOW_ATTRS(w) &= ALL_BUT_COLOR, \ 21520 WINDOW_ATTRS(w) |= (A_COLOR & COLOR_PAIR(p)) 21521 #define SameAttrOf(a,b) (AttrOf(a) == AttrOf(b)) 21522 -#define VIDATTR(attr, pair) vidattr(attr) 21523 + 21524 +#if NCURSES_SP_FUNCS 21525 +#define VIDATTR(sp,attr,pair) NCURSES_SP_NAME(vidattr)(sp, attr) 21526 +#else 21527 +#define VIDATTR(sp,attr,pair) vidattr(attr) 21528 #endif 21529 21530 +#endif /* NCURSES_EXT_COLORS && USE_WIDEC_SUPPORT */ 21531 + 18520 21532 #if NCURSES_NO_PADDING 18521 21533 #define GetNoPadding(sp) ((sp) ? (sp)->_no_padding : _nc_prescreen._no_padding) … … 18526 21538 #define GetNoPadding(sp) FALSE 18527 21539 #define SetNoPadding(sp) /*nothing*/ 18528 @@ -404,6 +435,8 @@ 21540 @@ -302,17 +374,31 @@ 21541 #define SET_SCREEN_PAIR(s,p) SetPair(SCREEN_ATTRS(s), p) 21542 21543 #if USE_REENTRANT 21544 -NCURSES_EXPORT(int *) _nc_ptr_Lines (void); 21545 -NCURSES_EXPORT(int *) _nc_ptr_Cols (void); 21546 -#define ptrLines() (SP ? &(SP->_LINES) : &(_nc_prescreen._LINES)) 21547 -#define ptrCols() (SP ? &(SP->_COLS) : &(_nc_prescreen._COLS)) 21548 -#define SET_LINES(value) *_nc_ptr_Lines() = value 21549 -#define SET_COLS(value) *_nc_ptr_Cols() = value 21550 -#else 21551 -#define ptrLines() &LINES 21552 -#define ptrCols() &COLS 21553 -#define SET_LINES(value) LINES = value 21554 -#define SET_COLS(value) COLS = value 21555 + 21556 +NCURSES_EXPORT(int *) _nc_ptr_Lines (SCREEN *); 21557 +NCURSES_EXPORT(int *) _nc_ptr_Cols (SCREEN *); 21558 +NCURSES_EXPORT(int *) _nc_ptr_Tabsize (SCREEN *); 21559 +NCURSES_EXPORT(int *) _nc_ptr_Escdelay (SCREEN *); 21560 + 21561 +#define ptrLines(sp) (sp ? &(sp->_LINES) : &(_nc_prescreen._LINES)) 21562 +#define ptrCols(sp) (sp ? &(sp->_COLS) : &(_nc_prescreen._COLS)) 21563 +#define ptrTabsize(sp) (sp ? &(sp->_TABSIZE) : &(_nc_prescreen._TABSIZE)) 21564 +#define ptrEscdelay(sp) (sp ? &(sp->_ESCDELAY) : &(_nc_prescreen._ESCDELAY)) 21565 + 21566 +#define SET_LINES(value) *_nc_ptr_Lines(SP_PARM) = value 21567 +#define SET_COLS(value) *_nc_ptr_Cols(SP_PARM) = value 21568 +#define SET_TABSIZE(value) *_nc_ptr_Tabsize(SP_PARM) = value 21569 +#define SET_ESCDELAY(value) *_nc_ptr_Escdelay(SP_PARM) = value 21570 + 21571 +#else 21572 + 21573 +#define ptrLines(sp) &LINES 21574 +#define ptrCols(sp) &COLS 21575 +#define SET_LINES(value) LINES = value 21576 +#define SET_COLS(value) COLS = value 21577 +#define SET_TABSIZE(value) TABSIZE = value 21578 +#define SET_ESCDELAY(value) ESCDELAY = value 21579 + 21580 #endif 21581 21582 #define TR_MUTEX(data) _tracef("%s@%d: me:%08lX COUNT:%2u/%2d/%6d/%2d/%s%9u: " #data, \ 21583 @@ -404,6 +490,8 @@ 18529 21584 #define C_SHIFT 9 /* we need more bits than there are colors */ 18530 21585 #define C_MASK ((1 << C_SHIFT) - 1) … … 18535 21590 18536 21591 #define COLOR_DEFAULT C_MASK 18537 @@ -464,13 + 497,13 @@21592 @@ -464,13 +552,13 @@ 18538 21593 } slk_ent; 18539 21594 … … 18555 21610 } SLK; 18556 21611 18557 @@ -703,6 +736,8 @@ 21612 @@ -493,10 +581,10 @@ 21613 typedef int (*TYPE_Gpm_Close) (void); 21614 typedef int (*TYPE_Gpm_GetEvent) (Gpm_Event *); 21615 21616 -#define my_gpm_fd SP->_mouse_gpm_fd 21617 -#define my_Gpm_Open SP->_mouse_Gpm_Open 21618 -#define my_Gpm_Close SP->_mouse_Gpm_Close 21619 -#define my_Gpm_GetEvent SP->_mouse_Gpm_GetEvent 21620 +#define my_gpm_fd SP_PARM->_mouse_gpm_fd 21621 +#define my_Gpm_Open SP_PARM->_mouse_Gpm_Open 21622 +#define my_Gpm_Close SP_PARM->_mouse_Gpm_Close 21623 +#define my_Gpm_GetEvent SP_PARM->_mouse_Gpm_GetEvent 21624 #else 21625 /* link statically to GPM */ 21626 #define my_gpm_fd &gpm_fd 21627 @@ -609,8 +697,10 @@ 21628 int tgetent_index; 21629 long tgetent_sequence; 21630 21631 +#ifndef USE_SP_WINDOWLIST 21632 WINDOWLIST *_nc_windowlist; 21633 -#define _nc_windows _nc_globals._nc_windowlist 21634 +#define WindowList(sp) _nc_globals._nc_windowlist 21635 +#endif 21636 21637 #if USE_HOME_TERMINFO 21638 char *home_terminfo; 21639 @@ -644,7 +734,9 @@ 21640 char traceatr_color_buf[2][80]; 21641 int traceatr_color_sel; 21642 int traceatr_color_last; 21643 - 21644 +#if !defined(USE_PTHREADS) && USE_REENTRANT 21645 + int nested_tracef; 21646 +#endif 21647 #endif /* TRACE */ 21648 21649 #ifdef USE_PTHREADS 21650 @@ -669,8 +761,10 @@ 21651 bool use_env; 21652 bool filter_mode; 21653 attr_t previous_attr; 21654 +#ifndef USE_SP_RIPOFF 21655 ripoff_t rippedoff[N_RIPS]; 21656 ripoff_t *rsp; 21657 +#endif 21658 TPARM_STATE tparm_state; 21659 TTY *saved_tty; /* savetty/resetty information */ 21660 #if NCURSES_NO_PADDING 21661 @@ -680,6 +774,8 @@ 21662 chtype *real_acs_map; 21663 int _LINES; 21664 int _COLS; 21665 + int _TABSIZE; 21666 + int _ESCDELAY; 21667 TERMINAL *_cur_term; 21668 #ifdef TRACE 21669 long _outchars; 21670 @@ -688,8 +784,16 @@ 21671 #endif 21672 } NCURSES_PRESCREEN; 21673 21674 -#define ripoff_sp _nc_prescreen.rsp 21675 -#define ripoff_stack _nc_prescreen.rippedoff 21676 +/* 21677 + * Use screen-specific ripoff data (for softkeys) rather than global. 21678 + */ 21679 +#ifdef USE_SP_RIPOFF 21680 +#define safe_ripoff_sp (sp)->rsp 21681 +#define safe_ripoff_stack (sp)->rippedoff 21682 +#else 21683 +#define safe_ripoff_sp _nc_prescreen.rsp 21684 +#define safe_ripoff_stack _nc_prescreen.rippedoff 21685 +#endif 21686 21687 extern NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen; 21688 21689 @@ -703,6 +807,8 @@ 18558 21690 char *_setbuf; /* buffered I/O for output */ 18559 21691 bool _filtered; /* filter() was called */ … … 18564 21696 TERMINAL *_term; /* terminal type information */ 18565 21697 TTY _saved_tty; /* savetty/resetty information */ 18566 @@ -794,11 +829,13 @@ 21698 @@ -716,6 +822,10 @@ 21699 WINDOW *_newscr; /* virtual screen to be updated to */ 21700 WINDOW *_stdscr; /* screen's full-window context */ 21701 21702 +#define CurScreen(sp) (sp)->_curscr 21703 +#define NewScreen(sp) (sp)->_newscr 21704 +#define StdScreen(sp) (sp)->_stdscr 21705 + 21706 TRIES *_keytry; /* "Try" for use with keypad mode */ 21707 TRIES *_key_ok; /* Disabled keys via keyok(,FALSE) */ 21708 bool _tried; /* keypad mode was initialized */ 21709 @@ -794,11 +904,13 @@ 18567 21710 int _color_count; /* count of colors in palette */ 18568 21711 colorpair_t *_color_pairs; /* screen's color pair list */ … … 18578 21721 chtype _ok_attributes; /* valid attributes for terminal */ 18579 21722 chtype _xmc_suppress; /* attributes to suppress if xmc */ 18580 @@ -1263,7 +1300,7 @@ 21723 @@ -895,7 +1007,7 @@ 21724 int _oldnum_size; 21725 21726 bool _cleanup; /* cleanup after int/quit signal */ 21727 - int (*_outch)(int); /* output handler if not putc */ 21728 + NCURSES_SP_OUTC _outch; /* output handler if not putc */ 21729 21730 int _legacy_coding; /* see use_legacy_coding() */ 21731 21732 @@ -915,6 +1027,15 @@ 21733 char tracechr_buf[40]; 21734 char tracemse_buf[TRACEMSE_MAX]; 21735 #endif 21736 +#ifdef USE_SP_WINDOWLIST 21737 + WINDOWLIST* _windowlist; 21738 +#define WindowList(sp) (sp)->_windowlist 21739 +#endif 21740 + NCURSES_OUTC jump; 21741 + 21742 + ripoff_t rippedoff[N_RIPS]; 21743 + ripoff_t *rsp; 21744 + 21745 /* 21746 * ncurses/ncursesw are the same up to this point. 21747 */ 21748 @@ -943,6 +1064,20 @@ 21749 21750 #define WINDOW_EXT(win,field) (((WINDOWLIST *)(win))->field) 21751 21752 +#define SP_PRE_INIT(sp) \ 21753 + sp->_cursrow = -1; \ 21754 + sp->_curscol = -1; \ 21755 + sp->_nl = TRUE; \ 21756 + sp->_raw = FALSE; \ 21757 + sp->_cbreak = 0; \ 21758 + sp->_echo = TRUE; \ 21759 + sp->_fifohead = -1; \ 21760 + sp->_endwin = TRUE; \ 21761 + sp->_cursor = -1; \ 21762 + WindowList(sp) = 0; \ 21763 + sp->_outch = NCURSES_SP_NAME(_nc_outch); \ 21764 + sp->jump = 0 \ 21765 + 21766 /* usually in <limits.h> */ 21767 #ifndef UCHAR_MAX 21768 #define UCHAR_MAX 255 21769 @@ -1112,7 +1247,7 @@ 21770 AttrOf(dst) |= (ext + 1) 21771 21772 #define if_WIDEC(code) code 21773 -#define Charable(ch) ((SP != 0 && SP->_legacy_coding) \ 21774 +#define Charable(ch) ((SP_PARM != 0 && SP_PARM->_legacy_coding) \ 21775 || (AttrOf(ch) & A_ALTCHARSET) \ 21776 || (!isWidecExt(ch) && \ 21777 (ch).chars[1] == L'\0' && \ 21778 @@ -1214,8 +1349,8 @@ 21779 * Standardize/simplify common loops 21780 */ 21781 #define each_screen(p) p = _nc_screen_chain; p != 0; p = (p)->_next_screen 21782 -#define each_window(p) p = _nc_windows; p != 0; p = (p)->next 21783 -#define each_ripoff(p) p = ripoff_stack; (p - ripoff_stack) < N_RIPS; ++p 21784 +#define each_window(sp,p) p = WindowList(sp); p != 0; p = (p)->next 21785 +#define each_ripoff(p) p = safe_ripoff_stack; (p - safe_ripoff_stack) < N_RIPS; ++p 21786 21787 /* 21788 * Prefixes for call/return points of library function traces. We use these to 21789 @@ -1263,7 +1398,7 @@ 18581 21790 #define returnBool(code) TRACE_RETURN(code,bool) 18582 21791 #define returnCPtr(code) TRACE_RETURN(code,cptr) … … 18587 21796 #define returnPtr(code) TRACE_RETURN(code,ptr) 18588 21797 #define returnSP(code) TRACE_RETURN(code,sp) 18589 @@ -1322,7 +1 359,7 @@21798 @@ -1322,7 +1457,7 @@ 18590 21799 #define returnBool(code) return code 18591 21800 #define returnCPtr(code) return code … … 18596 21805 #define returnPtr(code) return code 18597 21806 #define returnSP(code) return code 18598 @@ -1519,7 +1556,7 @@ 21807 @@ -1348,7 +1483,7 @@ 21808 21809 #define ALL_BUT_COLOR ((chtype)~(A_COLOR)) 21810 #define NONBLANK_ATTR (A_NORMAL|A_BOLD|A_DIM|A_BLINK) 21811 -#define XMC_CHANGES(c) ((c) & SP->_xmc_suppress) 21812 +#define XMC_CHANGES(c) ((c) & SP_PARM->_xmc_suppress) 21813 21814 #define toggle_attr_on(S,at) {\ 21815 if (PAIR_NUMBER(at) > 0) {\ 21816 @@ -1367,38 +1502,38 @@ 21817 }\ 21818 TR(TRACE_ATTRS, ("new attribute is %s", _traceattr((S))));} 21819 21820 -#define DelCharCost(count) \ 21821 +#define DelCharCost(sp,count) \ 21822 ((parm_dch != 0) \ 21823 - ? SP->_dch_cost \ 21824 + ? sp->_dch_cost \ 21825 : ((delete_character != 0) \ 21826 - ? (SP->_dch1_cost * count) \ 21827 + ? (sp->_dch1_cost * count) \ 21828 : INFINITY)) 21829 21830 -#define InsCharCost(count) \ 21831 +#define InsCharCost(sp,count) \ 21832 ((parm_ich != 0) \ 21833 - ? SP->_ich_cost \ 21834 + ? sp->_ich_cost \ 21835 : ((enter_insert_mode && exit_insert_mode) \ 21836 - ? SP->_smir_cost + SP->_rmir_cost + (SP->_ip_cost * count) \ 21837 + ? sp->_smir_cost + sp->_rmir_cost + (sp->_ip_cost * count) \ 21838 : ((insert_character != 0) \ 21839 - ? ((SP->_ich1_cost + SP->_ip_cost) * count) \ 21840 + ? ((sp->_ich1_cost + sp->_ip_cost) * count) \ 21841 : INFINITY))) 21842 21843 #if USE_XMC_SUPPORT 21844 -#define UpdateAttrs(c) if (!SameAttrOf(SCREEN_ATTRS(SP), c)) { \ 21845 - attr_t chg = AttrOf(SCREEN_ATTRS(SP)); \ 21846 - VIDATTR(AttrOf(c), GetPair(c)); \ 21847 +#define UpdateAttrs(sp,c) if (!SameAttrOf(SCREEN_ATTRS(sp), c)) { \ 21848 + attr_t chg = AttrOf(SCREEN_ATTRS(sp)); \ 21849 + VIDATTR(sp, AttrOf(c), GetPair(c)); \ 21850 if (magic_cookie_glitch > 0 \ 21851 - && XMC_CHANGES((chg ^ AttrOf(SCREEN_ATTRS(SP))))) { \ 21852 + && XMC_CHANGES((chg ^ AttrOf(SCREEN_ATTRS(sp))))) { \ 21853 T(("%s @%d before glitch %d,%d", \ 21854 __FILE__, __LINE__, \ 21855 - SP->_cursrow, \ 21856 - SP->_curscol)); \ 21857 - _nc_do_xmc_glitch(chg); \ 21858 + sp->_cursrow, \ 21859 + sp->_curscol)); \ 21860 + NCURSES_SP_NAME(_nc_do_xmc_glitch)(NCURSES_SP_ARGx chg); \ 21861 } \ 21862 } 21863 #else 21864 -#define UpdateAttrs(c) if (!SameAttrOf(SCREEN_ATTRS(SP), c)) \ 21865 - VIDATTR(AttrOf(c), GetPair(c)); 21866 +#define UpdateAttrs(sp,c) if (!SameAttrOf(SCREEN_ATTRS(sp), c)) \ 21867 + VIDATTR(sp, AttrOf(c), GetPair(c)); 21868 #endif 21869 21870 /* 21871 @@ -1483,8 +1618,8 @@ 21872 #endif 21873 21874 /* lib_acs.c */ 21875 -extern NCURSES_EXPORT(void) _nc_init_acs (void); /* corresponds to traditional 'init_acs()' */ 21876 -extern NCURSES_EXPORT(int) _nc_msec_cost (const char *const, int); /* used by 'tack' program */ 21877 +extern NCURSES_EXPORT(void) _nc_init_acs (void); /* corresponds to traditional 'init_acs()' */ 21878 +extern NCURSES_EXPORT(int) _nc_msec_cost (const char *const, int); /* used by 'tack' program */ 21879 21880 /* lib_addch.c */ 21881 #if USE_WIDEC_SUPPORT 21882 @@ -1503,7 +1638,7 @@ 21883 extern NCURSES_EXPORT(int) _nc_wgetch(WINDOW *, unsigned long *, int EVENTLIST_2nd(_nc_eventlist *)); 21884 21885 /* lib_insch.c */ 21886 -extern NCURSES_EXPORT(int) _nc_insert_ch(WINDOW *, chtype); 21887 +extern NCURSES_EXPORT(int) _nc_insert_ch(SCREEN *, WINDOW *, chtype); 21888 21889 /* lib_mvcur.c */ 21890 #define INFINITY 1000000 /* cost: too high to use */ 21891 @@ -1519,7 +1654,7 @@ 18599 21892 extern NCURSES_EXPORT(void) _nc_screen_wrap (void); 18600 21893 … … 18605 21898 /* lib_mvcur.c */ 18606 21899 #define INFINITY 1000000 /* cost: too high to use */ 18607 @@ -1592,6 +1629,8 @@ 21900 @@ -1527,10 +1662,13 @@ 21901 21902 /* lib_setup.c */ 21903 extern NCURSES_EXPORT(char *) _nc_get_locale(void); 21904 -extern NCURSES_EXPORT(int) _nc_unicode_locale(void); 21905 -extern NCURSES_EXPORT(int) _nc_locale_breaks_acs(TERMINAL *); 21906 -extern NCURSES_EXPORT(int) _nc_setupterm(NCURSES_CONST char *, int, int *, bool); 21907 -extern NCURSES_EXPORT(void) _nc_get_screensize(SCREEN *, int *, int *); 21908 +extern NCURSES_EXPORT(int) _nc_unicode_locale(void); 21909 +extern NCURSES_EXPORT(int) _nc_locale_breaks_acs(TERMINAL *); 21910 +extern NCURSES_EXPORT(int) _nc_setupterm(NCURSES_CONST char *, int, int *, bool); 21911 +extern NCURSES_EXPORT(void) _nc_get_screensize(SCREEN *, int *, int *); 21912 + 21913 +/* lib_set_term.c */ 21914 +extern NCURSES_EXPORT(int) _nc_ripoffline(int, int(*)(WINDOW*, int)); 21915 21916 /* lib_tstp.c */ 21917 #if USE_SIGWINCH 21918 @@ -1539,9 +1677,6 @@ 21919 #define _nc_handle_sigwinch(a) /* nothing */ 21920 #endif 21921 21922 -/* lib_ungetch.c */ 21923 -extern NCURSES_EXPORT(int) _nc_ungetch (SCREEN *, int); 21924 - 21925 /* lib_wacs.c */ 21926 #if USE_WIDEC_SUPPORT 21927 extern NCURSES_EXPORT(void) _nc_init_wacs(void); 21928 @@ -1577,8 +1712,6 @@ 21929 21930 /* elsewhere ... */ 21931 extern NCURSES_EXPORT(ENTRY *) _nc_delink_entry (ENTRY *, TERMTYPE *); 21932 -extern NCURSES_EXPORT(NCURSES_CONST char *) _nc_keyname (SCREEN *, int); 21933 -extern NCURSES_EXPORT(NCURSES_CONST char *) _nc_unctrl (SCREEN *, chtype); 21934 extern NCURSES_EXPORT(SCREEN *) _nc_screen_of (WINDOW *); 21935 extern NCURSES_EXPORT(WINDOW *) _nc_makenew (int, int, int, int, int); 21936 extern NCURSES_EXPORT(char *) _nc_trace_buf (int, size_t); 21937 @@ -1592,12 +1725,14 @@ 18608 21938 extern NCURSES_EXPORT(int) _nc_keypad (SCREEN *, bool); 18609 21939 extern NCURSES_EXPORT(int) _nc_ospeed (int); … … 18614 21944 extern NCURSES_EXPORT(int) _nc_setupscreen (int, int, FILE *, bool, int); 18615 21945 extern NCURSES_EXPORT(int) _nc_timed_wait (SCREEN *, int, int, int * EVENTLIST_2nd(_nc_eventlist *)); 18616 @@ -1663,7 +1702,7 @@ 18617 18618 #define NC_BUFFERED(flag) _nc_set_buffer(SP->_ofp, flag) 21946 -extern NCURSES_EXPORT(void) _nc_do_color (short, short, bool, int (*)(int)); 21947 +extern NCURSES_EXPORT(void) _nc_do_color (short, short, bool, NCURSES_OUTC); 21948 extern NCURSES_EXPORT(void) _nc_flush (void); 21949 -extern NCURSES_EXPORT(void) _nc_free_and_exit (int); 21950 +extern NCURSES_EXPORT(void) _nc_free_and_exit (int) GCC_NORETURN; 21951 extern NCURSES_EXPORT(void) _nc_free_entry (ENTRY *, TERMTYPE *); 21952 extern NCURSES_EXPORT(void) _nc_freeall (void); 21953 extern NCURSES_EXPORT(void) _nc_hash_map (void); 21954 @@ -1661,9 +1796,9 @@ 21955 21956 #define USE_SETBUF_0 0 21957 21958 -#define NC_BUFFERED(flag) _nc_set_buffer(SP->_ofp, flag) 21959 +#define NC_BUFFERED(sp,flag) NCURSES_SP_NAME(_nc_set_buffer)(NCURSES_SP_ARGx sp->_ofp, flag) 18619 21960 18620 21961 -#define NC_OUTPUT ((SP != 0) ? SP->_ofp : stdout) 18621 +#define NC_OUTPUT ((SP_PARM != 0) ? SP_PARM->_ofp : stdout)21962 +#define NC_OUTPUT(sp) ((sp != 0) ? sp->_ofp : stdout) 18622 21963 18623 21964 /* 18624 21965 * On systems with a broken linker, define 'SP' as a function to force the 18625 @@ -1681,6 +1720,8 @@ 18626 #define _nc_set_screen(sp) SP = sp 21966 @@ -1672,13 +1807,21 @@ 21967 #if BROKEN_LINKER 21968 #define SP _nc_screen() 21969 extern NCURSES_EXPORT(SCREEN *) _nc_screen (void); 21970 -extern NCURSES_EXPORT(int) _nc_alloc_screen (void); 21971 -extern NCURSES_EXPORT(void) _nc_set_screen (SCREEN *); 21972 +extern NCURSES_EXPORT(int) _nc_alloc_screen (void); 21973 +extern NCURSES_EXPORT(void) _nc_set_screen (SCREEN *); 21974 +#define CURRENT_SCREEN _nc_screen() 21975 #else 21976 /* current screen is private data; avoid possible linking conflicts too */ 21977 extern NCURSES_EXPORT_VAR(SCREEN *) SP; 21978 -#define _nc_alloc_screen() ((SP = typeCalloc(SCREEN, 1)) != 0) 21979 -#define _nc_set_screen(sp) SP = sp 21980 +#define CURRENT_SCREEN SP 21981 +#define _nc_alloc_screen() ((SP = typeCalloc(SCREEN, 1)) != 0) 21982 +#define _nc_set_screen(sp) SP = sp 21983 +#endif 21984 + 21985 +#if NCURSES_SP_FUNCS && 0 21986 +#define CURRENT_SCREEN_PRE (IsPreScreen(CURRENT_SCREEN) ? CURRENT_SCREEN : new_prescr()) 21987 +#else 21988 +#define CURRENT_SCREEN_PRE CURRENT_SCREEN 18627 21989 #endif 18628 21990 18629 +#define CURRENT_SCREEN SP18630 +18631 21991 /* 18632 * We don't want to use the lines or columns capabilities internally, because 21992 @@ -1686,10 +1829,11 @@ 18633 21993 * if the application is running multiple screens under X, it's quite possible 18634 @@ -1715,6 +1756,79 @@ 21994 * they could all have type xterm but have different sizes! So... 21995 */ 21996 -#define screen_lines SP->_lines 21997 -#define screen_columns SP->_columns 21998 +#define screen_lines(sp) (sp)->_lines 21999 +#define screen_columns(sp) (sp)->_columns 22000 22001 extern NCURSES_EXPORT(int) _nc_slk_initialize (WINDOW *, int); 22002 +extern NCURSES_EXPORT(int) _nc_format_slks (SCREEN *, int); 22003 22004 /* 22005 * Some constants related to SLK's 22006 @@ -1707,14 +1851,243 @@ 22007 #define MAX_SKEY(fmt) (SLK_STDFMT(fmt)? MAX_SKEY_OLD : MAX_SKEY_PC) 22008 #define MAX_SKEY_LEN(fmt) (SLK_STDFMT(fmt)? MAX_SKEY_LEN_OLD : MAX_SKEY_LEN_PC) 22009 22010 -extern NCURSES_EXPORT(int) _nc_ripoffline (int line, int (*init)(WINDOW *,int)); 22011 - 22012 /* 22013 * Common error messages 22014 */ 18635 22015 #define MSG_NO_MEMORY "Out of memory" 18636 22016 #define MSG_NO_INPUTS "Premature EOF" 18637 22017 22018 +extern NCURSES_EXPORT(int) _nc_set_tty_mode(TTY *); 22019 +extern NCURSES_EXPORT(int) _nc_get_tty_mode(TTY *); 22020 + 18638 22021 +/* timed_wait flag definitions */ 18639 22022 +#define TW_NONE 0 … … 18642 22025 +#define TW_ANY (TW_INPUT | TW_MOUSE) 18643 22026 +#define TW_EVENT 4 22027 + 22028 +#define SetSafeOutcWrapper(outc) \ 22029 + SCREEN* sp = CURRENT_SCREEN; \ 22030 + if (sp==0) { \ 22031 + struct screen dummy; \ 22032 + sp = &dummy; \ 22033 + memset(sp,0,sizeof(struct screen)); \ 22034 + sp->_outch = _nc_outc_wrapper; \ 22035 + }\ 22036 + sp->jump = outc 22037 + 22038 +struct DriverTCB; /* Terminal Control Block forward declaration */ 22039 +typedef void* TERM_HANDLE; 22040 + 22041 +typedef struct _termInfo 22042 +{ 22043 + bool caninit; 22044 + 22045 + bool hascolor; 22046 + bool initcolor; 22047 + bool canchange; 22048 + 22049 + int tabsize; 22050 + 22051 + int maxcolors; 22052 + int maxpairs; 22053 + int nocolorvideo; 22054 + 22055 + int numlabels; 22056 + int labelwidth; 22057 + int labelheight; 22058 + 22059 + const color_t* defaultPalette; 22060 +} TerminalInfo; 22061 + 22062 +typedef struct term_driver { 22063 + bool isTerminfo; 22064 + bool (*CanHandle)(struct DriverTCB*,const char*,int*); 22065 + void (*init)(struct DriverTCB*); 22066 + void (*release)(struct DriverTCB*); 22067 + int (*size)(struct DriverTCB*, int* Line, int *Cols); 22068 + int (*sgmode)(struct DriverTCB*, bool setFlag, TTY*); 22069 + chtype (*conattr)(struct DriverTCB*); 22070 + int (*hwcur)(struct DriverTCB*, int yold, int xold, int y, int x); 22071 + int (*mode)(struct DriverTCB*, bool progFlag, bool defFlag); 22072 + bool (*rescol)(struct DriverTCB*); 22073 + bool (*rescolors)(struct DriverTCB*); 22074 + void (*color)(struct DriverTCB*,bool fore, int color, int(*)(SCREEN*,int)); 22075 + int (*doBeepOrFlash)(struct DriverTCB*, bool); 22076 + void (*initpair)(struct DriverTCB*,short,short,short); 22077 + void (*initcolor)(struct DriverTCB*,short,short,short,short); 22078 + void (*docolor)(struct DriverTCB*,short,short,bool,int(*)(SCREEN*,int)); 22079 + void (*initmouse)(struct DriverTCB*); 22080 + void (*setfilter)(struct DriverTCB*); 22081 + void (*hwlabel)(struct DriverTCB*,int,char*); 22082 + void (*hwlabelOnOff)(struct DriverTCB*,bool); 22083 + int (*update)(struct DriverTCB*); 22084 + int (*defaultcolors)(struct DriverTCB*,int,int); 22085 + int (*print)(struct DriverTCB*,char*,int); 22086 + int (*getsize)(struct DriverTCB*,int*,int*); 22087 + int (*setsize)(struct DriverTCB*,int,int); 22088 + void (*initacs)(struct DriverTCB*,chtype*,chtype*); 22089 + void (*scinit)(SCREEN *); 22090 + void (*scexit)(SCREEN *); 22091 + int (*twait)(struct DriverTCB*,int,int,int* EVENTLIST_2nd(_nc_eventlist*)); 22092 + int (*read)(struct DriverTCB*,int*); 22093 + int (*nap)(struct DriverTCB*,int); 22094 + int (*kpad)(struct DriverTCB*, bool); 22095 + int (*kyOk)(struct DriverTCB*, int, bool); 22096 + bool (*kyExist)(struct DriverTCB*, int); 22097 +} TERM_DRIVER; 22098 + 22099 + 22100 +typedef struct DriverTCB 22101 +{ 22102 + TERMINAL term; /* needs to be the first Element !!! */ 22103 + TERM_HANDLE inp; /* The input handle of the Terminal */ 22104 + TERM_HANDLE out; /* The output handle of the Terminal in shell mode */ 22105 + TERM_HANDLE hdl; /* The output handle of the Terminal in prog mode */ 22106 + TERM_DRIVER* drv; /* The driver for that Terminal */ 22107 + SCREEN* csp; /* The screen that owns that Terminal */ 22108 + TerminalInfo info; /* Driver independent core capabilities of the Terminal */ 22109 + void* prop; /* Driver dependent property storage to be used by the Driver */ 22110 + long magic; 22111 +} TERMINAL_CONTROL_BLOCK; 22112 + 22113 +#define NCDRV_MAGIC(id) (0x47110000 | (id&0xffff)) 22114 +#define NCDRV_TINFO 0x01 22115 +#define NCDRV_WINCONSOLE 0x02 22116 + 22117 +#define TCBOf(sp) ((TERMINAL_CONTROL_BLOCK*)(TerminalOf(sp))) 22118 +#define InfoOf(sp) TCBOf(sp)->info 22119 +#define CallDriver(sp,method) TCBOf(sp)->drv->method(TCBOf(sp)) 22120 +#define CallDriver_1(sp,method,arg1) TCBOf(sp)->drv->method(TCBOf(sp),arg1) 22121 +#define CallDriver_2(sp,method,arg1,arg2) TCBOf(sp)->drv->method(TCBOf(sp),arg1,arg2) 22122 +#define CallDriver_3(sp,method,arg1,arg2,arg3) TCBOf(sp)->drv->method(TCBOf(sp),arg1,arg2,arg3) 22123 +#define CallDriver_4(sp,method,arg1,arg2,arg3,arg4) TCBOf(sp)->drv->method(TCBOf(sp),arg1,arg2,arg3,arg4) 22124 + 22125 +extern NCURSES_EXPORT_VAR(const color_t*) _nc_cga_palette; 22126 +extern NCURSES_EXPORT_VAR(const color_t*) _nc_hls_palette; 22127 + 22128 +#ifdef USE_TERM_DRIVER 22129 +extern NCURSES_EXPORT(int) _nc_tinfo_has_key(SCREEN*, int); 22130 +extern NCURSES_EXPORT(int) _nc_tinfo_doupdate(SCREEN *sp); 22131 +extern NCURSES_EXPORT(int) _nc_tinfo_mvcur(SCREEN*,int,int,int,int); 22132 +extern NCURSES_EXPORT(int) _nc_get_driver(TERMINAL_CONTROL_BLOCK*, const char*, int*); 22133 +#endif 22134 + 22135 +#ifdef __MINGW32__ 22136 +#include <nc_mingw.h> 22137 +extern NCURSES_EXPORT_VAR(TERM_DRIVER) _nc_WIN_DRIVER; 22138 +#endif 22139 +extern NCURSES_EXPORT_VAR(TERM_DRIVER) _nc_TINFO_DRIVER; 22140 + 22141 +#ifdef USE_TERM_DRIVER 22142 +#define IsTermInfo(sp) (TCBOf(sp) && ((TCBOf(sp)->drv->isTerminfo))) 22143 +#else 22144 +#define IsTermInfo(sp) TRUE 22145 +#endif 22146 + 22147 +#define HasTInfoTerminal(sp) ((0 != TerminalOf(sp)) && IsTermInfo(sp)) 22148 +#define IsValidTIScreen(sp) (HasTInfoTerminal(sp)) 18644 22149 + 18645 22150 +/* … … 18652 22157 +extern NCURSES_EXPORT(int) _nc_outc_wrapper(SCREEN*,int); 18653 22158 + 18654 +extern NCURSES_EXPORT(TERMINAL*) NCURSES_SP_NAME(_nc_set_curterm)(SCREEN*,TERMINAL*); 18655 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_del_curterm)(SCREEN*,TERMINAL*); 22159 +#if USE_REENTRANT 22160 +extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(_nc_ttytype)(SCREEN*); 22161 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_TABSIZE)(SCREEN*); 22162 +extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(longname)(SCREEN*); 22163 +#endif 18656 22164 + 18657 22165 +#if NCURSES_EXT_FUNCS 18658 22166 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_set_tabsize)(SCREEN*, int); 18659 22167 +#endif 18660 +18661 +extern NCURSES_EXPORT(chtype) NCURSES_SP_NAME(_nc_acs_char)(SCREEN*,int);18662 22168 + 18663 22169 +/* … … 18667 22173 +extern NCURSES_EXPORT(SCREEN*) _nc_SP(void); 18668 22174 + 22175 +extern NCURSES_EXPORT(TERMINAL*) NCURSES_SP_NAME(_nc_set_curterm)(SCREEN*,TERMINAL*); 22176 +extern NCURSES_EXPORT(TERMINAL*) NCURSES_SP_NAME(cur_term)(SCREEN *sp); 22177 +extern NCURSES_EXPORT(WINDOW *) NCURSES_SP_NAME(_nc_makenew) (SCREEN*, int, int, int, int, int); 22178 +extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(_nc_reset_colors)(SCREEN*); 22179 +extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(_nc_printf_string)(SCREEN*, const char *, va_list); 22180 +extern NCURSES_EXPORT(chtype) NCURSES_SP_NAME(_nc_acs_char)(SCREEN*,int); 22181 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_curs_set)(SCREEN*,int); 22182 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_get_tty_mode)(SCREEN*,TTY*); 22183 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_mcprint)(SCREEN*,char*, int); 22184 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_msec_cost)(SCREEN*, const char *, int); 22185 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_outch)(SCREEN*, int); 22186 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_putp)(SCREEN*, const char *, const char*); 22187 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_putp_flush)(SCREEN*, const char *, const char *); 22188 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_resetty)(SCREEN*); 22189 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_resize_term)(SCREEN*,int,int); 22190 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_ripoffline)(SCREEN*, int, int (*)(WINDOW *,int)); 22191 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_savetty)(SCREEN*); 22192 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_scr_init)(SCREEN*,const char*); 22193 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_scr_restore)(SCREEN*, const char*); 22194 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_scrolln)(SCREEN*, int, int, int, int); 22195 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_set_tty_mode)(SCREEN*, TTY*); 22196 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_setupscreen)(SCREEN**, int, int, FILE *, bool, int); 22197 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_tgetent)(SCREEN*,char*,const char *); 22198 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_tigetnum)(SCREEN*,NCURSES_CONST char*); 22199 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_vid_attr)(SCREEN *, attr_t, short, void *); 18669 22200 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_vidputs)(SCREEN*,chtype,int(*) (SCREEN*, int)); 18670 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_vidattr)(SCREEN *, chtype); 18671 + 18672 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_scr_restore)(SCREEN*, const char*); 18673 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_scr_init)(SCREEN*,const char*); 18674 + 18675 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_restartterm)(SCREEN*,NCURSES_CONST char*,int,int*); 18676 +extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(_nc_is_term_resized)(SCREEN*,int,int); 18677 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_resize_term)(SCREEN*,int,int); 18678 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_resizeterm)(SCREEN*,int,int); 18679 + 18680 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_outch)(SCREEN*, int ch); 18681 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_flush)(SCREEN*); 18682 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_putp)(SCREEN*, const char *, const char *); 18683 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_putp_flush)(SCREEN*, const char *, const char *); 18684 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_tgetent)(SCREEN*,char*,const char *); 18685 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_tputs)(SCREEN*,const char*,int,int(*)(SCREEN*, int)); 18686 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_savetty)(SCREEN*); 18687 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_resetty)(SCREEN*); 18688 + 18689 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_mcprint)(SCREEN*,char*, int); 18690 +extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(_nc_tgetstr)(SCREEN*,NCURSES_CONST char*,char**); 18691 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_tgetflag)(SCREEN*,NCURSES_CONST char*); 18692 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_tgetnum)(SCREEN*,NCURSES_CONST char*); 18693 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_tigetflag)(SCREEN*,NCURSES_CONST char*); 18694 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_tigetnum)(SCREEN*,NCURSES_CONST char*); 18695 +extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(_nc_tigetstr)(SCREEN*, NCURSES_CONST char*); 22201 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_do_color)(SCREEN*, short, short, bool, NCURSES_SP_OUTC); 22202 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_do_xmc_glitch)(SCREEN*, attr_t); 22203 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_flush)(SCREEN*); 22204 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_free_and_exit)(SCREEN*, int) GCC_NORETURN; 22205 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_freeall)(SCREEN*); 22206 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_hash_map)(SCREEN*); 22207 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_init_acs)(SCREEN*); 22208 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_make_oldhash)(SCREEN*, int i); 22209 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_mvcur_init)(SCREEN*); 22210 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_mvcur_resume)(SCREEN*); 22211 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_mvcur_wrap)(SCREEN*); 22212 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_screen_init)(SCREEN*); 22213 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_screen_resume)(SCREEN*); 22214 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_screen_wrap)(SCREEN*); 22215 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_scroll_oldhash)(SCREEN*, int n, int top, int bot); 22216 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_scroll_optimize)(SCREEN*); 22217 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_set_buffer)(SCREEN*, FILE *, bool); 22218 + 18696 22219 +extern NCURSES_EXPORT(void) _nc_cookie_init(SCREEN *sp); 18697 +extern NCURSES_EXPORT(int) _nc_tinfo_doupdate(SCREEN *sp); 18698 +extern NCURSES_EXPORT(int) _nc_tinfo_mcprint(SCREEN*,char*,int); 22220 + 22221 +#if defined(TRACE) || defined(SCROLLDEBUG) || defined(HASHDEBUG) 22222 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_linedump)(SCREEN*); 22223 +#endif 22224 + 18699 22225 +#if USE_WIDEC_SUPPORT 18700 22226 +extern NCURSES_EXPORT(wchar_t *) NCURSES_SP_NAME(_nc_wunctrl)(SCREEN*, cchar_t *); 18701 22227 +#endif 18702 22228 + 18703 +/* FIXME - move these to curses.h.in */18704 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(getmouse) (SCREEN*, MEVENT *);18705 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(ungetmouse) (SCREEN*, MEVENT *);18706 +extern NCURSES_EXPORT(mmask_t) NCURSES_SP_NAME(mousemask) (SCREEN*, mmask_t, mmask_t *);18707 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(mouseinterval) (SCREEN*, int);18708 +extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(has_mouse) (SCREEN*);18709 22229 +#endif /* NCURSES_SP_FUNCS */ 22230 + 22231 +#if NCURSES_SP_FUNCS 22232 + 22233 +#define safe_keyname NCURSES_SP_NAME(keyname) 22234 +#define safe_unctrl NCURSES_SP_NAME(unctrl) 22235 +#define safe_ungetch NCURSES_SP_NAME(ungetch) 22236 + 22237 +#else 22238 + 22239 +#define safe_keyname _nc_keyname 22240 +#define safe_unctrl _nc_unctrl 22241 +#define safe_ungetch _nc_ungetch 22242 + 22243 +extern NCURSES_EXPORT(NCURSES_CONST char *) _nc_keyname (SCREEN *, int); 22244 +extern NCURSES_EXPORT(int) _nc_ungetch (SCREEN *, int); 22245 +extern NCURSES_EXPORT(NCURSES_CONST char *) _nc_unctrl (SCREEN *, chtype); 22246 + 22247 +#endif 18710 22248 + 18711 22249 #ifdef __cplusplus … … 18714 22252 diff -Naur ncurses-5.7.orig/ncurses/Makefile.in ncurses-5.7/ncurses/Makefile.in 18715 22253 --- ncurses-5.7.orig/ncurses/Makefile.in 2008-10-18 07:11:54.000000000 -0700 18716 +++ ncurses-5.7/ncurses/Makefile.in 2009-0 3-22 21:16:55.671355217-070022254 +++ ncurses-5.7/ncurses/Makefile.in 2009-06-05 14:01:30.000000000 -0700 18717 22255 @@ -1,6 +1,6 @@ 18718 22256 -# $Id: Makefile.in,v 1.113 2008/10/18 14:11:54 tom Exp $ 18719 +# $Id: Makefile.in,v 1.11 4 2009/01/03 19:09:26 tomExp $22257 +# $Id: Makefile.in,v 1.115 2009/03/28 18:22:39 Charles.Wilson Exp $ 18720 22258 ############################################################################## 18721 22259 -# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. # … … 18724 22262 # Permission is hereby granted, free of charge, to any person obtaining a # 18725 22263 # copy of this software and associated documentation files (the "Software"), # 18726 @@ -78,7 +78,7 @@ 22264 @@ -71,6 +71,7 @@ 22265 LIBTOOL_LINK = @LIB_LINK@ 22266 LIBTOOL_INSTALL = @LIB_INSTALL@ 22267 LIBTOOL_UNINSTALL = @LIB_UNINSTALL@ 22268 +LT_UNDEF = @LT_UNDEF@ 22269 22270 INSTALL = @INSTALL@ 22271 INSTALL_LIB = @INSTALL@ @INSTALL_LIB@ 22272 @@ -78,7 +79,7 @@ 18727 22273 INSTALL_DATA = @INSTALL_DATA@ 18728 22274 … … 18733 22279 LD = @LD@ 18734 22280 LN_S = @LN_S@ 22281 diff -Naur ncurses-5.7.orig/ncurses/tinfo/access.c ncurses-5.7/ncurses/tinfo/access.c 22282 --- ncurses-5.7.orig/ncurses/tinfo/access.c 2007-11-17 16:57:53.000000000 -0800 22283 +++ ncurses-5.7/ncurses/tinfo/access.c 2009-06-05 14:01:33.000000000 -0700 22284 @@ -1,5 +1,5 @@ 22285 /**************************************************************************** 22286 - * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. * 22287 + * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. * 22288 * * 22289 * Permission is hereby granted, free of charge, to any person obtaining a * 22290 * copy of this software and associated documentation files (the * 22291 @@ -38,7 +38,7 @@ 22292 #include <tic.h> 22293 #include <nc_alloc.h> 22294 22295 -MODULE_ID("$Id: access.c,v 1.14 2007/11/18 00:57:53 tom Exp $") 22296 +MODULE_ID("$Id: access.c,v 1.15 2009/04/05 00:03:10 tom Exp $") 22297 22298 #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c)) 22299 22300 @@ -97,7 +97,7 @@ 22301 test = path; 22302 else 22303 test++; 22304 - return (test - path); 22305 + return (unsigned) (test - path); 22306 } 22307 22308 NCURSES_EXPORT(char *) 22309 diff -Naur ncurses-5.7.orig/ncurses/tinfo/alloc_ttype.c ncurses-5.7/ncurses/tinfo/alloc_ttype.c 22310 --- ncurses-5.7.orig/ncurses/tinfo/alloc_ttype.c 2008-10-12 09:12:00.000000000 -0700 22311 +++ ncurses-5.7/ncurses/tinfo/alloc_ttype.c 2009-06-05 14:01:44.000000000 -0700 22312 @@ -1,5 +1,5 @@ 22313 /**************************************************************************** 22314 - * Copyright (c) 1999-2006,2008 Free Software Foundation, Inc. * 22315 + * Copyright (c) 1999-2008,2009 Free Software Foundation, Inc. * 22316 * * 22317 * Permission is hereby granted, free of charge, to any person obtaining a * 22318 * copy of this software and associated documentation files (the * 22319 @@ -43,7 +43,7 @@ 22320 #include <tic.h> 22321 #include <term_entry.h> 22322 22323 -MODULE_ID("$Id: alloc_ttype.c,v 1.17 2008/10/12 16:12:00 tom Exp $") 22324 +MODULE_ID("$Id: alloc_ttype.c,v 1.18 2009/04/18 21:01:38 tom Exp $") 22325 22326 #if NCURSES_XNAMES 22327 /* 22328 @@ -147,10 +147,10 @@ 22329 /* 22330 * Returns the first index in ext_Names[] for the given token-type 22331 */ 22332 -static int 22333 +static unsigned 22334 _nc_first_ext_name(TERMTYPE *tp, int token_type) 22335 { 22336 - int first; 22337 + unsigned first; 22338 22339 switch (token_type) { 22340 case BOOLEAN: 22341 @@ -160,7 +160,7 @@ 22342 first = tp->ext_Booleans; 22343 break; 22344 case STRING: 22345 - first = tp->ext_Booleans + tp->ext_Numbers; 22346 + first = (unsigned) (tp->ext_Booleans + tp->ext_Numbers); 22347 break; 22348 default: 22349 first = 0; 22350 @@ -172,17 +172,17 @@ 22351 /* 22352 * Returns the last index in ext_Names[] for the given token-type 22353 */ 22354 -static int 22355 +static unsigned 22356 _nc_last_ext_name(TERMTYPE *tp, int token_type) 22357 { 22358 - int last; 22359 + unsigned last; 22360 22361 switch (token_type) { 22362 case BOOLEAN: 22363 last = tp->ext_Booleans; 22364 break; 22365 case NUMBER: 22366 - last = tp->ext_Booleans + tp->ext_Numbers; 22367 + last = (unsigned) (tp->ext_Booleans + tp->ext_Numbers); 22368 break; 22369 default: 22370 case STRING: 22371 @@ -204,7 +204,7 @@ 22372 22373 for (j = first; j < last; j++) { 22374 if (!strcmp(name, tp->ext_Names[j])) { 22375 - return j; 22376 + return (int) j; 22377 } 22378 } 22379 return -1; 22380 @@ -244,7 +244,7 @@ 22381 int first, last; 22382 22383 if ((first = _nc_find_ext_name(tp, name, token_type)) >= 0) { 22384 - last = NUM_EXT_NAMES(tp) - 1; 22385 + last = (int) NUM_EXT_NAMES(tp) - 1; 22386 for (j = first; j < last; j++) { 22387 tp->ext_Names[j] = tp->ext_Names[j + 1]; 22388 } 22389 @@ -254,22 +254,22 @@ 22390 last = tp->num_Booleans - 1; 22391 for (j = first; j < last; j++) 22392 tp->Booleans[j] = tp->Booleans[j + 1]; 22393 - tp->ext_Booleans -= 1; 22394 - tp->num_Booleans -= 1; 22395 + tp->ext_Booleans--; 22396 + tp->num_Booleans--; 22397 break; 22398 case NUMBER: 22399 last = tp->num_Numbers - 1; 22400 for (j = first; j < last; j++) 22401 tp->Numbers[j] = tp->Numbers[j + 1]; 22402 - tp->ext_Numbers -= 1; 22403 - tp->num_Numbers -= 1; 22404 + tp->ext_Numbers--; 22405 + tp->num_Numbers--; 22406 break; 22407 case STRING: 22408 last = tp->num_Strings - 1; 22409 for (j = first; j < last; j++) 22410 tp->Strings[j] = tp->Strings[j + 1]; 22411 - tp->ext_Strings -= 1; 22412 - tp->num_Strings -= 1; 22413 + tp->ext_Strings--; 22414 + tp->num_Strings--; 22415 break; 22416 } 22417 return TRUE; 22418 @@ -307,22 +307,22 @@ 22419 22420 switch (token_type) { 22421 case BOOLEAN: 22422 - tp->ext_Booleans += 1; 22423 - tp->num_Booleans += 1; 22424 + tp->ext_Booleans++; 22425 + tp->num_Booleans++; 22426 tp->Booleans = typeRealloc(NCURSES_SBOOL, tp->num_Booleans, tp->Booleans); 22427 for (k = tp->num_Booleans - 1; k > j; k--) 22428 tp->Booleans[k] = tp->Booleans[k - 1]; 22429 break; 22430 case NUMBER: 22431 - tp->ext_Numbers += 1; 22432 - tp->num_Numbers += 1; 22433 + tp->ext_Numbers++; 22434 + tp->num_Numbers++; 22435 tp->Numbers = typeRealloc(short, tp->num_Numbers, tp->Numbers); 22436 for (k = tp->num_Numbers - 1; k > j; k--) 22437 tp->Numbers[k] = tp->Numbers[k - 1]; 22438 break; 22439 case STRING: 22440 - tp->ext_Strings += 1; 22441 - tp->num_Strings += 1; 22442 + tp->ext_Strings++; 22443 + tp->num_Strings++; 22444 tp->Strings = typeRealloc(char *, tp->num_Strings, tp->Strings); 22445 for (k = tp->num_Strings - 1; k > j; k--) 22446 tp->Strings[k] = tp->Strings[k - 1]; 22447 @@ -345,7 +345,7 @@ 22448 22449 for (j = first; j < last;) { 22450 char *name = to->ext_Names[j]; 22451 - unsigned j_str = to->num_Strings - first - to->ext_Strings; 22452 + int j_str = to->num_Strings - first - to->ext_Strings; 22453 22454 if (to->Strings[j + j_str] == CANCELLED_STRING) { 22455 if ((k = _nc_find_ext_name(from, to->ext_Names[j], BOOLEAN)) >= 0) { 22456 diff -Naur ncurses-5.7.orig/ncurses/tinfo/captoinfo.c ncurses-5.7/ncurses/tinfo/captoinfo.c 22457 --- ncurses-5.7.orig/ncurses/tinfo/captoinfo.c 2008-08-16 12:24:51.000000000 -0700 22458 +++ ncurses-5.7/ncurses/tinfo/captoinfo.c 2009-06-05 14:01:30.000000000 -0700 22459 @@ -1,5 +1,5 @@ 22460 /**************************************************************************** 22461 - * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. * 22462 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 22463 * * 22464 * Permission is hereby granted, free of charge, to any person obtaining a * 22465 * copy of this software and associated documentation files (the * 22466 @@ -93,7 +93,7 @@ 22467 #include <ctype.h> 22468 #include <tic.h> 22469 22470 -MODULE_ID("$Id: captoinfo.c,v 1.52 2008/08/16 19:24:51 tom Exp $") 22471 +MODULE_ID("$Id: captoinfo.c,v 1.53 2009/03/28 20:44:23 tom Exp $") 22472 22473 #define MAX_PUSHED 16 /* max # args we can push onto the stack */ 22474 22475 @@ -128,7 +128,7 @@ 22476 size_t have = (d - my_string); 22477 size_t need = have + strlen(s) + 2; 22478 if (need > my_length) { 22479 - my_string = (char *) realloc(my_string, my_length = (need + need)); 22480 + my_string = (char *) _nc_doalloc(my_string, my_length = (need + need)); 22481 if (my_string == 0) 22482 _nc_err_abort(MSG_NO_MEMORY); 22483 d = my_string + have; 22484 diff -Naur ncurses-5.7.orig/ncurses/tinfo/comp_scan.c ncurses-5.7/ncurses/tinfo/comp_scan.c 22485 --- ncurses-5.7.orig/ncurses/tinfo/comp_scan.c 2008-08-16 12:22:55.000000000 -0700 22486 +++ ncurses-5.7/ncurses/tinfo/comp_scan.c 2009-06-05 14:01:51.000000000 -0700 22487 @@ -51,7 +51,7 @@ 22488 #include <term_entry.h> 22489 #include <tic.h> 22490 22491 -MODULE_ID("$Id: comp_scan.c,v 1.83 2008/08/16 19:22:55 tom Exp $") 22492 +MODULE_ID("$Id: comp_scan.c,v 1.84 2009/05/09 16:37:42 tom Exp $") 22493 22494 /* 22495 * Maximum length of string capability we'll accept before raising an error. 22496 @@ -61,19 +61,13 @@ 22497 22498 #define iswhite(ch) (ch == ' ' || ch == '\t') 22499 22500 -NCURSES_EXPORT_VAR(int) 22501 -_nc_syntax = 0; /* termcap or terminfo? */ 22502 -NCURSES_EXPORT_VAR(long) 22503 -_nc_curr_file_pos = 0; /* file offset of current line */ 22504 -NCURSES_EXPORT_VAR(long) 22505 -_nc_comment_start = 0; /* start of comment range before name */ 22506 -NCURSES_EXPORT_VAR(long) 22507 -_nc_comment_end = 0; /* end of comment range before name */ 22508 -NCURSES_EXPORT_VAR(long) 22509 -_nc_start_line = 0; /* start line of current entry */ 22510 +NCURSES_EXPORT_VAR (int) _nc_syntax = 0; /* termcap or terminfo? */ 22511 +NCURSES_EXPORT_VAR (long) _nc_curr_file_pos = 0; /* file offset of current line */ 22512 +NCURSES_EXPORT_VAR (long) _nc_comment_start = 0; /* start of comment range before name */ 22513 +NCURSES_EXPORT_VAR (long) _nc_comment_end = 0; /* end of comment range before name */ 22514 +NCURSES_EXPORT_VAR (long) _nc_start_line = 0; /* start line of current entry */ 22515 22516 -NCURSES_EXPORT_VAR(struct token) 22517 -_nc_curr_token = 22518 +NCURSES_EXPORT_VAR (struct token) _nc_curr_token = 22519 { 22520 0, 0, 0 22521 }; 22522 @@ -91,8 +85,7 @@ 22523 static char *pushname; 22524 22525 #if NCURSES_EXT_FUNCS 22526 -NCURSES_EXPORT_VAR(bool) 22527 -_nc_disable_period = FALSE; /* used by tic -a option */ 22528 +NCURSES_EXPORT_VAR (bool) _nc_disable_period = FALSE; /* used by tic -a option */ 22529 #endif 22530 22531 /***************************************************************************** 22532 @@ -637,7 +630,8 @@ 22533 /* just to get rid of the compiler warning */ 22534 type = UNDEF; 22535 if (!silent) 22536 - _nc_warning("Illegal character - '%s'", unctrl((chtype) ch)); 22537 + _nc_warning("Illegal character - '%s'", 22538 + unctrl((chtype) ch)); 22539 } 22540 } /* end else (first_column == FALSE) */ 22541 } /* end else (ch != EOF) */ 18735 22542 diff -Naur ncurses-5.7.orig/ncurses/tinfo/entries.c ncurses-5.7/ncurses/tinfo/entries.c 18736 22543 --- ncurses-5.7.orig/ncurses/tinfo/entries.c 2008-09-27 06:11:10.000000000 -0700 18737 +++ ncurses-5.7/ncurses/tinfo/entries.c 2009-0 3-22 21:17:09.916267635-070022544 +++ ncurses-5.7/ncurses/tinfo/entries.c 2009-06-05 14:01:21.000000000 -0700 18738 22545 @@ -1,5 +1,5 @@ 18739 22546 /**************************************************************************** … … 18765 22572 diff -Naur ncurses-5.7.orig/ncurses/tinfo/hashed_db.c ncurses-5.7/ncurses/tinfo/hashed_db.c 18766 22573 --- ncurses-5.7.orig/ncurses/tinfo/hashed_db.c 2006-08-19 12:48:38.000000000 -0700 18767 +++ ncurses-5.7/ncurses/tinfo/hashed_db.c 2009-0 3-22 21:16:50.643032825-070022574 +++ ncurses-5.7/ncurses/tinfo/hashed_db.c 2009-06-05 14:00:57.000000000 -0700 18768 22575 @@ -1,5 +1,5 @@ 18769 22576 /**************************************************************************** … … 18869 22676 } 18870 22677 22678 diff -Naur ncurses-5.7.orig/ncurses/tinfo/init_keytry.c ncurses-5.7/ncurses/tinfo/init_keytry.c 22679 --- ncurses-5.7.orig/ncurses/tinfo/init_keytry.c 2008-05-24 14:44:51.000000000 -0700 22680 +++ ncurses-5.7/ncurses/tinfo/init_keytry.c 2009-06-05 14:01:51.000000000 -0700 22681 @@ -1,5 +1,5 @@ 22682 /**************************************************************************** 22683 - * Copyright (c) 1999-2006,2008 Free Software Foundation, Inc. * 22684 + * Copyright (c) 1999-2008,2009 Free Software Foundation, Inc. * 22685 * * 22686 * Permission is hereby granted, free of charge, to any person obtaining a * 22687 * copy of this software and associated documentation files (the * 22688 @@ -27,16 +27,11 @@ 22689 ****************************************************************************/ 22690 22691 #include <curses.priv.h> 22692 - 22693 -#include <term.h> 22694 -/* keypad_xmit, keypad_local, meta_on, meta_off */ 22695 -/* cursor_visible,cursor_normal,cursor_invisible */ 22696 - 22697 #include <tic.h> /* struct tinfo_fkeys */ 22698 22699 #include <term_entry.h> 22700 22701 -MODULE_ID("$Id: init_keytry.c,v 1.12 2008/05/24 21:44:51 tom Exp $") 22702 +MODULE_ID("$Id: init_keytry.c,v 1.14 2009/05/10 00:48:29 tom Exp $") 22703 22704 /* 22705 ** _nc_init_keytry() 22706 @@ -50,7 +45,7 @@ 22707 * than cur_term. 22708 */ 22709 #undef CUR 22710 -#define CUR (sp->_term)->type. 22711 +#define CUR SP_TERMTYPE 22712 22713 #if BROKEN_LINKER 22714 #undef _nc_tinfo_fkeys 22715 @@ -102,7 +97,8 @@ 22716 if (name != 0 22717 && *name == 'k' 22718 && value != 0 22719 - && key_defined(value) == 0) { 22720 + && NCURSES_SP_NAME(key_defined) (NCURSES_SP_ARGx 22721 + value) == 0) { 22722 (void) _nc_add_to_try(&(sp->_keytry), 22723 value, 22724 n - STRCOUNT + KEY_MAX); 18871 22725 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_acs.c ncurses-5.7/ncurses/tinfo/lib_acs.c 18872 22726 --- ncurses-5.7.orig/ncurses/tinfo/lib_acs.c 2008-08-16 12:22:55.000000000 -0700 18873 +++ ncurses-5.7/ncurses/tinfo/lib_acs.c 2009-03-22 21:17:11.636377985 -0700 18874 @@ -35,12 +35,12 @@ 18875 #include <curses.priv.h> 18876 #include <term.h> /* ena_acs, acs_chars */ 18877 18878 -MODULE_ID("$Id: lib_acs.c,v 1.36 2008/08/16 19:22:55 tom Exp $") 18879 +MODULE_ID("$Id: lib_acs.c,v 1.37 2009/03/21 19:39:23 tom Exp $") 18880 18881 #if BROKEN_LINKER || USE_REENTRANT 18882 #define MyBuffer _nc_prescreen.real_acs_map 18883 NCURSES_EXPORT_VAR(chtype *) 18884 -_nc_acs_map(void) 18885 +NCURSES_PUBLIC_VAR(acs_map)(void) 18886 { 18887 if (MyBuffer == 0) 18888 MyBuffer = typeCalloc(chtype, ACS_LEN); 18889 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_baudrate.c ncurses-5.7/ncurses/tinfo/lib_baudrate.c 18890 --- ncurses-5.7.orig/ncurses/tinfo/lib_baudrate.c 2008-06-28 08:19:24.000000000 -0700 18891 +++ ncurses-5.7/ncurses/tinfo/lib_baudrate.c 2009-03-22 21:17:05.651994412 -0700 22727 +++ ncurses-5.7/ncurses/tinfo/lib_acs.c 2009-06-05 14:01:51.000000000 -0700 18892 22728 @@ -1,5 +1,5 @@ 18893 22729 /**************************************************************************** … … 18897 22733 * Permission is hereby granted, free of charge, to any person obtaining a * 18898 22734 * copy of this software and associated documentation files (the * 18899 @@ -80,7 +80,7 @@ 22735 @@ -35,12 +35,16 @@ 22736 #include <curses.priv.h> 22737 #include <term.h> /* ena_acs, acs_chars */ 22738 22739 -MODULE_ID("$Id: lib_acs.c,v 1.36 2008/08/16 19:22:55 tom Exp $") 22740 +#ifndef CUR 22741 +#define CUR SP_TERMTYPE 22742 +#endif 22743 + 22744 +MODULE_ID("$Id: lib_acs.c,v 1.39 2009/05/10 00:48:29 tom Exp $") 22745 22746 #if BROKEN_LINKER || USE_REENTRANT 22747 #define MyBuffer _nc_prescreen.real_acs_map 22748 -NCURSES_EXPORT_VAR(chtype *) 22749 -_nc_acs_map(void) 22750 +NCURSES_EXPORT(chtype *) 22751 +NCURSES_PUBLIC_VAR(acs_map) (void) 22752 { 22753 if (MyBuffer == 0) 22754 MyBuffer = typeCalloc(chtype, ACS_LEN); 22755 @@ -48,7 +52,7 @@ 22756 } 22757 #undef MyBuffer 22758 #else 22759 -NCURSES_EXPORT_VAR(chtype) acs_map[ACS_LEN] = 22760 +NCURSES_EXPORT_VAR (chtype) acs_map[ACS_LEN] = 22761 { 22762 0 22763 }; 22764 @@ -57,6 +61,9 @@ 22765 NCURSES_EXPORT(void) 22766 _nc_init_acs(void) 22767 { 22768 +#if NCURSES_SP_FUNCS 22769 + SCREEN *sp = CURRENT_SCREEN; 22770 +#endif 22771 chtype *fake_map = acs_map; 22772 chtype *real_map = SP != 0 ? SP->_acs_map : fake_map; 22773 int j; 22774 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_baudrate.c ncurses-5.7/ncurses/tinfo/lib_baudrate.c 22775 --- ncurses-5.7.orig/ncurses/tinfo/lib_baudrate.c 2008-06-28 08:19:24.000000000 -0700 22776 +++ ncurses-5.7/ncurses/tinfo/lib_baudrate.c 2009-06-05 14:01:51.000000000 -0700 22777 @@ -1,5 +1,5 @@ 22778 /**************************************************************************** 22779 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 22780 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 22781 * * 22782 * Permission is hereby granted, free of charge, to any person obtaining a * 22783 * copy of this software and associated documentation files (the * 22784 @@ -38,7 +38,6 @@ 22785 */ 22786 22787 #include <curses.priv.h> 22788 -#include <term.h> /* cur_term, pad_char */ 22789 #include <termcap.h> /* ospeed */ 22790 #if defined(__FreeBSD__) 22791 #include <sys/param.h> 22792 @@ -80,7 +79,7 @@ 18900 22793 #undef USE_OLD_TTY 18901 22794 #endif /* USE_OLD_TTY */ 18902 22795 18903 22796 -MODULE_ID("$Id: lib_baudrate.c,v 1.27 2008/06/28 15:19:24 tom Exp $") 18904 +MODULE_ID("$Id: lib_baudrate.c,v 1.2 8 2009/02/14 21:41:22tom Exp $")22797 +MODULE_ID("$Id: lib_baudrate.c,v 1.29 2009/02/21 17:22:13 tom Exp $") 18905 22798 18906 22799 /* 18907 22800 * int 18908 @@ -195, 7 +195,7@@22801 @@ -195,11 +194,11 @@ 18909 22802 } 18910 22803 … … 18915 22808 int result; 18916 22809 18917 @@ -207,7 +207,7 @@ 22810 - T((T_CALLED("baudrate()"))); 22811 + T((T_CALLED("baudrate(%p)"), SP_PARM)); 22812 22813 /* 22814 * In debugging, allow the environment symbol to override when we're 22815 @@ -207,7 +206,8 @@ 18918 22816 * that take into account costs that depend on baudrate. 18919 22817 */ 18920 22818 #ifdef TRACE 18921 22819 - if (!isatty(fileno(SP ? SP->_ofp : stdout)) 18922 + if (!isatty(fileno(SP_PARM ? SP_PARM->_ofp : stdout)) 22820 + if (IsValidTIScreen(SP_PARM) 22821 + && !isatty(fileno(SP_PARM ? SP_PARM->_ofp : stdout)) 18923 22822 && getenv("BAUDRATE") != 0) { 18924 22823 int ret; 18925 22824 if ((ret = _nc_getenv_num("BAUDRATE")) <= 0) 18926 @@ -236,3 +236,11 @@ 22825 @@ -217,22 +217,30 @@ 22826 } 22827 #endif 22828 22829 - if (cur_term != 0) { 22830 + if (IsValidTIScreen(SP_PARM)) { 22831 #ifdef USE_OLD_TTY 22832 - result = cfgetospeed(&cur_term->Nttyb); 22833 + result = cfgetospeed(&(TerminalOf(SP_PARM)->Nttyb)); 22834 ospeed = _nc_ospeed(result); 22835 #else /* !USE_OLD_TTY */ 22836 #ifdef TERMIOS 22837 - ospeed = cfgetospeed(&cur_term->Nttyb); 22838 + ospeed = cfgetospeed(&(TerminalOf(SP_PARM)->Nttyb)); 22839 #else 22840 - ospeed = cur_term->Nttyb.sg_ospeed; 22841 + ospeed = TerminalOf(SP_PARM)->Nttyb.sg_ospeed; 22842 #endif 22843 result = _nc_baudrate(ospeed); 22844 #endif 22845 - cur_term->_baudrate = result; 22846 + TerminalOf(SP_PARM)->_baudrate = result; 22847 } else { 22848 result = ERR; 22849 } 18927 22850 18928 22851 returnCode(result); … … 18938 22861 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_cur_term.c ncurses-5.7/ncurses/tinfo/lib_cur_term.c 18939 22862 --- ncurses-5.7.orig/ncurses/tinfo/lib_cur_term.c 2008-08-16 12:22:55.000000000 -0700 18940 +++ ncurses-5.7/ncurses/tinfo/lib_cur_term.c 2009-0 3-22 21:17:09.916267635-070022863 +++ ncurses-5.7/ncurses/tinfo/lib_cur_term.c 2009-06-05 14:01:55.000000000 -0700 18941 22864 @@ -1,5 +1,5 @@ 18942 22865 /**************************************************************************** … … 18951 22874 18952 22875 -MODULE_ID("$Id: lib_cur_term.c,v 1.18 2008/08/16 19:22:55 tom Exp $") 18953 +MODULE_ID("$Id: lib_cur_term.c,v 1.2 0 2009/03/14 14:39:32tom Exp $")22876 +MODULE_ID("$Id: lib_cur_term.c,v 1.22 2009/05/30 13:55:19 tom Exp $") 18954 22877 18955 22878 #undef CUR … … 18974 22897 #else 18975 22898 cur_term = termp; 22899 @@ -84,7 +88,7 @@ 22900 } 22901 22902 NCURSES_EXPORT(int) 22903 -del_curterm(TERMINAL * termp) 22904 +NCURSES_SP_NAME(del_curterm) (NCURSES_SP_DCLx TERMINAL * termp) 22905 { 22906 int rc = ERR; 22907 22908 @@ -94,6 +98,10 @@ 22909 if (termp != 0) { 22910 _nc_free_termtype(&(termp->type)); 22911 FreeIfNeeded(termp->_termname); 22912 +#if USE_HOME_TERMINFO 22913 + if (_nc_globals.home_terminfo != 0) 22914 + FreeAndNull(_nc_globals.home_terminfo); 22915 +#endif 22916 free(termp); 22917 if (termp == cur_term) 22918 set_curterm(0); 22919 @@ -103,3 +111,13 @@ 22920 22921 returnCode(rc); 22922 } 22923 + 22924 +#if NCURSES_SP_FUNCS 22925 +NCURSES_EXPORT(int) 22926 +del_curterm(TERMINAL * termp) 22927 +{ 22928 + int rc = ERR; 22929 + rc = NCURSES_SP_NAME(del_curterm) (CURRENT_SCREEN, termp); 22930 + return (rc); 22931 +} 22932 +#endif 22933 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_data.c ncurses-5.7/ncurses/tinfo/lib_data.c 22934 --- ncurses-5.7.orig/ncurses/tinfo/lib_data.c 2008-08-23 15:16:15.000000000 -0700 22935 +++ ncurses-5.7/ncurses/tinfo/lib_data.c 2009-06-05 14:01:55.000000000 -0700 22936 @@ -1,5 +1,5 @@ 22937 /**************************************************************************** 22938 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 22939 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 22940 * * 22941 * Permission is hereby granted, free of charge, to any person obtaining a * 22942 * copy of this software and associated documentation files (the * 22943 @@ -41,7 +41,7 @@ 22944 22945 #include <curses.priv.h> 22946 22947 -MODULE_ID("$Id: lib_data.c,v 1.52 2008/08/23 22:16:15 tom Exp $") 22948 +MODULE_ID("$Id: lib_data.c,v 1.53 2009/05/30 15:59:25 tom Exp $") 22949 22950 /* 22951 * OS/2's native linker complains if we don't initialize public data when 22952 @@ -225,6 +225,8 @@ 22953 NULL, /* real_acs_map */ 22954 0, /* LINES */ 22955 0, /* COLS */ 22956 + 8, /* TABSIZE */ 22957 + 1000, /* ESCDELAY */ 22958 0, /* cur_term */ 22959 #ifdef TRACE 22960 0L, /* _outchars */ 18976 22961 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_has_cap.c ncurses-5.7/ncurses/tinfo/lib_has_cap.c 18977 22962 --- ncurses-5.7.orig/ncurses/tinfo/lib_has_cap.c 2003-10-25 12:43:55.000000000 -0700 18978 +++ ncurses-5.7/ncurses/tinfo/lib_has_cap.c 2009-0 3-22 21:17:05.651994412-070022963 +++ ncurses-5.7/ncurses/tinfo/lib_has_cap.c 2009-06-05 14:01:51.000000000 -0700 18979 22964 @@ -1,5 +1,5 @@ 18980 22965 /**************************************************************************** … … 18992 22977 18993 22978 /* 18994 @@ -43,10 +44,10 @@ 18995 18996 #include <term.h> 22979 @@ -41,25 +42,53 @@ 22980 22981 #include <curses.priv.h> 22982 22983 -#include <term.h> 22984 +#ifndef CUR 22985 +#define CUR SP_TERMTYPE 22986 +#endif 18997 22987 18998 22988 -MODULE_ID("$Id: lib_has_cap.c,v 1.4 2003/10/25 19:43:55 tom Exp $") 18999 +MODULE_ID("$Id: lib_has_cap.c,v 1. 5 2009/02/15 00:47:12 tom Exp $")22989 +MODULE_ID("$Id: lib_has_cap.c,v 1.8 2009/05/10 00:53:52 tom Exp $") 19000 22990 19001 22991 NCURSES_EXPORT(bool) 19002 -has_ic(void)19003 22992 +NCURSES_SP_NAME(has_ic) (NCURSES_SP_DCL0) 22993 +{ 22994 + bool code = FALSE; 22995 + 22996 + T((T_CALLED("has_ic(%p)"), SP_PARM)); 22997 + 22998 + if (IsValidTIScreen(SP_PARM) && IsTermInfo(SP_PARM)) { 22999 + code = ((insert_character || parm_ich 23000 + || (enter_insert_mode && exit_insert_mode)) 23001 + && (delete_character || parm_dch)) ? TRUE : FALSE; 23002 + } 23003 + 23004 + returnCode(code); 23005 +} 23006 + 23007 +#if NCURSES_SP_FUNCS 23008 +NCURSES_EXPORT(bool) 23009 has_ic(void) 19004 23010 { 19005 T((T_CALLED("has_ic()"))); 19006 returnCode(cur_term && 19007 @@ -55,11 +56,27 @@ 19008 && (delete_character || parm_dch)); 19009 } 19010 19011 +#if NCURSES_SP_FUNCS 19012 NCURSES_EXPORT(bool) 19013 -has_il(void) 19014 +has_ic(void) 19015 +{ 23011 - T((T_CALLED("has_ic()"))); 23012 - returnCode(cur_term && 23013 - (insert_character || parm_ich 23014 - || (enter_insert_mode && exit_insert_mode)) 23015 - && (delete_character || parm_dch)); 19016 23016 + return NCURSES_SP_NAME(has_ic) (CURRENT_SCREEN); 19017 23017 +} … … 19020 23020 +NCURSES_EXPORT(bool) 19021 23021 +NCURSES_SP_NAME(has_il) (NCURSES_SP_DCL0) 23022 +{ 23023 + bool code = FALSE; 23024 + T((T_CALLED("has_il(%p)"), SP_PARM)); 23025 + if (IsValidTIScreen(SP_PARM) && IsTermInfo(SP_PARM)) { 23026 + code = ((insert_line || parm_insert_line) 23027 + && (delete_line || parm_delete_line)) ? TRUE : FALSE; 23028 + } 23029 + 23030 + returnCode(code); 23031 } 23032 23033 +#if NCURSES_SP_FUNCS 23034 NCURSES_EXPORT(bool) 23035 has_il(void) 19022 23036 { 19023 T((T_CALLED("has_il()"))); 19024 returnCode(cur_term 19025 && (insert_line || parm_insert_line) 19026 && (delete_line || parm_delete_line)); 23037 - T((T_CALLED("has_il()"))); 23038 - returnCode(cur_term 23039 - && (insert_line || parm_insert_line) 23040 - && (delete_line || parm_delete_line)); 23041 + return NCURSES_SP_NAME(has_il) (CURRENT_SCREEN); 19027 23042 } 19028 +19029 +#if NCURSES_SP_FUNCS19030 +NCURSES_EXPORT(bool)19031 +has_il(void)19032 +{19033 + return NCURSES_SP_NAME(has_il) (CURRENT_SCREEN);19034 +}19035 23043 +#endif 19036 23044 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_kernel.c ncurses-5.7/ncurses/tinfo/lib_kernel.c 19037 23045 --- ncurses-5.7.orig/ncurses/tinfo/lib_kernel.c 2004-05-08 10:11:21.000000000 -0700 19038 +++ ncurses-5.7/ncurses/tinfo/lib_kernel.c 2009-0 3-22 21:17:05.651994412-070023046 +++ ncurses-5.7/ncurses/tinfo/lib_kernel.c 2009-06-05 14:01:14.000000000 -0700 19039 23047 @@ -1,5 +1,5 @@ 19040 23048 /**************************************************************************** … … 19147 23155 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_longname.c ncurses-5.7/ncurses/tinfo/lib_longname.c 19148 23156 --- ncurses-5.7.orig/ncurses/tinfo/lib_longname.c 2000-12-09 18:55:07.000000000 -0800 19149 +++ ncurses-5.7/ncurses/tinfo/lib_longname.c 2009-0 3-22 21:17:05.651994412-070023157 +++ ncurses-5.7/ncurses/tinfo/lib_longname.c 2009-06-05 14:01:51.000000000 -0700 19150 23158 @@ -1,5 +1,5 @@ 19151 23159 /**************************************************************************** … … 19164 23172 19165 23173 /* 19166 @@ -40, 10 +42,10@@23174 @@ -40,8 +42,38 @@ 19167 23175 19168 23176 #include <curses.priv.h> 19169 23177 19170 23178 -MODULE_ID("$Id: lib_longname.c,v 1.9 2000/12/10 02:55:07 tom Exp $") 19171 +MODULE_ID("$Id: lib_longname.c,v 1.1 0 2009/02/15 00:48:15tom Exp $")19172 19173 NCURSES_EXPORT(char *) 19174 -longname(void)23179 +MODULE_ID("$Id: lib_longname.c,v 1.11 2009/02/21 17:18:02 tom Exp $") 23180 23181 +#if USE_REENTRANT 23182 +NCURSES_EXPORT(char *) 19175 23183 +NCURSES_SP_NAME(longname) (NCURSES_SP_DCL0) 19176 { 19177 char *ptr; 19178 19179 @@ -55,3 +57,11 @@ 19180 19181 returnPtr(ttytype); 19182 } 23184 +{ 23185 + static char empty[] = 23186 + {'\0'}; 23187 + char *ptr; 23188 + 23189 + T((T_CALLED("longname(%p)"), SP_PARM)); 23190 + 23191 + if (SP_PARM) { 23192 + for (ptr = SP_PARM->_ttytype + strlen(SP_PARM->_ttytype); 23193 + ptr > SP_PARM->_ttytype; 23194 + ptr--) 23195 + if (*ptr == '|') 23196 + returnPtr(ptr + 1); 23197 + returnPtr(SP_PARM->_ttytype); 23198 + } 23199 + return empty; 23200 +} 19183 23201 + 19184 23202 +#if NCURSES_SP_FUNCS … … 19189 23207 +} 19190 23208 +#endif 23209 + 23210 +#else 23211 NCURSES_EXPORT(char *) 23212 longname(void) 23213 { 23214 @@ -49,9 +81,11 @@ 23215 23216 T((T_CALLED("longname()"))); 23217 23218 - for (ptr = ttytype + strlen(ttytype); ptr > ttytype; ptr--) 23219 + for (ptr = ttytype + strlen(ttytype); 23220 + ptr > ttytype; 23221 + ptr--) 23222 if (*ptr == '|') 23223 returnPtr(ptr + 1); 23224 - 23225 returnPtr(ttytype); 23226 } 23227 +#endif 19191 23228 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_napms.c ncurses-5.7/ncurses/tinfo/lib_napms.c 19192 23229 --- ncurses-5.7.orig/ncurses/tinfo/lib_napms.c 2008-05-03 14:34:13.000000000 -0700 19193 +++ ncurses-5.7/ncurses/tinfo/lib_napms.c 2009-0 3-22 21:17:05.651994412-070023230 +++ ncurses-5.7/ncurses/tinfo/lib_napms.c 2009-06-05 14:01:14.000000000 -0700 19194 23231 @@ -1,5 +1,5 @@ 19195 23232 /**************************************************************************** … … 19235 23272 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_options.c ncurses-5.7/ncurses/tinfo/lib_options.c 19236 23273 --- ncurses-5.7.orig/ncurses/tinfo/lib_options.c 2008-08-16 14:20:48.000000000 -0700 19237 +++ ncurses-5.7/ncurses/tinfo/lib_options.c 2009-0 3-22 21:17:08.400170414-070023274 +++ ncurses-5.7/ncurses/tinfo/lib_options.c 2009-06-05 14:01:54.000000000 -0700 19238 23275 @@ -1,5 +1,5 @@ 19239 23276 /**************************************************************************** … … 19251 23288 19252 23289 /* 19253 @@ -43, 7 +44,7@@23290 @@ -43,14 +44,20 @@ 19254 23291 19255 23292 #include <term.h> 19256 23293 19257 23294 -MODULE_ID("$Id: lib_options.c,v 1.58 2008/08/16 21:20:48 Werner.Fink Exp $") 19258 +MODULE_ID("$Id: lib_options.c,v 1.60 2009/02/28 21:07:56 tom Exp $") 19259 19260 static int _nc_curs_set(SCREEN *, int); 23295 +#ifndef CUR 23296 +#define CUR SP_TERMTYPE 23297 +#endif 23298 + 23299 +MODULE_ID("$Id: lib_options.c,v 1.64 2009/05/23 23:58:07 tom Exp $") 23300 23301 -static int _nc_curs_set(SCREEN *, int); 19261 23302 static int _nc_meta(SCREEN *, bool); 19262 @@ -72,18 +73,26 @@ 23303 23304 NCURSES_EXPORT(int) 23305 idlok(WINDOW *win, bool flag) 23306 { 23307 +#if NCURSES_SP_FUNCS 23308 + SCREEN *sp = CURRENT_SCREEN; 23309 +#endif 23310 T((T_CALLED("idlok(%p,%d)"), win, flag)); 23311 23312 if (win) { 23313 @@ -72,18 +79,26 @@ 19263 23314 } 19264 23315 … … 19290 23341 nodelay(WINDOW *win, bool flag) 19291 23342 { 19292 @@ -158,17 +167,25 @@ 23343 @@ -148,27 +163,64 @@ 23344 /* curs_set() moved here to narrow the kernel interface */ 23345 23346 NCURSES_EXPORT(int) 23347 -curs_set(int vis) 23348 +NCURSES_SP_NAME(curs_set) (NCURSES_SP_DCLx int vis) 23349 { 23350 - int result; 23351 + int result = ERR; 23352 + 23353 + T((T_CALLED("curs_set(%p,%d)"), SP_PARM, vis)); 23354 + if (SP_PARM != 0 && vis >= 0 && vis <= 2) { 23355 + int cursor = SP_PARM->_cursor; 23356 23357 - T((T_CALLED("curs_set(%d)"), vis)); 23358 - result = _nc_curs_set(SP, vis); 23359 + if (vis == cursor) { 23360 + result = cursor; 23361 + } else { 23362 + switch (vis) { 23363 + case 2: 23364 + result = _nc_putp_flush("cursor_visible", cursor_visible); 23365 + break; 23366 + case 1: 23367 + result = _nc_putp_flush("cursor_normal", cursor_normal); 23368 + break; 23369 + case 0: 23370 + result = _nc_putp_flush("cursor_invisible", cursor_invisible); 23371 + break; 23372 + } 23373 + if (result != ERR) 23374 + result = (cursor == -1 ? 1 : cursor); 23375 + SP_PARM->_cursor = vis; 23376 + } 23377 + } 23378 returnCode(result); 19293 23379 } 19294 23380 23381 +#if NCURSES_SP_FUNCS 19295 23382 NCURSES_EXPORT(int) 19296 23383 -typeahead(int fd) 23384 +curs_set(int vis) 23385 +{ 23386 + return (NCURSES_SP_NAME(curs_set) (CURRENT_SCREEN, vis)); 23387 +} 23388 +#endif 23389 + 23390 +NCURSES_EXPORT(int) 19297 23391 +NCURSES_SP_NAME(typeahead) (NCURSES_SP_DCLx int fd) 19298 23392 { … … 19319 23413 ** has_key() 19320 23414 ** 19321 @@ -204,8 +221,9 @@ 23415 @@ -190,11 +242,19 @@ 23416 } 23417 23418 NCURSES_EXPORT(int) 23419 +NCURSES_SP_NAME(has_key) (NCURSES_SP_DCLx int keycode) 23420 +{ 23421 + T((T_CALLED("has_key(%p,%d)"), SP_PARM, keycode)); 23422 + returnCode(SP != 0 ? has_key_internal(keycode, SP_PARM->_keytry) : FALSE); 23423 +} 23424 + 23425 +#if NCURSES_SP_FUNCS 23426 +NCURSES_EXPORT(int) 23427 has_key(int keycode) 23428 { 23429 - T((T_CALLED("has_key(%d)"), keycode)); 23430 - returnCode(SP != 0 ? has_key_internal(keycode, SP->_keytry) : FALSE); 23431 + return NCURSES_SP_NAME(has_key) (CURRENT_SCREEN, keycode); 23432 } 23433 +#endif 23434 #endif /* NCURSES_EXT_FUNCS */ 23435 23436 /* 23437 @@ -202,29 +262,26 @@ 23438 * than cur_term. 23439 */ 19322 23440 #undef CUR 19323 #define CUR (sp->_term)->type. 23441 -#define CUR (sp->_term)->type. 23442 +#define CUR SP_TERMTYPE 19324 23443 19325 23444 -static int 19326 23445 -_nc_putp(const char *name GCC_UNUSED, const char *value) 19327 +NCURSES_EXPORT(int)19328 +NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_DCLx19329 + const char *name GCC_UNUSED, const char *value)19330 {19331 int rc = ERR;19332 19333 @@ -216,8 +234,17 @@19334 return rc;19335 }19336 19337 -static int19338 -_nc_putp_flush(const char *name, const char *value)19339 +#if NCURSES_SP_FUNCS19340 +NCURSES_EXPORT(int)19341 +_nc_putp(const char *name, const char *value)19342 +{19343 + return NCURSES_SP_NAME(_nc_putp) (CURRENT_SCREEN, name, value);19344 +}19345 +#endif19346 +19347 23446 +NCURSES_EXPORT(int) 19348 23447 +NCURSES_SP_NAME(_nc_putp_flush) (NCURSES_SP_DCLx 19349 23448 + const char *name, const char *value) 19350 23449 { 19351 int rc = _nc_putp(name, value); 19352 if (rc != ERR) { 19353 @@ -226,6 +253,14 @@ 23450 - int rc = ERR; 23451 - 23452 - if (value) { 23453 - TPUTS_TRACE(name); 23454 - rc = putp(value); 23455 + int rc = _nc_putp(name, value); 23456 + if (rc != ERR) { 23457 + _nc_flush(); 23458 } 19354 23459 return rc; 19355 23460 } 19356 23461 23462 -static int 19357 23463 +#if NCURSES_SP_FUNCS 19358 23464 +NCURSES_EXPORT(int) 19359 +_nc_putp_flush(const char *name, const char *value) 19360 +{ 23465 _nc_putp_flush(const char *name, const char *value) 23466 { 23467 - int rc = _nc_putp(name, value); 23468 - if (rc != ERR) { 23469 - _nc_flush(); 23470 - } 23471 - return rc; 19361 23472 + return NCURSES_SP_NAME(_nc_putp_flush) (CURRENT_SCREEN, name, value); 19362 +}23473 } 19363 23474 +#endif 19364 + 23475 19365 23476 /* Turn the keypad on/off 19366 23477 * 19367 * Note: we flush the output because changing this mode causes some terminals 19368 @@ -245,12 +280,12 @@ 23478 @@ -245,12 +302,12 @@ 19369 23479 * has wgetch() reading in more than one thread. putp() and below 19370 23480 * may use SP explicitly. … … 19381 23491 rc = _nc_keypad(sp, flag); 19382 23492 _nc_set_screen(save_sp); 19383 @@ -313,8 +348,8 @@ 23493 @@ -276,45 +333,14 @@ 23494 } 23495 23496 static int 23497 -_nc_curs_set(SCREEN *sp, int vis) 23498 -{ 23499 - int result = ERR; 23500 - 23501 - T((T_CALLED("curs_set(%d)"), vis)); 23502 - if (sp != 0 && vis >= 0 && vis <= 2) { 23503 - int cursor = sp->_cursor; 23504 - 23505 - if (vis == cursor) { 23506 - result = cursor; 23507 - } else { 23508 - switch (vis) { 23509 - case 2: 23510 - result = _nc_putp_flush("cursor_visible", cursor_visible); 23511 - break; 23512 - case 1: 23513 - result = _nc_putp_flush("cursor_normal", cursor_normal); 23514 - break; 23515 - case 0: 23516 - result = _nc_putp_flush("cursor_invisible", cursor_invisible); 23517 - break; 23518 - } 23519 - if (result != ERR) 23520 - result = (cursor == -1 ? 1 : cursor); 23521 - sp->_cursor = vis; 23522 - } 23523 - } 23524 - returnCode(result); 23525 -} 23526 - 23527 -static int 23528 _nc_meta(SCREEN *sp, bool flag) 23529 { 23530 int result = ERR; 19384 23531 19385 23532 /* Ok, we stay relaxed and don't signal an error if win is NULL */ … … 19392 23539 if (flag) { 19393 23540 _nc_putp("meta_on", meta_on); 23541 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_print.c ncurses-5.7/ncurses/tinfo/lib_print.c 23542 --- ncurses-5.7.orig/ncurses/tinfo/lib_print.c 2006-11-25 16:26:34.000000000 -0800 23543 +++ ncurses-5.7/ncurses/tinfo/lib_print.c 2009-06-05 14:01:51.000000000 -0700 23544 @@ -1,5 +1,5 @@ 23545 /**************************************************************************** 23546 - * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc. * 23547 + * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. * 23548 * * 23549 * Permission is hereby granted, free of charge, to any person obtaining a * 23550 * copy of this software and associated documentation files (the * 23551 @@ -35,12 +35,19 @@ 23552 23553 #include <term.h> 23554 23555 -MODULE_ID("$Id: lib_print.c,v 1.16 2006/11/26 00:26:34 tom Exp $") 23556 +#ifndef CUR 23557 +#define CUR SP_TERMTYPE 23558 +#endif 23559 + 23560 +MODULE_ID("$Id: lib_print.c,v 1.18 2009/05/10 00:48:29 tom Exp $") 23561 23562 NCURSES_EXPORT(int) 23563 mcprint(char *data, int len) 23564 /* ship binary character data to the printer via mc4/mc5/mc5p */ 23565 { 23566 +#if NCURSES_SP_FUNCS 23567 + SCREEN *sp = CURRENT_SCREEN; 23568 +#endif 23569 char *mybuf, *switchon; 23570 size_t onsize, offsize, res; 23571 19394 23572 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_raw.c ncurses-5.7/ncurses/tinfo/lib_raw.c 19395 23573 --- ncurses-5.7.orig/ncurses/tinfo/lib_raw.c 2007-09-29 14:50:22.000000000 -0700 19396 +++ ncurses-5.7/ncurses/tinfo/lib_raw.c 2009-0 3-22 21:17:05.651994412-070023574 +++ ncurses-5.7/ncurses/tinfo/lib_raw.c 2009-06-05 14:01:14.000000000 -0700 19397 23575 @@ -1,5 +1,5 @@ 19398 23576 /**************************************************************************** … … 19643 23821 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_setup.c ncurses-5.7/ncurses/tinfo/lib_setup.c 19644 23822 --- ncurses-5.7.orig/ncurses/tinfo/lib_setup.c 2008-08-03 15:42:33.000000000 -0700 19645 +++ ncurses-5.7/ncurses/tinfo/lib_setup.c 2009-0 3-22 21:17:05.655995250 -070023823 +++ ncurses-5.7/ncurses/tinfo/lib_setup.c 2009-06-05 14:01:55.000000000 -0700 19646 23824 @@ -1,5 +1,5 @@ 19647 23825 /**************************************************************************** … … 19664 23842 19665 23843 -MODULE_ID("$Id: lib_setup.c,v 1.111 2008/08/03 22:42:33 tom Exp $") 19666 +MODULE_ID("$Id: lib_setup.c,v 1.11 3 2009/02/14 22:21:40tom Exp $")23844 +MODULE_ID("$Id: lib_setup.c,v 1.116 2009/05/30 20:39:21 tom Exp $") 19667 23845 19668 23846 /**************************************************************************** 19669 23847 * 19670 @@ -149,21 +150,30 @@ 23848 @@ -116,54 +117,68 @@ 23849 return cur_term ? cur_term->type.term_names : empty; 23850 } 23851 NCURSES_EXPORT(int *) 23852 -_nc_ptr_Lines(void) 23853 +_nc_ptr_Lines(SCREEN *sp) 23854 { 23855 - return ptrLines(); 23856 + return ptrLines(sp); 23857 } 23858 NCURSES_EXPORT(int) 23859 NCURSES_PUBLIC_VAR(LINES) (void) 23860 { 23861 - return *_nc_ptr_Lines(); 23862 + return *_nc_ptr_Lines(CURRENT_SCREEN); 23863 } 23864 NCURSES_EXPORT(int *) 23865 -_nc_ptr_Cols(void) 23866 +_nc_ptr_Cols(SCREEN *sp) 23867 { 23868 - return ptrCols(); 23869 + return ptrCols(sp); 23870 } 23871 NCURSES_EXPORT(int) 23872 NCURSES_PUBLIC_VAR(COLS) (void) 23873 { 23874 - return *_nc_ptr_Cols(); 23875 + return *_nc_ptr_Cols(CURRENT_SCREEN); 23876 +} 23877 +NCURSES_EXPORT(int *) 23878 +_nc_ptr_Tabsize(SCREEN *sp) 23879 +{ 23880 + return ptrTabsize(sp); 23881 } 23882 NCURSES_EXPORT(int) 23883 NCURSES_PUBLIC_VAR(TABSIZE) (void) 23884 { 23885 - return SP ? SP->_TABSIZE : 8; 23886 + return *_nc_ptr_Tabsize(CURRENT_SCREEN); 23887 } 23888 #else 23889 NCURSES_EXPORT_VAR(char) ttytype[NAMESIZE] = ""; 23890 NCURSES_EXPORT_VAR(int) LINES = 0; 23891 NCURSES_EXPORT_VAR(int) COLS = 0; 23892 -NCURSES_EXPORT_VAR(int) TABSIZE = 0; 23893 +NCURSES_EXPORT_VAR(int) TABSIZE = 8; 23894 #endif 19671 23895 19672 23896 #if NCURSES_EXT_FUNCS … … 19702 23926 #if USE_SIGWINCH 19703 23927 /* 19704 @@ -188,13 + 198,25 @@23928 @@ -188,13 +203,25 @@ 19705 23929 #endif 19706 23930 … … 19730 23954 _nc_get_screensize(SCREEN *sp, int *linep, int *colp) 19731 23955 /* Obtain lines/columns values from the environment and/or terminfo entry */ 23956 @@ -604,7 +631,7 @@ 23957 /* 23958 * We should always check the screensize, just in case. 23959 */ 23960 - _nc_get_screensize(SP, ptrLines(), ptrCols()); 23961 + _nc_get_screensize(SP, ptrLines(SP), ptrCols(SP)); 23962 23963 if (errret) 23964 *errret = TGETENT_YES; 23965 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_termcap.c ncurses-5.7/ncurses/tinfo/lib_termcap.c 23966 --- ncurses-5.7.orig/ncurses/tinfo/lib_termcap.c 2008-08-16 12:22:55.000000000 -0700 23967 +++ ncurses-5.7/ncurses/tinfo/lib_termcap.c 2009-06-05 14:01:54.000000000 -0700 23968 @@ -1,5 +1,5 @@ 23969 /**************************************************************************** 23970 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 23971 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 23972 * * 23973 * Permission is hereby granted, free of charge, to any person obtaining a * 23974 * copy of this software and associated documentation files (the * 23975 @@ -30,6 +30,7 @@ 23976 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 23977 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 23978 * and: Thomas E. Dickey 1996-on * 23979 + * and: Juergen Pfeifer * 23980 * * 23981 * some of the code in here was contributed by: * 23982 * Magnus Bengtsson, d6mbeng@dtek.chalmers.se (Nov'93) * 23983 @@ -45,7 +46,11 @@ 23984 23985 #include <term_entry.h> 23986 23987 -MODULE_ID("$Id: lib_termcap.c,v 1.63 2008/08/16 19:22:55 tom Exp $") 23988 +#ifndef CUR 23989 +#define CUR SP_TERMTYPE 23990 +#endif 23991 + 23992 +MODULE_ID("$Id: lib_termcap.c,v 1.66 2009/05/23 23:47:34 tom Exp $") 23993 23994 NCURSES_EXPORT_VAR(char *) UP = 0; 23995 NCURSES_EXPORT_VAR(char *) BC = 0; 23996 @@ -76,7 +81,7 @@ 23997 ***************************************************************************/ 23998 23999 NCURSES_EXPORT(int) 24000 -tgetent(char *bufp, const char *name) 24001 +NCURSES_SP_NAME(tgetent) (NCURSES_SP_DCLx char *bufp, const char *name) 24002 { 24003 int errcode; 24004 int n; 24005 @@ -111,7 +116,7 @@ 24006 */ 24007 if (LAST_TRM != 0 && LAST_TRM != cur_term) { 24008 TERMINAL *trm = LAST_TRM; 24009 - del_curterm(LAST_TRM); 24010 + NCURSES_SP_NAME(del_curterm) (NCURSES_SP_ARGx LAST_TRM); 24011 for (CacheInx = 0; CacheInx < TGETENT_MAX; ++CacheInx) 24012 if (LAST_TRM == trm) 24013 LAST_TRM = 0; 24014 @@ -164,8 +169,8 @@ 24015 LAST_BUF = bufp; 24016 LAST_USE = TRUE; 24017 24018 - SetNoPadding(SP); 24019 - (void) baudrate(); /* sets ospeed as a side-effect */ 24020 + SetNoPadding(SP_PARM); 24021 + (void) NCURSES_SP_NAME(baudrate) (NCURSES_SP_ARG); /* sets ospeed as a side-effect */ 24022 24023 /* LINT_PREPRO 24024 #if 0*/ 24025 @@ -177,6 +182,14 @@ 24026 returnCode(errcode); 24027 } 24028 24029 +#if NCURSES_SP_FUNCS 24030 +NCURSES_EXPORT(int) 24031 +tgetent(char *bufp, const char *name) 24032 +{ 24033 + return NCURSES_SP_NAME(tgetent) (CURRENT_SCREEN, bufp, name); 24034 +} 24035 +#endif 24036 + 24037 /*************************************************************************** 24038 * 24039 * tgetflag(str) 24040 @@ -187,7 +200,7 @@ 24041 ***************************************************************************/ 24042 24043 NCURSES_EXPORT(int) 24044 -tgetflag(NCURSES_CONST char *id) 24045 +NCURSES_SP_NAME(tgetflag) (NCURSES_SP_DCLx NCURSES_CONST char *id) 24046 { 24047 unsigned i; 24048 24049 @@ -205,6 +218,14 @@ 24050 returnCode(0); /* Solaris does this */ 24051 } 24052 24053 +#if NCURSES_SP_FUNCS 24054 +NCURSES_EXPORT(int) 24055 +tgetflag(NCURSES_CONST char *id) 24056 +{ 24057 + return NCURSES_SP_NAME(tgetflag) (CURRENT_SCREEN, id); 24058 +} 24059 +#endif 24060 + 24061 /*************************************************************************** 24062 * 24063 * tgetnum(str) 24064 @@ -215,7 +236,7 @@ 24065 ***************************************************************************/ 24066 24067 NCURSES_EXPORT(int) 24068 -tgetnum(NCURSES_CONST char *id) 24069 +NCURSES_SP_NAME(tgetnum) (NCURSES_SP_DCLx NCURSES_CONST char *id) 24070 { 24071 unsigned i; 24072 24073 @@ -234,6 +255,14 @@ 24074 returnCode(ABSENT_NUMERIC); 24075 } 24076 24077 +#if NCURSES_SP_FUNCS 24078 +NCURSES_EXPORT(int) 24079 +tgetnum(NCURSES_CONST char *id) 24080 +{ 24081 + return NCURSES_SP_NAME(tgetnum) (CURRENT_SCREEN, id); 24082 +} 24083 +#endif 24084 + 24085 /*************************************************************************** 24086 * 24087 * tgetstr(str, area) 24088 @@ -244,7 +273,7 @@ 24089 ***************************************************************************/ 24090 24091 NCURSES_EXPORT(char *) 24092 -tgetstr(NCURSES_CONST char *id, char **area) 24093 +NCURSES_SP_NAME(tgetstr) (NCURSES_SP_DCLx NCURSES_CONST char *id, char **area) 24094 { 24095 unsigned i; 24096 char *result = NULL; 24097 @@ -278,6 +307,14 @@ 24098 returnPtr(result); 24099 } 24100 24101 +#if NCURSES_SP_FUNCS 24102 +NCURSES_EXPORT(char *) 24103 +tgetstr(NCURSES_CONST char *id, char **area) 24104 +{ 24105 + return NCURSES_SP_NAME(tgetstr) (CURRENT_SCREEN, id, area); 24106 +} 24107 +#endif 24108 + 24109 #if NO_LEAKS 24110 NCURSES_EXPORT(void) 24111 _nc_tgetent_leaks(void) 19732 24112 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_termname.c ncurses-5.7/ncurses/tinfo/lib_termname.c 19733 24113 --- ncurses-5.7.orig/ncurses/tinfo/lib_termname.c 2003-12-27 10:23:01.000000000 -0800 19734 +++ ncurses-5.7/ncurses/tinfo/lib_termname.c 2009-0 3-22 21:17:07.020082134-070024114 +++ ncurses-5.7/ncurses/tinfo/lib_termname.c 2009-06-05 14:01:16.000000000 -0700 19735 24115 @@ -1,5 +1,5 @@ 19736 24116 /**************************************************************************** … … 19775 24155 +} 19776 24156 +#endif 24157 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_ti.c ncurses-5.7/ncurses/tinfo/lib_ti.c 24158 --- ncurses-5.7.orig/ncurses/tinfo/lib_ti.c 2003-05-24 14:10:28.000000000 -0700 24159 +++ ncurses-5.7/ncurses/tinfo/lib_ti.c 2009-06-05 14:01:51.000000000 -0700 24160 @@ -1,5 +1,5 @@ 24161 /**************************************************************************** 24162 - * Copyright (c) 1998-2000,2003 Free Software Foundation, Inc. * 24163 + * Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. * 24164 * * 24165 * Permission is hereby granted, free of charge, to any person obtaining a * 24166 * copy of this software and associated documentation files (the * 24167 @@ -36,17 +36,17 @@ 24168 #include <term_entry.h> 24169 #include <tic.h> 24170 24171 -MODULE_ID("$Id: lib_ti.c,v 1.23 2003/05/24 21:10:28 tom Exp $") 24172 +MODULE_ID("$Id: lib_ti.c,v 1.24 2009/04/18 17:37:50 tom Exp $") 24173 24174 NCURSES_EXPORT(int) 24175 -tigetflag(NCURSES_CONST char *str) 24176 +NCURSES_SP_NAME(tigetflag) (NCURSES_SP_DCLx NCURSES_CONST char *str) 24177 { 24178 unsigned i; 24179 24180 - T((T_CALLED("tigetflag(%s)"), str)); 24181 + T((T_CALLED("tigetflag(%p, %s)"), SP_PARM, str)); 24182 24183 - if (cur_term != 0) { 24184 - TERMTYPE *tp = &(cur_term->type); 24185 + if (HasTInfoTerminal(SP_PARM)) { 24186 + TERMTYPE *tp = &(TerminalOf(SP_PARM)->type); 24187 for_each_boolean(i, tp) { 24188 const char *capname = ExtBoolname(tp, i, boolnames); 24189 if (!strcmp(str, capname)) { 24190 @@ -59,15 +59,23 @@ 24191 returnCode(ABSENT_BOOLEAN); 24192 } 24193 24194 +#if NCURSES_SP_FUNCS 24195 NCURSES_EXPORT(int) 24196 -tigetnum(NCURSES_CONST char *str) 24197 +tigetflag(NCURSES_CONST char *str) 24198 +{ 24199 + return NCURSES_SP_NAME(tigetflag) (CURRENT_SCREEN, str); 24200 +} 24201 +#endif 24202 + 24203 +NCURSES_EXPORT(int) 24204 +NCURSES_SP_NAME(tigetnum) (NCURSES_SP_DCLx NCURSES_CONST char *str) 24205 { 24206 unsigned i; 24207 24208 - T((T_CALLED("tigetnum(%s)"), str)); 24209 + T((T_CALLED("tigetnum(%p, %s)"), SP_PARM, str)); 24210 24211 - if (cur_term != 0) { 24212 - TERMTYPE *tp = &(cur_term->type); 24213 + if (HasTInfoTerminal(SP_PARM)) { 24214 + TERMTYPE *tp = &(TerminalOf(SP_PARM)->type); 24215 for_each_number(i, tp) { 24216 const char *capname = ExtNumname(tp, i, numnames); 24217 if (!strcmp(str, capname)) { 24218 @@ -81,15 +89,23 @@ 24219 returnCode(CANCELLED_NUMERIC); /* Solaris returns a -1 instead */ 24220 } 24221 24222 +#if NCURSES_SP_FUNCS 24223 +NCURSES_EXPORT(int) 24224 +tigetnum(NCURSES_CONST char *str) 24225 +{ 24226 + return NCURSES_SP_NAME(tigetnum) (CURRENT_SCREEN, str); 24227 +} 24228 +#endif 24229 + 24230 NCURSES_EXPORT(char *) 24231 -tigetstr(NCURSES_CONST char *str) 24232 +NCURSES_SP_NAME(tigetstr) (NCURSES_SP_DCLx NCURSES_CONST char *str) 24233 { 24234 unsigned i; 24235 24236 - T((T_CALLED("tigetstr(%s)"), str)); 24237 + T((T_CALLED("tigetstr(%p, %s)"), SP_PARM, str)); 24238 24239 - if (cur_term != 0) { 24240 - TERMTYPE *tp = &(cur_term->type); 24241 + if (HasTInfoTerminal(SP_PARM)) { 24242 + TERMTYPE *tp = &(TerminalOf(SP_PARM)->type); 24243 for_each_string(i, tp) { 24244 const char *capname = ExtStrname(tp, i, strnames); 24245 if (!strcmp(str, capname)) { 24246 @@ -101,3 +117,11 @@ 24247 24248 returnPtr(CANCELLED_STRING); 24249 } 24250 + 24251 +#if NCURSES_SP_FUNCS 24252 +NCURSES_EXPORT(char *) 24253 +tigetstr(NCURSES_CONST char *str) 24254 +{ 24255 + return NCURSES_SP_NAME(tigetstr) (CURRENT_SCREEN, str); 24256 +} 24257 +#endif 19777 24258 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_tparm.c ncurses-5.7/ncurses/tinfo/lib_tparm.c 19778 24259 --- ncurses-5.7.orig/ncurses/tinfo/lib_tparm.c 2008-08-16 12:22:55.000000000 -0700 19779 +++ ncurses-5.7/ncurses/tinfo/lib_tparm.c 2009-0 3-22 21:17:07.020082134-070024260 +++ ncurses-5.7/ncurses/tinfo/lib_tparm.c 2009-06-05 14:01:16.000000000 -0700 19780 24261 @@ -40,10 +40,9 @@ 19781 24262 #include <curses.priv.h> … … 19792 24273 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_tputs.c ncurses-5.7/ncurses/tinfo/lib_tputs.c 19793 24274 --- ncurses-5.7.orig/ncurses/tinfo/lib_tputs.c 2008-06-28 06:12:15.000000000 -0700 19794 +++ ncurses-5.7/ncurses/tinfo/lib_tputs.c 2009-0 3-22 21:17:08.400170414-070024275 +++ ncurses-5.7/ncurses/tinfo/lib_tputs.c 2009-06-05 14:01:54.000000000 -0700 19795 24276 @@ -1,5 +1,5 @@ 19796 24277 /**************************************************************************** … … 19808 24289 19809 24290 /* 19810 @@ -46,7 +47,7 @@ 24291 @@ -41,12 +42,16 @@ 24292 */ 24293 24294 #include <curses.priv.h> 24295 + 24296 +#ifndef CUR 24297 +#define CUR SP_TERMTYPE 24298 +#endif 24299 + 24300 #include <ctype.h> 24301 -#include <term.h> /* padding_baud_rate, xon_xoff */ 19811 24302 #include <termcap.h> /* ospeed */ 19812 24303 #include <tic.h> 19813 24304 19814 24305 -MODULE_ID("$Id: lib_tputs.c,v 1.66 2008/06/28 13:12:15 tom Exp $") 19815 +MODULE_ID("$Id: lib_tputs.c,v 1. 68 2009/02/28 21:08:18tom Exp $")24306 +MODULE_ID("$Id: lib_tputs.c,v 1.74 2009/05/23 23:56:23 tom Exp $") 19816 24307 19817 24308 NCURSES_EXPORT_VAR(char) PC = 0; /* used by termcap library */ 19818 24309 NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0; /* used by termcap library */ 19819 @@ -72,7 +73,7 @@ 19820 static int (*my_outch) (int c) = _nc_outch; 24310 @@ -69,62 +74,122 @@ 24311 } 24312 #endif 24313 24314 -static int (*my_outch) (int c) = _nc_outch; 24315 +#if NCURSES_SP_FUNCS 24316 +#define my_outch SP_PARM->_outch 24317 +#else 24318 +static NCURSES_SP_OUTC my_outch = NCURSES_SP_NAME(_nc_outch); 24319 +#endif 19821 24320 19822 24321 NCURSES_EXPORT(int) … … 19824 24323 +NCURSES_SP_NAME(delay_output) (NCURSES_SP_DCLx int ms) 19825 24324 { 19826 T((T_CALLED("delay_output(%d)"), ms)); 19827 19828 @@ -92,19 +93,35 @@ 24325 - T((T_CALLED("delay_output(%d)"), ms)); 24326 + T((T_CALLED("delay_output(%p,%d)"), SP_PARM, ms)); 24327 24328 if (no_pad_char) { 24329 - _nc_flush(); 24330 + NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG); 24331 napms(ms); 24332 } else { 24333 register int nullcount; 24334 24335 nullcount = (ms * _nc_baudrate(ospeed)) / (BAUDBYTE * 1000); 24336 for (_nc_nulls_sent += nullcount; nullcount > 0; nullcount--) 24337 - my_outch(PC); 24338 - if (my_outch == _nc_outch) 24339 - _nc_flush(); 24340 + my_outch(NCURSES_SP_ARGx PC); 24341 + if (my_outch == NCURSES_SP_NAME(_nc_outch)) 24342 + NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG); 24343 } 24344 19829 24345 returnCode(OK); 19830 24346 } … … 19838 24354 +#endif 19839 24355 + 24356 +NCURSES_EXPORT(void) 24357 +NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_DCL0) 24358 +{ 24359 + (void) fflush(NC_OUTPUT(SP_PARM)); 24360 +} 24361 + 24362 +#if NCURSES_SP_FUNCS 19840 24363 NCURSES_EXPORT(void) 19841 -_nc_flush(void) 19842 +NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_DCL0) 24364 _nc_flush(void) 19843 24365 { 19844 (void) fflush(NC_OUTPUT); 24366 - (void) fflush(NC_OUTPUT); 24367 + NCURSES_SP_NAME(_nc_flush) (CURRENT_SCREEN); 19845 24368 } 19846 19847 +#if NCURSES_SP_FUNCS19848 +NCURSES_EXPORT(void)19849 +_nc_flush(void)19850 +{19851 + NCURSES_SP_NAME(_nc_flush) (CURRENT_SCREEN);19852 +}19853 24369 +#endif 19854 + 24370 19855 24371 NCURSES_EXPORT(int) 19856 24372 -_nc_outch(int ch) … … 19866 24382 /* 19867 24383 * POSIX says write() is safe in a signal handler, but the 19868 @@ -117,6 +134,14 @@ 24384 * buffered I/O is not. 24385 */ 24386 - write(fileno(NC_OUTPUT), &tmp, 1); 24387 + write(fileno(NC_OUTPUT(SP_PARM)), &tmp, 1); 24388 } else { 24389 - putc(ch, NC_OUTPUT); 24390 + putc(ch, NC_OUTPUT(SP_PARM)); 24391 } 19869 24392 return OK; 19870 24393 } … … 19878 24401 +#endif 19879 24402 + 24403 +NCURSES_EXPORT(int) 24404 +NCURSES_SP_NAME(putp) (NCURSES_SP_DCLx const char *string) 24405 +{ 24406 + return NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx 24407 + string, 1, NCURSES_SP_NAME(_nc_outch)); 24408 +} 24409 + 24410 +NCURSES_EXPORT(int) 24411 +NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_DCLx 24412 + const char *name GCC_UNUSED, 24413 + const char *string) 24414 +{ 24415 + int rc = ERR; 24416 + 24417 + if (string != 0) { 24418 + TPUTS_TRACE(name); 24419 + rc = NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx string); 24420 + } 24421 + return rc; 24422 +} 24423 + 24424 +#if NCURSES_SP_FUNCS 19880 24425 NCURSES_EXPORT(int) 19881 24426 putp(const char *string) 19882 24427 { 24428 - return tputs(string, 1, _nc_outch); 24429 + return NCURSES_SP_NAME(putp) (CURRENT_SCREEN, string); 24430 } 24431 24432 NCURSES_EXPORT(int) 24433 -tputs(const char *string, int affcnt, int (*outc) (int)) 24434 +_nc_putp(const char *name, const char *string) 24435 +{ 24436 + return NCURSES_SP_NAME(_nc_putp) (CURRENT_SCREEN, name, string); 24437 +} 24438 +#endif 24439 + 24440 +NCURSES_EXPORT(int) 24441 +NCURSES_SP_NAME(tputs) (NCURSES_SP_DCLx 24442 + const char *string, 24443 + int affcnt, 24444 + NCURSES_SP_OUTC outc) 24445 { 24446 bool always_delay; 24447 bool normal_delay; 24448 @@ -137,7 +202,7 @@ 24449 char addrbuf[32]; 24450 24451 if (USE_TRACEF(TRACE_TPUTS)) { 24452 - if (outc == _nc_outch) 24453 + if (outc == NCURSES_SP_NAME(_nc_outch)) 24454 (void) strcpy(addrbuf, "_nc_outch"); 24455 else 24456 (void) sprintf(addrbuf, "%p", outc); 24457 @@ -164,7 +229,7 @@ 24458 !xon_xoff 24459 && padding_baud_rate 24460 #if NCURSES_NO_PADDING 24461 - && !GetNoPadding(SP) 24462 + && !GetNoPadding(SP_PARM) 24463 #endif 24464 && (_nc_baudrate(ospeed) >= padding_baud_rate); 24465 } 24466 @@ -201,21 +266,21 @@ 24467 my_outch = outc; /* redirect delay_output() */ 24468 while (*string) { 24469 if (*string != '$') 24470 - (*outc) (*string); 24471 + (*outc) (NCURSES_SP_ARGx *string); 24472 else { 24473 string++; 24474 if (*string != '<') { 24475 - (*outc) ('$'); 24476 + (*outc) (NCURSES_SP_ARGx '$'); 24477 if (*string) 24478 - (*outc) (*string); 24479 + (*outc) (NCURSES_SP_ARGx *string); 24480 } else { 24481 bool mandatory; 24482 24483 string++; 24484 if ((!isdigit(UChar(*string)) && *string != '.') 24485 || !strchr(string, '>')) { 24486 - (*outc) ('$'); 24487 - (*outc) ('<'); 24488 + (*outc) (NCURSES_SP_ARGx '$'); 24489 + (*outc) (NCURSES_SP_ARGx '<'); 24490 continue; 24491 } 24492 24493 @@ -250,7 +315,7 @@ 24494 && (always_delay 24495 || normal_delay 24496 || mandatory)) 24497 - delay_output(number / 10); 24498 + NCURSES_SP_NAME(delay_output) (NCURSES_SP_ARGx number / 10); 24499 24500 } /* endelse (*string == '<') */ 24501 } /* endelse (*string == '$') */ 24502 @@ -270,6 +335,25 @@ 24503 delay_output(trailpad / 10); 24504 #endif /* BSD_TPUTS */ 24505 24506 - my_outch = _nc_outch; 24507 + my_outch = NCURSES_SP_NAME(_nc_outch); 24508 return OK; 24509 } 24510 + 24511 +#if NCURSES_SP_FUNCS 24512 +NCURSES_EXPORT(int) 24513 +_nc_outc_wrapper(SCREEN *sp, int c) 24514 +{ 24515 + if (0 == sp) { 24516 + return (ERR); 24517 + } else { 24518 + return sp->jump(c); 24519 + } 24520 +} 24521 + 24522 +NCURSES_EXPORT(int) 24523 +tputs(const char *string, int affcnt, int (*outc) (int)) 24524 +{ 24525 + SetSafeOutcWrapper(outc); 24526 + return NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx string, affcnt, _nc_outc_wrapper); 24527 +} 24528 +#endif 19883 24529 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_ttyflags.c ncurses-5.7/ncurses/tinfo/lib_ttyflags.c 19884 24530 --- ncurses-5.7.orig/ncurses/tinfo/lib_ttyflags.c 2008-08-03 15:10:44.000000000 -0700 19885 +++ ncurses-5.7/ncurses/tinfo/lib_ttyflags.c 2009-0 3-22 21:17:05.655995250 -070024531 +++ ncurses-5.7/ncurses/tinfo/lib_ttyflags.c 2009-06-05 14:01:51.000000000 -0700 19886 24532 @@ -1,5 +1,5 @@ 19887 24533 /**************************************************************************** … … 19891 24537 * Permission is hereby granted, free of charge, to any person obtaining a * 19892 24538 * copy of this software and associated documentation files (the * 19893 @@ -38, 7 +38,7@@24539 @@ -38,10 +38,14 @@ 19894 24540 #include <curses.priv.h> 19895 24541 #include <term.h> /* cur_term */ 19896 24542 19897 24543 -MODULE_ID("$Id: lib_ttyflags.c,v 1.18 2008/08/03 22:10:44 tom Exp $") 19898 +MODULE_ID("$Id: lib_ttyflags.c,v 1.19 2009/02/15 00:33:49 tom Exp $") 24544 +#ifndef CUR 24545 +#define CUR SP_TERMTYPE 24546 +#endif 24547 + 24548 +MODULE_ID("$Id: lib_ttyflags.c,v 1.24 2009/05/10 00:48:29 tom Exp $") 19899 24549 19900 24550 NCURSES_EXPORT(int) 19901 _nc_get_tty_mode(TTY * buf) 19902 @@ -101,7 +101,7 @@ 24551 -_nc_get_tty_mode(TTY * buf) 24552 +NCURSES_SP_NAME(_nc_get_tty_mode) (NCURSES_SP_DCLx TTY * buf) 24553 { 24554 int result = OK; 24555 24556 @@ -71,8 +75,16 @@ 24557 return (result); 19903 24558 } 19904 24559 24560 +#if NCURSES_SP_FUNCS 24561 NCURSES_EXPORT(int) 24562 -_nc_set_tty_mode(TTY * buf) 24563 +_nc_get_tty_mode(TTY * buf) 24564 +{ 24565 + return NCURSES_SP_NAME(_nc_get_tty_mode) (CURRENT_SCREEN, buf); 24566 +} 24567 +#endif 24568 + 24569 +NCURSES_EXPORT(int) 24570 +NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_DCLx TTY * buf) 24571 { 24572 int result = OK; 24573 24574 @@ -86,8 +98,8 @@ 24575 if (SET_TTY(cur_term->Filedes, buf) != 0) { 24576 if (errno == EINTR) 24577 continue; 24578 - if ((errno == ENOTTY) && (SP != 0)) 24579 - SP->_notty = TRUE; 24580 + if ((errno == ENOTTY) && (SP_PARM != 0)) 24581 + SP_PARM->_notty = TRUE; 24582 result = ERR; 24583 } 24584 break; 24585 @@ -100,8 +112,16 @@ 24586 return (result); 24587 } 24588 24589 +#if NCURSES_SP_FUNCS 19905 24590 NCURSES_EXPORT(int) 19906 24591 -def_shell_mode(void) 24592 +_nc_set_tty_mode(TTY * buf) 24593 +{ 24594 + return NCURSES_SP_NAME(_nc_set_tty_mode) (CURRENT_SCREEN, buf); 24595 +} 24596 +#endif 24597 + 24598 +NCURSES_EXPORT(int) 19907 24599 +NCURSES_SP_NAME(def_shell_mode) (NCURSES_SP_DCL0) 19908 24600 { 19909 24601 int rc = ERR; 19910 24602 19911 @@ -125,8 +1 25,16 @@24603 @@ -125,8 +145,16 @@ 19912 24604 returnCode(rc); 19913 24605 } … … 19927 24619 int rc = ERR; 19928 24620 19929 @@ -148,1 6 +156,24@@24621 @@ -148,17 +176,25 @@ 19930 24622 returnCode(rc); 19931 24623 } … … 19950 24642 - if (SP->_keypad_on) 19951 24643 - _nc_keypad(SP, TRUE); 24644 - NC_BUFFERED(TRUE); 19952 24645 + if (SP_PARM) { 19953 24646 + if (SP_PARM->_keypad_on) 19954 24647 + _nc_keypad(SP_PARM, TRUE); 19955 NC_BUFFERED(TRUE);24648 + NC_BUFFERED(SP_PARM, TRUE); 19956 24649 } 19957 24650 returnCode(OK); 19958 @@ -166,14 +182,22 @@ 24651 } 24652 @@ -166,22 +202,38 @@ 19959 24653 returnCode(ERR); 19960 24654 } … … 19980 24674 + _nc_keypad(SP_PARM, FALSE); 19981 24675 _nc_flush(); 19982 NC_BUFFERED(FALSE); 24676 - NC_BUFFERED(FALSE); 24677 + NC_BUFFERED(SP_PARM, FALSE); 19983 24678 } 19984 @@ -182,6 +206,14 @@ 24679 returnCode(_nc_set_tty_mode(&cur_term->Ottyb)); 24680 } 19985 24681 returnCode(ERR); 19986 24682 } … … 19999 24695 diff -Naur ncurses-5.7.orig/ncurses/tinfo/make_keys.c ncurses-5.7/ncurses/tinfo/make_keys.c 20000 24696 --- ncurses-5.7.orig/ncurses/tinfo/make_keys.c 2008-08-03 14:57:22.000000000 -0700 20001 +++ ncurses-5.7/ncurses/tinfo/make_keys.c 2009-0 3-22 21:17:07.020082134-070024697 +++ ncurses-5.7/ncurses/tinfo/make_keys.c 2009-06-05 14:01:16.000000000 -0700 20002 24698 @@ -39,16 +39,16 @@ 20003 24699 #define USE_TERMLIB 1 … … 20044 24740 diff -Naur ncurses-5.7.orig/ncurses/tinfo/MKcodes.awk ncurses-5.7/ncurses/tinfo/MKcodes.awk 20045 24741 --- ncurses-5.7.orig/ncurses/tinfo/MKcodes.awk 2008-06-28 16:13:25.000000000 -0700 20046 +++ ncurses-5.7/ncurses/tinfo/MKcodes.awk 2009-0 3-22 21:17:11.636377985-070024742 +++ ncurses-5.7/ncurses/tinfo/MKcodes.awk 2009-06-05 14:01:54.000000000 -0700 20047 24743 @@ -1,5 +1,5 @@ 20048 24744 ############################################################################## … … 20057 24753 ############################################################################## 20058 24754 -# $Id: MKcodes.awk,v 1.5 2008/06/28 23:13:25 tom Exp $ 20059 +# $Id: MKcodes.awk,v 1. 6 2009/03/21 21:03:39tom Exp $24755 +# $Id: MKcodes.awk,v 1.8 2009/05/23 19:09:54 tom Exp $ 20060 24756 function large_item(value) { 20061 24757 result = sprintf("%d,", offset); 20062 24758 offset = offset + length(value) + 1; 20063 @@ -124,7 +124,7 @@ 24759 @@ -117,28 +117,39 @@ 24760 print " if ((*value = typeCalloc(NCURSES_CONST char *, size + 1)) != 0) {" 24761 print " unsigned n;" 24762 print " for (n = 0; n < size; ++n) {" 24763 - print " (*value)[n] = _nc_code_blob + offsets[n];" 24764 + print " (*value)[n] = (NCURSES_CONST char *) _nc_code_blob + offsets[n];" 24765 print " }" 24766 print " }" 24767 print " }" 20064 24768 print " return *value;" 20065 24769 print "}" … … 20070 24774 print "#define DCL(it) static IT data##it[]" 20071 24775 print "" 20072 @@ -134,11 +134,22 @@ 20073 print "#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API _nc_##it(void) { return data##it; }" 24776 print_strings("boolcodes", small_boolcodes); 24777 print_strings("numcodes", small_numcodes); 24778 print_strings("strcodes", small_strcodes); 24779 - print "#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API _nc_##it(void) { return data##it; }" 24780 + print "#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API NCURSES_PUBLIC_VAR(it)(void) { return data##it; }" 20074 24781 } 20075 24782 print "" … … 20093 24800 print "#if NO_LEAKS" 20094 24801 print "NCURSES_EXPORT(void)" 24802 diff -Naur ncurses-5.7.orig/ncurses/tinfo/MKfallback.sh ncurses-5.7/ncurses/tinfo/MKfallback.sh 24803 --- ncurses-5.7.orig/ncurses/tinfo/MKfallback.sh 2006-07-15 09:54:20.000000000 -0700 24804 +++ ncurses-5.7/ncurses/tinfo/MKfallback.sh 2009-06-05 14:01:44.000000000 -0700 24805 @@ -1,6 +1,6 @@ 24806 #!/bin/sh 24807 ############################################################################## 24808 -# Copyright (c) 1998-2001,2006 Free Software Foundation, Inc. # 24809 +# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. # 24810 # # 24811 # Permission is hereby granted, free of charge, to any person obtaining a # 24812 # copy of this software and associated documentation files (the "Software"), # 24813 @@ -26,7 +26,7 @@ 24814 # use or other dealings in this Software without prior written # 24815 # authorization. # 24816 ############################################################################## 24817 -# $Id: MKfallback.sh,v 1.13 2006/07/15 16:54:20 tom Exp $ 24818 +# $Id: MKfallback.sh,v 1.14 2009/04/18 21:01:38 tom Exp $ 24819 # 24820 # MKfallback.sh -- create fallback table for entry reads 24821 # 24822 @@ -63,7 +63,6 @@ 24823 */ 24824 24825 #include <curses.priv.h> 24826 -#include <term.h> 24827 24828 EOF 24829 20095 24830 diff -Naur ncurses-5.7.orig/ncurses/tinfo/MKnames.awk ncurses-5.7/ncurses/tinfo/MKnames.awk 20096 24831 --- ncurses-5.7.orig/ncurses/tinfo/MKnames.awk 2008-10-11 14:07:56.000000000 -0700 20097 +++ ncurses-5.7/ncurses/tinfo/MKnames.awk 2009-0 3-22 21:17:11.636377985-070024832 +++ ncurses-5.7/ncurses/tinfo/MKnames.awk 2009-06-05 14:01:24.000000000 -0700 20098 24833 @@ -1,5 +1,5 @@ 20099 24834 ############################################################################## … … 20166 24901 diff -Naur ncurses-5.7.orig/ncurses/tinfo/name_match.c ncurses-5.7/ncurses/tinfo/name_match.c 20167 24902 --- ncurses-5.7.orig/ncurses/tinfo/name_match.c 2008-08-03 12:49:33.000000000 -0700 20168 +++ ncurses-5.7/ncurses/tinfo/name_match.c 2009-0 3-22 21:17:07.020082134-070024903 +++ ncurses-5.7/ncurses/tinfo/name_match.c 2009-06-05 14:01:16.000000000 -0700 20169 24904 @@ -31,10 +31,9 @@ 20170 24905 ****************************************************************************/ … … 20179 24914 /* 20180 24915 * _nc_first_name(char *names) 24916 diff -Naur ncurses-5.7.orig/ncurses/tinfo/parse_entry.c ncurses-5.7/ncurses/tinfo/parse_entry.c 24917 --- ncurses-5.7.orig/ncurses/tinfo/parse_entry.c 2008-08-16 14:52:03.000000000 -0700 24918 +++ ncurses-5.7/ncurses/tinfo/parse_entry.c 2009-06-05 14:01:44.000000000 -0700 24919 @@ -1,5 +1,5 @@ 24920 /**************************************************************************** 24921 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 24922 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 24923 * * 24924 * Permission is hereby granted, free of charge, to any person obtaining a * 24925 * copy of this software and associated documentation files (the * 24926 @@ -48,7 +48,7 @@ 24927 #include <tic.h> 24928 #include <term_entry.h> 24929 24930 -MODULE_ID("$Id: parse_entry.c,v 1.69 2008/08/16 21:52:03 tom Exp $") 24931 +MODULE_ID("$Id: parse_entry.c,v 1.70 2009/04/18 21:01:38 tom Exp $") 24932 24933 #ifdef LINT 24934 static short const parametrized[] = 24935 @@ -84,13 +84,13 @@ 24936 case NUMBER: 24937 first = tp->ext_Booleans; 24938 last = tp->ext_Numbers + first; 24939 - offset = tp->ext_Booleans + tp->ext_Numbers; 24940 + offset = (unsigned) (tp->ext_Booleans + tp->ext_Numbers); 24941 tindex = tp->num_Numbers; 24942 break; 24943 case STRING: 24944 - first = tp->ext_Booleans + tp->ext_Numbers; 24945 + first = (unsigned) (tp->ext_Booleans + tp->ext_Numbers); 24946 last = tp->ext_Strings + first; 24947 - offset = tp->ext_Booleans + tp->ext_Numbers + tp->ext_Strings; 24948 + offset = (unsigned) (tp->ext_Booleans + tp->ext_Numbers + tp->ext_Strings); 24949 tindex = tp->num_Strings; 24950 break; 24951 case CANCEL: 24952 @@ -137,27 +137,31 @@ 24953 break; 24954 } 24955 } 24956 + 24957 +#define for_each_value(max) \ 24958 + for (last = (unsigned) (max - 1); last > tindex; last--) 24959 + 24960 if (!found) { 24961 switch (token_type) { 24962 case BOOLEAN: 24963 - tp->ext_Booleans += 1; 24964 - tp->num_Booleans += 1; 24965 + tp->ext_Booleans++; 24966 + tp->num_Booleans++; 24967 tp->Booleans = typeRealloc(NCURSES_SBOOL, tp->num_Booleans, tp->Booleans); 24968 - for (last = tp->num_Booleans - 1; last > tindex; last--) 24969 + for_each_value(tp->num_Booleans) 24970 tp->Booleans[last] = tp->Booleans[last - 1]; 24971 break; 24972 case NUMBER: 24973 - tp->ext_Numbers += 1; 24974 - tp->num_Numbers += 1; 24975 + tp->ext_Numbers++; 24976 + tp->num_Numbers++; 24977 tp->Numbers = typeRealloc(short, tp->num_Numbers, tp->Numbers); 24978 - for (last = tp->num_Numbers - 1; last > tindex; last--) 24979 + for_each_value(tp->num_Numbers) 24980 tp->Numbers[last] = tp->Numbers[last - 1]; 24981 break; 24982 case STRING: 24983 - tp->ext_Strings += 1; 24984 - tp->num_Strings += 1; 24985 + tp->ext_Strings++; 24986 + tp->num_Strings++; 24987 tp->Strings = typeRealloc(char *, tp->num_Strings, tp->Strings); 24988 - for (last = tp->num_Strings - 1; last > tindex; last--) 24989 + for_each_value(tp->num_Strings) 24990 tp->Strings[last] = tp->Strings[last - 1]; 24991 break; 24992 } 24993 @@ -170,7 +174,7 @@ 24994 24995 temp.nte_name = tp->ext_Names[offset]; 24996 temp.nte_type = token_type; 24997 - temp.nte_index = tindex; 24998 + temp.nte_index = (short) tindex; 24999 temp.nte_link = -1; 25000 25001 return &temp; 25002 @@ -444,7 +448,7 @@ 25003 25004 case NUMBER: 25005 entryp->tterm.Numbers[entry_ptr->nte_index] = 25006 - _nc_curr_token.tk_valnumber; 25007 + (short) _nc_curr_token.tk_valnumber; 25008 break; 25009 25010 case STRING: 25011 @@ -788,7 +792,7 @@ 25012 for (base = other_non_function_keys; 25013 (cp = strchr(base, ',')) != 0; 25014 base = cp + 1) { 25015 - size_t len = cp - base; 25016 + size_t len = (unsigned) (cp - base); 25017 25018 for (ap = ko_xlate; ap->from; ap++) { 25019 if (len == strlen(ap->from) 25020 diff -Naur ncurses-5.7.orig/ncurses/tinfo/setbuf.c ncurses-5.7/ncurses/tinfo/setbuf.c 25021 --- ncurses-5.7.orig/ncurses/tinfo/setbuf.c 2007-05-12 12:04:02.000000000 -0700 25022 +++ ncurses-5.7/ncurses/tinfo/setbuf.c 2009-06-05 14:01:51.000000000 -0700 25023 @@ -1,5 +1,5 @@ 25024 /**************************************************************************** 25025 - * Copyright (c) 1998-2003,2007 Free Software Foundation, Inc. * 25026 + * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. * 25027 * * 25028 * Permission is hereby granted, free of charge, to any person obtaining a * 25029 * copy of this software and associated documentation files (the * 25030 @@ -29,6 +29,8 @@ 25031 /**************************************************************************** 25032 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 25033 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 25034 + * and: Thomas E. Dickey 1996-on * 25035 + * and: Juergen Pfeifer 2008 * 25036 ****************************************************************************/ 25037 25038 /* 25039 @@ -40,7 +42,7 @@ 25040 25041 #include <curses.priv.h> 25042 25043 -MODULE_ID("$Id: setbuf.c,v 1.13 2007/05/12 19:04:02 tom Exp $") 25044 +MODULE_ID("$Id: setbuf.c,v 1.14 2009/05/09 23:09:00 tom Exp $") 25045 25046 /* 25047 * If the output file descriptor is connected to a tty (the typical case) it 25048 @@ -98,11 +100,11 @@ 25049 * buffer. So we disable this by default (there may yet be a workaround). 25050 */ 25051 NCURSES_EXPORT(void) 25052 -_nc_set_buffer(FILE *ofp, bool buffered) 25053 +NCURSES_SP_NAME(_nc_set_buffer) (NCURSES_SP_DCLx FILE *ofp, bool buffered) 25054 { 25055 /* optional optimization hack -- do before any output to ofp */ 25056 #if HAVE_SETVBUF || HAVE_SETBUFFER 25057 - if (SP->_buffered != buffered) { 25058 + if (SP_PARM->_buffered != buffered) { 25059 unsigned buf_len; 25060 char *buf_ptr; 25061 25062 @@ -115,10 +117,10 @@ 25063 #endif 25064 if (buffered != 0) { 25065 buf_len = min(LINES * (COLS + 6), 2800); 25066 - if ((buf_ptr = SP->_setbuf) == 0) { 25067 + if ((buf_ptr = SP_PARM->_setbuf) == 0) { 25068 if ((buf_ptr = typeMalloc(char, buf_len)) == NULL) 25069 return; 25070 - SP->_setbuf = buf_ptr; 25071 + SP_PARM->_setbuf = buf_ptr; 25072 /* Don't try to free this! */ 25073 } 25074 #if !USE_SETBUF_0 25075 @@ -144,7 +146,15 @@ 25076 (void) setbuffer(ofp, buf_ptr, (int) buf_len); 25077 #endif 25078 25079 - SP->_buffered = buffered; 25080 + SP_PARM->_buffered = buffered; 25081 } 25082 #endif /* HAVE_SETVBUF || HAVE_SETBUFFER */ 25083 } 25084 + 25085 +#if NCURSES_SP_FUNCS 25086 +NCURSES_EXPORT(void) 25087 +_nc_set_buffer(FILE *ofp, bool buffered) 25088 +{ 25089 + return NCURSES_SP_NAME(_nc_set_buffer) (CURRENT_SCREEN, ofp, buffered); 25090 +} 25091 +#endif 20181 25092 diff -Naur ncurses-5.7.orig/ncurses/tinfo/use_screen.c ncurses-5.7/ncurses/tinfo/use_screen.c 20182 25093 --- ncurses-5.7.orig/ncurses/tinfo/use_screen.c 2008-06-07 12:16:56.000000000 -0700 20183 +++ ncurses-5.7/ncurses/tinfo/use_screen.c 2009-0 3-22 21:17:07.020082134-070025094 +++ ncurses-5.7/ncurses/tinfo/use_screen.c 2009-06-05 14:01:16.000000000 -0700 20184 25095 @@ -32,7 +32,7 @@ 20185 25096 … … 20200 25111 20201 25112 code = func(screen, data); 25113 diff -Naur ncurses-5.7.orig/ncurses/tinfo/write_entry.c ncurses-5.7/ncurses/tinfo/write_entry.c 25114 --- ncurses-5.7.orig/ncurses/tinfo/write_entry.c 2008-08-03 12:24:00.000000000 -0700 25115 +++ ncurses-5.7/ncurses/tinfo/write_entry.c 2009-06-05 14:01:44.000000000 -0700 25116 @@ -1,5 +1,5 @@ 25117 /**************************************************************************** 25118 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 25119 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 25120 * * 25121 * Permission is hereby granted, free of charge, to any person obtaining a * 25122 * copy of this software and associated documentation files (the * 25123 @@ -54,7 +54,7 @@ 25124 #define TRACE_OUT(p) /*nothing */ 25125 #endif 25126 25127 -MODULE_ID("$Id: write_entry.c,v 1.72 2008/08/03 19:24:00 tom Exp $") 25128 +MODULE_ID("$Id: write_entry.c,v 1.73 2009/04/18 21:01:38 tom Exp $") 25129 25130 static int total_written; 25131 25132 @@ -171,7 +171,11 @@ 25133 struct stat statbuf; 25134 25135 if ((rc = stat(path, &statbuf)) < 0) { 25136 - rc = mkdir(path, 0777); 25137 + rc = mkdir(path 25138 +#if !defined(__MINGW32__) 25139 + ,0777 25140 +#endif 25141 + ); 25142 } else if (_nc_access(path, R_OK | W_OK | X_OK) < 0) { 25143 rc = -1; /* permission denied */ 25144 } else if (!(S_ISDIR(statbuf.st_mode))) { 25145 @@ -338,6 +342,7 @@ 25146 25147 while (*other_names != '\0') { 25148 ptr = other_names++; 25149 + assert(ptr < buffer + sizeof(buffer) - 1); 25150 while (*other_names != '|' && *other_names != '\0') 25151 other_names++; 25152 25153 @@ -385,7 +390,6 @@ 25154 } 25155 while (*other_names != '\0') { 25156 ptr = other_names++; 25157 - assert(ptr < buffer + sizeof(buffer) - 1); 25158 while (*other_names != '|' && *other_names != '\0') 25159 other_names++; 25160 25161 @@ -468,18 +472,18 @@ 25162 unsigned want, 25163 unsigned size) 25164 { 25165 - int have = (limit - *offset); 25166 + unsigned have = (limit - *offset); 25167 25168 want *= size; 25169 if (have > 0) { 25170 - if ((int) want > have) 25171 + if (want > have) 25172 want = have; 25173 memcpy(dst + *offset, src, want); 25174 *offset += want; 25175 } else { 25176 want = 0; 25177 } 25178 - return (int) (want / size); 25179 + return (want / size); 25180 } 25181 25182 #define Write(buf, size, count) fake_write(buffer, offset, limit, (char *) buf, count, size) 25183 @@ -487,14 +491,15 @@ 25184 #undef LITTLE_ENDIAN /* BSD/OS defines this as a feature macro */ 25185 #define HI(x) ((x) / 256) 25186 #define LO(x) ((x) % 256) 25187 -#define LITTLE_ENDIAN(p, x) (p)[0] = LO(x), (p)[1] = HI(x) 25188 +#define LITTLE_ENDIAN(p, x) (p)[0] = (unsigned char)LO(x), \ 25189 + (p)[1] = (unsigned char)HI(x) 25190 25191 #define WRITE_STRING(str) (Write(str, sizeof(char), strlen(str) + 1) == strlen(str) + 1) 25192 25193 static int 25194 compute_offsets(char **Strings, unsigned strmax, short *offsets) 25195 { 25196 - size_t nextfree = 0; 25197 + int nextfree = 0; 25198 unsigned i; 25199 25200 for (i = 0; i < strmax; i++) { 25201 @@ -503,8 +508,8 @@ 25202 } else if (Strings[i] == CANCELLED_STRING) { 25203 offsets[i] = -2; 25204 } else { 25205 - offsets[i] = nextfree; 25206 - nextfree += strlen(Strings[i]) + 1; 25207 + offsets[i] = (short) nextfree; 25208 + nextfree += (int) strlen(Strings[i]) + 1; 25209 TRACE_OUT(("put Strings[%d]=%s(%d)", (int) i, 25210 _nc_visbuf(Strings[i]), (int) nextfree)); 25211 } 25212 @@ -536,8 +541,8 @@ 25213 static unsigned 25214 extended_Booleans(TERMTYPE *tp) 25215 { 25216 - unsigned short result = 0; 25217 - unsigned short i; 25218 + unsigned result = 0; 25219 + unsigned i; 25220 25221 for (i = 0; i < tp->ext_Booleans; ++i) { 25222 if (tp->Booleans[BOOLCOUNT + i] == TRUE) 25223 @@ -549,8 +554,8 @@ 25224 static unsigned 25225 extended_Numbers(TERMTYPE *tp) 25226 { 25227 - unsigned short result = 0; 25228 - unsigned short i; 25229 + unsigned result = 0; 25230 + unsigned i; 25231 25232 for (i = 0; i < tp->ext_Numbers; ++i) { 25233 if (tp->Numbers[NUMCOUNT + i] != ABSENT_NUMERIC) 25234 @@ -597,7 +602,7 @@ 25235 size_t namelen, boolmax, nummax, strmax; 25236 char zero = '\0'; 25237 size_t i; 25238 - short nextfree; 25239 + int nextfree; 25240 short offsets[MAX_ENTRY_SIZE / 2]; 25241 unsigned char buf[MAX_ENTRY_SIZE]; 25242 unsigned last_bool = BOOLWRITE; 25243 @@ -690,7 +695,7 @@ 25244 25245 #if NCURSES_XNAMES 25246 if (extended_object(tp)) { 25247 - unsigned extcnt = NUM_EXT_NAMES(tp); 25248 + unsigned extcnt = (unsigned) NUM_EXT_NAMES(tp); 25249 25250 if (even_boundary(nextfree)) 25251 return (ERR); 20202 25252 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_traceatr.c ncurses-5.7/ncurses/trace/lib_traceatr.c 20203 25253 --- ncurses-5.7.orig/ncurses/trace/lib_traceatr.c 2008-08-03 09:24:53.000000000 -0700 20204 +++ ncurses-5.7/ncurses/trace/lib_traceatr.c 2009-0 3-22 21:17:08.400170414-070025254 +++ ncurses-5.7/ncurses/trace/lib_traceatr.c 2009-06-05 14:01:51.000000000 -0700 20205 25255 @@ -1,5 +1,5 @@ 20206 25256 /**************************************************************************** … … 20218 25268 20219 25269 /* 20220 @@ -39,7 +40,7 @@ 25270 @@ -37,9 +38,12 @@ 25271 */ 25272 20221 25273 #include <curses.priv.h> 20222 25274 -#include <term.h> /* acs_chars */ 20223 25275 20224 25276 -MODULE_ID("$Id: lib_traceatr.c,v 1.63 2008/08/03 16:24:53 tom Exp $") 20225 +MODULE_ID("$Id: lib_traceatr.c,v 1.64 2009/02/28 21:10:20 tom Exp $") 25277 +#ifndef CUR 25278 +#define CUR SP_TERMTYPE 25279 +#endif 25280 + 25281 +MODULE_ID("$Id: lib_traceatr.c,v 1.66 2009/05/10 00:48:29 tom Exp $") 20226 25282 20227 25283 #define COLOR_OF(c) ((c < 0) ? "default" : (c > 7 ? color_of(c) : colors[c].name)) 20228 25284 20229 @@ -228,7 +229,7 @@ 25285 @@ -186,6 +190,9 @@ 25286 unsigned int val; 25287 const char *name; 25288 } ALT_NAMES; 25289 +#if NCURSES_SP_FUNCS 25290 + SCREEN *sp = CURRENT_SCREEN; 25291 +#endif 25292 static const ALT_NAMES names[] = 25293 { 25294 {'l', "ACS_ULCORNER"}, /* upper left corner */ 25295 @@ -228,7 +235,7 @@ 20230 25296 if ((attr & A_ALTCHARSET) && (acs_chars != 0)) { 20231 25297 char *cp; … … 20236 25302 for (cp = acs_chars; cp[0] && cp[1]; cp += 2) { 20237 25303 if (ChCharOf(cp[1]) == ChCharOf(ch)) { 20238 @@ -239,9 +24 0,9 @@25304 @@ -239,9 +246,9 @@ 20239 25305 20240 25306 if (found != 0) { … … 20249 25315 } 20250 25316 } 20251 @@ -260,7 +26 1,8@@25317 @@ -260,7 +267,9 @@ 20252 25318 if ((found = _nc_altcharset_name(ChAttrOf(ch), ch)) != 0) { 20253 25319 (void) _nc_trace_bufcat(bufnum, found); 20254 25320 } else 20255 25321 - (void) _nc_trace_bufcat(bufnum, _nc_tracechar(SP, (int) ChCharOf(ch))); 20256 + (void) _nc_trace_bufcat(bufnum, _nc_tracechar(CURRENT_SCREEN, 20257 + (int) ChCharOf(ch))); 25322 + (void) _nc_trace_bufcat(bufnum, 25323 + _nc_tracechar(CURRENT_SCREEN, 25324 + (int) ChCharOf(ch))); 20258 25325 20259 25326 if (ChAttrOf(ch) != A_NORMAL) { 20260 25327 (void) _nc_trace_bufcat(bufnum, " | "); 20261 @@ -320,7 +32 2,7 @@25328 @@ -320,7 +329,7 @@ 20262 25329 if (PUTC_ch != L'\0') { 20263 25330 /* it could not be a multibyte sequence */ … … 20268 25335 } 20269 25336 break; 20270 @@ -329,7 +33 1,7 @@25337 @@ -329,7 +338,7 @@ 20271 25338 if (n) 20272 25339 (void) _nc_trace_bufcat(bufnum, ", "); … … 20279 25346 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_tracebits.c ncurses-5.7/ncurses/trace/lib_tracebits.c 20280 25347 --- ncurses-5.7.orig/ncurses/trace/lib_tracebits.c 2008-08-03 09:09:26.000000000 -0700 20281 +++ ncurses-5.7/ncurses/trace/lib_tracebits.c 2009-0 3-22 21:17:07.020082134-070025348 +++ ncurses-5.7/ncurses/trace/lib_tracebits.c 2009-06-05 14:01:16.000000000 -0700 20282 25349 @@ -33,9 +33,8 @@ 20283 25350 ****************************************************************************/ … … 20293 25360 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_trace.c ncurses-5.7/ncurses/trace/lib_trace.c 20294 25361 --- ncurses-5.7.orig/ncurses/trace/lib_trace.c 2008-08-23 11:04:29.000000000 -0700 20295 +++ ncurses-5.7/ncurses/trace/lib_trace.c 2009-0 3-22 21:17:08.400170414-070025362 +++ ncurses-5.7/ncurses/trace/lib_trace.c 2009-06-05 14:01:18.000000000 -0700 20296 25363 @@ -1,5 +1,5 @@ 20297 25364 /**************************************************************************** … … 20351 25418 _nc_prescreen._outchars += increment; 20352 25419 } 25420 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_tracechr.c ncurses-5.7/ncurses/trace/lib_tracechr.c 25421 --- ncurses-5.7.orig/ncurses/trace/lib_tracechr.c 2008-08-03 08:39:29.000000000 -0700 25422 +++ ncurses-5.7/ncurses/trace/lib_tracechr.c 2009-06-05 14:01:44.000000000 -0700 25423 @@ -1,5 +1,5 @@ 25424 /**************************************************************************** 25425 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 25426 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 25427 * * 25428 * Permission is hereby granted, free of charge, to any person obtaining a * 25429 * copy of this software and associated documentation files (the * 25430 @@ -39,7 +39,7 @@ 25431 25432 #include <ctype.h> 25433 25434 -MODULE_ID("$Id: lib_tracechr.c,v 1.19 2008/08/03 15:39:29 tom Exp $") 25435 +MODULE_ID("$Id: lib_tracechr.c,v 1.20 2009/04/18 22:48:29 tom Exp $") 25436 25437 #ifdef TRACE 25438 25439 @@ -52,7 +52,7 @@ 25440 : _nc_globals.tracechr_buf); 25441 25442 if (ch > KEY_MIN || ch < 0) { 25443 - name = _nc_keyname(sp, ch); 25444 + name = safe_keyname(SP_PARM, ch); 25445 if (name == 0 || *name == '\0') 25446 name = "NULL"; 25447 (void) sprintf(MyBuffer, "'%.30s' = %#03o", name, ch); 25448 @@ -64,7 +64,7 @@ 25449 */ 25450 (void) sprintf(MyBuffer, "%#03o", ch); 25451 } else { 25452 - name = _nc_unctrl(sp, (chtype) ch); 25453 + name = safe_unctrl(SP_PARM, (chtype) ch); 25454 if (name == 0 || *name == 0) 25455 name = "null"; /* shouldn't happen */ 25456 (void) sprintf(MyBuffer, "'%.30s' = %#03o", name, ch); 25457 @@ -75,7 +75,7 @@ 25458 NCURSES_EXPORT(char *) 25459 _tracechar(int ch) 25460 { 25461 - return _nc_tracechar(SP, ch); 25462 + return _nc_tracechar(CURRENT_SCREEN, ch); 25463 } 25464 #else 25465 EMPTY_MODULE(_nc_lib_tracechr) 25466 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_tracedmp.c ncurses-5.7/ncurses/trace/lib_tracedmp.c 25467 --- ncurses-5.7.orig/ncurses/trace/lib_tracedmp.c 2008-08-16 12:30:56.000000000 -0700 25468 +++ ncurses-5.7/ncurses/trace/lib_tracedmp.c 2009-06-05 14:01:44.000000000 -0700 25469 @@ -1,5 +1,5 @@ 25470 /**************************************************************************** 25471 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 25472 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 25473 * * 25474 * Permission is hereby granted, free of charge, to any person obtaining a * 25475 * copy of this software and associated documentation files (the * 25476 @@ -39,7 +39,7 @@ 25477 #include <curses.priv.h> 25478 #include <ctype.h> 25479 25480 -MODULE_ID("$Id: lib_tracedmp.c,v 1.31 2008/08/16 19:30:56 tom Exp $") 25481 +MODULE_ID("$Id: lib_tracedmp.c,v 1.32 2009/04/18 21:01:38 tom Exp $") 25482 25483 #ifdef TRACE 25484 25485 @@ -68,7 +68,7 @@ 25486 if (width < win->_maxx) 25487 ++width; 25488 if (++width + 1 > (int) my_length) { 25489 - my_length = 2 * (width + 1); 25490 + my_length = (unsigned) (2 * (width + 1)); 25491 my_buffer = typeRealloc(char, my_length, my_buffer); 25492 } 25493 25494 @@ -82,7 +82,7 @@ 25495 * we map those to '.' and '?' respectively. 25496 */ 25497 for (j = 0; j < width; ++j) { 25498 - chtype test = CharOf(win->_line[n].text[j]); 25499 + chtype test = (chtype) CharOf(win->_line[n].text[j]); 25500 ep[j] = (char) ((UChar(test) == test 25501 #if USE_WIDEC_SUPPORT 25502 && (win->_line[n].text[j].chars[1] == 0) 25503 @@ -111,7 +111,7 @@ 25504 if (multicolumn) { 25505 ep = my_buffer; 25506 for (j = 0; j < width; ++j) { 25507 - int test = WidecExt(win->_line[n].text[j]); 25508 + chtype test = WidecExt(win->_line[n].text[j]); 25509 if (test) { 25510 ep[j] = (char) (test + '0'); 25511 } else { 25512 @@ -153,7 +153,7 @@ 25513 25514 for (i = 0; i < 4; ++i) { 25515 const char *hex = " 123456789ABCDEF"; 25516 - attr_t mask = (0xf << ((i + 4) * 4)); 25517 + attr_t mask = (attr_t) (0xf << ((i + 4) * 4)); 25518 25519 haveattrs = FALSE; 25520 for (j = 0; j < width; ++j) 20353 25521 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_tracemse.c ncurses-5.7/ncurses/trace/lib_tracemse.c 20354 25522 --- ncurses-5.7.orig/ncurses/trace/lib_tracemse.c 2008-08-03 08:39:29.000000000 -0700 20355 +++ ncurses-5.7/ncurses/trace/lib_tracemse.c 2009-0 3-22 21:17:07.020082134-070025523 +++ ncurses-5.7/ncurses/trace/lib_tracemse.c 2009-06-05 14:01:16.000000000 -0700 20356 25524 @@ -38,7 +38,7 @@ 20357 25525 … … 20372 25540 20373 25541 #else /* !TRACE */ 25542 diff -Naur ncurses-5.7.orig/ncurses/trace/trace_tries.c ncurses-5.7/ncurses/trace/trace_tries.c 25543 --- ncurses-5.7.orig/ncurses/trace/trace_tries.c 2008-08-03 08:43:30.000000000 -0700 25544 +++ ncurses-5.7/ncurses/trace/trace_tries.c 2009-06-05 14:01:30.000000000 -0700 25545 @@ -1,5 +1,5 @@ 25546 /**************************************************************************** 25547 - * Copyright (c) 1999-2007,2008 Free Software Foundation, Inc. * 25548 + * Copyright (c) 1999-2008,2009 Free Software Foundation, Inc. * 25549 * * 25550 * Permission is hereby granted, free of charge, to any person obtaining a * 25551 * copy of this software and associated documentation files (the * 25552 @@ -35,7 +35,7 @@ 25553 25554 #include <curses.priv.h> 25555 25556 -MODULE_ID("$Id: trace_tries.c,v 1.13 2008/08/03 15:43:30 tom Exp $") 25557 +MODULE_ID("$Id: trace_tries.c,v 1.14 2009/03/28 20:44:01 tom Exp $") 25558 25559 #ifdef TRACE 25560 #define my_buffer _nc_globals.tracetry_buf 25561 @@ -46,7 +46,7 @@ 25562 { 25563 if (level > my_length) { 25564 my_length = (level + 1) * 4; 25565 - my_buffer = (unsigned char *) realloc(my_buffer, my_length); 25566 + my_buffer = (unsigned char *) _nc_doalloc(my_buffer, my_length); 25567 } 25568 25569 while (tree != 0) { 20374 25570 diff -Naur ncurses-5.7.orig/ncurses/trace/varargs.c ncurses-5.7/ncurses/trace/varargs.c 20375 25571 --- ncurses-5.7.orig/ncurses/trace/varargs.c 2008-08-03 08:42:49.000000000 -0700 20376 +++ ncurses-5.7/ncurses/trace/varargs.c 2009-0 3-22 21:17:07.020082134-070025572 +++ ncurses-5.7/ncurses/trace/varargs.c 2009-06-05 14:01:16.000000000 -0700 20377 25573 @@ -34,7 +34,7 @@ 20378 25574 … … 20393 25589 #define VA_PTR(type) pval = (char *)va_arg(ap, type) 20394 25590 #define VA_STR(type) sval = va_arg(ap, type) 25591 diff -Naur ncurses-5.7.orig/ncurses/tty/hardscroll.c ncurses-5.7/ncurses/tty/hardscroll.c 25592 --- ncurses-5.7.orig/ncurses/tty/hardscroll.c 2008-08-03 16:49:30.000000000 -0700 25593 +++ ncurses-5.7/ncurses/tty/hardscroll.c 2009-06-05 14:01:44.000000000 -0700 25594 @@ -1,5 +1,5 @@ 25595 /**************************************************************************** 25596 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 25597 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 25598 * * 25599 * Permission is hereby granted, free of charge, to any person obtaining a * 25600 * copy of this software and associated documentation files (the * 25601 @@ -147,90 +147,96 @@ 25602 25603 #include <curses.priv.h> 25604 25605 -MODULE_ID("$Id: hardscroll.c,v 1.42 2008/08/03 23:49:30 tom Exp $") 25606 +MODULE_ID("$Id: hardscroll.c,v 1.43 2009/04/18 21:41:30 tom Exp $") 25607 25608 #if defined(SCROLLDEBUG) || defined(HASHDEBUG) 25609 25610 # undef screen_lines 25611 -# define screen_lines MAXLINES 25612 -NCURSES_EXPORT_VAR(int) 25613 -oldnums[MAXLINES]; 25614 -# define OLDNUM(n) oldnums[n] 25615 +# define screen_lines(sp) MAXLINES 25616 +NCURSES_EXPORT_VAR (int) 25617 + oldnums[MAXLINES]; 25618 +# define OLDNUM(sp,n) oldnums[n] 25619 # define _tracef printf 25620 # undef TR 25621 # define TR(n, a) if (_nc_tracing & (n)) { _tracef a ; putchar('\n'); } 25622 25623 -extern NCURSES_EXPORT_VAR(unsigned) _nc_tracing; 25624 +extern NCURSES_EXPORT_VAR(unsigned) _nc_tracing; 25625 25626 #else /* no debug */ 25627 25628 /* OLDNUM(n) indicates which line will be shifted to the position n. 25629 if OLDNUM(n) == _NEWINDEX, then the line n in new, not shifted from 25630 somewhere. */ 25631 -NCURSES_EXPORT_VAR(int *) 25632 -_nc_oldnums = 0; /* obsolete: keep for ABI compat */ 25633 +NCURSES_EXPORT_VAR (int *) 25634 + _nc_oldnums = 0; /* obsolete: keep for ABI compat */ 25635 25636 # if USE_HASHMAP 25637 -# define oldnums SP->_oldnum_list 25638 -# define OLDNUM(n) oldnums[n] 25639 +# define oldnums(sp) (sp)->_oldnum_list 25640 +# define OLDNUM(sp,n) oldnums(sp)[n] 25641 # else /* !USE_HASHMAP */ 25642 -# define OLDNUM(n) newscr->_line[n].oldindex 25643 +# define OLDNUM(sp,n) sp->_newscr->_line[n].oldindex 25644 # endif /* !USE_HASHMAP */ 25645 25646 -#define OLDNUM_SIZE SP->_oldnum_size 25647 +#define OLDNUM_SIZE(sp) (sp)->_oldnum_size 25648 25649 #endif /* defined(SCROLLDEBUG) || defined(HASHDEBUG) */ 25650 25651 NCURSES_EXPORT(void) 25652 -_nc_scroll_optimize(void) 25653 +NCURSES_SP_NAME(_nc_scroll_optimize) (NCURSES_SP_DCL0) 25654 /* scroll optimization to transform curscr to newscr */ 25655 { 25656 int i; 25657 int start, end, shift; 25658 25659 - TR(TRACE_ICALLS, (T_CALLED("_nc_scroll_optimize"))); 25660 + TR(TRACE_ICALLS, (T_CALLED("_nc_scroll_optimize(%p)"), SP_PARM)); 25661 25662 #if !defined(SCROLLDEBUG) && !defined(HASHDEBUG) 25663 #if USE_HASHMAP 25664 /* get enough storage */ 25665 - if (OLDNUM_SIZE < screen_lines) { 25666 - int *new_oldnums = typeRealloc(int, screen_lines, oldnums); 25667 + if (OLDNUM_SIZE(SP_PARM) < screen_lines(SP_PARM)) { 25668 + int *new_oldnums = typeRealloc(int, screen_lines(SP_PARM), oldnums(SP_PARM)); 25669 if (!new_oldnums) 25670 return; 25671 - oldnums = new_oldnums; 25672 - OLDNUM_SIZE = screen_lines; 25673 + oldnums(SP_PARM) = new_oldnums; 25674 + OLDNUM_SIZE(SP_PARM) = screen_lines(SP_PARM); 25675 } 25676 /* calculate the indices */ 25677 - _nc_hash_map(); 25678 + NCURSES_SP_NAME(_nc_hash_map) (NCURSES_SP_ARG); 25679 #endif 25680 #endif /* !defined(SCROLLDEBUG) && !defined(HASHDEBUG) */ 25681 25682 #ifdef TRACE 25683 if (USE_TRACEF(TRACE_UPDATE | TRACE_MOVE)) { 25684 - _nc_linedump(); 25685 + NCURSES_SP_NAME(_nc_linedump) (NCURSES_SP_ARG); 25686 _nc_unlock_global(tracef); 25687 } 25688 #endif /* TRACE */ 25689 25690 /* pass 1 - from top to bottom scrolling up */ 25691 - for (i = 0; i < screen_lines;) { 25692 - while (i < screen_lines && (OLDNUM(i) == _NEWINDEX || OLDNUM(i) <= i)) 25693 + for (i = 0; i < screen_lines(SP_PARM);) { 25694 + while (i < screen_lines(SP_PARM) 25695 + && (OLDNUM(SP_PARM, i) == _NEWINDEX || OLDNUM(SP_PARM, i) <= i)) 25696 i++; 25697 - if (i >= screen_lines) 25698 + if (i >= screen_lines(SP_PARM)) 25699 break; 25700 25701 - shift = OLDNUM(i) - i; /* shift > 0 */ 25702 + shift = OLDNUM(SP_PARM, i) - i; /* shift > 0 */ 25703 start = i; 25704 25705 i++; 25706 - while (i < screen_lines && OLDNUM(i) != _NEWINDEX && OLDNUM(i) - i 25707 - == shift) 25708 + while (i < screen_lines(SP_PARM) 25709 + && OLDNUM(SP_PARM, i) != _NEWINDEX 25710 + && OLDNUM(SP_PARM, i) - i == shift) 25711 i++; 25712 end = i - 1 + shift; 25713 25714 TR(TRACE_UPDATE | TRACE_MOVE, ("scroll [%d, %d] by %d", start, end, shift)); 25715 #if !defined(SCROLLDEBUG) && !defined(HASHDEBUG) 25716 - if (_nc_scrolln(shift, start, end, screen_lines - 1) == ERR) { 25717 + if (NCURSES_SP_NAME(_nc_scrolln) (NCURSES_SP_ARGx 25718 + shift, 25719 + start, 25720 + end, 25721 + screen_lines(SP_PARM) - 1) == ERR) { 25722 TR(TRACE_UPDATE | TRACE_MOVE, ("unable to scroll")); 25723 continue; 25724 } 25725 @@ -238,23 +244,33 @@ 25726 } 25727 25728 /* pass 2 - from bottom to top scrolling down */ 25729 - for (i = screen_lines - 1; i >= 0;) { 25730 - while (i >= 0 && (OLDNUM(i) == _NEWINDEX || OLDNUM(i) >= i)) 25731 + for (i = screen_lines(SP_PARM) - 1; i >= 0;) { 25732 + while (i >= 0 25733 + && (OLDNUM(SP_PARM, i) == _NEWINDEX 25734 + || OLDNUM(SP_PARM, i) >= i)) { 25735 i--; 25736 + } 25737 if (i < 0) 25738 break; 25739 25740 - shift = OLDNUM(i) - i; /* shift < 0 */ 25741 + shift = OLDNUM(SP_PARM, i) - i; /* shift < 0 */ 25742 end = i; 25743 25744 i--; 25745 - while (i >= 0 && OLDNUM(i) != _NEWINDEX && OLDNUM(i) - i == shift) 25746 + while (i >= 0 25747 + && OLDNUM(SP_PARM, i) != _NEWINDEX 25748 + && OLDNUM(SP_PARM, i) - i == shift) { 25749 i--; 25750 + } 25751 start = i + 1 - (-shift); 25752 25753 TR(TRACE_UPDATE | TRACE_MOVE, ("scroll [%d, %d] by %d", start, end, shift)); 25754 #if !defined(SCROLLDEBUG) && !defined(HASHDEBUG) 25755 - if (_nc_scrolln(shift, start, end, screen_lines - 1) == ERR) { 25756 + if (NCURSES_SP_NAME(_nc_scrolln) (NCURSES_SP_ARGx 25757 + shift, 25758 + start, 25759 + end, 25760 + screen_lines(SP_PARM) - 1) == ERR) { 25761 TR(TRACE_UPDATE | TRACE_MOVE, ("unable to scroll")); 25762 continue; 25763 } 25764 @@ -263,24 +279,41 @@ 25765 TR(TRACE_ICALLS, (T_RETURN(""))); 25766 } 25767 25768 +#if NCURSES_SP_FUNCS 25769 +NCURSES_EXPORT(void) 25770 +_nc_scroll_optimize(void) 25771 +{ 25772 + NCURSES_SP_NAME(_nc_scroll_optimize) (CURRENT_SCREEN); 25773 +} 25774 +#endif 25775 + 25776 #if defined(TRACE) || defined(SCROLLDEBUG) || defined(HASHDEBUG) 25777 NCURSES_EXPORT(void) 25778 -_nc_linedump(void) 25779 +NCURSES_SP_NAME(_nc_linedump) (NCURSES_SP_DCL0) 25780 /* dump the state of the real and virtual oldnum fields */ 25781 { 25782 int n; 25783 char *buf = 0; 25784 - size_t want = (screen_lines + 1) * 4; 25785 + size_t want = (screen_lines(SP_PARM) + 1) * 4; 25786 25787 if ((buf = typeMalloc(char, want)) != 0) { 25788 25789 (void) strcpy(buf, "virt"); 25790 - for (n = 0; n < screen_lines; n++) 25791 - (void) sprintf(buf + strlen(buf), " %02d", OLDNUM(n)); 25792 + for (n = 0; n < screen_lines(SP_PARM); n++) 25793 + (void) sprintf(buf + strlen(buf), " %02d", OLDNUM(SP_PARM, n)); 25794 TR(TRACE_UPDATE | TRACE_MOVE, (buf)); 25795 free(buf); 25796 } 25797 } 25798 + 25799 +#if NCURSES_SP_FUNCS 25800 +NCURSES_EXPORT(void) 25801 +_nc_linedump(void) 25802 +{ 25803 + NCURSES_SP_NAME(_nc_linedump) (CURRENT_SCREEN); 25804 +} 25805 +#endif 25806 + 25807 #endif /* defined(TRACE) || defined(SCROLLDEBUG) */ 25808 25809 #ifdef SCROLLDEBUG 25810 diff -Naur ncurses-5.7.orig/ncurses/tty/hashmap.c ncurses-5.7/ncurses/tty/hashmap.c 25811 --- ncurses-5.7.orig/ncurses/tty/hashmap.c 2007-10-13 11:47:25.000000000 -0700 25812 +++ ncurses-5.7/ncurses/tty/hashmap.c 2009-06-05 14:01:51.000000000 -0700 25813 @@ -1,5 +1,5 @@ 25814 /**************************************************************************** 25815 - * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. * 25816 + * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. * 25817 * * 25818 * Permission is hereby granted, free of charge, to any person obtaining a * 25819 * copy of this software and associated documentation files (the * 25820 @@ -68,9 +68,12 @@ 25821 *****************************************************************************/ 25822 25823 #include <curses.priv.h> 25824 -#include <term.h> /* for back_color_erase */ 25825 25826 -MODULE_ID("$Id: hashmap.c,v 1.56 2007/10/13 18:47:25 Miroslav.Lichvar Exp $") 25827 +#ifndef CUR 25828 +#define CUR SP_TERMTYPE 25829 +#endif 25830 + 25831 +MODULE_ID("$Id: hashmap.c,v 1.59 2009/05/10 00:51:57 tom Exp $") 25832 25833 #ifdef HASHDEBUG 25834 25835 @@ -83,25 +86,25 @@ 25836 int oldnums[MAXLINES], reallines[MAXLINES]; 25837 static NCURSES_CH_T oldtext[MAXLINES][TEXTWIDTH]; 25838 static NCURSES_CH_T newtext[MAXLINES][TEXTWIDTH]; 25839 -# define OLDNUM(n) oldnums[n] 25840 -# define OLDTEXT(n) oldtext[n] 25841 -# define NEWTEXT(m) newtext[m] 25842 -# define PENDING(n) 1 25843 +# define OLDNUM(sp,n) oldnums[n] 25844 +# define OLDTEXT(sp,n) oldtext[n] 25845 +# define NEWTEXT(sp,m) newtext[m] 25846 +# define PENDING(sp,n) 1 25847 25848 #else /* !HASHDEBUG */ 25849 25850 -# define OLDNUM(n) SP->_oldnum_list[n] 25851 -# define OLDTEXT(n) curscr->_line[n].text 25852 -# define NEWTEXT(m) newscr->_line[m].text 25853 -# define TEXTWIDTH (curscr->_maxx+1) 25854 -# define PENDING(n) (newscr->_line[n].firstchar != _NOCHANGE) 25855 +# define OLDNUM(sp,n) (sp)->_oldnum_list[n] 25856 +# define OLDTEXT(sp,n) (sp)->_curscr->_line[n].text 25857 +# define NEWTEXT(sp,m) (sp)->_newscr->_line[m].text 25858 +# define TEXTWIDTH(sp) ((sp)->_curscr->_maxx+1) 25859 +# define PENDING(sp,n) ((sp)->_newscr->_line[n].firstchar != _NOCHANGE) 25860 25861 #endif /* !HASHDEBUG */ 25862 25863 -#define oldhash (SP->oldhash) 25864 -#define newhash (SP->newhash) 25865 -#define hashtab (SP->hashtab) 25866 -#define lines_alloc (SP->hashtab_len) 25867 +#define oldhash(sp) ((sp)->oldhash) 25868 +#define newhash(sp) ((sp)->newhash) 25869 +#define hashtab(sp) ((sp)->hashtab) 25870 +#define lines_alloc(sp) ((sp)->hashtab_len) 25871 25872 #if USE_WIDEC_SUPPORT 25873 #define HASH_VAL(ch) (ch.chars[0]) 25874 @@ -112,12 +115,12 @@ 25875 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT); 25876 25877 static NCURSES_INLINE unsigned long 25878 -hash(NCURSES_CH_T * text) 25879 +hash(SCREEN *sp, NCURSES_CH_T * text) 25880 { 25881 int i; 25882 NCURSES_CH_T ch; 25883 unsigned long result = 0; 25884 - for (i = TEXTWIDTH; i > 0; i--) { 25885 + for (i = TEXTWIDTH(sp); i > 0; i--) { 25886 ch = *text++; 25887 result += (result << 5) + HASH_VAL(ch); 25888 } 25889 @@ -126,12 +129,12 @@ 25890 25891 /* approximate update cost */ 25892 static int 25893 -update_cost(NCURSES_CH_T * from, NCURSES_CH_T * to) 25894 +update_cost(SCREEN *sp, NCURSES_CH_T * from, NCURSES_CH_T * to) 25895 { 25896 int cost = 0; 25897 int i; 25898 25899 - for (i = TEXTWIDTH; i > 0; i--, from++, to++) 25900 + for (i = TEXTWIDTH(sp); i > 0; i--, from++, to++) 25901 if (!(CharEq(*from, *to))) 25902 cost++; 25903 25904 @@ -139,7 +142,7 @@ 25905 } 25906 25907 static int 25908 -update_cost_from_blank(NCURSES_CH_T * to) 25909 +update_cost_from_blank(SCREEN *sp, NCURSES_CH_T * to) 25910 { 25911 int cost = 0; 25912 int i; 25913 @@ -148,7 +151,7 @@ 25914 if (back_color_erase) 25915 SetPair(blank, GetPair(stdscr->_nc_bkgd)); 25916 25917 - for (i = TEXTWIDTH; i > 0; i--, to++) 25918 + for (i = TEXTWIDTH(sp); i > 0; i--, to++) 25919 if (!(CharEq(blank, *to))) 25920 cost++; 25921 25922 @@ -160,14 +163,14 @@ 25923 * effective. 'blank' indicates whether the line 'to' would become blank. 25924 */ 25925 static NCURSES_INLINE bool 25926 -cost_effective(const int from, const int to, const bool blank) 25927 +cost_effective(SCREEN *sp, const int from, const int to, const bool blank) 25928 { 25929 int new_from; 25930 25931 if (from == to) 25932 return FALSE; 25933 25934 - new_from = OLDNUM(from); 25935 + new_from = OLDNUM(sp, from); 25936 if (new_from == _NEWINDEX) 25937 new_from = from; 25938 25939 @@ -175,16 +178,17 @@ 25940 * On the left side of >= is the cost before moving; 25941 * on the right side -- cost after moving. 25942 */ 25943 - return (((blank ? update_cost_from_blank(NEWTEXT(to)) 25944 - : update_cost(OLDTEXT(to), NEWTEXT(to))) 25945 - + update_cost(OLDTEXT(new_from), NEWTEXT(from))) 25946 - >= ((new_from == from ? update_cost_from_blank(NEWTEXT(from)) 25947 - : update_cost(OLDTEXT(new_from), NEWTEXT(from))) 25948 - + update_cost(OLDTEXT(from), NEWTEXT(to)))) ? TRUE : FALSE; 25949 + return (((blank ? update_cost_from_blank(sp, NEWTEXT(sp, to)) 25950 + : update_cost(sp, OLDTEXT(sp, to), NEWTEXT(sp, to))) 25951 + + update_cost(sp, OLDTEXT(sp, new_from), NEWTEXT(sp, from))) 25952 + >= ((new_from == from ? update_cost_from_blank(sp, NEWTEXT(sp, from)) 25953 + : update_cost(sp, OLDTEXT(sp, new_from), NEWTEXT(sp, from))) 25954 + + update_cost(sp, OLDTEXT(sp, from), NEWTEXT(sp, to)))) 25955 + ? TRUE : FALSE; 25956 } 25957 25958 static void 25959 -grow_hunks(void) 25960 +grow_hunks(SCREEN *sp) 25961 { 25962 int start, end, shift; 25963 int back_limit, forward_limit; /* limits for cells to fill */ 25964 @@ -200,35 +204,36 @@ 25965 back_ref_limit = 0; 25966 25967 i = 0; 25968 - while (i < screen_lines && OLDNUM(i) == _NEWINDEX) 25969 + while (i < screen_lines(sp) && OLDNUM(sp, i) == _NEWINDEX) 25970 i++; 25971 - for (; i < screen_lines; i = next_hunk) { 25972 + for (; i < screen_lines(sp); i = next_hunk) { 25973 start = i; 25974 - shift = OLDNUM(i) - i; 25975 + shift = OLDNUM(sp, i) - i; 25976 25977 /* get forward limit */ 25978 i = start + 1; 25979 - while (i < screen_lines && OLDNUM(i) != _NEWINDEX && OLDNUM(i) - i 25980 - == shift) 25981 + while (i < screen_lines(sp) 25982 + && OLDNUM(sp, i) != _NEWINDEX 25983 + && OLDNUM(sp, i) - i == shift) 25984 i++; 25985 end = i; 25986 - while (i < screen_lines && OLDNUM(i) == _NEWINDEX) 25987 + while (i < screen_lines(sp) && OLDNUM(sp, i) == _NEWINDEX) 25988 i++; 25989 next_hunk = i; 25990 forward_limit = i; 25991 - if (i >= screen_lines || OLDNUM(i) >= i) 25992 + if (i >= screen_lines(sp) || OLDNUM(sp, i) >= i) 25993 forward_ref_limit = i; 25994 else 25995 - forward_ref_limit = OLDNUM(i); 25996 + forward_ref_limit = OLDNUM(sp, i); 25997 25998 i = start - 1; 25999 /* grow back */ 26000 if (shift < 0) 26001 back_limit = back_ref_limit + (-shift); 26002 while (i >= back_limit) { 26003 - if (newhash[i] == oldhash[i + shift] 26004 - || cost_effective(i + shift, i, shift < 0)) { 26005 - OLDNUM(i) = i + shift; 26006 + if (newhash(sp)[i] == oldhash(sp)[i + shift] 26007 + || cost_effective(sp, i + shift, i, shift < 0)) { 26008 + OLDNUM(sp, i) = i + shift; 26009 TR(TRACE_UPDATE | TRACE_MOVE, 26010 ("connected new line %d to old line %d (backward continuation)", 26011 i, i + shift)); 26012 @@ -246,9 +251,9 @@ 26013 if (shift > 0) 26014 forward_limit = forward_ref_limit - shift; 26015 while (i < forward_limit) { 26016 - if (newhash[i] == oldhash[i + shift] 26017 - || cost_effective(i + shift, i, shift > 0)) { 26018 - OLDNUM(i) = i + shift; 26019 + if (newhash(sp)[i] == oldhash(sp)[i + shift] 26020 + || cost_effective(sp, i + shift, i, shift > 0)) { 26021 + OLDNUM(sp, i) = i + shift; 26022 TR(TRACE_UPDATE | TRACE_MOVE, 26023 ("connected new line %d to old line %d (forward continuation)", 26024 i, i + shift)); 26025 @@ -268,51 +273,53 @@ 26026 } 26027 26028 NCURSES_EXPORT(void) 26029 -_nc_hash_map(void) 26030 +NCURSES_SP_NAME(_nc_hash_map) (NCURSES_SP_DCL0) 26031 { 26032 - HASHMAP *sp; 26033 + HASHMAP *hsp; 26034 register int i; 26035 int start, shift, size; 26036 26037 - if (screen_lines > lines_alloc) { 26038 - if (hashtab) 26039 - free(hashtab); 26040 - hashtab = typeMalloc(HASHMAP, (screen_lines + 1) * 2); 26041 - if (!hashtab) { 26042 - if (oldhash) { 26043 - FreeAndNull(oldhash); 26044 + if (screen_lines(SP_PARM) > lines_alloc(SP_PARM)) { 26045 + if (hashtab(SP_PARM)) 26046 + free(hashtab(SP_PARM)); 26047 + hashtab(SP_PARM) = typeMalloc(HASHMAP, (screen_lines(SP_PARM) + 1) * 2); 26048 + if (!hashtab(SP_PARM)) { 26049 + if (oldhash(SP_PARM)) { 26050 + FreeAndNull(oldhash(SP_PARM)); 26051 } 26052 - lines_alloc = 0; 26053 + lines_alloc(SP_PARM) = 0; 26054 return; 26055 } 26056 - lines_alloc = screen_lines; 26057 + lines_alloc(SP_PARM) = screen_lines(SP_PARM); 26058 } 26059 26060 - if (oldhash && newhash) { 26061 + if (oldhash(SP_PARM) && newhash(SP_PARM)) { 26062 /* re-hash only changed lines */ 26063 - for (i = 0; i < screen_lines; i++) { 26064 - if (PENDING(i)) 26065 - newhash[i] = hash(NEWTEXT(i)); 26066 + for (i = 0; i < screen_lines(SP_PARM); i++) { 26067 + if (PENDING(SP_PARM, i)) 26068 + newhash(SP_PARM)[i] = hash(SP_PARM, NEWTEXT(SP_PARM, i)); 26069 } 26070 } else { 26071 /* re-hash all */ 26072 - if (oldhash == 0) 26073 - oldhash = typeCalloc(unsigned long, (unsigned) screen_lines); 26074 - if (newhash == 0) 26075 - newhash = typeCalloc(unsigned long, (unsigned) screen_lines); 26076 - if (!oldhash || !newhash) 26077 + if (oldhash(SP_PARM) == 0) 26078 + oldhash(SP_PARM) = typeCalloc(unsigned long, 26079 + (unsigned) screen_lines(SP_PARM)); 26080 + if (newhash(SP_PARM) == 0) 26081 + newhash(SP_PARM) = typeCalloc(unsigned long, 26082 + (unsigned) screen_lines(SP_PARM)); 26083 + if (!oldhash(SP_PARM) || !newhash(SP_PARM)) 26084 return; /* malloc failure */ 26085 - for (i = 0; i < screen_lines; i++) { 26086 - newhash[i] = hash(NEWTEXT(i)); 26087 - oldhash[i] = hash(OLDTEXT(i)); 26088 + for (i = 0; i < screen_lines(SP_PARM); i++) { 26089 + newhash(SP_PARM)[i] = hash(SP_PARM, NEWTEXT(SP_PARM, i)); 26090 + oldhash(SP_PARM)[i] = hash(SP_PARM, OLDTEXT(SP_PARM, i)); 26091 } 26092 } 26093 26094 #ifdef HASH_VERIFY 26095 - for (i = 0; i < screen_lines; i++) { 26096 - if (newhash[i] != hash(NEWTEXT(i))) 26097 + for (i = 0; i < screen_lines(SP_PARM); i++) { 26098 + if (newhash(SP_PARM)[i] != hash(SP_PARM, NEWTEXT(SP_PARM, i))) 26099 fprintf(stderr, "error in newhash[%d]\n", i); 26100 - if (oldhash[i] != hash(OLDTEXT(i))) 26101 + if (oldhash(SP_PARM)[i] != hash(SP_PARM, OLDTEXT(SP_PARM, i))) 26102 fprintf(stderr, "error in oldhash[%d]\n", i); 26103 } 26104 #endif 26105 @@ -320,28 +327,29 @@ 26106 /* 26107 * Set up and count line-hash values. 26108 */ 26109 - memset(hashtab, '\0', sizeof(*hashtab) * (screen_lines + 1) * 2); 26110 - for (i = 0; i < screen_lines; i++) { 26111 - unsigned long hashval = oldhash[i]; 26112 + memset(hashtab(SP_PARM), '\0', 26113 + sizeof(*(hashtab(SP_PARM))) * (screen_lines(SP_PARM) + 1) * 2); 26114 + for (i = 0; i < screen_lines(SP_PARM); i++) { 26115 + unsigned long hashval = oldhash(SP_PARM)[i]; 26116 26117 - for (sp = hashtab; sp->hashval; sp++) 26118 - if (sp->hashval == hashval) 26119 + for (hsp = hashtab(SP_PARM); hsp->hashval; hsp++) 26120 + if (hsp->hashval == hashval) 26121 break; 26122 - sp->hashval = hashval; /* in case this is a new entry */ 26123 - sp->oldcount++; 26124 - sp->oldindex = i; 26125 + hsp->hashval = hashval; /* in case this is a new entry */ 26126 + hsp->oldcount++; 26127 + hsp->oldindex = i; 26128 } 26129 - for (i = 0; i < screen_lines; i++) { 26130 - unsigned long hashval = newhash[i]; 26131 + for (i = 0; i < screen_lines(SP_PARM); i++) { 26132 + unsigned long hashval = newhash(SP_PARM)[i]; 26133 26134 - for (sp = hashtab; sp->hashval; sp++) 26135 - if (sp->hashval == hashval) 26136 + for (hsp = hashtab(SP_PARM); hsp->hashval; hsp++) 26137 + if (hsp->hashval == hashval) 26138 break; 26139 - sp->hashval = hashval; /* in case this is a new entry */ 26140 - sp->newcount++; 26141 - sp->newindex = i; 26142 + hsp->hashval = hashval; /* in case this is a new entry */ 26143 + hsp->newcount++; 26144 + hsp->newindex = i; 26145 26146 - OLDNUM(i) = _NEWINDEX; /* initialize old indices array */ 26147 + OLDNUM(SP_PARM, i) = _NEWINDEX; /* initialize old indices array */ 26148 } 26149 26150 /* 26151 @@ -351,16 +359,16 @@ 26152 * extending hunks by cost_effective. Otherwise, it does not 26153 * have any side effects. 26154 */ 26155 - for (sp = hashtab; sp->hashval; sp++) 26156 - if (sp->oldcount == 1 && sp->newcount == 1 26157 - && sp->oldindex != sp->newindex) { 26158 + for (hsp = hashtab(SP_PARM); hsp->hashval; hsp++) 26159 + if (hsp->oldcount == 1 && hsp->newcount == 1 26160 + && hsp->oldindex != hsp->newindex) { 26161 TR(TRACE_UPDATE | TRACE_MOVE, 26162 ("new line %d is hash-identical to old line %d (unique)", 26163 - sp->newindex, sp->oldindex)); 26164 - OLDNUM(sp->newindex) = sp->oldindex; 26165 + hsp->newindex, hsp->oldindex)); 26166 + OLDNUM(SP_PARM, hsp->newindex) = hsp->oldindex; 26167 } 26168 26169 - grow_hunks(); 26170 + grow_hunks(SP_PARM); 26171 26172 /* 26173 * Eliminate bad or impossible shifts -- this includes removing 26174 @@ -368,58 +376,83 @@ 26175 * those which are to be moved too far, they are likely to destroy 26176 * more than carry. 26177 */ 26178 - for (i = 0; i < screen_lines;) { 26179 - while (i < screen_lines && OLDNUM(i) == _NEWINDEX) 26180 + for (i = 0; i < screen_lines(SP_PARM);) { 26181 + while (i < screen_lines(SP_PARM) && OLDNUM(SP_PARM, i) == _NEWINDEX) 26182 i++; 26183 - if (i >= screen_lines) 26184 + if (i >= screen_lines(SP_PARM)) 26185 break; 26186 start = i; 26187 - shift = OLDNUM(i) - i; 26188 + shift = OLDNUM(SP_PARM, i) - i; 26189 i++; 26190 - while (i < screen_lines && OLDNUM(i) != _NEWINDEX && OLDNUM(i) - i 26191 - == shift) 26192 + while (i < screen_lines(SP_PARM) 26193 + && OLDNUM(SP_PARM, i) != _NEWINDEX 26194 + && OLDNUM(SP_PARM, i) - i == shift) 26195 i++; 26196 size = i - start; 26197 if (size < 3 || size + min(size / 8, 2) < abs(shift)) { 26198 while (start < i) { 26199 - OLDNUM(start) = _NEWINDEX; 26200 + OLDNUM(SP_PARM, start) = _NEWINDEX; 26201 start++; 26202 } 26203 } 26204 } 26205 26206 /* After clearing invalid hunks, try grow the rest. */ 26207 - grow_hunks(); 26208 + grow_hunks(SP_PARM); 26209 } 26210 26211 +#if NCURSES_SP_FUNCS 26212 +NCURSES_EXPORT(void) 26213 +_nc_hash_map(void) 26214 +{ 26215 + NCURSES_SP_NAME(_nc_hash_map) (CURRENT_SCREEN); 26216 +} 26217 +#endif 26218 + 26219 +NCURSES_EXPORT(void) 26220 +NCURSES_SP_NAME(_nc_make_oldhash) (NCURSES_SP_DCLx int i) 26221 +{ 26222 + if (oldhash(SP_PARM)) 26223 + oldhash(SP_PARM)[i] = hash(SP_PARM, OLDTEXT(SP_PARM, i)); 26224 +} 26225 + 26226 +#if NCURSES_SP_FUNCS 26227 NCURSES_EXPORT(void) 26228 _nc_make_oldhash(int i) 26229 { 26230 - if (oldhash) 26231 - oldhash[i] = hash(OLDTEXT(i)); 26232 + NCURSES_SP_NAME(_nc_make_oldhash) (CURRENT_SCREEN, i); 26233 } 26234 +#endif 26235 26236 NCURSES_EXPORT(void) 26237 -_nc_scroll_oldhash(int n, int top, int bot) 26238 +NCURSES_SP_NAME(_nc_scroll_oldhash) (NCURSES_SP_DCLx int n, int top, int bot) 26239 { 26240 size_t size; 26241 int i; 26242 26243 - if (!oldhash) 26244 + if (!oldhash(SP_PARM)) 26245 return; 26246 26247 - size = sizeof(*oldhash) * (bot - top + 1 - abs(n)); 26248 + size = sizeof(*(oldhash(SP_PARM))) * (bot - top + 1 - abs(n)); 26249 if (n > 0) { 26250 - memmove(oldhash + top, oldhash + top + n, size); 26251 + memmove(oldhash(SP_PARM) + top, oldhash(SP_PARM) + top + n, size); 26252 for (i = bot; i > bot - n; i--) 26253 - oldhash[i] = hash(OLDTEXT(i)); 26254 + oldhash(SP_PARM)[i] = hash(SP_PARM, OLDTEXT(SP_PARM, i)); 26255 } else { 26256 - memmove(oldhash + top - n, oldhash + top, size); 26257 + memmove(oldhash(SP_PARM) + top - n, oldhash(SP_PARM) + top, size); 26258 for (i = top; i < top - n; i++) 26259 - oldhash[i] = hash(OLDTEXT(i)); 26260 + oldhash(SP_PARM)[i] = hash(SP_PARM, OLDTEXT(SP_PARM, i)); 26261 } 26262 } 26263 26264 +#if NCURSES_SP_FUNCS 26265 +NCURSES_EXPORT(void) 26266 +_nc_scroll_oldhash(int n, int top, int bot) 26267 +{ 26268 + NCURSES_SP_NAME(_nc_scroll_oldhash) (CURRENT_SCREEN, n, top, bot); 26269 +} 26270 +#endif 26271 + 26272 #ifdef HASHDEBUG 26273 static void 26274 usage(void) 20395 26275 diff -Naur ncurses-5.7.orig/ncurses/tty/lib_mvcur.c ncurses-5.7/ncurses/tty/lib_mvcur.c 20396 26276 --- ncurses-5.7.orig/ncurses/tty/lib_mvcur.c 2008-08-16 12:30:58.000000000 -0700 20397 +++ ncurses-5.7/ncurses/tty/lib_mvcur.c 2009-0 3-22 21:17:05.655995250 -070026277 +++ ncurses-5.7/ncurses/tty/lib_mvcur.c 2009-06-05 14:01:51.000000000 -0700 20398 26278 @@ -1,5 +1,5 @@ 20399 26279 /**************************************************************************** … … 20411 26291 20412 26292 /* 20413 @@ -155,7 +156,7 @@ 20414 #include <term.h> 26293 @@ -109,8 +110,8 @@ 26294 * LONG_DIST and (b) further inward from the right or left edge than LONG_DIST, 26295 * we'll consider nonlocal. 26296 */ 26297 -#define NOT_LOCAL(fy, fx, ty, tx) ((tx > LONG_DIST) \ 26298 - && (tx < screen_columns - 1 - LONG_DIST) \ 26299 +#define NOT_LOCAL(sp, fy, fx, ty, tx) ((tx > LONG_DIST) \ 26300 + && (tx < screen_columns(sp) - 1 - LONG_DIST) \ 26301 && (abs(ty-fy) + abs(tx-fx) > LONG_DIST)) 26302 26303 /**************************************************************************** 26304 @@ -152,13 +153,16 @@ 26305 */ 26306 26307 #include <curses.priv.h> 26308 -#include <term.h> 20415 26309 #include <ctype.h> 20416 26310 20417 26311 -MODULE_ID("$Id: lib_mvcur.c,v 1.113 2008/08/16 19:30:58 tom Exp $") 20418 +MODULE_ID("$Id: lib_mvcur.c,v 1.114 2009/02/15 00:50:33 tom Exp $") 20419 20420 #define WANT_CHAR(y, x) SP->_newscr->_line[y].text[x] /* desired state */ 20421 #define BAUDRATE cur_term->_baudrate /* bits per second */ 20422 @@ -853,9 +854,10 @@ 26312 +#ifndef CUR 26313 +#define CUR SP_TERMTYPE 26314 +#endif 26315 + 26316 +MODULE_ID("$Id: lib_mvcur.c,v 1.120 2009/05/10 00:52:29 tom Exp $") 26317 26318 -#define WANT_CHAR(y, x) SP->_newscr->_line[y].text[x] /* desired state */ 26319 -#define BAUDRATE cur_term->_baudrate /* bits per second */ 26320 +#define WANT_CHAR(sp, y, x) (sp)->_newscr->_line[y].text[x] /* desired state */ 26321 +#define BAUDRATE(sp) cur_term->_baudrate /* bits per second */ 26322 26323 #if defined(MAIN) || defined(NCURSES_TEST) 26324 #include <sys/time.h> 26325 @@ -169,7 +173,7 @@ 26326 26327 #define OPT_SIZE 512 26328 26329 -static int normalized_cost(const char *const cap, int affcnt); 26330 +static int normalized_cost(NCURSES_SP_DCLx const char *const cap, int affcnt); 26331 26332 /**************************************************************************** 26333 * 26334 @@ -179,34 +183,34 @@ 26335 26336 #ifdef TRACE 26337 static int 26338 -trace_cost_of(const char *capname, const char *cap, int affcnt) 26339 +trace_cost_of(NCURSES_SP_DCLx const char *capname, const char *cap, int affcnt) 26340 { 26341 - int result = _nc_msec_cost(cap, affcnt); 26342 + int result = NCURSES_SP_NAME(_nc_msec_cost) (NCURSES_SP_ARGx cap, affcnt); 26343 TR(TRACE_CHARPUT | TRACE_MOVE, 26344 ("CostOf %s %d %s", capname, result, _nc_visbuf(cap))); 26345 return result; 26346 } 26347 -#define CostOf(cap,affcnt) trace_cost_of(#cap,cap,affcnt); 26348 +#define CostOf(cap,affcnt) trace_cost_of(NCURSES_SP_ARGx #cap, cap, affcnt) 26349 26350 static int 26351 -trace_normalized_cost(const char *capname, const char *cap, int affcnt) 26352 +trace_normalized_cost(NCURSES_SP_DCLx const char *capname, const char *cap, int affcnt) 26353 { 26354 - int result = normalized_cost(cap, affcnt); 26355 + int result = normalized_cost(NCURSES_SP_ARGx cap, affcnt); 26356 TR(TRACE_CHARPUT | TRACE_MOVE, 26357 ("NormalizedCost %s %d %s", capname, result, _nc_visbuf(cap))); 26358 return result; 26359 } 26360 -#define NormalizedCost(cap,affcnt) trace_normalized_cost(#cap,cap,affcnt); 26361 +#define NormalizedCost(cap,affcnt) trace_normalized_cost(NCURSES_SP_ARGx #cap, cap, affcnt) 26362 26363 #else 26364 26365 -#define CostOf(cap,affcnt) _nc_msec_cost(cap,affcnt); 26366 -#define NormalizedCost(cap,affcnt) normalized_cost(cap,affcnt); 26367 +#define CostOf(cap,affcnt) NCURSES_SP_NAME(_nc_msec_cost)(NCURSES_SP_ARGx cap, affcnt) 26368 +#define NormalizedCost(cap,affcnt) normalized_cost(NCURSES_SP_ARGx cap, affcnt) 26369 26370 #endif 26371 26372 NCURSES_EXPORT(int) 26373 -_nc_msec_cost(const char *const cap, int affcnt) 26374 +NCURSES_SP_NAME(_nc_msec_cost) (NCURSES_SP_DCLx const char *const cap, int affcnt) 26375 /* compute the cost of a given operation */ 26376 { 26377 if (cap == 0) 26378 @@ -230,45 +234,56 @@ 26379 } 26380 26381 #if NCURSES_NO_PADDING 26382 - if (!GetNoPadding(SP)) 26383 + if (!GetNoPadding(SP_PARM)) 26384 #endif 26385 cum_cost += number * 10; 26386 } else 26387 - cum_cost += SP->_char_padding; 26388 + cum_cost += SP_PARM->_char_padding; 26389 } 26390 26391 return ((int) cum_cost); 26392 } 26393 } 26394 26395 +#if NCURSES_SP_FUNCS 26396 +NCURSES_EXPORT(int) 26397 +_nc_msec_cost(const char *const cap, int affcnt) 26398 +{ 26399 + return NCURSES_SP_NAME(_nc_msec_cost) (CURRENT_SCREEN, cap, affcnt); 26400 +} 26401 +#endif 26402 + 26403 static int 26404 -normalized_cost(const char *const cap, int affcnt) 26405 +normalized_cost(NCURSES_SP_DCLx const char *const cap, int affcnt) 26406 /* compute the effective character-count for an operation (round up) */ 26407 { 26408 - int cost = _nc_msec_cost(cap, affcnt); 26409 + int cost = NCURSES_SP_NAME(_nc_msec_cost) (NCURSES_SP_ARGx cap, affcnt); 26410 if (cost != INFINITY) 26411 - cost = (cost + SP->_char_padding - 1) / SP->_char_padding; 26412 + cost = (cost + SP_PARM->_char_padding - 1) / SP_PARM->_char_padding; 26413 return cost; 26414 } 26415 26416 static void 26417 -reset_scroll_region(void) 26418 +reset_scroll_region(NCURSES_SP_DCL0) 26419 /* Set the scroll-region to a known state (the default) */ 26420 { 26421 if (change_scroll_region) { 26422 - TPUTS_TRACE("change_scroll_region"); 26423 - putp(TPARM_2(change_scroll_region, 0, screen_lines - 1)); 26424 + NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx 26425 + "change_scroll_region", 26426 + TPARM_2(change_scroll_region, 26427 + 0, screen_lines(SP_PARM) - 1)); 26428 } 26429 } 26430 26431 NCURSES_EXPORT(void) 26432 -_nc_mvcur_resume(void) 26433 +NCURSES_SP_NAME(_nc_mvcur_resume) (NCURSES_SP_DCL0) 26434 /* what to do at initialization time and after each shellout */ 26435 { 26436 /* initialize screen for cursor access */ 26437 if (enter_ca_mode) { 26438 - TPUTS_TRACE("enter_ca_mode"); 26439 - putp(enter_ca_mode); 26440 + NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx 26441 + "enter_ca_mode", 26442 + enter_ca_mode); 26443 } 26444 26445 /* 26446 @@ -280,53 +295,63 @@ 26447 * they know the screen size. This is useful when you're running 26448 * a vt100 emulation through xterm. 26449 */ 26450 - reset_scroll_region(); 26451 - SP->_cursrow = SP->_curscol = -1; 26452 + reset_scroll_region(NCURSES_SP_ARG); 26453 + SP_PARM->_cursrow = SP_PARM->_curscol = -1; 26454 26455 /* restore cursor shape */ 26456 - if (SP->_cursor != -1) { 26457 - int cursor = SP->_cursor; 26458 - SP->_cursor = -1; 26459 - curs_set(cursor); 26460 + if (SP_PARM->_cursor != -1) { 26461 + int cursor = SP_PARM->_cursor; 26462 + SP_PARM->_cursor = -1; 26463 + NCURSES_SP_NAME(curs_set) (NCURSES_SP_ARGx cursor); 26464 } 26465 } 26466 26467 +#if NCURSES_SP_FUNCS 26468 NCURSES_EXPORT(void) 26469 -_nc_mvcur_init(void) 26470 +_nc_mvcur_resume(void) 26471 +{ 26472 + NCURSES_SP_NAME(_nc_mvcur_resume) (CURRENT_SCREEN); 26473 +} 26474 +#endif 26475 + 26476 +NCURSES_EXPORT(void) 26477 +NCURSES_SP_NAME(_nc_mvcur_init) (NCURSES_SP_DCL0) 26478 /* initialize the cost structure */ 26479 { 26480 - if (isatty(fileno(SP->_ofp))) 26481 - SP->_char_padding = ((BAUDBYTE * 1000 * 10) 26482 - / (BAUDRATE > 0 ? BAUDRATE : 9600)); 26483 + if (SP_PARM->_ofp && isatty(fileno(SP_PARM->_ofp))) 26484 + SP_PARM->_char_padding = ((BAUDBYTE * 1000 * 10) 26485 + / (BAUDRATE(SP_PARM) > 0 26486 + ? BAUDRATE(SP_PARM) 26487 + : 9600)); 26488 else 26489 - SP->_char_padding = 1; /* must be nonzero */ 26490 - if (SP->_char_padding <= 0) 26491 - SP->_char_padding = 1; /* must be nonzero */ 26492 - TR(TRACE_CHARPUT | TRACE_MOVE, ("char_padding %d msecs", SP->_char_padding)); 26493 + SP_PARM->_char_padding = 1; /* must be nonzero */ 26494 + if (SP_PARM->_char_padding <= 0) 26495 + SP_PARM->_char_padding = 1; /* must be nonzero */ 26496 + TR(TRACE_CHARPUT | TRACE_MOVE, ("char_padding %d msecs", SP_PARM->_char_padding)); 26497 26498 /* non-parameterized local-motion strings */ 26499 - SP->_cr_cost = CostOf(carriage_return, 0); 26500 - SP->_home_cost = CostOf(cursor_home, 0); 26501 - SP->_ll_cost = CostOf(cursor_to_ll, 0); 26502 + SP_PARM->_cr_cost = CostOf(carriage_return, 0); 26503 + SP_PARM->_home_cost = CostOf(cursor_home, 0); 26504 + SP_PARM->_ll_cost = CostOf(cursor_to_ll, 0); 26505 #if USE_HARD_TABS 26506 if (getenv("NCURSES_NO_HARD_TABS") == 0) { 26507 - SP->_ht_cost = CostOf(tab, 0); 26508 - SP->_cbt_cost = CostOf(back_tab, 0); 26509 + SP_PARM->_ht_cost = CostOf(tab, 0); 26510 + SP_PARM->_cbt_cost = CostOf(back_tab, 0); 26511 } else { 26512 - SP->_ht_cost = INFINITY; 26513 - SP->_cbt_cost = INFINITY; 26514 + SP_PARM->_ht_cost = INFINITY; 26515 + SP_PARM->_cbt_cost = INFINITY; 26516 } 26517 #endif /* USE_HARD_TABS */ 26518 - SP->_cub1_cost = CostOf(cursor_left, 0); 26519 - SP->_cuf1_cost = CostOf(cursor_right, 0); 26520 - SP->_cud1_cost = CostOf(cursor_down, 0); 26521 - SP->_cuu1_cost = CostOf(cursor_up, 0); 26522 - 26523 - SP->_smir_cost = CostOf(enter_insert_mode, 0); 26524 - SP->_rmir_cost = CostOf(exit_insert_mode, 0); 26525 - SP->_ip_cost = 0; 26526 + SP_PARM->_cub1_cost = CostOf(cursor_left, 0); 26527 + SP_PARM->_cuf1_cost = CostOf(cursor_right, 0); 26528 + SP_PARM->_cud1_cost = CostOf(cursor_down, 0); 26529 + SP_PARM->_cuu1_cost = CostOf(cursor_up, 0); 26530 + 26531 + SP_PARM->_smir_cost = CostOf(enter_insert_mode, 0); 26532 + SP_PARM->_rmir_cost = CostOf(exit_insert_mode, 0); 26533 + SP_PARM->_ip_cost = 0; 26534 if (insert_padding) { 26535 - SP->_ip_cost = CostOf(insert_padding, 0); 26536 + SP_PARM->_ip_cost = CostOf(insert_padding, 0); 26537 } 26538 26539 /* 26540 @@ -335,7 +360,7 @@ 26541 * can treat it like absolute screen addressing. This seems to be true 26542 * for all cursor_mem_address terminal types in the terminfo database. 26543 */ 26544 - SP->_address_cursor = cursor_address ? cursor_address : cursor_mem_address; 26545 + SP_PARM->_address_cursor = cursor_address ? cursor_address : cursor_mem_address; 26546 26547 /* 26548 * Parametrized local-motion strings. This static cost computation 26549 @@ -361,40 +386,43 @@ 26550 * All these averages depend on the assumption that all parameter values 26551 * are equally probable. 26552 */ 26553 - SP->_cup_cost = CostOf(TPARM_2(SP->_address_cursor, 23, 23), 1); 26554 - SP->_cub_cost = CostOf(TPARM_1(parm_left_cursor, 23), 1); 26555 - SP->_cuf_cost = CostOf(TPARM_1(parm_right_cursor, 23), 1); 26556 - SP->_cud_cost = CostOf(TPARM_1(parm_down_cursor, 23), 1); 26557 - SP->_cuu_cost = CostOf(TPARM_1(parm_up_cursor, 23), 1); 26558 - SP->_hpa_cost = CostOf(TPARM_1(column_address, 23), 1); 26559 - SP->_vpa_cost = CostOf(TPARM_1(row_address, 23), 1); 26560 + SP_PARM->_cup_cost = CostOf(TPARM_2(SP_PARM->_address_cursor, 23, 23), 1); 26561 + SP_PARM->_cub_cost = CostOf(TPARM_1(parm_left_cursor, 23), 1); 26562 + SP_PARM->_cuf_cost = CostOf(TPARM_1(parm_right_cursor, 23), 1); 26563 + SP_PARM->_cud_cost = CostOf(TPARM_1(parm_down_cursor, 23), 1); 26564 + SP_PARM->_cuu_cost = CostOf(TPARM_1(parm_up_cursor, 23), 1); 26565 + SP_PARM->_hpa_cost = CostOf(TPARM_1(column_address, 23), 1); 26566 + SP_PARM->_vpa_cost = CostOf(TPARM_1(row_address, 23), 1); 26567 26568 /* non-parameterized screen-update strings */ 26569 - SP->_ed_cost = NormalizedCost(clr_eos, 1); 26570 - SP->_el_cost = NormalizedCost(clr_eol, 1); 26571 - SP->_el1_cost = NormalizedCost(clr_bol, 1); 26572 - SP->_dch1_cost = NormalizedCost(delete_character, 1); 26573 - SP->_ich1_cost = NormalizedCost(insert_character, 1); 26574 + SP_PARM->_ed_cost = NormalizedCost(clr_eos, 1); 26575 + SP_PARM->_el_cost = NormalizedCost(clr_eol, 1); 26576 + SP_PARM->_el1_cost = NormalizedCost(clr_bol, 1); 26577 + SP_PARM->_dch1_cost = NormalizedCost(delete_character, 1); 26578 + SP_PARM->_ich1_cost = NormalizedCost(insert_character, 1); 26579 26580 /* 26581 * If this is a bce-terminal, we want to bias the choice so we use clr_eol 26582 * rather than spaces at the end of a line. 26583 */ 26584 if (back_color_erase) 26585 - SP->_el_cost = 0; 26586 + SP_PARM->_el_cost = 0; 26587 26588 /* parameterized screen-update strings */ 26589 - SP->_dch_cost = NormalizedCost(TPARM_1(parm_dch, 23), 1); 26590 - SP->_ich_cost = NormalizedCost(TPARM_1(parm_ich, 23), 1); 26591 - SP->_ech_cost = NormalizedCost(TPARM_1(erase_chars, 23), 1); 26592 - SP->_rep_cost = NormalizedCost(TPARM_2(repeat_char, ' ', 23), 1); 26593 - 26594 - SP->_cup_ch_cost = NormalizedCost(TPARM_2(SP->_address_cursor, 23, 23), 1); 26595 - SP->_hpa_ch_cost = NormalizedCost(TPARM_1(column_address, 23), 1); 26596 - SP->_cuf_ch_cost = NormalizedCost(TPARM_1(parm_right_cursor, 23), 1); 26597 - SP->_inline_cost = min(SP->_cup_ch_cost, 26598 - min(SP->_hpa_ch_cost, 26599 - SP->_cuf_ch_cost)); 26600 + SP_PARM->_dch_cost = NormalizedCost(TPARM_1(parm_dch, 23), 1); 26601 + SP_PARM->_ich_cost = NormalizedCost(TPARM_1(parm_ich, 23), 1); 26602 + SP_PARM->_ech_cost = NormalizedCost(TPARM_1(erase_chars, 23), 1); 26603 + SP_PARM->_rep_cost = NormalizedCost(TPARM_2(repeat_char, ' ', 23), 1); 26604 + 26605 + SP_PARM->_cup_ch_cost = NormalizedCost( 26606 + TPARM_2(SP_PARM->_address_cursor, 26607 + 23, 23), 26608 + 1); 26609 + SP_PARM->_hpa_ch_cost = NormalizedCost(TPARM_1(column_address, 23), 1); 26610 + SP_PARM->_cuf_ch_cost = NormalizedCost(TPARM_1(parm_right_cursor, 23), 1); 26611 + SP_PARM->_inline_cost = min(SP_PARM->_cup_ch_cost, 26612 + min(SP_PARM->_hpa_ch_cost, 26613 + SP_PARM->_cuf_ch_cost)); 26614 26615 /* 26616 * If save_cursor is used within enter_ca_mode, we should not use it for 26617 @@ -411,30 +439,40 @@ 26618 } 26619 26620 /* 26621 - * A different, possibly better way to arrange this would be to set 26622 - * SP->_endwin = TRUE at window initialization time and let this be 26623 + * A different, possibly better way to arrange this would be to set the 26624 + * SCREEN's _endwin to TRUE at window initialization time and let this be 26625 * called by doupdate's return-from-shellout code. 26626 */ 26627 + NCURSES_SP_NAME(_nc_mvcur_resume) (NCURSES_SP_ARG); 26628 +} 26629 + 26630 +#if NCURSES_SP_FUNCS 26631 +NCURSES_EXPORT(void) 26632 +_nc_mvcur_init(void) 26633 +{ 26634 + NCURSES_SP_NAME(_nc_mvcur_init) (CURRENT_SCREEN); 26635 _nc_mvcur_resume(); 26636 } 26637 +#endif 26638 26639 NCURSES_EXPORT(void) 26640 -_nc_mvcur_wrap(void) 26641 +NCURSES_SP_NAME(_nc_mvcur_wrap) (NCURSES_SP_DCL0) 26642 /* wrap up cursor-addressing mode */ 26643 { 26644 /* leave cursor at screen bottom */ 26645 - mvcur(-1, -1, screen_lines - 1, 0); 26646 + mvcur(-1, -1, screen_lines(CURRENT_SCREEN) - 1, 0); 26647 26648 /* set cursor to normal mode */ 26649 - if (SP->_cursor != -1) { 26650 - int cursor = SP->_cursor; 26651 - curs_set(1); 26652 - SP->_cursor = cursor; 26653 + if (SP_PARM->_cursor != -1) { 26654 + int cursor = SP_PARM->_cursor; 26655 + NCURSES_SP_NAME(curs_set) (NCURSES_SP_ARGx 1); 26656 + SP_PARM->_cursor = cursor; 26657 } 26658 26659 if (exit_ca_mode) { 26660 - TPUTS_TRACE("exit_ca_mode"); 26661 - putp(exit_ca_mode); 26662 + NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx 26663 + "exit_ca_mode", 26664 + exit_ca_mode); 26665 } 26666 /* 26667 * Reset terminal's tab counter. There's a long-time bug that 26668 @@ -444,8 +482,16 @@ 26669 * escape sequences that reset things as column positions. 26670 * Utter a \r to reset this invisibly. 26671 */ 26672 - _nc_outch('\r'); 26673 + NCURSES_SP_NAME(_nc_outch) (NCURSES_SP_ARGx '\r'); 26674 +} 26675 + 26676 +#if NCURSES_SP_FUNCS 26677 +NCURSES_EXPORT(void) 26678 +_nc_mvcur_wrap(void) 26679 +{ 26680 + NCURSES_SP_NAME(_nc_mvcur_wrap) (CURRENT_SCREEN); 26681 } 26682 +#endif 26683 26684 /**************************************************************************** 26685 * 26686 @@ -486,8 +532,13 @@ 26687 #define LASTTAB(fr) ((fr > 0) ? ((fr - 1) / init_tabs) * init_tabs : -1) 26688 26689 static int 26690 -relative_move(string_desc * target, int from_y, int from_x, int to_y, int 26691 - to_x, bool ovw) 26692 +relative_move(NCURSES_SP_DCLx 26693 + string_desc * target, 26694 + int from_y, 26695 + int from_x, 26696 + int to_y, 26697 + int to_x, 26698 + bool ovw) 26699 /* move via local motions (cuu/cuu1/cud/cud1/cub1/cub/cuf1/cuf/vpa/hpa) */ 26700 { 26701 string_desc save; 26702 @@ -500,38 +551,38 @@ 26703 26704 if (row_address != 0 26705 && _nc_safe_strcat(target, TPARM_1(row_address, to_y))) { 26706 - vcost = SP->_vpa_cost; 26707 + vcost = SP_PARM->_vpa_cost; 26708 } 26709 26710 if (to_y > from_y) { 26711 n = (to_y - from_y); 26712 26713 if (parm_down_cursor 26714 - && SP->_cud_cost < vcost 26715 + && SP_PARM->_cud_cost < vcost 26716 && _nc_safe_strcat(_nc_str_copy(target, &save), 26717 TPARM_1(parm_down_cursor, n))) { 26718 - vcost = SP->_cud_cost; 26719 + vcost = SP_PARM->_cud_cost; 26720 } 26721 26722 if (cursor_down 26723 - && (*cursor_down != '\n' || SP->_nl) 26724 - && (n * SP->_cud1_cost < vcost)) { 26725 + && (*cursor_down != '\n' || SP_PARM->_nl) 26726 + && (n * SP_PARM->_cud1_cost < vcost)) { 26727 vcost = repeated_append(_nc_str_copy(target, &save), 0, 26728 - SP->_cud1_cost, n, cursor_down); 26729 + SP_PARM->_cud1_cost, n, cursor_down); 26730 } 26731 } else { /* (to_y < from_y) */ 26732 n = (from_y - to_y); 26733 26734 if (parm_up_cursor 26735 - && SP->_cuu_cost < vcost 26736 + && SP_PARM->_cuu_cost < vcost 26737 && _nc_safe_strcat(_nc_str_copy(target, &save), 26738 TPARM_1(parm_up_cursor, n))) { 26739 - vcost = SP->_cuu_cost; 26740 + vcost = SP_PARM->_cuu_cost; 26741 } 26742 26743 - if (cursor_up && (n * SP->_cuu1_cost < vcost)) { 26744 + if (cursor_up && (n * SP_PARM->_cuu1_cost < vcost)) { 26745 vcost = repeated_append(_nc_str_copy(target, &save), 0, 26746 - SP->_cuu1_cost, n, cursor_up); 26747 + SP_PARM->_cuu1_cost, n, cursor_up); 26748 } 26749 } 26750 26751 @@ -550,17 +601,17 @@ 26752 if (column_address 26753 && _nc_safe_strcat(_nc_str_copy(target, &save), 26754 TPARM_1(column_address, to_x))) { 26755 - hcost = SP->_hpa_cost; 26756 + hcost = SP_PARM->_hpa_cost; 26757 } 26758 26759 if (to_x > from_x) { 26760 n = to_x - from_x; 26761 26762 if (parm_right_cursor 26763 - && SP->_cuf_cost < hcost 26764 + && SP_PARM->_cuf_cost < hcost 26765 && _nc_safe_strcat(_nc_str_copy(target, &save), 26766 TPARM_1(parm_right_cursor, n))) { 26767 - hcost = SP->_cuf_cost; 26768 + hcost = SP_PARM->_cuf_cost; 26769 } 26770 26771 if (cursor_right) { 26772 @@ -575,7 +626,7 @@ 26773 26774 for (fr = from_x; (nxt = NEXTTAB(fr)) <= to_x; fr = nxt) { 26775 lhcost = repeated_append(&check, lhcost, 26776 - SP->_ht_cost, 1, tab); 26777 + SP_PARM->_ht_cost, 1, tab); 26778 if (lhcost == INFINITY) 26779 break; 26780 } 26781 @@ -599,7 +650,7 @@ 26782 && n < (int) check.s_size 26783 && vcost == 0 26784 && str[0] == '\0') { 26785 - int wanted = CharOf(WANT_CHAR(to_y, from_x)); 26786 + int wanted = CharOf(WANT_CHAR(SP_PARM, to_y, from_x)); 26787 if (is8bits(wanted) && isdigit(wanted)) 26788 ovw = FALSE; 26789 } 26790 @@ -616,8 +667,8 @@ 26791 int i; 26792 26793 for (i = 0; i < n; i++) { 26794 - NCURSES_CH_T ch = WANT_CHAR(to_y, from_x + i); 26795 - if (!SameAttrOf(ch, SCREEN_ATTRS(SP)) 26796 + NCURSES_CH_T ch = WANT_CHAR(SP_PARM, to_y, from_x + i); 26797 + if (!SameAttrOf(ch, SCREEN_ATTRS(SP_PARM)) 26798 #if USE_WIDEC_SUPPORT 26799 || !Charable(ch) 26800 #endif 26801 @@ -631,13 +682,13 @@ 26802 int i; 26803 26804 for (i = 0; i < n; i++) 26805 - *check.s_tail++ = (char) CharOf(WANT_CHAR(to_y, 26806 + *check.s_tail++ = (char) CharOf(WANT_CHAR(SP_PARM, to_y, 26807 from_x + i)); 26808 *check.s_tail = '\0'; 26809 check.s_size -= n; 26810 - lhcost += n * SP->_char_padding; 26811 + lhcost += n * SP_PARM->_char_padding; 26812 } else { 26813 - lhcost = repeated_append(&check, lhcost, SP->_cuf1_cost, 26814 + lhcost = repeated_append(&check, lhcost, SP_PARM->_cuf1_cost, 26815 n, cursor_right); 26816 } 26817 26818 @@ -650,10 +701,10 @@ 26819 n = from_x - to_x; 26820 26821 if (parm_left_cursor 26822 - && SP->_cub_cost < hcost 26823 + && SP_PARM->_cub_cost < hcost 26824 && _nc_safe_strcat(_nc_str_copy(target, &save), 26825 TPARM_1(parm_left_cursor, n))) { 26826 - hcost = SP->_cub_cost; 26827 + hcost = SP_PARM->_cub_cost; 26828 } 26829 26830 if (cursor_left) { 26831 @@ -667,7 +718,8 @@ 26832 26833 for (fr = from_x; (nxt = LASTTAB(fr)) >= to_x; fr = nxt) { 26834 lhcost = repeated_append(&check, lhcost, 26835 - SP->_cbt_cost, 1, back_tab); 26836 + SP_PARM->_cbt_cost, 26837 + 1, back_tab); 26838 if (lhcost == INFINITY) 26839 break; 26840 } 26841 @@ -676,7 +728,9 @@ 26842 } 26843 #endif /* USE_HARD_TABS */ 26844 26845 - lhcost = repeated_append(&check, lhcost, SP->_cub1_cost, n, cursor_left); 26846 + lhcost = repeated_append(&check, lhcost, 26847 + SP_PARM->_cub1_cost, 26848 + n, cursor_left); 26849 26850 if (lhcost < hcost 26851 && _nc_safe_strcat(_nc_str_copy(target, &save), str)) { 26852 @@ -705,7 +759,7 @@ 26853 */ 26854 26855 static NCURSES_INLINE int 26856 -onscreen_mvcur(int yold, int xold, int ynew, int xnew, bool ovw) 26857 +onscreen_mvcur(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew, bool ovw) 26858 /* onscreen move from (yold, xold) to (ynew, xnew) */ 26859 { 26860 string_desc result; 26861 @@ -723,9 +777,9 @@ 26862 #define InitResult _nc_str_init(&result, buffer, sizeof(buffer)) 26863 26864 /* tactic #0: use direct cursor addressing */ 26865 - if (_nc_safe_strcpy(InitResult, TPARM_2(SP->_address_cursor, ynew, xnew))) { 26866 + if (_nc_safe_strcpy(InitResult, TPARM_2(SP_PARM->_address_cursor, ynew, xnew))) { 26867 tactic = 0; 26868 - usecost = SP->_cup_cost; 26869 + usecost = SP_PARM->_cup_cost; 26870 26871 #if defined(TRACE) || defined(NCURSES_TEST) 26872 if (!(_nc_optimize_enable & OPTIMIZE_MVCUR)) 26873 @@ -740,7 +794,7 @@ 26874 * (like, say, local-movement \n getting mapped to some obscure 26875 * character because A_ALTCHARSET is on). 26876 */ 26877 - if (yold == -1 || xold == -1 || NOT_LOCAL(yold, xold, ynew, xnew)) { 26878 + if (yold == -1 || xold == -1 || NOT_LOCAL(SP_PARM, yold, xold, ynew, xnew)) { 26879 #if defined(MAIN) || defined(NCURSES_TEST) 26880 if (!profiling) { 26881 (void) fputs("nonlocal\n", stderr); 26882 @@ -754,8 +808,10 @@ 26883 #ifndef NO_OPTIMIZE 26884 /* tactic #1: use local movement */ 26885 if (yold != -1 && xold != -1 26886 - && ((newcost = relative_move(NullResult, yold, xold, ynew, xnew, 26887 - ovw)) != INFINITY) 26888 + && ((newcost = relative_move(NCURSES_SP_ARGx 26889 + NullResult, 26890 + yold, xold, 26891 + ynew, xnew, ovw)) != INFINITY) 26892 && newcost < usecost) { 26893 tactic = 1; 26894 usecost = newcost; 26895 @@ -763,42 +819,51 @@ 26896 26897 /* tactic #2: use carriage-return + local movement */ 26898 if (yold != -1 && carriage_return 26899 - && ((newcost = relative_move(NullResult, yold, 0, ynew, xnew, ovw)) 26900 - != INFINITY) 26901 - && SP->_cr_cost + newcost < usecost) { 26902 + && ((newcost = relative_move(NCURSES_SP_ARGx 26903 + NullResult, 26904 + yold, 0, 26905 + ynew, xnew, ovw)) != INFINITY) 26906 + && SP_PARM->_cr_cost + newcost < usecost) { 26907 tactic = 2; 26908 - usecost = SP->_cr_cost + newcost; 26909 + usecost = SP_PARM->_cr_cost + newcost; 26910 } 26911 26912 /* tactic #3: use home-cursor + local movement */ 26913 if (cursor_home 26914 - && ((newcost = relative_move(NullResult, 0, 0, ynew, xnew, ovw)) != INFINITY) 26915 - && SP->_home_cost + newcost < usecost) { 26916 + && ((newcost = relative_move(NCURSES_SP_ARGx 26917 + NullResult, 26918 + 0, 0, 26919 + ynew, xnew, ovw)) != INFINITY) 26920 + && SP_PARM->_home_cost + newcost < usecost) { 26921 tactic = 3; 26922 - usecost = SP->_home_cost + newcost; 26923 + usecost = SP_PARM->_home_cost + newcost; 26924 } 26925 26926 /* tactic #4: use home-down + local movement */ 26927 if (cursor_to_ll 26928 - && ((newcost = relative_move(NullResult, screen_lines - 1, 0, ynew, 26929 - xnew, ovw)) != INFINITY) 26930 - && SP->_ll_cost + newcost < usecost) { 26931 + && ((newcost = relative_move(NCURSES_SP_ARGx 26932 + NullResult, 26933 + screen_lines(SP_PARM) - 1, 0, 26934 + ynew, xnew, ovw)) != INFINITY) 26935 + && SP_PARM->_ll_cost + newcost < usecost) { 26936 tactic = 4; 26937 - usecost = SP->_ll_cost + newcost; 26938 + usecost = SP_PARM->_ll_cost + newcost; 26939 } 26940 26941 /* 26942 * tactic #5: use left margin for wrap to right-hand side, 26943 * unless strange wrap behavior indicated by xenl might hose us. 26944 */ 26945 - t5_cr_cost = (xold > 0 ? SP->_cr_cost : 0); 26946 + t5_cr_cost = (xold > 0 ? SP_PARM->_cr_cost : 0); 26947 if (auto_left_margin && !eat_newline_glitch 26948 && yold > 0 && cursor_left 26949 - && ((newcost = relative_move(NullResult, yold - 1, screen_columns - 26950 - 1, ynew, xnew, ovw)) != INFINITY) 26951 - && t5_cr_cost + SP->_cub1_cost + newcost < usecost) { 26952 + && ((newcost = relative_move(NCURSES_SP_ARGx 26953 + NullResult, 26954 + yold - 1, screen_columns(SP_PARM) - 1, 26955 + ynew, xnew, ovw)) != INFINITY) 26956 + && t5_cr_cost + SP_PARM->_cub1_cost + newcost < usecost) { 26957 tactic = 5; 26958 - usecost = t5_cr_cost + SP->_cub1_cost + newcost; 26959 + usecost = t5_cr_cost + SP_PARM->_cub1_cost + newcost; 26960 } 26961 26962 /* 26963 @@ -808,26 +873,39 @@ 26964 InitResult; 26965 switch (tactic) { 26966 case 1: 26967 - (void) relative_move(&result, yold, xold, ynew, xnew, ovw); 26968 + (void) relative_move(NCURSES_SP_ARGx 26969 + &result, 26970 + yold, xold, 26971 + ynew, xnew, ovw); 26972 break; 26973 case 2: 26974 (void) _nc_safe_strcpy(&result, carriage_return); 26975 - (void) relative_move(&result, yold, 0, ynew, xnew, ovw); 26976 + (void) relative_move(NCURSES_SP_ARGx 26977 + &result, 26978 + yold, 0, 26979 + ynew, xnew, ovw); 26980 break; 26981 case 3: 26982 (void) _nc_safe_strcpy(&result, cursor_home); 26983 - (void) relative_move(&result, 0, 0, ynew, xnew, ovw); 26984 + (void) relative_move(NCURSES_SP_ARGx 26985 + &result, 0, 0, 26986 + ynew, xnew, ovw); 26987 break; 26988 case 4: 26989 (void) _nc_safe_strcpy(&result, cursor_to_ll); 26990 - (void) relative_move(&result, screen_lines - 1, 0, ynew, xnew, ovw); 26991 + (void) relative_move(NCURSES_SP_ARGx 26992 + &result, 26993 + screen_lines(SP_PARM) - 1, 0, 26994 + ynew, xnew, ovw); 26995 break; 26996 case 5: 26997 if (xold > 0) 26998 (void) _nc_safe_strcat(&result, carriage_return); 26999 (void) _nc_safe_strcat(&result, cursor_left); 27000 - (void) relative_move(&result, yold - 1, screen_columns - 1, ynew, 27001 - xnew, ovw); 27002 + (void) relative_move(NCURSES_SP_ARGx 27003 + &result, 27004 + yold - 1, screen_columns(SP_PARM) - 1, 27005 + ynew, xnew, ovw); 27006 break; 27007 } 27008 #endif /* !NO_OPTIMIZE */ 27009 @@ -845,17 +923,19 @@ 27010 27011 if (usecost != INFINITY) { 27012 TPUTS_TRACE("mvcur"); 27013 - tputs(buffer, 1, _nc_outch); 27014 - SP->_cursrow = ynew; 27015 - SP->_curscol = xnew; 27016 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx 27017 + buffer, 1, NCURSES_SP_NAME(_nc_outch)); 27018 + SP_PARM->_cursrow = ynew; 27019 + SP_PARM->_curscol = xnew; 27020 return (OK); 27021 } else 20423 27022 return (ERR); 20424 27023 } … … 20433 27032 NCURSES_CH_T oldattr; 20434 27033 int code; 20435 @@ -863,7 + 865,7 @@27034 @@ -863,7 +943,7 @@ 20436 27035 TR(TRACE_CALLS | TRACE_MOVE, (T_CALLED("mvcur(%d,%d,%d,%d)"), 20437 27036 yold, xold, ynew, xnew)); … … 20442 27041 } else if (yold == ynew && xold == xnew) { 20443 27042 code = OK; 20444 @@ -884,7 +886,7 @@ 27043 @@ -874,9 +954,9 @@ 27044 * column position implied by wraparound or the lack thereof and 27045 * rolling up the screen to get ynew on the screen. 27046 */ 27047 - if (xnew >= screen_columns) { 27048 - ynew += xnew / screen_columns; 27049 - xnew %= screen_columns; 27050 + if (xnew >= screen_columns(SP_PARM)) { 27051 + ynew += xnew / screen_columns(SP_PARM); 27052 + xnew %= screen_columns(SP_PARM); 27053 } 27054 27055 /* 27056 @@ -884,38 +964,40 @@ 20445 27057 * character set -- these have a strong tendency to screw up the CR & 20446 27058 * LF used for local character motions! … … 20451 27063 || (AttrOf(oldattr) && !move_standout_mode)) { 20452 27064 TR(TRACE_CHARPUT, ("turning off (%#lx) %s before move", 20453 @@ -896,7 +898,7 @@ 20454 if (xold >= screen_columns) { 27065 (unsigned long) AttrOf(oldattr), 27066 _traceattr(AttrOf(oldattr)))); 27067 - (void) VIDATTR(A_NORMAL, 0); 27068 + (void) VIDATTR(SP_PARM, A_NORMAL, 0); 27069 } 27070 27071 - if (xold >= screen_columns) { 27072 + if (xold >= screen_columns(SP_PARM)) { 20455 27073 int l; 20456 27074 20457 27075 - if (SP->_nl) { 27076 - l = (xold + 1) / screen_columns; 20458 27077 + if (SP_PARM->_nl) { 20459 l = (xold + 1) / screen_columns;27078 + l = (xold + 1) / screen_columns(SP_PARM); 20460 27079 yold += l; 20461 if (yold >= screen_lines) 20462 @@ -940,7 +942,7 @@ 27080 - if (yold >= screen_lines) 27081 - l -= (yold - screen_lines - 1); 27082 + if (yold >= screen_lines(SP_PARM)) 27083 + l -= (yold - screen_lines(SP_PARM) - 1); 27084 27085 if (l > 0) { 27086 if (carriage_return) { 27087 - TPUTS_TRACE("carriage_return"); 27088 - putp(carriage_return); 27089 + NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx 27090 + "carriage_return", 27091 + carriage_return); 27092 } else 27093 - _nc_outch('\r'); 27094 + NCURSES_SP_NAME(_nc_outch) (NCURSES_SP_ARGx '\r'); 27095 xold = 0; 27096 27097 while (l > 0) { 27098 if (newline) { 27099 - TPUTS_TRACE("newline"); 27100 - putp(newline); 27101 + NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx 27102 + "newline", 27103 + newline); 27104 } else 27105 - _nc_outch('\n'); 27106 + NCURSES_SP_NAME(_nc_outch) (NCURSES_SP_ARGx '\n'); 27107 l--; 27108 } 27109 } 27110 @@ -929,27 +1011,35 @@ 27111 } 27112 } 27113 27114 - if (yold > screen_lines - 1) 27115 - yold = screen_lines - 1; 27116 - if (ynew > screen_lines - 1) 27117 - ynew = screen_lines - 1; 27118 + if (yold > screen_lines(SP_PARM) - 1) 27119 + yold = screen_lines(SP_PARM) - 1; 27120 + if (ynew > screen_lines(SP_PARM) - 1) 27121 + ynew = screen_lines(SP_PARM) - 1; 27122 27123 /* destination location is on screen now */ 27124 - code = onscreen_mvcur(yold, xold, ynew, xnew, TRUE); 27125 + code = onscreen_mvcur(NCURSES_SP_ARGx yold, xold, ynew, xnew, TRUE); 27126 20463 27127 /* 20464 27128 * Restore attributes if we disabled them before moving. … … 20469 27133 (unsigned long) AttrOf(oldattr), 20470 27134 _traceattr(AttrOf(oldattr)))); 20471 @@ -950,6 +952,14 @@ 27135 - (void) VIDATTR(AttrOf(oldattr), GetPair(oldattr)); 27136 + (void) VIDATTR(SP_PARM, AttrOf(oldattr), GetPair(oldattr)); 27137 } 27138 } 20472 27139 returnCode(code); 20473 27140 } … … 20484 27151 NCURSES_EXPORT_VAR(int) _nc_optimize_enable = OPTIMIZE_ALL; 20485 27152 #endif 27153 @@ -1212,25 +1302,25 @@ 27154 speeds[i], overhead, totalest); 27155 } 27156 } else if (buf[0] == 'c') { 27157 - (void) printf("char padding: %d\n", SP->_char_padding); 27158 - (void) printf("cr cost: %d\n", SP->_cr_cost); 27159 - (void) printf("cup cost: %d\n", SP->_cup_cost); 27160 - (void) printf("home cost: %d\n", SP->_home_cost); 27161 - (void) printf("ll cost: %d\n", SP->_ll_cost); 27162 + (void) printf("char padding: %d\n", CURRENT_SCREEN->_char_padding); 27163 + (void) printf("cr cost: %d\n", CURRENT_SCREEN->_cr_cost); 27164 + (void) printf("cup cost: %d\n", CURRENT_SCREEN->_cup_cost); 27165 + (void) printf("home cost: %d\n", CURRENT_SCREEN->_home_cost); 27166 + (void) printf("ll cost: %d\n", CURRENT_SCREEN->_ll_cost); 27167 #if USE_HARD_TABS 27168 - (void) printf("ht cost: %d\n", SP->_ht_cost); 27169 - (void) printf("cbt cost: %d\n", SP->_cbt_cost); 27170 + (void) printf("ht cost: %d\n", CURRENT_SCREEN->_ht_cost); 27171 + (void) printf("cbt cost: %d\n", CURRENT_SCREEN->_cbt_cost); 27172 #endif /* USE_HARD_TABS */ 27173 - (void) printf("cub1 cost: %d\n", SP->_cub1_cost); 27174 - (void) printf("cuf1 cost: %d\n", SP->_cuf1_cost); 27175 - (void) printf("cud1 cost: %d\n", SP->_cud1_cost); 27176 - (void) printf("cuu1 cost: %d\n", SP->_cuu1_cost); 27177 - (void) printf("cub cost: %d\n", SP->_cub_cost); 27178 - (void) printf("cuf cost: %d\n", SP->_cuf_cost); 27179 - (void) printf("cud cost: %d\n", SP->_cud_cost); 27180 - (void) printf("cuu cost: %d\n", SP->_cuu_cost); 27181 - (void) printf("hpa cost: %d\n", SP->_hpa_cost); 27182 - (void) printf("vpa cost: %d\n", SP->_vpa_cost); 27183 + (void) printf("cub1 cost: %d\n", CURRENT_SCREEN->_cub1_cost); 27184 + (void) printf("cuf1 cost: %d\n", CURRENT_SCREEN->_cuf1_cost); 27185 + (void) printf("cud1 cost: %d\n", CURRENT_SCREEN->_cud1_cost); 27186 + (void) printf("cuu1 cost: %d\n", CURRENT_SCREEN->_cuu1_cost); 27187 + (void) printf("cub cost: %d\n", CURRENT_SCREEN->_cub_cost); 27188 + (void) printf("cuf cost: %d\n", CURRENT_SCREEN->_cuf_cost); 27189 + (void) printf("cud cost: %d\n", CURRENT_SCREEN->_cud_cost); 27190 + (void) printf("cuu cost: %d\n", CURRENT_SCREEN->_cuu_cost); 27191 + (void) printf("hpa cost: %d\n", CURRENT_SCREEN->_hpa_cost); 27192 + (void) printf("vpa cost: %d\n", CURRENT_SCREEN->_vpa_cost); 27193 } else if (buf[0] == 'x' || buf[0] == 'q') 27194 break; 27195 else 27196 diff -Naur ncurses-5.7.orig/ncurses/tty/lib_tstp.c ncurses-5.7/ncurses/tty/lib_tstp.c 27197 --- ncurses-5.7.orig/ncurses/tty/lib_tstp.c 2008-05-03 09:24:56.000000000 -0700 27198 +++ ncurses-5.7/ncurses/tty/lib_tstp.c 2009-06-05 14:01:51.000000000 -0700 27199 @@ -1,5 +1,5 @@ 27200 /**************************************************************************** 27201 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 27202 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 27203 * * 27204 * Permission is hereby granted, free of charge, to any person obtaining a * 27205 * copy of this software and associated documentation files (the * 27206 @@ -46,7 +46,7 @@ 27207 #define _POSIX_SOURCE 27208 #endif 27209 27210 -MODULE_ID("$Id: lib_tstp.c,v 1.37 2008/05/03 16:24:56 tom Exp $") 27211 +MODULE_ID("$Id: lib_tstp.c,v 1.39 2009/05/09 15:46:20 tom Exp $") 27212 27213 #if defined(SIGTSTP) && (HAVE_SIGACTION || HAVE_SIGVEC) 27214 #define USE_SIGTSTP 1 27215 @@ -59,16 +59,20 @@ 27216 signal_name(int sig) 27217 { 27218 switch (sig) { 27219 +#ifdef SIGALRM 27220 case SIGALRM: 27221 return "SIGALRM"; 27222 +#endif 27223 #ifdef SIGCONT 27224 case SIGCONT: 27225 return "SIGCONT"; 27226 #endif 27227 case SIGINT: 27228 return "SIGINT"; 27229 +#ifdef SIGQUIT 27230 case SIGQUIT: 27231 return "SIGQUIT"; 27232 +#endif 27233 case SIGTERM: 27234 return "SIGTERM"; 27235 #ifdef SIGTSTP 27236 @@ -136,6 +140,7 @@ 27237 static void 27238 tstp(int dummy GCC_UNUSED) 27239 { 27240 + SCREEN *sp = CURRENT_SCREEN; 27241 sigset_t mask, omask; 27242 sigaction_t act, oact; 27243 27244 @@ -154,11 +159,11 @@ 27245 * parent was stopped before us, and we would likely pick up the 27246 * settings already modified by the shell. 27247 */ 27248 - if (SP != 0 && !SP->_endwin) /* don't do this if we're not in curses */ 27249 + if (sp != 0 && !sp->_endwin) /* don't do this if we're not in curses */ 27250 #if HAVE_TCGETPGRP 27251 if (tcgetpgrp(STDIN_FILENO) == getpgrp()) 27252 #endif 27253 - def_prog_mode(); 27254 + NCURSES_SP_NAME(def_prog_mode) (NCURSES_SP_ARG); 27255 27256 /* 27257 * Block window change and timer signals. The latter 27258 @@ -166,7 +171,9 @@ 27259 * to repaint the screen. 27260 */ 27261 (void) sigemptyset(&mask); 27262 +#ifdef SIGALRM 27263 (void) sigaddset(&mask, SIGALRM); 27264 +#endif 27265 #if USE_SIGWINCH 27266 (void) sigaddset(&mask, SIGWINCH); 27267 #endif 27268 @@ -185,7 +192,7 @@ 27269 * End window mode, which also resets the terminal state to the 27270 * original (pre-curses) modes. 27271 */ 27272 - endwin(); 27273 + NCURSES_SP_NAME(endwin) (NCURSES_SP_ARG); 27274 27275 /* Unblock SIGTSTP. */ 27276 (void) sigemptyset(&mask); 27277 @@ -212,19 +219,19 @@ 27278 27279 T(("SIGCONT received")); 27280 sigaction(SIGTSTP, &oact, NULL); 27281 - flushinp(); 27282 + NCURSES_SP_NAME(flushinp) (NCURSES_SP_ARG); 27283 27284 /* 27285 * If the user modified the tty state while suspended, he wants 27286 * those changes to stick. So save the new "default" terminal state. 27287 */ 27288 - def_shell_mode(); 27289 + NCURSES_SP_NAME(def_shell_mode) (NCURSES_SP_ARG); 27290 27291 /* 27292 * This relies on the fact that doupdate() will restore the 27293 * program-mode tty state, and issue enter_ca_mode if need be. 27294 */ 27295 - doupdate(); 27296 + NCURSES_SP_NAME(doupdate) (NCURSES_SP_ARG); 27297 27298 /* Reset the signals. */ 27299 (void) sigprocmask(SIG_SETMASK, &omask, NULL); 27300 @@ -234,6 +241,8 @@ 27301 static void 27302 cleanup(int sig) 27303 { 27304 + SCREEN *sp = CURRENT_SCREEN; 27305 + 27306 /* 27307 * Actually, doing any sort of I/O from within an signal handler is 27308 * "unsafe". But we'll _try_ to clean up the screen and terminal 27309 @@ -241,7 +250,10 @@ 27310 */ 27311 if (!_nc_globals.cleanup_nested++ 27312 && (sig == SIGINT 27313 - || sig == SIGQUIT)) { 27314 +#ifdef SIGQUIT 27315 + || sig == SIGQUIT 27316 +#endif 27317 + )) { 27318 #if HAVE_SIGACTION || HAVE_SIGVEC 27319 sigaction_t act; 27320 sigemptyset(&act.sa_mask); 27321 @@ -257,12 +269,12 @@ 27322 if (scan->_ofp != 0 27323 && isatty(fileno(scan->_ofp))) { 27324 scan->_cleanup = TRUE; 27325 - scan->_outch = _nc_outch; 27326 + scan->_outch = NCURSES_SP_NAME(_nc_outch); 27327 } 27328 set_term(scan); 27329 - endwin(); 27330 - if (SP) 27331 - SP->_endwin = FALSE; /* in case we have an atexit! */ 27332 + NCURSES_SP_NAME(endwin) (NCURSES_SP_ARG); 27333 + if (sp) 27334 + sp->_endwin = FALSE; /* in case we have an atexit! */ 27335 } 27336 } 27337 } 27338 diff -Naur ncurses-5.7.orig/ncurses/tty/lib_twait.c ncurses-5.7/ncurses/tty/lib_twait.c 27339 --- ncurses-5.7.orig/ncurses/tty/lib_twait.c 2008-08-30 13:08:19.000000000 -0700 27340 +++ ncurses-5.7/ncurses/tty/lib_twait.c 2009-06-05 14:01:44.000000000 -0700 27341 @@ -1,5 +1,5 @@ 27342 /**************************************************************************** 27343 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 27344 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 27345 * * 27346 * Permission is hereby granted, free of charge, to any person obtaining a * 27347 * copy of this software and associated documentation files (the * 27348 @@ -65,10 +65,12 @@ 27349 # include <sys/select.h> 27350 # endif 27351 #endif 27352 - 27353 +#ifdef __MINGW32__ 27354 +# include <sys/time.h> 27355 +#endif 27356 #undef CUR 27357 27358 -MODULE_ID("$Id: lib_twait.c,v 1.59 2008/08/30 20:08:19 tom Exp $") 27359 +MODULE_ID("$Id: lib_twait.c,v 1.60 2009/04/18 21:01:13 tom Exp $") 27360 27361 static long 27362 _nc_gettime(TimeType * t0, bool first) 27363 @@ -124,15 +126,27 @@ 27364 } 27365 #endif /* NCURSES_WGETCH_EVENTS */ 27366 27367 +#if (USE_FUNC_POLL || HAVE_SELECT) 27368 +# define MAYBE_UNUSED 27369 +#else 27370 +# define MAYBE_UNUSED GCC_UNUSED 27371 +#endif 27372 + 27373 +#if (USE_FUNC_POLL || HAVE_SELECT) 27374 +# define MAYBE_UNUSED 27375 +#else 27376 +# define MAYBE_UNUSED GCC_UNUSED 27377 +#endif 27378 + 27379 /* 27380 * Wait a specified number of milliseconds, returning nonzero if the timer 27381 * didn't expire before there is activity on the specified file descriptors. 27382 * The file-descriptors are specified by the mode: 27383 - * 0 - none (absolute time) 27384 - * 1 - ncurses' normal input-descriptor 27385 - * 2 - mouse descriptor, if any 27386 - * 3 - either input or mouse. 27387 - * 27388 + * TW_NONE 0 - none (absolute time) 27389 + * TW_INPUT 1 - ncurses' normal input-descriptor 27390 + * TW_MOUSE 2 - mouse descriptor, if any 27391 + * TW_ANY 3 - either input or mouse. 27392 + * TW_EVENT 4 - 27393 * Experimental: if NCURSES_WGETCH_EVENTS is defined, (mode & 4) determines 27394 * whether to pay attention to evl argument. If set, the smallest of 27395 * millisecond and of timeout of evl is taken. 27396 @@ -143,16 +157,18 @@ 27397 * descriptors. 27398 */ 27399 NCURSES_EXPORT(int) 27400 -_nc_timed_wait(SCREEN *sp, 27401 - int mode, 27402 +_nc_timed_wait(SCREEN *sp MAYBE_UNUSED, 27403 + int mode MAYBE_UNUSED, 27404 int milliseconds, 27405 int *timeleft 27406 EVENTLIST_2nd(_nc_eventlist * evl)) 27407 { 27408 - int fd; 27409 int count; 27410 - int result = 0; 27411 + int result = TW_NONE; 27412 TimeType t0; 27413 +#if (USE_FUNC_POLL || HAVE_SELECT) 27414 + int fd; 27415 +#endif 27416 27417 #ifdef NCURSES_WGETCH_EVENTS 27418 int timeout_is_event = 0; 27419 @@ -174,7 +190,7 @@ 27420 milliseconds, mode)); 27421 27422 #ifdef NCURSES_WGETCH_EVENTS 27423 - if (mode & 4) { 27424 + if (mode & TW_EVENT) { 27425 int event_delay = _nc_eventlist_timeout(evl); 27426 27427 if (event_delay >= 0 27428 @@ -193,7 +209,7 @@ 27429 count = 0; 27430 27431 #ifdef NCURSES_WGETCH_EVENTS 27432 - if ((mode & 4) && evl) 27433 + if ((mode & TW_EVENT) && evl) 27434 evl->result_flags = 0; 27435 #endif 27436 27437 @@ -201,23 +217,23 @@ 27438 memset(fd_list, 0, sizeof(fd_list)); 27439 27440 #ifdef NCURSES_WGETCH_EVENTS 27441 - if ((mode & 4) && evl) 27442 + if ((mode & TW_EVENT) && evl) 27443 fds = typeMalloc(struct pollfd, MIN_FDS + evl->count); 27444 #endif 27445 27446 - if (mode & 1) { 27447 + if (mode & TW_INPUT) { 27448 fds[count].fd = sp->_ifd; 27449 fds[count].events = POLLIN; 27450 count++; 27451 } 27452 - if ((mode & 2) 27453 + if ((mode & TW_MOUSE) 27454 && (fd = sp->_mouse_fd) >= 0) { 27455 fds[count].fd = fd; 27456 fds[count].events = POLLIN; 27457 count++; 27458 } 27459 #ifdef NCURSES_WGETCH_EVENTS 27460 - if ((mode & 4) && evl) { 27461 + if ((mode & TW_EVENT) && evl) { 27462 for (n = 0; n < evl->count; ++n) { 27463 _nc_event *ev = evl->events[n]; 27464 27465 @@ -234,7 +250,7 @@ 27466 result = poll(fds, (unsigned) count, milliseconds); 27467 27468 #ifdef NCURSES_WGETCH_EVENTS 27469 - if ((mode & 4) && evl) { 27470 + if ((mode & TW_EVENT) && evl) { 27471 int c; 27472 27473 if (!result) 27474 @@ -276,8 +292,8 @@ 27475 * 27476 * FIXME: this assumes mode&1 if milliseconds < 0 (see lib_getch.c). 27477 */ 27478 - result = 0; 27479 - if (mode & 1) { 27480 + result = TW_NONE; 27481 + if (mode & TW_INPUT) { 27482 int step = (milliseconds < 0) ? 0 : 5000; 27483 bigtime_t d; 27484 bigtime_t useconds = milliseconds * 1000; 27485 @@ -313,17 +329,17 @@ 27486 */ 27487 FD_ZERO(&set); 27488 27489 - if (mode & 1) { 27490 + if (mode & TW_INPUT) { 27491 FD_SET(sp->_ifd, &set); 27492 count = sp->_ifd + 1; 27493 } 27494 - if ((mode & 2) 27495 + if ((mode & TW_MOUSE) 27496 && (fd = sp->_mouse_fd) >= 0) { 27497 FD_SET(fd, &set); 27498 count = max(fd, count) + 1; 27499 } 27500 #ifdef NCURSES_WGETCH_EVENTS 27501 - if ((mode & 4) && evl) { 27502 + if ((mode & TW_EVENT) && evl) { 27503 for (n = 0; n < evl->count; ++n) { 27504 _nc_event *ev = evl->events[n]; 27505 27506 @@ -346,7 +362,7 @@ 27507 } 27508 27509 #ifdef NCURSES_WGETCH_EVENTS 27510 - if ((mode & 4) && evl) { 27511 + if ((mode & TW_EVENT) && evl) { 27512 evl->result_flags = 0; 27513 for (n = 0; n < evl->count; ++n) { 27514 _nc_event *ev = evl->events[n]; 27515 @@ -428,22 +444,22 @@ 27516 } 27517 } 27518 #elif defined(__BEOS__) 27519 - result = 1; /* redundant, but simple */ 27520 + result = TW_INPUT; /* redundant, but simple */ 27521 #elif HAVE_SELECT 27522 - if ((mode & 2) 27523 + if ((mode & TW_MOUSE) 27524 && (fd = sp->_mouse_fd) >= 0 27525 && FD_ISSET(fd, &set)) 27526 - result |= 2; 27527 - if ((mode & 1) 27528 + result |= TW_MOUSE; 27529 + if ((mode & TW_INPUT) 27530 && FD_ISSET(sp->_ifd, &set)) 27531 - result |= 1; 27532 + result |= TW_INPUT; 27533 #endif 27534 } else 27535 result = 0; 27536 } 27537 #ifdef NCURSES_WGETCH_EVENTS 27538 - if ((mode & 4) && evl && evl->result_flags) 27539 - result |= 4; 27540 + if ((mode & TW_EVENT) && evl && evl->result_flags) 27541 + result |= TW_EVENT; 27542 #endif 27543 27544 return (result); 20486 27545 diff -Naur ncurses-5.7.orig/ncurses/tty/lib_vidattr.c ncurses-5.7/ncurses/tty/lib_vidattr.c 20487 27546 --- ncurses-5.7.orig/ncurses/tty/lib_vidattr.c 2007-06-30 14:58:04.000000000 -0700 20488 +++ ncurses-5.7/ncurses/tty/lib_vidattr.c 2009-0 3-22 21:17:07.020082134-070027547 +++ ncurses-5.7/ncurses/tty/lib_vidattr.c 2009-06-05 14:01:51.000000000 -0700 20489 27548 @@ -1,5 +1,5 @@ 20490 27549 /**************************************************************************** … … 20504 27563 20505 27564 /* 20506 @@ -65, 7 +66,7@@27565 @@ -65,9 +66,15 @@ 20507 27566 #include <curses.priv.h> 20508 27567 #include <term.h> 20509 27568 20510 27569 -MODULE_ID("$Id: lib_vidattr.c,v 1.49 2007/06/30 21:58:04 tom Exp $") 20511 +MODULE_ID("$Id: lib_vidattr.c,v 1.51 2009/02/21 21:43:40 tom Exp $") 20512 20513 #define doPut(mode) TPUTS_TRACE(#mode); tputs(mode, 1, outc) 20514 20515 @@ -299,7 +300,7 @@ 27570 +#ifndef CUR 27571 +#define CUR SP_TERMTYPE 27572 +#endif 27573 + 27574 +MODULE_ID("$Id: lib_vidattr.c,v 1.56 2009/05/10 00:48:29 tom Exp $") 27575 27576 -#define doPut(mode) TPUTS_TRACE(#mode); tputs(mode, 1, outc) 27577 +#define doPut(mode) \ 27578 + TPUTS_TRACE(#mode); \ 27579 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx mode, 1, outc) 27580 27581 #define TurnOn(mask,mode) \ 27582 if ((turn_on & mask) && mode) { doPut(mode); } 27583 @@ -83,21 +90,24 @@ 27584 if ((pair != old_pair) \ 27585 || (fix_pair0 && (pair == 0)) \ 27586 || (reverse ^ ((old_attr & A_REVERSE) != 0))) { \ 27587 - _nc_do_color(old_pair, pair, reverse, outc); \ 27588 + NCURSES_SP_NAME(_nc_do_color) (NCURSES_SP_ARGx \ 27589 + old_pair, pair, reverse, outc); \ 27590 } \ 27591 } 27592 27593 #define PreviousAttr _nc_prescreen.previous_attr 27594 27595 NCURSES_EXPORT(int) 27596 -vidputs(chtype newmode, int (*outc) (int)) 27597 +NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx 27598 + chtype newmode, 27599 + NCURSES_SP_OUTC outc) 27600 { 27601 attr_t turn_on, turn_off; 27602 int pair; 27603 bool reverse = FALSE; 27604 - bool can_color = (SP == 0 || SP->_coloron); 27605 + bool can_color = (SP_PARM == 0 || SP_PARM->_coloron); 27606 #if NCURSES_EXT_FUNCS 27607 - bool fix_pair0 = (SP != 0 && SP->_coloron && !SP->_default_color); 27608 + bool fix_pair0 = (SP_PARM != 0 && SP_PARM->_coloron && !SP_PARM->_default_color); 27609 #else 27610 #define fix_pair0 FALSE 27611 #endif 27612 @@ -106,12 +116,12 @@ 27613 T((T_CALLED("vidputs(%s)"), _traceattr(newmode))); 27614 27615 /* this allows us to go on whether or not newterm() has been called */ 27616 - if (SP) 27617 - PreviousAttr = AttrOf(SCREEN_ATTRS(SP)); 27618 + if (SP_PARM) 27619 + PreviousAttr = AttrOf(SCREEN_ATTRS(SP_PARM)); 27620 27621 TR(TRACE_ATTRS, ("previous attribute was %s", _traceattr(PreviousAttr))); 27622 27623 - if ((SP != 0) 27624 + if ((SP_PARM != 0) 27625 && (magic_cookie_glitch > 0)) { 27626 #if USE_XMC_SUPPORT 27627 static const chtype table[] = 27628 @@ -135,7 +145,7 @@ 27629 * the terminfo max_attributes value. 27630 */ 27631 for (n = 0; n < SIZEOF(table); ++n) { 27632 - if ((table[n] & SP->_ok_attributes) == 0) { 27633 + if ((table[n] & SP_PARM->_ok_attributes) == 0) { 27634 newmode &= ~table[n]; 27635 } else if ((table[n] & newmode) != 0) { 27636 if (used++ >= limit) { 27637 @@ -148,7 +158,7 @@ 27638 } 27639 } 27640 #else 27641 - newmode &= ~(SP->_xmc_suppress); 27642 + newmode &= ~(SP_PARM->_xmc_suppress); 27643 #endif 27644 TR(TRACE_ATTRS, ("suppressed attribute is %s", _traceattr(newmode))); 27645 } 27646 @@ -208,10 +218,10 @@ 27647 if (exit_attribute_mode) { 27648 doPut(exit_attribute_mode); 27649 } else { 27650 - if (!SP || SP->_use_rmul) { 27651 + if (!SP_PARM || SP_PARM->_use_rmul) { 27652 TurnOff(A_UNDERLINE, exit_underline_mode); 27653 } 27654 - if (!SP || SP->_use_rmso) { 27655 + if (!SP_PARM || SP_PARM->_use_rmso) { 27656 TurnOff(A_STANDOUT, exit_standout_mode); 27657 } 27658 } 27659 @@ -222,16 +232,18 @@ 27660 } else if (set_attributes) { 27661 if (turn_on || turn_off) { 27662 TPUTS_TRACE("set_attributes"); 27663 - tputs(tparm(set_attributes, 27664 - (newmode & A_STANDOUT) != 0, 27665 - (newmode & A_UNDERLINE) != 0, 27666 - (newmode & A_REVERSE) != 0, 27667 - (newmode & A_BLINK) != 0, 27668 - (newmode & A_DIM) != 0, 27669 - (newmode & A_BOLD) != 0, 27670 - (newmode & A_INVIS) != 0, 27671 - (newmode & A_PROTECT) != 0, 27672 - (newmode & A_ALTCHARSET) != 0), 1, outc); 27673 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx 27674 + tparm(set_attributes, 27675 + (newmode & A_STANDOUT) != 0, 27676 + (newmode & A_UNDERLINE) != 0, 27677 + (newmode & A_REVERSE) != 0, 27678 + (newmode & A_BLINK) != 0, 27679 + (newmode & A_DIM) != 0, 27680 + (newmode & A_BOLD) != 0, 27681 + (newmode & A_INVIS) != 0, 27682 + (newmode & A_PROTECT) != 0, 27683 + (newmode & A_ALTCHARSET) != 0), 27684 + 1, outc); 27685 PreviousAttr &= ALL_BUT_COLOR; 27686 } 27687 SetColorsIf((pair != 0) || fix_pair0, PreviousAttr); 27688 @@ -241,11 +253,11 @@ 27689 27690 TurnOff(A_ALTCHARSET, exit_alt_charset_mode); 27691 27692 - if (!SP || SP->_use_rmul) { 27693 + if (!SP_PARM || SP_PARM->_use_rmul) { 27694 TurnOff(A_UNDERLINE, exit_underline_mode); 27695 } 27696 27697 - if (!SP || SP->_use_rmso) { 27698 + if (!SP_PARM || SP_PARM->_use_rmso) { 27699 TurnOff(A_STANDOUT, exit_standout_mode); 27700 } 27701 27702 @@ -282,8 +294,8 @@ 27703 if (reverse) 27704 newmode |= A_REVERSE; 27705 27706 - if (SP) 27707 - SetAttr(SCREEN_ATTRS(SP), newmode); 27708 + if (SP_PARM) 27709 + SetAttr(SCREEN_ATTRS(SP_PARM), newmode); 27710 else 27711 PreviousAttr = newmode; 27712 27713 @@ -291,15 +303,33 @@ 20516 27714 } 27715 27716 NCURSES_EXPORT(int) 27717 +NCURSES_SP_NAME(vidattr) (NCURSES_SP_DCLx 27718 + chtype newmode) 27719 +{ 27720 + return NCURSES_SP_NAME(vidputs) (NCURSES_SP_ARGx 27721 + newmode, 27722 + NCURSES_SP_NAME(_nc_outch)); 27723 +} 27724 + 27725 +#if NCURSES_SP_FUNCS 27726 +NCURSES_EXPORT(int) 27727 +vidputs(chtype newmode, NCURSES_OUTC outc) 27728 +{ 27729 + SetSafeOutcWrapper(outc); 27730 + return NCURSES_SP_NAME(vidputs) (CURRENT_SCREEN, newmode, _nc_outc_wrapper); 27731 +} 27732 + 27733 +NCURSES_EXPORT(int) 27734 vidattr(chtype newmode) 27735 { 27736 T((T_CALLED("vidattr(%s)"), _traceattr(newmode))); 27737 27738 returnCode(vidputs(newmode, _nc_outch)); 27739 } 27740 +#endif 20517 27741 20518 27742 NCURSES_EXPORT(chtype) … … 20522 27746 chtype attrs = A_NORMAL; 20523 27747 20524 @@ -331,8 +3 32,16 @@27748 @@ -331,8 +361,16 @@ 20525 27749 if (enter_underline_mode) 20526 27750 attrs |= A_UNDERLINE; … … 20543 27767 diff -Naur ncurses-5.7.orig/ncurses/tty/tty_update.c ncurses-5.7/ncurses/tty/tty_update.c 20544 27768 --- ncurses-5.7.orig/ncurses/tty/tty_update.c 2008-08-30 13:08:19.000000000 -0700 20545 +++ ncurses-5.7/ncurses/tty/tty_update.c 2009-0 3-22 21:17:05.655995250 -070027769 +++ ncurses-5.7/ncurses/tty/tty_update.c 2009-06-05 14:01:52.000000000 -0700 20546 27770 @@ -1,5 +1,5 @@ 20547 27771 /**************************************************************************** … … 20559 27783 20560 27784 /*----------------------------------------------------------------- 20561 @@ -78,7 +79,7 @@ 27785 @@ -38,12 +39,16 @@ 27786 * 27787 * The routine doupdate() and its dependents. 27788 * All physical output is concentrated here (except _nc_outch() 27789 - * in lib_tputs.c). 27790 + * in lib_tputs.c). 27791 * 27792 *-----------------------------------------------------------------*/ 27793 27794 #include <curses.priv.h> 27795 27796 +#ifndef CUR 27797 +#define CUR SP_TERMTYPE 27798 +#endif 27799 + 27800 #if defined __HAIKU__ && defined __BEOS__ 27801 #undef __BEOS__ 27802 #endif 27803 @@ -76,9 +81,8 @@ 27804 #endif 27805 20562 27806 #include <ctype.h> 20563 27807 -#include <term.h> 20564 27808 20565 27809 -MODULE_ID("$Id: tty_update.c,v 1.246 2008/08/30 20:08:19 tom Exp $") 20566 +MODULE_ID("$Id: tty_update.c,v 1.2 48 2009/02/15 00:51:22tom Exp $")27810 +MODULE_ID("$Id: tty_update.c,v 1.256 2009/05/17 00:13:49 tom Exp $") 20567 27811 20568 27812 /* 20569 27813 * This define controls the line-breakout optimization. Every once in a 20570 @@ -618,7 +619,7 @@ 27814 @@ -91,7 +95,7 @@ 27815 */ 27816 #define CHECK_INTERVAL 5 27817 27818 -#define FILL_BCE() (SP->_coloron && !SP->_default_color && !back_color_erase) 27819 +#define FILL_BCE(sp) (sp->_coloron && !sp->_default_color && !back_color_erase) 27820 27821 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT); 27822 static NCURSES_CH_T normal = NewChar(BLANK_TEXT); 27823 @@ -103,13 +107,23 @@ 27824 */ 27825 /* #define POSITION_DEBUG */ 27826 27827 -static NCURSES_INLINE NCURSES_CH_T ClrBlank(WINDOW *win); 27828 +static NCURSES_INLINE NCURSES_CH_T ClrBlank(NCURSES_SP_DCLx WINDOW *win); 27829 + 27830 +#if NCURSES_SP_FUNCS 27831 +static int ClrBottom(SCREEN *, int total); 27832 +static void ClearScreen(SCREEN *, NCURSES_CH_T blank); 27833 +static void ClrUpdate(SCREEN *); 27834 +static void DelChar(SCREEN *, int count); 27835 +static void InsStr(SCREEN *, NCURSES_CH_T * line, int count); 27836 +static void TransformLine(SCREEN *, int const lineno); 27837 +#else 27838 static int ClrBottom(int total); 27839 static void ClearScreen(NCURSES_CH_T blank); 27840 static void ClrUpdate(void); 27841 static void DelChar(int count); 27842 static void InsStr(NCURSES_CH_T * line, int count); 27843 static void TransformLine(int const lineno); 27844 +#endif 27845 27846 #ifdef POSITION_DEBUG 27847 /**************************************************************************** 27848 @@ -119,7 +133,7 @@ 27849 ****************************************************************************/ 27850 27851 static void 27852 -position_check(int expected_y, int expected_x, char *legend) 27853 +position_check(NCURSES_SP_DCLx int expected_y, int expected_x, char *legend) 27854 /* check to see if the real cursor position matches the virtual */ 27855 { 27856 char buf[20]; 27857 @@ -129,10 +143,10 @@ 27858 if (!_nc_tracing || (expected_y < 0 && expected_x < 0)) 27859 return; 27860 27861 - _nc_flush(); 27862 + NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG); 27863 memset(buf, '\0', sizeof(buf)); 27864 - putp("\033[6n"); /* only works on ANSI-compatibles */ 27865 - _nc_flush(); 27866 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx "\033[6n"); /* only works on ANSI-compatibles */ 27867 + NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG); 27868 *(s = buf) = 0; 27869 do { 27870 int ask = sizeof(buf) - 1 - (s - buf); 27871 @@ -152,8 +166,12 @@ 27872 if (expected_y < 0) 27873 expected_y = y - 1; 27874 if (y - 1 != expected_y || x - 1 != expected_x) { 27875 - beep(); 27876 - tputs(tparm("\033[%d;%dH", expected_y + 1, expected_x + 1), 1, _nc_outch); 27877 + NCURSES_SP_NAME(beep) (NCURSES_SP_ARG); 27878 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx 27879 + tparm("\033[%d;%dH", 27880 + expected_y + 1, 27881 + expected_x + 1), 27882 + 1, NCURSES_SP_NAME(_nc_outch)); 27883 _tracef("position seen (%d, %d) doesn't match expected one (%d, %d) in %s", 27884 y - 1, x - 1, expected_y, expected_x, legend); 27885 } else { 27886 @@ -162,7 +180,7 @@ 27887 } 27888 } 27889 #else 27890 -#define position_check(expected_y, expected_x, legend) /* nothing */ 27891 +#define position_check(sp, expected_y, expected_x, legend) /* nothing */ 27892 #endif /* POSITION_DEBUG */ 27893 27894 /**************************************************************************** 27895 @@ -172,19 +190,19 @@ 27896 ****************************************************************************/ 27897 27898 static NCURSES_INLINE void 27899 -GoTo(int const row, int const col) 27900 +GoTo(NCURSES_SP_DCLx int const row, int const col) 27901 { 27902 TR(TRACE_MOVE, ("GoTo(%d, %d) from (%d, %d)", 27903 - row, col, SP->_cursrow, SP->_curscol)); 27904 + row, col, SP_PARM->_cursrow, SP_PARM->_curscol)); 27905 27906 - position_check(SP->_cursrow, SP->_curscol, "GoTo"); 27907 + position_check(SP_PARM, SP_PARM->_cursrow, SP_PARM->_curscol, "GoTo"); 27908 27909 - mvcur(SP->_cursrow, SP->_curscol, row, col); 27910 - position_check(SP->_cursrow, SP->_curscol, "GoTo2"); 27911 + mvcur(SP_PARM->_cursrow, SP_PARM->_curscol, row, col); 27912 + position_check(SP_PARM, SP_PARM->_cursrow, SP_PARM->_curscol, "GoTo2"); 27913 } 27914 27915 static NCURSES_INLINE void 27916 -PutAttrChar(CARG_CH_T ch) 27917 +PutAttrChar(NCURSES_SP_DCLx CARG_CH_T ch) 27918 { 27919 int chlen = 1; 27920 NCURSES_CH_T my_ch; 27921 @@ -194,7 +212,7 @@ 27922 27923 TR(TRACE_CHARPUT, ("PutAttrChar(%s) at (%d, %d)", 27924 _tracech_t(ch), 27925 - SP->_cursrow, SP->_curscol)); 27926 + SP_PARM->_cursrow, SP_PARM->_curscol)); 27927 #if USE_WIDEC_SUPPORT 27928 /* 27929 * If this is not a valid character, there is nothing more to do. 27930 @@ -224,12 +242,12 @@ 27931 */ 27932 if (is8bits(CharOf(CHDEREF(ch))) 27933 && (isprint(CharOf(CHDEREF(ch))) 27934 - || (SP->_legacy_coding > 0 && CharOf(CHDEREF(ch)) >= 160) 27935 - || (SP->_legacy_coding > 1 && CharOf(CHDEREF(ch)) >= 128) 27936 + || (SP_PARM->_legacy_coding > 0 && CharOf(CHDEREF(ch)) >= 160) 27937 + || (SP_PARM->_legacy_coding > 1 && CharOf(CHDEREF(ch)) >= 128) 27938 || (AttrOf(attr) & A_ALTCHARSET 27939 && ((CharOfD(ch) < ACS_LEN 27940 - && SP->_acs_map != 0 27941 - && SP->_acs_map[CharOfD(ch)] != 0) 27942 + && SP_PARM->_acs_map != 0 27943 + && SP_PARM->_acs_map[CharOfD(ch)] != 0) 27944 || (CharOfD(ch) >= 128))))) { 27945 ; 27946 } else { 27947 @@ -241,7 +259,7 @@ 27948 #endif 27949 27950 if ((AttrOf(attr) & A_ALTCHARSET) 27951 - && SP->_acs_map != 0 27952 + && SP_PARM->_acs_map != 0 27953 && CharOfD(ch) < ACS_LEN) { 27954 my_ch = CHDEREF(ch); /* work around const param */ 27955 #if USE_WIDEC_SUPPORT 27956 @@ -251,8 +269,8 @@ 27957 * character, and uses the wide-character mapping when we expect the 27958 * normal one to be broken (by mis-design ;-). 27959 */ 27960 - if (SP->_screen_acs_fix 27961 - && SP->_screen_acs_map[CharOf(my_ch)]) { 27962 + if (SP_PARM->_screen_acs_fix 27963 + && SP_PARM->_screen_acs_map[CharOf(my_ch)]) { 27964 RemAttr(attr, A_ALTCHARSET); 27965 my_ch = _nc_wacs[CharOf(my_ch)]; 27966 } 27967 @@ -265,9 +283,9 @@ 27968 */ 27969 if (AttrOf(attr) & A_ALTCHARSET) { 27970 int j = CharOfD(ch); 27971 - chtype temp = UChar(SP->_acs_map[j]); 27972 + chtype temp = UChar(SP_PARM->_acs_map[j]); 27973 27974 - if (!(SP->_screen_acs_map[j])) { 27975 + if (!(SP_PARM->_screen_acs_map[j])) { 27976 RemAttr(attr, A_ALTCHARSET); 27977 if (temp == 0) 27978 temp = ' '; 27979 @@ -282,28 +300,28 @@ 27980 ch = CHREF(tilde); 27981 } 27982 27983 - UpdateAttrs(attr); 27984 + UpdateAttrs(SP_PARM, attr); 27985 #if !USE_WIDEC_SUPPORT 27986 /* FIXME - we do this special case for signal handling, should see how to 27987 * make it work for wide characters. 27988 */ 27989 - if (SP->_outch != 0) { 27990 - SP->_outch(UChar(ch)); 27991 + if (SP_PARM->_outch != 0) { 27992 + SP_PARM->_outch(NCURSES_SP_ARGx UChar(ch)); 27993 } else 27994 #endif 27995 { 27996 - PUTC(CHDEREF(ch), SP->_ofp); /* macro's fastest... */ 27997 + PUTC(CHDEREF(ch), SP_PARM->_ofp); /* macro's fastest... */ 27998 COUNT_OUTCHARS(1); 27999 } 28000 - SP->_curscol += chlen; 28001 + SP_PARM->_curscol += chlen; 28002 if (char_padding) { 28003 TPUTS_TRACE("char_padding"); 28004 - putp(char_padding); 28005 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx char_padding); 28006 } 28007 } 28008 28009 static bool 28010 -check_pending(void) 28011 +check_pending(NCURSES_SP_DCL0) 28012 /* check for pending input */ 28013 { 28014 bool have_pending = FALSE; 28015 @@ -313,13 +331,13 @@ 28016 * have the refreshing slow down drastically (or stop) if there's an 28017 * unread character available. 28018 */ 28019 - if (SP->_fifohold != 0) 28020 + if (SP_PARM->_fifohold != 0) 28021 return FALSE; 28022 28023 - if (SP->_checkfd >= 0) { 28024 + if (SP_PARM->_checkfd >= 0) { 28025 #if USE_FUNC_POLL 28026 struct pollfd fds[1]; 28027 - fds[0].fd = SP->_checkfd; 28028 + fds[0].fd = SP_PARM->_checkfd; 28029 fds[0].events = POLLIN; 28030 if (poll(fds, 1, 0) > 0) { 28031 have_pending = TRUE; 28032 @@ -347,43 +365,52 @@ 28033 ktimeout.tv_usec = 0; 28034 28035 FD_ZERO(&fdset); 28036 - FD_SET(SP->_checkfd, &fdset); 28037 - if (select(SP->_checkfd + 1, &fdset, NULL, NULL, &ktimeout) != 0) { 28038 + FD_SET(SP_PARM->_checkfd, &fdset); 28039 + if (select(SP_PARM->_checkfd + 1, &fdset, NULL, NULL, &ktimeout) != 0) { 28040 have_pending = TRUE; 28041 } 28042 #endif 28043 } 28044 if (have_pending) { 28045 - SP->_fifohold = 5; 28046 - _nc_flush(); 28047 + SP_PARM->_fifohold = 5; 28048 + NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG); 28049 } 28050 return FALSE; 28051 } 28052 28053 /* put char at lower right corner */ 28054 static void 28055 -PutCharLR(const ARG_CH_T ch) 28056 +PutCharLR(NCURSES_SP_DCLx const ARG_CH_T ch) 28057 { 28058 if (!auto_right_margin) { 28059 /* we can put the char directly */ 28060 - PutAttrChar(ch); 28061 + PutAttrChar(NCURSES_SP_ARGx ch); 28062 } else if (enter_am_mode && exit_am_mode) { 28063 /* we can suppress automargin */ 28064 TPUTS_TRACE("exit_am_mode"); 28065 - putp(exit_am_mode); 28066 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx exit_am_mode); 28067 28068 - PutAttrChar(ch); 28069 - SP->_curscol--; 28070 - position_check(SP->_cursrow, SP->_curscol, "exit_am_mode"); 28071 + PutAttrChar(NCURSES_SP_ARGx ch); 28072 + SP_PARM->_curscol--; 28073 + position_check(SP_PARM, 28074 + SP_PARM->_cursrow, 28075 + SP_PARM->_curscol, 28076 + "exit_am_mode"); 28077 28078 TPUTS_TRACE("enter_am_mode"); 28079 - putp(enter_am_mode); 28080 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx enter_am_mode); 28081 } else if ((enter_insert_mode && exit_insert_mode) 28082 || insert_character || parm_ich) { 28083 - GoTo(screen_lines - 1, screen_columns - 2); 28084 - PutAttrChar(ch); 28085 - GoTo(screen_lines - 1, screen_columns - 2); 28086 - InsStr(newscr->_line[screen_lines - 1].text + screen_columns - 2, 1); 28087 + GoTo(NCURSES_SP_ARGx 28088 + screen_lines(SP_PARM) - 1, 28089 + screen_columns(SP_PARM) - 2); 28090 + PutAttrChar(NCURSES_SP_ARGx ch); 28091 + GoTo(NCURSES_SP_ARGx 28092 + screen_lines(SP_PARM) - 1, 28093 + screen_columns(SP_PARM) - 2); 28094 + InsStr(NCURSES_SP_ARGx 28095 + NewScreen(SP_PARM)->_line[screen_lines(SP_PARM) - 1].text + 28096 + screen_columns(SP_PARM) - 2, 1); 28097 } 28098 } 28099 28100 @@ -391,7 +418,7 @@ 28101 * Wrap the cursor position, i.e., advance to the beginning of the next line. 28102 */ 28103 static void 28104 -wrap_cursor(void) 28105 +wrap_cursor(NCURSES_SP_DCL0) 28106 { 28107 if (eat_newline_glitch) { 28108 /* 28109 @@ -407,40 +434,45 @@ 28110 * it's safe to just tell the code that the cursor is in hyperspace and 28111 * let the next mvcur() call straighten things out. 28112 */ 28113 - SP->_curscol = -1; 28114 - SP->_cursrow = -1; 28115 + SP_PARM->_curscol = -1; 28116 + SP_PARM->_cursrow = -1; 28117 } else if (auto_right_margin) { 28118 - SP->_curscol = 0; 28119 - SP->_cursrow++; 28120 + SP_PARM->_curscol = 0; 28121 + SP_PARM->_cursrow++; 28122 /* 28123 * We've actually moved - but may have to work around problems with 28124 * video attributes not working. 28125 */ 28126 - if (!move_standout_mode && AttrOf(SCREEN_ATTRS(SP))) { 28127 + if (!move_standout_mode && AttrOf(SCREEN_ATTRS(SP_PARM))) { 28128 TR(TRACE_CHARPUT, ("turning off (%#lx) %s before wrapping", 28129 - (unsigned long) AttrOf(SCREEN_ATTRS(SP)), 28130 - _traceattr(AttrOf(SCREEN_ATTRS(SP))))); 28131 - (void) VIDATTR(A_NORMAL, 0); 28132 + (unsigned long) AttrOf(SCREEN_ATTRS(SP_PARM)), 28133 + _traceattr(AttrOf(SCREEN_ATTRS(SP_PARM))))); 28134 + (void) VIDATTR(SP_PARM, A_NORMAL, 0); 28135 } 28136 } else { 28137 - SP->_curscol--; 28138 + SP_PARM->_curscol--; 28139 } 28140 - position_check(SP->_cursrow, SP->_curscol, "wrap_cursor"); 28141 + position_check(SP_PARM, 28142 + SP_PARM->_cursrow, 28143 + SP_PARM->_curscol, 28144 + "wrap_cursor"); 28145 } 28146 28147 static NCURSES_INLINE void 28148 -PutChar(const ARG_CH_T ch) 28149 +PutChar(NCURSES_SP_DCLx const ARG_CH_T ch) 28150 /* insert character, handling automargin stuff */ 28151 { 28152 - if (SP->_cursrow == screen_lines - 1 && SP->_curscol == screen_columns - 1) 28153 - PutCharLR(ch); 28154 - else 28155 - PutAttrChar(ch); 28156 + if (SP_PARM->_cursrow == screen_lines(SP_PARM) - 1 && 28157 + SP_PARM->_curscol == screen_columns(SP_PARM) - 1) { 28158 + PutCharLR(NCURSES_SP_ARGx ch); 28159 + } else { 28160 + PutAttrChar(NCURSES_SP_ARGx ch); 28161 + } 28162 28163 - if (SP->_curscol >= screen_columns) 28164 - wrap_cursor(); 28165 + if (SP_PARM->_curscol >= screen_columns(SP_PARM)) 28166 + wrap_cursor(NCURSES_SP_ARG); 28167 28168 - position_check(SP->_cursrow, SP->_curscol, "PutChar"); 28169 + position_check(SP_PARM, SP_PARM->_cursrow, SP_PARM->_curscol, "PutChar"); 28170 } 28171 28172 /* 28173 @@ -450,19 +482,19 @@ 28174 * or can be output by clearing (A_COLOR in case of bce-terminal) are excluded. 28175 */ 28176 static NCURSES_INLINE bool 28177 -can_clear_with(ARG_CH_T ch) 28178 +can_clear_with(NCURSES_SP_DCLx ARG_CH_T ch) 28179 { 28180 - if (!back_color_erase && SP->_coloron) { 28181 + if (!back_color_erase && SP_PARM->_coloron) { 28182 #if NCURSES_EXT_FUNCS 28183 int pair; 28184 28185 - if (!SP->_default_color) 28186 + if (!SP_PARM->_default_color) 28187 return FALSE; 28188 - if (SP->_default_fg != C_MASK || SP->_default_bg != C_MASK) 28189 + if (SP_PARM->_default_fg != C_MASK || SP_PARM->_default_bg != C_MASK) 28190 return FALSE; 28191 if ((pair = GetPair(CHDEREF(ch))) != 0) { 28192 short fg, bg; 28193 - pair_content(pair, &fg, &bg); 28194 + NCURSES_SP_NAME(pair_content) (NCURSES_SP_ARGx pair, &fg, &bg); 28195 if (fg != C_MASK || bg != C_MASK) 28196 return FALSE; 28197 } 28198 @@ -488,7 +520,7 @@ 28199 * This code is optimized using ech and rep. 28200 */ 28201 static int 28202 -EmitRange(const NCURSES_CH_T * ntext, int num) 28203 +EmitRange(NCURSES_SP_DCLx const NCURSES_CH_T * ntext, int num) 28204 { 28205 int i; 28206 28207 @@ -500,13 +532,13 @@ 28208 NCURSES_CH_T ntext0; 28209 28210 while (num > 1 && !CharEq(ntext[0], ntext[1])) { 28211 - PutChar(CHREF(ntext[0])); 28212 + PutChar(NCURSES_SP_ARGx CHREF(ntext[0])); 28213 ntext++; 28214 num--; 28215 } 28216 ntext0 = ntext[0]; 28217 if (num == 1) { 28218 - PutChar(CHREF(ntext0)); 28219 + PutChar(NCURSES_SP_ARGx CHREF(ntext0)); 28220 return 0; 28221 } 28222 runcount = 2; 28223 @@ -523,10 +555,10 @@ 28224 * which it would be marginally advantageous. 28225 */ 28226 if (erase_chars 28227 - && runcount > SP->_ech_cost + SP->_cup_ch_cost 28228 - && can_clear_with(CHREF(ntext0))) { 28229 - UpdateAttrs(ntext0); 28230 - putp(TPARM_1(erase_chars, runcount)); 28231 + && runcount > SP_PARM->_ech_cost + SP_PARM->_cup_ch_cost 28232 + && can_clear_with(NCURSES_SP_ARGx CHREF(ntext0))) { 28233 + UpdateAttrs(SP_PARM, ntext0); 28234 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx TPARM_1(erase_chars, runcount)); 28235 28236 /* 28237 * If this is the last part of the given interval, 28238 @@ -534,27 +566,34 @@ 28239 * last update on the line. 28240 */ 28241 if (runcount < num) { 28242 - GoTo(SP->_cursrow, SP->_curscol + runcount); 28243 + GoTo(NCURSES_SP_ARGx 28244 + SP_PARM->_cursrow, 28245 + SP_PARM->_curscol + runcount); 28246 } else { 28247 return 1; /* cursor stays in the middle */ 28248 } 28249 - } else if (repeat_char && runcount > SP->_rep_cost) { 28250 - bool wrap_possible = (SP->_curscol + runcount >= screen_columns); 28251 + } else if (repeat_char && runcount > SP_PARM->_rep_cost) { 28252 + bool wrap_possible = (SP_PARM->_curscol + runcount >= 28253 + screen_columns(SP_PARM)); 28254 int rep_count = runcount; 28255 28256 if (wrap_possible) 28257 rep_count--; 28258 28259 - UpdateAttrs(ntext0); 28260 - tputs(TPARM_2(repeat_char, CharOf(ntext0), rep_count), 28261 - rep_count, _nc_outch); 28262 - SP->_curscol += rep_count; 28263 + UpdateAttrs(SP_PARM, ntext0); 28264 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx 28265 + TPARM_2(repeat_char, 28266 + CharOf(ntext0), 28267 + rep_count), 28268 + rep_count, 28269 + NCURSES_SP_NAME(_nc_outch)); 28270 + SP_PARM->_curscol += rep_count; 28271 28272 if (wrap_possible) 28273 - PutChar(CHREF(ntext0)); 28274 + PutChar(NCURSES_SP_ARGx CHREF(ntext0)); 28275 } else { 28276 for (i = 0; i < runcount; i++) 28277 - PutChar(CHREF(ntext[i])); 28278 + PutChar(NCURSES_SP_ARGx CHREF(ntext[i])); 28279 } 28280 ntext += runcount; 28281 num -= runcount; 28282 @@ -563,7 +602,7 @@ 28283 } 28284 28285 for (i = 0; i < num; i++) 28286 - PutChar(CHREF(ntext[i])); 28287 + PutChar(NCURSES_SP_ARGx CHREF(ntext[i])); 28288 return 0; 28289 } 28290 28291 @@ -576,39 +615,40 @@ 28292 * Returns: same as EmitRange 28293 */ 28294 static int 28295 -PutRange(const NCURSES_CH_T * otext, 28296 +PutRange(NCURSES_SP_DCLx 28297 + const NCURSES_CH_T * otext, 28298 const NCURSES_CH_T * ntext, 28299 int row, 28300 int first, int last) 28301 { 28302 int i, j, same; 28303 28304 - TR(TRACE_CHARPUT, ("PutRange(%p, %p, %d, %d, %d)", 28305 - otext, ntext, row, first, last)); 28306 + TR(TRACE_CHARPUT, ("PutRange(%p, %p, %p, %d, %d, %d)", 28307 + SP_PARM, otext, ntext, row, first, last)); 28308 28309 if (otext != ntext 28310 - && (last - first + 1) > SP->_inline_cost) { 28311 + && (last - first + 1) > SP_PARM->_inline_cost) { 28312 for (j = first, same = 0; j <= last; j++) { 28313 if (!same && isWidecExt(otext[j])) 28314 continue; 28315 if (CharEq(otext[j], ntext[j])) { 28316 same++; 28317 } else { 28318 - if (same > SP->_inline_cost) { 28319 - EmitRange(ntext + first, j - same - first); 28320 - GoTo(row, first = j); 28321 + if (same > SP_PARM->_inline_cost) { 28322 + EmitRange(NCURSES_SP_ARGx ntext + first, j - same - first); 28323 + GoTo(NCURSES_SP_ARGx row, first = j); 28324 } 28325 same = 0; 28326 } 28327 } 28328 - i = EmitRange(ntext + first, j - same - first); 28329 + i = EmitRange(NCURSES_SP_ARGx ntext + first, j - same - first); 28330 /* 28331 * Always return 1 for the next GoTo() after a PutRange() if we found 28332 * identical characters at end of interval 28333 */ 28334 return (same == 0 ? i : 1); 28335 } 28336 - return EmitRange(ntext + first, last - first + 1); 28337 + return EmitRange(NCURSES_SP_ARGx ntext + first, last - first + 1); 28338 } 28339 28340 /* leave unbracketed here so 'indent' works */ 28341 @@ -618,7 +658,7 @@ 20571 28342 if_USE_SCROLL_HINTS(win->_line[row].oldindex = row) 20572 28343 … … 20577 28348 int i; 20578 28349 int nonempty; 20579 @@ -645,11 +646,11 @@ 28350 @@ -628,28 +668,47 @@ 28351 28352 T((T_CALLED("doupdate()"))); 28353 28354 - if (curscr == 0 28355 - || newscr == 0) 28356 +#if !USE_REENTRANT 28357 + /* 28358 + * It is "legal" but unlikely that an application could assign a new 28359 + * value to one of the standard windows. Check for that possibility 28360 + * and try to recover. 28361 + * 28362 + * We do not allow applications to assign new values in the reentrant 28363 + * model. 28364 + */ 28365 +#define SyncScreens(internal,exported) \ 28366 + if (internal == 0) internal = exported; \ 28367 + if (internal != exported) exported = internal 28368 + 28369 + SyncScreens(CurScreen(SP_PARM), curscr); 28370 + SyncScreens(NewScreen(SP_PARM), newscr); 28371 + SyncScreens(StdScreen(SP_PARM), stdscr); 28372 +#endif 28373 + 28374 + if (CurScreen(SP_PARM) == 0 28375 + || NewScreen(SP_PARM) == 0 28376 + || StdScreen(SP_PARM) == 0) 28377 returnCode(ERR); 28378 28379 #ifdef TRACE 28380 if (USE_TRACEF(TRACE_UPDATE)) { 28381 - if (curscr->_clear) 28382 + if (CurScreen(SP_PARM)->_clear) 28383 _tracef("curscr is clear"); 28384 else 28385 - _tracedump("curscr", curscr); 28386 - _tracedump("newscr", newscr); 28387 + _tracedump("curscr", CurScreen(SP_PARM)); 28388 + _tracedump("newscr", NewScreen(SP_PARM)); 28389 _nc_unlock_global(tracef); 28390 } 28391 #endif /* TRACE */ 20580 28392 20581 28393 _nc_signal_handler(FALSE); … … 20592 28404 * This is a transparent extension: XSI does not address it, 20593 28405 * and applications need not know that ncurses can do it. 20594 @@ -658,20 + 659,20 @@28406 @@ -658,20 +717,20 @@ 20595 28407 * (this can happen in an xterm, for example), and resize the 20596 28408 * ncurses data structures accordingly. … … 20605 28417 20606 28418 T(("coming back from shell mode")); 20607 reset_prog_mode(); 20608 20609 _nc_mvcur_resume(); 20610 _nc_screen_resume(); 28419 - reset_prog_mode(); 28420 + NCURSES_SP_NAME(reset_prog_mode) (NCURSES_SP_ARG); 28421 28422 - _nc_mvcur_resume(); 28423 - _nc_screen_resume(); 20611 28424 - SP->_mouse_resume(SP); 28425 + NCURSES_SP_NAME(_nc_mvcur_resume) (NCURSES_SP_ARG); 28426 + NCURSES_SP_NAME(_nc_screen_resume) (NCURSES_SP_ARG); 20612 28427 + SP_PARM->_mouse_resume(SP_PARM); 20613 28428 … … 20617 28432 #if USE_TRACE_TIMES 20618 28433 /* zero the metering machinery */ 20619 @@ -699,7 +700,7 @@ 20620 for (j = 0; j < screen_columns; j++) { 28434 @@ -695,11 +754,11 @@ 28435 int j, k; 28436 attr_t rattr = A_NORMAL; 28437 28438 - for (i = 0; i < screen_lines; i++) { 28439 - for (j = 0; j < screen_columns; j++) { 28440 + for (i = 0; i < screen_lines(SP_PARM); i++) { 28441 + for (j = 0; j < screen_columns(SP_PARM); j++) { 20621 28442 bool failed = FALSE; 20622 28443 - NCURSES_CH_T *thisline = newscr->_line[i].text; 20623 28444 - attr_t thisattr = AttrOf(thisline[j]) & SP->_xmc_triggers; 28445 + NCURSES_CH_T *thisline = NewScreen(SP_PARM)->_line[i].text; 20624 28446 + attr_t thisattr = AttrOf(thisline[j]) & SP_PARM->_xmc_triggers; 20625 28447 attr_t turnon = thisattr & ~rattr; 20626 28448 20627 28449 /* is an attribute turned on here? */ 20628 @@ -717, 7 +718,7@@28450 @@ -717,8 +776,8 @@ 20629 28451 * there's enough room to set the attribute before the first 20630 28452 * non-blank in the run. 20631 28453 */ 20632 28454 -#define SAFE(a) (!((a) & SP->_xmc_triggers)) 20633 +#define SAFE(a) (!((a) & SP_PARM->_xmc_triggers)) 20634 if (ISBLANK(thisline[j]) && SAFE(turnon)) { 28455 - if (ISBLANK(thisline[j]) && SAFE(turnon)) { 28456 +#define SAFE(scr,a) (!((a) & (scr)->_xmc_triggers)) 28457 + if (ISBLANK(thisline[j]) && SAFE(SP_PARM, turnon)) { 20635 28458 RemAttr(thisline[j], turnon); 20636 28459 continue; 20637 @@ -748,7 +749,7 @@ 20638 for (m = i; m < screen_lines; m++) { 20639 for (; n < screen_columns; n++) { 20640 attr_t testattr = AttrOf(newscr->_line[m].text[n]); 28460 } 28461 @@ -727,14 +786,14 @@ 28462 for (k = 1; k <= magic_cookie_glitch; k++) { 28463 if (j - k < 0 28464 || !ISBLANK(thisline[j - k]) 28465 - || !SAFE(AttrOf(thisline[j - k]))) { 28466 + || !SAFE(SP_PARM, AttrOf(thisline[j - k]))) { 28467 failed = TRUE; 28468 TR(TRACE_ATTRS, ("No room at start in %d,%d%s%s", 28469 i, j - k, 28470 (ISBLANK(thisline[j - k]) 28471 ? "" 28472 : ":nonblank"), 28473 - (SAFE(AttrOf(thisline[j - k])) 28474 + (SAFE(SP_PARM, AttrOf(thisline[j - k])) 28475 ? "" 28476 : ":unsafe"))); 28477 break; 28478 @@ -745,10 +804,12 @@ 28479 int m, n = j; 28480 28481 /* find end of span, if it's onscreen */ 28482 - for (m = i; m < screen_lines; m++) { 28483 - for (; n < screen_columns; n++) { 28484 - attr_t testattr = AttrOf(newscr->_line[m].text[n]); 20641 28485 - if ((testattr & SP->_xmc_triggers) == rattr) { 28486 + for (m = i; m < screen_lines(SP_PARM); m++) { 28487 + for (; n < screen_columns(SP_PARM); n++) { 28488 + attr_t testattr 28489 + = AttrOf(NewScreen(SP_PARM)->_line[m].text[n]); 28490 + 20642 28491 + if ((testattr & SP_PARM->_xmc_triggers) == rattr) { 20643 28492 end_onscreen = TRUE; 20644 28493 TR(TRACE_ATTRS, 20645 28494 ("Range attributed with %s ends at (%d, %d)", 20646 @@ -809,7 +810,7 @@ 20647 for (p = i; p < screen_lines; p++) { 20648 for (; q < screen_columns; q++) { 20649 attr_t testattr = AttrOf(newscr->_line[p].text[q]); 28495 @@ -764,7 +825,8 @@ 28496 foundit:; 28497 28498 if (end_onscreen) { 28499 - NCURSES_CH_T *lastline = newscr->_line[m].text; 28500 + NCURSES_CH_T *lastline = 28501 + NewScreen(SP_PARM)->_line[m].text; 28502 28503 /* 28504 * If there are safely-attributed blanks at the end of 28505 @@ -773,15 +835,15 @@ 28506 */ 28507 while (n >= 0 28508 && ISBLANK(lastline[n]) 28509 - && SAFE(AttrOf(lastline[n]))) { 28510 + && SAFE(SP_PARM, AttrOf(lastline[n]))) { 28511 RemAttr(lastline[n--], turnon); 28512 } 28513 28514 /* check that there's enough room at end of span */ 28515 for (k = 1; k <= magic_cookie_glitch; k++) { 28516 - if (n + k >= screen_columns 28517 + if (n + k >= screen_columns(SP_PARM) 28518 || !ISBLANK(lastline[n + k]) 28519 - || !SAFE(AttrOf(lastline[n + k]))) { 28520 + || !SAFE(SP_PARM, AttrOf(lastline[n + k]))) { 28521 failed = TRUE; 28522 TR(TRACE_ATTRS, 28523 ("No room at end in %d,%d%s%s", 28524 @@ -789,7 +851,7 @@ 28525 (ISBLANK(lastline[n + k]) 28526 ? "" 28527 : ":nonblank"), 28528 - (SAFE(AttrOf(lastline[n + k])) 28529 + (SAFE(SP_PARM, AttrOf(lastline[n + k])) 28530 ? "" 28531 : ":unsafe"))); 28532 break; 28533 @@ -806,12 +868,13 @@ 28534 _traceattr(turnon), i, j)); 28535 28536 /* turn off new attributes over span */ 28537 - for (p = i; p < screen_lines; p++) { 28538 - for (; q < screen_columns; q++) { 28539 - attr_t testattr = AttrOf(newscr->_line[p].text[q]); 20650 28540 - if ((testattr & SP->_xmc_triggers) == rattr) 28541 + for (p = i; p < screen_lines(SP_PARM); p++) { 28542 + for (; q < screen_columns(SP_PARM); q++) { 28543 + attr_t testattr = 28544 + AttrOf(NewScreen(SP_PARM)->_line[p].text[q]); 20651 28545 + if ((testattr & SP_PARM->_xmc_triggers) == rattr) 20652 28546 goto foundend; 20653 RemAttr(newscr->_line[p].text[q], turnon); 28547 - RemAttr(newscr->_line[p].text[q], turnon); 28548 + RemAttr(NewScreen(SP_PARM)->_line[p].text[q], turnon); 20654 28549 } 20655 @@ -857,7 +858,7 @@ 20656 20657 nonempty = min(screen_lines, newscr->_maxy + 1); 28550 q = 0; 28551 } 28552 @@ -837,7 +900,7 @@ 28553 /* show altered highlights after magic-cookie check */ 28554 if (USE_TRACEF(TRACE_UPDATE)) { 28555 _tracef("After magic-cookie check..."); 28556 - _tracedump("newscr", newscr); 28557 + _tracedump("newscr", NewScreen(SP_PARM)); 28558 _nc_unlock_global(tracef); 28559 } 28560 #endif /* TRACE */ 28561 @@ -845,23 +908,23 @@ 28562 #endif /* USE_XMC_SUPPORT */ 28563 28564 nonempty = 0; 28565 - if (curscr->_clear || newscr->_clear) { /* force refresh ? */ 28566 - ClrUpdate(); 28567 - curscr->_clear = FALSE; /* reset flag */ 28568 - newscr->_clear = FALSE; /* reset flag */ 28569 + if (CurScreen(SP_PARM)->_clear || NewScreen(SP_PARM)->_clear) { /* force refresh ? */ 28570 + ClrUpdate(NCURSES_SP_ARG); 28571 + CurScreen(SP_PARM)->_clear = FALSE; /* reset flag */ 28572 + NewScreen(SP_PARM)->_clear = FALSE; /* reset flag */ 28573 } else { 28574 int changedlines = CHECK_INTERVAL; 28575 28576 - if (check_pending()) 28577 + if (check_pending(NCURSES_SP_ARG)) 28578 goto cleanup; 28579 28580 - nonempty = min(screen_lines, newscr->_maxy + 1); 28581 + nonempty = min(screen_lines(SP_PARM), NewScreen(SP_PARM)->_maxy + 1); 20658 28582 20659 28583 - if (SP->_scrolling) { … … 20662 28586 } 20663 28587 20664 @@ -940,6 +941,14 @@ 28588 - nonempty = ClrBottom(nonempty); 28589 + nonempty = ClrBottom(NCURSES_SP_ARGx nonempty); 28590 28591 TR(TRACE_UPDATE, ("Transforming lines, nonempty %d", nonempty)); 28592 for (i = 0; i < nonempty; i++) { 28593 @@ -869,46 +932,46 @@ 28594 * Here is our line-breakout optimization. 28595 */ 28596 if (changedlines == CHECK_INTERVAL) { 28597 - if (check_pending()) 28598 + if (check_pending(NCURSES_SP_ARG)) 28599 goto cleanup; 28600 changedlines = 0; 28601 } 28602 28603 /* 28604 - * newscr->line[i].firstchar is normally set 28605 - * by wnoutrefresh. curscr->line[i].firstchar 28606 + * newscr.line[i].firstchar is normally set 28607 + * by wnoutrefresh. curscr.line[i].firstchar 28608 * is normally set by _nc_scroll_window in the 28609 * vertical-movement optimization code, 28610 */ 28611 - if (newscr->_line[i].firstchar != _NOCHANGE 28612 - || curscr->_line[i].firstchar != _NOCHANGE) { 28613 - TransformLine(i); 28614 + if (NewScreen(SP_PARM)->_line[i].firstchar != _NOCHANGE 28615 + || CurScreen(SP_PARM)->_line[i].firstchar != _NOCHANGE) { 28616 + TransformLine(NCURSES_SP_ARGx i); 28617 changedlines++; 28618 } 28619 28620 /* mark line changed successfully */ 28621 - if (i <= newscr->_maxy) { 28622 - MARK_NOCHANGE(newscr, i); 28623 + if (i <= NewScreen(SP_PARM)->_maxy) { 28624 + MARK_NOCHANGE(NewScreen(SP_PARM), i); 28625 } 28626 - if (i <= curscr->_maxy) { 28627 - MARK_NOCHANGE(curscr, i); 28628 + if (i <= CurScreen(SP_PARM)->_maxy) { 28629 + MARK_NOCHANGE(CurScreen(SP_PARM), i); 28630 } 28631 } 28632 } 28633 28634 /* put everything back in sync */ 28635 - for (i = nonempty; i <= newscr->_maxy; i++) { 28636 - MARK_NOCHANGE(newscr, i); 28637 + for (i = nonempty; i <= NewScreen(SP_PARM)->_maxy; i++) { 28638 + MARK_NOCHANGE(NewScreen(SP_PARM), i); 28639 } 28640 - for (i = nonempty; i <= curscr->_maxy; i++) { 28641 - MARK_NOCHANGE(curscr, i); 28642 + for (i = nonempty; i <= CurScreen(SP_PARM)->_maxy; i++) { 28643 + MARK_NOCHANGE(CurScreen(SP_PARM), i); 28644 } 28645 28646 - if (!newscr->_leaveok) { 28647 - curscr->_curx = newscr->_curx; 28648 - curscr->_cury = newscr->_cury; 28649 + if (!NewScreen(SP_PARM)->_leaveok) { 28650 + CurScreen(SP_PARM)->_curx = NewScreen(SP_PARM)->_curx; 28651 + CurScreen(SP_PARM)->_cury = NewScreen(SP_PARM)->_cury; 28652 28653 - GoTo(curscr->_cury, curscr->_curx); 28654 + GoTo(NCURSES_SP_ARGx CurScreen(SP_PARM)->_cury, CurScreen(SP_PARM)->_curx); 28655 } 28656 28657 cleanup: 28658 @@ -921,10 +984,10 @@ 28659 #if USE_XMC_SUPPORT 28660 if (magic_cookie_glitch != 0) 28661 #endif 28662 - UpdateAttrs(normal); 28663 + UpdateAttrs(SP_PARM, normal); 28664 28665 - _nc_flush(); 28666 - WINDOW_ATTRS(curscr) = WINDOW_ATTRS(newscr); 28667 + NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG); 28668 + WINDOW_ATTRS(CurScreen(SP_PARM)) = WINDOW_ATTRS(NewScreen(SP_PARM)); 28669 28670 #if USE_TRACE_TIMES 28671 (void) times(&after); 28672 @@ -940,6 +1003,14 @@ 20665 28673 returnCode(OK); 20666 28674 } … … 20677 28685 * ClrBlank(win) 20678 28686 * 20679 @@ -1165,8 +1174,8 @@ 28687 @@ -951,10 +1022,10 @@ 28688 * in the wbkgd() call. Assume 'stdscr' for this case. 28689 */ 28690 #define BCE_ATTRS (A_NORMAL|A_COLOR) 28691 -#define BCE_BKGD(win) (((win) == curscr ? stdscr : (win))->_nc_bkgd) 28692 +#define BCE_BKGD(win) (((win) == CurScreen(SP_PARM) ? StdScreen(SP_PARM) : (win))->_nc_bkgd) 28693 28694 static NCURSES_INLINE NCURSES_CH_T 28695 -ClrBlank(WINDOW *win) 28696 +ClrBlank(NCURSES_SP_DCLx WINDOW *win) 28697 { 28698 NCURSES_CH_T blank = blankchar; 28699 if (back_color_erase) 28700 @@ -970,23 +1041,24 @@ 28701 */ 28702 28703 static void 28704 -ClrUpdate(void) 28705 +ClrUpdate(NCURSES_SP_DCL0) 28706 { 28707 - int i; 28708 - NCURSES_CH_T blank = ClrBlank(stdscr); 28709 - int nonempty = min(screen_lines, newscr->_maxy + 1); 28710 - 28711 TR(TRACE_UPDATE, (T_CALLED("ClrUpdate"))); 28712 + if (0 != SP_PARM) { 28713 + int i; 28714 + NCURSES_CH_T blank = ClrBlank(NCURSES_SP_ARGx StdScreen(SP_PARM)); 28715 + int nonempty = min(screen_lines(SP_PARM), 28716 + NewScreen(SP_PARM)->_maxy + 1); 28717 28718 - ClearScreen(blank); 28719 + ClearScreen(NCURSES_SP_ARGx blank); 28720 28721 - TR(TRACE_UPDATE, ("updating screen from scratch")); 28722 + TR(TRACE_UPDATE, ("updating screen from scratch")); 28723 28724 - nonempty = ClrBottom(nonempty); 28725 - 28726 - for (i = 0; i < nonempty; i++) 28727 - TransformLine(i); 28728 + nonempty = ClrBottom(NCURSES_SP_ARGx nonempty); 28729 28730 + for (i = 0; i < nonempty; i++) 28731 + TransformLine(NCURSES_SP_ARGx i); 28732 + } 28733 TR(TRACE_UPDATE, (T_RETURN(""))); 28734 } 28735 28736 @@ -997,15 +1069,16 @@ 28737 */ 28738 28739 static void 28740 -ClrToEOL(NCURSES_CH_T blank, bool needclear) 28741 +ClrToEOL(NCURSES_SP_DCLx NCURSES_CH_T blank, bool needclear) 28742 { 28743 int j; 28744 28745 - if (curscr != 0 28746 - && SP->_cursrow >= 0) { 28747 - for (j = SP->_curscol; j < screen_columns; j++) { 28748 + if (CurScreen(SP_PARM) != 0 28749 + && SP_PARM->_cursrow >= 0) { 28750 + for (j = SP_PARM->_curscol; j < screen_columns(SP_PARM); j++) { 28751 if (j >= 0) { 28752 - NCURSES_CH_T *cp = &(curscr->_line[SP->_cursrow].text[j]); 28753 + NCURSES_CH_T *cp = 28754 + &(CurScreen(SP_PARM)->_line[SP_PARM->_cursrow].text[j]); 28755 28756 if (!CharEq(*cp, blank)) { 28757 *cp = blank; 28758 @@ -1018,14 +1091,14 @@ 28759 } 28760 28761 if (needclear) { 28762 - UpdateAttrs(blank); 28763 + UpdateAttrs(SP_PARM, blank); 28764 TPUTS_TRACE("clr_eol"); 28765 - if (clr_eol && SP->_el_cost <= (screen_columns - SP->_curscol)) { 28766 - putp(clr_eol); 28767 + if (clr_eol && SP_PARM->_el_cost <= (screen_columns(SP_PARM) - SP_PARM->_curscol)) { 28768 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx clr_eol); 28769 } else { 28770 - int count = (screen_columns - SP->_curscol); 28771 + int count = (screen_columns(SP_PARM) - SP_PARM->_curscol); 28772 while (count-- > 0) 28773 - PutChar(CHREF(blank)); 28774 + PutChar(NCURSES_SP_ARGx CHREF(blank)); 28775 } 28776 } 28777 } 28778 @@ -1037,23 +1110,29 @@ 28779 */ 28780 28781 static void 28782 -ClrToEOS(NCURSES_CH_T blank) 28783 +ClrToEOS(NCURSES_SP_DCLx NCURSES_CH_T blank) 28784 { 28785 int row, col; 28786 28787 - row = SP->_cursrow; 28788 - col = SP->_curscol; 28789 - 28790 - UpdateAttrs(blank); 28791 - TPUTS_TRACE("clr_eos"); 28792 - tputs(clr_eos, screen_lines - row, _nc_outch); 28793 + if (0 == SP_PARM) 28794 + return; 28795 28796 - while (col < screen_columns) 28797 - curscr->_line[row].text[col++] = blank; 28798 + row = SP_PARM->_cursrow; 28799 + col = SP_PARM->_curscol; 28800 28801 - for (row++; row < screen_lines; row++) { 28802 - for (col = 0; col < screen_columns; col++) 28803 - curscr->_line[row].text[col] = blank; 28804 + UpdateAttrs(SP_PARM, blank); 28805 + TPUTS_TRACE("clr_eos"); 28806 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx 28807 + clr_eos, 28808 + screen_lines(SP_PARM) - row, 28809 + NCURSES_SP_NAME(_nc_outch)); 28810 + 28811 + while (col < screen_columns(SP_PARM)) 28812 + CurScreen(SP_PARM)->_line[row].text[col++] = blank; 28813 + 28814 + for (row++; row < screen_lines(SP_PARM); row++) { 28815 + for (col = 0; col < screen_columns(SP_PARM); col++) 28816 + CurScreen(SP_PARM)->_line[row].text[col] = blank; 28817 } 28818 } 28819 28820 @@ -1065,26 +1144,26 @@ 28821 * screen, checking if each is blank, and one or more are changed. 28822 */ 28823 static int 28824 -ClrBottom(int total) 28825 +ClrBottom(NCURSES_SP_DCLx int total) 28826 { 28827 int row; 28828 int col; 28829 int top = total; 28830 - int last = min(screen_columns, newscr->_maxx + 1); 28831 - NCURSES_CH_T blank = newscr->_line[total - 1].text[last - 1]; 28832 + int last = min(screen_columns(SP_PARM), NewScreen(SP_PARM)->_maxx + 1); 28833 + NCURSES_CH_T blank = NewScreen(SP_PARM)->_line[total - 1].text[last - 1]; 28834 bool ok; 28835 28836 - if (clr_eos && can_clear_with(CHREF(blank))) { 28837 + if (clr_eos && can_clear_with(NCURSES_SP_ARGx CHREF(blank))) { 28838 28839 for (row = total - 1; row >= 0; row--) { 28840 for (col = 0, ok = TRUE; ok && col < last; col++) { 28841 - ok = (CharEq(newscr->_line[row].text[col], blank)); 28842 + ok = (CharEq(NewScreen(SP_PARM)->_line[row].text[col], blank)); 28843 } 28844 if (!ok) 28845 break; 28846 28847 for (col = 0; ok && col < last; col++) { 28848 - ok = (CharEq(curscr->_line[row].text[col], blank)); 28849 + ok = (CharEq(CurScreen(SP_PARM)->_line[row].text[col], blank)); 28850 } 28851 if (!ok) 28852 top = row; 28853 @@ -1092,11 +1171,11 @@ 28854 28855 /* don't use clr_eos for just one line if clr_eol available */ 28856 if (top < total) { 28857 - GoTo(top, 0); 28858 - ClrToEOS(blank); 28859 - if (SP->oldhash && SP->newhash) { 28860 - for (row = top; row < screen_lines; row++) 28861 - SP->oldhash[row] = SP->newhash[row]; 28862 + GoTo(NCURSES_SP_ARGx top, 0); 28863 + ClrToEOS(NCURSES_SP_ARGx blank); 28864 + if (SP_PARM->oldhash && SP_PARM->newhash) { 28865 + for (row = top; row < screen_lines(SP_PARM); row++) 28866 + SP_PARM->oldhash[row] = SP_PARM->newhash[row]; 28867 } 28868 } 28869 } 28870 @@ -1105,15 +1184,15 @@ 28871 28872 #if USE_XMC_SUPPORT 28873 #if USE_WIDEC_SUPPORT 28874 -#define check_xmc_transition(a, b) \ 28875 - ((((a)->attr ^ (b)->attr) & ~((a)->attr) & SP->_xmc_triggers) != 0) 28876 -#define xmc_turn_on(a,b) check_xmc_transition(&(a), &(b)) 28877 +#define check_xmc_transition(sp, a, b) \ 28878 + ((((a)->attr ^ (b)->attr) & ~((a)->attr) & (sp)->_xmc_triggers) != 0) 28879 +#define xmc_turn_on(sp,a,b) check_xmc_transition(sp,&(a), &(b)) 28880 #else 28881 -#define xmc_turn_on(a,b) ((((a)^(b)) & ~(a) & SP->_xmc_triggers) != 0) 28882 +#define xmc_turn_on(sp,a,b) ((((a)^(b)) & ~(a) & (sp)->_xmc_triggers) != 0) 28883 #endif 28884 28885 -#define xmc_new(r,c) newscr->_line[r].text[c] 28886 -#define xmc_turn_off(a,b) xmc_turn_on(b,a) 28887 +#define xmc_new(sp,r,c) NewScreen(SP_PARM)->_line[r].text[c] 28888 +#define xmc_turn_off(sp,a,b) xmc_turn_on(sp,b,a) 28889 #endif /* USE_XMC_SUPPORT */ 28890 28891 /* 28892 @@ -1135,19 +1214,19 @@ 28893 */ 28894 28895 static void 28896 -TransformLine(int const lineno) 28897 +TransformLine(NCURSES_SP_DCLx int const lineno) 28898 { 28899 int firstChar, oLastChar, nLastChar; 28900 - NCURSES_CH_T *newLine = newscr->_line[lineno].text; 28901 - NCURSES_CH_T *oldLine = curscr->_line[lineno].text; 28902 + NCURSES_CH_T *newLine = NewScreen(SP_PARM)->_line[lineno].text; 28903 + NCURSES_CH_T *oldLine = CurScreen(SP_PARM)->_line[lineno].text; 28904 int n; 28905 bool attrchanged = FALSE; 28906 28907 - TR(TRACE_UPDATE, (T_CALLED("TransformLine(%d)"), lineno)); 28908 + TR(TRACE_UPDATE, (T_CALLED("TransformLine(%p, %d)"), SP_PARM, lineno)); 28909 28910 /* copy new hash value to old one */ 28911 - if (SP->oldhash && SP->newhash) 28912 - SP->oldhash[lineno] = SP->newhash[lineno]; 28913 + if (SP_PARM->oldhash && SP_PARM->newhash) 28914 + SP_PARM->oldhash[lineno] = SP_PARM->newhash[lineno]; 28915 28916 /* 28917 * If we have colors, there is the possibility of having two color pairs 28918 @@ -1155,19 +1234,20 @@ 28919 * for this case, and update the old line with the new line's colors when 28920 * they are equivalent. 28921 */ 28922 - if (SP->_coloron) { 28923 + if (SP_PARM->_coloron) { 28924 int oldPair; 28925 int newPair; 28926 28927 - for (n = 0; n < screen_columns; n++) { 28928 + for (n = 0; n < screen_columns(SP_PARM); n++) { 28929 if (!CharEq(newLine[n], oldLine[n])) { 28930 oldPair = GetPair(oldLine[n]); 20680 28931 newPair = GetPair(newLine[n]); 20681 28932 if (oldPair != newPair … … 20683 28934 - if (oldPair < COLOR_PAIRS 20684 28935 - && newPair < COLOR_PAIRS 20685 + if (oldPair < SP->_pair_limit 20686 + && newPair < SP->_pair_limit 20687 && SP->_color_pairs[oldPair] == SP->_color_pairs[newPair]) { 28936 - && SP->_color_pairs[oldPair] == SP->_color_pairs[newPair]) { 28937 + if (oldPair < SP_PARM->_pair_limit 28938 + && newPair < SP_PARM->_pair_limit 28939 + && (SP_PARM->_color_pairs[oldPair] == 28940 + SP_PARM->_color_pairs[newPair])) { 20688 28941 SetPair(oldLine[n], GetPair(newLine[n])); 20689 28942 } 28943 } 28944 @@ -1177,7 +1257,7 @@ 28945 28946 if (ceol_standout_glitch && clr_eol) { 28947 firstChar = 0; 28948 - while (firstChar < screen_columns) { 28949 + while (firstChar < screen_columns(SP_PARM)) { 28950 if (!SameAttrOf(newLine[firstChar], oldLine[firstChar])) { 28951 attrchanged = TRUE; 28952 break; 28953 @@ -1189,9 +1269,13 @@ 28954 firstChar = 0; 28955 28956 if (attrchanged) { /* we may have to disregard the whole line */ 28957 - GoTo(lineno, firstChar); 28958 - ClrToEOL(ClrBlank(curscr), FALSE); 28959 - PutRange(oldLine, newLine, lineno, 0, (screen_columns - 1)); 28960 + GoTo(NCURSES_SP_ARGx lineno, firstChar); 28961 + ClrToEOL(NCURSES_SP_ARGx 28962 + ClrBlank(NCURSES_SP_ARGx CurScreen(SP_PARM)), 28963 + FALSE); 28964 + PutRange(NCURSES_SP_ARGx 28965 + oldLine, newLine, lineno, 0, 28966 + screen_columns(SP_PARM) - 1); 28967 #if USE_XMC_SUPPORT 28968 28969 /* 28970 @@ -1206,8 +1290,8 @@ 28971 * following operation. 28972 */ 28973 } else if (magic_cookie_glitch > 0) { 28974 - GoTo(lineno, firstChar); 28975 - for (n = 0; n < screen_columns; n++) { 28976 + GoTo(NCURSES_SP_ARGx lineno, firstChar); 28977 + for (n = 0; n < screen_columns(SP_PARM); n++) { 28978 int m = n + magic_cookie_glitch; 28979 28980 /* check for turn-on: 28981 @@ -1216,26 +1300,30 @@ 28982 */ 28983 if (ISBLANK(newLine[n]) 28984 && ((n > 0 28985 - && xmc_turn_on(newLine[n - 1], newLine[n])) 28986 + && xmc_turn_on(SP_PARM, newLine[n - 1], newLine[n])) 28987 || (n == 0 28988 && lineno > 0 28989 - && xmc_turn_on(xmc_new(lineno - 1, screen_columns - 1), 28990 + && xmc_turn_on(SP_PARM, 28991 + xmc_new(SP_PARM, lineno - 1, 28992 + screen_columns(SP_PARM) - 1), 28993 newLine[n])))) { 28994 n = m; 28995 } 28996 28997 - PutChar(CHREF(newLine[n])); 28998 + PutChar(NCURSES_SP_ARGx CHREF(newLine[n])); 28999 29000 /* check for turn-off: 29001 * If we are writing an attributed non-blank, where the 29002 * next cell is blank, and not attributed. 29003 */ 29004 if (!ISBLANK(newLine[n]) 29005 - && ((n + 1 < screen_columns 29006 - && xmc_turn_off(newLine[n], newLine[n + 1])) 29007 - || (n + 1 >= screen_columns 29008 - && lineno + 1 < screen_lines 29009 - && xmc_turn_off(newLine[n], xmc_new(lineno + 1, 0))))) { 29010 + && ((n + 1 < screen_columns(SP_PARM) 29011 + && xmc_turn_off(SP_PARM, newLine[n], newLine[n + 1])) 29012 + || (n + 1 >= screen_columns(SP_PARM) 29013 + && lineno + 1 < screen_lines(SP_PARM) 29014 + && xmc_turn_off(SP_PARM, 29015 + newLine[n], 29016 + xmc_new(SP_PARM, lineno + 1, 0))))) { 29017 n = m; 29018 } 29019 29020 @@ -1246,38 +1334,42 @@ 29021 29022 /* it may be cheap to clear leading whitespace with clr_bol */ 29023 blank = newLine[0]; 29024 - if (clr_bol && can_clear_with(CHREF(blank))) { 29025 + if (clr_bol && can_clear_with(NCURSES_SP_ARGx CHREF(blank))) { 29026 int oFirstChar, nFirstChar; 29027 29028 - for (oFirstChar = 0; oFirstChar < screen_columns; oFirstChar++) 29029 + for (oFirstChar = 0; 29030 + oFirstChar < screen_columns(SP_PARM); 29031 + oFirstChar++) 29032 if (!CharEq(oldLine[oFirstChar], blank)) 29033 break; 29034 - for (nFirstChar = 0; nFirstChar < screen_columns; nFirstChar++) 29035 + for (nFirstChar = 0; 29036 + nFirstChar < screen_columns(SP_PARM); 29037 + nFirstChar++) 29038 if (!CharEq(newLine[nFirstChar], blank)) 29039 break; 29040 29041 if (nFirstChar == oFirstChar) { 29042 firstChar = nFirstChar; 29043 /* find the first differing character */ 29044 - while (firstChar < screen_columns 29045 + while (firstChar < screen_columns(SP_PARM) 29046 && CharEq(newLine[firstChar], oldLine[firstChar])) 29047 firstChar++; 29048 } else if (oFirstChar > nFirstChar) { 29049 firstChar = nFirstChar; 29050 } else { /* oFirstChar < nFirstChar */ 29051 firstChar = oFirstChar; 29052 - if (SP->_el1_cost < nFirstChar - oFirstChar) { 29053 - if (nFirstChar >= screen_columns 29054 - && SP->_el_cost <= SP->_el1_cost) { 29055 - GoTo(lineno, 0); 29056 - UpdateAttrs(blank); 29057 + if (SP_PARM->_el1_cost < nFirstChar - oFirstChar) { 29058 + if (nFirstChar >= screen_columns(SP_PARM) 29059 + && SP_PARM->_el_cost <= SP_PARM->_el1_cost) { 29060 + GoTo(NCURSES_SP_ARGx lineno, 0); 29061 + UpdateAttrs(SP_PARM, blank); 29062 TPUTS_TRACE("clr_eol"); 29063 - putp(clr_eol); 29064 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx clr_eol); 29065 } else { 29066 - GoTo(lineno, nFirstChar - 1); 29067 - UpdateAttrs(blank); 29068 + GoTo(NCURSES_SP_ARGx lineno, nFirstChar - 1); 29069 + UpdateAttrs(SP_PARM, blank); 29070 TPUTS_TRACE("clr_bol"); 29071 - putp(clr_bol); 29072 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx clr_bol); 29073 } 29074 29075 while (firstChar < nFirstChar) 29076 @@ -1286,29 +1378,34 @@ 29077 } 29078 } else { 29079 /* find the first differing character */ 29080 - while (firstChar < screen_columns 29081 + while (firstChar < screen_columns(SP_PARM) 29082 && CharEq(newLine[firstChar], oldLine[firstChar])) 29083 firstChar++; 29084 } 29085 /* if there wasn't one, we're done */ 29086 - if (firstChar >= screen_columns) { 29087 + if (firstChar >= screen_columns(SP_PARM)) { 29088 TR(TRACE_UPDATE, (T_RETURN(""))); 29089 return; 29090 } 29091 29092 - blank = newLine[screen_columns - 1]; 29093 + blank = newLine[screen_columns(SP_PARM) - 1]; 29094 29095 - if (!can_clear_with(CHREF(blank))) { 29096 + if (!can_clear_with(NCURSES_SP_ARGx CHREF(blank))) { 29097 /* find the last differing character */ 29098 - nLastChar = screen_columns - 1; 29099 + nLastChar = screen_columns(SP_PARM) - 1; 29100 29101 while (nLastChar > firstChar 29102 && CharEq(newLine[nLastChar], oldLine[nLastChar])) 29103 nLastChar--; 29104 29105 if (nLastChar >= firstChar) { 29106 - GoTo(lineno, firstChar); 29107 - PutRange(oldLine, newLine, lineno, firstChar, nLastChar); 29108 + GoTo(NCURSES_SP_ARGx lineno, firstChar); 29109 + PutRange(NCURSES_SP_ARGx 29110 + oldLine, 29111 + newLine, 29112 + lineno, 29113 + firstChar, 29114 + nLastChar); 29115 memcpy(oldLine + firstChar, 29116 newLine + firstChar, 29117 (nLastChar - firstChar + 1) * sizeof(NCURSES_CH_T)); 29118 @@ -1318,32 +1415,43 @@ 29119 } 29120 29121 /* find last non-blank character on old line */ 29122 - oLastChar = screen_columns - 1; 29123 + oLastChar = screen_columns(SP_PARM) - 1; 29124 while (oLastChar > firstChar && CharEq(oldLine[oLastChar], blank)) 29125 oLastChar--; 29126 29127 /* find last non-blank character on new line */ 29128 - nLastChar = screen_columns - 1; 29129 + nLastChar = screen_columns(SP_PARM) - 1; 29130 while (nLastChar > firstChar && CharEq(newLine[nLastChar], blank)) 29131 nLastChar--; 29132 29133 if ((nLastChar == firstChar) 29134 - && (SP->_el_cost < (oLastChar - nLastChar))) { 29135 - GoTo(lineno, firstChar); 29136 + && (SP_PARM->_el_cost < (oLastChar - nLastChar))) { 29137 + GoTo(NCURSES_SP_ARGx lineno, firstChar); 29138 if (!CharEq(newLine[firstChar], blank)) 29139 - PutChar(CHREF(newLine[firstChar])); 29140 - ClrToEOL(blank, FALSE); 29141 + PutChar(NCURSES_SP_ARGx CHREF(newLine[firstChar])); 29142 + ClrToEOL(NCURSES_SP_ARGx blank, FALSE); 29143 } else if ((nLastChar != oLastChar) 29144 && (!CharEq(newLine[nLastChar], oldLine[oLastChar]) 29145 || !(_nc_idcok && has_ic()))) { 29146 - GoTo(lineno, firstChar); 29147 - if ((oLastChar - nLastChar) > SP->_el_cost) { 29148 - if (PutRange(oldLine, newLine, lineno, firstChar, nLastChar)) 29149 - GoTo(lineno, nLastChar + 1); 29150 - ClrToEOL(blank, FALSE); 29151 + GoTo(NCURSES_SP_ARGx lineno, firstChar); 29152 + if ((oLastChar - nLastChar) > SP_PARM->_el_cost) { 29153 + if (PutRange(NCURSES_SP_ARGx 29154 + oldLine, 29155 + newLine, 29156 + lineno, 29157 + firstChar, 29158 + nLastChar)) { 29159 + GoTo(NCURSES_SP_ARGx lineno, nLastChar + 1); 29160 + } 29161 + ClrToEOL(NCURSES_SP_ARGx blank, FALSE); 29162 } else { 29163 n = max(nLastChar, oLastChar); 29164 - PutRange(oldLine, newLine, lineno, firstChar, n); 29165 + PutRange(NCURSES_SP_ARGx 29166 + oldLine, 29167 + newLine, 29168 + lineno, 29169 + firstChar, 29170 + n); 29171 } 29172 } else { 29173 int nLastNonblank = nLastChar; 29174 @@ -1364,8 +1472,13 @@ 29175 29176 n = min(oLastChar, nLastChar); 29177 if (n >= firstChar) { 29178 - GoTo(lineno, firstChar); 29179 - PutRange(oldLine, newLine, lineno, firstChar, n); 29180 + GoTo(NCURSES_SP_ARGx lineno, firstChar); 29181 + PutRange(NCURSES_SP_ARGx 29182 + oldLine, 29183 + newLine, 29184 + lineno, 29185 + firstChar, 29186 + n); 29187 } 29188 29189 if (oLastChar < nLastChar) { 29190 @@ -1376,21 +1489,26 @@ 29191 --oLastChar; 29192 } 29193 #endif 29194 - GoTo(lineno, n + 1); 29195 + GoTo(NCURSES_SP_ARGx lineno, n + 1); 29196 if ((nLastChar < nLastNonblank) 29197 - || InsCharCost(nLastChar - oLastChar) > (m - n)) { 29198 - PutRange(oldLine, newLine, lineno, n + 1, m); 29199 + || InsCharCost(SP_PARM, nLastChar - oLastChar) > (m - n)) { 29200 + PutRange(NCURSES_SP_ARGx 29201 + oldLine, 29202 + newLine, 29203 + lineno, 29204 + n + 1, 29205 + m); 29206 } else { 29207 - InsStr(&newLine[n + 1], nLastChar - oLastChar); 29208 + InsStr(NCURSES_SP_ARGx &newLine[n + 1], nLastChar - oLastChar); 29209 } 29210 } else if (oLastChar > nLastChar) { 29211 - GoTo(lineno, n + 1); 29212 - if (DelCharCost(oLastChar - nLastChar) 29213 - > SP->_el_cost + nLastNonblank - (n + 1)) { 29214 - if (PutRange(oldLine, newLine, lineno, 29215 + GoTo(NCURSES_SP_ARGx lineno, n + 1); 29216 + if (DelCharCost(SP_PARM, oLastChar - nLastChar) 29217 + > SP_PARM->_el_cost + nLastNonblank - (n + 1)) { 29218 + if (PutRange(NCURSES_SP_ARGx oldLine, newLine, lineno, 29219 n + 1, nLastNonblank)) 29220 - GoTo(lineno, nLastNonblank + 1); 29221 - ClrToEOL(blank, FALSE); 29222 + GoTo(NCURSES_SP_ARGx lineno, nLastNonblank + 1); 29223 + ClrToEOL(NCURSES_SP_ARGx blank, FALSE); 29224 } else { 29225 /* 29226 * The delete-char sequence will 29227 @@ -1400,18 +1518,18 @@ 29228 * setting the video attributes from 29229 * the last character on the row. 29230 */ 29231 - UpdateAttrs(blank); 29232 - DelChar(oLastChar - nLastChar); 29233 + UpdateAttrs(SP_PARM, blank); 29234 + DelChar(NCURSES_SP_ARGx oLastChar - nLastChar); 29235 } 29236 } 29237 } 29238 } 29239 29240 /* update the code's internal representation */ 29241 - if (screen_columns > firstChar) 29242 + if (screen_columns(SP_PARM) > firstChar) 29243 memcpy(oldLine + firstChar, 29244 newLine + firstChar, 29245 - (screen_columns - firstChar) * sizeof(NCURSES_CH_T)); 29246 + (screen_columns(SP_PARM) - firstChar) * sizeof(NCURSES_CH_T)); 29247 TR(TRACE_UPDATE, (T_RETURN(""))); 29248 return; 29249 } 29250 @@ -1424,7 +1542,7 @@ 29251 */ 29252 29253 static void 29254 -ClearScreen(NCURSES_CH_T blank) 29255 +ClearScreen(NCURSES_SP_DCLx NCURSES_CH_T blank) 29256 { 29257 int i, j; 29258 bool fast_clear = (clear_screen || clr_eos || clr_eol); 29259 @@ -1432,9 +1550,13 @@ 29260 TR(TRACE_UPDATE, ("ClearScreen() called")); 29261 29262 #if NCURSES_EXT_FUNCS 29263 - if (SP->_coloron 29264 - && !SP->_default_color) { 29265 - _nc_do_color(GET_SCREEN_PAIR(SP), 0, FALSE, _nc_outch); 29266 + if (SP_PARM->_coloron 29267 + && !SP_PARM->_default_color) { 29268 + NCURSES_SP_NAME(_nc_do_color) (NCURSES_SP_ARGx 29269 + GET_SCREEN_PAIR(SP_PARM), 29270 + 0, 29271 + FALSE, 29272 + NCURSES_SP_NAME(_nc_outch)); 29273 if (!back_color_erase) { 29274 fast_clear = FALSE; 29275 } 29276 @@ -1443,42 +1565,48 @@ 29277 29278 if (fast_clear) { 29279 if (clear_screen) { 29280 - UpdateAttrs(blank); 29281 + UpdateAttrs(SP_PARM, blank); 29282 TPUTS_TRACE("clear_screen"); 29283 - putp(clear_screen); 29284 - SP->_cursrow = SP->_curscol = 0; 29285 - position_check(SP->_cursrow, SP->_curscol, "ClearScreen"); 29286 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx clear_screen); 29287 + SP_PARM->_cursrow = SP_PARM->_curscol = 0; 29288 + position_check(SP_PARM, 29289 + SP_PARM->_cursrow, 29290 + SP_PARM->_curscol, 29291 + "ClearScreen"); 29292 } else if (clr_eos) { 29293 - SP->_cursrow = SP->_curscol = -1; 29294 - GoTo(0, 0); 29295 + SP_PARM->_cursrow = SP_PARM->_curscol = -1; 29296 + GoTo(NCURSES_SP_ARGx 0, 0); 29297 29298 - UpdateAttrs(blank); 29299 + UpdateAttrs(SP_PARM, blank); 29300 TPUTS_TRACE("clr_eos"); 29301 - tputs(clr_eos, screen_lines, _nc_outch); 29302 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx 29303 + clr_eos, 29304 + screen_lines(SP_PARM), 29305 + NCURSES_SP_NAME(_nc_outch)); 29306 } else if (clr_eol) { 29307 - SP->_cursrow = SP->_curscol = -1; 29308 + SP_PARM->_cursrow = SP_PARM->_curscol = -1; 29309 29310 - UpdateAttrs(blank); 29311 - for (i = 0; i < screen_lines; i++) { 29312 - GoTo(i, 0); 29313 + UpdateAttrs(SP_PARM, blank); 29314 + for (i = 0; i < screen_lines(SP_PARM); i++) { 29315 + GoTo(NCURSES_SP_ARGx i, 0); 29316 TPUTS_TRACE("clr_eol"); 29317 - putp(clr_eol); 29318 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx clr_eol); 29319 } 29320 - GoTo(0, 0); 29321 + GoTo(NCURSES_SP_ARGx 0, 0); 29322 } 29323 } else { 29324 - UpdateAttrs(blank); 29325 - for (i = 0; i < screen_lines; i++) { 29326 - GoTo(i, 0); 29327 - for (j = 0; j < screen_columns; j++) 29328 - PutChar(CHREF(blank)); 29329 - } 29330 - GoTo(0, 0); 29331 + UpdateAttrs(SP_PARM, blank); 29332 + for (i = 0; i < screen_lines(SP_PARM); i++) { 29333 + GoTo(NCURSES_SP_ARGx i, 0); 29334 + for (j = 0; j < screen_columns(SP_PARM); j++) 29335 + PutChar(NCURSES_SP_ARGx CHREF(blank)); 29336 + } 29337 + GoTo(NCURSES_SP_ARGx 0, 0); 29338 } 29339 29340 - for (i = 0; i < screen_lines; i++) { 29341 - for (j = 0; j < screen_columns; j++) 29342 - curscr->_line[i].text[j] = blank; 29343 + for (i = 0; i < screen_lines(SP_PARM); i++) { 29344 + for (j = 0; j < screen_columns(SP_PARM); j++) 29345 + CurScreen(SP_PARM)->_line[i].text[j] = blank; 29346 } 29347 29348 TR(TRACE_UPDATE, ("screen cleared")); 29349 @@ -1492,49 +1620,52 @@ 29350 */ 29351 29352 static void 29353 -InsStr(NCURSES_CH_T * line, int count) 29354 +InsStr(NCURSES_SP_DCLx NCURSES_CH_T * line, int count) 29355 { 29356 - TR(TRACE_UPDATE, ("InsStr(%p,%d) called", line, count)); 29357 + TR(TRACE_UPDATE, ("InsStr(%p, %p,%d) called", SP_PARM, line, count)); 29358 29359 /* Prefer parm_ich as it has the smallest cost - no need to shift 29360 * the whole line on each character. */ 29361 /* The order must match that of InsCharCost. */ 29362 if (parm_ich) { 29363 TPUTS_TRACE("parm_ich"); 29364 - tputs(TPARM_1(parm_ich, count), count, _nc_outch); 29365 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx 29366 + TPARM_1(parm_ich, count), 29367 + count, 29368 + NCURSES_SP_NAME(_nc_outch)); 29369 while (count) { 29370 - PutAttrChar(CHREF(*line)); 29371 + PutAttrChar(NCURSES_SP_ARGx CHREF(*line)); 29372 line++; 29373 count--; 29374 } 29375 } else if (enter_insert_mode && exit_insert_mode) { 29376 TPUTS_TRACE("enter_insert_mode"); 29377 - putp(enter_insert_mode); 29378 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx enter_insert_mode); 29379 while (count) { 29380 - PutAttrChar(CHREF(*line)); 29381 + PutAttrChar(NCURSES_SP_ARGx CHREF(*line)); 29382 if (insert_padding) { 29383 TPUTS_TRACE("insert_padding"); 29384 - putp(insert_padding); 29385 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx insert_padding); 29386 } 29387 line++; 29388 count--; 29389 } 29390 TPUTS_TRACE("exit_insert_mode"); 29391 - putp(exit_insert_mode); 29392 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx exit_insert_mode); 29393 } else { 29394 while (count) { 29395 TPUTS_TRACE("insert_character"); 29396 - putp(insert_character); 29397 - PutAttrChar(CHREF(*line)); 29398 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx insert_character); 29399 + PutAttrChar(NCURSES_SP_ARGx CHREF(*line)); 29400 if (insert_padding) { 29401 TPUTS_TRACE("insert_padding"); 29402 - putp(insert_padding); 29403 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx insert_padding); 29404 } 29405 line++; 29406 count--; 29407 } 29408 } 29409 - position_check(SP->_cursrow, SP->_curscol, "InsStr"); 29410 + position_check(SP_PARM, SP_PARM->_cursrow, SP_PARM->_curscol, "InsStr"); 29411 } 29412 29413 /* 29414 @@ -1545,22 +1676,25 @@ 29415 */ 29416 29417 static void 29418 -DelChar(int count) 29419 +DelChar(NCURSES_SP_DCLx int count) 29420 { 29421 int n; 29422 29423 - TR(TRACE_UPDATE, ("DelChar(%d) called, position = (%ld,%ld)", 29424 - count, 29425 - (long) newscr->_cury, 29426 - (long) newscr->_curx)); 29427 + TR(TRACE_UPDATE, ("DelChar(%p, %d) called, position = (%ld,%ld)", 29428 + SP_PARM, count, 29429 + (long) NewScreen(SP_PARM)->_cury, 29430 + (long) NewScreen(SP_PARM)->_curx)); 29431 29432 if (parm_dch) { 29433 TPUTS_TRACE("parm_dch"); 29434 - tputs(TPARM_1(parm_dch, count), count, _nc_outch); 29435 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx 29436 + TPARM_1(parm_dch, count), 29437 + count, 29438 + NCURSES_SP_NAME(_nc_outch)); 29439 } else { 29440 for (n = 0; n < count; n++) { 29441 TPUTS_TRACE("delete_character"); 29442 - putp(delete_character); 29443 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx delete_character); 29444 } 29445 } 29446 } 29447 @@ -1599,54 +1733,66 @@ 29448 29449 /* Try to scroll up assuming given csr (miny, maxy). Returns ERR on failure */ 29450 static int 29451 -scroll_csr_forward(int n, int top, int bot, int miny, int maxy, NCURSES_CH_T blank) 29452 +scroll_csr_forward(NCURSES_SP_DCLx 29453 + int n, 29454 + int top, 29455 + int bot, 29456 + int miny, 29457 + int maxy, 29458 + NCURSES_CH_T blank) 29459 { 29460 int i; 29461 29462 if (n == 1 && scroll_forward && top == miny && bot == maxy) { 29463 - GoTo(bot, 0); 29464 - UpdateAttrs(blank); 29465 + GoTo(NCURSES_SP_ARGx bot, 0); 29466 + UpdateAttrs(SP_PARM, blank); 29467 TPUTS_TRACE("scroll_forward"); 29468 - putp(scroll_forward); 29469 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx scroll_forward); 29470 } else if (n == 1 && delete_line && bot == maxy) { 29471 - GoTo(top, 0); 29472 - UpdateAttrs(blank); 29473 + GoTo(NCURSES_SP_ARGx top, 0); 29474 + UpdateAttrs(SP_PARM, blank); 29475 TPUTS_TRACE("delete_line"); 29476 - putp(delete_line); 29477 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx delete_line); 29478 } else if (parm_index && top == miny && bot == maxy) { 29479 - GoTo(bot, 0); 29480 - UpdateAttrs(blank); 29481 + GoTo(NCURSES_SP_ARGx bot, 0); 29482 + UpdateAttrs(SP_PARM, blank); 29483 TPUTS_TRACE("parm_index"); 29484 - tputs(TPARM_2(parm_index, n, 0), n, _nc_outch); 29485 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx 29486 + TPARM_2(parm_index, n, 0), 29487 + n, 29488 + NCURSES_SP_NAME(_nc_outch)); 29489 } else if (parm_delete_line && bot == maxy) { 29490 - GoTo(top, 0); 29491 - UpdateAttrs(blank); 29492 + GoTo(NCURSES_SP_ARGx top, 0); 29493 + UpdateAttrs(SP_PARM, blank); 29494 TPUTS_TRACE("parm_delete_line"); 29495 - tputs(TPARM_2(parm_delete_line, n, 0), n, _nc_outch); 29496 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx 29497 + TPARM_2(parm_delete_line, n, 0), 29498 + n, 29499 + NCURSES_SP_NAME(_nc_outch)); 29500 } else if (scroll_forward && top == miny && bot == maxy) { 29501 - GoTo(bot, 0); 29502 - UpdateAttrs(blank); 29503 + GoTo(NCURSES_SP_ARGx bot, 0); 29504 + UpdateAttrs(SP_PARM, blank); 29505 for (i = 0; i < n; i++) { 29506 TPUTS_TRACE("scroll_forward"); 29507 - putp(scroll_forward); 29508 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx scroll_forward); 29509 } 29510 } else if (delete_line && bot == maxy) { 29511 - GoTo(top, 0); 29512 - UpdateAttrs(blank); 29513 + GoTo(NCURSES_SP_ARGx top, 0); 29514 + UpdateAttrs(SP_PARM, blank); 29515 for (i = 0; i < n; i++) { 29516 TPUTS_TRACE("delete_line"); 29517 - putp(delete_line); 29518 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx delete_line); 29519 } 29520 } else 29521 return ERR; 29522 29523 #if NCURSES_EXT_FUNCS 29524 - if (FILL_BCE()) { 29525 + if (FILL_BCE(SP_PARM)) { 29526 int j; 29527 for (i = 0; i < n; i++) { 29528 - GoTo(bot - i, 0); 29529 - for (j = 0; j < screen_columns; j++) 29530 - PutChar(CHREF(blank)); 29531 + GoTo(NCURSES_SP_ARGx bot - i, 0); 29532 + for (j = 0; j < screen_columns(SP_PARM); j++) 29533 + PutChar(NCURSES_SP_ARGx CHREF(blank)); 29534 } 29535 } 29536 #endif 29537 @@ -1656,55 +1802,66 @@ 29538 /* Try to scroll down assuming given csr (miny, maxy). Returns ERR on failure */ 29539 /* n > 0 */ 29540 static int 29541 -scroll_csr_backward(int n, int top, int bot, int miny, int maxy, 29542 +scroll_csr_backward(NCURSES_SP_DCLx 29543 + int n, 29544 + int top, 29545 + int bot, 29546 + int miny, 29547 + int maxy, 29548 NCURSES_CH_T blank) 29549 { 29550 int i; 29551 29552 if (n == 1 && scroll_reverse && top == miny && bot == maxy) { 29553 - GoTo(top, 0); 29554 - UpdateAttrs(blank); 29555 + GoTo(NCURSES_SP_ARGx top, 0); 29556 + UpdateAttrs(SP_PARM, blank); 29557 TPUTS_TRACE("scroll_reverse"); 29558 - putp(scroll_reverse); 29559 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx scroll_reverse); 29560 } else if (n == 1 && insert_line && bot == maxy) { 29561 - GoTo(top, 0); 29562 - UpdateAttrs(blank); 29563 + GoTo(NCURSES_SP_ARGx top, 0); 29564 + UpdateAttrs(SP_PARM, blank); 29565 TPUTS_TRACE("insert_line"); 29566 - putp(insert_line); 29567 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx insert_line); 29568 } else if (parm_rindex && top == miny && bot == maxy) { 29569 - GoTo(top, 0); 29570 - UpdateAttrs(blank); 29571 + GoTo(NCURSES_SP_ARGx top, 0); 29572 + UpdateAttrs(SP_PARM, blank); 29573 TPUTS_TRACE("parm_rindex"); 29574 - tputs(TPARM_2(parm_rindex, n, 0), n, _nc_outch); 29575 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx 29576 + TPARM_2(parm_rindex, n, 0), 29577 + n, 29578 + NCURSES_SP_NAME(_nc_outch)); 29579 } else if (parm_insert_line && bot == maxy) { 29580 - GoTo(top, 0); 29581 - UpdateAttrs(blank); 29582 + GoTo(NCURSES_SP_ARGx top, 0); 29583 + UpdateAttrs(SP_PARM, blank); 29584 TPUTS_TRACE("parm_insert_line"); 29585 - tputs(TPARM_2(parm_insert_line, n, 0), n, _nc_outch); 29586 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx 29587 + TPARM_2(parm_insert_line, n, 0), 29588 + n, 29589 + NCURSES_SP_NAME(_nc_outch)); 29590 } else if (scroll_reverse && top == miny && bot == maxy) { 29591 - GoTo(top, 0); 29592 - UpdateAttrs(blank); 29593 + GoTo(NCURSES_SP_ARGx top, 0); 29594 + UpdateAttrs(SP_PARM, blank); 29595 for (i = 0; i < n; i++) { 29596 TPUTS_TRACE("scroll_reverse"); 29597 - putp(scroll_reverse); 29598 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx scroll_reverse); 29599 } 29600 } else if (insert_line && bot == maxy) { 29601 - GoTo(top, 0); 29602 - UpdateAttrs(blank); 29603 + GoTo(NCURSES_SP_ARGx top, 0); 29604 + UpdateAttrs(SP_PARM, blank); 29605 for (i = 0; i < n; i++) { 29606 TPUTS_TRACE("insert_line"); 29607 - putp(insert_line); 29608 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx insert_line); 29609 } 29610 } else 29611 return ERR; 29612 29613 #if NCURSES_EXT_FUNCS 29614 - if (FILL_BCE()) { 29615 + if (FILL_BCE(SP_PARM)) { 29616 int j; 29617 for (i = 0; i < n; i++) { 29618 - GoTo(top + i, 0); 29619 - for (j = 0; j < screen_columns; j++) 29620 - PutChar(CHREF(blank)); 29621 + GoTo(NCURSES_SP_ARGx top + i, 0); 29622 + for (j = 0; j < screen_columns(SP_PARM); j++) 29623 + PutChar(NCURSES_SP_ARGx CHREF(blank)); 29624 } 29625 } 29626 #endif 29627 @@ -1714,40 +1871,46 @@ 29628 /* scroll by using delete_line at del and insert_line at ins */ 29629 /* n > 0 */ 29630 static int 29631 -scroll_idl(int n, int del, int ins, NCURSES_CH_T blank) 29632 +scroll_idl(NCURSES_SP_DCLx int n, int del, int ins, NCURSES_CH_T blank) 29633 { 29634 int i; 29635 29636 if (!((parm_delete_line || delete_line) && (parm_insert_line || insert_line))) 29637 return ERR; 29638 29639 - GoTo(del, 0); 29640 - UpdateAttrs(blank); 29641 + GoTo(NCURSES_SP_ARGx del, 0); 29642 + UpdateAttrs(SP_PARM, blank); 29643 if (n == 1 && delete_line) { 29644 TPUTS_TRACE("delete_line"); 29645 - putp(delete_line); 29646 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx delete_line); 29647 } else if (parm_delete_line) { 29648 TPUTS_TRACE("parm_delete_line"); 29649 - tputs(TPARM_2(parm_delete_line, n, 0), n, _nc_outch); 29650 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx 29651 + TPARM_2(parm_delete_line, n, 0), 29652 + n, 29653 + NCURSES_SP_NAME(_nc_outch)); 29654 } else { /* if (delete_line) */ 29655 for (i = 0; i < n; i++) { 29656 TPUTS_TRACE("delete_line"); 29657 - putp(delete_line); 29658 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx delete_line); 29659 } 29660 } 29661 29662 - GoTo(ins, 0); 29663 - UpdateAttrs(blank); 29664 + GoTo(NCURSES_SP_ARGx ins, 0); 29665 + UpdateAttrs(SP_PARM, blank); 29666 if (n == 1 && insert_line) { 29667 TPUTS_TRACE("insert_line"); 29668 - putp(insert_line); 29669 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx insert_line); 29670 } else if (parm_insert_line) { 29671 TPUTS_TRACE("parm_insert_line"); 29672 - tputs(TPARM_2(parm_insert_line, n, 0), n, _nc_outch); 29673 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx 29674 + TPARM_2(parm_insert_line, n, 0), 29675 + n, 29676 + NCURSES_SP_NAME(_nc_outch)); 29677 } else { /* if (insert_line) */ 29678 for (i = 0; i < n; i++) { 29679 TPUTS_TRACE("insert_line"); 29680 - putp(insert_line); 29681 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx insert_line); 29682 } 29683 } 29684 29685 @@ -1763,10 +1926,14 @@ 29686 * save/restore cursor capabilities if the terminal has them. 29687 */ 29688 NCURSES_EXPORT(int) 29689 -_nc_scrolln(int n, int top, int bot, int maxy) 29690 +NCURSES_SP_NAME(_nc_scrolln) (NCURSES_SP_DCLx 29691 + int n, 29692 + int top, 29693 + int bot, 29694 + int maxy) 29695 /* scroll region from top to bot by n lines */ 29696 { 29697 - NCURSES_CH_T blank = ClrBlank(stdscr); 29698 + NCURSES_CH_T blank = ClrBlank(NCURSES_SP_ARGx StdScreen(SP_PARM)); 29699 int i; 29700 bool cursor_saved = FALSE; 29701 int res; 29702 @@ -1787,34 +1954,36 @@ 29703 * Explicitly clear if stuff pushed off top of region might 29704 * be saved by the terminal. 29705 */ 29706 - res = scroll_csr_forward(n, top, bot, 0, maxy, blank); 29707 + res = scroll_csr_forward(NCURSES_SP_ARGx n, top, bot, 0, maxy, blank); 29708 29709 if (res == ERR && change_scroll_region) { 29710 if ((((n == 1 && scroll_forward) || parm_index) 29711 - && (SP->_cursrow == bot || SP->_cursrow == bot - 1)) 29712 + && (SP_PARM->_cursrow == bot || SP_PARM->_cursrow == bot - 1)) 29713 && save_cursor && restore_cursor) { 29714 cursor_saved = TRUE; 29715 TPUTS_TRACE("save_cursor"); 29716 - putp(save_cursor); 29717 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx save_cursor); 29718 } 29719 TPUTS_TRACE("change_scroll_region"); 29720 - putp(TPARM_2(change_scroll_region, top, bot)); 29721 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx 29722 + TPARM_2(change_scroll_region, top, bot)); 29723 if (cursor_saved) { 29724 TPUTS_TRACE("restore_cursor"); 29725 - putp(restore_cursor); 29726 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx restore_cursor); 29727 } else { 29728 - SP->_cursrow = SP->_curscol = -1; 29729 + SP_PARM->_cursrow = SP_PARM->_curscol = -1; 29730 } 29731 29732 - res = scroll_csr_forward(n, top, bot, top, bot, blank); 29733 + res = scroll_csr_forward(NCURSES_SP_ARGx n, top, bot, top, bot, blank); 29734 29735 TPUTS_TRACE("change_scroll_region"); 29736 - putp(TPARM_2(change_scroll_region, 0, maxy)); 29737 - SP->_cursrow = SP->_curscol = -1; 29738 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx 29739 + TPARM_2(change_scroll_region, 0, maxy)); 29740 + SP_PARM->_cursrow = SP_PARM->_curscol = -1; 29741 } 29742 29743 if (res == ERR && _nc_idlok) 29744 - res = scroll_idl(n, top, bot - n + 1, blank); 29745 + res = scroll_idl(NCURSES_SP_ARGx n, top, bot - n + 1, blank); 29746 29747 /* 29748 * Clear the newly shifted-in text. 29749 @@ -1823,44 +1992,49 @@ 29750 && (non_dest_scroll_region || (memory_below && bot == maxy))) { 29751 static const NCURSES_CH_T blank2 = NewChar(BLANK_TEXT); 29752 if (bot == maxy && clr_eos) { 29753 - GoTo(bot - n + 1, 0); 29754 - ClrToEOS(blank2); 29755 + GoTo(NCURSES_SP_ARGx bot - n + 1, 0); 29756 + ClrToEOS(NCURSES_SP_ARGx blank2); 29757 } else { 29758 for (i = 0; i < n; i++) { 29759 - GoTo(bot - i, 0); 29760 - ClrToEOL(blank2, FALSE); 29761 + GoTo(NCURSES_SP_ARGx bot - i, 0); 29762 + ClrToEOL(NCURSES_SP_ARGx blank2, FALSE); 29763 } 29764 } 29765 } 29766 29767 } else { /* (n < 0) - scroll down (backward) */ 29768 - res = scroll_csr_backward(-n, top, bot, 0, maxy, blank); 29769 + res = scroll_csr_backward(NCURSES_SP_ARGx -n, top, bot, 0, maxy, blank); 29770 29771 if (res == ERR && change_scroll_region) { 29772 - if (top != 0 && (SP->_cursrow == top || SP->_cursrow == top - 1) 29773 + if (top != 0 29774 + && (SP_PARM->_cursrow == top || 29775 + SP_PARM->_cursrow == top - 1) 29776 && save_cursor && restore_cursor) { 29777 cursor_saved = TRUE; 29778 TPUTS_TRACE("save_cursor"); 29779 - putp(save_cursor); 29780 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx save_cursor); 29781 } 29782 TPUTS_TRACE("change_scroll_region"); 29783 - putp(TPARM_2(change_scroll_region, top, bot)); 29784 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx 29785 + TPARM_2(change_scroll_region, top, bot)); 29786 if (cursor_saved) { 29787 TPUTS_TRACE("restore_cursor"); 29788 - putp(restore_cursor); 29789 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx restore_cursor); 29790 } else { 29791 - SP->_cursrow = SP->_curscol = -1; 29792 + SP_PARM->_cursrow = SP_PARM->_curscol = -1; 29793 } 29794 29795 - res = scroll_csr_backward(-n, top, bot, top, bot, blank); 29796 + res = scroll_csr_backward(NCURSES_SP_ARGx 29797 + -n, top, bot, top, bot, blank); 29798 29799 TPUTS_TRACE("change_scroll_region"); 29800 - putp(TPARM_2(change_scroll_region, 0, maxy)); 29801 - SP->_cursrow = SP->_curscol = -1; 29802 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx 29803 + TPARM_2(change_scroll_region, 0, maxy)); 29804 + SP_PARM->_cursrow = SP_PARM->_curscol = -1; 29805 } 29806 29807 if (res == ERR && _nc_idlok) 29808 - res = scroll_idl(-n, bot + n + 1, top, blank); 29809 + res = scroll_idl(NCURSES_SP_ARGx -n, bot + n + 1, top, blank); 29810 29811 /* 29812 * Clear the newly shifted-in text. 29813 @@ -1869,8 +2043,8 @@ 29814 && (non_dest_scroll_region || (memory_above && top == 0))) { 29815 static const NCURSES_CH_T blank2 = NewChar(BLANK_TEXT); 29816 for (i = 0; i < -n; i++) { 29817 - GoTo(i + top, 0); 29818 - ClrToEOL(blank2, FALSE); 29819 + GoTo(NCURSES_SP_ARGx i + top, 0); 29820 + ClrToEOL(NCURSES_SP_ARGx blank2, FALSE); 29821 } 29822 } 29823 } 29824 @@ -1878,99 +2052,156 @@ 29825 if (res == ERR) 29826 return (ERR); 29827 29828 - _nc_scroll_window(curscr, n, top, bot, blank); 29829 + _nc_scroll_window(CurScreen(SP_PARM), n, top, bot, blank); 29830 29831 /* shift hash values too - they can be reused */ 29832 - _nc_scroll_oldhash(n, top, bot); 29833 + NCURSES_SP_NAME(_nc_scroll_oldhash) (NCURSES_SP_ARGx n, top, bot); 29834 29835 return (OK); 29836 } 29837 29838 +#if NCURSES_SP_FUNCS 29839 +NCURSES_EXPORT(int) 29840 +_nc_scrolln(int n, int top, int bot, int maxy) 29841 +{ 29842 + return NCURSES_SP_NAME(_nc_scrolln) (CURRENT_SCREEN, n, top, bot, maxy); 29843 +} 29844 +#endif 29845 + 29846 NCURSES_EXPORT(void) 29847 -_nc_screen_resume(void) 29848 +NCURSES_SP_NAME(_nc_screen_resume) (NCURSES_SP_DCL0) 29849 { 29850 + assert(SP_PARM); 29851 + 29852 /* make sure terminal is in a sane known state */ 29853 - SetAttr(SCREEN_ATTRS(SP), A_NORMAL); 29854 - newscr->_clear = TRUE; 29855 + SetAttr(SCREEN_ATTRS(SP_PARM), A_NORMAL); 29856 + NewScreen(SP_PARM)->_clear = TRUE; 29857 29858 /* reset color pairs and definitions */ 29859 - if (SP->_coloron || SP->_color_defs) 29860 + if (SP_PARM->_coloron || SP_PARM->_color_defs) 29861 _nc_reset_colors(); 29862 29863 /* restore user-defined colors, if any */ 29864 - if (SP->_color_defs < 0) { 29865 + if (SP_PARM->_color_defs < 0) { 29866 int n; 29867 - SP->_color_defs = -(SP->_color_defs); 29868 - for (n = 0; n < SP->_color_defs; ++n) { 29869 - if (SP->_color_table[n].init) { 29870 - init_color(n, 29871 - SP->_color_table[n].r, 29872 - SP->_color_table[n].g, 29873 - SP->_color_table[n].b); 29874 + SP_PARM->_color_defs = -(SP_PARM->_color_defs); 29875 + for (n = 0; n < SP_PARM->_color_defs; ++n) { 29876 + if (SP_PARM->_color_table[n].init) { 29877 + NCURSES_SP_NAME(init_color) (NCURSES_SP_ARGx n, 29878 + SP_PARM->_color_table[n].r, 29879 + SP_PARM->_color_table[n].g, 29880 + SP_PARM->_color_table[n].b); 29881 } 29882 } 29883 } 29884 29885 if (exit_attribute_mode) 29886 - putp(exit_attribute_mode); 29887 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx exit_attribute_mode); 29888 else { 29889 /* turn off attributes */ 29890 if (exit_alt_charset_mode) 29891 - putp(exit_alt_charset_mode); 29892 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx exit_alt_charset_mode); 29893 if (exit_standout_mode) 29894 - putp(exit_standout_mode); 29895 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx exit_standout_mode); 29896 if (exit_underline_mode) 29897 - putp(exit_underline_mode); 29898 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx exit_underline_mode); 29899 } 29900 if (exit_insert_mode) 29901 - putp(exit_insert_mode); 29902 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx exit_insert_mode); 29903 if (enter_am_mode && exit_am_mode) 29904 - putp(auto_right_margin ? enter_am_mode : exit_am_mode); 29905 + NCURSES_SP_NAME(putp) (NCURSES_SP_ARGx 29906 + (auto_right_margin 29907 + ? enter_am_mode 29908 + : exit_am_mode)); 29909 } 29910 29911 +#if NCURSES_SP_FUNCS 29912 +NCURSES_EXPORT(void) 29913 +_nc_screen_resume(void) 29914 +{ 29915 + NCURSES_SP_NAME(_nc_screen_resume) (CURRENT_SCREEN); 29916 +} 29917 +#endif 29918 + 29919 +NCURSES_EXPORT(void) 29920 +NCURSES_SP_NAME(_nc_screen_init) (NCURSES_SP_DCL0) 29921 +{ 29922 + NCURSES_SP_NAME(_nc_screen_resume) (NCURSES_SP_ARG); 29923 +} 29924 + 29925 +#if NCURSES_SP_FUNCS 29926 NCURSES_EXPORT(void) 29927 _nc_screen_init(void) 29928 { 29929 - _nc_screen_resume(); 29930 + NCURSES_SP_NAME(_nc_screen_init) (CURRENT_SCREEN); 29931 } 29932 +#endif 29933 29934 /* wrap up screen handling */ 29935 NCURSES_EXPORT(void) 29936 -_nc_screen_wrap(void) 29937 +NCURSES_SP_NAME(_nc_screen_wrap) (NCURSES_SP_DCL0) 29938 { 29939 - UpdateAttrs(normal); 29940 + if (SP_PARM == 0) 29941 + return; 29942 + 29943 + UpdateAttrs(SP_PARM, normal); 29944 #if NCURSES_EXT_FUNCS 29945 - if (SP->_coloron 29946 - && !SP->_default_color) { 29947 + if (SP_PARM->_coloron 29948 + && !SP_PARM->_default_color) { 29949 static const NCURSES_CH_T blank = NewChar(BLANK_TEXT); 29950 - SP->_default_color = TRUE; 29951 - _nc_do_color(-1, 0, FALSE, _nc_outch); 29952 - SP->_default_color = FALSE; 29953 + SP_PARM->_default_color = TRUE; 29954 + NCURSES_SP_NAME(_nc_do_color) (NCURSES_SP_ARGx 29955 + -1, 0, 29956 + FALSE, 29957 + NCURSES_SP_NAME(_nc_outch)); 29958 + SP_PARM->_default_color = FALSE; 29959 29960 - mvcur(SP->_cursrow, SP->_curscol, screen_lines - 1, 0); 29961 + mvcur(SP_PARM->_cursrow, 29962 + SP_PARM->_curscol, 29963 + screen_lines(SP_PARM) - 1, 0); 29964 29965 - ClrToEOL(blank, TRUE); 29966 + ClrToEOL(NCURSES_SP_ARGx blank, TRUE); 29967 } 29968 #endif 29969 - if (SP->_color_defs) { 29970 + if (SP_PARM->_color_defs) { 29971 _nc_reset_colors(); 29972 } 29973 } 29974 29975 +#if NCURSES_SP_FUNCS 29976 +NCURSES_EXPORT(void) 29977 +_nc_screen_wrap(void) 29978 +{ 29979 + NCURSES_SP_NAME(_nc_screen_wrap) (CURRENT_SCREEN); 29980 +} 29981 +#endif 29982 + 29983 #if USE_XMC_SUPPORT 29984 NCURSES_EXPORT(void) 29985 -_nc_do_xmc_glitch(attr_t previous) 29986 +NCURSES_SP_NAME(_nc_do_xmc_glitch) (NCURSES_SP_DCLx attr_t previous) 29987 { 29988 - attr_t chg = XMC_CHANGES(previous ^ AttrOf(SCREEN_ATTRS(SP))); 29989 + if (SP_PARM != 0) { 29990 + attr_t chg = XMC_CHANGES(previous ^ AttrOf(SCREEN_ATTRS(SP_PARM))); 29991 29992 - while (chg != 0) { 29993 - if (chg & 1) { 29994 - SP->_curscol += magic_cookie_glitch; 29995 - if (SP->_curscol >= SP->_columns) 29996 - wrap_cursor(); 29997 - TR(TRACE_UPDATE, ("bumped to %d,%d after cookie", SP->_cursrow, SP->_curscol)); 29998 + while (chg != 0) { 29999 + if (chg & 1) { 30000 + SP_PARM->_curscol += magic_cookie_glitch; 30001 + if (SP_PARM->_curscol >= SP_PARM->_columns) 30002 + wrap_cursor(NCURSES_SP_ARG); 30003 + TR(TRACE_UPDATE, ("bumped to %d,%d after cookie", 30004 + SP_PARM->_cursrow, SP_PARM->_curscol)); 30005 + } 30006 + chg >>= 1; 30007 } 30008 - chg >>= 1; 30009 } 30010 } 30011 + 30012 +#if NCURSES_SP_FUNCS 30013 +NCURSES_EXPORT(void) 30014 +_nc_do_xmc_glitch(attr_t previous) 30015 +{ 30016 + NCURSES_SP_NAME(_nc_do_xmc_glitch) (CURRENT_SCREEN, previous); 30017 +} 30018 +#endif 30019 + 30020 #endif /* USE_XMC_SUPPORT */ 20690 30021 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_cchar.c ncurses-5.7/ncurses/widechar/lib_cchar.c 20691 30022 --- ncurses-5.7.orig/ncurses/widechar/lib_cchar.c 2007-05-12 12:03:06.000000000 -0700 20692 +++ ncurses-5.7/ncurses/widechar/lib_cchar.c 2009-0 3-22 21:17:07.020082134-070030023 +++ ncurses-5.7/ncurses/widechar/lib_cchar.c 2009-06-05 14:01:16.000000000 -0700 20693 30024 @@ -1,5 +1,5 @@ 20694 30025 /**************************************************************************** … … 20718 30049 20719 30050 TR(TRACE_CCALLS, (T_CALLED("setcchar(%p,%s,%lu,%d,%p)"), 30051 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_get_wch.c ncurses-5.7/ncurses/widechar/lib_get_wch.c 30052 --- ncurses-5.7.orig/ncurses/widechar/lib_get_wch.c 2008-08-16 12:22:55.000000000 -0700 30053 +++ ncurses-5.7/ncurses/widechar/lib_get_wch.c 2009-06-05 14:01:44.000000000 -0700 30054 @@ -1,5 +1,5 @@ 30055 /**************************************************************************** 30056 - * Copyright (c) 2002-2007,2008 Free Software Foundation, Inc. * 30057 + * Copyright (c) 2002-2008,2009 Free Software Foundation, Inc. * 30058 * * 30059 * Permission is hereby granted, free of charge, to any person obtaining a * 30060 * copy of this software and associated documentation files (the * 30061 @@ -40,7 +40,7 @@ 30062 #include <curses.priv.h> 30063 #include <ctype.h> 30064 30065 -MODULE_ID("$Id: lib_get_wch.c,v 1.17 2008/08/16 19:22:55 tom Exp $") 30066 +MODULE_ID("$Id: lib_get_wch.c,v 1.18 2009/04/18 22:41:33 tom Exp $") 30067 30068 #if HAVE_MBTOWC && HAVE_MBLEN 30069 #define reset_mbytes(state) mblen(NULL, 0), mbtowc(NULL, NULL, 0) 30070 @@ -95,12 +95,12 @@ 30071 * whether the improvement would be worth the effort. 30072 */ 30073 if (count != 0) { 30074 - _nc_ungetch(sp, (int) value); 30075 + safe_ungetch (SP_PARM, (int) value); 30076 code = ERR; 30077 } 30078 break; 30079 } else if (count + 1 >= sizeof(buffer)) { 30080 - _nc_ungetch(sp, (int) value); 30081 + safe_ungetch (SP_PARM, (int) value); 30082 code = ERR; 30083 break; 30084 } else { 30085 @@ -111,7 +111,7 @@ 30086 reset_mbytes(state); 30087 if (check_mbytes(wch, buffer, count, state) != status) { 30088 code = ERR; /* the two calls should match */ 30089 - _nc_ungetch(sp, (int) value); 30090 + safe_ungetch (SP_PARM, (int) value); 30091 } 30092 value = wch; 30093 break; 20720 30094 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_get_wstr.c ncurses-5.7/ncurses/widechar/lib_get_wstr.c 20721 30095 --- ncurses-5.7.orig/ncurses/widechar/lib_get_wstr.c 2008-08-16 12:25:33.000000000 -0700 20722 +++ ncurses-5.7/ncurses/widechar/lib_get_wstr.c 2009-0 3-22 21:17:07.020082134-070030096 +++ ncurses-5.7/ncurses/widechar/lib_get_wstr.c 2009-06-05 14:01:16.000000000 -0700 20723 30097 @@ -38,9 +38,8 @@ 20724 30098 */ … … 20732 30106 static int 20733 30107 wadd_wint(WINDOW *win, wint_t *src) 30108 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_ins_wch.c ncurses-5.7/ncurses/widechar/lib_ins_wch.c 30109 --- ncurses-5.7.orig/ncurses/widechar/lib_ins_wch.c 2005-12-03 12:24:19.000000000 -0800 30110 +++ ncurses-5.7/ncurses/widechar/lib_ins_wch.c 2009-06-05 14:01:55.000000000 -0700 30111 @@ -1,5 +1,5 @@ 30112 /**************************************************************************** 30113 - * Copyright (c) 2002-2003,2005 Free Software Foundation, Inc. * 30114 + * Copyright (c) 2002-2005,2009 Free Software Foundation, Inc. * 30115 * * 30116 * Permission is hereby granted, free of charge, to any person obtaining a * 30117 * copy of this software and associated documentation files (the * 30118 @@ -39,7 +39,7 @@ 30119 30120 #include <curses.priv.h> 30121 30122 -MODULE_ID("$Id: lib_ins_wch.c,v 1.8 2005/12/03 20:24:19 tom Exp $") 30123 +MODULE_ID("$Id: lib_ins_wch.c,v 1.9 2009/05/30 14:52:42 tom Exp $") 30124 30125 /* 30126 * Insert the given character, updating the current location to simplify 30127 @@ -112,6 +112,8 @@ 30128 n = wcslen(wstr); 30129 code = OK; 30130 if (n > 0) { 30131 + SCREEN *sp = _nc_screen_of(win); 30132 + 30133 oy = win->_cury; 30134 ox = win->_curx; 30135 for (cp = wstr; *cp && ((cp - wstr) < n); cp++) { 30136 @@ -129,7 +131,7 @@ 30137 code = _nc_insert_wch(win, &tmp_cchar); 30138 } else { 30139 /* tabs, other ASCII stuff */ 30140 - code = _nc_insert_ch(win, (chtype) (*cp)); 30141 + code = _nc_insert_ch(sp, win, (chtype) (*cp)); 30142 } 30143 if (code != OK) 30144 break; 30145 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_unget_wch.c ncurses-5.7/ncurses/widechar/lib_unget_wch.c 30146 --- ncurses-5.7.orig/ncurses/widechar/lib_unget_wch.c 2008-06-07 07:50:37.000000000 -0700 30147 +++ ncurses-5.7/ncurses/widechar/lib_unget_wch.c 2009-06-05 14:01:44.000000000 -0700 30148 @@ -1,5 +1,5 @@ 30149 /**************************************************************************** 30150 - * Copyright (c) 2002-2007,2008 Free Software Foundation, Inc. * 30151 + * Copyright (c) 2002-2008,2009 Free Software Foundation, Inc. * 30152 * * 30153 * Permission is hereby granted, free of charge, to any person obtaining a * 30154 * copy of this software and associated documentation files (the * 30155 @@ -39,7 +39,7 @@ 30156 30157 #include <curses.priv.h> 30158 30159 -MODULE_ID("$Id: lib_unget_wch.c,v 1.10 2008/06/07 14:50:37 tom Exp $") 30160 +MODULE_ID("$Id: lib_unget_wch.c,v 1.11 2009/04/04 23:57:25 tom Exp $") 30161 30162 /* 30163 * Wrapper for wcrtomb() which obtains the length needed for the given 30164 @@ -65,14 +65,14 @@ 30165 } 30166 30167 NCURSES_EXPORT(int) 30168 -unget_wch(const wchar_t wch) 30169 +NCURSES_SP_NAME(unget_wch) (NCURSES_SP_DCLx const wchar_t wch) 30170 { 30171 int result = OK; 30172 mbstate_t state; 30173 size_t length; 30174 int n; 30175 30176 - T((T_CALLED("unget_wch(%#lx)"), (unsigned long) wch)); 30177 + T((T_CALLED("unget_wch(%p, %#lx)"), SP_PARM, (unsigned long) wch)); 30178 30179 init_mb(state); 30180 length = _nc_wcrtomb(0, wch, &state); 30181 @@ -86,7 +86,7 @@ 30182 wcrtomb(string, wch, &state); 30183 30184 for (n = (int) (length - 1); n >= 0; --n) { 30185 - if (_nc_ungetch(SP, string[n]) != OK) { 30186 + if (NCURSES_SP_NAME(ungetch) (NCURSES_SP_ARGx string[n]) != OK) { 30187 result = ERR; 30188 break; 30189 } 30190 @@ -101,3 +101,11 @@ 30191 30192 returnCode(result); 30193 } 30194 + 30195 +#if NCURSES_SP_FUNCS 30196 +NCURSES_EXPORT(int) 30197 +unget_wch(const wchar_t wch) 30198 +{ 30199 + return NCURSES_SP_NAME(unget_wch) (CURRENT_SCREEN, wch); 30200 +} 30201 +#endif 30202 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_vid_attr.c ncurses-5.7/ncurses/widechar/lib_vid_attr.c 30203 --- ncurses-5.7.orig/ncurses/widechar/lib_vid_attr.c 2007-06-30 15:03:02.000000000 -0700 30204 +++ ncurses-5.7/ncurses/widechar/lib_vid_attr.c 2009-06-05 14:01:51.000000000 -0700 30205 @@ -1,5 +1,5 @@ 30206 /**************************************************************************** 30207 - * Copyright (c) 2002-2006,2007 Free Software Foundation, Inc. * 30208 + * Copyright (c) 2002-2007,2009 Free Software Foundation, Inc. * 30209 * * 30210 * Permission is hereby granted, free of charge, to any person obtaining a * 30211 * copy of this software and associated documentation files (the * 30212 @@ -33,9 +33,13 @@ 30213 #include <curses.priv.h> 30214 #include <term.h> 30215 30216 -MODULE_ID("$Id: lib_vid_attr.c,v 1.5 2007/06/30 22:03:02 tom Exp $") 30217 +#ifndef CUR 30218 +#define CUR SP_TERMTYPE 30219 +#endif 30220 + 30221 +MODULE_ID("$Id: lib_vid_attr.c,v 1.11 2009/05/10 00:48:29 tom Exp $") 30222 30223 -#define doPut(mode) TPUTS_TRACE(#mode); tputs(mode, 1, outc) 30224 +#define doPut(mode) TPUTS_TRACE(#mode); NCURSES_SP_NAME(tputs)(NCURSES_SP_ARGx mode, 1, outc) 30225 30226 #define TurnOn(mask,mode) \ 30227 if ((turn_on & mask) && mode) { doPut(mode); } 30228 @@ -50,14 +54,20 @@ 30229 if ((pair != old_pair) \ 30230 || (fix_pair0 && (pair == 0)) \ 30231 || (reverse ^ ((old_attr & A_REVERSE) != 0))) { \ 30232 - _nc_do_color(old_pair, pair, reverse, outc); \ 30233 + NCURSES_SP_NAME(_nc_do_color) (NCURSES_SP_ARGx \ 30234 + old_pair, pair, \ 30235 + reverse, outc); \ 30236 } \ 30237 } 30238 30239 #define set_color(mode, pair) mode &= ALL_BUT_COLOR; mode |= COLOR_PAIR(pair) 30240 30241 NCURSES_EXPORT(int) 30242 -vid_puts(attr_t newmode, short pair, void *opts GCC_UNUSED, int (*outc) (int)) 30243 +NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx 30244 + attr_t newmode, 30245 + short pair, 30246 + void *opts GCC_UNUSED, 30247 + NCURSES_SP_OUTC outc) 30248 { 30249 #if NCURSES_EXT_COLORS 30250 static attr_t previous_attr = A_NORMAL; 30251 @@ -65,9 +75,9 @@ 30252 30253 attr_t turn_on, turn_off; 30254 bool reverse = FALSE; 30255 - bool can_color = (SP == 0 || SP->_coloron); 30256 + bool can_color = (SP_PARM == 0 || SP_PARM->_coloron); 30257 #if NCURSES_EXT_FUNCS 30258 - bool fix_pair0 = (SP != 0 && SP->_coloron && !SP->_default_color); 30259 + bool fix_pair0 = (SP_PARM != 0 && SP_PARM->_coloron && !SP_PARM->_default_color); 30260 #else 30261 #define fix_pair0 FALSE 30262 #endif 30263 @@ -76,18 +86,18 @@ 30264 T((T_CALLED("vid_puts(%s,%d)"), _traceattr(newmode), pair)); 30265 30266 /* this allows us to go on whether or not newterm() has been called */ 30267 - if (SP) { 30268 - previous_attr = AttrOf(SCREEN_ATTRS(SP)); 30269 - previous_pair = GetPair(SCREEN_ATTRS(SP)); 30270 + if (SP_PARM) { 30271 + previous_attr = AttrOf(SCREEN_ATTRS(SP_PARM)); 30272 + previous_pair = GetPair(SCREEN_ATTRS(SP_PARM)); 30273 } 30274 30275 TR(TRACE_ATTRS, ("previous attribute was %s, %d", 30276 _traceattr(previous_attr), previous_pair)); 30277 30278 #if !USE_XMC_SUPPORT 30279 - if ((SP != 0) 30280 + if ((SP_PARM != 0) 30281 && (magic_cookie_glitch > 0)) 30282 - newmode &= ~(SP->_xmc_suppress); 30283 + newmode &= ~(SP_PARM->_xmc_suppress); 30284 #endif 30285 30286 /* 30287 @@ -144,10 +154,10 @@ 30288 if (exit_attribute_mode) { 30289 doPut(exit_attribute_mode); 30290 } else { 30291 - if (!SP || SP->_use_rmul) { 30292 + if (!SP_PARM || SP_PARM->_use_rmul) { 30293 TurnOff(A_UNDERLINE, exit_underline_mode); 30294 } 30295 - if (!SP || SP->_use_rmso) { 30296 + if (!SP_PARM || SP_PARM->_use_rmso) { 30297 TurnOff(A_STANDOUT, exit_standout_mode); 30298 } 30299 } 30300 @@ -159,16 +169,18 @@ 30301 } else if (set_attributes) { 30302 if (turn_on || turn_off) { 30303 TPUTS_TRACE("set_attributes"); 30304 - tputs(TPARM_9(set_attributes, 30305 - (newmode & A_STANDOUT) != 0, 30306 - (newmode & A_UNDERLINE) != 0, 30307 - (newmode & A_REVERSE) != 0, 30308 - (newmode & A_BLINK) != 0, 30309 - (newmode & A_DIM) != 0, 30310 - (newmode & A_BOLD) != 0, 30311 - (newmode & A_INVIS) != 0, 30312 - (newmode & A_PROTECT) != 0, 30313 - (newmode & A_ALTCHARSET) != 0), 1, outc); 30314 + NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx 30315 + TPARM_9(set_attributes, 30316 + (newmode & A_STANDOUT) != 0, 30317 + (newmode & A_UNDERLINE) != 0, 30318 + (newmode & A_REVERSE) != 0, 30319 + (newmode & A_BLINK) != 0, 30320 + (newmode & A_DIM) != 0, 30321 + (newmode & A_BOLD) != 0, 30322 + (newmode & A_INVIS) != 0, 30323 + (newmode & A_PROTECT) != 0, 30324 + (newmode & A_ALTCHARSET) != 0), 30325 + 1, outc); 30326 previous_attr &= ALL_BUT_COLOR; 30327 previous_pair = 0; 30328 } 30329 @@ -179,11 +191,11 @@ 30330 30331 TurnOff(A_ALTCHARSET, exit_alt_charset_mode); 30332 30333 - if (!SP || SP->_use_rmul) { 30334 + if (!SP_PARM || SP_PARM->_use_rmul) { 30335 TurnOff(A_UNDERLINE, exit_underline_mode); 30336 } 30337 30338 - if (!SP || SP->_use_rmso) { 30339 + if (!SP_PARM || SP_PARM->_use_rmso) { 30340 TurnOff(A_STANDOUT, exit_standout_mode); 30341 } 30342 30343 @@ -221,9 +233,9 @@ 30344 if (reverse) 30345 newmode |= A_REVERSE; 30346 30347 - if (SP) { 30348 - SetAttr(SCREEN_ATTRS(SP), newmode); 30349 - SetPair(SCREEN_ATTRS(SP), pair); 30350 + if (SP_PARM) { 30351 + SetAttr(SCREEN_ATTRS(SP_PARM), newmode); 30352 + SetPair(SCREEN_ATTRS(SP_PARM), pair); 30353 } else { 30354 previous_attr = newmode; 30355 previous_pair = pair; 30356 @@ -233,29 +245,60 @@ 30357 #else 30358 T((T_CALLED("vid_puts(%s,%d)"), _traceattr(newmode), pair)); 30359 set_color(newmode, pair); 30360 - returnCode(vidputs(newmode, outc)); 30361 + returnCode(NCURSES_SP_NAME(vidputs) (NCURSES_SP_ARGx newmode, outc)); 30362 #endif 30363 } 30364 30365 +#if NCURSES_SP_FUNCS 30366 +NCURSES_EXPORT(int) 30367 +vid_puts(attr_t newmode, 30368 + short pair, 30369 + void *opts GCC_UNUSED, 30370 + NCURSES_OUTC outc) 30371 +{ 30372 + SetSafeOutcWrapper(outc); 30373 + return NCURSES_SP_NAME(vid_puts) (CURRENT_SCREEN, 30374 + newmode, 30375 + pair, 30376 + opts, 30377 + _nc_outc_wrapper); 30378 +} 30379 +#endif 30380 + 30381 #undef vid_attr 30382 NCURSES_EXPORT(int) 30383 -vid_attr(attr_t newmode, short pair, void *opts) 30384 +NCURSES_SP_NAME(vid_attr) (NCURSES_SP_DCLx 30385 + attr_t newmode, 30386 + short pair, 30387 + void *opts) 30388 { 30389 T((T_CALLED("vid_attr(%s,%d)"), _traceattr(newmode), pair)); 30390 - returnCode(vid_puts(newmode, pair, opts, _nc_outch)); 30391 + returnCode(NCURSES_SP_NAME(vid_puts) (NCURSES_SP_ARGx 30392 + newmode, 30393 + pair, 30394 + opts, 30395 + NCURSES_SP_NAME(_nc_outch))); 30396 } 30397 30398 +#if NCURSES_SP_FUNCS 30399 +NCURSES_EXPORT(int) 30400 +vid_attr(attr_t newmode, short pair, void *opts) 30401 +{ 30402 + return NCURSES_SP_NAME(vid_attr) (CURRENT_SCREEN, newmode, pair, opts); 30403 +} 30404 +#endif 30405 + 30406 /* 30407 * This implementation uses the same mask values for A_xxx and WA_xxx, so 30408 * we can use termattrs() for part of the logic. 30409 */ 30410 NCURSES_EXPORT(attr_t) 30411 -term_attrs(void) 30412 +NCURSES_SP_NAME(term_attrs) (NCURSES_SP_DCL0) 30413 { 30414 attr_t attrs; 30415 30416 T((T_CALLED("term_attrs()"))); 30417 - attrs = termattrs(); 30418 + attrs = SP_PARM ? NCURSES_SP_NAME(termattrs) (NCURSES_SP_ARG) : 0; 30419 30420 /* these are only supported for wide-character mode */ 30421 if (enter_horizontal_hl_mode) 30422 @@ -273,3 +316,11 @@ 30423 30424 returnAttr(attrs); 30425 } 30426 + 30427 +#if NCURSES_SP_FUNCS 30428 +NCURSES_EXPORT(attr_t) 30429 +term_attrs(void) 30430 +{ 30431 + return NCURSES_SP_NAME(term_attrs) (CURRENT_SCREEN); 30432 +} 30433 +#endif 20734 30434 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_wacs.c ncurses-5.7/ncurses/widechar/lib_wacs.c 20735 30435 --- ncurses-5.7.orig/ncurses/widechar/lib_wacs.c 2006-12-17 07:16:17.000000000 -0800 20736 +++ ncurses-5.7/ncurses/widechar/lib_wacs.c 2009-0 3-22 21:17:07.020082134-070030436 +++ ncurses-5.7/ncurses/widechar/lib_wacs.c 2009-06-05 14:01:16.000000000 -0700 20737 30437 @@ -31,9 +31,8 @@ 20738 30438 ****************************************************************************/ … … 20746 30446 NCURSES_EXPORT_VAR(cchar_t) * _nc_wacs = 0; 20747 30447 30448 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_wunctrl.c ncurses-5.7/ncurses/widechar/lib_wunctrl.c 30449 --- ncurses-5.7.orig/ncurses/widechar/lib_wunctrl.c 2007-06-12 13:22:32.000000000 -0700 30450 +++ ncurses-5.7/ncurses/widechar/lib_wunctrl.c 2009-06-05 14:01:44.000000000 -0700 30451 @@ -1,5 +1,5 @@ 30452 /**************************************************************************** 30453 - * Copyright (c) 2001-2005,2007 Free Software Foundation, Inc. * 30454 + * Copyright (c) 2001-2007,2009 Free Software Foundation, Inc. * 30455 * * 30456 * Permission is hereby granted, free of charge, to any person obtaining a * 30457 * copy of this software and associated documentation files (the * 30458 @@ -35,21 +35,31 @@ 30459 30460 #include <curses.priv.h> 30461 30462 -MODULE_ID("$Id: lib_wunctrl.c,v 1.12 2007/06/12 20:22:32 tom Exp $") 30463 +MODULE_ID("$Id: lib_wunctrl.c,v 1.13 2009/04/18 19:06:55 tom Exp $") 30464 30465 NCURSES_EXPORT(wchar_t *) 30466 -wunctrl(cchar_t *wc) 30467 +NCURSES_SP_NAME(wunctrl) (NCURSES_SP_DCLx cchar_t *wc) 30468 { 30469 - static wchar_t str[CCHARW_MAX + 1], *sp; 30470 + static wchar_t str[CCHARW_MAX + 1], *wsp; 30471 30472 if (Charable(*wc)) { 30473 - const char *p = unctrl((unsigned) _nc_to_char((wint_t) CharOf(*wc))); 30474 + const char *p = 30475 + NCURSES_SP_NAME(unctrl) (NCURSES_SP_ARGx 30476 + (unsigned) _nc_to_char((wint_t)CharOf(*wc))); 30477 30478 - for (sp = str; *p; ++p) { 30479 - *sp++ = _nc_to_widechar(*p); 30480 + for (wsp = str; *p; ++p) { 30481 + *wsp++ = _nc_to_widechar(*p); 30482 } 30483 - *sp = 0; 30484 + *wsp = 0; 30485 return str; 30486 } else 30487 return wc->chars; 30488 } 30489 + 30490 +#if NCURSES_SP_FUNCS 30491 +NCURSES_EXPORT(wchar_t *) 30492 +wunctrl(cchar_t *wc) 30493 +{ 30494 + return NCURSES_SP_NAME(wunctrl) (CURRENT_SCREEN, wc); 30495 +} 30496 +#endif 20748 30497 diff -Naur ncurses-5.7.orig/NEWS ncurses-5.7/NEWS 20749 30498 --- ncurses-5.7.orig/NEWS 2008-11-01 17:56:22.000000000 -0700 20750 +++ ncurses-5.7/NEWS 2009-0 3-22 21:17:11.616376588-070030499 +++ ncurses-5.7/NEWS 2009-06-05 14:01:55.000000000 -0700 20751 30500 @@ -1,5 +1,5 @@ 20752 30501 ------------------------------------------------------------------------------- … … 20761 30510 ------------------------------------------------------------------------------- 20762 30511 --- $Id: NEWS,v 1.1320 2008/11/02 00:56:22 tom Exp $ 20763 +-- $Id: NEWS,v 1.13 73 2009/03/21 23:24:10tom Exp $30512 +-- $Id: NEWS,v 1.1392 2009/05/30 19:19:59 tom Exp $ 20764 30513 ------------------------------------------------------------------------------- 20765 30514 20766 30515 This is a log of changes that ncurses has gone through since Zeyd started 20767 @@ -45,6 +45, 185@@30516 @@ -45,6 +45,257 @@ 20768 30517 Changes through 1.9.9e did not credit all contributions; 20769 30518 it is not possible to add this information. 20770 30519 30520 +20090530 30521 + + fix an infinite recursion when adding a legacy-coding 8-bit value 30522 + using insch() (report by Clemens Ladisch). 30523 + + free home-terminfo string in del_curterm() (patch by Dan Weber). 30524 + + continue integrating "sp-funcs" by Juergen Pfeifer (incomplete). 30525 + 30526 +20090523 30527 + + continue integrating "sp-funcs" by Juergen Pfeifer (incomplete). 30528 + 30529 +20090516 30530 + + work around antique BSD game's manipulation of stdscr, etc., versus 30531 + SCREEN's copy of the pointer (Debian #528411). 30532 + + add a cast to wattrset macro to avoid compiler warning when comparing 30533 + its result against ERR (adapted from patch by Matt Kraii, Debian 30534 + #528374). 30535 + 30536 +20090510 30537 + + continue integrating "sp-funcs" by Juergen Pfeifer (incomplete). 30538 + 30539 +20090502 30540 + + continue integrating "sp-funcs" by Juergen Pfeifer (incomplete). 30541 + + add vwmterm terminfo entry (patch by Bryan Christ). 30542 + 30543 +20090425 30544 + + continue integrating "sp-funcs" by Juergen Pfeifer (incomplete). 30545 + 30546 +20090419 30547 + + build fix for _nc_free_and_exit() change in 20090418 (report by 30548 + Christian Ebert). 30549 + 30550 +20090418 30551 + + continue integrating "sp-funcs" by Juergen Pfeifer (incomplete). 30552 + 30553 +20090411 30554 + + continue integrating "sp-funcs" by Juergen Pfeifer (incomplete). 30555 + This change finishes merging for menu and panel libraries, does 30556 + part of the form library. 30557 + 30558 +20090404 30559 + + suppress configure check for static/dynamic linker flags for gcc on 30560 + Darwin (report by Nelson Beebe). 30561 + 30562 +20090328 30563 + + extend ansi.sys pfkey capability from kf1-kf10 to kf1-kf48, moving 30564 + function key definitions from emx-base for consistency -TD 30565 + + correct missing final 'p' in pfkey capability of ansi.sys-old (report 30566 + by Kalle Olavi Niemitalo). 30567 + + improve test/ncurses.c 'F' test, show combining characters in color. 30568 + + quiet a false report by cppcheck in c++/cursesw.cc by eliminating 30569 + a temporary variable. 30570 + + use _nc_doalloc() rather than realloc() in a few places in ncurses 30571 + library to avoid leak in out-of-memory condition (reports by William 30572 + Egert and Martin Ettl based on cppcheck tool). 30573 + + add --with-ncurses-wrap-prefix option to test/configure (discussion 30574 + with Charles Wilson). 30575 + + use ncurses*-config scripts if available for test/configure. 30576 + + update test/aclocal.m4 and test/configure 30577 + > patches by Charles Wilson: 30578 + + modify CF_WITH_LIBTOOL configure check to allow unreleased libtool 30579 + version numbers (e.g. which include alphabetic chars, as well as 30580 + digits, after the final '.'). 30581 + + improve use of -no-undefined option for libtool by setting an 30582 + intermediate variable LT_UNDEF in the configure script, and then 30583 + using that in the libtool link-commands. 30584 + + fix an missing use of NCURSES_PUBLIC_VAR() in tinfo/MKcodes.awk 30585 + from 2009031 changes. 30586 + + improve mk-1st.awk script by writing separate cases for the 30587 + LIBTOOL_LINK command, depending on which library (ncurses, ticlib, 30588 + termlib) is to be linked. 30589 + + modify configure.in to allow broken-linker configurations, not just 30590 + enable-reentrant, to set public wrap prefix. 30591 + 20771 30592 +20090321 20772 30593 + + add TICS_LIST and SHLIB_LIST to allow libtool 2.2.6 on Cygwin to … … 20786 30607 + such as "reset" by ignoring the executable suffix (reports by Charles 20787 30608 + Wilson, Samuel Thibault and Cedric Bretaudeau on Cygwin mailing 20788 + list). 30609 + list). 20789 30610 + + suppress configure check for static/dynamic linker flags for gcc on 20790 30611 + Solaris 10, since gcc is confused by absence of static libc, and … … 20953 30774 diff -Naur ncurses-5.7.orig/panel/Makefile.in ncurses-5.7/panel/Makefile.in 20954 30775 --- ncurses-5.7.orig/panel/Makefile.in 2007-04-28 07:56:11.000000000 -0700 20955 +++ ncurses-5.7/panel/Makefile.in 2009-0 3-22 21:16:55.671355217-070030776 +++ ncurses-5.7/panel/Makefile.in 2009-06-05 14:01:30.000000000 -0700 20956 30777 @@ -1,6 +1,6 @@ 20957 30778 -# $Id: Makefile.in,v 1.52 2007/04/28 14:56:11 tom Exp $ 20958 +# $Id: Makefile.in,v 1.5 3 2009/01/03 19:09:26 tomExp $30779 +# $Id: Makefile.in,v 1.54 2009/03/28 18:22:39 Charles.Wilson Exp $ 20959 30780 ############################################################################## 20960 30781 -# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. # … … 20963 30784 # Permission is hereby granted, free of charge, to any person obtaining a # 20964 30785 # copy of this software and associated documentation files (the "Software"), # 20965 @@ -71,7 +71,7 @@ 30786 @@ -64,6 +64,7 @@ 30787 LIBTOOL_LINK = @LIB_LINK@ 30788 LIBTOOL_INSTALL = @LIB_INSTALL@ 30789 LIBTOOL_UNINSTALL = @LIB_UNINSTALL@ 30790 +LT_UNDEF = @LT_UNDEF@ 30791 30792 INSTALL = @INSTALL@ 30793 INSTALL_LIB = @INSTALL@ @INSTALL_LIB@ 30794 @@ -71,7 +72,7 @@ 20966 30795 INSTALL_DATA = @INSTALL_DATA@ 20967 30796 … … 20972 30801 LD = @LD@ 20973 30802 LN_S = @LN_S@ 30803 diff -Naur ncurses-5.7.orig/panel/p_above.c ncurses-5.7/panel/p_above.c 30804 --- ncurses-5.7.orig/panel/p_above.c 2005-02-19 08:44:57.000000000 -0800 30805 +++ ncurses-5.7/panel/p_above.c 2009-06-05 14:01:33.000000000 -0700 30806 @@ -1,5 +1,5 @@ 30807 /**************************************************************************** 30808 - * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc. * 30809 + * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * 30810 * * 30811 * Permission is hereby granted, free of charge, to any person obtaining a * 30812 * copy of this software and associated documentation files (the * 30813 @@ -29,24 +29,56 @@ 30814 /**************************************************************************** 30815 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1995 * 30816 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 30817 + * and: Juergen Pfeifer 1997-1999,2008 * 30818 ****************************************************************************/ 30819 30820 /* p_above.c 30821 */ 30822 #include "panel.priv.h" 30823 30824 -MODULE_ID("$Id: p_above.c,v 1.6 2005/02/19 16:44:57 tom Exp $") 30825 +MODULE_ID("$Id: p_above.c,v 1.7 2009/04/11 20:03:06 tom Exp $") 30826 + 30827 +#if NCURSES_SP_FUNCS 30828 +NCURSES_EXPORT(PANEL *) 30829 +ground_panel(SCREEN * sp) 30830 +{ 30831 + T((T_CALLED("ground_panel(%p)"), sp)); 30832 + if (sp) 30833 + { 30834 + struct panelhook *ph = NCURSES_SP_NAME(_nc_panelhook) (sp); 30835 + 30836 + if (_nc_bottom_panel) /* this is the pseudo panel */ 30837 + returnPanel(_nc_bottom_panel->above); 30838 + else 30839 + returnPanel(0); 30840 + } 30841 + else 30842 + { 30843 + if (0 == CURRENT_SCREEN) 30844 + returnPanel(0); 30845 + else 30846 + returnPanel(ground_panel(CURRENT_SCREEN)); 30847 + } 30848 +} 30849 +#endif 30850 30851 NCURSES_EXPORT(PANEL *) 30852 panel_above(const PANEL * pan) 30853 { 30854 + PANEL *result; 30855 + 30856 T((T_CALLED("panel_above(%p)"), pan)); 30857 - if (!pan) 30858 + if (pan) 30859 + result = pan->above; 30860 + else 30861 { 30862 +#if NCURSES_SP_FUNCS 30863 + result = ground_panel(CURRENT_SCREEN); 30864 +#else 30865 /* if top and bottom are equal, we have no or only the pseudo panel; 30866 if not, we return the panel above the pseudo panel */ 30867 - returnPanel(EMPTY_STACK()? (PANEL *) 0 : _nc_bottom_panel->above); 30868 + result = EMPTY_STACK()? (PANEL *) 0 : _nc_bottom_panel->above; 30869 +#endif 30870 } 30871 - else 30872 - returnPanel(pan->above); 30873 + returnPanel(result); 30874 } 30875 diff -Naur ncurses-5.7.orig/panel/panel.c ncurses-5.7/panel/panel.c 30876 --- ncurses-5.7.orig/panel/panel.c 2005-02-19 10:04:31.000000000 -0800 30877 +++ ncurses-5.7/panel/panel.c 2009-06-05 14:01:33.000000000 -0700 30878 @@ -1,5 +1,5 @@ 30879 /**************************************************************************** 30880 - * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. * 30881 + * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * 30882 * * 30883 * Permission is hereby granted, free of charge, to any person obtaining a * 30884 * copy of this software and associated documentation files (the * 30885 @@ -29,12 +29,14 @@ 30886 /**************************************************************************** 30887 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1995 * 30888 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 30889 + * and: Juergen Pfeifer 1996-1999,2008 * 30890 + * and: Thomas E. Dickey * 30891 ****************************************************************************/ 30892 30893 /* panel.c -- implementation of panels library, some core routines */ 30894 #include "panel.priv.h" 30895 30896 -MODULE_ID("$Id: panel.c,v 1.23 2005/02/19 18:04:31 tom Exp $") 30897 +MODULE_ID("$Id: panel.c,v 1.24 2009/04/11 21:29:10 tom Exp $") 30898 30899 /*+------------------------------------------------------------------------- 30900 _nc_retrace_panel (pan) 30901 @@ -91,6 +93,8 @@ 30902 { 30903 char s80[80]; 30904 30905 + GetPanelHook(pan); 30906 + 30907 sprintf(s80, fmt, num, pan); 30908 _tracef("%s b=%s t=%s", s80, 30909 (_nc_bottom_panel) ? USER_PTR(_nc_bottom_panel->user) : "--", 30910 diff -Naur ncurses-5.7.orig/panel/panel.h ncurses-5.7/panel/panel.h 30911 --- ncurses-5.7.orig/panel/panel.h 2006-05-27 12:49:40.000000000 -0700 30912 +++ ncurses-5.7/panel/panel.h 2009-06-05 14:01:33.000000000 -0700 30913 @@ -1,5 +1,5 @@ 30914 /**************************************************************************** 30915 - * Copyright (c) 1998-2001,2006 Free Software Foundation, Inc. * 30916 + * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. * 30917 * * 30918 * Permission is hereby granted, free of charge, to any person obtaining a * 30919 * copy of this software and associated documentation files (the * 30920 @@ -29,9 +29,10 @@ 30921 /**************************************************************************** 30922 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1995 * 30923 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 30924 + * and: Juergen Pfeifer 1996-1999,2008 * 30925 ****************************************************************************/ 30926 30927 -/* $Id: panel.h,v 1.10 2006/05/27 19:49:40 tom Exp $ */ 30928 +/* $Id: panel.h,v 1.11 2009/04/11 19:50:40 tom Exp $ */ 30929 30930 /* panel.h -- interface file for panels library */ 30931 30932 @@ -68,6 +69,13 @@ 30933 extern NCURSES_EXPORT(int) replace_panel (PANEL *,WINDOW *); 30934 extern NCURSES_EXPORT(int) panel_hidden (const PANEL *); 30935 30936 +#if NCURSES_SP_FUNCS 30937 +extern NCURSES_EXPORT(PANEL *) ground_panel(SCREEN *); 30938 +extern NCURSES_EXPORT(PANEL *) ceiling_panel(SCREEN *); 30939 + 30940 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(update_panels) (SCREEN*); 30941 +#endif 30942 + 30943 #if defined(__cplusplus) 30944 } 30945 #endif 30946 diff -Naur ncurses-5.7.orig/panel/panel.priv.h ncurses-5.7/panel/panel.priv.h 30947 --- ncurses-5.7.orig/panel/panel.priv.h 2008-09-27 15:36:11.000000000 -0700 30948 +++ ncurses-5.7/panel/panel.priv.h 2009-06-05 14:01:33.000000000 -0700 30949 @@ -1,5 +1,5 @@ 30950 /**************************************************************************** 30951 - * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc. * 30952 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 30953 * * 30954 * Permission is hereby granted, free of charge, to any person obtaining a * 30955 * copy of this software and associated documentation files (the * 30956 @@ -26,7 +26,7 @@ 30957 * authorization. * 30958 ****************************************************************************/ 30959 30960 -/* $Id: panel.priv.h,v 1.22 2008/09/27 22:36:11 tom Exp $ */ 30961 +/* $Id: panel.priv.h,v 1.23 2009/04/11 20:33:55 tom Exp $ */ 30962 30963 #ifndef NCURSES_PANEL_PRIV_H 30964 #define NCURSES_PANEL_PRIV_H 1 30965 @@ -39,9 +39,11 @@ 30966 #include <string.h> 30967 #include <assert.h> 30968 30969 -#include "curses.priv.h" 30970 +struct screen; /* forward declaration */ 30971 + 30972 +#include "curses.priv.h" /* includes nc_panel.h */ 30973 #include "panel.h" 30974 -#include <nc_panel.h> 30975 + 30976 30977 #if USE_RCS_IDS 30978 # define MODULE_ID(id) static const char Ident[] = id; 30979 @@ -83,14 +85,38 @@ 30980 # define Touchline(pan,start,count) touchline((pan)->win,start,count) 30981 #endif 30982 30983 +#if NCURSES_SP_FUNCS 30984 +#define GetScreenHook(sp) \ 30985 + struct panelhook* ph = NCURSES_SP_NAME(_nc_panelhook)(sp) 30986 +#define GetPanelHook(pan) \ 30987 + GetScreenHook(_nc_screen_of((pan)->win)) 30988 +#define GetWindowHook(win) \ 30989 + SCREEN* sp = _nc_screen_of(win); \ 30990 + GetScreenHook(sp) 30991 +#define GetHook(pan) SCREEN* sp = _nc_screen_of(pan->win); \ 30992 + GetScreenHook(sp) 30993 + 30994 +#define _nc_stdscr_pseudo_panel ((ph)->stdscr_pseudo_panel) 30995 +#define _nc_top_panel ((ph)->top_panel) 30996 +#define _nc_bottom_panel ((ph)->bottom_panel) 30997 + 30998 +#else /* !NCURSES_SP_FUNCS */ 30999 + 31000 +#define GetScreenHook(sp) /* nothing */ 31001 +#define GetPanelHook(pan) /* nothing */ 31002 +#define GetWindowHook(win) /* nothing */ 31003 +#define GetHook(pan) /* nothing */ 31004 + 31005 #define _nc_stdscr_pseudo_panel _nc_panelhook()->stdscr_pseudo_panel 31006 -#define _nc_top_panel _nc_panelhook()->top_panel 31007 -#define _nc_bottom_panel _nc_panelhook()->bottom_panel 31008 +#define _nc_top_panel _nc_panelhook()->top_panel 31009 +#define _nc_bottom_panel _nc_panelhook()->bottom_panel 31010 31011 -#define EMPTY_STACK() (_nc_top_panel==_nc_bottom_panel) 31012 -#define Is_Bottom(p) (((p)!=(PANEL*)0) && !EMPTY_STACK() && (_nc_bottom_panel->above==(p))) 31013 -#define Is_Top(p) (((p)!=(PANEL*)0) && !EMPTY_STACK() && (_nc_top_panel==(p))) 31014 -#define Is_Pseudo(p) ((p) && ((p)==_nc_bottom_panel)) 31015 +#endif /* NCURSES_SP_FUNCS */ 31016 + 31017 +#define EMPTY_STACK() (_nc_top_panel == _nc_bottom_panel) 31018 +#define Is_Bottom(p) (((p) != (PANEL*)0) && !EMPTY_STACK() && (_nc_bottom_panel->above == (p))) 31019 +#define Is_Top(p) (((p) != (PANEL*)0) && !EMPTY_STACK() && (_nc_top_panel == (p))) 31020 +#define Is_Pseudo(p) (((p) != (PANEL*)0) && ((p) == _nc_bottom_panel)) 31021 31022 /*+------------------------------------------------------------------------- 31023 IS_LINKED(pan) - check to see if panel is in the stack 31024 @@ -122,7 +148,7 @@ 31025 ix2 = (PENDX(pan1) < PENDX(pan2)) ? PENDX(pan1) : PENDX(pan2);\ 31026 iy1 = (PSTARTY(pan1) < PSTARTY(pan2)) ? PSTARTY(pan2) : PSTARTY(pan1);\ 31027 iy2 = (PENDY(pan1) < PENDY(pan2)) ? PENDY(pan1) : PENDY(pan2);\ 31028 - assert((ix1<=ix2) && (iy1<=iy2));\ 31029 + assert((ix1<=ix2) && (iy1<=iy2)) 31030 31031 31032 /*+------------------------------------------------------------------------- 31033 @@ -136,12 +162,12 @@ 31034 { PANEL* pan2 = ((panstart) ? (panstart) : _nc_bottom_panel);\ 31035 while(pan2) {\ 31036 if ((pan2 != pan) && PANELS_OVERLAPPED(pan,pan2)) {\ 31037 - int y,ix1,ix2,iy1,iy2;\ 31038 - COMPUTE_INTERSECTION(pan,pan2,ix1,ix2,iy1,iy2);\ 31039 + int y, ix1, ix2, iy1, iy2;\ 31040 + COMPUTE_INTERSECTION(pan, pan2, ix1, ix2, iy1, iy2);\ 31041 for(y = iy1; y <= iy2; y++) {\ 31042 if (is_linetouched(pan->win,y - PSTARTY(pan))) {\ 31043 struct ldat* line = &(pan2->win->_line[y - PSTARTY(pan2)]);\ 31044 - CHANGED_RANGE(line,ix1-PSTARTX(pan2),ix2-PSTARTX(pan2));\ 31045 + CHANGED_RANGE(line, ix1 - PSTARTX(pan2), ix2 - PSTARTX(pan2));\ 31046 }\ 31047 }\ 31048 }\ 31049 @@ -180,4 +206,9 @@ 31050 err = err_if_unlinked;\ 31051 } 31052 31053 +#if NCURSES_SP_FUNCS 31054 +/* These may become later renamed and part of panel.h and the public API */ 31055 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_update_panels)(SCREEN*); 31056 +#endif 31057 + 31058 #endif /* NCURSES_PANEL_PRIV_H */ 31059 diff -Naur ncurses-5.7.orig/panel/p_below.c ncurses-5.7/panel/p_below.c 31060 --- ncurses-5.7.orig/panel/p_below.c 2005-02-19 08:45:10.000000000 -0800 31061 +++ ncurses-5.7/panel/p_below.c 2009-06-05 14:01:33.000000000 -0700 31062 @@ -1,5 +1,5 @@ 31063 /**************************************************************************** 31064 - * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc. * 31065 + * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * 31066 * * 31067 * Permission is hereby granted, free of charge, to any person obtaining a * 31068 * copy of this software and associated documentation files (the * 31069 @@ -29,26 +29,57 @@ 31070 /**************************************************************************** 31071 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1995 * 31072 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 31073 + * and: Juergen Pfeifer 1997-1999,2008 * 31074 ****************************************************************************/ 31075 31076 /* p_below.c 31077 */ 31078 #include "panel.priv.h" 31079 31080 -MODULE_ID("$Id: p_below.c,v 1.6 2005/02/19 16:45:10 tom Exp $") 31081 +MODULE_ID("$Id: p_below.c,v 1.7 2009/04/11 20:17:59 tom Exp $") 31082 31083 +#if NCURSES_SP_FUNCS 31084 NCURSES_EXPORT(PANEL *) 31085 -panel_below(const PANEL * pan) 31086 +ceiling_panel(SCREEN * sp) 31087 { 31088 - T((T_CALLED("panel_below(%p)"), pan)); 31089 - if (!pan) 31090 + T((T_CALLED("ceiling_panel(%p)"), sp)); 31091 + if (sp) 31092 { 31093 + struct panelhook *ph = NCURSES_SP_NAME(_nc_panelhook) (sp); 31094 + 31095 /* if top and bottom are equal, we have no or only the pseudo panel */ 31096 returnPanel(EMPTY_STACK()? (PANEL *) 0 : _nc_top_panel); 31097 } 31098 else 31099 { 31100 + if (0 == CURRENT_SCREEN) 31101 + returnPanel(0); 31102 + else 31103 + returnPanel(ceiling_panel(CURRENT_SCREEN)); 31104 + } 31105 +} 31106 +#endif 31107 + 31108 +NCURSES_EXPORT(PANEL *) 31109 +panel_below(const PANEL * pan) 31110 +{ 31111 + PANEL *result; 31112 + 31113 + T((T_CALLED("panel_below(%p)"), pan)); 31114 + if (pan) 31115 + { 31116 + GetHook(pan); 31117 /* we must not return the pseudo panel */ 31118 - returnPanel(Is_Pseudo(pan->below) ? (PANEL *) 0 : pan->below); 31119 + result = Is_Pseudo(pan->below) ? (PANEL *) 0 : pan->below; 31120 + } 31121 + else 31122 + { 31123 +#if NCURSES_SP_FUNCS 31124 + result = ceiling_panel(CURRENT_SCREEN); 31125 +#else 31126 + /* if top and bottom are equal, we have no or only the pseudo panel */ 31127 + result = EMPTY_STACK()? (PANEL *) 0 : _nc_top_panel; 31128 +#endif 31129 } 31130 + returnPanel(result); 31131 } 31132 diff -Naur ncurses-5.7.orig/panel/p_bottom.c ncurses-5.7/panel/p_bottom.c 31133 --- ncurses-5.7.orig/panel/p_bottom.c 2005-02-19 08:38:16.000000000 -0800 31134 +++ ncurses-5.7/panel/p_bottom.c 2009-06-05 14:01:33.000000000 -0700 31135 @@ -1,5 +1,5 @@ 31136 /**************************************************************************** 31137 - * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc. * 31138 + * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * 31139 * * 31140 * Permission is hereby granted, free of charge, to any person obtaining a * 31141 * copy of this software and associated documentation files (the * 31142 @@ -29,6 +29,7 @@ 31143 /**************************************************************************** 31144 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1995 * 31145 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 31146 + * and: Juergen Pfeifer 1997-1999,2008 * 31147 ****************************************************************************/ 31148 31149 /* p_bottom.c 31150 @@ -36,7 +37,7 @@ 31151 */ 31152 #include "panel.priv.h" 31153 31154 -MODULE_ID("$Id: p_bottom.c,v 1.11 2005/02/19 16:38:16 tom Exp $") 31155 +MODULE_ID("$Id: p_bottom.c,v 1.12 2008/11/16 00:19:59 juergen Exp $") 31156 31157 NCURSES_EXPORT(int) 31158 bottom_panel(PANEL * pan) 31159 @@ -46,6 +47,7 @@ 31160 T((T_CALLED("bottom_panel(%p)"), pan)); 31161 if (pan) 31162 { 31163 + GetHook(pan); 31164 if (!Is_Bottom(pan)) 31165 { 31166 31167 diff -Naur ncurses-5.7.orig/panel/p_delete.c ncurses-5.7/panel/p_delete.c 31168 --- ncurses-5.7.orig/panel/p_delete.c 2005-02-19 08:38:45.000000000 -0800 31169 +++ ncurses-5.7/panel/p_delete.c 2009-06-05 14:01:33.000000000 -0700 31170 @@ -1,5 +1,5 @@ 31171 /**************************************************************************** 31172 - * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc. * 31173 + * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * 31174 * * 31175 * Permission is hereby granted, free of charge, to any person obtaining a * 31176 * copy of this software and associated documentation files (the * 31177 @@ -29,6 +29,7 @@ 31178 /**************************************************************************** 31179 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1995 * 31180 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 31181 + * and: Juergen Pfeifer 1999,2008 * 31182 ****************************************************************************/ 31183 31184 /* p_delete.c 31185 @@ -36,7 +37,7 @@ 31186 */ 31187 #include "panel.priv.h" 31188 31189 -MODULE_ID("$Id: p_delete.c,v 1.8 2005/02/19 16:38:45 tom Exp $") 31190 +MODULE_ID("$Id: p_delete.c,v 1.9 2009/04/11 18:58:36 tom Exp $") 31191 31192 NCURSES_EXPORT(int) 31193 del_panel(PANEL * pan) 31194 @@ -47,8 +48,11 @@ 31195 if (pan) 31196 { 31197 dBug(("--> del_panel %s", USER_PTR(pan->user))); 31198 - HIDE_PANEL(pan, err, OK); 31199 - free((void *)pan); 31200 + { 31201 + GetHook(pan); 31202 + HIDE_PANEL(pan, err, OK); 31203 + free((void *)pan); 31204 + } 31205 } 31206 else 31207 err = ERR; 31208 diff -Naur ncurses-5.7.orig/panel/p_hidden.c ncurses-5.7/panel/p_hidden.c 31209 --- ncurses-5.7.orig/panel/p_hidden.c 2005-02-19 08:39:17.000000000 -0800 31210 +++ ncurses-5.7/panel/p_hidden.c 2009-06-05 14:01:33.000000000 -0700 31211 @@ -1,5 +1,5 @@ 31212 /**************************************************************************** 31213 - * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc. * 31214 + * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * 31215 * * 31216 * Permission is hereby granted, free of charge, to any person obtaining a * 31217 * copy of this software and associated documentation files (the * 31218 @@ -29,6 +29,7 @@ 31219 /**************************************************************************** 31220 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1995 * 31221 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 31222 + * and: Juergen Pfeifer 1997-1999,2008 * 31223 ****************************************************************************/ 31224 31225 /* p_hidden.c 31226 @@ -36,13 +37,18 @@ 31227 */ 31228 #include "panel.priv.h" 31229 31230 -MODULE_ID("$Id: p_hidden.c,v 1.7 2005/02/19 16:39:17 tom Exp $") 31231 +MODULE_ID("$Id: p_hidden.c,v 1.8 2009/04/11 19:01:56 tom Exp $") 31232 31233 NCURSES_EXPORT(int) 31234 panel_hidden(const PANEL * pan) 31235 { 31236 + int rc = ERR; 31237 + 31238 T((T_CALLED("panel_hidden(%p)"), pan)); 31239 - if (!pan) 31240 - returnCode(ERR); 31241 - returnCode(IS_LINKED(pan) ? FALSE : TRUE); 31242 + if (pan) 31243 + { 31244 + GetHook(pan); 31245 + rc = (IS_LINKED(pan) ? FALSE : TRUE); 31246 + } 31247 + returnCode(rc); 31248 } 31249 diff -Naur ncurses-5.7.orig/panel/p_hide.c ncurses-5.7/panel/p_hide.c 31250 --- ncurses-5.7.orig/panel/p_hide.c 2005-02-19 08:39:41.000000000 -0800 31251 +++ ncurses-5.7/panel/p_hide.c 2009-06-05 14:01:33.000000000 -0700 31252 @@ -36,23 +36,27 @@ 31253 */ 31254 #include "panel.priv.h" 31255 31256 -MODULE_ID("$Id: p_hide.c,v 1.9 2005/02/19 16:39:41 tom Exp $") 31257 +MODULE_ID("$Id: p_hide.c,v 1.10 2009/02/07 23:11:45 tom Exp $") 31258 31259 NCURSES_EXPORT(int) 31260 hide_panel(register PANEL * pan) 31261 { 31262 - int err = OK; 31263 + int err = ERR; 31264 31265 T((T_CALLED("hide_panel(%p)"), pan)); 31266 - if (!pan) 31267 - returnCode(ERR); 31268 31269 - dBug(("--> hide_panel %s", USER_PTR(pan->user))); 31270 - dStack("<u%d>", 1, pan); 31271 + if (pan) 31272 + { 31273 + GetHook(pan); 31274 31275 - HIDE_PANEL(pan, err, ERR); 31276 + dBug(("--> hide_panel %s", USER_PTR(pan->user))); 31277 + dStack("<u%d>", 1, pan); 31278 31279 - dStack("<u%d>", 9, pan); 31280 + HIDE_PANEL(pan, err, ERR); 31281 31282 + err = OK; 31283 + 31284 + dStack("<u%d>", 9, pan); 31285 + } 31286 returnCode(err); 31287 } 31288 diff -Naur ncurses-5.7.orig/panel/p_move.c ncurses-5.7/panel/p_move.c 31289 --- ncurses-5.7.orig/panel/p_move.c 2005-02-19 08:46:49.000000000 -0800 31290 +++ ncurses-5.7/panel/p_move.c 2009-06-05 14:01:33.000000000 -0700 31291 @@ -1,5 +1,5 @@ 31292 /**************************************************************************** 31293 - * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc. * 31294 + * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc. * 31295 * * 31296 * Permission is hereby granted, free of charge, to any person obtaining a * 31297 * copy of this software and associated documentation files (the * 31298 @@ -29,6 +29,7 @@ 31299 /**************************************************************************** 31300 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1995 * 31301 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 31302 + * and: Juergen Pfeifer 1997-1999,2009 * 31303 ****************************************************************************/ 31304 31305 /* p_move.c 31306 @@ -36,21 +37,24 @@ 31307 */ 31308 #include "panel.priv.h" 31309 31310 -MODULE_ID("$Id: p_move.c,v 1.9 2005/02/19 16:46:49 tom Exp $") 31311 +MODULE_ID("$Id: p_move.c,v 1.10 2008/11/16 00:19:59 juergen Exp $") 31312 31313 NCURSES_EXPORT(int) 31314 move_panel(PANEL * pan, int starty, int startx) 31315 { 31316 - T((T_CALLED("move_panel(%p,%d,%d)"), pan, starty, startx)); 31317 + int rc = ERR; 31318 31319 - if (!pan) 31320 - returnCode(ERR); 31321 + T((T_CALLED("move_panel(%p,%d,%d)"), pan, starty, startx)); 31322 31323 - if (IS_LINKED(pan)) 31324 + if (pan) 31325 { 31326 - Touchpan(pan); 31327 - PANEL_UPDATE(pan, (PANEL *) 0); 31328 + GetHook(pan); 31329 + if (IS_LINKED(pan)) 31330 + { 31331 + Touchpan(pan); 31332 + PANEL_UPDATE(pan, (PANEL *) 0); 31333 + } 31334 + rc = mvwin(pan->win, starty, startx); 31335 } 31336 - 31337 - returnCode(mvwin(pan->win, starty, startx)); 31338 + returnCode(rc); 31339 } 31340 diff -Naur ncurses-5.7.orig/panel/p_new.c ncurses-5.7/panel/p_new.c 31341 --- ncurses-5.7.orig/panel/p_new.c 2008-08-04 11:25:48.000000000 -0700 31342 +++ ncurses-5.7/panel/p_new.c 2009-06-05 14:01:33.000000000 -0700 31343 @@ -1,5 +1,5 @@ 31344 /**************************************************************************** 31345 - * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc. * 31346 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 31347 * * 31348 * Permission is hereby granted, free of charge, to any person obtaining a * 31349 * copy of this software and associated documentation files (the * 31350 @@ -38,7 +38,7 @@ 31351 */ 31352 #include "panel.priv.h" 31353 31354 -MODULE_ID("$Id: p_new.c,v 1.10 2008/08/04 18:25:48 tom Exp $") 31355 +MODULE_ID("$Id: p_new.c,v 1.14 2009/04/11 20:43:04 tom Exp $") 31356 31357 #ifdef TRACE 31358 static char *stdscr_id; 31359 @@ -50,20 +50,27 @@ 31360 Establish the pseudo panel for stdscr if necessary. 31361 --------------------------------------------------------------------------*/ 31362 static PANEL * 31363 -root_panel(void) 31364 +root_panel(NCURSES_SP_DCL0) 31365 { 31366 +#if NCURSES_SP_FUNCS 31367 + struct panelhook *ph = NCURSES_SP_NAME(_nc_panelhook) (sp); 31368 + 31369 +#elif NO_LEAKS 31370 + struct panelhook *ph = _nc_panelhook(); 31371 +#endif 31372 + 31373 if (_nc_stdscr_pseudo_panel == (PANEL *) 0) 31374 { 31375 31376 - assert(stdscr && !_nc_bottom_panel && !_nc_top_panel); 31377 + assert(SP_PARM && SP_PARM->_stdscr && !_nc_bottom_panel && !_nc_top_panel); 31378 #if NO_LEAKS 31379 - _nc_panelhook()->destroy = del_panel; 31380 + ph->destroy = del_panel; 31381 #endif 31382 _nc_stdscr_pseudo_panel = (PANEL *) malloc(sizeof(PANEL)); 31383 if (_nc_stdscr_pseudo_panel != 0) 31384 { 31385 PANEL *pan = _nc_stdscr_pseudo_panel; 31386 - WINDOW *win = stdscr; 31387 + WINDOW *win = SP_PARM->_stdscr; 31388 31389 pan->win = win; 31390 pan->below = (PANEL *) 0; 31391 @@ -86,13 +93,15 @@ 31392 { 31393 PANEL *pan = (PANEL *) 0; 31394 31395 + GetWindowHook(win); 31396 + 31397 T((T_CALLED("new_panel(%p)"), win)); 31398 31399 if (!win) 31400 returnPanel(pan); 31401 31402 if (!_nc_stdscr_pseudo_panel) 31403 - (void)root_panel(); 31404 + (void)root_panel(NCURSES_SP_ARG); 31405 assert(_nc_stdscr_pseudo_panel); 31406 31407 if (!(win->_flags & _ISPAD) && (pan = (PANEL *) malloc(sizeof(PANEL)))) 31408 diff -Naur ncurses-5.7.orig/panel/p_replace.c ncurses-5.7/panel/p_replace.c 31409 --- ncurses-5.7.orig/panel/p_replace.c 2005-02-19 08:41:31.000000000 -0800 31410 +++ ncurses-5.7/panel/p_replace.c 2009-06-05 14:01:33.000000000 -0700 31411 @@ -36,23 +36,25 @@ 31412 */ 31413 #include "panel.priv.h" 31414 31415 -MODULE_ID("$Id: p_replace.c,v 1.9 2005/02/19 16:41:31 tom Exp $") 31416 +MODULE_ID("$Id: p_replace.c,v 1.10 2009/02/07 23:11:45 tom Exp $") 31417 31418 NCURSES_EXPORT(int) 31419 replace_panel(PANEL * pan, WINDOW *win) 31420 { 31421 - T((T_CALLED("replace_panel(%p,%p)"), pan, win)); 31422 + int rc = ERR; 31423 31424 - if (!pan) 31425 - returnCode(ERR); 31426 + T((T_CALLED("replace_panel(%p,%p)"), pan, win)); 31427 31428 - if (IS_LINKED(pan)) 31429 + if (pan) 31430 { 31431 - Touchpan(pan); 31432 - PANEL_UPDATE(pan, (PANEL *) 0); 31433 + GetHook(pan); 31434 + if (IS_LINKED(pan)) 31435 + { 31436 + Touchpan(pan); 31437 + PANEL_UPDATE(pan, (PANEL *) 0); 31438 + } 31439 + pan->win = win; 31440 + rc = OK; 31441 } 31442 - 31443 - pan->win = win; 31444 - 31445 - returnCode(OK); 31446 + returnCode(rc); 31447 } 31448 diff -Naur ncurses-5.7.orig/panel/p_show.c ncurses-5.7/panel/p_show.c 31449 --- ncurses-5.7.orig/panel/p_show.c 2005-02-19 08:42:02.000000000 -0800 31450 +++ ncurses-5.7/panel/p_show.c 2009-06-05 14:01:33.000000000 -0700 31451 @@ -36,34 +36,37 @@ 31452 */ 31453 #include "panel.priv.h" 31454 31455 -MODULE_ID("$Id: p_show.c,v 1.11 2005/02/19 16:42:02 tom Exp $") 31456 +MODULE_ID("$Id: p_show.c,v 1.12 2009/02/07 23:11:45 tom Exp $") 31457 31458 NCURSES_EXPORT(int) 31459 show_panel(PANEL * pan) 31460 { 31461 - int err = OK; 31462 + int err = ERR; 31463 31464 T((T_CALLED("show_panel(%p)"), pan)); 31465 31466 - if (!pan) 31467 - returnCode(ERR); 31468 + if (pan) 31469 + { 31470 + GetHook(pan); 31471 31472 - if (Is_Top(pan)) 31473 - returnCode(OK); 31474 + if (Is_Top(pan)) 31475 + returnCode(OK); 31476 31477 - dBug(("--> show_panel %s", USER_PTR(pan->user))); 31478 + dBug(("--> show_panel %s", USER_PTR(pan->user))); 31479 31480 - HIDE_PANEL(pan, err, OK); 31481 + HIDE_PANEL(pan, err, OK); 31482 31483 - dStack("<lt%d>", 1, pan); 31484 - assert(_nc_bottom_panel == _nc_stdscr_pseudo_panel); 31485 + dStack("<lt%d>", 1, pan); 31486 + assert(_nc_bottom_panel == _nc_stdscr_pseudo_panel); 31487 31488 - _nc_top_panel->above = pan; 31489 - pan->below = _nc_top_panel; 31490 - pan->above = (PANEL *) 0; 31491 - _nc_top_panel = pan; 31492 + _nc_top_panel->above = pan; 31493 + pan->below = _nc_top_panel; 31494 + pan->above = (PANEL *) 0; 31495 + _nc_top_panel = pan; 31496 31497 - dStack("<lt%d>", 9, pan); 31498 + err = OK; 31499 31500 - returnCode(OK); 31501 + dStack("<lt%d>", 9, pan); 31502 + } 31503 + returnCode(err); 31504 } 31505 diff -Naur ncurses-5.7.orig/panel/p_update.c ncurses-5.7/panel/p_update.c 31506 --- ncurses-5.7.orig/panel/p_update.c 2005-02-19 08:49:47.000000000 -0800 31507 +++ ncurses-5.7/panel/p_update.c 2009-06-05 14:01:33.000000000 -0700 31508 @@ -1,5 +1,5 @@ 31509 /**************************************************************************** 31510 - * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc. * 31511 + * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * 31512 * * 31513 * Permission is hereby granted, free of charge, to any person obtaining a * 31514 * copy of this software and associated documentation files (the * 31515 @@ -29,6 +29,7 @@ 31516 /**************************************************************************** 31517 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1995 * 31518 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 31519 + * and: Juergen Pfeifer 1997-1999,2008 * 31520 ****************************************************************************/ 31521 31522 /* p_update.c 31523 @@ -36,28 +37,42 @@ 31524 */ 31525 #include "panel.priv.h" 31526 31527 -MODULE_ID("$Id: p_update.c,v 1.9 2005/02/19 16:49:47 tom Exp $") 31528 +MODULE_ID("$Id: p_update.c,v 1.10 2009/04/11 19:48:36 tom Exp $") 31529 31530 NCURSES_EXPORT(void) 31531 -update_panels(void) 31532 +NCURSES_SP_NAME(update_panels) (NCURSES_SP_DCL0) 31533 { 31534 PANEL *pan; 31535 31536 - T((T_CALLED("update_panels()"))); 31537 + T((T_CALLED("update_panels(%p)"), SP_PARM)); 31538 dBug(("--> update_panels")); 31539 - pan = _nc_bottom_panel; 31540 - while (pan && pan->above) 31541 - { 31542 - PANEL_UPDATE(pan, pan->above); 31543 - pan = pan->above; 31544 - } 31545 31546 - pan = _nc_bottom_panel; 31547 - while (pan) 31548 + if (SP_PARM) 31549 { 31550 - Wnoutrefresh(pan); 31551 - pan = pan->above; 31552 + GetScreenHook(SP_PARM); 31553 + 31554 + pan = _nc_bottom_panel; 31555 + while (pan && pan->above) 31556 + { 31557 + PANEL_UPDATE(pan, pan->above); 31558 + pan = pan->above; 31559 + } 31560 + 31561 + pan = _nc_bottom_panel; 31562 + while (pan) 31563 + { 31564 + Wnoutrefresh(pan); 31565 + pan = pan->above; 31566 + } 31567 } 31568 31569 returnVoid; 31570 } 31571 + 31572 +#if NCURSES_SP_FUNCS 31573 +NCURSES_EXPORT(void) 31574 +update_panels(void) 31575 +{ 31576 + NCURSES_SP_NAME(update_panels) (CURRENT_SCREEN); 31577 +} 31578 +#endif 20974 31579 diff -Naur ncurses-5.7.orig/progs/Makefile.in ncurses-5.7/progs/Makefile.in 20975 31580 --- ncurses-5.7.orig/progs/Makefile.in 2008-09-07 06:58:55.000000000 -0700 20976 +++ ncurses-5.7/progs/Makefile.in 2009-0 3-22 21:17:09.916267635-070031581 +++ ncurses-5.7/progs/Makefile.in 2009-06-05 14:01:30.000000000 -0700 20977 31582 @@ -1,6 +1,6 @@ 20978 31583 -# $Id: Makefile.in,v 1.79 2008/09/07 13:58:55 tom Exp $ 20979 +# $Id: Makefile.in,v 1.8 1 2009/03/14 18:45:55tom Exp $31584 +# $Id: Makefile.in,v 1.82 2009/03/28 20:30:58 tom Exp $ 20980 31585 ############################################################################## 20981 31586 -# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. # … … 21013 31618 + echo "#include <progs.priv.h>" >>$@ 21014 31619 + echo "extern bool same_program(const char *, const char *);" >>$@ 21015 + - test -n "$x" && echo "#define SUFFIX_IGNORED \"$x\"" >>$@31620 + -sh -c 'if test -n "$x" ; then echo "#define SUFFIX_IGNORED \"$x\"">>$@; fi' 21016 31621 + echo "#define PROG_CAPTOINFO \"$(define_captoinfo)\"" >>$@ 21017 31622 + echo "#define PROG_INFOTOCAP \"$(define_infotocap)\"" >>$@ … … 21085 31690 diff -Naur ncurses-5.7.orig/progs/modules ncurses-5.7/progs/modules 21086 31691 --- ncurses-5.7.orig/progs/modules 2006-12-23 16:53:21.000000000 -0800 21087 +++ ncurses-5.7/progs/modules 2009-0 3-22 21:17:09.916267635-070031692 +++ ncurses-5.7/progs/modules 2009-06-05 14:01:21.000000000 -0700 21088 31693 @@ -1,7 +1,7 @@ 21089 31694 -# $Id: modules,v 1.13 2006/12/24 00:53:21 tom Exp $ … … 21108 31713 diff -Naur ncurses-5.7.orig/progs/tabs.c ncurses-5.7/progs/tabs.c 21109 31714 --- ncurses-5.7.orig/progs/tabs.c 1969-12-31 16:00:00.000000000 -0800 21110 +++ ncurses-5.7/progs/tabs.c 2009-0 3-22 21:16:46.494768822-070031715 +++ ncurses-5.7/progs/tabs.c 2009-06-05 14:00:52.000000000 -0700 21111 31716 @@ -0,0 +1,506 @@ 21112 31717 +/**************************************************************************** … … 21618 32223 diff -Naur ncurses-5.7.orig/progs/tic.c ncurses-5.7/progs/tic.c 21619 32224 --- ncurses-5.7.orig/progs/tic.c 2008-09-13 09:59:24.000000000 -0700 21620 +++ ncurses-5.7/progs/tic.c 2009-0 3-22 21:17:09.916267635-070032225 +++ ncurses-5.7/progs/tic.c 2009-06-05 14:01:21.000000000 -0700 21621 32226 @@ -1,5 +1,5 @@ 21622 32227 /**************************************************************************** … … 21651 32256 diff -Naur ncurses-5.7.orig/progs/tput.c ncurses-5.7/progs/tput.c 21652 32257 --- ncurses-5.7.orig/progs/tput.c 2008-07-13 04:05:12.000000000 -0700 21653 +++ ncurses-5.7/progs/tput.c 2009-0 3-22 21:17:09.916267635-070032258 +++ ncurses-5.7/progs/tput.c 2009-06-05 14:01:21.000000000 -0700 21654 32259 @@ -1,5 +1,5 @@ 21655 32260 /**************************************************************************** … … 21681 32286 diff -Naur ncurses-5.7.orig/progs/transform.c ncurses-5.7/progs/transform.c 21682 32287 --- ncurses-5.7.orig/progs/transform.c 1969-12-31 16:00:00.000000000 -0800 21683 +++ ncurses-5.7/progs/transform.c 2009-0 3-22 21:17:09.916267635-070032288 +++ ncurses-5.7/progs/transform.c 2009-06-05 14:01:21.000000000 -0700 21684 32289 @@ -0,0 +1,79 @@ 21685 32290 +/**************************************************************************** … … 21764 32369 diff -Naur ncurses-5.7.orig/progs/tset.c ncurses-5.7/progs/tset.c 21765 32370 --- ncurses-5.7.orig/progs/tset.c 2008-10-11 12:26:19.000000000 -0700 21766 +++ ncurses-5.7/progs/tset.c 2009-0 3-22 21:17:09.916267635-070032371 +++ ncurses-5.7/progs/tset.c 2009-06-05 14:01:21.000000000 -0700 21767 32372 @@ -1,5 +1,5 @@ 21768 32373 /**************************************************************************** … … 21790 32395 reset_mode(); 21791 32396 } 32397 diff -Naur ncurses-5.7.orig/test/aclocal.m4 ncurses-5.7/test/aclocal.m4 32398 --- ncurses-5.7.orig/test/aclocal.m4 2008-02-09 10:22:17.000000000 -0800 32399 +++ ncurses-5.7/test/aclocal.m4 2009-06-05 14:01:30.000000000 -0700 32400 @@ -1,5 +1,5 @@ 32401 dnl*************************************************************************** 32402 -dnl Copyright (c) 2003-2007,2008 Free Software Foundation, Inc. * 32403 +dnl Copyright (c) 2003-2008,2009 Free Software Foundation, Inc. * 32404 dnl * 32405 dnl Permission is hereby granted, free of charge, to any person obtaining a * 32406 dnl copy of this software and associated documentation files (the * 32407 @@ -26,7 +26,7 @@ 32408 dnl authorization. * 32409 dnl*************************************************************************** 32410 dnl 32411 -dnl $Id: aclocal.m4,v 1.22 2008/02/09 18:22:17 tom Exp $ 32412 +dnl $Id: aclocal.m4,v 1.25 2009/03/28 20:09:37 tom Exp $ 32413 dnl 32414 dnl Author: Thomas E. Dickey 32415 dnl 32416 @@ -40,7 +40,7 @@ 32417 dnl 32418 dnl --------------------------------------------------------------------------- 32419 dnl --------------------------------------------------------------------------- 32420 -dnl CF_ADD_CFLAGS version: 7 updated: 2004/04/25 17:48:30 32421 +dnl CF_ADD_CFLAGS version: 8 updated: 2009/01/06 19:33:30 32422 dnl ------------- 32423 dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS 32424 dnl The second parameter if given makes this macro verbose. 32425 @@ -110,7 +110,7 @@ 32426 32427 if test -n "$cf_new_cppflags" ; then 32428 ifelse($2,,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)]) 32429 - CPPFLAGS="$cf_new_cppflags $CPPFLAGS" 32430 + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" 32431 fi 32432 32433 if test -n "$cf_new_extra_cppflags" ; then 32434 @@ -122,7 +122,7 @@ 32435 32436 ])dnl 32437 dnl --------------------------------------------------------------------------- 32438 -dnl CF_ADD_INCDIR version: 9 updated: 2008/02/09 13:15:34 32439 +dnl CF_ADD_INCDIR version: 12 updated: 2009/01/18 10:00:47 32440 dnl ------------- 32441 dnl Add an include-directory to $CPPFLAGS. Don't add /usr/include, since it's 32442 dnl redundant. We don't normally need to add -I/usr/local/include for gcc, 32443 @@ -149,7 +149,7 @@ 32444 fi 32445 32446 if test "$cf_have_incdir" = no ; then 32447 - if test "$cf_add_incdir" = /usr/local/include ; then 32448 + if test "$cf_add_incdir" = /usr/local/include ; then 32449 if test "$GCC" = yes 32450 then 32451 cf_save_CPPFLAGS=$CPPFLAGS 32452 @@ -165,11 +165,11 @@ 32453 32454 if test "$cf_have_incdir" = no ; then 32455 CF_VERBOSE(adding $cf_add_incdir to include-path) 32456 - ifelse($2,,CPPFLAGS,$2)="-I$cf_add_incdir $ifelse($2,,CPPFLAGS,[$]$2)" 32457 + ifelse($2,,CPPFLAGS,$2)="$ifelse($2,,CPPFLAGS,$2) -I$cf_add_incdir" 32458 32459 - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 32460 - test "$cf_top_incdir" = "$cf_add_incdir" && break 32461 - cf_add_incdir="$cf_top_incdir" 32462 + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 32463 + test "$cf_top_incdir" = "$cf_add_incdir" && break 32464 + cf_add_incdir="$cf_top_incdir" 32465 else 32466 break 32467 fi 32468 @@ -179,7 +179,7 @@ 32469 fi 32470 ])dnl 32471 dnl --------------------------------------------------------------------------- 32472 -dnl CF_ADD_LIBDIR version: 6 updated: 2008/02/09 13:15:34 32473 +dnl CF_ADD_LIBDIR version: 8 updated: 2009/01/18 10:01:08 32474 dnl ------------- 32475 dnl Adds to the library-path 32476 dnl 32477 @@ -208,7 +208,7 @@ 32478 fi 32479 if test "$cf_have_libdir" = no ; then 32480 CF_VERBOSE(adding $cf_add_libdir to library-path) 32481 - ifelse($2,,LDFLAGS,$2)="-L$cf_add_libdir $ifelse($2,,LDFLAGS,[$]$2)" 32482 + ifelse($2,,LDFLAGS,$2)="-L$cf_add_libdir $ifelse($2,,LDFLAGS,$2)" 32483 fi 32484 fi 32485 done 32486 @@ -289,7 +289,7 @@ 32487 fi 32488 ])dnl 32489 dnl --------------------------------------------------------------------------- 32490 -dnl CF_ANSI_CC_REQD version: 3 updated: 1997/09/06 13:40:44 32491 +dnl CF_ANSI_CC_REQD version: 4 updated: 2008/03/23 14:48:54 32492 dnl --------------- 32493 dnl For programs that must use an ANSI compiler, obtain compiler options that 32494 dnl will make it recognize prototypes. We'll do preprocessor checks in other 32495 @@ -298,7 +298,7 @@ 32496 AC_DEFUN([CF_ANSI_CC_REQD], 32497 [AC_REQUIRE([CF_ANSI_CC_CHECK]) 32498 if test "$cf_cv_ansi_cc" = "no"; then 32499 - AC_ERROR( 32500 + AC_MSG_ERROR( 32501 [Your compiler does not appear to recognize prototypes. 32502 You have the following choices: 32503 a. adjust your compiler options 32504 @@ -342,7 +342,7 @@ 32505 ])dnl 32506 ])])dnl 32507 dnl --------------------------------------------------------------------------- 32508 -dnl CF_CHECK_CACHE version: 10 updated: 2004/05/23 13:03:31 32509 +dnl CF_CHECK_CACHE version: 11 updated: 2008/03/23 14:45:59 32510 dnl -------------- 32511 dnl Check if we're accidentally using a cache from a different machine. 32512 dnl Derive the system name, as a check for reusing the autoconf cache. 32513 @@ -373,7 +373,7 @@ 32514 32515 if test ".$system_name" != ".$cf_cv_system_name" ; then 32516 AC_MSG_RESULT(Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)) 32517 - AC_ERROR("Please remove config.cache and try again.") 32518 + AC_MSG_ERROR("Please remove config.cache and try again.") 32519 fi 32520 ])dnl 32521 dnl --------------------------------------------------------------------------- 32522 @@ -399,14 +399,15 @@ 32523 fi 32524 ])dnl 32525 dnl --------------------------------------------------------------------------- 32526 -dnl CF_CURSES_ACS_MAP version: 3 updated: 2003/05/17 22:19:02 32527 +dnl CF_CURSES_ACS_MAP version: 5 updated: 2009/03/28 16:08:10 32528 dnl ----------------- 32529 dnl Check for likely values of acs_map[]: 32530 AC_DEFUN([CF_CURSES_ACS_MAP], 32531 [ 32532 +AC_REQUIRE([CF_NCURSES_WRAP_PREFIX])dnl 32533 AC_CACHE_CHECK(for alternate character set array, cf_cv_curses_acs_map,[ 32534 cf_cv_curses_acs_map=unknown 32535 -for name in acs_map _acs_map __acs_map _nc_acs_map 32536 +for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map 32537 do 32538 AC_TRY_LINK([ 32539 #include <${cf_cv_ncurses_header-curses.h}> 32540 @@ -441,7 +442,7 @@ 32541 fi 32542 ])dnl 32543 dnl --------------------------------------------------------------------------- 32544 -dnl CF_CURSES_CPPFLAGS version: 9 updated: 2006/02/04 19:44:43 32545 +dnl CF_CURSES_CPPFLAGS version: 10 updated: 2009/01/06 19:34:11 32546 dnl ------------------ 32547 dnl Look for the curses headers. 32548 AC_DEFUN([CF_CURSES_CPPFLAGS],[ 32549 @@ -460,7 +461,7 @@ 32550 ;; 32551 esac 32552 ]) 32553 -test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS" 32554 +test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir" 32555 32556 CF_CURSES_HEADER 32557 CF_TERM_HEADER 32558 @@ -549,7 +550,7 @@ 32559 AC_CHECK_HEADERS($cf_cv_ncurses_header) 32560 ])dnl 32561 dnl --------------------------------------------------------------------------- 32562 -dnl CF_CURSES_LIBS version: 26 updated: 2007/07/29 10:32:40 32563 +dnl CF_CURSES_LIBS version: 29 updated: 2009/01/06 19:34:57 32564 dnl -------------- 32565 dnl Look for the curses libraries. Older curses implementations may require 32566 dnl termcap/termlib to be linked as well. Call CF_CURSES_CPPFLAGS first. 32567 @@ -576,7 +577,7 @@ 32568 AC_CHECK_LIB(Hcurses,initscr,[ 32569 # HP's header uses __HP_CURSES, but user claims _HP_CURSES. 32570 LIBS="-lHcurses $LIBS" 32571 - CPPFLAGS="-D__HP_CURSES -D_HP_CURSES $CPPFLAGS" 32572 + CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES" 32573 ac_cv_func_initscr=yes 32574 ])]) 32575 ;; 32576 @@ -615,11 +616,11 @@ 32577 32578 # Check for library containing initscr 32579 test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" 32580 - for cf_curs_lib in $cf_check_list xcurses jcurses unknown 32581 + for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown 32582 do 32583 AC_CHECK_LIB($cf_curs_lib,initscr,[break]) 32584 done 32585 - test $cf_curs_lib = unknown && AC_ERROR(no curses library found) 32586 + test $cf_curs_lib = unknown && AC_MSG_ERROR(no curses library found) 32587 32588 LIBS="-l$cf_curs_lib $cf_save_LIBS" 32589 if test "$cf_term_lib" = unknown ; then 32590 @@ -629,7 +630,7 @@ 32591 [cf_result=yes], 32592 [cf_result=no]) 32593 AC_MSG_RESULT($cf_result) 32594 - test $cf_result = no && AC_ERROR(Cannot link curses library) 32595 + test $cf_result = no && AC_MSG_ERROR(Cannot link curses library) 32596 elif test "$cf_curs_lib" = "$cf_term_lib" ; then 32597 : 32598 elif test "$cf_term_lib" != predefined ; then 32599 @@ -772,7 +773,7 @@ 32600 fi 32601 ])dnl 32602 dnl --------------------------------------------------------------------------- 32603 -dnl CF_FIND_LIBRARY version: 8 updated: 2004/11/23 20:14:58 32604 +dnl CF_FIND_LIBRARY version: 9 updated: 2008/03/23 14:48:54 32605 dnl --------------- 32606 dnl Look for a non-standard library, given parameters for AC_TRY_LINK. We 32607 dnl prefer a standard location, and use -L options only if we do not find the 32608 @@ -817,11 +818,124 @@ 32609 eval 'cf_found_library=[$]cf_cv_have_lib_'$1 32610 ifelse($6,,[ 32611 if test $cf_found_library = no ; then 32612 - AC_ERROR(Cannot link $1 library) 32613 + AC_MSG_ERROR(Cannot link $1 library) 32614 fi 32615 ]) 32616 ])dnl 32617 dnl --------------------------------------------------------------------------- 32618 +dnl CF_FIND_LINKAGE version: 13 updated: 2008/12/24 07:59:55 32619 +dnl --------------- 32620 +dnl Find a library (specifically the linkage used in the code fragment), 32621 +dnl searching for it if it is not already in the library path. 32622 +dnl See also CF_ADD_SEARCHPATH. 32623 +dnl 32624 +dnl Parameters (4-on are optional): 32625 +dnl $1 = headers for library entrypoint 32626 +dnl $2 = code fragment for library entrypoint 32627 +dnl $3 = the library name without the "-l" option or ".so" suffix. 32628 +dnl $4 = action to perform if successful (default: update CPPFLAGS, etc) 32629 +dnl $5 = action to perform if not successful 32630 +dnl $6 = module name, if not the same as the library name 32631 +dnl $7 = extra libraries 32632 +dnl 32633 +dnl Sets these variables: 32634 +dnl $cf_cv_find_linkage_$3 - yes/no according to whether linkage is found 32635 +dnl $cf_cv_header_path_$3 - include-directory if needed 32636 +dnl $cf_cv_library_path_$3 - library-directory if needed 32637 +dnl $cf_cv_library_file_$3 - library-file if needed, e.g., -l$3 32638 +AC_DEFUN([CF_FIND_LINKAGE],[ 32639 + 32640 +# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these 32641 +# will be set on completion of the AC_TRY_LINK below. 32642 +cf_cv_header_path_$3= 32643 +cf_cv_library_path_$3= 32644 + 32645 +CF_MSG_LOG([Starting [FIND_LINKAGE]($3,$6)]) 32646 + 32647 +AC_TRY_LINK([$1],[$2], 32648 + cf_cv_find_linkage_$3=yes,[ 32649 + cf_cv_find_linkage_$3=no 32650 + 32651 + CF_VERBOSE(find linkage for $3 library) 32652 + CF_MSG_LOG([Searching for headers in [FIND_LINKAGE]($3,$6)]) 32653 + 32654 + cf_save_CPPFLAGS="$CPPFLAGS" 32655 + cf_test_CPPFLAGS="$CPPFLAGS" 32656 + 32657 + CF_HEADER_PATH(cf_search,ifelse([$6],,[$3],[$6])) 32658 + for cf_cv_header_path_$3 in $cf_search 32659 + do 32660 + if test -d $cf_cv_header_path_$3 ; then 32661 + CF_VERBOSE(... testing $cf_cv_header_path_$3) 32662 + CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_$3" 32663 + AC_TRY_COMPILE([$1],[$2],[ 32664 + CF_VERBOSE(... found $3 headers in $cf_cv_header_path_$3) 32665 + cf_cv_find_linkage_$3=maybe 32666 + cf_test_CPPFLAGS="$CPPFLAGS" 32667 + break],[ 32668 + CPPFLAGS="$cf_save_CPPFLAGS" 32669 + ]) 32670 + fi 32671 + done 32672 + 32673 + if test "$cf_cv_find_linkage_$3" = maybe ; then 32674 + 32675 + CF_MSG_LOG([Searching for $3 library in [FIND_LINKAGE]($3,$6)]) 32676 + 32677 + cf_save_LIBS="$LIBS" 32678 + cf_save_LDFLAGS="$LDFLAGS" 32679 + 32680 + ifelse([$6],,,[ 32681 + CPPFLAGS="$cf_test_CPPFLAGS" 32682 + LIBS="-l$3 $7 $cf_save_LIBS" 32683 + AC_TRY_LINK([$1],[$2],[ 32684 + CF_VERBOSE(... found $3 library in system) 32685 + cf_cv_find_linkage_$3=yes]) 32686 + CPPFLAGS="$cf_save_CPPFLAGS" 32687 + LIBS="$cf_save_LIBS" 32688 + ]) 32689 + 32690 + if test "$cf_cv_find_linkage_$3" != yes ; then 32691 + CF_LIBRARY_PATH(cf_search,$3) 32692 + for cf_cv_library_path_$3 in $cf_search 32693 + do 32694 + if test -d $cf_cv_library_path_$3 ; then 32695 + CF_VERBOSE(... testing $cf_cv_library_path_$3) 32696 + CPPFLAGS="$cf_test_CPPFLAGS" 32697 + LIBS="-l$3 $7 $cf_save_LIBS" 32698 + LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_$3" 32699 + AC_TRY_LINK([$1],[$2],[ 32700 + CF_VERBOSE(... found $3 library in $cf_cv_library_path_$3) 32701 + cf_cv_find_linkage_$3=yes 32702 + cf_cv_library_file_$3="-l$3" 32703 + break],[ 32704 + CPPFLAGS="$cf_save_CPPFLAGS" 32705 + LIBS="$cf_save_LIBS" 32706 + LDFLAGS="$cf_save_LDFLAGS" 32707 + ]) 32708 + fi 32709 + done 32710 + LIBS="$cf_save_LIBS" 32711 + CPPFLAGS="$cf_save_CPPFLAGS" 32712 + LDFLAGS="$cf_save_LDFLAGS" 32713 + fi 32714 + 32715 + else 32716 + cf_cv_find_linkage_$3=no 32717 + fi 32718 + ],$7) 32719 + 32720 +if test "$cf_cv_find_linkage_$3" = yes ; then 32721 +ifelse([$4],,[ 32722 + CF_ADD_INCDIR($cf_cv_header_path_$3) 32723 + CF_ADD_LIBDIR($cf_cv_library_path_$3) 32724 + LIBS="-l$3 $LIBS" 32725 +],[$4]) 32726 +else 32727 +ifelse([$5],,AC_MSG_WARN(Cannot find $3 library),[$5]) 32728 +fi 32729 +])dnl 32730 +dnl --------------------------------------------------------------------------- 32731 dnl CF_FUNC_CURSES_VERSION version: 4 updated: 2007/04/28 09:15:55 32732 dnl ---------------------- 32733 dnl Solaris has a data item 'curses_version', which confuses AC_CHECK_FUNCS. 32734 @@ -933,7 +1047,7 @@ 32735 fi 32736 ])dnl 32737 dnl --------------------------------------------------------------------------- 32738 -dnl CF_GCC_WARNINGS version: 22 updated: 2007/07/29 09:55:12 32739 +dnl CF_GCC_WARNINGS version: 24 updated: 2009/02/01 15:21:00 32740 dnl --------------- 32741 dnl Check if the compiler supports useful warning options. There's a few that 32742 dnl we don't use, simply because they're too noisy: 32743 @@ -966,7 +1080,6 @@ 32744 then 32745 # The "-wdXXX" options suppress warnings: 32746 # remark #1419: external declaration in primary source file 32747 -# remark #1682: implicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem) 32748 # remark #1683: explicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem) 32749 # remark #1684: conversion from pointer to same-sized integral type (potential portability problem) 32750 # remark #193: zero used for undefined preprocessing identifier 32751 @@ -974,19 +1087,18 @@ 32752 # remark #810: conversion from "int" to "Dimension={unsigned short}" may lose significant bits 32753 # remark #869: parameter "tw" was never referenced 32754 # remark #981: operands are evaluated in unspecified order 32755 -# warning #269: invalid format string conversion 32756 +# warning #279: controlling expression is constant 32757 32758 AC_CHECKING([for $CC warning options]) 32759 cf_save_CFLAGS="$CFLAGS" 32760 EXTRA_CFLAGS="-Wall" 32761 for cf_opt in \ 32762 wd1419 \ 32763 - wd1682 \ 32764 wd1683 \ 32765 wd1684 \ 32766 wd193 \ 32767 - wd279 \ 32768 wd593 \ 32769 + wd279 \ 32770 wd810 \ 32771 wd869 \ 32772 wd981 32773 @@ -1028,7 +1140,7 @@ 32774 ;; 32775 Winline) #(vi 32776 case $GCC_VERSION in 32777 - 3.3*) 32778 + [[34]].*) 32779 CF_VERBOSE(feature is broken in gcc $GCC_VERSION) 32780 continue;; 32781 esac 32782 @@ -1074,11 +1186,31 @@ 32783 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" 32784 ])dnl 32785 dnl --------------------------------------------------------------------------- 32786 -dnl CF_HEADER_PATH version: 8 updated: 2002/11/10 14:46:59 32787 +dnl CF_HEADER_PATH version: 9 updated: 2008/12/07 19:38:31 32788 dnl -------------- 32789 -dnl Construct a search-list for a nonstandard header-file 32790 +dnl Construct a search-list of directories for a nonstandard header-file 32791 +dnl 32792 +dnl Parameters 32793 +dnl $1 = the variable to return as result 32794 +dnl $2 = the package name 32795 AC_DEFUN([CF_HEADER_PATH], 32796 -[CF_SUBDIR_PATH($1,$2,include) 32797 +[ 32798 +cf_header_path_list="" 32799 +if test -n "${CFLAGS}${CPPFLAGS}" ; then 32800 + for cf_header_path in $CPPFLAGS $CFLAGS 32801 + do 32802 + case $cf_header_path in #(vi 32803 + -I*) 32804 + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` 32805 + CF_ADD_SUBDIR_PATH($1,$2,include,$cf_header_path,NONE) 32806 + cf_header_path_list="$cf_header_path_list [$]$1" 32807 + ;; 32808 + esac 32809 + done 32810 +fi 32811 + 32812 +CF_SUBDIR_PATH($1,$2,include) 32813 + 32814 test "$includedir" != NONE && \ 32815 test "$includedir" != "/usr/include" && \ 32816 test -d "$includedir" && { 32817 @@ -1093,6 +1225,7 @@ 32818 test -d $oldincludedir/$2 && $1="[$]$1 $oldincludedir/$2" 32819 } 32820 32821 +$1="$cf_header_path_list [$]$1" 32822 ])dnl 32823 dnl --------------------------------------------------------------------------- 32824 dnl CF_INHERIT_SCRIPT version: 2 updated: 2003/03/01 23:50:42 32825 @@ -1140,11 +1273,33 @@ 32826 fi 32827 ])dnl 32828 dnl --------------------------------------------------------------------------- 32829 -dnl CF_LIBRARY_PATH version: 7 updated: 2002/11/10 14:46:59 32830 +dnl CF_LIBRARY_PATH version: 8 updated: 2008/12/07 19:38:31 32831 dnl --------------- 32832 -dnl Construct a search-list for a nonstandard library-file 32833 +dnl Construct a search-list of directories for a nonstandard library-file 32834 +dnl 32835 +dnl Parameters 32836 +dnl $1 = the variable to return as result 32837 +dnl $2 = the package name 32838 AC_DEFUN([CF_LIBRARY_PATH], 32839 -[CF_SUBDIR_PATH($1,$2,lib)])dnl 32840 +[ 32841 +cf_library_path_list="" 32842 +if test -n "${LDFLAGS}${LIBS}" ; then 32843 + for cf_library_path in $LDFLAGS $LIBS 32844 + do 32845 + case $cf_library_path in #(vi 32846 + -L*) 32847 + cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` 32848 + CF_ADD_SUBDIR_PATH($1,$2,lib,$cf_library_path,NONE) 32849 + cf_library_path_list="$cf_library_path_list [$]$1" 32850 + ;; 32851 + esac 32852 + done 32853 +fi 32854 + 32855 +CF_SUBDIR_PATH($1,$2,lib) 32856 + 32857 +$1="$cf_library_path_list [$]$1" 32858 +])dnl 32859 dnl --------------------------------------------------------------------------- 32860 dnl CF_MSG_LOG version: 4 updated: 2007/07/29 09:55:12 32861 dnl ---------- 32862 @@ -1187,6 +1342,45 @@ 32863 ,[$1=no]) 32864 ])dnl 32865 dnl --------------------------------------------------------------------------- 32866 +dnl CF_NCURSES_CONFIG version: 5 updated: 2009/01/11 15:31:22 32867 +dnl ----------------- 32868 +dnl Tie together the configure-script macros for ncurses. 32869 +dnl Prefer the "-config" script from ncurses 5.6, to simplify analysis. 32870 +dnl Allow that to be overridden using the $NCURSES_CONFIG environment variable. 32871 +dnl 32872 +dnl $1 is the root library name (default: "ncurses") 32873 +AC_DEFUN([CF_NCURSES_CONFIG], 32874 +[ 32875 +cf_ncuconfig_root=ifelse($1,,ncurses,$1) 32876 + 32877 +echo "Looking for ${cf_ncuconfig_root}-config" 32878 +AC_PATH_PROGS(NCURSES_CONFIG,${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config,none) 32879 + 32880 +if test "$NCURSES_CONFIG" != none ; then 32881 + 32882 +cf_cv_ncurses_header=curses.h 32883 + 32884 +CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" 32885 +LIBS="`$NCURSES_CONFIG --libs` $LIBS" 32886 + 32887 +dnl like CF_NCURSES_CPPFLAGS 32888 +AC_DEFINE(NCURSES) 32889 + 32890 +dnl like CF_NCURSES_LIBS 32891 +CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_ncuconfig_root) 32892 +AC_DEFINE_UNQUOTED($cf_nculib_ROOT) 32893 + 32894 +dnl like CF_NCURSES_VERSION 32895 +cf_cv_ncurses_version=`$NCURSES_CONFIG --version` 32896 + 32897 +else 32898 + 32899 +CF_NCURSES_CPPFLAGS(ifelse($1,,ncurses,$1)) 32900 +CF_NCURSES_LIBS(ifelse($1,,ncurses,$1)) 32901 + 32902 +fi 32903 +])dnl 32904 +dnl --------------------------------------------------------------------------- 32905 dnl CF_NCURSES_CPPFLAGS version: 19 updated: 2007/07/29 13:35:20 32906 dnl ------------------- 32907 dnl Look for the SVr4 curses clone 'ncurses' in the standard places, adjusting 32908 @@ -1238,7 +1432,7 @@ 32909 CF_NCURSES_VERSION 32910 ])dnl 32911 dnl --------------------------------------------------------------------------- 32912 -dnl CF_NCURSES_HEADER version: 1 updated: 2005/12/31 13:28:37 32913 +dnl CF_NCURSES_HEADER version: 2 updated: 2008/03/23 14:48:54 32914 dnl ----------------- 32915 dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common 32916 dnl variations of ncurses' installs. 32917 @@ -1273,7 +1467,7 @@ 32918 CPPFLAGS="$cf_save2_CPPFLAGS" 32919 test "$cf_cv_ncurses_h2" != no && break 32920 done 32921 - test "$cf_cv_ncurses_h2" = no && AC_ERROR(not found) 32922 + test "$cf_cv_ncurses_h2" = no && AC_MSG_ERROR(not found) 32923 ]) 32924 32925 CF_DIRNAME(cf_1st_incdir,$cf_cv_ncurses_h2) 32926 @@ -1435,7 +1629,23 @@ 32927 test "$cf_cv_ncurses_version" = no || AC_DEFINE(NCURSES) 32928 ])dnl 32929 dnl --------------------------------------------------------------------------- 32930 -dnl CF_PATH_SYNTAX version: 11 updated: 2006/09/02 08:55:46 32931 +dnl CF_NCURSES_WRAP_PREFIX version: 1 updated: 2009/03/28 16:08:10 32932 +dnl ---------------------- 32933 +dnl Check for ncurses "wrap-prefix" used for public variables which have been 32934 +dnl wrapped with a function to help with concurrency control. 32935 +AC_DEFUN([CF_NCURSES_WRAP_PREFIX], 32936 +[ 32937 +AC_MSG_CHECKING(for ncurses wrap-prefix) 32938 +AC_ARG_WITH(ncurses-wrap-prefix, 32939 + [ --with-ncurses-wrap-prefix naming-prefix for ncurses wrapped-variables], 32940 + [NCURSES_WRAP_PREFIX=$withval], 32941 + [NCURSES_WRAP_PREFIX=_nc_]) 32942 +AC_MSG_RESULT($NCURSES_WRAP_PREFIX) 32943 + 32944 +AC_SUBST(NCURSES_WRAP_PREFIX) 32945 +]) 32946 +dnl --------------------------------------------------------------------------- 32947 +dnl CF_PATH_SYNTAX version: 12 updated: 2008/03/23 14:45:59 32948 dnl -------------- 32949 dnl Check the argument to see that it looks like a pathname. Rewrite it if it 32950 dnl begins with one of the prefix/exec_prefix variables, and then again if the 32951 @@ -1467,12 +1677,12 @@ 32952 $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%` 32953 ;; 32954 *) 32955 - ifelse($2,,[AC_ERROR([expected a pathname, not \"[$]$1\"])],$2) 32956 + ifelse($2,,[AC_MSG_ERROR([expected a pathname, not \"[$]$1\"])],$2) 32957 ;; 32958 esac 32959 ])dnl 32960 dnl --------------------------------------------------------------------------- 32961 -dnl CF_PDCURSES_X11 version: 7 updated: 2006/11/12 17:31:59 32962 +dnl CF_PDCURSES_X11 version: 9 updated: 2009/01/11 15:31:37 32963 dnl --------------- 32964 dnl Configure for PDCurses' X11 library 32965 AC_DEFUN([CF_PDCURSES_X11],[ 32966 @@ -1482,7 +1692,7 @@ 32967 32968 if test "$XCURSES_CONFIG" != none ; then 32969 32970 -CPPFLAGS="`$XCURSES_CONFIG --cflags` $CPPFLAGS" 32971 +CPPFLAGS="$CPPFLAGS `$XCURSES_CONFIG --cflags`" 32972 LIBS="`$XCURSES_CONFIG --libs` $LIBS" 32973 32974 cf_cv_lib_XCurses=yes 32975 @@ -1511,7 +1721,7 @@ 32976 AC_DEFINE(XCURSES) 32977 AC_DEFINE(HAVE_XCURSES) 32978 else 32979 - AC_ERROR(Cannot link with XCurses) 32980 + AC_MSG_ERROR(Cannot link with XCurses) 32981 fi 32982 ])dnl 32983 dnl --------------------------------------------------------------------------- 32984 @@ -1790,7 +2000,7 @@ 32985 $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 32986 ])dnl 32987 dnl --------------------------------------------------------------------------- 32988 -dnl CF_UTF8_LIB version: 4 updated: 2003/03/01 18:36:42 32989 +dnl CF_UTF8_LIB version: 5 updated: 2008/10/17 19:37:52 32990 dnl ----------- 32991 dnl Check for multibyte support, and if not found, utf8 compatibility library 32992 AC_DEFUN([CF_UTF8_LIB], 32993 @@ -1800,18 +2010,18 @@ 32994 AC_TRY_LINK([ 32995 #include <stdlib.h>],[putwc(0,0);], 32996 [cf_cv_utf8_lib=yes], 32997 - [LIBS="-lutf8 $LIBS" 32998 - AC_TRY_LINK([ 32999 -#include <libutf8.h>],[putwc(0,0);], 33000 + [CF_FIND_LINKAGE([ 33001 +#include <libutf8.h>],[putwc(0,0);],utf8, 33002 [cf_cv_utf8_lib=add-on], 33003 [cf_cv_utf8_lib=no]) 33004 - LIBS="$cf_save_LIBS" 33005 ])]) 33006 33007 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between 33008 # ncurses/ncursesw: 33009 if test "$cf_cv_utf8_lib" = "add-on" ; then 33010 AC_DEFINE(HAVE_LIBUTF8_H) 33011 + CF_ADD_INCDIR($cf_cv_header_path_utf8) 33012 + CF_ADD_LIBDIR($cf_cv_library_path_utf8) 33013 LIBS="-lutf8 $LIBS" 33014 fi 33015 ])dnl 33016 @@ -1866,7 +2076,7 @@ 33017 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" 33018 ])dnl 33019 dnl --------------------------------------------------------------------------- 33020 -dnl CF_XOPEN_SOURCE version: 25 updated: 2007/01/29 18:36:38 33021 +dnl CF_XOPEN_SOURCE version: 28 updated: 2008/12/27 12:30:03 33022 dnl --------------- 33023 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, 33024 dnl or adapt to the vendor's definitions to get equivalent functionality, 33025 @@ -1883,10 +2093,10 @@ 33026 cf_POSIX_C_SOURCE=ifelse($2,,199506L,$2) 33027 33028 case $host_os in #(vi 33029 -aix[[45]]*) #(vi 33030 +aix[[456]]*) #(vi 33031 CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE" 33032 ;; 33033 -freebsd*) #(vi 33034 +freebsd*|dragonfly*) #(vi 33035 # 5.x headers associate 33036 # _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L 33037 # _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L 33038 @@ -1900,7 +2110,7 @@ 33039 irix[[56]].*) #(vi 33040 CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE" 33041 ;; 33042 -linux*|gnu*|k*bsd*-gnu) #(vi 33043 +linux*|gnu*|mint*|k*bsd*-gnu) #(vi 33044 CF_GNU_SOURCE 33045 ;; 33046 mirbsd*) #(vi 33047 @@ -2005,7 +2215,7 @@ 33048 CF_X_ATHENA_LIBS($cf_x_athena) 33049 ])dnl 33050 dnl --------------------------------------------------------------------------- 33051 -dnl CF_X_ATHENA_CPPFLAGS version: 2 updated: 2002/10/09 20:00:37 33052 +dnl CF_X_ATHENA_CPPFLAGS version: 3 updated: 2009/01/11 15:33:39 33053 dnl -------------------- 33054 dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of 33055 dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw. 33056 @@ -2024,7 +2234,7 @@ 33057 cf_save="$CPPFLAGS" 33058 cf_test=X11/$cf_x_athena_root/SimpleMenu.h 33059 if test $cf_path != default ; then 33060 - CPPFLAGS="-I$cf_path/include $cf_save" 33061 + CPPFLAGS="$cf_save -I$cf_path/include" 33062 AC_MSG_CHECKING(for $cf_test in $cf_path) 33063 else 33064 AC_MSG_CHECKING(for $cf_test) 33065 @@ -2052,7 +2262,7 @@ 33066 fi 33067 ]) 33068 dnl --------------------------------------------------------------------------- 33069 -dnl CF_X_ATHENA_LIBS version: 6 updated: 2006/11/30 17:57:11 33070 +dnl CF_X_ATHENA_LIBS version: 7 updated: 2008/03/23 14:46:03 33071 dnl ---------------- 33072 dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of 33073 dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw. 33074 @@ -2096,7 +2306,7 @@ 33075 done 33076 33077 if test -z "$cf_x_athena_lib" ; then 33078 - AC_ERROR( 33079 + AC_MSG_ERROR( 33080 [Unable to successfully link Athena library (-l$cf_x_athena_root) with test program]) 33081 fi 33082 33083 @@ -2104,7 +2314,7 @@ 33084 AC_DEFINE_UNQUOTED($cf_x_athena_LIBS) 33085 ]) 33086 dnl --------------------------------------------------------------------------- 33087 -dnl CF_X_TOOLKIT version: 11 updated: 2006/11/29 19:05:14 33088 +dnl CF_X_TOOLKIT version: 12 updated: 2008/03/23 15:04:54 33089 dnl ------------ 33090 dnl Check for X Toolkit libraries 33091 dnl 33092 @@ -2133,7 +2343,7 @@ 33093 [$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])]) 33094 33095 if test $cf_have_X_LIBS = no ; then 33096 - AC_WARN( 33097 + AC_MSG_WARN( 33098 [Unable to successfully link X Toolkit library (-lXt) with 33099 test program. You will have to check and add the proper libraries by hand 33100 to makefile.]) 21792 33101 diff -Naur ncurses-5.7.orig/test/clip_printw.c ncurses-5.7/test/clip_printw.c 21793 33102 --- ncurses-5.7.orig/test/clip_printw.c 1969-12-31 16:00:00.000000000 -0800 21794 +++ ncurses-5.7/test/clip_printw.c 2009-0 3-22 21:16:52.251135633-070033103 +++ ncurses-5.7/test/clip_printw.c 2009-06-05 14:00:59.000000000 -0700 21795 33104 @@ -0,0 +1,360 @@ 21796 33105 +/**************************************************************************** … … 22154 33463 + ExitProgram(EXIT_SUCCESS); 22155 33464 +} 33465 diff -Naur ncurses-5.7.orig/test/configure ncurses-5.7/test/configure 33466 --- ncurses-5.7.orig/test/configure 2008-09-06 15:11:48.000000000 -0700 33467 +++ ncurses-5.7/test/configure 2009-06-05 14:01:30.000000000 -0700 33468 @@ -194,6 +194,7 @@ 33469 --with-Xaw3d link with Xaw 3d library 33470 --with-neXtaw link with neXT Athena library 33471 --with-XawPlus link with Athena-Plus library 33472 + --with-ncurses-wrap-prefix naming-prefix for ncurses wrapped-variables 33473 EOF 33474 exit 0 ;; 33475 33476 @@ -536,7 +537,7 @@ 33477 # Uses ac_ vars as temps to allow command line to override cache and checks. 33478 # --without-x overrides everything else, but does not touch the cache. 33479 echo $ac_n "checking for X""... $ac_c" 1>&6 33480 -echo "configure:540: checking for X" >&5 33481 +echo "configure:541: checking for X" >&5 33482 33483 33484 # Check whether --with-x or --without-x was given. 33485 @@ -599,12 +600,12 @@ 33486 33487 # First, try using that file with no special directory specified. 33488 cat > conftest.$ac_ext <<EOF 33489 -#line 603 "configure" 33490 +#line 604 "configure" 33491 #include "confdefs.h" 33492 #include <$x_direct_test_include> 33493 EOF 33494 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 33495 -{ (eval echo configure:608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 33496 +{ (eval echo configure:609: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 33497 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 33498 if test -z "$ac_err"; then 33499 rm -rf conftest* 33500 @@ -673,14 +674,14 @@ 33501 ac_save_LIBS="$LIBS" 33502 LIBS="-l$x_direct_test_library $LIBS" 33503 cat > conftest.$ac_ext <<EOF 33504 -#line 677 "configure" 33505 +#line 678 "configure" 33506 #include "confdefs.h" 33507 33508 int main() { 33509 ${x_direct_test_function}() 33510 ; return 0; } 33511 EOF 33512 -if { (eval echo configure:684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 33513 +if { (eval echo configure:685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 33514 rm -rf conftest* 33515 LIBS="$ac_save_LIBS" 33516 # We can link X programs with no special library path. 33517 @@ -803,7 +804,7 @@ 33518 fi 33519 33520 echo $ac_n "checking host system type""... $ac_c" 1>&6 33521 -echo "configure:807: checking host system type" >&5 33522 +echo "configure:808: checking host system type" >&5 33523 33524 host_alias=$host 33525 case "$host_alias" in 33526 @@ -851,7 +852,7 @@ 33527 33528 33529 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 33530 -echo "configure:855: checking whether ${MAKE-make} sets \${MAKE}" >&5 33531 +echo "configure:856: checking whether ${MAKE-make} sets \${MAKE}" >&5 33532 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` 33533 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then 33534 echo $ac_n "(cached) $ac_c" 1>&6 33535 @@ -880,7 +881,7 @@ 33536 # Extract the first word of "gcc", so it can be a program name with args. 33537 set dummy gcc; ac_word=$2 33538 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 33539 -echo "configure:884: checking for $ac_word" >&5 33540 +echo "configure:885: checking for $ac_word" >&5 33541 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then 33542 echo $ac_n "(cached) $ac_c" 1>&6 33543 else 33544 @@ -910,7 +911,7 @@ 33545 # Extract the first word of "cc", so it can be a program name with args. 33546 set dummy cc; ac_word=$2 33547 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 33548 -echo "configure:914: checking for $ac_word" >&5 33549 +echo "configure:915: checking for $ac_word" >&5 33550 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then 33551 echo $ac_n "(cached) $ac_c" 1>&6 33552 else 33553 @@ -961,7 +962,7 @@ 33554 # Extract the first word of "cl", so it can be a program name with args. 33555 set dummy cl; ac_word=$2 33556 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 33557 -echo "configure:965: checking for $ac_word" >&5 33558 +echo "configure:966: checking for $ac_word" >&5 33559 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then 33560 echo $ac_n "(cached) $ac_c" 1>&6 33561 else 33562 @@ -993,7 +994,7 @@ 33563 fi 33564 33565 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 33566 -echo "configure:997: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 33567 +echo "configure:998: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 33568 33569 ac_ext=c 33570 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. 33571 @@ -1004,12 +1005,12 @@ 33572 33573 cat > conftest.$ac_ext << EOF 33574 33575 -#line 1008 "configure" 33576 +#line 1009 "configure" 33577 #include "confdefs.h" 33578 33579 main(){return(0);} 33580 EOF 33581 -if { (eval echo configure:1013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 33582 +if { (eval echo configure:1014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 33583 ac_cv_prog_cc_works=yes 33584 # If we can't run a trivial program, we are probably using a cross compiler. 33585 if (./conftest; exit) 2>/dev/null; then 33586 @@ -1035,12 +1036,12 @@ 33587 { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } 33588 fi 33589 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 33590 -echo "configure:1039: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 33591 +echo "configure:1040: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 33592 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 33593 cross_compiling=$ac_cv_prog_cc_cross 33594 33595 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 33596 -echo "configure:1044: checking whether we are using GNU C" >&5 33597 +echo "configure:1045: checking whether we are using GNU C" >&5 33598 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then 33599 echo $ac_n "(cached) $ac_c" 1>&6 33600 else 33601 @@ -1049,7 +1050,7 @@ 33602 yes; 33603 #endif 33604 EOF 33605 -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1053: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then 33606 +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then 33607 ac_cv_prog_gcc=yes 33608 else 33609 ac_cv_prog_gcc=no 33610 @@ -1068,7 +1069,7 @@ 33611 ac_save_CFLAGS="$CFLAGS" 33612 CFLAGS= 33613 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 33614 -echo "configure:1072: checking whether ${CC-cc} accepts -g" >&5 33615 +echo "configure:1073: checking whether ${CC-cc} accepts -g" >&5 33616 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then 33617 echo $ac_n "(cached) $ac_c" 1>&6 33618 else 33619 @@ -1100,7 +1101,7 @@ 33620 fi 33621 33622 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 33623 -echo "configure:1104: checking how to run the C preprocessor" >&5 33624 +echo "configure:1105: checking how to run the C preprocessor" >&5 33625 # On Suns, sometimes $CPP names a directory. 33626 if test -n "$CPP" && test -d "$CPP"; then 33627 CPP= 33628 @@ -1115,13 +1116,13 @@ 33629 # On the NeXT, cc -E runs the code through the compiler's parser, 33630 # not just through cpp. 33631 cat > conftest.$ac_ext <<EOF 33632 -#line 1119 "configure" 33633 +#line 1120 "configure" 33634 #include "confdefs.h" 33635 #include <assert.h> 33636 Syntax Error 33637 EOF 33638 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 33639 -{ (eval echo configure:1125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 33640 +{ (eval echo configure:1126: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 33641 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 33642 if test -z "$ac_err"; then 33643 : 33644 @@ -1132,13 +1133,13 @@ 33645 rm -rf conftest* 33646 CPP="${CC-cc} -E -traditional-cpp" 33647 cat > conftest.$ac_ext <<EOF 33648 -#line 1136 "configure" 33649 +#line 1137 "configure" 33650 #include "confdefs.h" 33651 #include <assert.h> 33652 Syntax Error 33653 EOF 33654 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 33655 -{ (eval echo configure:1142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 33656 +{ (eval echo configure:1143: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 33657 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 33658 if test -z "$ac_err"; then 33659 : 33660 @@ -1149,13 +1150,13 @@ 33661 rm -rf conftest* 33662 CPP="${CC-cc} -nologo -E" 33663 cat > conftest.$ac_ext <<EOF 33664 -#line 1153 "configure" 33665 +#line 1154 "configure" 33666 #include "confdefs.h" 33667 #include <assert.h> 33668 Syntax Error 33669 EOF 33670 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 33671 -{ (eval echo configure:1159: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 33672 +{ (eval echo configure:1160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 33673 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 33674 if test -z "$ac_err"; then 33675 : 33676 @@ -1184,7 +1185,7 @@ 33677 # Extract the first word of "$ac_prog", so it can be a program name with args. 33678 set dummy $ac_prog; ac_word=$2 33679 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 33680 -echo "configure:1188: checking for $ac_word" >&5 33681 +echo "configure:1189: checking for $ac_word" >&5 33682 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then 33683 echo $ac_n "(cached) $ac_c" 1>&6 33684 else 33685 @@ -1246,12 +1247,12 @@ 33686 cf_cv_libtype= 33687 33688 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 33689 -echo "configure:1250: checking for Cygwin environment" >&5 33690 +echo "configure:1251: checking for Cygwin environment" >&5 33691 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then 33692 echo $ac_n "(cached) $ac_c" 1>&6 33693 else 33694 cat > conftest.$ac_ext <<EOF 33695 -#line 1255 "configure" 33696 +#line 1256 "configure" 33697 #include "confdefs.h" 33698 33699 int main() { 33700 @@ -1262,7 +1263,7 @@ 33701 return __CYGWIN__; 33702 ; return 0; } 33703 EOF 33704 -if { (eval echo configure:1266: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33705 +if { (eval echo configure:1267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33706 rm -rf conftest* 33707 ac_cv_cygwin=yes 33708 else 33709 @@ -1279,19 +1280,19 @@ 33710 CYGWIN= 33711 test "$ac_cv_cygwin" = yes && CYGWIN=yes 33712 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 33713 -echo "configure:1283: checking for mingw32 environment" >&5 33714 +echo "configure:1284: checking for mingw32 environment" >&5 33715 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then 33716 echo $ac_n "(cached) $ac_c" 1>&6 33717 else 33718 cat > conftest.$ac_ext <<EOF 33719 -#line 1288 "configure" 33720 +#line 1289 "configure" 33721 #include "confdefs.h" 33722 33723 int main() { 33724 return __MINGW32__; 33725 ; return 0; } 33726 EOF 33727 -if { (eval echo configure:1295: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33728 +if { (eval echo configure:1296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33729 rm -rf conftest* 33730 ac_cv_mingw32=yes 33731 else 33732 @@ -1310,7 +1311,7 @@ 33733 33734 33735 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 33736 -echo "configure:1314: checking for executable suffix" >&5 33737 +echo "configure:1315: checking for executable suffix" >&5 33738 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then 33739 echo $ac_n "(cached) $ac_c" 1>&6 33740 else 33741 @@ -1320,7 +1321,7 @@ 33742 rm -f conftest* 33743 echo 'int main () { return 0; }' > conftest.$ac_ext 33744 ac_cv_exeext= 33745 - if { (eval echo configure:1324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then 33746 + if { (eval echo configure:1325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then 33747 for file in conftest.*; do 33748 case $file in 33749 *.c | *.o | *.obj) ;; 33750 @@ -1341,13 +1342,13 @@ 33751 ac_exeext=$EXEEXT 33752 33753 echo $ac_n "checking for object suffix""... $ac_c" 1>&6 33754 -echo "configure:1345: checking for object suffix" >&5 33755 +echo "configure:1346: checking for object suffix" >&5 33756 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then 33757 echo $ac_n "(cached) $ac_c" 1>&6 33758 else 33759 rm -f conftest* 33760 echo 'int i = 1;' > conftest.$ac_ext 33761 -if { (eval echo configure:1351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33762 +if { (eval echo configure:1352: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33763 for ac_file in conftest.*; do 33764 case $ac_file in 33765 *.c) ;; 33766 @@ -1367,7 +1368,7 @@ 33767 33768 33769 echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 33770 -echo "configure:1371: checking for ${CC-cc} option to accept ANSI C" >&5 33771 +echo "configure:1372: checking for ${CC-cc} option to accept ANSI C" >&5 33772 if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then 33773 echo $ac_n "(cached) $ac_c" 1>&6 33774 else 33775 @@ -1451,7 +1452,7 @@ 33776 33777 if test -n "$cf_new_cppflags" ; then 33778 33779 - CPPFLAGS="$cf_new_cppflags $CPPFLAGS" 33780 + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" 33781 fi 33782 33783 if test -n "$cf_new_extra_cppflags" ; then 33784 @@ -1463,7 +1464,7 @@ 33785 33786 33787 cat > conftest.$ac_ext <<EOF 33788 -#line 1467 "configure" 33789 +#line 1468 "configure" 33790 #include "confdefs.h" 33791 33792 #ifndef CC_HAS_PROTOS 33793 @@ -1479,7 +1480,7 @@ 33794 struct s2 {int (*f) (double a);}; 33795 ; return 0; } 33796 EOF 33797 -if { (eval echo configure:1483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33798 +if { (eval echo configure:1484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33799 rm -rf conftest* 33800 cf_cv_ansi_cc="$cf_arg"; break 33801 else 33802 @@ -1558,7 +1559,7 @@ 33803 33804 if test -n "$cf_new_cppflags" ; then 33805 33806 - CPPFLAGS="$cf_new_cppflags $CPPFLAGS" 33807 + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" 33808 fi 33809 33810 if test -n "$cf_new_extra_cppflags" ; then 33811 @@ -1606,9 +1607,9 @@ 33812 if test "$GCC" = yes 33813 then 33814 echo "checking for $CC __attribute__ directives" 1>&6 33815 -echo "configure:1610: checking for $CC __attribute__ directives" >&5 33816 +echo "configure:1611: checking for $CC __attribute__ directives" >&5 33817 cat > conftest.$ac_ext <<EOF 33818 -#line 1612 "${as_me-configure}" 33819 +#line 1613 "${as_me-configure}" 33820 #include "confdefs.h" 33821 #include "conftest.h" 33822 #include "conftest.i" 33823 @@ -1646,7 +1647,7 @@ 33824 EOF 33825 ;; 33826 esac 33827 - if { (eval echo configure:1650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33828 + if { (eval echo configure:1651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33829 test -n "$verbose" && echo "$ac_t""... $cf_attribute" 1>&6 33830 cat conftest.h >>confdefs.h 33831 fi 33832 @@ -1659,7 +1660,7 @@ 33833 33834 33835 echo $ac_n "checking if $CC -U and -D options work together""... $ac_c" 1>&6 33836 -echo "configure:1663: checking if $CC -U and -D options work together" >&5 33837 +echo "configure:1664: checking if $CC -U and -D options work together" >&5 33838 if eval "test \"`echo '$''{'cf_cv_cc_u_d_options'+set}'`\" = set"; then 33839 echo $ac_n "(cached) $ac_c" 1>&6 33840 else 33841 @@ -1667,7 +1668,7 @@ 33842 cf_save_CPPFLAGS="$CPPFLAGS" 33843 CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS" 33844 cat > conftest.$ac_ext <<EOF 33845 -#line 1671 "configure" 33846 +#line 1672 "configure" 33847 #include "confdefs.h" 33848 33849 int main() { 33850 @@ -1681,7 +1682,7 @@ 33851 33852 ; return 0; } 33853 EOF 33854 -if { (eval echo configure:1685: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33855 +if { (eval echo configure:1686: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33856 rm -rf conftest* 33857 33858 cf_cv_cc_u_d_options=yes 33859 @@ -1707,10 +1708,10 @@ 33860 cf_POSIX_C_SOURCE=199506L 33861 33862 case $host_os in #(vi 33863 -aix[45]*) #(vi 33864 +aix[456]*) #(vi 33865 CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE" 33866 ;; 33867 -freebsd*) #(vi 33868 +freebsd*|dragonfly*) #(vi 33869 # 5.x headers associate 33870 # _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L 33871 # _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L 33872 @@ -1724,16 +1725,16 @@ 33873 irix[56].*) #(vi 33874 CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE" 33875 ;; 33876 -linux*|gnu*|k*bsd*-gnu) #(vi 33877 +linux*|gnu*|mint*|k*bsd*-gnu) #(vi 33878 33879 echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6 33880 -echo "configure:1731: checking if we must define _GNU_SOURCE" >&5 33881 +echo "configure:1732: checking if we must define _GNU_SOURCE" >&5 33882 if eval "test \"`echo '$''{'cf_cv_gnu_source'+set}'`\" = set"; then 33883 echo $ac_n "(cached) $ac_c" 1>&6 33884 else 33885 33886 cat > conftest.$ac_ext <<EOF 33887 -#line 1737 "configure" 33888 +#line 1738 "configure" 33889 #include "confdefs.h" 33890 #include <sys/types.h> 33891 int main() { 33892 @@ -1743,7 +1744,7 @@ 33893 #endif 33894 ; return 0; } 33895 EOF 33896 -if { (eval echo configure:1747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33897 +if { (eval echo configure:1748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33898 rm -rf conftest* 33899 cf_cv_gnu_source=no 33900 else 33901 @@ -1753,7 +1754,7 @@ 33902 cf_save="$CPPFLAGS" 33903 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" 33904 cat > conftest.$ac_ext <<EOF 33905 -#line 1757 "configure" 33906 +#line 1758 "configure" 33907 #include "confdefs.h" 33908 #include <sys/types.h> 33909 int main() { 33910 @@ -1763,7 +1764,7 @@ 33911 #endif 33912 ; return 0; } 33913 EOF 33914 -if { (eval echo configure:1767: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33915 +if { (eval echo configure:1768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33916 rm -rf conftest* 33917 cf_cv_gnu_source=no 33918 else 33919 @@ -1807,13 +1808,13 @@ 33920 ;; 33921 *) 33922 echo $ac_n "checking if we should define _XOPEN_SOURCE""... $ac_c" 1>&6 33923 -echo "configure:1811: checking if we should define _XOPEN_SOURCE" >&5 33924 +echo "configure:1812: checking if we should define _XOPEN_SOURCE" >&5 33925 if eval "test \"`echo '$''{'cf_cv_xopen_source'+set}'`\" = set"; then 33926 echo $ac_n "(cached) $ac_c" 1>&6 33927 else 33928 33929 cat > conftest.$ac_ext <<EOF 33930 -#line 1817 "configure" 33931 +#line 1818 "configure" 33932 #include "confdefs.h" 33933 #include <sys/types.h> 33934 int main() { 33935 @@ -1823,7 +1824,7 @@ 33936 #endif 33937 ; return 0; } 33938 EOF 33939 -if { (eval echo configure:1827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33940 +if { (eval echo configure:1828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33941 rm -rf conftest* 33942 cf_cv_xopen_source=no 33943 else 33944 @@ -1833,7 +1834,7 @@ 33945 cf_save="$CPPFLAGS" 33946 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" 33947 cat > conftest.$ac_ext <<EOF 33948 -#line 1837 "configure" 33949 +#line 1838 "configure" 33950 #include "confdefs.h" 33951 #include <sys/types.h> 33952 int main() { 33953 @@ -1843,7 +1844,7 @@ 33954 #endif 33955 ; return 0; } 33956 EOF 33957 -if { (eval echo configure:1847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33958 +if { (eval echo configure:1848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33959 rm -rf conftest* 33960 cf_cv_xopen_source=no 33961 else 33962 @@ -1898,16 +1899,16 @@ 33963 33964 33965 echo $ac_n "checking if we should define _POSIX_C_SOURCE""... $ac_c" 1>&6 33966 -echo "configure:1902: checking if we should define _POSIX_C_SOURCE" >&5 33967 +echo "configure:1903: checking if we should define _POSIX_C_SOURCE" >&5 33968 if eval "test \"`echo '$''{'cf_cv_posix_c_source'+set}'`\" = set"; then 33969 echo $ac_n "(cached) $ac_c" 1>&6 33970 else 33971 33972 33973 -echo "${as_me-configure}:1908: testing if the symbol is already defined go no further ..." 1>&5 33974 +echo "${as_me-configure}:1909: testing if the symbol is already defined go no further ..." 1>&5 33975 33976 cat > conftest.$ac_ext <<EOF 33977 -#line 1911 "configure" 33978 +#line 1912 "configure" 33979 #include "confdefs.h" 33980 #include <sys/types.h> 33981 int main() { 33982 @@ -1917,7 +1918,7 @@ 33983 #endif 33984 ; return 0; } 33985 EOF 33986 -if { (eval echo configure:1921: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33987 +if { (eval echo configure:1922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33988 rm -rf conftest* 33989 cf_cv_posix_c_source=no 33990 else 33991 @@ -1939,7 +1940,7 @@ 33992 esac 33993 if test "$cf_want_posix_source" = yes ; then 33994 cat > conftest.$ac_ext <<EOF 33995 -#line 1943 "configure" 33996 +#line 1944 "configure" 33997 #include "confdefs.h" 33998 #include <sys/types.h> 33999 int main() { 34000 @@ -1949,7 +1950,7 @@ 34001 #endif 34002 ; return 0; } 34003 EOF 34004 -if { (eval echo configure:1953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34005 +if { (eval echo configure:1954: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34006 : 34007 else 34008 echo "configure: failed program was:" >&5 34009 @@ -1960,15 +1961,15 @@ 34010 rm -f conftest* 34011 fi 34012 34013 -echo "${as_me-configure}:1964: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 34014 +echo "${as_me-configure}:1965: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 34015 34016 CFLAGS="$cf_trim_CFLAGS" 34017 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" 34018 34019 -echo "${as_me-configure}:1969: testing if the second compile does not leave our definition intact error ..." 1>&5 34020 +echo "${as_me-configure}:1970: testing if the second compile does not leave our definition intact error ..." 1>&5 34021 34022 cat > conftest.$ac_ext <<EOF 34023 -#line 1972 "configure" 34024 +#line 1973 "configure" 34025 #include "confdefs.h" 34026 #include <sys/types.h> 34027 int main() { 34028 @@ -1978,7 +1979,7 @@ 34029 #endif 34030 ; return 0; } 34031 EOF 34032 -if { (eval echo configure:1982: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34033 +if { (eval echo configure:1983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34034 : 34035 else 34036 echo "configure: failed program was:" >&5 34037 @@ -2013,12 +2014,12 @@ 34038 esac 34039 34040 echo $ac_n "checking for working const""... $ac_c" 1>&6 34041 -echo "configure:2017: checking for working const" >&5 34042 +echo "configure:2018: checking for working const" >&5 34043 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then 34044 echo $ac_n "(cached) $ac_c" 1>&6 34045 else 34046 cat > conftest.$ac_ext <<EOF 34047 -#line 2022 "configure" 34048 +#line 2023 "configure" 34049 #include "confdefs.h" 34050 34051 int main() { 34052 @@ -2067,7 +2068,7 @@ 34053 34054 ; return 0; } 34055 EOF 34056 -if { (eval echo configure:2071: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34057 +if { (eval echo configure:2072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34058 rm -rf conftest* 34059 ac_cv_c_const=yes 34060 else 34061 @@ -2089,7 +2090,7 @@ 34062 34063 34064 echo $ac_n "checking for signal global datatype""... $ac_c" 1>&6 34065 -echo "configure:2093: checking for signal global datatype" >&5 34066 +echo "configure:2094: checking for signal global datatype" >&5 34067 if eval "test \"`echo '$''{'cf_cv_sig_atomic_t'+set}'`\" = set"; then 34068 echo $ac_n "(cached) $ac_c" 1>&6 34069 else 34070 @@ -2100,7 +2101,7 @@ 34071 "int" 34072 do 34073 cat > conftest.$ac_ext <<EOF 34074 -#line 2104 "configure" 34075 +#line 2105 "configure" 34076 #include "confdefs.h" 34077 34078 #include <sys/types.h> 34079 @@ -2118,7 +2119,7 @@ 34080 x = 1 34081 ; return 0; } 34082 EOF 34083 -if { (eval echo configure:2122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34084 +if { (eval echo configure:2123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34085 rm -rf conftest* 34086 cf_cv_sig_atomic_t=$cf_type 34087 else 34088 @@ -2142,7 +2143,7 @@ 34089 34090 34091 echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6 34092 -echo "configure:2146: checking if you want to see long compiling messages" >&5 34093 +echo "configure:2147: checking if you want to see long compiling messages" >&5 34094 34095 # Check whether --enable-echo or --disable-echo was given. 34096 if test "${enable_echo+set}" = set; then 34097 @@ -2189,7 +2190,7 @@ 34098 GCC_VERSION=none 34099 if test "$GCC" = yes ; then 34100 echo $ac_n "checking version of $CC""... $ac_c" 1>&6 34101 -echo "configure:2193: checking version of $CC" >&5 34102 +echo "configure:2194: checking version of $CC" >&5 34103 GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" 34104 test -z "$GCC_VERSION" && GCC_VERSION=unknown 34105 echo "$ac_t""$GCC_VERSION" 1>&6 34106 @@ -2199,7 +2200,7 @@ 34107 if ( test "$GCC" = yes || test "$GXX" = yes ) 34108 then 34109 echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6 34110 -echo "configure:2203: checking if you want to turn on gcc warnings" >&5 34111 +echo "configure:2204: checking if you want to turn on gcc warnings" >&5 34112 34113 # Check whether --enable-warnings or --disable-warnings was given. 34114 if test "${enable_warnings+set}" = set; then 34115 @@ -2228,11 +2229,11 @@ 34116 case $host_os in 34117 linux*|gnu*) 34118 echo $ac_n "checking if this is really Intel C compiler""... $ac_c" 1>&6 34119 -echo "configure:2232: checking if this is really Intel C compiler" >&5 34120 +echo "configure:2233: checking if this is really Intel C compiler" >&5 34121 cf_save_CFLAGS="$CFLAGS" 34122 CFLAGS="$CFLAGS -no-gcc" 34123 cat > conftest.$ac_ext <<EOF 34124 -#line 2236 "configure" 34125 +#line 2237 "configure" 34126 #include "confdefs.h" 34127 34128 int main() { 34129 @@ -2244,7 +2245,7 @@ 34130 34131 ; return 0; } 34132 EOF 34133 -if { (eval echo configure:2248: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34134 +if { (eval echo configure:2249: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34135 rm -rf conftest* 34136 INTEL_COMPILER=yes 34137 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" 34138 @@ -2262,7 +2263,7 @@ 34139 34140 34141 cat > conftest.$ac_ext <<EOF 34142 -#line 2266 "${as_me-configure}" 34143 +#line 2267 "${as_me-configure}" 34144 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } 34145 EOF 34146 34147 @@ -2270,7 +2271,6 @@ 34148 then 34149 # The "-wdXXX" options suppress warnings: 34150 # remark #1419: external declaration in primary source file 34151 -# remark #1682: implicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem) 34152 # remark #1683: explicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem) 34153 # remark #1684: conversion from pointer to same-sized integral type (potential portability problem) 34154 # remark #193: zero used for undefined preprocessing identifier 34155 @@ -2278,7 +2278,7 @@ 34156 # remark #810: conversion from "int" to "Dimension={unsigned short}" may lose significant bits 34157 # remark #869: parameter "tw" was never referenced 34158 # remark #981: operands are evaluated in unspecified order 34159 -# warning #269: invalid format string conversion 34160 +# warning #279: controlling expression is constant 34161 34162 echo "checking for $CC warning options" 1>&6 34163 echo "configure:2285: checking for $CC warning options" >&5 34164 @@ -2286,18 +2286,17 @@ 34165 EXTRA_CFLAGS="-Wall" 34166 for cf_opt in \ 34167 wd1419 \ 34168 - wd1682 \ 34169 wd1683 \ 34170 wd1684 \ 34171 wd193 \ 34172 - wd279 \ 34173 wd593 \ 34174 + wd279 \ 34175 wd810 \ 34176 wd869 \ 34177 wd981 34178 do 34179 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" 34180 - if { (eval echo configure:2301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34181 + if { (eval echo configure:2300: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34182 test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6 34183 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" 34184 fi 34185 @@ -2307,7 +2306,7 @@ 34186 elif test "$GCC" = yes 34187 then 34188 echo "checking for $CC warning options" 1>&6 34189 -echo "configure:2311: checking for $CC warning options" >&5 34190 +echo "configure:2310: checking for $CC warning options" >&5 34191 cf_save_CFLAGS="$CFLAGS" 34192 EXTRA_CFLAGS="-W -Wall" 34193 cf_warn_CONST="" 34194 @@ -2326,7 +2325,7 @@ 34195 Wundef $cf_warn_CONST 34196 do 34197 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" 34198 - if { (eval echo configure:2330: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34199 + if { (eval echo configure:2329: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34200 test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6 34201 case $cf_opt in #(vi 34202 Wcast-qual) #(vi 34203 @@ -2334,10 +2333,10 @@ 34204 ;; 34205 Winline) #(vi 34206 case $GCC_VERSION in 34207 - 3.3*) 34208 + [34].*) 34209 test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 34210 34211 -echo "${as_me-configure}:2341: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 34212 +echo "${as_me-configure}:2340: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 34213 34214 34215 continue;; 34216 @@ -2441,7 +2440,7 @@ 34217 34218 34219 echo $ac_n "checking for extra include directories""... $ac_c" 1>&6 34220 -echo "configure:2445: checking for extra include directories" >&5 34221 +echo "configure:2444: checking for extra include directories" >&5 34222 if eval "test \"`echo '$''{'cf_cv_curses_incdir'+set}'`\" = set"; then 34223 echo $ac_n "(cached) $ac_c" 1>&6 34224 else 34225 @@ -2462,11 +2461,11 @@ 34226 fi 34227 34228 echo "$ac_t""$cf_cv_curses_incdir" 1>&6 34229 -test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS" 34230 +test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir" 34231 34232 34233 echo $ac_n "checking if we have identified curses headers""... $ac_c" 1>&6 34234 -echo "configure:2470: checking if we have identified curses headers" >&5 34235 +echo "configure:2469: checking if we have identified curses headers" >&5 34236 if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then 34237 echo $ac_n "(cached) $ac_c" 1>&6 34238 else 34239 @@ -2479,14 +2478,14 @@ 34240 ncurses/ncurses.h 34241 do 34242 cat > conftest.$ac_ext <<EOF 34243 -#line 2483 "configure" 34244 +#line 2482 "configure" 34245 #include "confdefs.h" 34246 #include <${cf_header}> 34247 int main() { 34248 initscr(); tgoto("?", 0,0) 34249 ; return 0; } 34250 EOF 34251 -if { (eval echo configure:2490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34252 +if { (eval echo configure:2489: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34253 rm -rf conftest* 34254 cf_cv_ncurses_header=$cf_header; break 34255 else 34256 @@ -2509,17 +2508,17 @@ 34257 do 34258 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 34259 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 34260 -echo "configure:2513: checking for $ac_hdr" >&5 34261 +echo "configure:2512: checking for $ac_hdr" >&5 34262 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 34263 echo $ac_n "(cached) $ac_c" 1>&6 34264 else 34265 cat > conftest.$ac_ext <<EOF 34266 -#line 2518 "configure" 34267 +#line 2517 "configure" 34268 #include "confdefs.h" 34269 #include <$ac_hdr> 34270 EOF 34271 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 34272 -{ (eval echo configure:2523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 34273 +{ (eval echo configure:2522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 34274 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 34275 if test -z "$ac_err"; then 34276 rm -rf conftest* 34277 @@ -2548,7 +2547,7 @@ 34278 34279 34280 echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 34281 -echo "configure:2552: checking for terminfo header" >&5 34282 +echo "configure:2551: checking for terminfo header" >&5 34283 if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then 34284 echo $ac_n "(cached) $ac_c" 1>&6 34285 else 34286 @@ -2565,7 +2564,7 @@ 34287 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" 34288 do 34289 cat > conftest.$ac_ext <<EOF 34290 -#line 2569 "configure" 34291 +#line 2568 "configure" 34292 #include "confdefs.h" 34293 #include <stdio.h> 34294 #include <${cf_cv_ncurses_header-curses.h}> 34295 @@ -2575,7 +2574,7 @@ 34296 int x = auto_left_margin 34297 ; return 0; } 34298 EOF 34299 -if { (eval echo configure:2579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34300 +if { (eval echo configure:2578: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34301 rm -rf conftest* 34302 34303 cf_cv_term_header="$cf_test" 34304 @@ -2624,7 +2623,7 @@ 34305 34306 34307 echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 34308 -echo "configure:2628: checking for ncurses version" >&5 34309 +echo "configure:2627: checking for ncurses version" >&5 34310 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then 34311 echo $ac_n "(cached) $ac_c" 1>&6 34312 else 34313 @@ -2650,7 +2649,7 @@ 34314 #endif 34315 EOF 34316 cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" 34317 - { (eval echo configure:2654: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } 34318 + { (eval echo configure:2653: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } 34319 if test -f conftest.out ; then 34320 cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` 34321 test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" 34322 @@ -2659,7 +2658,7 @@ 34323 34324 else 34325 cat > conftest.$ac_ext <<EOF 34326 -#line 2663 "configure" 34327 +#line 2662 "configure" 34328 #include "confdefs.h" 34329 34330 #include <${cf_cv_ncurses_header-curses.h}> 34331 @@ -2683,7 +2682,7 @@ 34332 ${cf_cv_main_return-return}(0); 34333 } 34334 EOF 34335 -if { (eval echo configure:2687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 34336 +if { (eval echo configure:2686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 34337 then 34338 34339 cf_cv_ncurses_version=`cat $cf_tempfile` 34340 @@ -2707,16 +2706,16 @@ 34341 34342 34343 echo $ac_n "checking if we have identified curses libraries""... $ac_c" 1>&6 34344 -echo "configure:2711: checking if we have identified curses libraries" >&5 34345 +echo "configure:2710: checking if we have identified curses libraries" >&5 34346 cat > conftest.$ac_ext <<EOF 34347 -#line 2713 "configure" 34348 +#line 2712 "configure" 34349 #include "confdefs.h" 34350 #include <${cf_cv_ncurses_header-curses.h}> 34351 int main() { 34352 initscr(); tgoto("?", 0,0) 34353 ; return 0; } 34354 EOF 34355 -if { (eval echo configure:2720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34356 +if { (eval echo configure:2719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34357 rm -rf conftest* 34358 cf_result=yes 34359 else 34360 @@ -2732,7 +2731,7 @@ 34361 case $host_os in #(vi 34362 freebsd*) #(vi 34363 echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 34364 -echo "configure:2736: checking for tgoto in -lmytinfo" >&5 34365 +echo "configure:2735: checking for tgoto in -lmytinfo" >&5 34366 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` 34367 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 34368 echo $ac_n "(cached) $ac_c" 1>&6 34369 @@ -2740,7 +2739,7 @@ 34370 ac_save_LIBS="$LIBS" 34371 LIBS="-lmytinfo $LIBS" 34372 cat > conftest.$ac_ext <<EOF 34373 -#line 2744 "configure" 34374 +#line 2743 "configure" 34375 #include "confdefs.h" 34376 /* Override any gcc2 internal prototype to avoid an error. */ 34377 /* We use char because int might match the return type of a gcc2 34378 @@ -2751,7 +2750,7 @@ 34379 tgoto() 34380 ; return 0; } 34381 EOF 34382 -if { (eval echo configure:2755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34383 +if { (eval echo configure:2754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34384 rm -rf conftest* 34385 eval "ac_cv_lib_$ac_lib_var=yes" 34386 else 34387 @@ -2774,7 +2773,7 @@ 34388 ;; 34389 hpux10.*) #(vi 34390 echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6 34391 -echo "configure:2778: checking for initscr in -lcur_colr" >&5 34392 +echo "configure:2777: checking for initscr in -lcur_colr" >&5 34393 ac_lib_var=`echo cur_colr'_'initscr | sed 'y%./+-%__p_%'` 34394 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 34395 echo $ac_n "(cached) $ac_c" 1>&6 34396 @@ -2782,7 +2781,7 @@ 34397 ac_save_LIBS="$LIBS" 34398 LIBS="-lcur_colr $LIBS" 34399 cat > conftest.$ac_ext <<EOF 34400 -#line 2786 "configure" 34401 +#line 2785 "configure" 34402 #include "confdefs.h" 34403 /* Override any gcc2 internal prototype to avoid an error. */ 34404 /* We use char because int might match the return type of a gcc2 34405 @@ -2793,7 +2792,7 @@ 34406 initscr() 34407 ; return 0; } 34408 EOF 34409 -if { (eval echo configure:2797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34410 +if { (eval echo configure:2796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34411 rm -rf conftest* 34412 eval "ac_cv_lib_$ac_lib_var=yes" 34413 else 34414 @@ -2816,7 +2815,7 @@ 34415 echo "$ac_t""no" 1>&6 34416 34417 echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6 34418 -echo "configure:2820: checking for initscr in -lHcurses" >&5 34419 +echo "configure:2819: checking for initscr in -lHcurses" >&5 34420 ac_lib_var=`echo Hcurses'_'initscr | sed 'y%./+-%__p_%'` 34421 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 34422 echo $ac_n "(cached) $ac_c" 1>&6 34423 @@ -2824,7 +2823,7 @@ 34424 ac_save_LIBS="$LIBS" 34425 LIBS="-lHcurses $LIBS" 34426 cat > conftest.$ac_ext <<EOF 34427 -#line 2828 "configure" 34428 +#line 2827 "configure" 34429 #include "confdefs.h" 34430 /* Override any gcc2 internal prototype to avoid an error. */ 34431 /* We use char because int might match the return type of a gcc2 34432 @@ -2835,7 +2834,7 @@ 34433 initscr() 34434 ; return 0; } 34435 EOF 34436 -if { (eval echo configure:2839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34437 +if { (eval echo configure:2838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34438 rm -rf conftest* 34439 eval "ac_cv_lib_$ac_lib_var=yes" 34440 else 34441 @@ -2853,7 +2852,7 @@ 34442 34443 # HP's header uses __HP_CURSES, but user claims _HP_CURSES. 34444 LIBS="-lHcurses $LIBS" 34445 - CPPFLAGS="-D__HP_CURSES -D_HP_CURSES $CPPFLAGS" 34446 + CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES" 34447 ac_cv_func_initscr=yes 34448 34449 else 34450 @@ -2884,7 +2883,7 @@ 34451 if test "$cf_have_libdir" = no ; then 34452 test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 34453 34454 -echo "${as_me-configure}:2888: testing adding $cf_add_libdir to library-path ..." 1>&5 34455 +echo "${as_me-configure}:2887: testing adding $cf_add_libdir to library-path ..." 1>&5 34456 34457 34458 LDFLAGS="-L$cf_add_libdir $LDFLAGS" 34459 @@ -2916,7 +2915,7 @@ 34460 if test "$cf_have_libdir" = no ; then 34461 test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 34462 34463 -echo "${as_me-configure}:2920: testing adding $cf_add_libdir to library-path ..." 1>&5 34464 +echo "${as_me-configure}:2919: testing adding $cf_add_libdir to library-path ..." 1>&5 34465 34466 34467 LDFLAGS="-L$cf_add_libdir $LDFLAGS" 34468 @@ -2946,12 +2945,12 @@ 34469 # Check for library containing tgoto. Do this before curses library 34470 # because it may be needed to link the test-case for initscr. 34471 echo $ac_n "checking for tgoto""... $ac_c" 1>&6 34472 -echo "configure:2950: checking for tgoto" >&5 34473 +echo "configure:2949: checking for tgoto" >&5 34474 if eval "test \"`echo '$''{'ac_cv_func_tgoto'+set}'`\" = set"; then 34475 echo $ac_n "(cached) $ac_c" 1>&6 34476 else 34477 cat > conftest.$ac_ext <<EOF 34478 -#line 2955 "configure" 34479 +#line 2954 "configure" 34480 #include "confdefs.h" 34481 /* System header to define __stub macros and hopefully few prototypes, 34482 which can conflict with char tgoto(); below. */ 34483 @@ -2974,7 +2973,7 @@ 34484 34485 ; return 0; } 34486 EOF 34487 -if { (eval echo configure:2978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34488 +if { (eval echo configure:2977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34489 rm -rf conftest* 34490 eval "ac_cv_func_tgoto=yes" 34491 else 34492 @@ -2995,7 +2994,7 @@ 34493 for cf_term_lib in $cf_check_list termcap termlib unknown 34494 do 34495 echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6 34496 -echo "configure:2999: checking for tgoto in -l$cf_term_lib" >&5 34497 +echo "configure:2998: checking for tgoto in -l$cf_term_lib" >&5 34498 ac_lib_var=`echo $cf_term_lib'_'tgoto | sed 'y%./+-%__p_%'` 34499 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 34500 echo $ac_n "(cached) $ac_c" 1>&6 34501 @@ -3003,7 +3002,7 @@ 34502 ac_save_LIBS="$LIBS" 34503 LIBS="-l$cf_term_lib $LIBS" 34504 cat > conftest.$ac_ext <<EOF 34505 -#line 3007 "configure" 34506 +#line 3006 "configure" 34507 #include "confdefs.h" 34508 /* Override any gcc2 internal prototype to avoid an error. */ 34509 /* We use char because int might match the return type of a gcc2 34510 @@ -3014,7 +3013,7 @@ 34511 tgoto() 34512 ; return 0; } 34513 EOF 34514 -if { (eval echo configure:3018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34515 +if { (eval echo configure:3017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34516 rm -rf conftest* 34517 eval "ac_cv_lib_$ac_lib_var=yes" 34518 else 34519 @@ -3041,10 +3040,10 @@ 34520 34521 # Check for library containing initscr 34522 test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" 34523 - for cf_curs_lib in $cf_check_list xcurses jcurses unknown 34524 + for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown 34525 do 34526 echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6 34527 -echo "configure:3048: checking for initscr in -l$cf_curs_lib" >&5 34528 +echo "configure:3047: checking for initscr in -l$cf_curs_lib" >&5 34529 ac_lib_var=`echo $cf_curs_lib'_'initscr | sed 'y%./+-%__p_%'` 34530 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 34531 echo $ac_n "(cached) $ac_c" 1>&6 34532 @@ -3052,7 +3051,7 @@ 34533 ac_save_LIBS="$LIBS" 34534 LIBS="-l$cf_curs_lib $LIBS" 34535 cat > conftest.$ac_ext <<EOF 34536 -#line 3056 "configure" 34537 +#line 3055 "configure" 34538 #include "confdefs.h" 34539 /* Override any gcc2 internal prototype to avoid an error. */ 34540 /* We use char because int might match the return type of a gcc2 34541 @@ -3063,7 +3062,7 @@ 34542 initscr() 34543 ; return 0; } 34544 EOF 34545 -if { (eval echo configure:3067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34546 +if { (eval echo configure:3066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34547 rm -rf conftest* 34548 eval "ac_cv_lib_$ac_lib_var=yes" 34549 else 34550 @@ -3089,16 +3088,16 @@ 34551 LIBS="-l$cf_curs_lib $cf_save_LIBS" 34552 if test "$cf_term_lib" = unknown ; then 34553 echo $ac_n "checking if we can link with $cf_curs_lib library""... $ac_c" 1>&6 34554 -echo "configure:3093: checking if we can link with $cf_curs_lib library" >&5 34555 +echo "configure:3092: checking if we can link with $cf_curs_lib library" >&5 34556 cat > conftest.$ac_ext <<EOF 34557 -#line 3095 "configure" 34558 +#line 3094 "configure" 34559 #include "confdefs.h" 34560 #include <${cf_cv_ncurses_header-curses.h}> 34561 int main() { 34562 initscr() 34563 ; return 0; } 34564 EOF 34565 -if { (eval echo configure:3102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34566 +if { (eval echo configure:3101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34567 rm -rf conftest* 34568 cf_result=yes 34569 else 34570 @@ -3114,16 +3113,16 @@ 34571 : 34572 elif test "$cf_term_lib" != predefined ; then 34573 echo $ac_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries""... $ac_c" 1>&6 34574 -echo "configure:3118: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 34575 +echo "configure:3117: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 34576 cat > conftest.$ac_ext <<EOF 34577 -#line 3120 "configure" 34578 +#line 3119 "configure" 34579 #include "confdefs.h" 34580 #include <${cf_cv_ncurses_header-curses.h}> 34581 int main() { 34582 initscr(); tgoto((char *)0, 0, 0); 34583 ; return 0; } 34584 EOF 34585 -if { (eval echo configure:3127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34586 +if { (eval echo configure:3126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34587 rm -rf conftest* 34588 cf_result=no 34589 else 34590 @@ -3133,14 +3132,14 @@ 34591 34592 LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" 34593 cat > conftest.$ac_ext <<EOF 34594 -#line 3137 "configure" 34595 +#line 3136 "configure" 34596 #include "confdefs.h" 34597 #include <${cf_cv_ncurses_header-curses.h}> 34598 int main() { 34599 initscr() 34600 ; return 0; } 34601 EOF 34602 -if { (eval echo configure:3144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34603 +if { (eval echo configure:3143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34604 rm -rf conftest* 34605 cf_result=yes 34606 else 34607 @@ -3162,6 +3161,76 @@ 34608 ;; 34609 ncurses) 34610 34611 +cf_ncuconfig_root=ncurses 34612 + 34613 +echo "Looking for ${cf_ncuconfig_root}-config" 34614 +for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config 34615 +do 34616 +# Extract the first word of "$ac_prog", so it can be a program name with args. 34617 +set dummy $ac_prog; ac_word=$2 34618 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 34619 +echo "configure:3173: checking for $ac_word" >&5 34620 +if eval "test \"`echo '$''{'ac_cv_path_NCURSES_CONFIG'+set}'`\" = set"; then 34621 + echo $ac_n "(cached) $ac_c" 1>&6 34622 +else 34623 + case "$NCURSES_CONFIG" in 34624 + /*) 34625 + ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a path. 34626 + ;; 34627 + ?:/*) 34628 + ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a dos path. 34629 + ;; 34630 + *) 34631 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 34632 + ac_dummy="$PATH" 34633 + for ac_dir in $ac_dummy; do 34634 + test -z "$ac_dir" && ac_dir=. 34635 + if test -f $ac_dir/$ac_word; then 34636 + ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word" 34637 + break 34638 + fi 34639 + done 34640 + IFS="$ac_save_ifs" 34641 + ;; 34642 +esac 34643 +fi 34644 +NCURSES_CONFIG="$ac_cv_path_NCURSES_CONFIG" 34645 +if test -n "$NCURSES_CONFIG"; then 34646 + echo "$ac_t""$NCURSES_CONFIG" 1>&6 34647 +else 34648 + echo "$ac_t""no" 1>&6 34649 +fi 34650 + 34651 +test -n "$NCURSES_CONFIG" && break 34652 +done 34653 +test -n "$NCURSES_CONFIG" || NCURSES_CONFIG="none" 34654 + 34655 + 34656 +if test "$NCURSES_CONFIG" != none ; then 34657 + 34658 +cf_cv_ncurses_header=curses.h 34659 + 34660 +CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" 34661 +LIBS="`$NCURSES_CONFIG --libs` $LIBS" 34662 + 34663 +cat >> confdefs.h <<\EOF 34664 +#define NCURSES 1 34665 +EOF 34666 + 34667 + 34668 + 34669 +cf_nculib_ROOT=`echo "HAVE_LIB$cf_ncuconfig_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 34670 + 34671 +cat >> confdefs.h <<EOF 34672 +#define $cf_nculib_ROOT 1 34673 +EOF 34674 + 34675 + 34676 +cf_cv_ncurses_version=`$NCURSES_CONFIG --version` 34677 + 34678 +else 34679 + 34680 + 34681 34682 cf_ncuhdr_root=ncurses 34683 34684 @@ -3186,20 +3255,20 @@ 34685 fi 34686 34687 if test "$cf_have_incdir" = no ; then 34688 - if test "$cf_add_incdir" = /usr/local/include ; then 34689 + if test "$cf_add_incdir" = /usr/local/include ; then 34690 if test "$GCC" = yes 34691 then 34692 cf_save_CPPFLAGS=$CPPFLAGS 34693 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 34694 cat > conftest.$ac_ext <<EOF 34695 -#line 3196 "configure" 34696 +#line 3265 "configure" 34697 #include "confdefs.h" 34698 #include <stdio.h> 34699 int main() { 34700 printf("Hello") 34701 ; return 0; } 34702 EOF 34703 -if { (eval echo configure:3203: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34704 +if { (eval echo configure:3272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34705 : 34706 else 34707 echo "configure: failed program was:" >&5 34708 @@ -3216,14 +3285,14 @@ 34709 if test "$cf_have_incdir" = no ; then 34710 test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 34711 34712 -echo "${as_me-configure}:3220: testing adding $cf_add_incdir to include-path ..." 1>&5 34713 +echo "${as_me-configure}:3289: testing adding $cf_add_incdir to include-path ..." 1>&5 34714 34715 34716 - CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" 34717 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 34718 34719 - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 34720 - test "$cf_top_incdir" = "$cf_add_incdir" && break 34721 - cf_add_incdir="$cf_top_incdir" 34722 + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 34723 + test "$cf_top_incdir" = "$cf_add_incdir" && break 34724 + cf_add_incdir="$cf_top_incdir" 34725 else 34726 break 34727 fi 34728 @@ -3235,7 +3304,7 @@ 34729 } 34730 34731 echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6 34732 -echo "configure:3239: checking for $cf_ncuhdr_root header in include-path" >&5 34733 +echo "configure:3308: checking for $cf_ncuhdr_root header in include-path" >&5 34734 if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then 34735 echo $ac_n "(cached) $ac_c" 1>&6 34736 else 34737 @@ -3246,7 +3315,7 @@ 34738 do 34739 34740 cat > conftest.$ac_ext <<EOF 34741 -#line 3250 "configure" 34742 +#line 3319 "configure" 34743 #include "confdefs.h" 34744 34745 34746 @@ -3267,7 +3336,7 @@ 34747 34748 ; return 0; } 34749 EOF 34750 -if { (eval echo configure:3271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34751 +if { (eval echo configure:3340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34752 rm -rf conftest* 34753 cf_cv_ncurses_h=$cf_header 34754 34755 @@ -3293,13 +3362,39 @@ 34756 else 34757 34758 echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6 34759 -echo "configure:3297: checking for $cf_ncuhdr_root include-path" >&5 34760 +echo "configure:3366: checking for $cf_ncuhdr_root include-path" >&5 34761 if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then 34762 echo $ac_n "(cached) $ac_c" 1>&6 34763 else 34764 34765 test -n "$verbose" && echo 34766 - cf_search="" 34767 + 34768 +cf_header_path_list="" 34769 +if test -n "${CFLAGS}${CPPFLAGS}" ; then 34770 + for cf_header_path in $CPPFLAGS $CFLAGS 34771 + do 34772 + case $cf_header_path in #(vi 34773 + -I*) 34774 + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` 34775 + 34776 +test "$cf_header_path" != "NONE" && \ 34777 +test -d "$cf_header_path" && \ 34778 + { 34779 + test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" 34780 + test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" 34781 + test -d $cf_header_path/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root" 34782 + test -d $cf_header_path/include/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include" 34783 + test -d $cf_header_path/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include" 34784 + test -d $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 34785 +} 34786 + 34787 + cf_header_path_list="$cf_header_path_list $cf_search" 34788 + ;; 34789 + esac 34790 + done 34791 +fi 34792 + 34793 +cf_search="" 34794 34795 34796 test "/usr" != "$prefix" && \ 34797 @@ -3362,6 +3457,7 @@ 34798 } 34799 34800 34801 + 34802 test "$includedir" != NONE && \ 34803 test "$includedir" != "/usr/include" && \ 34804 test -d "$includedir" && { 34805 @@ -3376,6 +3472,7 @@ 34806 test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root" 34807 } 34808 34809 +cf_search="$cf_header_path_list $cf_search" 34810 34811 test -n "$verbose" && echo search path $cf_search 34812 cf_save2_CPPFLAGS="$CPPFLAGS" 34813 @@ -3400,20 +3497,20 @@ 34814 fi 34815 34816 if test "$cf_have_incdir" = no ; then 34817 - if test "$cf_add_incdir" = /usr/local/include ; then 34818 + if test "$cf_add_incdir" = /usr/local/include ; then 34819 if test "$GCC" = yes 34820 then 34821 cf_save_CPPFLAGS=$CPPFLAGS 34822 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 34823 cat > conftest.$ac_ext <<EOF 34824 -#line 3410 "configure" 34825 +#line 3507 "configure" 34826 #include "confdefs.h" 34827 #include <stdio.h> 34828 int main() { 34829 printf("Hello") 34830 ; return 0; } 34831 EOF 34832 -if { (eval echo configure:3417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34833 +if { (eval echo configure:3514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34834 : 34835 else 34836 echo "configure: failed program was:" >&5 34837 @@ -3430,14 +3527,14 @@ 34838 if test "$cf_have_incdir" = no ; then 34839 test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 34840 34841 -echo "${as_me-configure}:3434: testing adding $cf_add_incdir to include-path ..." 1>&5 34842 +echo "${as_me-configure}:3531: testing adding $cf_add_incdir to include-path ..." 1>&5 34843 34844 34845 - CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" 34846 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 34847 34848 - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 34849 - test "$cf_top_incdir" = "$cf_add_incdir" && break 34850 - cf_add_incdir="$cf_top_incdir" 34851 + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 34852 + test "$cf_top_incdir" = "$cf_add_incdir" && break 34853 + cf_add_incdir="$cf_top_incdir" 34854 else 34855 break 34856 fi 34857 @@ -3452,7 +3549,7 @@ 34858 do 34859 34860 cat > conftest.$ac_ext <<EOF 34861 -#line 3456 "configure" 34862 +#line 3553 "configure" 34863 #include "confdefs.h" 34864 34865 34866 @@ -3473,7 +3570,7 @@ 34867 34868 ; return 0; } 34869 EOF 34870 -if { (eval echo configure:3477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34871 +if { (eval echo configure:3574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34872 rm -rf conftest* 34873 cf_cv_ncurses_h2=$cf_header 34874 34875 @@ -3525,20 +3622,20 @@ 34876 fi 34877 34878 if test "$cf_have_incdir" = no ; then 34879 - if test "$cf_add_incdir" = /usr/local/include ; then 34880 + if test "$cf_add_incdir" = /usr/local/include ; then 34881 if test "$GCC" = yes 34882 then 34883 cf_save_CPPFLAGS=$CPPFLAGS 34884 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 34885 cat > conftest.$ac_ext <<EOF 34886 -#line 3535 "configure" 34887 +#line 3632 "configure" 34888 #include "confdefs.h" 34889 #include <stdio.h> 34890 int main() { 34891 printf("Hello") 34892 ; return 0; } 34893 EOF 34894 -if { (eval echo configure:3542: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34895 +if { (eval echo configure:3639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34896 : 34897 else 34898 echo "configure: failed program was:" >&5 34899 @@ -3555,14 +3652,14 @@ 34900 if test "$cf_have_incdir" = no ; then 34901 test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 34902 34903 -echo "${as_me-configure}:3559: testing adding $cf_add_incdir to include-path ..." 1>&5 34904 +echo "${as_me-configure}:3656: testing adding $cf_add_incdir to include-path ..." 1>&5 34905 34906 34907 - CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" 34908 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 34909 34910 - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 34911 - test "$cf_top_incdir" = "$cf_add_incdir" && break 34912 - cf_add_incdir="$cf_top_incdir" 34913 + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 34914 + test "$cf_top_incdir" = "$cf_add_incdir" && break 34915 + cf_add_incdir="$cf_top_incdir" 34916 else 34917 break 34918 fi 34919 @@ -3603,7 +3700,7 @@ 34920 34921 34922 echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 34923 -echo "configure:3607: checking for terminfo header" >&5 34924 +echo "configure:3704: checking for terminfo header" >&5 34925 if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then 34926 echo $ac_n "(cached) $ac_c" 1>&6 34927 else 34928 @@ -3620,7 +3717,7 @@ 34929 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" 34930 do 34931 cat > conftest.$ac_ext <<EOF 34932 -#line 3624 "configure" 34933 +#line 3721 "configure" 34934 #include "confdefs.h" 34935 #include <stdio.h> 34936 #include <${cf_cv_ncurses_header-curses.h}> 34937 @@ -3630,7 +3727,7 @@ 34938 int x = auto_left_margin 34939 ; return 0; } 34940 EOF 34941 -if { (eval echo configure:3634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34942 +if { (eval echo configure:3731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34943 rm -rf conftest* 34944 34945 cf_cv_term_header="$cf_test" 34946 @@ -3685,7 +3782,7 @@ 34947 34948 34949 echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 34950 -echo "configure:3689: checking for ncurses version" >&5 34951 +echo "configure:3786: checking for ncurses version" >&5 34952 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then 34953 echo $ac_n "(cached) $ac_c" 1>&6 34954 else 34955 @@ -3711,7 +3808,7 @@ 34956 #endif 34957 EOF 34958 cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" 34959 - { (eval echo configure:3715: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } 34960 + { (eval echo configure:3812: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } 34961 if test -f conftest.out ; then 34962 cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` 34963 test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" 34964 @@ -3720,7 +3817,7 @@ 34965 34966 else 34967 cat > conftest.$ac_ext <<EOF 34968 -#line 3724 "configure" 34969 +#line 3821 "configure" 34970 #include "confdefs.h" 34971 34972 #include <${cf_cv_ncurses_header-curses.h}> 34973 @@ -3744,7 +3841,7 @@ 34974 ${cf_cv_main_return-return}(0); 34975 } 34976 EOF 34977 -if { (eval echo configure:3748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 34978 +if { (eval echo configure:3845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 34979 then 34980 34981 cf_cv_ncurses_version=`cat $cf_tempfile` 34982 @@ -3766,7 +3863,7 @@ 34983 34984 34985 34986 - 34987 + 34988 34989 cf_nculib_root=ncurses 34990 # This works, except for the special case where we find gpm, but 34991 @@ -3775,7 +3872,7 @@ 34992 cf_ncurses_LIBS="" 34993 cf_ncurses_SAVE="$LIBS" 34994 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 34995 -echo "configure:3779: checking for Gpm_Open in -lgpm" >&5 34996 +echo "configure:3876: checking for Gpm_Open in -lgpm" >&5 34997 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` 34998 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 34999 echo $ac_n "(cached) $ac_c" 1>&6 35000 @@ -3783,7 +3880,7 @@ 35001 ac_save_LIBS="$LIBS" 35002 LIBS="-lgpm $LIBS" 35003 cat > conftest.$ac_ext <<EOF 35004 -#line 3787 "configure" 35005 +#line 3884 "configure" 35006 #include "confdefs.h" 35007 /* Override any gcc2 internal prototype to avoid an error. */ 35008 /* We use char because int might match the return type of a gcc2 35009 @@ -3794,7 +3891,7 @@ 35010 Gpm_Open() 35011 ; return 0; } 35012 EOF 35013 -if { (eval echo configure:3798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35014 +if { (eval echo configure:3895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35015 rm -rf conftest* 35016 eval "ac_cv_lib_$ac_lib_var=yes" 35017 else 35018 @@ -3810,7 +3907,7 @@ 35019 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 35020 echo "$ac_t""yes" 1>&6 35021 echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6 35022 -echo "configure:3814: checking for initscr in -lgpm" >&5 35023 +echo "configure:3911: checking for initscr in -lgpm" >&5 35024 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'` 35025 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 35026 echo $ac_n "(cached) $ac_c" 1>&6 35027 @@ -3818,7 +3915,7 @@ 35028 ac_save_LIBS="$LIBS" 35029 LIBS="-lgpm $LIBS" 35030 cat > conftest.$ac_ext <<EOF 35031 -#line 3822 "configure" 35032 +#line 3919 "configure" 35033 #include "confdefs.h" 35034 /* Override any gcc2 internal prototype to avoid an error. */ 35035 /* We use char because int might match the return type of a gcc2 35036 @@ -3829,7 +3926,7 @@ 35037 initscr() 35038 ; return 0; } 35039 EOF 35040 -if { (eval echo configure:3833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35041 +if { (eval echo configure:3930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35042 rm -rf conftest* 35043 eval "ac_cv_lib_$ac_lib_var=yes" 35044 else 35045 @@ -3861,7 +3958,7 @@ 35046 # version of ncurses (but it should do no harm, since it's static). 35047 if test "$cf_nculib_root" = ncurses ; then 35048 echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 35049 -echo "configure:3865: checking for tgoto in -lmytinfo" >&5 35050 +echo "configure:3962: checking for tgoto in -lmytinfo" >&5 35051 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` 35052 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 35053 echo $ac_n "(cached) $ac_c" 1>&6 35054 @@ -3869,7 +3966,7 @@ 35055 ac_save_LIBS="$LIBS" 35056 LIBS="-lmytinfo $LIBS" 35057 cat > conftest.$ac_ext <<EOF 35058 -#line 3873 "configure" 35059 +#line 3970 "configure" 35060 #include "confdefs.h" 35061 /* Override any gcc2 internal prototype to avoid an error. */ 35062 /* We use char because int might match the return type of a gcc2 35063 @@ -3880,7 +3977,7 @@ 35064 tgoto() 35065 ; return 0; } 35066 EOF 35067 -if { (eval echo configure:3884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35068 +if { (eval echo configure:3981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35069 rm -rf conftest* 35070 eval "ac_cv_lib_$ac_lib_var=yes" 35071 else 35072 @@ -3928,7 +4025,7 @@ 35073 if test "$cf_have_libdir" = no ; then 35074 test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 35075 35076 -echo "${as_me-configure}:3932: testing adding $cf_add_libdir to library-path ..." 1>&5 35077 +echo "${as_me-configure}:4029: testing adding $cf_add_libdir to library-path ..." 1>&5 35078 35079 35080 LDFLAGS="-L$cf_add_libdir $LDFLAGS" 35081 @@ -3943,12 +4040,12 @@ 35082 eval 'cf_cv_have_lib_'$cf_nculib_root'=no' 35083 cf_libdir="" 35084 echo $ac_n "checking for initscr""... $ac_c" 1>&6 35085 -echo "configure:3947: checking for initscr" >&5 35086 +echo "configure:4044: checking for initscr" >&5 35087 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then 35088 echo $ac_n "(cached) $ac_c" 1>&6 35089 else 35090 cat > conftest.$ac_ext <<EOF 35091 -#line 3952 "configure" 35092 +#line 4049 "configure" 35093 #include "confdefs.h" 35094 /* System header to define __stub macros and hopefully few prototypes, 35095 which can conflict with char initscr(); below. */ 35096 @@ -3971,7 +4068,7 @@ 35097 35098 ; return 0; } 35099 EOF 35100 -if { (eval echo configure:3975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35101 +if { (eval echo configure:4072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35102 rm -rf conftest* 35103 eval "ac_cv_func_initscr=yes" 35104 else 35105 @@ -3991,17 +4088,17 @@ 35106 35107 cf_save_LIBS="$LIBS" 35108 echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 35109 -echo "configure:3995: checking for initscr in -l$cf_nculib_root" >&5 35110 +echo "configure:4092: checking for initscr in -l$cf_nculib_root" >&5 35111 LIBS="-l$cf_nculib_root $LIBS" 35112 cat > conftest.$ac_ext <<EOF 35113 -#line 3998 "configure" 35114 +#line 4095 "configure" 35115 #include "confdefs.h" 35116 #include <${cf_cv_ncurses_header-curses.h}> 35117 int main() { 35118 initscr() 35119 ; return 0; } 35120 EOF 35121 -if { (eval echo configure:4005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35122 +if { (eval echo configure:4102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35123 rm -rf conftest* 35124 echo "$ac_t""yes" 1>&6 35125 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' 35126 @@ -4011,7 +4108,33 @@ 35127 cat conftest.$ac_ext >&5 35128 rm -rf conftest* 35129 echo "$ac_t""no" 1>&6 35130 - cf_search="" 35131 + 35132 +cf_library_path_list="" 35133 +if test -n "${LDFLAGS}${LIBS}" ; then 35134 + for cf_library_path in $LDFLAGS $LIBS 35135 + do 35136 + case $cf_library_path in #(vi 35137 + -L*) 35138 + cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` 35139 + 35140 +test "$cf_library_path" != "NONE" && \ 35141 +test -d "$cf_library_path" && \ 35142 + { 35143 + test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" 35144 + test -d $cf_library_path/lib && cf_search="$cf_search $cf_library_path/lib" 35145 + test -d $cf_library_path/lib/$cf_nculib_root && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root" 35146 + test -d $cf_library_path/lib/$cf_nculib_root/lib && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib" 35147 + test -d $cf_library_path/$cf_nculib_root/lib && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib" 35148 + test -d $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root" 35149 +} 35150 + 35151 + cf_library_path_list="$cf_library_path_list $cf_search" 35152 + ;; 35153 + esac 35154 + done 35155 +fi 35156 + 35157 +cf_search="" 35158 35159 35160 test "/usr" != "$prefix" && \ 35161 @@ -4074,20 +4197,23 @@ 35162 } 35163 35164 35165 + 35166 +cf_search="$cf_library_path_list $cf_search" 35167 + 35168 for cf_libdir in $cf_search 35169 do 35170 echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6 35171 -echo "configure:4081: checking for -l$cf_nculib_root in $cf_libdir" >&5 35172 +echo "configure:4207: checking for -l$cf_nculib_root in $cf_libdir" >&5 35173 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" 35174 cat > conftest.$ac_ext <<EOF 35175 -#line 4084 "configure" 35176 +#line 4210 "configure" 35177 #include "confdefs.h" 35178 #include <${cf_cv_ncurses_header-curses.h}> 35179 int main() { 35180 initscr() 35181 ; return 0; } 35182 EOF 35183 -if { (eval echo configure:4091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35184 +if { (eval echo configure:4217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35185 rm -rf conftest* 35186 echo "$ac_t""yes" 1>&6 35187 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' 35188 @@ -4118,7 +4244,7 @@ 35189 35190 if test -n "$cf_ncurses_LIBS" ; then 35191 echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6 35192 -echo "configure:4122: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 35193 +echo "configure:4248: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 35194 cf_ncurses_SAVE="$LIBS" 35195 for p in $cf_ncurses_LIBS ; do 35196 q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` 35197 @@ -4127,14 +4253,14 @@ 35198 fi 35199 done 35200 cat > conftest.$ac_ext <<EOF 35201 -#line 4131 "configure" 35202 +#line 4257 "configure" 35203 #include "confdefs.h" 35204 #include <${cf_cv_ncurses_header-curses.h}> 35205 int main() { 35206 initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); 35207 ; return 0; } 35208 EOF 35209 -if { (eval echo configure:4138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35210 +if { (eval echo configure:4264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35211 rm -rf conftest* 35212 echo "$ac_t""yes" 1>&6 35213 else 35214 @@ -4155,19 +4281,22 @@ 35215 EOF 35216 35217 35218 + 35219 +fi 35220 + 35221 ;; 35222 ncursesw) 35223 cf_cv_libtype=w 35224 35225 echo $ac_n "checking for multibyte character support""... $ac_c" 1>&6 35226 -echo "configure:4164: checking for multibyte character support" >&5 35227 +echo "configure:4293: checking for multibyte character support" >&5 35228 if eval "test \"`echo '$''{'cf_cv_utf8_lib'+set}'`\" = set"; then 35229 echo $ac_n "(cached) $ac_c" 1>&6 35230 else 35231 35232 cf_save_LIBS="$LIBS" 35233 cat > conftest.$ac_ext <<EOF 35234 -#line 4171 "configure" 35235 +#line 4300 "configure" 35236 #include "confdefs.h" 35237 35238 #include <stdlib.h> 35239 @@ -4175,16 +4304,26 @@ 35240 putwc(0,0); 35241 ; return 0; } 35242 EOF 35243 -if { (eval echo configure:4179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35244 +if { (eval echo configure:4308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35245 rm -rf conftest* 35246 cf_cv_utf8_lib=yes 35247 else 35248 echo "configure: failed program was:" >&5 35249 cat conftest.$ac_ext >&5 35250 rm -rf conftest* 35251 - LIBS="-lutf8 $LIBS" 35252 - cat > conftest.$ac_ext <<EOF 35253 -#line 4188 "configure" 35254 + 35255 + 35256 +# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these 35257 +# will be set on completion of the AC_TRY_LINK below. 35258 +cf_cv_header_path_utf8= 35259 +cf_cv_library_path_utf8= 35260 + 35261 + 35262 +echo "${as_me-configure}:4323: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 35263 + 35264 + 35265 +cat > conftest.$ac_ext <<EOF 35266 +#line 4327 "configure" 35267 #include "confdefs.h" 35268 35269 #include <libutf8.h> 35270 @@ -4192,17 +4331,341 @@ 35271 putwc(0,0); 35272 ; return 0; } 35273 EOF 35274 -if { (eval echo configure:4196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35275 +if { (eval echo configure:4335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35276 rm -rf conftest* 35277 - cf_cv_utf8_lib=add-on 35278 + cf_cv_find_linkage_utf8=yes 35279 else 35280 echo "configure: failed program was:" >&5 35281 cat conftest.$ac_ext >&5 35282 rm -rf conftest* 35283 - cf_cv_utf8_lib=no 35284 + 35285 + cf_cv_find_linkage_utf8=no 35286 + 35287 + test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 35288 + 35289 +echo "${as_me-configure}:4347: testing find linkage for utf8 library ..." 1>&5 35290 + 35291 + 35292 + 35293 +echo "${as_me-configure}:4351: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 35294 + 35295 + 35296 + cf_save_CPPFLAGS="$CPPFLAGS" 35297 + cf_test_CPPFLAGS="$CPPFLAGS" 35298 + 35299 + 35300 +cf_header_path_list="" 35301 +if test -n "${CFLAGS}${CPPFLAGS}" ; then 35302 + for cf_header_path in $CPPFLAGS $CFLAGS 35303 + do 35304 + case $cf_header_path in #(vi 35305 + -I*) 35306 + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` 35307 + 35308 +test "$cf_header_path" != "NONE" && \ 35309 +test -d "$cf_header_path" && \ 35310 + { 35311 + test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" 35312 + test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" 35313 + test -d $cf_header_path/include/utf8 && cf_search="$cf_search $cf_header_path/include/utf8" 35314 + test -d $cf_header_path/include/utf8/include && cf_search="$cf_search $cf_header_path/include/utf8/include" 35315 + test -d $cf_header_path/utf8/include && cf_search="$cf_search $cf_header_path/utf8/include" 35316 + test -d $cf_header_path/utf8/include/utf8 && cf_search="$cf_search $cf_header_path/utf8/include/utf8" 35317 +} 35318 + 35319 + cf_header_path_list="$cf_header_path_list $cf_search" 35320 + ;; 35321 + esac 35322 + done 35323 +fi 35324 + 35325 +cf_search="" 35326 + 35327 + 35328 +test "/usr" != "$prefix" && \ 35329 +test -d "/usr" && \ 35330 +(test $prefix = NONE || test -d $prefix) && { 35331 + test -n "$verbose" && echo " ... testing for include-directories under /usr" 35332 + test -d /usr/include && cf_search="$cf_search /usr/include" 35333 + test -d /usr/include/utf8 && cf_search="$cf_search /usr/include/utf8" 35334 + test -d /usr/include/utf8/include && cf_search="$cf_search /usr/include/utf8/include" 35335 + test -d /usr/utf8/include && cf_search="$cf_search /usr/utf8/include" 35336 + test -d /usr/utf8/include/utf8 && cf_search="$cf_search /usr/utf8/include/utf8" 35337 +} 35338 + 35339 + 35340 +test "$prefix" != "NONE" && \ 35341 +test -d "$prefix" && \ 35342 + { 35343 + test -n "$verbose" && echo " ... testing for include-directories under $prefix" 35344 + test -d $prefix/include && cf_search="$cf_search $prefix/include" 35345 + test -d $prefix/include/utf8 && cf_search="$cf_search $prefix/include/utf8" 35346 + test -d $prefix/include/utf8/include && cf_search="$cf_search $prefix/include/utf8/include" 35347 + test -d $prefix/utf8/include && cf_search="$cf_search $prefix/utf8/include" 35348 + test -d $prefix/utf8/include/utf8 && cf_search="$cf_search $prefix/utf8/include/utf8" 35349 +} 35350 + 35351 + 35352 +test "/usr/local" != "$prefix" && \ 35353 +test -d "/usr/local" && \ 35354 +(test $prefix = NONE || test -d $prefix) && { 35355 + test -n "$verbose" && echo " ... testing for include-directories under /usr/local" 35356 + test -d /usr/local/include && cf_search="$cf_search /usr/local/include" 35357 + test -d /usr/local/include/utf8 && cf_search="$cf_search /usr/local/include/utf8" 35358 + test -d /usr/local/include/utf8/include && cf_search="$cf_search /usr/local/include/utf8/include" 35359 + test -d /usr/local/utf8/include && cf_search="$cf_search /usr/local/utf8/include" 35360 + test -d /usr/local/utf8/include/utf8 && cf_search="$cf_search /usr/local/utf8/include/utf8" 35361 +} 35362 + 35363 + 35364 +test "/opt" != "$prefix" && \ 35365 +test -d "/opt" && \ 35366 +(test $prefix = NONE || test -d $prefix) && { 35367 + test -n "$verbose" && echo " ... testing for include-directories under /opt" 35368 + test -d /opt/include && cf_search="$cf_search /opt/include" 35369 + test -d /opt/include/utf8 && cf_search="$cf_search /opt/include/utf8" 35370 + test -d /opt/include/utf8/include && cf_search="$cf_search /opt/include/utf8/include" 35371 + test -d /opt/utf8/include && cf_search="$cf_search /opt/utf8/include" 35372 + test -d /opt/utf8/include/utf8 && cf_search="$cf_search /opt/utf8/include/utf8" 35373 +} 35374 + 35375 + 35376 +test "$HOME" != "$prefix" && \ 35377 +test -d "$HOME" && \ 35378 +(test $prefix = NONE || test -d $prefix) && { 35379 + test -n "$verbose" && echo " ... testing for include-directories under $HOME" 35380 + test -d $HOME/include && cf_search="$cf_search $HOME/include" 35381 + test -d $HOME/include/utf8 && cf_search="$cf_search $HOME/include/utf8" 35382 + test -d $HOME/include/utf8/include && cf_search="$cf_search $HOME/include/utf8/include" 35383 + test -d $HOME/utf8/include && cf_search="$cf_search $HOME/utf8/include" 35384 + test -d $HOME/utf8/include/utf8 && cf_search="$cf_search $HOME/utf8/include/utf8" 35385 +} 35386 + 35387 + 35388 + 35389 +test "$includedir" != NONE && \ 35390 +test "$includedir" != "/usr/include" && \ 35391 +test -d "$includedir" && { 35392 + test -d $includedir && cf_search="$cf_search $includedir" 35393 + test -d $includedir/utf8 && cf_search="$cf_search $includedir/utf8" 35394 +} 35395 + 35396 +test "$oldincludedir" != NONE && \ 35397 +test "$oldincludedir" != "/usr/include" && \ 35398 +test -d "$oldincludedir" && { 35399 + test -d $oldincludedir && cf_search="$cf_search $oldincludedir" 35400 + test -d $oldincludedir/utf8 && cf_search="$cf_search $oldincludedir/utf8" 35401 +} 35402 + 35403 +cf_search="$cf_header_path_list $cf_search" 35404 + 35405 + for cf_cv_header_path_utf8 in $cf_search 35406 + do 35407 + if test -d $cf_cv_header_path_utf8 ; then 35408 + test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 35409 + 35410 +echo "${as_me-configure}:4468: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 35411 + 35412 + 35413 + CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8" 35414 + cat > conftest.$ac_ext <<EOF 35415 +#line 4473 "configure" 35416 +#include "confdefs.h" 35417 + 35418 +#include <libutf8.h> 35419 +int main() { 35420 +putwc(0,0); 35421 +; return 0; } 35422 +EOF 35423 +if { (eval echo configure:4481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 35424 + rm -rf conftest* 35425 + 35426 + test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 35427 + 35428 +echo "${as_me-configure}:4486: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 35429 + 35430 + 35431 + cf_cv_find_linkage_utf8=maybe 35432 + cf_test_CPPFLAGS="$CPPFLAGS" 35433 + break 35434 +else 35435 + echo "configure: failed program was:" >&5 35436 + cat conftest.$ac_ext >&5 35437 + rm -rf conftest* 35438 + 35439 + CPPFLAGS="$cf_save_CPPFLAGS" 35440 + 35441 fi 35442 rm -f conftest* 35443 - LIBS="$cf_save_LIBS" 35444 + fi 35445 + done 35446 + 35447 + if test "$cf_cv_find_linkage_utf8" = maybe ; then 35448 + 35449 + 35450 +echo "${as_me-configure}:4507: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 35451 + 35452 + 35453 + cf_save_LIBS="$LIBS" 35454 + cf_save_LDFLAGS="$LDFLAGS" 35455 + 35456 + 35457 + 35458 + if test "$cf_cv_find_linkage_utf8" != yes ; then 35459 + 35460 +cf_library_path_list="" 35461 +if test -n "${LDFLAGS}${LIBS}" ; then 35462 + for cf_library_path in $LDFLAGS $LIBS 35463 + do 35464 + case $cf_library_path in #(vi 35465 + -L*) 35466 + cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` 35467 + 35468 +test "$cf_library_path" != "NONE" && \ 35469 +test -d "$cf_library_path" && \ 35470 + { 35471 + test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" 35472 + test -d $cf_library_path/lib && cf_search="$cf_search $cf_library_path/lib" 35473 + test -d $cf_library_path/lib/utf8 && cf_search="$cf_search $cf_library_path/lib/utf8" 35474 + test -d $cf_library_path/lib/utf8/lib && cf_search="$cf_search $cf_library_path/lib/utf8/lib" 35475 + test -d $cf_library_path/utf8/lib && cf_search="$cf_search $cf_library_path/utf8/lib" 35476 + test -d $cf_library_path/utf8/lib/utf8 && cf_search="$cf_search $cf_library_path/utf8/lib/utf8" 35477 +} 35478 + 35479 + cf_library_path_list="$cf_library_path_list $cf_search" 35480 + ;; 35481 + esac 35482 + done 35483 +fi 35484 + 35485 +cf_search="" 35486 + 35487 + 35488 +test "/usr" != "$prefix" && \ 35489 +test -d "/usr" && \ 35490 +(test $prefix = NONE || test -d $prefix) && { 35491 + test -n "$verbose" && echo " ... testing for lib-directories under /usr" 35492 + test -d /usr/lib && cf_search="$cf_search /usr/lib" 35493 + test -d /usr/lib/utf8 && cf_search="$cf_search /usr/lib/utf8" 35494 + test -d /usr/lib/utf8/lib && cf_search="$cf_search /usr/lib/utf8/lib" 35495 + test -d /usr/utf8/lib && cf_search="$cf_search /usr/utf8/lib" 35496 + test -d /usr/utf8/lib/utf8 && cf_search="$cf_search /usr/utf8/lib/utf8" 35497 +} 35498 + 35499 + 35500 +test "$prefix" != "NONE" && \ 35501 +test -d "$prefix" && \ 35502 + { 35503 + test -n "$verbose" && echo " ... testing for lib-directories under $prefix" 35504 + test -d $prefix/lib && cf_search="$cf_search $prefix/lib" 35505 + test -d $prefix/lib/utf8 && cf_search="$cf_search $prefix/lib/utf8" 35506 + test -d $prefix/lib/utf8/lib && cf_search="$cf_search $prefix/lib/utf8/lib" 35507 + test -d $prefix/utf8/lib && cf_search="$cf_search $prefix/utf8/lib" 35508 + test -d $prefix/utf8/lib/utf8 && cf_search="$cf_search $prefix/utf8/lib/utf8" 35509 +} 35510 + 35511 + 35512 +test "/usr/local" != "$prefix" && \ 35513 +test -d "/usr/local" && \ 35514 +(test $prefix = NONE || test -d $prefix) && { 35515 + test -n "$verbose" && echo " ... testing for lib-directories under /usr/local" 35516 + test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib" 35517 + test -d /usr/local/lib/utf8 && cf_search="$cf_search /usr/local/lib/utf8" 35518 + test -d /usr/local/lib/utf8/lib && cf_search="$cf_search /usr/local/lib/utf8/lib" 35519 + test -d /usr/local/utf8/lib && cf_search="$cf_search /usr/local/utf8/lib" 35520 + test -d /usr/local/utf8/lib/utf8 && cf_search="$cf_search /usr/local/utf8/lib/utf8" 35521 +} 35522 + 35523 + 35524 +test "/opt" != "$prefix" && \ 35525 +test -d "/opt" && \ 35526 +(test $prefix = NONE || test -d $prefix) && { 35527 + test -n "$verbose" && echo " ... testing for lib-directories under /opt" 35528 + test -d /opt/lib && cf_search="$cf_search /opt/lib" 35529 + test -d /opt/lib/utf8 && cf_search="$cf_search /opt/lib/utf8" 35530 + test -d /opt/lib/utf8/lib && cf_search="$cf_search /opt/lib/utf8/lib" 35531 + test -d /opt/utf8/lib && cf_search="$cf_search /opt/utf8/lib" 35532 + test -d /opt/utf8/lib/utf8 && cf_search="$cf_search /opt/utf8/lib/utf8" 35533 +} 35534 + 35535 + 35536 +test "$HOME" != "$prefix" && \ 35537 +test -d "$HOME" && \ 35538 +(test $prefix = NONE || test -d $prefix) && { 35539 + test -n "$verbose" && echo " ... testing for lib-directories under $HOME" 35540 + test -d $HOME/lib && cf_search="$cf_search $HOME/lib" 35541 + test -d $HOME/lib/utf8 && cf_search="$cf_search $HOME/lib/utf8" 35542 + test -d $HOME/lib/utf8/lib && cf_search="$cf_search $HOME/lib/utf8/lib" 35543 + test -d $HOME/utf8/lib && cf_search="$cf_search $HOME/utf8/lib" 35544 + test -d $HOME/utf8/lib/utf8 && cf_search="$cf_search $HOME/utf8/lib/utf8" 35545 +} 35546 + 35547 + 35548 + 35549 +cf_search="$cf_library_path_list $cf_search" 35550 + 35551 + for cf_cv_library_path_utf8 in $cf_search 35552 + do 35553 + if test -d $cf_cv_library_path_utf8 ; then 35554 + test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 35555 + 35556 +echo "${as_me-configure}:4613: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 35557 + 35558 + 35559 + CPPFLAGS="$cf_test_CPPFLAGS" 35560 + LIBS="-lutf8 $cf_save_LIBS" 35561 + LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8" 35562 + cat > conftest.$ac_ext <<EOF 35563 +#line 4620 "configure" 35564 +#include "confdefs.h" 35565 + 35566 +#include <libutf8.h> 35567 +int main() { 35568 +putwc(0,0); 35569 +; return 0; } 35570 +EOF 35571 +if { (eval echo configure:4628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35572 + rm -rf conftest* 35573 + 35574 + test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 35575 + 35576 +echo "${as_me-configure}:4633: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 35577 + 35578 + 35579 + cf_cv_find_linkage_utf8=yes 35580 + cf_cv_library_file_utf8="-lutf8" 35581 + break 35582 +else 35583 + echo "configure: failed program was:" >&5 35584 + cat conftest.$ac_ext >&5 35585 + rm -rf conftest* 35586 + 35587 + CPPFLAGS="$cf_save_CPPFLAGS" 35588 + LIBS="$cf_save_LIBS" 35589 + LDFLAGS="$cf_save_LDFLAGS" 35590 + 35591 +fi 35592 +rm -f conftest* 35593 + fi 35594 + done 35595 + LIBS="$cf_save_LIBS" 35596 + CPPFLAGS="$cf_save_CPPFLAGS" 35597 + LDFLAGS="$cf_save_LDFLAGS" 35598 + fi 35599 + 35600 + else 35601 + cf_cv_find_linkage_utf8=no 35602 + fi 35603 + 35604 +fi 35605 +rm -f conftest* 35606 + 35607 +if test "$cf_cv_find_linkage_utf8" = yes ; then 35608 +cf_cv_utf8_lib=add-on 35609 +else 35610 +cf_cv_utf8_lib=no 35611 +fi 35612 + 35613 35614 fi 35615 rm -f conftest* 35616 @@ -4217,10 +4680,174 @@ 35617 #define HAVE_LIBUTF8_H 1 35618 EOF 35619 35620 + 35621 +if test -n "$cf_cv_header_path_utf8" ; then 35622 + for cf_add_incdir in $cf_cv_header_path_utf8 35623 + do 35624 + while test $cf_add_incdir != /usr/include 35625 + do 35626 + if test -d $cf_add_incdir 35627 + then 35628 + cf_have_incdir=no 35629 + if test -n "$CFLAGS$CPPFLAGS" ; then 35630 + # a loop is needed to ensure we can add subdirs of existing dirs 35631 + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do 35632 + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then 35633 + cf_have_incdir=yes; break 35634 + fi 35635 + done 35636 + fi 35637 + 35638 + if test "$cf_have_incdir" = no ; then 35639 + if test "$cf_add_incdir" = /usr/local/include ; then 35640 + if test "$GCC" = yes 35641 + then 35642 + cf_save_CPPFLAGS=$CPPFLAGS 35643 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 35644 + cat > conftest.$ac_ext <<EOF 35645 +#line 4709 "configure" 35646 +#include "confdefs.h" 35647 +#include <stdio.h> 35648 +int main() { 35649 +printf("Hello") 35650 +; return 0; } 35651 +EOF 35652 +if { (eval echo configure:4716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 35653 + : 35654 +else 35655 + echo "configure: failed program was:" >&5 35656 + cat conftest.$ac_ext >&5 35657 + rm -rf conftest* 35658 + cf_have_incdir=yes 35659 +fi 35660 +rm -f conftest* 35661 + CPPFLAGS=$cf_save_CPPFLAGS 35662 + fi 35663 + fi 35664 + fi 35665 + 35666 + if test "$cf_have_incdir" = no ; then 35667 + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 35668 + 35669 +echo "${as_me-configure}:4733: testing adding $cf_add_incdir to include-path ..." 1>&5 35670 + 35671 + 35672 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 35673 + 35674 + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 35675 + test "$cf_top_incdir" = "$cf_add_incdir" && break 35676 + cf_add_incdir="$cf_top_incdir" 35677 + else 35678 + break 35679 + fi 35680 + fi 35681 + done 35682 + done 35683 +fi 35684 + 35685 + 35686 +if test -n "$cf_cv_library_path_utf8" ; then 35687 + for cf_add_libdir in $cf_cv_library_path_utf8 35688 + do 35689 + if test $cf_add_libdir = /usr/lib ; then 35690 + : 35691 + elif test -d $cf_add_libdir 35692 + then 35693 + cf_have_libdir=no 35694 + if test -n "$LDFLAGS$LIBS" ; then 35695 + # a loop is needed to ensure we can add subdirs of existing dirs 35696 + for cf_test_libdir in $LDFLAGS $LIBS ; do 35697 + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then 35698 + cf_have_libdir=yes; break 35699 + fi 35700 + done 35701 + fi 35702 + if test "$cf_have_libdir" = no ; then 35703 + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 35704 + 35705 +echo "${as_me-configure}:4769: testing adding $cf_add_libdir to library-path ..." 1>&5 35706 + 35707 + 35708 + LDFLAGS="-L$cf_add_libdir $LDFLAGS" 35709 + fi 35710 + fi 35711 + done 35712 +fi 35713 + 35714 LIBS="-lutf8 $LIBS" 35715 fi 35716 35717 35718 +cf_ncuconfig_root=ncursesw 35719 + 35720 +echo "Looking for ${cf_ncuconfig_root}-config" 35721 +for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config 35722 +do 35723 +# Extract the first word of "$ac_prog", so it can be a program name with args. 35724 +set dummy $ac_prog; ac_word=$2 35725 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 35726 +echo "configure:4790: checking for $ac_word" >&5 35727 +if eval "test \"`echo '$''{'ac_cv_path_NCURSES_CONFIG'+set}'`\" = set"; then 35728 + echo $ac_n "(cached) $ac_c" 1>&6 35729 +else 35730 + case "$NCURSES_CONFIG" in 35731 + /*) 35732 + ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a path. 35733 + ;; 35734 + ?:/*) 35735 + ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a dos path. 35736 + ;; 35737 + *) 35738 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 35739 + ac_dummy="$PATH" 35740 + for ac_dir in $ac_dummy; do 35741 + test -z "$ac_dir" && ac_dir=. 35742 + if test -f $ac_dir/$ac_word; then 35743 + ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word" 35744 + break 35745 + fi 35746 + done 35747 + IFS="$ac_save_ifs" 35748 + ;; 35749 +esac 35750 +fi 35751 +NCURSES_CONFIG="$ac_cv_path_NCURSES_CONFIG" 35752 +if test -n "$NCURSES_CONFIG"; then 35753 + echo "$ac_t""$NCURSES_CONFIG" 1>&6 35754 +else 35755 + echo "$ac_t""no" 1>&6 35756 +fi 35757 + 35758 +test -n "$NCURSES_CONFIG" && break 35759 +done 35760 +test -n "$NCURSES_CONFIG" || NCURSES_CONFIG="none" 35761 + 35762 + 35763 +if test "$NCURSES_CONFIG" != none ; then 35764 + 35765 +cf_cv_ncurses_header=curses.h 35766 + 35767 +CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" 35768 +LIBS="`$NCURSES_CONFIG --libs` $LIBS" 35769 + 35770 +cat >> confdefs.h <<\EOF 35771 +#define NCURSES 1 35772 +EOF 35773 + 35774 + 35775 + 35776 +cf_nculib_ROOT=`echo "HAVE_LIB$cf_ncuconfig_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 35777 + 35778 +cat >> confdefs.h <<EOF 35779 +#define $cf_nculib_ROOT 1 35780 +EOF 35781 + 35782 + 35783 +cf_cv_ncurses_version=`$NCURSES_CONFIG --version` 35784 + 35785 +else 35786 + 35787 + 35788 35789 cf_ncuhdr_root=ncursesw 35790 35791 @@ -4245,20 +4872,20 @@ 35792 fi 35793 35794 if test "$cf_have_incdir" = no ; then 35795 - if test "$cf_add_incdir" = /usr/local/include ; then 35796 + if test "$cf_add_incdir" = /usr/local/include ; then 35797 if test "$GCC" = yes 35798 then 35799 cf_save_CPPFLAGS=$CPPFLAGS 35800 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 35801 cat > conftest.$ac_ext <<EOF 35802 -#line 4255 "configure" 35803 +#line 4882 "configure" 35804 #include "confdefs.h" 35805 #include <stdio.h> 35806 int main() { 35807 printf("Hello") 35808 ; return 0; } 35809 EOF 35810 -if { (eval echo configure:4262: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 35811 +if { (eval echo configure:4889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 35812 : 35813 else 35814 echo "configure: failed program was:" >&5 35815 @@ -4275,14 +4902,14 @@ 35816 if test "$cf_have_incdir" = no ; then 35817 test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 35818 35819 -echo "${as_me-configure}:4279: testing adding $cf_add_incdir to include-path ..." 1>&5 35820 +echo "${as_me-configure}:4906: testing adding $cf_add_incdir to include-path ..." 1>&5 35821 35822 35823 - CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" 35824 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 35825 35826 - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 35827 - test "$cf_top_incdir" = "$cf_add_incdir" && break 35828 - cf_add_incdir="$cf_top_incdir" 35829 + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 35830 + test "$cf_top_incdir" = "$cf_add_incdir" && break 35831 + cf_add_incdir="$cf_top_incdir" 35832 else 35833 break 35834 fi 35835 @@ -4294,7 +4921,7 @@ 35836 } 35837 35838 echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6 35839 -echo "configure:4298: checking for $cf_ncuhdr_root header in include-path" >&5 35840 +echo "configure:4925: checking for $cf_ncuhdr_root header in include-path" >&5 35841 if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then 35842 echo $ac_n "(cached) $ac_c" 1>&6 35843 else 35844 @@ -4305,7 +4932,7 @@ 35845 do 35846 35847 cat > conftest.$ac_ext <<EOF 35848 -#line 4309 "configure" 35849 +#line 4936 "configure" 35850 #include "confdefs.h" 35851 35852 35853 @@ -4334,7 +4961,7 @@ 35854 35855 ; return 0; } 35856 EOF 35857 -if { (eval echo configure:4338: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 35858 +if { (eval echo configure:4965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 35859 rm -rf conftest* 35860 cf_cv_ncurses_h=$cf_header 35861 35862 @@ -4360,13 +4987,39 @@ 35863 else 35864 35865 echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6 35866 -echo "configure:4364: checking for $cf_ncuhdr_root include-path" >&5 35867 +echo "configure:4991: checking for $cf_ncuhdr_root include-path" >&5 35868 if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then 35869 echo $ac_n "(cached) $ac_c" 1>&6 35870 else 35871 35872 test -n "$verbose" && echo 35873 - cf_search="" 35874 + 35875 +cf_header_path_list="" 35876 +if test -n "${CFLAGS}${CPPFLAGS}" ; then 35877 + for cf_header_path in $CPPFLAGS $CFLAGS 35878 + do 35879 + case $cf_header_path in #(vi 35880 + -I*) 35881 + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` 35882 + 35883 +test "$cf_header_path" != "NONE" && \ 35884 +test -d "$cf_header_path" && \ 35885 + { 35886 + test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" 35887 + test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" 35888 + test -d $cf_header_path/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root" 35889 + test -d $cf_header_path/include/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include" 35890 + test -d $cf_header_path/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include" 35891 + test -d $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 35892 +} 35893 + 35894 + cf_header_path_list="$cf_header_path_list $cf_search" 35895 + ;; 35896 + esac 35897 + done 35898 +fi 35899 + 35900 +cf_search="" 35901 35902 35903 test "/usr" != "$prefix" && \ 35904 @@ -4429,6 +5082,7 @@ 35905 } 35906 35907 35908 + 35909 test "$includedir" != NONE && \ 35910 test "$includedir" != "/usr/include" && \ 35911 test -d "$includedir" && { 35912 @@ -4443,6 +5097,7 @@ 35913 test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root" 35914 } 35915 35916 +cf_search="$cf_header_path_list $cf_search" 35917 35918 test -n "$verbose" && echo search path $cf_search 35919 cf_save2_CPPFLAGS="$CPPFLAGS" 35920 @@ -4467,20 +5122,20 @@ 35921 fi 35922 35923 if test "$cf_have_incdir" = no ; then 35924 - if test "$cf_add_incdir" = /usr/local/include ; then 35925 + if test "$cf_add_incdir" = /usr/local/include ; then 35926 if test "$GCC" = yes 35927 then 35928 cf_save_CPPFLAGS=$CPPFLAGS 35929 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 35930 cat > conftest.$ac_ext <<EOF 35931 -#line 4477 "configure" 35932 +#line 5132 "configure" 35933 #include "confdefs.h" 35934 #include <stdio.h> 35935 int main() { 35936 printf("Hello") 35937 ; return 0; } 35938 EOF 35939 -if { (eval echo configure:4484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 35940 +if { (eval echo configure:5139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 35941 : 35942 else 35943 echo "configure: failed program was:" >&5 35944 @@ -4497,14 +5152,14 @@ 35945 if test "$cf_have_incdir" = no ; then 35946 test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 35947 35948 -echo "${as_me-configure}:4501: testing adding $cf_add_incdir to include-path ..." 1>&5 35949 +echo "${as_me-configure}:5156: testing adding $cf_add_incdir to include-path ..." 1>&5 35950 35951 35952 - CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" 35953 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 35954 35955 - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 35956 - test "$cf_top_incdir" = "$cf_add_incdir" && break 35957 - cf_add_incdir="$cf_top_incdir" 35958 + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 35959 + test "$cf_top_incdir" = "$cf_add_incdir" && break 35960 + cf_add_incdir="$cf_top_incdir" 35961 else 35962 break 35963 fi 35964 @@ -4519,7 +5174,7 @@ 35965 do 35966 35967 cat > conftest.$ac_ext <<EOF 35968 -#line 4523 "configure" 35969 +#line 5178 "configure" 35970 #include "confdefs.h" 35971 35972 35973 @@ -4540,7 +5195,7 @@ 35974 35975 ; return 0; } 35976 EOF 35977 -if { (eval echo configure:4544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 35978 +if { (eval echo configure:5199: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 35979 rm -rf conftest* 35980 cf_cv_ncurses_h2=$cf_header 35981 35982 @@ -4592,20 +5247,20 @@ 35983 fi 35984 35985 if test "$cf_have_incdir" = no ; then 35986 - if test "$cf_add_incdir" = /usr/local/include ; then 35987 + if test "$cf_add_incdir" = /usr/local/include ; then 35988 if test "$GCC" = yes 35989 then 35990 cf_save_CPPFLAGS=$CPPFLAGS 35991 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 35992 cat > conftest.$ac_ext <<EOF 35993 -#line 4602 "configure" 35994 +#line 5257 "configure" 35995 #include "confdefs.h" 35996 #include <stdio.h> 35997 int main() { 35998 printf("Hello") 35999 ; return 0; } 36000 EOF 36001 -if { (eval echo configure:4609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 36002 +if { (eval echo configure:5264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 36003 : 36004 else 36005 echo "configure: failed program was:" >&5 36006 @@ -4622,14 +5277,14 @@ 36007 if test "$cf_have_incdir" = no ; then 36008 test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 36009 36010 -echo "${as_me-configure}:4626: testing adding $cf_add_incdir to include-path ..." 1>&5 36011 +echo "${as_me-configure}:5281: testing adding $cf_add_incdir to include-path ..." 1>&5 36012 36013 36014 - CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" 36015 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 36016 36017 - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 36018 - test "$cf_top_incdir" = "$cf_add_incdir" && break 36019 - cf_add_incdir="$cf_top_incdir" 36020 + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 36021 + test "$cf_top_incdir" = "$cf_add_incdir" && break 36022 + cf_add_incdir="$cf_top_incdir" 36023 else 36024 break 36025 fi 36026 @@ -4670,7 +5325,7 @@ 36027 36028 36029 echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 36030 -echo "configure:4674: checking for terminfo header" >&5 36031 +echo "configure:5329: checking for terminfo header" >&5 36032 if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then 36033 echo $ac_n "(cached) $ac_c" 1>&6 36034 else 36035 @@ -4687,7 +5342,7 @@ 36036 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" 36037 do 36038 cat > conftest.$ac_ext <<EOF 36039 -#line 4691 "configure" 36040 +#line 5346 "configure" 36041 #include "confdefs.h" 36042 #include <stdio.h> 36043 #include <${cf_cv_ncurses_header-curses.h}> 36044 @@ -4697,7 +5352,7 @@ 36045 int x = auto_left_margin 36046 ; return 0; } 36047 EOF 36048 -if { (eval echo configure:4701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 36049 +if { (eval echo configure:5356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 36050 rm -rf conftest* 36051 36052 cf_cv_term_header="$cf_test" 36053 @@ -4752,7 +5407,7 @@ 36054 36055 36056 echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 36057 -echo "configure:4756: checking for ncurses version" >&5 36058 +echo "configure:5411: checking for ncurses version" >&5 36059 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then 36060 echo $ac_n "(cached) $ac_c" 1>&6 36061 else 36062 @@ -4778,7 +5433,7 @@ 36063 #endif 36064 EOF 36065 cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" 36066 - { (eval echo configure:4782: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } 36067 + { (eval echo configure:5437: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } 36068 if test -f conftest.out ; then 36069 cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` 36070 test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" 36071 @@ -4787,7 +5442,7 @@ 36072 36073 else 36074 cat > conftest.$ac_ext <<EOF 36075 -#line 4791 "configure" 36076 +#line 5446 "configure" 36077 #include "confdefs.h" 36078 36079 #include <${cf_cv_ncurses_header-curses.h}> 36080 @@ -4811,7 +5466,7 @@ 36081 ${cf_cv_main_return-return}(0); 36082 } 36083 EOF 36084 -if { (eval echo configure:4815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 36085 +if { (eval echo configure:5470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 36086 then 36087 36088 cf_cv_ncurses_version=`cat $cf_tempfile` 36089 @@ -4833,7 +5488,7 @@ 36090 36091 36092 36093 - 36094 + 36095 36096 cf_nculib_root=ncursesw 36097 # This works, except for the special case where we find gpm, but 36098 @@ -4842,7 +5497,7 @@ 36099 cf_ncurses_LIBS="" 36100 cf_ncurses_SAVE="$LIBS" 36101 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 36102 -echo "configure:4846: checking for Gpm_Open in -lgpm" >&5 36103 +echo "configure:5501: checking for Gpm_Open in -lgpm" >&5 36104 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` 36105 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 36106 echo $ac_n "(cached) $ac_c" 1>&6 36107 @@ -4850,7 +5505,7 @@ 36108 ac_save_LIBS="$LIBS" 36109 LIBS="-lgpm $LIBS" 36110 cat > conftest.$ac_ext <<EOF 36111 -#line 4854 "configure" 36112 +#line 5509 "configure" 36113 #include "confdefs.h" 36114 /* Override any gcc2 internal prototype to avoid an error. */ 36115 /* We use char because int might match the return type of a gcc2 36116 @@ -4861,7 +5516,7 @@ 36117 Gpm_Open() 36118 ; return 0; } 36119 EOF 36120 -if { (eval echo configure:4865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36121 +if { (eval echo configure:5520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36122 rm -rf conftest* 36123 eval "ac_cv_lib_$ac_lib_var=yes" 36124 else 36125 @@ -4877,7 +5532,7 @@ 36126 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 36127 echo "$ac_t""yes" 1>&6 36128 echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6 36129 -echo "configure:4881: checking for initscr in -lgpm" >&5 36130 +echo "configure:5536: checking for initscr in -lgpm" >&5 36131 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'` 36132 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 36133 echo $ac_n "(cached) $ac_c" 1>&6 36134 @@ -4885,7 +5540,7 @@ 36135 ac_save_LIBS="$LIBS" 36136 LIBS="-lgpm $LIBS" 36137 cat > conftest.$ac_ext <<EOF 36138 -#line 4889 "configure" 36139 +#line 5544 "configure" 36140 #include "confdefs.h" 36141 /* Override any gcc2 internal prototype to avoid an error. */ 36142 /* We use char because int might match the return type of a gcc2 36143 @@ -4896,7 +5551,7 @@ 36144 initscr() 36145 ; return 0; } 36146 EOF 36147 -if { (eval echo configure:4900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36148 +if { (eval echo configure:5555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36149 rm -rf conftest* 36150 eval "ac_cv_lib_$ac_lib_var=yes" 36151 else 36152 @@ -4928,7 +5583,7 @@ 36153 # version of ncurses (but it should do no harm, since it's static). 36154 if test "$cf_nculib_root" = ncurses ; then 36155 echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 36156 -echo "configure:4932: checking for tgoto in -lmytinfo" >&5 36157 +echo "configure:5587: checking for tgoto in -lmytinfo" >&5 36158 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` 36159 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 36160 echo $ac_n "(cached) $ac_c" 1>&6 36161 @@ -4936,7 +5591,7 @@ 36162 ac_save_LIBS="$LIBS" 36163 LIBS="-lmytinfo $LIBS" 36164 cat > conftest.$ac_ext <<EOF 36165 -#line 4940 "configure" 36166 +#line 5595 "configure" 36167 #include "confdefs.h" 36168 /* Override any gcc2 internal prototype to avoid an error. */ 36169 /* We use char because int might match the return type of a gcc2 36170 @@ -4947,7 +5602,7 @@ 36171 tgoto() 36172 ; return 0; } 36173 EOF 36174 -if { (eval echo configure:4951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36175 +if { (eval echo configure:5606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36176 rm -rf conftest* 36177 eval "ac_cv_lib_$ac_lib_var=yes" 36178 else 36179 @@ -4995,7 +5650,7 @@ 36180 if test "$cf_have_libdir" = no ; then 36181 test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 36182 36183 -echo "${as_me-configure}:4999: testing adding $cf_add_libdir to library-path ..." 1>&5 36184 +echo "${as_me-configure}:5654: testing adding $cf_add_libdir to library-path ..." 1>&5 36185 36186 36187 LDFLAGS="-L$cf_add_libdir $LDFLAGS" 36188 @@ -5010,12 +5665,12 @@ 36189 eval 'cf_cv_have_lib_'$cf_nculib_root'=no' 36190 cf_libdir="" 36191 echo $ac_n "checking for initscr""... $ac_c" 1>&6 36192 -echo "configure:5014: checking for initscr" >&5 36193 +echo "configure:5669: checking for initscr" >&5 36194 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then 36195 echo $ac_n "(cached) $ac_c" 1>&6 36196 else 36197 cat > conftest.$ac_ext <<EOF 36198 -#line 5019 "configure" 36199 +#line 5674 "configure" 36200 #include "confdefs.h" 36201 /* System header to define __stub macros and hopefully few prototypes, 36202 which can conflict with char initscr(); below. */ 36203 @@ -5038,7 +5693,7 @@ 36204 36205 ; return 0; } 36206 EOF 36207 -if { (eval echo configure:5042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36208 +if { (eval echo configure:5697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36209 rm -rf conftest* 36210 eval "ac_cv_func_initscr=yes" 36211 else 36212 @@ -5058,17 +5713,17 @@ 36213 36214 cf_save_LIBS="$LIBS" 36215 echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 36216 -echo "configure:5062: checking for initscr in -l$cf_nculib_root" >&5 36217 +echo "configure:5717: checking for initscr in -l$cf_nculib_root" >&5 36218 LIBS="-l$cf_nculib_root $LIBS" 36219 cat > conftest.$ac_ext <<EOF 36220 -#line 5065 "configure" 36221 +#line 5720 "configure" 36222 #include "confdefs.h" 36223 #include <${cf_cv_ncurses_header-curses.h}> 36224 int main() { 36225 initscr() 36226 ; return 0; } 36227 EOF 36228 -if { (eval echo configure:5072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36229 +if { (eval echo configure:5727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36230 rm -rf conftest* 36231 echo "$ac_t""yes" 1>&6 36232 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' 36233 @@ -5078,7 +5733,33 @@ 36234 cat conftest.$ac_ext >&5 36235 rm -rf conftest* 36236 echo "$ac_t""no" 1>&6 36237 - cf_search="" 36238 + 36239 +cf_library_path_list="" 36240 +if test -n "${LDFLAGS}${LIBS}" ; then 36241 + for cf_library_path in $LDFLAGS $LIBS 36242 + do 36243 + case $cf_library_path in #(vi 36244 + -L*) 36245 + cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` 36246 + 36247 +test "$cf_library_path" != "NONE" && \ 36248 +test -d "$cf_library_path" && \ 36249 + { 36250 + test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" 36251 + test -d $cf_library_path/lib && cf_search="$cf_search $cf_library_path/lib" 36252 + test -d $cf_library_path/lib/$cf_nculib_root && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root" 36253 + test -d $cf_library_path/lib/$cf_nculib_root/lib && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib" 36254 + test -d $cf_library_path/$cf_nculib_root/lib && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib" 36255 + test -d $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root" 36256 +} 36257 + 36258 + cf_library_path_list="$cf_library_path_list $cf_search" 36259 + ;; 36260 + esac 36261 + done 36262 +fi 36263 + 36264 +cf_search="" 36265 36266 36267 test "/usr" != "$prefix" && \ 36268 @@ -5141,20 +5822,23 @@ 36269 } 36270 36271 36272 + 36273 +cf_search="$cf_library_path_list $cf_search" 36274 + 36275 for cf_libdir in $cf_search 36276 do 36277 echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6 36278 -echo "configure:5148: checking for -l$cf_nculib_root in $cf_libdir" >&5 36279 +echo "configure:5832: checking for -l$cf_nculib_root in $cf_libdir" >&5 36280 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" 36281 cat > conftest.$ac_ext <<EOF 36282 -#line 5151 "configure" 36283 +#line 5835 "configure" 36284 #include "confdefs.h" 36285 #include <${cf_cv_ncurses_header-curses.h}> 36286 int main() { 36287 initscr() 36288 ; return 0; } 36289 EOF 36290 -if { (eval echo configure:5158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36291 +if { (eval echo configure:5842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36292 rm -rf conftest* 36293 echo "$ac_t""yes" 1>&6 36294 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' 36295 @@ -5185,7 +5869,7 @@ 36296 36297 if test -n "$cf_ncurses_LIBS" ; then 36298 echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6 36299 -echo "configure:5189: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 36300 +echo "configure:5873: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 36301 cf_ncurses_SAVE="$LIBS" 36302 for p in $cf_ncurses_LIBS ; do 36303 q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` 36304 @@ -5194,14 +5878,14 @@ 36305 fi 36306 done 36307 cat > conftest.$ac_ext <<EOF 36308 -#line 5198 "configure" 36309 +#line 5882 "configure" 36310 #include "confdefs.h" 36311 #include <${cf_cv_ncurses_header-curses.h}> 36312 int main() { 36313 initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); 36314 ; return 0; } 36315 EOF 36316 -if { (eval echo configure:5205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36317 +if { (eval echo configure:5889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36318 rm -rf conftest* 36319 echo "$ac_t""yes" 1>&6 36320 else 36321 @@ -5222,6 +5906,9 @@ 36322 EOF 36323 36324 36325 + 36326 +fi 36327 + 36328 ;; 36329 pdcurses) #(vi 36330 if test "$no_x" = yes; then 36331 @@ -5244,17 +5931,17 @@ 36332 case "`(uname -sr) 2>/dev/null`" in 36333 "SunOS 5"*) 36334 echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 36335 -echo "configure:5248: checking whether -R must be followed by a space" >&5 36336 +echo "configure:5935: checking whether -R must be followed by a space" >&5 36337 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" 36338 cat > conftest.$ac_ext <<EOF 36339 -#line 5251 "configure" 36340 +#line 5938 "configure" 36341 #include "confdefs.h" 36342 36343 int main() { 36344 36345 ; return 0; } 36346 EOF 36347 -if { (eval echo configure:5258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36348 +if { (eval echo configure:5945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36349 rm -rf conftest* 36350 ac_R_nospace=yes 36351 else 36352 @@ -5270,14 +5957,14 @@ 36353 else 36354 LIBS="$ac_xsave_LIBS -R $x_libraries" 36355 cat > conftest.$ac_ext <<EOF 36356 -#line 5274 "configure" 36357 +#line 5961 "configure" 36358 #include "confdefs.h" 36359 36360 int main() { 36361 36362 ; return 0; } 36363 EOF 36364 -if { (eval echo configure:5281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36365 +if { (eval echo configure:5968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36366 rm -rf conftest* 36367 ac_R_space=yes 36368 else 36369 @@ -5309,7 +5996,7 @@ 36370 # libraries were built with DECnet support. And karl@cs.umb.edu says 36371 # the Alpha needs dnet_stub (dnet does not exist). 36372 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 36373 -echo "configure:5313: checking for dnet_ntoa in -ldnet" >&5 36374 +echo "configure:6000: checking for dnet_ntoa in -ldnet" >&5 36375 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` 36376 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 36377 echo $ac_n "(cached) $ac_c" 1>&6 36378 @@ -5317,7 +6004,7 @@ 36379 ac_save_LIBS="$LIBS" 36380 LIBS="-ldnet $LIBS" 36381 cat > conftest.$ac_ext <<EOF 36382 -#line 5321 "configure" 36383 +#line 6008 "configure" 36384 #include "confdefs.h" 36385 /* Override any gcc2 internal prototype to avoid an error. */ 36386 /* We use char because int might match the return type of a gcc2 36387 @@ -5328,7 +6015,7 @@ 36388 dnet_ntoa() 36389 ; return 0; } 36390 EOF 36391 -if { (eval echo configure:5332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36392 +if { (eval echo configure:6019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36393 rm -rf conftest* 36394 eval "ac_cv_lib_$ac_lib_var=yes" 36395 else 36396 @@ -5350,7 +6037,7 @@ 36397 36398 if test $ac_cv_lib_dnet_dnet_ntoa = no; then 36399 echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 36400 -echo "configure:5354: checking for dnet_ntoa in -ldnet_stub" >&5 36401 +echo "configure:6041: checking for dnet_ntoa in -ldnet_stub" >&5 36402 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` 36403 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 36404 echo $ac_n "(cached) $ac_c" 1>&6 36405 @@ -5358,7 +6045,7 @@ 36406 ac_save_LIBS="$LIBS" 36407 LIBS="-ldnet_stub $LIBS" 36408 cat > conftest.$ac_ext <<EOF 36409 -#line 5362 "configure" 36410 +#line 6049 "configure" 36411 #include "confdefs.h" 36412 /* Override any gcc2 internal prototype to avoid an error. */ 36413 /* We use char because int might match the return type of a gcc2 36414 @@ -5369,7 +6056,7 @@ 36415 dnet_ntoa() 36416 ; return 0; } 36417 EOF 36418 -if { (eval echo configure:5373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36419 +if { (eval echo configure:6060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36420 rm -rf conftest* 36421 eval "ac_cv_lib_$ac_lib_var=yes" 36422 else 36423 @@ -5398,12 +6085,12 @@ 36424 # The nsl library prevents programs from opening the X display 36425 # on Irix 5.2, according to dickey@clark.net. 36426 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 36427 -echo "configure:5402: checking for gethostbyname" >&5 36428 +echo "configure:6089: checking for gethostbyname" >&5 36429 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then 36430 echo $ac_n "(cached) $ac_c" 1>&6 36431 else 36432 cat > conftest.$ac_ext <<EOF 36433 -#line 5407 "configure" 36434 +#line 6094 "configure" 36435 #include "confdefs.h" 36436 /* System header to define __stub macros and hopefully few prototypes, 36437 which can conflict with char gethostbyname(); below. */ 36438 @@ -5426,7 +6113,7 @@ 36439 36440 ; return 0; } 36441 EOF 36442 -if { (eval echo configure:5430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36443 +if { (eval echo configure:6117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36444 rm -rf conftest* 36445 eval "ac_cv_func_gethostbyname=yes" 36446 else 36447 @@ -5447,7 +6134,7 @@ 36448 36449 if test $ac_cv_func_gethostbyname = no; then 36450 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 36451 -echo "configure:5451: checking for gethostbyname in -lnsl" >&5 36452 +echo "configure:6138: checking for gethostbyname in -lnsl" >&5 36453 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` 36454 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 36455 echo $ac_n "(cached) $ac_c" 1>&6 36456 @@ -5455,7 +6142,7 @@ 36457 ac_save_LIBS="$LIBS" 36458 LIBS="-lnsl $LIBS" 36459 cat > conftest.$ac_ext <<EOF 36460 -#line 5459 "configure" 36461 +#line 6146 "configure" 36462 #include "confdefs.h" 36463 /* Override any gcc2 internal prototype to avoid an error. */ 36464 /* We use char because int might match the return type of a gcc2 36465 @@ -5466,7 +6153,7 @@ 36466 gethostbyname() 36467 ; return 0; } 36468 EOF 36469 -if { (eval echo configure:5470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36470 +if { (eval echo configure:6157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36471 rm -rf conftest* 36472 eval "ac_cv_lib_$ac_lib_var=yes" 36473 else 36474 @@ -5496,12 +6183,12 @@ 36475 # -lsocket must be given before -lnsl if both are needed. 36476 # We assume that if connect needs -lnsl, so does gethostbyname. 36477 echo $ac_n "checking for connect""... $ac_c" 1>&6 36478 -echo "configure:5500: checking for connect" >&5 36479 +echo "configure:6187: checking for connect" >&5 36480 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then 36481 echo $ac_n "(cached) $ac_c" 1>&6 36482 else 36483 cat > conftest.$ac_ext <<EOF 36484 -#line 5505 "configure" 36485 +#line 6192 "configure" 36486 #include "confdefs.h" 36487 /* System header to define __stub macros and hopefully few prototypes, 36488 which can conflict with char connect(); below. */ 36489 @@ -5524,7 +6211,7 @@ 36490 36491 ; return 0; } 36492 EOF 36493 -if { (eval echo configure:5528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36494 +if { (eval echo configure:6215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36495 rm -rf conftest* 36496 eval "ac_cv_func_connect=yes" 36497 else 36498 @@ -5545,7 +6232,7 @@ 36499 36500 if test $ac_cv_func_connect = no; then 36501 echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 36502 -echo "configure:5549: checking for connect in -lsocket" >&5 36503 +echo "configure:6236: checking for connect in -lsocket" >&5 36504 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` 36505 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 36506 echo $ac_n "(cached) $ac_c" 1>&6 36507 @@ -5553,7 +6240,7 @@ 36508 ac_save_LIBS="$LIBS" 36509 LIBS="-lsocket $X_EXTRA_LIBS $LIBS" 36510 cat > conftest.$ac_ext <<EOF 36511 -#line 5557 "configure" 36512 +#line 6244 "configure" 36513 #include "confdefs.h" 36514 /* Override any gcc2 internal prototype to avoid an error. */ 36515 /* We use char because int might match the return type of a gcc2 36516 @@ -5564,7 +6251,7 @@ 36517 connect() 36518 ; return 0; } 36519 EOF 36520 -if { (eval echo configure:5568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36521 +if { (eval echo configure:6255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36522 rm -rf conftest* 36523 eval "ac_cv_lib_$ac_lib_var=yes" 36524 else 36525 @@ -5588,12 +6275,12 @@ 36526 36527 # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. 36528 echo $ac_n "checking for remove""... $ac_c" 1>&6 36529 -echo "configure:5592: checking for remove" >&5 36530 +echo "configure:6279: checking for remove" >&5 36531 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then 36532 echo $ac_n "(cached) $ac_c" 1>&6 36533 else 36534 cat > conftest.$ac_ext <<EOF 36535 -#line 5597 "configure" 36536 +#line 6284 "configure" 36537 #include "confdefs.h" 36538 /* System header to define __stub macros and hopefully few prototypes, 36539 which can conflict with char remove(); below. */ 36540 @@ -5616,7 +6303,7 @@ 36541 36542 ; return 0; } 36543 EOF 36544 -if { (eval echo configure:5620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36545 +if { (eval echo configure:6307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36546 rm -rf conftest* 36547 eval "ac_cv_func_remove=yes" 36548 else 36549 @@ -5637,7 +6324,7 @@ 36550 36551 if test $ac_cv_func_remove = no; then 36552 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 36553 -echo "configure:5641: checking for remove in -lposix" >&5 36554 +echo "configure:6328: checking for remove in -lposix" >&5 36555 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` 36556 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 36557 echo $ac_n "(cached) $ac_c" 1>&6 36558 @@ -5645,7 +6332,7 @@ 36559 ac_save_LIBS="$LIBS" 36560 LIBS="-lposix $LIBS" 36561 cat > conftest.$ac_ext <<EOF 36562 -#line 5649 "configure" 36563 +#line 6336 "configure" 36564 #include "confdefs.h" 36565 /* Override any gcc2 internal prototype to avoid an error. */ 36566 /* We use char because int might match the return type of a gcc2 36567 @@ -5656,7 +6343,7 @@ 36568 remove() 36569 ; return 0; } 36570 EOF 36571 -if { (eval echo configure:5660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36572 +if { (eval echo configure:6347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36573 rm -rf conftest* 36574 eval "ac_cv_lib_$ac_lib_var=yes" 36575 else 36576 @@ -5680,12 +6367,12 @@ 36577 36578 # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. 36579 echo $ac_n "checking for shmat""... $ac_c" 1>&6 36580 -echo "configure:5684: checking for shmat" >&5 36581 +echo "configure:6371: checking for shmat" >&5 36582 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then 36583 echo $ac_n "(cached) $ac_c" 1>&6 36584 else 36585 cat > conftest.$ac_ext <<EOF 36586 -#line 5689 "configure" 36587 +#line 6376 "configure" 36588 #include "confdefs.h" 36589 /* System header to define __stub macros and hopefully few prototypes, 36590 which can conflict with char shmat(); below. */ 36591 @@ -5708,7 +6395,7 @@ 36592 36593 ; return 0; } 36594 EOF 36595 -if { (eval echo configure:5712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36596 +if { (eval echo configure:6399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36597 rm -rf conftest* 36598 eval "ac_cv_func_shmat=yes" 36599 else 36600 @@ -5729,7 +6416,7 @@ 36601 36602 if test $ac_cv_func_shmat = no; then 36603 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 36604 -echo "configure:5733: checking for shmat in -lipc" >&5 36605 +echo "configure:6420: checking for shmat in -lipc" >&5 36606 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` 36607 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 36608 echo $ac_n "(cached) $ac_c" 1>&6 36609 @@ -5737,7 +6424,7 @@ 36610 ac_save_LIBS="$LIBS" 36611 LIBS="-lipc $LIBS" 36612 cat > conftest.$ac_ext <<EOF 36613 -#line 5741 "configure" 36614 +#line 6428 "configure" 36615 #include "confdefs.h" 36616 /* Override any gcc2 internal prototype to avoid an error. */ 36617 /* We use char because int might match the return type of a gcc2 36618 @@ -5748,7 +6435,7 @@ 36619 shmat() 36620 ; return 0; } 36621 EOF 36622 -if { (eval echo configure:5752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36623 +if { (eval echo configure:6439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36624 rm -rf conftest* 36625 eval "ac_cv_lib_$ac_lib_var=yes" 36626 else 36627 @@ -5781,7 +6468,7 @@ 36628 # libraries we check for below, so use a different variable. 36629 # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. 36630 echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 36631 -echo "configure:5785: checking for IceConnectionNumber in -lICE" >&5 36632 +echo "configure:6472: checking for IceConnectionNumber in -lICE" >&5 36633 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` 36634 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 36635 echo $ac_n "(cached) $ac_c" 1>&6 36636 @@ -5789,7 +6476,7 @@ 36637 ac_save_LIBS="$LIBS" 36638 LIBS="-lICE $X_EXTRA_LIBS $LIBS" 36639 cat > conftest.$ac_ext <<EOF 36640 -#line 5793 "configure" 36641 +#line 6480 "configure" 36642 #include "confdefs.h" 36643 /* Override any gcc2 internal prototype to avoid an error. */ 36644 /* We use char because int might match the return type of a gcc2 36645 @@ -5800,7 +6487,7 @@ 36646 IceConnectionNumber() 36647 ; return 0; } 36648 EOF 36649 -if { (eval echo configure:5804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36650 +if { (eval echo configure:6491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36651 rm -rf conftest* 36652 eval "ac_cv_lib_$ac_lib_var=yes" 36653 else 36654 @@ -5836,7 +6523,7 @@ 36655 36656 test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 36657 36658 -echo "${as_me-configure}:5840: testing checking additions to CFLAGS ..." 1>&5 36659 +echo "${as_me-configure}:6527: testing checking additions to CFLAGS ..." 1>&5 36660 36661 36662 cf_check_cflags="$CFLAGS" 36663 @@ -5898,7 +6585,7 @@ 36664 if test -n "$cf_new_cflags" ; then 36665 test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 36666 36667 -echo "${as_me-configure}:5902: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 36668 +echo "${as_me-configure}:6589: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 36669 36670 36671 CFLAGS="$CFLAGS $cf_new_cflags" 36672 @@ -5907,16 +6594,16 @@ 36673 if test -n "$cf_new_cppflags" ; then 36674 test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 36675 36676 -echo "${as_me-configure}:5911: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 36677 +echo "${as_me-configure}:6598: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 36678 36679 36680 - CPPFLAGS="$cf_new_cppflags $CPPFLAGS" 36681 + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" 36682 fi 36683 36684 if test -n "$cf_new_extra_cppflags" ; then 36685 test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 36686 36687 -echo "${as_me-configure}:5920: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 36688 +echo "${as_me-configure}:6607: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 36689 36690 36691 EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" 36692 @@ -5927,14 +6614,14 @@ 36693 36694 if test "$cf_check_cflags" != "$CFLAGS" ; then 36695 cat > conftest.$ac_ext <<EOF 36696 -#line 5931 "configure" 36697 +#line 6618 "configure" 36698 #include "confdefs.h" 36699 #include <stdio.h> 36700 int main() { 36701 printf("Hello world"); 36702 ; return 0; } 36703 EOF 36704 -if { (eval echo configure:5938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36705 +if { (eval echo configure:6625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36706 : 36707 else 36708 echo "configure: failed program was:" >&5 36709 @@ -5942,13 +6629,13 @@ 36710 rm -rf conftest* 36711 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 36712 36713 -echo "${as_me-configure}:5946: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 36714 +echo "${as_me-configure}:6633: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 36715 36716 36717 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then 36718 test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 36719 36720 -echo "${as_me-configure}:5952: testing but keeping change to \$CPPFLAGS ..." 1>&5 36721 +echo "${as_me-configure}:6639: testing but keeping change to \$CPPFLAGS ..." 1>&5 36722 36723 36724 fi 36725 @@ -5959,12 +6646,12 @@ 36726 36727 36728 echo $ac_n "checking for XOpenDisplay""... $ac_c" 1>&6 36729 -echo "configure:5963: checking for XOpenDisplay" >&5 36730 +echo "configure:6650: checking for XOpenDisplay" >&5 36731 if eval "test \"`echo '$''{'ac_cv_func_XOpenDisplay'+set}'`\" = set"; then 36732 echo $ac_n "(cached) $ac_c" 1>&6 36733 else 36734 cat > conftest.$ac_ext <<EOF 36735 -#line 5968 "configure" 36736 +#line 6655 "configure" 36737 #include "confdefs.h" 36738 /* System header to define __stub macros and hopefully few prototypes, 36739 which can conflict with char XOpenDisplay(); below. */ 36740 @@ -5987,7 +6674,7 @@ 36741 36742 ; return 0; } 36743 EOF 36744 -if { (eval echo configure:5991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36745 +if { (eval echo configure:6678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36746 rm -rf conftest* 36747 eval "ac_cv_func_XOpenDisplay=yes" 36748 else 36749 @@ -6006,7 +6693,7 @@ 36750 echo "$ac_t""no" 1>&6 36751 36752 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 36753 -echo "configure:6010: checking for XOpenDisplay in -lX11" >&5 36754 +echo "configure:6697: checking for XOpenDisplay in -lX11" >&5 36755 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` 36756 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 36757 echo $ac_n "(cached) $ac_c" 1>&6 36758 @@ -6014,7 +6701,7 @@ 36759 ac_save_LIBS="$LIBS" 36760 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" 36761 cat > conftest.$ac_ext <<EOF 36762 -#line 6018 "configure" 36763 +#line 6705 "configure" 36764 #include "confdefs.h" 36765 /* Override any gcc2 internal prototype to avoid an error. */ 36766 /* We use char because int might match the return type of a gcc2 36767 @@ -6025,7 +6712,7 @@ 36768 XOpenDisplay() 36769 ; return 0; } 36770 EOF 36771 -if { (eval echo configure:6029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36772 +if { (eval echo configure:6716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36773 rm -rf conftest* 36774 eval "ac_cv_lib_$ac_lib_var=yes" 36775 else 36776 @@ -6049,12 +6736,12 @@ 36777 36778 36779 echo $ac_n "checking for XtAppInitialize""... $ac_c" 1>&6 36780 -echo "configure:6053: checking for XtAppInitialize" >&5 36781 +echo "configure:6740: checking for XtAppInitialize" >&5 36782 if eval "test \"`echo '$''{'ac_cv_func_XtAppInitialize'+set}'`\" = set"; then 36783 echo $ac_n "(cached) $ac_c" 1>&6 36784 else 36785 cat > conftest.$ac_ext <<EOF 36786 -#line 6058 "configure" 36787 +#line 6745 "configure" 36788 #include "confdefs.h" 36789 /* System header to define __stub macros and hopefully few prototypes, 36790 which can conflict with char XtAppInitialize(); below. */ 36791 @@ -6077,7 +6764,7 @@ 36792 36793 ; return 0; } 36794 EOF 36795 -if { (eval echo configure:6081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36796 +if { (eval echo configure:6768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36797 rm -rf conftest* 36798 eval "ac_cv_func_XtAppInitialize=yes" 36799 else 36800 @@ -6096,7 +6783,7 @@ 36801 echo "$ac_t""no" 1>&6 36802 36803 echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6 36804 -echo "configure:6100: checking for XtAppInitialize in -lXt" >&5 36805 +echo "configure:6787: checking for XtAppInitialize in -lXt" >&5 36806 ac_lib_var=`echo Xt'_'XtAppInitialize | sed 'y%./+-%__p_%'` 36807 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 36808 echo $ac_n "(cached) $ac_c" 1>&6 36809 @@ -6104,7 +6791,7 @@ 36810 ac_save_LIBS="$LIBS" 36811 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" 36812 cat > conftest.$ac_ext <<EOF 36813 -#line 6108 "configure" 36814 +#line 6795 "configure" 36815 #include "confdefs.h" 36816 /* Override any gcc2 internal prototype to avoid an error. */ 36817 /* We use char because int might match the return type of a gcc2 36818 @@ -6115,7 +6802,7 @@ 36819 XtAppInitialize() 36820 ; return 0; } 36821 EOF 36822 -if { (eval echo configure:6119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36823 +if { (eval echo configure:6806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36824 rm -rf conftest* 36825 eval "ac_cv_lib_$ac_lib_var=yes" 36826 else 36827 @@ -6153,7 +6840,7 @@ 36828 cf_x_athena=${cf_x_athena-Xaw} 36829 36830 echo $ac_n "checking if you want to link with Xaw 3d library""... $ac_c" 1>&6 36831 -echo "configure:6157: checking if you want to link with Xaw 3d library" >&5 36832 +echo "configure:6844: checking if you want to link with Xaw 3d library" >&5 36833 withval= 36834 36835 # Check whether --with-Xaw3d or --without-Xaw3d was given. 36836 @@ -6170,7 +6857,7 @@ 36837 fi 36838 36839 echo $ac_n "checking if you want to link with neXT Athena library""... $ac_c" 1>&6 36840 -echo "configure:6174: checking if you want to link with neXT Athena library" >&5 36841 +echo "configure:6861: checking if you want to link with neXT Athena library" >&5 36842 withval= 36843 36844 # Check whether --with-neXtaw or --without-neXtaw was given. 36845 @@ -6187,7 +6874,7 @@ 36846 fi 36847 36848 echo $ac_n "checking if you want to link with Athena-Plus library""... $ac_c" 1>&6 36849 -echo "configure:6191: checking if you want to link with Athena-Plus library" >&5 36850 +echo "configure:6878: checking if you want to link with Athena-Plus library" >&5 36851 withval= 36852 36853 # Check whether --with-XawPlus or --without-XawPlus was given. 36854 @@ -6204,7 +6891,7 @@ 36855 fi 36856 36857 echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 36858 -echo "configure:6208: checking for XextCreateExtension in -lXext" >&5 36859 +echo "configure:6895: checking for XextCreateExtension in -lXext" >&5 36860 ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'` 36861 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 36862 echo $ac_n "(cached) $ac_c" 1>&6 36863 @@ -6212,7 +6899,7 @@ 36864 ac_save_LIBS="$LIBS" 36865 LIBS="-lXext $LIBS" 36866 cat > conftest.$ac_ext <<EOF 36867 -#line 6216 "configure" 36868 +#line 6903 "configure" 36869 #include "confdefs.h" 36870 /* Override any gcc2 internal prototype to avoid an error. */ 36871 /* We use char because int might match the return type of a gcc2 36872 @@ -6223,7 +6910,7 @@ 36873 XextCreateExtension() 36874 ; return 0; } 36875 EOF 36876 -if { (eval echo configure:6227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36877 +if { (eval echo configure:6914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36878 rm -rf conftest* 36879 eval "ac_cv_lib_$ac_lib_var=yes" 36880 else 36881 @@ -6260,15 +6947,15 @@ 36882 cf_save="$CPPFLAGS" 36883 cf_test=X11/$cf_x_athena_root/SimpleMenu.h 36884 if test $cf_path != default ; then 36885 - CPPFLAGS="-I$cf_path/include $cf_save" 36886 + CPPFLAGS="$cf_save -I$cf_path/include" 36887 echo $ac_n "checking for $cf_test in $cf_path""... $ac_c" 1>&6 36888 -echo "configure:6266: checking for $cf_test in $cf_path" >&5 36889 +echo "configure:6953: checking for $cf_test in $cf_path" >&5 36890 else 36891 echo $ac_n "checking for $cf_test""... $ac_c" 1>&6 36892 -echo "configure:6269: checking for $cf_test" >&5 36893 +echo "configure:6956: checking for $cf_test" >&5 36894 fi 36895 cat > conftest.$ac_ext <<EOF 36896 -#line 6272 "configure" 36897 +#line 6959 "configure" 36898 #include "confdefs.h" 36899 36900 #include <X11/Intrinsic.h> 36901 @@ -6277,7 +6964,7 @@ 36902 36903 ; return 0; } 36904 EOF 36905 -if { (eval echo configure:6281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 36906 +if { (eval echo configure:6968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 36907 rm -rf conftest* 36908 cf_result=yes 36909 else 36910 @@ -6324,21 +7011,21 @@ 36911 if test $cf_path != default ; then 36912 LIBS="-L$cf_path/lib $cf_lib $LIBS" 36913 echo $ac_n "checking for $cf_lib in $cf_path""... $ac_c" 1>&6 36914 -echo "configure:6328: checking for $cf_lib in $cf_path" >&5 36915 +echo "configure:7015: checking for $cf_lib in $cf_path" >&5 36916 else 36917 LIBS="$cf_lib $LIBS" 36918 echo $ac_n "checking for $cf_test in $cf_lib""... $ac_c" 1>&6 36919 -echo "configure:6332: checking for $cf_test in $cf_lib" >&5 36920 +echo "configure:7019: checking for $cf_test in $cf_lib" >&5 36921 fi 36922 cat > conftest.$ac_ext <<EOF 36923 -#line 6335 "configure" 36924 +#line 7022 "configure" 36925 #include "confdefs.h" 36926 36927 int main() { 36928 $cf_test() 36929 ; return 0; } 36930 EOF 36931 -if { (eval echo configure:6342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36932 +if { (eval echo configure:7029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36933 rm -rf conftest* 36934 cf_result=yes 36935 else 36936 @@ -6379,7 +7066,7 @@ 36937 # Extract the first word of "$ac_prog", so it can be a program name with args. 36938 set dummy $ac_prog; ac_word=$2 36939 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 36940 -echo "configure:6383: checking for $ac_word" >&5 36941 +echo "configure:7070: checking for $ac_word" >&5 36942 if eval "test \"`echo '$''{'ac_cv_path_XCURSES_CONFIG'+set}'`\" = set"; then 36943 echo $ac_n "(cached) $ac_c" 1>&6 36944 else 36945 @@ -6418,7 +7105,7 @@ 36946 36947 if test "$XCURSES_CONFIG" != none ; then 36948 36949 -CPPFLAGS="`$XCURSES_CONFIG --cflags` $CPPFLAGS" 36950 +CPPFLAGS="$CPPFLAGS `$XCURSES_CONFIG --cflags`" 36951 LIBS="`$XCURSES_CONFIG --libs` $LIBS" 36952 36953 cf_cv_lib_XCurses=yes 36954 @@ -6429,7 +7116,7 @@ 36955 36956 test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 36957 36958 -echo "${as_me-configure}:6433: testing checking additions to CFLAGS ..." 1>&5 36959 +echo "${as_me-configure}:7120: testing checking additions to CFLAGS ..." 1>&5 36960 36961 36962 cf_check_cflags="$CFLAGS" 36963 @@ -6491,7 +7178,7 @@ 36964 if test -n "$cf_new_cflags" ; then 36965 test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 36966 36967 -echo "${as_me-configure}:6495: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 36968 +echo "${as_me-configure}:7182: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 36969 36970 36971 CFLAGS="$CFLAGS $cf_new_cflags" 36972 @@ -6500,16 +7187,16 @@ 36973 if test -n "$cf_new_cppflags" ; then 36974 test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 36975 36976 -echo "${as_me-configure}:6504: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 36977 +echo "${as_me-configure}:7191: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 36978 36979 36980 - CPPFLAGS="$cf_new_cppflags $CPPFLAGS" 36981 + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" 36982 fi 36983 36984 if test -n "$cf_new_extra_cppflags" ; then 36985 test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 36986 36987 -echo "${as_me-configure}:6513: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 36988 +echo "${as_me-configure}:7200: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 36989 36990 36991 EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" 36992 @@ -6520,14 +7207,14 @@ 36993 36994 if test "$cf_check_cflags" != "$CFLAGS" ; then 36995 cat > conftest.$ac_ext <<EOF 36996 -#line 6524 "configure" 36997 +#line 7211 "configure" 36998 #include "confdefs.h" 36999 #include <stdio.h> 37000 int main() { 37001 printf("Hello world"); 37002 ; return 0; } 37003 EOF 37004 -if { (eval echo configure:6531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37005 +if { (eval echo configure:7218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37006 : 37007 else 37008 echo "configure: failed program was:" >&5 37009 @@ -6535,13 +7222,13 @@ 37010 rm -rf conftest* 37011 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 37012 37013 -echo "${as_me-configure}:6539: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 37014 +echo "${as_me-configure}:7226: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 37015 37016 37017 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then 37018 test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 37019 37020 -echo "${as_me-configure}:6545: testing but keeping change to \$CPPFLAGS ..." 1>&5 37021 +echo "${as_me-configure}:7232: testing but keeping change to \$CPPFLAGS ..." 1>&5 37022 37023 37024 fi 37025 @@ -6551,7 +7238,7 @@ 37026 fi 37027 37028 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 37029 -echo "configure:6555: checking for XOpenDisplay in -lX11" >&5 37030 +echo "configure:7242: checking for XOpenDisplay in -lX11" >&5 37031 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` 37032 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 37033 echo $ac_n "(cached) $ac_c" 1>&6 37034 @@ -6559,7 +7246,7 @@ 37035 ac_save_LIBS="$LIBS" 37036 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" 37037 cat > conftest.$ac_ext <<EOF 37038 -#line 6563 "configure" 37039 +#line 7250 "configure" 37040 #include "confdefs.h" 37041 /* Override any gcc2 internal prototype to avoid an error. */ 37042 /* We use char because int might match the return type of a gcc2 37043 @@ -6570,7 +7257,7 @@ 37044 XOpenDisplay() 37045 ; return 0; } 37046 EOF 37047 -if { (eval echo configure:6574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37048 +if { (eval echo configure:7261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37049 rm -rf conftest* 37050 eval "ac_cv_lib_$ac_lib_var=yes" 37051 else 37052 @@ -6591,14 +7278,14 @@ 37053 fi 37054 37055 echo $ac_n "checking for XCurses library""... $ac_c" 1>&6 37056 -echo "configure:6595: checking for XCurses library" >&5 37057 +echo "configure:7282: checking for XCurses library" >&5 37058 if eval "test \"`echo '$''{'cf_cv_lib_XCurses'+set}'`\" = set"; then 37059 echo $ac_n "(cached) $ac_c" 1>&6 37060 else 37061 37062 LIBS="-lXCurses $LIBS" 37063 cat > conftest.$ac_ext <<EOF 37064 -#line 6602 "configure" 37065 +#line 7289 "configure" 37066 #include "confdefs.h" 37067 37068 #include <xcurses.h> 37069 @@ -6608,7 +7295,7 @@ 37070 XCursesExit(); 37071 ; return 0; } 37072 EOF 37073 -if { (eval echo configure:6612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37074 +if { (eval echo configure:7299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37075 rm -rf conftest* 37076 cf_cv_lib_XCurses=yes 37077 else 37078 @@ -6653,7 +7340,7 @@ 37079 *) 37080 # look for curses-related libraries 37081 echo $ac_n "checking for new_panel in -lpanel$cf_cv_libtype""... $ac_c" 1>&6 37082 -echo "configure:6657: checking for new_panel in -lpanel$cf_cv_libtype" >&5 37083 +echo "configure:7344: checking for new_panel in -lpanel$cf_cv_libtype" >&5 37084 ac_lib_var=`echo panel$cf_cv_libtype'_'new_panel | sed 'y%./+-%__p_%'` 37085 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 37086 echo $ac_n "(cached) $ac_c" 1>&6 37087 @@ -6661,7 +7348,7 @@ 37088 ac_save_LIBS="$LIBS" 37089 LIBS="-lpanel$cf_cv_libtype $LIBS" 37090 cat > conftest.$ac_ext <<EOF 37091 -#line 6665 "configure" 37092 +#line 7352 "configure" 37093 #include "confdefs.h" 37094 /* Override any gcc2 internal prototype to avoid an error. */ 37095 /* We use char because int might match the return type of a gcc2 37096 @@ -6672,7 +7359,7 @@ 37097 new_panel() 37098 ; return 0; } 37099 EOF 37100 -if { (eval echo configure:6676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37101 +if { (eval echo configure:7363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37102 rm -rf conftest* 37103 eval "ac_cv_lib_$ac_lib_var=yes" 37104 else 37105 @@ -6700,7 +7387,7 @@ 37106 fi 37107 37108 echo $ac_n "checking for menu_driver in -lmenu$cf_cv_libtype""... $ac_c" 1>&6 37109 -echo "configure:6704: checking for menu_driver in -lmenu$cf_cv_libtype" >&5 37110 +echo "configure:7391: checking for menu_driver in -lmenu$cf_cv_libtype" >&5 37111 ac_lib_var=`echo menu$cf_cv_libtype'_'menu_driver | sed 'y%./+-%__p_%'` 37112 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 37113 echo $ac_n "(cached) $ac_c" 1>&6 37114 @@ -6708,7 +7395,7 @@ 37115 ac_save_LIBS="$LIBS" 37116 LIBS="-lmenu$cf_cv_libtype $LIBS" 37117 cat > conftest.$ac_ext <<EOF 37118 -#line 6712 "configure" 37119 +#line 7399 "configure" 37120 #include "confdefs.h" 37121 /* Override any gcc2 internal prototype to avoid an error. */ 37122 /* We use char because int might match the return type of a gcc2 37123 @@ -6719,7 +7406,7 @@ 37124 menu_driver() 37125 ; return 0; } 37126 EOF 37127 -if { (eval echo configure:6723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37128 +if { (eval echo configure:7410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37129 rm -rf conftest* 37130 eval "ac_cv_lib_$ac_lib_var=yes" 37131 else 37132 @@ -6747,7 +7434,7 @@ 37133 fi 37134 37135 echo $ac_n "checking for form_driver in -lform$cf_cv_libtype""... $ac_c" 1>&6 37136 -echo "configure:6751: checking for form_driver in -lform$cf_cv_libtype" >&5 37137 +echo "configure:7438: checking for form_driver in -lform$cf_cv_libtype" >&5 37138 ac_lib_var=`echo form$cf_cv_libtype'_'form_driver | sed 'y%./+-%__p_%'` 37139 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 37140 echo $ac_n "(cached) $ac_c" 1>&6 37141 @@ -6755,7 +7442,7 @@ 37142 ac_save_LIBS="$LIBS" 37143 LIBS="-lform$cf_cv_libtype $LIBS" 37144 cat > conftest.$ac_ext <<EOF 37145 -#line 6759 "configure" 37146 +#line 7446 "configure" 37147 #include "confdefs.h" 37148 /* Override any gcc2 internal prototype to avoid an error. */ 37149 /* We use char because int might match the return type of a gcc2 37150 @@ -6766,7 +7453,7 @@ 37151 form_driver() 37152 ; return 0; } 37153 EOF 37154 -if { (eval echo configure:6770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37155 +if { (eval echo configure:7457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37156 rm -rf conftest* 37157 eval "ac_cv_lib_$ac_lib_var=yes" 37158 else 37159 @@ -6805,17 +7492,17 @@ 37160 do 37161 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 37162 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 37163 -echo "configure:6809: checking for $ac_hdr" >&5 37164 +echo "configure:7496: checking for $ac_hdr" >&5 37165 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 37166 echo $ac_n "(cached) $ac_c" 1>&6 37167 else 37168 cat > conftest.$ac_ext <<EOF 37169 -#line 6814 "configure" 37170 +#line 7501 "configure" 37171 #include "confdefs.h" 37172 #include <$ac_hdr> 37173 EOF 37174 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 37175 -{ (eval echo configure:6819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 37176 +{ (eval echo configure:7506: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 37177 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 37178 if test -z "$ac_err"; then 37179 rm -rf conftest* 37180 @@ -6845,12 +7532,12 @@ 37181 esac 37182 37183 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 37184 -echo "configure:6849: checking return type of signal handlers" >&5 37185 +echo "configure:7536: checking return type of signal handlers" >&5 37186 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then 37187 echo $ac_n "(cached) $ac_c" 1>&6 37188 else 37189 cat > conftest.$ac_ext <<EOF 37190 -#line 6854 "configure" 37191 +#line 7541 "configure" 37192 #include "confdefs.h" 37193 #include <sys/types.h> 37194 #include <signal.h> 37195 @@ -6867,7 +7554,7 @@ 37196 int i; 37197 ; return 0; } 37198 EOF 37199 -if { (eval echo configure:6871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 37200 +if { (eval echo configure:7558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 37201 rm -rf conftest* 37202 ac_cv_type_signal=void 37203 else 37204 @@ -6887,12 +7574,12 @@ 37205 37206 37207 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 37208 -echo "configure:6891: checking for ANSI C header files" >&5 37209 +echo "configure:7578: checking for ANSI C header files" >&5 37210 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then 37211 echo $ac_n "(cached) $ac_c" 1>&6 37212 else 37213 cat > conftest.$ac_ext <<EOF 37214 -#line 6896 "configure" 37215 +#line 7583 "configure" 37216 #include "confdefs.h" 37217 #include <stdlib.h> 37218 #include <stdarg.h> 37219 @@ -6900,7 +7587,7 @@ 37220 #include <float.h> 37221 EOF 37222 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 37223 -{ (eval echo configure:6904: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 37224 +{ (eval echo configure:7591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 37225 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 37226 if test -z "$ac_err"; then 37227 rm -rf conftest* 37228 @@ -6917,7 +7604,7 @@ 37229 if test $ac_cv_header_stdc = yes; then 37230 # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 37231 cat > conftest.$ac_ext <<EOF 37232 -#line 6921 "configure" 37233 +#line 7608 "configure" 37234 #include "confdefs.h" 37235 #include <string.h> 37236 EOF 37237 @@ -6935,7 +7622,7 @@ 37238 if test $ac_cv_header_stdc = yes; then 37239 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 37240 cat > conftest.$ac_ext <<EOF 37241 -#line 6939 "configure" 37242 +#line 7626 "configure" 37243 #include "confdefs.h" 37244 #include <stdlib.h> 37245 EOF 37246 @@ -6956,7 +7643,7 @@ 37247 : 37248 else 37249 cat > conftest.$ac_ext <<EOF 37250 -#line 6960 "configure" 37251 +#line 7647 "configure" 37252 #include "confdefs.h" 37253 #include <ctype.h> 37254 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') 37255 @@ -6967,7 +7654,7 @@ 37256 exit (0); } 37257 37258 EOF 37259 -if { (eval echo configure:6971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 37260 +if { (eval echo configure:7658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 37261 then 37262 : 37263 else 37264 @@ -6991,12 +7678,12 @@ 37265 fi 37266 37267 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 37268 -echo "configure:6995: checking whether time.h and sys/time.h may both be included" >&5 37269 +echo "configure:7682: checking whether time.h and sys/time.h may both be included" >&5 37270 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then 37271 echo $ac_n "(cached) $ac_c" 1>&6 37272 else 37273 cat > conftest.$ac_ext <<EOF 37274 -#line 7000 "configure" 37275 +#line 7687 "configure" 37276 #include "confdefs.h" 37277 #include <sys/types.h> 37278 #include <sys/time.h> 37279 @@ -7005,7 +7692,7 @@ 37280 struct tm *tp; 37281 ; return 0; } 37282 EOF 37283 -if { (eval echo configure:7009: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 37284 +if { (eval echo configure:7696: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 37285 rm -rf conftest* 37286 ac_cv_header_time=yes 37287 else 37288 @@ -7038,17 +7725,17 @@ 37289 do 37290 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 37291 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 37292 -echo "configure:7042: checking for $ac_hdr" >&5 37293 +echo "configure:7729: checking for $ac_hdr" >&5 37294 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 37295 echo $ac_n "(cached) $ac_c" 1>&6 37296 else 37297 cat > conftest.$ac_ext <<EOF 37298 -#line 7047 "configure" 37299 +#line 7734 "configure" 37300 #include "confdefs.h" 37301 #include <$ac_hdr> 37302 EOF 37303 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 37304 -{ (eval echo configure:7052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 37305 +{ (eval echo configure:7739: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 37306 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 37307 if test -z "$ac_err"; then 37308 rm -rf conftest* 37309 @@ -7089,12 +7776,12 @@ 37310 37311 do 37312 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 37313 -echo "configure:7093: checking for $ac_func" >&5 37314 +echo "configure:7780: checking for $ac_func" >&5 37315 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 37316 echo $ac_n "(cached) $ac_c" 1>&6 37317 else 37318 cat > conftest.$ac_ext <<EOF 37319 -#line 7098 "configure" 37320 +#line 7785 "configure" 37321 #include "confdefs.h" 37322 /* System header to define __stub macros and hopefully few prototypes, 37323 which can conflict with char $ac_func(); below. */ 37324 @@ -7117,7 +7804,7 @@ 37325 37326 ; return 0; } 37327 EOF 37328 -if { (eval echo configure:7121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37329 +if { (eval echo configure:7808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37330 rm -rf conftest* 37331 eval "ac_cv_func_$ac_func=yes" 37332 else 37333 @@ -7144,13 +7831,13 @@ 37334 37335 37336 echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6 37337 -echo "configure:7148: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 37338 +echo "configure:7835: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 37339 if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then 37340 echo $ac_n "(cached) $ac_c" 1>&6 37341 else 37342 37343 cat > conftest.$ac_ext <<EOF 37344 -#line 7154 "configure" 37345 +#line 7841 "configure" 37346 #include "confdefs.h" 37347 37348 #include <stdlib.h> 37349 @@ -7162,7 +7849,7 @@ 37350 getbegyx(stdscr, y1, x1) 37351 ; return 0; } 37352 EOF 37353 -if { (eval echo configure:7166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37354 +if { (eval echo configure:7853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37355 rm -rf conftest* 37356 cf_cv_need_xopen_extension=no 37357 else 37358 @@ -7170,7 +7857,7 @@ 37359 cat conftest.$ac_ext >&5 37360 rm -rf conftest* 37361 cat > conftest.$ac_ext <<EOF 37362 -#line 7174 "configure" 37363 +#line 7861 "configure" 37364 #include "confdefs.h" 37365 37366 #define _XOPEN_SOURCE_EXTENDED 37367 @@ -7183,7 +7870,7 @@ 37368 getbegyx(stdscr, y1, x1) 37369 ; return 0; } 37370 EOF 37371 -if { (eval echo configure:7187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37372 +if { (eval echo configure:7874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37373 rm -rf conftest* 37374 cf_cv_need_xopen_extension=yes 37375 else 37376 @@ -7202,7 +7889,7 @@ 37377 37378 37379 echo $ac_n "checking for term.h""... $ac_c" 1>&6 37380 -echo "configure:7206: checking for term.h" >&5 37381 +echo "configure:7893: checking for term.h" >&5 37382 if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then 37383 echo $ac_n "(cached) $ac_c" 1>&6 37384 else 37385 @@ -7215,7 +7902,7 @@ 37386 term.h 37387 do 37388 cat > conftest.$ac_ext <<EOF 37389 -#line 7219 "configure" 37390 +#line 7906 "configure" 37391 #include "confdefs.h" 37392 37393 #include <${cf_cv_ncurses_header-curses.h}> 37394 @@ -7224,7 +7911,7 @@ 37395 WINDOW *x 37396 ; return 0; } 37397 EOF 37398 -if { (eval echo configure:7228: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 37399 +if { (eval echo configure:7915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 37400 rm -rf conftest* 37401 cf_cv_term_header=$cf_header 37402 break 37403 @@ -7301,9 +7988,9 @@ 37404 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 37405 37406 echo $ac_n "checking for ${cf_func}""... $ac_c" 1>&6 37407 -echo "configure:7305: checking for ${cf_func}" >&5 37408 +echo "configure:7992: checking for ${cf_func}" >&5 37409 37410 -echo "${as_me-configure}:7307: testing ${cf_func} ..." 1>&5 37411 +echo "${as_me-configure}:7994: testing ${cf_func} ..." 1>&5 37412 37413 if eval "test \"`echo '$''{'cf_cv_func_$cf_func'+set}'`\" = set"; then 37414 echo $ac_n "(cached) $ac_c" 1>&6 37415 @@ -7312,7 +7999,7 @@ 37416 eval cf_result='$ac_cv_func_'$cf_func 37417 if test ".$cf_result" != ".no"; then 37418 cat > conftest.$ac_ext <<EOF 37419 -#line 7316 "configure" 37420 +#line 8003 "configure" 37421 #include "confdefs.h" 37422 37423 #ifdef HAVE_XCURSES 37424 @@ -7341,7 +8028,7 @@ 37425 37426 ; return 0; } 37427 EOF 37428 -if { (eval echo configure:7345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37429 +if { (eval echo configure:8032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37430 rm -rf conftest* 37431 cf_result=yes 37432 else 37433 @@ -7369,13 +8056,13 @@ 37434 37435 37436 echo $ac_n "checking for ncurses extended functions""... $ac_c" 1>&6 37437 -echo "configure:7373: checking for ncurses extended functions" >&5 37438 +echo "configure:8060: checking for ncurses extended functions" >&5 37439 if eval "test \"`echo '$''{'cf_cv_ncurses_ext_funcs'+set}'`\" = set"; then 37440 echo $ac_n "(cached) $ac_c" 1>&6 37441 else 37442 37443 cat > conftest.$ac_ext <<EOF 37444 -#line 7379 "configure" 37445 +#line 8066 "configure" 37446 #include "confdefs.h" 37447 37448 #include <${cf_cv_ncurses_header-curses.h}> 37449 @@ -7395,7 +8082,7 @@ 37450 (void) wresize (0, 0, 0); 37451 ; return 0; } 37452 EOF 37453 -if { (eval echo configure:7399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37454 +if { (eval echo configure:8086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37455 rm -rf conftest* 37456 cf_cv_ncurses_ext_funcs=yes 37457 else 37458 @@ -7415,13 +8102,13 @@ 37459 37460 37461 echo $ac_n "checking for wide-character functions""... $ac_c" 1>&6 37462 -echo "configure:7419: checking for wide-character functions" >&5 37463 +echo "configure:8106: checking for wide-character functions" >&5 37464 if eval "test \"`echo '$''{'cf_cv_widechar_funcs'+set}'`\" = set"; then 37465 echo $ac_n "(cached) $ac_c" 1>&6 37466 else 37467 37468 cat > conftest.$ac_ext <<EOF 37469 -#line 7425 "configure" 37470 +#line 8112 "configure" 37471 #include "confdefs.h" 37472 37473 #include <${cf_cv_ncurses_header-curses.h}> 37474 @@ -7433,7 +8120,7 @@ 37475 37476 ; return 0; } 37477 EOF 37478 -if { (eval echo configure:7437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37479 +if { (eval echo configure:8124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37480 rm -rf conftest* 37481 cf_cv_widechar_funcs=yes 37482 else 37483 @@ -7461,13 +8148,13 @@ 37484 37485 37486 echo $ac_n "checking if sys/time.h works with sys/select.h""... $ac_c" 1>&6 37487 -echo "configure:7465: checking if sys/time.h works with sys/select.h" >&5 37488 +echo "configure:8152: checking if sys/time.h works with sys/select.h" >&5 37489 if eval "test \"`echo '$''{'cf_cv_sys_time_select'+set}'`\" = set"; then 37490 echo $ac_n "(cached) $ac_c" 1>&6 37491 else 37492 37493 cat > conftest.$ac_ext <<EOF 37494 -#line 7471 "configure" 37495 +#line 8158 "configure" 37496 #include "confdefs.h" 37497 37498 #include <sys/types.h> 37499 @@ -7482,7 +8169,7 @@ 37500 37501 ; return 0; } 37502 EOF 37503 -if { (eval echo configure:7486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 37504 +if { (eval echo configure:8173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 37505 rm -rf conftest* 37506 cf_cv_sys_time_select=yes 37507 else 37508 @@ -7503,7 +8190,7 @@ 37509 37510 37511 echo $ac_n "checking for function curses_version""... $ac_c" 1>&6 37512 -echo "configure:7507: checking for function curses_version" >&5 37513 +echo "configure:8194: checking for function curses_version" >&5 37514 if eval "test \"`echo '$''{'cf_cv_func_curses_version'+set}'`\" = set"; then 37515 echo $ac_n "(cached) $ac_c" 1>&6 37516 else 37517 @@ -7512,7 +8199,7 @@ 37518 cf_cv_func_curses_version=unknown 37519 else 37520 cat > conftest.$ac_ext <<EOF 37521 -#line 7516 "configure" 37522 +#line 8203 "configure" 37523 #include "confdefs.h" 37524 37525 #include <${cf_cv_ncurses_header-curses.h}> 37526 @@ -7524,7 +8211,7 @@ 37527 } 37528 37529 EOF 37530 -if { (eval echo configure:7528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 37531 +if { (eval echo configure:8215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 37532 then 37533 cf_cv_func_curses_version=yes 37534 37535 @@ -7548,17 +8235,33 @@ 37536 37537 37538 37539 +echo $ac_n "checking for ncurses wrap-prefix""... $ac_c" 1>&6 37540 +echo "configure:8240: checking for ncurses wrap-prefix" >&5 37541 + 37542 +# Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given. 37543 +if test "${with_ncurses_wrap_prefix+set}" = set; then 37544 + withval="$with_ncurses_wrap_prefix" 37545 + NCURSES_WRAP_PREFIX=$withval 37546 +else 37547 + NCURSES_WRAP_PREFIX=_nc_ 37548 +fi 37549 + 37550 +echo "$ac_t""$NCURSES_WRAP_PREFIX" 1>&6 37551 + 37552 + 37553 + 37554 + 37555 echo $ac_n "checking for alternate character set array""... $ac_c" 1>&6 37556 -echo "configure:7553: checking for alternate character set array" >&5 37557 +echo "configure:8256: checking for alternate character set array" >&5 37558 if eval "test \"`echo '$''{'cf_cv_curses_acs_map'+set}'`\" = set"; then 37559 echo $ac_n "(cached) $ac_c" 1>&6 37560 else 37561 37562 cf_cv_curses_acs_map=unknown 37563 -for name in acs_map _acs_map __acs_map _nc_acs_map 37564 +for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map 37565 do 37566 cat > conftest.$ac_ext <<EOF 37567 -#line 7562 "configure" 37568 +#line 8265 "configure" 37569 #include "confdefs.h" 37570 37571 #include <${cf_cv_ncurses_header-curses.h}> 37572 @@ -7569,7 +8272,7 @@ 37573 37574 ; return 0; } 37575 EOF 37576 -if { (eval echo configure:7573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37577 +if { (eval echo configure:8276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37578 rm -rf conftest* 37579 cf_cv_curses_acs_map=$name; break 37580 else 37581 @@ -7590,7 +8293,7 @@ 37582 37583 37584 echo $ac_n "checking for wide alternate character set array""... $ac_c" 1>&6 37585 -echo "configure:7594: checking for wide alternate character set array" >&5 37586 +echo "configure:8297: checking for wide alternate character set array" >&5 37587 if eval "test \"`echo '$''{'cf_cv_curses_wacs_map'+set}'`\" = set"; then 37588 echo $ac_n "(cached) $ac_c" 1>&6 37589 else 37590 @@ -7599,7 +8302,7 @@ 37591 for name in wacs_map _wacs_map __wacs_map _nc_wacs 37592 do 37593 cat > conftest.$ac_ext <<EOF 37594 -#line 7603 "configure" 37595 +#line 8306 "configure" 37596 #include "confdefs.h" 37597 37598 #ifndef _XOPEN_SOURCE_EXTENDED 37599 @@ -7610,7 +8313,7 @@ 37600 $name['k'] = *WACS_PLUS 37601 ; return 0; } 37602 EOF 37603 -if { (eval echo configure:7614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37604 +if { (eval echo configure:8317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 37605 rm -rf conftest* 37606 cf_cv_curses_wacs_map=$name 37607 break 37608 @@ -7626,9 +8329,9 @@ 37609 37610 37611 echo $ac_n "checking for type attr_t in ${cf_cv_ncurses_header-curses.h}""... $ac_c" 1>&6 37612 -echo "configure:7630: checking for type attr_t in ${cf_cv_ncurses_header-curses.h}" >&5 37613 +echo "configure:8333: checking for type attr_t in ${cf_cv_ncurses_header-curses.h}" >&5 37614 cat > conftest.$ac_ext <<EOF 37615 -#line 7632 "configure" 37616 +#line 8335 "configure" 37617 #include "confdefs.h" 37618 37619 #ifndef _XOPEN_SOURCE_EXTENDED 37620 @@ -7641,7 +8344,7 @@ 37621 37622 ; return 0; } 37623 EOF 37624 -if { (eval echo configure:7645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 37625 +if { (eval echo configure:8348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 37626 rm -rf conftest* 37627 cf_result=yes 37628 else 37629 @@ -7669,9 +8372,9 @@ 37630 37631 37632 echo $ac_n "checking for type mbstate_t in ${cf_cv_ncurses_header-curses.h}""... $ac_c" 1>&6 37633 -echo "configure:7673: checking for type mbstate_t in ${cf_cv_ncurses_header-curses.h}" >&5 37634 +echo "configure:8376: checking for type mbstate_t in ${cf_cv_ncurses_header-curses.h}" >&5 37635 cat > conftest.$ac_ext <<EOF 37636 -#line 7675 "configure" 37637 +#line 8378 "configure" 37638 #include "confdefs.h" 37639 37640 #ifndef _XOPEN_SOURCE_EXTENDED 37641 @@ -7684,7 +8387,7 @@ 37642 37643 ; return 0; } 37644 EOF 37645 -if { (eval echo configure:7688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 37646 +if { (eval echo configure:8391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 37647 rm -rf conftest* 37648 cf_result=yes 37649 else 37650 @@ -7891,11 +8594,13 @@ 37651 s%@SHOW_CC@%$SHOW_CC%g 37652 s%@ECHO_CC@%$ECHO_CC%g 37653 s%@EXTRA_CFLAGS@%$EXTRA_CFLAGS%g 37654 +s%@NCURSES_CONFIG@%$NCURSES_CONFIG%g 37655 s%@X_CFLAGS@%$X_CFLAGS%g 37656 s%@X_PRE_LIBS@%$X_PRE_LIBS%g 37657 s%@X_LIBS@%$X_LIBS%g 37658 s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g 37659 s%@XCURSES_CONFIG@%$XCURSES_CONFIG%g 37660 +s%@NCURSES_WRAP_PREFIX@%$NCURSES_WRAP_PREFIX%g 37661 37662 CEOF 37663 EOF 37664 diff -Naur ncurses-5.7.orig/test/configure.in ncurses-5.7/test/configure.in 37665 --- ncurses-5.7.orig/test/configure.in 2008-09-06 15:10:23.000000000 -0700 37666 +++ ncurses-5.7/test/configure.in 2009-06-05 14:01:30.000000000 -0700 37667 @@ -28,7 +28,7 @@ 37668 dnl 37669 dnl Author: Thomas E. Dickey 1996, etc. 37670 dnl 37671 -dnl $Id: configure.in,v 1.67 2008/09/06 22:10:23 tom Exp $ 37672 +dnl $Id: configure.in,v 1.68 2009/03/28 19:49:55 tom Exp $ 37673 dnl This is a simple configuration-script for the ncurses test programs that 37674 dnl allows the test-directory to be separately configured against a reference 37675 dnl system (i.e., sysvr4 curses) 37676 @@ -125,14 +125,12 @@ 37677 CF_CURSES_LIBS 37678 ;; 37679 ncurses) 37680 - CF_NCURSES_CPPFLAGS 37681 - CF_NCURSES_LIBS 37682 + CF_NCURSES_CONFIG 37683 ;; 37684 ncursesw) 37685 cf_cv_libtype=w 37686 CF_UTF8_LIB 37687 - CF_NCURSES_CPPFLAGS(ncursesw) 37688 - CF_NCURSES_LIBS(ncursesw) 37689 + CF_NCURSES_CONFIG(ncursesw) 37690 ;; 37691 pdcurses) #(vi 37692 CF_PDCURSES_X11 22156 37693 diff -Naur ncurses-5.7.orig/test/demo_forms.c ncurses-5.7/test/demo_forms.c 22157 37694 --- ncurses-5.7.orig/test/demo_forms.c 2008-10-18 13:38:20.000000000 -0700 22158 +++ ncurses-5.7/test/demo_forms.c 2009-03-22 21:16:52.251135633 -0700 37695 +++ ncurses-5.7/test/demo_forms.c 2009-06-05 14:01:55.000000000 -0700 37696 @@ -1,5 +1,5 @@ 37697 /**************************************************************************** 37698 - * Copyright (c) 2003-2007,2008 Free Software Foundation, Inc. * 37699 + * Copyright (c) 2003-2008,2009 Free Software Foundation, Inc. * 37700 * * 37701 * Permission is hereby granted, free of charge, to any person obtaining a * 37702 * copy of this software and associated documentation files (the * 22159 37703 @@ -26,7 +26,7 @@ 22160 37704 * authorization. * … … 22162 37706 /* 22163 37707 - * $Id: demo_forms.c,v 1.30 2008/10/18 20:38:20 tom Exp $ 22164 + * $Id: demo_forms.c,v 1.3 1 2008/12/20 19:23:00tom Exp $37708 + * $Id: demo_forms.c,v 1.32 2009/05/30 16:52:42 tom Exp $ 22165 37709 * 22166 37710 * Demonstrate a variety of functions from the form library. … … 22189 37733 set_field_buffer(f, 0, t_value); 22190 37734 } 37735 @@ -444,8 +451,11 @@ 37736 37737 free_form(form); 37738 } 37739 - for (c = 0; f[c] != 0; c++) 37740 + for (c = 0; f[c] != 0; c++) { 37741 + void *ptr = field_userptr(f[c]); 37742 + free(ptr); 37743 free_field(f[c]); 37744 + } 37745 noraw(); 37746 nl(); 37747 37748 diff -Naur ncurses-5.7.orig/test/ditto.c ncurses-5.7/test/ditto.c 37749 --- ncurses-5.7.orig/test/ditto.c 2008-08-04 06:21:41.000000000 -0700 37750 +++ ncurses-5.7/test/ditto.c 2009-06-05 14:01:49.000000000 -0700 37751 @@ -29,7 +29,7 @@ 37752 /* 37753 * Author: Thomas E. Dickey (1998-on) 37754 * 37755 - * $Id: ditto.c,v 1.32 2008/08/04 13:21:41 tom Exp $ 37756 + * $Id: ditto.c,v 1.33 2008/11/16 00:19:59 juergen Exp $ 37757 * 37758 * The program illustrates how to set up multiple screens from a single 37759 * program. 37760 @@ -137,8 +137,8 @@ 37761 { 37762 int result = -1; 37763 if (peek->sequence < fifo->sequence) { 37764 - peek->sequence += 1; 37765 result = fifo->data[THIS_FIFO(peek->sequence)]; 37766 + peek->sequence += 1; 37767 } 37768 return result; 37769 } 37770 @@ -188,7 +188,11 @@ 37771 } 37772 37773 static void 37774 -init_screen(SCREEN *sp GCC_UNUSED, void *arg) 37775 +init_screen( 37776 +#if HAVE_USE_WINDOW 37777 + SCREEN *sp GCC_UNUSED, 37778 +#endif 37779 + void *arg) 37780 { 37781 DITTO *target = (DITTO *) arg; 37782 int high, wide; 37783 @@ -237,6 +241,7 @@ 37784 target->which1 = which1; 37785 target->titles = source; 37786 target->length = length; 37787 + target->fifo.head = -1; 37788 target->screen = newterm((char *) 0, /* assume $TERM is the same */ 37789 target->output, 37790 target->input); 37791 @@ -248,7 +253,11 @@ 37792 } 37793 37794 static int 37795 -close_screen(SCREEN *sp GCC_UNUSED, void *arg GCC_UNUSED) 37796 +close_screen( 37797 +#if HAVE_USE_WINDOW 37798 + SCREEN *sp GCC_UNUSED, 37799 +#endif 37800 + void *arg GCC_UNUSED) 37801 { 37802 (void) sp; 37803 (void) arg; 37804 @@ -259,7 +268,11 @@ 37805 * Read data from the 'source' screen. 37806 */ 37807 static int 37808 -read_screen(SCREEN *sp GCC_UNUSED, void *arg) 37809 +read_screen( 37810 +#if HAVE_USE_WINDOW 37811 + SCREEN *sp GCC_UNUSED, 37812 +#endif 37813 + void *arg) 37814 { 37815 DDATA *data = (DDATA *) arg; 37816 DITTO *ditto = &(data->ditto[data->source]); 37817 @@ -278,7 +291,11 @@ 37818 * Write all of the data that's in fifos for the 'target' screen. 37819 */ 37820 static int 37821 -write_screen(SCREEN *sp GCC_UNUSED, void *arg GCC_UNUSED) 37822 +write_screen( 37823 +#if HAVE_USE_WINDOW 37824 + SCREEN *sp GCC_UNUSED, 37825 +#endif 37826 + void *arg GCC_UNUSED) 37827 { 37828 DDATA *data = (DDATA *) arg; 37829 DITTO *ditto = &(data->ditto[data->target]); 37830 @@ -360,7 +377,7 @@ 37831 37832 if (argc <= 1) 37833 usage(); 37834 - 37835 + 37836 if ((data = typeCalloc(DITTO, (size_t) argc)) == 0) 37837 failed("calloc data"); 37838 22191 37839 diff -Naur ncurses-5.7.orig/test/edit_field.c ncurses-5.7/test/edit_field.c 22192 37840 --- ncurses-5.7.orig/test/edit_field.c 2008-10-18 13:40:20.000000000 -0700 22193 +++ ncurses-5.7/test/edit_field.c 2009-0 3-22 21:16:52.251135633-070037841 +++ ncurses-5.7/test/edit_field.c 2009-06-05 14:00:59.000000000 -0700 22194 37842 @@ -26,7 +26,7 @@ 22195 37843 * authorization. * … … 22214 37862 diff -Naur ncurses-5.7.orig/test/edit_field.h ncurses-5.7/test/edit_field.h 22215 37863 --- ncurses-5.7.orig/test/edit_field.h 2006-06-03 09:38:57.000000000 -0700 22216 +++ ncurses-5.7/test/edit_field.h 2009-0 3-22 21:16:52.251135633-070037864 +++ ncurses-5.7/test/edit_field.h 2009-06-05 14:00:59.000000000 -0700 22217 37865 @@ -1,5 +1,5 @@ 22218 37866 /**************************************************************************** … … 22244 37892 diff -Naur ncurses-5.7.orig/test/filter.c ncurses-5.7/test/filter.c 22245 37893 --- ncurses-5.7.orig/test/filter.c 2006-12-09 08:53:47.000000000 -0800 22246 +++ ncurses-5.7/test/filter.c 2009-0 3-22 21:16:49.034929738-070037894 +++ ncurses-5.7/test/filter.c 2009-06-05 14:00:55.000000000 -0700 22247 37895 @@ -1,5 +1,5 @@ 22248 37896 /**************************************************************************** … … 22316 37964 diff -Naur ncurses-5.7.orig/test/insdelln.c ncurses-5.7/test/insdelln.c 22317 37965 --- ncurses-5.7.orig/test/insdelln.c 1969-12-31 16:00:00.000000000 -0800 22318 +++ ncurses-5.7/test/insdelln.c 2009-0 3-22 21:16:52.251135633-070037966 +++ ncurses-5.7/test/insdelln.c 2009-06-05 14:00:59.000000000 -0700 22319 37967 @@ -0,0 +1,380 @@ 22320 37968 +/**************************************************************************** … … 22700 38348 diff -Naur ncurses-5.7.orig/test/modules ncurses-5.7/test/modules 22701 38349 --- ncurses-5.7.orig/test/modules 2007-08-18 10:57:08.000000000 -0700 22702 +++ ncurses-5.7/test/modules 2009-0 3-22 21:16:52.251135633-070038350 +++ ncurses-5.7/test/modules 2009-06-05 14:00:59.000000000 -0700 22703 38351 @@ -1,4 +1,4 @@ 22704 38352 -# $Id: modules,v 1.36 2007/08/18 17:57:08 tom Exp $ … … 22725 38373 diff -Naur ncurses-5.7.orig/test/ncurses.c ncurses-5.7/test/ncurses.c 22726 38374 --- ncurses-5.7.orig/test/ncurses.c 2008-09-27 07:34:58.000000000 -0700 22727 +++ ncurses-5.7/test/ncurses.c 2009-03-22 21:17:02.199776504 -0700 38375 +++ ncurses-5.7/test/ncurses.c 2009-06-05 14:01:49.000000000 -0700 38376 @@ -1,5 +1,5 @@ 38377 /**************************************************************************** 38378 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 38379 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 38380 * * 38381 * Permission is hereby granted, free of charge, to any person obtaining a * 38382 * copy of this software and associated documentation files (the * 22728 38383 @@ -40,7 +40,7 @@ 22729 38384 Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993 … … 22731 38386 22732 38387 -$Id: ncurses.c,v 1.329 2008/09/27 14:34:58 tom Exp $ 22733 +$Id: ncurses.c,v 1.33 6 2009/01/25 00:39:14 tomExp $38388 +$Id: ncurses.c,v 1.339 2009/04/04 22:46:11 juergen Exp $ 22734 38389 22735 38390 ***************************************************************************/ 22736 38391 22737 @@ -569,8 +569,11 @@ 38392 @@ -483,7 +483,11 @@ 38393 addstr("Shelling out..."); 38394 def_prog_mode(); 38395 endwin(); 38396 +#ifdef __MINGW32__ 38397 + system("cmd.exe"); 38398 +#else 38399 system("sh"); 38400 +#endif 38401 if (message) 38402 addstr("returned from shellout.\n"); 38403 refresh(); 38404 @@ -569,8 +573,11 @@ 22738 38405 * 22739 38406 ****************************************************************************/ … … 22748 38415 keypad(win, flags['k']); /* should be redundant, but for testing */ 22749 38416 meta(win, flags['m']); /* force this to a known state */ 22750 @@ -581,7 +58 4,17 @@38417 @@ -581,7 +588,17 @@ 22751 38418 } 22752 38419 … … 22767 38434 static const char *help[] = 22768 38435 { 22769 @@ -731,13 +74 4,10 @@38436 @@ -731,13 +748,10 @@ 22770 38437 int first_y, first_x; 22771 38438 int c; … … 22783 38450 getyx(win, first_y, first_x); 22784 38451 22785 @@ -835,12 +84 5,18 @@38452 @@ -835,12 +849,18 @@ 22786 38453 } 22787 38454 #endif … … 22807 38474 } else { 22808 38475 if (isprint(c)) 22809 @@ -854,6 +87 0,9 @@38476 @@ -854,6 +874,9 @@ 22810 38477 } 22811 38478 … … 22817 38484 22818 38485 static int 22819 @@ -978,15 +997,12 @@ 38486 @@ -905,6 +928,7 @@ 38487 wgetch_test(0, stdscr, delay); 38488 forget_boxes(); 38489 finish_getch_test(); 38490 + slk_clear(); 38491 } 38492 38493 #if USE_WIDEC_SUPPORT 38494 @@ -978,15 +1002,12 @@ 22820 38495 int first_y, first_x; 22821 38496 wint_t c; … … 22835 38510 getyx(win, first_y, first_x); 22836 38511 22837 @@ -1096,14 +111 2,14 @@38512 @@ -1096,14 +1117,14 @@ 22838 38513 resize_wide_boxes(level, win); 22839 38514 } … … 22855 38530 } 22856 38531 wgetch_wrap(win, first_y); 22857 @@ -1111,6 +11 27,9 @@38532 @@ -1111,6 +1132,9 @@ 22858 38533 } 22859 38534 … … 22865 38540 22866 38541 static void 22867 @@ -1840,6 +1859,8 @@ 38542 @@ -1122,6 +1146,7 @@ 38543 wget_wch_test(0, stdscr, delay); 38544 forget_boxes(); 38545 finish_getch_test(); 38546 + slk_clear(); 38547 } 38548 #endif 38549 38550 @@ -1840,6 +1865,8 @@ 22868 38551 width = 4; 22869 38552 } else if (color >= 8) { … … 22874 38557 strcpy(temp, the_color_names[color]); 22875 38558 } 22876 @@ -1874,6 +1 895,8 @@38559 @@ -1874,6 +1901,8 @@ 22877 38560 mvwprintw(helpwin, row++, col, 22878 38561 " n/N toggle text/number on/off"); … … 22883 38566 #if USE_WIDEC_SUPPORT 22884 38567 if (wide) { 22885 @@ -1906,12 +19 29,19 @@38568 @@ -1906,12 +1935,19 @@ 22886 38569 bool done = FALSE; 22887 38570 bool opt_acsc = FALSE; … … 22906 38589 while (!done) { 22907 38590 int shown = 0; 22908 @@ -1926,12 +19 56,14 @@38591 @@ -1926,12 +1962,14 @@ 22909 38592 hello = "Hello"; 22910 38593 per_row = 8; … … 22923 38606 clrtobot(); 22924 38607 (void) mvprintw(top + 1, 0, 22925 @@ -1942,7 +19 74,7 @@38608 @@ -1942,7 +1980,7 @@ 22926 38609 22927 38610 /* show color names/numbers across the top */ … … 22932 38615 /* show a grid of colors, with color names/ numbers on the left */ 22933 38616 for (i = (short) (base_row * per_row); i < pairs_max; i++) { 22934 @@ -1950,9 +198 2,11 @@38617 @@ -1950,9 +1988,11 @@ 22935 38618 int col = (i % per_row + 1) * width; 22936 38619 short pair = i; … … 22946 38629 init_pair(pair, fg, bg); 22947 38630 attron((attr_t) COLOR_PAIR(pair)); 22948 @@ -1960,6 + 1994,8 @@38631 @@ -1960,6 +2000,8 @@ 22949 38632 attron((attr_t) A_ALTCHARSET); 22950 38633 if (opt_bold) … … 22955 38638 if (opt_nums) { 22956 38639 sprintf(numbered, "{%02X}", i); 22957 @@ -1968,8 +20 04,8 @@38640 @@ -1968,8 +2010,8 @@ 22958 38641 printw("%-*.*s", width, width, hello); 22959 38642 attrset(A_NORMAL); … … 22966 38649 ++shown; 22967 38650 } else if (shown) { 22968 @@ -1996,6 +203 2,12 @@38651 @@ -1996,6 +2038,12 @@ 22969 38652 case 'N': 22970 38653 opt_nums = TRUE; … … 22979 38662 done = TRUE; 22980 38663 continue; 22981 @@ -2073,7 +21 15,7 @@38664 @@ -2073,7 +2121,7 @@ 22982 38665 int base_row = 0; 22983 38666 int grid_top = top + 3; … … 22988 38671 int per_row; 22989 38672 char numbered[80]; 22990 @@ -2081,12 +212 3,22 @@38673 @@ -2081,12 +2129,22 @@ 22991 38674 bool done = FALSE; 22992 38675 bool opt_acsc = FALSE; … … 23011 38694 int shown = 0; 23012 38695 23013 @@ -2100,6 +215 2,8 @@38696 @@ -2100,6 +2158,8 @@ 23014 38697 hello = "Hello"; 23015 38698 per_row = 8; … … 23020 38703 make_fullwidth_text(buffer, hello); 23021 38704 width *= 2; 23022 @@ -2111,8 +21 65,9 @@38705 @@ -2111,8 +2171,9 @@ 23023 38706 row_limit = (pairs_max + per_row - 1) / per_row; 23024 38707 … … 23032 38715 clrtobot(); 23033 38716 (void) mvprintw(top + 1, 0, 23034 @@ -2123,7 +21 78,7 @@38717 @@ -2123,7 +2184,7 @@ 23035 38718 23036 38719 /* show color names/numbers across the top */ … … 23041 38724 /* show a grid of colors, with color names/ numbers on the left */ 23042 38725 for (i = (base_row * per_row); i < pairs_max; i++) { 23043 @@ -2132,12 +21 87,14 @@38726 @@ -2132,12 +2193,14 @@ 23044 38727 short pair = (short) i; 23045 38728 … … 23057 38740 if (opt_nums) { 23058 38741 sprintf(numbered, "{%02X}", i); 23059 @@ -2150,8 +22 07,8 @@38742 @@ -2150,8 +2213,8 @@ 23060 38743 addnwstr(buffer, width); 23061 38744 attr_set(A_NORMAL, 0, NULL); … … 23068 38751 ++shown; 23069 38752 } else if (shown) { 23070 @@ -2178,6 +22 35,12 @@38753 @@ -2178,6 +2241,12 @@ 23071 38754 case 'N': 23072 38755 opt_nums = TRUE; … … 23081 38764 done = TRUE; 23082 38765 continue; 23083 @@ -2802,6 +28 65,7 @@38766 @@ -2802,6 +2871,7 @@ 23084 38767 } attrs_to_cycle[] = { 23085 38768 { A_NORMAL, "normal" }, … … 23089 38772 { A_UNDERLINE, "underline" }, 23090 38773 }; 23091 @@ -2902,7 +29 66,7 @@38774 @@ -2902,7 +2972,7 @@ 23092 38775 do { 23093 38776 if (C1) … … 23098 38781 /* (yes, this _is_ crude) */ 23099 38782 while ((reply = Getchar()) != ERR) { 23100 @@ -2951,7 +30 15,7 @@38783 @@ -2951,7 +3021,7 @@ 23101 38784 */ 23102 38785 break; … … 23107 38790 } 23108 38791 } while (--count > 0); 23109 @@ -2969,15 +303 3,23 @@38792 @@ -2969,15 +3039,23 @@ 23110 38793 mvaddstr(0, 20, "Display of the ACS Line-Drawing Set"); 23111 38794 attroff(A_BOLD); … … 23139 38822 23140 38823 } 23141 @@ -3002,7 +30 74,7 @@38824 @@ -3002,7 +3080,7 @@ 23142 38825 { 23143 38826 int n; … … 23148 38831 erase(); 23149 38832 attron(A_BOLD); 23150 @@ -3238,7 +3310,7 @@ 38833 @@ -3212,7 +3290,7 @@ 38834 * the display. 38835 */ 38836 if (wcwidth(code) == 0) 38837 - addch(space | A_REVERSE); 38838 + addch(space | (A_REVERSE ^ attr) | COLOR_PAIR(pair)); 38839 /* 38840 * This could use add_wch(), but is done for comparison with the 38841 * normal 'f' test (and to make a test-case for echo_wchar()). 38842 @@ -3238,7 +3316,7 @@ 23151 38843 int col = (n / height) * COLS / 2; 23152 38844 … … 23157 38849 } 23158 38850 return n + 1; 23159 @@ -3307,12 +33 79,12 @@38851 @@ -3307,12 +3385,12 @@ 23160 38852 23161 38853 #undef MERGE_ATTR … … 23172 38864 (void) repeat; 23173 38865 erase(); 23174 @@ -3321,17 +339 3,23 @@38866 @@ -3321,17 +3399,23 @@ 23175 38867 attroff(A_BOLD); 23176 38868 refresh(); … … 23206 38898 23207 38899 } 23208 @@ -5804,7 +588 2,7 @@38900 @@ -5804,7 +5888,7 @@ 23209 38901 break; 23210 38902 case 2: … … 23217 38909 diff -Naur ncurses-5.7.orig/test/programs ncurses-5.7/test/programs 23218 38910 --- ncurses-5.7.orig/test/programs 2008-08-16 14:47:39.000000000 -0700 23219 +++ ncurses-5.7/test/programs 2009-0 3-22 21:16:52.255135912-070038911 +++ ncurses-5.7/test/programs 2009-06-05 14:00:59.000000000 -0700 23220 38912 @@ -1,4 +1,4 @@ 23221 38913 -# $Id: programs,v 1.14 2008/08/16 21:47:39 tom Exp $ … … 23242 38934 diff -Naur ncurses-5.7.orig/test/railroad.c ncurses-5.7/test/railroad.c 23243 38935 --- ncurses-5.7.orig/test/railroad.c 2008-02-09 10:08:43.000000000 -0800 23244 +++ ncurses-5.7/test/railroad.c 2009-0 3-22 21:17:08.400170414-070038936 +++ ncurses-5.7/test/railroad.c 2009-06-05 14:01:18.000000000 -0700 23245 38937 @@ -29,7 +29,7 @@ 23246 38938 /* … … 23289 38981 diff -Naur ncurses-5.7.orig/test/README ncurses-5.7/test/README 23290 38982 --- ncurses-5.7.orig/test/README 2008-10-18 14:02:45.000000000 -0700 23291 +++ ncurses-5.7/test/README 2009-0 3-22 21:16:52.251135633-070038983 +++ ncurses-5.7/test/README 2009-06-05 14:00:59.000000000 -0700 23292 38984 @@ -25,7 +25,7 @@ 23293 38985 -- sale, use or other dealings in this Software without prior written -- … … 23585 39277 diff -Naur ncurses-5.7.orig/test/test.priv.h ncurses-5.7/test/test.priv.h 23586 39278 --- ncurses-5.7.orig/test/test.priv.h 2008-10-04 14:53:41.000000000 -0700 23587 +++ ncurses-5.7/test/test.priv.h 2009-0 3-22 21:16:52.255135912-070039279 +++ ncurses-5.7/test/test.priv.h 2009-06-05 14:01:49.000000000 -0700 23588 39280 @@ -29,7 +29,7 @@ 23589 39281 /**************************************************************************** … … 23591 39283 ****************************************************************************/ 23592 39284 -/* $Id: test.priv.h,v 1.79 2008/10/04 21:53:41 tom Exp $ */ 23593 +/* $Id: test.priv.h,v 1.8 0 2008/12/20 16:37:20 tomExp $ */39285 +/* $Id: test.priv.h,v 1.81 2008/12/28 20:20:39 juergen Exp $ */ 23594 39286 23595 39287 #ifndef __TEST_PRIV_H … … 23605 39297 * Workaround for HPUX 23606 39298 */ 39299 @@ -464,6 +467,14 @@ 39300 #define EXIT_FAILURE 1 39301 #endif 39302 39303 +#ifdef __MINGW32__ 39304 +#include <nc_mingw.h> 39305 +/* conflicts in test/firstlast.c */ 39306 +#undef large 39307 +#undef small 39308 + 39309 +#endif 39310 + 39311 /* Use this to quiet gcc's -Wwrite-strings warnings, but accommodate SVr4 39312 * curses which doesn't have const parameters declared (so far) in the places 39313 * that XSI shows. 39314 @@ -560,7 +571,7 @@ 39315 #define USING_SCREEN(s,func,data) use_screen(s, (NCURSES_SCREEN_CB) func, data) 39316 #define WANT_USE_SCREEN() extern void _nc_want_use_screen(void) 39317 #else 39318 -#define USING_SCREEN(s,func,data) func(s,data) 39319 +#define USING_SCREEN(s,func,data) func(data) 39320 #define WANT_USE_SCREEN() extern void _nc_want_use_screen(void) 39321 #endif 39322 39323 diff -Naur ncurses-5.7.orig/test/view.c ncurses-5.7/test/view.c 39324 --- ncurses-5.7.orig/test/view.c 2008-09-06 15:10:50.000000000 -0700 39325 +++ ncurses-5.7/test/view.c 2009-06-05 14:01:49.000000000 -0700 39326 @@ -50,7 +50,7 @@ 39327 * scroll operation worked, and the refresh() code only had to do a 39328 * partial repaint. 39329 * 39330 - * $Id: view.c,v 1.69 2008/09/06 22:10:50 tom Exp $ 39331 + * $Id: view.c,v 1.70 2008/11/16 00:19:59 juergen Exp $ 39332 */ 39333 39334 #include <test.priv.h> 39335 @@ -62,8 +62,10 @@ 39336 #if HAVE_TERMIOS_H 39337 # include <termios.h> 39338 #else 39339 +#if !defined(__MINGW32__) 39340 # include <sgtty.h> 39341 #endif 39342 +#endif 39343 39344 #if !defined(sun) || !HAVE_TERMIOS_H 39345 # if HAVE_SYS_IOCTL_H 39346 diff -Naur ncurses-5.7.orig/test/worm.c ncurses-5.7/test/worm.c 39347 --- ncurses-5.7.orig/test/worm.c 2008-10-04 14:54:09.000000000 -0700 39348 +++ ncurses-5.7/test/worm.c 2009-06-05 14:01:49.000000000 -0700 39349 @@ -61,7 +61,7 @@ 39350 traces will be dumped. The program stops and waits for one character of 39351 input at the beginning and end of the interval. 39352 39353 - $Id: worm.c,v 1.58 2008/10/04 21:54:09 tom Exp $ 39354 + $Id: worm.c,v 1.59 2008/11/16 00:19:59 juergen Exp $ 39355 */ 39356 39357 #include <test.priv.h> 39358 @@ -330,7 +330,11 @@ 39359 while (!quit_worm(((struct worm *) arg) - worm)) { 39360 while (compare < sequence) { 39361 ++compare; 39362 +#if HAVE_USE_WINDOW 39363 use_window(stdscr, draw_worm, arg); 39364 +#else 39365 + draw_worm(stdscr, arg); 39366 +#endif 39367 } 39368 } 39369 Trace(("...start_worm (done)")); 39370 @@ -356,7 +360,13 @@ 39371 } 39372 #else 39373 for (n = 0, w = &worm[0]; n < number; n++, w++) { 39374 - if (USING_WINDOW2(stdscr, draw_worm, w)) 39375 + if ( 39376 +#if HAVE_USE_WINDOW 39377 + USING_WINDOW2(stdscr, draw_worm, w) 39378 +#else 39379 + draw_worm(stdscr, w) 39380 +#endif 39381 + ) 39382 done = TRUE; 39383 } 39384 #endif 23607 39385 diff -Naur ncurses-5.7.orig/TO-DO ncurses-5.7/TO-DO 23608 39386 --- ncurses-5.7.orig/TO-DO 2008-10-11 12:22:27.000000000 -0700 23609 +++ ncurses-5.7/TO-DO 2009-0 3-22 21:16:47.770848442-070039387 +++ ncurses-5.7/TO-DO 2009-06-05 14:00:53.000000000 -0700 23610 39388 @@ -25,7 +25,7 @@ 23611 39389 -- sale, use or other dealings in this Software without prior written --
Note:
See TracChangeset
for help on using the changeset viewer.
