Index: tches/ncurses-5.7-branch_update-4.patch
===================================================================
--- patches/ncurses-5.7-branch_update-4.patch	(revision 39806f8b8e61809daf1ec386359df0259e7bb2d5)
+++ 	(revision )
@@ -1,16574 +1,0 @@
-Submitted By: Jim Gifford (jim at cross-lfs dot org)
-Date: 01-08-2009
-Initial Package Version: 5.7
-Origin: Upstream
-Upstream Status: Applied
-Description: This is a branch update for NCurses-5.7, and should be
-             rechecked periodically. This patch covers up to 5.7-20090105.
-
-diff -Naur ncurses-5.7.orig/Ada95/samples/Makefile.in ncurses-5.7/Ada95/samples/Makefile.in
---- ncurses-5.7.orig/Ada95/samples/Makefile.in	2006-12-17 08:45:02.000000000 -0800
-+++ ncurses-5.7/Ada95/samples/Makefile.in	2009-01-08 19:48:08.000000000 -0800
-@@ -1,5 +1,5 @@
- ##############################################################################
--# Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2005,2008 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -28,7 +28,7 @@
- #
- #  Author:  Juergen Pfeifer, 1996
- #
--#  $Id: Makefile.in,v 1.34 2006/12/17 16:45:02 tom Exp $
-+#  $Id: Makefile.in,v 1.35 2008/11/23 00:17:20 juergen Exp $
- #
- .SUFFIXES:
- 
-@@ -145,7 +145,7 @@
- 
- clean :: mostlyclean
- 	rm -f *.o *.ali b_t*.* *.s $(PROGS) a.out core b_*_test.c *.xr[bs] \
--	explain.msg trace screendump 
-+	explain.msg trace screendump b~*.ad[bs]
- 
- distclean :: clean
- 	rm -f Makefile
-diff -Naur ncurses-5.7.orig/Ada95/src/Makefile.in ncurses-5.7/Ada95/src/Makefile.in
---- ncurses-5.7.orig/Ada95/src/Makefile.in	2007-09-15 11:22:24.000000000 -0700
-+++ ncurses-5.7/Ada95/src/Makefile.in	2009-01-08 19:48:29.000000000 -0800
-@@ -1,5 +1,5 @@
- ##############################################################################
--# Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -28,7 +28,7 @@
- #
- #  Author:  Juergen Pfeifer, 1996
- #
--#  $Id: Makefile.in,v 1.31 2007/09/15 18:22:24 tom Exp $
-+#  $Id: Makefile.in,v 1.32 2009/01/03 19:12:01 tom Exp $
- #
- .SUFFIXES:
- 
-@@ -46,7 +46,7 @@
- INSTALL_DATA	= @INSTALL_DATA@
- 
- AR		= @AR@
--AR_OPTS		= @AR_OPTS@
-+ARFLAGS		= @ARFLAGS@
- AWK		= @AWK@
- LN_S		= @LN_S@
- 
-@@ -168,7 +168,7 @@
- 	@echo done
- 
- libAdaCurses.a :: dotouch $(LIBOBJS) @cf_generic_objects@
--	$(AR) $(AR_OPTS) $@ $(LIBOBJS) @cf_generic_objects@
-+	$(AR) $(ARFLAGS) $@ $(LIBOBJS) @cf_generic_objects@
- 
- dotouch :
- 	@sh -c 'for f in $(LIBALIS) $(GENALIS); do test -f $$f || touch $$f; done'
-diff -Naur ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb
---- ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb	2008-07-26 11:51:11.000000000 -0700
-+++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb	2009-01-08 19:48:08.000000000 -0800
-@@ -35,8 +35,8 @@
- ------------------------------------------------------------------------------
- --  Author:  Juergen Pfeifer, 1996
- --  Version Control:
----  $Revision: 1.22 $
----  $Date: 2008/07/26 18:51:11 $
-+--  $Revision: 1.23 $
-+--  $Date: 2008/11/16 00:19:59 $
- --  Binding Version 01.00
- ------------------------------------------------------------------------------
- with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
-@@ -50,7 +50,7 @@
-    function Has_Mouse return Boolean
-    is
-       function Mouse_Avail return C_Int;
--      pragma Import (C, Mouse_Avail, "_nc_has_mouse");
-+      pragma Import (C, Mouse_Avail, "has_mouse");
-    begin
-       if Has_Key (Key_Mouse) or else Mouse_Avail /= 0 then
-          return True;
-diff -Naur ncurses-5.7.orig/INSTALL ncurses-5.7/INSTALL
---- ncurses-5.7.orig/INSTALL	2008-11-02 13:13:51.000000000 -0800
-+++ ncurses-5.7/INSTALL	2009-01-08 19:48:29.000000000 -0800
-@@ -1,5 +1,5 @@
- -------------------------------------------------------------------------------
---- Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.               --
-+-- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.               --
- --                                                                           --
- -- Permission is hereby granted, free of charge, to any person obtaining a   --
- -- copy of this software and associated documentation files (the             --
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: INSTALL,v 1.135 2008/11/02 21:13:51 tom Exp $
-+-- $Id: INSTALL,v 1.137 2009/01/03 23:59:23 tom Exp $
- ---------------------------------------------------------------------
-              How to install Ncurses/Terminfo on your system
- ---------------------------------------------------------------------
-@@ -525,6 +525,11 @@
- 	terminfo entries.  This is the default, unless you have disabled the
- 	extended functions.
- 
-+    --enable-pc-files
-+	If pkg-config is found (see --with-pkg-config), generate ".pc" files
-+	for each of the libraries, and install them in pkg-config's library
-+	directory.
-+
-     --enable-reentrant
- 	Compile experimental configuration which improves reentrant use of the
- 	library by reducing global and static variables.  This option is also
-@@ -850,6 +855,9 @@
- 	those using termcap, do not use the higher speeds.  Your application
- 	(or system, in general) may or may not.
- 
-+    --with-pkg-config=[DIR]
-+	Check for pkg-config, optionally specifying its path.
-+
-     --with-profile
- 	Generate profile-libraries These are named by adding "_p" to the root,
- 	e.g., libncurses_p.a
-@@ -975,6 +983,9 @@
-     --without-dlsym
- 	Do not use dlsym() to load GPM dynamically.
- 
-+    --without-manpages
-+	Tell the configure script to suppress the install of ncurses' manpages.
-+
-     --without-progs
- 	Tell the configure script to suppress the build of ncurses' application
- 	programs (e.g., tic).  The test applications will still be built if you
-diff -Naur ncurses-5.7.orig/MANIFEST ncurses-5.7/MANIFEST
---- ncurses-5.7.orig/MANIFEST	2008-10-25 16:47:24.000000000 -0700
-+++ ncurses-5.7/MANIFEST	2009-01-08 19:48:29.000000000 -0800
-@@ -640,6 +640,7 @@
- ./man/ncurses.3x
- ./man/panel.3x
- ./man/resizeterm.3x
-+./man/tabs.1
- ./man/term.5
- ./man/term.7
- ./man/terminfo.head
-@@ -694,6 +695,7 @@
- ./misc/emx.src
- ./misc/form.def
- ./misc/form.ref
-+./misc/gen-pkgconfig.in
- ./misc/gen_edit.sh
- ./misc/jpf-indent
- ./misc/makedef.cmd
-@@ -947,6 +949,7 @@
- ./progs/infocmp.c
- ./progs/modules
- ./progs/progs.priv.h
-+./progs/tabs.c
- ./progs/tic.c
- ./progs/toe.c
- ./progs/tput.c
-@@ -963,6 +966,7 @@
- ./test/cardfile.c
- ./test/cardfile.dat
- ./test/chgat.c
-+./test/clip_printw.c
- ./test/color_set.c
- ./test/configure
- ./test/configure.in
-@@ -990,6 +994,7 @@
- ./test/inch_wide.c
- ./test/inchs.c
- ./test/ins_wide.c
-+./test/insdelln.c
- ./test/inserts.c
- ./test/key_names.c
- ./test/keynames.c
-diff -Naur ncurses-5.7.orig/NEWS ncurses-5.7/NEWS
---- ncurses-5.7.orig/NEWS	2008-11-01 17:56:22.000000000 -0700
-+++ ncurses-5.7/NEWS	2009-01-08 19:48:34.000000000 -0800
-@@ -1,5 +1,5 @@
- -------------------------------------------------------------------------------
---- Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.               --
-+-- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.               --
- --                                                                           --
- -- Permission is hereby granted, free of charge, to any person obtaining a   --
- -- copy of this software and associated documentation files (the             --
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.1320 2008/11/02 00:56:22 tom Exp $
-+-- $Id: NEWS,v 1.1353 2009/01/06 00:26:35 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,105 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20090105
-+	+ remove undeveloped feature in ncurses-config.in for setting
-+	  prefix variable.
-+	+ recent change to ncurses-config.in did not take into account the
-+	  --disable-overwrite option, which sets $includedir to the
-+	  subdirectory and using just that for a -I option does not work - fix
-+	  (report by Frederic L W Meunier).
-+
-+20090104
-+	+ modify gen-pkgconfig.in to eliminate a dependency on rpath when
-+	  deciding whether to add $LIBS to --libs output; that should be shown
-+	  for the ncurses and tinfo libraries without taking rpath into
-+	  account.
-+	+ fix an overlooked change from $AR_OPTS to $ARFLAGS in mk-1st.awk,
-+	  used in static libraries (report by Marty Jack).
-+
-+20090103
-+	+ add a configure-time check to pick a suitable value for
-+	  CC_SHARED_OPTS for Solaris (report by Dagobert Michelsen).
-+	+ add configure --with-pkg-config and --enable-pc-files options, along
-+	  with misc/gen-pkgconfig.in which can be used to generate ".pc" files
-+	  for pkg-config (request by Jan Engelhardt).
-+	+ use $includedir symbol in misc/ncurses-config.in, add --includedir
-+	  option.
-+	+ change makefiles to use $ARFLAGS rather than $AR_OPTS, provide a
-+	  configure check to detect whether a "-" is needed before "ar"
-+	  options.
-+	+ update config.guess, config.sub from
-+		http://savannah.gnu.org/projects/config
-+
-+20081227
-+	+ modify mk-1st.awk to work with extra categories for tinfo library.
-+	+ modify configure script to allow building shared libraries with gcc
-+	  on AIX 5 or 6 (adapted from patch by Lital Natan).
-+
-+20081220
-+	+ modify to omit the opaque-functions from lib_gen.o when
-+	  --disable-ext-funcs is used.
-+	+ add test/clip_printw.c to illustrate how to use printw without
-+	  wrapping.
-+	+ modify ncurses 'F' test to demo wborder_set() with colored lines.
-+	+ modify ncurses 'f' test to demo wborder() with colored lines.
-+
-+20081213
-+	+ add check for failure to open hashed-database needed for db4.6
-+	  (GenToo #245370).
-+	+ corrected --without-manpages option; previous change only suppressed
-+	  the auxiliary rules install.man and uninstall.man
-+	+ add case for FreeMINT to configure macro CF_XOPEN_SOURCE (patch from
-+	  GenToo #250454).
-+	+ fixes from NetBSD port at
-+	  http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/devel/ncurses/patches
-+	  patch-ac (build-fix for DragonFly)
-+	  patch-ae (use INSTALL_SCRIPT for installing misc/ncurses*-config).
-+	+ improve configure script macros CF_HEADER_PATH and CF_LIBRARY_PATH
-+	  by adding CFLAGS, CPPFLAGS and LDFLAGS, LIBS values to the
-+	  search-lists.
-+	+ correct title string for keybound manpage (patch by Frederic Culot,
-+	  OpenBSD documentation/6019),
-+
-+20081206
-+	+ move del_curterm() call from _nc_freeall() to _nc_leaks_tinfo() to
-+	  work for progs/clear, progs/tabs, etc.
-+	+ correct buffer-size after internal resizing of wide-character
-+	  set_field_buffer(), broken in 20081018 changes (report by Mike Gran).
-+	+ add "-i" option to test/filter.c to tell it to use initscr() rather
-+	  than newterm(), to investigate report on comp.unix.programmer that
-+	  ncurses would clear the screen in that case (it does not - the issue
-+	  was xterm's alternate screen feature).
-+	+ add check in mouse-driver to disable connection if GPM returns a
-+	  zero, indicating that the connection is closed (Debian #506717,
-+	  adapted from patch by Samuel Thibault).
-+
-+20081129
-+	+ improve a workaround in adding wide-characters, when a control
-+	  character is found.  The library (cf: 20040207) uses unctrl() to
-+	  obtain a printable version of the control character, but was not
-+	  passing color or video attributes.
-+	+ improve test/ncurses.c 'a' test, using unctrl() more consistently to
-+	  display meta-characters.
-+	+ turn on _XOPEN_CURSES definition in curses.h
-+	+ add eterm-color entry (report by Vincent Lefevre) -TD
-+	+ correct use of key_name() in test/ncurses.c 'A' test, which only
-+	  displays wide-characters, not key-codes since 20070612 (report by
-+	  Ricardo Cantu).
-+
-+20081122
-+	+ change _nc_has_mouse() to has_mouse(), reflect its use in C++ and
-+	  Ada95 (patch by Juergen Pfeifer).
-+	+ document in TO-DO an issue with Cygwin's package for GNAT (report
-+	  by Mike Dennison).
-+	+ improve error-checking of command-line options in "tabs" program.
-+
-+20081115
-+	+ change several terminfo entries to make consistent use of ANSI
-+	  clear-all-tabs -TD
-+	+ add "tabs" program (prompted by Debian #502260).
-+	+ add configure --without-manpages option (request by Mike Frysinger).
-+
- 20081102 5.7 release for upload to ftp.gnu.org
- 
- 20081025
-diff -Naur ncurses-5.7.orig/TO-DO ncurses-5.7/TO-DO
---- ncurses-5.7.orig/TO-DO	2008-10-11 12:22:27.000000000 -0700
-+++ ncurses-5.7/TO-DO	2009-01-08 19:48:12.000000000 -0800
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: TO-DO,v 1.51 2008/10/11 19:22:27 tom Exp $
-+-- $Id: TO-DO,v 1.53 2008/11/28 16:39:12 tom Exp $
- -------------------------------------------------------------------------------
- 
- SHORT-TERM TO-DO ITEMS:
-@@ -45,7 +45,7 @@
- + Scrolling optimization has holes:  for example, it forces repaints of the
-   screen between calls to refresh().
- 
--+ SVr4 uses slightly different rules for determining when softkeys are shown. 
-++ SVr4 uses slightly different rules for determining when softkeys are shown.
-   For example, they are initially displayed (before the ncurses 'e' test
-   activates them), and a touchwin can apparently also force them to be
-   displayed.
-@@ -58,7 +58,7 @@
- + The window classes defined in the c++ subdirectory need documentation.  Some
-   C++ programmer could earn a lot of good karma by doing this...
- 
--+ vid_attr() should support the set_a_attributes (sgr1) string, but does not. 
-++ vid_attr() should support the set_a_attributes (sgr1) string, but does not.
-   There appear to be no terminals that require that functionality.
- 
- + the configure --disable-ext-funcs option does not work for Ada95 tree.
-@@ -66,6 +66,24 @@
- + the --with-pthread configuration builds for Cygwin, but does not work
-   properly (test/worm.c shows all of the worms in the same location).
- 
-++ the Ada95 tree requires a small fix to build on Cygwin, since the GNAT port
-+  to that platform provides an incomplete Interrupts.Names package.  For
-+  instance (your gcc version may be different):
-+        /usr/lib/gcc/i686-pc-cygwin/3.4.4/adainclude/a-intnam.ads
-+
-+  cut here...
-+-------------------------------------------------------------------------------
-+--- a-intnam.ads.orig   2003-10-21 13:41:51.000000000 +0000
-++++ a-intnam.ads        2007-05-05 22:40:02.609375000 +0000
-+@@ -44,5 +44,6 @@
-+
-+    DUMMY_INTERRUPT_1 : constant Interrupt_ID := 1;
-+    DUMMY_INTERRUPT_2 : constant Interrupt_ID := 2;
-++   SIGINT : constant Interrupt_ID := 2;
-+
-+ end Ada.Interrupts.Names;
-+-------------------------------------------------------------------------------
-+
- + the --enable-rpath configure option builds for the corresponding platforms;
-   however combining it with --with-ticlib and --with-termlib does not always
-   produce libraries that can be run without setting environment variables.
-@@ -122,7 +140,7 @@
- 2. DOS port
- 
- Only a few of the files in the library depend on the terminfo format.
--It should be possible to further kernelize the package, then rewrite 
-+It should be possible to further kernelize the package, then rewrite
- a small number of core files to produce a functionally-compatible
- port that would do updates to a memory-mapped screen area.  The first
- result of this would be a DOS port.
-@@ -195,10 +213,10 @@
- 		move_insert, dest_tabs_magic_smso, transparent_underline,
- 		needs_xon_xoff, hard_cursor.
- 	Numerics: lines_of_memory, buttons.
--	Strings: pkey_key, pkey_local, pkey_xmit, underline_char, 
--		enter_xon_mode,	exit_xon_mode, xon_character, xoff_character, 
-+	Strings: pkey_key, pkey_local, pkey_xmit, underline_char,
-+		enter_xon_mode,	exit_xon_mode, xon_character, xoff_character,
- 		display_clock, remove_clock, user[0-5], display_pc_char,
--		enter_scancode_mode, exit_scancode_mode, pc_term_options, 
-+		enter_scancode_mode, exit_scancode_mode, pc_term_options,
- 		scancode_escape, alt_scancode_esc.
- 
- These are the potentially important ones for ncurses.  Notes:
-diff -Naur ncurses-5.7.orig/aclocal.m4 ncurses-5.7/aclocal.m4
---- ncurses-5.7.orig/aclocal.m4	2008-10-25 15:15:32.000000000 -0700
-+++ ncurses-5.7/aclocal.m4	2009-01-08 19:48:29.000000000 -0800
-@@ -1,5 +1,5 @@
- dnl***************************************************************************
--dnl Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-+dnl Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
- dnl                                                                          *
- dnl Permission is hereby granted, free of charge, to any person obtaining a  *
- dnl copy of this software and associated documentation files (the            *
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: aclocal.m4,v 1.470 2008/10/25 22:15:32 tom Exp $
-+dnl $Id: aclocal.m4,v 1.481 2009/01/04 00:11:12 tom Exp $
- dnl Macros used in NCURSES auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -168,7 +168,7 @@
- 
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_ADD_INCDIR version: 9 updated: 2008/02/09 13:15:34
-+dnl CF_ADD_INCDIR version: 10 updated: 2008/12/27 12:30:03
- dnl -------------
- dnl Add an include-directory to $CPPFLAGS.  Don't add /usr/include, since it's
- dnl redundant.  We don't normally need to add -I/usr/local/include for gcc,
-@@ -195,7 +195,7 @@
- 		fi
- 
- 		if test "$cf_have_incdir" = no ; then
--          if test "$cf_add_incdir" = /usr/local/include ; then
-+		  if test "$cf_add_incdir" = /usr/local/include ; then
- 			if test "$GCC" = yes
- 			then
- 			  cf_save_CPPFLAGS=$CPPFLAGS
-@@ -213,9 +213,9 @@
- 		  CF_VERBOSE(adding $cf_add_incdir to include-path)
- 		  ifelse($2,,CPPFLAGS,$2)="-I$cf_add_incdir $ifelse($2,,CPPFLAGS,[$]$2)"
- 
--          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
--          test "$cf_top_incdir" = "$cf_add_incdir" && break
--          cf_add_incdir="$cf_top_incdir"
-+		  cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
-+		  test "$cf_top_incdir" = "$cf_add_incdir" && break
-+		  cf_add_incdir="$cf_top_incdir"
- 		else
- 		  break
- 		fi
-@@ -353,7 +353,41 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_AWK_BIG_PRINTF version: 2 updated: 2008/10/04 17:16:18
-+dnl CF_AR_FLAGS version: 2 updated: 2009/01/01 20:45:18
-+dnl -----------
-+dnl Check for suitable "ar" (archiver) options for updating an archive.
-+AC_DEFUN([CF_AR_FLAGS],[
-+AC_REQUIRE([CF_PROG_AR])
-+
-+AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[
-+	cf_cv_ar_flags=unknown
-+	for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
-+	do
-+		rm -f conftest.$ac_cv_objext
-+		rm -f conftest.a
-+
-+		cat >conftest.$ac_ext <<EOF
-+#line __oline__ "configure"
-+int	testdata[[3]] = { 123, 456, 789 };
-+EOF
-+		if AC_TRY_EVAL(ac_compile) ; then
-+			$AR $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&AC_FD_CC 1>/dev/null
-+			if test -f conftest.a ; then
-+				cf_cv_ar_flags=$cf_ar_flags
-+				break
-+			fi
-+		else
-+			CF_VERBOSE(cannot compile test-program)
-+			break
-+		fi
-+	done
-+	rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
-+])
-+
-+AC_SUBST(ARFLAGS,$cf_cv_ar_flags)
-+])
-+dnl ---------------------------------------------------------------------------
-+dnl CF_AWK_BIG_PRINTF version: 3 updated: 2008/12/27 12:30:03
- dnl -----------------
- dnl Check if awk can handle big strings using printf.  Some older versions of
- dnl awk choke on large strings passed via "%s".
-@@ -362,19 +396,19 @@
- dnl $2 = variable to set with result
- AC_DEFUN([CF_AWK_BIG_PRINTF],
- [
--    case x$AWK in #(vi
--    x)
--        eval $2=no
--        ;;
--    *) #(vi
--        if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < $1) { xx = xx "x"; }; printf("%s\n", xx); }' \
--            | $AWK '{ printf "%d\n", length([$]0); }' | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ([$]0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then
--            eval $2=yes
--        else
--            eval $2=no
--        fi
--        ;;
--    esac
-+	case x$AWK in #(vi
-+	x)
-+		eval $2=no
-+		;;
-+	*) #(vi
-+		if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < $1) { xx = xx "x"; }; printf("%s\n", xx); }' \
-+			| $AWK '{ printf "%d\n", length([$]0); }' | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ([$]0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then
-+			eval $2=yes
-+		else
-+			eval $2=no
-+		fi
-+		;;
-+	esac
- ])dnl
- dnl ---------------------------------------------------------------------------
- dnl CF_BOOL_DECL version: 8 updated: 2004/01/30 15:51:18
-@@ -1019,7 +1053,7 @@
- CXXFLAGS="$cf_save_CXXFLAGS"
- ])
- dnl ---------------------------------------------------------------------------
--dnl CF_FIND_LINKAGE version: 12 updated: 2007/07/29 20:13:53
-+dnl CF_FIND_LINKAGE version: 13 updated: 2008/12/24 07:59:55
- dnl ---------------
- dnl Find a library (specifically the linkage used in the code fragment),
- dnl searching for it if it is not already in the library path.
-@@ -1052,6 +1086,7 @@
-     cf_cv_find_linkage_$3=yes,[
-     cf_cv_find_linkage_$3=no
- 
-+    CF_VERBOSE(find linkage for $3 library)
-     CF_MSG_LOG([Searching for headers in [FIND_LINKAGE]($3,$6)])
- 
-     cf_save_CPPFLAGS="$CPPFLAGS"
-@@ -1998,11 +2033,31 @@
- ])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_HEADER_PATH version: 8 updated: 2002/11/10 14:46:59
-+dnl CF_HEADER_PATH version: 9 updated: 2008/12/07 19:38:31
- dnl --------------
--dnl Construct a search-list for a nonstandard header-file
-+dnl Construct a search-list of directories for a nonstandard header-file
-+dnl
-+dnl Parameters
-+dnl	$1 = the variable to return as result
-+dnl	$2 = the package name
- AC_DEFUN([CF_HEADER_PATH],
--[CF_SUBDIR_PATH($1,$2,include)
-+[
-+cf_header_path_list=""
-+if test -n "${CFLAGS}${CPPFLAGS}" ; then
-+	for cf_header_path in $CPPFLAGS $CFLAGS
-+	do
-+		case $cf_header_path in #(vi
-+		-I*)
-+			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
-+			CF_ADD_SUBDIR_PATH($1,$2,include,$cf_header_path,NONE)
-+			cf_header_path_list="$cf_header_path_list [$]$1"
-+			;;
-+		esac
-+	done
-+fi
-+
-+CF_SUBDIR_PATH($1,$2,include)
-+
- test "$includedir" != NONE && \
- test "$includedir" != "/usr/include" && \
- test -d "$includedir" && {
-@@ -2017,6 +2072,7 @@
- 	test -d $oldincludedir/$2 && $1="[$]$1 $oldincludedir/$2"
- }
- 
-+$1="$cf_header_path_list [$]$1"
- ])dnl
- dnl ---------------------------------------------------------------------------
- dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23
-@@ -2143,7 +2199,7 @@
- ])
- ])
- dnl ---------------------------------------------------------------------------
--dnl CF_LDFLAGS_STATIC version: 4 updated: 2008/10/18 17:58:20
-+dnl CF_LDFLAGS_STATIC version: 5 updated: 2008/12/27 12:30:03
- dnl -----------------
- dnl Check for compiler/linker flags used to temporarily force usage of static
- dnl libraries.  This depends on the compiler and platform.  Use this to help
-@@ -2153,7 +2209,7 @@
- 
- if test "$GCC" = yes ; then
- 	case $cf_cv_system_name in #(
--	OS/2*|os2*|aix[[45]]*) 	#( vi
-+	OS/2*|os2*|aix[[4]]*) 	#( vi
- 		LDFLAGS_STATIC=
- 		LDFLAGS_SHARED=
- 		;;
-@@ -2164,7 +2220,7 @@
-     esac
- else
- 	case $cf_cv_system_name in #(
--	aix[[45]]*) 	#( from ld manpage
-+	aix[[456]]*) 	#( from ld manpage
- 		LDFLAGS_STATIC=-bstatic
- 		LDFLAGS_SHARED=-bdynamic
- 		;;
-@@ -2179,7 +2235,7 @@
- 		;;
- 	osf[[45]]*)	#( from ld manpage osf4.0d, osf5.1
- 		# alternative "-oldstyle_liblookup" (not in cc manpage)
--		LDFLAGS_STATIC=-noso 
-+		LDFLAGS_STATIC=-noso
- 		LDFLAGS_SHARED=-so_archive
- 		;;
- 	solaris2*)
-@@ -2193,11 +2249,33 @@
- AC_SUBST(LDFLAGS_SHARED)
- ])
- dnl ---------------------------------------------------------------------------
--dnl CF_LIBRARY_PATH version: 7 updated: 2002/11/10 14:46:59
-+dnl CF_LIBRARY_PATH version: 8 updated: 2008/12/07 19:38:31
- dnl ---------------
--dnl Construct a search-list for a nonstandard library-file
-+dnl Construct a search-list of directories for a nonstandard library-file
-+dnl
-+dnl Parameters
-+dnl	$1 = the variable to return as result
-+dnl	$2 = the package name
- AC_DEFUN([CF_LIBRARY_PATH],
--[CF_SUBDIR_PATH($1,$2,lib)])dnl
-+[
-+cf_library_path_list=""
-+if test -n "${LDFLAGS}${LIBS}" ; then
-+	for cf_library_path in $LDFLAGS $LIBS
-+	do
-+		case $cf_library_path in #(vi
-+		-L*)
-+			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
-+			CF_ADD_SUBDIR_PATH($1,$2,lib,$cf_library_path,NONE)
-+			cf_library_path_list="$cf_library_path_list [$]$1"
-+			;;
-+		esac
-+	done
-+fi
-+
-+CF_SUBDIR_PATH($1,$2,lib)
-+
-+$1="$cf_library_path_list [$]$1"
-+])dnl
- dnl ---------------------------------------------------------------------------
- dnl CF_LIB_PREFIX version: 8 updated: 2008/09/13 11:34:16
- dnl -------------
-@@ -2216,7 +2294,7 @@
- 	AC_SUBST(LIB_PREFIX)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_LIB_RULES version: 53 updated: 2008/09/20 19:51:59
-+dnl CF_LIB_RULES version: 55 updated: 2008/12/13 16:17:38
- dnl ------------
- dnl Append definitions and rules for the given models to the subdirectory
- dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
-@@ -2504,18 +2582,28 @@
- install.libs uninstall.libs \\
- install.data uninstall.data ::
- $MAKE_TERMINFO	cd misc && \${MAKE} \${CF_MFLAGS} \[$]@
-+CF_EOF
-+
-+if test "x$cf_with_manpages" = xyes; then
-+cat >> Makefile <<CF_EOF
- 
- install.man \\
- uninstall.man ::
- 	cd man && \${MAKE} \${CF_MFLAGS} \[$]@
-+CF_EOF
-+fi
-+
-+cat >> Makefile <<CF_EOF
- 
- distclean ::
- 	rm -f config.cache config.log config.status Makefile include/ncurses_cfg.h
- 	rm -f headers.sh headers.sed mk_shared_lib.sh
-+	rm -f edit_man.* man_alias.*
- 	rm -rf \${DIRS_TO_MAKE}
- CF_EOF
- 
- # Special case: tack's manpage lives in its own directory.
-+if test "x$cf_with_manpages" = xyes; then
- if test -d tack ; then
- if test -f $srcdir/$tack.h; then
- cat >> Makefile <<CF_EOF
-@@ -2526,6 +2614,7 @@
- CF_EOF
- fi
- fi
-+fi
- 
- dnl If we're installing into a subdirectory of /usr/include, etc., we should
- dnl prepend the subdirectory's name to the "#include" paths.  It won't hurt
-@@ -2679,7 +2768,7 @@
- ])
- ])
- dnl ---------------------------------------------------------------------------
--dnl CF_LIB_SUFFIX version: 15 updated: 2008/09/13 11:54:48
-+dnl CF_LIB_SUFFIX version: 16 updated: 2008/12/27 12:30:03
- dnl -------------
- dnl Compute the library file-suffix from the given model name
- dnl $1 = model name
-@@ -2689,40 +2778,44 @@
- AC_DEFUN([CF_LIB_SUFFIX],
- [
- 	AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
--	case $1 in
--	libtool)
-+	case $1 in #(vi
-+	libtool) #(vi
- 		$2='.la'
- 		$3=[$]$2
- 		;;
--	normal)
-+	normal) #(vi
- 		$2='.a'
- 		$3=[$]$2
- 		;;
--	debug)
-+	debug) #(vi
- 		$2='_g.a'
- 		$3=[$]$2
- 		;;
--	profile)
-+	profile) #(vi
- 		$2='_p.a'
- 		$3=[$]$2
- 		;;
--	shared)
-+	shared) #(vi
- 		case $cf_cv_system_name in
--		cygwin*)
-+		aix[[56]]*) #(vi
-+			$2='.a'
-+			$3=[$]$2
-+			;;
-+		cygwin*) #(vi
- 			$2='.dll'
- 			$3='.dll.a'
- 			;;
--		darwin*)
-+		darwin*) #(vi
- 			$2='.dylib'
- 			$3=[$]$2
- 			;;
--		hpux*)
-+		hpux*) #(vi
- 			case $target in
--			ia64*)
-+			ia64*) #(vi
- 				$2='.so'
- 				$3=[$]$2
- 				;;
--			*)
-+			*) #(vi
- 				$2='.sl'
- 				$3=[$]$2
- 				;;
-@@ -2755,7 +2848,7 @@
- 	test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}"
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_LINK_DATAONLY version: 8 updated: 2006/12/16 12:33:30
-+dnl CF_LINK_DATAONLY version: 9 updated: 2009/01/01 20:21:38
- dnl ----------------
- dnl Some systems have a non-ANSI linker that doesn't pull in modules that have
- dnl only data (i.e., no functions), for example NeXT.  On those systems we'll
-@@ -2772,7 +2865,7 @@
- EOF
- 	if AC_TRY_EVAL(ac_compile) ; then
- 		mv conftest.o data.o && \
--		( $AR $AR_OPTS conftest.a data.o ) 2>&AC_FD_CC 1>/dev/null
-+		( $AR $ARFLAGS conftest.a data.o ) 2>&AC_FD_CC 1>/dev/null
- 	fi
- 	rm -f conftest.$ac_ext data.o
- 	cat >conftest.$ac_ext <<EOF
-@@ -2791,7 +2884,7 @@
- EOF
- 	if AC_TRY_EVAL(ac_compile); then
- 		mv conftest.o func.o && \
--		( $AR $AR_OPTS conftest.a func.o ) 2>&AC_FD_CC 1>/dev/null
-+		( $AR $ARFLAGS conftest.a func.o ) 2>&AC_FD_CC 1>/dev/null
- 	fi
- 	rm -f conftest.$ac_ext func.o
- 	( eval $RANLIB conftest.a ) 2>&AC_FD_CC >/dev/null
-@@ -3737,6 +3830,38 @@
- esac
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_PKG_CONFIG version: 2 updated: 2008/12/24 07:57:28
-+dnl -------------
-+dnl Check for the package-config program, unless disabled by command-line.
-+AC_DEFUN([CF_PKG_CONFIG],
-+[
-+AC_MSG_CHECKING(if you want to use pkg-config)
-+AC_ARG_WITH(pkg-config,
-+	[  --with-pkg-config{=path} enable/disable use of pkg-config],
-+	[cf_pkg_config=$withval],
-+	[cf_pkg_config=yes])
-+AC_MSG_RESULT($cf_pkg_config)
-+
-+case $cf_pkg_config in
-+no)
-+	PKG_CONFIG=none
-+	;;
-+yes)
-+	AC_PATH_PROG(PKG_CONFIG, pkg-config, none)
-+	;;
-+*)
-+	PKG_CONFIG=$withval
-+	;;
-+esac
-+
-+test -z "$PKG_CONFIG" && PKG_CONFIG=none
-+if test "$PKG_CONFIG" != none ; then
-+	CF_PATH_SYNTAX(PKG_CONFIG)
-+fi
-+
-+AC_SUBST(PKG_CONFIG)
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_POSIX_C_SOURCE version: 6 updated: 2005/07/14 20:25:10
- dnl -----------------
- dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed.
-@@ -3872,6 +3997,13 @@
- 
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_PROG_AR version: 1 updated: 2009/01/01 20:15:22
-+dnl ----------
-+dnl Check for archiver "ar".
-+AC_DEFUN([CF_PROG_AR],[
-+AC_CHECK_TOOL(AR, ar, ar)
-+])
-+dnl ---------------------------------------------------------------------------
- dnl CF_PROG_AWK version: 1 updated: 2006/09/16 11:40:59
- dnl -----------
- dnl Check for awk, ensure that the check found something.
-@@ -4003,7 +4135,7 @@
- esac
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_PROG_LDCONFIG version: 1 updated: 2003/09/20 17:07:55
-+dnl CF_PROG_LDCONFIG version: 2 updated: 2008/12/13 14:08:40
- dnl ----------------
- dnl Check for ldconfig, needed to fixup shared libraries that would be built
- dnl and then used in the install.
-@@ -4012,7 +4144,7 @@
-   LDCONFIG=:
- else
- case "$cf_cv_system_name" in #(vi
--freebsd*) #(vi
-+dragonfly*|freebsd*) #(vi
-   test -z "$LDCONFIG" && LDCONFIG="/sbin/ldconfig -R"
-   ;;
- *) LDPATH=$PATH:/sbin:/usr/sbin
-@@ -4147,7 +4279,7 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_SHARED_OPTS version: 53 updated: 2008/10/25 18:14:20
-+dnl CF_SHARED_OPTS version: 56 updated: 2009/01/03 19:10:38
- dnl --------------
- dnl --------------
- dnl Attempt to determine the appropriate CC/LD options for creating a shared
-@@ -4176,6 +4308,7 @@
- 	AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
- 	LOCAL_LDFLAGS=
- 	LOCAL_LDFLAGS2=
-+	LD_RPATH_OPT=
- 	LD_SHARED_OPTS=
- 	INSTALL_LIB="-m 644"
- 
-@@ -4219,6 +4352,12 @@
- 	cf_cv_shlib_version_infix=no
- 
- 	case $cf_cv_system_name in
-+	aix[[56]]*)
-+		if test "$GCC" = yes; then
-+			CC_SHARED_OPTS=
-+			MK_SHARED_LIB="$(CC) -shared"
-+		fi
-+		;;
- 	beos*)
- 		MK_SHARED_LIB='${CC} ${CFLAGS} -o $[@] -Xlinker -soname=`basename $[@]` -nostart -e 0'
- 		;;
-@@ -4239,7 +4378,7 @@
- EOF
- 		exec \[$]* -shared -Wl,--out-implib=../lib/\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\[$]{SHARED_LIB}
- CF_EOF
--		chmod +x mk_shared_lib.sh 
-+		chmod +x mk_shared_lib.sh
- 		;;
- 	darwin*)
- 		EXTRA_CFLAGS="-no-cpp-precomp"
-@@ -4272,10 +4411,10 @@
- 	irix*)
- 		if test "$cf_cv_ld_rpath" = yes ; then
- 			if test "$GCC" = yes; then
--				cf_ld_rpath_opt="-Wl,-rpath,"
-+				LD_RPATH_OPT="-Wl,-rpath,"
- 				EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
- 			else
--				cf_ld_rpath_opt="-rpath "
-+				LD_RPATH_OPT="-rpath "
- 				EXTRA_LDFLAGS="-rpath \${libdir} $EXTRA_LDFLAGS"
- 			fi
- 		fi
-@@ -4294,7 +4433,7 @@
- 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
- 		fi
- 		if test "$cf_cv_ld_rpath" = yes ; then
--			cf_ld_rpath_opt="-Wl,-rpath,"
-+			LD_RPATH_OPT="-Wl,-rpath,"
- 			EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
- 		fi
- 		CF_SHARED_SONAME
-@@ -4306,7 +4445,7 @@
- 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
- 		fi
- 		if test "$cf_cv_ld_rpath" = yes ; then
--			cf_ld_rpath_opt="-Wl,-rpath,"
-+			LD_RPATH_OPT="-Wl,-rpath,"
- 			EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
- 		fi
- 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
-@@ -4323,7 +4462,7 @@
- 		if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
- 			LOCAL_LDFLAGS="-rpath \$(LOCAL_LIBDIR)"
- 			LOCAL_LDFLAGS2="-rpath \${libdir} $LOCAL_LDFLAGS"
--			cf_ld_rpath_opt="-rpath "
-+			LD_RPATH_OPT="-rpath "
- 			EXTRA_LDFLAGS="-rpath \${libdir} $EXTRA_LDFLAGS"
- 		fi
- 		CF_SHARED_SONAME
-@@ -4331,7 +4470,7 @@
- 		;;
- 	netbsd*)
- 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
--		test "$cf_cv_ld_rpath" = yes && cf_ld_rpath_opt="-Wl,-rpath,"
-+		test "$cf_cv_ld_rpath" = yes && LD_RPATH_OPT="-Wl,-rpath,"
- 		if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
- 			LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
- 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
-@@ -4365,7 +4504,7 @@
- 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
- 		fi
- 		if test "$cf_cv_ld_rpath" = yes ; then
--			cf_ld_rpath_opt="-rpath"
-+			LD_RPATH_OPT="-rpath"
- 			# EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
- 		fi
- 		cf_cv_rm_so_locs=yes
-@@ -4400,12 +4539,19 @@
- 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
- 		fi
- 		if test "$cf_cv_ld_rpath" = yes ; then
--			cf_ld_rpath_opt="-R"
-+			LD_RPATH_OPT="-R"
- 			EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
- 		fi
- 		CF_SHARED_SONAME
- 		if test "$GCC" != yes; then
--			CC_SHARED_OPTS='-xcode=pic32'
-+			cf_save_CFLAGS="$CFLAGS"
-+			for cf_shared_opts in -xcode=pic13 -xcode=pic32 -Kpic -KPIC -O
-+			do
-+				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
-+				AC_TRY_COMPILE([#include <stdio.h>],[printf("Hello\n");],[break])
-+			done
-+			CFLAGS="$cf_save_CFLAGS"
-+			CC_SHARED_OPTS=$cf_shared_opts
- 			MK_SHARED_LIB='${CC} -dy -G -h '$cf_cv_shared_soname' -o $[@]'
- 		else
- 			MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $[@]'
-@@ -4438,18 +4584,19 @@
- 		;;
- 	esac
- 
--	if test -n "$cf_ld_rpath_opt" ; then
-+	if test -n "$LD_RPATH_OPT" ; then
- 		AC_MSG_CHECKING(if we need a space after rpath option)
- 		cf_save_LIBS="$LIBS"
--		LIBS="$LIBS ${cf_ld_rpath_opt}$libdir"
-+		LIBS="$LIBS ${LD_RPATH_OPT}$libdir"
- 		AC_TRY_LINK(, , cf_rpath_space=no, cf_rpath_space=yes)
- 		LIBS="$cf_save_LIBS"
- 		AC_MSG_RESULT($cf_rpath_space)
--		test "$cf_rpath_space" = yes && cf_ld_rpath_opt="$cf_ld_rpath_opt "
--		MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}"
-+		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
-+		MK_SHARED_LIB="$MK_SHARED_LIB $LD_RPATH_OPT\${libdir}"
- 	fi
- 
- 	AC_SUBST(CC_SHARED_OPTS)
-+	AC_SUBST(LD_RPATH_OPT)
- 	AC_SUBST(LD_SHARED_OPTS)
- 	AC_SUBST(MK_SHARED_LIB)
- 	AC_SUBST(LINK_PROGS)
-@@ -4642,7 +4789,7 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_SRC_MODULES version: 18 updated: 2005/05/28 12:58:54
-+dnl CF_SRC_MODULES version: 20 updated: 2008/12/27 12:30:03
- dnl --------------
- dnl For each parameter, test if the source-directory exists, and if it contains
- dnl a 'modules' file.  If so, add to the list $cf_cv_src_modules which we'll
-@@ -4717,7 +4864,11 @@
- AC_SUBST(TEST_ARG2)
- AC_SUBST(TEST_DEP2)
- 
--SRC_SUBDIRS="man include"
-+SRC_SUBDIRS=
-+if test "x$cf_with_manpages" != xno ; then
-+	SRC_SUBDIRS="$SRC_SUBDIRS man"
-+fi
-+SRC_SUBDIRS="$SRC_SUBDIRS include"
- for cf_dir in $cf_cv_src_modules
- do
- 	SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir"
-@@ -4728,8 +4879,8 @@
- 
- ADA_SUBDIRS=
- if test "$cf_cv_prog_gnat_correct" = yes && test -f $srcdir/Ada95/Makefile.in; then
--   SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
--   ADA_SUBDIRS="gen src samples"
-+	SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
-+	ADA_SUBDIRS="gen src samples"
- fi
- 
- SUB_MAKEFILES=
-@@ -4739,11 +4890,11 @@
- done
- 
- if test -n "$ADA_SUBDIRS"; then
--   for cf_dir in $ADA_SUBDIRS
--   do
--      SUB_MAKEFILES="$SUB_MAKEFILES Ada95/$cf_dir/Makefile"
--   done
--   AC_SUBST(ADA_SUBDIRS)
-+	for cf_dir in $ADA_SUBDIRS
-+	do
-+		SUB_MAKEFILES="$SUB_MAKEFILES Ada95/$cf_dir/Makefile"
-+	done
-+	AC_SUBST(ADA_SUBDIRS)
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
-@@ -5241,7 +5392,7 @@
- fi
- ])
- dnl ---------------------------------------------------------------------------
--dnl CF_WITH_LIBTOOL version: 19 updated: 2008/03/29 15:46:43
-+dnl CF_WITH_LIBTOOL version: 20 updated: 2008/12/27 12:31:39
- dnl ---------------
- dnl Provide a configure option to incorporate libtool.  Define several useful
- dnl symbols for the makefile rules.
-@@ -5261,18 +5412,18 @@
- dnl		echo cannot find libtool.m4 file
- dnl		exit 1
- dnl	fi
--dnl	
-+dnl
- dnl	LOCAL=aclocal.m4
- dnl	ORIG=aclocal.m4.orig
--dnl	
-+dnl
- dnl	trap "mv $ORIG $LOCAL" 0 1 2 5 15
- dnl	rm -f $ORIG
- dnl	mv $LOCAL $ORIG
--dnl	
-+dnl
- dnl	# sed the LIBTOOL= assignment to omit the current directory?
- dnl	sed -e 's/^LIBTOOL=.*/LIBTOOL=${LIBTOOL-libtool}/' $ACLOCAL/libtool.m4 >>$LOCAL
- dnl	cat $ORIG >>$LOCAL
--dnl	
-+dnl
- dnl	autoconf-257 $*
- dnl
- AC_DEFUN([CF_WITH_LIBTOOL],
-@@ -5306,15 +5457,15 @@
- 	AC_PROG_LIBTOOL
- 	# missing_content_AC_PROG_LIBTOOL}}
- ],[
-- 	if test "$with_libtool" != "yes" ; then
-+	if test "$with_libtool" != "yes" ; then
- 		CF_PATH_SYNTAX(with_libtool)
- 		LIBTOOL=$with_libtool
- 	else
-- 		AC_PATH_PROG(LIBTOOL,libtool)
-- 	fi
-- 	if test -z "$LIBTOOL" ; then
-- 		AC_MSG_ERROR(Cannot find libtool)
-- 	fi
-+		AC_PATH_PROG(LIBTOOL,libtool)
-+	fi
-+	if test -z "$LIBTOOL" ; then
-+		AC_MSG_ERROR(Cannot find libtool)
-+	fi
- ])dnl
- 	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
- 	LIB_OBJECT='${OBJECTS:.o=.lo}'
-@@ -5535,7 +5686,7 @@
- 	[USE_VALGRIND])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_XOPEN_SOURCE version: 26 updated: 2008/07/27 11:26:57
-+dnl CF_XOPEN_SOURCE version: 28 updated: 2008/12/27 12:30:03
- dnl ---------------
- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
- dnl or adapt to the vendor's definitions to get equivalent functionality,
-@@ -5552,7 +5703,7 @@
- cf_POSIX_C_SOURCE=ifelse($2,,199506L,$2)
- 
- case $host_os in #(vi
--aix[[45]]*) #(vi
-+aix[[456]]*) #(vi
- 	CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE"
- 	;;
- freebsd*|dragonfly*) #(vi
-@@ -5569,7 +5720,7 @@
- irix[[56]].*) #(vi
- 	CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
- 	;;
--linux*|gnu*|k*bsd*-gnu) #(vi
-+linux*|gnu*|mint*|k*bsd*-gnu) #(vi
- 	CF_GNU_SOURCE
- 	;;
- mirbsd*) #(vi
-diff -Naur ncurses-5.7.orig/c++/Makefile.in ncurses-5.7/c++/Makefile.in
---- ncurses-5.7.orig/c++/Makefile.in	2007-04-28 08:29:12.000000000 -0700
-+++ ncurses-5.7/c++/Makefile.in	2009-01-08 19:48:29.000000000 -0800
-@@ -1,6 +1,6 @@
--# $Id: Makefile.in,v 1.84 2007/04/28 15:29:12 tom Exp $
-+# $Id: Makefile.in,v 1.85 2009/01/03 19:10:40 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -61,10 +61,10 @@
- INSTALL_DATA	= @INSTALL_DATA@
- 
- AR		= @AR@
--AR_OPTS		= @AR_OPTS@
-+ARFLAGS		= @ARFLAGS@
- 
- CXX_AR		= @CXX_AR@
--CXX_AR_OPTS	= @CXX_AR_OPTS@
-+CXX_ARFLAGS	= @CXX_ARFLAGS@
- RANLIB		= @LIB_PREP@
- 
- CXX		= @CXX@
-@@ -153,7 +153,7 @@
- 	$(MODEL)/cursesmain$o
- 
- ../lib/$(LIBNAME_NORMAL) : $(LIB_OBJS)
--	$(CXX_AR) $(CXX_AR_OPTS) $@ $?
-+	$(CXX_AR) $(CXX_ARFLAGS) $@ $?
- 	$(RANLIB) $@
- 
- ../lib/$(LIBNAME_LIBTOOL) : $(LIB_OBJS)
-diff -Naur ncurses-5.7.orig/c++/cursesw.cc ncurses-5.7/c++/cursesw.cc
---- ncurses-5.7.orig/c++/cursesw.cc	2007-12-15 15:01:57.000000000 -0800
-+++ ncurses-5.7/c++/cursesw.cc	2009-01-08 19:48:09.000000000 -0800
-@@ -1,6 +1,6 @@
- // * this is for making emacs happy: -*-Mode: C++;-*-
- /****************************************************************************
-- * Copyright (c) 2007 Free Software Foundation, Inc.                        *
-+ * Copyright (c) 2007,2008 Free Software Foundation, Inc.                   *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -42,7 +42,7 @@
- #include "internal.h"
- #include "cursesw.h"
- 
--MODULE_ID("$Id: cursesw.cc,v 1.49 2007/12/15 23:01:57 tom Exp $")
-+MODULE_ID("$Id: cursesw.cc,v 1.50 2008/11/23 00:17:31 juergen Exp $")
- 
- #define COLORS_NEED_INITIALIZATION  -1
- #define COLORS_NOT_INITIALIZED       0
-@@ -287,7 +287,6 @@
- {
-     initialize();
-     w = win;
--    assert((w->_maxx +1 ) == ncols);
- }
- 
- int _nc_xx_ripoff_init(WINDOW *w, int ncols)
-@@ -464,7 +463,7 @@
- #if HAVE_HAS_KEY
- bool NCursesWindow::has_mouse() const
- {
--    return ((::has_key(KEY_MOUSE) || ::_nc_has_mouse())
-+    return ((::has_key(KEY_MOUSE) || ::has_mouse())
- 	     ? TRUE : FALSE);
- }
- #endif
-diff -Naur ncurses-5.7.orig/config.guess ncurses-5.7/config.guess
---- ncurses-5.7.orig/config.guess	2008-08-30 13:25:07.000000000 -0700
-+++ ncurses-5.7/config.guess	2009-01-08 19:48:29.000000000 -0800
-@@ -4,7 +4,7 @@
- #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
- #   Free Software Foundation, Inc.
- 
--timestamp='2008-04-14'
-+timestamp='2008-12-19'
- 
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -331,7 +331,20 @@
- 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- 	exit ;;
-     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
--	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	eval $set_cc_for_build
-+	SUN_ARCH="i386"
-+	# If there is a compiler, see if it is configured for 64-bit objects.
-+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-+	# This test works for both compilers.
-+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+		grep IS_64BIT_ARCH >/dev/null
-+	    then
-+		SUN_ARCH="x86_64"
-+	    fi
-+	fi
-+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- 	exit ;;
-     sun4*:SunOS:6*:*)
- 	# According to config.sub, this is the proper way to canonicalize
-@@ -796,7 +809,7 @@
- 	    x86)
- 		echo i586-pc-interix${UNAME_RELEASE}
- 		exit ;;
--	    EM64T | authenticamd)
-+	    EM64T | authenticamd | genuineintel)
- 		echo x86_64-unknown-interix${UNAME_RELEASE}
- 		exit ;;
- 	    IA64)
-@@ -935,6 +948,9 @@
- 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- 	exit ;;
-+    padre:Linux:*:*)
-+	echo sparc-unknown-linux-gnu
-+	exit ;;
-     parisc:Linux:*:* | hppa:Linux:*:*)
- 	# Look for CPU level
- 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -1138,6 +1154,16 @@
-     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-           && { echo i486-ncr-sysv4; exit; } ;;
-+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-+	OS_REL='.3'
-+	test -r /etc/.relid \
-+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- 	echo m68k-unknown-lynxos${UNAME_RELEASE}
- 	exit ;;
-diff -Naur ncurses-5.7.orig/config.sub ncurses-5.7/config.sub
---- ncurses-5.7.orig/config.sub	2008-08-30 13:25:02.000000000 -0700
-+++ ncurses-5.7/config.sub	2009-01-08 19:48:29.000000000 -0800
-@@ -4,7 +4,7 @@
- #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
- #   Free Software Foundation, Inc.
- 
--timestamp='2008-06-16'
-+timestamp='2008-12-11'
- 
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -249,6 +249,7 @@
- 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- 	| i370 | i860 | i960 | ia64 \
- 	| ip2k | iq2000 \
-+	| lm32 \
- 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
- 	| maxq | mb | microblaze | mcore | mep | metag \
- 	| mips | mipsbe | mipseb | mipsel | mipsle \
-@@ -279,7 +280,7 @@
- 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- 	| pyramid \
- 	| score \
--	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- 	| sh64 | sh64le \
- 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
- 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-@@ -288,7 +289,7 @@
- 	| v850 | v850e \
- 	| we32k \
- 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
--	| z8k)
-+	| z8k | z80)
- 		basic_machine=$basic_machine-unknown
- 		;;
- 	m6811 | m68hc11 | m6812 | m68hc12)
-@@ -331,6 +332,7 @@
- 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- 	| i*86-* | i860-* | i960-* | ia64-* \
- 	| ip2k-* | iq2000-* \
-+	| lm32-* \
- 	| m32c-* | m32r-* | m32rle-* \
- 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- 	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-@@ -362,7 +364,7 @@
- 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- 	| pyramid-* \
- 	| romp-* | rs6000-* \
--	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- 	| sparclite-* \
-@@ -375,7 +377,7 @@
- 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- 	| xstormy16-* | xtensa*-* \
- 	| ymp-* \
--	| z8k-*)
-+	| z8k-* | z80-*)
- 		;;
- 	# Recognize the basic CPU types without company name, with glob match.
- 	xtensa*)
-@@ -1140,6 +1142,10 @@
- 		basic_machine=z8k-unknown
- 		os=-sim
- 		;;
-+	z80-*-coff)
-+		basic_machine=z80-unknown
-+		os=-sim
-+		;;
- 	none)
- 		basic_machine=none-none
- 		os=-none
-@@ -1178,7 +1184,7 @@
- 	we32k)
- 		basic_machine=we32k-att
- 		;;
--	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
-+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
- 		basic_machine=sh-unknown
- 		;;
- 	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-diff -Naur ncurses-5.7.orig/configure ncurses-5.7/configure
---- ncurses-5.7.orig/configure	2008-10-25 17:04:38.000000000 -0700
-+++ ncurses-5.7/configure	2009-01-08 19:48:34.000000000 -0800
-@@ -1,7 +1,7 @@
- #! /bin/sh
--# From configure.in Revision: 1.454 .
-+# From configure.in Revision: 1.463 .
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by Autoconf 2.52.20080325.
-+# Generated by Autoconf 2.52.20081225.
- #
- # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
- # Free Software Foundation, Inc.
-@@ -697,8 +697,11 @@
-   --without-cxx           do not adjust ncurses bool to match C++
-   --without-cxx-binding   do not build C++ binding and demo
-   --without-ada           suppress check for Ada95, don't build demo
-+  --without-manpages      suppress install of manpages
-   --without-progs         suppress build with programs (e.g., tic)
-   --without-curses-h      install curses.h as ncurses.h only
-+  --with-pkg-config{=path} enable/disable use of pkg-config
-+  --enable-pc-files       generate and install .pc files for pkg-config
-   --enable-mixed-case     tic should assume mixed-case filenames
-   --with-install-prefix   prefixes actual install-location ($DESTDIR)
- Build-Tools Needed to Compile Temporary Applications for Cross-compiling:
-@@ -870,7 +873,7 @@
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by $as_me, which was
--generated by GNU Autoconf 2.52.20080325.  Invocation command line was
-+generated by GNU Autoconf 2.52.20081225.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -994,7 +997,7 @@
- fi
- for ac_site_file in $CONFIG_SITE; do
-   if test -r "$ac_site_file"; then
--    { echo "$as_me:997: loading site script $ac_site_file" >&5
-+    { echo "$as_me:1000: loading site script $ac_site_file" >&5
- echo "$as_me: loading site script $ac_site_file" >&6;}
-     cat "$ac_site_file" >&5
-     . "$ac_site_file"
-@@ -1005,7 +1008,7 @@
-   # Some versions of bash will fail to source /dev/null (special
-   # files actually), so we avoid doing that.
-   if test -f "$cache_file"; then
--    { echo "$as_me:1008: loading cache $cache_file" >&5
-+    { echo "$as_me:1011: loading cache $cache_file" >&5
- echo "$as_me: loading cache $cache_file" >&6;}
-     case $cache_file in
-       [\\/]* | ?:[\\/]* ) . $cache_file;;
-@@ -1013,7 +1016,7 @@
-     esac
-   fi
- else
--  { echo "$as_me:1016: creating cache $cache_file" >&5
-+  { echo "$as_me:1019: creating cache $cache_file" >&5
- echo "$as_me: creating cache $cache_file" >&6;}
-   >$cache_file
- fi
-@@ -1029,21 +1032,21 @@
-   eval ac_new_val="\$ac_env_${ac_var}_value"
-   case $ac_old_set,$ac_new_set in
-     set,)
--      { echo "$as_me:1032: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+      { echo "$as_me:1035: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
- echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-       ac_cache_corrupted=: ;;
-     ,set)
--      { echo "$as_me:1036: error: \`$ac_var' was not set in the previous run" >&5
-+      { echo "$as_me:1039: error: \`$ac_var' was not set in the previous run" >&5
- echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-       ac_cache_corrupted=: ;;
-     ,);;
-     *)
-       if test "x$ac_old_val" != "x$ac_new_val"; then
--        { echo "$as_me:1042: error: \`$ac_var' has changed since the previous run:" >&5
-+        { echo "$as_me:1045: error: \`$ac_var' has changed since the previous run:" >&5
- echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
--        { echo "$as_me:1044:   former value:  $ac_old_val" >&5
-+        { echo "$as_me:1047:   former value:  $ac_old_val" >&5
- echo "$as_me:   former value:  $ac_old_val" >&2;}
--        { echo "$as_me:1046:   current value: $ac_new_val" >&5
-+        { echo "$as_me:1049:   current value: $ac_new_val" >&5
- echo "$as_me:   current value: $ac_new_val" >&2;}
-         ac_cache_corrupted=:
-       fi;;
-@@ -1062,9 +1065,9 @@
-   fi
- done
- if $ac_cache_corrupted; then
--  { echo "$as_me:1065: error: changes in the environment can compromise the build" >&5
-+  { echo "$as_me:1068: error: changes in the environment can compromise the build" >&5
- echo "$as_me: error: changes in the environment can compromise the build" >&2;}
--  { { echo "$as_me:1067: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-+  { { echo "$as_me:1070: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
- echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -1085,10 +1088,10 @@
- echo "#! $SHELL" >conftest.sh
- echo  "exit 0"   >>conftest.sh
- chmod +x conftest.sh
--if { (echo "$as_me:1088: PATH=\".;.\"; conftest.sh") >&5
-+if { (echo "$as_me:1091: PATH=\".;.\"; conftest.sh") >&5
-   (PATH=".;."; conftest.sh) 2>&5
-   ac_status=$?
--  echo "$as_me:1091: \$? = $ac_status" >&5
-+  echo "$as_me:1094: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   ac_path_separator=';'
- else
-@@ -1101,7 +1104,7 @@
- 
- top_builddir=`pwd`
- 
--echo "$as_me:1104: checking for egrep" >&5
-+echo "$as_me:1107: checking for egrep" >&5
- echo $ECHO_N "checking for egrep... $ECHO_C" >&6
- if test "${ac_cv_prog_egrep+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1111,11 +1114,11 @@
-     else ac_cv_prog_egrep='egrep'
-     fi
- fi
--echo "$as_me:1114: result: $ac_cv_prog_egrep" >&5
-+echo "$as_me:1117: result: $ac_cv_prog_egrep" >&5
- echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-  EGREP=$ac_cv_prog_egrep
- 
--test -z "$EGREP" && { { echo "$as_me:1118: error: No egrep program found" >&5
-+test -z "$EGREP" && { { echo "$as_me:1121: error: No egrep program found" >&5
- echo "$as_me: error: No egrep program found" >&2;}
-    { (exit 1); exit 1; }; }
- 
-@@ -1125,7 +1128,7 @@
- cf_cv_abi_version=${NCURSES_MAJOR}
- cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
- cf_cv_timestamp=`date`
--echo "$as_me:1128: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
-+echo "$as_me:1131: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
- echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
- 
- test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
-@@ -1133,7 +1136,7 @@
- # Check whether --with-rel-version or --without-rel-version was given.
- if test "${with_rel_version+set}" = set; then
-   withval="$with_rel_version"
--  { echo "$as_me:1136: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
-+  { echo "$as_me:1139: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
- echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;}
-  cf_cv_rel_version=$withval
- fi;
-@@ -1146,13 +1149,13 @@
-   [0-9]*) #(vi
-  	;;
-   *)
--	{ { echo "$as_me:1149: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
-+	{ { echo "$as_me:1152: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
- echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;}
-    { (exit 1); exit 1; }; }
-  	;;
-   esac
- else
--  { { echo "$as_me:1155: error: Release major-version value is empty" >&5
-+  { { echo "$as_me:1158: error: Release major-version value is empty" >&5
- echo "$as_me: error: Release major-version value is empty" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -1162,13 +1165,13 @@
-   [0-9]*) #(vi
-  	;;
-   *)
--	{ { echo "$as_me:1165: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
-+	{ { echo "$as_me:1168: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
- echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;}
-    { (exit 1); exit 1; }; }
-  	;;
-   esac
- else
--  { { echo "$as_me:1171: error: Release minor-version value is empty" >&5
-+  { { echo "$as_me:1174: error: Release minor-version value is empty" >&5
- echo "$as_me: error: Release minor-version value is empty" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -1178,7 +1181,7 @@
- # Check whether --with-abi-version or --without-abi-version was given.
- if test "${with_abi_version+set}" = set; then
-   withval="$with_abi_version"
--  { echo "$as_me:1181: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
-+  { echo "$as_me:1184: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
- echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;}
-  cf_cv_abi_version=$withval
- fi;
-@@ -1188,13 +1191,13 @@
-   [0-9]*) #(vi
-  	;;
-   *)
--	{ { echo "$as_me:1191: error: ABI version is not a number: $cf_cv_abi_version" >&5
-+	{ { echo "$as_me:1194: error: ABI version is not a number: $cf_cv_abi_version" >&5
- echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;}
-    { (exit 1); exit 1; }; }
-  	;;
-   esac
- else
--  { { echo "$as_me:1197: error: ABI version value is empty" >&5
-+  { { echo "$as_me:1200: error: ABI version value is empty" >&5
- echo "$as_me: error: ABI version value is empty" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -1216,7 +1219,7 @@
-   fi
- done
- if test -z "$ac_aux_dir"; then
--  { { echo "$as_me:1219: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-+  { { echo "$as_me:1222: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
- echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -1226,11 +1229,11 @@
- 
- # Make sure we can run config.sub.
- $ac_config_sub sun4 >/dev/null 2>&1 ||
--  { { echo "$as_me:1229: error: cannot run $ac_config_sub" >&5
-+  { { echo "$as_me:1232: error: cannot run $ac_config_sub" >&5
- echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-    { (exit 1); exit 1; }; }
- 
--echo "$as_me:1233: checking build system type" >&5
-+echo "$as_me:1236: checking build system type" >&5
- echo $ECHO_N "checking build system type... $ECHO_C" >&6
- if test "${ac_cv_build+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1239,23 +1242,23 @@
- test -z "$ac_cv_build_alias" &&
-   ac_cv_build_alias=`$ac_config_guess`
- test -z "$ac_cv_build_alias" &&
--  { { echo "$as_me:1242: error: cannot guess build type; you must specify one" >&5
-+  { { echo "$as_me:1245: error: cannot guess build type; you must specify one" >&5
- echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-    { (exit 1); exit 1; }; }
- ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
--  { { echo "$as_me:1246: error: $ac_config_sub $ac_cv_build_alias failed." >&5
-+  { { echo "$as_me:1249: error: $ac_config_sub $ac_cv_build_alias failed." >&5
- echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:1251: result: $ac_cv_build" >&5
-+echo "$as_me:1254: result: $ac_cv_build" >&5
- echo "${ECHO_T}$ac_cv_build" >&6
- build=$ac_cv_build
- build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
- build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
- build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- 
--echo "$as_me:1258: checking host system type" >&5
-+echo "$as_me:1261: checking host system type" >&5
- echo $ECHO_N "checking host system type... $ECHO_C" >&6
- if test "${ac_cv_host+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1264,12 +1267,12 @@
- test -z "$ac_cv_host_alias" &&
-   ac_cv_host_alias=$ac_cv_build_alias
- ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
--  { { echo "$as_me:1267: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-+  { { echo "$as_me:1270: error: $ac_config_sub $ac_cv_host_alias failed" >&5
- echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:1272: result: $ac_cv_host" >&5
-+echo "$as_me:1275: result: $ac_cv_host" >&5
- echo "${ECHO_T}$ac_cv_host" >&6
- host=$ac_cv_host
- host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-@@ -1277,7 +1280,7 @@
- host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- 
- if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
--	echo "$as_me:1280: checking target system type" >&5
-+	echo "$as_me:1283: checking target system type" >&5
- echo $ECHO_N "checking target system type... $ECHO_C" >&6
- if test "${ac_cv_target+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1286,12 +1289,12 @@
- test "x$ac_cv_target_alias" = "x" &&
-   ac_cv_target_alias=$ac_cv_host_alias
- ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
--  { { echo "$as_me:1289: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-+  { { echo "$as_me:1292: error: $ac_config_sub $ac_cv_target_alias failed" >&5
- echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:1294: result: $ac_cv_target" >&5
-+echo "$as_me:1297: result: $ac_cv_target" >&5
- echo "${ECHO_T}$ac_cv_target" >&6
- target=$ac_cv_target
- target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-@@ -1322,13 +1325,13 @@
- fi
- 
- test -z "$system_name" && system_name="$cf_cv_system_name"
--test -n "$cf_cv_system_name" && echo "$as_me:1325: result: Configuring for $cf_cv_system_name" >&5
-+test -n "$cf_cv_system_name" && echo "$as_me:1328: result: Configuring for $cf_cv_system_name" >&5
- echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
- 
- if test ".$system_name" != ".$cf_cv_system_name" ; then
--	echo "$as_me:1329: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
-+	echo "$as_me:1332: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
- echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
--	{ { echo "$as_me:1331: error: \"Please remove config.cache and try again.\"" >&5
-+	{ { echo "$as_me:1334: error: \"Please remove config.cache and try again.\"" >&5
- echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -1336,7 +1339,7 @@
- # Check whether --with-system-type or --without-system-type was given.
- if test "${with_system_type+set}" = set; then
-   withval="$with_system_type"
--  { echo "$as_me:1339: WARNING: overriding system type to $withval" >&5
-+  { echo "$as_me:1342: WARNING: overriding system type to $withval" >&5
- echo "$as_me: WARNING: overriding system type to $withval" >&2;}
-  cf_cv_system_name=$withval
- fi;
-@@ -1346,7 +1349,7 @@
- 
- ###	Default install-location
- 
--echo "$as_me:1349: checking for prefix" >&5
-+echo "$as_me:1352: checking for prefix" >&5
- echo $ECHO_N "checking for prefix... $ECHO_C" >&6
- if test "x$prefix" = "xNONE" ; then
- 	case "$cf_cv_system_name" in
-@@ -1358,11 +1361,11 @@
- 		;;
- 	esac
- fi
--echo "$as_me:1361: result: $prefix" >&5
-+echo "$as_me:1364: result: $prefix" >&5
- echo "${ECHO_T}$prefix" >&6
- 
- if test "x$prefix" = "xNONE" ; then
--echo "$as_me:1365: checking for default include-directory" >&5
-+echo "$as_me:1368: checking for default include-directory" >&5
- echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
- test -n "$verbose" && echo 1>&6
- for cf_symbol in \
-@@ -1385,7 +1388,7 @@
- 	fi
- 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
- done
--echo "$as_me:1388: result: $includedir" >&5
-+echo "$as_me:1391: result: $includedir" >&5
- echo "${ECHO_T}$includedir" >&6
- fi
- 
-@@ -1399,7 +1402,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
--echo "$as_me:1402: checking for $ac_word" >&5
-+echo "$as_me:1405: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1414,7 +1417,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
--echo "$as_me:1417: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1420: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1422,10 +1425,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$as_me:1425: result: $CC" >&5
-+  echo "$as_me:1428: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
--  echo "$as_me:1428: result: no" >&5
-+  echo "$as_me:1431: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1434,7 +1437,7 @@
-   ac_ct_CC=$CC
-   # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
--echo "$as_me:1437: checking for $ac_word" >&5
-+echo "$as_me:1440: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1449,7 +1452,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_CC="gcc"
--echo "$as_me:1452: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1455: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1457,10 +1460,10 @@
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  echo "$as_me:1460: result: $ac_ct_CC" >&5
-+  echo "$as_me:1463: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6
- else
--  echo "$as_me:1463: result: no" >&5
-+  echo "$as_me:1466: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1473,7 +1476,7 @@
-   if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}cc; ac_word=$2
--echo "$as_me:1476: checking for $ac_word" >&5
-+echo "$as_me:1479: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1488,7 +1491,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_CC="${ac_tool_prefix}cc"
--echo "$as_me:1491: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1494: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1496,10 +1499,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$as_me:1499: result: $CC" >&5
-+  echo "$as_me:1502: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
--  echo "$as_me:1502: result: no" >&5
-+  echo "$as_me:1505: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1508,7 +1511,7 @@
-   ac_ct_CC=$CC
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
--echo "$as_me:1511: checking for $ac_word" >&5
-+echo "$as_me:1514: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1523,7 +1526,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_CC="cc"
--echo "$as_me:1526: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1529: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1531,10 +1534,10 @@
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  echo "$as_me:1534: result: $ac_ct_CC" >&5
-+  echo "$as_me:1537: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6
- else
--  echo "$as_me:1537: result: no" >&5
-+  echo "$as_me:1540: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1547,7 +1550,7 @@
- if test -z "$CC"; then
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
--echo "$as_me:1550: checking for $ac_word" >&5
-+echo "$as_me:1553: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1567,7 +1570,7 @@
-   continue
- fi
- ac_cv_prog_CC="cc"
--echo "$as_me:1570: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1573: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1589,10 +1592,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$as_me:1592: result: $CC" >&5
-+  echo "$as_me:1595: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
--  echo "$as_me:1595: result: no" >&5
-+  echo "$as_me:1598: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1603,7 +1606,7 @@
-   do
-     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--echo "$as_me:1606: checking for $ac_word" >&5
-+echo "$as_me:1609: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1618,7 +1621,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
--echo "$as_me:1621: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1624: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1626,10 +1629,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$as_me:1629: result: $CC" >&5
-+  echo "$as_me:1632: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
--  echo "$as_me:1632: result: no" >&5
-+  echo "$as_me:1635: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1642,7 +1645,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:1645: checking for $ac_word" >&5
-+echo "$as_me:1648: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1657,7 +1660,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_CC="$ac_prog"
--echo "$as_me:1660: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1663: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1665,10 +1668,10 @@
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  echo "$as_me:1668: result: $ac_ct_CC" >&5
-+  echo "$as_me:1671: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6
- else
--  echo "$as_me:1671: result: no" >&5
-+  echo "$as_me:1674: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1680,32 +1683,32 @@
- 
- fi
- 
--test -z "$CC" && { { echo "$as_me:1683: error: no acceptable cc found in \$PATH" >&5
-+test -z "$CC" && { { echo "$as_me:1686: error: no acceptable cc found in \$PATH" >&5
- echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
-    { (exit 1); exit 1; }; }
- 
- # Provide some information about the compiler.
--echo "$as_me:1688:" \
-+echo "$as_me:1691:" \
-      "checking for C compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:1691: \"$ac_compiler --version </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:1694: \"$ac_compiler --version </dev/null >&5\"") >&5
-   (eval $ac_compiler --version </dev/null >&5) 2>&5
-   ac_status=$?
--  echo "$as_me:1694: \$? = $ac_status" >&5
-+  echo "$as_me:1697: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:1696: \"$ac_compiler -v </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:1699: \"$ac_compiler -v </dev/null >&5\"") >&5
-   (eval $ac_compiler -v </dev/null >&5) 2>&5
-   ac_status=$?
--  echo "$as_me:1699: \$? = $ac_status" >&5
-+  echo "$as_me:1702: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:1701: \"$ac_compiler -V </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:1704: \"$ac_compiler -V </dev/null >&5\"") >&5
-   (eval $ac_compiler -V </dev/null >&5) 2>&5
-   ac_status=$?
--  echo "$as_me:1704: \$? = $ac_status" >&5
-+  echo "$as_me:1707: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 1708 "configure"
-+#line 1711 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1721,13 +1724,13 @@
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--echo "$as_me:1724: checking for C compiler default output" >&5
-+echo "$as_me:1727: checking for C compiler default output" >&5
- echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
- ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
--if { (eval echo "$as_me:1727: \"$ac_link_default\"") >&5
-+if { (eval echo "$as_me:1730: \"$ac_link_default\"") >&5
-   (eval $ac_link_default) 2>&5
-   ac_status=$?
--  echo "$as_me:1730: \$? = $ac_status" >&5
-+  echo "$as_me:1733: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   # Find the output, starting from the most likely.  This scheme is
- # not robust to junk in `.', hence go to wildcards (a.*) only as a last
-@@ -1736,7 +1739,7 @@
-                 ls a.out conftest 2>/dev/null;
-                 ls a.* conftest.* 2>/dev/null`; do
-   case $ac_file in
--    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.dbg | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-     a.out ) # We found the default executable, but exeext='' is most
-             # certainly right.
-             break;;
-@@ -1750,34 +1753,34 @@
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--{ { echo "$as_me:1753: error: C compiler cannot create executables" >&5
-+{ { echo "$as_me:1756: error: C compiler cannot create executables" >&5
- echo "$as_me: error: C compiler cannot create executables" >&2;}
-    { (exit 77); exit 77; }; }
- fi
- 
- ac_exeext=$ac_cv_exeext
--echo "$as_me:1759: result: $ac_file" >&5
-+echo "$as_me:1762: result: $ac_file" >&5
- echo "${ECHO_T}$ac_file" >&6
- 
- # Check the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:1764: checking whether the C compiler works" >&5
-+echo "$as_me:1767: checking whether the C compiler works" >&5
- echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
- # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
-   if { ac_try='./$ac_file'
--  { (eval echo "$as_me:1770: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1773: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1773: \$? = $ac_status" >&5
-+  echo "$as_me:1776: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-     cross_compiling=no
-   else
-     if test "$cross_compiling" = maybe; then
- 	cross_compiling=yes
-     else
--	{ { echo "$as_me:1780: error: cannot run C compiled programs.
-+	{ { echo "$as_me:1783: error: cannot run C compiled programs.
- If you meant to cross compile, use \`--host'." >&5
- echo "$as_me: error: cannot run C compiled programs.
- If you meant to cross compile, use \`--host'." >&2;}
-@@ -1785,24 +1788,24 @@
-     fi
-   fi
- fi
--echo "$as_me:1788: result: yes" >&5
-+echo "$as_me:1791: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
- rm -f a.out a.exe conftest$ac_cv_exeext
- ac_clean_files=$ac_clean_files_save
- # Check the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:1795: checking whether we are cross compiling" >&5
-+echo "$as_me:1798: checking whether we are cross compiling" >&5
- echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
--echo "$as_me:1797: result: $cross_compiling" >&5
-+echo "$as_me:1800: result: $cross_compiling" >&5
- echo "${ECHO_T}$cross_compiling" >&6
- 
--echo "$as_me:1800: checking for executable suffix" >&5
-+echo "$as_me:1803: checking for executable suffix" >&5
- echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
--if { (eval echo "$as_me:1802: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:1805: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:1805: \$? = $ac_status" >&5
-+  echo "$as_me:1808: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   # If both `conftest.exe' and `conftest' are `present' (well, observable)
- # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-@@ -1810,7 +1813,7 @@
- # `rm'.
- for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
-   case $ac_file in
--    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.dbg | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-           export ac_cv_exeext
-           break;;
-@@ -1818,25 +1821,25 @@
-   esac
- done
- else
--  { { echo "$as_me:1821: error: cannot compute EXEEXT: cannot compile and link" >&5
-+  { { echo "$as_me:1824: error: cannot compute EXEEXT: cannot compile and link" >&5
- echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- rm -f conftest$ac_cv_exeext
--echo "$as_me:1827: result: $ac_cv_exeext" >&5
-+echo "$as_me:1830: result: $ac_cv_exeext" >&5
- echo "${ECHO_T}$ac_cv_exeext" >&6
- 
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--echo "$as_me:1833: checking for object suffix" >&5
-+echo "$as_me:1836: checking for object suffix" >&5
- echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
- if test "${ac_cv_objext+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1839 "configure"
-+#line 1842 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1848,14 +1851,14 @@
- }
- _ACEOF
- rm -f conftest.o conftest.obj
--if { (eval echo "$as_me:1851: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1854: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1854: \$? = $ac_status" >&5
-+  echo "$as_me:1857: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-   case $ac_file in
--    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.dbg | *.pdb | *.xSYM | *.map | *.inf ) ;;
-     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-        break;;
-   esac
-@@ -1863,24 +1866,24 @@
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--{ { echo "$as_me:1866: error: cannot compute OBJEXT: cannot compile" >&5
-+{ { echo "$as_me:1869: error: cannot compute OBJEXT: cannot compile" >&5
- echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--echo "$as_me:1873: result: $ac_cv_objext" >&5
-+echo "$as_me:1876: result: $ac_cv_objext" >&5
- echo "${ECHO_T}$ac_cv_objext" >&6
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--echo "$as_me:1877: checking whether we are using the GNU C compiler" >&5
-+echo "$as_me:1880: checking whether we are using the GNU C compiler" >&5
- echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1883 "configure"
-+#line 1886 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1895,16 +1898,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1898: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1901: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1901: \$? = $ac_status" >&5
-+  echo "$as_me:1904: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1904: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1907: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1907: \$? = $ac_status" >&5
-+  echo "$as_me:1910: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_compiler_gnu=yes
- else
-@@ -1916,19 +1919,19 @@
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
- 
- fi
--echo "$as_me:1919: result: $ac_cv_c_compiler_gnu" >&5
-+echo "$as_me:1922: result: $ac_cv_c_compiler_gnu" >&5
- echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
- GCC=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
- CFLAGS="-g"
--echo "$as_me:1925: checking whether $CC accepts -g" >&5
-+echo "$as_me:1928: checking whether $CC accepts -g" >&5
- echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
- if test "${ac_cv_prog_cc_g+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1931 "configure"
-+#line 1934 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1940,16 +1943,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1943: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1946: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1946: \$? = $ac_status" >&5
-+  echo "$as_me:1949: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1949: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1952: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1952: \$? = $ac_status" >&5
-+  echo "$as_me:1955: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_prog_cc_g=yes
- else
-@@ -1959,7 +1962,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:1962: result: $ac_cv_prog_cc_g" >&5
-+echo "$as_me:1965: result: $ac_cv_prog_cc_g" >&5
- echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
- if test "$ac_test_CFLAGS" = set; then
-   CFLAGS=$ac_save_CFLAGS
-@@ -1986,16 +1989,16 @@
- #endif
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1989: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1992: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1992: \$? = $ac_status" >&5
-+  echo "$as_me:1995: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1995: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1998: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1998: \$? = $ac_status" >&5
-+  echo "$as_me:2001: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   for ac_declaration in \
-    ''\
-@@ -2007,7 +2010,7 @@
-    'void exit (int);'
- do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2010 "configure"
-+#line 2013 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- $ac_declaration
-@@ -2020,16 +2023,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2023: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2026: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2026: \$? = $ac_status" >&5
-+  echo "$as_me:2029: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2029: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2032: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2032: \$? = $ac_status" >&5
-+  echo "$as_me:2035: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -2039,7 +2042,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2042 "configure"
-+#line 2045 "configure"
- #include "confdefs.h"
- $ac_declaration
- int
-@@ -2051,16 +2054,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2054: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2057: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2057: \$? = $ac_status" >&5
-+  echo "$as_me:2060: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2060: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2063: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2063: \$? = $ac_status" >&5
-+  echo "$as_me:2066: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -2090,11 +2093,11 @@
- 
- GCC_VERSION=none
- if test "$GCC" = yes ; then
--	echo "$as_me:2093: checking version of $CC" >&5
-+	echo "$as_me:2096: checking version of $CC" >&5
- echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
- 	GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
- 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
--	echo "$as_me:2097: result: $GCC_VERSION" >&5
-+	echo "$as_me:2100: result: $GCC_VERSION" >&5
- echo "${ECHO_T}$GCC_VERSION" >&6
- fi
- 
-@@ -2104,7 +2107,7 @@
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ac_main_return=return
--echo "$as_me:2107: checking how to run the C preprocessor" >&5
-+echo "$as_me:2110: checking how to run the C preprocessor" >&5
- echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
-@@ -2125,18 +2128,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2128 "configure"
-+#line 2131 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:2133: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2136: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:2139: \$? = $ac_status" >&5
-+  echo "$as_me:2142: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2159,17 +2162,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2162 "configure"
-+#line 2165 "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:2166: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2169: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:2172: \$? = $ac_status" >&5
-+  echo "$as_me:2175: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2206,7 +2209,7 @@
- else
-   ac_cv_prog_CPP=$CPP
- fi
--echo "$as_me:2209: result: $CPP" >&5
-+echo "$as_me:2212: result: $CPP" >&5
- echo "${ECHO_T}$CPP" >&6
- ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
-@@ -2216,18 +2219,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2219 "configure"
-+#line 2222 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:2224: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2227: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:2230: \$? = $ac_status" >&5
-+  echo "$as_me:2233: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2250,17 +2253,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2253 "configure"
-+#line 2256 "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:2257: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2260: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:2263: \$? = $ac_status" >&5
-+  echo "$as_me:2266: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2288,7 +2291,7 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:2291: error: C preprocessor \"$CPP\" fails sanity check" >&5
-+  { { echo "$as_me:2294: error: C preprocessor \"$CPP\" fails sanity check" >&5
- echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -2301,14 +2304,14 @@
- ac_main_return=return
- 
- if test $ac_cv_c_compiler_gnu = yes; then
--    echo "$as_me:2304: checking whether $CC needs -traditional" >&5
-+    echo "$as_me:2307: checking whether $CC needs -traditional" >&5
- echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
- if test "${ac_cv_prog_gcc_traditional+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-     ac_pattern="Autoconf.*'x'"
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2311 "configure"
-+#line 2314 "configure"
- #include "confdefs.h"
- #include <sgtty.h>
- int Autoconf = TIOCGETP;
-@@ -2323,7 +2326,7 @@
- 
-   if test $ac_cv_prog_gcc_traditional = no; then
-     cat >conftest.$ac_ext <<_ACEOF
--#line 2326 "configure"
-+#line 2329 "configure"
- #include "confdefs.h"
- #include <termio.h>
- int Autoconf = TCGETA;
-@@ -2336,14 +2339,14 @@
- 
-   fi
- fi
--echo "$as_me:2339: result: $ac_cv_prog_gcc_traditional" >&5
-+echo "$as_me:2342: result: $ac_cv_prog_gcc_traditional" >&5
- echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
-   if test $ac_cv_prog_gcc_traditional = yes; then
-     CC="$CC -traditional"
-   fi
- fi
- 
--echo "$as_me:2346: checking whether $CC understands -c and -o together" >&5
-+echo "$as_me:2349: checking whether $CC understands -c and -o together" >&5
- echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6
- if test "${cf_cv_prog_CC_c_o+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2359,15 +2362,15 @@
- # We do the test twice because some compilers refuse to overwrite an
- # existing .o file with -o, though they will create one.
- ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
--if { (eval echo "$as_me:2362: \"$ac_try\"") >&5
-+if { (eval echo "$as_me:2365: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2365: \$? = $ac_status" >&5
-+  echo "$as_me:2368: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--  test -f conftest2.$ac_objext && { (eval echo "$as_me:2367: \"$ac_try\"") >&5
-+  test -f conftest2.$ac_objext && { (eval echo "$as_me:2370: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2370: \$? = $ac_status" >&5
-+  echo "$as_me:2373: \$? = $ac_status" >&5
-   (exit $ac_status); };
- then
-   eval cf_cv_prog_CC_c_o=yes
-@@ -2378,19 +2381,19 @@
- 
- fi
- if test $cf_cv_prog_CC_c_o = yes; then
--  echo "$as_me:2381: result: yes" >&5
-+  echo "$as_me:2384: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:2384: result: no" >&5
-+  echo "$as_me:2387: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:2388: checking for POSIXized ISC" >&5
-+echo "$as_me:2391: checking for POSIXized ISC" >&5
- echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
- if test -d /etc/conf/kconfig.d &&
-    grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
- then
--  echo "$as_me:2393: result: yes" >&5
-+  echo "$as_me:2396: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-   ISC=yes # If later tests want to check for ISC.
- 
-@@ -2404,12 +2407,12 @@
-     CC="$CC -Xp"
-   fi
- else
--  echo "$as_me:2407: result: no" >&5
-+  echo "$as_me:2410: result: no" >&5
- echo "${ECHO_T}no" >&6
-   ISC=
- fi
- 
--echo "$as_me:2412: checking for ${CC-cc} option to accept ANSI C" >&5
-+echo "$as_me:2415: checking for ${CC-cc} option to accept ANSI C" >&5
- echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
- if test "${cf_cv_ansi_cc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2503,7 +2506,7 @@
- fi
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 2506 "configure"
-+#line 2509 "configure"
- #include "confdefs.h"
- 
- #ifndef CC_HAS_PROTOS
-@@ -2524,16 +2527,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2527: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2530: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2530: \$? = $ac_status" >&5
-+  echo "$as_me:2533: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2533: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2536: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2536: \$? = $ac_status" >&5
-+  echo "$as_me:2539: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ansi_cc="$cf_arg"; break
- else
-@@ -2546,7 +2549,7 @@
- CPPFLAGS="$cf_save_CPPFLAGS"
- 
- fi
--echo "$as_me:2549: result: $cf_cv_ansi_cc" >&5
-+echo "$as_me:2552: result: $cf_cv_ansi_cc" >&5
- echo "${ECHO_T}$cf_cv_ansi_cc" >&6
- 
- if test "$cf_cv_ansi_cc" != "no"; then
-@@ -2629,7 +2632,7 @@
- fi
- 
- if test "$cf_cv_ansi_cc" = "no"; then
--	{ { echo "$as_me:2632: error: Your compiler does not appear to recognize prototypes.
-+	{ { echo "$as_me:2635: error: Your compiler does not appear to recognize prototypes.
- You have the following choices:
- 	a. adjust your compiler options
- 	b. get an up-to-date compiler
-@@ -2663,13 +2666,13 @@
-   LDCONFIG=:
- else
- case "$cf_cv_system_name" in #(vi
--freebsd*) #(vi
-+dragonfly*|freebsd*) #(vi
-   test -z "$LDCONFIG" && LDCONFIG="/sbin/ldconfig -R"
-   ;;
- *) LDPATH=$PATH:/sbin:/usr/sbin
-   # Extract the first word of "ldconfig", so it can be a program name with args.
- set dummy ldconfig; ac_word=$2
--echo "$as_me:2672: checking for $ac_word" >&5
-+echo "$as_me:2675: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_LDCONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2686,7 +2689,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   if $as_executable_p "$ac_dir/$ac_word"; then
-    ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
--   echo "$as_me:2689: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:2692: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -2697,10 +2700,10 @@
- LDCONFIG=$ac_cv_path_LDCONFIG
- 
- if test -n "$LDCONFIG"; then
--  echo "$as_me:2700: result: $LDCONFIG" >&5
-+  echo "$as_me:2703: result: $LDCONFIG" >&5
- echo "${ECHO_T}$LDCONFIG" >&6
- else
--  echo "$as_me:2703: result: no" >&5
-+  echo "$as_me:2706: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2708,7 +2711,7 @@
- esac
- fi
- 
--echo "$as_me:2711: checking if you want to ensure bool is consistent with C++" >&5
-+echo "$as_me:2714: checking if you want to ensure bool is consistent with C++" >&5
- echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6
- 
- # Check whether --with-cxx or --without-cxx was given.
-@@ -2718,7 +2721,7 @@
- else
-   cf_with_cxx=yes
- fi;
--echo "$as_me:2721: result: $cf_with_cxx" >&5
-+echo "$as_me:2724: result: $cf_with_cxx" >&5
- echo "${ECHO_T}$cf_with_cxx" >&6
- if test "X$cf_with_cxx" = Xno ; then
- 	CXX=""
-@@ -2736,7 +2739,7 @@
-   do
-     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--echo "$as_me:2739: checking for $ac_word" >&5
-+echo "$as_me:2742: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CXX+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2751,7 +2754,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
--echo "$as_me:2754: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2757: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -2759,10 +2762,10 @@
- fi
- CXX=$ac_cv_prog_CXX
- if test -n "$CXX"; then
--  echo "$as_me:2762: result: $CXX" >&5
-+  echo "$as_me:2765: result: $CXX" >&5
- echo "${ECHO_T}$CXX" >&6
- else
--  echo "$as_me:2765: result: no" >&5
-+  echo "$as_me:2768: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2775,7 +2778,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:2778: checking for $ac_word" >&5
-+echo "$as_me:2781: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2790,7 +2793,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_CXX="$ac_prog"
--echo "$as_me:2793: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2796: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -2798,10 +2801,10 @@
- fi
- ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
- if test -n "$ac_ct_CXX"; then
--  echo "$as_me:2801: result: $ac_ct_CXX" >&5
-+  echo "$as_me:2804: result: $ac_ct_CXX" >&5
- echo "${ECHO_T}$ac_ct_CXX" >&6
- else
--  echo "$as_me:2804: result: no" >&5
-+  echo "$as_me:2807: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2813,32 +2816,32 @@
- fi
- 
- # Provide some information about the compiler.
--echo "$as_me:2816:" \
-+echo "$as_me:2819:" \
-      "checking for C++ compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:2819: \"$ac_compiler --version </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:2822: \"$ac_compiler --version </dev/null >&5\"") >&5
-   (eval $ac_compiler --version </dev/null >&5) 2>&5
-   ac_status=$?
--  echo "$as_me:2822: \$? = $ac_status" >&5
-+  echo "$as_me:2825: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:2824: \"$ac_compiler -v </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:2827: \"$ac_compiler -v </dev/null >&5\"") >&5
-   (eval $ac_compiler -v </dev/null >&5) 2>&5
-   ac_status=$?
--  echo "$as_me:2827: \$? = $ac_status" >&5
-+  echo "$as_me:2830: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:2829: \"$ac_compiler -V </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:2832: \"$ac_compiler -V </dev/null >&5\"") >&5
-   (eval $ac_compiler -V </dev/null >&5) 2>&5
-   ac_status=$?
--  echo "$as_me:2832: \$? = $ac_status" >&5
-+  echo "$as_me:2835: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 
--echo "$as_me:2835: checking whether we are using the GNU C++ compiler" >&5
-+echo "$as_me:2838: checking whether we are using the GNU C++ compiler" >&5
- echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
- if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2841 "configure"
-+#line 2844 "configure"
- #include "confdefs.h"
- 
- int
-@@ -2853,16 +2856,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2856: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2859: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2859: \$? = $ac_status" >&5
-+  echo "$as_me:2862: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2862: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2865: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2865: \$? = $ac_status" >&5
-+  echo "$as_me:2868: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_compiler_gnu=yes
- else
-@@ -2874,19 +2877,19 @@
- ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
- 
- fi
--echo "$as_me:2877: result: $ac_cv_cxx_compiler_gnu" >&5
-+echo "$as_me:2880: result: $ac_cv_cxx_compiler_gnu" >&5
- echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
- GXX=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CXXFLAGS=${CXXFLAGS+set}
- ac_save_CXXFLAGS=$CXXFLAGS
- CXXFLAGS="-g"
--echo "$as_me:2883: checking whether $CXX accepts -g" >&5
-+echo "$as_me:2886: checking whether $CXX accepts -g" >&5
- echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
- if test "${ac_cv_prog_cxx_g+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2889 "configure"
-+#line 2892 "configure"
- #include "confdefs.h"
- 
- int
-@@ -2898,16 +2901,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2901: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2904: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2904: \$? = $ac_status" >&5
-+  echo "$as_me:2907: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2907: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2910: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2910: \$? = $ac_status" >&5
-+  echo "$as_me:2913: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_prog_cxx_g=yes
- else
-@@ -2917,7 +2920,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:2920: result: $ac_cv_prog_cxx_g" >&5
-+echo "$as_me:2923: result: $ac_cv_prog_cxx_g" >&5
- echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
- if test "$ac_test_CXXFLAGS" = set; then
-   CXXFLAGS=$ac_save_CXXFLAGS
-@@ -2944,7 +2947,7 @@
-    'void exit (int);'
- do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2947 "configure"
-+#line 2950 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- $ac_declaration
-@@ -2957,16 +2960,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2960: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2963: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2963: \$? = $ac_status" >&5
-+  echo "$as_me:2966: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2966: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2969: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2969: \$? = $ac_status" >&5
-+  echo "$as_me:2972: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -2976,7 +2979,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2979 "configure"
-+#line 2982 "configure"
- #include "confdefs.h"
- $ac_declaration
- int
-@@ -2988,16 +2991,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2991: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2994: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2994: \$? = $ac_status" >&5
-+  echo "$as_me:2997: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2997: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3000: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3000: \$? = $ac_status" >&5
-+  echo "$as_me:3003: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -3024,7 +3027,7 @@
- 	if test "$CXX" = "g++" ; then
- 		# Extract the first word of "g++", so it can be a program name with args.
- set dummy g++; ac_word=$2
--echo "$as_me:3027: checking for $ac_word" >&5
-+echo "$as_me:3030: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_CXX+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3041,7 +3044,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   if $as_executable_p "$ac_dir/$ac_word"; then
-    ac_cv_path_CXX="$ac_dir/$ac_word"
--   echo "$as_me:3044: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:3047: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -3052,16 +3055,16 @@
- CXX=$ac_cv_path_CXX
- 
- if test -n "$CXX"; then
--  echo "$as_me:3055: result: $CXX" >&5
-+  echo "$as_me:3058: result: $CXX" >&5
- echo "${ECHO_T}$CXX" >&6
- else
--  echo "$as_me:3058: result: no" >&5
-+  echo "$as_me:3061: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
- 	fi
- 	if test "$CXX" = "g++" ; then
--		{ echo "$as_me:3064: WARNING: ignoring hardcoded g++" >&5
-+		{ echo "$as_me:3067: WARNING: ignoring hardcoded g++" >&5
- echo "$as_me: WARNING: ignoring hardcoded g++" >&2;}
- 		cf_with_cxx=no; CXX=""; GXX="";
- 	fi
-@@ -3069,11 +3072,11 @@
- 
- GXX_VERSION=none
- if test "$GXX" = yes; then
--	echo "$as_me:3072: checking version of g++" >&5
-+	echo "$as_me:3075: checking version of g++" >&5
- echo $ECHO_N "checking version of g++... $ECHO_C" >&6
- 	GXX_VERSION="`${CXX-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
- 	test -z "$GXX_VERSION" && GXX_VERSION=unknown
--	echo "$as_me:3076: result: $GXX_VERSION" >&5
-+	echo "$as_me:3079: result: $GXX_VERSION" >&5
- echo "${ECHO_T}$GXX_VERSION" >&6
- fi
- 
-@@ -3081,12 +3084,12 @@
- 1*|2.[0-6]*)
- 	# GXX=""; CXX=""; ac_cv_prog_gxx=no
- 	# cf_cxx_library=no
--	{ echo "$as_me:3084: WARNING: templates do not work" >&5
-+	{ echo "$as_me:3087: WARNING: templates do not work" >&5
- echo "$as_me: WARNING: templates do not work" >&2;}
- 	;;
- esac
- 
--echo "$as_me:3089: checking if you want to build C++ binding and demo" >&5
-+echo "$as_me:3092: checking if you want to build C++ binding and demo" >&5
- echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6
- 
- # Check whether --with-cxx-binding or --without-cxx-binding was given.
-@@ -3096,10 +3099,10 @@
- else
-   cf_with_cxx_binding=$cf_with_cxx
- fi;
--echo "$as_me:3099: result: $cf_with_cxx_binding" >&5
-+echo "$as_me:3102: result: $cf_with_cxx_binding" >&5
- echo "${ECHO_T}$cf_with_cxx_binding" >&6
- 
--echo "$as_me:3102: checking if you want to build with Ada95" >&5
-+echo "$as_me:3105: checking if you want to build with Ada95" >&5
- echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6
- 
- # Check whether --with-ada or --without-ada was given.
-@@ -3109,10 +3112,23 @@
- else
-   cf_with_ada=yes
- fi;
--echo "$as_me:3112: result: $cf_with_ada" >&5
-+echo "$as_me:3115: result: $cf_with_ada" >&5
- echo "${ECHO_T}$cf_with_ada" >&6
- 
--echo "$as_me:3115: checking if you want to build programs such as tic" >&5
-+echo "$as_me:3118: checking if you want to install manpages" >&5
-+echo $ECHO_N "checking if you want to install manpages... $ECHO_C" >&6
-+
-+# Check whether --with-manpages or --without-manpages was given.
-+if test "${with_manpages+set}" = set; then
-+  withval="$with_manpages"
-+  cf_with_manpages=$withval
-+else
-+  cf_with_manpages=yes
-+fi;
-+echo "$as_me:3128: result: $cf_with_manpages" >&5
-+echo "${ECHO_T}$cf_with_manpages" >&6
-+
-+echo "$as_me:3131: checking if you want to build programs such as tic" >&5
- echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6
- 
- # Check whether --with-progs or --without-progs was given.
-@@ -3122,10 +3138,10 @@
- else
-   cf_with_progs=yes
- fi;
--echo "$as_me:3125: result: $cf_with_progs" >&5
-+echo "$as_me:3141: result: $cf_with_progs" >&5
- echo "${ECHO_T}$cf_with_progs" >&6
- 
--echo "$as_me:3128: checking if you wish to install curses.h" >&5
-+echo "$as_me:3144: checking if you wish to install curses.h" >&5
- echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6
- 
- # Check whether --with-curses-h or --without-curses-h was given.
-@@ -3135,7 +3151,7 @@
- else
-   with_curses_h=yes
- fi;
--echo "$as_me:3138: result: $with_curses_h" >&5
-+echo "$as_me:3154: result: $with_curses_h" >&5
- echo "${ECHO_T}$with_curses_h" >&6
- 
- modules_to_build="ncurses"
-@@ -3161,7 +3177,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:3164: checking for $ac_word" >&5
-+echo "$as_me:3180: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_AWK+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3176,7 +3192,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_AWK="$ac_prog"
--echo "$as_me:3179: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3195: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3184,21 +3200,21 @@
- fi
- AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
--  echo "$as_me:3187: result: $AWK" >&5
-+  echo "$as_me:3203: result: $AWK" >&5
- echo "${ECHO_T}$AWK" >&6
- else
--  echo "$as_me:3190: result: no" >&5
-+  echo "$as_me:3206: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-   test -n "$AWK" && break
- done
- 
--test -z "$AWK" && { { echo "$as_me:3197: error: No awk program found" >&5
-+test -z "$AWK" && { { echo "$as_me:3213: error: No awk program found" >&5
- echo "$as_me: error: No awk program found" >&2;}
-    { (exit 1); exit 1; }; }
- 
--echo "$as_me:3201: checking for egrep" >&5
-+echo "$as_me:3217: checking for egrep" >&5
- echo $ECHO_N "checking for egrep... $ECHO_C" >&6
- if test "${ac_cv_prog_egrep+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3208,11 +3224,11 @@
-     else ac_cv_prog_egrep='egrep'
-     fi
- fi
--echo "$as_me:3211: result: $ac_cv_prog_egrep" >&5
-+echo "$as_me:3227: result: $ac_cv_prog_egrep" >&5
- echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-  EGREP=$ac_cv_prog_egrep
- 
--test -z "$EGREP" && { { echo "$as_me:3215: error: No egrep program found" >&5
-+test -z "$EGREP" && { { echo "$as_me:3231: error: No egrep program found" >&5
- echo "$as_me: error: No egrep program found" >&2;}
-    { (exit 1); exit 1; }; }
- 
-@@ -3228,7 +3244,7 @@
- # AFS /usr/afsws/bin/install, which mishandles nonexistent args
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
--echo "$as_me:3231: checking for a BSD compatible install" >&5
-+echo "$as_me:3247: checking for a BSD compatible install" >&5
- echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
- if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
-@@ -3277,7 +3293,7 @@
-     INSTALL=$ac_install_sh
-   fi
- fi
--echo "$as_me:3280: result: $INSTALL" >&5
-+echo "$as_me:3296: result: $INSTALL" >&5
- echo "${ECHO_T}$INSTALL" >&6
- 
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -3302,7 +3318,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:3305: checking for $ac_word" >&5
-+echo "$as_me:3321: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_LINT+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3317,7 +3333,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_LINT="$ac_prog"
--echo "$as_me:3320: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3336: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3325,28 +3341,28 @@
- fi
- LINT=$ac_cv_prog_LINT
- if test -n "$LINT"; then
--  echo "$as_me:3328: result: $LINT" >&5
-+  echo "$as_me:3344: result: $LINT" >&5
- echo "${ECHO_T}$LINT" >&6
- else
--  echo "$as_me:3331: result: no" >&5
-+  echo "$as_me:3347: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-   test -n "$LINT" && break
- done
- 
--echo "$as_me:3338: checking whether ln -s works" >&5
-+echo "$as_me:3354: checking whether ln -s works" >&5
- echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
- LN_S=$as_ln_s
- if test "$LN_S" = "ln -s"; then
--  echo "$as_me:3342: result: yes" >&5
-+  echo "$as_me:3358: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:3345: result: no, using $LN_S" >&5
-+  echo "$as_me:3361: result: no, using $LN_S" >&5
- echo "${ECHO_T}no, using $LN_S" >&6
- fi
- 
--echo "$as_me:3349: checking for long file names" >&5
-+echo "$as_me:3365: checking for long file names" >&5
- echo $ECHO_N "checking for long file names... $ECHO_C" >&6
- if test "${ac_cv_sys_long_file_names+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3385,7 +3401,7 @@
-   rm -rf $ac_xdir 2>/dev/null
- done
- fi
--echo "$as_me:3388: result: $ac_cv_sys_long_file_names" >&5
-+echo "$as_me:3404: result: $ac_cv_sys_long_file_names" >&5
- echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
- if test $ac_cv_sys_long_file_names = yes; then
- 
-@@ -3395,7 +3411,136 @@
- 
- fi
- 
--echo "$as_me:3398: checking if we should assume mixed-case filenames" >&5
-+# if we find pkg-config, check if we should install the ".pc" files.
-+
-+echo "$as_me:3416: checking if you want to use pkg-config" >&5
-+echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
-+
-+# Check whether --with-pkg-config or --without-pkg-config was given.
-+if test "${with_pkg_config+set}" = set; then
-+  withval="$with_pkg_config"
-+  cf_pkg_config=$withval
-+else
-+  cf_pkg_config=yes
-+fi;
-+echo "$as_me:3426: result: $cf_pkg_config" >&5
-+echo "${ECHO_T}$cf_pkg_config" >&6
-+
-+case $cf_pkg_config in
-+no)
-+	PKG_CONFIG=none
-+	;;
-+yes)
-+	# Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+echo "$as_me:3436: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $PKG_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  ac_save_IFS=$IFS; IFS=$ac_path_separator
-+ac_dummy="$PATH"
-+for ac_dir in $ac_dummy; do
-+  IFS=$ac_save_IFS
-+  test -z "$ac_dir" && ac_dir=.
-+  if $as_executable_p "$ac_dir/$ac_word"; then
-+   ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-+   echo "$as_me:3453: found $ac_dir/$ac_word" >&5
-+   break
-+fi
-+done
-+
-+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="none"
-+  ;;
-+esac
-+fi
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+
-+if test -n "$PKG_CONFIG"; then
-+  echo "$as_me:3465: result: $PKG_CONFIG" >&5
-+echo "${ECHO_T}$PKG_CONFIG" >&6
-+else
-+  echo "$as_me:3468: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+	;;
-+*)
-+	PKG_CONFIG=$withval
-+	;;
-+esac
-+
-+test -z "$PKG_CONFIG" && PKG_CONFIG=none
-+if test "$PKG_CONFIG" != none ; then
-+
-+if test "x$prefix" != xNONE; then
-+  cf_path_syntax="$prefix"
-+else
-+  cf_path_syntax="$ac_default_prefix"
-+fi
-+
-+case ".$PKG_CONFIG" in #(vi
-+.\$\(*\)*|.\'*\'*) #(vi
-+  ;;
-+..|./*|.\\*) #(vi
-+  ;;
-+.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
-+  ;;
-+.\${*prefix}*) #(vi
-+  eval PKG_CONFIG="$PKG_CONFIG"
-+  case ".$PKG_CONFIG" in #(vi
-+  .NONE/*)
-+    PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
-+    ;;
-+  esac
-+  ;; #(vi
-+.no|.NONE/*)
-+  PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
-+  ;;
-+*)
-+  { { echo "$as_me:3506: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
-+echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
-+   { (exit 1); exit 1; }; }
-+  ;;
-+esac
-+
-+fi
-+
-+if test "$PKG_CONFIG" != no ; then
-+	echo "$as_me:3515: checking if we should install .pc files for $PKG_CONFIG" >&5
-+echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6
-+
-+	# Leave this as something that can be overridden in the environment.
-+	if test -z "$PKG_CONFIG_LIBDIR" ; then
-+		PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`/lib/pkgconfig
-+	fi
-+
-+	if test -d "$PKG_CONFIG_LIBDIR" ; then
-+
-+# Check whether --enable-pc-files or --disable-pc-files was given.
-+if test "${enable_pc_files+set}" = set; then
-+  enableval="$enable_pc_files"
-+  enable_pc_files=$enableval
-+else
-+  enable_pc_files=no
-+fi;
-+		echo "$as_me:3532: result: $enable_pc_files" >&5
-+echo "${ECHO_T}$enable_pc_files" >&6
-+	else
-+		echo "$as_me:3535: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+		{ echo "$as_me:3537: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5
-+echo "$as_me: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&2;}
-+		enable_pc_files=no
-+	fi
-+fi
-+
-+echo "$as_me:3543: checking if we should assume mixed-case filenames" >&5
- echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
- 
- # Check whether --enable-mixed-case or --disable-mixed-case was given.
-@@ -3405,11 +3550,11 @@
- else
-   enable_mixedcase=auto
- fi;
--echo "$as_me:3408: result: $enable_mixedcase" >&5
-+echo "$as_me:3553: result: $enable_mixedcase" >&5
- echo "${ECHO_T}$enable_mixedcase" >&6
- if test "$enable_mixedcase" = "auto" ; then
- 
--echo "$as_me:3412: checking if filesystem supports mixed-case filenames" >&5
-+echo "$as_me:3557: checking if filesystem supports mixed-case filenames" >&5
- echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
- if test "${cf_cv_mixedcase+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3436,7 +3581,7 @@
- fi
- 
- fi
--echo "$as_me:3439: result: $cf_cv_mixedcase" >&5
-+echo "$as_me:3584: result: $cf_cv_mixedcase" >&5
- echo "${ECHO_T}$cf_cv_mixedcase" >&6
- test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF
- #define MIXEDCASE_FILENAMES 1
-@@ -3453,7 +3598,7 @@
- fi
- 
- # do this after mixed-case option (tags/TAGS is not as important as tic).
--echo "$as_me:3456: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "$as_me:3601: checking whether ${MAKE-make} sets \${MAKE}" >&5
- echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
- if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-@@ -3473,18 +3618,18 @@
- rm -f conftest.make
- fi
- if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
--  echo "$as_me:3476: result: yes" >&5
-+  echo "$as_me:3621: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-   SET_MAKE=
- else
--  echo "$as_me:3480: result: no" >&5
-+  echo "$as_me:3625: result: no" >&5
- echo "${ECHO_T}no" >&6
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
- 
- # Extract the first word of "ctags", so it can be a program name with args.
- set dummy ctags; ac_word=$2
--echo "$as_me:3487: checking for $ac_word" >&5
-+echo "$as_me:3632: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3499,7 +3644,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_MAKE_LOWER_TAGS="yes"
--echo "$as_me:3502: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3647: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3508,17 +3653,17 @@
- fi
- MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
- if test -n "$MAKE_LOWER_TAGS"; then
--  echo "$as_me:3511: result: $MAKE_LOWER_TAGS" >&5
-+  echo "$as_me:3656: result: $MAKE_LOWER_TAGS" >&5
- echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
- else
--  echo "$as_me:3514: result: no" >&5
-+  echo "$as_me:3659: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
- if test "$cf_cv_mixedcase" = yes ; then
- 	# Extract the first word of "etags", so it can be a program name with args.
- set dummy etags; ac_word=$2
--echo "$as_me:3521: checking for $ac_word" >&5
-+echo "$as_me:3666: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3533,7 +3678,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_MAKE_UPPER_TAGS="yes"
--echo "$as_me:3536: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3681: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3542,10 +3687,10 @@
- fi
- MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
- if test -n "$MAKE_UPPER_TAGS"; then
--  echo "$as_me:3545: result: $MAKE_UPPER_TAGS" >&5
-+  echo "$as_me:3690: result: $MAKE_UPPER_TAGS" >&5
- echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
- else
--  echo "$as_me:3548: result: no" >&5
-+  echo "$as_me:3693: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3565,7 +3710,7 @@
- 	MAKE_LOWER_TAGS="#"
- fi
- 
--echo "$as_me:3568: checking for makeflags variable" >&5
-+echo "$as_me:3713: checking for makeflags variable" >&5
- echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
- if test "${cf_cv_makeflags+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3599,13 +3744,13 @@
- 	rm -f cf_makeflags.tmp
- 
- fi
--echo "$as_me:3602: result: $cf_cv_makeflags" >&5
-+echo "$as_me:3747: result: $cf_cv_makeflags" >&5
- echo "${ECHO_T}$cf_cv_makeflags" >&6
- 
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
--echo "$as_me:3608: checking for $ac_word" >&5
-+echo "$as_me:3753: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_RANLIB+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3620,7 +3765,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
--echo "$as_me:3623: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3768: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3628,10 +3773,10 @@
- fi
- RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
--  echo "$as_me:3631: result: $RANLIB" >&5
-+  echo "$as_me:3776: result: $RANLIB" >&5
- echo "${ECHO_T}$RANLIB" >&6
- else
--  echo "$as_me:3634: result: no" >&5
-+  echo "$as_me:3779: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3640,7 +3785,7 @@
-   ac_ct_RANLIB=$RANLIB
-   # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
--echo "$as_me:3643: checking for $ac_word" >&5
-+echo "$as_me:3788: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3655,7 +3800,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_RANLIB="ranlib"
--echo "$as_me:3658: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3803: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3664,10 +3809,10 @@
- fi
- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
- if test -n "$ac_ct_RANLIB"; then
--  echo "$as_me:3667: result: $ac_ct_RANLIB" >&5
-+  echo "$as_me:3812: result: $ac_ct_RANLIB" >&5
- echo "${ECHO_T}$ac_ct_RANLIB" >&6
- else
--  echo "$as_me:3670: result: no" >&5
-+  echo "$as_me:3815: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3679,7 +3824,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ld; ac_word=$2
--echo "$as_me:3682: checking for $ac_word" >&5
-+echo "$as_me:3827: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_LD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3694,7 +3839,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_LD="${ac_tool_prefix}ld"
--echo "$as_me:3697: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3842: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3702,10 +3847,10 @@
- fi
- LD=$ac_cv_prog_LD
- if test -n "$LD"; then
--  echo "$as_me:3705: result: $LD" >&5
-+  echo "$as_me:3850: result: $LD" >&5
- echo "${ECHO_T}$LD" >&6
- else
--  echo "$as_me:3708: result: no" >&5
-+  echo "$as_me:3853: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3714,7 +3859,7 @@
-   ac_ct_LD=$LD
-   # Extract the first word of "ld", so it can be a program name with args.
- set dummy ld; ac_word=$2
--echo "$as_me:3717: checking for $ac_word" >&5
-+echo "$as_me:3862: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3729,7 +3874,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_LD="ld"
--echo "$as_me:3732: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3877: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3738,10 +3883,10 @@
- fi
- ac_ct_LD=$ac_cv_prog_ac_ct_LD
- if test -n "$ac_ct_LD"; then
--  echo "$as_me:3741: result: $ac_ct_LD" >&5
-+  echo "$as_me:3886: result: $ac_ct_LD" >&5
- echo "${ECHO_T}$ac_ct_LD" >&6
- else
--  echo "$as_me:3744: result: no" >&5
-+  echo "$as_me:3889: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3753,7 +3898,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
--echo "$as_me:3756: checking for $ac_word" >&5
-+echo "$as_me:3901: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3768,7 +3913,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_AR="${ac_tool_prefix}ar"
--echo "$as_me:3771: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3916: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3776,10 +3921,10 @@
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
--  echo "$as_me:3779: result: $AR" >&5
-+  echo "$as_me:3924: result: $AR" >&5
- echo "${ECHO_T}$AR" >&6
- else
--  echo "$as_me:3782: result: no" >&5
-+  echo "$as_me:3927: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3788,7 +3933,7 @@
-   ac_ct_AR=$AR
-   # Extract the first word of "ar", so it can be a program name with args.
- set dummy ar; ac_word=$2
--echo "$as_me:3791: checking for $ac_word" >&5
-+echo "$as_me:3936: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3803,7 +3948,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_AR="ar"
--echo "$as_me:3806: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3951: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3812,10 +3957,10 @@
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
--  echo "$as_me:3815: result: $ac_ct_AR" >&5
-+  echo "$as_me:3960: result: $ac_ct_AR" >&5
- echo "${ECHO_T}$ac_ct_AR" >&6
- else
--  echo "$as_me:3818: result: no" >&5
-+  echo "$as_me:3963: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3824,25 +3969,123 @@
-   AR="$ac_cv_prog_AR"
- fi
- 
--if test "${cf_cv_subst_AR_OPTS+set}" = set; then
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}ar; ac_word=$2
-+echo "$as_me:3975: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-+  if test -n "$AR"; then
-+  ac_cv_prog_AR="$AR" # Let the user override the test.
-+else
-+  ac_save_IFS=$IFS; IFS=$ac_path_separator
-+ac_dummy="$PATH"
-+for ac_dir in $ac_dummy; do
-+  IFS=$ac_save_IFS
-+  test -z "$ac_dir" && ac_dir=.
-+  $as_executable_p "$ac_dir/$ac_word" || continue
-+ac_cv_prog_AR="${ac_tool_prefix}ar"
-+echo "$as_me:3990: found $ac_dir/$ac_word" >&5
-+break
-+done
- 
--echo "$as_me:3831: checking for archiver options (symbol AR_OPTS)" >&5
--echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6
-+fi
-+fi
-+AR=$ac_cv_prog_AR
-+if test -n "$AR"; then
-+  echo "$as_me:3998: result: $AR" >&5
-+echo "${ECHO_T}$AR" >&6
-+else
-+  echo "$as_me:4001: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
- 
--if test -z "$AR_OPTS" ; then
--	AR_OPTS=rv
-+fi
-+if test -z "$ac_cv_prog_AR"; then
-+  ac_ct_AR=$AR
-+  # Extract the first word of "ar", so it can be a program name with args.
-+set dummy ar; ac_word=$2
-+echo "$as_me:4010: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$ac_ct_AR"; then
-+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-+else
-+  ac_save_IFS=$IFS; IFS=$ac_path_separator
-+ac_dummy="$PATH"
-+for ac_dir in $ac_dummy; do
-+  IFS=$ac_save_IFS
-+  test -z "$ac_dir" && ac_dir=.
-+  $as_executable_p "$ac_dir/$ac_word" || continue
-+ac_cv_prog_ac_ct_AR="ar"
-+echo "$as_me:4025: found $ac_dir/$ac_word" >&5
-+break
-+done
- 
-+  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="ar"
-+fi
- fi
-+ac_ct_AR=$ac_cv_prog_ac_ct_AR
-+if test -n "$ac_ct_AR"; then
-+  echo "$as_me:4034: result: $ac_ct_AR" >&5
-+echo "${ECHO_T}$ac_ct_AR" >&6
-+else
-+  echo "$as_me:4037: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+  AR=$ac_ct_AR
-+else
-+  AR="$ac_cv_prog_AR"
-+fi
-+
-+echo "$as_me:4046: checking for options to update archives" >&5
-+echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
-+if test "${cf_cv_ar_flags+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+	cf_cv_ar_flags=unknown
-+	for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
-+	do
-+		rm -f conftest.$ac_cv_objext
-+		rm -f conftest.a
-+
-+		cat >conftest.$ac_ext <<EOF
-+#line 4059 "configure"
-+int	testdata[3] = { 123, 456, 789 };
-+EOF
-+		if { (eval echo "$as_me:4062: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:4065: \$? = $ac_status" >&5
-+  (exit $ac_status); } ; then
-+			$AR $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null
-+			if test -f conftest.a ; then
-+				cf_cv_ar_flags=$cf_ar_flags
-+				break
-+			fi
-+		else
-+			test -n "$verbose" && echo "	cannot compile test-program" 1>&6
- 
--cf_cv_subst_AR_OPTS=$AR_OPTS
--echo "$as_me:3840: result: $AR_OPTS" >&5
--echo "${ECHO_T}$AR_OPTS" >&6
-+echo "${as_me-configure}:4075: testing cannot compile test-program ..." 1>&5
-+
-+			break
-+		fi
-+	done
-+	rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
- 
- fi
-+echo "$as_me:4083: result: $cf_cv_ar_flags" >&5
-+echo "${ECHO_T}$cf_cv_ar_flags" >&6
- 
--echo "$as_me:3845: checking if you have specified an install-prefix" >&5
-+ARFLAGS=$cf_cv_ar_flags
-+
-+echo "$as_me:4088: checking if you have specified an install-prefix" >&5
- echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
- 
- # Check whether --with-install-prefix or --without-install-prefix was given.
-@@ -3855,7 +4098,7 @@
- 		;;
- 	esac
- fi;
--echo "$as_me:3858: result: $DESTDIR" >&5
-+echo "$as_me:4101: result: $DESTDIR" >&5
- echo "${ECHO_T}$DESTDIR" >&6
- 
- ###############################################################################
-@@ -3883,7 +4126,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:3886: checking for $ac_word" >&5
-+echo "$as_me:4129: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_BUILD_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3898,7 +4141,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_BUILD_CC="$ac_prog"
--echo "$as_me:3901: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4144: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3906,10 +4149,10 @@
- fi
- BUILD_CC=$ac_cv_prog_BUILD_CC
- if test -n "$BUILD_CC"; then
--  echo "$as_me:3909: result: $BUILD_CC" >&5
-+  echo "$as_me:4152: result: $BUILD_CC" >&5
- echo "${ECHO_T}$BUILD_CC" >&6
- else
--  echo "$as_me:3912: result: no" >&5
-+  echo "$as_me:4155: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3917,12 +4160,12 @@
- done
- 
- fi;
--	echo "$as_me:3920: checking for native build C compiler" >&5
-+	echo "$as_me:4163: checking for native build C compiler" >&5
- echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
--	echo "$as_me:3922: result: $BUILD_CC" >&5
-+	echo "$as_me:4165: result: $BUILD_CC" >&5
- echo "${ECHO_T}$BUILD_CC" >&6
- 
--	echo "$as_me:3925: checking for native build C preprocessor" >&5
-+	echo "$as_me:4168: checking for native build C preprocessor" >&5
- echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
- 
- # Check whether --with-build-cpp or --without-build-cpp was given.
-@@ -3932,10 +4175,10 @@
- else
-   BUILD_CPP='${BUILD_CC} -E'
- fi;
--	echo "$as_me:3935: result: $BUILD_CPP" >&5
-+	echo "$as_me:4178: result: $BUILD_CPP" >&5
- echo "${ECHO_T}$BUILD_CPP" >&6
- 
--	echo "$as_me:3938: checking for native build C flags" >&5
-+	echo "$as_me:4181: checking for native build C flags" >&5
- echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
- 
- # Check whether --with-build-cflags or --without-build-cflags was given.
-@@ -3943,10 +4186,10 @@
-   withval="$with_build_cflags"
-   BUILD_CFLAGS="$withval"
- fi;
--	echo "$as_me:3946: result: $BUILD_CFLAGS" >&5
-+	echo "$as_me:4189: result: $BUILD_CFLAGS" >&5
- echo "${ECHO_T}$BUILD_CFLAGS" >&6
- 
--	echo "$as_me:3949: checking for native build C preprocessor-flags" >&5
-+	echo "$as_me:4192: checking for native build C preprocessor-flags" >&5
- echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
- 
- # Check whether --with-build-cppflags or --without-build-cppflags was given.
-@@ -3954,10 +4197,10 @@
-   withval="$with_build_cppflags"
-   BUILD_CPPFLAGS="$withval"
- fi;
--	echo "$as_me:3957: result: $BUILD_CPPFLAGS" >&5
-+	echo "$as_me:4200: result: $BUILD_CPPFLAGS" >&5
- echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
- 
--	echo "$as_me:3960: checking for native build linker-flags" >&5
-+	echo "$as_me:4203: checking for native build linker-flags" >&5
- echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
- 
- # Check whether --with-build-ldflags or --without-build-ldflags was given.
-@@ -3965,10 +4208,10 @@
-   withval="$with_build_ldflags"
-   BUILD_LDFLAGS="$withval"
- fi;
--	echo "$as_me:3968: result: $BUILD_LDFLAGS" >&5
-+	echo "$as_me:4211: result: $BUILD_LDFLAGS" >&5
- echo "${ECHO_T}$BUILD_LDFLAGS" >&6
- 
--	echo "$as_me:3971: checking for native build linker-libraries" >&5
-+	echo "$as_me:4214: checking for native build linker-libraries" >&5
- echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
- 
- # Check whether --with-build-libs or --without-build-libs was given.
-@@ -3976,7 +4219,7 @@
-   withval="$with_build_libs"
-   BUILD_LIBS="$withval"
- fi;
--	echo "$as_me:3979: result: $BUILD_LIBS" >&5
-+	echo "$as_me:4222: result: $BUILD_LIBS" >&5
- echo "${ECHO_T}$BUILD_LIBS" >&6
- 
- 	# this assumes we're on Unix.
-@@ -3986,7 +4229,7 @@
- 	: ${BUILD_CC:='${CC}'}
- 
- 	if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
--		{ { echo "$as_me:3989: error: Cross-build requires two compilers.
-+		{ { echo "$as_me:4232: error: Cross-build requires two compilers.
- Use --with-build-cc to specify the native compiler." >&5
- echo "$as_me: error: Cross-build requires two compilers.
- Use --with-build-cc to specify the native compiler." >&2;}
-@@ -4027,7 +4270,7 @@
- LIB_INSTALL=
- LIB_UNINSTALL=
- 
--echo "$as_me:4030: checking if you want to build libraries with libtool" >&5
-+echo "$as_me:4273: checking if you want to build libraries with libtool" >&5
- echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6
- 
- # Check whether --with-libtool or --without-libtool was given.
-@@ -4037,11 +4280,11 @@
- else
-   with_libtool=no
- fi;
--echo "$as_me:4040: result: $with_libtool" >&5
-+echo "$as_me:4283: result: $with_libtool" >&5
- echo "${ECHO_T}$with_libtool" >&6
- if test "$with_libtool" != "no"; then
- 
-- 	if test "$with_libtool" != "yes" ; then
-+	if test "$with_libtool" != "yes" ; then
- 
- if test "x$prefix" != xNONE; then
-   cf_path_syntax="$prefix"
-@@ -4068,7 +4311,7 @@
-   with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
-   ;;
- *)
--  { { echo "$as_me:4071: error: expected a pathname, not \"$with_libtool\"" >&5
-+  { { echo "$as_me:4314: error: expected a pathname, not \"$with_libtool\"" >&5
- echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
-    { (exit 1); exit 1; }; }
-   ;;
-@@ -4076,9 +4319,9 @@
- 
- 		LIBTOOL=$with_libtool
- 	else
-- 		# Extract the first word of "libtool", so it can be a program name with args.
-+		# Extract the first word of "libtool", so it can be a program name with args.
- set dummy libtool; ac_word=$2
--echo "$as_me:4081: checking for $ac_word" >&5
-+echo "$as_me:4324: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_LIBTOOL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4095,7 +4338,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   if $as_executable_p "$ac_dir/$ac_word"; then
-    ac_cv_path_LIBTOOL="$ac_dir/$ac_word"
--   echo "$as_me:4098: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:4341: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -4106,19 +4349,19 @@
- LIBTOOL=$ac_cv_path_LIBTOOL
- 
- if test -n "$LIBTOOL"; then
--  echo "$as_me:4109: result: $LIBTOOL" >&5
-+  echo "$as_me:4352: result: $LIBTOOL" >&5
- echo "${ECHO_T}$LIBTOOL" >&6
- else
--  echo "$as_me:4112: result: no" >&5
-+  echo "$as_me:4355: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-- 	fi
-- 	if test -z "$LIBTOOL" ; then
-- 		{ { echo "$as_me:4118: error: Cannot find libtool" >&5
-+	fi
-+	if test -z "$LIBTOOL" ; then
-+		{ { echo "$as_me:4361: error: Cannot find libtool" >&5
- echo "$as_me: error: Cannot find libtool" >&2;}
-    { (exit 1); exit 1; }; }
-- 	fi
-+	fi
- 	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
- 	LIB_OBJECT='${OBJECTS:.o=.lo}'
- 	LIB_SUFFIX=.la
-@@ -4130,17 +4373,17 @@
- 	LIB_PREP=:
- 
- 	# Show the version of libtool
--	echo "$as_me:4133: checking version of libtool" >&5
-+	echo "$as_me:4376: checking version of libtool" >&5
- echo $ECHO_N "checking version of libtool... $ECHO_C" >&6
- 
- 	# Save the version in a cache variable - this is not entirely a good
- 	# thing, but the version string from libtool is very ugly, and for
- 	# bug reports it might be useful to have the original string.
- 	cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'`
--	echo "$as_me:4140: result: $cf_cv_libtool_version" >&5
-+	echo "$as_me:4383: result: $cf_cv_libtool_version" >&5
- echo "${ECHO_T}$cf_cv_libtool_version" >&6
- 	if test -z "$cf_cv_libtool_version" ; then
--		{ { echo "$as_me:4143: error: This is not GNU libtool" >&5
-+		{ { echo "$as_me:4386: error: This is not GNU libtool" >&5
- echo "$as_me: error: This is not GNU libtool" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
-@@ -4168,7 +4411,7 @@
- 
- else
- 
--echo "$as_me:4171: checking if you want to build shared libraries" >&5
-+echo "$as_me:4414: checking if you want to build shared libraries" >&5
- echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6
- 
- # Check whether --with-shared or --without-shared was given.
-@@ -4178,11 +4421,11 @@
- else
-   with_shared=no
- fi;
--echo "$as_me:4181: result: $with_shared" >&5
-+echo "$as_me:4424: result: $with_shared" >&5
- echo "${ECHO_T}$with_shared" >&6
- test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
- 
--echo "$as_me:4185: checking if you want to build static libraries" >&5
-+echo "$as_me:4428: checking if you want to build static libraries" >&5
- echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6
- 
- # Check whether --with-normal or --without-normal was given.
-@@ -4192,11 +4435,11 @@
- else
-   with_normal=yes
- fi;
--echo "$as_me:4195: result: $with_normal" >&5
-+echo "$as_me:4438: result: $with_normal" >&5
- echo "${ECHO_T}$with_normal" >&6
- test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal"
- 
--echo "$as_me:4199: checking if you want to build debug libraries" >&5
-+echo "$as_me:4442: checking if you want to build debug libraries" >&5
- echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6
- 
- # Check whether --with-debug or --without-debug was given.
-@@ -4206,11 +4449,11 @@
- else
-   with_debug=yes
- fi;
--echo "$as_me:4209: result: $with_debug" >&5
-+echo "$as_me:4452: result: $with_debug" >&5
- echo "${ECHO_T}$with_debug" >&6
- test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug"
- 
--echo "$as_me:4213: checking if you want to build profiling libraries" >&5
-+echo "$as_me:4456: checking if you want to build profiling libraries" >&5
- echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6
- 
- # Check whether --with-profile or --without-profile was given.
-@@ -4220,7 +4463,7 @@
- else
-   with_profile=no
- fi;
--echo "$as_me:4223: result: $with_profile" >&5
-+echo "$as_me:4466: result: $with_profile" >&5
- echo "${ECHO_T}$with_profile" >&6
- test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile"
- 
-@@ -4228,19 +4471,19 @@
- 
- ###############################################################################
- 
--echo "$as_me:4231: checking for specified models" >&5
-+echo "$as_me:4474: checking for specified models" >&5
- echo $ECHO_N "checking for specified models... $ECHO_C" >&6
- test -z "$cf_list_models" && cf_list_models=normal
- test "$with_libtool" != "no" && cf_list_models=libtool
--echo "$as_me:4235: result: $cf_list_models" >&5
-+echo "$as_me:4478: result: $cf_list_models" >&5
- echo "${ECHO_T}$cf_list_models" >&6
- 
- ### Use the first model as the default, and save its suffix for use in building
- ### up test-applications.
--echo "$as_me:4240: checking for default model" >&5
-+echo "$as_me:4483: checking for default model" >&5
- echo $ECHO_N "checking for default model... $ECHO_C" >&6
- DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'`
--echo "$as_me:4243: result: $DFT_LWR_MODEL" >&5
-+echo "$as_me:4486: result: $DFT_LWR_MODEL" >&5
- echo "${ECHO_T}$DFT_LWR_MODEL" >&6
- 
- DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-@@ -4269,7 +4512,7 @@
- 
- ###############################################################################
- 
--echo "$as_me:4272: checking if you want to build a separate terminfo library" >&5
-+echo "$as_me:4515: checking if you want to build a separate terminfo library" >&5
- echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6
- 
- # Check whether --with-termlib or --without-termlib was given.
-@@ -4279,10 +4522,10 @@
- else
-   with_termlib=no
- fi;
--echo "$as_me:4282: result: $with_termlib" >&5
-+echo "$as_me:4525: result: $with_termlib" >&5
- echo "${ECHO_T}$with_termlib" >&6
- 
--echo "$as_me:4285: checking if you want to build a separate tic library" >&5
-+echo "$as_me:4528: checking if you want to build a separate tic library" >&5
- echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6
- 
- # Check whether --with-ticlib or --without-ticlib was given.
-@@ -4292,13 +4535,13 @@
- else
-   with_ticlib=no
- fi;
--echo "$as_me:4295: result: $with_ticlib" >&5
-+echo "$as_me:4538: result: $with_ticlib" >&5
- echo "${ECHO_T}$with_ticlib" >&6
- 
- ### Checks for special libraries, must be done up-front.
- SHLIB_LIST=""
- 
--echo "$as_me:4301: checking if you want to link with the GPM mouse library" >&5
-+echo "$as_me:4544: checking if you want to link with the GPM mouse library" >&5
- echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6
- 
- # Check whether --with-gpm or --without-gpm was given.
-@@ -4308,27 +4551,27 @@
- else
-   with_gpm=maybe
- fi;
--echo "$as_me:4311: result: $with_gpm" >&5
-+echo "$as_me:4554: result: $with_gpm" >&5
- echo "${ECHO_T}$with_gpm" >&6
- 
- if test "$with_gpm" != no ; then
--	echo "$as_me:4315: checking for gpm.h" >&5
-+	echo "$as_me:4558: checking for gpm.h" >&5
- echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6
- if test "${ac_cv_header_gpm_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 4321 "configure"
-+#line 4564 "configure"
- #include "confdefs.h"
- #include <gpm.h>
- _ACEOF
--if { (eval echo "$as_me:4325: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:4568: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:4331: \$? = $ac_status" >&5
-+  echo "$as_me:4574: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -4347,7 +4590,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:4350: result: $ac_cv_header_gpm_h" >&5
-+echo "$as_me:4593: result: $ac_cv_header_gpm_h" >&5
- echo "${ECHO_T}$ac_cv_header_gpm_h" >&6
- if test $ac_cv_header_gpm_h = yes; then
- 
-@@ -4358,14 +4601,14 @@
- 		if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then
- 			test -n "$verbose" && echo "	assuming we really have GPM library" 1>&6
- 
--echo "${as_me-configure}:4361: testing assuming we really have GPM library ..." 1>&5
-+echo "${as_me-configure}:4604: testing assuming we really have GPM library ..." 1>&5
- 
- 			cat >>confdefs.h <<\EOF
- #define HAVE_LIBGPM 1
- EOF
- 
- 		else
--			echo "$as_me:4368: checking for Gpm_Open in -lgpm" >&5
-+			echo "$as_me:4611: checking for Gpm_Open in -lgpm" >&5
- echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4373,7 +4616,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 4376 "configure"
-+#line 4619 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4392,16 +4635,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4395: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4638: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4398: \$? = $ac_status" >&5
-+  echo "$as_me:4641: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4401: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4644: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4404: \$? = $ac_status" >&5
-+  echo "$as_me:4647: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Open=yes
- else
-@@ -4412,13 +4655,13 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:4415: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:4658: result: $ac_cv_lib_gpm_Gpm_Open" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
- if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-   :
- else
- 
--				{ { echo "$as_me:4421: error: Cannot link with GPM library" >&5
-+				{ { echo "$as_me:4664: error: Cannot link with GPM library" >&5
- echo "$as_me: error: Cannot link with GPM library" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
-@@ -4428,7 +4671,7 @@
- 
- else
- 
--		test "$with_gpm" != maybe && { echo "$as_me:4431: WARNING: Cannot find GPM header" >&5
-+		test "$with_gpm" != maybe && { echo "$as_me:4674: WARNING: Cannot find GPM header" >&5
- echo "$as_me: WARNING: Cannot find GPM header" >&2;}
- 		with_gpm=no
- 
-@@ -4437,7 +4680,7 @@
- fi
- 
- if test "$with_gpm" != no ; then
--	echo "$as_me:4440: checking if you want to load GPM dynamically" >&5
-+	echo "$as_me:4683: checking if you want to load GPM dynamically" >&5
- echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6
- 
- # Check whether --with-dlsym or --without-dlsym was given.
-@@ -4447,18 +4690,18 @@
- else
-   with_dlsym=yes
- fi;
--	echo "$as_me:4450: result: $with_dlsym" >&5
-+	echo "$as_me:4693: result: $with_dlsym" >&5
- echo "${ECHO_T}$with_dlsym" >&6
- 	if test "$with_dlsym" = yes ; then
- 
- cf_have_dlsym=no
--echo "$as_me:4455: checking for dlsym" >&5
-+echo "$as_me:4698: checking for dlsym" >&5
- echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
- if test "${ac_cv_func_dlsym+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 4461 "configure"
-+#line 4704 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char dlsym (); below.  */
-@@ -4489,16 +4732,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4492: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4735: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4495: \$? = $ac_status" >&5
-+  echo "$as_me:4738: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4498: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4741: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4501: \$? = $ac_status" >&5
-+  echo "$as_me:4744: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_dlsym=yes
- else
-@@ -4508,14 +4751,14 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:4511: result: $ac_cv_func_dlsym" >&5
-+echo "$as_me:4754: result: $ac_cv_func_dlsym" >&5
- echo "${ECHO_T}$ac_cv_func_dlsym" >&6
- if test $ac_cv_func_dlsym = yes; then
-   cf_have_dlsym=yes
- else
- 
- cf_have_libdl=no
--echo "$as_me:4518: checking for dlsym in -ldl" >&5
-+echo "$as_me:4761: checking for dlsym in -ldl" >&5
- echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
- if test "${ac_cv_lib_dl_dlsym+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4523,7 +4766,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 4526 "configure"
-+#line 4769 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4542,16 +4785,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4545: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4788: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4548: \$? = $ac_status" >&5
-+  echo "$as_me:4791: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4551: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4794: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4554: \$? = $ac_status" >&5
-+  echo "$as_me:4797: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dl_dlsym=yes
- else
-@@ -4562,7 +4805,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:4565: result: $ac_cv_lib_dl_dlsym" >&5
-+echo "$as_me:4808: result: $ac_cv_lib_dl_dlsym" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
- if test $ac_cv_lib_dl_dlsym = yes; then
- 
-@@ -4575,10 +4818,10 @@
- if test "$cf_have_dlsym" = yes ; then
- 	test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS"
- 
--	echo "$as_me:4578: checking whether able to link to dl*() functions" >&5
-+	echo "$as_me:4821: checking whether able to link to dl*() functions" >&5
- echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 4581 "configure"
-+#line 4824 "configure"
- #include "confdefs.h"
- #include <dlfcn.h>
- int
-@@ -4596,16 +4839,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4599: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4842: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4602: \$? = $ac_status" >&5
-+  echo "$as_me:4845: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4605: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4848: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4608: \$? = $ac_status" >&5
-+  echo "$as_me:4851: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 		cat >>confdefs.h <<\EOF
-@@ -4616,15 +4859,15 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- 
--		{ { echo "$as_me:4619: error: Cannot link test program for libdl" >&5
-+		{ { echo "$as_me:4862: error: Cannot link test program for libdl" >&5
- echo "$as_me: error: Cannot link test program for libdl" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--	echo "$as_me:4624: result: ok" >&5
-+	echo "$as_me:4867: result: ok" >&5
- echo "${ECHO_T}ok" >&6
- else
--	{ { echo "$as_me:4627: error: Cannot find dlsym function" >&5
-+	{ { echo "$as_me:4870: error: Cannot find dlsym function" >&5
- echo "$as_me: error: Cannot find dlsym function" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -4632,12 +4875,12 @@
- 		if test "$with_gpm" != yes ; then
- 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
- 
--echo "${as_me-configure}:4635: testing assuming soname for gpm is $with_gpm ..." 1>&5
-+echo "${as_me-configure}:4878: testing assuming soname for gpm is $with_gpm ..." 1>&5
- 
- 			cf_cv_gpm_soname="$with_gpm"
- 		else
- 
--echo "$as_me:4640: checking for soname of gpm library" >&5
-+echo "$as_me:4883: checking for soname of gpm library" >&5
- echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6
- if test "${cf_cv_gpm_soname+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4655,15 +4898,15 @@
- CF_EOF
- cf_save_LIBS="$LIBS"
- 	LIBS="-lgpm $LIBS"
--	if { (eval echo "$as_me:4658: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:4901: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4661: \$? = $ac_status" >&5
-+  echo "$as_me:4904: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
--		if { (eval echo "$as_me:4663: \"$ac_link\"") >&5
-+		if { (eval echo "$as_me:4906: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4666: \$? = $ac_status" >&5
-+  echo "$as_me:4909: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 			cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
- 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
-@@ -4674,7 +4917,7 @@
- fi
- 
- fi
--echo "$as_me:4677: result: $cf_cv_gpm_soname" >&5
-+echo "$as_me:4920: result: $cf_cv_gpm_soname" >&5
- echo "${ECHO_T}$cf_cv_gpm_soname" >&6
- 
- 		fi
-@@ -4690,7 +4933,7 @@
- #define HAVE_LIBGPM 1
- EOF
- 
--echo "$as_me:4693: checking for Gpm_Wgetch in -lgpm" >&5
-+echo "$as_me:4936: checking for Gpm_Wgetch in -lgpm" >&5
- echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4698,7 +4941,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 4701 "configure"
-+#line 4944 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4717,16 +4960,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4720: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4963: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4723: \$? = $ac_status" >&5
-+  echo "$as_me:4966: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4726: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4969: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4729: \$? = $ac_status" >&5
-+  echo "$as_me:4972: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Wgetch=yes
- else
-@@ -4737,11 +4980,11 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:4740: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
-+echo "$as_me:4983: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6
- if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then
- 
--echo "$as_me:4744: checking if GPM is weakly bound to curses library" >&5
-+echo "$as_me:4987: checking if GPM is weakly bound to curses library" >&5
- echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6
- if test "${cf_cv_check_gpm_wgetch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4765,15 +5008,15 @@
- 	# to rely on the static library, noting that some packagers may not
- 	# include it.
- 	LIBS="-static -lgpm -dynamic $LIBS"
--	if { (eval echo "$as_me:4768: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:5011: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4771: \$? = $ac_status" >&5
-+  echo "$as_me:5014: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
--		if { (eval echo "$as_me:4773: \"$ac_link\"") >&5
-+		if { (eval echo "$as_me:5016: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4776: \$? = $ac_status" >&5
-+  echo "$as_me:5019: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 			cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'`
- 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
-@@ -4785,11 +5028,11 @@
- fi
- 
- fi
--echo "$as_me:4788: result: $cf_cv_check_gpm_wgetch" >&5
-+echo "$as_me:5031: result: $cf_cv_check_gpm_wgetch" >&5
- echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6
- 
- if test "$cf_cv_check_gpm_wgetch" != yes ; then
--	{ echo "$as_me:4792: WARNING: GPM library is already linked with curses - read the FAQ" >&5
-+	{ echo "$as_me:5035: WARNING: GPM library is already linked with curses - read the FAQ" >&5
- echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;}
- fi
- 
-@@ -4799,7 +5042,7 @@
- 
- # not everyone has "test -c"
- if test -c /dev/sysmouse 2>/dev/null ; then
--echo "$as_me:4802: checking if you want to use sysmouse" >&5
-+echo "$as_me:5045: checking if you want to use sysmouse" >&5
- echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6
- 
- # Check whether --with-sysmouse or --without-sysmouse was given.
-@@ -4811,7 +5054,7 @@
- fi;
- 	if test "$cf_with_sysmouse" != no ; then
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 4814 "configure"
-+#line 5057 "configure"
- #include "confdefs.h"
- 
- #include <osreldate.h>
-@@ -4834,16 +5077,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4837: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5080: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4840: \$? = $ac_status" >&5
-+  echo "$as_me:5083: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4843: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5086: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4846: \$? = $ac_status" >&5
-+  echo "$as_me:5089: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_with_sysmouse=yes
- else
-@@ -4853,7 +5096,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	fi
--echo "$as_me:4856: result: $cf_with_sysmouse" >&5
-+echo "$as_me:5099: result: $cf_with_sysmouse" >&5
- echo "${ECHO_T}$cf_with_sysmouse" >&6
- test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF
- #define USE_SYSMOUSE 1
-@@ -4871,7 +5114,7 @@
- 	test -n "$GXX" && test "${ac_cv_prog_cxx_g}" != yes && CXX_G_OPT=''
- fi
- 
--echo "$as_me:4874: checking for default loader flags" >&5
-+echo "$as_me:5117: checking for default loader flags" >&5
- echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
- case $DFT_LWR_MODEL in
- libtool) LD_MODEL=''   ;;
-@@ -4880,13 +5123,13 @@
- profile) LD_MODEL='-pg';;
- shared)  LD_MODEL=''   ;;
- esac
--echo "$as_me:4883: result: $LD_MODEL" >&5
-+echo "$as_me:5126: result: $LD_MODEL" >&5
- echo "${ECHO_T}$LD_MODEL" >&6
- 
- case $DFT_LWR_MODEL in
- shared)
- 
--echo "$as_me:4889: checking if rpath option should be used" >&5
-+echo "$as_me:5132: checking if rpath option should be used" >&5
- echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
- 
- # Check whether --enable-rpath or --disable-rpath was given.
-@@ -4896,10 +5139,10 @@
- else
-   cf_cv_ld_rpath=no
- fi;
--echo "$as_me:4899: result: $cf_cv_ld_rpath" >&5
-+echo "$as_me:5142: result: $cf_cv_ld_rpath" >&5
- echo "${ECHO_T}$cf_cv_ld_rpath" >&6
- 
--echo "$as_me:4902: checking if shared libraries should be relinked during install" >&5
-+echo "$as_me:5145: checking if shared libraries should be relinked during install" >&5
- echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6
- 
- # Check whether --enable-relink or --disable-relink was given.
-@@ -4909,19 +5152,20 @@
- else
-   cf_cv_do_relink=yes
- fi;
--echo "$as_me:4912: result: $cf_cv_do_relink" >&5
-+echo "$as_me:5155: result: $cf_cv_do_relink" >&5
- echo "${ECHO_T}$cf_cv_do_relink" >&6
- 	;;
- esac
- 
- 	LOCAL_LDFLAGS=
- 	LOCAL_LDFLAGS2=
-+	LD_RPATH_OPT=
- 	LD_SHARED_OPTS=
- 	INSTALL_LIB="-m 644"
- 
- 	cf_cv_do_symlinks=no
- 
--	echo "$as_me:4924: checking if release/abi version should be used for shared libs" >&5
-+	echo "$as_me:5168: checking if release/abi version should be used for shared libs" >&5
- echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
- 
- # Check whether --with-shlib-version or --without-shlib-version was given.
-@@ -4936,7 +5180,7 @@
- 		cf_cv_shlib_version=$withval
- 		;;
- 	*)
--		{ { echo "$as_me:4939: error: option value must be one of: rel, abi, auto or no" >&5
-+		{ { echo "$as_me:5183: error: option value must be one of: rel, abi, auto or no" >&5
- echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;}
-    { (exit 1); exit 1; }; }
- 		;;
-@@ -4945,7 +5189,7 @@
- else
-   cf_cv_shlib_version=auto
- fi;
--	echo "$as_me:4948: result: $cf_cv_shlib_version" >&5
-+	echo "$as_me:5192: result: $cf_cv_shlib_version" >&5
- echo "${ECHO_T}$cf_cv_shlib_version" >&6
- 
- 	cf_cv_rm_so_locs=no
-@@ -4954,14 +5198,14 @@
- 	CC_SHARED_OPTS=
- 	if test "$GCC" = yes
- 	then
--		echo "$as_me:4957: checking which $CC option to use" >&5
-+		echo "$as_me:5201: checking which $CC option to use" >&5
- echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CFLAGS"
- 		for CC_SHARED_OPTS in -fPIC -fpic ''
- 		do
- 			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 4964 "configure"
-+#line 5208 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -4973,16 +5217,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4976: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5220: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4979: \$? = $ac_status" >&5
-+  echo "$as_me:5223: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4982: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5226: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4985: \$? = $ac_status" >&5
-+  echo "$as_me:5229: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -4991,7 +5235,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		done
--		echo "$as_me:4994: result: $CC_SHARED_OPTS" >&5
-+		echo "$as_me:5238: result: $CC_SHARED_OPTS" >&5
- echo "${ECHO_T}$CC_SHARED_OPTS" >&6
- 		CFLAGS="$cf_save_CFLAGS"
- 	fi
-@@ -4999,6 +5243,12 @@
- 	cf_cv_shlib_version_infix=no
- 
- 	case $cf_cv_system_name in
-+	aix[56]*)
-+		if test "$GCC" = yes; then
-+			CC_SHARED_OPTS=
-+			MK_SHARED_LIB="$(CC) -shared"
-+		fi
-+		;;
- 	beos*)
- 		MK_SHARED_LIB='${CC} ${CFLAGS} -o $@ -Xlinker -soname=`basename $@` -nostart -e 0'
- 		;;
-@@ -5027,7 +5277,7 @@
- 		MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
- 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
- 		cf_cv_shlib_version_infix=yes
--		echo "$as_me:5030: checking if ld -search_paths_first works" >&5
-+		echo "$as_me:5280: checking if ld -search_paths_first works" >&5
- echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
- if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5036,7 +5286,7 @@
- 			cf_save_LDFLAGS=$LDFLAGS
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 5039 "configure"
-+#line 5289 "configure"
- #include "confdefs.h"
- 
- int
-@@ -5048,16 +5298,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5051: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5301: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5054: \$? = $ac_status" >&5
-+  echo "$as_me:5304: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5057: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5307: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5060: \$? = $ac_status" >&5
-+  echo "$as_me:5310: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ldflags_search_paths_first=yes
- else
-@@ -5068,7 +5318,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 				LDFLAGS=$cf_save_LDFLAGS
- fi
--echo "$as_me:5071: result: $cf_cv_ldflags_search_paths_first" >&5
-+echo "$as_me:5321: result: $cf_cv_ldflags_search_paths_first" >&5
- echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
- 		if test $cf_cv_ldflags_search_paths_first = yes; then
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
-@@ -5090,10 +5340,10 @@
- 	irix*)
- 		if test "$cf_cv_ld_rpath" = yes ; then
- 			if test "$GCC" = yes; then
--				cf_ld_rpath_opt="-Wl,-rpath,"
-+				LD_RPATH_OPT="-Wl,-rpath,"
- 				EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
- 			else
--				cf_ld_rpath_opt="-rpath "
-+				LD_RPATH_OPT="-rpath "
- 				EXTRA_LDFLAGS="-rpath \${libdir} $EXTRA_LDFLAGS"
- 			fi
- 		fi
-@@ -5112,7 +5362,7 @@
- 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
- 		fi
- 		if test "$cf_cv_ld_rpath" = yes ; then
--			cf_ld_rpath_opt="-Wl,-rpath,"
-+			LD_RPATH_OPT="-Wl,-rpath,"
- 			EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
- 		fi
- 
-@@ -5131,7 +5381,7 @@
- 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
- 		fi
- 		if test "$cf_cv_ld_rpath" = yes ; then
--			cf_ld_rpath_opt="-Wl,-rpath,"
-+			LD_RPATH_OPT="-Wl,-rpath,"
- 			EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
- 		fi
- 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
-@@ -5155,7 +5405,7 @@
- 		if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
- 			LOCAL_LDFLAGS="-rpath \$(LOCAL_LIBDIR)"
- 			LOCAL_LDFLAGS2="-rpath \${libdir} $LOCAL_LDFLAGS"
--			cf_ld_rpath_opt="-rpath "
-+			LD_RPATH_OPT="-rpath "
- 			EXTRA_LDFLAGS="-rpath \${libdir} $EXTRA_LDFLAGS"
- 		fi
- 
-@@ -5170,7 +5420,7 @@
- 		;;
- 	netbsd*)
- 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
--		test "$cf_cv_ld_rpath" = yes && cf_ld_rpath_opt="-Wl,-rpath,"
-+		test "$cf_cv_ld_rpath" = yes && LD_RPATH_OPT="-Wl,-rpath,"
- 		if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
- 			LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
- 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
-@@ -5211,7 +5461,7 @@
- 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
- 		fi
- 		if test "$cf_cv_ld_rpath" = yes ; then
--			cf_ld_rpath_opt="-rpath"
-+			LD_RPATH_OPT="-rpath"
- 			# EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
- 		fi
- 		cf_cv_rm_so_locs=yes
-@@ -5246,7 +5496,7 @@
- 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
- 		fi
- 		if test "$cf_cv_ld_rpath" = yes ; then
--			cf_ld_rpath_opt="-R"
-+			LD_RPATH_OPT="-R"
- 			EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
- 		fi
- 
-@@ -5258,7 +5508,43 @@
- 	fi
- 
- 		if test "$GCC" != yes; then
--			CC_SHARED_OPTS='-xcode=pic32'
-+			cf_save_CFLAGS="$CFLAGS"
-+			for cf_shared_opts in -xcode=pic13 -xcode=pic32 -Kpic -KPIC -O
-+			do
-+				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
-+				cat >conftest.$ac_ext <<_ACEOF
-+#line 5516 "configure"
-+#include "confdefs.h"
-+#include <stdio.h>
-+int
-+main ()
-+{
-+printf("Hello\n");
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:5528: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:5531: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:5534: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:5537: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  break
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+			done
-+			CFLAGS="$cf_save_CFLAGS"
-+			CC_SHARED_OPTS=$cf_shared_opts
- 			MK_SHARED_LIB='${CC} -dy -G -h '$cf_cv_shared_soname' -o $@'
- 		else
- 			MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $@'
-@@ -5285,20 +5571,20 @@
- 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
- 			;;
- 		*)
--			{ echo "$as_me:5288: WARNING: ignored --with-shlib-version" >&5
-+			{ echo "$as_me:5574: WARNING: ignored --with-shlib-version" >&5
- echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
- 			;;
- 		esac
- 		;;
- 	esac
- 
--	if test -n "$cf_ld_rpath_opt" ; then
--		echo "$as_me:5296: checking if we need a space after rpath option" >&5
-+	if test -n "$LD_RPATH_OPT" ; then
-+		echo "$as_me:5582: checking if we need a space after rpath option" >&5
- echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
- 		cf_save_LIBS="$LIBS"
--		LIBS="$LIBS ${cf_ld_rpath_opt}$libdir"
-+		LIBS="$LIBS ${LD_RPATH_OPT}$libdir"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 5301 "configure"
-+#line 5587 "configure"
- #include "confdefs.h"
- 
- int
-@@ -5310,16 +5596,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5313: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5599: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5316: \$? = $ac_status" >&5
-+  echo "$as_me:5602: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5319: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5605: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5322: \$? = $ac_status" >&5
-+  echo "$as_me:5608: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_space=no
- else
-@@ -5329,16 +5615,16 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 		LIBS="$cf_save_LIBS"
--		echo "$as_me:5332: result: $cf_rpath_space" >&5
-+		echo "$as_me:5618: result: $cf_rpath_space" >&5
- echo "${ECHO_T}$cf_rpath_space" >&6
--		test "$cf_rpath_space" = yes && cf_ld_rpath_opt="$cf_ld_rpath_opt "
--		MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}"
-+		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
-+		MK_SHARED_LIB="$MK_SHARED_LIB $LD_RPATH_OPT\${libdir}"
- 	fi
- 
- if test "$CC_SHARED_OPTS" = "unknown"; then
- 	for model in $cf_list_models; do
- 		if test "$model" = "shared"; then
--			{ { echo "$as_me:5341: error: Shared libraries are not supported in this version" >&5
-+			{ { echo "$as_me:5627: error: Shared libraries are not supported in this version" >&5
- echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
-@@ -5348,7 +5634,7 @@
- ###############################################################################
- 
- ###	use option --disable-overwrite to leave out the link to -lcurses
--echo "$as_me:5351: checking if you wish to install ncurses overwriting curses" >&5
-+echo "$as_me:5637: checking if you wish to install ncurses overwriting curses" >&5
- echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
- 
- # Check whether --enable-overwrite or --disable-overwrite was given.
-@@ -5358,10 +5644,10 @@
- else
-   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
- fi;
--echo "$as_me:5361: result: $with_overwrite" >&5
-+echo "$as_me:5647: result: $with_overwrite" >&5
- echo "${ECHO_T}$with_overwrite" >&6
- 
--echo "$as_me:5364: checking if external terminfo-database is used" >&5
-+echo "$as_me:5650: checking if external terminfo-database is used" >&5
- echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
- 
- # Check whether --enable-database or --disable-database was given.
-@@ -5371,7 +5657,7 @@
- else
-   use_database=yes
- fi;
--echo "$as_me:5374: result: $use_database" >&5
-+echo "$as_me:5660: result: $use_database" >&5
- echo "${ECHO_T}$use_database" >&6
- 
- case $host_os in #(vi
-@@ -5393,7 +5679,7 @@
- #define USE_DATABASE 1
- EOF
- 
--	echo "$as_me:5396: checking which terminfo source-file will be installed" >&5
-+	echo "$as_me:5682: checking which terminfo source-file will be installed" >&5
- echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
- 
- # Check whether --enable-database or --disable-database was given.
-@@ -5401,10 +5687,10 @@
-   enableval="$enable_database"
-   TERMINFO_SRC=$withval
- fi;
--	echo "$as_me:5404: result: $TERMINFO_SRC" >&5
-+	echo "$as_me:5690: result: $TERMINFO_SRC" >&5
- echo "${ECHO_T}$TERMINFO_SRC" >&6
- 
--	echo "$as_me:5407: checking whether to use hashed database instead of directory/tree" >&5
-+	echo "$as_me:5693: checking whether to use hashed database instead of directory/tree" >&5
- echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
- 
- # Check whether --with-hashed-db or --without-hashed-db was given.
-@@ -5414,13 +5700,13 @@
- else
-   with_hashed_db=no
- fi;
--	echo "$as_me:5417: result: $with_hashed_db" >&5
-+	echo "$as_me:5703: result: $with_hashed_db" >&5
- echo "${ECHO_T}$with_hashed_db" >&6
- else
- 	with_hashed_db=no
- fi
- 
--echo "$as_me:5423: checking for list of fallback descriptions" >&5
-+echo "$as_me:5709: checking for list of fallback descriptions" >&5
- echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
- 
- # Check whether --with-fallbacks or --without-fallbacks was given.
-@@ -5430,11 +5716,11 @@
- else
-   with_fallback=
- fi;
--echo "$as_me:5433: result: $with_fallback" >&5
-+echo "$as_me:5719: result: $with_fallback" >&5
- echo "${ECHO_T}$with_fallback" >&6
- FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
- 
--echo "$as_me:5437: checking if you want modern xterm or antique" >&5
-+echo "$as_me:5723: checking if you want modern xterm or antique" >&5
- echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
- 
- # Check whether --with-xterm-new or --without-xterm-new was given.
-@@ -5448,7 +5734,7 @@
- no)	with_xterm_new=xterm-old;;
- *)	with_xterm_new=xterm-new;;
- esac
--echo "$as_me:5451: result: $with_xterm_new" >&5
-+echo "$as_me:5737: result: $with_xterm_new" >&5
- echo "${ECHO_T}$with_xterm_new" >&6
- WHICH_XTERM=$with_xterm_new
- 
-@@ -5458,7 +5744,7 @@
- 	MAKE_TERMINFO="#"
- else
- 
--echo "$as_me:5461: checking for list of terminfo directories" >&5
-+echo "$as_me:5747: checking for list of terminfo directories" >&5
- echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
- 
- # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
-@@ -5498,7 +5784,7 @@
-   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
-   ;;
- *)
--  { { echo "$as_me:5501: error: expected a pathname, not \"$cf_src_path\"" >&5
-+  { { echo "$as_me:5787: error: expected a pathname, not \"$cf_src_path\"" >&5
- echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
-    { (exit 1); exit 1; }; }
-   ;;
-@@ -5511,13 +5797,13 @@
- 
- eval 'TERMINFO_DIRS="$cf_dst_path"'
- 
--echo "$as_me:5514: result: $TERMINFO_DIRS" >&5
-+echo "$as_me:5800: result: $TERMINFO_DIRS" >&5
- echo "${ECHO_T}$TERMINFO_DIRS" >&6
- test -n "$TERMINFO_DIRS" && cat >>confdefs.h <<EOF
- #define TERMINFO_DIRS "$TERMINFO_DIRS"
- EOF
- 
--echo "$as_me:5520: checking for default terminfo directory" >&5
-+echo "$as_me:5806: checking for default terminfo directory" >&5
- echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
- 
- # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
-@@ -5553,7 +5839,7 @@
-   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
-   ;;
- *)
--  { { echo "$as_me:5556: error: expected a pathname, not \"$withval\"" >&5
-+  { { echo "$as_me:5842: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
-   ;;
-@@ -5562,7 +5848,7 @@
- fi
- TERMINFO="$withval"
- 
--echo "$as_me:5565: result: $TERMINFO" >&5
-+echo "$as_me:5851: result: $TERMINFO" >&5
- echo "${ECHO_T}$TERMINFO" >&6
- cat >>confdefs.h <<EOF
- #define TERMINFO "$TERMINFO"
-@@ -5572,7 +5858,7 @@
- 
- ###	use option --disable-big-core to make tic run on small machines
- ###	We need 4Mb, check if we can allocate 50% more than that.
--echo "$as_me:5575: checking if big-core option selected" >&5
-+echo "$as_me:5861: checking if big-core option selected" >&5
- echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
- 
- # Check whether --enable-big-core or --disable-big-core was given.
-@@ -5584,7 +5870,7 @@
-   with_big_core=no
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5587 "configure"
-+#line 5873 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -5598,15 +5884,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:5601: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5887: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5604: \$? = $ac_status" >&5
-+  echo "$as_me:5890: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:5606: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5892: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5609: \$? = $ac_status" >&5
-+  echo "$as_me:5895: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_big_core=yes
- else
-@@ -5618,7 +5904,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi;
--echo "$as_me:5621: result: $with_big_core" >&5
-+echo "$as_me:5907: result: $with_big_core" >&5
- echo "${ECHO_T}$with_big_core" >&6
- test "$with_big_core" = "yes" && cat >>confdefs.h <<\EOF
- #define HAVE_BIG_CORE 1
-@@ -5627,7 +5913,7 @@
- ### ISO C only guarantees 512-char strings, we have tables which load faster
- ### when constructed using "big" strings.  More than the C compiler, the awk
- ### program is a limit on most vendor UNIX systems.  Check that we can build.
--echo "$as_me:5630: checking if big-strings option selected" >&5
-+echo "$as_me:5916: checking if big-strings option selected" >&5
- echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
- 
- # Check whether --enable-big-strings or --disable-big-strings was given.
-@@ -5636,29 +5922,29 @@
-   with_big_strings=$enableval
- else
- 
--    case x$AWK in #(vi
--    x)
--        eval with_big_strings=no
--        ;;
--    *) #(vi
--        if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < 12000) { xx = xx "x"; }; printf("%s\n", xx); }' \
--            | $AWK '{ printf "%d\n", length($0); }' | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ($0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then
--            eval with_big_strings=yes
--        else
--            eval with_big_strings=no
--        fi
--        ;;
--    esac
-+	case x$AWK in #(vi
-+	x)
-+		eval with_big_strings=no
-+		;;
-+	*) #(vi
-+		if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < 12000) { xx = xx "x"; }; printf("%s\n", xx); }' \
-+			| $AWK '{ printf "%d\n", length($0); }' | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ($0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then
-+			eval with_big_strings=yes
-+		else
-+			eval with_big_strings=no
-+		fi
-+		;;
-+	esac
- 
- fi;
--echo "$as_me:5654: result: $with_big_strings" >&5
-+echo "$as_me:5940: result: $with_big_strings" >&5
- echo "${ECHO_T}$with_big_strings" >&6
- 
- USE_BIG_STRINGS=0
- test "$with_big_strings" = "yes" && USE_BIG_STRINGS=1
- 
- ###	use option --enable-termcap to compile in the termcap fallback support
--echo "$as_me:5661: checking if you want termcap-fallback support" >&5
-+echo "$as_me:5947: checking if you want termcap-fallback support" >&5
- echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
- 
- # Check whether --enable-termcap or --disable-termcap was given.
-@@ -5668,13 +5954,13 @@
- else
-   with_termcap=no
- fi;
--echo "$as_me:5671: result: $with_termcap" >&5
-+echo "$as_me:5957: result: $with_termcap" >&5
- echo "${ECHO_T}$with_termcap" >&6
- 
- if test "$with_termcap" != "yes" ; then
- 	if test "$use_database" = no ; then
- 		if test -z "$with_fallback" ; then
--			{ { echo "$as_me:5677: error: You have disabled the database w/o specifying fallbacks" >&5
-+			{ { echo "$as_me:5963: error: You have disabled the database w/o specifying fallbacks" >&5
- echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
-@@ -5686,7 +5972,7 @@
- else
- 
- if test "$with_ticlib" != no ; then
--	{ { echo "$as_me:5689: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
-+	{ { echo "$as_me:5975: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
- echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -5695,7 +5981,7 @@
- #define USE_TERMCAP 1
- EOF
- 
--echo "$as_me:5698: checking for list of termcap files" >&5
-+echo "$as_me:5984: checking for list of termcap files" >&5
- echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
- 
- # Check whether --with-termpath or --without-termpath was given.
-@@ -5735,7 +6021,7 @@
-   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
-   ;;
- *)
--  { { echo "$as_me:5738: error: expected a pathname, not \"$cf_src_path\"" >&5
-+  { { echo "$as_me:6024: error: expected a pathname, not \"$cf_src_path\"" >&5
- echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
-    { (exit 1); exit 1; }; }
-   ;;
-@@ -5748,14 +6034,14 @@
- 
- eval 'TERMPATH="$cf_dst_path"'
- 
--echo "$as_me:5751: result: $TERMPATH" >&5
-+echo "$as_me:6037: result: $TERMPATH" >&5
- echo "${ECHO_T}$TERMPATH" >&6
- test -n "$TERMPATH" && cat >>confdefs.h <<EOF
- #define TERMPATH "$TERMPATH"
- EOF
- 
- ###	use option --enable-getcap to use a hacked getcap for reading termcaps
--echo "$as_me:5758: checking if fast termcap-loader is needed" >&5
-+echo "$as_me:6044: checking if fast termcap-loader is needed" >&5
- echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
- 
- # Check whether --enable-getcap or --disable-getcap was given.
-@@ -5765,13 +6051,13 @@
- else
-   with_getcap=no
- fi;
--echo "$as_me:5768: result: $with_getcap" >&5
-+echo "$as_me:6054: result: $with_getcap" >&5
- echo "${ECHO_T}$with_getcap" >&6
- test "$with_getcap" = "yes" && cat >>confdefs.h <<\EOF
- #define USE_GETCAP 1
- EOF
- 
--echo "$as_me:5774: checking if translated termcaps will be cached in ~/.terminfo" >&5
-+echo "$as_me:6060: checking if translated termcaps will be cached in ~/.terminfo" >&5
- echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
- 
- # Check whether --enable-getcap-cache or --disable-getcap-cache was given.
-@@ -5781,7 +6067,7 @@
- else
-   with_getcap_cache=no
- fi;
--echo "$as_me:5784: result: $with_getcap_cache" >&5
-+echo "$as_me:6070: result: $with_getcap_cache" >&5
- echo "${ECHO_T}$with_getcap_cache" >&6
- test "$with_getcap_cache" = "yes" && cat >>confdefs.h <<\EOF
- #define USE_GETCAP_CACHE 1
-@@ -5790,7 +6076,7 @@
- fi
- 
- ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
--echo "$as_me:5793: checking if ~/.terminfo is wanted" >&5
-+echo "$as_me:6079: checking if ~/.terminfo is wanted" >&5
- echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
- 
- # Check whether --enable-home-terminfo or --disable-home-terminfo was given.
-@@ -5800,13 +6086,13 @@
- else
-   with_home_terminfo=yes
- fi;
--echo "$as_me:5803: result: $with_home_terminfo" >&5
-+echo "$as_me:6089: result: $with_home_terminfo" >&5
- echo "${ECHO_T}$with_home_terminfo" >&6
- test "$with_home_terminfo" = "yes" && cat >>confdefs.h <<\EOF
- #define USE_HOME_TERMINFO 1
- EOF
- 
--echo "$as_me:5809: checking if you want to use restricted environment when running as root" >&5
-+echo "$as_me:6095: checking if you want to use restricted environment when running as root" >&5
- echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
- 
- # Check whether --enable-root-environ or --disable-root-environ was given.
-@@ -5816,7 +6102,7 @@
- else
-   with_root_environ=yes
- fi;
--echo "$as_me:5819: result: $with_root_environ" >&5
-+echo "$as_me:6105: result: $with_root_environ" >&5
- echo "${ECHO_T}$with_root_environ" >&6
- test "$with_root_environ" = yes && cat >>confdefs.h <<\EOF
- #define USE_ROOT_ENVIRON 1
-@@ -5830,13 +6116,13 @@
- 	unlink
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:5833: checking for $ac_func" >&5
-+echo "$as_me:6119: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5839 "configure"
-+#line 6125 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -5867,16 +6153,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5870: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6156: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5873: \$? = $ac_status" >&5
-+  echo "$as_me:6159: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5876: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6162: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5879: \$? = $ac_status" >&5
-+  echo "$as_me:6165: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -5886,7 +6172,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:5889: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:6175: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -5903,13 +6189,13 @@
- 		symlink
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:5906: checking for $ac_func" >&5
-+echo "$as_me:6192: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5912 "configure"
-+#line 6198 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -5940,16 +6226,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5943: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6229: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5946: \$? = $ac_status" >&5
-+  echo "$as_me:6232: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5949: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6235: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5952: \$? = $ac_status" >&5
-+  echo "$as_me:6238: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -5959,7 +6245,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:5962: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:6248: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -5970,7 +6256,7 @@
- done
- 
- else
--	echo "$as_me:5973: checking if link/symlink functions work" >&5
-+	echo "$as_me:6259: checking if link/symlink functions work" >&5
- echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
- if test "${cf_cv_link_funcs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5983,7 +6269,7 @@
- 			eval 'ac_cv_func_'$cf_func'=error'
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5986 "configure"
-+#line 6272 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -6013,15 +6299,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:6016: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6302: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6019: \$? = $ac_status" >&5
-+  echo "$as_me:6305: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:6021: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6307: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6024: \$? = $ac_status" >&5
-+  echo "$as_me:6310: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
-@@ -6039,7 +6325,7 @@
- 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
- 
- fi
--echo "$as_me:6042: result: $cf_cv_link_funcs" >&5
-+echo "$as_me:6328: result: $cf_cv_link_funcs" >&5
- echo "${ECHO_T}$cf_cv_link_funcs" >&6
- 	test "$ac_cv_func_link"    = yes && cat >>confdefs.h <<\EOF
- #define HAVE_LINK 1
-@@ -6057,7 +6343,7 @@
- # soft links (symbolic links) are useful for some systems where hard links do
- # not work, or to make it simpler to copy terminfo trees around.
- if test "$ac_cv_func_symlink" = yes ; then
--    echo "$as_me:6060: checking if tic should use symbolic links" >&5
-+    echo "$as_me:6346: checking if tic should use symbolic links" >&5
- echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
- 
- # Check whether --enable-symlinks or --disable-symlinks was given.
-@@ -6067,21 +6353,21 @@
- else
-   with_symlinks=no
- fi;
--    echo "$as_me:6070: result: $with_symlinks" >&5
-+    echo "$as_me:6356: result: $with_symlinks" >&5
- echo "${ECHO_T}$with_symlinks" >&6
- fi
- 
- # If we have hard links and did not choose to use soft links instead, there is
- # no reason to make this choice optional - use the hard links.
- if test "$with_symlinks" = no ; then
--    echo "$as_me:6077: checking if tic should use hard links" >&5
-+    echo "$as_me:6363: checking if tic should use hard links" >&5
- echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
-     if test "$ac_cv_func_link" = yes ; then
- 	with_links=yes
-     else
- 	with_links=no
-     fi
--    echo "$as_me:6084: result: $with_links" >&5
-+    echo "$as_me:6370: result: $with_links" >&5
- echo "${ECHO_T}$with_links" >&6
- fi
- 
-@@ -6094,7 +6380,7 @@
- EOF
- 
- ###   use option --enable-broken-linker to force on use of broken-linker support
--echo "$as_me:6097: checking if you want broken-linker support code" >&5
-+echo "$as_me:6383: checking if you want broken-linker support code" >&5
- echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
- 
- # Check whether --enable-broken_linker or --disable-broken_linker was given.
-@@ -6104,7 +6390,7 @@
- else
-   with_broken_linker=${BROKEN_LINKER-no}
- fi;
--echo "$as_me:6107: result: $with_broken_linker" >&5
-+echo "$as_me:6393: result: $with_broken_linker" >&5
- echo "${ECHO_T}$with_broken_linker" >&6
- 
- BROKEN_LINKER=0
-@@ -6124,14 +6410,14 @@
- 		BROKEN_LINKER=1
- 		test -n "$verbose" && echo "	cygwin linker is broken anyway" 1>&6
- 
--echo "${as_me-configure}:6127: testing cygwin linker is broken anyway ..." 1>&5
-+echo "${as_me-configure}:6413: testing cygwin linker is broken anyway ..." 1>&5
- 
- 		;;
- 	esac
- fi
- 
- ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
--echo "$as_me:6134: checking if tputs should process BSD-style prefix padding" >&5
-+echo "$as_me:6420: checking if tputs should process BSD-style prefix padding" >&5
- echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
- 
- # Check whether --enable-bsdpad or --disable-bsdpad was given.
-@@ -6141,7 +6427,7 @@
- else
-   with_bsdpad=no
- fi;
--echo "$as_me:6144: result: $with_bsdpad" >&5
-+echo "$as_me:6430: result: $with_bsdpad" >&5
- echo "${ECHO_T}$with_bsdpad" >&6
- test "$with_bsdpad" = yes && cat >>confdefs.h <<\EOF
- #define BSD_TPUTS 1
-@@ -6158,7 +6444,7 @@
- 
- # Check to define _XOPEN_SOURCE "automatically"
- 
--echo "$as_me:6161: checking if $CC -U and -D options work together" >&5
-+echo "$as_me:6447: checking if $CC -U and -D options work together" >&5
- echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6
- if test "${cf_cv_cc_u_d_options+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6167,7 +6453,7 @@
- 	cf_save_CPPFLAGS="$CPPFLAGS"
- 	CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 6170 "configure"
-+#line 6456 "configure"
- #include "confdefs.h"
- 
- int
-@@ -6186,16 +6472,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6189: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6475: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6192: \$? = $ac_status" >&5
-+  echo "$as_me:6478: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6195: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6481: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6198: \$? = $ac_status" >&5
-+  echo "$as_me:6484: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_cc_u_d_options=yes
-@@ -6209,14 +6495,14 @@
- 	CPPFLAGS="$cf_save_CPPFLAGS"
- 
- fi
--echo "$as_me:6212: result: $cf_cv_cc_u_d_options" >&5
-+echo "$as_me:6498: result: $cf_cv_cc_u_d_options" >&5
- echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6
- 
- cf_XOPEN_SOURCE=500
- cf_POSIX_C_SOURCE=199506L
- 
- case $host_os in #(vi
--aix[45]*) #(vi
-+aix[456]*) #(vi
- 	CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE"
- 	;;
- freebsd*|dragonfly*) #(vi
-@@ -6233,16 +6519,16 @@
- irix[56].*) #(vi
- 	CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
- 	;;
--linux*|gnu*|k*bsd*-gnu) #(vi
-+linux*|gnu*|mint*|k*bsd*-gnu) #(vi
- 
--echo "$as_me:6238: checking if we must define _GNU_SOURCE" >&5
-+echo "$as_me:6524: checking if we must define _GNU_SOURCE" >&5
- echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_gnu_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 6245 "configure"
-+#line 6531 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -6257,16 +6543,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6260: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6546: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6263: \$? = $ac_status" >&5
-+  echo "$as_me:6549: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6266: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6552: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6269: \$? = $ac_status" >&5
-+  echo "$as_me:6555: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -6275,7 +6561,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 6278 "configure"
-+#line 6564 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -6290,16 +6576,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6293: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6579: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6296: \$? = $ac_status" >&5
-+  echo "$as_me:6582: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6299: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6585: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6302: \$? = $ac_status" >&5
-+  echo "$as_me:6588: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -6314,7 +6600,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:6317: result: $cf_cv_gnu_source" >&5
-+echo "$as_me:6603: result: $cf_cv_gnu_source" >&5
- echo "${ECHO_T}$cf_cv_gnu_source" >&6
- test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 
-@@ -6341,14 +6627,14 @@
- 	CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
- 	;;
- *)
--	echo "$as_me:6344: checking if we should define _XOPEN_SOURCE" >&5
-+	echo "$as_me:6630: checking if we should define _XOPEN_SOURCE" >&5
- echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_xopen_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 6351 "configure"
-+#line 6637 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -6363,16 +6649,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6366: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6652: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6369: \$? = $ac_status" >&5
-+  echo "$as_me:6655: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6372: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6658: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6375: \$? = $ac_status" >&5
-+  echo "$as_me:6661: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -6381,7 +6667,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 6384 "configure"
-+#line 6670 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -6396,16 +6682,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6399: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6685: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6402: \$? = $ac_status" >&5
-+  echo "$as_me:6688: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6405: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6691: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6408: \$? = $ac_status" >&5
-+  echo "$as_me:6694: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -6420,7 +6706,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:6423: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:6709: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 	if test "$cf_cv_xopen_source" != no ; then
- 
-@@ -6454,16 +6740,16 @@
- 	sed	-e 's/-[UD]_POSIX_C_SOURCE\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]_POSIX_C_SOURCE\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:6457: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:6743: checking if we should define _POSIX_C_SOURCE" >&5
- echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_posix_c_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--echo "${as_me-configure}:6463: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me-configure}:6749: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 6466 "configure"
-+#line 6752 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -6478,16 +6764,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6481: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6767: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6484: \$? = $ac_status" >&5
-+  echo "$as_me:6770: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6487: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6773: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6490: \$? = $ac_status" >&5
-+  echo "$as_me:6776: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -6508,7 +6794,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 6511 "configure"
-+#line 6797 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -6523,16 +6809,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6526: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6812: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6529: \$? = $ac_status" >&5
-+  echo "$as_me:6815: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6532: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6818: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6535: \$? = $ac_status" >&5
-+  echo "$as_me:6821: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -6543,15 +6829,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me-configure}:6546: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me-configure}:6832: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
- 
- 	 CFLAGS="$cf_trim_CFLAGS"
- 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
- 
--echo "${as_me-configure}:6551: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me-configure}:6837: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 6554 "configure"
-+#line 6840 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -6566,16 +6852,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6569: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6855: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6572: \$? = $ac_status" >&5
-+  echo "$as_me:6858: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6575: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6861: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6578: \$? = $ac_status" >&5
-+  echo "$as_me:6864: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -6591,7 +6877,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:6594: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:6880: result: $cf_cv_posix_c_source" >&5
- echo "${ECHO_T}$cf_cv_posix_c_source" >&6
- 
- if test "$cf_cv_posix_c_source" != no ; then
-@@ -6610,14 +6896,14 @@
- 
- # Work around breakage on OS X
- 
--echo "$as_me:6613: checking if SIGWINCH is defined" >&5
-+echo "$as_me:6899: checking if SIGWINCH is defined" >&5
- echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
- if test "${cf_cv_define_sigwinch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 6620 "configure"
-+#line 6906 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -6632,23 +6918,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6635: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6921: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6638: \$? = $ac_status" >&5
-+  echo "$as_me:6924: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6641: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6927: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6644: \$? = $ac_status" >&5
-+  echo "$as_me:6930: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_define_sigwinch=yes
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 6651 "configure"
-+#line 6937 "configure"
- #include "confdefs.h"
- 
- #undef _XOPEN_SOURCE
-@@ -6666,16 +6952,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6669: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6955: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6672: \$? = $ac_status" >&5
-+  echo "$as_me:6958: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6675: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6961: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6678: \$? = $ac_status" >&5
-+  echo "$as_me:6964: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_define_sigwinch=maybe
- else
-@@ -6689,11 +6975,11 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:6692: result: $cf_cv_define_sigwinch" >&5
-+echo "$as_me:6978: result: $cf_cv_define_sigwinch" >&5
- echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
- 
- if test "$cf_cv_define_sigwinch" = maybe ; then
--echo "$as_me:6696: checking for actual SIGWINCH definition" >&5
-+echo "$as_me:6982: checking for actual SIGWINCH definition" >&5
- echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
- if test "${cf_cv_fixup_sigwinch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6704,7 +6990,7 @@
- while test $cf_sigwinch != 1
- do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 6707 "configure"
-+#line 6993 "configure"
- #include "confdefs.h"
- 
- #undef _XOPEN_SOURCE
-@@ -6726,16 +7012,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6729: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7015: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6732: \$? = $ac_status" >&5
-+  echo "$as_me:7018: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6735: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7021: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6738: \$? = $ac_status" >&5
-+  echo "$as_me:7024: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_fixup_sigwinch=$cf_sigwinch
- 	 break
-@@ -6749,7 +7035,7 @@
- done
- 
- fi
--echo "$as_me:6752: result: $cf_cv_fixup_sigwinch" >&5
-+echo "$as_me:7038: result: $cf_cv_fixup_sigwinch" >&5
- echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
- 
- 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
-@@ -6759,13 +7045,13 @@
- 
- # Checks for CODESET support.
- 
--  echo "$as_me:6762: checking for nl_langinfo and CODESET" >&5
-+  echo "$as_me:7048: checking for nl_langinfo and CODESET" >&5
- echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
- if test "${am_cv_langinfo_codeset+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6768 "configure"
-+#line 7054 "configure"
- #include "confdefs.h"
- #include <langinfo.h>
- int
-@@ -6777,16 +7063,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6780: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7066: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6783: \$? = $ac_status" >&5
-+  echo "$as_me:7069: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6786: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7072: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6789: \$? = $ac_status" >&5
-+  echo "$as_me:7075: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   am_cv_langinfo_codeset=yes
- else
-@@ -6797,7 +7083,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:6800: result: $am_cv_langinfo_codeset" >&5
-+echo "$as_me:7086: result: $am_cv_langinfo_codeset" >&5
- echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
-   if test $am_cv_langinfo_codeset = yes; then
- 
-@@ -6811,7 +7097,7 @@
- NCURSES_OK_WCHAR_T=
- NCURSES_OK_WINT_T=
- 
--echo "$as_me:6814: checking if you want wide-character code" >&5
-+echo "$as_me:7100: checking if you want wide-character code" >&5
- echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
- 
- # Check whether --enable-widec or --disable-widec was given.
-@@ -6821,7 +7107,7 @@
- else
-   with_widec=no
- fi;
--echo "$as_me:6824: result: $with_widec" >&5
-+echo "$as_me:7110: result: $with_widec" >&5
- echo "${ECHO_T}$with_widec" >&6
- if test "$with_widec" = yes ; then
- 	LIB_SUFFIX="w${LIB_SUFFIX}"
-@@ -6829,10 +7115,10 @@
- #define USE_WIDEC_SUPPORT 1
- EOF
- 
--echo "$as_me:6832: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
-+echo "$as_me:7118: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
- echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 6835 "configure"
-+#line 7121 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- 
-@@ -6848,16 +7134,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6851: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7137: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6854: \$? = $ac_status" >&5
-+  echo "$as_me:7140: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6857: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7143: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6860: \$? = $ac_status" >&5
-+  echo "$as_me:7146: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=no
- else
-@@ -6866,16 +7152,16 @@
- cf_result=yes
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:6869: result: $cf_result" >&5
-+echo "$as_me:7155: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test "$cf_result" = yes ; then
- 	CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
- elif test "x" != "x" ; then
--	echo "$as_me:6875: checking checking for compatible value versus " >&5
-+	echo "$as_me:7161: checking checking for compatible value versus " >&5
- echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 6878 "configure"
-+#line 7164 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- 
-@@ -6891,16 +7177,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6894: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7180: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6897: \$? = $ac_status" >&5
-+  echo "$as_me:7183: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6900: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7186: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6903: \$? = $ac_status" >&5
-+  echo "$as_me:7189: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -6909,7 +7195,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:6912: result: $cf_result" >&5
-+	echo "$as_me:7198: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test "$cf_result" = no ; then
- 		# perhaps we can override it - try...
-@@ -6923,13 +7209,13 @@
- for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:6926: checking for $ac_func" >&5
-+echo "$as_me:7212: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6932 "configure"
-+#line 7218 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -6960,16 +7246,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6963: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7249: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6966: \$? = $ac_status" >&5
-+  echo "$as_me:7252: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6969: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7255: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6972: \$? = $ac_status" >&5
-+  echo "$as_me:7258: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -6979,7 +7265,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:6982: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:7268: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -6991,7 +7277,7 @@
- 
- 	if test "$ac_cv_func_putwc" != yes ; then
- 
--echo "$as_me:6994: checking for multibyte character support" >&5
-+echo "$as_me:7280: checking for multibyte character support" >&5
- echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
- if test "${cf_cv_utf8_lib+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6999,7 +7285,7 @@
- 
- 	cf_save_LIBS="$LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 7002 "configure"
-+#line 7288 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -7012,16 +7298,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7015: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7301: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7018: \$? = $ac_status" >&5
-+  echo "$as_me:7304: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7021: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7307: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7024: \$? = $ac_status" >&5
-+  echo "$as_me:7310: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_utf8_lib=yes
- else
-@@ -7033,10 +7319,10 @@
- cf_cv_header_path_utf8=
- cf_cv_library_path_utf8=
- 
--echo "${as_me-configure}:7036: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me-configure}:7322: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 7039 "configure"
-+#line 7325 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -7049,16 +7335,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7052: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7338: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7055: \$? = $ac_status" >&5
-+  echo "$as_me:7341: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7058: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7344: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7061: \$? = $ac_status" >&5
-+  echo "$as_me:7347: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_find_linkage_utf8=yes
- else
-@@ -7067,12 +7353,41 @@
- 
-     cf_cv_find_linkage_utf8=no
- 
--echo "${as_me-configure}:7070: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
-+    test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
-+
-+echo "${as_me-configure}:7358: testing find linkage for utf8 library ..." 1>&5
-+
-+echo "${as_me-configure}:7360: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
- 
-     cf_save_CPPFLAGS="$CPPFLAGS"
-     cf_test_CPPFLAGS="$CPPFLAGS"
- 
--    cf_search=""
-+cf_header_path_list=""
-+if test -n "${CFLAGS}${CPPFLAGS}" ; then
-+	for cf_header_path in $CPPFLAGS $CFLAGS
-+	do
-+		case $cf_header_path in #(vi
-+		-I*)
-+			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
-+
-+test "$cf_header_path" != "NONE" && \
-+test -d "$cf_header_path" && \
-+ {
-+	test -n "$verbose" && echo "	... testing for include-directories under $cf_header_path"
-+	test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
-+	test -d $cf_header_path/include/utf8 &&       cf_search="$cf_search $cf_header_path/include/utf8"
-+	test -d $cf_header_path/include/utf8/include &&    cf_search="$cf_search $cf_header_path/include/utf8/include"
-+	test -d $cf_header_path/utf8/include &&       cf_search="$cf_search $cf_header_path/utf8/include"
-+	test -d $cf_header_path/utf8/include/utf8 &&    cf_search="$cf_search $cf_header_path/utf8/include/utf8"
-+}
-+
-+			cf_header_path_list="$cf_header_path_list $cf_search"
-+			;;
-+		esac
-+	done
-+fi
-+
-+cf_search=""
- 
- test "/usr" != "$prefix" && \
- test -d "/usr" && \
-@@ -7143,16 +7458,18 @@
- 	test -d $oldincludedir/utf8 && cf_search="$cf_search $oldincludedir/utf8"
- }
- 
-+cf_search="$cf_header_path_list $cf_search"
-+
-     for cf_cv_header_path_utf8 in $cf_search
-     do
-       if test -d $cf_cv_header_path_utf8 ; then
-         test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
- 
--echo "${as_me-configure}:7151: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me-configure}:7468: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
- 
-         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
-         cat >conftest.$ac_ext <<_ACEOF
--#line 7155 "configure"
-+#line 7472 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -7165,21 +7482,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7168: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7485: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7171: \$? = $ac_status" >&5
-+  echo "$as_me:7488: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7174: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7491: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7177: \$? = $ac_status" >&5
-+  echo "$as_me:7494: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
-             test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
- 
--echo "${as_me-configure}:7182: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me-configure}:7499: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
- 
-             cf_cv_find_linkage_utf8=maybe
-             cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -7197,13 +7514,39 @@
- 
-     if test "$cf_cv_find_linkage_utf8" = maybe ; then
- 
--echo "${as_me-configure}:7200: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me-configure}:7517: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
- 
-       cf_save_LIBS="$LIBS"
-       cf_save_LDFLAGS="$LDFLAGS"
- 
-       if test "$cf_cv_find_linkage_utf8" != yes ; then
--        cf_search=""
-+
-+cf_library_path_list=""
-+if test -n "${LDFLAGS}${LIBS}" ; then
-+	for cf_library_path in $LDFLAGS $LIBS
-+	do
-+		case $cf_library_path in #(vi
-+		-L*)
-+			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
-+
-+test "$cf_library_path" != "NONE" && \
-+test -d "$cf_library_path" && \
-+ {
-+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_library_path"
-+	test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
-+	test -d $cf_library_path/lib/utf8 &&       cf_search="$cf_search $cf_library_path/lib/utf8"
-+	test -d $cf_library_path/lib/utf8/lib &&    cf_search="$cf_search $cf_library_path/lib/utf8/lib"
-+	test -d $cf_library_path/utf8/lib &&       cf_search="$cf_search $cf_library_path/utf8/lib"
-+	test -d $cf_library_path/utf8/lib/utf8 &&    cf_search="$cf_search $cf_library_path/utf8/lib/utf8"
-+}
-+
-+			cf_library_path_list="$cf_library_path_list $cf_search"
-+			;;
-+		esac
-+	done
-+fi
-+
-+cf_search=""
- 
- test "/usr" != "$prefix" && \
- test -d "/usr" && \
-@@ -7260,18 +7603,20 @@
- 	test -d $HOME/utf8/lib/utf8 &&    cf_search="$cf_search $HOME/utf8/lib/utf8"
- }
- 
-+cf_search="$cf_library_path_list $cf_search"
-+
-         for cf_cv_library_path_utf8 in $cf_search
-         do
-           if test -d $cf_cv_library_path_utf8 ; then
-             test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
- 
--echo "${as_me-configure}:7268: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me-configure}:7613: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
- 
-             CPPFLAGS="$cf_test_CPPFLAGS"
-             LIBS="-lutf8  $cf_save_LIBS"
-             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
-             cat >conftest.$ac_ext <<_ACEOF
--#line 7274 "configure"
-+#line 7619 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -7284,21 +7629,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7287: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7632: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7290: \$? = $ac_status" >&5
-+  echo "$as_me:7635: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7293: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7638: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7296: \$? = $ac_status" >&5
-+  echo "$as_me:7641: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
-                 test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
- 
--echo "${as_me-configure}:7301: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me-configure}:7646: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
- 
-                 cf_cv_find_linkage_utf8=yes
-                 cf_cv_library_file_utf8="-lutf8"
-@@ -7336,7 +7681,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:7339: result: $cf_cv_utf8_lib" >&5
-+echo "$as_me:7684: result: $cf_cv_utf8_lib" >&5
- echo "${ECHO_T}$cf_cv_utf8_lib" >&6
- 
- # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
-@@ -7364,13 +7709,13 @@
- 		fi
- 
- 		if test "$cf_have_incdir" = no ; then
--          if test "$cf_add_incdir" = /usr/local/include ; then
-+		  if test "$cf_add_incdir" = /usr/local/include ; then
- 			if test "$GCC" = yes
- 			then
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 7373 "configure"
-+#line 7718 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -7382,16 +7727,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7385: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7730: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7388: \$? = $ac_status" >&5
-+  echo "$as_me:7733: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7391: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7736: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7394: \$? = $ac_status" >&5
-+  echo "$as_me:7739: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -7408,13 +7753,13 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me-configure}:7411: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me-configure}:7756: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
- 
--          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
--          test "$cf_top_incdir" = "$cf_add_incdir" && break
--          cf_add_incdir="$cf_top_incdir"
-+		  cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
-+		  test "$cf_top_incdir" = "$cf_add_incdir" && break
-+		  cf_add_incdir="$cf_top_incdir"
- 		else
- 		  break
- 		fi
-@@ -7442,7 +7787,7 @@
-       if test "$cf_have_libdir" = no ; then
-         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me-configure}:7445: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me-configure}:7790: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
-         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-       fi
-@@ -7459,14 +7804,14 @@
- 	fi
- 
- # This is needed on Tru64 5.0 to declare mbstate_t
--echo "$as_me:7462: checking if we must include wchar.h to declare mbstate_t" >&5
-+echo "$as_me:7807: checking if we must include wchar.h to declare mbstate_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
- if test "${cf_cv_mbstate_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 7469 "configure"
-+#line 7814 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -7484,23 +7829,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7487: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7832: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7490: \$? = $ac_status" >&5
-+  echo "$as_me:7835: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7493: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7838: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7496: \$? = $ac_status" >&5
-+  echo "$as_me:7841: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 7503 "configure"
-+#line 7848 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -7519,16 +7864,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7522: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7867: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7525: \$? = $ac_status" >&5
-+  echo "$as_me:7870: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7528: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7873: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7531: \$? = $ac_status" >&5
-+  echo "$as_me:7876: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=yes
- else
-@@ -7540,7 +7885,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:7543: result: $cf_cv_mbstate_t" >&5
-+echo "$as_me:7888: result: $cf_cv_mbstate_t" >&5
- echo "${ECHO_T}$cf_cv_mbstate_t" >&6
- 
- if test "$cf_cv_mbstate_t" = yes ; then
-@@ -7557,14 +7902,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wchar_t
--echo "$as_me:7560: checking if we must include wchar.h to declare wchar_t" >&5
-+echo "$as_me:7905: checking if we must include wchar.h to declare wchar_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
- if test "${cf_cv_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 7567 "configure"
-+#line 7912 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -7582,23 +7927,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7585: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7930: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7588: \$? = $ac_status" >&5
-+  echo "$as_me:7933: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7591: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7936: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7594: \$? = $ac_status" >&5
-+  echo "$as_me:7939: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 7601 "configure"
-+#line 7946 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -7617,16 +7962,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7620: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7965: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7623: \$? = $ac_status" >&5
-+  echo "$as_me:7968: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7626: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7971: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7629: \$? = $ac_status" >&5
-+  echo "$as_me:7974: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=yes
- else
-@@ -7638,7 +7983,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:7641: result: $cf_cv_wchar_t" >&5
-+echo "$as_me:7986: result: $cf_cv_wchar_t" >&5
- echo "${ECHO_T}$cf_cv_wchar_t" >&6
- 
- if test "$cf_cv_wchar_t" = yes ; then
-@@ -7660,14 +8005,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wint_t
--echo "$as_me:7663: checking if we must include wchar.h to declare wint_t" >&5
-+echo "$as_me:8008: checking if we must include wchar.h to declare wint_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
- if test "${cf_cv_wint_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 7670 "configure"
-+#line 8015 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -7685,23 +8030,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7688: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8033: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7691: \$? = $ac_status" >&5
-+  echo "$as_me:8036: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7694: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8039: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7697: \$? = $ac_status" >&5
-+  echo "$as_me:8042: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 7704 "configure"
-+#line 8049 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -7720,16 +8065,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7723: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8068: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7726: \$? = $ac_status" >&5
-+  echo "$as_me:8071: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7729: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8074: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7732: \$? = $ac_status" >&5
-+  echo "$as_me:8077: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=yes
- else
-@@ -7741,7 +8086,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:7744: result: $cf_cv_wint_t" >&5
-+echo "$as_me:8089: result: $cf_cv_wint_t" >&5
- echo "${ECHO_T}$cf_cv_wint_t" >&6
- 
- if test "$cf_cv_wint_t" = yes ; then
-@@ -7780,7 +8125,7 @@
- 	;;
- esac
- 
--echo "$as_me:7783: checking whether to enable _LP64 definition in curses.h" >&5
-+echo "$as_me:8128: checking whether to enable _LP64 definition in curses.h" >&5
- echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
- 
- # Check whether --enable-lp64 or --disable-lp64 was given.
-@@ -7790,7 +8135,7 @@
- else
-   with_lp64=$default_with_lp64
- fi;
--echo "$as_me:7793: result: $with_lp64" >&5
-+echo "$as_me:8138: result: $with_lp64" >&5
- echo "${ECHO_T}$with_lp64" >&6
- 
- if test "$with_lp64" = yes ; then
-@@ -7806,7 +8151,7 @@
- fi;
- if test "$enable_largefile" != no; then
- 
--  echo "$as_me:7809: checking for special C compiler options needed for large files" >&5
-+  echo "$as_me:8154: checking for special C compiler options needed for large files" >&5
- echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_largefile_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7818,7 +8163,7 @@
-      	 # IRIX 6.2 and later do not support large files by default,
-      	 # so use the C compiler's -n32 option if that helps.
-          cat >conftest.$ac_ext <<_ACEOF
--#line 7821 "configure"
-+#line 8166 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -7838,16 +8183,16 @@
- }
- _ACEOF
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7841: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8186: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7844: \$? = $ac_status" >&5
-+  echo "$as_me:8189: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7847: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8192: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7850: \$? = $ac_status" >&5
-+  echo "$as_me:8195: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -7857,16 +8202,16 @@
- rm -f conftest.$ac_objext
-      	 CC="$CC -n32"
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7860: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8205: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7863: \$? = $ac_status" >&5
-+  echo "$as_me:8208: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7866: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8211: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7869: \$? = $ac_status" >&5
-+  echo "$as_me:8214: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_CC=' -n32'; break
- else
-@@ -7880,13 +8225,13 @@
-        rm -f conftest.$ac_ext
-     fi
- fi
--echo "$as_me:7883: result: $ac_cv_sys_largefile_CC" >&5
-+echo "$as_me:8228: result: $ac_cv_sys_largefile_CC" >&5
- echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
-   if test "$ac_cv_sys_largefile_CC" != no; then
-     CC=$CC$ac_cv_sys_largefile_CC
-   fi
- 
--  echo "$as_me:7889: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+  echo "$as_me:8234: checking for _FILE_OFFSET_BITS value needed for large files" >&5
- echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_file_offset_bits+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7894,7 +8239,7 @@
-   while :; do
-   ac_cv_sys_file_offset_bits=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7897 "configure"
-+#line 8242 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -7914,16 +8259,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7917: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8262: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7920: \$? = $ac_status" >&5
-+  echo "$as_me:8265: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7923: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8268: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7926: \$? = $ac_status" >&5
-+  echo "$as_me:8271: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -7932,7 +8277,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7935 "configure"
-+#line 8280 "configure"
- #include "confdefs.h"
- #define _FILE_OFFSET_BITS 64
- #include <sys/types.h>
-@@ -7953,16 +8298,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7956: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8301: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7959: \$? = $ac_status" >&5
-+  echo "$as_me:8304: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7962: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8307: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7965: \$? = $ac_status" >&5
-+  echo "$as_me:8310: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_file_offset_bits=64; break
- else
-@@ -7973,7 +8318,7 @@
-   break
- done
- fi
--echo "$as_me:7976: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "$as_me:8321: result: $ac_cv_sys_file_offset_bits" >&5
- echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
- if test "$ac_cv_sys_file_offset_bits" != no; then
- 
-@@ -7983,7 +8328,7 @@
- 
- fi
- rm -f conftest*
--  echo "$as_me:7986: checking for _LARGE_FILES value needed for large files" >&5
-+  echo "$as_me:8331: checking for _LARGE_FILES value needed for large files" >&5
- echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_large_files+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7991,7 +8336,7 @@
-   while :; do
-   ac_cv_sys_large_files=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7994 "configure"
-+#line 8339 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -8011,16 +8356,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8014: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8359: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8017: \$? = $ac_status" >&5
-+  echo "$as_me:8362: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8020: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8365: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8023: \$? = $ac_status" >&5
-+  echo "$as_me:8368: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -8029,7 +8374,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8032 "configure"
-+#line 8377 "configure"
- #include "confdefs.h"
- #define _LARGE_FILES 1
- #include <sys/types.h>
-@@ -8050,16 +8395,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8053: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8398: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8056: \$? = $ac_status" >&5
-+  echo "$as_me:8401: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8059: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8404: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8062: \$? = $ac_status" >&5
-+  echo "$as_me:8407: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_large_files=1; break
- else
-@@ -8070,7 +8415,7 @@
-   break
- done
- fi
--echo "$as_me:8073: result: $ac_cv_sys_large_files" >&5
-+echo "$as_me:8418: result: $ac_cv_sys_large_files" >&5
- echo "${ECHO_T}$ac_cv_sys_large_files" >&6
- if test "$ac_cv_sys_large_files" != no; then
- 
-@@ -8083,7 +8428,7 @@
- fi
- 
-     if test "$enable_largefile" != no ; then
--	echo "$as_me:8086: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+	echo "$as_me:8431: checking for _LARGEFILE_SOURCE value needed for large files" >&5
- echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_largefile_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8091,7 +8436,7 @@
-   while :; do
-   ac_cv_sys_largefile_source=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8094 "configure"
-+#line 8439 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -8103,16 +8448,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8106: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8451: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8109: \$? = $ac_status" >&5
-+  echo "$as_me:8454: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8112: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8457: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8115: \$? = $ac_status" >&5
-+  echo "$as_me:8460: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -8121,7 +8466,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8124 "configure"
-+#line 8469 "configure"
- #include "confdefs.h"
- #define _LARGEFILE_SOURCE 1
- #include <stdio.h>
-@@ -8134,16 +8479,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8137: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8482: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8140: \$? = $ac_status" >&5
-+  echo "$as_me:8485: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8143: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8488: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8146: \$? = $ac_status" >&5
-+  echo "$as_me:8491: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_source=1; break
- else
-@@ -8154,7 +8499,7 @@
-   break
- done
- fi
--echo "$as_me:8157: result: $ac_cv_sys_largefile_source" >&5
-+echo "$as_me:8502: result: $ac_cv_sys_largefile_source" >&5
- echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
- if test "$ac_cv_sys_largefile_source" != no; then
- 
-@@ -8168,13 +8513,13 @@
- # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
- # in glibc 2.1.3, but that breaks too many other things.
- # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
--echo "$as_me:8171: checking for fseeko" >&5
-+echo "$as_me:8516: checking for fseeko" >&5
- echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
- if test "${ac_cv_func_fseeko+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8177 "configure"
-+#line 8522 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -8186,16 +8531,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8189: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8534: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8192: \$? = $ac_status" >&5
-+  echo "$as_me:8537: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8195: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8540: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8198: \$? = $ac_status" >&5
-+  echo "$as_me:8543: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fseeko=yes
- else
-@@ -8205,7 +8550,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:8208: result: $ac_cv_func_fseeko" >&5
-+echo "$as_me:8553: result: $ac_cv_func_fseeko" >&5
- echo "${ECHO_T}$ac_cv_func_fseeko" >&6
- if test $ac_cv_func_fseeko = yes; then
- 
-@@ -8226,14 +8571,14 @@
- 	test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
- 	test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
- 
--	echo "$as_me:8229: checking whether to use struct dirent64" >&5
-+	echo "$as_me:8574: checking whether to use struct dirent64" >&5
- echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
- if test "${cf_cv_struct_dirent64+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 8236 "configure"
-+#line 8581 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -8254,16 +8599,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8257: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8602: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8260: \$? = $ac_status" >&5
-+  echo "$as_me:8605: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8263: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8608: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8266: \$? = $ac_status" >&5
-+  echo "$as_me:8611: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_struct_dirent64=yes
- else
-@@ -8274,7 +8619,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8277: result: $cf_cv_struct_dirent64" >&5
-+echo "$as_me:8622: result: $cf_cv_struct_dirent64" >&5
- echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
- 	test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF
- #define HAVE_STRUCT_DIRENT64 1
-@@ -8283,7 +8628,7 @@
-     fi
- 
- ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
--echo "$as_me:8286: checking if you want tparm not to use X/Open fixed-parameter list" >&5
-+echo "$as_me:8631: checking if you want tparm not to use X/Open fixed-parameter list" >&5
- echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6
- 
- # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given.
-@@ -8293,14 +8638,14 @@
- else
-   with_tparm_varargs=yes
- fi;
--echo "$as_me:8296: result: $with_tparm_varargs" >&5
-+echo "$as_me:8641: result: $with_tparm_varargs" >&5
- echo "${ECHO_T}$with_tparm_varargs" >&6
- NCURSES_TPARM_VARARGS=0
- test "$with_tparm_varargs" = yes && NCURSES_TPARM_VARARGS=1
- 
- ###   use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw
- if test "$with_ticlib" != no ; then
--echo "$as_me:8303: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
-+echo "$as_me:8648: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
- echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6
- 
- # Check whether --enable-tic-depends or --disable-tic-depends was given.
-@@ -8310,14 +8655,14 @@
- else
-   with_tic_depends=yes
- fi;
--echo "$as_me:8313: result: $with_tic_depends" >&5
-+echo "$as_me:8658: result: $with_tic_depends" >&5
- echo "${ECHO_T}$with_tic_depends" >&6
- else
- 	with_tic_depends=no
- fi
- 
- ###   use option --with-bool to override bool's type
--echo "$as_me:8320: checking for type of bool" >&5
-+echo "$as_me:8665: checking for type of bool" >&5
- echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
- 
- # Check whether --with-bool or --without-bool was given.
-@@ -8327,10 +8672,10 @@
- else
-   NCURSES_BOOL=auto
- fi;
--echo "$as_me:8330: result: $NCURSES_BOOL" >&5
-+echo "$as_me:8675: result: $NCURSES_BOOL" >&5
- echo "${ECHO_T}$NCURSES_BOOL" >&6
- 
--echo "$as_me:8333: checking for alternate terminal capabilities file" >&5
-+echo "$as_me:8678: checking for alternate terminal capabilities file" >&5
- echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
- 
- # Check whether --with-caps or --without-caps was given.
-@@ -8341,11 +8686,11 @@
-   TERMINFO_CAPS=Caps
- fi;
- test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
--echo "$as_me:8344: result: $TERMINFO_CAPS" >&5
-+echo "$as_me:8689: result: $TERMINFO_CAPS" >&5
- echo "${ECHO_T}$TERMINFO_CAPS" >&6
- 
- ###   use option --with-chtype to override chtype's type
--echo "$as_me:8348: checking for type of chtype" >&5
-+echo "$as_me:8693: checking for type of chtype" >&5
- echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
- 
- # Check whether --with-chtype or --without-chtype was given.
-@@ -8355,11 +8700,11 @@
- else
-   NCURSES_CHTYPE=auto
- fi;
--echo "$as_me:8358: result: $NCURSES_CHTYPE" >&5
-+echo "$as_me:8703: result: $NCURSES_CHTYPE" >&5
- echo "${ECHO_T}$NCURSES_CHTYPE" >&6
- 
- ###   use option --with-ospeed to override ospeed's type
--echo "$as_me:8362: checking for type of ospeed" >&5
-+echo "$as_me:8707: checking for type of ospeed" >&5
- echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
- 
- # Check whether --with-ospeed or --without-ospeed was given.
-@@ -8369,11 +8714,11 @@
- else
-   NCURSES_OSPEED=short
- fi;
--echo "$as_me:8372: result: $NCURSES_OSPEED" >&5
-+echo "$as_me:8717: result: $NCURSES_OSPEED" >&5
- echo "${ECHO_T}$NCURSES_OSPEED" >&6
- 
- ###   use option --with-mmask-t to override mmask_t's type
--echo "$as_me:8376: checking for type of mmask_t" >&5
-+echo "$as_me:8721: checking for type of mmask_t" >&5
- echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
- 
- # Check whether --with-mmask-t or --without-mmask-t was given.
-@@ -8383,11 +8728,11 @@
- else
-   NCURSES_MMASK_T=auto
- fi;
--echo "$as_me:8386: result: $NCURSES_MMASK_T" >&5
-+echo "$as_me:8731: result: $NCURSES_MMASK_T" >&5
- echo "${ECHO_T}$NCURSES_MMASK_T" >&6
- 
- ### Enable compiling-in rcs id's
--echo "$as_me:8390: checking if RCS identifiers should be compiled-in" >&5
-+echo "$as_me:8735: checking if RCS identifiers should be compiled-in" >&5
- echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
- 
- # Check whether --with-rcs-ids or --without-rcs-ids was given.
-@@ -8397,7 +8742,7 @@
- else
-   with_rcs_ids=no
- fi;
--echo "$as_me:8400: result: $with_rcs_ids" >&5
-+echo "$as_me:8745: result: $with_rcs_ids" >&5
- echo "${ECHO_T}$with_rcs_ids" >&6
- test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF
- #define USE_RCS_IDS 1
-@@ -8405,7 +8750,7 @@
- 
- ###############################################################################
- 
--echo "$as_me:8408: checking format of man-pages" >&5
-+echo "$as_me:8753: checking format of man-pages" >&5
- echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
- 
- # Check whether --with-manpage-format or --without-manpage-format was given.
-@@ -8494,14 +8839,14 @@
-   ;;
- esac
- 
--echo "$as_me:8497: result: $MANPAGE_FORMAT" >&5
-+echo "$as_me:8842: result: $MANPAGE_FORMAT" >&5
- echo "${ECHO_T}$MANPAGE_FORMAT" >&6
- if test -n "$cf_unknown" ; then
--  { echo "$as_me:8500: WARNING: Unexpected manpage-format $cf_unknown" >&5
-+  { echo "$as_me:8845: WARNING: Unexpected manpage-format $cf_unknown" >&5
- echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
- fi
- 
--echo "$as_me:8504: checking for manpage renaming" >&5
-+echo "$as_me:8849: checking for manpage renaming" >&5
- echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
- 
- # Check whether --with-manpage-renames or --without-manpage-renames was given.
-@@ -8529,7 +8874,7 @@
-   if test -f $srcdir/man/$MANPAGE_RENAMES ; then
-     MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
-   elif test ! -f $MANPAGE_RENAMES ; then
--    { { echo "$as_me:8532: error: not a filename: $MANPAGE_RENAMES" >&5
-+    { { echo "$as_me:8877: error: not a filename: $MANPAGE_RENAMES" >&5
- echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
-    { (exit 1); exit 1; }; }
-   fi
-@@ -8543,10 +8888,10 @@
-   fi
- fi
- 
--echo "$as_me:8546: result: $MANPAGE_RENAMES" >&5
-+echo "$as_me:8891: result: $MANPAGE_RENAMES" >&5
- echo "${ECHO_T}$MANPAGE_RENAMES" >&6
- 
--echo "$as_me:8549: checking if manpage aliases will be installed" >&5
-+echo "$as_me:8894: checking if manpage aliases will be installed" >&5
- echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
- 
- # Check whether --with-manpage-aliases or --without-manpage-aliases was given.
-@@ -8557,7 +8902,7 @@
-   MANPAGE_ALIASES=yes
- fi;
- 
--echo "$as_me:8560: result: $MANPAGE_ALIASES" >&5
-+echo "$as_me:8905: result: $MANPAGE_ALIASES" >&5
- echo "${ECHO_T}$MANPAGE_ALIASES" >&6
- 
- if test "$LN_S" = "ln -s"; then
-@@ -8568,7 +8913,7 @@
- 
- MANPAGE_SYMLINKS=no
- if test "$MANPAGE_ALIASES" = yes ; then
--echo "$as_me:8571: checking if manpage symlinks should be used" >&5
-+echo "$as_me:8916: checking if manpage symlinks should be used" >&5
- echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
- 
- # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
-@@ -8581,17 +8926,17 @@
- 
- if test "$$cf_use_symlinks" = no; then
- if test "$MANPAGE_SYMLINKS" = yes ; then
--	{ echo "$as_me:8584: WARNING: cannot make symlinks" >&5
-+	{ echo "$as_me:8929: WARNING: cannot make symlinks" >&5
- echo "$as_me: WARNING: cannot make symlinks" >&2;}
- 	MANPAGE_SYMLINKS=no
- fi
- fi
- 
--echo "$as_me:8590: result: $MANPAGE_SYMLINKS" >&5
-+echo "$as_me:8935: result: $MANPAGE_SYMLINKS" >&5
- echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
- fi
- 
--echo "$as_me:8594: checking for manpage tbl" >&5
-+echo "$as_me:8939: checking for manpage tbl" >&5
- echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
- 
- # Check whether --with-manpage-tbl or --without-manpage-tbl was given.
-@@ -8602,7 +8947,7 @@
-   MANPAGE_TBL=no
- fi;
- 
--echo "$as_me:8605: result: $MANPAGE_TBL" >&5
-+echo "$as_me:8950: result: $MANPAGE_TBL" >&5
- echo "${ECHO_T}$MANPAGE_TBL" >&6
- 
-   if test "$prefix" = "NONE" ; then
-@@ -8718,7 +9063,7 @@
- 		s,@NCURSES_OSPEED@,\$NCURSES_OSPEED,g
- CF_EOF
- 
--	for cf_name in  captoinfo clear infocmp infotocap tic toe tput
-+	for cf_name in  captoinfo clear infocmp infotocap tabs tic toe tput tset
- 	do
- 		cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
- 		cf_name=`echo $cf_name|sed "$program_transform_name"`
-@@ -8913,7 +9258,7 @@
- ###############################################################################
- 
- ### Note that some functions (such as const) are normally disabled anyway.
--echo "$as_me:8916: checking if you want to build with function extensions" >&5
-+echo "$as_me:9261: checking if you want to build with function extensions" >&5
- echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
- 
- # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
-@@ -8923,7 +9268,7 @@
- else
-   with_ext_funcs=yes
- fi;
--echo "$as_me:8926: result: $with_ext_funcs" >&5
-+echo "$as_me:9271: result: $with_ext_funcs" >&5
- echo "${ECHO_T}$with_ext_funcs" >&6
- if test "$with_ext_funcs" = yes ; then
- 	NCURSES_EXT_FUNCS=1
-@@ -8955,12 +9300,14 @@
- #define NCURSES_EXT_FUNCS 1
- EOF
- 
-+	GENERATED_EXT_FUNCS=generated
- else
- 	NCURSES_EXT_FUNCS=0
-+	GENERATED_EXT_FUNCS=
- fi
- 
- ###   use option --enable-const to turn on use of const beyond that in XSI.
--echo "$as_me:8963: checking for extended use of const keyword" >&5
-+echo "$as_me:9310: checking for extended use of const keyword" >&5
- echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
- 
- # Check whether --enable-const or --disable-const was given.
-@@ -8970,7 +9317,7 @@
- else
-   with_ext_const=no
- fi;
--echo "$as_me:8973: result: $with_ext_const" >&5
-+echo "$as_me:9320: result: $with_ext_const" >&5
- echo "${ECHO_T}$with_ext_const" >&6
- NCURSES_CONST='/*nothing*/'
- if test "$with_ext_const" = yes ; then
-@@ -8978,7 +9325,7 @@
- fi
- 
- ###   use option --enable-ext-colors to turn on use of colors beyond 16.
--echo "$as_me:8981: checking if you want to use extended colors" >&5
-+echo "$as_me:9328: checking if you want to use extended colors" >&5
- echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6
- 
- # Check whether --enable-ext-colors or --disable-ext-colors was given.
-@@ -8988,12 +9335,12 @@
- else
-   with_ext_colors=no
- fi;
--echo "$as_me:8991: result: $with_ext_colors" >&5
-+echo "$as_me:9338: result: $with_ext_colors" >&5
- echo "${ECHO_T}$with_ext_colors" >&6
- NCURSES_EXT_COLORS=0
- if test "$with_ext_colors" = yes ; then
- 	if test "$with_widec" != yes ; then
--		{ { echo "$as_me:8996: error: This option applies only to wide-character library" >&5
-+		{ { echo "$as_me:9343: error: This option applies only to wide-character library" >&5
- echo "$as_me: error: This option applies only to wide-character library" >&2;}
-    { (exit 1); exit 1; }; }
- 	else
-@@ -9004,7 +9351,7 @@
- 	5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:9007: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:9354: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -9019,7 +9366,7 @@
- fi
- 
- ###   use option --enable-ext-mouse to modify coding to support 5-button mice
--echo "$as_me:9022: checking if you want to use extended mouse encoding" >&5
-+echo "$as_me:9369: checking if you want to use extended mouse encoding" >&5
- echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6
- 
- # Check whether --enable-ext-mouse or --disable-ext-mouse was given.
-@@ -9029,7 +9376,7 @@
- else
-   with_ext_mouse=no
- fi;
--echo "$as_me:9032: result: $with_ext_mouse" >&5
-+echo "$as_me:9379: result: $with_ext_mouse" >&5
- echo "${ECHO_T}$with_ext_mouse" >&6
- NCURSES_MOUSE_VERSION=1
- if test "$with_ext_mouse" = yes ; then
-@@ -9040,7 +9387,7 @@
- 	5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:9043: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:9390: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -9048,7 +9395,7 @@
- 
- fi
- 
--echo "$as_me:9051: checking if you want \$NCURSES_NO_PADDING code" >&5
-+echo "$as_me:9398: checking if you want \$NCURSES_NO_PADDING code" >&5
- echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
- 
- # Check whether --enable-no-padding or --disable-no-padding was given.
-@@ -9058,19 +9405,19 @@
- else
-   with_no_padding=$with_ext_funcs
- fi;
--echo "$as_me:9061: result: $with_no_padding" >&5
-+echo "$as_me:9408: result: $with_no_padding" >&5
- echo "${ECHO_T}$with_no_padding" >&6
- test "$with_no_padding" = yes && cat >>confdefs.h <<\EOF
- #define NCURSES_NO_PADDING 1
- EOF
- 
--echo "$as_me:9067: checking for ANSI C header files" >&5
-+echo "$as_me:9414: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
- if test "${ac_cv_header_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9073 "configure"
-+#line 9420 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -9078,13 +9425,13 @@
- #include <float.h>
- 
- _ACEOF
--if { (eval echo "$as_me:9081: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:9428: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:9087: \$? = $ac_status" >&5
-+  echo "$as_me:9434: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -9106,7 +9453,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9109 "configure"
-+#line 9456 "configure"
- #include "confdefs.h"
- #include <string.h>
- 
-@@ -9124,7 +9471,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9127 "configure"
-+#line 9474 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- 
-@@ -9145,7 +9492,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9148 "configure"
-+#line 9495 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
-@@ -9171,15 +9518,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:9174: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9521: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9177: \$? = $ac_status" >&5
-+  echo "$as_me:9524: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:9179: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9526: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9182: \$? = $ac_status" >&5
-+  echo "$as_me:9529: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -9192,7 +9539,7 @@
- fi
- fi
- fi
--echo "$as_me:9195: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:9542: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -9208,28 +9555,28 @@
-                   inttypes.h stdint.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:9211: checking for $ac_header" >&5
-+echo "$as_me:9558: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9217 "configure"
-+#line 9564 "configure"
- #include "confdefs.h"
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9223: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9570: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9226: \$? = $ac_status" >&5
-+  echo "$as_me:9573: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9229: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9576: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9232: \$? = $ac_status" >&5
-+  echo "$as_me:9579: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -9239,7 +9586,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:9242: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:9589: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -9249,13 +9596,13 @@
- fi
- done
- 
--echo "$as_me:9252: checking for signed char" >&5
-+echo "$as_me:9599: checking for signed char" >&5
- echo $ECHO_N "checking for signed char... $ECHO_C" >&6
- if test "${ac_cv_type_signed_char+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9258 "configure"
-+#line 9605 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -9270,16 +9617,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9273: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9620: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9276: \$? = $ac_status" >&5
-+  echo "$as_me:9623: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9279: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9626: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9282: \$? = $ac_status" >&5
-+  echo "$as_me:9629: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_signed_char=yes
- else
-@@ -9289,10 +9636,10 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:9292: result: $ac_cv_type_signed_char" >&5
-+echo "$as_me:9639: result: $ac_cv_type_signed_char" >&5
- echo "${ECHO_T}$ac_cv_type_signed_char" >&6
- 
--echo "$as_me:9295: checking size of signed char" >&5
-+echo "$as_me:9642: checking size of signed char" >&5
- echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
- if test "${ac_cv_sizeof_signed_char+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9301,7 +9648,7 @@
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--#line 9304 "configure"
-+#line 9651 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -9313,21 +9660,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9316: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9663: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9319: \$? = $ac_status" >&5
-+  echo "$as_me:9666: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9322: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9669: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9325: \$? = $ac_status" >&5
-+  echo "$as_me:9672: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 9330 "configure"
-+#line 9677 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -9339,16 +9686,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9342: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9689: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9345: \$? = $ac_status" >&5
-+  echo "$as_me:9692: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9348: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9695: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9351: \$? = $ac_status" >&5
-+  echo "$as_me:9698: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -9364,7 +9711,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 9367 "configure"
-+#line 9714 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -9376,16 +9723,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9379: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9726: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9382: \$? = $ac_status" >&5
-+  echo "$as_me:9729: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9385: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9732: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9388: \$? = $ac_status" >&5
-+  echo "$as_me:9735: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -9401,7 +9748,7 @@
- while test "x$ac_lo" != "x$ac_hi"; do
-   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9404 "configure"
-+#line 9751 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -9413,16 +9760,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9416: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9763: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9419: \$? = $ac_status" >&5
-+  echo "$as_me:9766: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9422: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9769: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9425: \$? = $ac_status" >&5
-+  echo "$as_me:9772: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid
- else
-@@ -9435,12 +9782,12 @@
- ac_cv_sizeof_signed_char=$ac_lo
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:9438: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:9785: error: cannot run test program while cross compiling" >&5
- echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9443 "configure"
-+#line 9790 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -9456,15 +9803,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:9459: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9806: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9462: \$? = $ac_status" >&5
-+  echo "$as_me:9809: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:9464: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9811: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9467: \$? = $ac_status" >&5
-+  echo "$as_me:9814: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_signed_char=`cat conftest.val`
- else
-@@ -9480,7 +9827,7 @@
-   ac_cv_sizeof_signed_char=0
- fi
- fi
--echo "$as_me:9483: result: $ac_cv_sizeof_signed_char" >&5
-+echo "$as_me:9830: result: $ac_cv_sizeof_signed_char" >&5
- echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
- cat >>confdefs.h <<EOF
- #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
-@@ -9491,7 +9838,7 @@
- else
- 	NCURSES_SBOOL="char"
- fi
--echo "$as_me:9494: checking if you want to use signed Boolean array in term.h" >&5
-+echo "$as_me:9841: checking if you want to use signed Boolean array in term.h" >&5
- echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
- 
- # Check whether --enable-signed-char or --disable-signed-char was given.
-@@ -9501,12 +9848,12 @@
- else
-   with_signed_char=no
- fi;
--echo "$as_me:9504: result: $with_signed_char" >&5
-+echo "$as_me:9851: result: $with_signed_char" >&5
- echo "${ECHO_T}$with_signed_char" >&6
- test "$with_signed_char" != yes && NCURSES_SBOOL="char"
- 
- ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
--echo "$as_me:9509: checking if you want SIGWINCH handler" >&5
-+echo "$as_me:9856: checking if you want SIGWINCH handler" >&5
- echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
- 
- # Check whether --enable-sigwinch or --disable-sigwinch was given.
-@@ -9516,14 +9863,14 @@
- else
-   with_sigwinch=$with_ext_funcs
- fi;
--echo "$as_me:9519: result: $with_sigwinch" >&5
-+echo "$as_me:9866: result: $with_sigwinch" >&5
- echo "${ECHO_T}$with_sigwinch" >&6
- test "$with_sigwinch" = yes && cat >>confdefs.h <<\EOF
- #define USE_SIGWINCH 1
- EOF
- 
- ###   use option --enable-tcap-names to allow user to define new capabilities
--echo "$as_me:9526: checking if you want user-definable terminal capabilities like termcap" >&5
-+echo "$as_me:9873: checking if you want user-definable terminal capabilities like termcap" >&5
- echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
- 
- # Check whether --enable-tcap-names or --disable-tcap-names was given.
-@@ -9533,7 +9880,7 @@
- else
-   with_tcap_names=$with_ext_funcs
- fi;
--echo "$as_me:9536: result: $with_tcap_names" >&5
-+echo "$as_me:9883: result: $with_tcap_names" >&5
- echo "${ECHO_T}$with_tcap_names" >&6
- NCURSES_XNAMES=0
- test "$with_tcap_names" = yes && NCURSES_XNAMES=1
-@@ -9541,7 +9888,7 @@
- ###############################################################################
- # These options are relatively safe to experiment with.
- 
--echo "$as_me:9544: checking if you want all development code" >&5
-+echo "$as_me:9891: checking if you want all development code" >&5
- echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
- 
- # Check whether --with-develop or --without-develop was given.
-@@ -9551,11 +9898,11 @@
- else
-   with_develop=no
- fi;
--echo "$as_me:9554: result: $with_develop" >&5
-+echo "$as_me:9901: result: $with_develop" >&5
- echo "${ECHO_T}$with_develop" >&6
- 
- ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
--echo "$as_me:9558: checking if you want hard-tabs code" >&5
-+echo "$as_me:9905: checking if you want hard-tabs code" >&5
- echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
- 
- # Check whether --enable-hard-tabs or --disable-hard-tabs was given.
-@@ -9565,14 +9912,14 @@
- else
-   enable_hard_tabs=$with_develop
- fi;
--echo "$as_me:9568: result: $enable_hard_tabs" >&5
-+echo "$as_me:9915: result: $enable_hard_tabs" >&5
- echo "${ECHO_T}$enable_hard_tabs" >&6
- test "$enable_hard_tabs" = yes && cat >>confdefs.h <<\EOF
- #define USE_HARD_TABS 1
- EOF
- 
- ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
--echo "$as_me:9575: checking if you want limited support for xmc" >&5
-+echo "$as_me:9922: checking if you want limited support for xmc" >&5
- echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
- 
- # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
-@@ -9582,7 +9929,7 @@
- else
-   enable_xmc_glitch=$with_develop
- fi;
--echo "$as_me:9585: result: $enable_xmc_glitch" >&5
-+echo "$as_me:9932: result: $enable_xmc_glitch" >&5
- echo "${ECHO_T}$enable_xmc_glitch" >&6
- test "$enable_xmc_glitch" = yes && cat >>confdefs.h <<\EOF
- #define USE_XMC_SUPPORT 1
-@@ -9591,7 +9938,7 @@
- ###############################################################################
- # These are just experimental, probably should not be in a package:
- 
--echo "$as_me:9594: checking if you do not want to assume colors are white-on-black" >&5
-+echo "$as_me:9941: checking if you do not want to assume colors are white-on-black" >&5
- echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
- 
- # Check whether --enable-assumed-color or --disable-assumed-color was given.
-@@ -9601,14 +9948,14 @@
- else
-   with_assumed_color=yes
- fi;
--echo "$as_me:9604: result: $with_assumed_color" >&5
-+echo "$as_me:9951: result: $with_assumed_color" >&5
- echo "${ECHO_T}$with_assumed_color" >&6
- test "$with_assumed_color" = yes && cat >>confdefs.h <<\EOF
- #define USE_ASSUMED_COLOR 1
- EOF
- 
- ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
--echo "$as_me:9611: checking if you want hashmap scrolling-optimization code" >&5
-+echo "$as_me:9958: checking if you want hashmap scrolling-optimization code" >&5
- echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
- 
- # Check whether --enable-hashmap or --disable-hashmap was given.
-@@ -9618,14 +9965,14 @@
- else
-   with_hashmap=yes
- fi;
--echo "$as_me:9621: result: $with_hashmap" >&5
-+echo "$as_me:9968: result: $with_hashmap" >&5
- echo "${ECHO_T}$with_hashmap" >&6
- test "$with_hashmap" = yes && cat >>confdefs.h <<\EOF
- #define USE_HASHMAP 1
- EOF
- 
- ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
--echo "$as_me:9628: checking if you want colorfgbg code" >&5
-+echo "$as_me:9975: checking if you want colorfgbg code" >&5
- echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
- 
- # Check whether --enable-colorfgbg or --disable-colorfgbg was given.
-@@ -9635,7 +9982,7 @@
- else
-   with_colorfgbg=no
- fi;
--echo "$as_me:9638: result: $with_colorfgbg" >&5
-+echo "$as_me:9985: result: $with_colorfgbg" >&5
- echo "${ECHO_T}$with_colorfgbg" >&6
- test "$with_colorfgbg" = yes && cat >>confdefs.h <<\EOF
- #define USE_COLORFGBG 1
-@@ -9644,7 +9991,7 @@
- # This is still experimental (20080329), but should ultimately be moved to
- # the script-block --with-normal, etc.
- 
--echo "$as_me:9647: checking if you want to link with the pthread library" >&5
-+echo "$as_me:9994: checking if you want to link with the pthread library" >&5
- echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
- 
- # Check whether --with-pthread or --without-pthread was given.
-@@ -9654,27 +10001,27 @@
- else
-   with_pthread=no
- fi;
--echo "$as_me:9657: result: $with_pthread" >&5
-+echo "$as_me:10004: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 
- if test "$with_pthread" != no ; then
--    echo "$as_me:9661: checking for pthread.h" >&5
-+    echo "$as_me:10008: checking for pthread.h" >&5
- echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
- if test "${ac_cv_header_pthread_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9667 "configure"
-+#line 10014 "configure"
- #include "confdefs.h"
- #include <pthread.h>
- _ACEOF
--if { (eval echo "$as_me:9671: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:10018: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:9677: \$? = $ac_status" >&5
-+  echo "$as_me:10024: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -9693,7 +10040,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:9696: result: $ac_cv_header_pthread_h" >&5
-+echo "$as_me:10043: result: $ac_cv_header_pthread_h" >&5
- echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
- if test $ac_cv_header_pthread_h = yes; then
- 
-@@ -9701,12 +10048,12 @@
- #define HAVE_PTHREADS_H 1
- EOF
- 
--        echo "$as_me:9704: checking if we can link with the pthread library" >&5
-+        echo "$as_me:10051: checking if we can link with the pthread library" >&5
- echo $ECHO_N "checking if we can link with the pthread library... $ECHO_C" >&6
-         cf_save_LIBS="$LIBS"
-         LIBS="-lpthread $LIBS"
-         cat >conftest.$ac_ext <<_ACEOF
--#line 9709 "configure"
-+#line 10056 "configure"
- #include "confdefs.h"
- 
- #include <pthread.h>
-@@ -9722,16 +10069,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9725: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10072: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9728: \$? = $ac_status" >&5
-+  echo "$as_me:10075: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9731: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10078: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9734: \$? = $ac_status" >&5
-+  echo "$as_me:10081: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_pthread=yes
- else
-@@ -9741,7 +10088,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-         LIBS="$cf_save_LIBS"
--        echo "$as_me:9744: result: $with_pthread" >&5
-+        echo "$as_me:10091: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 
-         if test "$with_pthread" = yes ; then
-@@ -9751,7 +10098,7 @@
- EOF
- 
-         else
--            { { echo "$as_me:9754: error: Cannot link with pthread library" >&5
-+            { { echo "$as_me:10101: error: Cannot link with pthread library" >&5
- echo "$as_me: error: Cannot link with pthread library" >&2;}
-    { (exit 1); exit 1; }; }
-         fi
-@@ -9760,7 +10107,7 @@
- 
- fi
- 
--echo "$as_me:9763: checking if you want to use weak-symbols for pthreads" >&5
-+echo "$as_me:10110: checking if you want to use weak-symbols for pthreads" >&5
- echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
- 
- # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
-@@ -9770,18 +10117,18 @@
- else
-   use_weak_symbols=no
- fi;
--echo "$as_me:9773: result: $use_weak_symbols" >&5
-+echo "$as_me:10120: result: $use_weak_symbols" >&5
- echo "${ECHO_T}$use_weak_symbols" >&6
- if test "$use_weak_symbols" = yes ; then
- 
--echo "$as_me:9777: checking if $CC supports weak symbols" >&5
-+echo "$as_me:10124: checking if $CC supports weak symbols" >&5
- echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
- if test "${cf_cv_weak_symbols+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9784 "configure"
-+#line 10131 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -9807,16 +10154,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9810: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10157: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9813: \$? = $ac_status" >&5
-+  echo "$as_me:10160: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9816: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10163: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9819: \$? = $ac_status" >&5
-+  echo "$as_me:10166: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_weak_symbols=yes
- else
-@@ -9827,7 +10174,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:9830: result: $cf_cv_weak_symbols" >&5
-+echo "$as_me:10177: result: $cf_cv_weak_symbols" >&5
- echo "${ECHO_T}$cf_cv_weak_symbols" >&6
- 
- else
-@@ -9857,7 +10204,7 @@
- # opaque outside of that, so there is no --enable-opaque option.  We can use
- # this option without --with-pthreads, but this will be always set for
- # pthreads.
--echo "$as_me:9860: checking if you want experimental reentrant code" >&5
-+echo "$as_me:10207: checking if you want experimental reentrant code" >&5
- echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6
- 
- # Check whether --enable-reentrant or --disable-reentrant was given.
-@@ -9867,7 +10214,7 @@
- else
-   with_reentrant=no
- fi;
--echo "$as_me:9870: result: $with_reentrant" >&5
-+echo "$as_me:10217: result: $with_reentrant" >&5
- echo "${ECHO_T}$with_reentrant" >&6
- if test "$with_reentrant" = yes ; then
- 	cf_cv_enable_reentrant=1
-@@ -9891,7 +10238,7 @@
- 	5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:9894: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:10241: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -9904,7 +10251,7 @@
- 	NCURSES_SIZE_T=short
- fi
- 
--echo "$as_me:9907: checking if you want experimental safe-sprintf code" >&5
-+echo "$as_me:10254: checking if you want experimental safe-sprintf code" >&5
- echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
- 
- # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
-@@ -9914,7 +10261,7 @@
- else
-   with_safe_sprintf=no
- fi;
--echo "$as_me:9917: result: $with_safe_sprintf" >&5
-+echo "$as_me:10264: result: $with_safe_sprintf" >&5
- echo "${ECHO_T}$with_safe_sprintf" >&6
- test "$with_safe_sprintf" = yes && cat >>confdefs.h <<\EOF
- #define USE_SAFE_SPRINTF 1
-@@ -9923,7 +10270,7 @@
- ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
- # when hashmap is used scroll hints are useless
- if test "$with_hashmap" = no ; then
--echo "$as_me:9926: checking if you want to experiment without scrolling-hints code" >&5
-+echo "$as_me:10273: checking if you want to experiment without scrolling-hints code" >&5
- echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
- 
- # Check whether --enable-scroll-hints or --disable-scroll-hints was given.
-@@ -9933,7 +10280,7 @@
- else
-   with_scroll_hints=yes
- fi;
--echo "$as_me:9936: result: $with_scroll_hints" >&5
-+echo "$as_me:10283: result: $with_scroll_hints" >&5
- echo "${ECHO_T}$with_scroll_hints" >&6
- test "$with_scroll_hints" = yes && cat >>confdefs.h <<\EOF
- #define USE_SCROLL_HINTS 1
-@@ -9941,7 +10288,7 @@
- 
- fi
- 
--echo "$as_me:9944: checking if you want experimental wgetch-events code" >&5
-+echo "$as_me:10291: checking if you want experimental wgetch-events code" >&5
- echo $ECHO_N "checking if you want experimental wgetch-events code... $ECHO_C" >&6
- 
- # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
-@@ -9951,7 +10298,7 @@
- else
-   with_wgetch_events=no
- fi;
--echo "$as_me:9954: result: $with_wgetch_events" >&5
-+echo "$as_me:10301: result: $with_wgetch_events" >&5
- echo "${ECHO_T}$with_wgetch_events" >&6
- test "$with_wgetch_events" = yes && cat >>confdefs.h <<\EOF
- #define NCURSES_WGETCH_EVENTS 1
-@@ -9960,7 +10307,7 @@
- ###############################################################################
- 
- ###	use option --disable-echo to suppress full display compiling commands
--echo "$as_me:9963: checking if you want to display full commands during build" >&5
-+echo "$as_me:10310: checking if you want to display full commands during build" >&5
- echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6
- 
- # Check whether --enable-echo or --disable-echo was given.
-@@ -9977,11 +10324,11 @@
- 	test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent"
- 	test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent"
- fi
--echo "$as_me:9980: result: $with_echo" >&5
-+echo "$as_me:10327: result: $with_echo" >&5
- echo "${ECHO_T}$with_echo" >&6
- 
- ###	use option --enable-warnings to turn on all gcc warnings
--echo "$as_me:9984: checking if you want to see compiler warnings" >&5
-+echo "$as_me:10331: checking if you want to see compiler warnings" >&5
- echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
- 
- # Check whether --enable-warnings or --disable-warnings was given.
-@@ -9989,7 +10336,7 @@
-   enableval="$enable_warnings"
-   with_warnings=$enableval
- fi;
--echo "$as_me:9992: result: $with_warnings" >&5
-+echo "$as_me:10339: result: $with_warnings" >&5
- echo "${ECHO_T}$with_warnings" >&6
- 
- if test "x$with_warnings" = "xyes"; then
-@@ -10000,12 +10347,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	linux*|gnu*)
--		echo "$as_me:10003: checking if this is really Intel C compiler" >&5
-+		echo "$as_me:10350: checking if this is really Intel C compiler" >&5
- echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CFLAGS"
- 		CFLAGS="$CFLAGS -no-gcc"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 10008 "configure"
-+#line 10355 "configure"
- #include "confdefs.h"
- 
- int
-@@ -10022,16 +10369,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10025: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10372: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10028: \$? = $ac_status" >&5
-+  echo "$as_me:10375: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10031: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10378: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10034: \$? = $ac_status" >&5
-+  echo "$as_me:10381: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
-@@ -10042,14 +10389,14 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:10045: result: $INTEL_COMPILER" >&5
-+		echo "$as_me:10392: result: $INTEL_COMPILER" >&5
- echo "${ECHO_T}$INTEL_COMPILER" >&6
- 		;;
- 	esac
- fi
- 
- cat > conftest.$ac_ext <<EOF
--#line 10052 "${as_me-configure}"
-+#line 10399 "${as_me-configure}"
- int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
- EOF
- 
-@@ -10067,7 +10414,7 @@
- # remark #981: operands are evaluated in unspecified order
- # warning #269: invalid format string conversion
- 
--	{ echo "$as_me:10070: checking for $CC warning options..." >&5
-+	{ echo "$as_me:10417: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-Wall"
-@@ -10084,12 +10431,12 @@
- 		wd981
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:10087: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:10434: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10090: \$? = $ac_status" >&5
-+  echo "$as_me:10437: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:10092: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:10439: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
- 		fi
-@@ -10098,7 +10445,7 @@
- 
- elif test "$GCC" = yes
- then
--	{ echo "$as_me:10101: checking for $CC warning options..." >&5
-+	{ echo "$as_me:10448: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-W -Wall"
-@@ -10118,12 +10465,12 @@
- 		Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:10121: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:10468: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10124: \$? = $ac_status" >&5
-+  echo "$as_me:10471: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:10126: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:10473: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			case $cf_opt in #(vi
- 			Wcast-qual) #(vi
-@@ -10134,7 +10481,7 @@
- 				[34].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me-configure}:10137: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me-configure}:10484: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -10154,12 +10501,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	linux*|gnu*)
--		echo "$as_me:10157: checking if this is really Intel C++ compiler" >&5
-+		echo "$as_me:10504: checking if this is really Intel C++ compiler" >&5
- echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CXXFLAGS"
- 		CXXFLAGS="$CXXFLAGS -no-gcc"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 10162 "configure"
-+#line 10509 "configure"
- #include "confdefs.h"
- 
- int
-@@ -10176,16 +10523,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10179: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10526: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10182: \$? = $ac_status" >&5
-+  echo "$as_me:10529: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10185: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10532: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10188: \$? = $ac_status" >&5
-+  echo "$as_me:10535: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_CPLUSPLUS=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
-@@ -10196,7 +10543,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CXXFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:10199: result: $INTEL_CPLUSPLUS" >&5
-+		echo "$as_me:10546: result: $INTEL_CPLUSPLUS" >&5
- echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
- 		;;
- 	esac
-@@ -10210,7 +10557,7 @@
- ac_main_return=return
- 
- cat > conftest.$ac_ext <<EOF
--#line 10213 "configure"
-+#line 10560 "configure"
- int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
- EOF
- 
-@@ -10228,7 +10575,7 @@
- # remark #981: operands are evaluated in unspecified order
- # warning #269: invalid format string conversion
- 
--	{ echo "$as_me:10231: checking for $CC warning options..." >&5
-+	{ echo "$as_me:10578: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CXXFLAGS="$CXXFLAGS"
- 	EXTRA_CXXFLAGS="-Wall"
-@@ -10245,12 +10592,12 @@
- 		wd981
- 	do
- 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
--		if { (eval echo "$as_me:10248: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:10595: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10251: \$? = $ac_status" >&5
-+  echo "$as_me:10598: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:10253: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:10600: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
- 		fi
-@@ -10259,7 +10606,7 @@
- 
- elif test "$GXX" = yes
- then
--	{ echo "$as_me:10262: checking for $CXX warning options..." >&5
-+	{ echo "$as_me:10609: checking for $CXX warning options..." >&5
- echo "$as_me: checking for $CXX warning options..." >&6;}
- 	cf_save_CXXFLAGS="$CXXFLAGS"
- 	EXTRA_CXXFLAGS="-W -Wall"
-@@ -10288,16 +10635,16 @@
- 		Wundef $cf_gxx_extra_warnings Wno-unused
- 	do
- 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
--		if { (eval echo "$as_me:10291: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:10638: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10294: \$? = $ac_status" >&5
-+  echo "$as_me:10641: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:10296: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:10643: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
- 		else
--			test -n "$verbose" && echo "$as_me:10300: result: ... no -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:10647: result: ... no -$cf_opt" >&5
- echo "${ECHO_T}... no -$cf_opt" >&6
- 		fi
- 	done
-@@ -10333,10 +10680,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ echo "$as_me:10336: checking for $CC __attribute__ directives..." >&5
-+	{ echo "$as_me:10683: checking for $CC __attribute__ directives..." >&5
- echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
- cat > conftest.$ac_ext <<EOF
--#line 10339 "${as_me-configure}"
-+#line 10686 "${as_me-configure}"
- #include "confdefs.h"
- #include "conftest.h"
- #include "conftest.i"
-@@ -10374,12 +10721,12 @@
- EOF
- 			;;
- 		esac
--		if { (eval echo "$as_me:10377: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:10724: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10380: \$? = $ac_status" >&5
-+  echo "$as_me:10727: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:10382: result: ... $cf_attribute" >&5
-+			test -n "$verbose" && echo "$as_me:10729: result: ... $cf_attribute" >&5
- echo "${ECHO_T}... $cf_attribute" >&6
- 			cat conftest.h >>confdefs.h
- 		fi
-@@ -10391,7 +10738,7 @@
- fi
- 
- ###	use option --enable-assertions to turn on generation of assertion code
--echo "$as_me:10394: checking if you want to enable runtime assertions" >&5
-+echo "$as_me:10741: checking if you want to enable runtime assertions" >&5
- echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
- 
- # Check whether --enable-assertions or --disable-assertions was given.
-@@ -10401,7 +10748,7 @@
- else
-   with_assertions=no
- fi;
--echo "$as_me:10404: result: $with_assertions" >&5
-+echo "$as_me:10751: result: $with_assertions" >&5
- echo "${ECHO_T}$with_assertions" >&6
- if test -n "$GCC"
- then
-@@ -10419,7 +10766,7 @@
- 
- ###	use option --disable-leaks to suppress "permanent" leaks, for testing
- 
--echo "$as_me:10422: checking if you want to use dmalloc for testing" >&5
-+echo "$as_me:10769: checking if you want to use dmalloc for testing" >&5
- echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
- 
- # Check whether --with-dmalloc or --without-dmalloc was given.
-@@ -10435,7 +10782,7 @@
- else
-   with_dmalloc=
- fi;
--echo "$as_me:10438: result: ${with_dmalloc:-no}" >&5
-+echo "$as_me:10785: result: ${with_dmalloc:-no}" >&5
- echo "${ECHO_T}${with_dmalloc:-no}" >&6
- 
- case .$with_cflags in #(vi
-@@ -10519,23 +10866,23 @@
- esac
- 
- if test "$with_dmalloc" = yes ; then
--	echo "$as_me:10522: checking for dmalloc.h" >&5
-+	echo "$as_me:10869: checking for dmalloc.h" >&5
- echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
- if test "${ac_cv_header_dmalloc_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10528 "configure"
-+#line 10875 "configure"
- #include "confdefs.h"
- #include <dmalloc.h>
- _ACEOF
--if { (eval echo "$as_me:10532: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:10879: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:10538: \$? = $ac_status" >&5
-+  echo "$as_me:10885: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -10554,11 +10901,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:10557: result: $ac_cv_header_dmalloc_h" >&5
-+echo "$as_me:10904: result: $ac_cv_header_dmalloc_h" >&5
- echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
- if test $ac_cv_header_dmalloc_h = yes; then
- 
--echo "$as_me:10561: checking for dmalloc_debug in -ldmalloc" >&5
-+echo "$as_me:10908: checking for dmalloc_debug in -ldmalloc" >&5
- echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
- if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10566,7 +10913,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 10569 "configure"
-+#line 10916 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10585,16 +10932,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10588: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10935: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10591: \$? = $ac_status" >&5
-+  echo "$as_me:10938: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10594: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10941: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10597: \$? = $ac_status" >&5
-+  echo "$as_me:10944: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dmalloc_dmalloc_debug=yes
- else
-@@ -10605,7 +10952,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:10608: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
-+echo "$as_me:10955: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
- echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
- if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
-   cat >>confdefs.h <<EOF
-@@ -10620,7 +10967,7 @@
- 
- fi
- 
--echo "$as_me:10623: checking if you want to use dbmalloc for testing" >&5
-+echo "$as_me:10970: checking if you want to use dbmalloc for testing" >&5
- echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
- 
- # Check whether --with-dbmalloc or --without-dbmalloc was given.
-@@ -10636,7 +10983,7 @@
- else
-   with_dbmalloc=
- fi;
--echo "$as_me:10639: result: ${with_dbmalloc:-no}" >&5
-+echo "$as_me:10986: result: ${with_dbmalloc:-no}" >&5
- echo "${ECHO_T}${with_dbmalloc:-no}" >&6
- 
- case .$with_cflags in #(vi
-@@ -10720,23 +11067,23 @@
- esac
- 
- if test "$with_dbmalloc" = yes ; then
--	echo "$as_me:10723: checking for dbmalloc.h" >&5
-+	echo "$as_me:11070: checking for dbmalloc.h" >&5
- echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
- if test "${ac_cv_header_dbmalloc_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10729 "configure"
-+#line 11076 "configure"
- #include "confdefs.h"
- #include <dbmalloc.h>
- _ACEOF
--if { (eval echo "$as_me:10733: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:11080: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:10739: \$? = $ac_status" >&5
-+  echo "$as_me:11086: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -10755,11 +11102,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:10758: result: $ac_cv_header_dbmalloc_h" >&5
-+echo "$as_me:11105: result: $ac_cv_header_dbmalloc_h" >&5
- echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
- if test $ac_cv_header_dbmalloc_h = yes; then
- 
--echo "$as_me:10762: checking for debug_malloc in -ldbmalloc" >&5
-+echo "$as_me:11109: checking for debug_malloc in -ldbmalloc" >&5
- echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
- if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10767,7 +11114,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldbmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 10770 "configure"
-+#line 11117 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10786,16 +11133,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10789: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11136: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10792: \$? = $ac_status" >&5
-+  echo "$as_me:11139: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10795: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11142: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10798: \$? = $ac_status" >&5
-+  echo "$as_me:11145: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dbmalloc_debug_malloc=yes
- else
-@@ -10806,7 +11153,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:10809: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
-+echo "$as_me:11156: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
- echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
- if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
-   cat >>confdefs.h <<EOF
-@@ -10821,7 +11168,7 @@
- 
- fi
- 
--echo "$as_me:10824: checking if you want to use valgrind for testing" >&5
-+echo "$as_me:11171: checking if you want to use valgrind for testing" >&5
- echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
- 
- # Check whether --with-valgrind or --without-valgrind was given.
-@@ -10837,7 +11184,7 @@
- else
-   with_valgrind=
- fi;
--echo "$as_me:10840: result: ${with_valgrind:-no}" >&5
-+echo "$as_me:11187: result: ${with_valgrind:-no}" >&5
- echo "${ECHO_T}${with_valgrind:-no}" >&6
- 
- case .$with_cflags in #(vi
-@@ -10920,7 +11267,7 @@
- 	;;
- esac
- 
--echo "$as_me:10923: checking if you want to perform memory-leak testing" >&5
-+echo "$as_me:11270: checking if you want to perform memory-leak testing" >&5
- echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
- 
- # Check whether --enable-leaks or --disable-leaks was given.
-@@ -10930,7 +11277,7 @@
- else
-   : ${with_no_leaks:=no}
- fi;
--echo "$as_me:10933: result: $with_no_leaks" >&5
-+echo "$as_me:11280: result: $with_no_leaks" >&5
- echo "${ECHO_T}$with_no_leaks" >&6
- 
- if test "$with_no_leaks" = yes ; then
-@@ -10975,7 +11322,7 @@
- 	;;
- esac
- 
--echo "$as_me:10978: checking whether to add trace feature to all models" >&5
-+echo "$as_me:11325: checking whether to add trace feature to all models" >&5
- echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
- 
- # Check whether --with-trace or --without-trace was given.
-@@ -10985,7 +11332,7 @@
- else
-   cf_with_trace=$cf_all_traces
- fi;
--echo "$as_me:10988: result: $cf_with_trace" >&5
-+echo "$as_me:11335: result: $cf_with_trace" >&5
- echo "${ECHO_T}$cf_with_trace" >&6
- 
- if test "$cf_with_trace" = yes ; then
-@@ -11066,13 +11413,13 @@
- fi
- 
- ###	Checks for libraries.
--echo "$as_me:11069: checking for gettimeofday" >&5
-+echo "$as_me:11416: checking for gettimeofday" >&5
- echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
- if test "${ac_cv_func_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11075 "configure"
-+#line 11422 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char gettimeofday (); below.  */
-@@ -11103,16 +11450,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11106: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11453: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11109: \$? = $ac_status" >&5
-+  echo "$as_me:11456: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11112: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11459: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11115: \$? = $ac_status" >&5
-+  echo "$as_me:11462: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_gettimeofday=yes
- else
-@@ -11122,7 +11469,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:11125: result: $ac_cv_func_gettimeofday" >&5
-+echo "$as_me:11472: result: $ac_cv_func_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
- if test $ac_cv_func_gettimeofday = yes; then
-   cat >>confdefs.h <<\EOF
-@@ -11131,7 +11478,7 @@
- 
- else
- 
--echo "$as_me:11134: checking for gettimeofday in -lbsd" >&5
-+echo "$as_me:11481: checking for gettimeofday in -lbsd" >&5
- echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
- if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -11139,7 +11486,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 11142 "configure"
-+#line 11489 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -11158,16 +11505,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11161: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11508: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11164: \$? = $ac_status" >&5
-+  echo "$as_me:11511: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11167: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11514: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11170: \$? = $ac_status" >&5
-+  echo "$as_me:11517: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_bsd_gettimeofday=yes
- else
-@@ -11178,7 +11525,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:11181: result: $ac_cv_lib_bsd_gettimeofday" >&5
-+echo "$as_me:11528: result: $ac_cv_lib_bsd_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
- if test $ac_cv_lib_bsd_gettimeofday = yes; then
-   cat >>confdefs.h <<\EOF
-@@ -11190,14 +11537,14 @@
- 
- fi
- 
--echo "$as_me:11193: checking if -lm needed for math functions" >&5
-+echo "$as_me:11540: checking if -lm needed for math functions" >&5
- echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
- if test "${cf_cv_need_libm+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 11200 "configure"
-+#line 11547 "configure"
- #include "confdefs.h"
- 
- 	#include <stdio.h>
-@@ -11212,16 +11559,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11215: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11562: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11218: \$? = $ac_status" >&5
-+  echo "$as_me:11565: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11221: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11568: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11224: \$? = $ac_status" >&5
-+  echo "$as_me:11571: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_need_libm=no
- else
-@@ -11231,7 +11578,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:11234: result: $cf_cv_need_libm" >&5
-+echo "$as_me:11581: result: $cf_cv_need_libm" >&5
- echo "${ECHO_T}$cf_cv_need_libm" >&6
- if test "$cf_cv_need_libm" = yes
- then
-@@ -11239,13 +11586,13 @@
- fi
- 
- ###	Checks for header files.
--echo "$as_me:11242: checking for ANSI C header files" >&5
-+echo "$as_me:11589: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
- if test "${ac_cv_header_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11248 "configure"
-+#line 11595 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -11253,13 +11600,13 @@
- #include <float.h>
- 
- _ACEOF
--if { (eval echo "$as_me:11256: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:11603: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:11262: \$? = $ac_status" >&5
-+  echo "$as_me:11609: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -11281,7 +11628,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11284 "configure"
-+#line 11631 "configure"
- #include "confdefs.h"
- #include <string.h>
- 
-@@ -11299,7 +11646,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11302 "configure"
-+#line 11649 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- 
-@@ -11320,7 +11667,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11323 "configure"
-+#line 11670 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
-@@ -11346,15 +11693,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:11349: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11696: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11352: \$? = $ac_status" >&5
-+  echo "$as_me:11699: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:11354: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11701: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11357: \$? = $ac_status" >&5
-+  echo "$as_me:11704: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -11367,7 +11714,7 @@
- fi
- fi
- fi
--echo "$as_me:11370: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:11717: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -11380,13 +11727,13 @@
- ac_header_dirent=no
- for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
--echo "$as_me:11383: checking for $ac_hdr that defines DIR" >&5
-+echo "$as_me:11730: checking for $ac_hdr that defines DIR" >&5
- echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11389 "configure"
-+#line 11736 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$ac_hdr>
-@@ -11401,16 +11748,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11404: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11751: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11407: \$? = $ac_status" >&5
-+  echo "$as_me:11754: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11410: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11757: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11413: \$? = $ac_status" >&5
-+  echo "$as_me:11760: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -11420,7 +11767,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:11423: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:11770: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -11433,7 +11780,7 @@
- done
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
--  echo "$as_me:11436: checking for opendir in -ldir" >&5
-+  echo "$as_me:11783: checking for opendir in -ldir" >&5
- echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
- if test "${ac_cv_lib_dir_opendir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -11441,7 +11788,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldir  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 11444 "configure"
-+#line 11791 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -11460,16 +11807,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11463: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11810: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11466: \$? = $ac_status" >&5
-+  echo "$as_me:11813: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11469: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11816: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11472: \$? = $ac_status" >&5
-+  echo "$as_me:11819: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dir_opendir=yes
- else
-@@ -11480,14 +11827,14 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:11483: result: $ac_cv_lib_dir_opendir" >&5
-+echo "$as_me:11830: result: $ac_cv_lib_dir_opendir" >&5
- echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
- if test $ac_cv_lib_dir_opendir = yes; then
-   LIBS="$LIBS -ldir"
- fi
- 
- else
--  echo "$as_me:11490: checking for opendir in -lx" >&5
-+  echo "$as_me:11837: checking for opendir in -lx" >&5
- echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
- if test "${ac_cv_lib_x_opendir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -11495,7 +11842,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lx  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 11498 "configure"
-+#line 11845 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -11514,16 +11861,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11517: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11864: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11520: \$? = $ac_status" >&5
-+  echo "$as_me:11867: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11523: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11870: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11526: \$? = $ac_status" >&5
-+  echo "$as_me:11873: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_x_opendir=yes
- else
-@@ -11534,7 +11881,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:11537: result: $ac_cv_lib_x_opendir" >&5
-+echo "$as_me:11884: result: $ac_cv_lib_x_opendir" >&5
- echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
- if test $ac_cv_lib_x_opendir = yes; then
-   LIBS="$LIBS -lx"
-@@ -11542,13 +11889,13 @@
- 
- fi
- 
--echo "$as_me:11545: checking whether time.h and sys/time.h may both be included" >&5
-+echo "$as_me:11892: checking whether time.h and sys/time.h may both be included" >&5
- echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
- if test "${ac_cv_header_time+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11551 "configure"
-+#line 11898 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/time.h>
-@@ -11564,16 +11911,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11567: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11914: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11570: \$? = $ac_status" >&5
-+  echo "$as_me:11917: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11573: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11920: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11576: \$? = $ac_status" >&5
-+  echo "$as_me:11923: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_header_time=yes
- else
-@@ -11583,7 +11930,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:11586: result: $ac_cv_header_time" >&5
-+echo "$as_me:11933: result: $ac_cv_header_time" >&5
- echo "${ECHO_T}$ac_cv_header_time" >&6
- if test $ac_cv_header_time = yes; then
- 
-@@ -11593,14 +11940,14 @@
- 
- fi
- 
--echo "$as_me:11596: checking for regular-expression headers" >&5
-+echo "$as_me:11943: checking for regular-expression headers" >&5
- echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
- if test "${cf_cv_regex+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 11603 "configure"
-+#line 11950 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <regex.h>
-@@ -11618,16 +11965,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11621: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11968: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11624: \$? = $ac_status" >&5
-+  echo "$as_me:11971: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11627: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11974: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11630: \$? = $ac_status" >&5
-+  echo "$as_me:11977: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_regex="regex.h"
- else
-@@ -11635,7 +11982,7 @@
- cat conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 11638 "configure"
-+#line 11985 "configure"
- #include "confdefs.h"
- #include <regexp.h>
- int
-@@ -11650,16 +11997,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11653: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12000: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11656: \$? = $ac_status" >&5
-+  echo "$as_me:12003: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11659: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12006: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11662: \$? = $ac_status" >&5
-+  echo "$as_me:12009: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_regex="regexp.h"
- else
-@@ -11669,7 +12016,7 @@
- 		cf_save_LIBS="$LIBS"
- 		LIBS="-lgen $LIBS"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 11672 "configure"
-+#line 12019 "configure"
- #include "confdefs.h"
- #include <regexpr.h>
- int
-@@ -11684,16 +12031,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11687: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12034: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11690: \$? = $ac_status" >&5
-+  echo "$as_me:12037: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11693: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12040: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11696: \$? = $ac_status" >&5
-+  echo "$as_me:12043: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_regex="regexpr.h"
- else
-@@ -11709,7 +12056,7 @@
- 
- fi
- 
--echo "$as_me:11712: result: $cf_cv_regex" >&5
-+echo "$as_me:12059: result: $cf_cv_regex" >&5
- echo "${ECHO_T}$cf_cv_regex" >&6
- case $cf_cv_regex in
- 	regex.h)   cat >>confdefs.h <<\EOF
-@@ -11745,23 +12092,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:11748: checking for $ac_header" >&5
-+echo "$as_me:12095: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11754 "configure"
-+#line 12101 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:11758: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:12105: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:11764: \$? = $ac_status" >&5
-+  echo "$as_me:12111: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -11780,7 +12127,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:11783: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:12130: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -11794,7 +12141,7 @@
- # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
- if test "$ISC" = yes ; then
- 
--echo "$as_me:11797: checking for main in -lcposix" >&5
-+echo "$as_me:12144: checking for main in -lcposix" >&5
- echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
- if test "${ac_cv_lib_cposix_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -11802,7 +12149,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lcposix  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 11805 "configure"
-+#line 12152 "configure"
- #include "confdefs.h"
- 
- int
-@@ -11814,16 +12161,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11817: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12164: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11820: \$? = $ac_status" >&5
-+  echo "$as_me:12167: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11823: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12170: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11826: \$? = $ac_status" >&5
-+  echo "$as_me:12173: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_cposix_main=yes
- else
-@@ -11834,7 +12181,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:11837: result: $ac_cv_lib_cposix_main" >&5
-+echo "$as_me:12184: result: $ac_cv_lib_cposix_main" >&5
- echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
- if test $ac_cv_lib_cposix_main = yes; then
-   cat >>confdefs.h <<EOF
-@@ -11845,7 +12192,7 @@
- 
- fi
- 
--	echo "$as_me:11848: checking for bzero in -linet" >&5
-+	echo "$as_me:12195: checking for bzero in -linet" >&5
- echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
- if test "${ac_cv_lib_inet_bzero+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -11853,7 +12200,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-linet  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 11856 "configure"
-+#line 12203 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -11872,16 +12219,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11875: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12222: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11878: \$? = $ac_status" >&5
-+  echo "$as_me:12225: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11881: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12228: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11884: \$? = $ac_status" >&5
-+  echo "$as_me:12231: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_inet_bzero=yes
- else
-@@ -11892,21 +12239,21 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:11895: result: $ac_cv_lib_inet_bzero" >&5
-+echo "$as_me:12242: result: $ac_cv_lib_inet_bzero" >&5
- echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
- if test $ac_cv_lib_inet_bzero = yes; then
-   LIBS="$LIBS -linet"
- fi
- fi
- 
--echo "$as_me:11902: checking if sys/time.h works with sys/select.h" >&5
-+echo "$as_me:12249: checking if sys/time.h works with sys/select.h" >&5
- echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
- if test "${cf_cv_sys_time_select+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 11909 "configure"
-+#line 12256 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -11926,16 +12273,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11929: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12276: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11932: \$? = $ac_status" >&5
-+  echo "$as_me:12279: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11935: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12282: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11938: \$? = $ac_status" >&5
-+  echo "$as_me:12285: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sys_time_select=yes
- else
-@@ -11947,7 +12294,7 @@
- 
- fi
- 
--echo "$as_me:11950: result: $cf_cv_sys_time_select" >&5
-+echo "$as_me:12297: result: $cf_cv_sys_time_select" >&5
- echo "${ECHO_T}$cf_cv_sys_time_select" >&6
- test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF
- #define HAVE_SYS_TIME_SELECT 1
-@@ -11961,7 +12308,7 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ac_main_return=return
- 
--echo "$as_me:11964: checking for $CC option to accept ANSI C" >&5
-+echo "$as_me:12311: checking for $CC option to accept ANSI C" >&5
- echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
- if test "${ac_cv_prog_cc_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -11969,7 +12316,7 @@
-   ac_cv_prog_cc_stdc=no
- ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
--#line 11972 "configure"
-+#line 12319 "configure"
- #include "confdefs.h"
- #include <stdarg.h>
- #include <stdio.h>
-@@ -12018,16 +12365,16 @@
- do
-   CC="$ac_save_CC $ac_arg"
-   rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12021: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12368: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12024: \$? = $ac_status" >&5
-+  echo "$as_me:12371: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12027: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12374: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12030: \$? = $ac_status" >&5
-+  echo "$as_me:12377: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_prog_cc_stdc=$ac_arg
- break
-@@ -12044,21 +12391,21 @@
- 
- case "x$ac_cv_prog_cc_stdc" in
-   x|xno)
--    echo "$as_me:12047: result: none needed" >&5
-+    echo "$as_me:12394: result: none needed" >&5
- echo "${ECHO_T}none needed" >&6 ;;
-   *)
--    echo "$as_me:12050: result: $ac_cv_prog_cc_stdc" >&5
-+    echo "$as_me:12397: result: $ac_cv_prog_cc_stdc" >&5
- echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-     CC="$CC $ac_cv_prog_cc_stdc" ;;
- esac
- 
--echo "$as_me:12055: checking for an ANSI C-conforming const" >&5
-+echo "$as_me:12402: checking for an ANSI C-conforming const" >&5
- echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
- if test "${ac_cv_c_const+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12061 "configure"
-+#line 12408 "configure"
- #include "confdefs.h"
- 
- int
-@@ -12116,16 +12463,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12119: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12466: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12122: \$? = $ac_status" >&5
-+  echo "$as_me:12469: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12125: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12472: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12128: \$? = $ac_status" >&5
-+  echo "$as_me:12475: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_const=yes
- else
-@@ -12135,7 +12482,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:12138: result: $ac_cv_c_const" >&5
-+echo "$as_me:12485: result: $ac_cv_c_const" >&5
- echo "${ECHO_T}$ac_cv_c_const" >&6
- if test $ac_cv_c_const = no; then
- 
-@@ -12145,7 +12492,7 @@
- 
- fi
- 
--echo "$as_me:12148: checking for inline" >&5
-+echo "$as_me:12495: checking for inline" >&5
- echo $ECHO_N "checking for inline... $ECHO_C" >&6
- if test "${ac_cv_c_inline+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12153,7 +12500,7 @@
-   ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12156 "configure"
-+#line 12503 "configure"
- #include "confdefs.h"
- #ifndef __cplusplus
- static $ac_kw int static_foo () {return 0; }
-@@ -12162,16 +12509,16 @@
- 
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12165: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12512: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12168: \$? = $ac_status" >&5
-+  echo "$as_me:12515: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12171: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12518: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12174: \$? = $ac_status" >&5
-+  echo "$as_me:12521: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_inline=$ac_kw; break
- else
-@@ -12182,7 +12529,7 @@
- done
- 
- fi
--echo "$as_me:12185: result: $ac_cv_c_inline" >&5
-+echo "$as_me:12532: result: $ac_cv_c_inline" >&5
- echo "${ECHO_T}$ac_cv_c_inline" >&6
- case $ac_cv_c_inline in
-   inline | yes) ;;
-@@ -12205,7 +12552,7 @@
-     :
-   elif test "$GCC" = yes
-   then
--    echo "$as_me:12208: checking if gcc supports options to tune inlining" >&5
-+    echo "$as_me:12555: checking if gcc supports options to tune inlining" >&5
- echo $ECHO_N "checking if gcc supports options to tune inlining... $ECHO_C" >&6
- if test "${cf_cv_gcc_inline+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12214,7 +12561,7 @@
-       cf_save_CFLAGS=$CFLAGS
-       CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
-       cat >conftest.$ac_ext <<_ACEOF
--#line 12217 "configure"
-+#line 12564 "configure"
- #include "confdefs.h"
- inline int foo(void) { return 1; }
- int
-@@ -12226,16 +12573,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12229: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12576: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12232: \$? = $ac_status" >&5
-+  echo "$as_me:12579: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12235: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12582: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12238: \$? = $ac_status" >&5
-+  echo "$as_me:12585: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gcc_inline=yes
- else
-@@ -12247,7 +12594,7 @@
-       CFLAGS=$cf_save_CFLAGS
- 
- fi
--echo "$as_me:12250: result: $cf_cv_gcc_inline" >&5
-+echo "$as_me:12597: result: $cf_cv_gcc_inline" >&5
- echo "${ECHO_T}$cf_cv_gcc_inline" >&6
-     if test "$cf_cv_gcc_inline" = yes ; then
- 
-@@ -12323,7 +12670,7 @@
-   fi
- fi
- 
--echo "$as_me:12326: checking for signal global datatype" >&5
-+echo "$as_me:12673: checking for signal global datatype" >&5
- echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
- if test "${cf_cv_sig_atomic_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12335,7 +12682,7 @@
- 		"int"
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 12338 "configure"
-+#line 12685 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -12358,16 +12705,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12361: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12708: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12364: \$? = $ac_status" >&5
-+  echo "$as_me:12711: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12367: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12714: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12370: \$? = $ac_status" >&5
-+  echo "$as_me:12717: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sig_atomic_t=$cf_type
- else
-@@ -12381,7 +12728,7 @@
- 
- fi
- 
--echo "$as_me:12384: result: $cf_cv_sig_atomic_t" >&5
-+echo "$as_me:12731: result: $cf_cv_sig_atomic_t" >&5
- echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
- test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <<EOF
- #define SIG_ATOMIC_T $cf_cv_sig_atomic_t
-@@ -12389,7 +12736,7 @@
- 
- if test $NCURSES_CHTYPE = auto ; then
- 
--echo "$as_me:12392: checking for type of chtype" >&5
-+echo "$as_me:12739: checking for type of chtype" >&5
- echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
- if test "${cf_cv_typeof_chtype+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12399,7 +12746,7 @@
-   cf_cv_typeof_chtype=long
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12402 "configure"
-+#line 12749 "configure"
- #include "confdefs.h"
- 
- #define WANT_BITS 31
-@@ -12434,15 +12781,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:12437: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12784: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12440: \$? = $ac_status" >&5
-+  echo "$as_me:12787: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:12442: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12789: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12445: \$? = $ac_status" >&5
-+  echo "$as_me:12792: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_typeof_chtype=`cat cf_test.out`
- else
-@@ -12457,7 +12804,7 @@
- 
- fi
- 
--echo "$as_me:12460: result: $cf_cv_typeof_chtype" >&5
-+echo "$as_me:12807: result: $cf_cv_typeof_chtype" >&5
- echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
- 
- cat >>confdefs.h <<EOF
-@@ -12469,14 +12816,14 @@
- fi
- test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
- 
--echo "$as_me:12472: checking if unsigned literals are legal" >&5
-+echo "$as_me:12819: checking if unsigned literals are legal" >&5
- echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
- if test "${cf_cv_unsigned_literals+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 12479 "configure"
-+#line 12826 "configure"
- #include "confdefs.h"
- 
- int
-@@ -12488,16 +12835,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12491: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12838: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12494: \$? = $ac_status" >&5
-+  echo "$as_me:12841: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12497: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12844: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12500: \$? = $ac_status" >&5
-+  echo "$as_me:12847: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_unsigned_literals=yes
- else
-@@ -12509,7 +12856,7 @@
- 
- fi
- 
--echo "$as_me:12512: result: $cf_cv_unsigned_literals" >&5
-+echo "$as_me:12859: result: $cf_cv_unsigned_literals" >&5
- echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
- 
- cf_cv_1UL="1"
-@@ -12525,14 +12872,14 @@
- 
- ###	Checks for external-data
- 
--echo "$as_me:12528: checking if external errno is declared" >&5
-+echo "$as_me:12875: checking if external errno is declared" >&5
- echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
- if test "${cf_cv_dcl_errno+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-     cat >conftest.$ac_ext <<_ACEOF
--#line 12535 "configure"
-+#line 12882 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_STDLIB_H
-@@ -12550,16 +12897,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12553: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12900: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12556: \$? = $ac_status" >&5
-+  echo "$as_me:12903: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12559: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12906: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12562: \$? = $ac_status" >&5
-+  echo "$as_me:12909: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_dcl_errno=yes
- else
-@@ -12570,7 +12917,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:12573: result: $cf_cv_dcl_errno" >&5
-+echo "$as_me:12920: result: $cf_cv_dcl_errno" >&5
- echo "${ECHO_T}$cf_cv_dcl_errno" >&6
- 
- if test "$cf_cv_dcl_errno" = no ; then
-@@ -12585,14 +12932,14 @@
- 
- # It's possible (for near-UNIX clones) that the data doesn't exist
- 
--echo "$as_me:12588: checking if external errno exists" >&5
-+echo "$as_me:12935: checking if external errno exists" >&5
- echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
- if test "${cf_cv_have_errno+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-     cat >conftest.$ac_ext <<_ACEOF
--#line 12595 "configure"
-+#line 12942 "configure"
- #include "confdefs.h"
- 
- #undef errno
-@@ -12607,16 +12954,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12610: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12957: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12613: \$? = $ac_status" >&5
-+  echo "$as_me:12960: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12616: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12963: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12619: \$? = $ac_status" >&5
-+  echo "$as_me:12966: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_errno=yes
- else
-@@ -12627,7 +12974,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:12630: result: $cf_cv_have_errno" >&5
-+echo "$as_me:12977: result: $cf_cv_have_errno" >&5
- echo "${ECHO_T}$cf_cv_have_errno" >&6
- 
- if test "$cf_cv_have_errno" = yes ; then
-@@ -12640,7 +12987,7 @@
- 
- fi
- 
--echo "$as_me:12643: checking if data-only library module links" >&5
-+echo "$as_me:12990: checking if data-only library module links" >&5
- echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
- if test "${cf_cv_link_dataonly+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12648,20 +12995,20 @@
- 
- 	rm -f conftest.a
- 	cat >conftest.$ac_ext <<EOF
--#line 12651 "configure"
-+#line 12998 "configure"
- int	testdata[3] = { 123, 456, 789 };
- EOF
--	if { (eval echo "$as_me:12654: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:13001: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12657: \$? = $ac_status" >&5
-+  echo "$as_me:13004: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		mv conftest.o data.o && \
--		( $AR $AR_OPTS conftest.a data.o ) 2>&5 1>/dev/null
-+		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
- 	fi
- 	rm -f conftest.$ac_ext data.o
- 	cat >conftest.$ac_ext <<EOF
--#line 12664 "configure"
-+#line 13011 "configure"
- int	testfunc()
- {
- #if defined(NeXT)
-@@ -12674,13 +13021,13 @@
- #endif
- }
- EOF
--	if { (eval echo "$as_me:12677: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:13024: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12680: \$? = $ac_status" >&5
-+  echo "$as_me:13027: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
- 		mv conftest.o func.o && \
--		( $AR $AR_OPTS conftest.a func.o ) 2>&5 1>/dev/null
-+		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
- 	fi
- 	rm -f conftest.$ac_ext func.o
- 	( eval $RANLIB conftest.a ) 2>&5 >/dev/null
-@@ -12690,7 +13037,7 @@
-   cf_cv_link_dataonly=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12693 "configure"
-+#line 13040 "configure"
- #include "confdefs.h"
- 
- 	int main()
-@@ -12701,15 +13048,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:12704: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13051: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12707: \$? = $ac_status" >&5
-+  echo "$as_me:13054: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:12709: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13056: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12712: \$? = $ac_status" >&5
-+  echo "$as_me:13059: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_link_dataonly=yes
- else
-@@ -12724,7 +13071,7 @@
- 
- fi
- 
--echo "$as_me:12727: result: $cf_cv_link_dataonly" >&5
-+echo "$as_me:13074: result: $cf_cv_link_dataonly" >&5
- echo "${ECHO_T}$cf_cv_link_dataonly" >&6
- 
- if test "$cf_cv_link_dataonly" = no ; then
-@@ -12759,13 +13106,13 @@
- 
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:12762: checking for $ac_func" >&5
-+echo "$as_me:13109: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12768 "configure"
-+#line 13115 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -12796,16 +13143,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12799: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13146: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12802: \$? = $ac_status" >&5
-+  echo "$as_me:13149: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12805: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13152: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12808: \$? = $ac_status" >&5
-+  echo "$as_me:13155: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -12815,7 +13162,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:12818: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:13165: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -12827,14 +13174,14 @@
- 
- if test "$with_getcap" = "yes" ; then
- 
--echo "$as_me:12830: checking for terminal-capability database functions" >&5
-+echo "$as_me:13177: checking for terminal-capability database functions" >&5
- echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
- if test "${cf_cv_cgetent+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 12837 "configure"
-+#line 13184 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -12854,16 +13201,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12857: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13204: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12860: \$? = $ac_status" >&5
-+  echo "$as_me:13207: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12863: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13210: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12866: \$? = $ac_status" >&5
-+  echo "$as_me:13213: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cgetent=yes
- else
-@@ -12875,7 +13222,7 @@
- 
- fi
- 
--echo "$as_me:12878: result: $cf_cv_cgetent" >&5
-+echo "$as_me:13225: result: $cf_cv_cgetent" >&5
- echo "${ECHO_T}$cf_cv_cgetent" >&6
- test "$cf_cv_cgetent" = yes && cat >>confdefs.h <<\EOF
- #define HAVE_BSD_CGETENT 1
-@@ -12883,14 +13230,14 @@
- 
- fi
- 
--echo "$as_me:12886: checking for isascii" >&5
-+echo "$as_me:13233: checking for isascii" >&5
- echo $ECHO_N "checking for isascii... $ECHO_C" >&6
- if test "${cf_cv_have_isascii+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 12893 "configure"
-+#line 13240 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- int
-@@ -12902,16 +13249,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12905: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13252: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12908: \$? = $ac_status" >&5
-+  echo "$as_me:13255: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12911: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13258: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12914: \$? = $ac_status" >&5
-+  echo "$as_me:13261: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_isascii=yes
- else
-@@ -12922,17 +13269,17 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:12925: result: $cf_cv_have_isascii" >&5
-+echo "$as_me:13272: result: $cf_cv_have_isascii" >&5
- echo "${ECHO_T}$cf_cv_have_isascii" >&6
- test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF
- #define HAVE_ISASCII 1
- EOF
- 
- if test "$ac_cv_func_sigaction" = yes; then
--echo "$as_me:12932: checking whether sigaction needs _POSIX_SOURCE" >&5
-+echo "$as_me:13279: checking whether sigaction needs _POSIX_SOURCE" >&5
- echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 12935 "configure"
-+#line 13282 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -12946,16 +13293,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12949: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13296: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12952: \$? = $ac_status" >&5
-+  echo "$as_me:13299: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12955: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13302: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12958: \$? = $ac_status" >&5
-+  echo "$as_me:13305: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=no
- else
-@@ -12963,7 +13310,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 12966 "configure"
-+#line 13313 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -12978,16 +13325,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12981: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13328: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12984: \$? = $ac_status" >&5
-+  echo "$as_me:13331: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12987: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13334: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12990: \$? = $ac_status" >&5
-+  echo "$as_me:13337: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=yes
- 	 cat >>confdefs.h <<\EOF
-@@ -13002,11 +13349,11 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:13005: result: $sigact_bad" >&5
-+echo "$as_me:13352: result: $sigact_bad" >&5
- echo "${ECHO_T}$sigact_bad" >&6
- fi
- 
--echo "$as_me:13009: checking if nanosleep really works" >&5
-+echo "$as_me:13356: checking if nanosleep really works" >&5
- echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
- if test "${cf_cv_func_nanosleep+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13016,7 +13363,7 @@
-   cf_cv_func_nanosleep=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13019 "configure"
-+#line 13366 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -13041,15 +13388,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:13044: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13391: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13047: \$? = $ac_status" >&5
-+  echo "$as_me:13394: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:13049: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13396: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13052: \$? = $ac_status" >&5
-+  echo "$as_me:13399: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_nanosleep=yes
- else
-@@ -13061,7 +13408,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:13064: result: $cf_cv_func_nanosleep" >&5
-+echo "$as_me:13411: result: $cf_cv_func_nanosleep" >&5
- echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
- 
- test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF
-@@ -13075,23 +13422,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:13078: checking for $ac_header" >&5
-+echo "$as_me:13425: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13084 "configure"
-+#line 13431 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:13088: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13435: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:13094: \$? = $ac_status" >&5
-+  echo "$as_me:13441: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13110,7 +13457,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:13113: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:13460: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -13125,23 +13472,23 @@
- for ac_header in sys/termio.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:13128: checking for $ac_header" >&5
-+echo "$as_me:13475: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13134 "configure"
-+#line 13481 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:13138: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13485: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:13144: \$? = $ac_status" >&5
-+  echo "$as_me:13491: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13160,7 +13507,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:13163: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:13510: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -13178,10 +13525,10 @@
- 	*)	termios_bad=maybe ;;
- 	esac
- 	if test "$termios_bad" = maybe ; then
--	echo "$as_me:13181: checking whether termios.h needs _POSIX_SOURCE" >&5
-+	echo "$as_me:13528: checking whether termios.h needs _POSIX_SOURCE" >&5
- echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 13184 "configure"
-+#line 13531 "configure"
- #include "confdefs.h"
- #include <termios.h>
- int
-@@ -13193,16 +13540,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13196: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13543: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13199: \$? = $ac_status" >&5
-+  echo "$as_me:13546: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13202: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13549: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13205: \$? = $ac_status" >&5
-+  echo "$as_me:13552: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=no
- else
-@@ -13210,7 +13557,7 @@
- cat conftest.$ac_ext >&5
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 13213 "configure"
-+#line 13560 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -13224,16 +13571,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13227: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13574: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13230: \$? = $ac_status" >&5
-+  echo "$as_me:13577: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13233: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13580: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13236: \$? = $ac_status" >&5
-+  echo "$as_me:13583: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=unknown
- else
-@@ -13248,19 +13595,19 @@
- 
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:13251: result: $termios_bad" >&5
-+	echo "$as_me:13598: result: $termios_bad" >&5
- echo "${ECHO_T}$termios_bad" >&6
- 	fi
- fi
- 
--echo "$as_me:13256: checking for tcgetattr" >&5
-+echo "$as_me:13603: checking for tcgetattr" >&5
- echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
- if test "${cf_cv_have_tcgetattr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 13263 "configure"
-+#line 13610 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -13288,16 +13635,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13291: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13638: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13294: \$? = $ac_status" >&5
-+  echo "$as_me:13641: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13297: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13644: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13300: \$? = $ac_status" >&5
-+  echo "$as_me:13647: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_tcgetattr=yes
- else
-@@ -13307,20 +13654,20 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:13310: result: $cf_cv_have_tcgetattr" >&5
-+echo "$as_me:13657: result: $cf_cv_have_tcgetattr" >&5
- echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
- test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF
- #define HAVE_TCGETATTR 1
- EOF
- 
--echo "$as_me:13316: checking for vsscanf function or workaround" >&5
-+echo "$as_me:13663: checking for vsscanf function or workaround" >&5
- echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
- if test "${cf_cv_func_vsscanf+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 13323 "configure"
-+#line 13670 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -13336,16 +13683,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13339: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13686: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13342: \$? = $ac_status" >&5
-+  echo "$as_me:13689: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13345: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13692: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13348: \$? = $ac_status" >&5
-+  echo "$as_me:13695: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vsscanf
- else
-@@ -13353,7 +13700,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 13356 "configure"
-+#line 13703 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -13375,16 +13722,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13378: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13725: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13381: \$? = $ac_status" >&5
-+  echo "$as_me:13728: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13384: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13731: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13387: \$? = $ac_status" >&5
-+  echo "$as_me:13734: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vfscanf
- else
-@@ -13392,7 +13739,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 13395 "configure"
-+#line 13742 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -13414,16 +13761,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13417: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13764: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13420: \$? = $ac_status" >&5
-+  echo "$as_me:13767: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13423: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13770: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13426: \$? = $ac_status" >&5
-+  echo "$as_me:13773: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=_doscan
- else
-@@ -13438,7 +13785,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:13441: result: $cf_cv_func_vsscanf" >&5
-+echo "$as_me:13788: result: $cf_cv_func_vsscanf" >&5
- echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
- 
- case $cf_cv_func_vsscanf in #(vi
-@@ -13456,7 +13803,7 @@
- ;;
- esac
- 
--echo "$as_me:13459: checking for working mkstemp" >&5
-+echo "$as_me:13806: checking for working mkstemp" >&5
- echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
- if test "${cf_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13464,13 +13811,13 @@
- 
- rm -f conftest*
- if test "$cross_compiling" = yes; then
--  echo "$as_me:13467: checking for mkstemp" >&5
-+  echo "$as_me:13814: checking for mkstemp" >&5
- echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
- if test "${ac_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13473 "configure"
-+#line 13820 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char mkstemp (); below.  */
-@@ -13501,16 +13848,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13504: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13851: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13507: \$? = $ac_status" >&5
-+  echo "$as_me:13854: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13510: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13857: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13513: \$? = $ac_status" >&5
-+  echo "$as_me:13860: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_mkstemp=yes
- else
-@@ -13520,12 +13867,12 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:13523: result: $ac_cv_func_mkstemp" >&5
-+echo "$as_me:13870: result: $ac_cv_func_mkstemp" >&5
- echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13528 "configure"
-+#line 13875 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -13563,15 +13910,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:13566: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13913: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13569: \$? = $ac_status" >&5
-+  echo "$as_me:13916: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:13571: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13918: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13574: \$? = $ac_status" >&5
-+  echo "$as_me:13921: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_mkstemp=yes
- 
-@@ -13586,7 +13933,7 @@
- fi
- 
- fi
--echo "$as_me:13589: result: $cf_cv_func_mkstemp" >&5
-+echo "$as_me:13936: result: $cf_cv_func_mkstemp" >&5
- echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
- if test "$cf_cv_func_mkstemp" = yes ; then
- 	cat >>confdefs.h <<\EOF
-@@ -13604,21 +13951,21 @@
- fi
- 
- if test "$cross_compiling" = yes ; then
--	{ echo "$as_me:13607: WARNING: cross compiling: assume setvbuf params not reversed" >&5
-+	{ echo "$as_me:13954: WARNING: cross compiling: assume setvbuf params not reversed" >&5
- echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
- else
--	echo "$as_me:13610: checking whether setvbuf arguments are reversed" >&5
-+	echo "$as_me:13957: checking whether setvbuf arguments are reversed" >&5
- echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
- if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:13616: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:13963: error: cannot run test program while cross compiling" >&5
- echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13621 "configure"
-+#line 13968 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- /* If setvbuf has the reversed format, exit 0. */
-@@ -13635,15 +13982,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:13638: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13985: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13641: \$? = $ac_status" >&5
-+  echo "$as_me:13988: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:13643: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13990: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13646: \$? = $ac_status" >&5
-+  echo "$as_me:13993: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_setvbuf_reversed=yes
- else
-@@ -13656,7 +14003,7 @@
- fi
- rm -f core core.* *.core
- fi
--echo "$as_me:13659: result: $ac_cv_func_setvbuf_reversed" >&5
-+echo "$as_me:14006: result: $ac_cv_func_setvbuf_reversed" >&5
- echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
- if test $ac_cv_func_setvbuf_reversed = yes; then
- 
-@@ -13667,13 +14014,13 @@
- fi
- 
- fi
--echo "$as_me:13670: checking return type of signal handlers" >&5
-+echo "$as_me:14017: checking return type of signal handlers" >&5
- echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
- if test "${ac_cv_type_signal+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13676 "configure"
-+#line 14023 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <signal.h>
-@@ -13695,16 +14042,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13698: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14045: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13701: \$? = $ac_status" >&5
-+  echo "$as_me:14048: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13704: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14051: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13707: \$? = $ac_status" >&5
-+  echo "$as_me:14054: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_signal=void
- else
-@@ -13714,21 +14061,21 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:13717: result: $ac_cv_type_signal" >&5
-+echo "$as_me:14064: result: $ac_cv_type_signal" >&5
- echo "${ECHO_T}$ac_cv_type_signal" >&6
- 
- cat >>confdefs.h <<EOF
- #define RETSIGTYPE $ac_cv_type_signal
- EOF
- 
--echo "$as_me:13724: checking for type sigaction_t" >&5
-+echo "$as_me:14071: checking for type sigaction_t" >&5
- echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
- if test "${cf_cv_type_sigaction+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 13731 "configure"
-+#line 14078 "configure"
- #include "confdefs.h"
- 
- #include <signal.h>
-@@ -13741,16 +14088,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13744: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14091: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13747: \$? = $ac_status" >&5
-+  echo "$as_me:14094: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13750: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14097: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13753: \$? = $ac_status" >&5
-+  echo "$as_me:14100: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_sigaction=yes
- else
-@@ -13761,13 +14108,13 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--echo "$as_me:13764: result: $cf_cv_type_sigaction" >&5
-+echo "$as_me:14111: result: $cf_cv_type_sigaction" >&5
- echo "${ECHO_T}$cf_cv_type_sigaction" >&6
- test "$cf_cv_type_sigaction" = yes && cat >>confdefs.h <<\EOF
- #define HAVE_TYPE_SIGACTION 1
- EOF
- 
--echo "$as_me:13770: checking declaration of size-change" >&5
-+echo "$as_me:14117: checking declaration of size-change" >&5
- echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
- if test "${cf_cv_sizechange+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13782,7 +14129,7 @@
-     CPPFLAGS="$cf_save_CPPFLAGS"
-     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
-     cat >conftest.$ac_ext <<_ACEOF
--#line 13785 "configure"
-+#line 14132 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #ifdef HAVE_TERMIOS_H
-@@ -13826,16 +14173,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13829: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14176: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13832: \$? = $ac_status" >&5
-+  echo "$as_me:14179: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13835: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14182: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13838: \$? = $ac_status" >&5
-+  echo "$as_me:14185: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sizechange=yes
- else
-@@ -13854,7 +14201,7 @@
- done
- 
- fi
--echo "$as_me:13857: result: $cf_cv_sizechange" >&5
-+echo "$as_me:14204: result: $cf_cv_sizechange" >&5
- echo "${ECHO_T}$cf_cv_sizechange" >&6
- if test "$cf_cv_sizechange" != no ; then
- 	cat >>confdefs.h <<\EOF
-@@ -13871,13 +14218,13 @@
- 	esac
- fi
- 
--echo "$as_me:13874: checking for memmove" >&5
-+echo "$as_me:14221: checking for memmove" >&5
- echo $ECHO_N "checking for memmove... $ECHO_C" >&6
- if test "${ac_cv_func_memmove+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13880 "configure"
-+#line 14227 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char memmove (); below.  */
-@@ -13908,16 +14255,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13911: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14258: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13914: \$? = $ac_status" >&5
-+  echo "$as_me:14261: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13917: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14264: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13920: \$? = $ac_status" >&5
-+  echo "$as_me:14267: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_memmove=yes
- else
-@@ -13927,19 +14274,19 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:13930: result: $ac_cv_func_memmove" >&5
-+echo "$as_me:14277: result: $ac_cv_func_memmove" >&5
- echo "${ECHO_T}$ac_cv_func_memmove" >&6
- if test $ac_cv_func_memmove = yes; then
-   :
- else
- 
--echo "$as_me:13936: checking for bcopy" >&5
-+echo "$as_me:14283: checking for bcopy" >&5
- echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
- if test "${ac_cv_func_bcopy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13942 "configure"
-+#line 14289 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char bcopy (); below.  */
-@@ -13970,16 +14317,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13973: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14320: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13976: \$? = $ac_status" >&5
-+  echo "$as_me:14323: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13979: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14326: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13982: \$? = $ac_status" >&5
-+  echo "$as_me:14329: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_bcopy=yes
- else
-@@ -13989,11 +14336,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:13992: result: $ac_cv_func_bcopy" >&5
-+echo "$as_me:14339: result: $ac_cv_func_bcopy" >&5
- echo "${ECHO_T}$ac_cv_func_bcopy" >&6
- if test $ac_cv_func_bcopy = yes; then
- 
--	echo "$as_me:13996: checking if bcopy does overlapping moves" >&5
-+	echo "$as_me:14343: checking if bcopy does overlapping moves" >&5
- echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
- if test "${cf_cv_good_bcopy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14003,7 +14350,7 @@
-   cf_cv_good_bcopy=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14006 "configure"
-+#line 14353 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -14017,15 +14364,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:14020: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14367: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14023: \$? = $ac_status" >&5
-+  echo "$as_me:14370: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:14025: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14372: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14028: \$? = $ac_status" >&5
-+  echo "$as_me:14375: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_good_bcopy=yes
- else
-@@ -14038,7 +14385,7 @@
- fi
- 
- fi
--echo "$as_me:14041: result: $cf_cv_good_bcopy" >&5
-+echo "$as_me:14388: result: $cf_cv_good_bcopy" >&5
- echo "${ECHO_T}$cf_cv_good_bcopy" >&6
- 
- else
-@@ -14059,7 +14406,7 @@
- 
- fi
- 
--echo "$as_me:14062: checking if poll really works" >&5
-+echo "$as_me:14409: checking if poll really works" >&5
- echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
- if test "${cf_cv_working_poll+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14069,7 +14416,7 @@
-   cf_cv_working_poll=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14072 "configure"
-+#line 14419 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -14090,15 +14437,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:14093: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14440: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14096: \$? = $ac_status" >&5
-+  echo "$as_me:14443: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:14098: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14445: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14101: \$? = $ac_status" >&5
-+  echo "$as_me:14448: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_working_poll=yes
- else
-@@ -14110,7 +14457,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:14113: result: $cf_cv_working_poll" >&5
-+echo "$as_me:14460: result: $cf_cv_working_poll" >&5
- echo "${ECHO_T}$cf_cv_working_poll" >&6
- test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF
- #define HAVE_WORKING_POLL 1
-@@ -14118,7 +14465,7 @@
- 
- # special check for test/ditto.c
- 
--echo "$as_me:14121: checking for openpty in -lutil" >&5
-+echo "$as_me:14468: checking for openpty in -lutil" >&5
- echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
- if test "${ac_cv_lib_util_openpty+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14126,7 +14473,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lutil  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14129 "configure"
-+#line 14476 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14145,16 +14492,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14148: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14495: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14151: \$? = $ac_status" >&5
-+  echo "$as_me:14498: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14154: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14501: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14157: \$? = $ac_status" >&5
-+  echo "$as_me:14504: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_util_openpty=yes
- else
-@@ -14165,7 +14512,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14168: result: $ac_cv_lib_util_openpty" >&5
-+echo "$as_me:14515: result: $ac_cv_lib_util_openpty" >&5
- echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
- if test $ac_cv_lib_util_openpty = yes; then
-   cf_cv_lib_util=yes
-@@ -14173,7 +14520,7 @@
-   cf_cv_lib_util=no
- fi
- 
--echo "$as_me:14176: checking for openpty header" >&5
-+echo "$as_me:14523: checking for openpty header" >&5
- echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
- if test "${cf_cv_func_openpty+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14184,7 +14531,7 @@
-     for cf_header in pty.h libutil.h util.h
-     do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 14187 "configure"
-+#line 14534 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -14201,16 +14548,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14204: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14551: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14207: \$? = $ac_status" >&5
-+  echo "$as_me:14554: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14210: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14557: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14213: \$? = $ac_status" >&5
-+  echo "$as_me:14560: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
-         cf_cv_func_openpty=$cf_header
-@@ -14228,7 +14575,7 @@
-     LIBS="$cf_save_LIBS"
- 
- fi
--echo "$as_me:14231: result: $cf_cv_func_openpty" >&5
-+echo "$as_me:14578: result: $cf_cv_func_openpty" >&5
- echo "${ECHO_T}$cf_cv_func_openpty" >&6
- 
- if test "$cf_cv_func_openpty" != no ; then
-@@ -14274,13 +14621,13 @@
- 		fi
- 
- 		if test "$cf_have_incdir" = no ; then
--          if test "$cf_add_incdir" = /usr/local/include ; then
-+		  if test "$cf_add_incdir" = /usr/local/include ; then
- 			if test "$GCC" = yes
- 			then
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 14283 "configure"
-+#line 14630 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -14292,16 +14639,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14295: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14642: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14298: \$? = $ac_status" >&5
-+  echo "$as_me:14645: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14301: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14648: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14304: \$? = $ac_status" >&5
-+  echo "$as_me:14651: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -14318,13 +14665,13 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me-configure}:14321: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me-configure}:14668: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
- 
--          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
--          test "$cf_top_incdir" = "$cf_add_incdir" && break
--          cf_add_incdir="$cf_top_incdir"
-+		  cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
-+		  test "$cf_top_incdir" = "$cf_add_incdir" && break
-+		  cf_add_incdir="$cf_top_incdir"
- 		else
- 		  break
- 		fi
-@@ -14352,7 +14699,7 @@
-       if test "$cf_have_libdir" = no ; then
-         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me-configure}:14355: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me-configure}:14702: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
-         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-       fi
-@@ -14363,23 +14710,23 @@
-     fi
- esac
- 
--echo "$as_me:14366: checking for db.h" >&5
-+echo "$as_me:14713: checking for db.h" >&5
- echo $ECHO_N "checking for db.h... $ECHO_C" >&6
- if test "${ac_cv_header_db_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14372 "configure"
-+#line 14719 "configure"
- #include "confdefs.h"
- #include <db.h>
- _ACEOF
--if { (eval echo "$as_me:14376: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:14723: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:14382: \$? = $ac_status" >&5
-+  echo "$as_me:14729: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -14398,11 +14745,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:14401: result: $ac_cv_header_db_h" >&5
-+echo "$as_me:14748: result: $ac_cv_header_db_h" >&5
- echo "${ECHO_T}$ac_cv_header_db_h" >&6
- if test $ac_cv_header_db_h = yes; then
- 
--echo "$as_me:14405: checking for version of db" >&5
-+echo "$as_me:14752: checking for version of db" >&5
- echo $ECHO_N "checking for version of db... $ECHO_C" >&6
- if test "${cf_cv_hashed_db_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14413,10 +14760,10 @@
- for cf_db_version in 1 2 3 4 5
- do
- 
--echo "${as_me-configure}:14416: testing checking for db version $cf_db_version ..." 1>&5
-+echo "${as_me-configure}:14763: testing checking for db version $cf_db_version ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14419 "configure"
-+#line 14766 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -14446,16 +14793,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14449: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14796: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14452: \$? = $ac_status" >&5
-+  echo "$as_me:14799: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14455: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14802: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14458: \$? = $ac_status" >&5
-+  echo "$as_me:14805: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_hashed_db_version=$cf_db_version
-@@ -14469,16 +14816,16 @@
- done
- 
- fi
--echo "$as_me:14472: result: $cf_cv_hashed_db_version" >&5
-+echo "$as_me:14819: result: $cf_cv_hashed_db_version" >&5
- echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
- 
- if test "$cf_cv_hashed_db_version" = unknown ; then
--	{ { echo "$as_me:14476: error: Cannot determine version of db" >&5
-+	{ { echo "$as_me:14823: error: Cannot determine version of db" >&5
- echo "$as_me: error: Cannot determine version of db" >&2;}
-    { (exit 1); exit 1; }; }
- else
- 
--echo "$as_me:14481: checking for db libraries" >&5
-+echo "$as_me:14828: checking for db libraries" >&5
- echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
- if test "${cf_cv_hashed_db_libs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14492,10 +14839,10 @@
- 		LIBS="-l$cf_db_libs $LIBS"
- 	fi
- 
--echo "${as_me-configure}:14495: testing checking for library "$cf_db_libs" ..." 1>&5
-+echo "${as_me-configure}:14842: testing checking for library "$cf_db_libs" ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14498 "configure"
-+#line 14845 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -14550,16 +14897,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14553: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14900: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14556: \$? = $ac_status" >&5
-+  echo "$as_me:14903: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14559: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14906: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14562: \$? = $ac_status" >&5
-+  echo "$as_me:14909: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	if test -n "$cf_db_libs" ; then
-@@ -14579,11 +14926,11 @@
- done
- 
- fi
--echo "$as_me:14582: result: $cf_cv_hashed_db_libs" >&5
-+echo "$as_me:14929: result: $cf_cv_hashed_db_libs" >&5
- echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
- 
- 	if test "$cf_cv_hashed_db_libs" = unknown ; then
--		{ { echo "$as_me:14586: error: Cannot determine library for db" >&5
-+		{ { echo "$as_me:14933: error: Cannot determine library for db" >&5
- echo "$as_me: error: Cannot determine library for db" >&2;}
-    { (exit 1); exit 1; }; }
- 	elif test "$cf_cv_hashed_db_libs" != default ; then
-@@ -14593,7 +14940,7 @@
- 
- else
- 
--	{ { echo "$as_me:14596: error: Cannot find db.h" >&5
-+	{ { echo "$as_me:14943: error: Cannot find db.h" >&5
- echo "$as_me: error: Cannot find db.h" >&2;}
-    { (exit 1); exit 1; }; }
- 
-@@ -14608,7 +14955,7 @@
- 
- # Just in case, check if the C compiler has a bool type.
- 
--echo "$as_me:14611: checking if we should include stdbool.h" >&5
-+echo "$as_me:14958: checking if we should include stdbool.h" >&5
- echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
- 
- if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -14616,7 +14963,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14619 "configure"
-+#line 14966 "configure"
- #include "confdefs.h"
- 
- int
-@@ -14628,23 +14975,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14631: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14978: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14634: \$? = $ac_status" >&5
-+  echo "$as_me:14981: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14637: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14984: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14640: \$? = $ac_status" >&5
-+  echo "$as_me:14987: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=0
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 14647 "configure"
-+#line 14994 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -14660,16 +15007,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14663: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15010: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14666: \$? = $ac_status" >&5
-+  echo "$as_me:15013: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14669: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15016: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14672: \$? = $ac_status" >&5
-+  echo "$as_me:15019: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -14683,13 +15030,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:14686: result: yes" >&5
-+then	echo "$as_me:15033: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:14688: result: no" >&5
-+else	echo "$as_me:15035: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:14692: checking for builtin bool type" >&5
-+echo "$as_me:15039: checking for builtin bool type" >&5
- echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
- 
- if test "${cf_cv_cc_bool_type+set}" = set; then
-@@ -14697,7 +15044,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14700 "configure"
-+#line 15047 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -14712,16 +15059,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14715: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15062: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14718: \$? = $ac_status" >&5
-+  echo "$as_me:15065: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14721: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15068: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14724: \$? = $ac_status" >&5
-+  echo "$as_me:15071: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cc_bool_type=1
- else
-@@ -14734,9 +15081,9 @@
- fi
- 
- if test "$cf_cv_cc_bool_type" = 1
--then	echo "$as_me:14737: result: yes" >&5
-+then	echo "$as_me:15084: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:14739: result: no" >&5
-+else	echo "$as_me:15086: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -14758,7 +15105,7 @@
- 	cf_stdcpp_libname=stdc++
- 	;;
- esac
--echo "$as_me:14761: checking for library $cf_stdcpp_libname" >&5
-+echo "$as_me:15108: checking for library $cf_stdcpp_libname" >&5
- echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
- if test "${cf_cv_libstdcpp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14767,7 +15114,7 @@
- 	cf_save="$LIBS"
- 	LIBS="$LIBS -l$cf_stdcpp_libname"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14770 "configure"
-+#line 15117 "configure"
- #include "confdefs.h"
- 
- #include <strstream.h>
-@@ -14783,16 +15130,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14786: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15133: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14789: \$? = $ac_status" >&5
-+  echo "$as_me:15136: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14792: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15139: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14795: \$? = $ac_status" >&5
-+  echo "$as_me:15142: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_libstdcpp=yes
- else
-@@ -14804,12 +15151,12 @@
- 	LIBS="$cf_save"
- 
- fi
--echo "$as_me:14807: result: $cf_cv_libstdcpp" >&5
-+echo "$as_me:15154: result: $cf_cv_libstdcpp" >&5
- echo "${ECHO_T}$cf_cv_libstdcpp" >&6
- test "$cf_cv_libstdcpp" = yes && CXXLIBS="$CXXLIBS -l$cf_stdcpp_libname"
- fi
- 
--	echo "$as_me:14812: checking whether $CXX understands -c and -o together" >&5
-+	echo "$as_me:15159: checking whether $CXX understands -c and -o together" >&5
- echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
- if test "${cf_cv_prog_CXX_c_o+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14825,15 +15172,15 @@
- # We do the test twice because some compilers refuse to overwrite an
- # existing .o file with -o, though they will create one.
- ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
--if { (eval echo "$as_me:14828: \"$ac_try\"") >&5
-+if { (eval echo "$as_me:15175: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14831: \$? = $ac_status" >&5
-+  echo "$as_me:15178: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--  test -f conftest2.$ac_objext && { (eval echo "$as_me:14833: \"$ac_try\"") >&5
-+  test -f conftest2.$ac_objext && { (eval echo "$as_me:15180: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14836: \$? = $ac_status" >&5
-+  echo "$as_me:15183: \$? = $ac_status" >&5
-   (exit $ac_status); };
- then
-   eval cf_cv_prog_CXX_c_o=yes
-@@ -14844,10 +15191,10 @@
- 
- fi
- if test $cf_cv_prog_CXX_c_o = yes; then
--  echo "$as_me:14847: result: yes" >&5
-+  echo "$as_me:15194: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:14850: result: no" >&5
-+  echo "$as_me:15197: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -14867,12 +15214,12 @@
- 	;;
- esac
- if test "$GXX" = yes; then
--	echo "$as_me:14870: checking for lib$cf_gpp_libname" >&5
-+	echo "$as_me:15217: checking for lib$cf_gpp_libname" >&5
- echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
- 	cf_save="$LIBS"
- 	LIBS="$LIBS -l$cf_gpp_libname"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14875 "configure"
-+#line 15222 "configure"
- #include "confdefs.h"
- 
- #include <$cf_gpp_libname/builtin.h>
-@@ -14886,16 +15233,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14889: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15236: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14892: \$? = $ac_status" >&5
-+  echo "$as_me:15239: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14895: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15242: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14898: \$? = $ac_status" >&5
-+  echo "$as_me:15245: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 	 CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
-@@ -14914,7 +15261,7 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 14917 "configure"
-+#line 15264 "configure"
- #include "confdefs.h"
- 
- #include <builtin.h>
-@@ -14928,16 +15275,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14931: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15278: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14934: \$? = $ac_status" >&5
-+  echo "$as_me:15281: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14937: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15284: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14940: \$? = $ac_status" >&5
-+  echo "$as_me:15287: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 	 CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
-@@ -14954,7 +15301,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save"
--	echo "$as_me:14957: result: $cf_cxx_library" >&5
-+	echo "$as_me:15304: result: $cf_cxx_library" >&5
- echo "${ECHO_T}$cf_cxx_library" >&6
- fi
- 
-@@ -14970,7 +15317,7 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- ac_main_return=return
--echo "$as_me:14973: checking how to run the C++ preprocessor" >&5
-+echo "$as_me:15320: checking how to run the C++ preprocessor" >&5
- echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
- if test -z "$CXXCPP"; then
-   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-@@ -14987,18 +15334,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14990 "configure"
-+#line 15337 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:14995: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15342: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:15001: \$? = $ac_status" >&5
-+  echo "$as_me:15348: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -15021,17 +15368,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15024 "configure"
-+#line 15371 "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:15028: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15375: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:15034: \$? = $ac_status" >&5
-+  echo "$as_me:15381: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -15068,7 +15415,7 @@
- else
-   ac_cv_prog_CXXCPP=$CXXCPP
- fi
--echo "$as_me:15071: result: $CXXCPP" >&5
-+echo "$as_me:15418: result: $CXXCPP" >&5
- echo "${ECHO_T}$CXXCPP" >&6
- ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
-@@ -15078,18 +15425,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15081 "configure"
-+#line 15428 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:15086: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15433: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:15092: \$? = $ac_status" >&5
-+  echo "$as_me:15439: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -15112,17 +15459,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15115 "configure"
-+#line 15462 "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:15119: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15466: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:15125: \$? = $ac_status" >&5
-+  echo "$as_me:15472: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -15150,7 +15497,7 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:15153: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
-+  { { echo "$as_me:15500: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
- echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -15165,23 +15512,23 @@
- for ac_header in iostream typeinfo
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:15168: checking for $ac_header" >&5
-+echo "$as_me:15515: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15174 "configure"
-+#line 15521 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:15178: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15525: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:15184: \$? = $ac_status" >&5
-+  echo "$as_me:15531: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -15200,7 +15547,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:15203: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:15550: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -15211,10 +15558,10 @@
- done
- 
-     if test x"$ac_cv_header_iostream" = xyes ; then
--        echo "$as_me:15214: checking if iostream uses std-namespace" >&5
-+        echo "$as_me:15561: checking if iostream uses std-namespace" >&5
- echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
-         cat >conftest.$ac_ext <<_ACEOF
--#line 15217 "configure"
-+#line 15564 "configure"
- #include "confdefs.h"
- 
- #include <iostream>
-@@ -15231,16 +15578,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15234: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15581: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15237: \$? = $ac_status" >&5
-+  echo "$as_me:15584: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15240: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15587: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15243: \$? = $ac_status" >&5
-+  echo "$as_me:15590: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_iostream_namespace=yes
- else
-@@ -15249,7 +15596,7 @@
- cf_iostream_namespace=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--        echo "$as_me:15252: result: $cf_iostream_namespace" >&5
-+        echo "$as_me:15599: result: $cf_iostream_namespace" >&5
- echo "${ECHO_T}$cf_iostream_namespace" >&6
-         if test "$cf_iostream_namespace" = yes ; then
-             cat >>confdefs.h <<\EOF
-@@ -15259,7 +15606,7 @@
-         fi
-     fi
- 
--echo "$as_me:15262: checking if we should include stdbool.h" >&5
-+echo "$as_me:15609: checking if we should include stdbool.h" >&5
- echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
- 
- if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -15267,7 +15614,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15270 "configure"
-+#line 15617 "configure"
- #include "confdefs.h"
- 
- int
-@@ -15279,23 +15626,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15282: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15629: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15285: \$? = $ac_status" >&5
-+  echo "$as_me:15632: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15288: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15635: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15291: \$? = $ac_status" >&5
-+  echo "$as_me:15638: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=0
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 15298 "configure"
-+#line 15645 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -15311,16 +15658,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15314: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15661: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15317: \$? = $ac_status" >&5
-+  echo "$as_me:15664: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15320: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15667: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15323: \$? = $ac_status" >&5
-+  echo "$as_me:15670: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -15334,13 +15681,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:15337: result: yes" >&5
-+then	echo "$as_me:15684: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:15339: result: no" >&5
-+else	echo "$as_me:15686: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:15343: checking for builtin bool type" >&5
-+echo "$as_me:15690: checking for builtin bool type" >&5
- echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
- 
- if test "${cf_cv_builtin_bool+set}" = set; then
-@@ -15348,7 +15695,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15351 "configure"
-+#line 15698 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -15363,16 +15710,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15366: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15713: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15369: \$? = $ac_status" >&5
-+  echo "$as_me:15716: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15372: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15719: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15375: \$? = $ac_status" >&5
-+  echo "$as_me:15722: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_builtin_bool=1
- else
-@@ -15385,13 +15732,13 @@
- fi
- 
- if test "$cf_cv_builtin_bool" = 1
--then	echo "$as_me:15388: result: yes" >&5
-+then	echo "$as_me:15735: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:15390: result: no" >&5
-+else	echo "$as_me:15737: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:15394: checking for size of bool" >&5
-+echo "$as_me:15741: checking for size of bool" >&5
- echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
- if test "${cf_cv_type_of_bool+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15402,7 +15749,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15405 "configure"
-+#line 15752 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -15444,15 +15791,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:15447: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15794: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15450: \$? = $ac_status" >&5
-+  echo "$as_me:15797: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:15452: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15799: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15455: \$? = $ac_status" >&5
-+  echo "$as_me:15802: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_of_bool=`cat cf_test.out`
- 		 if test -z "$cf_cv_type_of_bool"; then
-@@ -15470,18 +15817,18 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:15473: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:15820: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in #(vi
- 	.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:15479: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:15826: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
- echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
- 	cf_cv_type_of_bool=$NCURSES_BOOL
- fi
- 
--echo "$as_me:15484: checking for special defines needed for etip.h" >&5
-+echo "$as_me:15831: checking for special defines needed for etip.h" >&5
- echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
- cf_save_CXXFLAGS="$CXXFLAGS"
- cf_result="none"
-@@ -15493,7 +15840,7 @@
- 	test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
- 	test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15496 "configure"
-+#line 15843 "configure"
- #include "confdefs.h"
- 
- #include <etip.h.in>
-@@ -15507,16 +15854,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15510: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15857: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15513: \$? = $ac_status" >&5
-+  echo "$as_me:15860: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15516: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15863: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15519: \$? = $ac_status" >&5
-+  echo "$as_me:15866: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	test -n "$cf_math" && cat >>confdefs.h <<EOF
-@@ -15537,12 +15884,12 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- done
- done
--echo "$as_me:15540: result: $cf_result" >&5
-+echo "$as_me:15887: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- CXXFLAGS="$cf_save_CXXFLAGS"
- 
- if test -n "$CXX"; then
--echo "$as_me:15545: checking if $CXX accepts parameter initialization" >&5
-+echo "$as_me:15892: checking if $CXX accepts parameter initialization" >&5
- echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
- if test "${cf_cv_cpp_param_init+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15559,7 +15906,7 @@
-   cf_cv_cpp_param_init=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15562 "configure"
-+#line 15909 "configure"
- #include "confdefs.h"
- 
- class TEST {
-@@ -15578,15 +15925,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:15581: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15928: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15584: \$? = $ac_status" >&5
-+  echo "$as_me:15931: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:15586: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15933: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15589: \$? = $ac_status" >&5
-+  echo "$as_me:15936: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_param_init=yes
- else
-@@ -15605,7 +15952,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:15608: result: $cf_cv_cpp_param_init" >&5
-+echo "$as_me:15955: result: $cf_cv_cpp_param_init" >&5
- echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
- fi
- test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF
-@@ -15614,7 +15961,7 @@
- 
- if test -n "$CXX"; then
- 
--echo "$as_me:15617: checking if $CXX accepts static_cast" >&5
-+echo "$as_me:15964: checking if $CXX accepts static_cast" >&5
- echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
- if test "${cf_cv_cpp_static_cast+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15628,7 +15975,7 @@
- ac_main_return=return
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15631 "configure"
-+#line 15978 "configure"
- #include "confdefs.h"
- 
- class NCursesPanel
-@@ -15672,16 +16019,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15675: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16022: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15678: \$? = $ac_status" >&5
-+  echo "$as_me:16025: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15681: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16028: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15684: \$? = $ac_status" >&5
-+  echo "$as_me:16031: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_static_cast=yes
- else
-@@ -15699,7 +16046,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:15702: result: $cf_cv_cpp_static_cast" >&5
-+echo "$as_me:16049: result: $cf_cv_cpp_static_cast" >&5
- echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
- 
- fi
-@@ -15709,12 +16056,12 @@
- EOF
- 
- 	CXX_AR='$(AR)'
--	CXX_AR_OPTS='$(AR_OPTS)'
-+	CXX_ARFLAGS='$(ARFLAGS)'
- 	case $cf_cv_system_name in #(vi
- 	irix*) #(vi
- 	    if test "$GXX" != yes ; then
- 		CXX_AR='$(CXX)'
--		CXX_AR_OPTS='-ar -o'
-+		CXX_ARFLAGS='-ar -o'
- 	    fi
- 	    ;;
- 	sco3.2v5*) #(vi
-@@ -15723,7 +16070,7 @@
- 	solaris2*)
- 	    if test "$GXX" != yes ; then
- 		CXX_AR='$(CXX)'
--		CXX_AR_OPTS='-xar -o'
-+		CXX_ARFLAGS='-xar -o'
- 	    fi
- 	    ;;
- 	esac
-@@ -15747,7 +16094,7 @@
- 	else
- 		if test "$cf_cv_header_stdbool_h" = 1 ; then
- 
--echo "$as_me:15750: checking for size of bool" >&5
-+echo "$as_me:16097: checking for size of bool" >&5
- echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
- if test "${cf_cv_type_of_bool+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15758,7 +16105,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15761 "configure"
-+#line 16108 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -15800,15 +16147,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:15803: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16150: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15806: \$? = $ac_status" >&5
-+  echo "$as_me:16153: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:15808: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16155: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15811: \$? = $ac_status" >&5
-+  echo "$as_me:16158: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_of_bool=`cat cf_test.out`
- 		 if test -z "$cf_cv_type_of_bool"; then
-@@ -15826,25 +16173,25 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:15829: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:16176: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in #(vi
- 	.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:15835: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:16182: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
- echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
- 	cf_cv_type_of_bool=$NCURSES_BOOL
- fi
- 
- 		else
--			echo "$as_me:15841: checking for fallback type of bool" >&5
-+			echo "$as_me:16188: checking for fallback type of bool" >&5
- echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
- 			case "$host_cpu" in #(vi
- 			i?86)	cf_cv_type_of_bool=char	;; #(vi
- 			*)	cf_cv_type_of_bool=int	;;
- 			esac
--			echo "$as_me:15847: result: $cf_cv_type_of_bool" >&5
-+			echo "$as_me:16194: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- 		fi
- 	fi
-@@ -15873,7 +16220,7 @@
- 
- if test "$cf_with_ada" != "no" ; then
-     if test "$with_libtool" != "no"; then
--	{ echo "$as_me:15876: WARNING: libtool does not support Ada - disabling feature" >&5
-+	{ echo "$as_me:16223: WARNING: libtool does not support Ada - disabling feature" >&5
- echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
- 	cf_with_ada=no
-     fi
-@@ -15883,7 +16230,7 @@
- cf_ada_make=gnatmake
- # Extract the first word of "$cf_ada_make", so it can be a program name with args.
- set dummy $cf_ada_make; ac_word=$2
--echo "$as_me:15886: checking for $ac_word" >&5
-+echo "$as_me:16233: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_gnat_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15898,7 +16245,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_gnat_exists="yes"
--echo "$as_me:15901: found $ac_dir/$ac_word" >&5
-+echo "$as_me:16248: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -15907,10 +16254,10 @@
- fi
- gnat_exists=$ac_cv_prog_gnat_exists
- if test -n "$gnat_exists"; then
--  echo "$as_me:15910: result: $gnat_exists" >&5
-+  echo "$as_me:16257: result: $gnat_exists" >&5
- echo "${ECHO_T}$gnat_exists" >&6
- else
--  echo "$as_me:15913: result: no" >&5
-+  echo "$as_me:16260: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -15918,11 +16265,11 @@
-    cf_ada_make=
- else
- 
--echo "$as_me:15921: checking for gnat version" >&5
-+echo "$as_me:16268: checking for gnat version" >&5
- echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
- cf_gnat_version=`${cf_ada_make-gnatmake} -v 2>&1 | grep '[0-9].[0-9][0-9]*' |\
-   sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
--echo "$as_me:15925: result: $cf_gnat_version" >&5
-+echo "$as_me:16272: result: $cf_gnat_version" >&5
- echo "${ECHO_T}$cf_gnat_version" >&6
- 
- case $cf_gnat_version in
-@@ -15945,7 +16292,7 @@
- 
-    # Extract the first word of "m4", so it can be a program name with args.
- set dummy m4; ac_word=$2
--echo "$as_me:15948: checking for $ac_word" >&5
-+echo "$as_me:16295: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_M4_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15960,7 +16307,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_M4_exists="yes"
--echo "$as_me:15963: found $ac_dir/$ac_word" >&5
-+echo "$as_me:16310: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -15969,10 +16316,10 @@
- fi
- M4_exists=$ac_cv_prog_M4_exists
- if test -n "$M4_exists"; then
--  echo "$as_me:15972: result: $M4_exists" >&5
-+  echo "$as_me:16319: result: $M4_exists" >&5
- echo "${ECHO_T}$M4_exists" >&6
- else
--  echo "$as_me:15975: result: no" >&5
-+  echo "$as_me:16322: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -15981,7 +16328,7 @@
-       echo Ada95 binding required program m4 not found. Ada95 binding disabled.
-    fi
-    if test "$cf_cv_prog_gnat_correct" = yes; then
--      echo "$as_me:15984: checking if GNAT works" >&5
-+      echo "$as_me:16331: checking if GNAT works" >&5
- echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
- 
- rm -f conftest*
-@@ -16009,14 +16356,14 @@
- fi
- rm -f conftest*
- 
--      echo "$as_me:16012: result: $cf_cv_prog_gnat_correct" >&5
-+      echo "$as_me:16359: result: $cf_cv_prog_gnat_correct" >&5
- echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
-    fi
- fi
- if test	"$cf_cv_prog_gnat_correct" = yes; then
-    ADAFLAGS="-O3 -gnatpn $ADAFLAGS"
- 
--   echo "$as_me:16019: checking if GNAT pragma Unreferenced works" >&5
-+   echo "$as_me:16366: checking if GNAT pragma Unreferenced works" >&5
- echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6
- 
- rm -f conftest*
-@@ -16043,7 +16390,7 @@
- fi
- rm -f conftest*
- 
--   echo "$as_me:16046: result: $cf_cv_pragma_unreferenced" >&5
-+   echo "$as_me:16393: result: $cf_cv_pragma_unreferenced" >&5
- echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6
- 
-    # if the pragma is supported, use it (needed in the Trace code).
-@@ -16096,7 +16443,7 @@
-   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
-   ;;
- *)
--  { { echo "$as_me:16099: error: expected a pathname, not \"$withval\"" >&5
-+  { { echo "$as_me:16446: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
-   ;;
-@@ -16138,7 +16485,7 @@
-   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
-   ;;
- *)
--  { { echo "$as_me:16141: error: expected a pathname, not \"$withval\"" >&5
-+  { { echo "$as_me:16488: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
-   ;;
-@@ -16163,7 +16510,7 @@
- ### chooses to split module lists into libraries.
- ###
- ### (see CF_LIB_RULES).
--echo "$as_me:16166: checking for library subsets" >&5
-+echo "$as_me:16513: checking for library subsets" >&5
- echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
- LIB_SUBSETS=
- 
-@@ -16188,7 +16535,7 @@
- test "$with_widec"     = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
- test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
- 
--echo "$as_me:16191: result: $LIB_SUBSETS" >&5
-+echo "$as_me:16538: result: $LIB_SUBSETS" >&5
- echo "${ECHO_T}$LIB_SUBSETS" >&6
- 
- ### Construct the list of include-directories to be generated
-@@ -16226,7 +16573,7 @@
- fi
- 
- ### Build up pieces for makefile rules
--echo "$as_me:16229: checking default library suffix" >&5
-+echo "$as_me:16576: checking default library suffix" >&5
- echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -16237,46 +16584,50 @@
- 	shared)  DFT_ARG_SUFFIX=''   ;;
- 	esac
- 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
--echo "$as_me:16240: result: $DFT_ARG_SUFFIX" >&5
-+echo "$as_me:16587: result: $DFT_ARG_SUFFIX" >&5
- echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
- 
--echo "$as_me:16243: checking default library-dependency suffix" >&5
-+echo "$as_me:16590: checking default library-dependency suffix" >&5
- echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
- 
--	case $DFT_LWR_MODEL in
--	libtool)
-+	case $DFT_LWR_MODEL in #(vi
-+	libtool) #(vi
- 		DFT_LIB_SUFFIX='.la'
- 		DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
- 		;;
--	normal)
-+	normal) #(vi
- 		DFT_LIB_SUFFIX='.a'
- 		DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
- 		;;
--	debug)
-+	debug) #(vi
- 		DFT_LIB_SUFFIX='_g.a'
- 		DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
- 		;;
--	profile)
-+	profile) #(vi
- 		DFT_LIB_SUFFIX='_p.a'
- 		DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
- 		;;
--	shared)
-+	shared) #(vi
- 		case $cf_cv_system_name in
--		cygwin*)
-+		aix[56]*) #(vi
-+			DFT_LIB_SUFFIX='.a'
-+			DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
-+			;;
-+		cygwin*) #(vi
- 			DFT_LIB_SUFFIX='.dll'
- 			DFT_DEP_SUFFIX='.dll.a'
- 			;;
--		darwin*)
-+		darwin*) #(vi
- 			DFT_LIB_SUFFIX='.dylib'
- 			DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
- 			;;
--		hpux*)
-+		hpux*) #(vi
- 			case $target in
--			ia64*)
-+			ia64*) #(vi
- 				DFT_LIB_SUFFIX='.so'
- 				DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
- 				;;
--			*)
-+			*) #(vi
- 				DFT_LIB_SUFFIX='.sl'
- 				DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
- 				;;
-@@ -16289,10 +16640,10 @@
- 	esac
- 	test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}"
- 	test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}"
--echo "$as_me:16292: result: $DFT_DEP_SUFFIX" >&5
-+echo "$as_me:16643: result: $DFT_DEP_SUFFIX" >&5
- echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
- 
--echo "$as_me:16295: checking default object directory" >&5
-+echo "$as_me:16646: checking default object directory" >&5
- echo $ECHO_N "checking default object directory... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -16308,51 +16659,55 @@
- 			DFT_OBJ_SUBDIR='obj_s' ;;
- 		esac
- 	esac
--echo "$as_me:16311: result: $DFT_OBJ_SUBDIR" >&5
-+echo "$as_me:16662: result: $DFT_OBJ_SUBDIR" >&5
- echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
- 
- # libtool thinks it can make c++ shared libraries (perhaps only g++)
- if test "$cf_with_cxx" = yes ; then
--echo "$as_me:16316: checking c++ library-dependency suffix" >&5
-+echo "$as_me:16667: checking c++ library-dependency suffix" >&5
- echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
- if test "$with_libtool" != "no"; then
- 	CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX
- else
- 
--	case normal in
--	libtool)
-+	case normal in #(vi
-+	libtool) #(vi
- 		CXX_LIB_SUFFIX='.la'
- 		CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
- 		;;
--	normal)
-+	normal) #(vi
- 		CXX_LIB_SUFFIX='.a'
- 		CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
- 		;;
--	debug)
-+	debug) #(vi
- 		CXX_LIB_SUFFIX='_g.a'
- 		CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
- 		;;
--	profile)
-+	profile) #(vi
- 		CXX_LIB_SUFFIX='_p.a'
- 		CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
- 		;;
--	shared)
-+	shared) #(vi
- 		case $cf_cv_system_name in
--		cygwin*)
-+		aix[56]*) #(vi
-+			CXX_LIB_SUFFIX='.a'
-+			CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
-+			;;
-+		cygwin*) #(vi
- 			CXX_LIB_SUFFIX='.dll'
- 			CXX_DEP_SUFFIX='.dll.a'
- 			;;
--		darwin*)
-+		darwin*) #(vi
- 			CXX_LIB_SUFFIX='.dylib'
- 			CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
- 			;;
--		hpux*)
-+		hpux*) #(vi
- 			case $target in
--			ia64*)
-+			ia64*) #(vi
- 				CXX_LIB_SUFFIX='.so'
- 				CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
- 				;;
--			*)
-+			*) #(vi
- 				CXX_LIB_SUFFIX='.sl'
- 				CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
- 				;;
-@@ -16366,7 +16721,7 @@
- 	test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}"
- 	test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}"
- fi
--echo "$as_me:16369: result: $CXX_LIB_SUFFIX" >&5
-+echo "$as_me:16724: result: $CXX_LIB_SUFFIX" >&5
- echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
- 
- fi
-@@ -16480,7 +16835,7 @@
- 
- if test "$GCC" = yes ; then
- 	case $cf_cv_system_name in #(
--	OS/2*|os2*|aix[45]*) 	#( vi
-+	OS/2*|os2*|aix[4]*) 	#( vi
- 		LDFLAGS_STATIC=
- 		LDFLAGS_SHARED=
- 		;;
-@@ -16491,7 +16846,7 @@
-     esac
- else
- 	case $cf_cv_system_name in #(
--	aix[45]*) 	#( from ld manpage
-+	aix[456]*) 	#( from ld manpage
- 		LDFLAGS_STATIC=-bstatic
- 		LDFLAGS_SHARED=-bdynamic
- 		;;
-@@ -16519,12 +16874,12 @@
- 	;;
- esac
- 
--echo "$as_me:16522: checking where we will install curses.h" >&5
-+echo "$as_me:16877: checking where we will install curses.h" >&5
- echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
- test "$with_overwrite" = no && \
- test "x$includedir" = 'x${prefix}/include' && \
- 	includedir='${prefix}/include/ncurses'${LIB_SUFFIX}
--echo "$as_me:16527: result: $includedir" >&5
-+echo "$as_me:16882: result: $includedir" >&5
- echo "${ECHO_T}$includedir" >&6
- 
- ### Resolve a conflict between normal and wide-curses by forcing applications
-@@ -16532,10 +16887,11 @@
- if test "$with_overwrite" != no ; then
- if test "$NCURSES_LIBUTF8" = 1 ; then
- 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
--	{ echo "$as_me:16535: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
-+	{ echo "$as_me:16890: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
- echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
- fi
- fi
-+WITH_OVERWRITE=$with_overwrite
- 
- # used to separate tack out of the tree
- NCURSES_TREE=
-@@ -16548,7 +16904,7 @@
- ### Construct the list of subdirectories for which we'll customize makefiles
- ### with the appropriate compile-rules.
- 
--echo "$as_me:16551: checking for src modules" >&5
-+echo "$as_me:16907: checking for src modules" >&5
- echo $ECHO_N "checking for src modules... $ECHO_C" >&6
- 
- # dependencies and linker-arguments for test-programs
-@@ -16611,13 +16967,17 @@
- 		fi
- 	fi
- done
--echo "$as_me:16614: result: $cf_cv_src_modules" >&5
-+echo "$as_me:16970: result: $cf_cv_src_modules" >&5
- echo "${ECHO_T}$cf_cv_src_modules" >&6
- 
- TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
- TEST_ARG2="-L${LIB_2ND} $TEST_ARG2"
- 
--SRC_SUBDIRS="man include"
-+SRC_SUBDIRS=
-+if test "x$cf_with_manpages" != xno ; then
-+	SRC_SUBDIRS="$SRC_SUBDIRS man"
-+fi
-+SRC_SUBDIRS="$SRC_SUBDIRS include"
- for cf_dir in $cf_cv_src_modules
- do
- 	SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir"
-@@ -16628,8 +16988,8 @@
- 
- ADA_SUBDIRS=
- if test "$cf_cv_prog_gnat_correct" = yes && test -f $srcdir/Ada95/Makefile.in; then
--   SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
--   ADA_SUBDIRS="gen src samples"
-+	SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
-+	ADA_SUBDIRS="gen src samples"
- fi
- 
- SUB_MAKEFILES=
-@@ -16639,10 +16999,10 @@
- done
- 
- if test -n "$ADA_SUBDIRS"; then
--   for cf_dir in $ADA_SUBDIRS
--   do
--      SUB_MAKEFILES="$SUB_MAKEFILES Ada95/$cf_dir/Makefile"
--   done
-+	for cf_dir in $ADA_SUBDIRS
-+	do
-+		SUB_MAKEFILES="$SUB_MAKEFILES Ada95/$cf_dir/Makefile"
-+	done
- 
- fi
- 
-@@ -16760,18 +17120,18 @@
- ### If we're building with rpath, try to link non-standard libs that way too.
- if test "$DFT_LWR_MODEL" = "shared"; then
- 
--echo "$as_me:16763: checking for updated LDFLAGS" >&5
-+echo "$as_me:17123: checking for updated LDFLAGS" >&5
- echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
- if test -n "$LDFLAGS" ; then
--echo "$as_me:16766: result: maybe" >&5
-+echo "$as_me:17126: result: maybe" >&5
- echo "${ECHO_T}maybe" >&6
- test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me-configure}:16770: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me-configure}:17130: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me-configure}:16774: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me-configure}:17134: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- case "$EXTRA_LDFLAGS" in #(vi
- -Wl,-rpath,*) #(vi
-@@ -16793,7 +17153,7 @@
- 	do
- 		test -n "$verbose" && echo "	Filtering $cf_rpath_src" 1>&6
- 
--echo "${as_me-configure}:16796: testing Filtering $cf_rpath_src ..." 1>&5
-+echo "${as_me-configure}:17156: testing Filtering $cf_rpath_src ..." 1>&5
- 
- 		case $cf_rpath_src in #(vi
- 		-L*) #(vi
-@@ -16804,7 +17164,7 @@
- 			fi
- 			test -n "$verbose" && echo "	...Filter $cf_rpath_tmp" 1>&6
- 
--echo "${as_me-configure}:16807: testing ...Filter $cf_rpath_tmp ..." 1>&5
-+echo "${as_me-configure}:17167: testing ...Filter $cf_rpath_tmp ..." 1>&5
- 
- 			EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			;;
-@@ -16814,15 +17174,15 @@
- 	LDFLAGS=$cf_rpath_dst
- 	test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me-configure}:16817: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me-configure}:17177: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me-configure}:16821: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me-configure}:17181: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- fi
- else
--echo "$as_me:16825: result: no" >&5
-+echo "$as_me:17185: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -16849,8 +17209,18 @@
- fi
- 
- ################################################################################
--test "$use_database" = yes && SUB_MAKEFILES="$SUB_MAKEFILES misc/run_tic.sh:misc/run_tic.in"
-+test "$use_database" = yes && \
-+SUB_MAKEFILES="$SUB_MAKEFILES misc/run_tic.sh:misc/run_tic.in"
-+
- SUB_MAKEFILES="$SUB_MAKEFILES misc/ncurses-config:misc/ncurses-config.in"
-+
-+if test x"$enable_pc_files" = xyes ; then \
-+SUB_MAKEFILES="$SUB_MAKEFILES misc/gen-pkgconfig:misc/gen-pkgconfig.in"
-+MAKE_PC_FILES=
-+else
-+MAKE_PC_FILES="#"
-+fi
-+
- ac_config_files="$ac_config_files include/MKterm.h.awk include/curses.head:include/curses.h.in include/termcap.h include/unctrl.h $SUB_MAKEFILES Makefile"
- ac_config_commands="$ac_config_commands default"
- cat >confcache <<\_ACEOF
-@@ -16932,7 +17302,7 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:16935: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:17305: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -17064,7 +17434,7 @@
- cat >>$CONFIG_STATUS <<EOF
- ac_cs_version="\\
- config.status
--configured by $0, generated by GNU Autoconf 2.52.20080325,
-+configured by $0, generated by GNU Autoconf 2.52.20081225,
-   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
- 
- Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-@@ -17108,7 +17478,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { echo "$as_me:17111: error: ambiguous option: $1
-+    { { echo "$as_me:17481: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -17127,7 +17497,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:17130: error: unrecognized option: $1
-+  -*) { { echo "$as_me:17500: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -17146,7 +17516,7 @@
- ## Running config.status.  ##
- ## ----------------------- ##
- 
--This file was extended by $as_me 2.52.20080325, executed with
-+This file was extended by $as_me 2.52.20081225, executed with
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-   CONFIG_LINKS    = $CONFIG_LINKS
-@@ -17181,13 +17551,13 @@
- NCURSES_PATCH="$NCURSES_PATCH"
- SRC_SUBDIRS="$SRC_SUBDIRS"
- TERMINFO="$TERMINFO"
-+TICS_ARG_SUFFIX="$TICS_ARG_SUFFIX"
-+TICS_LIB_SUFFIX="$TICS_LIB_SUFFIX"
-+TICS_NAME="$TICS_NAME"
- TINFO_ARG_SUFFIX="$TINFO_ARG_SUFFIX"
- TINFO_LIB_SUFFIX="$TINFO_LIB_SUFFIX"
- TINFO_NAME="$TINFO_NAME"
- TINFO_SUFFIX="$TINFO_SUFFIX"
--TICS_ARG_SUFFIX="$TICS_ARG_SUFFIX"
--TICS_LIB_SUFFIX="$TICS_LIB_SUFFIX"
--TICS_NAME="$TICS_NAME"
- WITH_CURSES_H="$with_curses_h"
- WITH_ECHO="$with_echo"
- WITH_OVERWRITE="$with_overwrite"
-@@ -17206,6 +17576,7 @@
- cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix"
- cf_cv_system_name="$cf_cv_system_name"
- cf_with_cxx_binding="$cf_with_cxx_binding"
-+cf_with_manpages="$cf_with_manpages"
- host="$host"
- target="$target"
- 
-@@ -17224,7 +17595,7 @@
-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
--  *) { { echo "$as_me:17227: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:17598: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -17349,6 +17720,8 @@
- s,@LINT@,$LINT,;t t
- s,@LINT_OPTS@,$LINT_OPTS,;t t
- s,@LN_S@,$LN_S,;t t
-+s,@PKG_CONFIG@,$PKG_CONFIG,;t t
-+s,@PKG_CONFIG_LIBDIR@,$PKG_CONFIG_LIBDIR,;t t
- s,@SET_MAKE@,$SET_MAKE,;t t
- s,@MAKE_LOWER_TAGS@,$MAKE_LOWER_TAGS,;t t
- s,@MAKE_UPPER_TAGS@,$MAKE_UPPER_TAGS,;t t
-@@ -17359,7 +17732,7 @@
- s,@ac_ct_LD@,$ac_ct_LD,;t t
- s,@AR@,$AR,;t t
- s,@ac_ct_AR@,$ac_ct_AR,;t t
--s,@AR_OPTS@,$AR_OPTS,;t t
-+s,@ARFLAGS@,$ARFLAGS,;t t
- s,@DESTDIR@,$DESTDIR,;t t
- s,@BUILD_CC@,$BUILD_CC,;t t
- s,@BUILD_CPP@,$BUILD_CPP,;t t
-@@ -17392,6 +17765,7 @@
- s,@CXX_G_OPT@,$CXX_G_OPT,;t t
- s,@LD_MODEL@,$LD_MODEL,;t t
- s,@CC_SHARED_OPTS@,$CC_SHARED_OPTS,;t t
-+s,@LD_RPATH_OPT@,$LD_RPATH_OPT,;t t
- s,@LD_SHARED_OPTS@,$LD_SHARED_OPTS,;t t
- s,@MK_SHARED_LIB@,$MK_SHARED_LIB,;t t
- s,@LINK_PROGS@,$LINK_PROGS,;t t
-@@ -17425,6 +17799,7 @@
- s,@NCURSES_OSPEED@,$NCURSES_OSPEED,;t t
- s,@MANPAGE_RENAMES@,$MANPAGE_RENAMES,;t t
- s,@NCURSES_EXT_FUNCS@,$NCURSES_EXT_FUNCS,;t t
-+s,@GENERATED_EXT_FUNCS@,$GENERATED_EXT_FUNCS,;t t
- s,@NCURSES_CONST@,$NCURSES_CONST,;t t
- s,@NCURSES_EXT_COLORS@,$NCURSES_EXT_COLORS,;t t
- s,@NCURSES_MOUSE_VERSION@,$NCURSES_MOUSE_VERSION,;t t
-@@ -17449,7 +17824,7 @@
- s,@CXXCPP@,$CXXCPP,;t t
- s,@CXXLDFLAGS@,$CXXLDFLAGS,;t t
- s,@CXX_AR@,$CXX_AR,;t t
--s,@CXX_AR_OPTS@,$CXX_AR_OPTS,;t t
-+s,@CXX_ARFLAGS@,$CXX_ARFLAGS,;t t
- s,@CXXLIBS@,$CXXLIBS,;t t
- s,@USE_CXX_BOOL@,$USE_CXX_BOOL,;t t
- s,@gnat_exists@,$gnat_exists,;t t
-@@ -17493,6 +17868,7 @@
- s,@HAVE_TCGETATTR@,$HAVE_TCGETATTR,;t t
- s,@HAVE_TERMIO_H@,$HAVE_TERMIO_H,;t t
- s,@HAVE_TERMIOS_H@,$HAVE_TERMIOS_H,;t t
-+s,@MAKE_PC_FILES@,$MAKE_PC_FILES,;t t
- CEOF
- 
- EOF
-@@ -17607,7 +17983,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:17610: creating $ac_file" >&5
-+    { echo "$as_me:17986: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -17625,7 +18001,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:17628: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:18004: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -17638,7 +18014,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:17641: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:18017: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -17704,7 +18080,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:17707: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:18083: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -17715,7 +18091,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:17718: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:18094: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -17728,7 +18104,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:17731: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:18107: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -17786,7 +18162,7 @@
-   rm -f $tmp/in
-   if test x"$ac_file" != x-; then
-     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
--      { echo "$as_me:17789: $ac_file is unchanged" >&5
-+      { echo "$as_me:18165: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-@@ -17873,40 +18249,44 @@
- 		for cf_item in $cf_LIST_MODELS
- 		do
- 
--	case $cf_item in
--	libtool)
-+	case $cf_item in #(vi
-+	libtool) #(vi
- 		cf_suffix='.la'
- 		cf_depsuf=$cf_suffix
- 		;;
--	normal)
-+	normal) #(vi
- 		cf_suffix='.a'
- 		cf_depsuf=$cf_suffix
- 		;;
--	debug)
-+	debug) #(vi
- 		cf_suffix='_g.a'
- 		cf_depsuf=$cf_suffix
- 		;;
--	profile)
-+	profile) #(vi
- 		cf_suffix='_p.a'
- 		cf_depsuf=$cf_suffix
- 		;;
--	shared)
-+	shared) #(vi
- 		case $cf_cv_system_name in
--		cygwin*)
-+		aix[56]*) #(vi
-+			cf_suffix='.a'
-+			cf_depsuf=$cf_suffix
-+			;;
-+		cygwin*) #(vi
- 			cf_suffix='.dll'
- 			cf_depsuf='.dll.a'
- 			;;
--		darwin*)
-+		darwin*) #(vi
- 			cf_suffix='.dylib'
- 			cf_depsuf=$cf_suffix
- 			;;
--		hpux*)
-+		hpux*) #(vi
- 			case $target in
--			ia64*)
-+			ia64*) #(vi
- 				cf_suffix='.so'
- 				cf_depsuf=$cf_suffix
- 				;;
--			*)
-+			*) #(vi
- 				cf_suffix='.sl'
- 				cf_depsuf=$cf_suffix
- 				;;
-@@ -18020,40 +18400,44 @@
- 
- cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
- 
--	case $cf_item in
--	libtool)
-+	case $cf_item in #(vi
-+	libtool) #(vi
- 		cf_suffix='.la'
- 		cf_depsuf=$cf_suffix
- 		;;
--	normal)
-+	normal) #(vi
- 		cf_suffix='.a'
- 		cf_depsuf=$cf_suffix
- 		;;
--	debug)
-+	debug) #(vi
- 		cf_suffix='_g.a'
- 		cf_depsuf=$cf_suffix
- 		;;
--	profile)
-+	profile) #(vi
- 		cf_suffix='_p.a'
- 		cf_depsuf=$cf_suffix
- 		;;
--	shared)
-+	shared) #(vi
- 		case $cf_cv_system_name in
--		cygwin*)
-+		aix[56]*) #(vi
-+			cf_suffix='.a'
-+			cf_depsuf=$cf_suffix
-+			;;
-+		cygwin*) #(vi
- 			cf_suffix='.dll'
- 			cf_depsuf='.dll.a'
- 			;;
--		darwin*)
-+		darwin*) #(vi
- 			cf_suffix='.dylib'
- 			cf_depsuf=$cf_suffix
- 			;;
--		hpux*)
-+		hpux*) #(vi
- 			case $target in
--			ia64*)
-+			ia64*) #(vi
- 				cf_suffix='.so'
- 				cf_depsuf=$cf_suffix
- 				;;
--			*)
-+			*) #(vi
- 				cf_suffix='.sl'
- 				cf_depsuf=$cf_suffix
- 				;;
-@@ -18234,18 +18618,28 @@
- install.libs uninstall.libs \\
- install.data uninstall.data ::
- $MAKE_TERMINFO	cd misc && \${MAKE} \${CF_MFLAGS} \$@
-+CF_EOF
-+
-+if test "x$cf_with_manpages" = xyes; then
-+cat >> Makefile <<CF_EOF
- 
- install.man \\
- uninstall.man ::
- 	cd man && \${MAKE} \${CF_MFLAGS} \$@
-+CF_EOF
-+fi
-+
-+cat >> Makefile <<CF_EOF
- 
- distclean ::
- 	rm -f config.cache config.log config.status Makefile include/ncurses_cfg.h
- 	rm -f headers.sh headers.sed mk_shared_lib.sh
-+	rm -f edit_man.* man_alias.*
- 	rm -rf \${DIRS_TO_MAKE}
- CF_EOF
- 
- # Special case: tack's manpage lives in its own directory.
-+if test "x$cf_with_manpages" = xyes; then
- if test -d tack ; then
- if test -f $srcdir/$tack.h; then
- cat >> Makefile <<CF_EOF
-@@ -18256,6 +18650,7 @@
- CF_EOF
- fi
- fi
-+fi
- 
- rm -f headers.sed headers.sh
- 
-diff -Naur ncurses-5.7.orig/configure.in ncurses-5.7/configure.in
---- ncurses-5.7.orig/configure.in	2008-10-18 07:53:32.000000000 -0700
-+++ ncurses-5.7/configure.in	2009-01-08 19:48:34.000000000 -0800
-@@ -1,5 +1,5 @@
- dnl***************************************************************************
--dnl Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-+dnl Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
- dnl                                                                          *
- dnl Permission is hereby granted, free of charge, to any person obtaining a  *
- dnl copy of this software and associated documentation files (the            *
-@@ -28,14 +28,14 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: configure.in,v 1.454 2008/10/18 14:53:32 tom Exp $
-+dnl $Id: configure.in,v 1.463 2009/01/06 01:40:09 tom Exp $
- dnl Process this file with autoconf to produce a configure script.
- dnl
- dnl See http://invisible-island.net/autoconf/ for additional information.
- dnl
- dnl ---------------------------------------------------------------------------
- AC_PREREQ(2.13.20020210)
--AC_REVISION($Revision: 1.454 $)
-+AC_REVISION($Revision: 1.463 $)
- AC_INIT(ncurses/base/lib_initscr.c)
- AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
- 
-@@ -122,6 +122,13 @@
- 	[cf_with_ada=yes])
- AC_MSG_RESULT($cf_with_ada)
- 
-+AC_MSG_CHECKING(if you want to install manpages)
-+AC_ARG_WITH(manpages,
-+	[  --without-manpages      suppress install of manpages],
-+	[cf_with_manpages=$withval],
-+	[cf_with_manpages=yes])
-+AC_MSG_RESULT($cf_with_manpages)
-+
- AC_MSG_CHECKING(if you want to build programs such as tic)
- AC_ARG_WITH(progs,
- 	[  --without-progs         suppress build with programs (e.g., tic)],
-@@ -152,6 +159,31 @@
- 
- AC_SYS_LONG_FILE_NAMES
- 
-+# if we find pkg-config, check if we should install the ".pc" files.
-+CF_PKG_CONFIG
-+
-+if test "$PKG_CONFIG" != no ; then
-+	AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG)
-+
-+	# Leave this as something that can be overridden in the environment.
-+	if test -z "$PKG_CONFIG_LIBDIR" ; then
-+		PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'`/lib/pkgconfig
-+	fi
-+
-+	if test -d "$PKG_CONFIG_LIBDIR" ; then
-+		AC_ARG_ENABLE(pc-files,
-+			[  --enable-pc-files       generate and install .pc files for pkg-config],
-+			[enable_pc_files=$enableval],
-+			[enable_pc_files=no])
-+		AC_MSG_RESULT($enable_pc_files)
-+	else
-+		AC_MSG_RESULT(no)
-+		AC_MSG_WARN(did not find library $PKG_CONFIG_LIBDIR)
-+		enable_pc_files=no
-+	fi
-+fi
-+AC_SUBST(PKG_CONFIG_LIBDIR)
-+
- AC_MSG_CHECKING(if we should assume mixed-case filenames)
- AC_ARG_ENABLE(mixed-case,
- 	[  --enable-mixed-case     tic should assume mixed-case filenames],
-@@ -176,7 +208,7 @@
- AC_CHECK_TOOL(RANLIB, ranlib, ':')
- AC_CHECK_TOOL(LD, ld, ld)
- AC_CHECK_TOOL(AR, ar, ar)
--CF_SUBST(archiver options,AR_OPTS,rv)
-+CF_AR_FLAGS
- 
- dnl Special option for use by system-builders: the install-prefix is used to
- dnl adjust the location into which the actual install is done, so that an
-@@ -807,7 +839,7 @@
- test "$with_rcs_ids" = yes && AC_DEFINE(USE_RCS_IDS)
- 
- ###############################################################################
--CF_MAN_PAGES([ captoinfo clear infocmp infotocap tic toe tput ])
-+CF_MAN_PAGES([ captoinfo clear infocmp infotocap tabs tic toe tput tset ])
- 
- ###############################################################################
- CF_HELP_MESSAGE(Extensions:)
-@@ -828,10 +860,13 @@
- 	AC_DEFINE(HAVE_USE_DEFAULT_COLORS)
- 	AC_DEFINE(HAVE_WRESIZE)
- 	AC_DEFINE(NCURSES_EXT_FUNCS)
-+	GENERATED_EXT_FUNCS=generated
- else
- 	NCURSES_EXT_FUNCS=0
-+	GENERATED_EXT_FUNCS=
- fi
- AC_SUBST(NCURSES_EXT_FUNCS)
-+AC_SUBST(GENERATED_EXT_FUNCS)
- 
- ###   use option --enable-const to turn on use of const beyond that in XSI.
- AC_MSG_CHECKING(for extended use of const keyword)
-@@ -1354,12 +1389,12 @@
- 	CF_CPP_STATIC_CAST
- 
- 	CXX_AR='$(AR)'
--	CXX_AR_OPTS='$(AR_OPTS)'
-+	CXX_ARFLAGS='$(ARFLAGS)'
- 	case $cf_cv_system_name in #(vi
- 	irix*) #(vi
- 	    if test "$GXX" != yes ; then
- 		CXX_AR='$(CXX)'
--		CXX_AR_OPTS='-ar -o'
-+		CXX_ARFLAGS='-ar -o'
- 	    fi
- 	    ;;
- 	sco3.2v5*) #(vi
-@@ -1368,13 +1403,13 @@
- 	solaris2*)
- 	    if test "$GXX" != yes ; then
- 		CXX_AR='$(CXX)'
--		CXX_AR_OPTS='-xar -o'
-+		CXX_ARFLAGS='-xar -o'
- 	    fi
- 	    ;;
- 	esac
- 	AC_SUBST(CXXLDFLAGS)
- 	AC_SUBST(CXX_AR)
--	AC_SUBST(CXX_AR_OPTS)
-+	AC_SUBST(CXX_ARFLAGS)
- else
- 	cf_cxx_library=no
- 	cf_cv_builtin_bool=1
-@@ -1723,6 +1758,7 @@
- 	AC_MSG_WARN(Wide-character applications must define HAVE_LIBUTF8_H to include curses.h)
- fi
- fi
-+WITH_OVERWRITE=$with_overwrite
- 
- AC_SUBST(WITH_OVERWRITE)
- AC_SUBST(TICS_LIST)
-@@ -1765,8 +1801,19 @@
- CF_SUBST_IF(["$ac_cv_header_termios_h" = yes], HAVE_TERMIOS_H, 1, 0)
- 
- ################################################################################
--test "$use_database" = yes && SUB_MAKEFILES="$SUB_MAKEFILES misc/run_tic.sh:misc/run_tic.in"
-+test "$use_database" = yes && \
-+SUB_MAKEFILES="$SUB_MAKEFILES misc/run_tic.sh:misc/run_tic.in"
-+
- SUB_MAKEFILES="$SUB_MAKEFILES misc/ncurses-config:misc/ncurses-config.in"
-+
-+if test x"$enable_pc_files" = xyes ; then \
-+SUB_MAKEFILES="$SUB_MAKEFILES misc/gen-pkgconfig:misc/gen-pkgconfig.in"
-+MAKE_PC_FILES=
-+else
-+MAKE_PC_FILES="#"
-+fi
-+AC_SUBST(MAKE_PC_FILES)
-+
- AC_OUTPUT( \
- 	include/MKterm.h.awk \
- 	include/curses.head:include/curses.h.in \
-@@ -1796,13 +1843,13 @@
- NCURSES_PATCH="$NCURSES_PATCH"
- SRC_SUBDIRS="$SRC_SUBDIRS"
- TERMINFO="$TERMINFO"
-+TICS_ARG_SUFFIX="$TICS_ARG_SUFFIX"
-+TICS_LIB_SUFFIX="$TICS_LIB_SUFFIX"
-+TICS_NAME="$TICS_NAME"
- TINFO_ARG_SUFFIX="$TINFO_ARG_SUFFIX"
- TINFO_LIB_SUFFIX="$TINFO_LIB_SUFFIX"
- TINFO_NAME="$TINFO_NAME"
- TINFO_SUFFIX="$TINFO_SUFFIX"
--TICS_ARG_SUFFIX="$TICS_ARG_SUFFIX"
--TICS_LIB_SUFFIX="$TICS_LIB_SUFFIX"
--TICS_NAME="$TICS_NAME"
- WITH_CURSES_H="$with_curses_h"
- WITH_ECHO="$with_echo"
- WITH_OVERWRITE="$with_overwrite"
-@@ -1821,6 +1868,7 @@
- cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix"
- cf_cv_system_name="$cf_cv_system_name"
- cf_with_cxx_binding="$cf_with_cxx_binding"
-+cf_with_manpages="$cf_with_manpages"
- host="$host"
- target="$target"
- 
-diff -Naur ncurses-5.7.orig/dist.mk ncurses-5.7/dist.mk
---- ncurses-5.7.orig/dist.mk	2008-11-01 17:58:38.000000000 -0700
-+++ ncurses-5.7/dist.mk	2009-01-08 19:48:34.000000000 -0800
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.671 2008/11/02 00:58:38 tom Exp $
-+# $Id: dist.mk,v 1.681 2009/01/05 23:52:40 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 5
- NCURSES_MINOR = 7
--NCURSES_PATCH = 20081102
-+NCURSES_PATCH = 20090105
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-diff -Naur ncurses-5.7.orig/form/Makefile.in ncurses-5.7/form/Makefile.in
---- ncurses-5.7.orig/form/Makefile.in	2007-04-28 07:56:11.000000000 -0700
-+++ ncurses-5.7/form/Makefile.in	2009-01-08 19:48:30.000000000 -0800
-@@ -1,6 +1,6 @@
--# $Id: Makefile.in,v 1.47 2007/04/28 14:56:11 tom Exp $
-+# $Id: Makefile.in,v 1.48 2009/01/03 19:09:26 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -70,7 +70,7 @@
- INSTALL_DATA	= @INSTALL_DATA@
- 
- AR		= @AR@
--AR_OPTS		= @AR_OPTS@
-+ARFLAGS		= @ARFLAGS@
- AWK		= @AWK@
- LD		= @LD@
- LN_S		= @LN_S@
-diff -Naur ncurses-5.7.orig/form/frm_driver.c ncurses-5.7/form/frm_driver.c
---- ncurses-5.7.orig/form/frm_driver.c	2008-10-18 09:25:00.000000000 -0700
-+++ ncurses-5.7/form/frm_driver.c	2009-01-08 19:48:14.000000000 -0800
-@@ -32,7 +32,7 @@
- 
- #include "form.priv.h"
- 
--MODULE_ID("$Id: frm_driver.c,v 1.88 2008/10/18 16:25:00 tom Exp $")
-+MODULE_ID("$Id: frm_driver.c,v 1.89 2008/12/06 23:08:12 tom Exp $")
- 
- /*----------------------------------------------------------------------------
-   This is the core module of the form library. It contains the majority
-@@ -4366,6 +4366,7 @@
-       delwin(field->working);
-       field->working = newpad(field->drows, field->dcols);
-     }
-+  len = Buffer_Length(field);
-   wclear(field->working);
-   mvwaddstr(field->working, 0, 0, value);
- 
-diff -Naur ncurses-5.7.orig/include/curses.h.in ncurses-5.7/include/curses.h.in
---- ncurses-5.7.orig/include/curses.h.in	2008-08-30 13:11:29.000000000 -0700
-+++ ncurses-5.7/include/curses.h.in	2009-01-08 19:48:22.000000000 -0800
-@@ -32,7 +32,7 @@
-  *     and: Thomas E. Dickey                        1996-on                 *
-  ****************************************************************************/
- 
--/* $Id: curses.h.in,v 1.187 2008/08/30 20:11:29 tom Exp $ */
-+/* $Id: curses.h.in,v 1.190 2008/12/20 22:28:52 tom Exp $ */
- 
- #ifndef __NCURSES_H
- #define __NCURSES_H
-@@ -40,12 +40,6 @@
- #define CURSES 1
- #define CURSES_H 1
- 
--/* This should be defined for the enhanced functionality to be visible.
-- * However, some of the wide-character (enhanced) functionality is missing.
-- * So we do not define it (yet).
--#define _XOPEN_CURSES 1
-- */
--
- /* These are defined only in curses.h, and are used for conditional compiles */
- #define NCURSES_VERSION_MAJOR @NCURSES_MAJOR@
- #define NCURSES_VERSION_MINOR @NCURSES_MINOR@
-@@ -856,18 +850,18 @@
-  * These extensions provide access to information stored in the WINDOW even
-  * when NCURSES_OPAQUE is set:
-  */
--extern NCURSES_EXPORT(WINDOW *) wgetparent (const WINDOW *);	/* generated */
--extern NCURSES_EXPORT(bool) is_cleared (const WINDOW *);	/* generated */
--extern NCURSES_EXPORT(bool) is_idcok (const WINDOW *);		/* generated */
--extern NCURSES_EXPORT(bool) is_idlok (const WINDOW *);		/* generated */
--extern NCURSES_EXPORT(bool) is_immedok (const WINDOW *);	/* generated */
--extern NCURSES_EXPORT(bool) is_keypad (const WINDOW *);		/* generated */
--extern NCURSES_EXPORT(bool) is_leaveok (const WINDOW *);	/* generated */
--extern NCURSES_EXPORT(bool) is_nodelay (const WINDOW *);	/* generated */
--extern NCURSES_EXPORT(bool) is_notimeout (const WINDOW *);	/* generated */
--extern NCURSES_EXPORT(bool) is_scrollok (const WINDOW *);	/* generated */
--extern NCURSES_EXPORT(bool) is_syncok (const WINDOW *);		/* generated */
--extern NCURSES_EXPORT(int) wgetscrreg (const WINDOW *, int *, int *); /* generated */
-+extern NCURSES_EXPORT(WINDOW *) wgetparent (const WINDOW *);	/* @GENERATED_EXT_FUNCS@ */
-+extern NCURSES_EXPORT(bool) is_cleared (const WINDOW *);	/* @GENERATED_EXT_FUNCS@ */
-+extern NCURSES_EXPORT(bool) is_idcok (const WINDOW *);		/* @GENERATED_EXT_FUNCS@ */
-+extern NCURSES_EXPORT(bool) is_idlok (const WINDOW *);		/* @GENERATED_EXT_FUNCS@ */
-+extern NCURSES_EXPORT(bool) is_immedok (const WINDOW *);	/* @GENERATED_EXT_FUNCS@ */
-+extern NCURSES_EXPORT(bool) is_keypad (const WINDOW *);		/* @GENERATED_EXT_FUNCS@ */
-+extern NCURSES_EXPORT(bool) is_leaveok (const WINDOW *);	/* @GENERATED_EXT_FUNCS@ */
-+extern NCURSES_EXPORT(bool) is_nodelay (const WINDOW *);	/* @GENERATED_EXT_FUNCS@ */
-+extern NCURSES_EXPORT(bool) is_notimeout (const WINDOW *);	/* @GENERATED_EXT_FUNCS@ */
-+extern NCURSES_EXPORT(bool) is_scrollok (const WINDOW *);	/* @GENERATED_EXT_FUNCS@ */
-+extern NCURSES_EXPORT(bool) is_syncok (const WINDOW *);		/* @GENERATED_EXT_FUNCS@ */
-+extern NCURSES_EXPORT(int) wgetscrreg (const WINDOW *, int *, int *); /* @GENERATED_EXT_FUNCS@ */
- 
- #else
- #define curses_version() NCURSES_VERSION
-diff -Naur ncurses-5.7.orig/include/curses.tail ncurses-5.7/include/curses.tail
---- ncurses-5.7.orig/include/curses.tail	2008-07-05 13:20:38.000000000 -0700
-+++ ncurses-5.7/include/curses.tail	2009-01-08 19:48:09.000000000 -0800
-@@ -1,4 +1,4 @@
--/* $Id: curses.tail,v 1.16 2008/07/05 20:20:38 tom Exp $ */
-+/* $Id: curses.tail,v 1.17 2008/11/23 00:12:12 tom Exp $ */
- /*
-  * vile:cmode:
-  * This file is part of ncurses, designed to be appended after curses.h.in
-@@ -94,6 +94,7 @@
- }
- MEVENT;
- 
-+extern NCURSES_EXPORT(bool) has_mouse (void);
- extern NCURSES_EXPORT(int) getmouse (MEVENT *);
- extern NCURSES_EXPORT(int) ungetmouse (MEVENT *);
- extern NCURSES_EXPORT(mmask_t) mousemask (mmask_t, mmask_t *);
-diff -Naur ncurses-5.7.orig/include/curses.wide ncurses-5.7/include/curses.wide
---- ncurses-5.7.orig/include/curses.wide	2007-03-10 09:52:23.000000000 -0800
-+++ ncurses-5.7/include/curses.wide	2009-01-08 19:48:12.000000000 -0800
-@@ -1,9 +1,11 @@
--/* $Id: curses.wide,v 1.34 2007/03/10 17:52:23 tom Exp $ */
-+/* $Id: curses.wide,v 1.36 2008/11/29 18:44:08 tom Exp $ */
- /*
-  * vile:cmode:
-  * This file is part of ncurses, designed to be appended after curses.h.in
-  * (see that file for the relevant copyright).
-  */
-+#define _XOPEN_CURSES 1
-+
- #ifdef _XOPEN_SOURCE_EXTENDED
- 
- extern NCURSES_EXPORT_VAR(cchar_t *) _nc_wacs;
-diff -Naur ncurses-5.7.orig/man/curs_mouse.3x ncurses-5.7/man/curs_mouse.3x
---- ncurses-5.7.orig/man/curs_mouse.3x	2006-12-30 15:43:34.000000000 -0800
-+++ ncurses-5.7/man/curs_mouse.3x	2009-01-08 19:48:09.000000000 -0800
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,11 +27,12 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_mouse.3x,v 1.30 2006/12/30 23:43:34 tom Exp $
-+.\" $Id: curs_mouse.3x,v 1.31 2008/11/23 00:09:53 tom Exp $
- .TH curs_mouse 3X ""
- .na
- .hy 0
- .SH NAME
-+\fBhas_mouse\fR,
- \fBgetmouse\fR, \fBungetmouse\fR,
- \fBmousemask\fR, \fBwenclose\fR,
- \fBmouse_trafo\fR, \fBwmouse_trafo\fR,
-@@ -53,7 +54,9 @@
- MEVENT;\fR
- .fi
- .br
--\fBint getmouse(MEVENT *event);\fR
-+\fBbool has_mouse(void);\fR
-+.br
-+-\fBint getmouse(MEVENT *event);\fR
- .br
- \fBint ungetmouse(MEVENT *event);\fR
- .br
-@@ -197,6 +200,9 @@
- Use \fBmouseinterval(-1)\fR to obtain the interval without altering it.
- The default is one sixth of a second.
- .PP
-+The \fBhas_mouse\fP function returns TRUE if the mouse driver has been
-+successfully initialized.
-+.PP
- Note that mouse events will be ignored when input is in cooked mode, and will
- cause an error beep when cooked mode is being simulated in a window by a
- function such as \fBgetstr\fR that expects a linefeed for input-loop
-diff -Naur ncurses-5.7.orig/man/keybound.3x ncurses-5.7/man/keybound.3x
---- ncurses-5.7.orig/man/keybound.3x	2006-02-25 13:47:06.000000000 -0800
-+++ ncurses-5.7/man/keybound.3x	2009-01-08 19:48:18.000000000 -0800
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1999-2003,2006 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1999-2006,2008 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -28,8 +28,8 @@
- .\"
- .\" Author: Thomas E. Dickey 1999
- .\"
--.\" $Id: keybound.3x,v 1.6 2006/02/25 21:47:06 tom Exp $
--.TH keyok 3X ""
-+.\" $Id: keybound.3x,v 1.7 2008/12/13 18:19:07 Frederic.Culot Exp $
-+.TH keybound 3X ""
- .SH NAME
- \fBkeybound\fP \- return definition of keycode
- .SH SYNOPSIS
-diff -Naur ncurses-5.7.orig/man/tabs.1 ncurses-5.7/man/tabs.1
---- ncurses-5.7.orig/man/tabs.1	1969-12-31 16:00:00.000000000 -0800
-+++ ncurses-5.7/man/tabs.1	2009-01-08 19:48:01.000000000 -0800
-@@ -0,0 +1,143 @@
-+.\"***************************************************************************
-+.\" Copyright (c) 2008 Free Software Foundation, Inc.                        *
-+.\"                                                                          *
-+.\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+.\" copy of this software and associated documentation files (the            *
-+.\" "Software"), to deal in the Software without restriction, including      *
-+.\" without limitation the rights to use, copy, modify, merge, publish,      *
-+.\" distribute, distribute with modifications, sublicense, and/or sell       *
-+.\" copies of the Software, and to permit persons to whom the Software is    *
-+.\" furnished to do so, subject to the following conditions:                 *
-+.\"                                                                          *
-+.\" The above copyright notice and this permission notice shall be included  *
-+.\" in all copies or substantial portions of the Software.                   *
-+.\"                                                                          *
-+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-+.\" IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-+.\" DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-+.\" OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-+.\" THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-+.\"                                                                          *
-+.\" Except as contained in this notice, the name(s) of the above copyright   *
-+.\" holders shall not be used in advertising or otherwise to promote the     *
-+.\" sale, use or other dealings in this Software without prior written       *
-+.\" authorization.                                                           *
-+.\"***************************************************************************
-+.\"
-+.\" $Id: tabs.1,v 1.2 2008/11/15 23:03:45 tom Exp $
-+.TH @TABS@ 1M ""
-+.ds n 5
-+.SH NAME
-+\fBtabs\fR - set tabs on a terminal
-+.SH SYNOPSIS
-+\fBtabs\fR [\fB-v\fR[\fIn\fR]] [\fB-ahuUV\fR] \fIfile...\fR
-+.br
-+.SH DESCRIPTION
-+.PP
-+The \fBtabs\fP program clears and sets tab-stops on the terminal.
-+This uses the terminfo \fIclear_all_tabs\fP and \fIset_tab\fP capabilities.
-+If either is absent, \fBtabs\fP is unable to clear/set tab-stops.
-+The terminal should be configured to use hard tabs, e.g.,
-+.sp
-+.RS
-+stty tab0
-+.RE
-+.SH OPTIONS
-+.SS General Options
-+.TP 5
-+.BI -T "name"
-+Tell \fBtabs\fP which terminal type to use.
-+If this option is not given, \fBtabs\fP will use the \fB$TERM\fP
-+environment variable.
-+If that is not set, it will use the \fIansi+tabs\fP entry.
-+.TP 5
-+.B -d
-+The debugging option shows a ruler line, followed by two data lines.
-+The first data line shows the expected tab-stops marked with asterisks.
-+The second data line shows the actual tab-stops, marked with asterisks.
-+.TP 5
-+.B -n
-+This option tells \fBtabs\fP to check the options and run any debugging
-+option, but not to modify the terminal settings.
-+.PP
-+The \fBtabs\fP program processes a single list of tab stops.
-+The last option to be processed which defines a list is the one that
-+determines the list to be processed.
-+.SS Implicit Lists
-+Use a single number as an option, e.g., "\fB-5\fP" to set tabs at the given
-+interval (in this case 1, 6, 11, 16, 21, etc.).  Tabs are repeated up to
-+the right margin of the screen.
-+.SS Explicit Lists
-+An explicit list can be defined after the options (this does not use a "-").
-+The values in the list must be in increasing numeric order, and greater than
-+zero.  They are separated by a comma or a blank, for example,
-+.sp
-+.RS
-+tabs 1,6,11,16,21
-+.br
-+tabs 1 6 11 16 21
-+.RE
-+Use a '+' to treat a number as an increment relative to the previous value,
-+e.g.,
-+.sp
-+.RS
-+tabs 1,+5,+5,+5,+5
-+.RE
-+which is equivalent to the 1,6,11,16,21 example.
-+.SS Predefined Tab-Stops
-+X/Open defines several predefined lists of tab stops.
-+.TP 5
-+.B -a
-+Assembler, IBM S/370, first format
-+.TP 5
-+.B -a2
-+Assembler, IBM S/370, second format
-+.TP 5
-+.B -c
-+COBOL, normal format
-+.TP 5
-+.B -c2
-+COBOL compact format
-+.TP 5
-+.B -c3
-+COBOL compact format extended
-+.TP 5
-+.B -f
-+FORTRAN
-+.TP 5
-+.B -p
-+PL/I
-+.TP 5
-+.B -s
-+SNOBOL
-+.TP 5
-+.B -u
-+UNIVAC 1100 Assembler
-+.SH PORTABILITY
-+.PP
-+X/Open describes a \fB+m\fP option, to set a terminal's left-margin.
-+None of the entries in the terminal database provide this capability.
-+.PP
-+The \fB-d\fP (debug) and \fB-n\fP (no-op) options are extensions not provided
-+by other implementations.
-+.PP
-+Documentation for other implementations states that there is a limit on the
-+number of tab stops.  While some terminals may not accept an arbitrary number
-+of tab stops, this implementation will attempt to set tab stops up to the
-+right margin of the screen, if the given list happens to be that long.
-+.SH SEE ALSO
-+\fB@TSET@\fR(1),
-+\fB@INFOCMP@\fR(1M),
-+\fBcurses\fR(3X),
-+\fBterminfo\fR(\*n).
-+.PP
-+This describes \fBncurses\fR
-+version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
-+.\"#
-+.\"# The following sets edit modes for GNU EMACS
-+.\"# Local Variables:
-+.\"# mode:nroff
-+.\"# fill-column:79
-+.\"# End:
-diff -Naur ncurses-5.7.orig/man/tset.1 ncurses-5.7/man/tset.1
---- ncurses-5.7.orig/man/tset.1	2006-12-24 07:00:30.000000000 -0800
-+++ ncurses-5.7/man/tset.1	2009-01-08 19:48:01.000000000 -0800
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,8 +26,8 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: tset.1,v 1.19 2006/12/24 15:00:30 tom Exp $
--.TH tset 1 ""
-+.\" $Id: tset.1,v 1.20 2008/11/15 23:14:06 tom Exp $
-+.TH @TSET@ 1 ""
- .SH NAME
- \fBtset\fR, \fBreset\fR - terminal initialization
- .SH SYNOPSIS
-diff -Naur ncurses-5.7.orig/menu/Makefile.in ncurses-5.7/menu/Makefile.in
---- ncurses-5.7.orig/menu/Makefile.in	2007-04-28 07:56:11.000000000 -0700
-+++ ncurses-5.7/menu/Makefile.in	2009-01-08 19:48:30.000000000 -0800
-@@ -1,6 +1,6 @@
--# $Id: Makefile.in,v 1.48 2007/04/28 14:56:11 tom Exp $
-+# $Id: Makefile.in,v 1.49 2009/01/03 19:09:26 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -70,7 +70,7 @@
- INSTALL_DATA	= @INSTALL_DATA@
- 
- AR		= @AR@
--AR_OPTS		= @AR_OPTS@
-+ARFLAGS		= @ARFLAGS@
- AWK		= @AWK@
- LD		= @LD@
- LN_S		= @LN_S@
-diff -Naur ncurses-5.7.orig/misc/Makefile.in ncurses-5.7/misc/Makefile.in
---- ncurses-5.7.orig/misc/Makefile.in	2007-03-31 08:54:17.000000000 -0700
-+++ ncurses-5.7/misc/Makefile.in	2009-01-08 19:48:30.000000000 -0800
-@@ -1,6 +1,6 @@
--# $Id: Makefile.in,v 1.43 2007/03/31 15:54:17 tom Exp $
-+# $Id: Makefile.in,v 1.48 2009/01/03 23:52:41 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -66,9 +66,11 @@
- source		= @TERMINFO_SRC@
- 
- INSTALL		= @INSTALL@
--INSTALL_PROG	= @INSTALL_PROGRAM@
-+INSTALL_PROG	= @INSTALL_SCRIPT@
- INSTALL_DATA	= @INSTALL_DATA@
- 
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+
- ################################################################################
- all :	terminfo.tmp
- 
-@@ -103,9 +105,16 @@
- 
- NCURSES_CONFIG	= ncurses@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config
- 
--install.libs : $(DESTDIR)$(bindir) ncurses-config
-+install.libs :: $(DESTDIR)$(bindir) ncurses-config
- 	$(INSTALL_PROG) ncurses-config $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
- 
-+@MAKE_PC_FILES@install.libs :: pc-files
-+@MAKE_PC_FILES@	$(SHELL) -c 'for name in *.pc; do $(INSTALL_DATA) $$name $(PKG_CONFIG_LIBDIR)/$$name; done'
-+
-+@MAKE_PC_FILES@pc-files :
-+@MAKE_PC_FILES@	$(SHELL) ./gen-pkgconfig
-+@MAKE_PC_FILES@	touch $@
-+
- terminfo.tmp : run_tic.sed $(source)
- 	echo '** adjusting tabset paths'
- 	sed -f run_tic.sed $(source) >terminfo.tmp
-@@ -130,6 +139,7 @@
- 
- uninstall.libs :
- 	-rm -f $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
-+@MAKE_PC_FILES@	$(SHELL) 'for name in *.pc; do rm -f $(PKG_CONFIG_LIBDIR)/$$name; done'
- 
- tags :
- 
-@@ -138,11 +148,13 @@
- mostlyclean :
- 	-rm -f terminfo.tmp
- 	-rm -f run_tic.sed
-+@MAKE_PC_FILES@	-rm -f *.pc pc-files
- 	-rm -f core tags TAGS *~ *.bak *.ln *.atac trace
- 
- clean :: mostlyclean
- 
- distclean : clean
-+@MAKE_PC_FILES@	-rm -f gen-pkgconfig
- 	-rm -f Makefile run_tic.sh ncurses-config
- 
- realclean : distclean
-diff -Naur ncurses-5.7.orig/misc/gen-pkgconfig.in ncurses-5.7/misc/gen-pkgconfig.in
---- ncurses-5.7.orig/misc/gen-pkgconfig.in	1969-12-31 16:00:00.000000000 -0800
-+++ ncurses-5.7/misc/gen-pkgconfig.in	2009-01-08 19:48:32.000000000 -0800
-@@ -0,0 +1,119 @@
-+#!@SHELL@
-+# $Id: gen-pkgconfig.in,v 1.4 2009/01/04 21:52:33 tom Exp $
-+##############################################################################
-+# Copyright (c) 2009 Free Software Foundation, Inc.                          #
-+#                                                                            #
-+# Permission is hereby granted, free of charge, to any person obtaining a    #
-+# copy of this software and associated documentation files (the "Software"), #
-+# to deal in the Software without restriction, including without limitation  #
-+# the rights to use, copy, modify, merge, publish, distribute, distribute    #
-+# with modifications, sublicense, and/or sell copies of the Software, and to #
-+# permit persons to whom the Software is furnished to do so, subject to the  #
-+# following conditions:                                                      #
-+#                                                                            #
-+# The above copyright notice and this permission notice shall be included in #
-+# all copies or substantial portions of the Software.                        #
-+#                                                                            #
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,   #
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL    #
-+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER      #
-+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING    #
-+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER        #
-+# DEALINGS IN THE SOFTWARE.                                                  #
-+#                                                                            #
-+# Except as contained in this notice, the name(s) of the above copyright     #
-+# holders shall not be used in advertising or otherwise to promote the sale, #
-+# use or other dealings in this Software without prior written               #
-+# authorization.                                                             #
-+##############################################################################
-+#
-+# Author: Thomas E. Dickey, 2009
-+#
-+# The complete configure script for ncurses is the ncurses5-config (or similar
-+# name, depending on the flavor, e.g., ncursesw5-config, ncurses6-config, etc).
-+# That provides more information than pkg-config, and is the portable and
-+# recommended solution.
-+#
-+# For each library, generate a ".pc" file which depends on the base ncurses
-+# library, except that the tinfo library does not depend on ncurses.
-+LIB_NAME=@LIB_NAME@
-+TINFO_NAME=@TINFO_NAME@
-+DFT_DEP_SUFFIX=@DFT_DEP_SUFFIX@
-+CXX_LIB_SUFFIX=@CXX_LIB_SUFFIX@
-+
-+prefix="@prefix@"
-+exec_prefix="@exec_prefix@"
-+includedir="@includedir@"
-+libdir="@libdir@"
-+
-+show_prefix='@prefix@'
-+show_exec_prefix='@exec_prefix@'
-+show_includedir='@includedir@'
-+show_libdir='@libdir@'
-+
-+MAIN_LIBRARY="${LIB_NAME}@DFT_ARG_SUFFIX@"
-+SUB_LIBRARY="${TINFO_NAME}@DFT_ARG_SUFFIX@"
-+
-+for lib in ../lib/*
-+do
-+	name=`basename $lib`
-+	root=`basename $name "$DFT_DEP_SUFFIX"`
-+	if test "$name" == "$root" ; then
-+		root=`basename $name "$CXX_LIB_SUFFIX"`
-+		if test "$name" == "$root" ; then
-+			continue
-+		fi
-+	fi
-+
-+	name=`echo "$name" | sed -e 's/^lib//' -e 's/\..*$//'`
-+
-+	desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"
-+	if test $name = $MAIN_LIBRARY ; then
-+		reqs=
-+		desc="$desc library"
-+	elif test $name = $SUB_LIBRARY ; then
-+		reqs=
-+		desc="$desc terminal interface library"
-+	else
-+		reqs=$MAIN_LIBRARY
-+		desc="$desc add-on library"
-+	fi
-+
-+	if test "$includedir" = "/usr/include" ; then
-+		cflags=
-+	else
-+		cflags="-I\${includedir}"
-+	fi
-+
-+	if test "$libdir" = "/usr/lib" ; then
-+		libs=
-+	else
-+		libs="-L\${libdir}"
-+	fi
-+	libs="$libs -l$name"
-+
-+	# add dependencies that pkg-config cannot guess about
-+	if test -z "$reqs" ; then
-+		libs="$libs @LIBS@"
-+	fi
-+
-+	echo "** creating ${name}.pc"
-+	cat >${name}.pc <<EOF
-+prefix=$show_prefix
-+exec_prefix=$show_exec_prefix
-+libdir=$show_libdir
-+includedir=$show_includedir
-+major_version=@NCURSES_MAJOR@
-+version=@NCURSES_MAJOR@.@NCURSES_MINOR@.@NCURSES_PATCH@
-+
-+Name: $name
-+Description: $desc
-+Version: \${version}
-+Requires: $reqs
-+Libs: $libs
-+Cflags: $cflags
-+EOF
-+	# pr -f ${name}.pc
-+done
-+# vile:shmode
-diff -Naur ncurses-5.7.orig/misc/ncurses-config.in ncurses-5.7/misc/ncurses-config.in
---- ncurses-5.7.orig/misc/ncurses-config.in	2007-03-17 13:02:19.000000000 -0700
-+++ ncurses-5.7/misc/ncurses-config.in	2009-01-08 19:48:34.000000000 -0800
-@@ -1,7 +1,7 @@
- #!@SHELL@
--# $Id: ncurses-config.in,v 1.12 2007/03/17 20:02:19 tom Exp $
-+# $Id: ncurses-config.in,v 1.21 2009/01/06 01:06:21 tom Exp $
- ##############################################################################
--# Copyright (c) 2006,2007 Free Software Foundation, Inc.                     #
-+# Copyright (c) 2006-2007,2009 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -28,58 +28,54 @@
- # authorization.                                                             #
- ##############################################################################
- #
--# Author: Thomas E. Dickey, 2006
-+# Author: Thomas E. Dickey, 2006-on
- 
- prefix="@prefix@"
- exec_prefix="@exec_prefix@"
- 
- bindir="@bindir@"
-+includedir="@includedir@"
- libdir="@libdir@"
- datadir="@datadir@"
- mandir="@mandir@"
- 
--THIS="ncurses@DFT_ARG_SUFFIX@"
-+THIS="@LIB_NAME@@DFT_ARG_SUFFIX@"
- 
- LANG=C;		export LANG
- LANGUAGE=C;	export LANGUAGE
- LC_ALL=C;	export LC_ALL
- LC_CTYPE=C;	export LC_CTYPE
- 
--test $# = 0 && exec @SHELL@ $0 --error
--
--while test $# -gt 0; do
--	case "$1" in
--	-*=*)
--		ARG=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
--		;;
--	*)
--		ARG=
-+# with --disable-overwrite, we installed into a subdirectory, but transformed
-+# the headers to include like this:
-+#	<ncurses@LIB_SUFFIX@/curses.h>
-+if test x@WITH_OVERWRITE@ = xno ; then
-+	case $includedir in
-+	$prefix/include/ncurses@LIB_SUFFIX@)
-+		includedir=`echo "$includedir" | sed -e 's,/[^/]*$,,'`
- 		;;
- 	esac
-+fi
- 
-+test $# = 0 && exec @SHELL@ $0 --error
-+
-+while test $# -gt 0; do
- 	case "$1" in
- 	# basic configuration
--	--prefix=*)
--		prefix="$ARG"
--		test -z "$exec_prefix" && exec_prefix="$ARG"
--		;;
- 	--prefix)
- 		echo "$prefix"
- 		;;
--	--exec-prefix=*)
--		exec_prefix="$ARG"
--		;;
- 	--exec-prefix)
- 		echo "$exec_prefix"
- 		;;
- 	# compile/link
- 	--cflags)
- 		INCS=
--		if test "${prefix}/include" != /usr/include ; then
--			INCS="-I${prefix}/include"
-+		if test "${includedir}" != /usr/include ; then
-+			INCS="-I${includedir}"
- 		fi
--		if test "@WITH_OVERWRITE@" != no ; then
--			INCS="$INCS -I${prefix}/include/${THIS}"
-+		if test "x@WITH_OVERWRITE@" == xno ; then
-+			INCS="$INCS -I${includedir}/${THIS}"
- 		fi
- 		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
- 			$INCS
-@@ -87,7 +83,7 @@
- 		;;
- 	--libs)
- 		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
--			-L${exec_prefix}/lib @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
-+			-L$libdir @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
- ENDECHO
- 		;;
- 	# identification
-@@ -107,6 +103,9 @@
- 	--datadir)
- 		echo "${datadir}"
- 		;;
-+	--includedir)
-+		echo "${includedir}"
-+		;;
- 	--libdir)
- 		echo "${libdir}"
- 		;;
-@@ -129,9 +128,7 @@
- 
- Options:
-   --prefix           echos the package-prefix of ${THIS}
--  --prefix=ARG       sets the package-prefix of ${THIS}
-   --exec-prefix      echos the executable-prefix of ${THIS}
--  --exec-prefix=ARG  sets the executable-prefix of ${THIS}
- 
-   --cflags           echos the C compiler flags needed to compile with ${THIS}
-   --libs             echos the libraries needed to link with ${THIS}
-@@ -142,6 +139,7 @@
- 
-   --bindir           echos the directory containing ${THIS} programs
-   --datadir          echos the directory containing ${THIS} data
-+  --includedir       echos the directory containing ${THIS} header files
-   --libdir           echos the directory containing ${THIS} libraries
-   --mandir           echos the directory containing ${THIS} manpages
-   --terminfo         echos the \$TERMINFO terminfo database path
-diff -Naur ncurses-5.7.orig/misc/terminfo.src ncurses-5.7/misc/terminfo.src
---- ncurses-5.7.orig/misc/terminfo.src	2008-10-12 16:03:54.000000000 -0700
-+++ ncurses-5.7/misc/terminfo.src	2009-01-08 19:48:12.000000000 -0800
-@@ -6,8 +6,8 @@
- # Report bugs and new terminal descriptions to
- #	bug-ncurses@gnu.org
- #
--#	$Revision: 1.341 $
--#	$Date: 2008/10/12 23:03:54 $
-+#	$Revision: 1.343 $
-+#	$Date: 2008/11/29 15:27:35 $
- #
- # The original header is preserved below for reference.  It is noted that there
- # is a "newer" version which differs in some cosmetic details (but actually
-@@ -340,7 +340,7 @@
- 	cub=\E[%p1%dD, cud=\E[%p1%dB, cuf=\E[%p1%dC,
- 	cuu=\E[%p1%dA, use=ansi+local1,
- ansi+tabs,
--	cbt=\E[Z, ht=^I, hts=\EH, tbc=\E[2g,
-+	cbt=\E[Z, ht=^I, hts=\EH, tbc=\E[3g,
- ansi+inittabs,
- 	it#8, use=ansi+tabs,
- ansi+erase,
-@@ -545,7 +545,7 @@
- 	cud1=\E[B, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A,
- 	dch1=\E[P, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
- 	hts=\EH, il1=\E[L, ind=^J, kbs=^H, kcub1=\E[D, kcud1=\E[B,
--	kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, tbc=\E[2g,
-+	kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, tbc=\E[3g,
- 	use=klone+sgr-dumb,
- pcansi-25-m|pcansi25m|ibm-pc terminal programs with 25 lines (mono mode),
- 	lines#25, use=pcansi-m,
-@@ -576,7 +576,7 @@
- 	kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
- 	kich1=\E[L, mc4=\E[4i, mc5=\E[5i, nel=\r\E[S,
- 	rep=%p1%c\E[%p2%{1}%-%db, rin=\E[%p1%dT, s0ds=\E(B,
--	s1ds=\E)B, s2ds=\E*B, s3ds=\E+B, tbc=\E[2g,
-+	s1ds=\E)B, s2ds=\E*B, s3ds=\E+B, tbc=\E[3g,
- 	vpa=\E[%i%p1%dd, use=pcansi-m,
- 
- ansi+enq|ncurses extension for ANSI ENQ,
-@@ -1005,7 +1005,7 @@
- 	sc=\E7,
- 	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,
- 	sgr0=\E[0;10m, smacs=\E[12m, smso=\E[7m, smul=\E[4m,
--	tbc=\E[2g, vpa=\E[%i%p1%dd, use=klone+color,
-+	tbc=\E[3g, vpa=\E[%i%p1%dd, use=klone+color,
- # (pc6300plus: removed ":KM=/usr/lib/ua/kmap.s5:"; renamed BO/EE/CI/CV -- esr)
- pc6300plus|AT&T 6300 plus,
- 	OTbs, am, xon,
-@@ -1416,7 +1416,7 @@
- 	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
- 	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%;,
- 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smso=\E[7m,
--	smul=\E[4m, tbc=\E[2g,
-+	smul=\E[4m, tbc=\E[3g,
- 	tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH,
- #
- qansi|QNX ansi with console writes,
-@@ -4357,6 +4357,26 @@
- 	sgr0=\E[m, smcup=\E7\E[?47h, smir=\E[4h, smso=\E[7m,
- 	smul=\E[4m,
- 
-+# The codes supported by the term.el terminal emulation in GNU Emacs 22.2
-+eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96,
-+	am, mir, msgr, xenl,
-+	colors#8, cols#80, lines#24, pairs#64,
-+	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=^M,
-+	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
-+	cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
-+	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
-+	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J,
-+	el=\E[K, el1=\E[1K, home=\E[H, ht=^I, ich=\E[%p1%d@,
-+	il=\E[%p1%dL, il1=\E[L, ind=^J, invis=\E[8m, kbs=\177,
-+	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-+	kdch1=\E[3~, kend=\E[4~, khome=\E[1~, kich1=\E[2~,
-+	knp=\E[6~, kpp=\E[5~, op=\E[39;49m, rc=\E8, rev=\E[7m,
-+	ri=\EM, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
-+	sc=\E7, setab=\E[%p1%'('%+%dm, setaf=\E[%p1%{30}%+%dm,
-+	sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;m,
-+	sgr0=\E[m, smir=\E[4h, smso=\E[7m, smul=\E[4m,
-+	u6=\E[%i%d;%dR, u7=\E[6n,
-+
- # Entries for use by the `screen' program by Juergen Weigert,
- # Michael Schroeder, Oliver Laumann.  The screen and
- # screen-w entries came with version 3.7.1.  The screen2 and screen3 entries
-@@ -5247,7 +5267,7 @@
- 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
- 	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,
- 	sgr0=\E[0;10m, smacs=\E[11m, smir=\E[4h, smso=\E[7m,
--	smul=\E[4m, tbc=\E[2g, vpa=\E[%i%p1%dd, use=vt102+enq,
-+	smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=vt102+enq,
- 
- # Key definitions:
- # The encodings for unshifted arrow keys, F1-F12, Home, Insert, etc.  match the
-@@ -11060,7 +11080,7 @@
- 	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m,
- 	sgr0=\E[m,
- 	smkx=\EP`>z~[[J`8xz~[[A`4xz~[[D`6xz~[[C`2xz~[[B\E\\,
--	smm=\E[>52h, smso=\E[7m, smul=\E[4m, tbc=\E[2g,
-+	smm=\E[>52h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
- 	vpa=\E[%p1%{1}%+%dd,
- 
- aaa+rv|ann arbor ambassador in reverse video,
-@@ -12147,7 +12167,7 @@
- 	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m,
- 	sgr0=\E[m, smacs=\017$<1>, smcup=\E[=4l\E[1;24w\E2\r,
- 	smir=\E[4h, smkx=\E[1!z\E[0;3u, smso=\E[7m, smul=\E[4m,
--	tbc=\E[2g, vpa=\E[%p1%{1}%+%dd,
-+	tbc=\E[3g, vpa=\E[%p1%{1}%+%dd,
- avt-rv-ns|concept avt in reverse video mode/no status line,
- 	flash=\E[=205l$<200>\E[=205h, is1=\E[=103l\E[=205h,
- 	use=avt-ns,
-@@ -14584,7 +14604,7 @@
- 	sc=\E[%y,
- 	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%;,
- 	sgr0=\E[0m\017, smir=\E[4h, smso=\E[7m, smul=\E[4m,
--	tbc=\E[2g, tsl=\E[%i%p1%d%%}, vpa=\E[%i%p1%dd,
-+	tbc=\E[3g, tsl=\E[%i%p1%d%%}, vpa=\E[%i%p1%dd,
- 
- # p9-w: Prism-9 in 132 column mode
- # --------------------------------
-@@ -16037,7 +16057,7 @@
- 	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, rmam=\E[?7l,
- 	rmso=\E[m, rmul=\E[m,
- 	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m,
--	sgr0=\E[m, smam=\E[?7h, smso=\E[7m, smul=\E[4m, tbc=\E[2g,
-+	sgr0=\E[m, smam=\E[?7h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
- 	vpa=\E[%p1%{1}%+%dd,
- # The tek4125 emulates a vt100 incorrectly - the scrolling region
- # command is ignored.  The following entry replaces <csr> with the needed
-@@ -17729,7 +17749,7 @@
- 	rmul=\E[m, rs2=\E[?=h\Ec, s0ds=^O, s1ds=^N,
- 	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%;,
- 	sgr0=\E[m\017, smacs=^N, smcup=\E[?>h\EPY99\:98\E\\,
--	smir=\E[4h, smso=\E[0;7m, smul=\E[0;4m, tbc=\E[2g,
-+	smir=\E[4h, smso=\E[0;7m, smul=\E[0;4m, tbc=\E[3g,
- 	tsl=\EPY99\:98\E\\\E[0;98v\E[2;7m,
- tws2102-sna|dku7102-sna|BULL Questar tws2102 for SNA,
- 	dsl=\E[0;98v\E[2J\E[v, fsl=\E[v, is3=\Eb, tsl=\E[0;98v,
-@@ -21791,6 +21811,13 @@
- #	* add "aterm" -TD
- #	* add "linux2.6.26" -TD
- #
-+# 2008-11-15
-+#	* change several \E[2g (clear tab at current column) to \E[3g
-+#	  (clear all tabs) to match definition for tbc capability -TD
-+#
-+# 2008-11-29
-+#	* add eterm-color -TD
-+#
- # The following sets edit modes for GNU EMACS.
- # Local Variables:
- # fill-prefix:"\t"
-diff -Naur ncurses-5.7.orig/mk-1st.awk ncurses-5.7/mk-1st.awk
---- ncurses-5.7.orig/mk-1st.awk	2007-03-24 15:10:55.000000000 -0700
-+++ ncurses-5.7/mk-1st.awk	2009-01-08 19:48:32.000000000 -0800
-@@ -1,6 +1,6 @@
--# $Id: mk-1st.awk,v 1.78 2007/03/24 22:10:55 tom Exp $
-+# $Id: mk-1st.awk,v 1.80 2009/01/04 21:51:38 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -59,7 +59,7 @@
- 		return ( subset ~ /^ticlib$/ );
- 	}
- function is_termlib() {
--		return ( subset ~ /^(ticlib\+)?termlib(\+ext_tinfo)?$/ );
-+		return ( subset ~ /^(ticlib\+)?termlib((\+[^+ ]+)*\+ext_tinfo)?$/ );
- 	}
- # see lib_name
- function lib_name_of(a_name) {
-@@ -404,7 +404,7 @@
- 			{
- 				end_name = lib_name;
- 				printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS
--				printf "\t$(AR) $(AR_OPTS) $@ $?\n"
-+				printf "\t$(AR) $(ARFLAGS) $@ $?\n"
- 				printf "\t$(RANLIB) $@\n"
- 				if ( host == "vxworks" )
- 				{
-diff -Naur ncurses-5.7.orig/ncurses/Makefile.in ncurses-5.7/ncurses/Makefile.in
---- ncurses-5.7.orig/ncurses/Makefile.in	2008-10-18 07:11:54.000000000 -0700
-+++ ncurses-5.7/ncurses/Makefile.in	2009-01-08 19:48:30.000000000 -0800
-@@ -1,6 +1,6 @@
--# $Id: Makefile.in,v 1.113 2008/10/18 14:11:54 tom Exp $
-+# $Id: Makefile.in,v 1.114 2009/01/03 19:09:26 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -78,7 +78,7 @@
- INSTALL_DATA	= @INSTALL_DATA@
- 
- AR		= @AR@
--AR_OPTS		= @AR_OPTS@
-+ARFLAGS		= @ARFLAGS@
- AWK		= @AWK@
- LD		= @LD@
- LN_S		= @LN_S@
-diff -Naur ncurses-5.7.orig/ncurses/base/lib_addch.c ncurses-5.7/ncurses/base/lib_addch.c
---- ncurses-5.7.orig/ncurses/base/lib_addch.c	2008-08-16 12:20:04.000000000 -0700
-+++ ncurses-5.7/ncurses/base/lib_addch.c	2009-01-08 19:48:12.000000000 -0800
-@@ -36,7 +36,7 @@
- #include <curses.priv.h>
- #include <ctype.h>
- 
--MODULE_ID("$Id: lib_addch.c,v 1.113 2008/08/16 19:20:04 tom Exp $")
-+MODULE_ID("$Id: lib_addch.c,v 1.114 2008/11/29 21:02:10 tom Exp $")
- 
- static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
- 
-@@ -265,15 +265,25 @@
- 	    int len = _nc_build_wch(win, CHREF(ch));
- 
- 	    if (len >= -1) {
--		/* handle EILSEQ */
-+		attr_t attr = AttrOf(ch);
-+
-+		/* handle EILSEQ (i.e., when len >= -1) */
- 		if (is8bits(CharOf(ch))) {
-+		    int rc = OK;
- 		    const char *s = unctrl((chtype) CharOf(ch));
--		    if (s[1] != 0) {
--			return waddstr(win, s);
-+
-+		    if (s[1] != '\0') {
-+			while (*s != '\0') {
-+			    rc = waddch(win, UChar(*s) | attr);
-+			    if (rc != OK)
-+				break;
-+			    ++s;
-+			}
-+			return rc;
- 		    }
- 		}
- 		if (len == -1)
--		    return waddch(win, ' ');
-+		    return waddch(win, ' ' | attr);
- 	    } else {
- 		return OK;
- 	    }
-diff -Naur ncurses-5.7.orig/ncurses/base/lib_freeall.c ncurses-5.7/ncurses/base/lib_freeall.c
---- ncurses-5.7.orig/ncurses/base/lib_freeall.c	2008-09-27 06:09:57.000000000 -0700
-+++ ncurses-5.7/ncurses/base/lib_freeall.c	2009-01-08 19:48:14.000000000 -0800
-@@ -40,7 +40,7 @@
- extern int malloc_errfd;	/* FIXME */
- #endif
- 
--MODULE_ID("$Id: lib_freeall.c,v 1.54 2008/09/27 13:09:57 tom Exp $")
-+MODULE_ID("$Id: lib_freeall.c,v 1.55 2008/12/06 23:52:29 tom Exp $")
- 
- /*
-  * Free all ncurses data.  This is used for testing only (there's no practical
-@@ -98,8 +98,6 @@
- 	delscreen(SP);
- 	_nc_unlock_global(curses);
-     }
--    if (cur_term != 0)
--	del_curterm(cur_term);
- 
-     (void) _nc_printf_string(0, empty_va);
- #ifdef TRACE
-diff -Naur ncurses-5.7.orig/ncurses/base/lib_mouse.c ncurses-5.7/ncurses/base/lib_mouse.c
---- ncurses-5.7.orig/ncurses/base/lib_mouse.c	2008-10-18 14:48:55.000000000 -0700
-+++ ncurses-5.7/ncurses/base/lib_mouse.c	2009-01-08 19:48:15.000000000 -0800
-@@ -79,7 +79,7 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_mouse.c,v 1.102 2008/10/18 21:48:55 tom Exp $")
-+MODULE_ID("$Id: lib_mouse.c,v 1.104 2008/11/30 01:37:27 tom Exp $")
- 
- #include <term.h>
- #include <tic.h>
-@@ -694,11 +694,16 @@
- 
- #if USE_GPM_SUPPORT
-     case M_GPM:
--	{
-+	if (sp->_mouse_fd >= 0) {
- 	    /* query server for event, return TRUE if we find one */
- 	    Gpm_Event ev;
- 
--	    if (my_Gpm_GetEvent(&ev) == 1) {
-+	    switch (my_Gpm_GetEvent(&ev)) {
-+	    case 0:
-+		/* Connection closed, drop the mouse. */
-+		sp->_mouse_fd = -1;
-+		break;
-+	    case 1:
- 		/* there's only one mouse... */
- 		eventp->id = NORMAL_EVENT;
- 
-@@ -731,6 +736,7 @@
- 		/* bump the next-free pointer into the circular list */
- 		sp->_mouse_eventp = eventp = NEXT(eventp);
- 		result = TRUE;
-+		break;
- 	    }
- 	}
- 	break;
-@@ -1397,10 +1403,16 @@
- 
- /* This may be used by other routines to ask for the existence of mouse
-    support */
--NCURSES_EXPORT(int)
--_nc_has_mouse(void)
-+NCURSES_EXPORT(bool)
-+_nc_has_mouse(SCREEN *sp)
-+{
-+    return ((sp->_mouse_type == M_NONE) ? FALSE : TRUE);
-+}
-+
-+NCURSES_EXPORT(bool)
-+has_mouse(void)
- {
--    return (SP->_mouse_type == M_NONE ? 0 : 1);
-+    return _nc_has_mouse(SP);
- }
- 
- NCURSES_EXPORT(bool)
-diff -Naur ncurses-5.7.orig/ncurses/curses.priv.h ncurses-5.7/ncurses/curses.priv.h
---- ncurses-5.7.orig/ncurses/curses.priv.h	2008-10-04 14:37:45.000000000 -0700
-+++ ncurses-5.7/ncurses/curses.priv.h	2009-01-08 19:48:09.000000000 -0800
-@@ -34,7 +34,7 @@
- 
- 
- /*
-- * $Id: curses.priv.h,v 1.394 2008/10/04 21:37:45 tom Exp $
-+ * $Id: curses.priv.h,v 1.395 2008/11/23 00:09:04 tom Exp $
-  *
-  *	curses.priv.h
-  *
-@@ -1519,7 +1519,7 @@
- extern NCURSES_EXPORT(void) _nc_screen_wrap (void);
- 
- /* lib_mouse.c */
--extern NCURSES_EXPORT(int) _nc_has_mouse (void);
-+extern NCURSES_EXPORT(bool) _nc_has_mouse (SCREEN *);
- 
- /* lib_mvcur.c */
- #define INFINITY	1000000	/* cost: too high to use */
-diff -Naur ncurses-5.7.orig/ncurses/tinfo/entries.c ncurses-5.7/ncurses/tinfo/entries.c
---- ncurses-5.7.orig/ncurses/tinfo/entries.c	2008-09-27 06:11:10.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/entries.c	2009-01-08 19:48:15.000000000 -0800
-@@ -37,7 +37,7 @@
- #include <tic.h>
- #include <term_entry.h>
- 
--MODULE_ID("$Id: entries.c,v 1.8 2008/09/27 13:11:10 tom Exp $")
-+MODULE_ID("$Id: entries.c,v 1.10 2008/12/07 00:11:45 tom Exp $")
- 
- /****************************************************************************
-  *
-@@ -117,6 +117,9 @@
- 
-     T((T_CALLED("_nc_free_tinfo()")));
- #if NO_LEAKS
-+    if (cur_term != 0)
-+	del_curterm(cur_term);
-+
-     _nc_free_tparm();
-     _nc_tgetent_leaks();
-     _nc_free_entries(_nc_head);
-diff -Naur ncurses-5.7.orig/ncurses/tinfo/hashed_db.c ncurses-5.7/ncurses/tinfo/hashed_db.c
---- ncurses-5.7.orig/ncurses/tinfo/hashed_db.c	2006-08-19 12:48:38.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/hashed_db.c	2009-01-08 19:48:18.000000000 -0800
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2006 Free Software Foundation, Inc.                        *
-+ * Copyright (c) 2006,2008 Free Software Foundation, Inc.                   *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -27,7 +27,7 @@
-  ****************************************************************************/
- 
- /****************************************************************************
-- *  Author: Thomas E. Dickey                        2006                    *
-+ *  Author: Thomas E. Dickey                        2006-on                 *
-  ****************************************************************************/
- 
- #include <curses.priv.h>
-@@ -36,7 +36,7 @@
- 
- #if USE_HASHED_DB
- 
--MODULE_ID("$Id: hashed_db.c,v 1.13 2006/08/19 19:48:38 tom Exp $")
-+MODULE_ID("$Id: hashed_db.c,v 1.14 2008/12/13 20:59:02 tom Exp $")
- 
- #if HASHED_DB_API >= 2
- static DBC *cursor;
-@@ -49,27 +49,30 @@
- _nc_db_open(const char *path, bool modify)
- {
-     DB *result = 0;
-+    int code;
- 
- #if HASHED_DB_API >= 4
-     db_create(&result, NULL, 0);
--    result->open(result,
--		 NULL,
--		 path,
--		 NULL,
--		 DB_HASH,
--		 modify ? DB_CREATE : DB_RDONLY,
--		 0644);
-+    if ((code = result->open(result,
-+			     NULL,
-+			     path,
-+			     NULL,
-+			     DB_HASH,
-+			     modify ? DB_CREATE : DB_RDONLY,
-+			     0644)) != 0) {
-+	result = 0;
-+    }
- #elif HASHED_DB_API >= 3
-     db_create(&result, NULL, 0);
--    result->open(result,
--		 path,
--		 NULL,
--		 DB_HASH,
--		 modify ? DB_CREATE : DB_RDONLY,
--		 0644);
-+    if ((code = result->open(result,
-+			     path,
-+			     NULL,
-+			     DB_HASH,
-+			     modify ? DB_CREATE : DB_RDONLY,
-+			     0644)) != 0) {
-+	result = 0;
-+    }
- #elif HASHED_DB_API >= 2
--    int code;
--
-     if ((code = db_open(path,
- 			DB_HASH,
- 			modify ? DB_CREATE : DB_RDONLY,
-@@ -77,21 +80,22 @@
- 			(DB_ENV *) 0,
- 			(DB_INFO *) 0,
- 			&result)) != 0) {
--	T(("cannot open %s: %s", path, strerror(code)));
- 	result = 0;
--    } else {
--	T(("opened %s", path));
-     }
- #else
--    result = dbopen(path,
--		    modify ? (O_CREAT | O_RDWR) : O_RDONLY,
--		    0644,
--		    DB_HASH,
--		    NULL);
-+    if ((result = dbopen(path,
-+			 modify ? (O_CREAT | O_RDWR) : O_RDONLY,
-+			 0644,
-+			 DB_HASH,
-+			 NULL)) == 0) {
-+	code = errno;
-+    }
-+#endif
-     if (result != 0) {
- 	T(("opened %s", path));
-+    } else {
-+	T(("cannot open %s: %s", path, strerror(code)));
-     }
--#endif
-     return result;
- }
- 
-diff -Naur ncurses-5.7.orig/panel/Makefile.in ncurses-5.7/panel/Makefile.in
---- ncurses-5.7.orig/panel/Makefile.in	2007-04-28 07:56:11.000000000 -0700
-+++ ncurses-5.7/panel/Makefile.in	2009-01-08 19:48:30.000000000 -0800
-@@ -1,6 +1,6 @@
--# $Id: Makefile.in,v 1.52 2007/04/28 14:56:11 tom Exp $
-+# $Id: Makefile.in,v 1.53 2009/01/03 19:09:26 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -71,7 +71,7 @@
- INSTALL_DATA	= @INSTALL_DATA@
- 
- AR		= @AR@
--AR_OPTS		= @AR_OPTS@
-+ARFLAGS		= @ARFLAGS@
- AWK		= @AWK@
- LD		= @LD@
- LN_S		= @LN_S@
-diff -Naur ncurses-5.7.orig/progs/Makefile.in ncurses-5.7/progs/Makefile.in
---- ncurses-5.7.orig/progs/Makefile.in	2008-09-07 06:58:55.000000000 -0700
-+++ ncurses-5.7/progs/Makefile.in	2009-01-08 19:48:01.000000000 -0800
-@@ -1,6 +1,6 @@
--# $Id: Makefile.in,v 1.79 2008/09/07 13:58:55 tom Exp $
-+# $Id: Makefile.in,v 1.80 2008/11/15 19:04:19 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -124,7 +124,7 @@
- 	transform.h
- 
- # tic relies on direct access to the terminfo database
--GET_PROGS = infocmp$x clear$x tput$x tset$x toe$x
-+GET_PROGS = infocmp$x clear$x tabs$x tput$x tset$x toe$x
- PUT_PROGS = @MAKE_TERMINFO@ tic$x
- PROGS = $(PUT_PROGS) $(GET_PROGS)
- 
-@@ -159,6 +159,7 @@
- actual_infotocap = `echo infotocap$x| $(TRANSFORM)`
- actual_init      = `echo init$x|      $(TRANSFORM)`
- actual_reset     = `echo reset$x|     $(TRANSFORM)`
-+actual_tabs      = `echo tabs$x|      $(TRANSFORM)`
- actual_tic       = `echo tic$x|       $(TRANSFORM)`
- actual_toe       = `echo toe$x|       $(TRANSFORM)`
- actual_tput      = `echo tput$x|      $(TRANSFORM)`
-@@ -187,6 +188,7 @@
- @MAKE_TERMINFO@	(cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_captoinfo))
- 	$(LIBTOOL_INSTALL) $(INSTALL_PROG) infocmp$x $(DESTDIR)$(bindir)/$(actual_infocmp)
- 	$(LIBTOOL_INSTALL) $(INSTALL_PROG) clear$x   $(DESTDIR)$(bindir)/$(actual_clear)
-+	$(LIBTOOL_INSTALL) $(INSTALL_PROG) tabs$x    $(DESTDIR)$(bindir)/$(actual_tabs)
- 	$(LIBTOOL_INSTALL) $(INSTALL_PROG) tput$x    $(DESTDIR)$(bindir)/$(actual_tput)
- 	$(LIBTOOL_INSTALL) $(INSTALL_PROG) tset$x    $(DESTDIR)$(bindir)/$(actual_tset)
- 	@echo "linking $(actual_reset) to $(actual_tset)"
-@@ -200,6 +202,7 @@
- @MAKE_TERMINFO@	-@rm -f $(DESTDIR)$(bindir)/$(actual_infotocap)
- 	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_infocmp)
- 	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_clear)
-+	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tabs)
- 	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tput)
- 	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tset)
- 	-@rm -f $(DESTDIR)$(bindir)/$(actual_reset)
-@@ -230,6 +233,12 @@
- clear$x: $(DEPS_CLEAR) $(DEPS_CURSES)
- 	@ECHO_LINK@ $(LINK) $(DEPS_CLEAR) $(LDFLAGS_TINFO) -o $@
- 
-+DEPS_TABS = \
-+	$(MODEL)/tabs$o
-+
-+tabs$x: $(DEPS_TABS) $(DEPS_TABS)
-+	@ECHO_LINK@ $(LINK) $(DEPS_TABS) $(LDFLAGS_TINFO) -o $@
-+
- DEPS_TPUT = \
- 	$(MODEL)/tput$o
- 
-@@ -289,6 +298,7 @@
- @MAKE_TERMINFO@	$(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/toe.c     $(srcdir)/dump_entry.c $(LINT_LIBS)
- 	$(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/clear.c                          $(LINT_LIBS)
- 	$(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/infocmp.c $(srcdir)/dump_entry.c $(LINT_LIBS)
-+	$(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/tabs.c                           $(LINT_LIBS)
- 	$(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/tput.c                           $(LINT_LIBS)
- 	$(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/tset.c    $(srcdir)/dump_entry.c $(LINT_LIBS)
- 
-diff -Naur ncurses-5.7.orig/progs/modules ncurses-5.7/progs/modules
---- ncurses-5.7.orig/progs/modules	2006-12-23 16:53:21.000000000 -0800
-+++ ncurses-5.7/progs/modules	2009-01-08 19:48:01.000000000 -0800
-@@ -1,7 +1,7 @@
--# $Id: modules,v 1.13 2006/12/24 00:53:21 tom Exp $
-+# $Id: modules,v 1.14 2008/11/15 16:26:48 tom Exp $
- # Program modules (some are in ncurses lib!)
- ##############################################################################
--# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -37,6 +37,7 @@
- toe		progs		$(srcdir)	$(HEADER_DEPS)             $(srcdir)/dump_entry.h
- dump_entry	progs		$(srcdir)	$(HEADER_DEPS)             $(srcdir)/dump_entry.h ../include/parametrized.h $(INCDIR)/capdefaults.c termsort.c
- infocmp		progs		$(srcdir)	$(HEADER_DEPS)             $(srcdir)/dump_entry.h
-+tabs		progs		$(srcdir)	$(HEADER_DEPS)
- tput		progs		$(srcdir)	$(HEADER_DEPS) transform.h termsort.c
- tset		progs		$(srcdir)	$(HEADER_DEPS) transform.h $(srcdir)/dump_entry.h ../include/termcap.h
- 
-diff -Naur ncurses-5.7.orig/progs/tabs.c ncurses-5.7/progs/tabs.c
---- ncurses-5.7.orig/progs/tabs.c	1969-12-31 16:00:00.000000000 -0800
-+++ ncurses-5.7/progs/tabs.c	2009-01-08 19:48:09.000000000 -0800
-@@ -0,0 +1,506 @@
-+/****************************************************************************
-+ * Copyright (c) 2008 Free Software Foundation, Inc.                        *
-+ *                                                                          *
-+ * Permission is hereby granted, free of charge, to any person obtaining a  *
-+ * copy of this software and associated documentation files (the            *
-+ * "Software"), to deal in the Software without restriction, including      *
-+ * without limitation the rights to use, copy, modify, merge, publish,      *
-+ * distribute, distribute with modifications, sublicense, and/or sell       *
-+ * copies of the Software, and to permit persons to whom the Software is    *
-+ * furnished to do so, subject to the following conditions:                 *
-+ *                                                                          *
-+ * The above copyright notice and this permission notice shall be included  *
-+ * in all copies or substantial portions of the Software.                   *
-+ *                                                                          *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-+ *                                                                          *
-+ * Except as contained in this notice, the name(s) of the above copyright   *
-+ * holders shall not be used in advertising or otherwise to promote the     *
-+ * sale, use or other dealings in this Software without prior written       *
-+ * authorization.                                                           *
-+ ****************************************************************************/
-+
-+/****************************************************************************
-+ *  Author: Thomas E. Dickey                        2008                    *
-+ ****************************************************************************/
-+
-+/*
-+ * tabs.c --  set terminal hard-tabstops
-+ */
-+
-+#define USE_LIBTINFO
-+#include <progs.priv.h>
-+
-+MODULE_ID("$Id: tabs.c,v 1.15 2008/11/23 00:47:51 tom Exp $")
-+
-+static void usage(void) GCC_NORETURN;
-+
-+static int max_cols;
-+
-+static int
-+putch(int c)
-+{
-+    return putchar(c);
-+}
-+
-+static void
-+do_tabs(int *tab_list)
-+{
-+    int last = 1;
-+    int stop;
-+
-+    putchar('\r');
-+    while ((stop = *tab_list++) > 0) {
-+	if (last < stop) {
-+	    while (last++ < stop) {
-+		if (last > max_cols)
-+		    break;
-+		putchar(' ');
-+	    }
-+	}
-+	if (stop <= max_cols) {
-+	    tputs(tparm(set_tab, stop), 1, putch);
-+	    last = stop;
-+	} else {
-+	    break;
-+	}
-+    }
-+    putchar('\n');
-+}
-+
-+static int *
-+decode_tabs(const char *tab_list)
-+{
-+    int *result = typeCalloc(int, strlen(tab_list) + (unsigned) max_cols);
-+    int n = 0;
-+    int value = 0;
-+    int prior = 0;
-+    int ch;
-+
-+    if (result != 0) {
-+	while ((ch = *tab_list++) != '\0') {
-+	    if (isdigit(UChar(ch))) {
-+		value *= 10;
-+		value += (ch - '0');
-+	    } else if (ch == ',') {
-+		result[n] = value + prior;
-+		if (n > 0 && value <= result[n - 1]) {
-+		    fprintf(stderr,
-+			    "tab-stops are not in increasing order\n");
-+		    free(result);
-+		    result = 0;
-+		    break;
-+		}
-+		++n;
-+		value = 0;
-+		prior = 0;
-+	    } else if (ch == '+') {
-+		if (n)
-+		    prior = result[n - 1];
-+	    }
-+	}
-+    }
-+
-+    if (result != 0) {
-+	/*
-+	 * If there is only one value, then it is an option such as "-8".
-+	 */
-+	if ((n == 0) && (value > 0)) {
-+	    int step = value;
-+	    while (n < max_cols - 1) {
-+		result[n++] = value;
-+		value += step;
-+	    }
-+	}
-+
-+	/*
-+	 * Add the last value, if any.
-+	 */
-+	result[n++] = value;
-+	result[n] = 0;
-+    }
-+    return result;
-+}
-+
-+static void
-+print_ruler(int *tab_list)
-+{
-+    int last = 0;
-+    int stop;
-+    int n;
-+
-+    /* first print a readable ruler */
-+    for (n = 0; n < max_cols; n += 10) {
-+	int ch = 1 + (n / 10);
-+	char buffer[20];
-+	sprintf(buffer, "----+----%c",
-+		((ch < 10)
-+		 ? (ch + '0')
-+		 : (ch + 'A' - 10)));
-+	printf("%.*s", ((max_cols - n) > 10) ? 10 : (max_cols - n), buffer);
-+    }
-+    putchar('\n');
-+
-+    /* now, print '*' for each stop */
-+    for (n = 0, last = 0; (tab_list[n] > 0) && (last < max_cols); ++n) {
-+	stop = tab_list[n];
-+	while (++last < stop) {
-+	    if (last <= max_cols) {
-+		putchar('-');
-+	    } else {
-+		break;
-+	    }
-+	}
-+	if (last <= max_cols) {
-+	    putchar('*');
-+	    last = stop;
-+	} else {
-+	    break;
-+	}
-+    }
-+    while (++last <= max_cols)
-+	putchar('-');
-+    putchar('\n');
-+}
-+
-+/*
-+ * Write an '*' on each tabstop, to demonstrate whether it lines up with the
-+ * ruler.
-+ */
-+static void
-+write_tabs(int *tab_list)
-+{
-+    int stop;
-+
-+    while ((stop = *tab_list++) > 0 && stop <= max_cols) {
-+	fputs((stop == 1) ? "*" : "\t*", stdout);
-+    };
-+    /* also show a tab _past_ the stops */
-+    if (stop < max_cols)
-+	fputs("\t+", stdout);
-+    putchar('\n');
-+}
-+
-+/*
-+ * Trim leading/trailing blanks, as well as blanks after a comma.
-+ * Convert embedded blanks to commas.
-+ */
-+static char *
-+trimmed_tab_list(const char *source)
-+{
-+    char *result = strdup(source);
-+    int ch, j, k, last;
-+
-+    if (result != 0) {
-+	for (j = k = last = 0; result[j] != 0; ++j) {
-+	    ch = UChar(result[j]);
-+	    if (isspace(ch)) {
-+		if (last == '\0') {
-+		    continue;
-+		} else if (isdigit(last) || last == ',') {
-+		    ch = ',';
-+		}
-+	    } else if (ch == ',') {
-+		;
-+	    } else {
-+		if (last == ',')
-+		    result[k++] = last;
-+		result[k++] = ch;
-+	    }
-+	    last = ch;
-+	}
-+	result[k] = '\0';
-+    }
-+    return result;
-+}
-+
-+static bool
-+comma_is_needed(const char *source)
-+{
-+    bool result = FALSE;
-+
-+    if (source != 0) {
-+	unsigned len = strlen(source);
-+	if (len != 0)
-+	    result = (source[len - 1] != ',');
-+    } else {
-+	result = FALSE;
-+    }
-+    return result;
-+}
-+
-+/*
-+ * Add a command-line parameter to the tab-list.  It can be blank- or comma-
-+ * separated (or a mixture).  For simplicity, empty tabs are ignored, e.g.,
-+ *	tabs 1,,6,11
-+ *	tabs 1,6,11
-+ * are treated the same.
-+ */
-+static const char *
-+add_to_tab_list(char **append, const char *value)
-+{
-+    char *result = *append;
-+    char *copied = trimmed_tab_list(value);
-+
-+    if (copied != 0 && *copied != '\0') {
-+	const char *comma = ",";
-+	unsigned need = 1 + strlen(copied);
-+
-+	if (*copied == ',')
-+	    comma = "";
-+	else if (!comma_is_needed(*append))
-+	    comma = "";
-+
-+	need += strlen(comma);
-+	if (*append != 0)
-+	    need += strlen(*append);
-+
-+	result = malloc(need);
-+	if (result != 0) {
-+	    *result = '\0';
-+	    if (*append != 0) {
-+		strcpy(result, *append);
-+		free(*append);
-+	    }
-+	    strcat(result, comma);
-+	    strcat(result, copied);
-+	}
-+
-+	*append = result;
-+    }
-+    return result;
-+}
-+
-+/*
-+ * Check for illegal characters in the tab-list.
-+ */
-+static bool
-+legal_tab_list(const char *program, const char *tab_list)
-+{
-+    bool result = TRUE;
-+
-+    if (tab_list != 0 && *tab_list != '\0') {
-+	if (comma_is_needed(tab_list)) {
-+	    int n, ch;
-+	    for (n = 0; tab_list[n] != '\0'; ++n) {
-+		ch = UChar(tab_list[n]);
-+		if (!(isdigit(ch) || ch == ',')) {
-+		    fprintf(stderr,
-+			    "%s: unexpected character found '%c'\n",
-+			    program, ch);
-+		    result = FALSE;
-+		    break;
-+		}
-+	    }
-+	} else {
-+	    fprintf(stderr, "%s: trailing comma found '%s'\n", program, tab_list);
-+	    result = FALSE;
-+	}
-+    } else {
-+	fprintf(stderr, "%s: no tab-list given\n", program);
-+	result = FALSE;
-+    }
-+    return result;
-+}
-+
-+static void
-+usage(void)
-+{
-+    static const char *msg[] =
-+    {
-+	"Usage: tabs [options] [tabstop-list]"
-+	,""
-+	,"Options:"
-+	,"  -0       reset tabs"
-+	,"  -8       set tabs to standard interval"
-+	,"  -a       Assembler, IBM S/370, first format"
-+	,"  -a2      Assembler, IBM S/370, second format"
-+	,"  -c       COBOL, normal format"
-+	,"  -c2      COBOL compact format"
-+	,"  -c3      COBOL compact format extended"
-+	,"  -d       debug (show ruler with expected/actual tab positions)"
-+	,"  -f       FORTRAN"
-+	,"  -n       no-op (do not modify terminal settings)"
-+	,"  -p       PL/I"
-+	,"  -s       SNOBOL"
-+	,"  -u       UNIVAC 1100 Assembler"
-+	,"  -T name  use terminal type 'name'"
-+	,""
-+	,"A tabstop-list is an ordered list of column numbers, e.g., 1,11,21"
-+	,"or 1,+10,+10 which is the same."
-+    };
-+    unsigned n;
-+
-+    fflush(stdout);
-+    for (n = 0; n < SIZEOF(msg); ++n) {
-+	fprintf(stderr, "%s\n", msg[n]);
-+    }
-+    ExitProgram(EXIT_FAILURE);
-+}
-+
-+int
-+main(int argc, char *argv[])
-+{
-+    int rc = EXIT_FAILURE;
-+    bool debug = FALSE;
-+    bool no_op = FALSE;
-+    int n, ch;
-+    NCURSES_CONST char *term_name = 0;
-+    const char *mar_list = 0;	/* ignored */
-+    char *append = 0;
-+    const char *tab_list = 0;
-+
-+    if ((term_name = getenv("TERM")) == 0)
-+	term_name = "ansi+tabs";
-+
-+    /* cannot use getopt, since some options are two-character */
-+    for (n = 1; n < argc; ++n) {
-+	char *option = argv[n];
-+	switch (option[0]) {
-+	case '-':
-+	    while ((ch = *++option) != '\0') {
-+		switch (ch) {
-+		case 'a':
-+		    switch (*option) {
-+		    case '\0':
-+			tab_list = "1,10,16,36,72";
-+			/* Assembler, IBM S/370, first format */
-+			break;
-+		    case '2':
-+			tab_list = "1,10,16,40,72";
-+			/* Assembler, IBM S/370, second format */
-+			break;
-+		    default:
-+			usage();
-+		    }
-+		    break;
-+		case 'c':
-+		    switch (*option) {
-+		    case '\0':
-+			tab_list = "1,8,12,16,20,55";
-+			/* COBOL, normal format */
-+			break;
-+		    case '2':
-+			tab_list = "1,6,10,14,49";
-+			/* COBOL compact format */
-+			break;
-+		    case '3':
-+			tab_list = "1,6,10,14,18,22,26,30,34,38,42,46,50,54,58,62,67";
-+			/* COBOL compact format extended */
-+			break;
-+		    default:
-+			usage();
-+		    }
-+		    break;
-+		case 'd':	/* ncurses extension */
-+		    debug = TRUE;
-+		    break;
-+		case 'f':
-+		    tab_list = "1,7,11,15,19,23";
-+		    /* FORTRAN */
-+		    break;
-+		case 'n':	/* ncurses extension */
-+		    no_op = TRUE;
-+		    break;
-+		case 'p':
-+		    tab_list = "1,5,9,13,17,21,25,29,33,37,41,45,49,53,57,61";
-+		    /* PL/I */
-+		    break;
-+		case 's':
-+		    tab_list = "1,10,55";
-+		    /* SNOBOL */
-+		    break;
-+		case 'u':
-+		    tab_list = "1,12,20,44";
-+		    /* UNIVAC 1100 Assembler */
-+		    break;
-+		case 'T':
-+		    ++n;
-+		    if (*++option != '\0') {
-+			term_name = option;
-+		    } else {
-+			term_name = argv[n++];
-+		    }
-+		    option += ((int) strlen(option)) - 1;
-+		    continue;
-+		default:
-+		    if (isdigit(UChar(*option))) {
-+			tab_list = option;
-+			++n;
-+		    } else {
-+			usage();
-+		    }
-+		    option += ((int) strlen(option)) - 1;
-+		    break;
-+		}
-+	    }
-+	    break;
-+	case '+':
-+	    while ((ch = *++option) != '\0') {
-+		switch (ch) {
-+		case 'm':
-+		    mar_list = option;
-+		    break;
-+		default:
-+		    usage();
-+		}
-+	    }
-+	    break;
-+	default:
-+	    if (append != 0) {
-+		if (tab_list != (const char *) append) {
-+		    /* one of the predefined options was used */
-+		    free(append);
-+		    append = 0;
-+		}
-+	    }
-+	    tab_list = add_to_tab_list(&append, option);
-+	    option += ((int) strlen(option)) - 1;
-+	    break;
-+	}
-+    }
-+
-+    setupterm(term_name, STDOUT_FILENO, (int *) 0);
-+
-+    max_cols = (columns > 0) ? columns : 80;
-+
-+    if (!VALID_STRING(clear_all_tabs)) {
-+	fprintf(stderr,
-+		"%s: terminal type '%s' cannot reset tabs\n",
-+		argv[0], term_name);
-+    } else if (!VALID_STRING(set_tab)) {
-+	fprintf(stderr,
-+		"%s: terminal type '%s' cannot set tabs\n",
-+		argv[0], term_name);
-+    } else if (legal_tab_list(argv[0], tab_list)) {
-+	int *list = decode_tabs(tab_list);
-+
-+	if (!no_op)
-+	    tputs(clear_all_tabs, 1, putch);
-+
-+	if (list != 0) {
-+	    if (!no_op)
-+		do_tabs(list);
-+	    if (debug) {
-+		fflush(stderr);
-+		printf("tabs %s\n", tab_list);
-+		print_ruler(list);
-+		write_tabs(list);
-+	    }
-+	    free(list);
-+	} else if (debug) {
-+	    fflush(stderr);
-+	    printf("tabs %s\n", tab_list);
-+	}
-+	rc = EXIT_SUCCESS;
-+    }
-+    if (append != 0)
-+	free(append);
-+    ExitProgram(rc);
-+}
-diff -Naur ncurses-5.7.orig/test/README ncurses-5.7/test/README
---- ncurses-5.7.orig/test/README	2008-10-18 14:02:45.000000000 -0700
-+++ ncurses-5.7/test/README	2009-01-08 19:48:22.000000000 -0800
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: README,v 1.38 2008/10/18 21:02:45 tom Exp $
-+-- $Id: README,v 1.39 2008/12/20 23:38:13 tom Exp $
- -------------------------------------------------------------------------------
- 
- The programs in this directory are designed to test your newest toy :-)
-@@ -87,7 +87,7 @@
- field_status			test: demo_forms
- field_term			-
- field_type			test: demo_forms
--field_userptr			test: edit_field ncurses
-+field_userptr			test: demo_forms edit_field ncurses
- form_driver			test: cardfile demo_forms edit_field ncurses
- form_fields			test: cardfile demo_forms
- form_init			-
-@@ -211,7 +211,7 @@
- ----------
- BC				-
- COLORS				test: echochar ncurses savescreen xmas
--COLOR_PAIR			test: background blue bs cardfile demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
-+COLOR_PAIR			test: background blue bs cardfile clip_printw demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
- COLOR_PAIRS			test: echochar ncurses newdemo savescreen
- COLS				test: cardfile demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto echochar edit_field firework foldkeys hashtest inch_wide inchs ins_wide inserts lrtest movewindow ncurses newdemo rain savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm
- ESCDELAY			test: test_opaque
-@@ -239,9 +239,9 @@
- attr_set			test: ncurses
- attroff				test: echochar filter gdc ncurses tclock
- attron				test: bs echochar filter gdc ncurses
--attrset				test: bs firework gdc hanoi ncurses rain tclock testaddch testcurs
-+attrset				test: bs firework gdc hanoi insdelln ncurses rain tclock testaddch testcurs
- baudrate			lib: ncurses
--beep				test: blue bs cardfile chgat demo_forms demo_menus demo_panels edit_field hanoi inch_wide inchs ins_wide inserts knight movewindow ncurses savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view xmas
-+beep				test: blue bs cardfile chgat clip_printw demo_forms demo_menus demo_panels edit_field hanoi inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view xmas
- bkgd				test: background cardfile demo_forms ncurses savescreen tclock view
- bkgdset				test: background ncurses testaddch
- bkgrnd				test: ncurses
-@@ -251,10 +251,10 @@
- boolnames			test: test_arrays progs: dump_entry infocmp
- border				-
- border_set			-
--box				test: cardfile chgat demo_forms demo_menus demo_panels ditto edit_field inch_wide inchs ins_wide inserts lrtest ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
-+box				test: cardfile chgat clip_printw demo_forms demo_menus demo_panels ditto edit_field inch_wide inchs ins_wide insdelln inserts lrtest ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
- box_set				test: ncurses
- can_change_color		test: ncurses
--cbreak				test: background blue bs cardfile chgat color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto filter firework foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest movewindow ncurses newdemo savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
-+cbreak				test: background blue bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto filter firework foldkeys gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses newdemo savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
- chgat				test: chgat
- clear				test: blue bs gdc ncurses testcurs xmas
- clearok				test: bs knight
-@@ -263,7 +263,7 @@
- color_content			test: ncurses
- color_set			test: color_set ncurses
- copywin				test: ncurses testcurs
--cur_term			test: dots dots_mvcur lrtest progs: clear tput tset
-+cur_term			test: dots dots_mvcur lrtest progs: clear tabs tput tset
- curs_set			test: echochar firework gdc hanoi lrtest ncurses newdemo rain savescreen tclock testcurs worm xmas
- curscr				test: demo_panels edit_field knight lrtest ncurses savescreen tclock view
- curses_version			test: ncurses progs: infocmp tic toe tput tset
-@@ -273,16 +273,16 @@
- del_curterm			lib: ncurses
- delay_output			test: newdemo
- delch				-
--deleteln			-
-+deleteln			test: insdelln
- delscreen			test: ditto dots_mvcur
--delwin				test: cardfile chgat demo_forms demo_panels edit_field inch_wide inchs ins_wide inserts movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
--derwin				test: cardfile chgat demo_forms demo_menus ditto inch_wide inchs ins_wide inserts movewindow ncurses test_get_wstr test_getstr test_instr test_inwstr test_opaque
-+delwin				test: cardfile chgat clip_printw demo_forms demo_panels edit_field inch_wide inchs ins_wide insdelln inserts movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
-+derwin				test: cardfile chgat clip_printw demo_forms demo_menus ditto inch_wide inchs ins_wide insdelln inserts movewindow ncurses test_get_wstr test_getstr test_instr test_inwstr test_opaque
- doupdate			test: cardfile demo_menus demo_panels ditto edit_field ins_wide inserts knight movewindow ncurses redraw savescreen test_get_wstr test_getstr
- dupwin				test: edit_field
- echo				test: bs hanoi ncurses test_get_wstr test_getstr testcurs testscanw
- echo_wchar			test: ncurses
- echochar			test: echochar ncurses
--endwin				test: background blue bs cardfile chgat color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto dots_mvcur echochar filter firework firstlast foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts key_names keynames knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
-+endwin				test: background blue bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto dots_mvcur echochar filter firework firstlast foldkeys gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
- erase				test: cardfile demo_menus filter firework firstlast hanoi lrtest ncurses tclock test_opaque testcurs
- erasechar			lib: ncurses
- erasewchar			-
-@@ -292,16 +292,16 @@
- get_wch				-
- get_wstr			test: test_get_wstr
- getattrs			-
--getbegx				test: chgat demo_menus demo_panels movewindow ncurses newdemo redraw testcurs
--getbegy				test: chgat demo_menus demo_panels movewindow ncurses newdemo redraw testcurs
-+getbegx				test: chgat clip_printw demo_menus demo_panels insdelln movewindow ncurses newdemo redraw testcurs
-+getbegy				test: chgat clip_printw demo_menus demo_panels insdelln movewindow ncurses newdemo redraw testcurs
- getbkgd				test: ncurses
- getbkgrnd			test: ncurses
- getcchar			test: ncurses view
--getch				test: background blue bs chgat color_set demo_altkeys filter firework firstlast foldkeys hanoi hashtest lrtest savescreen tclock test_opaque testaddch testcurs view xmas
--getcurx				test: bs chgat demo_altkeys demo_defkey demo_panels foldkeys movewindow ncurses redraw savescreen test_get_wstr test_getstr test_opaque testcurs
--getcury				test: bs chgat demo_altkeys demo_defkey demo_panels edit_field foldkeys movewindow ncurses redraw savescreen test_opaque testcurs
--getmaxx				test: chgat demo_panels inch_wide inchs movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
--getmaxy				test: chgat demo_forms demo_panels inch_wide inchs movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
-+getch				test: background blue bs chgat color_set demo_altkeys filter firework firstlast foldkeys hanoi hashtest insdelln lrtest savescreen tclock test_opaque testaddch testcurs view xmas
-+getcurx				test: bs chgat clip_printw demo_altkeys demo_defkey demo_panels foldkeys insdelln movewindow ncurses redraw savescreen test_get_wstr test_getstr test_opaque testcurs
-+getcury				test: bs chgat clip_printw demo_altkeys demo_defkey demo_panels edit_field foldkeys insdelln movewindow ncurses redraw savescreen test_opaque testcurs
-+getmaxx				test: chgat clip_printw demo_panels inch_wide inchs insdelln movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
-+getmaxy				test: chgat clip_printw demo_forms demo_panels inch_wide inchs insdelln movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
- getmouse			test: bs knight movewindow ncurses
- getn_wstr			test: test_get_wstr
- getnstr				test: filter ncurses test_getstr
-@@ -310,10 +310,11 @@
- getstr				test: test_getstr
- getwin				test: ncurses
- halfdelay			test: view
--has_colors			test: background bs cardfile chgat color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain savescreen tclock testcurs view worm xmas
-+has_colors			test: background bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock testcurs view worm xmas
- has_ic				test: lrtest
- has_il				lib: ncurses
- has_key				lib: ncurses
-+has_mouse			-
- hline				test: gdc ncurses
- hline_set			-
- idcok				test: test_opaque
-@@ -326,16 +327,16 @@
- inchnstr			test: inchs
- inchstr				test: inchs
- init_color			test: ncurses
--init_pair			test: background blue bs cardfile chgat color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
--initscr				test: background blue bs cardfile chgat color_set demo_defkey demo_forms demo_keyok demo_menus demo_panels echochar firework firstlast gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
-+init_pair			test: background blue bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
-+initscr				test: background blue bs cardfile chgat clip_printw color_set demo_defkey demo_forms demo_keyok demo_menus demo_panels echochar filter firework firstlast gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
- innstr				test: test_instr
- innwstr				test: test_inwstr
- ins_nwstr			test: ins_wide
- ins_wch				test: ins_wide
- ins_wstr			test: ins_wide
- insch				test: ins_wide inserts
--insdelln			-
--insertln			-
-+insdelln			test: insdelln
-+insertln			test: insdelln
- insnstr				test: inserts
- insstr				test: inserts
- instr				test: test_instr
-@@ -360,7 +361,7 @@
- keybound			test: demo_altkeys demo_defkey
- keyname				test: demo_altkeys demo_defkey demo_keyok demo_menus edit_field foldkeys keynames movewindow ncurses redraw testcurs view progs: tic
- keyok				test: demo_keyok foldkeys
--keypad				test: bs cardfile chgat demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto edit_field filter firework foldkeys hashtest inch_wide inchs ins_wide inserts key_names keynames knight lrtest movewindow ncurses redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view
-+keypad				test: bs cardfile chgat clip_printw demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto edit_field filter firework foldkeys hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view
- killchar			lib: ncurses
- killwchar			-
- leaveok				test: hanoi test_opaque
-@@ -450,7 +451,7 @@
- mvwinsstr			test: inserts testcurs
- mvwinstr			test: test_instr
- mvwinwstr			test: test_inwstr
--mvwprintw			test: chgat demo_panels inch_wide inchs ncurses test_instr test_inwstr testcurs
-+mvwprintw			test: chgat clip_printw demo_panels inch_wide inchs insdelln ncurses test_instr test_inwstr testcurs
- mvwscanw			test: testcurs
- mvwvline			test: ins_wide inserts movewindow
- mvwvline_set			-
-@@ -458,11 +459,11 @@
- newpad				test: edit_field ncurses testcurs
- newscr				lib: ncurses
- newterm				test: demo_altkeys ditto dots_mvcur filter foldkeys gdc key_names keynames
--newwin				test: cardfile chgat demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto edit_field firstlast inch_wide inchs ins_wide inserts knight movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs xmas
-+newwin				test: cardfile chgat clip_printw demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto edit_field firstlast inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs xmas
- nl				test: demo_forms ncurses rain testcurs
- nocbreak			test: testcurs
- nodelay				test: ditto firework gdc lrtest ncurses newdemo rain tclock test_opaque view worm xmas
--noecho				test: background bs cardfile chgat color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto firework firstlast foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest movewindow ncurses rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
-+noecho				test: background bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto firework firstlast foldkeys gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
- nofilter			-
- nonl				test: bs demo_forms hashtest movewindow ncurses view worm xmas
- noqiflush			-
-@@ -501,14 +502,14 @@
- scr_set				test: savescreen
- scrl				test: view
- scroll				test: testcurs
--scrollok			test: demo_altkeys demo_defkey demo_keyok demo_panels ditto foldkeys hashtest knight ncurses redraw test_opaque testcurs testscanw view
-+scrollok			test: clip_printw demo_altkeys demo_defkey demo_keyok demo_panels ditto foldkeys hashtest knight ncurses redraw test_opaque testcurs testscanw view
- set_curterm			lib: ncurses
- set_escdelay			test: test_opaque
- set_tabsize			test: test_opaque
- set_term			lib: ncurses
- setcchar			test: demo_panels ins_wide ncurses view
- setscrreg			test: view
--setupterm			test: dots progs: clear tput tset
-+setupterm			test: dots progs: clear tabs tput tset
- slk_attr			-
- slk_attr_off			-
- slk_attr_on			-
-@@ -528,8 +529,8 @@
- slk_wset			test: ncurses
- standend			test: blue gdc ncurses
- standout			test: blue ncurses
--start_color			test: background blue bs cardfile chgat color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
--stdscr				test: bs chgat demo_altkeys demo_forms demo_menus demo_panels ditto filter firework foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts key_names keynames knight lrtest movewindow ncurses rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view worm xmas
-+start_color			test: background blue bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
-+stdscr				test: bs chgat clip_printw demo_altkeys demo_forms demo_menus demo_panels ditto filter firework foldkeys gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view worm xmas
- strcodes			test: test_arrays progs: dump_entry
- strfnames			test: test_arrays progs: dump_entry
- strnames			test: foldkeys test_arrays progs: dump_entry infocmp tic
-@@ -548,10 +549,10 @@
- tigetnum			test: ncurses progs: tput
- tigetstr			test: blue demo_defkey foldkeys testcurs progs: tput
- timeout				test: rain savescreen
--touchline			test: chgat
--touchwin			test: chgat demo_menus edit_field filter firstlast inch_wide inchs ins_wide inserts movewindow ncurses redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque xmas
--tparm				test: dots dots_mvcur progs: tic tput
--tputs				test: dots dots_mvcur railroad progs: clear tset
-+touchline			test: chgat clip_printw insdelln
-+touchwin			test: chgat clip_printw demo_menus edit_field filter firstlast inch_wide inchs ins_wide insdelln inserts movewindow ncurses redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque xmas
-+tparm				test: dots dots_mvcur progs: tabs tic tput
-+tputs				test: dots dots_mvcur railroad progs: clear tabs tset
- trace				test: demo_menus hanoi hashtest lrtest ncurses testcurs view worm
- ttytype				lib: ncurses
- typeahead			test: testcurs
-@@ -572,7 +573,7 @@
- vidputs				lib: ncurses
- vline				test: gdc ncurses
- vline_set			-
--vw_printw			-
-+vw_printw			test: clip_printw
- vw_scanw			-
- vwprintw			test: movewindow
- vwscanw				lib: ncurses
-@@ -584,7 +585,7 @@
- waddchstr			-
- waddnstr			lib: menu
- waddnwstr			test: ncurses
--waddstr				test: chgat demo_forms demo_panels edit_field firstlast ins_wide knight ncurses redraw testcurs
-+waddstr				test: chgat clip_printw demo_forms demo_panels edit_field firstlast ins_wide insdelln knight ncurses redraw testcurs
- waddwstr			test: ins_wide test_get_wstr
- wattr_get			-
- wattr_off			lib: ncurses
-@@ -592,21 +593,21 @@
- wattr_set			-
- wattroff			test: demo_forms ncurses testcurs xmas
- wattron				test: testcurs xmas
--wattrset			test: demo_forms ncurses newdemo test_get_wstr test_getstr testcurs xmas
-+wattrset			test: clip_printw demo_forms insdelln ncurses newdemo test_get_wstr test_getstr testcurs xmas
- wbkgd				test: cardfile demo_forms demo_menus ncurses newdemo testcurs
- wbkgdset			test: demo_panels ins_wide inserts ncurses
- wbkgrnd				lib: ncurses
- wbkgrndset			lib: ncurses
--wborder				lib: ncurses
--wborder_set			lib: ncurses
-+wborder				test: ncurses
-+wborder_set			test: ncurses
- wchgat				test: chgat test_get_wstr test_getstr view
- wclear				test: ncurses test_opaque testcurs
- wclrtobot			test: firstlast inch_wide inchs ncurses test_instr test_inwstr testcurs
--wclrtoeol			test: chgat demo_defkey demo_keyok demo_panels firstlast inch_wide inchs ins_wide inserts knight ncurses test_instr test_inwstr testcurs
-+wclrtoeol			test: chgat clip_printw demo_defkey demo_keyok demo_panels firstlast inch_wide inchs ins_wide insdelln inserts knight ncurses test_instr test_inwstr testcurs
- wcolor_set			lib: ncurses
- wcursyncup			lib: form
- wdelch				test: ncurses testcurs
--wdeleteln			test: testcurs
-+wdeleteln			test: insdelln testcurs
- wecho_wchar			lib: ncurses
- wechochar			lib: ncurses
- wenclose			lib: form
-@@ -614,7 +615,7 @@
- wget_wch			test: ins_wide ncurses
- wget_wstr			test: test_get_wstr
- wgetbkgrnd			lib: ncurses
--wgetch				test: cardfile chgat demo_defkey demo_keyok demo_menus demo_panels ditto edit_field gdc inserts knight movewindow ncurses newdemo rain redraw test_opaque testcurs worm
-+wgetch				test: cardfile chgat clip_printw demo_defkey demo_keyok demo_menus demo_panels ditto edit_field gdc insdelln inserts knight movewindow ncurses newdemo rain redraw test_opaque testcurs worm
- wgetn_wstr			test: ncurses test_get_wstr
- wgetnstr			test: ncurses test_getstr
- wgetparent			test: test_opaque
-@@ -634,18 +635,18 @@
- wins_wch			test: ins_wide
- wins_wstr			test: ins_wide
- winsch				test: ins_wide inserts testcurs
--winsdelln			lib: ncurses
--winsertln			test: testcurs
-+winsdelln			test: insdelln
-+winsertln			test: insdelln testcurs
- winsnstr			test: inserts
- winsstr				test: inserts
- winstr				test: test_instr
- winwstr				test: test_inwstr
- wmouse_trafo			lib: form
--wmove				test: chgat demo_altkeys demo_defkey demo_keyok demo_menus demo_panels firstlast foldkeys inch_wide inchs ins_wide inserts knight movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs worm
-+wmove				test: chgat clip_printw demo_altkeys demo_defkey demo_keyok demo_menus demo_panels firstlast foldkeys inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs worm
- wnoutrefresh			test: demo_menus ditto edit_field inch_wide inchs ins_wide inserts knight movewindow ncurses redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque
--wprintw				test: chgat demo_defkey demo_forms demo_keyok demo_menus demo_panels edit_field inch_wide inchs ins_wide inserts knight movewindow ncurses test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
-+wprintw				test: chgat clip_printw demo_defkey demo_forms demo_keyok demo_menus demo_panels edit_field inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
- wredrawln			test: redraw
--wrefresh			test: chgat demo_forms demo_keyok demo_menus demo_panels edit_field firstlast knight lrtest movewindow ncurses newdemo redraw savescreen tclock testcurs view worm xmas
-+wrefresh			test: chgat clip_printw demo_forms demo_keyok demo_menus demo_panels edit_field firstlast insdelln knight lrtest movewindow ncurses newdemo redraw savescreen tclock testcurs view worm xmas
- wresize				test: cardfile ncurses
- wscanw				test: testcurs
- wscrl				test: ncurses testcurs
-diff -Naur ncurses-5.7.orig/test/clip_printw.c ncurses-5.7/test/clip_printw.c
---- ncurses-5.7.orig/test/clip_printw.c	1969-12-31 16:00:00.000000000 -0800
-+++ ncurses-5.7/test/clip_printw.c	2009-01-08 19:48:22.000000000 -0800
-@@ -0,0 +1,360 @@
-+/****************************************************************************
-+ * Copyright (c) 2008 Free Software Foundation, Inc.                        *
-+ *                                                                          *
-+ * Permission is hereby granted, free of charge, to any person obtaining a  *
-+ * copy of this software and associated documentation files (the            *
-+ * "Software"), to deal in the Software without restriction, including      *
-+ * without limitation the rights to use, copy, modify, merge, publish,      *
-+ * distribute, distribute with modifications, sublicense, and/or sell       *
-+ * copies of the Software, and to permit persons to whom the Software is    *
-+ * furnished to do so, subject to the following conditions:                 *
-+ *                                                                          *
-+ * The above copyright notice and this permission notice shall be included  *
-+ * in all copies or substantial portions of the Software.                   *
-+ *                                                                          *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-+ *                                                                          *
-+ * Except as contained in this notice, the name(s) of the above copyright   *
-+ * holders shall not be used in advertising or otherwise to promote the     *
-+ * sale, use or other dealings in this Software without prior written       *
-+ * authorization.                                                           *
-+ ****************************************************************************/
-+/*
-+ * $Id: clip_printw.c,v 1.1 2008/12/20 21:03:06 tom Exp $
-+ *
-+ * demonstrate how to use printw without wrapping.
-+ */
-+
-+#include <test.priv.h>
-+
-+#define SHOW(n) ((n) == ERR ? "ERR" : "OK")
-+#define COLOR_DEFAULT (-1)
-+
-+typedef struct {
-+    unsigned c;
-+    unsigned v;
-+    int status;
-+    int pair;
-+    unsigned attr;
-+    int count;
-+    int ch;
-+    const char *c_msg;
-+    const char *v_msg;
-+    int y_val;
-+    int x_val;
-+    int y_beg, x_beg;
-+    int y_max, x_max;
-+} STATUS;
-+
-+static int
-+clip_wprintw(WINDOW *win, const char *fmt,...)
-+{
-+    int y0, x0, y1, x1, width;
-+    WINDOW *sub;
-+    va_list ap;
-+    int rc;
-+
-+    /*
-+     * Allocate a single-line derived window extending from the current
-+     * cursor position to the end of the current line in the given window.
-+     * Disable scrolling in the derived window.
-+     */
-+    getyx(win, y0, x0);
-+    width = getmaxx(win) - x0;
-+    sub = derwin(win, 1, width, y0, x0);
-+    scrollok(sub, FALSE);
-+
-+    /*
-+     * Print the text.
-+     */
-+    va_start(ap, fmt);
-+    rc = vw_printw(sub, fmt, ap);
-+    va_end(ap);
-+
-+    getyx(sub, y1, x1);
-+    delwin(sub);
-+
-+    wmove(win, y1 + y0, x1 + x0);
-+
-+    return rc;
-+}
-+
-+static const char *
-+color_params(unsigned state, int *pair)
-+{
-+    /* *INDENT-OFF* */
-+    static struct {
-+	int pair;
-+	int fg, bg;
-+	const char *msg;
-+    } table[] = {
-+	{ 0, COLOR_DEFAULT, COLOR_DEFAULT, "default" },
-+	{ 1, COLOR_RED,     COLOR_BLACK,   "red/black" },
-+	{ 2, COLOR_WHITE,   COLOR_BLUE,    "white/blue" },
-+    };
-+    /* *INDENT-ON* */
-+
-+    static bool first = TRUE;
-+    const char *result = 0;
-+
-+    if (has_colors()) {
-+	if (first) {
-+	    unsigned n;
-+
-+	    start_color();
-+	    for (n = 0; n < SIZEOF(table); ++n) {
-+		init_pair(table[n].pair, table[n].fg, table[n].bg);
-+	    }
-+	}
-+	if (state < SIZEOF(table)) {
-+	    *pair = table[state].pair;
-+	    result = table[state].msg;
-+	}
-+    }
-+    return result;
-+}
-+
-+static const char *
-+video_params(unsigned state, unsigned *attr)
-+{
-+    /* *INDENT-OFF* */
-+    static struct {
-+	unsigned attr;
-+	const char *msg;
-+    } table[] = {
-+	{ A_NORMAL,	"normal" },
-+	{ A_BOLD,	"bold" },
-+	{ A_REVERSE,	"reverse" },
-+	{ A_UNDERLINE,	"underline" },
-+	{ A_BLINK, 	"blink" },
-+    };
-+    /* *INDENT-ON* */
-+
-+    const char *result = 0;
-+
-+    if (state < SIZEOF(table)) {
-+	*attr = table[state].attr;
-+	result = table[state].msg;
-+    }
-+    return result;
-+}
-+
-+/* fill the window with a test-pattern */
-+static void
-+fill_window(WINDOW *win)
-+{
-+    int y, x;
-+
-+    getyx(win, y, x);
-+    wmove(win, 0, 0);
-+    while (waddstr(win, "0123456789 abcdefghijklmnopqrstuvwxyz ") != ERR) {
-+    }
-+    wmove(win, y, x);
-+}
-+
-+static void
-+show_status(WINDOW *win, STATUS * sp)
-+{
-+    int y, x;
-+
-+    getyx(win, y, x);
-+    wmove(win, 0, 0);
-+    wprintw(win, "Count %d", sp->count);
-+    if (sp->v_msg != 0)
-+	wprintw(win, " Video %s", sp->v_msg);
-+    if (sp->c_msg != 0)
-+	wprintw(win, " Color %s", sp->c_msg);
-+    wprintw(win, " (%d)", sp->status);
-+    wclrtoeol(win);
-+    wmove(win, y, x);
-+}
-+
-+static void
-+do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *))
-+{
-+    WINDOW *win1 = newwin(sp->y_max - 2, sp->x_max - 2,
-+			  sp->y_beg + 1, sp->x_beg + 1);
-+
-+    if (win1 != 0 && sp->y_max > 4 && sp->x_max > 4) {
-+	WINDOW *win2 = derwin(win1, sp->y_max - 4, sp->x_max - 4, 1, 1);
-+
-+	if (win2 != 0) {
-+	    box(win1, 0, 0);
-+	    wrefresh(win1);
-+	    func(win2);
-+
-+	    delwin(win2);
-+	} else {
-+	    beep();
-+	}
-+	delwin(win1);
-+	touchwin(win);
-+    } else {
-+	beep();
-+    }
-+}
-+
-+static void
-+init_status(WINDOW *win, STATUS * sp)
-+{
-+    memset(sp, 0, sizeof(*sp));
-+    sp->c = 99;
-+    sp->v = 99;
-+    sp->ch = ' ';
-+
-+    keypad(win, TRUE);
-+    fill_window(win);
-+
-+    getbegyx(win, sp->y_beg, sp->x_beg);
-+    getmaxyx(win, sp->y_max, sp->x_max);
-+}
-+
-+static void
-+show_help(WINDOW *win)
-+{
-+    static const char *table[] =
-+    {
-+	"Basic commands:"
-+	,"Use h/j/k/l or arrow keys to move the cursor."
-+	,"Set the count parameter for clip_wprintw by entering digits 0-9."
-+	,""
-+	,"Other commands:"
-+	,"space toggles through the set of video attributes and colors."
-+	,"t     touches (forces repaint) of the current line."
-+	,".     calls clip_wprintw at the current position with the given count."
-+	,"=     resets count to zero."
-+	,"?     shows this help-window"
-+	,""
-+    };
-+
-+    int y_max, x_max;
-+    int row;
-+
-+    getmaxyx(win, y_max, x_max);
-+    for (row = 0; row < (int) SIZEOF(table) && row < y_max; ++row) {
-+	mvwprintw(win, row, 0, "%.*s", x_max, table[row]);
-+    }
-+    while (wgetch(win) != 'q')
-+	beep();
-+}
-+
-+static void
-+update_status(WINDOW *win, STATUS * sp)
-+{
-+    switch (sp->ch) {
-+    case ' ':			/* next test-iteration */
-+	if (has_colors()) {
-+	    if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == 0) {
-+		sp->c_msg = color_params(sp->c = 0, &(sp->pair));
-+		if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
-+		    sp->v_msg = video_params(sp->v = 0, &(sp->attr));
-+		}
-+	    }
-+	} else {
-+	    if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
-+		sp->v_msg = video_params(sp->v = 0, &(sp->attr));
-+	    }
-+	}
-+	sp->count = 0;
-+	show_status(win, sp);
-+	break;
-+    case KEY_LEFT:
-+    case 'h':
-+	if (sp->x_val > 0)
-+	    wmove(win, sp->y_val, --(sp->x_val));
-+	break;
-+    case KEY_DOWN:
-+    case 'j':
-+	if (sp->y_val < sp->y_max)
-+	    wmove(win, ++(sp->y_val), sp->x_val);
-+	break;
-+    case KEY_UP:
-+    case 'k':
-+	if (sp->y_val > 0)
-+	    wmove(win, --(sp->y_val), sp->x_val);
-+	break;
-+    case KEY_RIGHT:
-+    case 'l':
-+	if (sp->x_val < sp->x_max)
-+	    wmove(win, sp->y_val, ++(sp->x_val));
-+	break;
-+    case 't':
-+	touchline(win, sp->y_val, 1);
-+	break;
-+    case '=':
-+	sp->count = 0;
-+	show_status(win, sp);
-+	break;
-+    case '?':
-+	do_subwindow(win, sp, show_help);
-+	break;
-+    default:
-+	if (isdigit(sp->ch)) {
-+	    sp->count = (sp->count * 10) + (sp->ch - '0');
-+	    show_status(win, sp);
-+	} else {
-+	    beep();
-+	}
-+	break;
-+    }
-+}
-+
-+static void
-+test_clipping(WINDOW *win)
-+{
-+    STATUS st;
-+    char fmt[80];
-+    char *buffer;
-+    unsigned j, need;
-+
-+    init_status(win, &st);
-+
-+    do {
-+	switch (st.ch) {
-+	case '.':		/* change from current position */
-+	    wattrset(win, st.attr | COLOR_PAIR(st.pair));
-+	    if (st.count > 0) {
-+		need = st.count + 1;
-+		sprintf(fmt, "%%c%%%ds%%c", st.count);
-+	    } else {
-+		need = getmaxx(win) - 1;
-+		strcpy(fmt, "%c%s%c");
-+	    }
-+	    if ((buffer = typeMalloc(char, need)) != 0) {
-+		for (j = 0; j < need; ++j) {
-+		    buffer[j] = 'A' + (j % 26);
-+		}
-+		buffer[need - 1] = '\0';
-+		st.status = clip_wprintw(win, fmt, '[', buffer, ']');
-+	    }
-+	    break;
-+	case 'w':
-+	    do_subwindow(win, &st, test_clipping);
-+	    break;
-+	case 'q':
-+	    return;
-+	default:
-+	    update_status(win, &st);
-+	    break;
-+	}
-+    } while ((st.ch = wgetch(win)) != ERR);
-+}
-+
-+int
-+main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
-+{
-+    initscr();
-+    cbreak();
-+    noecho();
-+
-+    test_clipping(stdscr);
-+    endwin();
-+
-+    ExitProgram(EXIT_SUCCESS);
-+}
-diff -Naur ncurses-5.7.orig/test/demo_forms.c ncurses-5.7/test/demo_forms.c
---- ncurses-5.7.orig/test/demo_forms.c	2008-10-18 13:38:20.000000000 -0700
-+++ ncurses-5.7/test/demo_forms.c	2009-01-08 19:48:22.000000000 -0800
-@@ -26,7 +26,7 @@
-  * authorization.                                                           *
-  ****************************************************************************/
- /*
-- * $Id: demo_forms.c,v 1.30 2008/10/18 20:38:20 tom Exp $
-+ * $Id: demo_forms.c,v 1.31 2008/12/20 19:23:00 tom Exp $
-  *
-  * Demonstrate a variety of functions from the form library.
-  * Thomas Dickey - 2003/4/26
-@@ -97,6 +97,8 @@
-     FIELD *f = new_field(rows, cols, frow, fcol, o_value, 1);
- 
-     if (f) {
-+	FieldAttrs *ptr;
-+
- 	set_field_back(f, A_UNDERLINE);
- 	/*
- 	 * If -j and -d options are combined, -j loses.  It is documented in
-@@ -122,7 +124,12 @@
- 	/*
- 	 * The userptr is used in edit_field.c's inactive_field().
- 	 */
--	set_field_userptr(f, (void *) (long) field_back(f));
-+	ptr = (FieldAttrs *) field_userptr(f);
-+	if (ptr == 0) {
-+	    ptr = typeCalloc(FieldAttrs, 1);
-+	    ptr->background = field_back(f);
-+	}
-+	set_field_userptr(f, (void *) ptr);
- 	if (t_value)
- 	    set_field_buffer(f, 0, t_value);
-     }
-diff -Naur ncurses-5.7.orig/test/edit_field.c ncurses-5.7/test/edit_field.c
---- ncurses-5.7.orig/test/edit_field.c	2008-10-18 13:40:20.000000000 -0700
-+++ ncurses-5.7/test/edit_field.c	2009-01-08 19:48:22.000000000 -0800
-@@ -26,7 +26,7 @@
-  * authorization.                                                           *
-  ****************************************************************************/
- /*
-- * $Id: edit_field.c,v 1.14 2008/10/18 20:40:20 tom Exp $
-+ * $Id: edit_field.c,v 1.15 2008/12/20 19:23:01 tom Exp $
-  *
-  * A wrapper for form_driver() which keeps track of the user's editing changes
-  * for each field, and makes the result available as a null-terminated string
-@@ -294,8 +294,8 @@
- static void
- inactive_field(FIELD * f)
- {
--    void *ptr = field_userptr(f);
--    set_field_back(f, (chtype) ptr);
-+    FieldAttrs *ptr = (FieldAttrs *) field_userptr(f);
-+    set_field_back(f, ptr->background);
- }
- 
- int
-diff -Naur ncurses-5.7.orig/test/edit_field.h ncurses-5.7/test/edit_field.h
---- ncurses-5.7.orig/test/edit_field.h	2006-06-03 09:38:57.000000000 -0700
-+++ ncurses-5.7/test/edit_field.h	2009-01-08 19:48:22.000000000 -0800
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2003-2004,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2003-2006,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
-  * authorization.                                                           *
-  ****************************************************************************/
- /*
-- * $Id: edit_field.h,v 1.5 2006/06/03 16:38:57 tom Exp $
-+ * $Id: edit_field.h,v 1.6 2008/12/20 19:23:18 tom Exp $
-  *
-  * Interface of edit_field.c
-  */
-@@ -43,6 +43,10 @@
- #define MY_EDT_MODE	EDIT_FIELD('e')
- #define MY_INS_MODE	EDIT_FIELD('t')
- 
-+typedef struct {
-+    chtype background;
-+} FieldAttrs;
-+
- extern void help_edit_field(void);
- extern int edit_field(FORM * form, int *result);
- 
-diff -Naur ncurses-5.7.orig/test/filter.c ncurses-5.7/test/filter.c
---- ncurses-5.7.orig/test/filter.c	2006-12-09 08:53:47.000000000 -0800
-+++ ncurses-5.7/test/filter.c	2009-01-08 19:48:15.000000000 -0800
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -29,7 +29,7 @@
- /*
-  * Author:  Thomas E. Dickey <dickey@clark.net> 1998
-  *
-- * $Id: filter.c,v 1.11 2006/12/09 16:53:47 tom Exp $
-+ * $Id: filter.c,v 1.12 2008/12/06 21:59:27 tom Exp $
-  */
- #include <test.priv.h>
- 
-@@ -78,16 +78,50 @@
-     return code;
- }
- 
-+static void
-+usage(void)
-+{
-+    static const char *msg[] =
-+    {
-+	"Usage: filter [options]"
-+	,""
-+	,"Options:"
-+	,"  -i   use initscr() rather than newterm()"
-+    };
-+    unsigned n;
-+    for (n = 0; n < SIZEOF(msg); n++)
-+	fprintf(stderr, "%s\n", msg[n]);
-+    ExitProgram(EXIT_FAILURE);
-+}
-+
- int
--main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
-+main(int argc, char *argv[])
- {
-+    int ch;
-     char buffer[80];
-     attr_t underline;
-+    bool i_option = FALSE;
- 
-     setlocale(LC_ALL, "");
- 
-+    while ((ch = getopt(argc, argv, "i")) != -1) {
-+	switch (ch) {
-+	case 'i':
-+	    i_option = TRUE;
-+	    break;
-+	default:
-+	    usage();
-+	}
-+    }
-+
-+    printf("starting filter program using %s...\n",
-+	   i_option ? "initscr" : "newterm");
-     filter();
--    (void) newterm((char *) 0, stdout, stdin);
-+    if (i_option) {
-+	initscr();
-+    } else {
-+	(void) newterm((char *) 0, stdout, stdin);
-+    }
-     cbreak();
-     keypad(stdscr, TRUE);
- 
-diff -Naur ncurses-5.7.orig/test/insdelln.c ncurses-5.7/test/insdelln.c
---- ncurses-5.7.orig/test/insdelln.c	1969-12-31 16:00:00.000000000 -0800
-+++ ncurses-5.7/test/insdelln.c	2009-01-08 19:48:22.000000000 -0800
-@@ -0,0 +1,380 @@
-+/****************************************************************************
-+ * Copyright (c) 2008 Free Software Foundation, Inc.                        *
-+ *                                                                          *
-+ * Permission is hereby granted, free of charge, to any person obtaining a  *
-+ * copy of this software and associated documentation files (the            *
-+ * "Software"), to deal in the Software without restriction, including      *
-+ * without limitation the rights to use, copy, modify, merge, publish,      *
-+ * distribute, distribute with modifications, sublicense, and/or sell       *
-+ * copies of the Software, and to permit persons to whom the Software is    *
-+ * furnished to do so, subject to the following conditions:                 *
-+ *                                                                          *
-+ * The above copyright notice and this permission notice shall be included  *
-+ * in all copies or substantial portions of the Software.                   *
-+ *                                                                          *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-+ *                                                                          *
-+ * Except as contained in this notice, the name(s) of the above copyright   *
-+ * holders shall not be used in advertising or otherwise to promote the     *
-+ * sale, use or other dealings in this Software without prior written       *
-+ * authorization.                                                           *
-+ ****************************************************************************/
-+/*
-+ * $Id: insdelln.c,v 1.1 2008/12/20 22:06:52 tom Exp $
-+ *
-+ * test-driver for deleteln, wdeleteln, insdelln, winsdelln, insertln, winsertln
-+ */
-+
-+#include <test.priv.h>
-+
-+#define SHOW(n) ((n) == ERR ? "ERR" : "OK")
-+#define COLOR_DEFAULT (-1)
-+
-+typedef struct {
-+    unsigned c;
-+    unsigned v;
-+    int pair;
-+    unsigned attr;
-+    int count;
-+    int ch;
-+    const char *c_msg;
-+    const char *v_msg;
-+    int y_val;
-+    int x_val;
-+    int y_beg, x_beg;
-+    int y_max, x_max;
-+} STATUS;
-+
-+static const char *
-+color_params(unsigned state, int *pair)
-+{
-+    /* *INDENT-OFF* */
-+    static struct {
-+	int pair;
-+	int fg, bg;
-+	const char *msg;
-+    } table[] = {
-+	{ 0, COLOR_DEFAULT, COLOR_DEFAULT, "default" },
-+	{ 1, COLOR_RED,     COLOR_BLACK,   "red/black" },
-+	{ 2, COLOR_WHITE,   COLOR_BLUE,    "white/blue" },
-+    };
-+    /* *INDENT-ON* */
-+
-+    static bool first = TRUE;
-+    const char *result = 0;
-+
-+    if (has_colors()) {
-+	if (first) {
-+	    unsigned n;
-+
-+	    start_color();
-+	    for (n = 0; n < SIZEOF(table); ++n) {
-+		init_pair(table[n].pair, table[n].fg, table[n].bg);
-+	    }
-+	}
-+	if (state < SIZEOF(table)) {
-+	    *pair = table[state].pair;
-+	    result = table[state].msg;
-+	}
-+    }
-+    return result;
-+}
-+
-+static const char *
-+video_params(unsigned state, unsigned *attr)
-+{
-+    /* *INDENT-OFF* */
-+    static struct {
-+	unsigned attr;
-+	const char *msg;
-+    } table[] = {
-+	{ A_NORMAL,	"normal" },
-+	{ A_BOLD,	"bold" },
-+	{ A_REVERSE,	"reverse" },
-+	{ A_UNDERLINE,	"underline" },
-+	{ A_BLINK, 	"blink" },
-+    };
-+    /* *INDENT-ON* */
-+
-+    const char *result = 0;
-+
-+    if (state < SIZEOF(table)) {
-+	*attr = table[state].attr;
-+	result = table[state].msg;
-+    }
-+    return result;
-+}
-+
-+/* fill the window with a test-pattern */
-+static void
-+fill_window(WINDOW *win)
-+{
-+    int y, x;
-+
-+    getyx(win, y, x);
-+    wmove(win, 1, 0);
-+    while (waddstr(win, "0123456789 abcdefghijklmnopqrstuvwxyz ") != ERR) {
-+    }
-+    wmove(win, y, x);
-+}
-+
-+static void
-+show_status(WINDOW *win, STATUS * sp)
-+{
-+    int y, x;
-+
-+    getyx(win, y, x);
-+    wmove(win, 0, 0);
-+    wprintw(win, "Count %d", sp->count);
-+    if (sp->v_msg != 0)
-+	wprintw(win, " Video %s", sp->v_msg);
-+    if (sp->c_msg != 0)
-+	wprintw(win, " Color %s", sp->c_msg);
-+    wclrtoeol(win);
-+    wmove(win, y, x);
-+}
-+
-+static void
-+reshow_status(WINDOW *win, STATUS * sp)
-+{
-+    fill_window(win);
-+    show_status(win, sp);
-+}
-+
-+static void
-+do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *))
-+{
-+    WINDOW *win1 = newwin(sp->y_max - 2, sp->x_max - 2,
-+			  sp->y_beg + 1, sp->x_beg + 1);
-+
-+    if (win1 != 0 && sp->y_max > 4 && sp->x_max > 4) {
-+	WINDOW *win2 = derwin(win1, sp->y_max - 4, sp->x_max - 4, 1, 1);
-+
-+	if (win2 != 0) {
-+	    box(win1, 0, 0);
-+	    wrefresh(win1);
-+	    func(win2);
-+
-+	    delwin(win2);
-+	} else {
-+	    beep();
-+	}
-+	delwin(win1);
-+	touchwin(win);
-+    } else {
-+	beep();
-+    }
-+}
-+
-+static void
-+init_status(WINDOW *win, STATUS * sp)
-+{
-+    memset(sp, 0, sizeof(*sp));
-+    sp->c = 99;
-+    sp->v = 99;
-+    sp->ch = ' ';
-+
-+    keypad(win, TRUE);
-+    fill_window(win);
-+
-+    getbegyx(win, sp->y_beg, sp->x_beg);
-+    getmaxyx(win, sp->y_max, sp->x_max);
-+}
-+
-+static void
-+show_help(WINDOW *win)
-+{
-+    static const char *table[] =
-+    {
-+	"Basic commands:"
-+	,"Use h/j/k/l or arrow keys to move the cursor."
-+	,"Set the count parameter for insert/delete by entering digits 0-9."
-+	,""
-+	,"Other commands:"
-+	,"space toggles through the set of video attributes and colors."
-+	,"t     touches (forces repaint) of the current line."
-+	,"i     calls insertln at the current position with the given count."
-+	,"d     calls deleteln at the window beginning with the given count."
-+	,"I     calls insdelln at the window beginning with the given count."
-+	,"D     calls insdelln at the window beginning with the given -count."
-+	,"f     refills the window with test-pattern using current attributes."
-+	,"w     recur to test windows other than stdscr"
-+	,"q     quit"
-+	,"=     resets count to zero."
-+	,"?     shows this help-window"
-+	,""
-+	,""
-+    };
-+
-+    int y_max, x_max;
-+    int row;
-+
-+    getmaxyx(win, y_max, x_max);
-+    for (row = 0; row < (int) SIZEOF(table) && row < y_max; ++row) {
-+	mvwprintw(win, row, 0, "%.*s", x_max, table[row]);
-+    }
-+    while (wgetch(win) != 'q')
-+	beep();
-+}
-+
-+static void
-+update_status(WINDOW *win, STATUS * sp)
-+{
-+    switch (sp->ch) {
-+    case ' ':			/* next test-iteration */
-+	if (has_colors()) {
-+	    if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == 0) {
-+		sp->c_msg = color_params(sp->c = 0, &(sp->pair));
-+		if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
-+		    sp->v_msg = video_params(sp->v = 0, &(sp->attr));
-+		}
-+	    }
-+	} else {
-+	    if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
-+		sp->v_msg = video_params(sp->v = 0, &(sp->attr));
-+	    }
-+	}
-+	sp->count = 0;
-+	show_status(win, sp);
-+	break;
-+    case KEY_LEFT:
-+    case 'h':
-+	if (sp->x_val > 0)
-+	    wmove(win, sp->y_val, --(sp->x_val));
-+	break;
-+    case KEY_DOWN:
-+    case 'j':
-+	if (sp->y_val < sp->y_max)
-+	    wmove(win, ++(sp->y_val), sp->x_val);
-+	break;
-+    case KEY_UP:
-+    case 'k':
-+	if (sp->y_val > 0)
-+	    wmove(win, --(sp->y_val), sp->x_val);
-+	break;
-+    case KEY_RIGHT:
-+    case 'l':
-+	if (sp->x_val < sp->x_max)
-+	    wmove(win, sp->y_val, ++(sp->x_val));
-+	break;
-+    case 't':
-+	touchline(win, sp->y_val, 1);
-+	break;
-+    case '=':
-+	sp->count = 0;
-+	show_status(win, sp);
-+	break;
-+    case '?':
-+	do_subwindow(win, sp, show_help);
-+	break;
-+    default:
-+	if (isdigit(sp->ch)) {
-+	    sp->count = (sp->count * 10) + (sp->ch - '0');
-+	    show_status(win, sp);
-+	} else {
-+	    beep();
-+	}
-+	break;
-+    }
-+}
-+
-+static void
-+test_winsdelln(WINDOW *win)
-+{
-+    STATUS st;
-+    int n;
-+
-+    init_status(win, &st);
-+
-+    do {
-+	wattrset(win, st.attr | COLOR_PAIR(st.pair));
-+	switch (st.ch) {
-+	case 'i':
-+	    for (n = 0; n < st.count; ++n)
-+		winsertln(win);
-+	    break;
-+	case 'd':
-+	    for (n = 0; n < st.count; ++n)
-+		wdeleteln(win);
-+	    break;
-+	case 'I':
-+	    winsdelln(win, st.count);
-+	    break;
-+	case 'D':
-+	    winsdelln(win, -st.count);
-+	    break;
-+	case 'f':
-+	    fill_window(win);
-+	    reshow_status(win, &st);
-+	    break;
-+	case 'w':
-+	    do_subwindow(win, &st, test_winsdelln);
-+	    break;
-+	case 'q':
-+	    return;
-+	default:
-+	    update_status(win, &st);
-+	    break;
-+	}
-+    } while ((st.ch = wgetch(win)) != ERR);
-+}
-+
-+static void
-+test_insdelln(void)
-+{
-+    STATUS st;
-+    int n;
-+
-+    init_status(stdscr, &st);
-+
-+    do {
-+	attrset(st.attr | COLOR_PAIR(st.pair));
-+	switch (st.ch) {
-+	case 'i':
-+	    for (n = 0; n < st.count; ++n)
-+		insertln();
-+	    break;
-+	case 'd':
-+	    for (n = 0; n < st.count; ++n)
-+		deleteln();
-+	    break;
-+	case 'I':
-+	    insdelln(st.count);
-+	    break;
-+	case 'D':
-+	    insdelln(-st.count);
-+	    break;
-+	case 'f':
-+	    fill_window(stdscr);
-+	    reshow_status(stdscr, &st);
-+	    break;
-+	case 'w':
-+	    do_subwindow(stdscr, &st, test_winsdelln);
-+	    break;
-+	case 'q':
-+	    return;
-+	default:
-+	    update_status(stdscr, &st);
-+	    break;
-+	}
-+    } while ((st.ch = getch()) != ERR);
-+}
-+
-+int
-+main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
-+{
-+    initscr();
-+    cbreak();
-+    noecho();
-+
-+    test_insdelln();
-+    endwin();
-+
-+    ExitProgram(EXIT_SUCCESS);
-+}
-diff -Naur ncurses-5.7.orig/test/modules ncurses-5.7/test/modules
---- ncurses-5.7.orig/test/modules	2007-08-18 10:57:08.000000000 -0700
-+++ ncurses-5.7/test/modules	2009-01-08 19:48:22.000000000 -0800
-@@ -1,4 +1,4 @@
--# $Id: modules,v 1.36 2007/08/18 17:57:08 tom Exp $
-+# $Id: modules,v 1.37 2008/12/20 21:38:44 tom Exp $
- ##############################################################################
- # Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
- #                                                                            #
-@@ -37,6 +37,7 @@
- bs		progs		$(srcdir)	$(HEADER_DEPS)
- cardfile	progs		$(srcdir)	$(HEADER_DEPS)	../include/panel.h ../include/form.h
- chgat		progs		$(srcdir)	$(HEADER_DEPS)
-+clip_printw	progs		$(srcdir)	$(HEADER_DEPS)
- color_set	progs		$(srcdir)	$(HEADER_DEPS)
- demo_altkeys	progs		$(srcdir)	$(HEADER_DEPS)
- demo_defkey	progs		$(srcdir)	$(HEADER_DEPS)
-@@ -60,6 +61,7 @@
- inch_wide	progs		$(srcdir)	$(HEADER_DEPS)
- inchs		progs		$(srcdir)	$(HEADER_DEPS)
- ins_wide	progs		$(srcdir)	$(HEADER_DEPS)
-+insdelln	progs		$(srcdir)	$(HEADER_DEPS)
- inserts		progs		$(srcdir)	$(HEADER_DEPS)
- key_names	progs		$(srcdir)	$(HEADER_DEPS)
- keynames	progs		$(srcdir)	$(HEADER_DEPS)
-diff -Naur ncurses-5.7.orig/test/ncurses.c ncurses-5.7/test/ncurses.c
---- ncurses-5.7.orig/test/ncurses.c	2008-09-27 07:34:58.000000000 -0700
-+++ ncurses-5.7/test/ncurses.c	2009-01-08 19:48:22.000000000 -0800
-@@ -40,7 +40,7 @@
-    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
-            Thomas E. Dickey (beginning revision 1.27 in 1996).
- 
--$Id: ncurses.c,v 1.329 2008/09/27 14:34:58 tom Exp $
-+$Id: ncurses.c,v 1.334 2008/12/20 17:13:27 tom Exp $
- 
- ***************************************************************************/
- 
-@@ -569,8 +569,11 @@
-  *
-  ****************************************************************************/
- 
-+#define NUM_GETCH_FLAGS 256
-+typedef bool GetchFlags[NUM_GETCH_FLAGS];
-+
- static void
--setup_getch(WINDOW *win, bool flags[])
-+setup_getch(WINDOW *win, GetchFlags flags)
- {
-     keypad(win, flags['k']);	/* should be redundant, but for testing */
-     meta(win, flags['m']);	/* force this to a known state */
-@@ -581,7 +584,17 @@
- }
- 
- static void
--wgetch_help(WINDOW *win, bool flags[])
-+init_getch(WINDOW *win, GetchFlags flags)
-+{
-+    memset(flags, FALSE, NUM_GETCH_FLAGS);
-+    flags[UChar('k')] = (win == stdscr);
-+    flags[UChar('m')] = TRUE;
-+
-+    setup_getch(win, flags);
-+}
-+
-+static void
-+wgetch_help(WINDOW *win, GetchFlags flags)
- {
-     static const char *help[] =
-     {
-@@ -731,13 +744,10 @@
-     int first_y, first_x;
-     int c;
-     int incount = 0;
--    bool flags[256];
-+    GetchFlags flags;
-     bool blocking = (delay < 0);
- 
--    memset(flags, FALSE, sizeof(flags));
--    flags[UChar('k')] = (win == stdscr);
--
--    setup_getch(win, flags);
-+    init_getch(win, flags);
-     wtimeout(win, delay);
-     getyx(win, first_y, first_x);
- 
-@@ -835,12 +845,18 @@
- 		}
- #endif
- 		(void) waddstr(win, keyname(c));
--	    } else if (c > 0x80) {
--		unsigned c2 = (unsigned) (c & 0x7f);
--		if (isprint(c2))
--		    (void) wprintw(win, "M-%c", UChar(c2));
--		else
-+	    } else if (c >= 0x80) {
-+		unsigned c2 = (unsigned) c;
-+#if !(defined(NCURSES_VERSION) || defined(_XOPEN_CURSES))
-+		/* at least Solaris SVR4 curses breaks unctrl(128), etc. */
-+		c2 &= 0x7f;
-+#endif
-+		if (isprint(c))
-+		    (void) wprintw(win, "%c", UChar(c));
-+		else if (c2 != UChar(c))
- 		    (void) wprintw(win, "M-%s", unctrl(c2));
-+		else
-+		    (void) wprintw(win, "%s", unctrl(c2));
- 		waddstr(win, " (high-half character)");
- 	    } else {
- 		if (isprint(c))
-@@ -854,6 +870,9 @@
-     }
- 
-     wtimeout(win, -1);
-+
-+    if (!level)
-+	init_getch(win, flags);
- }
- 
- static int
-@@ -978,15 +997,12 @@
-     int first_y, first_x;
-     wint_t c;
-     int incount = 0;
--    bool flags[256];
-+    GetchFlags flags;
-     bool blocking = (delay < 0);
-     int y, x, code;
-     char *temp;
- 
--    memset(flags, FALSE, sizeof(flags));
--    flags[UChar('k')] = (win == stdscr);
--
--    setup_getch(win, flags);
-+    init_getch(win, flags);
-     wtimeout(win, delay);
-     getyx(win, first_y, first_x);
- 
-@@ -1096,14 +1112,14 @@
- 		    resize_wide_boxes(level, win);
- 		}
- #endif
--		(void) waddstr(win, key_name((wchar_t) c));
-+		(void) waddstr(win, keyname((wchar_t) c));
- 	    } else {
-+		(void) waddstr(win, key_name((wchar_t) c));
- 		if (c < 256 && iscntrl(c)) {
--		    (void) wprintw(win, "%s (control character)", unctrl(c));
-+		    (void) wprintw(win, " (control character)");
- 		} else {
--		    wchar_t c2 = (wchar_t) c;
--		    waddnwstr(win, &c2, 1);
--		    (void) wprintw(win, " = %#x (printable character)", (unsigned) c);
-+		    (void) wprintw(win, " = %#x (printable character)",
-+				   (unsigned) c);
- 		}
- 	    }
- 	    wgetch_wrap(win, first_y);
-@@ -1111,6 +1127,9 @@
-     }
- 
-     wtimeout(win, -1);
-+
-+    if (!level)
-+	init_getch(win, flags);
- }
- 
- static void
-@@ -2802,6 +2821,7 @@
- } attrs_to_cycle[] = {
-     { A_NORMAL,		"normal" },
-     { A_BOLD,		"bold" },
-+    { A_BLINK,		"blink" },
-     { A_REVERSE,	"reverse" },
-     { A_UNDERLINE,	"underline" },
- };
-@@ -2902,7 +2922,7 @@
- 	do {
- 	    if (C1)
- 		nodelay(stdscr, TRUE);
--	    echochar(code | attr | COLOR_PAIR(pair));
-+	    echochar(colored_chtype(code, attr, pair));
- 	    if (C1) {
- 		/* (yes, this _is_ crude) */
- 		while ((reply = Getchar()) != ERR) {
-@@ -2951,7 +2971,7 @@
- 		 */
- 		break;
- 	    default:
--		addch(code | A_ALTCHARSET | attr | COLOR_PAIR(pair));
-+		addch(colored_chtype(code, A_ALTCHARSET | attr, pair));
- 		break;
- 	    }
- 	} while (--count > 0);
-@@ -2969,15 +2989,23 @@
-     mvaddstr(0, 20, "Display of the ACS Line-Drawing Set");
-     attroff(A_BOLD);
-     refresh();
--    box(stdscr, 0, 0);
-     /* *INDENT-OFF* */
--    mvhline(LINES / 2, 0,        ACS_HLINE | attr, COLS);
--    mvvline(0,         COLS / 2, ACS_VLINE | attr, LINES);
--    mvaddch(0,         COLS / 2, ACS_TTEE | attr);
--    mvaddch(LINES / 2, COLS / 2, ACS_PLUS | attr);
--    mvaddch(LINES - 1, COLS / 2, ACS_BTEE | attr);
--    mvaddch(LINES / 2, 0,        ACS_LTEE | attr);
--    mvaddch(LINES / 2, COLS - 1, ACS_RTEE | attr);
-+    wborder(stdscr,
-+	    colored_chtype(ACS_VLINE,	 attr, pair),
-+	    colored_chtype(ACS_VLINE,	 attr, pair),
-+            colored_chtype(ACS_HLINE,    attr, pair),
-+	    colored_chtype(ACS_HLINE,	 attr, pair),
-+	    colored_chtype(ACS_ULCORNER, attr, pair),
-+	    colored_chtype(ACS_URCORNER, attr, pair),
-+            colored_chtype(ACS_LLCORNER, attr, pair),
-+	    colored_chtype(ACS_LRCORNER, attr, pair));
-+    mvhline(LINES / 2, 0,        colored_chtype(ACS_HLINE, attr, pair), COLS);
-+    mvvline(0,         COLS / 2, colored_chtype(ACS_VLINE, attr, pair), LINES);
-+    mvaddch(0,         COLS / 2, colored_chtype(ACS_TTEE,  attr, pair));
-+    mvaddch(LINES / 2, COLS / 2, colored_chtype(ACS_PLUS,  attr, pair));
-+    mvaddch(LINES - 1, COLS / 2, colored_chtype(ACS_BTEE,  attr, pair));
-+    mvaddch(LINES / 2, 0,        colored_chtype(ACS_LTEE,  attr, pair));
-+    mvaddch(LINES / 2, COLS - 1, colored_chtype(ACS_RTEE,  attr, pair));
-     /* *INDENT-ON* */
- 
- }
-@@ -3002,7 +3030,7 @@
- {
-     int n;
- 
--#define BOTH(name) #name, (name | attr | COLOR_PAIR(pair))
-+#define BOTH(name) #name, colored_chtype(name, attr, pair)
- 
-     erase();
-     attron(A_BOLD);
-@@ -3238,7 +3266,7 @@
-     int col = (n / height) * COLS / 2;
- 
-     mvprintw(row, col, "%*s : ", COLS / 4, name);
--    while (repeat-- >= 0) {
-+    while (--repeat >= 0) {
- 	add_wch(code);
-     }
-     return n + 1;
-@@ -3307,12 +3335,12 @@
- 
- #undef MERGE_ATTR
- 
--#define MERGE_ATTR(wch) merge_wide_attr(&temp, wch, attr, pair)
-+#define MERGE_ATTR(n,wch) merge_wide_attr(&temp[n], wch, attr, pair)
- 
- static void
- show_wbox_chars(int repeat, attr_t attr, short pair)
- {
--    cchar_t temp;
-+    cchar_t temp[8];
- 
-     (void) repeat;
-     erase();
-@@ -3321,17 +3349,23 @@
-     attroff(A_BOLD);
-     refresh();
- 
--    attr_set(attr, pair, 0);
--    box_set(stdscr, 0, 0);
--    attr_set(A_NORMAL, 0, 0);
-+    wborder_set(stdscr,
-+		MERGE_ATTR(0, WACS_VLINE),
-+		MERGE_ATTR(1, WACS_VLINE),
-+		MERGE_ATTR(2, WACS_HLINE),
-+		MERGE_ATTR(3, WACS_HLINE),
-+		MERGE_ATTR(4, WACS_ULCORNER),
-+		MERGE_ATTR(5, WACS_URCORNER),
-+		MERGE_ATTR(6, WACS_LLCORNER),
-+		MERGE_ATTR(7, WACS_LRCORNER));
-     /* *INDENT-OFF* */
--    mvhline_set(LINES / 2, 0,        MERGE_ATTR(WACS_HLINE), COLS);
--    mvvline_set(0,         COLS / 2, MERGE_ATTR(WACS_VLINE), LINES);
--    mvadd_wch(0,           COLS / 2, MERGE_ATTR(WACS_TTEE));
--    mvadd_wch(LINES / 2,   COLS / 2, MERGE_ATTR(WACS_PLUS));
--    mvadd_wch(LINES - 1,   COLS / 2, MERGE_ATTR(WACS_BTEE));
--    mvadd_wch(LINES / 2,   0,        MERGE_ATTR(WACS_LTEE));
--    mvadd_wch(LINES / 2,   COLS - 1, MERGE_ATTR(WACS_RTEE));
-+    mvhline_set(LINES / 2, 0,        MERGE_ATTR(0, WACS_HLINE), COLS);
-+    mvvline_set(0,         COLS / 2, MERGE_ATTR(0, WACS_VLINE), LINES);
-+    mvadd_wch(0,           COLS / 2, MERGE_ATTR(0, WACS_TTEE));
-+    mvadd_wch(LINES / 2,   COLS / 2, MERGE_ATTR(0, WACS_PLUS));
-+    mvadd_wch(LINES - 1,   COLS / 2, MERGE_ATTR(0, WACS_BTEE));
-+    mvadd_wch(LINES / 2,   0,        MERGE_ATTR(0, WACS_LTEE));
-+    mvadd_wch(LINES / 2,   COLS - 1, MERGE_ATTR(0, WACS_RTEE));
-     /* *INDENT-ON* */
- 
- }
-@@ -5804,7 +5838,7 @@
- 	break;
-     case 2:
- 	init_pair(cpair, COLOR_RED, COLOR_GREEN);
--	wbkgdset(win, ' ' | A_BLINK | COLOR_PAIR(cpair));
-+	wbkgdset(win, colored_chtype(' ', A_BLINK, cpair));
- 	break;
-     case 3:
- 	wbkgdset(win, ' ' | A_NORMAL);
-diff -Naur ncurses-5.7.orig/test/programs ncurses-5.7/test/programs
---- ncurses-5.7.orig/test/programs	2008-08-16 14:47:39.000000000 -0700
-+++ ncurses-5.7/test/programs	2009-01-08 19:48:22.000000000 -0800
-@@ -1,4 +1,4 @@
--# $Id: programs,v 1.14 2008/08/16 21:47:39 tom Exp $
-+# $Id: programs,v 1.15 2008/12/20 21:38:44 tom Exp $
- ##############################################################################
- # Copyright (c) 2006-2007,2008 Free Software Foundation, Inc.                #
- #                                                                            #
-@@ -35,6 +35,7 @@
- bs		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	bs
- cardfile	$(LDFLAGS_DEFAULT)	$(LOCAL_LIBS)	cardfile
- chgat		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	chgat
-+clip_printw	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	clip_printw
- color_set	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	color_set
- demo_altkeys	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	demo_altkeys
- demo_defkey	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	demo_defkey
-@@ -57,6 +58,7 @@
- inch_wide	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	inch_wide
- inchs		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	inchs
- ins_wide	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	ins_wide
-+insdelln	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	insdelln
- inserts		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	inserts
- key_names	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	key_names
- keynames	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	keynames
-diff -Naur ncurses-5.7.orig/test/test.priv.h ncurses-5.7/test/test.priv.h
---- ncurses-5.7.orig/test/test.priv.h	2008-10-04 14:53:41.000000000 -0700
-+++ ncurses-5.7/test/test.priv.h	2009-01-08 19:48:22.000000000 -0800
-@@ -29,7 +29,7 @@
- /****************************************************************************
-  *  Author: Thomas E. Dickey                    1996-on                     *
-  ****************************************************************************/
--/* $Id: test.priv.h,v 1.79 2008/10/04 21:53:41 tom Exp $ */
-+/* $Id: test.priv.h,v 1.80 2008/12/20 16:37:20 tom Exp $ */
- 
- #ifndef __TEST_PRIV_H
- #define __TEST_PRIV_H 1
-@@ -359,6 +359,9 @@
- #define KEY_MIN 256	/* not defined in Solaris 8 */
- #endif
- 
-+#define colored_chtype(ch, attr, pair) \
-+	((ch) | (attr) | COLOR_PAIR(pair))
-+
- /*
-  * Workaround for HPUX
-  */
Index: patches/ncurses-5.7-branch_update-5.patch
===================================================================
--- patches/ncurses-5.7-branch_update-5.patch	(revision 7352c103dc5e14ed00078707635ac0f08be49e3f)
+++ patches/ncurses-5.7-branch_update-5.patch	(revision 7352c103dc5e14ed00078707635ac0f08be49e3f)
@@ -0,0 +1,16871 @@
+Submitted By: Jim Gifford (jim at cross-lfs dot org)
+Date: 01-18-2009
+Initial Package Version: 5.7
+Origin: Upstream
+Upstream Status: Applied
+Description: This is a branch update for NCurses-5.7, and should be
+             rechecked periodically. This patch covers up to 5.7-20090117.
+
+diff -Naur ncurses-5.7.orig/Ada95/gen/Makefile.in ncurses-5.7/Ada95/gen/Makefile.in
+--- ncurses-5.7.orig/Ada95/gen/Makefile.in	2008-10-04 15:58:31.000000000 -0700
++++ ncurses-5.7/Ada95/gen/Makefile.in	2009-01-18 23:56:40.000000000 -0800
+@@ -1,5 +1,5 @@
+ ##############################################################################
+-# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.                #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
+@@ -28,7 +28,7 @@
+ #
+ #  Author:  Juergen Pfeifer, 1996
+ #
+-#  $Id: Makefile.in,v 1.61 2008/10/04 22:58:31 tom Exp $
++#  $Id: Makefile.in,v 1.63 2009/01/11 01:11:35 tom Exp $
+ #
+ .SUFFIXES:
+ 
+@@ -81,7 +81,7 @@
+ M4		= m4
+ M4FLAGS		= -DNCURSES_EXT_FUNCS=@NCURSES_EXT_FUNCS@
+ 
+-ADACURSES_CONFIG = adacurses-config
++ADACURSES_CONFIG = adacurses@DFT_ARG_SUFFIX@-config
+ 
+ WRAPPER		= sh $(top_srcdir)/misc/shlib
+ GENERATE	= ./gen$x '@DFT_ARG_SUFFIX@'
+@@ -166,6 +166,7 @@
+ 
+ sources:
+ 
++$(DESTDIR)$(bindir) \
+ $(ADA_INCLUDE) \
+ $(ADA_OBJECTS) :
+ 	sh $(top_srcdir)/mkdirs.sh $@
+@@ -187,8 +188,8 @@
+ 	@-chmod u+x $(ADA_SRCDIR)/*.ali
+ 
+ install \
+-install.libs :: $(DESTDIR)$(bindir) adacurses-config
+-	$(INSTALL_PROG) adacurses-config $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
++install.libs :: $(DESTDIR)$(bindir) $(ADACURSES_CONFIG)
++	$(INSTALL_PROG) $(ADACURSES_CONFIG) $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
+ 
+ uninstall \
+ uninstall.libs ::
+@@ -398,7 +399,7 @@
+ 	-rm -f $(GEN_TARGETS) instab.tmp *.ad[bs] *.html *.ali *.tmp
+ 
+ distclean :: clean
+-	-rm -f adacurses-config
++	-rm -f $(ADACURSES_CONFIG)
+ 	-rm -f Makefile
+ 
+ realclean :: distclean
+diff -Naur ncurses-5.7.orig/Ada95/gen/adacurses-config.in ncurses-5.7/Ada95/gen/adacurses-config.in
+--- ncurses-5.7.orig/Ada95/gen/adacurses-config.in	2007-04-07 14:06:50.000000000 -0700
++++ ncurses-5.7/Ada95/gen/adacurses-config.in	2009-01-18 23:56:40.000000000 -0800
+@@ -1,18 +1,47 @@
+ #! /bin/sh
+-# $Id: adacurses-config.in,v 1.2 2007/04/07 21:06:50 tom Exp $
+-#
+-# This script will return the option to add to `gnatmake' for using
+-# AdaCurses.
++# $Id: adacurses-config.in,v 1.5 2009/01/11 00:08:19 tom Exp $
++##############################################################################
++# Copyright (c) 2007,2009 Free Software Foundation, Inc.                     #
++#                                                                            #
++# Permission is hereby granted, free of charge, to any person obtaining a    #
++# copy of this software and associated documentation files (the "Software"), #
++# to deal in the Software without restriction, including without limitation  #
++# the rights to use, copy, modify, merge, publish, distribute, distribute    #
++# with modifications, sublicense, and/or sell copies of the Software, and to #
++# permit persons to whom the Software is furnished to do so, subject to the  #
++# following conditions:                                                      #
++#                                                                            #
++# The above copyright notice and this permission notice shall be included in #
++# all copies or substantial portions of the Software.                        #
++#                                                                            #
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,   #
++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL    #
++# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER      #
++# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING    #
++# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER        #
++# DEALINGS IN THE SOFTWARE.                                                  #
++#                                                                            #
++# Except as contained in this notice, the name(s) of the above copyright     #
++# holders shall not be used in advertising or otherwise to promote the sale, #
++# use or other dealings in this Software without prior written               #
++# authorization.                                                             #
++##############################################################################
+ #
++# This script returns the options to add to `gnatmake' for using AdaCurses.
++
++DESTDIR=@DESTDIR@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
+ 
+-prefix="@prefix@"
+-exec_prefix="@exec_prefix@"
+-libdir="@libdir@"
++ADA_INCLUDE=@ADA_INCLUDE@
++ADA_OBJECTS=@ADA_OBJECTS@
+ 
+-VERSION="@NCURSES_MAJOR@.@NCURSES_MINOR@.@NCURSES_PATCH@"
++VERSION=@NCURSES_MAJOR@.@NCURSES_MINOR@.@NCURSES_PATCH@
+ 
+-CFLAGS="-I$libdir/adacurses -L$libdir/adacurses"
+-LIBS="-L$prefix/lib -lAdaCurses"
++CFLAGS="-I$ADA_INCLUDE -aO$ADA_OBJECTS"
++LIBS="-L$ADA_OBJECTS -lAdaCurses"
+ 
+ case "x$1" in
+     x--version)
+@@ -26,10 +55,10 @@
+         ;;
+     x)
+     	# if no parameter is given, give what gnatmake needs
+-        echo $CFLAGS -largs $LIBS
++        echo "$CFLAGS -i -largs $LIBS"
+         ;;
+     *)
+-        echo 'Usage: adacurses-config [--version | --cflags | --libs]' >&2
++        echo 'Usage: adacurses@DFT_ARG_SUFFIX@-config [--version | --cflags | --libs]' >&2
+         exit 1
+         ;;
+ esac
+diff -Naur ncurses-5.7.orig/Ada95/samples/Makefile.in ncurses-5.7/Ada95/samples/Makefile.in
+--- ncurses-5.7.orig/Ada95/samples/Makefile.in	2006-12-17 08:45:02.000000000 -0800
++++ ncurses-5.7/Ada95/samples/Makefile.in	2009-01-18 23:56:40.000000000 -0800
+@@ -1,5 +1,5 @@
+ ##############################################################################
+-# Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.                #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
+@@ -28,7 +28,7 @@
+ #
+ #  Author:  Juergen Pfeifer, 1996
+ #
+-#  $Id: Makefile.in,v 1.34 2006/12/17 16:45:02 tom Exp $
++#  $Id: Makefile.in,v 1.36 2009/01/11 01:11:54 tom Exp $
+ #
+ .SUFFIXES:
+ 
+@@ -88,8 +88,8 @@
+ 
+ CARGS        =-cargs $(ADAFLAGS)
+ LARGS        =-largs @TEST_ARG2@ $(LD_FLAGS) -lAdaCurses
+- 
+-PROGS        = tour rain ncurses 
++
++PROGS        = tour rain ncurses
+ 
+ TOUR_OBJS    =	tour.o sample.o sample-curses_demo.o sample-explanation.o 	\
+ 		sample-form_demo.o sample-function_key_setting.o 		\
+@@ -145,7 +145,7 @@
+ 
+ clean :: mostlyclean
+ 	rm -f *.o *.ali b_t*.* *.s $(PROGS) a.out core b_*_test.c *.xr[bs] \
+-	explain.msg trace screendump 
++	explain.msg trace screendump b~*.ad[bs]
+ 
+ distclean :: clean
+ 	rm -f Makefile
+diff -Naur ncurses-5.7.orig/Ada95/src/Makefile.in ncurses-5.7/Ada95/src/Makefile.in
+--- ncurses-5.7.orig/Ada95/src/Makefile.in	2007-09-15 11:22:24.000000000 -0700
++++ ncurses-5.7/Ada95/src/Makefile.in	2009-01-18 23:56:40.000000000 -0800
+@@ -1,5 +1,5 @@
+ ##############################################################################
+-# Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.                #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
+@@ -28,7 +28,7 @@
+ #
+ #  Author:  Juergen Pfeifer, 1996
+ #
+-#  $Id: Makefile.in,v 1.31 2007/09/15 18:22:24 tom Exp $
++#  $Id: Makefile.in,v 1.34 2009/01/11 01:11:44 tom Exp $
+ #
+ .SUFFIXES:
+ 
+@@ -36,17 +36,22 @@
+ THIS		= Makefile
+ 
+ MODEL		= ../../@DFT_OBJ_SUBDIR@
++
+ DESTDIR		= @DESTDIR@
++
++top_srcdir	= @top_srcdir@
+ srcdir		= @srcdir@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+-ADA_INCLUDE	= @ADA_INCLUDE@
++
++ADA_INCLUDE	= $(DESTDIR)@ADA_INCLUDE@
++ADA_OBJECTS	= $(DESTDIR)@ADA_OBJECTS@
+ 
+ INSTALL		= @INSTALL@
+-INSTALL_DATA	= @INSTALL_DATA@
++INSTALL_LIB	= @INSTALL@ @INSTALL_LIB@
+ 
+ AR		= @AR@
+-AR_OPTS		= @AR_OPTS@
++ARFLAGS		= @ARFLAGS@
+ AWK		= @AWK@
+ LN_S		= @LN_S@
+ 
+@@ -75,11 +80,12 @@
+ ADAFLAGS        = @ADAFLAGS@ -I. -I$(srcdir)
+ 
+ ADAMAKE         = @cf_ada_make@
+-ADAMAKEFLAGS    = 
++ADAMAKEFLAGS    =
+ 
+ CARGS           = -cargs $(ADAFLAGS)
+ LARGS           =
+ 
++LIBRARY_FILE	= libAdaCurses.a
+ ALIB            = @cf_ada_package@
+ ABASE           = $(ALIB)-curses
+ 
+@@ -164,21 +170,25 @@
+ 	$(ABASE)-text_io-complex_io.o
+ 
+ 
+-all ::  libAdaCurses.a
++all ::  $(LIBRARY_FILE)
+ 	@echo done
+ 
+-libAdaCurses.a :: dotouch $(LIBOBJS) @cf_generic_objects@
+-	$(AR) $(AR_OPTS) $@ $(LIBOBJS) @cf_generic_objects@
+-
+-dotouch :
+-	@sh -c 'for f in $(LIBALIS) $(GENALIS); do test -f $$f || touch $$f; done'
++$(LIBRARY_FILE) :: $(LIBOBJS) @cf_generic_objects@
++	$(AR) $(ARFLAGS) $@ $(LIBOBJS) @cf_generic_objects@
+ 
+ sources :
+ 	@echo made $@
+ 
+ libs \
+ install \
+-install.libs \
++install.libs :: $(LIBRARY_FILE)
++	@echo made $(LIBRARY_FILE)
++
++install \
++install.libs :: $(LIBRARY_FILE)
++	@$(top_srcdir)/tar-copy.sh $(LIBRARY_FILE) . $(ADA_OBJECTS)
++	@echo made $@
++
+ uninstall \
+ uninstall.libs ::
+ 	@echo made $@
+diff -Naur ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb
+--- ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb	2008-07-26 11:51:11.000000000 -0700
++++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb	2009-01-18 23:56:21.000000000 -0800
+@@ -35,8 +35,8 @@
+ ------------------------------------------------------------------------------
+ --  Author:  Juergen Pfeifer, 1996
+ --  Version Control:
+---  $Revision: 1.22 $
+---  $Date: 2008/07/26 18:51:11 $
++--  $Revision: 1.23 $
++--  $Date: 2008/11/16 00:19:59 $
+ --  Binding Version 01.00
+ ------------------------------------------------------------------------------
+ with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
+@@ -50,7 +50,7 @@
+    function Has_Mouse return Boolean
+    is
+       function Mouse_Avail return C_Int;
+-      pragma Import (C, Mouse_Avail, "_nc_has_mouse");
++      pragma Import (C, Mouse_Avail, "has_mouse");
+    begin
+       if Has_Key (Key_Mouse) or else Mouse_Avail /= 0 then
+          return True;
+diff -Naur ncurses-5.7.orig/INSTALL ncurses-5.7/INSTALL
+--- ncurses-5.7.orig/INSTALL	2008-11-02 13:13:51.000000000 -0800
++++ ncurses-5.7/INSTALL	2009-01-18 23:56:34.000000000 -0800
+@@ -1,5 +1,5 @@
+ -------------------------------------------------------------------------------
+--- Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.               --
++-- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.               --
+ --                                                                           --
+ -- Permission is hereby granted, free of charge, to any person obtaining a   --
+ -- copy of this software and associated documentation files (the             --
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: INSTALL,v 1.135 2008/11/02 21:13:51 tom Exp $
++-- $Id: INSTALL,v 1.137 2009/01/03 23:59:23 tom Exp $
+ ---------------------------------------------------------------------
+              How to install Ncurses/Terminfo on your system
+ ---------------------------------------------------------------------
+@@ -525,6 +525,11 @@
+ 	terminfo entries.  This is the default, unless you have disabled the
+ 	extended functions.
+ 
++    --enable-pc-files
++	If pkg-config is found (see --with-pkg-config), generate ".pc" files
++	for each of the libraries, and install them in pkg-config's library
++	directory.
++
+     --enable-reentrant
+ 	Compile experimental configuration which improves reentrant use of the
+ 	library by reducing global and static variables.  This option is also
+@@ -850,6 +855,9 @@
+ 	those using termcap, do not use the higher speeds.  Your application
+ 	(or system, in general) may or may not.
+ 
++    --with-pkg-config=[DIR]
++	Check for pkg-config, optionally specifying its path.
++
+     --with-profile
+ 	Generate profile-libraries These are named by adding "_p" to the root,
+ 	e.g., libncurses_p.a
+@@ -975,6 +983,9 @@
+     --without-dlsym
+ 	Do not use dlsym() to load GPM dynamically.
+ 
++    --without-manpages
++	Tell the configure script to suppress the install of ncurses' manpages.
++
+     --without-progs
+ 	Tell the configure script to suppress the build of ncurses' application
+ 	programs (e.g., tic).  The test applications will still be built if you
+diff -Naur ncurses-5.7.orig/MANIFEST ncurses-5.7/MANIFEST
+--- ncurses-5.7.orig/MANIFEST	2008-10-25 16:47:24.000000000 -0700
++++ ncurses-5.7/MANIFEST	2009-01-18 23:56:34.000000000 -0800
+@@ -640,6 +640,7 @@
+ ./man/ncurses.3x
+ ./man/panel.3x
+ ./man/resizeterm.3x
++./man/tabs.1
+ ./man/term.5
+ ./man/term.7
+ ./man/terminfo.head
+@@ -694,6 +695,7 @@
+ ./misc/emx.src
+ ./misc/form.def
+ ./misc/form.ref
++./misc/gen-pkgconfig.in
+ ./misc/gen_edit.sh
+ ./misc/jpf-indent
+ ./misc/makedef.cmd
+@@ -947,6 +949,7 @@
+ ./progs/infocmp.c
+ ./progs/modules
+ ./progs/progs.priv.h
++./progs/tabs.c
+ ./progs/tic.c
+ ./progs/toe.c
+ ./progs/tput.c
+@@ -963,6 +966,7 @@
+ ./test/cardfile.c
+ ./test/cardfile.dat
+ ./test/chgat.c
++./test/clip_printw.c
+ ./test/color_set.c
+ ./test/configure
+ ./test/configure.in
+@@ -990,6 +994,7 @@
+ ./test/inch_wide.c
+ ./test/inchs.c
+ ./test/ins_wide.c
++./test/insdelln.c
+ ./test/inserts.c
+ ./test/key_names.c
+ ./test/keynames.c
+diff -Naur ncurses-5.7.orig/NEWS ncurses-5.7/NEWS
+--- ncurses-5.7.orig/NEWS	2008-11-01 17:56:22.000000000 -0700
++++ ncurses-5.7/NEWS	2009-01-18 23:56:41.000000000 -0800
+@@ -1,5 +1,5 @@
+ -------------------------------------------------------------------------------
+--- Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.               --
++-- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.               --
+ --                                                                           --
+ -- Permission is hereby granted, free of charge, to any person obtaining a   --
+ -- copy of this software and associated documentation files (the             --
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.1320 2008/11/02 00:56:22 tom Exp $
++-- $Id: NEWS,v 1.1358 2009/01/17 23:54:20 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -45,6 +45,125 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20090117
++	+ add -shared option to MK_SHARED_LIB when -Bsharable is used, for
++	  *BSD's, without which "main" might be one of the shared library's
++	  dependencies (report/analysis by Ken Dickey).
++	+ modify waddch_literal(), updating line-pointer after a multicolumn
++	  character is found to not fit on the current row, and wrapping is
++	  done.  Since the line-pointer was not updated, the wrapped
++	  multicolumn character was written to the beginning of the current row
++	  (cf: 20041023, reported by "Nick" regarding problem with ncmpc
++	  http://musicpd.org/mantis/bug_view_page.php?bug_id=1930).
++
++20090110
++	+ add screen.Eterm terminfo entry (GenToo #124887) -TD
++	+ modify adacurses-config to look for ".ali" files in the adalib
++	  directory.
++	+ correct install for Ada95, which omitted libAdaCurses.a used in
++	  adacurses-config
++	+ change install for adacurses-config to provide additional flavors
++	  such as adacursesw-config, for ncursesw (GenToo #167849).
++
++20090105
++	+ remove undeveloped feature in ncurses-config.in for setting
++	  prefix variable.
++	+ recent change to ncurses-config.in did not take into account the
++	  --disable-overwrite option, which sets $includedir to the
++	  subdirectory and using just that for a -I option does not work - fix
++	  (report by Frederic L W Meunier).
++
++20090104
++	+ modify gen-pkgconfig.in to eliminate a dependency on rpath when
++	  deciding whether to add $LIBS to --libs output; that should be shown
++	  for the ncurses and tinfo libraries without taking rpath into
++	  account.
++	+ fix an overlooked change from $AR_OPTS to $ARFLAGS in mk-1st.awk,
++	  used in static libraries (report by Marty Jack).
++
++20090103
++	+ add a configure-time check to pick a suitable value for
++	  CC_SHARED_OPTS for Solaris (report by Dagobert Michelsen).
++	+ add configure --with-pkg-config and --enable-pc-files options, along
++	  with misc/gen-pkgconfig.in which can be used to generate ".pc" files
++	  for pkg-config (request by Jan Engelhardt).
++	+ use $includedir symbol in misc/ncurses-config.in, add --includedir
++	  option.
++	+ change makefiles to use $ARFLAGS rather than $AR_OPTS, provide a
++	  configure check to detect whether a "-" is needed before "ar"
++	  options.
++	+ update config.guess, config.sub from
++		http://savannah.gnu.org/projects/config
++
++20081227
++	+ modify mk-1st.awk to work with extra categories for tinfo library.
++	+ modify configure script to allow building shared libraries with gcc
++	  on AIX 5 or 6 (adapted from patch by Lital Natan).
++
++20081220
++	+ modify to omit the opaque-functions from lib_gen.o when
++	  --disable-ext-funcs is used.
++	+ add test/clip_printw.c to illustrate how to use printw without
++	  wrapping.
++	+ modify ncurses 'F' test to demo wborder_set() with colored lines.
++	+ modify ncurses 'f' test to demo wborder() with colored lines.
++
++20081213
++	+ add check for failure to open hashed-database needed for db4.6
++	  (GenToo #245370).
++	+ corrected --without-manpages option; previous change only suppressed
++	  the auxiliary rules install.man and uninstall.man
++	+ add case for FreeMINT to configure macro CF_XOPEN_SOURCE (patch from
++	  GenToo #250454).
++	+ fixes from NetBSD port at
++	  http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/devel/ncurses/patches
++	  patch-ac (build-fix for DragonFly)
++	  patch-ae (use INSTALL_SCRIPT for installing misc/ncurses*-config).
++	+ improve configure script macros CF_HEADER_PATH and CF_LIBRARY_PATH
++	  by adding CFLAGS, CPPFLAGS and LDFLAGS, LIBS values to the
++	  search-lists.
++	+ correct title string for keybound manpage (patch by Frederic Culot,
++	  OpenBSD documentation/6019),
++
++20081206
++	+ move del_curterm() call from _nc_freeall() to _nc_leaks_tinfo() to
++	  work for progs/clear, progs/tabs, etc.
++	+ correct buffer-size after internal resizing of wide-character
++	  set_field_buffer(), broken in 20081018 changes (report by Mike Gran).
++	+ add "-i" option to test/filter.c to tell it to use initscr() rather
++	  than newterm(), to investigate report on comp.unix.programmer that
++	  ncurses would clear the screen in that case (it does not - the issue
++	  was xterm's alternate screen feature).
++	+ add check in mouse-driver to disable connection if GPM returns a
++	  zero, indicating that the connection is closed (Debian #506717,
++	  adapted from patch by Samuel Thibault).
++
++20081129
++	+ improve a workaround in adding wide-characters, when a control
++	  character is found.  The library (cf: 20040207) uses unctrl() to
++	  obtain a printable version of the control character, but was not
++	  passing color or video attributes.
++	+ improve test/ncurses.c 'a' test, using unctrl() more consistently to
++	  display meta-characters.
++	+ turn on _XOPEN_CURSES definition in curses.h
++	+ add eterm-color entry (report by Vincent Lefevre) -TD
++	+ correct use of key_name() in test/ncurses.c 'A' test, which only
++	  displays wide-characters, not key-codes since 20070612 (report by
++	  Ricardo Cantu).
++
++20081122
++	+ change _nc_has_mouse() to has_mouse(), reflect its use in C++ and
++	  Ada95 (patch by Juergen Pfeifer).
++	+ document in TO-DO an issue with Cygwin's package for GNAT (report
++	  by Mike Dennison).
++	+ improve error-checking of command-line options in "tabs" program.
++
++20081115
++	+ change several terminfo entries to make consistent use of ANSI
++	  clear-all-tabs -TD
++	+ add "tabs" program (prompted by Debian #502260).
++	+ add configure --without-manpages option (request by Mike Frysinger).
++
+ 20081102 5.7 release for upload to ftp.gnu.org
+ 
+ 20081025
+diff -Naur ncurses-5.7.orig/TO-DO ncurses-5.7/TO-DO
+--- ncurses-5.7.orig/TO-DO	2008-10-11 12:22:27.000000000 -0700
++++ ncurses-5.7/TO-DO	2009-01-18 23:56:23.000000000 -0800
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: TO-DO,v 1.51 2008/10/11 19:22:27 tom Exp $
++-- $Id: TO-DO,v 1.53 2008/11/28 16:39:12 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ SHORT-TERM TO-DO ITEMS:
+@@ -45,7 +45,7 @@
+ + Scrolling optimization has holes:  for example, it forces repaints of the
+   screen between calls to refresh().
+ 
+-+ SVr4 uses slightly different rules for determining when softkeys are shown. 
+++ SVr4 uses slightly different rules for determining when softkeys are shown.
+   For example, they are initially displayed (before the ncurses 'e' test
+   activates them), and a touchwin can apparently also force them to be
+   displayed.
+@@ -58,7 +58,7 @@
+ + The window classes defined in the c++ subdirectory need documentation.  Some
+   C++ programmer could earn a lot of good karma by doing this...
+ 
+-+ vid_attr() should support the set_a_attributes (sgr1) string, but does not. 
+++ vid_attr() should support the set_a_attributes (sgr1) string, but does not.
+   There appear to be no terminals that require that functionality.
+ 
+ + the configure --disable-ext-funcs option does not work for Ada95 tree.
+@@ -66,6 +66,24 @@
+ + the --with-pthread configuration builds for Cygwin, but does not work
+   properly (test/worm.c shows all of the worms in the same location).
+ 
+++ the Ada95 tree requires a small fix to build on Cygwin, since the GNAT port
++  to that platform provides an incomplete Interrupts.Names package.  For
++  instance (your gcc version may be different):
++        /usr/lib/gcc/i686-pc-cygwin/3.4.4/adainclude/a-intnam.ads
++
++  cut here...
++-------------------------------------------------------------------------------
++--- a-intnam.ads.orig   2003-10-21 13:41:51.000000000 +0000
+++++ a-intnam.ads        2007-05-05 22:40:02.609375000 +0000
++@@ -44,5 +44,6 @@
++
++    DUMMY_INTERRUPT_1 : constant Interrupt_ID := 1;
++    DUMMY_INTERRUPT_2 : constant Interrupt_ID := 2;
+++   SIGINT : constant Interrupt_ID := 2;
++
++ end Ada.Interrupts.Names;
++-------------------------------------------------------------------------------
++
+ + the --enable-rpath configure option builds for the corresponding platforms;
+   however combining it with --with-ticlib and --with-termlib does not always
+   produce libraries that can be run without setting environment variables.
+@@ -122,7 +140,7 @@
+ 2. DOS port
+ 
+ Only a few of the files in the library depend on the terminfo format.
+-It should be possible to further kernelize the package, then rewrite 
++It should be possible to further kernelize the package, then rewrite
+ a small number of core files to produce a functionally-compatible
+ port that would do updates to a memory-mapped screen area.  The first
+ result of this would be a DOS port.
+@@ -195,10 +213,10 @@
+ 		move_insert, dest_tabs_magic_smso, transparent_underline,
+ 		needs_xon_xoff, hard_cursor.
+ 	Numerics: lines_of_memory, buttons.
+-	Strings: pkey_key, pkey_local, pkey_xmit, underline_char, 
+-		enter_xon_mode,	exit_xon_mode, xon_character, xoff_character, 
++	Strings: pkey_key, pkey_local, pkey_xmit, underline_char,
++		enter_xon_mode,	exit_xon_mode, xon_character, xoff_character,
+ 		display_clock, remove_clock, user[0-5], display_pc_char,
+-		enter_scancode_mode, exit_scancode_mode, pc_term_options, 
++		enter_scancode_mode, exit_scancode_mode, pc_term_options,
+ 		scancode_escape, alt_scancode_esc.
+ 
+ These are the potentially important ones for ncurses.  Notes:
+diff -Naur ncurses-5.7.orig/aclocal.m4 ncurses-5.7/aclocal.m4
+--- ncurses-5.7.orig/aclocal.m4	2008-10-25 15:15:32.000000000 -0700
++++ ncurses-5.7/aclocal.m4	2009-01-18 23:56:41.000000000 -0800
+@@ -1,5 +1,5 @@
+ dnl***************************************************************************
+-dnl Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
++dnl Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+ dnl                                                                          *
+ dnl Permission is hereby granted, free of charge, to any person obtaining a  *
+ dnl copy of this software and associated documentation files (the            *
+@@ -28,7 +28,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.470 2008/10/25 22:15:32 tom Exp $
++dnl $Id: aclocal.m4,v 1.482 2009/01/17 21:10:05 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -168,7 +168,7 @@
+ 
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_ADD_INCDIR version: 9 updated: 2008/02/09 13:15:34
++dnl CF_ADD_INCDIR version: 10 updated: 2008/12/27 12:30:03
+ dnl -------------
+ dnl Add an include-directory to $CPPFLAGS.  Don't add /usr/include, since it's
+ dnl redundant.  We don't normally need to add -I/usr/local/include for gcc,
+@@ -195,7 +195,7 @@
+ 		fi
+ 
+ 		if test "$cf_have_incdir" = no ; then
+-          if test "$cf_add_incdir" = /usr/local/include ; then
++		  if test "$cf_add_incdir" = /usr/local/include ; then
+ 			if test "$GCC" = yes
+ 			then
+ 			  cf_save_CPPFLAGS=$CPPFLAGS
+@@ -213,9 +213,9 @@
+ 		  CF_VERBOSE(adding $cf_add_incdir to include-path)
+ 		  ifelse($2,,CPPFLAGS,$2)="-I$cf_add_incdir $ifelse($2,,CPPFLAGS,[$]$2)"
+ 
+-          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+-          test "$cf_top_incdir" = "$cf_add_incdir" && break
+-          cf_add_incdir="$cf_top_incdir"
++		  cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
++		  test "$cf_top_incdir" = "$cf_add_incdir" && break
++		  cf_add_incdir="$cf_top_incdir"
+ 		else
+ 		  break
+ 		fi
+@@ -353,7 +353,41 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_AWK_BIG_PRINTF version: 2 updated: 2008/10/04 17:16:18
++dnl CF_AR_FLAGS version: 2 updated: 2009/01/01 20:45:18
++dnl -----------
++dnl Check for suitable "ar" (archiver) options for updating an archive.
++AC_DEFUN([CF_AR_FLAGS],[
++AC_REQUIRE([CF_PROG_AR])
++
++AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[
++	cf_cv_ar_flags=unknown
++	for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
++	do
++		rm -f conftest.$ac_cv_objext
++		rm -f conftest.a
++
++		cat >conftest.$ac_ext <<EOF
++#line __oline__ "configure"
++int	testdata[[3]] = { 123, 456, 789 };
++EOF
++		if AC_TRY_EVAL(ac_compile) ; then
++			$AR $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&AC_FD_CC 1>/dev/null
++			if test -f conftest.a ; then
++				cf_cv_ar_flags=$cf_ar_flags
++				break
++			fi
++		else
++			CF_VERBOSE(cannot compile test-program)
++			break
++		fi
++	done
++	rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
++])
++
++AC_SUBST(ARFLAGS,$cf_cv_ar_flags)
++])
++dnl ---------------------------------------------------------------------------
++dnl CF_AWK_BIG_PRINTF version: 3 updated: 2008/12/27 12:30:03
+ dnl -----------------
+ dnl Check if awk can handle big strings using printf.  Some older versions of
+ dnl awk choke on large strings passed via "%s".
+@@ -362,19 +396,19 @@
+ dnl $2 = variable to set with result
+ AC_DEFUN([CF_AWK_BIG_PRINTF],
+ [
+-    case x$AWK in #(vi
+-    x)
+-        eval $2=no
+-        ;;
+-    *) #(vi
+-        if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < $1) { xx = xx "x"; }; printf("%s\n", xx); }' \
+-            | $AWK '{ printf "%d\n", length([$]0); }' | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ([$]0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then
+-            eval $2=yes
+-        else
+-            eval $2=no
+-        fi
+-        ;;
+-    esac
++	case x$AWK in #(vi
++	x)
++		eval $2=no
++		;;
++	*) #(vi
++		if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < $1) { xx = xx "x"; }; printf("%s\n", xx); }' \
++			| $AWK '{ printf "%d\n", length([$]0); }' | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ([$]0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then
++			eval $2=yes
++		else
++			eval $2=no
++		fi
++		;;
++	esac
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+ dnl CF_BOOL_DECL version: 8 updated: 2004/01/30 15:51:18
+@@ -1019,7 +1053,7 @@
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_FIND_LINKAGE version: 12 updated: 2007/07/29 20:13:53
++dnl CF_FIND_LINKAGE version: 13 updated: 2008/12/24 07:59:55
+ dnl ---------------
+ dnl Find a library (specifically the linkage used in the code fragment),
+ dnl searching for it if it is not already in the library path.
+@@ -1052,6 +1086,7 @@
+     cf_cv_find_linkage_$3=yes,[
+     cf_cv_find_linkage_$3=no
+ 
++    CF_VERBOSE(find linkage for $3 library)
+     CF_MSG_LOG([Searching for headers in [FIND_LINKAGE]($3,$6)])
+ 
+     cf_save_CPPFLAGS="$CPPFLAGS"
+@@ -1998,11 +2033,31 @@
+ ])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_HEADER_PATH version: 8 updated: 2002/11/10 14:46:59
++dnl CF_HEADER_PATH version: 9 updated: 2008/12/07 19:38:31
+ dnl --------------
+-dnl Construct a search-list for a nonstandard header-file
++dnl Construct a search-list of directories for a nonstandard header-file
++dnl
++dnl Parameters
++dnl	$1 = the variable to return as result
++dnl	$2 = the package name
+ AC_DEFUN([CF_HEADER_PATH],
+-[CF_SUBDIR_PATH($1,$2,include)
++[
++cf_header_path_list=""
++if test -n "${CFLAGS}${CPPFLAGS}" ; then
++	for cf_header_path in $CPPFLAGS $CFLAGS
++	do
++		case $cf_header_path in #(vi
++		-I*)
++			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
++			CF_ADD_SUBDIR_PATH($1,$2,include,$cf_header_path,NONE)
++			cf_header_path_list="$cf_header_path_list [$]$1"
++			;;
++		esac
++	done
++fi
++
++CF_SUBDIR_PATH($1,$2,include)
++
+ test "$includedir" != NONE && \
+ test "$includedir" != "/usr/include" && \
+ test -d "$includedir" && {
+@@ -2017,6 +2072,7 @@
+ 	test -d $oldincludedir/$2 && $1="[$]$1 $oldincludedir/$2"
+ }
+ 
++$1="$cf_header_path_list [$]$1"
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+ dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23
+@@ -2143,7 +2199,7 @@
+ ])
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_LDFLAGS_STATIC version: 4 updated: 2008/10/18 17:58:20
++dnl CF_LDFLAGS_STATIC version: 5 updated: 2008/12/27 12:30:03
+ dnl -----------------
+ dnl Check for compiler/linker flags used to temporarily force usage of static
+ dnl libraries.  This depends on the compiler and platform.  Use this to help
+@@ -2153,7 +2209,7 @@
+ 
+ if test "$GCC" = yes ; then
+ 	case $cf_cv_system_name in #(
+-	OS/2*|os2*|aix[[45]]*) 	#( vi
++	OS/2*|os2*|aix[[4]]*) 	#( vi
+ 		LDFLAGS_STATIC=
+ 		LDFLAGS_SHARED=
+ 		;;
+@@ -2164,7 +2220,7 @@
+     esac
+ else
+ 	case $cf_cv_system_name in #(
+-	aix[[45]]*) 	#( from ld manpage
++	aix[[456]]*) 	#( from ld manpage
+ 		LDFLAGS_STATIC=-bstatic
+ 		LDFLAGS_SHARED=-bdynamic
+ 		;;
+@@ -2179,7 +2235,7 @@
+ 		;;
+ 	osf[[45]]*)	#( from ld manpage osf4.0d, osf5.1
+ 		# alternative "-oldstyle_liblookup" (not in cc manpage)
+-		LDFLAGS_STATIC=-noso 
++		LDFLAGS_STATIC=-noso
+ 		LDFLAGS_SHARED=-so_archive
+ 		;;
+ 	solaris2*)
+@@ -2193,11 +2249,33 @@
+ AC_SUBST(LDFLAGS_SHARED)
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_LIBRARY_PATH version: 7 updated: 2002/11/10 14:46:59
++dnl CF_LIBRARY_PATH version: 8 updated: 2008/12/07 19:38:31
+ dnl ---------------
+-dnl Construct a search-list for a nonstandard library-file
++dnl Construct a search-list of directories for a nonstandard library-file
++dnl
++dnl Parameters
++dnl	$1 = the variable to return as result
++dnl	$2 = the package name
+ AC_DEFUN([CF_LIBRARY_PATH],
+-[CF_SUBDIR_PATH($1,$2,lib)])dnl
++[
++cf_library_path_list=""
++if test -n "${LDFLAGS}${LIBS}" ; then
++	for cf_library_path in $LDFLAGS $LIBS
++	do
++		case $cf_library_path in #(vi
++		-L*)
++			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
++			CF_ADD_SUBDIR_PATH($1,$2,lib,$cf_library_path,NONE)
++			cf_library_path_list="$cf_library_path_list [$]$1"
++			;;
++		esac
++	done
++fi
++
++CF_SUBDIR_PATH($1,$2,lib)
++
++$1="$cf_library_path_list [$]$1"
++])dnl
+ dnl ---------------------------------------------------------------------------
+ dnl CF_LIB_PREFIX version: 8 updated: 2008/09/13 11:34:16
+ dnl -------------
+@@ -2216,7 +2294,7 @@
+ 	AC_SUBST(LIB_PREFIX)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_LIB_RULES version: 53 updated: 2008/09/20 19:51:59
++dnl CF_LIB_RULES version: 55 updated: 2008/12/13 16:17:38
+ dnl ------------
+ dnl Append definitions and rules for the given models to the subdirectory
+ dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
+@@ -2504,18 +2582,28 @@
+ install.libs uninstall.libs \\
+ install.data uninstall.data ::
+ $MAKE_TERMINFO	cd misc && \${MAKE} \${CF_MFLAGS} \[$]@
++CF_EOF
++
++if test "x$cf_with_manpages" = xyes; then
++cat >> Makefile <<CF_EOF
+ 
+ install.man \\
+ uninstall.man ::
+ 	cd man && \${MAKE} \${CF_MFLAGS} \[$]@
++CF_EOF
++fi
++
++cat >> Makefile <<CF_EOF
+ 
+ distclean ::
+ 	rm -f config.cache config.log config.status Makefile include/ncurses_cfg.h
+ 	rm -f headers.sh headers.sed mk_shared_lib.sh
++	rm -f edit_man.* man_alias.*
+ 	rm -rf \${DIRS_TO_MAKE}
+ CF_EOF
+ 
+ # Special case: tack's manpage lives in its own directory.
++if test "x$cf_with_manpages" = xyes; then
+ if test -d tack ; then
+ if test -f $srcdir/$tack.h; then
+ cat >> Makefile <<CF_EOF
+@@ -2526,6 +2614,7 @@
+ CF_EOF
+ fi
+ fi
++fi
+ 
+ dnl If we're installing into a subdirectory of /usr/include, etc., we should
+ dnl prepend the subdirectory's name to the "#include" paths.  It won't hurt
+@@ -2679,7 +2768,7 @@
+ ])
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_LIB_SUFFIX version: 15 updated: 2008/09/13 11:54:48
++dnl CF_LIB_SUFFIX version: 16 updated: 2008/12/27 12:30:03
+ dnl -------------
+ dnl Compute the library file-suffix from the given model name
+ dnl $1 = model name
+@@ -2689,40 +2778,44 @@
+ AC_DEFUN([CF_LIB_SUFFIX],
+ [
+ 	AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
+-	case $1 in
+-	libtool)
++	case $1 in #(vi
++	libtool) #(vi
+ 		$2='.la'
+ 		$3=[$]$2
+ 		;;
+-	normal)
++	normal) #(vi
+ 		$2='.a'
+ 		$3=[$]$2
+ 		;;
+-	debug)
++	debug) #(vi
+ 		$2='_g.a'
+ 		$3=[$]$2
+ 		;;
+-	profile)
++	profile) #(vi
+ 		$2='_p.a'
+ 		$3=[$]$2
+ 		;;
+-	shared)
++	shared) #(vi
+ 		case $cf_cv_system_name in
+-		cygwin*)
++		aix[[56]]*) #(vi
++			$2='.a'
++			$3=[$]$2
++			;;
++		cygwin*) #(vi
+ 			$2='.dll'
+ 			$3='.dll.a'
+ 			;;
+-		darwin*)
++		darwin*) #(vi
+ 			$2='.dylib'
+ 			$3=[$]$2
+ 			;;
+-		hpux*)
++		hpux*) #(vi
+ 			case $target in
+-			ia64*)
++			ia64*) #(vi
+ 				$2='.so'
+ 				$3=[$]$2
+ 				;;
+-			*)
++			*) #(vi
+ 				$2='.sl'
+ 				$3=[$]$2
+ 				;;
+@@ -2755,7 +2848,7 @@
+ 	test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}"
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_LINK_DATAONLY version: 8 updated: 2006/12/16 12:33:30
++dnl CF_LINK_DATAONLY version: 9 updated: 2009/01/01 20:21:38
+ dnl ----------------
+ dnl Some systems have a non-ANSI linker that doesn't pull in modules that have
+ dnl only data (i.e., no functions), for example NeXT.  On those systems we'll
+@@ -2772,7 +2865,7 @@
+ EOF
+ 	if AC_TRY_EVAL(ac_compile) ; then
+ 		mv conftest.o data.o && \
+-		( $AR $AR_OPTS conftest.a data.o ) 2>&AC_FD_CC 1>/dev/null
++		( $AR $ARFLAGS conftest.a data.o ) 2>&AC_FD_CC 1>/dev/null
+ 	fi
+ 	rm -f conftest.$ac_ext data.o
+ 	cat >conftest.$ac_ext <<EOF
+@@ -2791,7 +2884,7 @@
+ EOF
+ 	if AC_TRY_EVAL(ac_compile); then
+ 		mv conftest.o func.o && \
+-		( $AR $AR_OPTS conftest.a func.o ) 2>&AC_FD_CC 1>/dev/null
++		( $AR $ARFLAGS conftest.a func.o ) 2>&AC_FD_CC 1>/dev/null
+ 	fi
+ 	rm -f conftest.$ac_ext func.o
+ 	( eval $RANLIB conftest.a ) 2>&AC_FD_CC >/dev/null
+@@ -3737,6 +3830,38 @@
+ esac
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_PKG_CONFIG version: 2 updated: 2008/12/24 07:57:28
++dnl -------------
++dnl Check for the package-config program, unless disabled by command-line.
++AC_DEFUN([CF_PKG_CONFIG],
++[
++AC_MSG_CHECKING(if you want to use pkg-config)
++AC_ARG_WITH(pkg-config,
++	[  --with-pkg-config{=path} enable/disable use of pkg-config],
++	[cf_pkg_config=$withval],
++	[cf_pkg_config=yes])
++AC_MSG_RESULT($cf_pkg_config)
++
++case $cf_pkg_config in
++no)
++	PKG_CONFIG=none
++	;;
++yes)
++	AC_PATH_PROG(PKG_CONFIG, pkg-config, none)
++	;;
++*)
++	PKG_CONFIG=$withval
++	;;
++esac
++
++test -z "$PKG_CONFIG" && PKG_CONFIG=none
++if test "$PKG_CONFIG" != none ; then
++	CF_PATH_SYNTAX(PKG_CONFIG)
++fi
++
++AC_SUBST(PKG_CONFIG)
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_POSIX_C_SOURCE version: 6 updated: 2005/07/14 20:25:10
+ dnl -----------------
+ dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed.
+@@ -3872,6 +3997,13 @@
+ 
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_PROG_AR version: 1 updated: 2009/01/01 20:15:22
++dnl ----------
++dnl Check for archiver "ar".
++AC_DEFUN([CF_PROG_AR],[
++AC_CHECK_TOOL(AR, ar, ar)
++])
++dnl ---------------------------------------------------------------------------
+ dnl CF_PROG_AWK version: 1 updated: 2006/09/16 11:40:59
+ dnl -----------
+ dnl Check for awk, ensure that the check found something.
+@@ -4003,7 +4135,7 @@
+ esac
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_PROG_LDCONFIG version: 1 updated: 2003/09/20 17:07:55
++dnl CF_PROG_LDCONFIG version: 2 updated: 2008/12/13 14:08:40
+ dnl ----------------
+ dnl Check for ldconfig, needed to fixup shared libraries that would be built
+ dnl and then used in the install.
+@@ -4012,7 +4144,7 @@
+   LDCONFIG=:
+ else
+ case "$cf_cv_system_name" in #(vi
+-freebsd*) #(vi
++dragonfly*|freebsd*) #(vi
+   test -z "$LDCONFIG" && LDCONFIG="/sbin/ldconfig -R"
+   ;;
+ *) LDPATH=$PATH:/sbin:/usr/sbin
+@@ -4147,7 +4279,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_SHARED_OPTS version: 53 updated: 2008/10/25 18:14:20
++dnl CF_SHARED_OPTS version: 57 updated: 2009/01/17 16:10:05
+ dnl --------------
+ dnl --------------
+ dnl Attempt to determine the appropriate CC/LD options for creating a shared
+@@ -4176,6 +4308,7 @@
+ 	AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
+ 	LOCAL_LDFLAGS=
+ 	LOCAL_LDFLAGS2=
++	LD_RPATH_OPT=
+ 	LD_SHARED_OPTS=
+ 	INSTALL_LIB="-m 644"
+ 
+@@ -4219,6 +4352,12 @@
+ 	cf_cv_shlib_version_infix=no
+ 
+ 	case $cf_cv_system_name in
++	aix[[56]]*)
++		if test "$GCC" = yes; then
++			CC_SHARED_OPTS=
++			MK_SHARED_LIB="$(CC) -shared"
++		fi
++		;;
+ 	beos*)
+ 		MK_SHARED_LIB='${CC} ${CFLAGS} -o $[@] -Xlinker -soname=`basename $[@]` -nostart -e 0'
+ 		;;
+@@ -4239,7 +4378,7 @@
+ EOF
+ 		exec \[$]* -shared -Wl,--out-implib=../lib/\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\[$]{SHARED_LIB}
+ CF_EOF
+-		chmod +x mk_shared_lib.sh 
++		chmod +x mk_shared_lib.sh
+ 		;;
+ 	darwin*)
+ 		EXTRA_CFLAGS="-no-cpp-precomp"
+@@ -4272,10 +4411,10 @@
+ 	irix*)
+ 		if test "$cf_cv_ld_rpath" = yes ; then
+ 			if test "$GCC" = yes; then
+-				cf_ld_rpath_opt="-Wl,-rpath,"
++				LD_RPATH_OPT="-Wl,-rpath,"
+ 				EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
+ 			else
+-				cf_ld_rpath_opt="-rpath "
++				LD_RPATH_OPT="-rpath "
+ 				EXTRA_LDFLAGS="-rpath \${libdir} $EXTRA_LDFLAGS"
+ 			fi
+ 		fi
+@@ -4294,7 +4433,7 @@
+ 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ 		fi
+ 		if test "$cf_cv_ld_rpath" = yes ; then
+-			cf_ld_rpath_opt="-Wl,-rpath,"
++			LD_RPATH_OPT="-Wl,-rpath,"
+ 			EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
+ 		fi
+ 		CF_SHARED_SONAME
+@@ -4306,12 +4445,12 @@
+ 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ 		fi
+ 		if test "$cf_cv_ld_rpath" = yes ; then
+-			cf_ld_rpath_opt="-Wl,-rpath,"
++			LD_RPATH_OPT="-Wl,-rpath,"
+ 			EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
+ 		fi
+ 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
+ 		CF_SHARED_SONAME
+-		MK_SHARED_LIB='${CC} ${CFLAGS} -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
++		MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
+ 		;;
+ 	nto-qnx*|openbsd*|freebsd[[12]].*)
+ 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
+@@ -4323,15 +4462,15 @@
+ 		if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
+ 			LOCAL_LDFLAGS="-rpath \$(LOCAL_LIBDIR)"
+ 			LOCAL_LDFLAGS2="-rpath \${libdir} $LOCAL_LDFLAGS"
+-			cf_ld_rpath_opt="-rpath "
++			LD_RPATH_OPT="-rpath "
+ 			EXTRA_LDFLAGS="-rpath \${libdir} $EXTRA_LDFLAGS"
+ 		fi
+ 		CF_SHARED_SONAME
+-		MK_SHARED_LIB='${LD} -Bshareable -soname=`basename $[@]` -o $[@]'
++		MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $[@]` -o $[@]'
+ 		;;
+ 	netbsd*)
+ 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
+-		test "$cf_cv_ld_rpath" = yes && cf_ld_rpath_opt="-Wl,-rpath,"
++		test "$cf_cv_ld_rpath" = yes && LD_RPATH_OPT="-Wl,-rpath,"
+ 		if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
+ 			LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
+ 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+@@ -4346,7 +4485,7 @@
+ 			CF_SHARED_SONAME
+ 			MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $[@]'
+ 		else
+-			MK_SHARED_LIB='${LD} -Bshareable -o $[@]'
++			MK_SHARED_LIB='${LD} -shared -Bshareable -o $[@]'
+ 		fi
+ 		;;
+ 	osf*|mls+*)
+@@ -4365,7 +4504,7 @@
+ 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ 		fi
+ 		if test "$cf_cv_ld_rpath" = yes ; then
+-			cf_ld_rpath_opt="-rpath"
++			LD_RPATH_OPT="-rpath"
+ 			# EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
+ 		fi
+ 		cf_cv_rm_so_locs=yes
+@@ -4400,12 +4539,19 @@
+ 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ 		fi
+ 		if test "$cf_cv_ld_rpath" = yes ; then
+-			cf_ld_rpath_opt="-R"
++			LD_RPATH_OPT="-R"
+ 			EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
+ 		fi
+ 		CF_SHARED_SONAME
+ 		if test "$GCC" != yes; then
+-			CC_SHARED_OPTS='-xcode=pic32'
++			cf_save_CFLAGS="$CFLAGS"
++			for cf_shared_opts in -xcode=pic13 -xcode=pic32 -Kpic -KPIC -O
++			do
++				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
++				AC_TRY_COMPILE([#include <stdio.h>],[printf("Hello\n");],[break])
++			done
++			CFLAGS="$cf_save_CFLAGS"
++			CC_SHARED_OPTS=$cf_shared_opts
+ 			MK_SHARED_LIB='${CC} -dy -G -h '$cf_cv_shared_soname' -o $[@]'
+ 		else
+ 			MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $[@]'
+@@ -4438,18 +4584,19 @@
+ 		;;
+ 	esac
+ 
+-	if test -n "$cf_ld_rpath_opt" ; then
++	if test -n "$LD_RPATH_OPT" ; then
+ 		AC_MSG_CHECKING(if we need a space after rpath option)
+ 		cf_save_LIBS="$LIBS"
+-		LIBS="$LIBS ${cf_ld_rpath_opt}$libdir"
++		LIBS="$LIBS ${LD_RPATH_OPT}$libdir"
+ 		AC_TRY_LINK(, , cf_rpath_space=no, cf_rpath_space=yes)
+ 		LIBS="$cf_save_LIBS"
+ 		AC_MSG_RESULT($cf_rpath_space)
+-		test "$cf_rpath_space" = yes && cf_ld_rpath_opt="$cf_ld_rpath_opt "
+-		MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}"
++		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
++		MK_SHARED_LIB="$MK_SHARED_LIB $LD_RPATH_OPT\${libdir}"
+ 	fi
+ 
+ 	AC_SUBST(CC_SHARED_OPTS)
++	AC_SUBST(LD_RPATH_OPT)
+ 	AC_SUBST(LD_SHARED_OPTS)
+ 	AC_SUBST(MK_SHARED_LIB)
+ 	AC_SUBST(LINK_PROGS)
+@@ -4642,7 +4789,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_SRC_MODULES version: 18 updated: 2005/05/28 12:58:54
++dnl CF_SRC_MODULES version: 20 updated: 2008/12/27 12:30:03
+ dnl --------------
+ dnl For each parameter, test if the source-directory exists, and if it contains
+ dnl a 'modules' file.  If so, add to the list $cf_cv_src_modules which we'll
+@@ -4717,7 +4864,11 @@
+ AC_SUBST(TEST_ARG2)
+ AC_SUBST(TEST_DEP2)
+ 
+-SRC_SUBDIRS="man include"
++SRC_SUBDIRS=
++if test "x$cf_with_manpages" != xno ; then
++	SRC_SUBDIRS="$SRC_SUBDIRS man"
++fi
++SRC_SUBDIRS="$SRC_SUBDIRS include"
+ for cf_dir in $cf_cv_src_modules
+ do
+ 	SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir"
+@@ -4728,8 +4879,8 @@
+ 
+ ADA_SUBDIRS=
+ if test "$cf_cv_prog_gnat_correct" = yes && test -f $srcdir/Ada95/Makefile.in; then
+-   SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
+-   ADA_SUBDIRS="gen src samples"
++	SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
++	ADA_SUBDIRS="gen src samples"
+ fi
+ 
+ SUB_MAKEFILES=
+@@ -4739,11 +4890,11 @@
+ done
+ 
+ if test -n "$ADA_SUBDIRS"; then
+-   for cf_dir in $ADA_SUBDIRS
+-   do
+-      SUB_MAKEFILES="$SUB_MAKEFILES Ada95/$cf_dir/Makefile"
+-   done
+-   AC_SUBST(ADA_SUBDIRS)
++	for cf_dir in $ADA_SUBDIRS
++	do
++		SUB_MAKEFILES="$SUB_MAKEFILES Ada95/$cf_dir/Makefile"
++	done
++	AC_SUBST(ADA_SUBDIRS)
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+@@ -5241,7 +5392,7 @@
+ fi
+ ])
+ dnl ---------------------------------------------------------------------------
+-dnl CF_WITH_LIBTOOL version: 19 updated: 2008/03/29 15:46:43
++dnl CF_WITH_LIBTOOL version: 20 updated: 2008/12/27 12:31:39
+ dnl ---------------
+ dnl Provide a configure option to incorporate libtool.  Define several useful
+ dnl symbols for the makefile rules.
+@@ -5261,18 +5412,18 @@
+ dnl		echo cannot find libtool.m4 file
+ dnl		exit 1
+ dnl	fi
+-dnl	
++dnl
+ dnl	LOCAL=aclocal.m4
+ dnl	ORIG=aclocal.m4.orig
+-dnl	
++dnl
+ dnl	trap "mv $ORIG $LOCAL" 0 1 2 5 15
+ dnl	rm -f $ORIG
+ dnl	mv $LOCAL $ORIG
+-dnl	
++dnl
+ dnl	# sed the LIBTOOL= assignment to omit the current directory?
+ dnl	sed -e 's/^LIBTOOL=.*/LIBTOOL=${LIBTOOL-libtool}/' $ACLOCAL/libtool.m4 >>$LOCAL
+ dnl	cat $ORIG >>$LOCAL
+-dnl	
++dnl
+ dnl	autoconf-257 $*
+ dnl
+ AC_DEFUN([CF_WITH_LIBTOOL],
+@@ -5306,15 +5457,15 @@
+ 	AC_PROG_LIBTOOL
+ 	# missing_content_AC_PROG_LIBTOOL}}
+ ],[
+- 	if test "$with_libtool" != "yes" ; then
++	if test "$with_libtool" != "yes" ; then
+ 		CF_PATH_SYNTAX(with_libtool)
+ 		LIBTOOL=$with_libtool
+ 	else
+- 		AC_PATH_PROG(LIBTOOL,libtool)
+- 	fi
+- 	if test -z "$LIBTOOL" ; then
+- 		AC_MSG_ERROR(Cannot find libtool)
+- 	fi
++		AC_PATH_PROG(LIBTOOL,libtool)
++	fi
++	if test -z "$LIBTOOL" ; then
++		AC_MSG_ERROR(Cannot find libtool)
++	fi
+ ])dnl
+ 	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
+ 	LIB_OBJECT='${OBJECTS:.o=.lo}'
+@@ -5535,7 +5686,7 @@
+ 	[USE_VALGRIND])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_XOPEN_SOURCE version: 26 updated: 2008/07/27 11:26:57
++dnl CF_XOPEN_SOURCE version: 28 updated: 2008/12/27 12:30:03
+ dnl ---------------
+ dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
+ dnl or adapt to the vendor's definitions to get equivalent functionality,
+@@ -5552,7 +5703,7 @@
+ cf_POSIX_C_SOURCE=ifelse($2,,199506L,$2)
+ 
+ case $host_os in #(vi
+-aix[[45]]*) #(vi
++aix[[456]]*) #(vi
+ 	CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE"
+ 	;;
+ freebsd*|dragonfly*) #(vi
+@@ -5569,7 +5720,7 @@
+ irix[[56]].*) #(vi
+ 	CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
+ 	;;
+-linux*|gnu*|k*bsd*-gnu) #(vi
++linux*|gnu*|mint*|k*bsd*-gnu) #(vi
+ 	CF_GNU_SOURCE
+ 	;;
+ mirbsd*) #(vi
+diff -Naur ncurses-5.7.orig/c++/Makefile.in ncurses-5.7/c++/Makefile.in
+--- ncurses-5.7.orig/c++/Makefile.in	2007-04-28 08:29:12.000000000 -0700
++++ ncurses-5.7/c++/Makefile.in	2009-01-18 23:56:34.000000000 -0800
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.84 2007/04/28 15:29:12 tom Exp $
++# $Id: Makefile.in,v 1.85 2009/01/03 19:10:40 tom Exp $
+ ##############################################################################
+-# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.                #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
+@@ -61,10 +61,10 @@
+ INSTALL_DATA	= @INSTALL_DATA@
+ 
+ AR		= @AR@
+-AR_OPTS		= @AR_OPTS@
++ARFLAGS		= @ARFLAGS@
+ 
+ CXX_AR		= @CXX_AR@
+-CXX_AR_OPTS	= @CXX_AR_OPTS@
++CXX_ARFLAGS	= @CXX_ARFLAGS@
+ RANLIB		= @LIB_PREP@
+ 
+ CXX		= @CXX@
+@@ -153,7 +153,7 @@
+ 	$(MODEL)/cursesmain$o
+ 
+ ../lib/$(LIBNAME_NORMAL) : $(LIB_OBJS)
+-	$(CXX_AR) $(CXX_AR_OPTS) $@ $?
++	$(CXX_AR) $(CXX_ARFLAGS) $@ $?
+ 	$(RANLIB) $@
+ 
+ ../lib/$(LIBNAME_LIBTOOL) : $(LIB_OBJS)
+diff -Naur ncurses-5.7.orig/c++/cursesw.cc ncurses-5.7/c++/cursesw.cc
+--- ncurses-5.7.orig/c++/cursesw.cc	2007-12-15 15:01:57.000000000 -0800
++++ ncurses-5.7/c++/cursesw.cc	2009-01-18 23:56:21.000000000 -0800
+@@ -1,6 +1,6 @@
+ // * this is for making emacs happy: -*-Mode: C++;-*-
+ /****************************************************************************
+- * Copyright (c) 2007 Free Software Foundation, Inc.                        *
++ * Copyright (c) 2007,2008 Free Software Foundation, Inc.                   *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -42,7 +42,7 @@
+ #include "internal.h"
+ #include "cursesw.h"
+ 
+-MODULE_ID("$Id: cursesw.cc,v 1.49 2007/12/15 23:01:57 tom Exp $")
++MODULE_ID("$Id: cursesw.cc,v 1.50 2008/11/23 00:17:31 juergen Exp $")
+ 
+ #define COLORS_NEED_INITIALIZATION  -1
+ #define COLORS_NOT_INITIALIZED       0
+@@ -287,7 +287,6 @@
+ {
+     initialize();
+     w = win;
+-    assert((w->_maxx +1 ) == ncols);
+ }
+ 
+ int _nc_xx_ripoff_init(WINDOW *w, int ncols)
+@@ -464,7 +463,7 @@
+ #if HAVE_HAS_KEY
+ bool NCursesWindow::has_mouse() const
+ {
+-    return ((::has_key(KEY_MOUSE) || ::_nc_has_mouse())
++    return ((::has_key(KEY_MOUSE) || ::has_mouse())
+ 	     ? TRUE : FALSE);
+ }
+ #endif
+diff -Naur ncurses-5.7.orig/config.guess ncurses-5.7/config.guess
+--- ncurses-5.7.orig/config.guess	2008-08-30 13:25:07.000000000 -0700
++++ ncurses-5.7/config.guess	2009-01-18 23:56:34.000000000 -0800
+@@ -4,7 +4,7 @@
+ #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ #   Free Software Foundation, Inc.
+ 
+-timestamp='2008-04-14'
++timestamp='2008-12-19'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -331,7 +331,20 @@
+ 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
+     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	eval $set_cc_for_build
++	SUN_ARCH="i386"
++	# If there is a compiler, see if it is configured for 64-bit objects.
++	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
++	# This test works for both compilers.
++	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
++		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++		grep IS_64BIT_ARCH >/dev/null
++	    then
++		SUN_ARCH="x86_64"
++	    fi
++	fi
++	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
+     sun4*:SunOS:6*:*)
+ 	# According to config.sub, this is the proper way to canonicalize
+@@ -796,7 +809,7 @@
+ 	    x86)
+ 		echo i586-pc-interix${UNAME_RELEASE}
+ 		exit ;;
+-	    EM64T | authenticamd)
++	    EM64T | authenticamd | genuineintel)
+ 		echo x86_64-unknown-interix${UNAME_RELEASE}
+ 		exit ;;
+ 	    IA64)
+@@ -935,6 +948,9 @@
+ 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ 	exit ;;
++    padre:Linux:*:*)
++	echo sparc-unknown-linux-gnu
++	exit ;;
+     parisc:Linux:*:* | hppa:Linux:*:*)
+ 	# Look for CPU level
+ 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+@@ -1138,6 +1154,16 @@
+     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+           && { echo i486-ncr-sysv4; exit; } ;;
++    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
++	OS_REL='.3'
++	test -r /etc/.relid \
++	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
++	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
++	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
++	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
++	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ 	echo m68k-unknown-lynxos${UNAME_RELEASE}
+ 	exit ;;
+diff -Naur ncurses-5.7.orig/config.sub ncurses-5.7/config.sub
+--- ncurses-5.7.orig/config.sub	2008-08-30 13:25:02.000000000 -0700
++++ ncurses-5.7/config.sub	2009-01-18 23:56:34.000000000 -0800
+@@ -4,7 +4,7 @@
+ #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ #   Free Software Foundation, Inc.
+ 
+-timestamp='2008-06-16'
++timestamp='2008-12-11'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -249,6 +249,7 @@
+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ 	| i370 | i860 | i960 | ia64 \
+ 	| ip2k | iq2000 \
++	| lm32 \
+ 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+ 	| maxq | mb | microblaze | mcore | mep | metag \
+ 	| mips | mipsbe | mipseb | mipsel | mipsle \
+@@ -279,7 +280,7 @@
+ 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ 	| pyramid \
+ 	| score \
+-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
++	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ 	| sh64 | sh64le \
+ 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+ 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+@@ -288,7 +289,7 @@
+ 	| v850 | v850e \
+ 	| we32k \
+ 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+-	| z8k)
++	| z8k | z80)
+ 		basic_machine=$basic_machine-unknown
+ 		;;
+ 	m6811 | m68hc11 | m6812 | m68hc12)
+@@ -331,6 +332,7 @@
+ 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ 	| i*86-* | i860-* | i960-* | ia64-* \
+ 	| ip2k-* | iq2000-* \
++	| lm32-* \
+ 	| m32c-* | m32r-* | m32rle-* \
+ 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+ 	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+@@ -362,7 +364,7 @@
+ 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ 	| pyramid-* \
+ 	| romp-* | rs6000-* \
+-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
++	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ 	| sparclite-* \
+@@ -375,7 +377,7 @@
+ 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ 	| xstormy16-* | xtensa*-* \
+ 	| ymp-* \
+-	| z8k-*)
++	| z8k-* | z80-*)
+ 		;;
+ 	# Recognize the basic CPU types without company name, with glob match.
+ 	xtensa*)
+@@ -1140,6 +1142,10 @@
+ 		basic_machine=z8k-unknown
+ 		os=-sim
+ 		;;
++	z80-*-coff)
++		basic_machine=z80-unknown
++		os=-sim
++		;;
+ 	none)
+ 		basic_machine=none-none
+ 		os=-none
+@@ -1178,7 +1184,7 @@
+ 	we32k)
+ 		basic_machine=we32k-att
+ 		;;
+-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
++	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+ 		basic_machine=sh-unknown
+ 		;;
+ 	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+diff -Naur ncurses-5.7.orig/configure ncurses-5.7/configure
+--- ncurses-5.7.orig/configure	2008-10-25 17:04:38.000000000 -0700
++++ ncurses-5.7/configure	2009-01-18 23:56:41.000000000 -0800
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.454 .
++# From configure.in Revision: 1.464 .
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by Autoconf 2.52.20080325.
++# Generated by Autoconf 2.52.20081225.
+ #
+ # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+ # Free Software Foundation, Inc.
+@@ -697,8 +697,11 @@
+   --without-cxx           do not adjust ncurses bool to match C++
+   --without-cxx-binding   do not build C++ binding and demo
+   --without-ada           suppress check for Ada95, don't build demo
++  --without-manpages      suppress install of manpages
+   --without-progs         suppress build with programs (e.g., tic)
+   --without-curses-h      install curses.h as ncurses.h only
++  --with-pkg-config{=path} enable/disable use of pkg-config
++  --enable-pc-files       generate and install .pc files for pkg-config
+   --enable-mixed-case     tic should assume mixed-case filenames
+   --with-install-prefix   prefixes actual install-location ($DESTDIR)
+ Build-Tools Needed to Compile Temporary Applications for Cross-compiling:
+@@ -870,7 +873,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.52.20080325.  Invocation command line was
++generated by GNU Autoconf 2.52.20081225.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -994,7 +997,7 @@
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+   if test -r "$ac_site_file"; then
+-    { echo "$as_me:997: loading site script $ac_site_file" >&5
++    { echo "$as_me:1000: loading site script $ac_site_file" >&5
+ echo "$as_me: loading site script $ac_site_file" >&6;}
+     cat "$ac_site_file" >&5
+     . "$ac_site_file"
+@@ -1005,7 +1008,7 @@
+   # Some versions of bash will fail to source /dev/null (special
+   # files actually), so we avoid doing that.
+   if test -f "$cache_file"; then
+-    { echo "$as_me:1008: loading cache $cache_file" >&5
++    { echo "$as_me:1011: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+       [\\/]* | ?:[\\/]* ) . $cache_file;;
+@@ -1013,7 +1016,7 @@
+     esac
+   fi
+ else
+-  { echo "$as_me:1016: creating cache $cache_file" >&5
++  { echo "$as_me:1019: creating cache $cache_file" >&5
+ echo "$as_me: creating cache $cache_file" >&6;}
+   >$cache_file
+ fi
+@@ -1029,21 +1032,21 @@
+   eval ac_new_val="\$ac_env_${ac_var}_value"
+   case $ac_old_set,$ac_new_set in
+     set,)
+-      { echo "$as_me:1032: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++      { echo "$as_me:1035: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,set)
+-      { echo "$as_me:1036: error: \`$ac_var' was not set in the previous run" >&5
++      { echo "$as_me:1039: error: \`$ac_var' was not set in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,);;
+     *)
+       if test "x$ac_old_val" != "x$ac_new_val"; then
+-        { echo "$as_me:1042: error: \`$ac_var' has changed since the previous run:" >&5
++        { echo "$as_me:1045: error: \`$ac_var' has changed since the previous run:" >&5
+ echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+-        { echo "$as_me:1044:   former value:  $ac_old_val" >&5
++        { echo "$as_me:1047:   former value:  $ac_old_val" >&5
+ echo "$as_me:   former value:  $ac_old_val" >&2;}
+-        { echo "$as_me:1046:   current value: $ac_new_val" >&5
++        { echo "$as_me:1049:   current value: $ac_new_val" >&5
+ echo "$as_me:   current value: $ac_new_val" >&2;}
+         ac_cache_corrupted=:
+       fi;;
+@@ -1062,9 +1065,9 @@
+   fi
+ done
+ if $ac_cache_corrupted; then
+-  { echo "$as_me:1065: error: changes in the environment can compromise the build" >&5
++  { echo "$as_me:1068: error: changes in the environment can compromise the build" >&5
+ echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+-  { { echo "$as_me:1067: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++  { { echo "$as_me:1070: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1085,10 +1088,10 @@
+ echo "#! $SHELL" >conftest.sh
+ echo  "exit 0"   >>conftest.sh
+ chmod +x conftest.sh
+-if { (echo "$as_me:1088: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:1091: PATH=\".;.\"; conftest.sh") >&5
+   (PATH=".;."; conftest.sh) 2>&5
+   ac_status=$?
+-  echo "$as_me:1091: \$? = $ac_status" >&5
++  echo "$as_me:1094: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   ac_path_separator=';'
+ else
+@@ -1101,7 +1104,7 @@
+ 
+ top_builddir=`pwd`
+ 
+-echo "$as_me:1104: checking for egrep" >&5
++echo "$as_me:1107: checking for egrep" >&5
+ echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+ if test "${ac_cv_prog_egrep+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1111,11 +1114,11 @@
+     else ac_cv_prog_egrep='egrep'
+     fi
+ fi
+-echo "$as_me:1114: result: $ac_cv_prog_egrep" >&5
++echo "$as_me:1117: result: $ac_cv_prog_egrep" >&5
+ echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+  EGREP=$ac_cv_prog_egrep
+ 
+-test -z "$EGREP" && { { echo "$as_me:1118: error: No egrep program found" >&5
++test -z "$EGREP" && { { echo "$as_me:1121: error: No egrep program found" >&5
+ echo "$as_me: error: No egrep program found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -1125,7 +1128,7 @@
+ cf_cv_abi_version=${NCURSES_MAJOR}
+ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
+ cf_cv_timestamp=`date`
+-echo "$as_me:1128: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
++echo "$as_me:1131: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
+ echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
+ 
+ test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
+@@ -1133,7 +1136,7 @@
+ # Check whether --with-rel-version or --without-rel-version was given.
+ if test "${with_rel_version+set}" = set; then
+   withval="$with_rel_version"
+-  { echo "$as_me:1136: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
++  { echo "$as_me:1139: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
+ echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;}
+  cf_cv_rel_version=$withval
+ fi;
+@@ -1146,13 +1149,13 @@
+   [0-9]*) #(vi
+  	;;
+   *)
+-	{ { echo "$as_me:1149: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
++	{ { echo "$as_me:1152: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
+ echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;}
+    { (exit 1); exit 1; }; }
+  	;;
+   esac
+ else
+-  { { echo "$as_me:1155: error: Release major-version value is empty" >&5
++  { { echo "$as_me:1158: error: Release major-version value is empty" >&5
+ echo "$as_me: error: Release major-version value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1162,13 +1165,13 @@
+   [0-9]*) #(vi
+  	;;
+   *)
+-	{ { echo "$as_me:1165: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
++	{ { echo "$as_me:1168: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
+ echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;}
+    { (exit 1); exit 1; }; }
+  	;;
+   esac
+ else
+-  { { echo "$as_me:1171: error: Release minor-version value is empty" >&5
++  { { echo "$as_me:1174: error: Release minor-version value is empty" >&5
+ echo "$as_me: error: Release minor-version value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1178,7 +1181,7 @@
+ # Check whether --with-abi-version or --without-abi-version was given.
+ if test "${with_abi_version+set}" = set; then
+   withval="$with_abi_version"
+-  { echo "$as_me:1181: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
++  { echo "$as_me:1184: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
+ echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;}
+  cf_cv_abi_version=$withval
+ fi;
+@@ -1188,13 +1191,13 @@
+   [0-9]*) #(vi
+  	;;
+   *)
+-	{ { echo "$as_me:1191: error: ABI version is not a number: $cf_cv_abi_version" >&5
++	{ { echo "$as_me:1194: error: ABI version is not a number: $cf_cv_abi_version" >&5
+ echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;}
+    { (exit 1); exit 1; }; }
+  	;;
+   esac
+ else
+-  { { echo "$as_me:1197: error: ABI version value is empty" >&5
++  { { echo "$as_me:1200: error: ABI version value is empty" >&5
+ echo "$as_me: error: ABI version value is empty" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1216,7 +1219,7 @@
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { echo "$as_me:1219: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++  { { echo "$as_me:1222: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+ echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1226,11 +1229,11 @@
+ 
+ # Make sure we can run config.sub.
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+-  { { echo "$as_me:1229: error: cannot run $ac_config_sub" >&5
++  { { echo "$as_me:1232: error: cannot run $ac_config_sub" >&5
+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:1233: checking build system type" >&5
++echo "$as_me:1236: checking build system type" >&5
+ echo $ECHO_N "checking build system type... $ECHO_C" >&6
+ if test "${ac_cv_build+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1239,23 +1242,23 @@
+ test -z "$ac_cv_build_alias" &&
+   ac_cv_build_alias=`$ac_config_guess`
+ test -z "$ac_cv_build_alias" &&
+-  { { echo "$as_me:1242: error: cannot guess build type; you must specify one" >&5
++  { { echo "$as_me:1245: error: cannot guess build type; you must specify one" >&5
+ echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+    { (exit 1); exit 1; }; }
+ ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+-  { { echo "$as_me:1246: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++  { { echo "$as_me:1249: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1251: result: $ac_cv_build" >&5
++echo "$as_me:1254: result: $ac_cv_build" >&5
+ echo "${ECHO_T}$ac_cv_build" >&6
+ build=$ac_cv_build
+ build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+-echo "$as_me:1258: checking host system type" >&5
++echo "$as_me:1261: checking host system type" >&5
+ echo $ECHO_N "checking host system type... $ECHO_C" >&6
+ if test "${ac_cv_host+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1264,12 +1267,12 @@
+ test -z "$ac_cv_host_alias" &&
+   ac_cv_host_alias=$ac_cv_build_alias
+ ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+-  { { echo "$as_me:1267: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++  { { echo "$as_me:1270: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1272: result: $ac_cv_host" >&5
++echo "$as_me:1275: result: $ac_cv_host" >&5
+ echo "${ECHO_T}$ac_cv_host" >&6
+ host=$ac_cv_host
+ host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -1277,7 +1280,7 @@
+ host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+ if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
+-	echo "$as_me:1280: checking target system type" >&5
++	echo "$as_me:1283: checking target system type" >&5
+ echo $ECHO_N "checking target system type... $ECHO_C" >&6
+ if test "${ac_cv_target+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1286,12 +1289,12 @@
+ test "x$ac_cv_target_alias" = "x" &&
+   ac_cv_target_alias=$ac_cv_host_alias
+ ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
+-  { { echo "$as_me:1289: error: $ac_config_sub $ac_cv_target_alias failed" >&5
++  { { echo "$as_me:1292: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1294: result: $ac_cv_target" >&5
++echo "$as_me:1297: result: $ac_cv_target" >&5
+ echo "${ECHO_T}$ac_cv_target" >&6
+ target=$ac_cv_target
+ target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -1322,13 +1325,13 @@
+ fi
+ 
+ test -z "$system_name" && system_name="$cf_cv_system_name"
+-test -n "$cf_cv_system_name" && echo "$as_me:1325: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1328: result: Configuring for $cf_cv_system_name" >&5
+ echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
+ 
+ if test ".$system_name" != ".$cf_cv_system_name" ; then
+-	echo "$as_me:1329: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++	echo "$as_me:1332: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+ echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
+-	{ { echo "$as_me:1331: error: \"Please remove config.cache and try again.\"" >&5
++	{ { echo "$as_me:1334: error: \"Please remove config.cache and try again.\"" >&5
+ echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1336,7 +1339,7 @@
+ # Check whether --with-system-type or --without-system-type was given.
+ if test "${with_system_type+set}" = set; then
+   withval="$with_system_type"
+-  { echo "$as_me:1339: WARNING: overriding system type to $withval" >&5
++  { echo "$as_me:1342: WARNING: overriding system type to $withval" >&5
+ echo "$as_me: WARNING: overriding system type to $withval" >&2;}
+  cf_cv_system_name=$withval
+ fi;
+@@ -1346,7 +1349,7 @@
+ 
+ ###	Default install-location
+ 
+-echo "$as_me:1349: checking for prefix" >&5
++echo "$as_me:1352: checking for prefix" >&5
+ echo $ECHO_N "checking for prefix... $ECHO_C" >&6
+ if test "x$prefix" = "xNONE" ; then
+ 	case "$cf_cv_system_name" in
+@@ -1358,11 +1361,11 @@
+ 		;;
+ 	esac
+ fi
+-echo "$as_me:1361: result: $prefix" >&5
++echo "$as_me:1364: result: $prefix" >&5
+ echo "${ECHO_T}$prefix" >&6
+ 
+ if test "x$prefix" = "xNONE" ; then
+-echo "$as_me:1365: checking for default include-directory" >&5
++echo "$as_me:1368: checking for default include-directory" >&5
+ echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
+ test -n "$verbose" && echo 1>&6
+ for cf_symbol in \
+@@ -1385,7 +1388,7 @@
+ 	fi
+ 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
+ done
+-echo "$as_me:1388: result: $includedir" >&5
++echo "$as_me:1391: result: $includedir" >&5
+ echo "${ECHO_T}$includedir" >&6
+ fi
+ 
+@@ -1399,7 +1402,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-echo "$as_me:1402: checking for $ac_word" >&5
++echo "$as_me:1405: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1414,7 +1417,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+-echo "$as_me:1417: found $ac_dir/$ac_word" >&5
++echo "$as_me:1420: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1422,10 +1425,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1425: result: $CC" >&5
++  echo "$as_me:1428: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1428: result: no" >&5
++  echo "$as_me:1431: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1434,7 +1437,7 @@
+   ac_ct_CC=$CC
+   # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-echo "$as_me:1437: checking for $ac_word" >&5
++echo "$as_me:1440: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1449,7 +1452,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="gcc"
+-echo "$as_me:1452: found $ac_dir/$ac_word" >&5
++echo "$as_me:1455: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1457,10 +1460,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1460: result: $ac_ct_CC" >&5
++  echo "$as_me:1463: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1463: result: no" >&5
++  echo "$as_me:1466: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1473,7 +1476,7 @@
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-echo "$as_me:1476: checking for $ac_word" >&5
++echo "$as_me:1479: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1488,7 +1491,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+-echo "$as_me:1491: found $ac_dir/$ac_word" >&5
++echo "$as_me:1494: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1496,10 +1499,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1499: result: $CC" >&5
++  echo "$as_me:1502: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1502: result: no" >&5
++  echo "$as_me:1505: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1508,7 +1511,7 @@
+   ac_ct_CC=$CC
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:1511: checking for $ac_word" >&5
++echo "$as_me:1514: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1523,7 +1526,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="cc"
+-echo "$as_me:1526: found $ac_dir/$ac_word" >&5
++echo "$as_me:1529: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1531,10 +1534,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1534: result: $ac_ct_CC" >&5
++  echo "$as_me:1537: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1537: result: no" >&5
++  echo "$as_me:1540: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1547,7 +1550,7 @@
+ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:1550: checking for $ac_word" >&5
++echo "$as_me:1553: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1567,7 +1570,7 @@
+   continue
+ fi
+ ac_cv_prog_CC="cc"
+-echo "$as_me:1570: found $ac_dir/$ac_word" >&5
++echo "$as_me:1573: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1589,10 +1592,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1592: result: $CC" >&5
++  echo "$as_me:1595: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1595: result: no" >&5
++  echo "$as_me:1598: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1603,7 +1606,7 @@
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:1606: checking for $ac_word" >&5
++echo "$as_me:1609: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1618,7 +1621,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+-echo "$as_me:1621: found $ac_dir/$ac_word" >&5
++echo "$as_me:1624: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1626,10 +1629,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1629: result: $CC" >&5
++  echo "$as_me:1632: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1632: result: no" >&5
++  echo "$as_me:1635: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1642,7 +1645,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:1645: checking for $ac_word" >&5
++echo "$as_me:1648: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1657,7 +1660,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+-echo "$as_me:1660: found $ac_dir/$ac_word" >&5
++echo "$as_me:1663: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1665,10 +1668,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1668: result: $ac_ct_CC" >&5
++  echo "$as_me:1671: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1671: result: no" >&5
++  echo "$as_me:1674: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1680,32 +1683,32 @@
+ 
+ fi
+ 
+-test -z "$CC" && { { echo "$as_me:1683: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:1686: error: no acceptable cc found in \$PATH" >&5
+ echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:1688:" \
++echo "$as_me:1691:" \
+      "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:1691: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1694: \"$ac_compiler --version </dev/null >&5\"") >&5
+   (eval $ac_compiler --version </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1694: \$? = $ac_status" >&5
++  echo "$as_me:1697: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:1696: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1699: \"$ac_compiler -v </dev/null >&5\"") >&5
+   (eval $ac_compiler -v </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1699: \$? = $ac_status" >&5
++  echo "$as_me:1702: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:1701: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1704: \"$ac_compiler -V </dev/null >&5\"") >&5
+   (eval $ac_compiler -V </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1704: \$? = $ac_status" >&5
++  echo "$as_me:1707: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 1708 "configure"
++#line 1711 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1721,13 +1724,13 @@
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+-echo "$as_me:1724: checking for C compiler default output" >&5
++echo "$as_me:1727: checking for C compiler default output" >&5
+ echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
+ ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+-if { (eval echo "$as_me:1727: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:1730: \"$ac_link_default\"") >&5
+   (eval $ac_link_default) 2>&5
+   ac_status=$?
+-  echo "$as_me:1730: \$? = $ac_status" >&5
++  echo "$as_me:1733: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   # Find the output, starting from the most likely.  This scheme is
+ # not robust to junk in `.', hence go to wildcards (a.*) only as a last
+@@ -1736,7 +1739,7 @@
+                 ls a.out conftest 2>/dev/null;
+                 ls a.* conftest.* 2>/dev/null`; do
+   case $ac_file in
+-    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.dbg | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+     a.out ) # We found the default executable, but exeext='' is most
+             # certainly right.
+             break;;
+@@ -1750,34 +1753,34 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-{ { echo "$as_me:1753: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:1756: error: C compiler cannot create executables" >&5
+ echo "$as_me: error: C compiler cannot create executables" >&2;}
+    { (exit 77); exit 77; }; }
+ fi
+ 
+ ac_exeext=$ac_cv_exeext
+-echo "$as_me:1759: result: $ac_file" >&5
++echo "$as_me:1762: result: $ac_file" >&5
+ echo "${ECHO_T}$ac_file" >&6
+ 
+ # Check the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+-echo "$as_me:1764: checking whether the C compiler works" >&5
++echo "$as_me:1767: checking whether the C compiler works" >&5
+ echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+ if test "$cross_compiling" != yes; then
+   if { ac_try='./$ac_file'
+-  { (eval echo "$as_me:1770: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1773: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1773: \$? = $ac_status" >&5
++  echo "$as_me:1776: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+     cross_compiling=no
+   else
+     if test "$cross_compiling" = maybe; then
+ 	cross_compiling=yes
+     else
+-	{ { echo "$as_me:1780: error: cannot run C compiled programs.
++	{ { echo "$as_me:1783: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'." >&5
+ echo "$as_me: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'." >&2;}
+@@ -1785,24 +1788,24 @@
+     fi
+   fi
+ fi
+-echo "$as_me:1788: result: yes" >&5
++echo "$as_me:1791: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+ rm -f a.out a.exe conftest$ac_cv_exeext
+ ac_clean_files=$ac_clean_files_save
+ # Check the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+-echo "$as_me:1795: checking whether we are cross compiling" >&5
++echo "$as_me:1798: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:1797: result: $cross_compiling" >&5
++echo "$as_me:1800: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+ 
+-echo "$as_me:1800: checking for executable suffix" >&5
++echo "$as_me:1803: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if { (eval echo "$as_me:1802: \"$ac_link\"") >&5
++if { (eval echo "$as_me:1805: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:1805: \$? = $ac_status" >&5
++  echo "$as_me:1808: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   # If both `conftest.exe' and `conftest' are `present' (well, observable)
+ # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+@@ -1810,7 +1813,7 @@
+ # `rm'.
+ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
+   case $ac_file in
+-    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.dbg | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+           export ac_cv_exeext
+           break;;
+@@ -1818,25 +1821,25 @@
+   esac
+ done
+ else
+-  { { echo "$as_me:1821: error: cannot compute EXEEXT: cannot compile and link" >&5
++  { { echo "$as_me:1824: error: cannot compute EXEEXT: cannot compile and link" >&5
+ echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ rm -f conftest$ac_cv_exeext
+-echo "$as_me:1827: result: $ac_cv_exeext" >&5
++echo "$as_me:1830: result: $ac_cv_exeext" >&5
+ echo "${ECHO_T}$ac_cv_exeext" >&6
+ 
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+-echo "$as_me:1833: checking for object suffix" >&5
++echo "$as_me:1836: checking for object suffix" >&5
+ echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
+ if test "${ac_cv_objext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1839 "configure"
++#line 1842 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1848,14 +1851,14 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:1851: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1854: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1854: \$? = $ac_status" >&5
++  echo "$as_me:1857: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.dbg | *.pdb | *.xSYM | *.map | *.inf ) ;;
+     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+        break;;
+   esac
+@@ -1863,24 +1866,24 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-{ { echo "$as_me:1866: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:1869: error: cannot compute OBJEXT: cannot compile" >&5
+ echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+-echo "$as_me:1873: result: $ac_cv_objext" >&5
++echo "$as_me:1876: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:1877: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:1880: checking whether we are using the GNU C compiler" >&5
+ echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+ if test "${ac_cv_c_compiler_gnu+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1883 "configure"
++#line 1886 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1895,16 +1898,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1898: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1901: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1901: \$? = $ac_status" >&5
++  echo "$as_me:1904: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1904: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1907: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1907: \$? = $ac_status" >&5
++  echo "$as_me:1910: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -1916,19 +1919,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:1919: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:1922: result: $ac_cv_c_compiler_gnu" >&5
+ echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+ GCC=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+ CFLAGS="-g"
+-echo "$as_me:1925: checking whether $CC accepts -g" >&5
++echo "$as_me:1928: checking whether $CC accepts -g" >&5
+ echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+ if test "${ac_cv_prog_cc_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1931 "configure"
++#line 1934 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1940,16 +1943,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1943: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1946: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1946: \$? = $ac_status" >&5
++  echo "$as_me:1949: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1949: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1952: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1952: \$? = $ac_status" >&5
++  echo "$as_me:1955: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_prog_cc_g=yes
+ else
+@@ -1959,7 +1962,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:1962: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:1965: result: $ac_cv_prog_cc_g" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+ if test "$ac_test_CFLAGS" = set; then
+   CFLAGS=$ac_save_CFLAGS
+@@ -1986,16 +1989,16 @@
+ #endif
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1989: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1992: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1992: \$? = $ac_status" >&5
++  echo "$as_me:1995: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1995: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1998: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1998: \$? = $ac_status" >&5
++  echo "$as_me:2001: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   for ac_declaration in \
+    ''\
+@@ -2007,7 +2010,7 @@
+    'void exit (int);'
+ do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2010 "configure"
++#line 2013 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ $ac_declaration
+@@ -2020,16 +2023,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2023: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2026: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2026: \$? = $ac_status" >&5
++  echo "$as_me:2029: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2029: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2032: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2032: \$? = $ac_status" >&5
++  echo "$as_me:2035: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -2039,7 +2042,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2042 "configure"
++#line 2045 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -2051,16 +2054,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2054: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2057: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2057: \$? = $ac_status" >&5
++  echo "$as_me:2060: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2060: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2063: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2063: \$? = $ac_status" >&5
++  echo "$as_me:2066: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -2090,11 +2093,11 @@
+ 
+ GCC_VERSION=none
+ if test "$GCC" = yes ; then
+-	echo "$as_me:2093: checking version of $CC" >&5
++	echo "$as_me:2096: checking version of $CC" >&5
+ echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
+ 	GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
+-	echo "$as_me:2097: result: $GCC_VERSION" >&5
++	echo "$as_me:2100: result: $GCC_VERSION" >&5
+ echo "${ECHO_T}$GCC_VERSION" >&6
+ fi
+ 
+@@ -2104,7 +2107,7 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return=return
+-echo "$as_me:2107: checking how to run the C preprocessor" >&5
++echo "$as_me:2110: checking how to run the C preprocessor" >&5
+ echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+@@ -2125,18 +2128,18 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2128 "configure"
++#line 2131 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2133: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2136: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:2139: \$? = $ac_status" >&5
++  echo "$as_me:2142: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2159,17 +2162,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2162 "configure"
++#line 2165 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:2166: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2169: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:2172: \$? = $ac_status" >&5
++  echo "$as_me:2175: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2206,7 +2209,7 @@
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:2209: result: $CPP" >&5
++echo "$as_me:2212: result: $CPP" >&5
+ echo "${ECHO_T}$CPP" >&6
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -2216,18 +2219,18 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2219 "configure"
++#line 2222 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2224: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2227: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:2230: \$? = $ac_status" >&5
++  echo "$as_me:2233: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2250,17 +2253,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2253 "configure"
++#line 2256 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:2257: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2260: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:2263: \$? = $ac_status" >&5
++  echo "$as_me:2266: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2288,7 +2291,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:2291: error: C preprocessor \"$CPP\" fails sanity check" >&5
++  { { echo "$as_me:2294: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -2301,14 +2304,14 @@
+ ac_main_return=return
+ 
+ if test $ac_cv_c_compiler_gnu = yes; then
+-    echo "$as_me:2304: checking whether $CC needs -traditional" >&5
++    echo "$as_me:2307: checking whether $CC needs -traditional" >&5
+ echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
+ if test "${ac_cv_prog_gcc_traditional+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+     ac_pattern="Autoconf.*'x'"
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2311 "configure"
++#line 2314 "configure"
+ #include "confdefs.h"
+ #include <sgtty.h>
+ int Autoconf = TIOCGETP;
+@@ -2323,7 +2326,7 @@
+ 
+   if test $ac_cv_prog_gcc_traditional = no; then
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 2326 "configure"
++#line 2329 "configure"
+ #include "confdefs.h"
+ #include <termio.h>
+ int Autoconf = TCGETA;
+@@ -2336,14 +2339,14 @@
+ 
+   fi
+ fi
+-echo "$as_me:2339: result: $ac_cv_prog_gcc_traditional" >&5
++echo "$as_me:2342: result: $ac_cv_prog_gcc_traditional" >&5
+ echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
+   if test $ac_cv_prog_gcc_traditional = yes; then
+     CC="$CC -traditional"
+   fi
+ fi
+ 
+-echo "$as_me:2346: checking whether $CC understands -c and -o together" >&5
++echo "$as_me:2349: checking whether $CC understands -c and -o together" >&5
+ echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6
+ if test "${cf_cv_prog_CC_c_o+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2359,15 +2362,15 @@
+ # We do the test twice because some compilers refuse to overwrite an
+ # existing .o file with -o, though they will create one.
+ ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+-if { (eval echo "$as_me:2362: \"$ac_try\"") >&5
++if { (eval echo "$as_me:2365: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2365: \$? = $ac_status" >&5
++  echo "$as_me:2368: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:2367: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:2370: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2370: \$? = $ac_status" >&5
++  echo "$as_me:2373: \$? = $ac_status" >&5
+   (exit $ac_status); };
+ then
+   eval cf_cv_prog_CC_c_o=yes
+@@ -2378,19 +2381,19 @@
+ 
+ fi
+ if test $cf_cv_prog_CC_c_o = yes; then
+-  echo "$as_me:2381: result: yes" >&5
++  echo "$as_me:2384: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:2384: result: no" >&5
++  echo "$as_me:2387: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:2388: checking for POSIXized ISC" >&5
++echo "$as_me:2391: checking for POSIXized ISC" >&5
+ echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
+ if test -d /etc/conf/kconfig.d &&
+    grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
+ then
+-  echo "$as_me:2393: result: yes" >&5
++  echo "$as_me:2396: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   ISC=yes # If later tests want to check for ISC.
+ 
+@@ -2404,12 +2407,12 @@
+     CC="$CC -Xp"
+   fi
+ else
+-  echo "$as_me:2407: result: no" >&5
++  echo "$as_me:2410: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   ISC=
+ fi
+ 
+-echo "$as_me:2412: checking for ${CC-cc} option to accept ANSI C" >&5
++echo "$as_me:2415: checking for ${CC-cc} option to accept ANSI C" >&5
+ echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
+ if test "${cf_cv_ansi_cc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2503,7 +2506,7 @@
+ fi
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 2506 "configure"
++#line 2509 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef CC_HAS_PROTOS
+@@ -2524,16 +2527,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2527: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2530: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2530: \$? = $ac_status" >&5
++  echo "$as_me:2533: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2533: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2536: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2536: \$? = $ac_status" >&5
++  echo "$as_me:2539: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ansi_cc="$cf_arg"; break
+ else
+@@ -2546,7 +2549,7 @@
+ CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+ fi
+-echo "$as_me:2549: result: $cf_cv_ansi_cc" >&5
++echo "$as_me:2552: result: $cf_cv_ansi_cc" >&5
+ echo "${ECHO_T}$cf_cv_ansi_cc" >&6
+ 
+ if test "$cf_cv_ansi_cc" != "no"; then
+@@ -2629,7 +2632,7 @@
+ fi
+ 
+ if test "$cf_cv_ansi_cc" = "no"; then
+-	{ { echo "$as_me:2632: error: Your compiler does not appear to recognize prototypes.
++	{ { echo "$as_me:2635: error: Your compiler does not appear to recognize prototypes.
+ You have the following choices:
+ 	a. adjust your compiler options
+ 	b. get an up-to-date compiler
+@@ -2663,13 +2666,13 @@
+   LDCONFIG=:
+ else
+ case "$cf_cv_system_name" in #(vi
+-freebsd*) #(vi
++dragonfly*|freebsd*) #(vi
+   test -z "$LDCONFIG" && LDCONFIG="/sbin/ldconfig -R"
+   ;;
+ *) LDPATH=$PATH:/sbin:/usr/sbin
+   # Extract the first word of "ldconfig", so it can be a program name with args.
+ set dummy ldconfig; ac_word=$2
+-echo "$as_me:2672: checking for $ac_word" >&5
++echo "$as_me:2675: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_LDCONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2686,7 +2689,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
+-   echo "$as_me:2689: found $ac_dir/$ac_word" >&5
++   echo "$as_me:2692: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -2697,10 +2700,10 @@
+ LDCONFIG=$ac_cv_path_LDCONFIG
+ 
+ if test -n "$LDCONFIG"; then
+-  echo "$as_me:2700: result: $LDCONFIG" >&5
++  echo "$as_me:2703: result: $LDCONFIG" >&5
+ echo "${ECHO_T}$LDCONFIG" >&6
+ else
+-  echo "$as_me:2703: result: no" >&5
++  echo "$as_me:2706: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2708,7 +2711,7 @@
+ esac
+ fi
+ 
+-echo "$as_me:2711: checking if you want to ensure bool is consistent with C++" >&5
++echo "$as_me:2714: checking if you want to ensure bool is consistent with C++" >&5
+ echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6
+ 
+ # Check whether --with-cxx or --without-cxx was given.
+@@ -2718,7 +2721,7 @@
+ else
+   cf_with_cxx=yes
+ fi;
+-echo "$as_me:2721: result: $cf_with_cxx" >&5
++echo "$as_me:2724: result: $cf_with_cxx" >&5
+ echo "${ECHO_T}$cf_with_cxx" >&6
+ if test "X$cf_with_cxx" = Xno ; then
+ 	CXX=""
+@@ -2736,7 +2739,7 @@
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:2739: checking for $ac_word" >&5
++echo "$as_me:2742: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2751,7 +2754,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+-echo "$as_me:2754: found $ac_dir/$ac_word" >&5
++echo "$as_me:2757: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2759,10 +2762,10 @@
+ fi
+ CXX=$ac_cv_prog_CXX
+ if test -n "$CXX"; then
+-  echo "$as_me:2762: result: $CXX" >&5
++  echo "$as_me:2765: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+-  echo "$as_me:2765: result: no" >&5
++  echo "$as_me:2768: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2775,7 +2778,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:2778: checking for $ac_word" >&5
++echo "$as_me:2781: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2790,7 +2793,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CXX="$ac_prog"
+-echo "$as_me:2793: found $ac_dir/$ac_word" >&5
++echo "$as_me:2796: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2798,10 +2801,10 @@
+ fi
+ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+ if test -n "$ac_ct_CXX"; then
+-  echo "$as_me:2801: result: $ac_ct_CXX" >&5
++  echo "$as_me:2804: result: $ac_ct_CXX" >&5
+ echo "${ECHO_T}$ac_ct_CXX" >&6
+ else
+-  echo "$as_me:2804: result: no" >&5
++  echo "$as_me:2807: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2813,32 +2816,32 @@
+ fi
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:2816:" \
++echo "$as_me:2819:" \
+      "checking for C++ compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:2819: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:2822: \"$ac_compiler --version </dev/null >&5\"") >&5
+   (eval $ac_compiler --version </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:2822: \$? = $ac_status" >&5
++  echo "$as_me:2825: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:2824: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:2827: \"$ac_compiler -v </dev/null >&5\"") >&5
+   (eval $ac_compiler -v </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:2827: \$? = $ac_status" >&5
++  echo "$as_me:2830: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:2829: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:2832: \"$ac_compiler -V </dev/null >&5\"") >&5
+   (eval $ac_compiler -V </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:2832: \$? = $ac_status" >&5
++  echo "$as_me:2835: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 
+-echo "$as_me:2835: checking whether we are using the GNU C++ compiler" >&5
++echo "$as_me:2838: checking whether we are using the GNU C++ compiler" >&5
+ echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
+ if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2841 "configure"
++#line 2844 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2853,16 +2856,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2856: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2859: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2859: \$? = $ac_status" >&5
++  echo "$as_me:2862: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2862: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2865: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2865: \$? = $ac_status" >&5
++  echo "$as_me:2868: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -2874,19 +2877,19 @@
+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:2877: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "$as_me:2880: result: $ac_cv_cxx_compiler_gnu" >&5
+ echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
+ GXX=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CXXFLAGS=${CXXFLAGS+set}
+ ac_save_CXXFLAGS=$CXXFLAGS
+ CXXFLAGS="-g"
+-echo "$as_me:2883: checking whether $CXX accepts -g" >&5
++echo "$as_me:2886: checking whether $CXX accepts -g" >&5
+ echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
+ if test "${ac_cv_prog_cxx_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2889 "configure"
++#line 2892 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2898,16 +2901,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2901: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2904: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2904: \$? = $ac_status" >&5
++  echo "$as_me:2907: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2907: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2910: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2910: \$? = $ac_status" >&5
++  echo "$as_me:2913: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_prog_cxx_g=yes
+ else
+@@ -2917,7 +2920,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:2920: result: $ac_cv_prog_cxx_g" >&5
++echo "$as_me:2923: result: $ac_cv_prog_cxx_g" >&5
+ echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
+ if test "$ac_test_CXXFLAGS" = set; then
+   CXXFLAGS=$ac_save_CXXFLAGS
+@@ -2944,7 +2947,7 @@
+    'void exit (int);'
+ do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2947 "configure"
++#line 2950 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ $ac_declaration
+@@ -2957,16 +2960,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2960: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2963: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2963: \$? = $ac_status" >&5
++  echo "$as_me:2966: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2966: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2969: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2969: \$? = $ac_status" >&5
++  echo "$as_me:2972: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -2976,7 +2979,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2979 "configure"
++#line 2982 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -2988,16 +2991,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2991: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2994: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2994: \$? = $ac_status" >&5
++  echo "$as_me:2997: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2997: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3000: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3000: \$? = $ac_status" >&5
++  echo "$as_me:3003: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -3024,7 +3027,7 @@
+ 	if test "$CXX" = "g++" ; then
+ 		# Extract the first word of "g++", so it can be a program name with args.
+ set dummy g++; ac_word=$2
+-echo "$as_me:3027: checking for $ac_word" >&5
++echo "$as_me:3030: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3041,7 +3044,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_CXX="$ac_dir/$ac_word"
+-   echo "$as_me:3044: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3047: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3052,16 +3055,16 @@
+ CXX=$ac_cv_path_CXX
+ 
+ if test -n "$CXX"; then
+-  echo "$as_me:3055: result: $CXX" >&5
++  echo "$as_me:3058: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+-  echo "$as_me:3058: result: no" >&5
++  echo "$as_me:3061: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ 	fi
+ 	if test "$CXX" = "g++" ; then
+-		{ echo "$as_me:3064: WARNING: ignoring hardcoded g++" >&5
++		{ echo "$as_me:3067: WARNING: ignoring hardcoded g++" >&5
+ echo "$as_me: WARNING: ignoring hardcoded g++" >&2;}
+ 		cf_with_cxx=no; CXX=""; GXX="";
+ 	fi
+@@ -3069,11 +3072,11 @@
+ 
+ GXX_VERSION=none
+ if test "$GXX" = yes; then
+-	echo "$as_me:3072: checking version of g++" >&5
++	echo "$as_me:3075: checking version of g++" >&5
+ echo $ECHO_N "checking version of g++... $ECHO_C" >&6
+ 	GXX_VERSION="`${CXX-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	test -z "$GXX_VERSION" && GXX_VERSION=unknown
+-	echo "$as_me:3076: result: $GXX_VERSION" >&5
++	echo "$as_me:3079: result: $GXX_VERSION" >&5
+ echo "${ECHO_T}$GXX_VERSION" >&6
+ fi
+ 
+@@ -3081,12 +3084,12 @@
+ 1*|2.[0-6]*)
+ 	# GXX=""; CXX=""; ac_cv_prog_gxx=no
+ 	# cf_cxx_library=no
+-	{ echo "$as_me:3084: WARNING: templates do not work" >&5
++	{ echo "$as_me:3087: WARNING: templates do not work" >&5
+ echo "$as_me: WARNING: templates do not work" >&2;}
+ 	;;
+ esac
+ 
+-echo "$as_me:3089: checking if you want to build C++ binding and demo" >&5
++echo "$as_me:3092: checking if you want to build C++ binding and demo" >&5
+ echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6
+ 
+ # Check whether --with-cxx-binding or --without-cxx-binding was given.
+@@ -3096,10 +3099,10 @@
+ else
+   cf_with_cxx_binding=$cf_with_cxx
+ fi;
+-echo "$as_me:3099: result: $cf_with_cxx_binding" >&5
++echo "$as_me:3102: result: $cf_with_cxx_binding" >&5
+ echo "${ECHO_T}$cf_with_cxx_binding" >&6
+ 
+-echo "$as_me:3102: checking if you want to build with Ada95" >&5
++echo "$as_me:3105: checking if you want to build with Ada95" >&5
+ echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6
+ 
+ # Check whether --with-ada or --without-ada was given.
+@@ -3109,10 +3112,23 @@
+ else
+   cf_with_ada=yes
+ fi;
+-echo "$as_me:3112: result: $cf_with_ada" >&5
++echo "$as_me:3115: result: $cf_with_ada" >&5
+ echo "${ECHO_T}$cf_with_ada" >&6
+ 
+-echo "$as_me:3115: checking if you want to build programs such as tic" >&5
++echo "$as_me:3118: checking if you want to install manpages" >&5
++echo $ECHO_N "checking if you want to install manpages... $ECHO_C" >&6
++
++# Check whether --with-manpages or --without-manpages was given.
++if test "${with_manpages+set}" = set; then
++  withval="$with_manpages"
++  cf_with_manpages=$withval
++else
++  cf_with_manpages=yes
++fi;
++echo "$as_me:3128: result: $cf_with_manpages" >&5
++echo "${ECHO_T}$cf_with_manpages" >&6
++
++echo "$as_me:3131: checking if you want to build programs such as tic" >&5
+ echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6
+ 
+ # Check whether --with-progs or --without-progs was given.
+@@ -3122,10 +3138,10 @@
+ else
+   cf_with_progs=yes
+ fi;
+-echo "$as_me:3125: result: $cf_with_progs" >&5
++echo "$as_me:3141: result: $cf_with_progs" >&5
+ echo "${ECHO_T}$cf_with_progs" >&6
+ 
+-echo "$as_me:3128: checking if you wish to install curses.h" >&5
++echo "$as_me:3144: checking if you wish to install curses.h" >&5
+ echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6
+ 
+ # Check whether --with-curses-h or --without-curses-h was given.
+@@ -3135,7 +3151,7 @@
+ else
+   with_curses_h=yes
+ fi;
+-echo "$as_me:3138: result: $with_curses_h" >&5
++echo "$as_me:3154: result: $with_curses_h" >&5
+ echo "${ECHO_T}$with_curses_h" >&6
+ 
+ modules_to_build="ncurses"
+@@ -3161,7 +3177,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:3164: checking for $ac_word" >&5
++echo "$as_me:3180: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_AWK+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3176,7 +3192,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+-echo "$as_me:3179: found $ac_dir/$ac_word" >&5
++echo "$as_me:3195: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3184,21 +3200,21 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  echo "$as_me:3187: result: $AWK" >&5
++  echo "$as_me:3203: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+-  echo "$as_me:3190: result: no" >&5
++  echo "$as_me:3206: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+   test -n "$AWK" && break
+ done
+ 
+-test -z "$AWK" && { { echo "$as_me:3197: error: No awk program found" >&5
++test -z "$AWK" && { { echo "$as_me:3213: error: No awk program found" >&5
+ echo "$as_me: error: No awk program found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:3201: checking for egrep" >&5
++echo "$as_me:3217: checking for egrep" >&5
+ echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+ if test "${ac_cv_prog_egrep+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3208,11 +3224,11 @@
+     else ac_cv_prog_egrep='egrep'
+     fi
+ fi
+-echo "$as_me:3211: result: $ac_cv_prog_egrep" >&5
++echo "$as_me:3227: result: $ac_cv_prog_egrep" >&5
+ echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+  EGREP=$ac_cv_prog_egrep
+ 
+-test -z "$EGREP" && { { echo "$as_me:3215: error: No egrep program found" >&5
++test -z "$EGREP" && { { echo "$as_me:3231: error: No egrep program found" >&5
+ echo "$as_me: error: No egrep program found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -3228,7 +3244,7 @@
+ # AFS /usr/afsws/bin/install, which mishandles nonexistent args
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+-echo "$as_me:3231: checking for a BSD compatible install" >&5
++echo "$as_me:3247: checking for a BSD compatible install" >&5
+ echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
+ if test -z "$INSTALL"; then
+ if test "${ac_cv_path_install+set}" = set; then
+@@ -3277,7 +3293,7 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:3280: result: $INSTALL" >&5
++echo "$as_me:3296: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -3302,7 +3318,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:3305: checking for $ac_word" >&5
++echo "$as_me:3321: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_LINT+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3317,7 +3333,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LINT="$ac_prog"
+-echo "$as_me:3320: found $ac_dir/$ac_word" >&5
++echo "$as_me:3336: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3325,28 +3341,28 @@
+ fi
+ LINT=$ac_cv_prog_LINT
+ if test -n "$LINT"; then
+-  echo "$as_me:3328: result: $LINT" >&5
++  echo "$as_me:3344: result: $LINT" >&5
+ echo "${ECHO_T}$LINT" >&6
+ else
+-  echo "$as_me:3331: result: no" >&5
++  echo "$as_me:3347: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+   test -n "$LINT" && break
+ done
+ 
+-echo "$as_me:3338: checking whether ln -s works" >&5
++echo "$as_me:3354: checking whether ln -s works" >&5
+ echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
+ LN_S=$as_ln_s
+ if test "$LN_S" = "ln -s"; then
+-  echo "$as_me:3342: result: yes" >&5
++  echo "$as_me:3358: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:3345: result: no, using $LN_S" >&5
++  echo "$as_me:3361: result: no, using $LN_S" >&5
+ echo "${ECHO_T}no, using $LN_S" >&6
+ fi
+ 
+-echo "$as_me:3349: checking for long file names" >&5
++echo "$as_me:3365: checking for long file names" >&5
+ echo $ECHO_N "checking for long file names... $ECHO_C" >&6
+ if test "${ac_cv_sys_long_file_names+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3385,7 +3401,7 @@
+   rm -rf $ac_xdir 2>/dev/null
+ done
+ fi
+-echo "$as_me:3388: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:3404: result: $ac_cv_sys_long_file_names" >&5
+ echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
+ if test $ac_cv_sys_long_file_names = yes; then
+ 
+@@ -3395,7 +3411,136 @@
+ 
+ fi
+ 
+-echo "$as_me:3398: checking if we should assume mixed-case filenames" >&5
++# if we find pkg-config, check if we should install the ".pc" files.
++
++echo "$as_me:3416: checking if you want to use pkg-config" >&5
++echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
++
++# Check whether --with-pkg-config or --without-pkg-config was given.
++if test "${with_pkg_config+set}" = set; then
++  withval="$with_pkg_config"
++  cf_pkg_config=$withval
++else
++  cf_pkg_config=yes
++fi;
++echo "$as_me:3426: result: $cf_pkg_config" >&5
++echo "${ECHO_T}$cf_pkg_config" >&6
++
++case $cf_pkg_config in
++no)
++	PKG_CONFIG=none
++	;;
++yes)
++	# Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++echo "$as_me:3436: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $PKG_CONFIG in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++  ;;
++  *)
++  ac_save_IFS=$IFS; IFS=$ac_path_separator
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  if $as_executable_p "$ac_dir/$ac_word"; then
++   ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
++   echo "$as_me:3453: found $ac_dir/$ac_word" >&5
++   break
++fi
++done
++
++  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="none"
++  ;;
++esac
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++
++if test -n "$PKG_CONFIG"; then
++  echo "$as_me:3465: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6
++else
++  echo "$as_me:3468: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++	;;
++*)
++	PKG_CONFIG=$withval
++	;;
++esac
++
++test -z "$PKG_CONFIG" && PKG_CONFIG=none
++if test "$PKG_CONFIG" != none ; then
++
++if test "x$prefix" != xNONE; then
++  cf_path_syntax="$prefix"
++else
++  cf_path_syntax="$ac_default_prefix"
++fi
++
++case ".$PKG_CONFIG" in #(vi
++.\$\(*\)*|.\'*\'*) #(vi
++  ;;
++..|./*|.\\*) #(vi
++  ;;
++.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
++  ;;
++.\${*prefix}*) #(vi
++  eval PKG_CONFIG="$PKG_CONFIG"
++  case ".$PKG_CONFIG" in #(vi
++  .NONE/*)
++    PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
++    ;;
++  esac
++  ;; #(vi
++.no|.NONE/*)
++  PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
++  ;;
++*)
++  { { echo "$as_me:3506: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
++   { (exit 1); exit 1; }; }
++  ;;
++esac
++
++fi
++
++if test "$PKG_CONFIG" != no ; then
++	echo "$as_me:3515: checking if we should install .pc files for $PKG_CONFIG" >&5
++echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6
++
++	# Leave this as something that can be overridden in the environment.
++	if test -z "$PKG_CONFIG_LIBDIR" ; then
++		PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`/lib/pkgconfig
++	fi
++
++	if test -d "$PKG_CONFIG_LIBDIR" ; then
++
++# Check whether --enable-pc-files or --disable-pc-files was given.
++if test "${enable_pc_files+set}" = set; then
++  enableval="$enable_pc_files"
++  enable_pc_files=$enableval
++else
++  enable_pc_files=no
++fi;
++		echo "$as_me:3532: result: $enable_pc_files" >&5
++echo "${ECHO_T}$enable_pc_files" >&6
++	else
++		echo "$as_me:3535: result: no" >&5
++echo "${ECHO_T}no" >&6
++		{ echo "$as_me:3537: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5
++echo "$as_me: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&2;}
++		enable_pc_files=no
++	fi
++fi
++
++echo "$as_me:3543: checking if we should assume mixed-case filenames" >&5
+ echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
+ 
+ # Check whether --enable-mixed-case or --disable-mixed-case was given.
+@@ -3405,11 +3550,11 @@
+ else
+   enable_mixedcase=auto
+ fi;
+-echo "$as_me:3408: result: $enable_mixedcase" >&5
++echo "$as_me:3553: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+ 
+-echo "$as_me:3412: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:3557: checking if filesystem supports mixed-case filenames" >&5
+ echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
+ if test "${cf_cv_mixedcase+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3436,7 +3581,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:3439: result: $cf_cv_mixedcase" >&5
++echo "$as_me:3584: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF
+ #define MIXEDCASE_FILENAMES 1
+@@ -3453,7 +3598,7 @@
+ fi
+ 
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:3456: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:3601: checking whether ${MAKE-make} sets \${MAKE}" >&5
+ echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+ if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+@@ -3473,18 +3618,18 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:3476: result: yes" >&5
++  echo "$as_me:3621: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:3480: result: no" >&5
++  echo "$as_me:3625: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+ # Extract the first word of "ctags", so it can be a program name with args.
+ set dummy ctags; ac_word=$2
+-echo "$as_me:3487: checking for $ac_word" >&5
++echo "$as_me:3632: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3499,7 +3644,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_MAKE_LOWER_TAGS="yes"
+-echo "$as_me:3502: found $ac_dir/$ac_word" >&5
++echo "$as_me:3647: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3508,17 +3653,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:3511: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:3656: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:3514: result: no" >&5
++  echo "$as_me:3659: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ if test "$cf_cv_mixedcase" = yes ; then
+ 	# Extract the first word of "etags", so it can be a program name with args.
+ set dummy etags; ac_word=$2
+-echo "$as_me:3521: checking for $ac_word" >&5
++echo "$as_me:3666: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3533,7 +3678,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_MAKE_UPPER_TAGS="yes"
+-echo "$as_me:3536: found $ac_dir/$ac_word" >&5
++echo "$as_me:3681: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3542,10 +3687,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:3545: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:3690: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:3548: result: no" >&5
++  echo "$as_me:3693: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3565,7 +3710,7 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:3568: checking for makeflags variable" >&5
++echo "$as_me:3713: checking for makeflags variable" >&5
+ echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
+ if test "${cf_cv_makeflags+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3599,13 +3744,13 @@
+ 	rm -f cf_makeflags.tmp
+ 
+ fi
+-echo "$as_me:3602: result: $cf_cv_makeflags" >&5
++echo "$as_me:3747: result: $cf_cv_makeflags" >&5
+ echo "${ECHO_T}$cf_cv_makeflags" >&6
+ 
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+-echo "$as_me:3608: checking for $ac_word" >&5
++echo "$as_me:3753: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_RANLIB+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3620,7 +3765,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+-echo "$as_me:3623: found $ac_dir/$ac_word" >&5
++echo "$as_me:3768: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3628,10 +3773,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:3631: result: $RANLIB" >&5
++  echo "$as_me:3776: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+-  echo "$as_me:3634: result: no" >&5
++  echo "$as_me:3779: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3640,7 +3785,7 @@
+   ac_ct_RANLIB=$RANLIB
+   # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+-echo "$as_me:3643: checking for $ac_word" >&5
++echo "$as_me:3788: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3655,7 +3800,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_RANLIB="ranlib"
+-echo "$as_me:3658: found $ac_dir/$ac_word" >&5
++echo "$as_me:3803: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3664,10 +3809,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:3667: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:3812: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "$as_me:3670: result: no" >&5
++  echo "$as_me:3815: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3679,7 +3824,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ld; ac_word=$2
+-echo "$as_me:3682: checking for $ac_word" >&5
++echo "$as_me:3827: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_LD+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3694,7 +3839,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LD="${ac_tool_prefix}ld"
+-echo "$as_me:3697: found $ac_dir/$ac_word" >&5
++echo "$as_me:3842: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3702,10 +3847,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+-  echo "$as_me:3705: result: $LD" >&5
++  echo "$as_me:3850: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "$as_me:3708: result: no" >&5
++  echo "$as_me:3853: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3714,7 +3859,7 @@
+   ac_ct_LD=$LD
+   # Extract the first word of "ld", so it can be a program name with args.
+ set dummy ld; ac_word=$2
+-echo "$as_me:3717: checking for $ac_word" >&5
++echo "$as_me:3862: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3729,7 +3874,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_LD="ld"
+-echo "$as_me:3732: found $ac_dir/$ac_word" >&5
++echo "$as_me:3877: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3738,10 +3883,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+-  echo "$as_me:3741: result: $ac_ct_LD" >&5
++  echo "$as_me:3886: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+-  echo "$as_me:3744: result: no" >&5
++  echo "$as_me:3889: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3753,7 +3898,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ar; ac_word=$2
+-echo "$as_me:3756: checking for $ac_word" >&5
++echo "$as_me:3901: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_AR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3768,7 +3913,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AR="${ac_tool_prefix}ar"
+-echo "$as_me:3771: found $ac_dir/$ac_word" >&5
++echo "$as_me:3916: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3776,10 +3921,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:3779: result: $AR" >&5
++  echo "$as_me:3924: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:3782: result: no" >&5
++  echo "$as_me:3927: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3788,7 +3933,7 @@
+   ac_ct_AR=$AR
+   # Extract the first word of "ar", so it can be a program name with args.
+ set dummy ar; ac_word=$2
+-echo "$as_me:3791: checking for $ac_word" >&5
++echo "$as_me:3936: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3803,7 +3948,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_AR="ar"
+-echo "$as_me:3806: found $ac_dir/$ac_word" >&5
++echo "$as_me:3951: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3812,10 +3957,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:3815: result: $ac_ct_AR" >&5
++  echo "$as_me:3960: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:3818: result: no" >&5
++  echo "$as_me:3963: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3824,25 +3969,123 @@
+   AR="$ac_cv_prog_AR"
+ fi
+ 
+-if test "${cf_cv_subst_AR_OPTS+set}" = set; then
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ar; ac_word=$2
++echo "$as_me:3975: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_AR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
++  if test -n "$AR"; then
++  ac_cv_prog_AR="$AR" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=$ac_path_separator
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  $as_executable_p "$ac_dir/$ac_word" || continue
++ac_cv_prog_AR="${ac_tool_prefix}ar"
++echo "$as_me:3990: found $ac_dir/$ac_word" >&5
++break
++done
+ 
+-echo "$as_me:3831: checking for archiver options (symbol AR_OPTS)" >&5
+-echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6
++fi
++fi
++AR=$ac_cv_prog_AR
++if test -n "$AR"; then
++  echo "$as_me:3998: result: $AR" >&5
++echo "${ECHO_T}$AR" >&6
++else
++  echo "$as_me:4001: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
+ 
+-if test -z "$AR_OPTS" ; then
+-	AR_OPTS=rv
++fi
++if test -z "$ac_cv_prog_AR"; then
++  ac_ct_AR=$AR
++  # Extract the first word of "ar", so it can be a program name with args.
++set dummy ar; ac_word=$2
++echo "$as_me:4010: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_AR"; then
++  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=$ac_path_separator
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  $as_executable_p "$ac_dir/$ac_word" || continue
++ac_cv_prog_ac_ct_AR="ar"
++echo "$as_me:4025: found $ac_dir/$ac_word" >&5
++break
++done
+ 
++  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="ar"
++fi
+ fi
++ac_ct_AR=$ac_cv_prog_ac_ct_AR
++if test -n "$ac_ct_AR"; then
++  echo "$as_me:4034: result: $ac_ct_AR" >&5
++echo "${ECHO_T}$ac_ct_AR" >&6
++else
++  echo "$as_me:4037: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  AR=$ac_ct_AR
++else
++  AR="$ac_cv_prog_AR"
++fi
++
++echo "$as_me:4046: checking for options to update archives" >&5
++echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
++if test "${cf_cv_ar_flags+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++	cf_cv_ar_flags=unknown
++	for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
++	do
++		rm -f conftest.$ac_cv_objext
++		rm -f conftest.a
++
++		cat >conftest.$ac_ext <<EOF
++#line 4059 "configure"
++int	testdata[3] = { 123, 456, 789 };
++EOF
++		if { (eval echo "$as_me:4062: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:4065: \$? = $ac_status" >&5
++  (exit $ac_status); } ; then
++			$AR $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null
++			if test -f conftest.a ; then
++				cf_cv_ar_flags=$cf_ar_flags
++				break
++			fi
++		else
++			test -n "$verbose" && echo "	cannot compile test-program" 1>&6
+ 
+-cf_cv_subst_AR_OPTS=$AR_OPTS
+-echo "$as_me:3840: result: $AR_OPTS" >&5
+-echo "${ECHO_T}$AR_OPTS" >&6
++echo "${as_me-configure}:4075: testing cannot compile test-program ..." 1>&5
++
++			break
++		fi
++	done
++	rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
+ 
+ fi
++echo "$as_me:4083: result: $cf_cv_ar_flags" >&5
++echo "${ECHO_T}$cf_cv_ar_flags" >&6
+ 
+-echo "$as_me:3845: checking if you have specified an install-prefix" >&5
++ARFLAGS=$cf_cv_ar_flags
++
++echo "$as_me:4088: checking if you have specified an install-prefix" >&5
+ echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-install-prefix or --without-install-prefix was given.
+@@ -3855,7 +4098,7 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:3858: result: $DESTDIR" >&5
++echo "$as_me:4101: result: $DESTDIR" >&5
+ echo "${ECHO_T}$DESTDIR" >&6
+ 
+ ###############################################################################
+@@ -3883,7 +4126,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:3886: checking for $ac_word" >&5
++echo "$as_me:4129: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_BUILD_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3898,7 +4141,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_BUILD_CC="$ac_prog"
+-echo "$as_me:3901: found $ac_dir/$ac_word" >&5
++echo "$as_me:4144: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3906,10 +4149,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+-  echo "$as_me:3909: result: $BUILD_CC" >&5
++  echo "$as_me:4152: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+-  echo "$as_me:3912: result: no" >&5
++  echo "$as_me:4155: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3917,12 +4160,12 @@
+ done
+ 
+ fi;
+-	echo "$as_me:3920: checking for native build C compiler" >&5
++	echo "$as_me:4163: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+-	echo "$as_me:3922: result: $BUILD_CC" >&5
++	echo "$as_me:4165: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ 
+-	echo "$as_me:3925: checking for native build C preprocessor" >&5
++	echo "$as_me:4168: checking for native build C preprocessor" >&5
+ echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
+ 
+ # Check whether --with-build-cpp or --without-build-cpp was given.
+@@ -3932,10 +4175,10 @@
+ else
+   BUILD_CPP='${BUILD_CC} -E'
+ fi;
+-	echo "$as_me:3935: result: $BUILD_CPP" >&5
++	echo "$as_me:4178: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+ 
+-	echo "$as_me:3938: checking for native build C flags" >&5
++	echo "$as_me:4181: checking for native build C flags" >&5
+ echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
+ 
+ # Check whether --with-build-cflags or --without-build-cflags was given.
+@@ -3943,10 +4186,10 @@
+   withval="$with_build_cflags"
+   BUILD_CFLAGS="$withval"
+ fi;
+-	echo "$as_me:3946: result: $BUILD_CFLAGS" >&5
++	echo "$as_me:4189: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+ 
+-	echo "$as_me:3949: checking for native build C preprocessor-flags" >&5
++	echo "$as_me:4192: checking for native build C preprocessor-flags" >&5
+ echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
+ 
+ # Check whether --with-build-cppflags or --without-build-cppflags was given.
+@@ -3954,10 +4197,10 @@
+   withval="$with_build_cppflags"
+   BUILD_CPPFLAGS="$withval"
+ fi;
+-	echo "$as_me:3957: result: $BUILD_CPPFLAGS" >&5
++	echo "$as_me:4200: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+ 
+-	echo "$as_me:3960: checking for native build linker-flags" >&5
++	echo "$as_me:4203: checking for native build linker-flags" >&5
+ echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
+ 
+ # Check whether --with-build-ldflags or --without-build-ldflags was given.
+@@ -3965,10 +4208,10 @@
+   withval="$with_build_ldflags"
+   BUILD_LDFLAGS="$withval"
+ fi;
+-	echo "$as_me:3968: result: $BUILD_LDFLAGS" >&5
++	echo "$as_me:4211: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+ 
+-	echo "$as_me:3971: checking for native build linker-libraries" >&5
++	echo "$as_me:4214: checking for native build linker-libraries" >&5
+ echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
+ 
+ # Check whether --with-build-libs or --without-build-libs was given.
+@@ -3976,7 +4219,7 @@
+   withval="$with_build_libs"
+   BUILD_LIBS="$withval"
+ fi;
+-	echo "$as_me:3979: result: $BUILD_LIBS" >&5
++	echo "$as_me:4222: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+ 
+ 	# this assumes we're on Unix.
+@@ -3986,7 +4229,7 @@
+ 	: ${BUILD_CC:='${CC}'}
+ 
+ 	if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
+-		{ { echo "$as_me:3989: error: Cross-build requires two compilers.
++		{ { echo "$as_me:4232: error: Cross-build requires two compilers.
+ Use --with-build-cc to specify the native compiler." >&5
+ echo "$as_me: error: Cross-build requires two compilers.
+ Use --with-build-cc to specify the native compiler." >&2;}
+@@ -4027,7 +4270,7 @@
+ LIB_INSTALL=
+ LIB_UNINSTALL=
+ 
+-echo "$as_me:4030: checking if you want to build libraries with libtool" >&5
++echo "$as_me:4273: checking if you want to build libraries with libtool" >&5
+ echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6
+ 
+ # Check whether --with-libtool or --without-libtool was given.
+@@ -4037,11 +4280,11 @@
+ else
+   with_libtool=no
+ fi;
+-echo "$as_me:4040: result: $with_libtool" >&5
++echo "$as_me:4283: result: $with_libtool" >&5
+ echo "${ECHO_T}$with_libtool" >&6
+ if test "$with_libtool" != "no"; then
+ 
+- 	if test "$with_libtool" != "yes" ; then
++	if test "$with_libtool" != "yes" ; then
+ 
+ if test "x$prefix" != xNONE; then
+   cf_path_syntax="$prefix"
+@@ -4068,7 +4311,7 @@
+   with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
+   ;;
+ *)
+-  { { echo "$as_me:4071: error: expected a pathname, not \"$with_libtool\"" >&5
++  { { echo "$as_me:4314: error: expected a pathname, not \"$with_libtool\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
+    { (exit 1); exit 1; }; }
+   ;;
+@@ -4076,9 +4319,9 @@
+ 
+ 		LIBTOOL=$with_libtool
+ 	else
+- 		# Extract the first word of "libtool", so it can be a program name with args.
++		# Extract the first word of "libtool", so it can be a program name with args.
+ set dummy libtool; ac_word=$2
+-echo "$as_me:4081: checking for $ac_word" >&5
++echo "$as_me:4324: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_LIBTOOL+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4095,7 +4338,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_LIBTOOL="$ac_dir/$ac_word"
+-   echo "$as_me:4098: found $ac_dir/$ac_word" >&5
++   echo "$as_me:4341: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -4106,19 +4349,19 @@
+ LIBTOOL=$ac_cv_path_LIBTOOL
+ 
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:4109: result: $LIBTOOL" >&5
++  echo "$as_me:4352: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:4112: result: no" >&5
++  echo "$as_me:4355: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+- 	fi
+- 	if test -z "$LIBTOOL" ; then
+- 		{ { echo "$as_me:4118: error: Cannot find libtool" >&5
++	fi
++	if test -z "$LIBTOOL" ; then
++		{ { echo "$as_me:4361: error: Cannot find libtool" >&5
+ echo "$as_me: error: Cannot find libtool" >&2;}
+    { (exit 1); exit 1; }; }
+- 	fi
++	fi
+ 	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
+ 	LIB_OBJECT='${OBJECTS:.o=.lo}'
+ 	LIB_SUFFIX=.la
+@@ -4130,17 +4373,17 @@
+ 	LIB_PREP=:
+ 
+ 	# Show the version of libtool
+-	echo "$as_me:4133: checking version of libtool" >&5
++	echo "$as_me:4376: checking version of libtool" >&5
+ echo $ECHO_N "checking version of libtool... $ECHO_C" >&6
+ 
+ 	# Save the version in a cache variable - this is not entirely a good
+ 	# thing, but the version string from libtool is very ugly, and for
+ 	# bug reports it might be useful to have the original string.
+ 	cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'`
+-	echo "$as_me:4140: result: $cf_cv_libtool_version" >&5
++	echo "$as_me:4383: result: $cf_cv_libtool_version" >&5
+ echo "${ECHO_T}$cf_cv_libtool_version" >&6
+ 	if test -z "$cf_cv_libtool_version" ; then
+-		{ { echo "$as_me:4143: error: This is not GNU libtool" >&5
++		{ { echo "$as_me:4386: error: This is not GNU libtool" >&5
+ echo "$as_me: error: This is not GNU libtool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -4168,7 +4411,7 @@
+ 
+ else
+ 
+-echo "$as_me:4171: checking if you want to build shared libraries" >&5
++echo "$as_me:4414: checking if you want to build shared libraries" >&5
+ echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6
+ 
+ # Check whether --with-shared or --without-shared was given.
+@@ -4178,11 +4421,11 @@
+ else
+   with_shared=no
+ fi;
+-echo "$as_me:4181: result: $with_shared" >&5
++echo "$as_me:4424: result: $with_shared" >&5
+ echo "${ECHO_T}$with_shared" >&6
+ test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
+ 
+-echo "$as_me:4185: checking if you want to build static libraries" >&5
++echo "$as_me:4428: checking if you want to build static libraries" >&5
+ echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6
+ 
+ # Check whether --with-normal or --without-normal was given.
+@@ -4192,11 +4435,11 @@
+ else
+   with_normal=yes
+ fi;
+-echo "$as_me:4195: result: $with_normal" >&5
++echo "$as_me:4438: result: $with_normal" >&5
+ echo "${ECHO_T}$with_normal" >&6
+ test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal"
+ 
+-echo "$as_me:4199: checking if you want to build debug libraries" >&5
++echo "$as_me:4442: checking if you want to build debug libraries" >&5
+ echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6
+ 
+ # Check whether --with-debug or --without-debug was given.
+@@ -4206,11 +4449,11 @@
+ else
+   with_debug=yes
+ fi;
+-echo "$as_me:4209: result: $with_debug" >&5
++echo "$as_me:4452: result: $with_debug" >&5
+ echo "${ECHO_T}$with_debug" >&6
+ test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug"
+ 
+-echo "$as_me:4213: checking if you want to build profiling libraries" >&5
++echo "$as_me:4456: checking if you want to build profiling libraries" >&5
+ echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6
+ 
+ # Check whether --with-profile or --without-profile was given.
+@@ -4220,7 +4463,7 @@
+ else
+   with_profile=no
+ fi;
+-echo "$as_me:4223: result: $with_profile" >&5
++echo "$as_me:4466: result: $with_profile" >&5
+ echo "${ECHO_T}$with_profile" >&6
+ test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile"
+ 
+@@ -4228,19 +4471,19 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:4231: checking for specified models" >&5
++echo "$as_me:4474: checking for specified models" >&5
+ echo $ECHO_N "checking for specified models... $ECHO_C" >&6
+ test -z "$cf_list_models" && cf_list_models=normal
+ test "$with_libtool" != "no" && cf_list_models=libtool
+-echo "$as_me:4235: result: $cf_list_models" >&5
++echo "$as_me:4478: result: $cf_list_models" >&5
+ echo "${ECHO_T}$cf_list_models" >&6
+ 
+ ### Use the first model as the default, and save its suffix for use in building
+ ### up test-applications.
+-echo "$as_me:4240: checking for default model" >&5
++echo "$as_me:4483: checking for default model" >&5
+ echo $ECHO_N "checking for default model... $ECHO_C" >&6
+ DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'`
+-echo "$as_me:4243: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:4486: result: $DFT_LWR_MODEL" >&5
+ echo "${ECHO_T}$DFT_LWR_MODEL" >&6
+ 
+ DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+@@ -4269,7 +4512,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:4272: checking if you want to build a separate terminfo library" >&5
++echo "$as_me:4515: checking if you want to build a separate terminfo library" >&5
+ echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6
+ 
+ # Check whether --with-termlib or --without-termlib was given.
+@@ -4279,10 +4522,10 @@
+ else
+   with_termlib=no
+ fi;
+-echo "$as_me:4282: result: $with_termlib" >&5
++echo "$as_me:4525: result: $with_termlib" >&5
+ echo "${ECHO_T}$with_termlib" >&6
+ 
+-echo "$as_me:4285: checking if you want to build a separate tic library" >&5
++echo "$as_me:4528: checking if you want to build a separate tic library" >&5
+ echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6
+ 
+ # Check whether --with-ticlib or --without-ticlib was given.
+@@ -4292,13 +4535,13 @@
+ else
+   with_ticlib=no
+ fi;
+-echo "$as_me:4295: result: $with_ticlib" >&5
++echo "$as_me:4538: result: $with_ticlib" >&5
+ echo "${ECHO_T}$with_ticlib" >&6
+ 
+ ### Checks for special libraries, must be done up-front.
+ SHLIB_LIST=""
+ 
+-echo "$as_me:4301: checking if you want to link with the GPM mouse library" >&5
++echo "$as_me:4544: checking if you want to link with the GPM mouse library" >&5
+ echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6
+ 
+ # Check whether --with-gpm or --without-gpm was given.
+@@ -4308,27 +4551,27 @@
+ else
+   with_gpm=maybe
+ fi;
+-echo "$as_me:4311: result: $with_gpm" >&5
++echo "$as_me:4554: result: $with_gpm" >&5
+ echo "${ECHO_T}$with_gpm" >&6
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:4315: checking for gpm.h" >&5
++	echo "$as_me:4558: checking for gpm.h" >&5
+ echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6
+ if test "${ac_cv_header_gpm_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4321 "configure"
++#line 4564 "configure"
+ #include "confdefs.h"
+ #include <gpm.h>
+ _ACEOF
+-if { (eval echo "$as_me:4325: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:4568: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:4331: \$? = $ac_status" >&5
++  echo "$as_me:4574: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -4347,7 +4590,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:4350: result: $ac_cv_header_gpm_h" >&5
++echo "$as_me:4593: result: $ac_cv_header_gpm_h" >&5
+ echo "${ECHO_T}$ac_cv_header_gpm_h" >&6
+ if test $ac_cv_header_gpm_h = yes; then
+ 
+@@ -4358,14 +4601,14 @@
+ 		if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then
+ 			test -n "$verbose" && echo "	assuming we really have GPM library" 1>&6
+ 
+-echo "${as_me-configure}:4361: testing assuming we really have GPM library ..." 1>&5
++echo "${as_me-configure}:4604: testing assuming we really have GPM library ..." 1>&5
+ 
+ 			cat >>confdefs.h <<\EOF
+ #define HAVE_LIBGPM 1
+ EOF
+ 
+ 		else
+-			echo "$as_me:4368: checking for Gpm_Open in -lgpm" >&5
++			echo "$as_me:4611: checking for Gpm_Open in -lgpm" >&5
+ echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4373,7 +4616,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4376 "configure"
++#line 4619 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -4392,16 +4635,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4395: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4638: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4398: \$? = $ac_status" >&5
++  echo "$as_me:4641: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:4401: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4644: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4404: \$? = $ac_status" >&5
++  echo "$as_me:4647: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -4412,13 +4655,13 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:4415: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:4658: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
+ if test $ac_cv_lib_gpm_Gpm_Open = yes; then
+   :
+ else
+ 
+-				{ { echo "$as_me:4421: error: Cannot link with GPM library" >&5
++				{ { echo "$as_me:4664: error: Cannot link with GPM library" >&5
+ echo "$as_me: error: Cannot link with GPM library" >&2;}
+    { (exit 1); exit 1; }; }
+ 		fi
+@@ -4428,7 +4671,7 @@
+ 
+ else
+ 
+-		test "$with_gpm" != maybe && { echo "$as_me:4431: WARNING: Cannot find GPM header" >&5
++		test "$with_gpm" != maybe && { echo "$as_me:4674: WARNING: Cannot find GPM header" >&5
+ echo "$as_me: WARNING: Cannot find GPM header" >&2;}
+ 		with_gpm=no
+ 
+@@ -4437,7 +4680,7 @@
+ fi
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:4440: checking if you want to load GPM dynamically" >&5
++	echo "$as_me:4683: checking if you want to load GPM dynamically" >&5
+ echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6
+ 
+ # Check whether --with-dlsym or --without-dlsym was given.
+@@ -4447,18 +4690,18 @@
+ else
+   with_dlsym=yes
+ fi;
+-	echo "$as_me:4450: result: $with_dlsym" >&5
++	echo "$as_me:4693: result: $with_dlsym" >&5
+ echo "${ECHO_T}$with_dlsym" >&6
+ 	if test "$with_dlsym" = yes ; then
+ 
+ cf_have_dlsym=no
+-echo "$as_me:4455: checking for dlsym" >&5
++echo "$as_me:4698: checking for dlsym" >&5
+ echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
+ if test "${ac_cv_func_dlsym+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4461 "configure"
++#line 4704 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char dlsym (); below.  */
+@@ -4489,16 +4732,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4492: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4735: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4495: \$? = $ac_status" >&5
++  echo "$as_me:4738: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:4498: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4741: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4501: \$? = $ac_status" >&5
++  echo "$as_me:4744: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_dlsym=yes
+ else
+@@ -4508,14 +4751,14 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:4511: result: $ac_cv_func_dlsym" >&5
++echo "$as_me:4754: result: $ac_cv_func_dlsym" >&5
+ echo "${ECHO_T}$ac_cv_func_dlsym" >&6
+ if test $ac_cv_func_dlsym = yes; then
+   cf_have_dlsym=yes
+ else
+ 
+ cf_have_libdl=no
+-echo "$as_me:4518: checking for dlsym in -ldl" >&5
++echo "$as_me:4761: checking for dlsym in -ldl" >&5
+ echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
+ if test "${ac_cv_lib_dl_dlsym+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4523,7 +4766,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4526 "configure"
++#line 4769 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -4542,16 +4785,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4545: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4788: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4548: \$? = $ac_status" >&5
++  echo "$as_me:4791: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:4551: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4794: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4554: \$? = $ac_status" >&5
++  echo "$as_me:4797: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dl_dlsym=yes
+ else
+@@ -4562,7 +4805,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:4565: result: $ac_cv_lib_dl_dlsym" >&5
++echo "$as_me:4808: result: $ac_cv_lib_dl_dlsym" >&5
+ echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
+ if test $ac_cv_lib_dl_dlsym = yes; then
+ 
+@@ -4575,10 +4818,10 @@
+ if test "$cf_have_dlsym" = yes ; then
+ 	test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS"
+ 
+-	echo "$as_me:4578: checking whether able to link to dl*() functions" >&5
++	echo "$as_me:4821: checking whether able to link to dl*() functions" >&5
+ echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 4581 "configure"
++#line 4824 "configure"
+ #include "confdefs.h"
+ #include <dlfcn.h>
+ int
+@@ -4596,16 +4839,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4599: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4842: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4602: \$? = $ac_status" >&5
++  echo "$as_me:4845: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:4605: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4848: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4608: \$? = $ac_status" >&5
++  echo "$as_me:4851: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 		cat >>confdefs.h <<\EOF
+@@ -4616,15 +4859,15 @@
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ 
+-		{ { echo "$as_me:4619: error: Cannot link test program for libdl" >&5
++		{ { echo "$as_me:4862: error: Cannot link test program for libdl" >&5
+ echo "$as_me: error: Cannot link test program for libdl" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-	echo "$as_me:4624: result: ok" >&5
++	echo "$as_me:4867: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ else
+-	{ { echo "$as_me:4627: error: Cannot find dlsym function" >&5
++	{ { echo "$as_me:4870: error: Cannot find dlsym function" >&5
+ echo "$as_me: error: Cannot find dlsym function" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -4632,12 +4875,12 @@
+ 		if test "$with_gpm" != yes ; then
+ 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
+ 
+-echo "${as_me-configure}:4635: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me-configure}:4878: testing assuming soname for gpm is $with_gpm ..." 1>&5
+ 
+ 			cf_cv_gpm_soname="$with_gpm"
+ 		else
+ 
+-echo "$as_me:4640: checking for soname of gpm library" >&5
++echo "$as_me:4883: checking for soname of gpm library" >&5
+ echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6
+ if test "${cf_cv_gpm_soname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4655,15 +4898,15 @@
+ CF_EOF
+ cf_save_LIBS="$LIBS"
+ 	LIBS="-lgpm $LIBS"
+-	if { (eval echo "$as_me:4658: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:4901: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4661: \$? = $ac_status" >&5
++  echo "$as_me:4904: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+-		if { (eval echo "$as_me:4663: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:4906: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4666: \$? = $ac_status" >&5
++  echo "$as_me:4909: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+ 			cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
+ 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
+@@ -4674,7 +4917,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:4677: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:4920: result: $cf_cv_gpm_soname" >&5
+ echo "${ECHO_T}$cf_cv_gpm_soname" >&6
+ 
+ 		fi
+@@ -4690,7 +4933,7 @@
+ #define HAVE_LIBGPM 1
+ EOF
+ 
+-echo "$as_me:4693: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:4936: checking for Gpm_Wgetch in -lgpm" >&5
+ echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4698,7 +4941,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4701 "configure"
++#line 4944 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -4717,16 +4960,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4720: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4963: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4723: \$? = $ac_status" >&5
++  echo "$as_me:4966: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:4726: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4969: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4729: \$? = $ac_status" >&5
++  echo "$as_me:4972: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_Gpm_Wgetch=yes
+ else
+@@ -4737,11 +4980,11 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:4740: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:4983: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6
+ if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then
+ 
+-echo "$as_me:4744: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:4987: checking if GPM is weakly bound to curses library" >&5
+ echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6
+ if test "${cf_cv_check_gpm_wgetch+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4765,15 +5008,15 @@
+ 	# to rely on the static library, noting that some packagers may not
+ 	# include it.
+ 	LIBS="-static -lgpm -dynamic $LIBS"
+-	if { (eval echo "$as_me:4768: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:5011: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4771: \$? = $ac_status" >&5
++  echo "$as_me:5014: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+-		if { (eval echo "$as_me:4773: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:5016: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4776: \$? = $ac_status" >&5
++  echo "$as_me:5019: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+ 			cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'`
+ 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
+@@ -4785,11 +5028,11 @@
+ fi
+ 
+ fi
+-echo "$as_me:4788: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:5031: result: $cf_cv_check_gpm_wgetch" >&5
+ echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6
+ 
+ if test "$cf_cv_check_gpm_wgetch" != yes ; then
+-	{ echo "$as_me:4792: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++	{ echo "$as_me:5035: WARNING: GPM library is already linked with curses - read the FAQ" >&5
+ echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;}
+ fi
+ 
+@@ -4799,7 +5042,7 @@
+ 
+ # not everyone has "test -c"
+ if test -c /dev/sysmouse 2>/dev/null ; then
+-echo "$as_me:4802: checking if you want to use sysmouse" >&5
++echo "$as_me:5045: checking if you want to use sysmouse" >&5
+ echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6
+ 
+ # Check whether --with-sysmouse or --without-sysmouse was given.
+@@ -4811,7 +5054,7 @@
+ fi;
+ 	if test "$cf_with_sysmouse" != no ; then
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 4814 "configure"
++#line 5057 "configure"
+ #include "confdefs.h"
+ 
+ #include <osreldate.h>
+@@ -4834,16 +5077,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4837: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5080: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4840: \$? = $ac_status" >&5
++  echo "$as_me:5083: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4843: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5086: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4846: \$? = $ac_status" >&5
++  echo "$as_me:5089: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_with_sysmouse=yes
+ else
+@@ -4853,7 +5096,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	fi
+-echo "$as_me:4856: result: $cf_with_sysmouse" >&5
++echo "$as_me:5099: result: $cf_with_sysmouse" >&5
+ echo "${ECHO_T}$cf_with_sysmouse" >&6
+ test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF
+ #define USE_SYSMOUSE 1
+@@ -4871,7 +5114,7 @@
+ 	test -n "$GXX" && test "${ac_cv_prog_cxx_g}" != yes && CXX_G_OPT=''
+ fi
+ 
+-echo "$as_me:4874: checking for default loader flags" >&5
++echo "$as_me:5117: checking for default loader flags" >&5
+ echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
+ case $DFT_LWR_MODEL in
+ libtool) LD_MODEL=''   ;;
+@@ -4880,13 +5123,13 @@
+ profile) LD_MODEL='-pg';;
+ shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:4883: result: $LD_MODEL" >&5
++echo "$as_me:5126: result: $LD_MODEL" >&5
+ echo "${ECHO_T}$LD_MODEL" >&6
+ 
+ case $DFT_LWR_MODEL in
+ shared)
+ 
+-echo "$as_me:4889: checking if rpath option should be used" >&5
++echo "$as_me:5132: checking if rpath option should be used" >&5
+ echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
+ 
+ # Check whether --enable-rpath or --disable-rpath was given.
+@@ -4896,10 +5139,10 @@
+ else
+   cf_cv_ld_rpath=no
+ fi;
+-echo "$as_me:4899: result: $cf_cv_ld_rpath" >&5
++echo "$as_me:5142: result: $cf_cv_ld_rpath" >&5
+ echo "${ECHO_T}$cf_cv_ld_rpath" >&6
+ 
+-echo "$as_me:4902: checking if shared libraries should be relinked during install" >&5
++echo "$as_me:5145: checking if shared libraries should be relinked during install" >&5
+ echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6
+ 
+ # Check whether --enable-relink or --disable-relink was given.
+@@ -4909,19 +5152,20 @@
+ else
+   cf_cv_do_relink=yes
+ fi;
+-echo "$as_me:4912: result: $cf_cv_do_relink" >&5
++echo "$as_me:5155: result: $cf_cv_do_relink" >&5
+ echo "${ECHO_T}$cf_cv_do_relink" >&6
+ 	;;
+ esac
+ 
+ 	LOCAL_LDFLAGS=
+ 	LOCAL_LDFLAGS2=
++	LD_RPATH_OPT=
+ 	LD_SHARED_OPTS=
+ 	INSTALL_LIB="-m 644"
+ 
+ 	cf_cv_do_symlinks=no
+ 
+-	echo "$as_me:4924: checking if release/abi version should be used for shared libs" >&5
++	echo "$as_me:5168: checking if release/abi version should be used for shared libs" >&5
+ echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
+ 
+ # Check whether --with-shlib-version or --without-shlib-version was given.
+@@ -4936,7 +5180,7 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	*)
+-		{ { echo "$as_me:4939: error: option value must be one of: rel, abi, auto or no" >&5
++		{ { echo "$as_me:5183: error: option value must be one of: rel, abi, auto or no" >&5
+ echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;}
+    { (exit 1); exit 1; }; }
+ 		;;
+@@ -4945,7 +5189,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:4948: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:5192: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -4954,14 +5198,14 @@
+ 	CC_SHARED_OPTS=
+ 	if test "$GCC" = yes
+ 	then
+-		echo "$as_me:4957: checking which $CC option to use" >&5
++		echo "$as_me:5201: checking which $CC option to use" >&5
+ echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
+ 		cf_save_CFLAGS="$CFLAGS"
+ 		for CC_SHARED_OPTS in -fPIC -fpic ''
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 4964 "configure"
++#line 5208 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -4973,16 +5217,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4976: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5220: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4979: \$? = $ac_status" >&5
++  echo "$as_me:5223: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4982: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5226: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4985: \$? = $ac_status" >&5
++  echo "$as_me:5229: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -4991,7 +5235,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		done
+-		echo "$as_me:4994: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:5238: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -4999,6 +5243,12 @@
+ 	cf_cv_shlib_version_infix=no
+ 
+ 	case $cf_cv_system_name in
++	aix[56]*)
++		if test "$GCC" = yes; then
++			CC_SHARED_OPTS=
++			MK_SHARED_LIB="$(CC) -shared"
++		fi
++		;;
+ 	beos*)
+ 		MK_SHARED_LIB='${CC} ${CFLAGS} -o $@ -Xlinker -soname=`basename $@` -nostart -e 0'
+ 		;;
+@@ -5027,7 +5277,7 @@
+ 		MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
+ 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
+ 		cf_cv_shlib_version_infix=yes
+-		echo "$as_me:5030: checking if ld -search_paths_first works" >&5
++		echo "$as_me:5280: checking if ld -search_paths_first works" >&5
+ echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
+ if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5036,7 +5286,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 5039 "configure"
++#line 5289 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -5048,16 +5298,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5051: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5301: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5054: \$? = $ac_status" >&5
++  echo "$as_me:5304: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5057: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5307: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5060: \$? = $ac_status" >&5
++  echo "$as_me:5310: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -5068,7 +5318,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:5071: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:5321: result: $cf_cv_ldflags_search_paths_first" >&5
+ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
+ 		if test $cf_cv_ldflags_search_paths_first = yes; then
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+@@ -5090,10 +5340,10 @@
+ 	irix*)
+ 		if test "$cf_cv_ld_rpath" = yes ; then
+ 			if test "$GCC" = yes; then
+-				cf_ld_rpath_opt="-Wl,-rpath,"
++				LD_RPATH_OPT="-Wl,-rpath,"
+ 				EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
+ 			else
+-				cf_ld_rpath_opt="-rpath "
++				LD_RPATH_OPT="-rpath "
+ 				EXTRA_LDFLAGS="-rpath \${libdir} $EXTRA_LDFLAGS"
+ 			fi
+ 		fi
+@@ -5112,7 +5362,7 @@
+ 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ 		fi
+ 		if test "$cf_cv_ld_rpath" = yes ; then
+-			cf_ld_rpath_opt="-Wl,-rpath,"
++			LD_RPATH_OPT="-Wl,-rpath,"
+ 			EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
+ 		fi
+ 
+@@ -5131,7 +5381,7 @@
+ 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ 		fi
+ 		if test "$cf_cv_ld_rpath" = yes ; then
+-			cf_ld_rpath_opt="-Wl,-rpath,"
++			LD_RPATH_OPT="-Wl,-rpath,"
+ 			EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
+ 		fi
+ 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
+@@ -5143,7 +5393,7 @@
+ 		cf_cv_shared_soname='`basename $@`'
+ 	fi
+ 
+-		MK_SHARED_LIB='${CC} ${CFLAGS} -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
++		MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
+ 		;;
+ 	nto-qnx*|openbsd*|freebsd[12].*)
+ 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
+@@ -5155,7 +5405,7 @@
+ 		if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
+ 			LOCAL_LDFLAGS="-rpath \$(LOCAL_LIBDIR)"
+ 			LOCAL_LDFLAGS2="-rpath \${libdir} $LOCAL_LDFLAGS"
+-			cf_ld_rpath_opt="-rpath "
++			LD_RPATH_OPT="-rpath "
+ 			EXTRA_LDFLAGS="-rpath \${libdir} $EXTRA_LDFLAGS"
+ 		fi
+ 
+@@ -5166,11 +5416,11 @@
+ 		cf_cv_shared_soname='`basename $@`'
+ 	fi
+ 
+-		MK_SHARED_LIB='${LD} -Bshareable -soname=`basename $@` -o $@'
++		MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $@` -o $@'
+ 		;;
+ 	netbsd*)
+ 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
+-		test "$cf_cv_ld_rpath" = yes && cf_ld_rpath_opt="-Wl,-rpath,"
++		test "$cf_cv_ld_rpath" = yes && LD_RPATH_OPT="-Wl,-rpath,"
+ 		if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
+ 			LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
+ 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+@@ -5192,7 +5442,7 @@
+ 
+ 			MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@'
+ 		else
+-			MK_SHARED_LIB='${LD} -Bshareable -o $@'
++			MK_SHARED_LIB='${LD} -shared -Bshareable -o $@'
+ 		fi
+ 		;;
+ 	osf*|mls+*)
+@@ -5211,7 +5461,7 @@
+ 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ 		fi
+ 		if test "$cf_cv_ld_rpath" = yes ; then
+-			cf_ld_rpath_opt="-rpath"
++			LD_RPATH_OPT="-rpath"
+ 			# EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
+ 		fi
+ 		cf_cv_rm_so_locs=yes
+@@ -5246,7 +5496,7 @@
+ 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ 		fi
+ 		if test "$cf_cv_ld_rpath" = yes ; then
+-			cf_ld_rpath_opt="-R"
++			LD_RPATH_OPT="-R"
+ 			EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
+ 		fi
+ 
+@@ -5258,7 +5508,43 @@
+ 	fi
+ 
+ 		if test "$GCC" != yes; then
+-			CC_SHARED_OPTS='-xcode=pic32'
++			cf_save_CFLAGS="$CFLAGS"
++			for cf_shared_opts in -xcode=pic13 -xcode=pic32 -Kpic -KPIC -O
++			do
++				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
++				cat >conftest.$ac_ext <<_ACEOF
++#line 5516 "configure"
++#include "confdefs.h"
++#include <stdio.h>
++int
++main ()
++{
++printf("Hello\n");
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:5528: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:5531: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:5534: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:5537: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  break
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++			done
++			CFLAGS="$cf_save_CFLAGS"
++			CC_SHARED_OPTS=$cf_shared_opts
+ 			MK_SHARED_LIB='${CC} -dy -G -h '$cf_cv_shared_soname' -o $@'
+ 		else
+ 			MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $@'
+@@ -5285,20 +5571,20 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		*)
+-			{ echo "$as_me:5288: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:5574: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+ 		;;
+ 	esac
+ 
+-	if test -n "$cf_ld_rpath_opt" ; then
+-		echo "$as_me:5296: checking if we need a space after rpath option" >&5
++	if test -n "$LD_RPATH_OPT" ; then
++		echo "$as_me:5582: checking if we need a space after rpath option" >&5
+ echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
+ 		cf_save_LIBS="$LIBS"
+-		LIBS="$LIBS ${cf_ld_rpath_opt}$libdir"
++		LIBS="$LIBS ${LD_RPATH_OPT}$libdir"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 5301 "configure"
++#line 5587 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -5310,16 +5596,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5313: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5599: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5316: \$? = $ac_status" >&5
++  echo "$as_me:5602: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5319: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5605: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5322: \$? = $ac_status" >&5
++  echo "$as_me:5608: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_rpath_space=no
+ else
+@@ -5329,16 +5615,16 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:5332: result: $cf_rpath_space" >&5
++		echo "$as_me:5618: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+-		test "$cf_rpath_space" = yes && cf_ld_rpath_opt="$cf_ld_rpath_opt "
+-		MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}"
++		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
++		MK_SHARED_LIB="$MK_SHARED_LIB $LD_RPATH_OPT\${libdir}"
+ 	fi
+ 
+ if test "$CC_SHARED_OPTS" = "unknown"; then
+ 	for model in $cf_list_models; do
+ 		if test "$model" = "shared"; then
+-			{ { echo "$as_me:5341: error: Shared libraries are not supported in this version" >&5
++			{ { echo "$as_me:5627: error: Shared libraries are not supported in this version" >&5
+ echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
+    { (exit 1); exit 1; }; }
+ 		fi
+@@ -5348,7 +5634,7 @@
+ ###############################################################################
+ 
+ ###	use option --disable-overwrite to leave out the link to -lcurses
+-echo "$as_me:5351: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:5637: checking if you wish to install ncurses overwriting curses" >&5
+ echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
+ 
+ # Check whether --enable-overwrite or --disable-overwrite was given.
+@@ -5358,10 +5644,10 @@
+ else
+   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
+ fi;
+-echo "$as_me:5361: result: $with_overwrite" >&5
++echo "$as_me:5647: result: $with_overwrite" >&5
+ echo "${ECHO_T}$with_overwrite" >&6
+ 
+-echo "$as_me:5364: checking if external terminfo-database is used" >&5
++echo "$as_me:5650: checking if external terminfo-database is used" >&5
+ echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
+ 
+ # Check whether --enable-database or --disable-database was given.
+@@ -5371,7 +5657,7 @@
+ else
+   use_database=yes
+ fi;
+-echo "$as_me:5374: result: $use_database" >&5
++echo "$as_me:5660: result: $use_database" >&5
+ echo "${ECHO_T}$use_database" >&6
+ 
+ case $host_os in #(vi
+@@ -5393,7 +5679,7 @@
+ #define USE_DATABASE 1
+ EOF
+ 
+-	echo "$as_me:5396: checking which terminfo source-file will be installed" >&5
++	echo "$as_me:5682: checking which terminfo source-file will be installed" >&5
+ echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
+ 
+ # Check whether --enable-database or --disable-database was given.
+@@ -5401,10 +5687,10 @@
+   enableval="$enable_database"
+   TERMINFO_SRC=$withval
+ fi;
+-	echo "$as_me:5404: result: $TERMINFO_SRC" >&5
++	echo "$as_me:5690: result: $TERMINFO_SRC" >&5
+ echo "${ECHO_T}$TERMINFO_SRC" >&6
+ 
+-	echo "$as_me:5407: checking whether to use hashed database instead of directory/tree" >&5
++	echo "$as_me:5693: checking whether to use hashed database instead of directory/tree" >&5
+ echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
+ 
+ # Check whether --with-hashed-db or --without-hashed-db was given.
+@@ -5414,13 +5700,13 @@
+ else
+   with_hashed_db=no
+ fi;
+-	echo "$as_me:5417: result: $with_hashed_db" >&5
++	echo "$as_me:5703: result: $with_hashed_db" >&5
+ echo "${ECHO_T}$with_hashed_db" >&6
+ else
+ 	with_hashed_db=no
+ fi
+ 
+-echo "$as_me:5423: checking for list of fallback descriptions" >&5
++echo "$as_me:5709: checking for list of fallback descriptions" >&5
+ echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
+ 
+ # Check whether --with-fallbacks or --without-fallbacks was given.
+@@ -5430,11 +5716,11 @@
+ else
+   with_fallback=
+ fi;
+-echo "$as_me:5433: result: $with_fallback" >&5
++echo "$as_me:5719: result: $with_fallback" >&5
+ echo "${ECHO_T}$with_fallback" >&6
+ FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
+ 
+-echo "$as_me:5437: checking if you want modern xterm or antique" >&5
++echo "$as_me:5723: checking if you want modern xterm or antique" >&5
+ echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
+ 
+ # Check whether --with-xterm-new or --without-xterm-new was given.
+@@ -5448,7 +5734,7 @@
+ no)	with_xterm_new=xterm-old;;
+ *)	with_xterm_new=xterm-new;;
+ esac
+-echo "$as_me:5451: result: $with_xterm_new" >&5
++echo "$as_me:5737: result: $with_xterm_new" >&5
+ echo "${ECHO_T}$with_xterm_new" >&6
+ WHICH_XTERM=$with_xterm_new
+ 
+@@ -5458,7 +5744,7 @@
+ 	MAKE_TERMINFO="#"
+ else
+ 
+-echo "$as_me:5461: checking for list of terminfo directories" >&5
++echo "$as_me:5747: checking for list of terminfo directories" >&5
+ echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
+ 
+ # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
+@@ -5498,7 +5784,7 @@
+   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
+   ;;
+ *)
+-  { { echo "$as_me:5501: error: expected a pathname, not \"$cf_src_path\"" >&5
++  { { echo "$as_me:5787: error: expected a pathname, not \"$cf_src_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+   ;;
+@@ -5511,13 +5797,13 @@
+ 
+ eval 'TERMINFO_DIRS="$cf_dst_path"'
+ 
+-echo "$as_me:5514: result: $TERMINFO_DIRS" >&5
++echo "$as_me:5800: result: $TERMINFO_DIRS" >&5
+ echo "${ECHO_T}$TERMINFO_DIRS" >&6
+ test -n "$TERMINFO_DIRS" && cat >>confdefs.h <<EOF
+ #define TERMINFO_DIRS "$TERMINFO_DIRS"
+ EOF
+ 
+-echo "$as_me:5520: checking for default terminfo directory" >&5
++echo "$as_me:5806: checking for default terminfo directory" >&5
+ echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
+ 
+ # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
+@@ -5553,7 +5839,7 @@
+   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+   ;;
+ *)
+-  { { echo "$as_me:5556: error: expected a pathname, not \"$withval\"" >&5
++  { { echo "$as_me:5842: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+   ;;
+@@ -5562,7 +5848,7 @@
+ fi
+ TERMINFO="$withval"
+ 
+-echo "$as_me:5565: result: $TERMINFO" >&5
++echo "$as_me:5851: result: $TERMINFO" >&5
+ echo "${ECHO_T}$TERMINFO" >&6
+ cat >>confdefs.h <<EOF
+ #define TERMINFO "$TERMINFO"
+@@ -5572,7 +5858,7 @@
+ 
+ ###	use option --disable-big-core to make tic run on small machines
+ ###	We need 4Mb, check if we can allocate 50% more than that.
+-echo "$as_me:5575: checking if big-core option selected" >&5
++echo "$as_me:5861: checking if big-core option selected" >&5
+ echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
+ 
+ # Check whether --enable-big-core or --disable-big-core was given.
+@@ -5584,7 +5870,7 @@
+   with_big_core=no
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5587 "configure"
++#line 5873 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -5598,15 +5884,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:5601: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5887: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5604: \$? = $ac_status" >&5
++  echo "$as_me:5890: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:5606: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5892: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5609: \$? = $ac_status" >&5
++  echo "$as_me:5895: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   with_big_core=yes
+ else
+@@ -5618,7 +5904,7 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi;
+-echo "$as_me:5621: result: $with_big_core" >&5
++echo "$as_me:5907: result: $with_big_core" >&5
+ echo "${ECHO_T}$with_big_core" >&6
+ test "$with_big_core" = "yes" && cat >>confdefs.h <<\EOF
+ #define HAVE_BIG_CORE 1
+@@ -5627,7 +5913,7 @@
+ ### ISO C only guarantees 512-char strings, we have tables which load faster
+ ### when constructed using "big" strings.  More than the C compiler, the awk
+ ### program is a limit on most vendor UNIX systems.  Check that we can build.
+-echo "$as_me:5630: checking if big-strings option selected" >&5
++echo "$as_me:5916: checking if big-strings option selected" >&5
+ echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
+ 
+ # Check whether --enable-big-strings or --disable-big-strings was given.
+@@ -5636,29 +5922,29 @@
+   with_big_strings=$enableval
+ else
+ 
+-    case x$AWK in #(vi
+-    x)
+-        eval with_big_strings=no
+-        ;;
+-    *) #(vi
+-        if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < 12000) { xx = xx "x"; }; printf("%s\n", xx); }' \
+-            | $AWK '{ printf "%d\n", length($0); }' | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ($0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then
+-            eval with_big_strings=yes
+-        else
+-            eval with_big_strings=no
+-        fi
+-        ;;
+-    esac
++	case x$AWK in #(vi
++	x)
++		eval with_big_strings=no
++		;;
++	*) #(vi
++		if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < 12000) { xx = xx "x"; }; printf("%s\n", xx); }' \
++			| $AWK '{ printf "%d\n", length($0); }' | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ($0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then
++			eval with_big_strings=yes
++		else
++			eval with_big_strings=no
++		fi
++		;;
++	esac
+ 
+ fi;
+-echo "$as_me:5654: result: $with_big_strings" >&5
++echo "$as_me:5940: result: $with_big_strings" >&5
+ echo "${ECHO_T}$with_big_strings" >&6
+ 
+ USE_BIG_STRINGS=0
+ test "$with_big_strings" = "yes" && USE_BIG_STRINGS=1
+ 
+ ###	use option --enable-termcap to compile in the termcap fallback support
+-echo "$as_me:5661: checking if you want termcap-fallback support" >&5
++echo "$as_me:5947: checking if you want termcap-fallback support" >&5
+ echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
+ 
+ # Check whether --enable-termcap or --disable-termcap was given.
+@@ -5668,13 +5954,13 @@
+ else
+   with_termcap=no
+ fi;
+-echo "$as_me:5671: result: $with_termcap" >&5
++echo "$as_me:5957: result: $with_termcap" >&5
+ echo "${ECHO_T}$with_termcap" >&6
+ 
+ if test "$with_termcap" != "yes" ; then
+ 	if test "$use_database" = no ; then
+ 		if test -z "$with_fallback" ; then
+-			{ { echo "$as_me:5677: error: You have disabled the database w/o specifying fallbacks" >&5
++			{ { echo "$as_me:5963: error: You have disabled the database w/o specifying fallbacks" >&5
+ echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
+    { (exit 1); exit 1; }; }
+ 		fi
+@@ -5686,7 +5972,7 @@
+ else
+ 
+ if test "$with_ticlib" != no ; then
+-	{ { echo "$as_me:5689: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++	{ { echo "$as_me:5975: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+ echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -5695,7 +5981,7 @@
+ #define USE_TERMCAP 1
+ EOF
+ 
+-echo "$as_me:5698: checking for list of termcap files" >&5
++echo "$as_me:5984: checking for list of termcap files" >&5
+ echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
+ 
+ # Check whether --with-termpath or --without-termpath was given.
+@@ -5735,7 +6021,7 @@
+   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
+   ;;
+ *)
+-  { { echo "$as_me:5738: error: expected a pathname, not \"$cf_src_path\"" >&5
++  { { echo "$as_me:6024: error: expected a pathname, not \"$cf_src_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+   ;;
+@@ -5748,14 +6034,14 @@
+ 
+ eval 'TERMPATH="$cf_dst_path"'
+ 
+-echo "$as_me:5751: result: $TERMPATH" >&5
++echo "$as_me:6037: result: $TERMPATH" >&5
+ echo "${ECHO_T}$TERMPATH" >&6
+ test -n "$TERMPATH" && cat >>confdefs.h <<EOF
+ #define TERMPATH "$TERMPATH"
+ EOF
+ 
+ ###	use option --enable-getcap to use a hacked getcap for reading termcaps
+-echo "$as_me:5758: checking if fast termcap-loader is needed" >&5
++echo "$as_me:6044: checking if fast termcap-loader is needed" >&5
+ echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
+ 
+ # Check whether --enable-getcap or --disable-getcap was given.
+@@ -5765,13 +6051,13 @@
+ else
+   with_getcap=no
+ fi;
+-echo "$as_me:5768: result: $with_getcap" >&5
++echo "$as_me:6054: result: $with_getcap" >&5
+ echo "${ECHO_T}$with_getcap" >&6
+ test "$with_getcap" = "yes" && cat >>confdefs.h <<\EOF
+ #define USE_GETCAP 1
+ EOF
+ 
+-echo "$as_me:5774: checking if translated termcaps will be cached in ~/.terminfo" >&5
++echo "$as_me:6060: checking if translated termcaps will be cached in ~/.terminfo" >&5
+ echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
+ 
+ # Check whether --enable-getcap-cache or --disable-getcap-cache was given.
+@@ -5781,7 +6067,7 @@
+ else
+   with_getcap_cache=no
+ fi;
+-echo "$as_me:5784: result: $with_getcap_cache" >&5
++echo "$as_me:6070: result: $with_getcap_cache" >&5
+ echo "${ECHO_T}$with_getcap_cache" >&6
+ test "$with_getcap_cache" = "yes" && cat >>confdefs.h <<\EOF
+ #define USE_GETCAP_CACHE 1
+@@ -5790,7 +6076,7 @@
+ fi
+ 
+ ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
+-echo "$as_me:5793: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:6079: checking if ~/.terminfo is wanted" >&5
+ echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
+ 
+ # Check whether --enable-home-terminfo or --disable-home-terminfo was given.
+@@ -5800,13 +6086,13 @@
+ else
+   with_home_terminfo=yes
+ fi;
+-echo "$as_me:5803: result: $with_home_terminfo" >&5
++echo "$as_me:6089: result: $with_home_terminfo" >&5
+ echo "${ECHO_T}$with_home_terminfo" >&6
+ test "$with_home_terminfo" = "yes" && cat >>confdefs.h <<\EOF
+ #define USE_HOME_TERMINFO 1
+ EOF
+ 
+-echo "$as_me:5809: checking if you want to use restricted environment when running as root" >&5
++echo "$as_me:6095: checking if you want to use restricted environment when running as root" >&5
+ echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
+ 
+ # Check whether --enable-root-environ or --disable-root-environ was given.
+@@ -5816,7 +6102,7 @@
+ else
+   with_root_environ=yes
+ fi;
+-echo "$as_me:5819: result: $with_root_environ" >&5
++echo "$as_me:6105: result: $with_root_environ" >&5
+ echo "${ECHO_T}$with_root_environ" >&6
+ test "$with_root_environ" = yes && cat >>confdefs.h <<\EOF
+ #define USE_ROOT_ENVIRON 1
+@@ -5830,13 +6116,13 @@
+ 	unlink
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:5833: checking for $ac_func" >&5
++echo "$as_me:6119: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5839 "configure"
++#line 6125 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -5867,16 +6153,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5870: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6156: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5873: \$? = $ac_status" >&5
++  echo "$as_me:6159: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5876: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6162: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5879: \$? = $ac_status" >&5
++  echo "$as_me:6165: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -5886,7 +6172,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:5889: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:6175: result: `eval echo '${'$as_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -5903,13 +6189,13 @@
+ 		symlink
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:5906: checking for $ac_func" >&5
++echo "$as_me:6192: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5912 "configure"
++#line 6198 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -5940,16 +6226,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5943: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6229: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5946: \$? = $ac_status" >&5
++  echo "$as_me:6232: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5949: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6235: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5952: \$? = $ac_status" >&5
++  echo "$as_me:6238: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -5959,7 +6245,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:5962: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:6248: result: `eval echo '${'$as_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -5970,7 +6256,7 @@
+ done
+ 
+ else
+-	echo "$as_me:5973: checking if link/symlink functions work" >&5
++	echo "$as_me:6259: checking if link/symlink functions work" >&5
+ echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
+ if test "${cf_cv_link_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5983,7 +6269,7 @@
+ 			eval 'ac_cv_func_'$cf_func'=error'
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5986 "configure"
++#line 6272 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -6013,15 +6299,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:6016: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6302: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6019: \$? = $ac_status" >&5
++  echo "$as_me:6305: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:6021: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6307: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6024: \$? = $ac_status" >&5
++  echo "$as_me:6310: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
+@@ -6039,7 +6325,7 @@
+ 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
+ 
+ fi
+-echo "$as_me:6042: result: $cf_cv_link_funcs" >&5
++echo "$as_me:6328: result: $cf_cv_link_funcs" >&5
+ echo "${ECHO_T}$cf_cv_link_funcs" >&6
+ 	test "$ac_cv_func_link"    = yes && cat >>confdefs.h <<\EOF
+ #define HAVE_LINK 1
+@@ -6057,7 +6343,7 @@
+ # soft links (symbolic links) are useful for some systems where hard links do
+ # not work, or to make it simpler to copy terminfo trees around.
+ if test "$ac_cv_func_symlink" = yes ; then
+-    echo "$as_me:6060: checking if tic should use symbolic links" >&5
++    echo "$as_me:6346: checking if tic should use symbolic links" >&5
+ echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
+ 
+ # Check whether --enable-symlinks or --disable-symlinks was given.
+@@ -6067,21 +6353,21 @@
+ else
+   with_symlinks=no
+ fi;
+-    echo "$as_me:6070: result: $with_symlinks" >&5
++    echo "$as_me:6356: result: $with_symlinks" >&5
+ echo "${ECHO_T}$with_symlinks" >&6
+ fi
+ 
+ # If we have hard links and did not choose to use soft links instead, there is
+ # no reason to make this choice optional - use the hard links.
+ if test "$with_symlinks" = no ; then
+-    echo "$as_me:6077: checking if tic should use hard links" >&5
++    echo "$as_me:6363: checking if tic should use hard links" >&5
+ echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
+     if test "$ac_cv_func_link" = yes ; then
+ 	with_links=yes
+     else
+ 	with_links=no
+     fi
+-    echo "$as_me:6084: result: $with_links" >&5
++    echo "$as_me:6370: result: $with_links" >&5
+ echo "${ECHO_T}$with_links" >&6
+ fi
+ 
+@@ -6094,7 +6380,7 @@
+ EOF
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+-echo "$as_me:6097: checking if you want broken-linker support code" >&5
++echo "$as_me:6383: checking if you want broken-linker support code" >&5
+ echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
+ 
+ # Check whether --enable-broken_linker or --disable-broken_linker was given.
+@@ -6104,7 +6390,7 @@
+ else
+   with_broken_linker=${BROKEN_LINKER-no}
+ fi;
+-echo "$as_me:6107: result: $with_broken_linker" >&5
++echo "$as_me:6393: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ BROKEN_LINKER=0
+@@ -6124,14 +6410,14 @@
+ 		BROKEN_LINKER=1
+ 		test -n "$verbose" && echo "	cygwin linker is broken anyway" 1>&6
+ 
+-echo "${as_me-configure}:6127: testing cygwin linker is broken anyway ..." 1>&5
++echo "${as_me-configure}:6413: testing cygwin linker is broken anyway ..." 1>&5
+ 
+ 		;;
+ 	esac
+ fi
+ 
+ ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
+-echo "$as_me:6134: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:6420: checking if tputs should process BSD-style prefix padding" >&5
+ echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
+ 
+ # Check whether --enable-bsdpad or --disable-bsdpad was given.
+@@ -6141,7 +6427,7 @@
+ else
+   with_bsdpad=no
+ fi;
+-echo "$as_me:6144: result: $with_bsdpad" >&5
++echo "$as_me:6430: result: $with_bsdpad" >&5
+ echo "${ECHO_T}$with_bsdpad" >&6
+ test "$with_bsdpad" = yes && cat >>confdefs.h <<\EOF
+ #define BSD_TPUTS 1
+@@ -6158,7 +6444,7 @@
+ 
+ # Check to define _XOPEN_SOURCE "automatically"
+ 
+-echo "$as_me:6161: checking if $CC -U and -D options work together" >&5
++echo "$as_me:6447: checking if $CC -U and -D options work together" >&5
+ echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6
+ if test "${cf_cv_cc_u_d_options+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6167,7 +6453,7 @@
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 6170 "configure"
++#line 6456 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -6186,16 +6472,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6189: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6475: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6192: \$? = $ac_status" >&5
++  echo "$as_me:6478: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6195: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6481: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6198: \$? = $ac_status" >&5
++  echo "$as_me:6484: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_cc_u_d_options=yes
+@@ -6209,14 +6495,14 @@
+ 	CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+ fi
+-echo "$as_me:6212: result: $cf_cv_cc_u_d_options" >&5
++echo "$as_me:6498: result: $cf_cv_cc_u_d_options" >&5
+ echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6
+ 
+ cf_XOPEN_SOURCE=500
+ cf_POSIX_C_SOURCE=199506L
+ 
+ case $host_os in #(vi
+-aix[45]*) #(vi
++aix[456]*) #(vi
+ 	CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE"
+ 	;;
+ freebsd*|dragonfly*) #(vi
+@@ -6233,16 +6519,16 @@
+ irix[56].*) #(vi
+ 	CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
+ 	;;
+-linux*|gnu*|k*bsd*-gnu) #(vi
++linux*|gnu*|mint*|k*bsd*-gnu) #(vi
+ 
+-echo "$as_me:6238: checking if we must define _GNU_SOURCE" >&5
++echo "$as_me:6524: checking if we must define _GNU_SOURCE" >&5
+ echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_gnu_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6245 "configure"
++#line 6531 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -6257,16 +6543,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6260: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6546: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6263: \$? = $ac_status" >&5
++  echo "$as_me:6549: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6266: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6552: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6269: \$? = $ac_status" >&5
++  echo "$as_me:6555: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -6275,7 +6561,7 @@
+ cf_save="$CPPFLAGS"
+ 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 6278 "configure"
++#line 6564 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -6290,16 +6576,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6293: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6579: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6296: \$? = $ac_status" >&5
++  echo "$as_me:6582: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6299: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6585: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6302: \$? = $ac_status" >&5
++  echo "$as_me:6588: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -6314,7 +6600,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:6317: result: $cf_cv_gnu_source" >&5
++echo "$as_me:6603: result: $cf_cv_gnu_source" >&5
+ echo "${ECHO_T}$cf_cv_gnu_source" >&6
+ test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+ 
+@@ -6341,14 +6627,14 @@
+ 	CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
+ 	;;
+ *)
+-	echo "$as_me:6344: checking if we should define _XOPEN_SOURCE" >&5
++	echo "$as_me:6630: checking if we should define _XOPEN_SOURCE" >&5
+ echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_xopen_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 6351 "configure"
++#line 6637 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -6363,16 +6649,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6366: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6652: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6369: \$? = $ac_status" >&5
++  echo "$as_me:6655: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6372: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6658: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6375: \$? = $ac_status" >&5
++  echo "$as_me:6661: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -6381,7 +6667,7 @@
+ cf_save="$CPPFLAGS"
+ 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 6384 "configure"
++#line 6670 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -6396,16 +6682,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6399: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6685: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6402: \$? = $ac_status" >&5
++  echo "$as_me:6688: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6405: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6691: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6408: \$? = $ac_status" >&5
++  echo "$as_me:6694: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -6420,7 +6706,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:6423: result: $cf_cv_xopen_source" >&5
++echo "$as_me:6709: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 	if test "$cf_cv_xopen_source" != no ; then
+ 
+@@ -6454,16 +6740,16 @@
+ 	sed	-e 's/-[UD]_POSIX_C_SOURCE\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]_POSIX_C_SOURCE\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:6457: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:6743: checking if we should define _POSIX_C_SOURCE" >&5
+ echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_posix_c_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-echo "${as_me-configure}:6463: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me-configure}:6749: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 6466 "configure"
++#line 6752 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -6478,16 +6764,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6481: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6767: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6484: \$? = $ac_status" >&5
++  echo "$as_me:6770: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6487: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6773: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6490: \$? = $ac_status" >&5
++  echo "$as_me:6776: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -6508,7 +6794,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 6511 "configure"
++#line 6797 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -6523,16 +6809,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6526: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6812: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6529: \$? = $ac_status" >&5
++  echo "$as_me:6815: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6532: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6818: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6535: \$? = $ac_status" >&5
++  echo "$as_me:6821: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -6543,15 +6829,15 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	 fi
+ 
+-echo "${as_me-configure}:6546: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me-configure}:6832: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
+ 
+-echo "${as_me-configure}:6551: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me-configure}:6837: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 6554 "configure"
++#line 6840 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -6566,16 +6852,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6569: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6855: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6572: \$? = $ac_status" >&5
++  echo "$as_me:6858: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6575: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6861: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6578: \$? = $ac_status" >&5
++  echo "$as_me:6864: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -6591,7 +6877,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:6594: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:6880: result: $cf_cv_posix_c_source" >&5
+ echo "${ECHO_T}$cf_cv_posix_c_source" >&6
+ 
+ if test "$cf_cv_posix_c_source" != no ; then
+@@ -6610,14 +6896,14 @@
+ 
+ # Work around breakage on OS X
+ 
+-echo "$as_me:6613: checking if SIGWINCH is defined" >&5
++echo "$as_me:6899: checking if SIGWINCH is defined" >&5
+ echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
+ if test "${cf_cv_define_sigwinch+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 6620 "configure"
++#line 6906 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -6632,23 +6918,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6635: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6921: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6638: \$? = $ac_status" >&5
++  echo "$as_me:6924: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6641: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6927: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6644: \$? = $ac_status" >&5
++  echo "$as_me:6930: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_define_sigwinch=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6651 "configure"
++#line 6937 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -6666,16 +6952,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6669: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6955: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6672: \$? = $ac_status" >&5
++  echo "$as_me:6958: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6675: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6961: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6678: \$? = $ac_status" >&5
++  echo "$as_me:6964: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -6689,11 +6975,11 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:6692: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:6978: result: $cf_cv_define_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
+ 
+ if test "$cf_cv_define_sigwinch" = maybe ; then
+-echo "$as_me:6696: checking for actual SIGWINCH definition" >&5
++echo "$as_me:6982: checking for actual SIGWINCH definition" >&5
+ echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
+ if test "${cf_cv_fixup_sigwinch+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6704,7 +6990,7 @@
+ while test $cf_sigwinch != 1
+ do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 6707 "configure"
++#line 6993 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -6726,16 +7012,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6729: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7015: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6732: \$? = $ac_status" >&5
++  echo "$as_me:7018: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6735: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7021: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6738: \$? = $ac_status" >&5
++  echo "$as_me:7024: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -6749,7 +7035,7 @@
+ done
+ 
+ fi
+-echo "$as_me:6752: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:7038: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -6759,13 +7045,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-  echo "$as_me:6762: checking for nl_langinfo and CODESET" >&5
++  echo "$as_me:7048: checking for nl_langinfo and CODESET" >&5
+ echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
+ if test "${am_cv_langinfo_codeset+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6768 "configure"
++#line 7054 "configure"
+ #include "confdefs.h"
+ #include <langinfo.h>
+ int
+@@ -6777,16 +7063,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6780: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7066: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6783: \$? = $ac_status" >&5
++  echo "$as_me:7069: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6786: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7072: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6789: \$? = $ac_status" >&5
++  echo "$as_me:7075: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -6797,7 +7083,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:6800: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:7086: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+   if test $am_cv_langinfo_codeset = yes; then
+ 
+@@ -6811,7 +7097,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+ 
+-echo "$as_me:6814: checking if you want wide-character code" >&5
++echo "$as_me:7100: checking if you want wide-character code" >&5
+ echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
+ 
+ # Check whether --enable-widec or --disable-widec was given.
+@@ -6821,7 +7107,7 @@
+ else
+   with_widec=no
+ fi;
+-echo "$as_me:6824: result: $with_widec" >&5
++echo "$as_me:7110: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+ if test "$with_widec" = yes ; then
+ 	LIB_SUFFIX="w${LIB_SUFFIX}"
+@@ -6829,10 +7115,10 @@
+ #define USE_WIDEC_SUPPORT 1
+ EOF
+ 
+-echo "$as_me:6832: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:7118: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+ echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6835 "configure"
++#line 7121 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ 
+@@ -6848,16 +7134,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6851: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7137: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6854: \$? = $ac_status" >&5
++  echo "$as_me:7140: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6857: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7143: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6860: \$? = $ac_status" >&5
++  echo "$as_me:7146: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=no
+ else
+@@ -6866,16 +7152,16 @@
+ cf_result=yes
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:6869: result: $cf_result" >&5
++echo "$as_me:7155: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test "$cf_result" = yes ; then
+ 	CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
+ elif test "x" != "x" ; then
+-	echo "$as_me:6875: checking checking for compatible value versus " >&5
++	echo "$as_me:7161: checking checking for compatible value versus " >&5
+ echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 6878 "configure"
++#line 7164 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ 
+@@ -6891,16 +7177,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6894: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7180: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6897: \$? = $ac_status" >&5
++  echo "$as_me:7183: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6900: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7186: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6903: \$? = $ac_status" >&5
++  echo "$as_me:7189: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -6909,7 +7195,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:6912: result: $cf_result" >&5
++	echo "$as_me:7198: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = no ; then
+ 		# perhaps we can override it - try...
+@@ -6923,13 +7209,13 @@
+ for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:6926: checking for $ac_func" >&5
++echo "$as_me:7212: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6932 "configure"
++#line 7218 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -6960,16 +7246,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6963: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7249: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6966: \$? = $ac_status" >&5
++  echo "$as_me:7252: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6969: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7255: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6972: \$? = $ac_status" >&5
++  echo "$as_me:7258: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -6979,7 +7265,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:6982: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:7268: result: `eval echo '${'$as_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -6991,7 +7277,7 @@
+ 
+ 	if test "$ac_cv_func_putwc" != yes ; then
+ 
+-echo "$as_me:6994: checking for multibyte character support" >&5
++echo "$as_me:7280: checking for multibyte character support" >&5
+ echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
+ if test "${cf_cv_utf8_lib+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6999,7 +7285,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 7002 "configure"
++#line 7288 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -7012,16 +7298,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7015: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7301: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7018: \$? = $ac_status" >&5
++  echo "$as_me:7304: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7021: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7307: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7024: \$? = $ac_status" >&5
++  echo "$as_me:7310: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -7033,10 +7319,10 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me-configure}:7036: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me-configure}:7322: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7039 "configure"
++#line 7325 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -7049,16 +7335,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7052: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7338: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7055: \$? = $ac_status" >&5
++  echo "$as_me:7341: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7058: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7344: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7061: \$? = $ac_status" >&5
++  echo "$as_me:7347: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_find_linkage_utf8=yes
+ else
+@@ -7067,12 +7353,41 @@
+ 
+     cf_cv_find_linkage_utf8=no
+ 
+-echo "${as_me-configure}:7070: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++    test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
++
++echo "${as_me-configure}:7358: testing find linkage for utf8 library ..." 1>&5
++
++echo "${as_me-configure}:7360: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+     cf_save_CPPFLAGS="$CPPFLAGS"
+     cf_test_CPPFLAGS="$CPPFLAGS"
+ 
+-    cf_search=""
++cf_header_path_list=""
++if test -n "${CFLAGS}${CPPFLAGS}" ; then
++	for cf_header_path in $CPPFLAGS $CFLAGS
++	do
++		case $cf_header_path in #(vi
++		-I*)
++			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
++
++test "$cf_header_path" != "NONE" && \
++test -d "$cf_header_path" && \
++ {
++	test -n "$verbose" && echo "	... testing for include-directories under $cf_header_path"
++	test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
++	test -d $cf_header_path/include/utf8 &&       cf_search="$cf_search $cf_header_path/include/utf8"
++	test -d $cf_header_path/include/utf8/include &&    cf_search="$cf_search $cf_header_path/include/utf8/include"
++	test -d $cf_header_path/utf8/include &&       cf_search="$cf_search $cf_header_path/utf8/include"
++	test -d $cf_header_path/utf8/include/utf8 &&    cf_search="$cf_search $cf_header_path/utf8/include/utf8"
++}
++
++			cf_header_path_list="$cf_header_path_list $cf_search"
++			;;
++		esac
++	done
++fi
++
++cf_search=""
+ 
+ test "/usr" != "$prefix" && \
+ test -d "/usr" && \
+@@ -7143,16 +7458,18 @@
+ 	test -d $oldincludedir/utf8 && cf_search="$cf_search $oldincludedir/utf8"
+ }
+ 
++cf_search="$cf_header_path_list $cf_search"
++
+     for cf_cv_header_path_utf8 in $cf_search
+     do
+       if test -d $cf_cv_header_path_utf8 ; then
+         test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
+ 
+-echo "${as_me-configure}:7151: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me-configure}:7468: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
+         cat >conftest.$ac_ext <<_ACEOF
+-#line 7155 "configure"
++#line 7472 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -7165,21 +7482,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7168: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7485: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7171: \$? = $ac_status" >&5
++  echo "$as_me:7488: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7174: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7491: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7177: \$? = $ac_status" >&5
++  echo "$as_me:7494: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+             test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
+ 
+-echo "${as_me-configure}:7182: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me-configure}:7499: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+             cf_cv_find_linkage_utf8=maybe
+             cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -7197,13 +7514,39 @@
+ 
+     if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me-configure}:7200: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me-configure}:7517: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+       cf_save_LIBS="$LIBS"
+       cf_save_LDFLAGS="$LDFLAGS"
+ 
+       if test "$cf_cv_find_linkage_utf8" != yes ; then
+-        cf_search=""
++
++cf_library_path_list=""
++if test -n "${LDFLAGS}${LIBS}" ; then
++	for cf_library_path in $LDFLAGS $LIBS
++	do
++		case $cf_library_path in #(vi
++		-L*)
++			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
++
++test "$cf_library_path" != "NONE" && \
++test -d "$cf_library_path" && \
++ {
++	test -n "$verbose" && echo "	... testing for lib-directories under $cf_library_path"
++	test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
++	test -d $cf_library_path/lib/utf8 &&       cf_search="$cf_search $cf_library_path/lib/utf8"
++	test -d $cf_library_path/lib/utf8/lib &&    cf_search="$cf_search $cf_library_path/lib/utf8/lib"
++	test -d $cf_library_path/utf8/lib &&       cf_search="$cf_search $cf_library_path/utf8/lib"
++	test -d $cf_library_path/utf8/lib/utf8 &&    cf_search="$cf_search $cf_library_path/utf8/lib/utf8"
++}
++
++			cf_library_path_list="$cf_library_path_list $cf_search"
++			;;
++		esac
++	done
++fi
++
++cf_search=""
+ 
+ test "/usr" != "$prefix" && \
+ test -d "/usr" && \
+@@ -7260,18 +7603,20 @@
+ 	test -d $HOME/utf8/lib/utf8 &&    cf_search="$cf_search $HOME/utf8/lib/utf8"
+ }
+ 
++cf_search="$cf_library_path_list $cf_search"
++
+         for cf_cv_library_path_utf8 in $cf_search
+         do
+           if test -d $cf_cv_library_path_utf8 ; then
+             test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
+ 
+-echo "${as_me-configure}:7268: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me-configure}:7613: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+ 
+             CPPFLAGS="$cf_test_CPPFLAGS"
+             LIBS="-lutf8  $cf_save_LIBS"
+             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
+             cat >conftest.$ac_ext <<_ACEOF
+-#line 7274 "configure"
++#line 7619 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -7284,21 +7629,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7287: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7632: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7290: \$? = $ac_status" >&5
++  echo "$as_me:7635: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7293: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7638: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7296: \$? = $ac_status" >&5
++  echo "$as_me:7641: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+                 test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
+ 
+-echo "${as_me-configure}:7301: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me-configure}:7646: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+                 cf_cv_find_linkage_utf8=yes
+                 cf_cv_library_file_utf8="-lutf8"
+@@ -7336,7 +7681,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:7339: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:7684: result: $cf_cv_utf8_lib" >&5
+ echo "${ECHO_T}$cf_cv_utf8_lib" >&6
+ 
+ # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
+@@ -7364,13 +7709,13 @@
+ 		fi
+ 
+ 		if test "$cf_have_incdir" = no ; then
+-          if test "$cf_add_incdir" = /usr/local/include ; then
++		  if test "$cf_add_incdir" = /usr/local/include ; then
+ 			if test "$GCC" = yes
+ 			then
+ 			  cf_save_CPPFLAGS=$CPPFLAGS
+ 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 7373 "configure"
++#line 7718 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -7382,16 +7727,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7385: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7730: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7388: \$? = $ac_status" >&5
++  echo "$as_me:7733: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7391: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7736: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7394: \$? = $ac_status" >&5
++  echo "$as_me:7739: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -7408,13 +7753,13 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me-configure}:7411: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me-configure}:7756: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
+ 
+-          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+-          test "$cf_top_incdir" = "$cf_add_incdir" && break
+-          cf_add_incdir="$cf_top_incdir"
++		  cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
++		  test "$cf_top_incdir" = "$cf_add_incdir" && break
++		  cf_add_incdir="$cf_top_incdir"
+ 		else
+ 		  break
+ 		fi
+@@ -7442,7 +7787,7 @@
+       if test "$cf_have_libdir" = no ; then
+         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me-configure}:7445: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me-configure}:7790: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+       fi
+@@ -7459,14 +7804,14 @@
+ 	fi
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:7462: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:7807: checking if we must include wchar.h to declare mbstate_t" >&5
+ echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
+ if test "${cf_cv_mbstate_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7469 "configure"
++#line 7814 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -7484,23 +7829,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7487: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7832: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7490: \$? = $ac_status" >&5
++  echo "$as_me:7835: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7493: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7838: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7496: \$? = $ac_status" >&5
++  echo "$as_me:7841: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_mbstate_t=no
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7503 "configure"
++#line 7848 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -7519,16 +7864,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7522: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7867: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7525: \$? = $ac_status" >&5
++  echo "$as_me:7870: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7528: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7873: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7531: \$? = $ac_status" >&5
++  echo "$as_me:7876: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -7540,7 +7885,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:7543: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:7888: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -7557,14 +7902,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:7560: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:7905: checking if we must include wchar.h to declare wchar_t" >&5
+ echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
+ if test "${cf_cv_wchar_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7567 "configure"
++#line 7912 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -7582,23 +7927,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7585: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7930: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7588: \$? = $ac_status" >&5
++  echo "$as_me:7933: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7591: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7936: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7594: \$? = $ac_status" >&5
++  echo "$as_me:7939: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wchar_t=no
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7601 "configure"
++#line 7946 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -7617,16 +7962,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7620: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7965: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7623: \$? = $ac_status" >&5
++  echo "$as_me:7968: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7626: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7971: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7629: \$? = $ac_status" >&5
++  echo "$as_me:7974: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -7638,7 +7983,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:7641: result: $cf_cv_wchar_t" >&5
++echo "$as_me:7986: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -7660,14 +8005,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:7663: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:8008: checking if we must include wchar.h to declare wint_t" >&5
+ echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
+ if test "${cf_cv_wint_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7670 "configure"
++#line 8015 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -7685,23 +8030,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7688: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8033: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7691: \$? = $ac_status" >&5
++  echo "$as_me:8036: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7694: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8039: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7697: \$? = $ac_status" >&5
++  echo "$as_me:8042: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wint_t=no
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7704 "configure"
++#line 8049 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -7720,16 +8065,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7723: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8068: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7726: \$? = $ac_status" >&5
++  echo "$as_me:8071: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7729: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8074: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7732: \$? = $ac_status" >&5
++  echo "$as_me:8077: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -7741,7 +8086,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:7744: result: $cf_cv_wint_t" >&5
++echo "$as_me:8089: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -7780,7 +8125,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:7783: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:8128: checking whether to enable _LP64 definition in curses.h" >&5
+ echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
+ 
+ # Check whether --enable-lp64 or --disable-lp64 was given.
+@@ -7790,7 +8135,7 @@
+ else
+   with_lp64=$default_with_lp64
+ fi;
+-echo "$as_me:7793: result: $with_lp64" >&5
++echo "$as_me:8138: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+ 
+ if test "$with_lp64" = yes ; then
+@@ -7806,7 +8151,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:7809: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:8154: checking for special C compiler options needed for large files" >&5
+ echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
+ if test "${ac_cv_sys_largefile_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7818,7 +8163,7 @@
+      	 # IRIX 6.2 and later do not support large files by default,
+      	 # so use the C compiler's -n32 option if that helps.
+          cat >conftest.$ac_ext <<_ACEOF
+-#line 7821 "configure"
++#line 8166 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -7838,16 +8183,16 @@
+ }
+ _ACEOF
+      	 rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7841: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8186: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7844: \$? = $ac_status" >&5
++  echo "$as_me:8189: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7847: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8192: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7850: \$? = $ac_status" >&5
++  echo "$as_me:8195: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -7857,16 +8202,16 @@
+ rm -f conftest.$ac_objext
+      	 CC="$CC -n32"
+      	 rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7860: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8205: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7863: \$? = $ac_status" >&5
++  echo "$as_me:8208: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7866: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8211: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7869: \$? = $ac_status" >&5
++  echo "$as_me:8214: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -7880,13 +8225,13 @@
+        rm -f conftest.$ac_ext
+     fi
+ fi
+-echo "$as_me:7883: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:8228: result: $ac_cv_sys_largefile_CC" >&5
+ echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
+   if test "$ac_cv_sys_largefile_CC" != no; then
+     CC=$CC$ac_cv_sys_largefile_CC
+   fi
+ 
+-  echo "$as_me:7889: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:8234: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+ echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
+ if test "${ac_cv_sys_file_offset_bits+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7894,7 +8239,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7897 "configure"
++#line 8242 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -7914,16 +8259,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7917: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8262: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7920: \$? = $ac_status" >&5
++  echo "$as_me:8265: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7923: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8268: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7926: \$? = $ac_status" >&5
++  echo "$as_me:8271: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -7932,7 +8277,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7935 "configure"
++#line 8280 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include <sys/types.h>
+@@ -7953,16 +8298,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7956: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8301: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7959: \$? = $ac_status" >&5
++  echo "$as_me:8304: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7962: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8307: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7965: \$? = $ac_status" >&5
++  echo "$as_me:8310: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -7973,7 +8318,7 @@
+   break
+ done
+ fi
+-echo "$as_me:7976: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:8321: result: $ac_cv_sys_file_offset_bits" >&5
+ echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
+ if test "$ac_cv_sys_file_offset_bits" != no; then
+ 
+@@ -7983,7 +8328,7 @@
+ 
+ fi
+ rm -f conftest*
+-  echo "$as_me:7986: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:8331: checking for _LARGE_FILES value needed for large files" >&5
+ echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
+ if test "${ac_cv_sys_large_files+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7991,7 +8336,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7994 "configure"
++#line 8339 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -8011,16 +8356,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8014: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8359: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8017: \$? = $ac_status" >&5
++  echo "$as_me:8362: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8020: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8365: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8023: \$? = $ac_status" >&5
++  echo "$as_me:8368: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -8029,7 +8374,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8032 "configure"
++#line 8377 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include <sys/types.h>
+@@ -8050,16 +8395,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8053: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8398: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8056: \$? = $ac_status" >&5
++  echo "$as_me:8401: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8059: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8404: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8062: \$? = $ac_status" >&5
++  echo "$as_me:8407: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -8070,7 +8415,7 @@
+   break
+ done
+ fi
+-echo "$as_me:8073: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:8418: result: $ac_cv_sys_large_files" >&5
+ echo "${ECHO_T}$ac_cv_sys_large_files" >&6
+ if test "$ac_cv_sys_large_files" != no; then
+ 
+@@ -8083,7 +8428,7 @@
+ fi
+ 
+     if test "$enable_largefile" != no ; then
+-	echo "$as_me:8086: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:8431: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+ echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
+ if test "${ac_cv_sys_largefile_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8091,7 +8436,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8094 "configure"
++#line 8439 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8103,16 +8448,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8106: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8451: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8109: \$? = $ac_status" >&5
++  echo "$as_me:8454: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8112: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8457: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8115: \$? = $ac_status" >&5
++  echo "$as_me:8460: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -8121,7 +8466,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8124 "configure"
++#line 8469 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include <stdio.h>
+@@ -8134,16 +8479,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8137: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8482: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8140: \$? = $ac_status" >&5
++  echo "$as_me:8485: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8143: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8488: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8146: \$? = $ac_status" >&5
++  echo "$as_me:8491: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -8154,7 +8499,7 @@
+   break
+ done
+ fi
+-echo "$as_me:8157: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:8502: result: $ac_cv_sys_largefile_source" >&5
+ echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
+ if test "$ac_cv_sys_largefile_source" != no; then
+ 
+@@ -8168,13 +8513,13 @@
+ # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
+ # in glibc 2.1.3, but that breaks too many other things.
+ # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
+-echo "$as_me:8171: checking for fseeko" >&5
++echo "$as_me:8516: checking for fseeko" >&5
+ echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
+ if test "${ac_cv_func_fseeko+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8177 "configure"
++#line 8522 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8186,16 +8531,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8189: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8534: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8192: \$? = $ac_status" >&5
++  echo "$as_me:8537: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:8195: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8540: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8198: \$? = $ac_status" >&5
++  echo "$as_me:8543: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -8205,7 +8550,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:8208: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:8553: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -8226,14 +8571,14 @@
+ 	test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
+ 	test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
+ 
+-	echo "$as_me:8229: checking whether to use struct dirent64" >&5
++	echo "$as_me:8574: checking whether to use struct dirent64" >&5
+ echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
+ if test "${cf_cv_struct_dirent64+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 8236 "configure"
++#line 8581 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -8254,16 +8599,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8257: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8602: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8260: \$? = $ac_status" >&5
++  echo "$as_me:8605: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8263: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8608: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8266: \$? = $ac_status" >&5
++  echo "$as_me:8611: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -8274,7 +8619,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:8277: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:8622: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF
+ #define HAVE_STRUCT_DIRENT64 1
+@@ -8283,7 +8628,7 @@
+     fi
+ 
+ ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:8286: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:8631: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+ echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6
+ 
+ # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given.
+@@ -8293,14 +8638,14 @@
+ else
+   with_tparm_varargs=yes
+ fi;
+-echo "$as_me:8296: result: $with_tparm_varargs" >&5
++echo "$as_me:8641: result: $with_tparm_varargs" >&5
+ echo "${ECHO_T}$with_tparm_varargs" >&6
+ NCURSES_TPARM_VARARGS=0
+ test "$with_tparm_varargs" = yes && NCURSES_TPARM_VARARGS=1
+ 
+ ###   use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw
+ if test "$with_ticlib" != no ; then
+-echo "$as_me:8303: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:8648: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+ echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6
+ 
+ # Check whether --enable-tic-depends or --disable-tic-depends was given.
+@@ -8310,14 +8655,14 @@
+ else
+   with_tic_depends=yes
+ fi;
+-echo "$as_me:8313: result: $with_tic_depends" >&5
++echo "$as_me:8658: result: $with_tic_depends" >&5
+ echo "${ECHO_T}$with_tic_depends" >&6
+ else
+ 	with_tic_depends=no
+ fi
+ 
+ ###   use option --with-bool to override bool's type
+-echo "$as_me:8320: checking for type of bool" >&5
++echo "$as_me:8665: checking for type of bool" >&5
+ echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
+ 
+ # Check whether --with-bool or --without-bool was given.
+@@ -8327,10 +8672,10 @@
+ else
+   NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:8330: result: $NCURSES_BOOL" >&5
++echo "$as_me:8675: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+ 
+-echo "$as_me:8333: checking for alternate terminal capabilities file" >&5
++echo "$as_me:8678: checking for alternate terminal capabilities file" >&5
+ echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
+ 
+ # Check whether --with-caps or --without-caps was given.
+@@ -8341,11 +8686,11 @@
+   TERMINFO_CAPS=Caps
+ fi;
+ test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
+-echo "$as_me:8344: result: $TERMINFO_CAPS" >&5
++echo "$as_me:8689: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+ 
+ ###   use option --with-chtype to override chtype's type
+-echo "$as_me:8348: checking for type of chtype" >&5
++echo "$as_me:8693: checking for type of chtype" >&5
+ echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
+ 
+ # Check whether --with-chtype or --without-chtype was given.
+@@ -8355,11 +8700,11 @@
+ else
+   NCURSES_CHTYPE=auto
+ fi;
+-echo "$as_me:8358: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:8703: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+ 
+ ###   use option --with-ospeed to override ospeed's type
+-echo "$as_me:8362: checking for type of ospeed" >&5
++echo "$as_me:8707: checking for type of ospeed" >&5
+ echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
+ 
+ # Check whether --with-ospeed or --without-ospeed was given.
+@@ -8369,11 +8714,11 @@
+ else
+   NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:8372: result: $NCURSES_OSPEED" >&5
++echo "$as_me:8717: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+ 
+ ###   use option --with-mmask-t to override mmask_t's type
+-echo "$as_me:8376: checking for type of mmask_t" >&5
++echo "$as_me:8721: checking for type of mmask_t" >&5
+ echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
+ 
+ # Check whether --with-mmask-t or --without-mmask-t was given.
+@@ -8383,11 +8728,11 @@
+ else
+   NCURSES_MMASK_T=auto
+ fi;
+-echo "$as_me:8386: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:8731: result: $NCURSES_MMASK_T" >&5
+ echo "${ECHO_T}$NCURSES_MMASK_T" >&6
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:8390: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:8735: checking if RCS identifiers should be compiled-in" >&5
+ echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
+ 
+ # Check whether --with-rcs-ids or --without-rcs-ids was given.
+@@ -8397,7 +8742,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:8400: result: $with_rcs_ids" >&5
++echo "$as_me:8745: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF
+ #define USE_RCS_IDS 1
+@@ -8405,7 +8750,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:8408: checking format of man-pages" >&5
++echo "$as_me:8753: checking format of man-pages" >&5
+ echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
+ 
+ # Check whether --with-manpage-format or --without-manpage-format was given.
+@@ -8494,14 +8839,14 @@
+   ;;
+ esac
+ 
+-echo "$as_me:8497: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:8842: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+-  { echo "$as_me:8500: WARNING: Unexpected manpage-format $cf_unknown" >&5
++  { echo "$as_me:8845: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+ 
+-echo "$as_me:8504: checking for manpage renaming" >&5
++echo "$as_me:8849: checking for manpage renaming" >&5
+ echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
+ 
+ # Check whether --with-manpage-renames or --without-manpage-renames was given.
+@@ -8529,7 +8874,7 @@
+   if test -f $srcdir/man/$MANPAGE_RENAMES ; then
+     MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
+   elif test ! -f $MANPAGE_RENAMES ; then
+-    { { echo "$as_me:8532: error: not a filename: $MANPAGE_RENAMES" >&5
++    { { echo "$as_me:8877: error: not a filename: $MANPAGE_RENAMES" >&5
+ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
+    { (exit 1); exit 1; }; }
+   fi
+@@ -8543,10 +8888,10 @@
+   fi
+ fi
+ 
+-echo "$as_me:8546: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:8891: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+ 
+-echo "$as_me:8549: checking if manpage aliases will be installed" >&5
++echo "$as_me:8894: checking if manpage aliases will be installed" >&5
+ echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
+ 
+ # Check whether --with-manpage-aliases or --without-manpage-aliases was given.
+@@ -8557,7 +8902,7 @@
+   MANPAGE_ALIASES=yes
+ fi;
+ 
+-echo "$as_me:8560: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:8905: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+ 
+ if test "$LN_S" = "ln -s"; then
+@@ -8568,7 +8913,7 @@
+ 
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:8571: checking if manpage symlinks should be used" >&5
++echo "$as_me:8916: checking if manpage symlinks should be used" >&5
+ echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
+ 
+ # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
+@@ -8581,17 +8926,17 @@
+ 
+ if test "$$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+-	{ echo "$as_me:8584: WARNING: cannot make symlinks" >&5
++	{ echo "$as_me:8929: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ 	MANPAGE_SYMLINKS=no
+ fi
+ fi
+ 
+-echo "$as_me:8590: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:8935: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+ 
+-echo "$as_me:8594: checking for manpage tbl" >&5
++echo "$as_me:8939: checking for manpage tbl" >&5
+ echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
+ 
+ # Check whether --with-manpage-tbl or --without-manpage-tbl was given.
+@@ -8602,7 +8947,7 @@
+   MANPAGE_TBL=no
+ fi;
+ 
+-echo "$as_me:8605: result: $MANPAGE_TBL" >&5
++echo "$as_me:8950: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+ 
+   if test "$prefix" = "NONE" ; then
+@@ -8718,7 +9063,7 @@
+ 		s,@NCURSES_OSPEED@,\$NCURSES_OSPEED,g
+ CF_EOF
+ 
+-	for cf_name in  captoinfo clear infocmp infotocap tic toe tput
++	for cf_name in  captoinfo clear infocmp infotocap tabs tic toe tput tset
+ 	do
+ 		cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ 		cf_name=`echo $cf_name|sed "$program_transform_name"`
+@@ -8913,7 +9258,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:8916: checking if you want to build with function extensions" >&5
++echo "$as_me:9261: checking if you want to build with function extensions" >&5
+ echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
+ 
+ # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
+@@ -8923,7 +9268,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:8926: result: $with_ext_funcs" >&5
++echo "$as_me:9271: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "$with_ext_funcs" = yes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -8955,12 +9300,14 @@
+ #define NCURSES_EXT_FUNCS 1
+ EOF
+ 
++	GENERATED_EXT_FUNCS=generated
+ else
+ 	NCURSES_EXT_FUNCS=0
++	GENERATED_EXT_FUNCS=
+ fi
+ 
+ ###   use option --enable-const to turn on use of const beyond that in XSI.
+-echo "$as_me:8963: checking for extended use of const keyword" >&5
++echo "$as_me:9310: checking for extended use of const keyword" >&5
+ echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
+ 
+ # Check whether --enable-const or --disable-const was given.
+@@ -8970,7 +9317,7 @@
+ else
+   with_ext_const=no
+ fi;
+-echo "$as_me:8973: result: $with_ext_const" >&5
++echo "$as_me:9320: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "$with_ext_const" = yes ; then
+@@ -8978,7 +9325,7 @@
+ fi
+ 
+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:8981: checking if you want to use extended colors" >&5
++echo "$as_me:9328: checking if you want to use extended colors" >&5
+ echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6
+ 
+ # Check whether --enable-ext-colors or --disable-ext-colors was given.
+@@ -8988,12 +9335,12 @@
+ else
+   with_ext_colors=no
+ fi;
+-echo "$as_me:8991: result: $with_ext_colors" >&5
++echo "$as_me:9338: result: $with_ext_colors" >&5
+ echo "${ECHO_T}$with_ext_colors" >&6
+ NCURSES_EXT_COLORS=0
+ if test "$with_ext_colors" = yes ; then
+ 	if test "$with_widec" != yes ; then
+-		{ { echo "$as_me:8996: error: This option applies only to wide-character library" >&5
++		{ { echo "$as_me:9343: error: This option applies only to wide-character library" >&5
+ echo "$as_me: error: This option applies only to wide-character library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	else
+@@ -9004,7 +9351,7 @@
+ 	5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:9007: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:9354: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -9019,7 +9366,7 @@
+ fi
+ 
+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:9022: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:9369: checking if you want to use extended mouse encoding" >&5
+ echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6
+ 
+ # Check whether --enable-ext-mouse or --disable-ext-mouse was given.
+@@ -9029,7 +9376,7 @@
+ else
+   with_ext_mouse=no
+ fi;
+-echo "$as_me:9032: result: $with_ext_mouse" >&5
++echo "$as_me:9379: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ NCURSES_MOUSE_VERSION=1
+ if test "$with_ext_mouse" = yes ; then
+@@ -9040,7 +9387,7 @@
+ 	5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:9043: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:9390: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -9048,7 +9395,7 @@
+ 
+ fi
+ 
+-echo "$as_me:9051: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:9398: checking if you want \$NCURSES_NO_PADDING code" >&5
+ echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
+ 
+ # Check whether --enable-no-padding or --disable-no-padding was given.
+@@ -9058,19 +9405,19 @@
+ else
+   with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:9061: result: $with_no_padding" >&5
++echo "$as_me:9408: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "$with_no_padding" = yes && cat >>confdefs.h <<\EOF
+ #define NCURSES_NO_PADDING 1
+ EOF
+ 
+-echo "$as_me:9067: checking for ANSI C header files" >&5
++echo "$as_me:9414: checking for ANSI C header files" >&5
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9073 "configure"
++#line 9420 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -9078,13 +9425,13 @@
+ #include <float.h>
+ 
+ _ACEOF
+-if { (eval echo "$as_me:9081: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:9428: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:9087: \$? = $ac_status" >&5
++  echo "$as_me:9434: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -9106,7 +9453,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9109 "configure"
++#line 9456 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ 
+@@ -9124,7 +9471,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9127 "configure"
++#line 9474 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ 
+@@ -9145,7 +9492,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9148 "configure"
++#line 9495 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -9171,15 +9518,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:9174: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9521: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9177: \$? = $ac_status" >&5
++  echo "$as_me:9524: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:9179: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9526: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9182: \$? = $ac_status" >&5
++  echo "$as_me:9529: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -9192,7 +9539,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:9195: result: $ac_cv_header_stdc" >&5
++echo "$as_me:9542: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -9208,28 +9555,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:9211: checking for $ac_header" >&5
++echo "$as_me:9558: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9217 "configure"
++#line 9564 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9223: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9570: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9226: \$? = $ac_status" >&5
++  echo "$as_me:9573: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9229: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9576: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9232: \$? = $ac_status" >&5
++  echo "$as_me:9579: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -9239,7 +9586,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:9242: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:9589: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -9249,13 +9596,13 @@
+ fi
+ done
+ 
+-echo "$as_me:9252: checking for signed char" >&5
++echo "$as_me:9599: checking for signed char" >&5
+ echo $ECHO_N "checking for signed char... $ECHO_C" >&6
+ if test "${ac_cv_type_signed_char+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9258 "configure"
++#line 9605 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -9270,16 +9617,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9273: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9620: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9276: \$? = $ac_status" >&5
++  echo "$as_me:9623: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9279: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9626: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9282: \$? = $ac_status" >&5
++  echo "$as_me:9629: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -9289,10 +9636,10 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:9292: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:9639: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:9295: checking size of signed char" >&5
++echo "$as_me:9642: checking size of signed char" >&5
+ echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_signed_char+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9301,7 +9648,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9304 "configure"
++#line 9651 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -9313,21 +9660,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9316: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9663: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9319: \$? = $ac_status" >&5
++  echo "$as_me:9666: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9322: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9669: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9325: \$? = $ac_status" >&5
++  echo "$as_me:9672: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 9330 "configure"
++#line 9677 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -9339,16 +9686,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9342: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9689: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9345: \$? = $ac_status" >&5
++  echo "$as_me:9692: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9348: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9695: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9351: \$? = $ac_status" >&5
++  echo "$as_me:9698: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -9364,7 +9711,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 9367 "configure"
++#line 9714 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -9376,16 +9723,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9379: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9726: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9382: \$? = $ac_status" >&5
++  echo "$as_me:9729: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9385: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9732: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9388: \$? = $ac_status" >&5
++  echo "$as_me:9735: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -9401,7 +9748,7 @@
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9404 "configure"
++#line 9751 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -9413,16 +9760,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9416: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9763: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9419: \$? = $ac_status" >&5
++  echo "$as_me:9766: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9422: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9769: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9425: \$? = $ac_status" >&5
++  echo "$as_me:9772: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -9435,12 +9782,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:9438: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:9785: error: cannot run test program while cross compiling" >&5
+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9443 "configure"
++#line 9790 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -9456,15 +9803,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:9459: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9806: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9462: \$? = $ac_status" >&5
++  echo "$as_me:9809: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:9464: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9811: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9467: \$? = $ac_status" >&5
++  echo "$as_me:9814: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -9480,7 +9827,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:9483: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:9830: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <<EOF
+ #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
+@@ -9491,7 +9838,7 @@
+ else
+ 	NCURSES_SBOOL="char"
+ fi
+-echo "$as_me:9494: checking if you want to use signed Boolean array in term.h" >&5
++echo "$as_me:9841: checking if you want to use signed Boolean array in term.h" >&5
+ echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
+ 
+ # Check whether --enable-signed-char or --disable-signed-char was given.
+@@ -9501,12 +9848,12 @@
+ else
+   with_signed_char=no
+ fi;
+-echo "$as_me:9504: result: $with_signed_char" >&5
++echo "$as_me:9851: result: $with_signed_char" >&5
+ echo "${ECHO_T}$with_signed_char" >&6
+ test "$with_signed_char" != yes && NCURSES_SBOOL="char"
+ 
+ ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:9509: checking if you want SIGWINCH handler" >&5
++echo "$as_me:9856: checking if you want SIGWINCH handler" >&5
+ echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
+ 
+ # Check whether --enable-sigwinch or --disable-sigwinch was given.
+@@ -9516,14 +9863,14 @@
+ else
+   with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:9519: result: $with_sigwinch" >&5
++echo "$as_me:9866: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ test "$with_sigwinch" = yes && cat >>confdefs.h <<\EOF
+ #define USE_SIGWINCH 1
+ EOF
+ 
+ ###   use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:9526: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:9873: checking if you want user-definable terminal capabilities like termcap" >&5
+ echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
+ 
+ # Check whether --enable-tcap-names or --disable-tcap-names was given.
+@@ -9533,7 +9880,7 @@
+ else
+   with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:9536: result: $with_tcap_names" >&5
++echo "$as_me:9883: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ test "$with_tcap_names" = yes && NCURSES_XNAMES=1
+@@ -9541,7 +9888,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:9544: checking if you want all development code" >&5
++echo "$as_me:9891: checking if you want all development code" >&5
+ echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
+ 
+ # Check whether --with-develop or --without-develop was given.
+@@ -9551,11 +9898,11 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:9554: result: $with_develop" >&5
++echo "$as_me:9901: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
+-echo "$as_me:9558: checking if you want hard-tabs code" >&5
++echo "$as_me:9905: checking if you want hard-tabs code" >&5
+ echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
+ 
+ # Check whether --enable-hard-tabs or --disable-hard-tabs was given.
+@@ -9565,14 +9912,14 @@
+ else
+   enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:9568: result: $enable_hard_tabs" >&5
++echo "$as_me:9915: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "$enable_hard_tabs" = yes && cat >>confdefs.h <<\EOF
+ #define USE_HARD_TABS 1
+ EOF
+ 
+ ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:9575: checking if you want limited support for xmc" >&5
++echo "$as_me:9922: checking if you want limited support for xmc" >&5
+ echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
+ 
+ # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
+@@ -9582,7 +9929,7 @@
+ else
+   enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:9585: result: $enable_xmc_glitch" >&5
++echo "$as_me:9932: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "$enable_xmc_glitch" = yes && cat >>confdefs.h <<\EOF
+ #define USE_XMC_SUPPORT 1
+@@ -9591,7 +9938,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+ 
+-echo "$as_me:9594: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:9941: checking if you do not want to assume colors are white-on-black" >&5
+ echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
+ 
+ # Check whether --enable-assumed-color or --disable-assumed-color was given.
+@@ -9601,14 +9948,14 @@
+ else
+   with_assumed_color=yes
+ fi;
+-echo "$as_me:9604: result: $with_assumed_color" >&5
++echo "$as_me:9951: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "$with_assumed_color" = yes && cat >>confdefs.h <<\EOF
+ #define USE_ASSUMED_COLOR 1
+ EOF
+ 
+ ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:9611: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:9958: checking if you want hashmap scrolling-optimization code" >&5
+ echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
+ 
+ # Check whether --enable-hashmap or --disable-hashmap was given.
+@@ -9618,14 +9965,14 @@
+ else
+   with_hashmap=yes
+ fi;
+-echo "$as_me:9621: result: $with_hashmap" >&5
++echo "$as_me:9968: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "$with_hashmap" = yes && cat >>confdefs.h <<\EOF
+ #define USE_HASHMAP 1
+ EOF
+ 
+ ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:9628: checking if you want colorfgbg code" >&5
++echo "$as_me:9975: checking if you want colorfgbg code" >&5
+ echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
+ 
+ # Check whether --enable-colorfgbg or --disable-colorfgbg was given.
+@@ -9635,7 +9982,7 @@
+ else
+   with_colorfgbg=no
+ fi;
+-echo "$as_me:9638: result: $with_colorfgbg" >&5
++echo "$as_me:9985: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "$with_colorfgbg" = yes && cat >>confdefs.h <<\EOF
+ #define USE_COLORFGBG 1
+@@ -9644,7 +9991,7 @@
+ # This is still experimental (20080329), but should ultimately be moved to
+ # the script-block --with-normal, etc.
+ 
+-echo "$as_me:9647: checking if you want to link with the pthread library" >&5
++echo "$as_me:9994: checking if you want to link with the pthread library" >&5
+ echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
+ 
+ # Check whether --with-pthread or --without-pthread was given.
+@@ -9654,27 +10001,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:9657: result: $with_pthread" >&5
++echo "$as_me:10004: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-    echo "$as_me:9661: checking for pthread.h" >&5
++    echo "$as_me:10008: checking for pthread.h" >&5
+ echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
+ if test "${ac_cv_header_pthread_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9667 "configure"
++#line 10014 "configure"
+ #include "confdefs.h"
+ #include <pthread.h>
+ _ACEOF
+-if { (eval echo "$as_me:9671: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:10018: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:9677: \$? = $ac_status" >&5
++  echo "$as_me:10024: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -9693,7 +10040,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:9696: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:10043: result: $ac_cv_header_pthread_h" >&5
+ echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
+ if test $ac_cv_header_pthread_h = yes; then
+ 
+@@ -9701,12 +10048,12 @@
+ #define HAVE_PTHREADS_H 1
+ EOF
+ 
+-        echo "$as_me:9704: checking if we can link with the pthread library" >&5
++        echo "$as_me:10051: checking if we can link with the pthread library" >&5
+ echo $ECHO_N "checking if we can link with the pthread library... $ECHO_C" >&6
+         cf_save_LIBS="$LIBS"
+         LIBS="-lpthread $LIBS"
+         cat >conftest.$ac_ext <<_ACEOF
+-#line 9709 "configure"
++#line 10056 "configure"
+ #include "confdefs.h"
+ 
+ #include <pthread.h>
+@@ -9722,16 +10069,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9725: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10072: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9728: \$? = $ac_status" >&5
++  echo "$as_me:10075: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9731: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10078: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9734: \$? = $ac_status" >&5
++  echo "$as_me:10081: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   with_pthread=yes
+ else
+@@ -9741,7 +10088,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+         LIBS="$cf_save_LIBS"
+-        echo "$as_me:9744: result: $with_pthread" >&5
++        echo "$as_me:10091: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+         if test "$with_pthread" = yes ; then
+@@ -9751,7 +10098,7 @@
+ EOF
+ 
+         else
+-            { { echo "$as_me:9754: error: Cannot link with pthread library" >&5
++            { { echo "$as_me:10101: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+         fi
+@@ -9760,7 +10107,7 @@
+ 
+ fi
+ 
+-echo "$as_me:9763: checking if you want to use weak-symbols for pthreads" >&5
++echo "$as_me:10110: checking if you want to use weak-symbols for pthreads" >&5
+ echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
+ 
+ # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
+@@ -9770,18 +10117,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-echo "$as_me:9773: result: $use_weak_symbols" >&5
++echo "$as_me:10120: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ if test "$use_weak_symbols" = yes ; then
+ 
+-echo "$as_me:9777: checking if $CC supports weak symbols" >&5
++echo "$as_me:10124: checking if $CC supports weak symbols" >&5
+ echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
+ if test "${cf_cv_weak_symbols+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9784 "configure"
++#line 10131 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -9807,16 +10154,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9810: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10157: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9813: \$? = $ac_status" >&5
++  echo "$as_me:10160: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:9816: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10163: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9819: \$? = $ac_status" >&5
++  echo "$as_me:10166: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -9827,7 +10174,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:9830: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:10177: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ else
+@@ -9857,7 +10204,7 @@
+ # opaque outside of that, so there is no --enable-opaque option.  We can use
+ # this option without --with-pthreads, but this will be always set for
+ # pthreads.
+-echo "$as_me:9860: checking if you want experimental reentrant code" >&5
++echo "$as_me:10207: checking if you want experimental reentrant code" >&5
+ echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6
+ 
+ # Check whether --enable-reentrant or --disable-reentrant was given.
+@@ -9867,7 +10214,7 @@
+ else
+   with_reentrant=no
+ fi;
+-echo "$as_me:9870: result: $with_reentrant" >&5
++echo "$as_me:10217: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "$with_reentrant" = yes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -9891,7 +10238,7 @@
+ 	5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:9894: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:10241: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -9904,7 +10251,7 @@
+ 	NCURSES_SIZE_T=short
+ fi
+ 
+-echo "$as_me:9907: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:10254: checking if you want experimental safe-sprintf code" >&5
+ echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
+ 
+ # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
+@@ -9914,7 +10261,7 @@
+ else
+   with_safe_sprintf=no
+ fi;
+-echo "$as_me:9917: result: $with_safe_sprintf" >&5
++echo "$as_me:10264: result: $with_safe_sprintf" >&5
+ echo "${ECHO_T}$with_safe_sprintf" >&6
+ test "$with_safe_sprintf" = yes && cat >>confdefs.h <<\EOF
+ #define USE_SAFE_SPRINTF 1
+@@ -9923,7 +10270,7 @@
+ ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
+ # when hashmap is used scroll hints are useless
+ if test "$with_hashmap" = no ; then
+-echo "$as_me:9926: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:10273: checking if you want to experiment without scrolling-hints code" >&5
+ echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
+ 
+ # Check whether --enable-scroll-hints or --disable-scroll-hints was given.
+@@ -9933,7 +10280,7 @@
+ else
+   with_scroll_hints=yes
+ fi;
+-echo "$as_me:9936: result: $with_scroll_hints" >&5
++echo "$as_me:10283: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "$with_scroll_hints" = yes && cat >>confdefs.h <<\EOF
+ #define USE_SCROLL_HINTS 1
+@@ -9941,7 +10288,7 @@
+ 
+ fi
+ 
+-echo "$as_me:9944: checking if you want experimental wgetch-events code" >&5
++echo "$as_me:10291: checking if you want experimental wgetch-events code" >&5
+ echo $ECHO_N "checking if you want experimental wgetch-events code... $ECHO_C" >&6
+ 
+ # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
+@@ -9951,7 +10298,7 @@
+ else
+   with_wgetch_events=no
+ fi;
+-echo "$as_me:9954: result: $with_wgetch_events" >&5
++echo "$as_me:10301: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ test "$with_wgetch_events" = yes && cat >>confdefs.h <<\EOF
+ #define NCURSES_WGETCH_EVENTS 1
+@@ -9960,7 +10307,7 @@
+ ###############################################################################
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+-echo "$as_me:9963: checking if you want to display full commands during build" >&5
++echo "$as_me:10310: checking if you want to display full commands during build" >&5
+ echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6
+ 
+ # Check whether --enable-echo or --disable-echo was given.
+@@ -9977,11 +10324,11 @@
+ 	test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent"
+ 	test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent"
+ fi
+-echo "$as_me:9980: result: $with_echo" >&5
++echo "$as_me:10327: result: $with_echo" >&5
+ echo "${ECHO_T}$with_echo" >&6
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+-echo "$as_me:9984: checking if you want to see compiler warnings" >&5
++echo "$as_me:10331: checking if you want to see compiler warnings" >&5
+ echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
+ 
+ # Check whether --enable-warnings or --disable-warnings was given.
+@@ -9989,7 +10336,7 @@
+   enableval="$enable_warnings"
+   with_warnings=$enableval
+ fi;
+-echo "$as_me:9992: result: $with_warnings" >&5
++echo "$as_me:10339: result: $with_warnings" >&5
+ echo "${ECHO_T}$with_warnings" >&6
+ 
+ if test "x$with_warnings" = "xyes"; then
+@@ -10000,12 +10347,12 @@
+ if test "$GCC" = yes ; then
+ 	case $host_os in
+ 	linux*|gnu*)
+-		echo "$as_me:10003: checking if this is really Intel C compiler" >&5
++		echo "$as_me:10350: checking if this is really Intel C compiler" >&5
+ echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
+ 		cf_save_CFLAGS="$CFLAGS"
+ 		CFLAGS="$CFLAGS -no-gcc"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 10008 "configure"
++#line 10355 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -10022,16 +10369,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10025: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10372: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10028: \$? = $ac_status" >&5
++  echo "$as_me:10375: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10031: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10378: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10034: \$? = $ac_status" >&5
++  echo "$as_me:10381: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
+@@ -10042,14 +10389,14 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		CFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:10045: result: $INTEL_COMPILER" >&5
++		echo "$as_me:10392: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ 		;;
+ 	esac
+ fi
+ 
+ cat > conftest.$ac_ext <<EOF
+-#line 10052 "${as_me-configure}"
++#line 10399 "${as_me-configure}"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+ 
+@@ -10067,7 +10414,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #269: invalid format string conversion
+ 
+-	{ echo "$as_me:10070: checking for $CC warning options..." >&5
++	{ echo "$as_me:10417: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="-Wall"
+@@ -10084,12 +10431,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:10087: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:10434: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10090: \$? = $ac_status" >&5
++  echo "$as_me:10437: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:10092: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:10439: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -10098,7 +10445,7 @@
+ 
+ elif test "$GCC" = yes
+ then
+-	{ echo "$as_me:10101: checking for $CC warning options..." >&5
++	{ echo "$as_me:10448: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="-W -Wall"
+@@ -10118,12 +10465,12 @@
+ 		Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:10121: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:10468: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10124: \$? = $ac_status" >&5
++  echo "$as_me:10471: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:10126: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:10473: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case $cf_opt in #(vi
+ 			Wcast-qual) #(vi
+@@ -10134,7 +10481,7 @@
+ 				[34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me-configure}:10137: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me-configure}:10484: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -10154,12 +10501,12 @@
+ if test "$GCC" = yes ; then
+ 	case $host_os in
+ 	linux*|gnu*)
+-		echo "$as_me:10157: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:10504: checking if this is really Intel C++ compiler" >&5
+ echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6
+ 		cf_save_CFLAGS="$CXXFLAGS"
+ 		CXXFLAGS="$CXXFLAGS -no-gcc"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 10162 "configure"
++#line 10509 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -10176,16 +10523,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10179: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10526: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10182: \$? = $ac_status" >&5
++  echo "$as_me:10529: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:10185: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10532: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10188: \$? = $ac_status" >&5
++  echo "$as_me:10535: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
+@@ -10196,7 +10543,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		CXXFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:10199: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:10546: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ 		;;
+ 	esac
+@@ -10210,7 +10557,7 @@
+ ac_main_return=return
+ 
+ cat > conftest.$ac_ext <<EOF
+-#line 10213 "configure"
++#line 10560 "configure"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+ 
+@@ -10228,7 +10575,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #269: invalid format string conversion
+ 
+-	{ echo "$as_me:10231: checking for $CC warning options..." >&5
++	{ echo "$as_me:10578: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-Wall"
+@@ -10245,12 +10592,12 @@
+ 		wd981
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:10248: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:10595: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10251: \$? = $ac_status" >&5
++  echo "$as_me:10598: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:10253: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:10600: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		fi
+@@ -10259,7 +10606,7 @@
+ 
+ elif test "$GXX" = yes
+ then
+-	{ echo "$as_me:10262: checking for $CXX warning options..." >&5
++	{ echo "$as_me:10609: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-W -Wall"
+@@ -10288,16 +10635,16 @@
+ 		Wundef $cf_gxx_extra_warnings Wno-unused
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+-		if { (eval echo "$as_me:10291: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:10638: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10294: \$? = $ac_status" >&5
++  echo "$as_me:10641: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:10296: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:10643: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		else
+-			test -n "$verbose" && echo "$as_me:10300: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:10647: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ 		fi
+ 	done
+@@ -10333,10 +10680,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:10336: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:10683: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > conftest.$ac_ext <<EOF
+-#line 10339 "${as_me-configure}"
++#line 10686 "${as_me-configure}"
+ #include "confdefs.h"
+ #include "conftest.h"
+ #include "conftest.i"
+@@ -10374,12 +10721,12 @@
+ EOF
+ 			;;
+ 		esac
+-		if { (eval echo "$as_me:10377: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:10724: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10380: \$? = $ac_status" >&5
++  echo "$as_me:10727: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:10382: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:10729: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 		fi
+@@ -10391,7 +10738,7 @@
+ fi
+ 
+ ###	use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:10394: checking if you want to enable runtime assertions" >&5
++echo "$as_me:10741: checking if you want to enable runtime assertions" >&5
+ echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
+ 
+ # Check whether --enable-assertions or --disable-assertions was given.
+@@ -10401,7 +10748,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:10404: result: $with_assertions" >&5
++echo "$as_me:10751: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -10419,7 +10766,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:10422: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:10769: checking if you want to use dmalloc for testing" >&5
+ echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
+ 
+ # Check whether --with-dmalloc or --without-dmalloc was given.
+@@ -10435,7 +10782,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:10438: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:10785: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case .$with_cflags in #(vi
+@@ -10519,23 +10866,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:10522: checking for dmalloc.h" >&5
++	echo "$as_me:10869: checking for dmalloc.h" >&5
+ echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
+ if test "${ac_cv_header_dmalloc_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 10528 "configure"
++#line 10875 "configure"
+ #include "confdefs.h"
+ #include <dmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:10532: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:10879: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:10538: \$? = $ac_status" >&5
++  echo "$as_me:10885: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10554,11 +10901,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:10557: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:10904: result: $ac_cv_header_dmalloc_h" >&5
+ echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
+ if test $ac_cv_header_dmalloc_h = yes; then
+ 
+-echo "$as_me:10561: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:10908: checking for dmalloc_debug in -ldmalloc" >&5
+ echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
+ if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10566,7 +10913,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10569 "configure"
++#line 10916 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10585,16 +10932,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10588: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10935: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10591: \$? = $ac_status" >&5
++  echo "$as_me:10938: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10594: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10941: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10597: \$? = $ac_status" >&5
++  echo "$as_me:10944: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -10605,7 +10952,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10608: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:10955: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+ echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
+ if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
+   cat >>confdefs.h <<EOF
+@@ -10620,7 +10967,7 @@
+ 
+ fi
+ 
+-echo "$as_me:10623: checking if you want to use dbmalloc for testing" >&5
++echo "$as_me:10970: checking if you want to use dbmalloc for testing" >&5
+ echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
+ 
+ # Check whether --with-dbmalloc or --without-dbmalloc was given.
+@@ -10636,7 +10983,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:10639: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:10986: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case .$with_cflags in #(vi
+@@ -10720,23 +11067,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:10723: checking for dbmalloc.h" >&5
++	echo "$as_me:11070: checking for dbmalloc.h" >&5
+ echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
+ if test "${ac_cv_header_dbmalloc_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 10729 "configure"
++#line 11076 "configure"
+ #include "confdefs.h"
+ #include <dbmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:10733: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:11080: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:10739: \$? = $ac_status" >&5
++  echo "$as_me:11086: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10755,11 +11102,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:10758: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:11105: result: $ac_cv_header_dbmalloc_h" >&5
+ echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
+ if test $ac_cv_header_dbmalloc_h = yes; then
+ 
+-echo "$as_me:10762: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:11109: checking for debug_malloc in -ldbmalloc" >&5
+ echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
+ if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10767,7 +11114,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10770 "configure"
++#line 11117 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10786,16 +11133,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10789: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11136: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10792: \$? = $ac_status" >&5
++  echo "$as_me:11139: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10795: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11142: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10798: \$? = $ac_status" >&5
++  echo "$as_me:11145: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -10806,7 +11153,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10809: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:11156: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+ echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
+ if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
+   cat >>confdefs.h <<EOF
+@@ -10821,7 +11168,7 @@
+ 
+ fi
+ 
+-echo "$as_me:10824: checking if you want to use valgrind for testing" >&5
++echo "$as_me:11171: checking if you want to use valgrind for testing" >&5
+ echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
+ 
+ # Check whether --with-valgrind or --without-valgrind was given.
+@@ -10837,7 +11184,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:10840: result: ${with_valgrind:-no}" >&5
++echo "$as_me:11187: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case .$with_cflags in #(vi
+@@ -10920,7 +11267,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:10923: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:11270: checking if you want to perform memory-leak testing" >&5
+ echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
+ 
+ # Check whether --enable-leaks or --disable-leaks was given.
+@@ -10930,7 +11277,7 @@
+ else
+   : ${with_no_leaks:=no}
+ fi;
+-echo "$as_me:10933: result: $with_no_leaks" >&5
++echo "$as_me:11280: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$with_no_leaks" = yes ; then
+@@ -10975,7 +11322,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:10978: checking whether to add trace feature to all models" >&5
++echo "$as_me:11325: checking whether to add trace feature to all models" >&5
+ echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
+ 
+ # Check whether --with-trace or --without-trace was given.
+@@ -10985,7 +11332,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:10988: result: $cf_with_trace" >&5
++echo "$as_me:11335: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "$cf_with_trace" = yes ; then
+@@ -11066,13 +11413,13 @@
+ fi
+ 
+ ###	Checks for libraries.
+-echo "$as_me:11069: checking for gettimeofday" >&5
++echo "$as_me:11416: checking for gettimeofday" >&5
+ echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
+ if test "${ac_cv_func_gettimeofday+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11075 "configure"
++#line 11422 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char gettimeofday (); below.  */
+@@ -11103,16 +11450,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11106: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11453: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11109: \$? = $ac_status" >&5
++  echo "$as_me:11456: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11112: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11459: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11115: \$? = $ac_status" >&5
++  echo "$as_me:11462: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -11122,7 +11469,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:11125: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:11472: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test $ac_cv_func_gettimeofday = yes; then
+   cat >>confdefs.h <<\EOF
+@@ -11131,7 +11478,7 @@
+ 
+ else
+ 
+-echo "$as_me:11134: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:11481: checking for gettimeofday in -lbsd" >&5
+ echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11139,7 +11486,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11142 "configure"
++#line 11489 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11158,16 +11505,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11161: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11508: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11164: \$? = $ac_status" >&5
++  echo "$as_me:11511: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11167: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11514: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11170: \$? = $ac_status" >&5
++  echo "$as_me:11517: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -11178,7 +11525,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11181: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:11528: result: $ac_cv_lib_bsd_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
+ if test $ac_cv_lib_bsd_gettimeofday = yes; then
+   cat >>confdefs.h <<\EOF
+@@ -11190,14 +11537,14 @@
+ 
+ fi
+ 
+-echo "$as_me:11193: checking if -lm needed for math functions" >&5
++echo "$as_me:11540: checking if -lm needed for math functions" >&5
+ echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
+ if test "${cf_cv_need_libm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 11200 "configure"
++#line 11547 "configure"
+ #include "confdefs.h"
+ 
+ 	#include <stdio.h>
+@@ -11212,16 +11559,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11215: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11562: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11218: \$? = $ac_status" >&5
++  echo "$as_me:11565: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11221: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11568: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11224: \$? = $ac_status" >&5
++  echo "$as_me:11571: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -11231,7 +11578,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:11234: result: $cf_cv_need_libm" >&5
++echo "$as_me:11581: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ if test "$cf_cv_need_libm" = yes
+ then
+@@ -11239,13 +11586,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:11242: checking for ANSI C header files" >&5
++echo "$as_me:11589: checking for ANSI C header files" >&5
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11248 "configure"
++#line 11595 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -11253,13 +11600,13 @@
+ #include <float.h>
+ 
+ _ACEOF
+-if { (eval echo "$as_me:11256: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:11603: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:11262: \$? = $ac_status" >&5
++  echo "$as_me:11609: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11281,7 +11628,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11284 "configure"
++#line 11631 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ 
+@@ -11299,7 +11646,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11302 "configure"
++#line 11649 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ 
+@@ -11320,7 +11667,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11323 "configure"
++#line 11670 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -11346,15 +11693,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:11349: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11696: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11352: \$? = $ac_status" >&5
++  echo "$as_me:11699: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:11354: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11701: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11357: \$? = $ac_status" >&5
++  echo "$as_me:11704: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -11367,7 +11714,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:11370: result: $ac_cv_header_stdc" >&5
++echo "$as_me:11717: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -11380,13 +11727,13 @@
+ ac_header_dirent=no
+ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+-echo "$as_me:11383: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:11730: checking for $ac_hdr that defines DIR" >&5
+ echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11389 "configure"
++#line 11736 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -11401,16 +11748,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11404: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11751: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11407: \$? = $ac_status" >&5
++  echo "$as_me:11754: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11410: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11757: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11413: \$? = $ac_status" >&5
++  echo "$as_me:11760: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -11420,7 +11767,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:11423: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:11770: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -11433,7 +11780,7 @@
+ done
+ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+ if test $ac_header_dirent = dirent.h; then
+-  echo "$as_me:11436: checking for opendir in -ldir" >&5
++  echo "$as_me:11783: checking for opendir in -ldir" >&5
+ echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
+ if test "${ac_cv_lib_dir_opendir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11441,7 +11788,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11444 "configure"
++#line 11791 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11460,16 +11807,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11463: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11810: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11466: \$? = $ac_status" >&5
++  echo "$as_me:11813: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11469: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11816: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11472: \$? = $ac_status" >&5
++  echo "$as_me:11819: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -11480,14 +11827,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11483: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:11830: result: $ac_cv_lib_dir_opendir" >&5
+ echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
+ if test $ac_cv_lib_dir_opendir = yes; then
+   LIBS="$LIBS -ldir"
+ fi
+ 
+ else
+-  echo "$as_me:11490: checking for opendir in -lx" >&5
++  echo "$as_me:11837: checking for opendir in -lx" >&5
+ echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
+ if test "${ac_cv_lib_x_opendir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11495,7 +11842,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11498 "configure"
++#line 11845 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11514,16 +11861,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11517: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11864: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11520: \$? = $ac_status" >&5
++  echo "$as_me:11867: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11523: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11870: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11526: \$? = $ac_status" >&5
++  echo "$as_me:11873: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -11534,7 +11881,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11537: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:11884: result: $ac_cv_lib_x_opendir" >&5
+ echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
+ if test $ac_cv_lib_x_opendir = yes; then
+   LIBS="$LIBS -lx"
+@@ -11542,13 +11889,13 @@
+ 
+ fi
+ 
+-echo "$as_me:11545: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:11892: checking whether time.h and sys/time.h may both be included" >&5
+ echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
+ if test "${ac_cv_header_time+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11551 "configure"
++#line 11898 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -11564,16 +11911,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11567: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11914: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11570: \$? = $ac_status" >&5
++  echo "$as_me:11917: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11573: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11920: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11576: \$? = $ac_status" >&5
++  echo "$as_me:11923: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -11583,7 +11930,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:11586: result: $ac_cv_header_time" >&5
++echo "$as_me:11933: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -11593,14 +11940,14 @@
+ 
+ fi
+ 
+-echo "$as_me:11596: checking for regular-expression headers" >&5
++echo "$as_me:11943: checking for regular-expression headers" >&5
+ echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
+ if test "${cf_cv_regex+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11603 "configure"
++#line 11950 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <regex.h>
+@@ -11618,16 +11965,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11621: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11968: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11624: \$? = $ac_status" >&5
++  echo "$as_me:11971: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11627: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11974: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11630: \$? = $ac_status" >&5
++  echo "$as_me:11977: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_regex="regex.h"
+ else
+@@ -11635,7 +11982,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 11638 "configure"
++#line 11985 "configure"
+ #include "confdefs.h"
+ #include <regexp.h>
+ int
+@@ -11650,16 +11997,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11653: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12000: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11656: \$? = $ac_status" >&5
++  echo "$as_me:12003: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11659: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12006: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11662: \$? = $ac_status" >&5
++  echo "$as_me:12009: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_regex="regexp.h"
+ else
+@@ -11669,7 +12016,7 @@
+ 		cf_save_LIBS="$LIBS"
+ 		LIBS="-lgen $LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 11672 "configure"
++#line 12019 "configure"
+ #include "confdefs.h"
+ #include <regexpr.h>
+ int
+@@ -11684,16 +12031,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11687: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12034: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11690: \$? = $ac_status" >&5
++  echo "$as_me:12037: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11693: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12040: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11696: \$? = $ac_status" >&5
++  echo "$as_me:12043: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_regex="regexpr.h"
+ else
+@@ -11709,7 +12056,7 @@
+ 
+ fi
+ 
+-echo "$as_me:11712: result: $cf_cv_regex" >&5
++echo "$as_me:12059: result: $cf_cv_regex" >&5
+ echo "${ECHO_T}$cf_cv_regex" >&6
+ case $cf_cv_regex in
+ 	regex.h)   cat >>confdefs.h <<\EOF
+@@ -11745,23 +12092,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:11748: checking for $ac_header" >&5
++echo "$as_me:12095: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11754 "configure"
++#line 12101 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:11758: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:12105: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:11764: \$? = $ac_status" >&5
++  echo "$as_me:12111: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11780,7 +12127,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:11783: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:12130: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -11794,7 +12141,7 @@
+ # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
+ if test "$ISC" = yes ; then
+ 
+-echo "$as_me:11797: checking for main in -lcposix" >&5
++echo "$as_me:12144: checking for main in -lcposix" >&5
+ echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_cposix_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11802,7 +12149,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcposix  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11805 "configure"
++#line 12152 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -11814,16 +12161,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11817: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12164: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11820: \$? = $ac_status" >&5
++  echo "$as_me:12167: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11823: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12170: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11826: \$? = $ac_status" >&5
++  echo "$as_me:12173: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_cposix_main=yes
+ else
+@@ -11834,7 +12181,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11837: result: $ac_cv_lib_cposix_main" >&5
++echo "$as_me:12184: result: $ac_cv_lib_cposix_main" >&5
+ echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
+ if test $ac_cv_lib_cposix_main = yes; then
+   cat >>confdefs.h <<EOF
+@@ -11845,7 +12192,7 @@
+ 
+ fi
+ 
+-	echo "$as_me:11848: checking for bzero in -linet" >&5
++	echo "$as_me:12195: checking for bzero in -linet" >&5
+ echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
+ if test "${ac_cv_lib_inet_bzero+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11853,7 +12200,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-linet  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11856 "configure"
++#line 12203 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11872,16 +12219,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11875: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12222: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11878: \$? = $ac_status" >&5
++  echo "$as_me:12225: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11881: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12228: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11884: \$? = $ac_status" >&5
++  echo "$as_me:12231: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_inet_bzero=yes
+ else
+@@ -11892,21 +12239,21 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11895: result: $ac_cv_lib_inet_bzero" >&5
++echo "$as_me:12242: result: $ac_cv_lib_inet_bzero" >&5
+ echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
+ if test $ac_cv_lib_inet_bzero = yes; then
+   LIBS="$LIBS -linet"
+ fi
+ fi
+ 
+-echo "$as_me:11902: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:12249: checking if sys/time.h works with sys/select.h" >&5
+ echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
+ if test "${cf_cv_sys_time_select+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11909 "configure"
++#line 12256 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -11926,16 +12273,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11929: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12276: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11932: \$? = $ac_status" >&5
++  echo "$as_me:12279: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11935: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12282: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11938: \$? = $ac_status" >&5
++  echo "$as_me:12285: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -11947,7 +12294,7 @@
+ 
+ fi
+ 
+-echo "$as_me:11950: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:12297: result: $cf_cv_sys_time_select" >&5
+ echo "${ECHO_T}$cf_cv_sys_time_select" >&6
+ test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF
+ #define HAVE_SYS_TIME_SELECT 1
+@@ -11961,7 +12308,7 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return=return
+ 
+-echo "$as_me:11964: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:12311: checking for $CC option to accept ANSI C" >&5
+ echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+ if test "${ac_cv_prog_cc_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11969,7 +12316,7 @@
+   ac_cv_prog_cc_stdc=no
+ ac_save_CC=$CC
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11972 "configure"
++#line 12319 "configure"
+ #include "confdefs.h"
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -12018,16 +12365,16 @@
+ do
+   CC="$ac_save_CC $ac_arg"
+   rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12021: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12368: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12024: \$? = $ac_status" >&5
++  echo "$as_me:12371: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12027: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12374: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12030: \$? = $ac_status" >&5
++  echo "$as_me:12377: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_prog_cc_stdc=$ac_arg
+ break
+@@ -12044,21 +12391,21 @@
+ 
+ case "x$ac_cv_prog_cc_stdc" in
+   x|xno)
+-    echo "$as_me:12047: result: none needed" >&5
++    echo "$as_me:12394: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+   *)
+-    echo "$as_me:12050: result: $ac_cv_prog_cc_stdc" >&5
++    echo "$as_me:12397: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+     CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+ 
+-echo "$as_me:12055: checking for an ANSI C-conforming const" >&5
++echo "$as_me:12402: checking for an ANSI C-conforming const" >&5
+ echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+ if test "${ac_cv_c_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12061 "configure"
++#line 12408 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -12116,16 +12463,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12119: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12466: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12122: \$? = $ac_status" >&5
++  echo "$as_me:12469: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12125: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12472: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12128: \$? = $ac_status" >&5
++  echo "$as_me:12475: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -12135,7 +12482,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:12138: result: $ac_cv_c_const" >&5
++echo "$as_me:12485: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -12145,7 +12492,7 @@
+ 
+ fi
+ 
+-echo "$as_me:12148: checking for inline" >&5
++echo "$as_me:12495: checking for inline" >&5
+ echo $ECHO_N "checking for inline... $ECHO_C" >&6
+ if test "${ac_cv_c_inline+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12153,7 +12500,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12156 "configure"
++#line 12503 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo () {return 0; }
+@@ -12162,16 +12509,16 @@
+ 
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12165: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12512: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12168: \$? = $ac_status" >&5
++  echo "$as_me:12515: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12171: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12518: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12174: \$? = $ac_status" >&5
++  echo "$as_me:12521: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -12182,7 +12529,7 @@
+ done
+ 
+ fi
+-echo "$as_me:12185: result: $ac_cv_c_inline" >&5
++echo "$as_me:12532: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -12205,7 +12552,7 @@
+     :
+   elif test "$GCC" = yes
+   then
+-    echo "$as_me:12208: checking if gcc supports options to tune inlining" >&5
++    echo "$as_me:12555: checking if gcc supports options to tune inlining" >&5
+ echo $ECHO_N "checking if gcc supports options to tune inlining... $ECHO_C" >&6
+ if test "${cf_cv_gcc_inline+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12214,7 +12561,7 @@
+       cf_save_CFLAGS=$CFLAGS
+       CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+       cat >conftest.$ac_ext <<_ACEOF
+-#line 12217 "configure"
++#line 12564 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -12226,16 +12573,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12229: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12576: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12232: \$? = $ac_status" >&5
++  echo "$as_me:12579: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12235: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12582: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12238: \$? = $ac_status" >&5
++  echo "$as_me:12585: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -12247,7 +12594,7 @@
+       CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:12250: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:12597: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+     if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -12323,7 +12670,7 @@
+   fi
+ fi
+ 
+-echo "$as_me:12326: checking for signal global datatype" >&5
++echo "$as_me:12673: checking for signal global datatype" >&5
+ echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
+ if test "${cf_cv_sig_atomic_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12335,7 +12682,7 @@
+ 		"int"
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 12338 "configure"
++#line 12685 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -12358,16 +12705,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12361: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12708: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12364: \$? = $ac_status" >&5
++  echo "$as_me:12711: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12367: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12714: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12370: \$? = $ac_status" >&5
++  echo "$as_me:12717: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -12381,7 +12728,7 @@
+ 
+ fi
+ 
+-echo "$as_me:12384: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:12731: result: $cf_cv_sig_atomic_t" >&5
+ echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
+ test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <<EOF
+ #define SIG_ATOMIC_T $cf_cv_sig_atomic_t
+@@ -12389,7 +12736,7 @@
+ 
+ if test $NCURSES_CHTYPE = auto ; then
+ 
+-echo "$as_me:12392: checking for type of chtype" >&5
++echo "$as_me:12739: checking for type of chtype" >&5
+ echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
+ if test "${cf_cv_typeof_chtype+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12399,7 +12746,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12402 "configure"
++#line 12749 "configure"
+ #include "confdefs.h"
+ 
+ #define WANT_BITS 31
+@@ -12434,15 +12781,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:12437: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12784: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12440: \$? = $ac_status" >&5
++  echo "$as_me:12787: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:12442: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12789: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12445: \$? = $ac_status" >&5
++  echo "$as_me:12792: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -12457,7 +12804,7 @@
+ 
+ fi
+ 
+-echo "$as_me:12460: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:12807: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <<EOF
+@@ -12469,14 +12816,14 @@
+ fi
+ test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
+ 
+-echo "$as_me:12472: checking if unsigned literals are legal" >&5
++echo "$as_me:12819: checking if unsigned literals are legal" >&5
+ echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
+ if test "${cf_cv_unsigned_literals+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 12479 "configure"
++#line 12826 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -12488,16 +12835,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12491: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12838: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12494: \$? = $ac_status" >&5
++  echo "$as_me:12841: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12497: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12844: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12500: \$? = $ac_status" >&5
++  echo "$as_me:12847: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -12509,7 +12856,7 @@
+ 
+ fi
+ 
+-echo "$as_me:12512: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:12859: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -12525,14 +12872,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:12528: checking if external errno is declared" >&5
++echo "$as_me:12875: checking if external errno is declared" >&5
+ echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
+ if test "${cf_cv_dcl_errno+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 12535 "configure"
++#line 12882 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_STDLIB_H
+@@ -12550,16 +12897,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12553: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12900: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12556: \$? = $ac_status" >&5
++  echo "$as_me:12903: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12559: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12906: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12562: \$? = $ac_status" >&5
++  echo "$as_me:12909: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -12570,7 +12917,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:12573: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:12920: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -12585,14 +12932,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:12588: checking if external errno exists" >&5
++echo "$as_me:12935: checking if external errno exists" >&5
+ echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
+ if test "${cf_cv_have_errno+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 12595 "configure"
++#line 12942 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -12607,16 +12954,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12610: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12957: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12613: \$? = $ac_status" >&5
++  echo "$as_me:12960: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12616: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12963: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12619: \$? = $ac_status" >&5
++  echo "$as_me:12966: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -12627,7 +12974,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:12630: result: $cf_cv_have_errno" >&5
++echo "$as_me:12977: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -12640,7 +12987,7 @@
+ 
+ fi
+ 
+-echo "$as_me:12643: checking if data-only library module links" >&5
++echo "$as_me:12990: checking if data-only library module links" >&5
+ echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
+ if test "${cf_cv_link_dataonly+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12648,20 +12995,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <<EOF
+-#line 12651 "configure"
++#line 12998 "configure"
+ int	testdata[3] = { 123, 456, 789 };
+ EOF
+-	if { (eval echo "$as_me:12654: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:13001: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12657: \$? = $ac_status" >&5
++  echo "$as_me:13004: \$? = $ac_status" >&5
+   (exit $ac_status); } ; then
+ 		mv conftest.o data.o && \
+-		( $AR $AR_OPTS conftest.a data.o ) 2>&5 1>/dev/null
++		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
+ 	fi
+ 	rm -f conftest.$ac_ext data.o
+ 	cat >conftest.$ac_ext <<EOF
+-#line 12664 "configure"
++#line 13011 "configure"
+ int	testfunc()
+ {
+ #if defined(NeXT)
+@@ -12674,13 +13021,13 @@
+ #endif
+ }
+ EOF
+-	if { (eval echo "$as_me:12677: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:13024: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12680: \$? = $ac_status" >&5
++  echo "$as_me:13027: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+ 		mv conftest.o func.o && \
+-		( $AR $AR_OPTS conftest.a func.o ) 2>&5 1>/dev/null
++		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+ 	fi
+ 	rm -f conftest.$ac_ext func.o
+ 	( eval $RANLIB conftest.a ) 2>&5 >/dev/null
+@@ -12690,7 +13037,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12693 "configure"
++#line 13040 "configure"
+ #include "confdefs.h"
+ 
+ 	int main()
+@@ -12701,15 +13048,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:12704: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13051: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12707: \$? = $ac_status" >&5
++  echo "$as_me:13054: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:12709: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13056: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12712: \$? = $ac_status" >&5
++  echo "$as_me:13059: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -12724,7 +13071,7 @@
+ 
+ fi
+ 
+-echo "$as_me:12727: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:13074: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -12759,13 +13106,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:12762: checking for $ac_func" >&5
++echo "$as_me:13109: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12768 "configure"
++#line 13115 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -12796,16 +13143,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12799: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13146: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12802: \$? = $ac_status" >&5
++  echo "$as_me:13149: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12805: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13152: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12808: \$? = $ac_status" >&5
++  echo "$as_me:13155: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -12815,7 +13162,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12818: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:13165: result: `eval echo '${'$as_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -12827,14 +13174,14 @@
+ 
+ if test "$with_getcap" = "yes" ; then
+ 
+-echo "$as_me:12830: checking for terminal-capability database functions" >&5
++echo "$as_me:13177: checking for terminal-capability database functions" >&5
+ echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
+ if test "${cf_cv_cgetent+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12837 "configure"
++#line 13184 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -12854,16 +13201,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12857: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13204: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12860: \$? = $ac_status" >&5
++  echo "$as_me:13207: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12863: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13210: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12866: \$? = $ac_status" >&5
++  echo "$as_me:13213: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -12875,7 +13222,7 @@
+ 
+ fi
+ 
+-echo "$as_me:12878: result: $cf_cv_cgetent" >&5
++echo "$as_me:13225: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ test "$cf_cv_cgetent" = yes && cat >>confdefs.h <<\EOF
+ #define HAVE_BSD_CGETENT 1
+@@ -12883,14 +13230,14 @@
+ 
+ fi
+ 
+-echo "$as_me:12886: checking for isascii" >&5
++echo "$as_me:13233: checking for isascii" >&5
+ echo $ECHO_N "checking for isascii... $ECHO_C" >&6
+ if test "${cf_cv_have_isascii+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 12893 "configure"
++#line 13240 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ int
+@@ -12902,16 +13249,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12905: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13252: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12908: \$? = $ac_status" >&5
++  echo "$as_me:13255: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12911: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13258: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12914: \$? = $ac_status" >&5
++  echo "$as_me:13261: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -12922,17 +13269,17 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:12925: result: $cf_cv_have_isascii" >&5
++echo "$as_me:13272: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF
+ #define HAVE_ISASCII 1
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:12932: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:13279: checking whether sigaction needs _POSIX_SOURCE" >&5
+ echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12935 "configure"
++#line 13282 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -12946,16 +13293,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12949: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13296: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12952: \$? = $ac_status" >&5
++  echo "$as_me:13299: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12955: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13302: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12958: \$? = $ac_status" >&5
++  echo "$as_me:13305: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   sigact_bad=no
+ else
+@@ -12963,7 +13310,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12966 "configure"
++#line 13313 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -12978,16 +13325,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12981: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13328: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12984: \$? = $ac_status" >&5
++  echo "$as_me:13331: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12987: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13334: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12990: \$? = $ac_status" >&5
++  echo "$as_me:13337: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   sigact_bad=yes
+ 	 cat >>confdefs.h <<\EOF
+@@ -13002,11 +13349,11 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:13005: result: $sigact_bad" >&5
++echo "$as_me:13352: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:13009: checking if nanosleep really works" >&5
++echo "$as_me:13356: checking if nanosleep really works" >&5
+ echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
+ if test "${cf_cv_func_nanosleep+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13016,7 +13363,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13019 "configure"
++#line 13366 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -13041,15 +13388,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:13044: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13391: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13047: \$? = $ac_status" >&5
++  echo "$as_me:13394: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:13049: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13396: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13052: \$? = $ac_status" >&5
++  echo "$as_me:13399: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -13061,7 +13408,7 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:13064: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:13411: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF
+@@ -13075,23 +13422,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:13078: checking for $ac_header" >&5
++echo "$as_me:13425: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13084 "configure"
++#line 13431 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:13088: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13435: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:13094: \$? = $ac_status" >&5
++  echo "$as_me:13441: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13110,7 +13457,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:13113: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:13460: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -13125,23 +13472,23 @@
+ for ac_header in sys/termio.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:13128: checking for $ac_header" >&5
++echo "$as_me:13475: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13134 "configure"
++#line 13481 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:13138: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13485: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:13144: \$? = $ac_status" >&5
++  echo "$as_me:13491: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -13160,7 +13507,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:13163: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:13510: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -13178,10 +13525,10 @@
+ 	*)	termios_bad=maybe ;;
+ 	esac
+ 	if test "$termios_bad" = maybe ; then
+-	echo "$as_me:13181: checking whether termios.h needs _POSIX_SOURCE" >&5
++	echo "$as_me:13528: checking whether termios.h needs _POSIX_SOURCE" >&5
+ echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 13184 "configure"
++#line 13531 "configure"
+ #include "confdefs.h"
+ #include <termios.h>
+ int
+@@ -13193,16 +13540,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13196: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13543: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13199: \$? = $ac_status" >&5
++  echo "$as_me:13546: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13202: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13549: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13205: \$? = $ac_status" >&5
++  echo "$as_me:13552: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   termios_bad=no
+ else
+@@ -13210,7 +13557,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 13213 "configure"
++#line 13560 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -13224,16 +13571,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13227: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13574: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13230: \$? = $ac_status" >&5
++  echo "$as_me:13577: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13233: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13580: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13236: \$? = $ac_status" >&5
++  echo "$as_me:13583: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   termios_bad=unknown
+ else
+@@ -13248,19 +13595,19 @@
+ 
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	echo "$as_me:13251: result: $termios_bad" >&5
++	echo "$as_me:13598: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:13256: checking for tcgetattr" >&5
++echo "$as_me:13603: checking for tcgetattr" >&5
+ echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
+ if test "${cf_cv_have_tcgetattr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13263 "configure"
++#line 13610 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -13288,16 +13635,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13291: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13638: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13294: \$? = $ac_status" >&5
++  echo "$as_me:13641: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13297: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13644: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13300: \$? = $ac_status" >&5
++  echo "$as_me:13647: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -13307,20 +13654,20 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:13310: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:13657: result: $cf_cv_have_tcgetattr" >&5
+ echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
+ test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF
+ #define HAVE_TCGETATTR 1
+ EOF
+ 
+-echo "$as_me:13316: checking for vsscanf function or workaround" >&5
++echo "$as_me:13663: checking for vsscanf function or workaround" >&5
+ echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
+ if test "${cf_cv_func_vsscanf+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13323 "configure"
++#line 13670 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -13336,16 +13683,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13339: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13686: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13342: \$? = $ac_status" >&5
++  echo "$as_me:13689: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13345: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13692: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13348: \$? = $ac_status" >&5
++  echo "$as_me:13695: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -13353,7 +13700,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13356 "configure"
++#line 13703 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -13375,16 +13722,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13378: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13725: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13381: \$? = $ac_status" >&5
++  echo "$as_me:13728: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13384: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13731: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13387: \$? = $ac_status" >&5
++  echo "$as_me:13734: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -13392,7 +13739,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13395 "configure"
++#line 13742 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -13414,16 +13761,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13417: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13764: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13420: \$? = $ac_status" >&5
++  echo "$as_me:13767: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13423: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13770: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13426: \$? = $ac_status" >&5
++  echo "$as_me:13773: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -13438,7 +13785,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:13441: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:13788: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case $cf_cv_func_vsscanf in #(vi
+@@ -13456,7 +13803,7 @@
+ ;;
+ esac
+ 
+-echo "$as_me:13459: checking for working mkstemp" >&5
++echo "$as_me:13806: checking for working mkstemp" >&5
+ echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
+ if test "${cf_cv_func_mkstemp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13464,13 +13811,13 @@
+ 
+ rm -f conftest*
+ if test "$cross_compiling" = yes; then
+-  echo "$as_me:13467: checking for mkstemp" >&5
++  echo "$as_me:13814: checking for mkstemp" >&5
+ echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
+ if test "${ac_cv_func_mkstemp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13473 "configure"
++#line 13820 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char mkstemp (); below.  */
+@@ -13501,16 +13848,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13504: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13851: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13507: \$? = $ac_status" >&5
++  echo "$as_me:13854: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13510: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13857: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13513: \$? = $ac_status" >&5
++  echo "$as_me:13860: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -13520,12 +13867,12 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:13523: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:13870: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13528 "configure"
++#line 13875 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -13563,15 +13910,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:13566: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13913: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13569: \$? = $ac_status" >&5
++  echo "$as_me:13916: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:13571: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13918: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13574: \$? = $ac_status" >&5
++  echo "$as_me:13921: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -13586,7 +13933,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:13589: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:13936: result: $cf_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
+ if test "$cf_cv_func_mkstemp" = yes ; then
+ 	cat >>confdefs.h <<\EOF
+@@ -13604,21 +13951,21 @@
+ fi
+ 
+ if test "$cross_compiling" = yes ; then
+-	{ echo "$as_me:13607: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:13954: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+ echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
+ else
+-	echo "$as_me:13610: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:13957: checking whether setvbuf arguments are reversed" >&5
+ echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
+ if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:13616: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:13963: error: cannot run test program while cross compiling" >&5
+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13621 "configure"
++#line 13968 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -13635,15 +13982,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:13638: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13985: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13641: \$? = $ac_status" >&5
++  echo "$as_me:13988: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:13643: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13990: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13646: \$? = $ac_status" >&5
++  echo "$as_me:13993: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -13656,7 +14003,7 @@
+ fi
+ rm -f core core.* *.core
+ fi
+-echo "$as_me:13659: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:14006: result: $ac_cv_func_setvbuf_reversed" >&5
+ echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
+ if test $ac_cv_func_setvbuf_reversed = yes; then
+ 
+@@ -13667,13 +14014,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:13670: checking return type of signal handlers" >&5
++echo "$as_me:14017: checking return type of signal handlers" >&5
+ echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
+ if test "${ac_cv_type_signal+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13676 "configure"
++#line 14023 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -13695,16 +14042,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13698: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14045: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13701: \$? = $ac_status" >&5
++  echo "$as_me:14048: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13704: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14051: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13707: \$? = $ac_status" >&5
++  echo "$as_me:14054: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_signal=void
+ else
+@@ -13714,21 +14061,21 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:13717: result: $ac_cv_type_signal" >&5
++echo "$as_me:14064: result: $ac_cv_type_signal" >&5
+ echo "${ECHO_T}$ac_cv_type_signal" >&6
+ 
+ cat >>confdefs.h <<EOF
+ #define RETSIGTYPE $ac_cv_type_signal
+ EOF
+ 
+-echo "$as_me:13724: checking for type sigaction_t" >&5
++echo "$as_me:14071: checking for type sigaction_t" >&5
+ echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
+ if test "${cf_cv_type_sigaction+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 13731 "configure"
++#line 14078 "configure"
+ #include "confdefs.h"
+ 
+ #include <signal.h>
+@@ -13741,16 +14088,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13744: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14091: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13747: \$? = $ac_status" >&5
++  echo "$as_me:14094: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13750: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14097: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13753: \$? = $ac_status" >&5
++  echo "$as_me:14100: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -13761,13 +14108,13 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-echo "$as_me:13764: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:14111: result: $cf_cv_type_sigaction" >&5
+ echo "${ECHO_T}$cf_cv_type_sigaction" >&6
+ test "$cf_cv_type_sigaction" = yes && cat >>confdefs.h <<\EOF
+ #define HAVE_TYPE_SIGACTION 1
+ EOF
+ 
+-echo "$as_me:13770: checking declaration of size-change" >&5
++echo "$as_me:14117: checking declaration of size-change" >&5
+ echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
+ if test "${cf_cv_sizechange+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13782,7 +14129,7 @@
+     CPPFLAGS="$cf_save_CPPFLAGS"
+     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 13785 "configure"
++#line 14132 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #ifdef HAVE_TERMIOS_H
+@@ -13826,16 +14173,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13829: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14176: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13832: \$? = $ac_status" >&5
++  echo "$as_me:14179: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13835: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14182: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13838: \$? = $ac_status" >&5
++  echo "$as_me:14185: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -13854,7 +14201,7 @@
+ done
+ 
+ fi
+-echo "$as_me:13857: result: $cf_cv_sizechange" >&5
++echo "$as_me:14204: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 	cat >>confdefs.h <<\EOF
+@@ -13871,13 +14218,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:13874: checking for memmove" >&5
++echo "$as_me:14221: checking for memmove" >&5
+ echo $ECHO_N "checking for memmove... $ECHO_C" >&6
+ if test "${ac_cv_func_memmove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13880 "configure"
++#line 14227 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char memmove (); below.  */
+@@ -13908,16 +14255,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13911: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14258: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13914: \$? = $ac_status" >&5
++  echo "$as_me:14261: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13917: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14264: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13920: \$? = $ac_status" >&5
++  echo "$as_me:14267: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -13927,19 +14274,19 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:13930: result: $ac_cv_func_memmove" >&5
++echo "$as_me:14277: result: $ac_cv_func_memmove" >&5
+ echo "${ECHO_T}$ac_cv_func_memmove" >&6
+ if test $ac_cv_func_memmove = yes; then
+   :
+ else
+ 
+-echo "$as_me:13936: checking for bcopy" >&5
++echo "$as_me:14283: checking for bcopy" >&5
+ echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
+ if test "${ac_cv_func_bcopy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13942 "configure"
++#line 14289 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char bcopy (); below.  */
+@@ -13970,16 +14317,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13973: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14320: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13976: \$? = $ac_status" >&5
++  echo "$as_me:14323: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13979: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14326: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13982: \$? = $ac_status" >&5
++  echo "$as_me:14329: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -13989,11 +14336,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:13992: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:14339: result: $ac_cv_func_bcopy" >&5
+ echo "${ECHO_T}$ac_cv_func_bcopy" >&6
+ if test $ac_cv_func_bcopy = yes; then
+ 
+-	echo "$as_me:13996: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:14343: checking if bcopy does overlapping moves" >&5
+ echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
+ if test "${cf_cv_good_bcopy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14003,7 +14350,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 14006 "configure"
++#line 14353 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -14017,15 +14364,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:14020: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14367: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14023: \$? = $ac_status" >&5
++  echo "$as_me:14370: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:14025: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14372: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14028: \$? = $ac_status" >&5
++  echo "$as_me:14375: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -14038,7 +14385,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:14041: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:14388: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -14059,7 +14406,7 @@
+ 
+ fi
+ 
+-echo "$as_me:14062: checking if poll really works" >&5
++echo "$as_me:14409: checking if poll really works" >&5
+ echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
+ if test "${cf_cv_working_poll+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14069,7 +14416,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 14072 "configure"
++#line 14419 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -14090,15 +14437,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:14093: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14440: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14096: \$? = $ac_status" >&5
++  echo "$as_me:14443: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:14098: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14445: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14101: \$? = $ac_status" >&5
++  echo "$as_me:14448: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -14110,7 +14457,7 @@
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:14113: result: $cf_cv_working_poll" >&5
++echo "$as_me:14460: result: $cf_cv_working_poll" >&5
+ echo "${ECHO_T}$cf_cv_working_poll" >&6
+ test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF
+ #define HAVE_WORKING_POLL 1
+@@ -14118,7 +14465,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:14121: checking for openpty in -lutil" >&5
++echo "$as_me:14468: checking for openpty in -lutil" >&5
+ echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
+ if test "${ac_cv_lib_util_openpty+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14126,7 +14473,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14129 "configure"
++#line 14476 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14145,16 +14492,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14148: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14495: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14151: \$? = $ac_status" >&5
++  echo "$as_me:14498: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14154: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14501: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14157: \$? = $ac_status" >&5
++  echo "$as_me:14504: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -14165,7 +14512,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14168: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:14515: result: $ac_cv_lib_util_openpty" >&5
+ echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
+ if test $ac_cv_lib_util_openpty = yes; then
+   cf_cv_lib_util=yes
+@@ -14173,7 +14520,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:14176: checking for openpty header" >&5
++echo "$as_me:14523: checking for openpty header" >&5
+ echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
+ if test "${cf_cv_func_openpty+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14184,7 +14531,7 @@
+     for cf_header in pty.h libutil.h util.h
+     do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 14187 "configure"
++#line 14534 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -14201,16 +14548,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14204: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14551: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14207: \$? = $ac_status" >&5
++  echo "$as_me:14554: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14210: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14557: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14213: \$? = $ac_status" >&5
++  echo "$as_me:14560: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+         cf_cv_func_openpty=$cf_header
+@@ -14228,7 +14575,7 @@
+     LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:14231: result: $cf_cv_func_openpty" >&5
++echo "$as_me:14578: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -14274,13 +14621,13 @@
+ 		fi
+ 
+ 		if test "$cf_have_incdir" = no ; then
+-          if test "$cf_add_incdir" = /usr/local/include ; then
++		  if test "$cf_add_incdir" = /usr/local/include ; then
+ 			if test "$GCC" = yes
+ 			then
+ 			  cf_save_CPPFLAGS=$CPPFLAGS
+ 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 14283 "configure"
++#line 14630 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -14292,16 +14639,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14295: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14642: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14298: \$? = $ac_status" >&5
++  echo "$as_me:14645: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14301: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14648: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14304: \$? = $ac_status" >&5
++  echo "$as_me:14651: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -14318,13 +14665,13 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me-configure}:14321: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me-configure}:14668: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
+ 
+-          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+-          test "$cf_top_incdir" = "$cf_add_incdir" && break
+-          cf_add_incdir="$cf_top_incdir"
++		  cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
++		  test "$cf_top_incdir" = "$cf_add_incdir" && break
++		  cf_add_incdir="$cf_top_incdir"
+ 		else
+ 		  break
+ 		fi
+@@ -14352,7 +14699,7 @@
+       if test "$cf_have_libdir" = no ; then
+         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me-configure}:14355: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me-configure}:14702: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+       fi
+@@ -14363,23 +14710,23 @@
+     fi
+ esac
+ 
+-echo "$as_me:14366: checking for db.h" >&5
++echo "$as_me:14713: checking for db.h" >&5
+ echo $ECHO_N "checking for db.h... $ECHO_C" >&6
+ if test "${ac_cv_header_db_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 14372 "configure"
++#line 14719 "configure"
+ #include "confdefs.h"
+ #include <db.h>
+ _ACEOF
+-if { (eval echo "$as_me:14376: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:14723: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:14382: \$? = $ac_status" >&5
++  echo "$as_me:14729: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14398,11 +14745,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:14401: result: $ac_cv_header_db_h" >&5
++echo "$as_me:14748: result: $ac_cv_header_db_h" >&5
+ echo "${ECHO_T}$ac_cv_header_db_h" >&6
+ if test $ac_cv_header_db_h = yes; then
+ 
+-echo "$as_me:14405: checking for version of db" >&5
++echo "$as_me:14752: checking for version of db" >&5
+ echo $ECHO_N "checking for version of db... $ECHO_C" >&6
+ if test "${cf_cv_hashed_db_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14413,10 +14760,10 @@
+ for cf_db_version in 1 2 3 4 5
+ do
+ 
+-echo "${as_me-configure}:14416: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me-configure}:14763: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 14419 "configure"
++#line 14766 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14446,16 +14793,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14449: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14796: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14452: \$? = $ac_status" >&5
++  echo "$as_me:14799: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14455: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14802: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14458: \$? = $ac_status" >&5
++  echo "$as_me:14805: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -14469,16 +14816,16 @@
+ done
+ 
+ fi
+-echo "$as_me:14472: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:14819: result: $cf_cv_hashed_db_version" >&5
+ echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
+ 
+ if test "$cf_cv_hashed_db_version" = unknown ; then
+-	{ { echo "$as_me:14476: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:14823: error: Cannot determine version of db" >&5
+ echo "$as_me: error: Cannot determine version of db" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+ 
+-echo "$as_me:14481: checking for db libraries" >&5
++echo "$as_me:14828: checking for db libraries" >&5
+ echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
+ if test "${cf_cv_hashed_db_libs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14492,10 +14839,10 @@
+ 		LIBS="-l$cf_db_libs $LIBS"
+ 	fi
+ 
+-echo "${as_me-configure}:14495: testing checking for library "$cf_db_libs" ..." 1>&5
++echo "${as_me-configure}:14842: testing checking for library "$cf_db_libs" ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 14498 "configure"
++#line 14845 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -14550,16 +14897,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14553: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14900: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14556: \$? = $ac_status" >&5
++  echo "$as_me:14903: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14559: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14906: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14562: \$? = $ac_status" >&5
++  echo "$as_me:14909: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -14579,11 +14926,11 @@
+ done
+ 
+ fi
+-echo "$as_me:14582: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:14929: result: $cf_cv_hashed_db_libs" >&5
+ echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
+ 
+ 	if test "$cf_cv_hashed_db_libs" = unknown ; then
+-		{ { echo "$as_me:14586: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:14933: error: Cannot determine library for db" >&5
+ echo "$as_me: error: Cannot determine library for db" >&2;}
+    { (exit 1); exit 1; }; }
+ 	elif test "$cf_cv_hashed_db_libs" != default ; then
+@@ -14593,7 +14940,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:14596: error: Cannot find db.h" >&5
++	{ { echo "$as_me:14943: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -14608,7 +14955,7 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:14611: checking if we should include stdbool.h" >&5
++echo "$as_me:14958: checking if we should include stdbool.h" >&5
+ echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
+ 
+ if test "${cf_cv_header_stdbool_h+set}" = set; then
+@@ -14616,7 +14963,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 14619 "configure"
++#line 14966 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -14628,23 +14975,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14631: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14978: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14634: \$? = $ac_status" >&5
++  echo "$as_me:14981: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14637: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14984: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14640: \$? = $ac_status" >&5
++  echo "$as_me:14987: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_header_stdbool_h=0
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14647 "configure"
++#line 14994 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -14660,16 +15007,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14663: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15010: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14666: \$? = $ac_status" >&5
++  echo "$as_me:15013: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14669: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15016: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14672: \$? = $ac_status" >&5
++  echo "$as_me:15019: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -14683,13 +15030,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:14686: result: yes" >&5
++then	echo "$as_me:15033: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:14688: result: no" >&5
++else	echo "$as_me:15035: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:14692: checking for builtin bool type" >&5
++echo "$as_me:15039: checking for builtin bool type" >&5
+ echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
+ 
+ if test "${cf_cv_cc_bool_type+set}" = set; then
+@@ -14697,7 +15044,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 14700 "configure"
++#line 15047 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -14712,16 +15059,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14715: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15062: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14718: \$? = $ac_status" >&5
++  echo "$as_me:15065: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14721: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15068: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14724: \$? = $ac_status" >&5
++  echo "$as_me:15071: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cc_bool_type=1
+ else
+@@ -14734,9 +15081,9 @@
+ fi
+ 
+ if test "$cf_cv_cc_bool_type" = 1
+-then	echo "$as_me:14737: result: yes" >&5
++then	echo "$as_me:15084: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:14739: result: no" >&5
++else	echo "$as_me:15086: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -14758,7 +15105,7 @@
+ 	cf_stdcpp_libname=stdc++
+ 	;;
+ esac
+-echo "$as_me:14761: checking for library $cf_stdcpp_libname" >&5
++echo "$as_me:15108: checking for library $cf_stdcpp_libname" >&5
+ echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
+ if test "${cf_cv_libstdcpp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14767,7 +15114,7 @@
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS -l$cf_stdcpp_libname"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14770 "configure"
++#line 15117 "configure"
+ #include "confdefs.h"
+ 
+ #include <strstream.h>
+@@ -14783,16 +15130,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14786: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15133: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14789: \$? = $ac_status" >&5
++  echo "$as_me:15136: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14792: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15139: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14795: \$? = $ac_status" >&5
++  echo "$as_me:15142: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -14804,12 +15151,12 @@
+ 	LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:14807: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:15154: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ test "$cf_cv_libstdcpp" = yes && CXXLIBS="$CXXLIBS -l$cf_stdcpp_libname"
+ fi
+ 
+-	echo "$as_me:14812: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:15159: checking whether $CXX understands -c and -o together" >&5
+ echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
+ if test "${cf_cv_prog_CXX_c_o+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14825,15 +15172,15 @@
+ # We do the test twice because some compilers refuse to overwrite an
+ # existing .o file with -o, though they will create one.
+ ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+-if { (eval echo "$as_me:14828: \"$ac_try\"") >&5
++if { (eval echo "$as_me:15175: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14831: \$? = $ac_status" >&5
++  echo "$as_me:15178: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:14833: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:15180: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14836: \$? = $ac_status" >&5
++  echo "$as_me:15183: \$? = $ac_status" >&5
+   (exit $ac_status); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -14844,10 +15191,10 @@
+ 
+ fi
+ if test $cf_cv_prog_CXX_c_o = yes; then
+-  echo "$as_me:14847: result: yes" >&5
++  echo "$as_me:15194: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:14850: result: no" >&5
++  echo "$as_me:15197: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -14867,12 +15214,12 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:14870: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:15217: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS -l$cf_gpp_libname"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 14875 "configure"
++#line 15222 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -14886,16 +15233,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14889: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15236: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14892: \$? = $ac_status" >&5
++  echo "$as_me:15239: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14895: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15242: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14898: \$? = $ac_status" >&5
++  echo "$as_me:15245: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cxx_library=yes
+ 	 CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
+@@ -14914,7 +15261,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14917 "configure"
++#line 15264 "configure"
+ #include "confdefs.h"
+ 
+ #include <builtin.h>
+@@ -14928,16 +15275,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14931: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15278: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14934: \$? = $ac_status" >&5
++  echo "$as_me:15281: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14937: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15284: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14940: \$? = $ac_status" >&5
++  echo "$as_me:15287: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cxx_library=yes
+ 	 CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
+@@ -14954,7 +15301,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	LIBS="$cf_save"
+-	echo "$as_me:14957: result: $cf_cxx_library" >&5
++	echo "$as_me:15304: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -14970,7 +15317,7 @@
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return=return
+-echo "$as_me:14973: checking how to run the C++ preprocessor" >&5
++echo "$as_me:15320: checking how to run the C++ preprocessor" >&5
+ echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
+ if test -z "$CXXCPP"; then
+   if test "${ac_cv_prog_CXXCPP+set}" = set; then
+@@ -14987,18 +15334,18 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 14990 "configure"
++#line 15337 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:14995: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15342: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:15001: \$? = $ac_status" >&5
++  echo "$as_me:15348: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -15021,17 +15368,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15024 "configure"
++#line 15371 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:15028: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15375: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:15034: \$? = $ac_status" >&5
++  echo "$as_me:15381: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -15068,7 +15415,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:15071: result: $CXXCPP" >&5
++echo "$as_me:15418: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -15078,18 +15425,18 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15081 "configure"
++#line 15428 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:15086: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15433: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:15092: \$? = $ac_status" >&5
++  echo "$as_me:15439: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -15112,17 +15459,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15115 "configure"
++#line 15462 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:15119: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15466: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:15125: \$? = $ac_status" >&5
++  echo "$as_me:15472: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -15150,7 +15497,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:15153: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:15500: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -15165,23 +15512,23 @@
+ for ac_header in iostream typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:15168: checking for $ac_header" >&5
++echo "$as_me:15515: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15174 "configure"
++#line 15521 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:15178: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15525: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:15184: \$? = $ac_status" >&5
++  echo "$as_me:15531: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -15200,7 +15547,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:15203: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:15550: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -15211,10 +15558,10 @@
+ done
+ 
+     if test x"$ac_cv_header_iostream" = xyes ; then
+-        echo "$as_me:15214: checking if iostream uses std-namespace" >&5
++        echo "$as_me:15561: checking if iostream uses std-namespace" >&5
+ echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
+         cat >conftest.$ac_ext <<_ACEOF
+-#line 15217 "configure"
++#line 15564 "configure"
+ #include "confdefs.h"
+ 
+ #include <iostream>
+@@ -15231,16 +15578,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15234: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15581: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15237: \$? = $ac_status" >&5
++  echo "$as_me:15584: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15240: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15587: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15243: \$? = $ac_status" >&5
++  echo "$as_me:15590: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -15249,7 +15596,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-        echo "$as_me:15252: result: $cf_iostream_namespace" >&5
++        echo "$as_me:15599: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+         if test "$cf_iostream_namespace" = yes ; then
+             cat >>confdefs.h <<\EOF
+@@ -15259,7 +15606,7 @@
+         fi
+     fi
+ 
+-echo "$as_me:15262: checking if we should include stdbool.h" >&5
++echo "$as_me:15609: checking if we should include stdbool.h" >&5
+ echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
+ 
+ if test "${cf_cv_header_stdbool_h+set}" = set; then
+@@ -15267,7 +15614,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 15270 "configure"
++#line 15617 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -15279,23 +15626,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15282: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15629: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15285: \$? = $ac_status" >&5
++  echo "$as_me:15632: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15288: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15635: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15291: \$? = $ac_status" >&5
++  echo "$as_me:15638: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_header_stdbool_h=0
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15298 "configure"
++#line 15645 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -15311,16 +15658,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15314: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15661: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15317: \$? = $ac_status" >&5
++  echo "$as_me:15664: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15320: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15667: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15323: \$? = $ac_status" >&5
++  echo "$as_me:15670: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -15334,13 +15681,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:15337: result: yes" >&5
++then	echo "$as_me:15684: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:15339: result: no" >&5
++else	echo "$as_me:15686: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:15343: checking for builtin bool type" >&5
++echo "$as_me:15690: checking for builtin bool type" >&5
+ echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
+ 
+ if test "${cf_cv_builtin_bool+set}" = set; then
+@@ -15348,7 +15695,7 @@
+ else
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 15351 "configure"
++#line 15698 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -15363,16 +15710,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15366: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15713: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15369: \$? = $ac_status" >&5
++  echo "$as_me:15716: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15372: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15719: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15375: \$? = $ac_status" >&5
++  echo "$as_me:15722: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_builtin_bool=1
+ else
+@@ -15385,13 +15732,13 @@
+ fi
+ 
+ if test "$cf_cv_builtin_bool" = 1
+-then	echo "$as_me:15388: result: yes" >&5
++then	echo "$as_me:15735: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:15390: result: no" >&5
++else	echo "$as_me:15737: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:15394: checking for size of bool" >&5
++echo "$as_me:15741: checking for size of bool" >&5
+ echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
+ if test "${cf_cv_type_of_bool+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15402,7 +15749,7 @@
+   cf_cv_type_of_bool=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15405 "configure"
++#line 15752 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -15444,15 +15791,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:15447: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15794: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15450: \$? = $ac_status" >&5
++  echo "$as_me:15797: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:15452: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15799: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15455: \$? = $ac_status" >&5
++  echo "$as_me:15802: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_type_of_bool=`cat cf_test.out`
+ 		 if test -z "$cf_cv_type_of_bool"; then
+@@ -15470,18 +15817,18 @@
+ fi
+ 
+ 	rm -f cf_test.out
+-echo "$as_me:15473: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:15820: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ if test "$cf_cv_type_of_bool" = unknown ; then
+ 	case .$NCURSES_BOOL in #(vi
+ 	.auto|.) NCURSES_BOOL=unsigned;;
+ 	esac
+-	{ echo "$as_me:15479: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:15826: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+ echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
+ 	cf_cv_type_of_bool=$NCURSES_BOOL
+ fi
+ 
+-echo "$as_me:15484: checking for special defines needed for etip.h" >&5
++echo "$as_me:15831: checking for special defines needed for etip.h" >&5
+ echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
+ cf_save_CXXFLAGS="$CXXFLAGS"
+ cf_result="none"
+@@ -15493,7 +15840,7 @@
+ 	test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
+ 	test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15496 "configure"
++#line 15843 "configure"
+ #include "confdefs.h"
+ 
+ #include <etip.h.in>
+@@ -15507,16 +15854,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15510: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15857: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15513: \$? = $ac_status" >&5
++  echo "$as_me:15860: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15516: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15863: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15519: \$? = $ac_status" >&5
++  echo "$as_me:15866: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <<EOF
+@@ -15537,12 +15884,12 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ done
+-echo "$as_me:15540: result: $cf_result" >&5
++echo "$as_me:15887: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:15545: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:15892: checking if $CXX accepts parameter initialization" >&5
+ echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
+ if test "${cf_cv_cpp_param_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15559,7 +15906,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15562 "configure"
++#line 15909 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -15578,15 +15925,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:15581: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15928: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15584: \$? = $ac_status" >&5
++  echo "$as_me:15931: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:15586: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15933: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15589: \$? = $ac_status" >&5
++  echo "$as_me:15936: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -15605,7 +15952,7 @@
+ ac_main_return=return
+ 
+ fi
+-echo "$as_me:15608: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:15955: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF
+@@ -15614,7 +15961,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:15617: checking if $CXX accepts static_cast" >&5
++echo "$as_me:15964: checking if $CXX accepts static_cast" >&5
+ echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
+ if test "${cf_cv_cpp_static_cast+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15628,7 +15975,7 @@
+ ac_main_return=return
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 15631 "configure"
++#line 15978 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -15672,16 +16019,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15675: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16022: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15678: \$? = $ac_status" >&5
++  echo "$as_me:16025: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:15681: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16028: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15684: \$? = $ac_status" >&5
++  echo "$as_me:16031: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -15699,7 +16046,7 @@
+ ac_main_return=return
+ 
+ fi
+-echo "$as_me:15702: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:16049: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -15709,12 +16056,12 @@
+ EOF
+ 
+ 	CXX_AR='$(AR)'
+-	CXX_AR_OPTS='$(AR_OPTS)'
++	CXX_ARFLAGS='$(ARFLAGS)'
+ 	case $cf_cv_system_name in #(vi
+ 	irix*) #(vi
+ 	    if test "$GXX" != yes ; then
+ 		CXX_AR='$(CXX)'
+-		CXX_AR_OPTS='-ar -o'
++		CXX_ARFLAGS='-ar -o'
+ 	    fi
+ 	    ;;
+ 	sco3.2v5*) #(vi
+@@ -15723,7 +16070,7 @@
+ 	solaris2*)
+ 	    if test "$GXX" != yes ; then
+ 		CXX_AR='$(CXX)'
+-		CXX_AR_OPTS='-xar -o'
++		CXX_ARFLAGS='-xar -o'
+ 	    fi
+ 	    ;;
+ 	esac
+@@ -15747,7 +16094,7 @@
+ 	else
+ 		if test "$cf_cv_header_stdbool_h" = 1 ; then
+ 
+-echo "$as_me:15750: checking for size of bool" >&5
++echo "$as_me:16097: checking for size of bool" >&5
+ echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
+ if test "${cf_cv_type_of_bool+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15758,7 +16105,7 @@
+   cf_cv_type_of_bool=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15761 "configure"
++#line 16108 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -15800,15 +16147,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:15803: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16150: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15806: \$? = $ac_status" >&5
++  echo "$as_me:16153: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:15808: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16155: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15811: \$? = $ac_status" >&5
++  echo "$as_me:16158: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_type_of_bool=`cat cf_test.out`
+ 		 if test -z "$cf_cv_type_of_bool"; then
+@@ -15826,25 +16173,25 @@
+ fi
+ 
+ 	rm -f cf_test.out
+-echo "$as_me:15829: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:16176: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ if test "$cf_cv_type_of_bool" = unknown ; then
+ 	case .$NCURSES_BOOL in #(vi
+ 	.auto|.) NCURSES_BOOL=unsigned;;
+ 	esac
+-	{ echo "$as_me:15835: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:16182: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+ echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
+ 	cf_cv_type_of_bool=$NCURSES_BOOL
+ fi
+ 
+ 		else
+-			echo "$as_me:15841: checking for fallback type of bool" >&5
++			echo "$as_me:16188: checking for fallback type of bool" >&5
+ echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
+ 			case "$host_cpu" in #(vi
+ 			i?86)	cf_cv_type_of_bool=char	;; #(vi
+ 			*)	cf_cv_type_of_bool=int	;;
+ 			esac
+-			echo "$as_me:15847: result: $cf_cv_type_of_bool" >&5
++			echo "$as_me:16194: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ 		fi
+ 	fi
+@@ -15873,7 +16220,7 @@
+ 
+ if test "$cf_with_ada" != "no" ; then
+     if test "$with_libtool" != "no"; then
+-	{ echo "$as_me:15876: WARNING: libtool does not support Ada - disabling feature" >&5
++	{ echo "$as_me:16223: WARNING: libtool does not support Ada - disabling feature" >&5
+ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
+ 	cf_with_ada=no
+     fi
+@@ -15883,7 +16230,7 @@
+ cf_ada_make=gnatmake
+ # Extract the first word of "$cf_ada_make", so it can be a program name with args.
+ set dummy $cf_ada_make; ac_word=$2
+-echo "$as_me:15886: checking for $ac_word" >&5
++echo "$as_me:16233: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_gnat_exists+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15898,7 +16245,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_gnat_exists="yes"
+-echo "$as_me:15901: found $ac_dir/$ac_word" >&5
++echo "$as_me:16248: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -15907,10 +16254,10 @@
+ fi
+ gnat_exists=$ac_cv_prog_gnat_exists
+ if test -n "$gnat_exists"; then
+-  echo "$as_me:15910: result: $gnat_exists" >&5
++  echo "$as_me:16257: result: $gnat_exists" >&5
+ echo "${ECHO_T}$gnat_exists" >&6
+ else
+-  echo "$as_me:15913: result: no" >&5
++  echo "$as_me:16260: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -15918,11 +16265,11 @@
+    cf_ada_make=
+ else
+ 
+-echo "$as_me:15921: checking for gnat version" >&5
++echo "$as_me:16268: checking for gnat version" >&5
+ echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
+ cf_gnat_version=`${cf_ada_make-gnatmake} -v 2>&1 | grep '[0-9].[0-9][0-9]*' |\
+   sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+-echo "$as_me:15925: result: $cf_gnat_version" >&5
++echo "$as_me:16272: result: $cf_gnat_version" >&5
+ echo "${ECHO_T}$cf_gnat_version" >&6
+ 
+ case $cf_gnat_version in
+@@ -15945,7 +16292,7 @@
+ 
+    # Extract the first word of "m4", so it can be a program name with args.
+ set dummy m4; ac_word=$2
+-echo "$as_me:15948: checking for $ac_word" >&5
++echo "$as_me:16295: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_M4_exists+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15960,7 +16307,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:15963: found $ac_dir/$ac_word" >&5
++echo "$as_me:16310: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -15969,10 +16316,10 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:15972: result: $M4_exists" >&5
++  echo "$as_me:16319: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:15975: result: no" >&5
++  echo "$as_me:16322: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -15981,7 +16328,7 @@
+       echo Ada95 binding required program m4 not found. Ada95 binding disabled.
+    fi
+    if test "$cf_cv_prog_gnat_correct" = yes; then
+-      echo "$as_me:15984: checking if GNAT works" >&5
++      echo "$as_me:16331: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -f conftest*
+@@ -16009,14 +16356,14 @@
+ fi
+ rm -f conftest*
+ 
+-      echo "$as_me:16012: result: $cf_cv_prog_gnat_correct" >&5
++      echo "$as_me:16359: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+    fi
+ fi
+ if test	"$cf_cv_prog_gnat_correct" = yes; then
+    ADAFLAGS="-O3 -gnatpn $ADAFLAGS"
+ 
+-   echo "$as_me:16019: checking if GNAT pragma Unreferenced works" >&5
++   echo "$as_me:16366: checking if GNAT pragma Unreferenced works" >&5
+ echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6
+ 
+ rm -f conftest*
+@@ -16043,7 +16390,7 @@
+ fi
+ rm -f conftest*
+ 
+-   echo "$as_me:16046: result: $cf_cv_pragma_unreferenced" >&5
++   echo "$as_me:16393: result: $cf_cv_pragma_unreferenced" >&5
+ echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6
+ 
+    # if the pragma is supported, use it (needed in the Trace code).
+@@ -16096,7 +16443,7 @@
+   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+   ;;
+ *)
+-  { { echo "$as_me:16099: error: expected a pathname, not \"$withval\"" >&5
++  { { echo "$as_me:16446: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+   ;;
+@@ -16138,7 +16485,7 @@
+   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+   ;;
+ *)
+-  { { echo "$as_me:16141: error: expected a pathname, not \"$withval\"" >&5
++  { { echo "$as_me:16488: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+   ;;
+@@ -16163,7 +16510,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:16166: checking for library subsets" >&5
++echo "$as_me:16513: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -16188,7 +16535,7 @@
+ test "$with_widec"     = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
+ test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
+ 
+-echo "$as_me:16191: result: $LIB_SUBSETS" >&5
++echo "$as_me:16538: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -16226,7 +16573,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:16229: checking default library suffix" >&5
++echo "$as_me:16576: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -16237,46 +16584,50 @@
+ 	shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:16240: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:16587: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:16243: checking default library-dependency suffix" >&5
++echo "$as_me:16590: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+-	case $DFT_LWR_MODEL in
+-	libtool)
++	case $DFT_LWR_MODEL in #(vi
++	libtool) #(vi
+ 		DFT_LIB_SUFFIX='.la'
+ 		DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ 		;;
+-	normal)
++	normal) #(vi
+ 		DFT_LIB_SUFFIX='.a'
+ 		DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ 		;;
+-	debug)
++	debug) #(vi
+ 		DFT_LIB_SUFFIX='_g.a'
+ 		DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ 		;;
+-	profile)
++	profile) #(vi
+ 		DFT_LIB_SUFFIX='_p.a'
+ 		DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ 		;;
+-	shared)
++	shared) #(vi
+ 		case $cf_cv_system_name in
+-		cygwin*)
++		aix[56]*) #(vi
++			DFT_LIB_SUFFIX='.a'
++			DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
++			;;
++		cygwin*) #(vi
+ 			DFT_LIB_SUFFIX='.dll'
+ 			DFT_DEP_SUFFIX='.dll.a'
+ 			;;
+-		darwin*)
++		darwin*) #(vi
+ 			DFT_LIB_SUFFIX='.dylib'
+ 			DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ 			;;
+-		hpux*)
++		hpux*) #(vi
+ 			case $target in
+-			ia64*)
++			ia64*) #(vi
+ 				DFT_LIB_SUFFIX='.so'
+ 				DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ 				;;
+-			*)
++			*) #(vi
+ 				DFT_LIB_SUFFIX='.sl'
+ 				DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ 				;;
+@@ -16289,10 +16640,10 @@
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}"
+ 	test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}"
+-echo "$as_me:16292: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:16643: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:16295: checking default object directory" >&5
++echo "$as_me:16646: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -16308,51 +16659,55 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:16311: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:16662: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ # libtool thinks it can make c++ shared libraries (perhaps only g++)
+ if test "$cf_with_cxx" = yes ; then
+-echo "$as_me:16316: checking c++ library-dependency suffix" >&5
++echo "$as_me:16667: checking c++ library-dependency suffix" >&5
+ echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
+ if test "$with_libtool" != "no"; then
+ 	CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX
+ else
+ 
+-	case normal in
+-	libtool)
++	case normal in #(vi
++	libtool) #(vi
+ 		CXX_LIB_SUFFIX='.la'
+ 		CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
+ 		;;
+-	normal)
++	normal) #(vi
+ 		CXX_LIB_SUFFIX='.a'
+ 		CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
+ 		;;
+-	debug)
++	debug) #(vi
+ 		CXX_LIB_SUFFIX='_g.a'
+ 		CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
+ 		;;
+-	profile)
++	profile) #(vi
+ 		CXX_LIB_SUFFIX='_p.a'
+ 		CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
+ 		;;
+-	shared)
++	shared) #(vi
+ 		case $cf_cv_system_name in
+-		cygwin*)
++		aix[56]*) #(vi
++			CXX_LIB_SUFFIX='.a'
++			CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
++			;;
++		cygwin*) #(vi
+ 			CXX_LIB_SUFFIX='.dll'
+ 			CXX_DEP_SUFFIX='.dll.a'
+ 			;;
+-		darwin*)
++		darwin*) #(vi
+ 			CXX_LIB_SUFFIX='.dylib'
+ 			CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
+ 			;;
+-		hpux*)
++		hpux*) #(vi
+ 			case $target in
+-			ia64*)
++			ia64*) #(vi
+ 				CXX_LIB_SUFFIX='.so'
+ 				CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
+ 				;;
+-			*)
++			*) #(vi
+ 				CXX_LIB_SUFFIX='.sl'
+ 				CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
+ 				;;
+@@ -16366,7 +16721,7 @@
+ 	test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}"
+ 	test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}"
+ fi
+-echo "$as_me:16369: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:16724: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -16480,7 +16835,7 @@
+ 
+ if test "$GCC" = yes ; then
+ 	case $cf_cv_system_name in #(
+-	OS/2*|os2*|aix[45]*) 	#( vi
++	OS/2*|os2*|aix[4]*) 	#( vi
+ 		LDFLAGS_STATIC=
+ 		LDFLAGS_SHARED=
+ 		;;
+@@ -16491,7 +16846,7 @@
+     esac
+ else
+ 	case $cf_cv_system_name in #(
+-	aix[45]*) 	#( from ld manpage
++	aix[456]*) 	#( from ld manpage
+ 		LDFLAGS_STATIC=-bstatic
+ 		LDFLAGS_SHARED=-bdynamic
+ 		;;
+@@ -16519,12 +16874,12 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16522: checking where we will install curses.h" >&5
++echo "$as_me:16877: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ test "$with_overwrite" = no && \
+ test "x$includedir" = 'x${prefix}/include' && \
+ 	includedir='${prefix}/include/ncurses'${LIB_SUFFIX}
+-echo "$as_me:16527: result: $includedir" >&5
++echo "$as_me:16882: result: $includedir" >&5
+ echo "${ECHO_T}$includedir" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -16532,10 +16887,11 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:16535: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:16890: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+ echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
+ fi
+ fi
++WITH_OVERWRITE=$with_overwrite
+ 
+ # used to separate tack out of the tree
+ NCURSES_TREE=
+@@ -16548,7 +16904,7 @@
+ ### Construct the list of subdirectories for which we'll customize makefiles
+ ### with the appropriate compile-rules.
+ 
+-echo "$as_me:16551: checking for src modules" >&5
++echo "$as_me:16907: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -16611,13 +16967,17 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:16614: result: $cf_cv_src_modules" >&5
++echo "$as_me:16970: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+ TEST_ARG2="-L${LIB_2ND} $TEST_ARG2"
+ 
+-SRC_SUBDIRS="man include"
++SRC_SUBDIRS=
++if test "x$cf_with_manpages" != xno ; then
++	SRC_SUBDIRS="$SRC_SUBDIRS man"
++fi
++SRC_SUBDIRS="$SRC_SUBDIRS include"
+ for cf_dir in $cf_cv_src_modules
+ do
+ 	SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir"
+@@ -16628,8 +16988,8 @@
+ 
+ ADA_SUBDIRS=
+ if test "$cf_cv_prog_gnat_correct" = yes && test -f $srcdir/Ada95/Makefile.in; then
+-   SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
+-   ADA_SUBDIRS="gen src samples"
++	SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
++	ADA_SUBDIRS="gen src samples"
+ fi
+ 
+ SUB_MAKEFILES=
+@@ -16639,15 +16999,15 @@
+ done
+ 
+ if test -n "$ADA_SUBDIRS"; then
+-   for cf_dir in $ADA_SUBDIRS
+-   do
+-      SUB_MAKEFILES="$SUB_MAKEFILES Ada95/$cf_dir/Makefile"
+-   done
++	for cf_dir in $ADA_SUBDIRS
++	do
++		SUB_MAKEFILES="$SUB_MAKEFILES Ada95/$cf_dir/Makefile"
++	done
+ 
+ fi
+ 
+ if test "$cf_with_ada" != "no" && test "$cf_cv_prog_gnat_correct" != "no"; then
+-   SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses-config"
++   SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses${DFT_ARG_SUFFIX}-config:Ada95/gen/adacurses-config.in"
+ fi
+ 
+ DIRS_TO_MAKE="lib"
+@@ -16760,18 +17120,18 @@
+ ### If we're building with rpath, try to link non-standard libs that way too.
+ if test "$DFT_LWR_MODEL" = "shared"; then
+ 
+-echo "$as_me:16763: checking for updated LDFLAGS" >&5
++echo "$as_me:17123: checking for updated LDFLAGS" >&5
+ echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
+ if test -n "$LDFLAGS" ; then
+-echo "$as_me:16766: result: maybe" >&5
++echo "$as_me:17126: result: maybe" >&5
+ echo "${ECHO_T}maybe" >&6
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me-configure}:16770: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me-configure}:17130: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me-configure}:16774: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me-configure}:17134: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ case "$EXTRA_LDFLAGS" in #(vi
+ -Wl,-rpath,*) #(vi
+@@ -16793,7 +17153,7 @@
+ 	do
+ 		test -n "$verbose" && echo "	Filtering $cf_rpath_src" 1>&6
+ 
+-echo "${as_me-configure}:16796: testing Filtering $cf_rpath_src ..." 1>&5
++echo "${as_me-configure}:17156: testing Filtering $cf_rpath_src ..." 1>&5
+ 
+ 		case $cf_rpath_src in #(vi
+ 		-L*) #(vi
+@@ -16804,7 +17164,7 @@
+ 			fi
+ 			test -n "$verbose" && echo "	...Filter $cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me-configure}:16807: testing ...Filter $cf_rpath_tmp ..." 1>&5
++echo "${as_me-configure}:17167: testing ...Filter $cf_rpath_tmp ..." 1>&5
+ 
+ 			EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			;;
+@@ -16814,15 +17174,15 @@
+ 	LDFLAGS=$cf_rpath_dst
+ 	test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me-configure}:16817: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me-configure}:17177: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me-configure}:16821: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me-configure}:17181: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ fi
+ else
+-echo "$as_me:16825: result: no" >&5
++echo "$as_me:17185: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -16849,8 +17209,18 @@
+ fi
+ 
+ ################################################################################
+-test "$use_database" = yes && SUB_MAKEFILES="$SUB_MAKEFILES misc/run_tic.sh:misc/run_tic.in"
++test "$use_database" = yes && \
++SUB_MAKEFILES="$SUB_MAKEFILES misc/run_tic.sh:misc/run_tic.in"
++
+ SUB_MAKEFILES="$SUB_MAKEFILES misc/ncurses-config:misc/ncurses-config.in"
++
++if test x"$enable_pc_files" = xyes ; then \
++SUB_MAKEFILES="$SUB_MAKEFILES misc/gen-pkgconfig:misc/gen-pkgconfig.in"
++MAKE_PC_FILES=
++else
++MAKE_PC_FILES="#"
++fi
++
+ ac_config_files="$ac_config_files include/MKterm.h.awk include/curses.head:include/curses.h.in include/termcap.h include/unctrl.h $SUB_MAKEFILES Makefile"
+ ac_config_commands="$ac_config_commands default"
+ cat >confcache <<\_ACEOF
+@@ -16932,7 +17302,7 @@
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:16935: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:17305: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+@@ -17064,7 +17434,7 @@
+ cat >>$CONFIG_STATUS <<EOF
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.52.20080325,
++configured by $0, generated by GNU Autoconf 2.52.20081225,
+   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+ 
+ Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+@@ -17108,7 +17478,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:17111: error: ambiguous option: $1
++    { { echo "$as_me:17481: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&5
+ echo "$as_me: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&2;}
+@@ -17127,7 +17497,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:17130: error: unrecognized option: $1
++  -*) { { echo "$as_me:17500: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&5
+ echo "$as_me: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&2;}
+@@ -17146,7 +17516,7 @@
+ ## Running config.status.  ##
+ ## ----------------------- ##
+ 
+-This file was extended by $as_me 2.52.20080325, executed with
++This file was extended by $as_me 2.52.20081225, executed with
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+   CONFIG_LINKS    = $CONFIG_LINKS
+@@ -17181,13 +17551,13 @@
+ NCURSES_PATCH="$NCURSES_PATCH"
+ SRC_SUBDIRS="$SRC_SUBDIRS"
+ TERMINFO="$TERMINFO"
++TICS_ARG_SUFFIX="$TICS_ARG_SUFFIX"
++TICS_LIB_SUFFIX="$TICS_LIB_SUFFIX"
++TICS_NAME="$TICS_NAME"
+ TINFO_ARG_SUFFIX="$TINFO_ARG_SUFFIX"
+ TINFO_LIB_SUFFIX="$TINFO_LIB_SUFFIX"
+ TINFO_NAME="$TINFO_NAME"
+ TINFO_SUFFIX="$TINFO_SUFFIX"
+-TICS_ARG_SUFFIX="$TICS_ARG_SUFFIX"
+-TICS_LIB_SUFFIX="$TICS_LIB_SUFFIX"
+-TICS_NAME="$TICS_NAME"
+ WITH_CURSES_H="$with_curses_h"
+ WITH_ECHO="$with_echo"
+ WITH_OVERWRITE="$with_overwrite"
+@@ -17206,6 +17576,7 @@
+ cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix"
+ cf_cv_system_name="$cf_cv_system_name"
+ cf_with_cxx_binding="$cf_with_cxx_binding"
++cf_with_manpages="$cf_with_manpages"
+ host="$host"
+ target="$target"
+ 
+@@ -17224,7 +17595,7 @@
+   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
+-  *) { { echo "$as_me:17227: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:17598: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -17349,6 +17720,8 @@
+ s,@LINT@,$LINT,;t t
+ s,@LINT_OPTS@,$LINT_OPTS,;t t
+ s,@LN_S@,$LN_S,;t t
++s,@PKG_CONFIG@,$PKG_CONFIG,;t t
++s,@PKG_CONFIG_LIBDIR@,$PKG_CONFIG_LIBDIR,;t t
+ s,@SET_MAKE@,$SET_MAKE,;t t
+ s,@MAKE_LOWER_TAGS@,$MAKE_LOWER_TAGS,;t t
+ s,@MAKE_UPPER_TAGS@,$MAKE_UPPER_TAGS,;t t
+@@ -17359,7 +17732,7 @@
+ s,@ac_ct_LD@,$ac_ct_LD,;t t
+ s,@AR@,$AR,;t t
+ s,@ac_ct_AR@,$ac_ct_AR,;t t
+-s,@AR_OPTS@,$AR_OPTS,;t t
++s,@ARFLAGS@,$ARFLAGS,;t t
+ s,@DESTDIR@,$DESTDIR,;t t
+ s,@BUILD_CC@,$BUILD_CC,;t t
+ s,@BUILD_CPP@,$BUILD_CPP,;t t
+@@ -17392,6 +17765,7 @@
+ s,@CXX_G_OPT@,$CXX_G_OPT,;t t
+ s,@LD_MODEL@,$LD_MODEL,;t t
+ s,@CC_SHARED_OPTS@,$CC_SHARED_OPTS,;t t
++s,@LD_RPATH_OPT@,$LD_RPATH_OPT,;t t
+ s,@LD_SHARED_OPTS@,$LD_SHARED_OPTS,;t t
+ s,@MK_SHARED_LIB@,$MK_SHARED_LIB,;t t
+ s,@LINK_PROGS@,$LINK_PROGS,;t t
+@@ -17425,6 +17799,7 @@
+ s,@NCURSES_OSPEED@,$NCURSES_OSPEED,;t t
+ s,@MANPAGE_RENAMES@,$MANPAGE_RENAMES,;t t
+ s,@NCURSES_EXT_FUNCS@,$NCURSES_EXT_FUNCS,;t t
++s,@GENERATED_EXT_FUNCS@,$GENERATED_EXT_FUNCS,;t t
+ s,@NCURSES_CONST@,$NCURSES_CONST,;t t
+ s,@NCURSES_EXT_COLORS@,$NCURSES_EXT_COLORS,;t t
+ s,@NCURSES_MOUSE_VERSION@,$NCURSES_MOUSE_VERSION,;t t
+@@ -17449,7 +17824,7 @@
+ s,@CXXCPP@,$CXXCPP,;t t
+ s,@CXXLDFLAGS@,$CXXLDFLAGS,;t t
+ s,@CXX_AR@,$CXX_AR,;t t
+-s,@CXX_AR_OPTS@,$CXX_AR_OPTS,;t t
++s,@CXX_ARFLAGS@,$CXX_ARFLAGS,;t t
+ s,@CXXLIBS@,$CXXLIBS,;t t
+ s,@USE_CXX_BOOL@,$USE_CXX_BOOL,;t t
+ s,@gnat_exists@,$gnat_exists,;t t
+@@ -17493,6 +17868,7 @@
+ s,@HAVE_TCGETATTR@,$HAVE_TCGETATTR,;t t
+ s,@HAVE_TERMIO_H@,$HAVE_TERMIO_H,;t t
+ s,@HAVE_TERMIOS_H@,$HAVE_TERMIOS_H,;t t
++s,@MAKE_PC_FILES@,$MAKE_PC_FILES,;t t
+ CEOF
+ 
+ EOF
+@@ -17607,7 +17983,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:17610: creating $ac_file" >&5
++    { echo "$as_me:17986: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -17625,7 +18001,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:17628: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:18004: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -17638,7 +18014,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:17641: error: cannot find input file: $f" >&5
++           { { echo "$as_me:18017: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -17704,7 +18080,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:17707: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:18083: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -17715,7 +18091,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:17718: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:18094: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -17728,7 +18104,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:17731: error: cannot find input file: $f" >&5
++           { { echo "$as_me:18107: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -17786,7 +18162,7 @@
+   rm -f $tmp/in
+   if test x"$ac_file" != x-; then
+     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
+-      { echo "$as_me:17789: $ac_file is unchanged" >&5
++      { echo "$as_me:18165: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -17873,40 +18249,44 @@
+ 		for cf_item in $cf_LIST_MODELS
+ 		do
+ 
+-	case $cf_item in
+-	libtool)
++	case $cf_item in #(vi
++	libtool) #(vi
+ 		cf_suffix='.la'
+ 		cf_depsuf=$cf_suffix
+ 		;;
+-	normal)
++	normal) #(vi
+ 		cf_suffix='.a'
+ 		cf_depsuf=$cf_suffix
+ 		;;
+-	debug)
++	debug) #(vi
+ 		cf_suffix='_g.a'
+ 		cf_depsuf=$cf_suffix
+ 		;;
+-	profile)
++	profile) #(vi
+ 		cf_suffix='_p.a'
+ 		cf_depsuf=$cf_suffix
+ 		;;
+-	shared)
++	shared) #(vi
+ 		case $cf_cv_system_name in
+-		cygwin*)
++		aix[56]*) #(vi
++			cf_suffix='.a'
++			cf_depsuf=$cf_suffix
++			;;
++		cygwin*) #(vi
+ 			cf_suffix='.dll'
+ 			cf_depsuf='.dll.a'
+ 			;;
+-		darwin*)
++		darwin*) #(vi
+ 			cf_suffix='.dylib'
+ 			cf_depsuf=$cf_suffix
+ 			;;
+-		hpux*)
++		hpux*) #(vi
+ 			case $target in
+-			ia64*)
++			ia64*) #(vi
+ 				cf_suffix='.so'
+ 				cf_depsuf=$cf_suffix
+ 				;;
+-			*)
++			*) #(vi
+ 				cf_suffix='.sl'
+ 				cf_depsuf=$cf_suffix
+ 				;;
+@@ -18020,40 +18400,44 @@
+ 
+ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ 
+-	case $cf_item in
+-	libtool)
++	case $cf_item in #(vi
++	libtool) #(vi
+ 		cf_suffix='.la'
+ 		cf_depsuf=$cf_suffix
+ 		;;
+-	normal)
++	normal) #(vi
+ 		cf_suffix='.a'
+ 		cf_depsuf=$cf_suffix
+ 		;;
+-	debug)
++	debug) #(vi
+ 		cf_suffix='_g.a'
+ 		cf_depsuf=$cf_suffix
+ 		;;
+-	profile)
++	profile) #(vi
+ 		cf_suffix='_p.a'
+ 		cf_depsuf=$cf_suffix
+ 		;;
+-	shared)
++	shared) #(vi
+ 		case $cf_cv_system_name in
+-		cygwin*)
++		aix[56]*) #(vi
++			cf_suffix='.a'
++			cf_depsuf=$cf_suffix
++			;;
++		cygwin*) #(vi
+ 			cf_suffix='.dll'
+ 			cf_depsuf='.dll.a'
+ 			;;
+-		darwin*)
++		darwin*) #(vi
+ 			cf_suffix='.dylib'
+ 			cf_depsuf=$cf_suffix
+ 			;;
+-		hpux*)
++		hpux*) #(vi
+ 			case $target in
+-			ia64*)
++			ia64*) #(vi
+ 				cf_suffix='.so'
+ 				cf_depsuf=$cf_suffix
+ 				;;
+-			*)
++			*) #(vi
+ 				cf_suffix='.sl'
+ 				cf_depsuf=$cf_suffix
+ 				;;
+@@ -18234,18 +18618,28 @@
+ install.libs uninstall.libs \\
+ install.data uninstall.data ::
+ $MAKE_TERMINFO	cd misc && \${MAKE} \${CF_MFLAGS} \$@
++CF_EOF
++
++if test "x$cf_with_manpages" = xyes; then
++cat >> Makefile <<CF_EOF
+ 
+ install.man \\
+ uninstall.man ::
+ 	cd man && \${MAKE} \${CF_MFLAGS} \$@
++CF_EOF
++fi
++
++cat >> Makefile <<CF_EOF
+ 
+ distclean ::
+ 	rm -f config.cache config.log config.status Makefile include/ncurses_cfg.h
+ 	rm -f headers.sh headers.sed mk_shared_lib.sh
++	rm -f edit_man.* man_alias.*
+ 	rm -rf \${DIRS_TO_MAKE}
+ CF_EOF
+ 
+ # Special case: tack's manpage lives in its own directory.
++if test "x$cf_with_manpages" = xyes; then
+ if test -d tack ; then
+ if test -f $srcdir/$tack.h; then
+ cat >> Makefile <<CF_EOF
+@@ -18256,6 +18650,7 @@
+ CF_EOF
+ fi
+ fi
++fi
+ 
+ rm -f headers.sed headers.sh
+ 
+diff -Naur ncurses-5.7.orig/configure.in ncurses-5.7/configure.in
+--- ncurses-5.7.orig/configure.in	2008-10-18 07:53:32.000000000 -0700
++++ ncurses-5.7/configure.in	2009-01-18 23:56:40.000000000 -0800
+@@ -1,5 +1,5 @@
+ dnl***************************************************************************
+-dnl Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
++dnl Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+ dnl                                                                          *
+ dnl Permission is hereby granted, free of charge, to any person obtaining a  *
+ dnl copy of this software and associated documentation files (the            *
+@@ -28,14 +28,14 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: configure.in,v 1.454 2008/10/18 14:53:32 tom Exp $
++dnl $Id: configure.in,v 1.464 2009/01/10 19:18:03 tom Exp $
+ dnl Process this file with autoconf to produce a configure script.
+ dnl
+ dnl See http://invisible-island.net/autoconf/ for additional information.
+ dnl
+ dnl ---------------------------------------------------------------------------
+ AC_PREREQ(2.13.20020210)
+-AC_REVISION($Revision: 1.454 $)
++AC_REVISION($Revision: 1.464 $)
+ AC_INIT(ncurses/base/lib_initscr.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -122,6 +122,13 @@
+ 	[cf_with_ada=yes])
+ AC_MSG_RESULT($cf_with_ada)
+ 
++AC_MSG_CHECKING(if you want to install manpages)
++AC_ARG_WITH(manpages,
++	[  --without-manpages      suppress install of manpages],
++	[cf_with_manpages=$withval],
++	[cf_with_manpages=yes])
++AC_MSG_RESULT($cf_with_manpages)
++
+ AC_MSG_CHECKING(if you want to build programs such as tic)
+ AC_ARG_WITH(progs,
+ 	[  --without-progs         suppress build with programs (e.g., tic)],
+@@ -152,6 +159,31 @@
+ 
+ AC_SYS_LONG_FILE_NAMES
+ 
++# if we find pkg-config, check if we should install the ".pc" files.
++CF_PKG_CONFIG
++
++if test "$PKG_CONFIG" != no ; then
++	AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG)
++
++	# Leave this as something that can be overridden in the environment.
++	if test -z "$PKG_CONFIG_LIBDIR" ; then
++		PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'`/lib/pkgconfig
++	fi
++
++	if test -d "$PKG_CONFIG_LIBDIR" ; then
++		AC_ARG_ENABLE(pc-files,
++			[  --enable-pc-files       generate and install .pc files for pkg-config],
++			[enable_pc_files=$enableval],
++			[enable_pc_files=no])
++		AC_MSG_RESULT($enable_pc_files)
++	else
++		AC_MSG_RESULT(no)
++		AC_MSG_WARN(did not find library $PKG_CONFIG_LIBDIR)
++		enable_pc_files=no
++	fi
++fi
++AC_SUBST(PKG_CONFIG_LIBDIR)
++
+ AC_MSG_CHECKING(if we should assume mixed-case filenames)
+ AC_ARG_ENABLE(mixed-case,
+ 	[  --enable-mixed-case     tic should assume mixed-case filenames],
+@@ -176,7 +208,7 @@
+ AC_CHECK_TOOL(RANLIB, ranlib, ':')
+ AC_CHECK_TOOL(LD, ld, ld)
+ AC_CHECK_TOOL(AR, ar, ar)
+-CF_SUBST(archiver options,AR_OPTS,rv)
++CF_AR_FLAGS
+ 
+ dnl Special option for use by system-builders: the install-prefix is used to
+ dnl adjust the location into which the actual install is done, so that an
+@@ -807,7 +839,7 @@
+ test "$with_rcs_ids" = yes && AC_DEFINE(USE_RCS_IDS)
+ 
+ ###############################################################################
+-CF_MAN_PAGES([ captoinfo clear infocmp infotocap tic toe tput ])
++CF_MAN_PAGES([ captoinfo clear infocmp infotocap tabs tic toe tput tset ])
+ 
+ ###############################################################################
+ CF_HELP_MESSAGE(Extensions:)
+@@ -828,10 +860,13 @@
+ 	AC_DEFINE(HAVE_USE_DEFAULT_COLORS)
+ 	AC_DEFINE(HAVE_WRESIZE)
+ 	AC_DEFINE(NCURSES_EXT_FUNCS)
++	GENERATED_EXT_FUNCS=generated
+ else
+ 	NCURSES_EXT_FUNCS=0
++	GENERATED_EXT_FUNCS=
+ fi
+ AC_SUBST(NCURSES_EXT_FUNCS)
++AC_SUBST(GENERATED_EXT_FUNCS)
+ 
+ ###   use option --enable-const to turn on use of const beyond that in XSI.
+ AC_MSG_CHECKING(for extended use of const keyword)
+@@ -1354,12 +1389,12 @@
+ 	CF_CPP_STATIC_CAST
+ 
+ 	CXX_AR='$(AR)'
+-	CXX_AR_OPTS='$(AR_OPTS)'
++	CXX_ARFLAGS='$(ARFLAGS)'
+ 	case $cf_cv_system_name in #(vi
+ 	irix*) #(vi
+ 	    if test "$GXX" != yes ; then
+ 		CXX_AR='$(CXX)'
+-		CXX_AR_OPTS='-ar -o'
++		CXX_ARFLAGS='-ar -o'
+ 	    fi
+ 	    ;;
+ 	sco3.2v5*) #(vi
+@@ -1368,13 +1403,13 @@
+ 	solaris2*)
+ 	    if test "$GXX" != yes ; then
+ 		CXX_AR='$(CXX)'
+-		CXX_AR_OPTS='-xar -o'
++		CXX_ARFLAGS='-xar -o'
+ 	    fi
+ 	    ;;
+ 	esac
+ 	AC_SUBST(CXXLDFLAGS)
+ 	AC_SUBST(CXX_AR)
+-	AC_SUBST(CXX_AR_OPTS)
++	AC_SUBST(CXX_ARFLAGS)
+ else
+ 	cf_cxx_library=no
+ 	cf_cv_builtin_bool=1
+@@ -1723,6 +1758,7 @@
+ 	AC_MSG_WARN(Wide-character applications must define HAVE_LIBUTF8_H to include curses.h)
+ fi
+ fi
++WITH_OVERWRITE=$with_overwrite
+ 
+ AC_SUBST(WITH_OVERWRITE)
+ AC_SUBST(TICS_LIST)
+@@ -1742,7 +1778,7 @@
+ CF_SRC_MODULES($modules_to_build)
+ 
+ if test "$cf_with_ada" != "no" && test "$cf_cv_prog_gnat_correct" != "no"; then
+-   SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses-config"
++   SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses${DFT_ARG_SUFFIX}-config:Ada95/gen/adacurses-config.in"
+ fi
+ 
+ CF_DIRS_TO_MAKE
+@@ -1765,8 +1801,19 @@
+ CF_SUBST_IF(["$ac_cv_header_termios_h" = yes], HAVE_TERMIOS_H, 1, 0)
+ 
+ ################################################################################
+-test "$use_database" = yes && SUB_MAKEFILES="$SUB_MAKEFILES misc/run_tic.sh:misc/run_tic.in"
++test "$use_database" = yes && \
++SUB_MAKEFILES="$SUB_MAKEFILES misc/run_tic.sh:misc/run_tic.in"
++
+ SUB_MAKEFILES="$SUB_MAKEFILES misc/ncurses-config:misc/ncurses-config.in"
++
++if test x"$enable_pc_files" = xyes ; then \
++SUB_MAKEFILES="$SUB_MAKEFILES misc/gen-pkgconfig:misc/gen-pkgconfig.in"
++MAKE_PC_FILES=
++else
++MAKE_PC_FILES="#"
++fi
++AC_SUBST(MAKE_PC_FILES)
++
+ AC_OUTPUT( \
+ 	include/MKterm.h.awk \
+ 	include/curses.head:include/curses.h.in \
+@@ -1796,13 +1843,13 @@
+ NCURSES_PATCH="$NCURSES_PATCH"
+ SRC_SUBDIRS="$SRC_SUBDIRS"
+ TERMINFO="$TERMINFO"
++TICS_ARG_SUFFIX="$TICS_ARG_SUFFIX"
++TICS_LIB_SUFFIX="$TICS_LIB_SUFFIX"
++TICS_NAME="$TICS_NAME"
+ TINFO_ARG_SUFFIX="$TINFO_ARG_SUFFIX"
+ TINFO_LIB_SUFFIX="$TINFO_LIB_SUFFIX"
+ TINFO_NAME="$TINFO_NAME"
+ TINFO_SUFFIX="$TINFO_SUFFIX"
+-TICS_ARG_SUFFIX="$TICS_ARG_SUFFIX"
+-TICS_LIB_SUFFIX="$TICS_LIB_SUFFIX"
+-TICS_NAME="$TICS_NAME"
+ WITH_CURSES_H="$with_curses_h"
+ WITH_ECHO="$with_echo"
+ WITH_OVERWRITE="$with_overwrite"
+@@ -1821,6 +1868,7 @@
+ cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix"
+ cf_cv_system_name="$cf_cv_system_name"
+ cf_with_cxx_binding="$cf_with_cxx_binding"
++cf_with_manpages="$cf_with_manpages"
+ host="$host"
+ target="$target"
+ 
+diff -Naur ncurses-5.7.orig/dist.mk ncurses-5.7/dist.mk
+--- ncurses-5.7.orig/dist.mk	2008-11-01 17:58:38.000000000 -0700
++++ ncurses-5.7/dist.mk	2009-01-18 23:56:41.000000000 -0800
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.671 2008/11/02 00:58:38 tom Exp $
++# $Id: dist.mk,v 1.683 2009/01/17 16:29:15 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -37,7 +37,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 5
+ NCURSES_MINOR = 7
+-NCURSES_PATCH = 20081102
++NCURSES_PATCH = 20090117
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+diff -Naur ncurses-5.7.orig/form/Makefile.in ncurses-5.7/form/Makefile.in
+--- ncurses-5.7.orig/form/Makefile.in	2007-04-28 07:56:11.000000000 -0700
++++ ncurses-5.7/form/Makefile.in	2009-01-18 23:56:35.000000000 -0800
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.47 2007/04/28 14:56:11 tom Exp $
++# $Id: Makefile.in,v 1.48 2009/01/03 19:09:26 tom Exp $
+ ##############################################################################
+-# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.                #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
+@@ -70,7 +70,7 @@
+ INSTALL_DATA	= @INSTALL_DATA@
+ 
+ AR		= @AR@
+-AR_OPTS		= @AR_OPTS@
++ARFLAGS		= @ARFLAGS@
+ AWK		= @AWK@
+ LD		= @LD@
+ LN_S		= @LN_S@
+diff -Naur ncurses-5.7.orig/form/frm_driver.c ncurses-5.7/form/frm_driver.c
+--- ncurses-5.7.orig/form/frm_driver.c	2008-10-18 09:25:00.000000000 -0700
++++ ncurses-5.7/form/frm_driver.c	2009-01-18 23:56:25.000000000 -0800
+@@ -32,7 +32,7 @@
+ 
+ #include "form.priv.h"
+ 
+-MODULE_ID("$Id: frm_driver.c,v 1.88 2008/10/18 16:25:00 tom Exp $")
++MODULE_ID("$Id: frm_driver.c,v 1.89 2008/12/06 23:08:12 tom Exp $")
+ 
+ /*----------------------------------------------------------------------------
+   This is the core module of the form library. It contains the majority
+@@ -4366,6 +4366,7 @@
+       delwin(field->working);
+       field->working = newpad(field->drows, field->dcols);
+     }
++  len = Buffer_Length(field);
+   wclear(field->working);
+   mvwaddstr(field->working, 0, 0, value);
+ 
+diff -Naur ncurses-5.7.orig/include/curses.h.in ncurses-5.7/include/curses.h.in
+--- ncurses-5.7.orig/include/curses.h.in	2008-08-30 13:11:29.000000000 -0700
++++ ncurses-5.7/include/curses.h.in	2009-01-18 23:56:29.000000000 -0800
+@@ -32,7 +32,7 @@
+  *     and: Thomas E. Dickey                        1996-on                 *
+  ****************************************************************************/
+ 
+-/* $Id: curses.h.in,v 1.187 2008/08/30 20:11:29 tom Exp $ */
++/* $Id: curses.h.in,v 1.190 2008/12/20 22:28:52 tom Exp $ */
+ 
+ #ifndef __NCURSES_H
+ #define __NCURSES_H
+@@ -40,12 +40,6 @@
+ #define CURSES 1
+ #define CURSES_H 1
+ 
+-/* This should be defined for the enhanced functionality to be visible.
+- * However, some of the wide-character (enhanced) functionality is missing.
+- * So we do not define it (yet).
+-#define _XOPEN_CURSES 1
+- */
+-
+ /* These are defined only in curses.h, and are used for conditional compiles */
+ #define NCURSES_VERSION_MAJOR @NCURSES_MAJOR@
+ #define NCURSES_VERSION_MINOR @NCURSES_MINOR@
+@@ -856,18 +850,18 @@
+  * These extensions provide access to information stored in the WINDOW even
+  * when NCURSES_OPAQUE is set:
+  */
+-extern NCURSES_EXPORT(WINDOW *) wgetparent (const WINDOW *);	/* generated */
+-extern NCURSES_EXPORT(bool) is_cleared (const WINDOW *);	/* generated */
+-extern NCURSES_EXPORT(bool) is_idcok (const WINDOW *);		/* generated */
+-extern NCURSES_EXPORT(bool) is_idlok (const WINDOW *);		/* generated */
+-extern NCURSES_EXPORT(bool) is_immedok (const WINDOW *);	/* generated */
+-extern NCURSES_EXPORT(bool) is_keypad (const WINDOW *);		/* generated */
+-extern NCURSES_EXPORT(bool) is_leaveok (const WINDOW *);	/* generated */
+-extern NCURSES_EXPORT(bool) is_nodelay (const WINDOW *);	/* generated */
+-extern NCURSES_EXPORT(bool) is_notimeout (const WINDOW *);	/* generated */
+-extern NCURSES_EXPORT(bool) is_scrollok (const WINDOW *);	/* generated */
+-extern NCURSES_EXPORT(bool) is_syncok (const WINDOW *);		/* generated */
+-extern NCURSES_EXPORT(int) wgetscrreg (const WINDOW *, int *, int *); /* generated */
++extern NCURSES_EXPORT(WINDOW *) wgetparent (const WINDOW *);	/* @GENERATED_EXT_FUNCS@ */
++extern NCURSES_EXPORT(bool) is_cleared (const WINDOW *);	/* @GENERATED_EXT_FUNCS@ */
++extern NCURSES_EXPORT(bool) is_idcok (const WINDOW *);		/* @GENERATED_EXT_FUNCS@ */
++extern NCURSES_EXPORT(bool) is_idlok (const WINDOW *);		/* @GENERATED_EXT_FUNCS@ */
++extern NCURSES_EXPORT(bool) is_immedok (const WINDOW *);	/* @GENERATED_EXT_FUNCS@ */
++extern NCURSES_EXPORT(bool) is_keypad (const WINDOW *);		/* @GENERATED_EXT_FUNCS@ */
++extern NCURSES_EXPORT(bool) is_leaveok (const WINDOW *);	/* @GENERATED_EXT_FUNCS@ */
++extern NCURSES_EXPORT(bool) is_nodelay (const WINDOW *);	/* @GENERATED_EXT_FUNCS@ */
++extern NCURSES_EXPORT(bool) is_notimeout (const WINDOW *);	/* @GENERATED_EXT_FUNCS@ */
++extern NCURSES_EXPORT(bool) is_scrollok (const WINDOW *);	/* @GENERATED_EXT_FUNCS@ */
++extern NCURSES_EXPORT(bool) is_syncok (const WINDOW *);		/* @GENERATED_EXT_FUNCS@ */
++extern NCURSES_EXPORT(int) wgetscrreg (const WINDOW *, int *, int *); /* @GENERATED_EXT_FUNCS@ */
+ 
+ #else
+ #define curses_version() NCURSES_VERSION
+diff -Naur ncurses-5.7.orig/include/curses.tail ncurses-5.7/include/curses.tail
+--- ncurses-5.7.orig/include/curses.tail	2008-07-05 13:20:38.000000000 -0700
++++ ncurses-5.7/include/curses.tail	2009-01-18 23:56:21.000000000 -0800
+@@ -1,4 +1,4 @@
+-/* $Id: curses.tail,v 1.16 2008/07/05 20:20:38 tom Exp $ */
++/* $Id: curses.tail,v 1.17 2008/11/23 00:12:12 tom Exp $ */
+ /*
+  * vile:cmode:
+  * This file is part of ncurses, designed to be appended after curses.h.in
+@@ -94,6 +94,7 @@
+ }
+ MEVENT;
+ 
++extern NCURSES_EXPORT(bool) has_mouse (void);
+ extern NCURSES_EXPORT(int) getmouse (MEVENT *);
+ extern NCURSES_EXPORT(int) ungetmouse (MEVENT *);
+ extern NCURSES_EXPORT(mmask_t) mousemask (mmask_t, mmask_t *);
+diff -Naur ncurses-5.7.orig/include/curses.wide ncurses-5.7/include/curses.wide
+--- ncurses-5.7.orig/include/curses.wide	2007-03-10 09:52:23.000000000 -0800
++++ ncurses-5.7/include/curses.wide	2009-01-18 23:56:23.000000000 -0800
+@@ -1,9 +1,11 @@
+-/* $Id: curses.wide,v 1.34 2007/03/10 17:52:23 tom Exp $ */
++/* $Id: curses.wide,v 1.36 2008/11/29 18:44:08 tom Exp $ */
+ /*
+  * vile:cmode:
+  * This file is part of ncurses, designed to be appended after curses.h.in
+  * (see that file for the relevant copyright).
+  */
++#define _XOPEN_CURSES 1
++
+ #ifdef _XOPEN_SOURCE_EXTENDED
+ 
+ extern NCURSES_EXPORT_VAR(cchar_t *) _nc_wacs;
+diff -Naur ncurses-5.7.orig/man/curs_mouse.3x ncurses-5.7/man/curs_mouse.3x
+--- ncurses-5.7.orig/man/curs_mouse.3x	2006-12-30 15:43:34.000000000 -0800
++++ ncurses-5.7/man/curs_mouse.3x	2009-01-18 23:56:21.000000000 -0800
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -27,11 +27,12 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_mouse.3x,v 1.30 2006/12/30 23:43:34 tom Exp $
++.\" $Id: curs_mouse.3x,v 1.31 2008/11/23 00:09:53 tom Exp $
+ .TH curs_mouse 3X ""
+ .na
+ .hy 0
+ .SH NAME
++\fBhas_mouse\fR,
+ \fBgetmouse\fR, \fBungetmouse\fR,
+ \fBmousemask\fR, \fBwenclose\fR,
+ \fBmouse_trafo\fR, \fBwmouse_trafo\fR,
+@@ -53,7 +54,9 @@
+ MEVENT;\fR
+ .fi
+ .br
+-\fBint getmouse(MEVENT *event);\fR
++\fBbool has_mouse(void);\fR
++.br
++-\fBint getmouse(MEVENT *event);\fR
+ .br
+ \fBint ungetmouse(MEVENT *event);\fR
+ .br
+@@ -197,6 +200,9 @@
+ Use \fBmouseinterval(-1)\fR to obtain the interval without altering it.
+ The default is one sixth of a second.
+ .PP
++The \fBhas_mouse\fP function returns TRUE if the mouse driver has been
++successfully initialized.
++.PP
+ Note that mouse events will be ignored when input is in cooked mode, and will
+ cause an error beep when cooked mode is being simulated in a window by a
+ function such as \fBgetstr\fR that expects a linefeed for input-loop
+diff -Naur ncurses-5.7.orig/man/keybound.3x ncurses-5.7/man/keybound.3x
+--- ncurses-5.7.orig/man/keybound.3x	2006-02-25 13:47:06.000000000 -0800
++++ ncurses-5.7/man/keybound.3x	2009-01-18 23:56:27.000000000 -0800
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1999-2003,2006 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1999-2006,2008 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -28,8 +28,8 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1999
+ .\"
+-.\" $Id: keybound.3x,v 1.6 2006/02/25 21:47:06 tom Exp $
+-.TH keyok 3X ""
++.\" $Id: keybound.3x,v 1.7 2008/12/13 18:19:07 Frederic.Culot Exp $
++.TH keybound 3X ""
+ .SH NAME
+ \fBkeybound\fP \- return definition of keycode
+ .SH SYNOPSIS
+diff -Naur ncurses-5.7.orig/man/tabs.1 ncurses-5.7/man/tabs.1
+--- ncurses-5.7.orig/man/tabs.1	1969-12-31 16:00:00.000000000 -0800
++++ ncurses-5.7/man/tabs.1	2009-01-18 23:56:19.000000000 -0800
+@@ -0,0 +1,143 @@
++.\"***************************************************************************
++.\" Copyright (c) 2008 Free Software Foundation, Inc.                        *
++.\"                                                                          *
++.\" Permission is hereby granted, free of charge, to any person obtaining a  *
++.\" copy of this software and associated documentation files (the            *
++.\" "Software"), to deal in the Software without restriction, including      *
++.\" without limitation the rights to use, copy, modify, merge, publish,      *
++.\" distribute, distribute with modifications, sublicense, and/or sell       *
++.\" copies of the Software, and to permit persons to whom the Software is    *
++.\" furnished to do so, subject to the following conditions:                 *
++.\"                                                                          *
++.\" The above copyright notice and this permission notice shall be included  *
++.\" in all copies or substantial portions of the Software.                   *
++.\"                                                                          *
++.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
++.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
++.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
++.\" IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
++.\" DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
++.\" OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
++.\" THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
++.\"                                                                          *
++.\" Except as contained in this notice, the name(s) of the above copyright   *
++.\" holders shall not be used in advertising or otherwise to promote the     *
++.\" sale, use or other dealings in this Software without prior written       *
++.\" authorization.                                                           *
++.\"***************************************************************************
++.\"
++.\" $Id: tabs.1,v 1.2 2008/11/15 23:03:45 tom Exp $
++.TH @TABS@ 1M ""
++.ds n 5
++.SH NAME
++\fBtabs\fR - set tabs on a terminal
++.SH SYNOPSIS
++\fBtabs\fR [\fB-v\fR[\fIn\fR]] [\fB-ahuUV\fR] \fIfile...\fR
++.br
++.SH DESCRIPTION
++.PP
++The \fBtabs\fP program clears and sets tab-stops on the terminal.
++This uses the terminfo \fIclear_all_tabs\fP and \fIset_tab\fP capabilities.
++If either is absent, \fBtabs\fP is unable to clear/set tab-stops.
++The terminal should be configured to use hard tabs, e.g.,
++.sp
++.RS
++stty tab0
++.RE
++.SH OPTIONS
++.SS General Options
++.TP 5
++.BI -T "name"
++Tell \fBtabs\fP which terminal type to use.
++If this option is not given, \fBtabs\fP will use the \fB$TERM\fP
++environment variable.
++If that is not set, it will use the \fIansi+tabs\fP entry.
++.TP 5
++.B -d
++The debugging option shows a ruler line, followed by two data lines.
++The first data line shows the expected tab-stops marked with asterisks.
++The second data line shows the actual tab-stops, marked with asterisks.
++.TP 5
++.B -n
++This option tells \fBtabs\fP to check the options and run any debugging
++option, but not to modify the terminal settings.
++.PP
++The \fBtabs\fP program processes a single list of tab stops.
++The last option to be processed which defines a list is the one that
++determines the list to be processed.
++.SS Implicit Lists
++Use a single number as an option, e.g., "\fB-5\fP" to set tabs at the given
++interval (in this case 1, 6, 11, 16, 21, etc.).  Tabs are repeated up to
++the right margin of the screen.
++.SS Explicit Lists
++An explicit list can be defined after the options (this does not use a "-").
++The values in the list must be in increasing numeric order, and greater than
++zero.  They are separated by a comma or a blank, for example,
++.sp
++.RS
++tabs 1,6,11,16,21
++.br
++tabs 1 6 11 16 21
++.RE
++Use a '+' to treat a number as an increment relative to the previous value,
++e.g.,
++.sp
++.RS
++tabs 1,+5,+5,+5,+5
++.RE
++which is equivalent to the 1,6,11,16,21 example.
++.SS Predefined Tab-Stops
++X/Open defines several predefined lists of tab stops.
++.TP 5
++.B -a
++Assembler, IBM S/370, first format
++.TP 5
++.B -a2
++Assembler, IBM S/370, second format
++.TP 5
++.B -c
++COBOL, normal format
++.TP 5
++.B -c2
++COBOL compact format
++.TP 5
++.B -c3
++COBOL compact format extended
++.TP 5
++.B -f
++FORTRAN
++.TP 5
++.B -p
++PL/I
++.TP 5
++.B -s
++SNOBOL
++.TP 5
++.B -u
++UNIVAC 1100 Assembler
++.SH PORTABILITY
++.PP
++X/Open describes a \fB+m\fP option, to set a terminal's left-margin.
++None of the entries in the terminal database provide this capability.
++.PP
++The \fB-d\fP (debug) and \fB-n\fP (no-op) options are extensions not provided
++by other implementations.
++.PP
++Documentation for other implementations states that there is a limit on the
++number of tab stops.  While some terminals may not accept an arbitrary number
++of tab stops, this implementation will attempt to set tab stops up to the
++right margin of the screen, if the given list happens to be that long.
++.SH SEE ALSO
++\fB@TSET@\fR(1),
++\fB@INFOCMP@\fR(1M),
++\fBcurses\fR(3X),
++\fBterminfo\fR(\*n).
++.PP
++This describes \fBncurses\fR
++version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
++.\"#
++.\"# The following sets edit modes for GNU EMACS
++.\"# Local Variables:
++.\"# mode:nroff
++.\"# fill-column:79
++.\"# End:
+diff -Naur ncurses-5.7.orig/man/tset.1 ncurses-5.7/man/tset.1
+--- ncurses-5.7.orig/man/tset.1	2006-12-24 07:00:30.000000000 -0800
++++ ncurses-5.7/man/tset.1	2009-01-18 23:56:19.000000000 -0800
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+ .\" copy of this software and associated documentation files (the            *
+@@ -26,8 +26,8 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tset.1,v 1.19 2006/12/24 15:00:30 tom Exp $
+-.TH tset 1 ""
++.\" $Id: tset.1,v 1.20 2008/11/15 23:14:06 tom Exp $
++.TH @TSET@ 1 ""
+ .SH NAME
+ \fBtset\fR, \fBreset\fR - terminal initialization
+ .SH SYNOPSIS
+diff -Naur ncurses-5.7.orig/menu/Makefile.in ncurses-5.7/menu/Makefile.in
+--- ncurses-5.7.orig/menu/Makefile.in	2007-04-28 07:56:11.000000000 -0700
++++ ncurses-5.7/menu/Makefile.in	2009-01-18 23:56:35.000000000 -0800
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.48 2007/04/28 14:56:11 tom Exp $
++# $Id: Makefile.in,v 1.49 2009/01/03 19:09:26 tom Exp $
+ ##############################################################################
+-# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.                #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
+@@ -70,7 +70,7 @@
+ INSTALL_DATA	= @INSTALL_DATA@
+ 
+ AR		= @AR@
+-AR_OPTS		= @AR_OPTS@
++ARFLAGS		= @ARFLAGS@
+ AWK		= @AWK@
+ LD		= @LD@
+ LN_S		= @LN_S@
+diff -Naur ncurses-5.7.orig/misc/Makefile.in ncurses-5.7/misc/Makefile.in
+--- ncurses-5.7.orig/misc/Makefile.in	2007-03-31 08:54:17.000000000 -0700
++++ ncurses-5.7/misc/Makefile.in	2009-01-18 23:56:35.000000000 -0800
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.43 2007/03/31 15:54:17 tom Exp $
++# $Id: Makefile.in,v 1.48 2009/01/03 23:52:41 tom Exp $
+ ##############################################################################
+-# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.                #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
+@@ -66,9 +66,11 @@
+ source		= @TERMINFO_SRC@
+ 
+ INSTALL		= @INSTALL@
+-INSTALL_PROG	= @INSTALL_PROGRAM@
++INSTALL_PROG	= @INSTALL_SCRIPT@
+ INSTALL_DATA	= @INSTALL_DATA@
+ 
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++
+ ################################################################################
+ all :	terminfo.tmp
+ 
+@@ -103,9 +105,16 @@
+ 
+ NCURSES_CONFIG	= ncurses@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config
+ 
+-install.libs : $(DESTDIR)$(bindir) ncurses-config
++install.libs :: $(DESTDIR)$(bindir) ncurses-config
+ 	$(INSTALL_PROG) ncurses-config $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
+ 
++@MAKE_PC_FILES@install.libs :: pc-files
++@MAKE_PC_FILES@	$(SHELL) -c 'for name in *.pc; do $(INSTALL_DATA) $$name $(PKG_CONFIG_LIBDIR)/$$name; done'
++
++@MAKE_PC_FILES@pc-files :
++@MAKE_PC_FILES@	$(SHELL) ./gen-pkgconfig
++@MAKE_PC_FILES@	touch $@
++
+ terminfo.tmp : run_tic.sed $(source)
+ 	echo '** adjusting tabset paths'
+ 	sed -f run_tic.sed $(source) >terminfo.tmp
+@@ -130,6 +139,7 @@
+ 
+ uninstall.libs :
+ 	-rm -f $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
++@MAKE_PC_FILES@	$(SHELL) 'for name in *.pc; do rm -f $(PKG_CONFIG_LIBDIR)/$$name; done'
+ 
+ tags :
+ 
+@@ -138,11 +148,13 @@
+ mostlyclean :
+ 	-rm -f terminfo.tmp
+ 	-rm -f run_tic.sed
++@MAKE_PC_FILES@	-rm -f *.pc pc-files
+ 	-rm -f core tags TAGS *~ *.bak *.ln *.atac trace
+ 
+ clean :: mostlyclean
+ 
+ distclean : clean
++@MAKE_PC_FILES@	-rm -f gen-pkgconfig
+ 	-rm -f Makefile run_tic.sh ncurses-config
+ 
+ realclean : distclean
+diff -Naur ncurses-5.7.orig/misc/gen-pkgconfig.in ncurses-5.7/misc/gen-pkgconfig.in
+--- ncurses-5.7.orig/misc/gen-pkgconfig.in	1969-12-31 16:00:00.000000000 -0800
++++ ncurses-5.7/misc/gen-pkgconfig.in	2009-01-18 23:56:36.000000000 -0800
+@@ -0,0 +1,119 @@
++#!@SHELL@
++# $Id: gen-pkgconfig.in,v 1.4 2009/01/04 21:52:33 tom Exp $
++##############################################################################
++# Copyright (c) 2009 Free Software Foundation, Inc.                          #
++#                                                                            #
++# Permission is hereby granted, free of charge, to any person obtaining a    #
++# copy of this software and associated documentation files (the "Software"), #
++# to deal in the Software without restriction, including without limitation  #
++# the rights to use, copy, modify, merge, publish, distribute, distribute    #
++# with modifications, sublicense, and/or sell copies of the Software, and to #
++# permit persons to whom the Software is furnished to do so, subject to the  #
++# following conditions:                                                      #
++#                                                                            #
++# The above copyright notice and this permission notice shall be included in #
++# all copies or substantial portions of the Software.                        #
++#                                                                            #
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,   #
++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL    #
++# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER      #
++# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING    #
++# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER        #
++# DEALINGS IN THE SOFTWARE.                                                  #
++#                                                                            #
++# Except as contained in this notice, the name(s) of the above copyright     #
++# holders shall not be used in advertising or otherwise to promote the sale, #
++# use or other dealings in this Software without prior written               #
++# authorization.                                                             #
++##############################################################################
++#
++# Author: Thomas E. Dickey, 2009
++#
++# The complete configure script for ncurses is the ncurses5-config (or similar
++# name, depending on the flavor, e.g., ncursesw5-config, ncurses6-config, etc).
++# That provides more information than pkg-config, and is the portable and
++# recommended solution.
++#
++# For each library, generate a ".pc" file which depends on the base ncurses
++# library, except that the tinfo library does not depend on ncurses.
++LIB_NAME=@LIB_NAME@
++TINFO_NAME=@TINFO_NAME@
++DFT_DEP_SUFFIX=@DFT_DEP_SUFFIX@
++CXX_LIB_SUFFIX=@CXX_LIB_SUFFIX@
++
++prefix="@prefix@"
++exec_prefix="@exec_prefix@"
++includedir="@includedir@"
++libdir="@libdir@"
++
++show_prefix='@prefix@'
++show_exec_prefix='@exec_prefix@'
++show_includedir='@includedir@'
++show_libdir='@libdir@'
++
++MAIN_LIBRARY="${LIB_NAME}@DFT_ARG_SUFFIX@"
++SUB_LIBRARY="${TINFO_NAME}@DFT_ARG_SUFFIX@"
++
++for lib in ../lib/*
++do
++	name=`basename $lib`
++	root=`basename $name "$DFT_DEP_SUFFIX"`
++	if test "$name" == "$root" ; then
++		root=`basename $name "$CXX_LIB_SUFFIX"`
++		if test "$name" == "$root" ; then
++			continue
++		fi
++	fi
++
++	name=`echo "$name" | sed -e 's/^lib//' -e 's/\..*$//'`
++
++	desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"
++	if test $name = $MAIN_LIBRARY ; then
++		reqs=
++		desc="$desc library"
++	elif test $name = $SUB_LIBRARY ; then
++		reqs=
++		desc="$desc terminal interface library"
++	else
++		reqs=$MAIN_LIBRARY
++		desc="$desc add-on library"
++	fi
++
++	if test "$includedir" = "/usr/include" ; then
++		cflags=
++	else
++		cflags="-I\${includedir}"
++	fi
++
++	if test "$libdir" = "/usr/lib" ; then
++		libs=
++	else
++		libs="-L\${libdir}"
++	fi
++	libs="$libs -l$name"
++
++	# add dependencies that pkg-config cannot guess about
++	if test -z "$reqs" ; then
++		libs="$libs @LIBS@"
++	fi
++
++	echo "** creating ${name}.pc"
++	cat >${name}.pc <<EOF
++prefix=$show_prefix
++exec_prefix=$show_exec_prefix
++libdir=$show_libdir
++includedir=$show_includedir
++major_version=@NCURSES_MAJOR@
++version=@NCURSES_MAJOR@.@NCURSES_MINOR@.@NCURSES_PATCH@
++
++Name: $name
++Description: $desc
++Version: \${version}
++Requires: $reqs
++Libs: $libs
++Cflags: $cflags
++EOF
++	# pr -f ${name}.pc
++done
++# vile:shmode
+diff -Naur ncurses-5.7.orig/misc/ncurses-config.in ncurses-5.7/misc/ncurses-config.in
+--- ncurses-5.7.orig/misc/ncurses-config.in	2007-03-17 13:02:19.000000000 -0700
++++ ncurses-5.7/misc/ncurses-config.in	2009-01-18 23:56:38.000000000 -0800
+@@ -1,7 +1,7 @@
+ #!@SHELL@
+-# $Id: ncurses-config.in,v 1.12 2007/03/17 20:02:19 tom Exp $
++# $Id: ncurses-config.in,v 1.21 2009/01/06 01:06:21 tom Exp $
+ ##############################################################################
+-# Copyright (c) 2006,2007 Free Software Foundation, Inc.                     #
++# Copyright (c) 2006-2007,2009 Free Software Foundation, Inc.                #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
+@@ -28,58 +28,54 @@
+ # authorization.                                                             #
+ ##############################################################################
+ #
+-# Author: Thomas E. Dickey, 2006
++# Author: Thomas E. Dickey, 2006-on
+ 
+ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ 
+ bindir="@bindir@"
++includedir="@includedir@"
+ libdir="@libdir@"
+ datadir="@datadir@"
+ mandir="@mandir@"
+ 
+-THIS="ncurses@DFT_ARG_SUFFIX@"
++THIS="@LIB_NAME@@DFT_ARG_SUFFIX@"
+ 
+ LANG=C;		export LANG
+ LANGUAGE=C;	export LANGUAGE
+ LC_ALL=C;	export LC_ALL
+ LC_CTYPE=C;	export LC_CTYPE
+ 
+-test $# = 0 && exec @SHELL@ $0 --error
+-
+-while test $# -gt 0; do
+-	case "$1" in
+-	-*=*)
+-		ARG=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
+-		;;
+-	*)
+-		ARG=
++# with --disable-overwrite, we installed into a subdirectory, but transformed
++# the headers to include like this:
++#	<ncurses@LIB_SUFFIX@/curses.h>
++if test x@WITH_OVERWRITE@ = xno ; then
++	case $includedir in
++	$prefix/include/ncurses@LIB_SUFFIX@)
++		includedir=`echo "$includedir" | sed -e 's,/[^/]*$,,'`
+ 		;;
+ 	esac
++fi
+ 
++test $# = 0 && exec @SHELL@ $0 --error
++
++while test $# -gt 0; do
+ 	case "$1" in
+ 	# basic configuration
+-	--prefix=*)
+-		prefix="$ARG"
+-		test -z "$exec_prefix" && exec_prefix="$ARG"
+-		;;
+ 	--prefix)
+ 		echo "$prefix"
+ 		;;
+-	--exec-prefix=*)
+-		exec_prefix="$ARG"
+-		;;
+ 	--exec-prefix)
+ 		echo "$exec_prefix"
+ 		;;
+ 	# compile/link
+ 	--cflags)
+ 		INCS=
+-		if test "${prefix}/include" != /usr/include ; then
+-			INCS="-I${prefix}/include"
++		if test "${includedir}" != /usr/include ; then
++			INCS="-I${includedir}"
+ 		fi
+-		if test "@WITH_OVERWRITE@" != no ; then
+-			INCS="$INCS -I${prefix}/include/${THIS}"
++		if test "x@WITH_OVERWRITE@" == xno ; then
++			INCS="$INCS -I${includedir}/${THIS}"
+ 		fi
+ 		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
+ 			$INCS
+@@ -87,7 +83,7 @@
+ 		;;
+ 	--libs)
+ 		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
+-			-L${exec_prefix}/lib @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
++			-L$libdir @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
+ ENDECHO
+ 		;;
+ 	# identification
+@@ -107,6 +103,9 @@
+ 	--datadir)
+ 		echo "${datadir}"
+ 		;;
++	--includedir)
++		echo "${includedir}"
++		;;
+ 	--libdir)
+ 		echo "${libdir}"
+ 		;;
+@@ -129,9 +128,7 @@
+ 
+ Options:
+   --prefix           echos the package-prefix of ${THIS}
+-  --prefix=ARG       sets the package-prefix of ${THIS}
+   --exec-prefix      echos the executable-prefix of ${THIS}
+-  --exec-prefix=ARG  sets the executable-prefix of ${THIS}
+ 
+   --cflags           echos the C compiler flags needed to compile with ${THIS}
+   --libs             echos the libraries needed to link with ${THIS}
+@@ -142,6 +139,7 @@
+ 
+   --bindir           echos the directory containing ${THIS} programs
+   --datadir          echos the directory containing ${THIS} data
++  --includedir       echos the directory containing ${THIS} header files
+   --libdir           echos the directory containing ${THIS} libraries
+   --mandir           echos the directory containing ${THIS} manpages
+   --terminfo         echos the \$TERMINFO terminfo database path
+diff -Naur ncurses-5.7.orig/misc/terminfo.src ncurses-5.7/misc/terminfo.src
+--- ncurses-5.7.orig/misc/terminfo.src	2008-10-12 16:03:54.000000000 -0700
++++ ncurses-5.7/misc/terminfo.src	2009-01-18 23:56:40.000000000 -0800
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.341 $
+-#	$Date: 2008/10/12 23:03:54 $
++#	$Revision: 1.345 $
++#	$Date: 2009/01/11 00:47:37 $
+ #
+ # The original header is preserved below for reference.  It is noted that there
+ # is a "newer" version which differs in some cosmetic details (but actually
+@@ -340,7 +340,7 @@
+ 	cub=\E[%p1%dD, cud=\E[%p1%dB, cuf=\E[%p1%dC,
+ 	cuu=\E[%p1%dA, use=ansi+local1,
+ ansi+tabs,
+-	cbt=\E[Z, ht=^I, hts=\EH, tbc=\E[2g,
++	cbt=\E[Z, ht=^I, hts=\EH, tbc=\E[3g,
+ ansi+inittabs,
+ 	it#8, use=ansi+tabs,
+ ansi+erase,
+@@ -545,7 +545,7 @@
+ 	cud1=\E[B, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A,
+ 	dch1=\E[P, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I,
+ 	hts=\EH, il1=\E[L, ind=^J, kbs=^H, kcub1=\E[D, kcud1=\E[B,
+-	kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, tbc=\E[2g,
++	kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, tbc=\E[3g,
+ 	use=klone+sgr-dumb,
+ pcansi-25-m|pcansi25m|ibm-pc terminal programs with 25 lines (mono mode),
+ 	lines#25, use=pcansi-m,
+@@ -576,7 +576,7 @@
+ 	kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+ 	kich1=\E[L, mc4=\E[4i, mc5=\E[5i, nel=\r\E[S,
+ 	rep=%p1%c\E[%p2%{1}%-%db, rin=\E[%p1%dT, s0ds=\E(B,
+-	s1ds=\E)B, s2ds=\E*B, s3ds=\E+B, tbc=\E[2g,
++	s1ds=\E)B, s2ds=\E*B, s3ds=\E+B, tbc=\E[3g,
+ 	vpa=\E[%i%p1%dd, use=pcansi-m,
+ 
+ ansi+enq|ncurses extension for ANSI ENQ,
+@@ -1005,7 +1005,7 @@
+ 	sc=\E7,
+ 	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,
+ 	sgr0=\E[0;10m, smacs=\E[12m, smso=\E[7m, smul=\E[4m,
+-	tbc=\E[2g, vpa=\E[%i%p1%dd, use=klone+color,
++	tbc=\E[3g, vpa=\E[%i%p1%dd, use=klone+color,
+ # (pc6300plus: removed ":KM=/usr/lib/ua/kmap.s5:"; renamed BO/EE/CI/CV -- esr)
+ pc6300plus|AT&T 6300 plus,
+ 	OTbs, am, xon,
+@@ -1416,7 +1416,7 @@
+ 	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
+ 	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%;,
+ 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smso=\E[7m,
+-	smul=\E[4m, tbc=\E[2g,
++	smul=\E[4m, tbc=\E[3g,
+ 	tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH,
+ #
+ qansi|QNX ansi with console writes,
+@@ -4357,6 +4357,26 @@
+ 	sgr0=\E[m, smcup=\E7\E[?47h, smir=\E[4h, smso=\E[7m,
+ 	smul=\E[4m,
+ 
++# The codes supported by the term.el terminal emulation in GNU Emacs 22.2
++eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96,
++	am, mir, msgr, xenl,
++	colors#8, cols#80, lines#24, pairs#64,
++	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=^M,
++	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
++	cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
++	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
++	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J,
++	el=\E[K, el1=\E[1K, home=\E[H, ht=^I, ich=\E[%p1%d@,
++	il=\E[%p1%dL, il1=\E[L, ind=^J, invis=\E[8m, kbs=\177,
++	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
++	kdch1=\E[3~, kend=\E[4~, khome=\E[1~, kich1=\E[2~,
++	knp=\E[6~, kpp=\E[5~, op=\E[39;49m, rc=\E8, rev=\E[7m,
++	ri=\EM, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
++	sc=\E7, setab=\E[%p1%'('%+%dm, setaf=\E[%p1%{30}%+%dm,
++	sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;m,
++	sgr0=\E[m, smir=\E[4h, smso=\E[7m, smul=\E[4m,
++	u6=\E[%i%d;%dR, u7=\E[6n,
++
+ # Entries for use by the `screen' program by Juergen Weigert,
+ # Michael Schroeder, Oliver Laumann.  The screen and
+ # screen-w entries came with version 3.7.1.  The screen2 and screen3 entries
+@@ -4497,6 +4517,8 @@
+ 	cvvis@, flash@, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
+ 	kcuu1=\EOA, use=screen+fkeys, use=vt100+enq,
+ 	use=rxvt+pcfkeys, use=vt220+keypad, use=screen,
++screen.Eterm|screen in Eterm,
++	use=screen+fkeys, use=Eterm,
+ # fix the backspace key
+ screen.linux|screen in linux console,
+ 	bw,
+@@ -5247,7 +5269,7 @@
+ 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+ 	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,
+ 	sgr0=\E[0;10m, smacs=\E[11m, smir=\E[4h, smso=\E[7m,
+-	smul=\E[4m, tbc=\E[2g, vpa=\E[%i%p1%dd, use=vt102+enq,
++	smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=vt102+enq,
+ 
+ # Key definitions:
+ # The encodings for unshifted arrow keys, F1-F12, Home, Insert, etc.  match the
+@@ -11060,7 +11082,7 @@
+ 	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m,
+ 	sgr0=\E[m,
+ 	smkx=\EP`>z~[[J`8xz~[[A`4xz~[[D`6xz~[[C`2xz~[[B\E\\,
+-	smm=\E[>52h, smso=\E[7m, smul=\E[4m, tbc=\E[2g,
++	smm=\E[>52h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+ 	vpa=\E[%p1%{1}%+%dd,
+ 
+ aaa+rv|ann arbor ambassador in reverse video,
+@@ -12147,7 +12169,7 @@
+ 	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m,
+ 	sgr0=\E[m, smacs=\017$<1>, smcup=\E[=4l\E[1;24w\E2\r,
+ 	smir=\E[4h, smkx=\E[1!z\E[0;3u, smso=\E[7m, smul=\E[4m,
+-	tbc=\E[2g, vpa=\E[%p1%{1}%+%dd,
++	tbc=\E[3g, vpa=\E[%p1%{1}%+%dd,
+ avt-rv-ns|concept avt in reverse video mode/no status line,
+ 	flash=\E[=205l$<200>\E[=205h, is1=\E[=103l\E[=205h,
+ 	use=avt-ns,
+@@ -14584,7 +14606,7 @@
+ 	sc=\E[%y,
+ 	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%;,
+ 	sgr0=\E[0m\017, smir=\E[4h, smso=\E[7m, smul=\E[4m,
+-	tbc=\E[2g, tsl=\E[%i%p1%d%%}, vpa=\E[%i%p1%dd,
++	tbc=\E[3g, tsl=\E[%i%p1%d%%}, vpa=\E[%i%p1%dd,
+ 
+ # p9-w: Prism-9 in 132 column mode
+ # --------------------------------
+@@ -16037,7 +16059,7 @@
+ 	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, rmam=\E[?7l,
+ 	rmso=\E[m, rmul=\E[m,
+ 	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m,
+-	sgr0=\E[m, smam=\E[?7h, smso=\E[7m, smul=\E[4m, tbc=\E[2g,
++	sgr0=\E[m, smam=\E[?7h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+ 	vpa=\E[%p1%{1}%+%dd,
+ # The tek4125 emulates a vt100 incorrectly - the scrolling region
+ # command is ignored.  The following entry replaces <csr> with the needed
+@@ -17729,7 +17751,7 @@
+ 	rmul=\E[m, rs2=\E[?=h\Ec, s0ds=^O, s1ds=^N,
+ 	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%;,
+ 	sgr0=\E[m\017, smacs=^N, smcup=\E[?>h\EPY99\:98\E\\,
+-	smir=\E[4h, smso=\E[0;7m, smul=\E[0;4m, tbc=\E[2g,
++	smir=\E[4h, smso=\E[0;7m, smul=\E[0;4m, tbc=\E[3g,
+ 	tsl=\EPY99\:98\E\\\E[0;98v\E[2;7m,
+ tws2102-sna|dku7102-sna|BULL Questar tws2102 for SNA,
+ 	dsl=\E[0;98v\E[2J\E[v, fsl=\E[v, is3=\Eb, tsl=\E[0;98v,
+@@ -21791,6 +21813,16 @@
+ #	* add "aterm" -TD
+ #	* add "linux2.6.26" -TD
+ #
++# 2008-11-15
++#	* change several \E[2g (clear tab at current column) to \E[3g
++#	  (clear all tabs) to match definition for tbc capability -TD
++#
++# 2008-11-29
++#	* add eterm-color -TD
++#
++# 2009-01-10
++#	* add screen.Eterm -TD
++#
+ # The following sets edit modes for GNU EMACS.
+ # Local Variables:
+ # fill-prefix:"\t"
+diff -Naur ncurses-5.7.orig/mk-1st.awk ncurses-5.7/mk-1st.awk
+--- ncurses-5.7.orig/mk-1st.awk	2007-03-24 15:10:55.000000000 -0700
++++ ncurses-5.7/mk-1st.awk	2009-01-18 23:56:36.000000000 -0800
+@@ -1,6 +1,6 @@
+-# $Id: mk-1st.awk,v 1.78 2007/03/24 22:10:55 tom Exp $
++# $Id: mk-1st.awk,v 1.80 2009/01/04 21:51:38 tom Exp $
+ ##############################################################################
+-# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.                #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
+@@ -59,7 +59,7 @@
+ 		return ( subset ~ /^ticlib$/ );
+ 	}
+ function is_termlib() {
+-		return ( subset ~ /^(ticlib\+)?termlib(\+ext_tinfo)?$/ );
++		return ( subset ~ /^(ticlib\+)?termlib((\+[^+ ]+)*\+ext_tinfo)?$/ );
+ 	}
+ # see lib_name
+ function lib_name_of(a_name) {
+@@ -404,7 +404,7 @@
+ 			{
+ 				end_name = lib_name;
+ 				printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS
+-				printf "\t$(AR) $(AR_OPTS) $@ $?\n"
++				printf "\t$(AR) $(ARFLAGS) $@ $?\n"
+ 				printf "\t$(RANLIB) $@\n"
+ 				if ( host == "vxworks" )
+ 				{
+diff -Naur ncurses-5.7.orig/ncurses/Makefile.in ncurses-5.7/ncurses/Makefile.in
+--- ncurses-5.7.orig/ncurses/Makefile.in	2008-10-18 07:11:54.000000000 -0700
++++ ncurses-5.7/ncurses/Makefile.in	2009-01-18 23:56:35.000000000 -0800
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.113 2008/10/18 14:11:54 tom Exp $
++# $Id: Makefile.in,v 1.114 2009/01/03 19:09:26 tom Exp $
+ ##############################################################################
+-# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.                #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
+@@ -78,7 +78,7 @@
+ INSTALL_DATA	= @INSTALL_DATA@
+ 
+ AR		= @AR@
+-AR_OPTS		= @AR_OPTS@
++ARFLAGS		= @ARFLAGS@
+ AWK		= @AWK@
+ LD		= @LD@
+ LN_S		= @LN_S@
+diff -Naur ncurses-5.7.orig/ncurses/base/lib_addch.c ncurses-5.7/ncurses/base/lib_addch.c
+--- ncurses-5.7.orig/ncurses/base/lib_addch.c	2008-08-16 12:20:04.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_addch.c	2009-01-18 23:56:41.000000000 -0800
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -36,7 +36,7 @@
+ #include <curses.priv.h>
+ #include <ctype.h>
+ 
+-MODULE_ID("$Id: lib_addch.c,v 1.113 2008/08/16 19:20:04 tom Exp $")
++MODULE_ID("$Id: lib_addch.c,v 1.115 2009/01/17 20:37:32 tom Exp $")
+ 
+ static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
+ 
+@@ -265,15 +265,25 @@
+ 	    int len = _nc_build_wch(win, CHREF(ch));
+ 
+ 	    if (len >= -1) {
+-		/* handle EILSEQ */
++		attr_t attr = AttrOf(ch);
++
++		/* handle EILSEQ (i.e., when len >= -1) */
+ 		if (is8bits(CharOf(ch))) {
++		    int rc = OK;
+ 		    const char *s = unctrl((chtype) CharOf(ch));
+-		    if (s[1] != 0) {
+-			return waddstr(win, s);
++
++		    if (s[1] != '\0') {
++			while (*s != '\0') {
++			    rc = waddch(win, UChar(*s) | attr);
++			    if (rc != OK)
++				break;
++			    ++s;
++			}
++			return rc;
+ 		    }
+ 		}
+ 		if (len == -1)
+-		    return waddch(win, ' ');
++		    return waddch(win, ' ' | attr);
+ 	    } else {
+ 		return OK;
+ 	    }
+@@ -327,6 +337,7 @@
+ 		    return ERR;
+ 		x = win->_curx;
+ 		y = win->_cury;
++		line = win->_line + y;
+ 	    }
+ 	    /*
+ 	     * Check for cells which are orphaned by adding this character, set
+diff -Naur ncurses-5.7.orig/ncurses/base/lib_freeall.c ncurses-5.7/ncurses/base/lib_freeall.c
+--- ncurses-5.7.orig/ncurses/base/lib_freeall.c	2008-09-27 06:09:57.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_freeall.c	2009-01-18 23:56:25.000000000 -0800
+@@ -40,7 +40,7 @@
+ extern int malloc_errfd;	/* FIXME */
+ #endif
+ 
+-MODULE_ID("$Id: lib_freeall.c,v 1.54 2008/09/27 13:09:57 tom Exp $")
++MODULE_ID("$Id: lib_freeall.c,v 1.55 2008/12/06 23:52:29 tom Exp $")
+ 
+ /*
+  * Free all ncurses data.  This is used for testing only (there's no practical
+@@ -98,8 +98,6 @@
+ 	delscreen(SP);
+ 	_nc_unlock_global(curses);
+     }
+-    if (cur_term != 0)
+-	del_curterm(cur_term);
+ 
+     (void) _nc_printf_string(0, empty_va);
+ #ifdef TRACE
+diff -Naur ncurses-5.7.orig/ncurses/base/lib_mouse.c ncurses-5.7/ncurses/base/lib_mouse.c
+--- ncurses-5.7.orig/ncurses/base/lib_mouse.c	2008-10-18 14:48:55.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_mouse.c	2009-01-18 23:56:25.000000000 -0800
+@@ -79,7 +79,7 @@
+ 
+ #include <curses.priv.h>
+ 
+-MODULE_ID("$Id: lib_mouse.c,v 1.102 2008/10/18 21:48:55 tom Exp $")
++MODULE_ID("$Id: lib_mouse.c,v 1.104 2008/11/30 01:37:27 tom Exp $")
+ 
+ #include <term.h>
+ #include <tic.h>
+@@ -694,11 +694,16 @@
+ 
+ #if USE_GPM_SUPPORT
+     case M_GPM:
+-	{
++	if (sp->_mouse_fd >= 0) {
+ 	    /* query server for event, return TRUE if we find one */
+ 	    Gpm_Event ev;
+ 
+-	    if (my_Gpm_GetEvent(&ev) == 1) {
++	    switch (my_Gpm_GetEvent(&ev)) {
++	    case 0:
++		/* Connection closed, drop the mouse. */
++		sp->_mouse_fd = -1;
++		break;
++	    case 1:
+ 		/* there's only one mouse... */
+ 		eventp->id = NORMAL_EVENT;
+ 
+@@ -731,6 +736,7 @@
+ 		/* bump the next-free pointer into the circular list */
+ 		sp->_mouse_eventp = eventp = NEXT(eventp);
+ 		result = TRUE;
++		break;
+ 	    }
+ 	}
+ 	break;
+@@ -1397,10 +1403,16 @@
+ 
+ /* This may be used by other routines to ask for the existence of mouse
+    support */
+-NCURSES_EXPORT(int)
+-_nc_has_mouse(void)
++NCURSES_EXPORT(bool)
++_nc_has_mouse(SCREEN *sp)
++{
++    return ((sp->_mouse_type == M_NONE) ? FALSE : TRUE);
++}
++
++NCURSES_EXPORT(bool)
++has_mouse(void)
+ {
+-    return (SP->_mouse_type == M_NONE ? 0 : 1);
++    return _nc_has_mouse(SP);
+ }
+ 
+ NCURSES_EXPORT(bool)
+diff -Naur ncurses-5.7.orig/ncurses/curses.priv.h ncurses-5.7/ncurses/curses.priv.h
+--- ncurses-5.7.orig/ncurses/curses.priv.h	2008-10-04 14:37:45.000000000 -0700
++++ ncurses-5.7/ncurses/curses.priv.h	2009-01-18 23:56:21.000000000 -0800
+@@ -34,7 +34,7 @@
+ 
+ 
+ /*
+- * $Id: curses.priv.h,v 1.394 2008/10/04 21:37:45 tom Exp $
++ * $Id: curses.priv.h,v 1.395 2008/11/23 00:09:04 tom Exp $
+  *
+  *	curses.priv.h
+  *
+@@ -1519,7 +1519,7 @@
+ extern NCURSES_EXPORT(void) _nc_screen_wrap (void);
+ 
+ /* lib_mouse.c */
+-extern NCURSES_EXPORT(int) _nc_has_mouse (void);
++extern NCURSES_EXPORT(bool) _nc_has_mouse (SCREEN *);
+ 
+ /* lib_mvcur.c */
+ #define INFINITY	1000000	/* cost: too high to use */
+diff -Naur ncurses-5.7.orig/ncurses/tinfo/entries.c ncurses-5.7/ncurses/tinfo/entries.c
+--- ncurses-5.7.orig/ncurses/tinfo/entries.c	2008-09-27 06:11:10.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/entries.c	2009-01-18 23:56:25.000000000 -0800
+@@ -37,7 +37,7 @@
+ #include <tic.h>
+ #include <term_entry.h>
+ 
+-MODULE_ID("$Id: entries.c,v 1.8 2008/09/27 13:11:10 tom Exp $")
++MODULE_ID("$Id: entries.c,v 1.10 2008/12/07 00:11:45 tom Exp $")
+ 
+ /****************************************************************************
+  *
+@@ -117,6 +117,9 @@
+ 
+     T((T_CALLED("_nc_free_tinfo()")));
+ #if NO_LEAKS
++    if (cur_term != 0)
++	del_curterm(cur_term);
++
+     _nc_free_tparm();
+     _nc_tgetent_leaks();
+     _nc_free_entries(_nc_head);
+diff -Naur ncurses-5.7.orig/ncurses/tinfo/hashed_db.c ncurses-5.7/ncurses/tinfo/hashed_db.c
+--- ncurses-5.7.orig/ncurses/tinfo/hashed_db.c	2006-08-19 12:48:38.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/hashed_db.c	2009-01-18 23:56:27.000000000 -0800
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2006 Free Software Foundation, Inc.                        *
++ * Copyright (c) 2006,2008 Free Software Foundation, Inc.                   *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -27,7 +27,7 @@
+  ****************************************************************************/
+ 
+ /****************************************************************************
+- *  Author: Thomas E. Dickey                        2006                    *
++ *  Author: Thomas E. Dickey                        2006-on                 *
+  ****************************************************************************/
+ 
+ #include <curses.priv.h>
+@@ -36,7 +36,7 @@
+ 
+ #if USE_HASHED_DB
+ 
+-MODULE_ID("$Id: hashed_db.c,v 1.13 2006/08/19 19:48:38 tom Exp $")
++MODULE_ID("$Id: hashed_db.c,v 1.14 2008/12/13 20:59:02 tom Exp $")
+ 
+ #if HASHED_DB_API >= 2
+ static DBC *cursor;
+@@ -49,27 +49,30 @@
+ _nc_db_open(const char *path, bool modify)
+ {
+     DB *result = 0;
++    int code;
+ 
+ #if HASHED_DB_API >= 4
+     db_create(&result, NULL, 0);
+-    result->open(result,
+-		 NULL,
+-		 path,
+-		 NULL,
+-		 DB_HASH,
+-		 modify ? DB_CREATE : DB_RDONLY,
+-		 0644);
++    if ((code = result->open(result,
++			     NULL,
++			     path,
++			     NULL,
++			     DB_HASH,
++			     modify ? DB_CREATE : DB_RDONLY,
++			     0644)) != 0) {
++	result = 0;
++    }
+ #elif HASHED_DB_API >= 3
+     db_create(&result, NULL, 0);
+-    result->open(result,
+-		 path,
+-		 NULL,
+-		 DB_HASH,
+-		 modify ? DB_CREATE : DB_RDONLY,
+-		 0644);
++    if ((code = result->open(result,
++			     path,
++			     NULL,
++			     DB_HASH,
++			     modify ? DB_CREATE : DB_RDONLY,
++			     0644)) != 0) {
++	result = 0;
++    }
+ #elif HASHED_DB_API >= 2
+-    int code;
+-
+     if ((code = db_open(path,
+ 			DB_HASH,
+ 			modify ? DB_CREATE : DB_RDONLY,
+@@ -77,21 +80,22 @@
+ 			(DB_ENV *) 0,
+ 			(DB_INFO *) 0,
+ 			&result)) != 0) {
+-	T(("cannot open %s: %s", path, strerror(code)));
+ 	result = 0;
+-    } else {
+-	T(("opened %s", path));
+     }
+ #else
+-    result = dbopen(path,
+-		    modify ? (O_CREAT | O_RDWR) : O_RDONLY,
+-		    0644,
+-		    DB_HASH,
+-		    NULL);
++    if ((result = dbopen(path,
++			 modify ? (O_CREAT | O_RDWR) : O_RDONLY,
++			 0644,
++			 DB_HASH,
++			 NULL)) == 0) {
++	code = errno;
++    }
++#endif
+     if (result != 0) {
+ 	T(("opened %s", path));
++    } else {
++	T(("cannot open %s: %s", path, strerror(code)));
+     }
+-#endif
+     return result;
+ }
+ 
+diff -Naur ncurses-5.7.orig/panel/Makefile.in ncurses-5.7/panel/Makefile.in
+--- ncurses-5.7.orig/panel/Makefile.in	2007-04-28 07:56:11.000000000 -0700
++++ ncurses-5.7/panel/Makefile.in	2009-01-18 23:56:35.000000000 -0800
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.52 2007/04/28 14:56:11 tom Exp $
++# $Id: Makefile.in,v 1.53 2009/01/03 19:09:26 tom Exp $
+ ##############################################################################
+-# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.                #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
+@@ -71,7 +71,7 @@
+ INSTALL_DATA	= @INSTALL_DATA@
+ 
+ AR		= @AR@
+-AR_OPTS		= @AR_OPTS@
++ARFLAGS		= @ARFLAGS@
+ AWK		= @AWK@
+ LD		= @LD@
+ LN_S		= @LN_S@
+diff -Naur ncurses-5.7.orig/progs/Makefile.in ncurses-5.7/progs/Makefile.in
+--- ncurses-5.7.orig/progs/Makefile.in	2008-09-07 06:58:55.000000000 -0700
++++ ncurses-5.7/progs/Makefile.in	2009-01-18 23:56:19.000000000 -0800
+@@ -1,6 +1,6 @@
+-# $Id: Makefile.in,v 1.79 2008/09/07 13:58:55 tom Exp $
++# $Id: Makefile.in,v 1.80 2008/11/15 19:04:19 tom Exp $
+ ##############################################################################
+-# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.                #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
+@@ -124,7 +124,7 @@
+ 	transform.h
+ 
+ # tic relies on direct access to the terminfo database
+-GET_PROGS = infocmp$x clear$x tput$x tset$x toe$x
++GET_PROGS = infocmp$x clear$x tabs$x tput$x tset$x toe$x
+ PUT_PROGS = @MAKE_TERMINFO@ tic$x
+ PROGS = $(PUT_PROGS) $(GET_PROGS)
+ 
+@@ -159,6 +159,7 @@
+ actual_infotocap = `echo infotocap$x| $(TRANSFORM)`
+ actual_init      = `echo init$x|      $(TRANSFORM)`
+ actual_reset     = `echo reset$x|     $(TRANSFORM)`
++actual_tabs      = `echo tabs$x|      $(TRANSFORM)`
+ actual_tic       = `echo tic$x|       $(TRANSFORM)`
+ actual_toe       = `echo toe$x|       $(TRANSFORM)`
+ actual_tput      = `echo tput$x|      $(TRANSFORM)`
+@@ -187,6 +188,7 @@
+ @MAKE_TERMINFO@	(cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_captoinfo))
+ 	$(LIBTOOL_INSTALL) $(INSTALL_PROG) infocmp$x $(DESTDIR)$(bindir)/$(actual_infocmp)
+ 	$(LIBTOOL_INSTALL) $(INSTALL_PROG) clear$x   $(DESTDIR)$(bindir)/$(actual_clear)
++	$(LIBTOOL_INSTALL) $(INSTALL_PROG) tabs$x    $(DESTDIR)$(bindir)/$(actual_tabs)
+ 	$(LIBTOOL_INSTALL) $(INSTALL_PROG) tput$x    $(DESTDIR)$(bindir)/$(actual_tput)
+ 	$(LIBTOOL_INSTALL) $(INSTALL_PROG) tset$x    $(DESTDIR)$(bindir)/$(actual_tset)
+ 	@echo "linking $(actual_reset) to $(actual_tset)"
+@@ -200,6 +202,7 @@
+ @MAKE_TERMINFO@	-@rm -f $(DESTDIR)$(bindir)/$(actual_infotocap)
+ 	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_infocmp)
+ 	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_clear)
++	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tabs)
+ 	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tput)
+ 	-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tset)
+ 	-@rm -f $(DESTDIR)$(bindir)/$(actual_reset)
+@@ -230,6 +233,12 @@
+ clear$x: $(DEPS_CLEAR) $(DEPS_CURSES)
+ 	@ECHO_LINK@ $(LINK) $(DEPS_CLEAR) $(LDFLAGS_TINFO) -o $@
+ 
++DEPS_TABS = \
++	$(MODEL)/tabs$o
++
++tabs$x: $(DEPS_TABS) $(DEPS_TABS)
++	@ECHO_LINK@ $(LINK) $(DEPS_TABS) $(LDFLAGS_TINFO) -o $@
++
+ DEPS_TPUT = \
+ 	$(MODEL)/tput$o
+ 
+@@ -289,6 +298,7 @@
+ @MAKE_TERMINFO@	$(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/toe.c     $(srcdir)/dump_entry.c $(LINT_LIBS)
+ 	$(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/clear.c                          $(LINT_LIBS)
+ 	$(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/infocmp.c $(srcdir)/dump_entry.c $(LINT_LIBS)
++	$(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/tabs.c                           $(LINT_LIBS)
+ 	$(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/tput.c                           $(LINT_LIBS)
+ 	$(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/tset.c    $(srcdir)/dump_entry.c $(LINT_LIBS)
+ 
+diff -Naur ncurses-5.7.orig/progs/modules ncurses-5.7/progs/modules
+--- ncurses-5.7.orig/progs/modules	2006-12-23 16:53:21.000000000 -0800
++++ ncurses-5.7/progs/modules	2009-01-18 23:56:19.000000000 -0800
+@@ -1,7 +1,7 @@
+-# $Id: modules,v 1.13 2006/12/24 00:53:21 tom Exp $
++# $Id: modules,v 1.14 2008/11/15 16:26:48 tom Exp $
+ # Program modules (some are in ncurses lib!)
+ ##############################################################################
+-# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.                #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
+@@ -37,6 +37,7 @@
+ toe		progs		$(srcdir)	$(HEADER_DEPS)             $(srcdir)/dump_entry.h
+ dump_entry	progs		$(srcdir)	$(HEADER_DEPS)             $(srcdir)/dump_entry.h ../include/parametrized.h $(INCDIR)/capdefaults.c termsort.c
+ infocmp		progs		$(srcdir)	$(HEADER_DEPS)             $(srcdir)/dump_entry.h
++tabs		progs		$(srcdir)	$(HEADER_DEPS)
+ tput		progs		$(srcdir)	$(HEADER_DEPS) transform.h termsort.c
+ tset		progs		$(srcdir)	$(HEADER_DEPS) transform.h $(srcdir)/dump_entry.h ../include/termcap.h
+ 
+diff -Naur ncurses-5.7.orig/progs/tabs.c ncurses-5.7/progs/tabs.c
+--- ncurses-5.7.orig/progs/tabs.c	1969-12-31 16:00:00.000000000 -0800
++++ ncurses-5.7/progs/tabs.c	2009-01-18 23:56:21.000000000 -0800
+@@ -0,0 +1,506 @@
++/****************************************************************************
++ * Copyright (c) 2008 Free Software Foundation, Inc.                        *
++ *                                                                          *
++ * Permission is hereby granted, free of charge, to any person obtaining a  *
++ * copy of this software and associated documentation files (the            *
++ * "Software"), to deal in the Software without restriction, including      *
++ * without limitation the rights to use, copy, modify, merge, publish,      *
++ * distribute, distribute with modifications, sublicense, and/or sell       *
++ * copies of the Software, and to permit persons to whom the Software is    *
++ * furnished to do so, subject to the following conditions:                 *
++ *                                                                          *
++ * The above copyright notice and this permission notice shall be included  *
++ * in all copies or substantial portions of the Software.                   *
++ *                                                                          *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
++ *                                                                          *
++ * Except as contained in this notice, the name(s) of the above copyright   *
++ * holders shall not be used in advertising or otherwise to promote the     *
++ * sale, use or other dealings in this Software without prior written       *
++ * authorization.                                                           *
++ ****************************************************************************/
++
++/****************************************************************************
++ *  Author: Thomas E. Dickey                        2008                    *
++ ****************************************************************************/
++
++/*
++ * tabs.c --  set terminal hard-tabstops
++ */
++
++#define USE_LIBTINFO
++#include <progs.priv.h>
++
++MODULE_ID("$Id: tabs.c,v 1.15 2008/11/23 00:47:51 tom Exp $")
++
++static void usage(void) GCC_NORETURN;
++
++static int max_cols;
++
++static int
++putch(int c)
++{
++    return putchar(c);
++}
++
++static void
++do_tabs(int *tab_list)
++{
++    int last = 1;
++    int stop;
++
++    putchar('\r');
++    while ((stop = *tab_list++) > 0) {
++	if (last < stop) {
++	    while (last++ < stop) {
++		if (last > max_cols)
++		    break;
++		putchar(' ');
++	    }
++	}
++	if (stop <= max_cols) {
++	    tputs(tparm(set_tab, stop), 1, putch);
++	    last = stop;
++	} else {
++	    break;
++	}
++    }
++    putchar('\n');
++}
++
++static int *
++decode_tabs(const char *tab_list)
++{
++    int *result = typeCalloc(int, strlen(tab_list) + (unsigned) max_cols);
++    int n = 0;
++    int value = 0;
++    int prior = 0;
++    int ch;
++
++    if (result != 0) {
++	while ((ch = *tab_list++) != '\0') {
++	    if (isdigit(UChar(ch))) {
++		value *= 10;
++		value += (ch - '0');
++	    } else if (ch == ',') {
++		result[n] = value + prior;
++		if (n > 0 && value <= result[n - 1]) {
++		    fprintf(stderr,
++			    "tab-stops are not in increasing order\n");
++		    free(result);
++		    result = 0;
++		    break;
++		}
++		++n;
++		value = 0;
++		prior = 0;
++	    } else if (ch == '+') {
++		if (n)
++		    prior = result[n - 1];
++	    }
++	}
++    }
++
++    if (result != 0) {
++	/*
++	 * If there is only one value, then it is an option such as "-8".
++	 */
++	if ((n == 0) && (value > 0)) {
++	    int step = value;
++	    while (n < max_cols - 1) {
++		result[n++] = value;
++		value += step;
++	    }
++	}
++
++	/*
++	 * Add the last value, if any.
++	 */
++	result[n++] = value;
++	result[n] = 0;
++    }
++    return result;
++}
++
++static void
++print_ruler(int *tab_list)
++{
++    int last = 0;
++    int stop;
++    int n;
++
++    /* first print a readable ruler */
++    for (n = 0; n < max_cols; n += 10) {
++	int ch = 1 + (n / 10);
++	char buffer[20];
++	sprintf(buffer, "----+----%c",
++		((ch < 10)
++		 ? (ch + '0')
++		 : (ch + 'A' - 10)));
++	printf("%.*s", ((max_cols - n) > 10) ? 10 : (max_cols - n), buffer);
++    }
++    putchar('\n');
++
++    /* now, print '*' for each stop */
++    for (n = 0, last = 0; (tab_list[n] > 0) && (last < max_cols); ++n) {
++	stop = tab_list[n];
++	while (++last < stop) {
++	    if (last <= max_cols) {
++		putchar('-');
++	    } else {
++		break;
++	    }
++	}
++	if (last <= max_cols) {
++	    putchar('*');
++	    last = stop;
++	} else {
++	    break;
++	}
++    }
++    while (++last <= max_cols)
++	putchar('-');
++    putchar('\n');
++}
++
++/*
++ * Write an '*' on each tabstop, to demonstrate whether it lines up with the
++ * ruler.
++ */
++static void
++write_tabs(int *tab_list)
++{
++    int stop;
++
++    while ((stop = *tab_list++) > 0 && stop <= max_cols) {
++	fputs((stop == 1) ? "*" : "\t*", stdout);
++    };
++    /* also show a tab _past_ the stops */
++    if (stop < max_cols)
++	fputs("\t+", stdout);
++    putchar('\n');
++}
++
++/*
++ * Trim leading/trailing blanks, as well as blanks after a comma.
++ * Convert embedded blanks to commas.
++ */
++static char *
++trimmed_tab_list(const char *source)
++{
++    char *result = strdup(source);
++    int ch, j, k, last;
++
++    if (result != 0) {
++	for (j = k = last = 0; result[j] != 0; ++j) {
++	    ch = UChar(result[j]);
++	    if (isspace(ch)) {
++		if (last == '\0') {
++		    continue;
++		} else if (isdigit(last) || last == ',') {
++		    ch = ',';
++		}
++	    } else if (ch == ',') {
++		;
++	    } else {
++		if (last == ',')
++		    result[k++] = last;
++		result[k++] = ch;
++	    }
++	    last = ch;
++	}
++	result[k] = '\0';
++    }
++    return result;
++}
++
++static bool
++comma_is_needed(const char *source)
++{
++    bool result = FALSE;
++
++    if (source != 0) {
++	unsigned len = strlen(source);
++	if (len != 0)
++	    result = (source[len - 1] != ',');
++    } else {
++	result = FALSE;
++    }
++    return result;
++}
++
++/*
++ * Add a command-line parameter to the tab-list.  It can be blank- or comma-
++ * separated (or a mixture).  For simplicity, empty tabs are ignored, e.g.,
++ *	tabs 1,,6,11
++ *	tabs 1,6,11
++ * are treated the same.
++ */
++static const char *
++add_to_tab_list(char **append, const char *value)
++{
++    char *result = *append;
++    char *copied = trimmed_tab_list(value);
++
++    if (copied != 0 && *copied != '\0') {
++	const char *comma = ",";
++	unsigned need = 1 + strlen(copied);
++
++	if (*copied == ',')
++	    comma = "";
++	else if (!comma_is_needed(*append))
++	    comma = "";
++
++	need += strlen(comma);
++	if (*append != 0)
++	    need += strlen(*append);
++
++	result = malloc(need);
++	if (result != 0) {
++	    *result = '\0';
++	    if (*append != 0) {
++		strcpy(result, *append);
++		free(*append);
++	    }
++	    strcat(result, comma);
++	    strcat(result, copied);
++	}
++
++	*append = result;
++    }
++    return result;
++}
++
++/*
++ * Check for illegal characters in the tab-list.
++ */
++static bool
++legal_tab_list(const char *program, const char *tab_list)
++{
++    bool result = TRUE;
++
++    if (tab_list != 0 && *tab_list != '\0') {
++	if (comma_is_needed(tab_list)) {
++	    int n, ch;
++	    for (n = 0; tab_list[n] != '\0'; ++n) {
++		ch = UChar(tab_list[n]);
++		if (!(isdigit(ch) || ch == ',')) {
++		    fprintf(stderr,
++			    "%s: unexpected character found '%c'\n",
++			    program, ch);
++		    result = FALSE;
++		    break;
++		}
++	    }
++	} else {
++	    fprintf(stderr, "%s: trailing comma found '%s'\n", program, tab_list);
++	    result = FALSE;
++	}
++    } else {
++	fprintf(stderr, "%s: no tab-list given\n", program);
++	result = FALSE;
++    }
++    return result;
++}
++
++static void
++usage(void)
++{
++    static const char *msg[] =
++    {
++	"Usage: tabs [options] [tabstop-list]"
++	,""
++	,"Options:"
++	,"  -0       reset tabs"
++	,"  -8       set tabs to standard interval"
++	,"  -a       Assembler, IBM S/370, first format"
++	,"  -a2      Assembler, IBM S/370, second format"
++	,"  -c       COBOL, normal format"
++	,"  -c2      COBOL compact format"
++	,"  -c3      COBOL compact format extended"
++	,"  -d       debug (show ruler with expected/actual tab positions)"
++	,"  -f       FORTRAN"
++	,"  -n       no-op (do not modify terminal settings)"
++	,"  -p       PL/I"
++	,"  -s       SNOBOL"
++	,"  -u       UNIVAC 1100 Assembler"
++	,"  -T name  use terminal type 'name'"
++	,""
++	,"A tabstop-list is an ordered list of column numbers, e.g., 1,11,21"
++	,"or 1,+10,+10 which is the same."
++    };
++    unsigned n;
++
++    fflush(stdout);
++    for (n = 0; n < SIZEOF(msg); ++n) {
++	fprintf(stderr, "%s\n", msg[n]);
++    }
++    ExitProgram(EXIT_FAILURE);
++}
++
++int
++main(int argc, char *argv[])
++{
++    int rc = EXIT_FAILURE;
++    bool debug = FALSE;
++    bool no_op = FALSE;
++    int n, ch;
++    NCURSES_CONST char *term_name = 0;
++    const char *mar_list = 0;	/* ignored */
++    char *append = 0;
++    const char *tab_list = 0;
++
++    if ((term_name = getenv("TERM")) == 0)
++	term_name = "ansi+tabs";
++
++    /* cannot use getopt, since some options are two-character */
++    for (n = 1; n < argc; ++n) {
++	char *option = argv[n];
++	switch (option[0]) {
++	case '-':
++	    while ((ch = *++option) != '\0') {
++		switch (ch) {
++		case 'a':
++		    switch (*option) {
++		    case '\0':
++			tab_list = "1,10,16,36,72";
++			/* Assembler, IBM S/370, first format */
++			break;
++		    case '2':
++			tab_list = "1,10,16,40,72";
++			/* Assembler, IBM S/370, second format */
++			break;
++		    default:
++			usage();
++		    }
++		    break;
++		case 'c':
++		    switch (*option) {
++		    case '\0':
++			tab_list = "1,8,12,16,20,55";
++			/* COBOL, normal format */
++			break;
++		    case '2':
++			tab_list = "1,6,10,14,49";
++			/* COBOL compact format */
++			break;
++		    case '3':
++			tab_list = "1,6,10,14,18,22,26,30,34,38,42,46,50,54,58,62,67";
++			/* COBOL compact format extended */
++			break;
++		    default:
++			usage();
++		    }
++		    break;
++		case 'd':	/* ncurses extension */
++		    debug = TRUE;
++		    break;
++		case 'f':
++		    tab_list = "1,7,11,15,19,23";
++		    /* FORTRAN */
++		    break;
++		case 'n':	/* ncurses extension */
++		    no_op = TRUE;
++		    break;
++		case 'p':
++		    tab_list = "1,5,9,13,17,21,25,29,33,37,41,45,49,53,57,61";
++		    /* PL/I */
++		    break;
++		case 's':
++		    tab_list = "1,10,55";
++		    /* SNOBOL */
++		    break;
++		case 'u':
++		    tab_list = "1,12,20,44";
++		    /* UNIVAC 1100 Assembler */
++		    break;
++		case 'T':
++		    ++n;
++		    if (*++option != '\0') {
++			term_name = option;
++		    } else {
++			term_name = argv[n++];
++		    }
++		    option += ((int) strlen(option)) - 1;
++		    continue;
++		default:
++		    if (isdigit(UChar(*option))) {
++			tab_list = option;
++			++n;
++		    } else {
++			usage();
++		    }
++		    option += ((int) strlen(option)) - 1;
++		    break;
++		}
++	    }
++	    break;
++	case '+':
++	    while ((ch = *++option) != '\0') {
++		switch (ch) {
++		case 'm':
++		    mar_list = option;
++		    break;
++		default:
++		    usage();
++		}
++	    }
++	    break;
++	default:
++	    if (append != 0) {
++		if (tab_list != (const char *) append) {
++		    /* one of the predefined options was used */
++		    free(append);
++		    append = 0;
++		}
++	    }
++	    tab_list = add_to_tab_list(&append, option);
++	    option += ((int) strlen(option)) - 1;
++	    break;
++	}
++    }
++
++    setupterm(term_name, STDOUT_FILENO, (int *) 0);
++
++    max_cols = (columns > 0) ? columns : 80;
++
++    if (!VALID_STRING(clear_all_tabs)) {
++	fprintf(stderr,
++		"%s: terminal type '%s' cannot reset tabs\n",
++		argv[0], term_name);
++    } else if (!VALID_STRING(set_tab)) {
++	fprintf(stderr,
++		"%s: terminal type '%s' cannot set tabs\n",
++		argv[0], term_name);
++    } else if (legal_tab_list(argv[0], tab_list)) {
++	int *list = decode_tabs(tab_list);
++
++	if (!no_op)
++	    tputs(clear_all_tabs, 1, putch);
++
++	if (list != 0) {
++	    if (!no_op)
++		do_tabs(list);
++	    if (debug) {
++		fflush(stderr);
++		printf("tabs %s\n", tab_list);
++		print_ruler(list);
++		write_tabs(list);
++	    }
++	    free(list);
++	} else if (debug) {
++	    fflush(stderr);
++	    printf("tabs %s\n", tab_list);
++	}
++	rc = EXIT_SUCCESS;
++    }
++    if (append != 0)
++	free(append);
++    ExitProgram(rc);
++}
+diff -Naur ncurses-5.7.orig/test/README ncurses-5.7/test/README
+--- ncurses-5.7.orig/test/README	2008-10-18 14:02:45.000000000 -0700
++++ ncurses-5.7/test/README	2009-01-18 23:56:30.000000000 -0800
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: README,v 1.38 2008/10/18 21:02:45 tom Exp $
++-- $Id: README,v 1.39 2008/12/20 23:38:13 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ The programs in this directory are designed to test your newest toy :-)
+@@ -87,7 +87,7 @@
+ field_status			test: demo_forms
+ field_term			-
+ field_type			test: demo_forms
+-field_userptr			test: edit_field ncurses
++field_userptr			test: demo_forms edit_field ncurses
+ form_driver			test: cardfile demo_forms edit_field ncurses
+ form_fields			test: cardfile demo_forms
+ form_init			-
+@@ -211,7 +211,7 @@
+ ----------
+ BC				-
+ COLORS				test: echochar ncurses savescreen xmas
+-COLOR_PAIR			test: background blue bs cardfile demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
++COLOR_PAIR			test: background blue bs cardfile clip_printw demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
+ COLOR_PAIRS			test: echochar ncurses newdemo savescreen
+ COLS				test: cardfile demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto echochar edit_field firework foldkeys hashtest inch_wide inchs ins_wide inserts lrtest movewindow ncurses newdemo rain savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm
+ ESCDELAY			test: test_opaque
+@@ -239,9 +239,9 @@
+ attr_set			test: ncurses
+ attroff				test: echochar filter gdc ncurses tclock
+ attron				test: bs echochar filter gdc ncurses
+-attrset				test: bs firework gdc hanoi ncurses rain tclock testaddch testcurs
++attrset				test: bs firework gdc hanoi insdelln ncurses rain tclock testaddch testcurs
+ baudrate			lib: ncurses
+-beep				test: blue bs cardfile chgat demo_forms demo_menus demo_panels edit_field hanoi inch_wide inchs ins_wide inserts knight movewindow ncurses savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view xmas
++beep				test: blue bs cardfile chgat clip_printw demo_forms demo_menus demo_panels edit_field hanoi inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view xmas
+ bkgd				test: background cardfile demo_forms ncurses savescreen tclock view
+ bkgdset				test: background ncurses testaddch
+ bkgrnd				test: ncurses
+@@ -251,10 +251,10 @@
+ boolnames			test: test_arrays progs: dump_entry infocmp
+ border				-
+ border_set			-
+-box				test: cardfile chgat demo_forms demo_menus demo_panels ditto edit_field inch_wide inchs ins_wide inserts lrtest ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
++box				test: cardfile chgat clip_printw demo_forms demo_menus demo_panels ditto edit_field inch_wide inchs ins_wide insdelln inserts lrtest ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
+ box_set				test: ncurses
+ can_change_color		test: ncurses
+-cbreak				test: background blue bs cardfile chgat color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto filter firework foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest movewindow ncurses newdemo savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
++cbreak				test: background blue bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto filter firework foldkeys gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses newdemo savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
+ chgat				test: chgat
+ clear				test: blue bs gdc ncurses testcurs xmas
+ clearok				test: bs knight
+@@ -263,7 +263,7 @@
+ color_content			test: ncurses
+ color_set			test: color_set ncurses
+ copywin				test: ncurses testcurs
+-cur_term			test: dots dots_mvcur lrtest progs: clear tput tset
++cur_term			test: dots dots_mvcur lrtest progs: clear tabs tput tset
+ curs_set			test: echochar firework gdc hanoi lrtest ncurses newdemo rain savescreen tclock testcurs worm xmas
+ curscr				test: demo_panels edit_field knight lrtest ncurses savescreen tclock view
+ curses_version			test: ncurses progs: infocmp tic toe tput tset
+@@ -273,16 +273,16 @@
+ del_curterm			lib: ncurses
+ delay_output			test: newdemo
+ delch				-
+-deleteln			-
++deleteln			test: insdelln
+ delscreen			test: ditto dots_mvcur
+-delwin				test: cardfile chgat demo_forms demo_panels edit_field inch_wide inchs ins_wide inserts movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
+-derwin				test: cardfile chgat demo_forms demo_menus ditto inch_wide inchs ins_wide inserts movewindow ncurses test_get_wstr test_getstr test_instr test_inwstr test_opaque
++delwin				test: cardfile chgat clip_printw demo_forms demo_panels edit_field inch_wide inchs ins_wide insdelln inserts movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
++derwin				test: cardfile chgat clip_printw demo_forms demo_menus ditto inch_wide inchs ins_wide insdelln inserts movewindow ncurses test_get_wstr test_getstr test_instr test_inwstr test_opaque
+ doupdate			test: cardfile demo_menus demo_panels ditto edit_field ins_wide inserts knight movewindow ncurses redraw savescreen test_get_wstr test_getstr
+ dupwin				test: edit_field
+ echo				test: bs hanoi ncurses test_get_wstr test_getstr testcurs testscanw
+ echo_wchar			test: ncurses
+ echochar			test: echochar ncurses
+-endwin				test: background blue bs cardfile chgat color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto dots_mvcur echochar filter firework firstlast foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts key_names keynames knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
++endwin				test: background blue bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto dots_mvcur echochar filter firework firstlast foldkeys gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
+ erase				test: cardfile demo_menus filter firework firstlast hanoi lrtest ncurses tclock test_opaque testcurs
+ erasechar			lib: ncurses
+ erasewchar			-
+@@ -292,16 +292,16 @@
+ get_wch				-
+ get_wstr			test: test_get_wstr
+ getattrs			-
+-getbegx				test: chgat demo_menus demo_panels movewindow ncurses newdemo redraw testcurs
+-getbegy				test: chgat demo_menus demo_panels movewindow ncurses newdemo redraw testcurs
++getbegx				test: chgat clip_printw demo_menus demo_panels insdelln movewindow ncurses newdemo redraw testcurs
++getbegy				test: chgat clip_printw demo_menus demo_panels insdelln movewindow ncurses newdemo redraw testcurs
+ getbkgd				test: ncurses
+ getbkgrnd			test: ncurses
+ getcchar			test: ncurses view
+-getch				test: background blue bs chgat color_set demo_altkeys filter firework firstlast foldkeys hanoi hashtest lrtest savescreen tclock test_opaque testaddch testcurs view xmas
+-getcurx				test: bs chgat demo_altkeys demo_defkey demo_panels foldkeys movewindow ncurses redraw savescreen test_get_wstr test_getstr test_opaque testcurs
+-getcury				test: bs chgat demo_altkeys demo_defkey demo_panels edit_field foldkeys movewindow ncurses redraw savescreen test_opaque testcurs
+-getmaxx				test: chgat demo_panels inch_wide inchs movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
+-getmaxy				test: chgat demo_forms demo_panels inch_wide inchs movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
++getch				test: background blue bs chgat color_set demo_altkeys filter firework firstlast foldkeys hanoi hashtest insdelln lrtest savescreen tclock test_opaque testaddch testcurs view xmas
++getcurx				test: bs chgat clip_printw demo_altkeys demo_defkey demo_panels foldkeys insdelln movewindow ncurses redraw savescreen test_get_wstr test_getstr test_opaque testcurs
++getcury				test: bs chgat clip_printw demo_altkeys demo_defkey demo_panels edit_field foldkeys insdelln movewindow ncurses redraw savescreen test_opaque testcurs
++getmaxx				test: chgat clip_printw demo_panels inch_wide inchs insdelln movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
++getmaxy				test: chgat clip_printw demo_forms demo_panels inch_wide inchs insdelln movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
+ getmouse			test: bs knight movewindow ncurses
+ getn_wstr			test: test_get_wstr
+ getnstr				test: filter ncurses test_getstr
+@@ -310,10 +310,11 @@
+ getstr				test: test_getstr
+ getwin				test: ncurses
+ halfdelay			test: view
+-has_colors			test: background bs cardfile chgat color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain savescreen tclock testcurs view worm xmas
++has_colors			test: background bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock testcurs view worm xmas
+ has_ic				test: lrtest
+ has_il				lib: ncurses
+ has_key				lib: ncurses
++has_mouse			-
+ hline				test: gdc ncurses
+ hline_set			-
+ idcok				test: test_opaque
+@@ -326,16 +327,16 @@
+ inchnstr			test: inchs
+ inchstr				test: inchs
+ init_color			test: ncurses
+-init_pair			test: background blue bs cardfile chgat color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
+-initscr				test: background blue bs cardfile chgat color_set demo_defkey demo_forms demo_keyok demo_menus demo_panels echochar firework firstlast gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
++init_pair			test: background blue bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
++initscr				test: background blue bs cardfile chgat clip_printw color_set demo_defkey demo_forms demo_keyok demo_menus demo_panels echochar filter firework firstlast gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
+ innstr				test: test_instr
+ innwstr				test: test_inwstr
+ ins_nwstr			test: ins_wide
+ ins_wch				test: ins_wide
+ ins_wstr			test: ins_wide
+ insch				test: ins_wide inserts
+-insdelln			-
+-insertln			-
++insdelln			test: insdelln
++insertln			test: insdelln
+ insnstr				test: inserts
+ insstr				test: inserts
+ instr				test: test_instr
+@@ -360,7 +361,7 @@
+ keybound			test: demo_altkeys demo_defkey
+ keyname				test: demo_altkeys demo_defkey demo_keyok demo_menus edit_field foldkeys keynames movewindow ncurses redraw testcurs view progs: tic
+ keyok				test: demo_keyok foldkeys
+-keypad				test: bs cardfile chgat demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto edit_field filter firework foldkeys hashtest inch_wide inchs ins_wide inserts key_names keynames knight lrtest movewindow ncurses redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view
++keypad				test: bs cardfile chgat clip_printw demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto edit_field filter firework foldkeys hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view
+ killchar			lib: ncurses
+ killwchar			-
+ leaveok				test: hanoi test_opaque
+@@ -450,7 +451,7 @@
+ mvwinsstr			test: inserts testcurs
+ mvwinstr			test: test_instr
+ mvwinwstr			test: test_inwstr
+-mvwprintw			test: chgat demo_panels inch_wide inchs ncurses test_instr test_inwstr testcurs
++mvwprintw			test: chgat clip_printw demo_panels inch_wide inchs insdelln ncurses test_instr test_inwstr testcurs
+ mvwscanw			test: testcurs
+ mvwvline			test: ins_wide inserts movewindow
+ mvwvline_set			-
+@@ -458,11 +459,11 @@
+ newpad				test: edit_field ncurses testcurs
+ newscr				lib: ncurses
+ newterm				test: demo_altkeys ditto dots_mvcur filter foldkeys gdc key_names keynames
+-newwin				test: cardfile chgat demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto edit_field firstlast inch_wide inchs ins_wide inserts knight movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs xmas
++newwin				test: cardfile chgat clip_printw demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto edit_field firstlast inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs xmas
+ nl				test: demo_forms ncurses rain testcurs
+ nocbreak			test: testcurs
+ nodelay				test: ditto firework gdc lrtest ncurses newdemo rain tclock test_opaque view worm xmas
+-noecho				test: background bs cardfile chgat color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto firework firstlast foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest movewindow ncurses rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
++noecho				test: background bs cardfile chgat clip_printw color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto firework firstlast foldkeys gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest movewindow ncurses rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
+ nofilter			-
+ nonl				test: bs demo_forms hashtest movewindow ncurses view worm xmas
+ noqiflush			-
+@@ -501,14 +502,14 @@
+ scr_set				test: savescreen
+ scrl				test: view
+ scroll				test: testcurs
+-scrollok			test: demo_altkeys demo_defkey demo_keyok demo_panels ditto foldkeys hashtest knight ncurses redraw test_opaque testcurs testscanw view
++scrollok			test: clip_printw demo_altkeys demo_defkey demo_keyok demo_panels ditto foldkeys hashtest knight ncurses redraw test_opaque testcurs testscanw view
+ set_curterm			lib: ncurses
+ set_escdelay			test: test_opaque
+ set_tabsize			test: test_opaque
+ set_term			lib: ncurses
+ setcchar			test: demo_panels ins_wide ncurses view
+ setscrreg			test: view
+-setupterm			test: dots progs: clear tput tset
++setupterm			test: dots progs: clear tabs tput tset
+ slk_attr			-
+ slk_attr_off			-
+ slk_attr_on			-
+@@ -528,8 +529,8 @@
+ slk_wset			test: ncurses
+ standend			test: blue gdc ncurses
+ standout			test: blue ncurses
+-start_color			test: background blue bs cardfile chgat color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
+-stdscr				test: bs chgat demo_altkeys demo_forms demo_menus demo_panels ditto filter firework foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts key_names keynames knight lrtest movewindow ncurses rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view worm xmas
++start_color			test: background blue bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide insdelln inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
++stdscr				test: bs chgat clip_printw demo_altkeys demo_forms demo_menus demo_panels ditto filter firework foldkeys gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest movewindow ncurses rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view worm xmas
+ strcodes			test: test_arrays progs: dump_entry
+ strfnames			test: test_arrays progs: dump_entry
+ strnames			test: foldkeys test_arrays progs: dump_entry infocmp tic
+@@ -548,10 +549,10 @@
+ tigetnum			test: ncurses progs: tput
+ tigetstr			test: blue demo_defkey foldkeys testcurs progs: tput
+ timeout				test: rain savescreen
+-touchline			test: chgat
+-touchwin			test: chgat demo_menus edit_field filter firstlast inch_wide inchs ins_wide inserts movewindow ncurses redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque xmas
+-tparm				test: dots dots_mvcur progs: tic tput
+-tputs				test: dots dots_mvcur railroad progs: clear tset
++touchline			test: chgat clip_printw insdelln
++touchwin			test: chgat clip_printw demo_menus edit_field filter firstlast inch_wide inchs ins_wide insdelln inserts movewindow ncurses redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque xmas
++tparm				test: dots dots_mvcur progs: tabs tic tput
++tputs				test: dots dots_mvcur railroad progs: clear tabs tset
+ trace				test: demo_menus hanoi hashtest lrtest ncurses testcurs view worm
+ ttytype				lib: ncurses
+ typeahead			test: testcurs
+@@ -572,7 +573,7 @@
+ vidputs				lib: ncurses
+ vline				test: gdc ncurses
+ vline_set			-
+-vw_printw			-
++vw_printw			test: clip_printw
+ vw_scanw			-
+ vwprintw			test: movewindow
+ vwscanw				lib: ncurses
+@@ -584,7 +585,7 @@
+ waddchstr			-
+ waddnstr			lib: menu
+ waddnwstr			test: ncurses
+-waddstr				test: chgat demo_forms demo_panels edit_field firstlast ins_wide knight ncurses redraw testcurs
++waddstr				test: chgat clip_printw demo_forms demo_panels edit_field firstlast ins_wide insdelln knight ncurses redraw testcurs
+ waddwstr			test: ins_wide test_get_wstr
+ wattr_get			-
+ wattr_off			lib: ncurses
+@@ -592,21 +593,21 @@
+ wattr_set			-
+ wattroff			test: demo_forms ncurses testcurs xmas
+ wattron				test: testcurs xmas
+-wattrset			test: demo_forms ncurses newdemo test_get_wstr test_getstr testcurs xmas
++wattrset			test: clip_printw demo_forms insdelln ncurses newdemo test_get_wstr test_getstr testcurs xmas
+ wbkgd				test: cardfile demo_forms demo_menus ncurses newdemo testcurs
+ wbkgdset			test: demo_panels ins_wide inserts ncurses
+ wbkgrnd				lib: ncurses
+ wbkgrndset			lib: ncurses
+-wborder				lib: ncurses
+-wborder_set			lib: ncurses
++wborder				test: ncurses
++wborder_set			test: ncurses
+ wchgat				test: chgat test_get_wstr test_getstr view
+ wclear				test: ncurses test_opaque testcurs
+ wclrtobot			test: firstlast inch_wide inchs ncurses test_instr test_inwstr testcurs
+-wclrtoeol			test: chgat demo_defkey demo_keyok demo_panels firstlast inch_wide inchs ins_wide inserts knight ncurses test_instr test_inwstr testcurs
++wclrtoeol			test: chgat clip_printw demo_defkey demo_keyok demo_panels firstlast inch_wide inchs ins_wide insdelln inserts knight ncurses test_instr test_inwstr testcurs
+ wcolor_set			lib: ncurses
+ wcursyncup			lib: form
+ wdelch				test: ncurses testcurs
+-wdeleteln			test: testcurs
++wdeleteln			test: insdelln testcurs
+ wecho_wchar			lib: ncurses
+ wechochar			lib: ncurses
+ wenclose			lib: form
+@@ -614,7 +615,7 @@
+ wget_wch			test: ins_wide ncurses
+ wget_wstr			test: test_get_wstr
+ wgetbkgrnd			lib: ncurses
+-wgetch				test: cardfile chgat demo_defkey demo_keyok demo_menus demo_panels ditto edit_field gdc inserts knight movewindow ncurses newdemo rain redraw test_opaque testcurs worm
++wgetch				test: cardfile chgat clip_printw demo_defkey demo_keyok demo_menus demo_panels ditto edit_field gdc insdelln inserts knight movewindow ncurses newdemo rain redraw test_opaque testcurs worm
+ wgetn_wstr			test: ncurses test_get_wstr
+ wgetnstr			test: ncurses test_getstr
+ wgetparent			test: test_opaque
+@@ -634,18 +635,18 @@
+ wins_wch			test: ins_wide
+ wins_wstr			test: ins_wide
+ winsch				test: ins_wide inserts testcurs
+-winsdelln			lib: ncurses
+-winsertln			test: testcurs
++winsdelln			test: insdelln
++winsertln			test: insdelln testcurs
+ winsnstr			test: inserts
+ winsstr				test: inserts
+ winstr				test: test_instr
+ winwstr				test: test_inwstr
+ wmouse_trafo			lib: form
+-wmove				test: chgat demo_altkeys demo_defkey demo_keyok demo_menus demo_panels firstlast foldkeys inch_wide inchs ins_wide inserts knight movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs worm
++wmove				test: chgat clip_printw demo_altkeys demo_defkey demo_keyok demo_menus demo_panels firstlast foldkeys inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs worm
+ wnoutrefresh			test: demo_menus ditto edit_field inch_wide inchs ins_wide inserts knight movewindow ncurses redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque
+-wprintw				test: chgat demo_defkey demo_forms demo_keyok demo_menus demo_panels edit_field inch_wide inchs ins_wide inserts knight movewindow ncurses test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
++wprintw				test: chgat clip_printw demo_defkey demo_forms demo_keyok demo_menus demo_panels edit_field inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
+ wredrawln			test: redraw
+-wrefresh			test: chgat demo_forms demo_keyok demo_menus demo_panels edit_field firstlast knight lrtest movewindow ncurses newdemo redraw savescreen tclock testcurs view worm xmas
++wrefresh			test: chgat clip_printw demo_forms demo_keyok demo_menus demo_panels edit_field firstlast insdelln knight lrtest movewindow ncurses newdemo redraw savescreen tclock testcurs view worm xmas
+ wresize				test: cardfile ncurses
+ wscanw				test: testcurs
+ wscrl				test: ncurses testcurs
+diff -Naur ncurses-5.7.orig/test/clip_printw.c ncurses-5.7/test/clip_printw.c
+--- ncurses-5.7.orig/test/clip_printw.c	1969-12-31 16:00:00.000000000 -0800
++++ ncurses-5.7/test/clip_printw.c	2009-01-18 23:56:30.000000000 -0800
+@@ -0,0 +1,360 @@
++/****************************************************************************
++ * Copyright (c) 2008 Free Software Foundation, Inc.                        *
++ *                                                                          *
++ * Permission is hereby granted, free of charge, to any person obtaining a  *
++ * copy of this software and associated documentation files (the            *
++ * "Software"), to deal in the Software without restriction, including      *
++ * without limitation the rights to use, copy, modify, merge, publish,      *
++ * distribute, distribute with modifications, sublicense, and/or sell       *
++ * copies of the Software, and to permit persons to whom the Software is    *
++ * furnished to do so, subject to the following conditions:                 *
++ *                                                                          *
++ * The above copyright notice and this permission notice shall be included  *
++ * in all copies or substantial portions of the Software.                   *
++ *                                                                          *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
++ *                                                                          *
++ * Except as contained in this notice, the name(s) of the above copyright   *
++ * holders shall not be used in advertising or otherwise to promote the     *
++ * sale, use or other dealings in this Software without prior written       *
++ * authorization.                                                           *
++ ****************************************************************************/
++/*
++ * $Id: clip_printw.c,v 1.1 2008/12/20 21:03:06 tom Exp $
++ *
++ * demonstrate how to use printw without wrapping.
++ */
++
++#include <test.priv.h>
++
++#define SHOW(n) ((n) == ERR ? "ERR" : "OK")
++#define COLOR_DEFAULT (-1)
++
++typedef struct {
++    unsigned c;
++    unsigned v;
++    int status;
++    int pair;
++    unsigned attr;
++    int count;
++    int ch;
++    const char *c_msg;
++    const char *v_msg;
++    int y_val;
++    int x_val;
++    int y_beg, x_beg;
++    int y_max, x_max;
++} STATUS;
++
++static int
++clip_wprintw(WINDOW *win, const char *fmt,...)
++{
++    int y0, x0, y1, x1, width;
++    WINDOW *sub;
++    va_list ap;
++    int rc;
++
++    /*
++     * Allocate a single-line derived window extending from the current
++     * cursor position to the end of the current line in the given window.
++     * Disable scrolling in the derived window.
++     */
++    getyx(win, y0, x0);
++    width = getmaxx(win) - x0;
++    sub = derwin(win, 1, width, y0, x0);
++    scrollok(sub, FALSE);
++
++    /*
++     * Print the text.
++     */
++    va_start(ap, fmt);
++    rc = vw_printw(sub, fmt, ap);
++    va_end(ap);
++
++    getyx(sub, y1, x1);
++    delwin(sub);
++
++    wmove(win, y1 + y0, x1 + x0);
++
++    return rc;
++}
++
++static const char *
++color_params(unsigned state, int *pair)
++{
++    /* *INDENT-OFF* */
++    static struct {
++	int pair;
++	int fg, bg;
++	const char *msg;
++    } table[] = {
++	{ 0, COLOR_DEFAULT, COLOR_DEFAULT, "default" },
++	{ 1, COLOR_RED,     COLOR_BLACK,   "red/black" },
++	{ 2, COLOR_WHITE,   COLOR_BLUE,    "white/blue" },
++    };
++    /* *INDENT-ON* */
++
++    static bool first = TRUE;
++    const char *result = 0;
++
++    if (has_colors()) {
++	if (first) {
++	    unsigned n;
++
++	    start_color();
++	    for (n = 0; n < SIZEOF(table); ++n) {
++		init_pair(table[n].pair, table[n].fg, table[n].bg);
++	    }
++	}
++	if (state < SIZEOF(table)) {
++	    *pair = table[state].pair;
++	    result = table[state].msg;
++	}
++    }
++    return result;
++}
++
++static const char *
++video_params(unsigned state, unsigned *attr)
++{
++    /* *INDENT-OFF* */
++    static struct {
++	unsigned attr;
++	const char *msg;
++    } table[] = {
++	{ A_NORMAL,	"normal" },
++	{ A_BOLD,	"bold" },
++	{ A_REVERSE,	"reverse" },
++	{ A_UNDERLINE,	"underline" },
++	{ A_BLINK, 	"blink" },
++    };
++    /* *INDENT-ON* */
++
++    const char *result = 0;
++
++    if (state < SIZEOF(table)) {
++	*attr = table[state].attr;
++	result = table[state].msg;
++    }
++    return result;
++}
++
++/* fill the window with a test-pattern */
++static void
++fill_window(WINDOW *win)
++{
++    int y, x;
++
++    getyx(win, y, x);
++    wmove(win, 0, 0);
++    while (waddstr(win, "0123456789 abcdefghijklmnopqrstuvwxyz ") != ERR) {
++    }
++    wmove(win, y, x);
++}
++
++static void
++show_status(WINDOW *win, STATUS * sp)
++{
++    int y, x;
++
++    getyx(win, y, x);
++    wmove(win, 0, 0);
++    wprintw(win, "Count %d", sp->count);
++    if (sp->v_msg != 0)
++	wprintw(win, " Video %s", sp->v_msg);
++    if (sp->c_msg != 0)
++	wprintw(win, " Color %s", sp->c_msg);
++    wprintw(win, " (%d)", sp->status);
++    wclrtoeol(win);
++    wmove(win, y, x);
++}
++
++static void
++do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *))
++{
++    WINDOW *win1 = newwin(sp->y_max - 2, sp->x_max - 2,
++			  sp->y_beg + 1, sp->x_beg + 1);
++
++    if (win1 != 0 && sp->y_max > 4 && sp->x_max > 4) {
++	WINDOW *win2 = derwin(win1, sp->y_max - 4, sp->x_max - 4, 1, 1);
++
++	if (win2 != 0) {
++	    box(win1, 0, 0);
++	    wrefresh(win1);
++	    func(win2);
++
++	    delwin(win2);
++	} else {
++	    beep();
++	}
++	delwin(win1);
++	touchwin(win);
++    } else {
++	beep();
++    }
++}
++
++static void
++init_status(WINDOW *win, STATUS * sp)
++{
++    memset(sp, 0, sizeof(*sp));
++    sp->c = 99;
++    sp->v = 99;
++    sp->ch = ' ';
++
++    keypad(win, TRUE);
++    fill_window(win);
++
++    getbegyx(win, sp->y_beg, sp->x_beg);
++    getmaxyx(win, sp->y_max, sp->x_max);
++}
++
++static void
++show_help(WINDOW *win)
++{
++    static const char *table[] =
++    {
++	"Basic commands:"
++	,"Use h/j/k/l or arrow keys to move the cursor."
++	,"Set the count parameter for clip_wprintw by entering digits 0-9."
++	,""
++	,"Other commands:"
++	,"space toggles through the set of video attributes and colors."
++	,"t     touches (forces repaint) of the current line."
++	,".     calls clip_wprintw at the current position with the given count."
++	,"=     resets count to zero."
++	,"?     shows this help-window"
++	,""
++    };
++
++    int y_max, x_max;
++    int row;
++
++    getmaxyx(win, y_max, x_max);
++    for (row = 0; row < (int) SIZEOF(table) && row < y_max; ++row) {
++	mvwprintw(win, row, 0, "%.*s", x_max, table[row]);
++    }
++    while (wgetch(win) != 'q')
++	beep();
++}
++
++static void
++update_status(WINDOW *win, STATUS * sp)
++{
++    switch (sp->ch) {
++    case ' ':			/* next test-iteration */
++	if (has_colors()) {
++	    if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == 0) {
++		sp->c_msg = color_params(sp->c = 0, &(sp->pair));
++		if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
++		    sp->v_msg = video_params(sp->v = 0, &(sp->attr));
++		}
++	    }
++	} else {
++	    if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
++		sp->v_msg = video_params(sp->v = 0, &(sp->attr));
++	    }
++	}
++	sp->count = 0;
++	show_status(win, sp);
++	break;
++    case KEY_LEFT:
++    case 'h':
++	if (sp->x_val > 0)
++	    wmove(win, sp->y_val, --(sp->x_val));
++	break;
++    case KEY_DOWN:
++    case 'j':
++	if (sp->y_val < sp->y_max)
++	    wmove(win, ++(sp->y_val), sp->x_val);
++	break;
++    case KEY_UP:
++    case 'k':
++	if (sp->y_val > 0)
++	    wmove(win, --(sp->y_val), sp->x_val);
++	break;
++    case KEY_RIGHT:
++    case 'l':
++	if (sp->x_val < sp->x_max)
++	    wmove(win, sp->y_val, ++(sp->x_val));
++	break;
++    case 't':
++	touchline(win, sp->y_val, 1);
++	break;
++    case '=':
++	sp->count = 0;
++	show_status(win, sp);
++	break;
++    case '?':
++	do_subwindow(win, sp, show_help);
++	break;
++    default:
++	if (isdigit(sp->ch)) {
++	    sp->count = (sp->count * 10) + (sp->ch - '0');
++	    show_status(win, sp);
++	} else {
++	    beep();
++	}
++	break;
++    }
++}
++
++static void
++test_clipping(WINDOW *win)
++{
++    STATUS st;
++    char fmt[80];
++    char *buffer;
++    unsigned j, need;
++
++    init_status(win, &st);
++
++    do {
++	switch (st.ch) {
++	case '.':		/* change from current position */
++	    wattrset(win, st.attr | COLOR_PAIR(st.pair));
++	    if (st.count > 0) {
++		need = st.count + 1;
++		sprintf(fmt, "%%c%%%ds%%c", st.count);
++	    } else {
++		need = getmaxx(win) - 1;
++		strcpy(fmt, "%c%s%c");
++	    }
++	    if ((buffer = typeMalloc(char, need)) != 0) {
++		for (j = 0; j < need; ++j) {
++		    buffer[j] = 'A' + (j % 26);
++		}
++		buffer[need - 1] = '\0';
++		st.status = clip_wprintw(win, fmt, '[', buffer, ']');
++	    }
++	    break;
++	case 'w':
++	    do_subwindow(win, &st, test_clipping);
++	    break;
++	case 'q':
++	    return;
++	default:
++	    update_status(win, &st);
++	    break;
++	}
++    } while ((st.ch = wgetch(win)) != ERR);
++}
++
++int
++main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
++{
++    initscr();
++    cbreak();
++    noecho();
++
++    test_clipping(stdscr);
++    endwin();
++
++    ExitProgram(EXIT_SUCCESS);
++}
+diff -Naur ncurses-5.7.orig/test/demo_forms.c ncurses-5.7/test/demo_forms.c
+--- ncurses-5.7.orig/test/demo_forms.c	2008-10-18 13:38:20.000000000 -0700
++++ ncurses-5.7/test/demo_forms.c	2009-01-18 23:56:30.000000000 -0800
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: demo_forms.c,v 1.30 2008/10/18 20:38:20 tom Exp $
++ * $Id: demo_forms.c,v 1.31 2008/12/20 19:23:00 tom Exp $
+  *
+  * Demonstrate a variety of functions from the form library.
+  * Thomas Dickey - 2003/4/26
+@@ -97,6 +97,8 @@
+     FIELD *f = new_field(rows, cols, frow, fcol, o_value, 1);
+ 
+     if (f) {
++	FieldAttrs *ptr;
++
+ 	set_field_back(f, A_UNDERLINE);
+ 	/*
+ 	 * If -j and -d options are combined, -j loses.  It is documented in
+@@ -122,7 +124,12 @@
+ 	/*
+ 	 * The userptr is used in edit_field.c's inactive_field().
+ 	 */
+-	set_field_userptr(f, (void *) (long) field_back(f));
++	ptr = (FieldAttrs *) field_userptr(f);
++	if (ptr == 0) {
++	    ptr = typeCalloc(FieldAttrs, 1);
++	    ptr->background = field_back(f);
++	}
++	set_field_userptr(f, (void *) ptr);
+ 	if (t_value)
+ 	    set_field_buffer(f, 0, t_value);
+     }
+diff -Naur ncurses-5.7.orig/test/edit_field.c ncurses-5.7/test/edit_field.c
+--- ncurses-5.7.orig/test/edit_field.c	2008-10-18 13:40:20.000000000 -0700
++++ ncurses-5.7/test/edit_field.c	2009-01-18 23:56:30.000000000 -0800
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: edit_field.c,v 1.14 2008/10/18 20:40:20 tom Exp $
++ * $Id: edit_field.c,v 1.15 2008/12/20 19:23:01 tom Exp $
+  *
+  * A wrapper for form_driver() which keeps track of the user's editing changes
+  * for each field, and makes the result available as a null-terminated string
+@@ -294,8 +294,8 @@
+ static void
+ inactive_field(FIELD * f)
+ {
+-    void *ptr = field_userptr(f);
+-    set_field_back(f, (chtype) ptr);
++    FieldAttrs *ptr = (FieldAttrs *) field_userptr(f);
++    set_field_back(f, ptr->background);
+ }
+ 
+ int
+diff -Naur ncurses-5.7.orig/test/edit_field.h ncurses-5.7/test/edit_field.h
+--- ncurses-5.7.orig/test/edit_field.h	2006-06-03 09:38:57.000000000 -0700
++++ ncurses-5.7/test/edit_field.h	2009-01-18 23:56:30.000000000 -0800
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2003-2004,2005 Free Software Foundation, Inc.              *
++ * Copyright (c) 2003-2006,2008 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -26,7 +26,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: edit_field.h,v 1.5 2006/06/03 16:38:57 tom Exp $
++ * $Id: edit_field.h,v 1.6 2008/12/20 19:23:18 tom Exp $
+  *
+  * Interface of edit_field.c
+  */
+@@ -43,6 +43,10 @@
+ #define MY_EDT_MODE	EDIT_FIELD('e')
+ #define MY_INS_MODE	EDIT_FIELD('t')
+ 
++typedef struct {
++    chtype background;
++} FieldAttrs;
++
+ extern void help_edit_field(void);
+ extern int edit_field(FORM * form, int *result);
+ 
+diff -Naur ncurses-5.7.orig/test/filter.c ncurses-5.7/test/filter.c
+--- ncurses-5.7.orig/test/filter.c	2006-12-09 08:53:47.000000000 -0800
++++ ncurses-5.7/test/filter.c	2009-01-18 23:56:25.000000000 -0800
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -29,7 +29,7 @@
+ /*
+  * Author:  Thomas E. Dickey <dickey@clark.net> 1998
+  *
+- * $Id: filter.c,v 1.11 2006/12/09 16:53:47 tom Exp $
++ * $Id: filter.c,v 1.12 2008/12/06 21:59:27 tom Exp $
+  */
+ #include <test.priv.h>
+ 
+@@ -78,16 +78,50 @@
+     return code;
+ }
+ 
++static void
++usage(void)
++{
++    static const char *msg[] =
++    {
++	"Usage: filter [options]"
++	,""
++	,"Options:"
++	,"  -i   use initscr() rather than newterm()"
++    };
++    unsigned n;
++    for (n = 0; n < SIZEOF(msg); n++)
++	fprintf(stderr, "%s\n", msg[n]);
++    ExitProgram(EXIT_FAILURE);
++}
++
+ int
+-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
++main(int argc, char *argv[])
+ {
++    int ch;
+     char buffer[80];
+     attr_t underline;
++    bool i_option = FALSE;
+ 
+     setlocale(LC_ALL, "");
+ 
++    while ((ch = getopt(argc, argv, "i")) != -1) {
++	switch (ch) {
++	case 'i':
++	    i_option = TRUE;
++	    break;
++	default:
++	    usage();
++	}
++    }
++
++    printf("starting filter program using %s...\n",
++	   i_option ? "initscr" : "newterm");
+     filter();
+-    (void) newterm((char *) 0, stdout, stdin);
++    if (i_option) {
++	initscr();
++    } else {
++	(void) newterm((char *) 0, stdout, stdin);
++    }
+     cbreak();
+     keypad(stdscr, TRUE);
+ 
+diff -Naur ncurses-5.7.orig/test/insdelln.c ncurses-5.7/test/insdelln.c
+--- ncurses-5.7.orig/test/insdelln.c	1969-12-31 16:00:00.000000000 -0800
++++ ncurses-5.7/test/insdelln.c	2009-01-18 23:56:30.000000000 -0800
+@@ -0,0 +1,380 @@
++/****************************************************************************
++ * Copyright (c) 2008 Free Software Foundation, Inc.                        *
++ *                                                                          *
++ * Permission is hereby granted, free of charge, to any person obtaining a  *
++ * copy of this software and associated documentation files (the            *
++ * "Software"), to deal in the Software without restriction, including      *
++ * without limitation the rights to use, copy, modify, merge, publish,      *
++ * distribute, distribute with modifications, sublicense, and/or sell       *
++ * copies of the Software, and to permit persons to whom the Software is    *
++ * furnished to do so, subject to the following conditions:                 *
++ *                                                                          *
++ * The above copyright notice and this permission notice shall be included  *
++ * in all copies or substantial portions of the Software.                   *
++ *                                                                          *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
++ *                                                                          *
++ * Except as contained in this notice, the name(s) of the above copyright   *
++ * holders shall not be used in advertising or otherwise to promote the     *
++ * sale, use or other dealings in this Software without prior written       *
++ * authorization.                                                           *
++ ****************************************************************************/
++/*
++ * $Id: insdelln.c,v 1.1 2008/12/20 22:06:52 tom Exp $
++ *
++ * test-driver for deleteln, wdeleteln, insdelln, winsdelln, insertln, winsertln
++ */
++
++#include <test.priv.h>
++
++#define SHOW(n) ((n) == ERR ? "ERR" : "OK")
++#define COLOR_DEFAULT (-1)
++
++typedef struct {
++    unsigned c;
++    unsigned v;
++    int pair;
++    unsigned attr;
++    int count;
++    int ch;
++    const char *c_msg;
++    const char *v_msg;
++    int y_val;
++    int x_val;
++    int y_beg, x_beg;
++    int y_max, x_max;
++} STATUS;
++
++static const char *
++color_params(unsigned state, int *pair)
++{
++    /* *INDENT-OFF* */
++    static struct {
++	int pair;
++	int fg, bg;
++	const char *msg;
++    } table[] = {
++	{ 0, COLOR_DEFAULT, COLOR_DEFAULT, "default" },
++	{ 1, COLOR_RED,     COLOR_BLACK,   "red/black" },
++	{ 2, COLOR_WHITE,   COLOR_BLUE,    "white/blue" },
++    };
++    /* *INDENT-ON* */
++
++    static bool first = TRUE;
++    const char *result = 0;
++
++    if (has_colors()) {
++	if (first) {
++	    unsigned n;
++
++	    start_color();
++	    for (n = 0; n < SIZEOF(table); ++n) {
++		init_pair(table[n].pair, table[n].fg, table[n].bg);
++	    }
++	}
++	if (state < SIZEOF(table)) {
++	    *pair = table[state].pair;
++	    result = table[state].msg;
++	}
++    }
++    return result;
++}
++
++static const char *
++video_params(unsigned state, unsigned *attr)
++{
++    /* *INDENT-OFF* */
++    static struct {
++	unsigned attr;
++	const char *msg;
++    } table[] = {
++	{ A_NORMAL,	"normal" },
++	{ A_BOLD,	"bold" },
++	{ A_REVERSE,	"reverse" },
++	{ A_UNDERLINE,	"underline" },
++	{ A_BLINK, 	"blink" },
++    };
++    /* *INDENT-ON* */
++
++    const char *result = 0;
++
++    if (state < SIZEOF(table)) {
++	*attr = table[state].attr;
++	result = table[state].msg;
++    }
++    return result;
++}
++
++/* fill the window with a test-pattern */
++static void
++fill_window(WINDOW *win)
++{
++    int y, x;
++
++    getyx(win, y, x);
++    wmove(win, 1, 0);
++    while (waddstr(win, "0123456789 abcdefghijklmnopqrstuvwxyz ") != ERR) {
++    }
++    wmove(win, y, x);
++}
++
++static void
++show_status(WINDOW *win, STATUS * sp)
++{
++    int y, x;
++
++    getyx(win, y, x);
++    wmove(win, 0, 0);
++    wprintw(win, "Count %d", sp->count);
++    if (sp->v_msg != 0)
++	wprintw(win, " Video %s", sp->v_msg);
++    if (sp->c_msg != 0)
++	wprintw(win, " Color %s", sp->c_msg);
++    wclrtoeol(win);
++    wmove(win, y, x);
++}
++
++static void
++reshow_status(WINDOW *win, STATUS * sp)
++{
++    fill_window(win);
++    show_status(win, sp);
++}
++
++static void
++do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *))
++{
++    WINDOW *win1 = newwin(sp->y_max - 2, sp->x_max - 2,
++			  sp->y_beg + 1, sp->x_beg + 1);
++
++    if (win1 != 0 && sp->y_max > 4 && sp->x_max > 4) {
++	WINDOW *win2 = derwin(win1, sp->y_max - 4, sp->x_max - 4, 1, 1);
++
++	if (win2 != 0) {
++	    box(win1, 0, 0);
++	    wrefresh(win1);
++	    func(win2);
++
++	    delwin(win2);
++	} else {
++	    beep();
++	}
++	delwin(win1);
++	touchwin(win);
++    } else {
++	beep();
++    }
++}
++
++static void
++init_status(WINDOW *win, STATUS * sp)
++{
++    memset(sp, 0, sizeof(*sp));
++    sp->c = 99;
++    sp->v = 99;
++    sp->ch = ' ';
++
++    keypad(win, TRUE);
++    fill_window(win);
++
++    getbegyx(win, sp->y_beg, sp->x_beg);
++    getmaxyx(win, sp->y_max, sp->x_max);
++}
++
++static void
++show_help(WINDOW *win)
++{
++    static const char *table[] =
++    {
++	"Basic commands:"
++	,"Use h/j/k/l or arrow keys to move the cursor."
++	,"Set the count parameter for insert/delete by entering digits 0-9."
++	,""
++	,"Other commands:"
++	,"space toggles through the set of video attributes and colors."
++	,"t     touches (forces repaint) of the current line."
++	,"i     calls insertln at the current position with the given count."
++	,"d     calls deleteln at the window beginning with the given count."
++	,"I     calls insdelln at the window beginning with the given count."
++	,"D     calls insdelln at the window beginning with the given -count."
++	,"f     refills the window with test-pattern using current attributes."
++	,"w     recur to test windows other than stdscr"
++	,"q     quit"
++	,"=     resets count to zero."
++	,"?     shows this help-window"
++	,""
++	,""
++    };
++
++    int y_max, x_max;
++    int row;
++
++    getmaxyx(win, y_max, x_max);
++    for (row = 0; row < (int) SIZEOF(table) && row < y_max; ++row) {
++	mvwprintw(win, row, 0, "%.*s", x_max, table[row]);
++    }
++    while (wgetch(win) != 'q')
++	beep();
++}
++
++static void
++update_status(WINDOW *win, STATUS * sp)
++{
++    switch (sp->ch) {
++    case ' ':			/* next test-iteration */
++	if (has_colors()) {
++	    if ((sp->c_msg = color_params(++(sp->c), &(sp->pair))) == 0) {
++		sp->c_msg = color_params(sp->c = 0, &(sp->pair));
++		if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
++		    sp->v_msg = video_params(sp->v = 0, &(sp->attr));
++		}
++	    }
++	} else {
++	    if ((sp->v_msg = video_params(++(sp->v), &(sp->attr))) == 0) {
++		sp->v_msg = video_params(sp->v = 0, &(sp->attr));
++	    }
++	}
++	sp->count = 0;
++	show_status(win, sp);
++	break;
++    case KEY_LEFT:
++    case 'h':
++	if (sp->x_val > 0)
++	    wmove(win, sp->y_val, --(sp->x_val));
++	break;
++    case KEY_DOWN:
++    case 'j':
++	if (sp->y_val < sp->y_max)
++	    wmove(win, ++(sp->y_val), sp->x_val);
++	break;
++    case KEY_UP:
++    case 'k':
++	if (sp->y_val > 0)
++	    wmove(win, --(sp->y_val), sp->x_val);
++	break;
++    case KEY_RIGHT:
++    case 'l':
++	if (sp->x_val < sp->x_max)
++	    wmove(win, sp->y_val, ++(sp->x_val));
++	break;
++    case 't':
++	touchline(win, sp->y_val, 1);
++	break;
++    case '=':
++	sp->count = 0;
++	show_status(win, sp);
++	break;
++    case '?':
++	do_subwindow(win, sp, show_help);
++	break;
++    default:
++	if (isdigit(sp->ch)) {
++	    sp->count = (sp->count * 10) + (sp->ch - '0');
++	    show_status(win, sp);
++	} else {
++	    beep();
++	}
++	break;
++    }
++}
++
++static void
++test_winsdelln(WINDOW *win)
++{
++    STATUS st;
++    int n;
++
++    init_status(win, &st);
++
++    do {
++	wattrset(win, st.attr | COLOR_PAIR(st.pair));
++	switch (st.ch) {
++	case 'i':
++	    for (n = 0; n < st.count; ++n)
++		winsertln(win);
++	    break;
++	case 'd':
++	    for (n = 0; n < st.count; ++n)
++		wdeleteln(win);
++	    break;
++	case 'I':
++	    winsdelln(win, st.count);
++	    break;
++	case 'D':
++	    winsdelln(win, -st.count);
++	    break;
++	case 'f':
++	    fill_window(win);
++	    reshow_status(win, &st);
++	    break;
++	case 'w':
++	    do_subwindow(win, &st, test_winsdelln);
++	    break;
++	case 'q':
++	    return;
++	default:
++	    update_status(win, &st);
++	    break;
++	}
++    } while ((st.ch = wgetch(win)) != ERR);
++}
++
++static void
++test_insdelln(void)
++{
++    STATUS st;
++    int n;
++
++    init_status(stdscr, &st);
++
++    do {
++	attrset(st.attr | COLOR_PAIR(st.pair));
++	switch (st.ch) {
++	case 'i':
++	    for (n = 0; n < st.count; ++n)
++		insertln();
++	    break;
++	case 'd':
++	    for (n = 0; n < st.count; ++n)
++		deleteln();
++	    break;
++	case 'I':
++	    insdelln(st.count);
++	    break;
++	case 'D':
++	    insdelln(-st.count);
++	    break;
++	case 'f':
++	    fill_window(stdscr);
++	    reshow_status(stdscr, &st);
++	    break;
++	case 'w':
++	    do_subwindow(stdscr, &st, test_winsdelln);
++	    break;
++	case 'q':
++	    return;
++	default:
++	    update_status(stdscr, &st);
++	    break;
++	}
++    } while ((st.ch = getch()) != ERR);
++}
++
++int
++main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
++{
++    initscr();
++    cbreak();
++    noecho();
++
++    test_insdelln();
++    endwin();
++
++    ExitProgram(EXIT_SUCCESS);
++}
+diff -Naur ncurses-5.7.orig/test/modules ncurses-5.7/test/modules
+--- ncurses-5.7.orig/test/modules	2007-08-18 10:57:08.000000000 -0700
++++ ncurses-5.7/test/modules	2009-01-18 23:56:30.000000000 -0800
+@@ -1,4 +1,4 @@
+-# $Id: modules,v 1.36 2007/08/18 17:57:08 tom Exp $
++# $Id: modules,v 1.37 2008/12/20 21:38:44 tom Exp $
+ ##############################################################################
+ # Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
+ #                                                                            #
+@@ -37,6 +37,7 @@
+ bs		progs		$(srcdir)	$(HEADER_DEPS)
+ cardfile	progs		$(srcdir)	$(HEADER_DEPS)	../include/panel.h ../include/form.h
+ chgat		progs		$(srcdir)	$(HEADER_DEPS)
++clip_printw	progs		$(srcdir)	$(HEADER_DEPS)
+ color_set	progs		$(srcdir)	$(HEADER_DEPS)
+ demo_altkeys	progs		$(srcdir)	$(HEADER_DEPS)
+ demo_defkey	progs		$(srcdir)	$(HEADER_DEPS)
+@@ -60,6 +61,7 @@
+ inch_wide	progs		$(srcdir)	$(HEADER_DEPS)
+ inchs		progs		$(srcdir)	$(HEADER_DEPS)
+ ins_wide	progs		$(srcdir)	$(HEADER_DEPS)
++insdelln	progs		$(srcdir)	$(HEADER_DEPS)
+ inserts		progs		$(srcdir)	$(HEADER_DEPS)
+ key_names	progs		$(srcdir)	$(HEADER_DEPS)
+ keynames	progs		$(srcdir)	$(HEADER_DEPS)
+diff -Naur ncurses-5.7.orig/test/ncurses.c ncurses-5.7/test/ncurses.c
+--- ncurses-5.7.orig/test/ncurses.c	2008-09-27 07:34:58.000000000 -0700
++++ ncurses-5.7/test/ncurses.c	2009-01-18 23:56:30.000000000 -0800
+@@ -40,7 +40,7 @@
+    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
+            Thomas E. Dickey (beginning revision 1.27 in 1996).
+ 
+-$Id: ncurses.c,v 1.329 2008/09/27 14:34:58 tom Exp $
++$Id: ncurses.c,v 1.334 2008/12/20 17:13:27 tom Exp $
+ 
+ ***************************************************************************/
+ 
+@@ -569,8 +569,11 @@
+  *
+  ****************************************************************************/
+ 
++#define NUM_GETCH_FLAGS 256
++typedef bool GetchFlags[NUM_GETCH_FLAGS];
++
+ static void
+-setup_getch(WINDOW *win, bool flags[])
++setup_getch(WINDOW *win, GetchFlags flags)
+ {
+     keypad(win, flags['k']);	/* should be redundant, but for testing */
+     meta(win, flags['m']);	/* force this to a known state */
+@@ -581,7 +584,17 @@
+ }
+ 
+ static void
+-wgetch_help(WINDOW *win, bool flags[])
++init_getch(WINDOW *win, GetchFlags flags)
++{
++    memset(flags, FALSE, NUM_GETCH_FLAGS);
++    flags[UChar('k')] = (win == stdscr);
++    flags[UChar('m')] = TRUE;
++
++    setup_getch(win, flags);
++}
++
++static void
++wgetch_help(WINDOW *win, GetchFlags flags)
+ {
+     static const char *help[] =
+     {
+@@ -731,13 +744,10 @@
+     int first_y, first_x;
+     int c;
+     int incount = 0;
+-    bool flags[256];
++    GetchFlags flags;
+     bool blocking = (delay < 0);
+ 
+-    memset(flags, FALSE, sizeof(flags));
+-    flags[UChar('k')] = (win == stdscr);
+-
+-    setup_getch(win, flags);
++    init_getch(win, flags);
+     wtimeout(win, delay);
+     getyx(win, first_y, first_x);
+ 
+@@ -835,12 +845,18 @@
+ 		}
+ #endif
+ 		(void) waddstr(win, keyname(c));
+-	    } else if (c > 0x80) {
+-		unsigned c2 = (unsigned) (c & 0x7f);
+-		if (isprint(c2))
+-		    (void) wprintw(win, "M-%c", UChar(c2));
+-		else
++	    } else if (c >= 0x80) {
++		unsigned c2 = (unsigned) c;
++#if !(defined(NCURSES_VERSION) || defined(_XOPEN_CURSES))
++		/* at least Solaris SVR4 curses breaks unctrl(128), etc. */
++		c2 &= 0x7f;
++#endif
++		if (isprint(c))
++		    (void) wprintw(win, "%c", UChar(c));
++		else if (c2 != UChar(c))
+ 		    (void) wprintw(win, "M-%s", unctrl(c2));
++		else
++		    (void) wprintw(win, "%s", unctrl(c2));
+ 		waddstr(win, " (high-half character)");
+ 	    } else {
+ 		if (isprint(c))
+@@ -854,6 +870,9 @@
+     }
+ 
+     wtimeout(win, -1);
++
++    if (!level)
++	init_getch(win, flags);
+ }
+ 
+ static int
+@@ -978,15 +997,12 @@
+     int first_y, first_x;
+     wint_t c;
+     int incount = 0;
+-    bool flags[256];
++    GetchFlags flags;
+     bool blocking = (delay < 0);
+     int y, x, code;
+     char *temp;
+ 
+-    memset(flags, FALSE, sizeof(flags));
+-    flags[UChar('k')] = (win == stdscr);
+-
+-    setup_getch(win, flags);
++    init_getch(win, flags);
+     wtimeout(win, delay);
+     getyx(win, first_y, first_x);
+ 
+@@ -1096,14 +1112,14 @@
+ 		    resize_wide_boxes(level, win);
+ 		}
+ #endif
+-		(void) waddstr(win, key_name((wchar_t) c));
++		(void) waddstr(win, keyname((wchar_t) c));
+ 	    } else {
++		(void) waddstr(win, key_name((wchar_t) c));
+ 		if (c < 256 && iscntrl(c)) {
+-		    (void) wprintw(win, "%s (control character)", unctrl(c));
++		    (void) wprintw(win, " (control character)");
+ 		} else {
+-		    wchar_t c2 = (wchar_t) c;
+-		    waddnwstr(win, &c2, 1);
+-		    (void) wprintw(win, " = %#x (printable character)", (unsigned) c);
++		    (void) wprintw(win, " = %#x (printable character)",
++				   (unsigned) c);
+ 		}
+ 	    }
+ 	    wgetch_wrap(win, first_y);
+@@ -1111,6 +1127,9 @@
+     }
+ 
+     wtimeout(win, -1);
++
++    if (!level)
++	init_getch(win, flags);
+ }
+ 
+ static void
+@@ -2802,6 +2821,7 @@
+ } attrs_to_cycle[] = {
+     { A_NORMAL,		"normal" },
+     { A_BOLD,		"bold" },
++    { A_BLINK,		"blink" },
+     { A_REVERSE,	"reverse" },
+     { A_UNDERLINE,	"underline" },
+ };
+@@ -2902,7 +2922,7 @@
+ 	do {
+ 	    if (C1)
+ 		nodelay(stdscr, TRUE);
+-	    echochar(code | attr | COLOR_PAIR(pair));
++	    echochar(colored_chtype(code, attr, pair));
+ 	    if (C1) {
+ 		/* (yes, this _is_ crude) */
+ 		while ((reply = Getchar()) != ERR) {
+@@ -2951,7 +2971,7 @@
+ 		 */
+ 		break;
+ 	    default:
+-		addch(code | A_ALTCHARSET | attr | COLOR_PAIR(pair));
++		addch(colored_chtype(code, A_ALTCHARSET | attr, pair));
+ 		break;
+ 	    }
+ 	} while (--count > 0);
+@@ -2969,15 +2989,23 @@
+     mvaddstr(0, 20, "Display of the ACS Line-Drawing Set");
+     attroff(A_BOLD);
+     refresh();
+-    box(stdscr, 0, 0);
+     /* *INDENT-OFF* */
+-    mvhline(LINES / 2, 0,        ACS_HLINE | attr, COLS);
+-    mvvline(0,         COLS / 2, ACS_VLINE | attr, LINES);
+-    mvaddch(0,         COLS / 2, ACS_TTEE | attr);
+-    mvaddch(LINES / 2, COLS / 2, ACS_PLUS | attr);
+-    mvaddch(LINES - 1, COLS / 2, ACS_BTEE | attr);
+-    mvaddch(LINES / 2, 0,        ACS_LTEE | attr);
+-    mvaddch(LINES / 2, COLS - 1, ACS_RTEE | attr);
++    wborder(stdscr,
++	    colored_chtype(ACS_VLINE,	 attr, pair),
++	    colored_chtype(ACS_VLINE,	 attr, pair),
++            colored_chtype(ACS_HLINE,    attr, pair),
++	    colored_chtype(ACS_HLINE,	 attr, pair),
++	    colored_chtype(ACS_ULCORNER, attr, pair),
++	    colored_chtype(ACS_URCORNER, attr, pair),
++            colored_chtype(ACS_LLCORNER, attr, pair),
++	    colored_chtype(ACS_LRCORNER, attr, pair));
++    mvhline(LINES / 2, 0,        colored_chtype(ACS_HLINE, attr, pair), COLS);
++    mvvline(0,         COLS / 2, colored_chtype(ACS_VLINE, attr, pair), LINES);
++    mvaddch(0,         COLS / 2, colored_chtype(ACS_TTEE,  attr, pair));
++    mvaddch(LINES / 2, COLS / 2, colored_chtype(ACS_PLUS,  attr, pair));
++    mvaddch(LINES - 1, COLS / 2, colored_chtype(ACS_BTEE,  attr, pair));
++    mvaddch(LINES / 2, 0,        colored_chtype(ACS_LTEE,  attr, pair));
++    mvaddch(LINES / 2, COLS - 1, colored_chtype(ACS_RTEE,  attr, pair));
+     /* *INDENT-ON* */
+ 
+ }
+@@ -3002,7 +3030,7 @@
+ {
+     int n;
+ 
+-#define BOTH(name) #name, (name | attr | COLOR_PAIR(pair))
++#define BOTH(name) #name, colored_chtype(name, attr, pair)
+ 
+     erase();
+     attron(A_BOLD);
+@@ -3238,7 +3266,7 @@
+     int col = (n / height) * COLS / 2;
+ 
+     mvprintw(row, col, "%*s : ", COLS / 4, name);
+-    while (repeat-- >= 0) {
++    while (--repeat >= 0) {
+ 	add_wch(code);
+     }
+     return n + 1;
+@@ -3307,12 +3335,12 @@
+ 
+ #undef MERGE_ATTR
+ 
+-#define MERGE_ATTR(wch) merge_wide_attr(&temp, wch, attr, pair)
++#define MERGE_ATTR(n,wch) merge_wide_attr(&temp[n], wch, attr, pair)
+ 
+ static void
+ show_wbox_chars(int repeat, attr_t attr, short pair)
+ {
+-    cchar_t temp;
++    cchar_t temp[8];
+ 
+     (void) repeat;
+     erase();
+@@ -3321,17 +3349,23 @@
+     attroff(A_BOLD);
+     refresh();
+ 
+-    attr_set(attr, pair, 0);
+-    box_set(stdscr, 0, 0);
+-    attr_set(A_NORMAL, 0, 0);
++    wborder_set(stdscr,
++		MERGE_ATTR(0, WACS_VLINE),
++		MERGE_ATTR(1, WACS_VLINE),
++		MERGE_ATTR(2, WACS_HLINE),
++		MERGE_ATTR(3, WACS_HLINE),
++		MERGE_ATTR(4, WACS_ULCORNER),
++		MERGE_ATTR(5, WACS_URCORNER),
++		MERGE_ATTR(6, WACS_LLCORNER),
++		MERGE_ATTR(7, WACS_LRCORNER));
+     /* *INDENT-OFF* */
+-    mvhline_set(LINES / 2, 0,        MERGE_ATTR(WACS_HLINE), COLS);
+-    mvvline_set(0,         COLS / 2, MERGE_ATTR(WACS_VLINE), LINES);
+-    mvadd_wch(0,           COLS / 2, MERGE_ATTR(WACS_TTEE));
+-    mvadd_wch(LINES / 2,   COLS / 2, MERGE_ATTR(WACS_PLUS));
+-    mvadd_wch(LINES - 1,   COLS / 2, MERGE_ATTR(WACS_BTEE));
+-    mvadd_wch(LINES / 2,   0,        MERGE_ATTR(WACS_LTEE));
+-    mvadd_wch(LINES / 2,   COLS - 1, MERGE_ATTR(WACS_RTEE));
++    mvhline_set(LINES / 2, 0,        MERGE_ATTR(0, WACS_HLINE), COLS);
++    mvvline_set(0,         COLS / 2, MERGE_ATTR(0, WACS_VLINE), LINES);
++    mvadd_wch(0,           COLS / 2, MERGE_ATTR(0, WACS_TTEE));
++    mvadd_wch(LINES / 2,   COLS / 2, MERGE_ATTR(0, WACS_PLUS));
++    mvadd_wch(LINES - 1,   COLS / 2, MERGE_ATTR(0, WACS_BTEE));
++    mvadd_wch(LINES / 2,   0,        MERGE_ATTR(0, WACS_LTEE));
++    mvadd_wch(LINES / 2,   COLS - 1, MERGE_ATTR(0, WACS_RTEE));
+     /* *INDENT-ON* */
+ 
+ }
+@@ -5804,7 +5838,7 @@
+ 	break;
+     case 2:
+ 	init_pair(cpair, COLOR_RED, COLOR_GREEN);
+-	wbkgdset(win, ' ' | A_BLINK | COLOR_PAIR(cpair));
++	wbkgdset(win, colored_chtype(' ', A_BLINK, cpair));
+ 	break;
+     case 3:
+ 	wbkgdset(win, ' ' | A_NORMAL);
+diff -Naur ncurses-5.7.orig/test/programs ncurses-5.7/test/programs
+--- ncurses-5.7.orig/test/programs	2008-08-16 14:47:39.000000000 -0700
++++ ncurses-5.7/test/programs	2009-01-18 23:56:30.000000000 -0800
+@@ -1,4 +1,4 @@
+-# $Id: programs,v 1.14 2008/08/16 21:47:39 tom Exp $
++# $Id: programs,v 1.15 2008/12/20 21:38:44 tom Exp $
+ ##############################################################################
+ # Copyright (c) 2006-2007,2008 Free Software Foundation, Inc.                #
+ #                                                                            #
+@@ -35,6 +35,7 @@
+ bs		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	bs
+ cardfile	$(LDFLAGS_DEFAULT)	$(LOCAL_LIBS)	cardfile
+ chgat		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	chgat
++clip_printw	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	clip_printw
+ color_set	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	color_set
+ demo_altkeys	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	demo_altkeys
+ demo_defkey	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	demo_defkey
+@@ -57,6 +58,7 @@
+ inch_wide	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	inch_wide
+ inchs		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	inchs
+ ins_wide	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	ins_wide
++insdelln	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	insdelln
+ inserts		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	inserts
+ key_names	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	key_names
+ keynames	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	keynames
+diff -Naur ncurses-5.7.orig/test/test.priv.h ncurses-5.7/test/test.priv.h
+--- ncurses-5.7.orig/test/test.priv.h	2008-10-04 14:53:41.000000000 -0700
++++ ncurses-5.7/test/test.priv.h	2009-01-18 23:56:30.000000000 -0800
+@@ -29,7 +29,7 @@
+ /****************************************************************************
+  *  Author: Thomas E. Dickey                    1996-on                     *
+  ****************************************************************************/
+-/* $Id: test.priv.h,v 1.79 2008/10/04 21:53:41 tom Exp $ */
++/* $Id: test.priv.h,v 1.80 2008/12/20 16:37:20 tom Exp $ */
+ 
+ #ifndef __TEST_PRIV_H
+ #define __TEST_PRIV_H 1
+@@ -359,6 +359,9 @@
+ #define KEY_MIN 256	/* not defined in Solaris 8 */
+ #endif
+ 
++#define colored_chtype(ch, attr, pair) \
++	((ch) | (attr) | COLOR_PAIR(pair))
++
+ /*
+  * Workaround for HPUX
+  */
Index: tches/vim-7.2-branch_update-4.patch
===================================================================
--- patches/vim-7.2-branch_update-4.patch	(revision 39806f8b8e61809daf1ec386359df0259e7bb2d5)
+++ 	(revision )
@@ -1,5493 +1,0 @@
-Submitted By: Jim Gifford (jim at cross-lfs dot org)
-Date: 01-08-2009
-Initial Package Version: 7.2
-Origin: Upstream
-Upstream Status: Applied
-Description: Contains all upstream patches up to 7.2.079
-             The following patches were skipped
-             007 036 041 049 071 072 074
-
-diff -Naur vim72.orig/Filelist vim72/Filelist
---- vim72.orig/Filelist	2008-07-06 11:02:23.000000000 -0700
-+++ vim72/Filelist	2009-01-08 20:57:31.000000000 -0800
-@@ -285,6 +285,7 @@
- 		src/proto/os_win32.pro \
- 		src/proto/os_mswin.pro \
- 		src/testdir/Make_dos.mak \
-+		src/testdir/Make_ming.mak \
- 		src/testdir/dos.vim \
- 		src/uninstal.c \
- 		src/vim.def \
-diff -Naur vim72.orig/runtime/doc/cmdline.txt vim72/runtime/doc/cmdline.txt
---- vim72.orig/runtime/doc/cmdline.txt	2008-08-09 07:22:59.000000000 -0700
-+++ vim72/runtime/doc/cmdline.txt	2009-01-08 20:57:32.000000000 -0800
-@@ -1,4 +1,4 @@
--*cmdline.txt*   For Vim version 7.2.  Last change: 2008 Jul 29
-+*cmdline.txt*   For Vim version 7.2.  Last change: 2008 Sep 18
- 
- 
- 		  VIM REFERENCE MANUAL    by Bram Moolenaar
-@@ -157,6 +157,11 @@
- 				(doesn't work at the expression prompt; some
- 				things such as changing the buffer or current
- 				window are not allowed to avoid side effects)
-+				When the result is a |List| the items are used
-+				as lines.  They can have line breaks inside
-+				too.
-+				When the result is a Float it's automatically
-+				converted to a String.
- 		See |registers| about registers.  {not in Vi}
- 		Implementation detail: When using the |expression| register
- 		and invoking setcmdpos(), this sets the position before
-@@ -730,19 +735,29 @@
- In Ex commands, at places where a file name can be used, the following
- characters have a special meaning.  These can also be used in the expression
- function expand() |expand()|.
--	%	is replaced with the current file name			*:_%*
--	#	is replaced with the alternate file name		*:_#*
-+	%	Is replaced with the current file name.		  *:_%* *c_%*
-+	#	Is replaced with the alternate file name.	  *:_#* *c_#*
- 	#n	(where n is a number) is replaced with the file name of
--		buffer n.  "#0" is the same as "#"
--	##	is replaced with all names in the argument list		*:_##*
-+		buffer n.  "#0" is the same as "#".
-+	##	Is replaced with all names in the argument list	  *:_##* *c_##*
- 		concatenated, separated by spaces.  Each space in a name
- 		is preceded with a backslash.
--Note that these give the file name as it was typed.  If an absolute path is
--needed (when using the file name from a different directory), you need to add
--":p".  See |filename-modifiers|.
-+	#<n	(where n is a number > 0) is replaced with old	  *:_#<* *c_#<*
-+		file name n.  See |:oldfiles| or |v:oldfiles| to get the
-+		number.							*E809*
-+		{only when compiled with the +eval and +viminfo features}
-+
-+Note that these, except "#<n", give the file name as it was typed.  If an
-+absolute path is needed (when using the file name from a different directory),
-+you need to add ":p".  See |filename-modifiers|.
-+
-+The "#<n" item returns an absolute path, but it will start with "~/" for files
-+below your home directory.
-+
- Note that backslashes are inserted before spaces, so that the command will
- correctly interpret the file name.  But this doesn't happen for shell
--commands.  For those you probably have to use quotes: >
-+commands.  For those you probably have to use quotes (this fails for files
-+that contain a quote and wildcards): >
- 	:!ls "%"
- 	:r !spell "%"
- 
-diff -Naur vim72.orig/runtime/doc/eval.txt vim72/runtime/doc/eval.txt
---- vim72.orig/runtime/doc/eval.txt	2008-08-09 07:22:59.000000000 -0700
-+++ vim72/runtime/doc/eval.txt	2009-01-08 20:57:45.000000000 -0800
-@@ -1,4 +1,4 @@
--*eval.txt*	For Vim version 7.2.  Last change: 2008 Aug 09
-+*eval.txt*	For Vim version 7.2.  Last change: 2008 Nov 27
- 
- 
- 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
-@@ -1484,6 +1484,17 @@
- 		This is the screen column number, like with |virtcol()|.  The
- 		value is zero when there was no mouse button click.
- 
-+					*v:oldfiles* *oldfiles-variable*
-+v:oldfiles	List of file names that is loaded from the |viminfo| file on
-+		startup.  These are the files that Vim remembers marks for.
-+		The length of the List is limited by the ' argument of the
-+		'viminfo' option (default is 100).
-+		Also see |:oldfiles| and |c_#<|.
-+		The List can be modified, but this has no effect on what is
-+		stored in the |viminfo| file later.  If you use values other
-+		than String this will cause trouble.
-+		{only when compiled with the +viminfo feature}
-+
- 					*v:operator* *operator-variable*
- v:operator	The last operator given in Normal mode.  This is a single
- 		character except for commands starting with <g> or <z>,
-@@ -1695,7 +1706,7 @@
- exists( {expr})			Number	TRUE if {expr} exists
- extend({expr1}, {expr2} [, {expr3}])
- 				List/Dict insert items of {expr2} into {expr1}
--expand( {expr})			String	expand special keywords in {expr}
-+expand( {expr} [, {flag}])	String	expand special keywords in {expr}
- feedkeys( {string} [, {mode}])	Number	add key sequence to typeahead buffer
- filereadable( {file})		Number	TRUE if {file} is a readable file
- filewritable( {file})		Number	TRUE if {file} is a writable file
-@@ -1747,8 +1758,9 @@
- getwinposx()			Number	X coord in pixels of GUI Vim window
- getwinposy()			Number	Y coord in pixels of GUI Vim window
- getwinvar( {nr}, {varname})	any	variable {varname} in window {nr}
--glob( {expr})			String	expand file wildcards in {expr}
--globpath( {path}, {expr})	String	do glob({expr}) for all dirs in {path}
-+glob( {expr} [, {flag}])	String	expand file wildcards in {expr}
-+globpath( {path}, {expr} [, {flag}])
-+				String	do glob({expr}) for all dirs in {path}
- has( {feature})			Number	TRUE if feature {feature} supported
- has_key( {dict}, {key})		Number	TRUE if {dict} has entry {key}
- haslocaldir()			Number	TRUE if current window executed |:lcd|
-@@ -3275,14 +3287,16 @@
- 			:let list_is_on = getwinvar(2, '&list')
- 			:echo "myvar = " . getwinvar(1, 'myvar')
- <
--							*glob()*
--glob({expr})	Expand the file wildcards in {expr}.  See |wildcards| for the
-+glob({expr} [, {flag}])					*glob()*
-+		Expand the file wildcards in {expr}.  See |wildcards| for the
- 		use of special characters.
- 		The result is a String.
- 		When there are several matches, they are separated by <NL>
- 		characters.
--		The 'wildignore' option applies: Names matching one of the
--		patterns in 'wildignore' will be skipped.
-+		Unless the optional {flag} argument is given and is non-zero,
-+		the 'suffixes' and 'wildignore' options apply: Names matching
-+		one of the patterns in 'wildignore' will be skipped and
-+		'suffixes' affect the ordering of matches.
- 		If the expansion fails, the result is an empty string.
- 		A name for a non-existing file is not included.
- 
-@@ -3296,20 +3310,22 @@
- 		See |expand()| for expanding special Vim variables.  See
- 		|system()| for getting the raw output of an external command.
- 
--globpath({path}, {expr})				*globpath()*
-+globpath({path}, {expr} [, {flag}])			*globpath()*
- 		Perform glob() on all directories in {path} and concatenate
- 		the results.  Example: >
- 			:echo globpath(&rtp, "syntax/c.vim")
- <		{path} is a comma-separated list of directory names.  Each
- 		directory name is prepended to {expr} and expanded like with
--		glob().  A path separator is inserted when needed.
-+		|glob()|.  A path separator is inserted when needed.
- 		To add a comma inside a directory name escape it with a
- 		backslash.  Note that on MS-Windows a directory may have a
- 		trailing backslash, remove it if you put a comma after it.
- 		If the expansion fails for one of the directories, there is no
- 		error message.
--		The 'wildignore' option applies: Names matching one of the
--		patterns in 'wildignore' will be skipped.
-+		Unless the optional {flag} argument is given and is non-zero,
-+		the 'suffixes' and 'wildignore' options apply: Names matching
-+		one of the patterns in 'wildignore' will be skipped and
-+		'suffixes' affect the ordering of matches.
- 
- 		The "**" item can be used to search in a directory tree.
- 		For example, to find all "README.txt" files in the directories
-@@ -5332,10 +5348,12 @@
- 		"fg"		foreground color (GUI: color name used to set
- 				the color, cterm: color number as a string,
- 				term: empty string)
--		"bg"		background color (like "fg")
-+		"bg"		background color (as with "fg")
-+		"sp"		special color (as with "fg") |highlight-guisp|
- 		"fg#"		like "fg", but for the GUI and the GUI is
- 				running the name in "#RRGGBB" form
- 		"bg#"		like "fg#" for "bg"
-+		"sp#"		like "fg#" for "sp"
- 		"bold"		"1" if bold
- 		"italic"	"1" if italic
- 		"reverse"	"1" if reverse
-@@ -5823,7 +5841,8 @@
- mouse_pterm		Compiled with support for qnx pterm mouse.
- mouse_sysmouse		Compiled with support for sysmouse (*BSD console mouse)
- mouse_xterm		Compiled with support for xterm mouse.
--multi_byte		Compiled with support for editing Korean et al.
-+multi_byte		Compiled with support for 'encoding'
-+multi_byte_encoding	'encoding' is set to a multi-byte encoding.
- multi_byte_ime		Compiled with support for IME input method.
- multi_lang		Compiled with support for multiple languages.
- mzscheme		Compiled with MzScheme interface |mzscheme|.
-diff -Naur vim72.orig/runtime/doc/netbeans.txt vim72/runtime/doc/netbeans.txt
---- vim72.orig/runtime/doc/netbeans.txt	2008-08-09 07:22:59.000000000 -0700
-+++ vim72/runtime/doc/netbeans.txt	2009-01-08 20:57:54.000000000 -0800
-@@ -1,4 +1,4 @@
--*netbeans.txt*  For Vim version 7.2.  Last change: 2008 Jun 28
-+*netbeans.txt*  For Vim version 7.2.  Last change: 2009 Jan 06
- 
- 
- 		  VIM REFERENCE MANUAL    by Gordon Prieur et al.
-@@ -722,8 +722,10 @@
- 		of the cursor.
- 		New in version 2.1.
- 
--killed		A file was closed by the user.  Only for files that have been
--		assigned a number by the IDE.
-+killed		A file was deleted or wiped out by the user and the buffer
-+		annotations have been removed.  The bufID number for this
-+		buffer has become invalid.  Only for files that have been
-+		assigned a bufID number by the IDE.
- 
- newDotAndMark off off
- 		Reports the position of the cursor being at "off" bytes into
-diff -Naur vim72.orig/runtime/doc/options.txt vim72/runtime/doc/options.txt
---- vim72.orig/runtime/doc/options.txt	2008-08-09 07:22:59.000000000 -0700
-+++ vim72/runtime/doc/options.txt	2009-01-08 20:57:43.000000000 -0800
-@@ -1,4 +1,4 @@
--*options.txt*	For Vim version 7.2.  Last change: 2008 Aug 06
-+*options.txt*	For Vim version 7.2.  Last change: 2008 Nov 25
- 
- 
- 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
-@@ -7472,7 +7472,9 @@
- 			{not available when compiled without the |+wildignore|
- 			feature}
- 	A list of file patterns.  A file that matches with one of these
--	patterns is ignored when completing file or directory names.
-+	patterns is ignored when completing file or directory names, and
-+	influences the result of |expand()|, |glob()| and |globpath()| unless
-+	a flag is passed to disable this.
- 	The pattern is used like with |:autocmd|, see |autocmd-patterns|.
- 	Also see 'suffixes'.
- 	Example: >
-diff -Naur vim72.orig/runtime/doc/spell.txt vim72/runtime/doc/spell.txt
---- vim72.orig/runtime/doc/spell.txt	2008-08-09 07:23:00.000000000 -0700
-+++ vim72/runtime/doc/spell.txt	2009-01-08 20:57:45.000000000 -0800
-@@ -1,4 +1,4 @@
--*spell.txt*	For Vim version 7.2.  Last change: 2008 Jun 21
-+*spell.txt*	For Vim version 7.2.  Last change: 2008 Nov 30
- 
- 
- 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
-@@ -831,8 +831,11 @@
- 
- 	# comment line ~
- 
--With some items it's also possible to put a comment after it, but this isn't
--supported in general.
-+Items with a fixed number of arguments can be followed by a comment.  But only
-+if none of the arguments can contain white space.  The comment must start with
-+a "#" character.  Example:
-+
-+	KEEPCASE =  # fix case for words with this flag ~
- 
- 
- ENCODING							*spell-SET*
-@@ -965,6 +968,9 @@
- 
- Note: When using utf-8 only characters up to 65000 may be used for flags.
- 
-+Note: even when using "num" or "long" the number of flags available to
-+compounding and prefixes is limited to about 250.
-+
- 
- AFFIXES
- 					    *spell-PFX* *spell-SFX*
-@@ -1178,6 +1184,9 @@
- The flag also applies to the word with affixes, thus this can be used to mark
- a whole bunch of related words as bad.
- 
-+							*spell-FORBIDDENWORD*
-+FORBIDDENWORD can be used just like BAD.  For compatibility with Hunspell.
-+
- 							*spell-NEEDAFFIX*
- The NEEDAFFIX flag is used to require that a word is used with an affix.  The
- word itself is not a good word (unless there is an empty affix).  Example:
-@@ -1268,6 +1277,10 @@
- 
- 	NEEDCOMPOUND & ~
- 
-+							*spell-ONLYINCOMPOUND*
-+The ONLYINCOMPOUND does exactly the same as NEEDCOMPOUND.  Supported for
-+compatiblity with Hunspell.
-+
- 							*spell-COMPOUNDMIN*
- The minimal character length of a word used for compounding is specified with
- COMPOUNDMIN.  Example:
-@@ -1328,6 +1341,20 @@
- rules.  Can also be used for an affix to count the affix as a compounding
- word.
- 
-+						*spell-CHECKCOMPOUNDPATTERN*
-+CHECKCOMPOUNDPATTERN is used to define patterns that, when matching at the
-+position where two words are compounded together forbids the compound.
-+For example:
-+	CHECKCOMPOUNDPATTERN o e ~
-+
-+This forbids compounding if the first word ends in "o" and the second word
-+starts with "e".
-+
-+The arguments must be plain text, no patterns are actually supported, despite
-+the item name.  Case is always ignored.
-+
-+The Hunspell feature to use three arguments and flags is not supported.
-+
- 							*spell-SYLLABLE*
- The SYLLABLE item defines characters or character sequences that are used to
- count the number of syllables in a word.  Example:
-@@ -1496,6 +1523,10 @@
- ACCENT		(Hunspell)				*spell-ACCENT*
- 		Use MAP instead. |spell-MAP|
- 
-+BREAK		(Hunspell)				*spell-BREAK*
-+		Define break points.  Unclear how it works exactly.
-+		Not supported.
-+
- CHECKCOMPOUNDCASE  (Hunspell)			*spell-CHECKCOMPOUNDCASE*
- 		Disallow uppercase letters at compound word boundaries.
- 		Not supported.
-@@ -1512,9 +1543,6 @@
- 		Forbid three identical characters when compounding.  Not
- 		supported.
- 
--CHECKCOMPOUNDPATTERN  (Hunspell)		*spell-CHECKCOMPOUNDPATTERN*
--		Forbid compounding when patterns match.  Not supported.
--
- COMPLEXPREFIXES  (Hunspell)				*spell-COMPLEXPREFIXES*
- 		Enables using two prefixes.  Not supported.
- 
-@@ -1536,13 +1564,18 @@
- COMPOUNDMIDDLE	(Hunspell)				*spell-COMPOUNDMIDDLE*
- 		Use COMPOUNDRULE instead. |spell-COMPOUNDRULE|
- 
-+COMPOUNDRULES	(Hunspell)				*spell-COMPOUNDRULES*
-+		Number of COMPOUNDRULE lines following.  Ignored, but the
-+		argument must be a number.
-+
- COMPOUNDSYLLABLE  (Hunspell)			*spell-COMPOUNDSYLLABLE*
- 		Use SYLLABLE and COMPOUNDSYLMAX instead. |spell-SYLLABLE|
- 		|spell-COMPOUNDSYLMAX|
- 
--FORBIDDENWORD	(Hunspell)				*spell-FORBIDDENWORD*
--		Use BAD instead. |spell-BAD|
--
-+KEY		(Hunspell)				*spell-KEY*
-+		Define characters that are close together on the keyboard.
-+		Used to give better suggestions.  Not supported.
-+		
- LANG		(Hunspell)				*spell-LANG*
- 		This specifies language-specific behavior.  This actually
- 		moves part of the language knowledge into the program,
-@@ -1553,10 +1586,7 @@
- 		Only needed for morphological analysis.
- 
- MAXNGRAMSUGS	(Hunspell)				*spell-MAXNGRAMSUGS*
--		Not supported.
--
--ONLYINCOMPOUND	(Hunspell)				*spell-ONLYINCOMPOUND*
--		Use NEEDCOMPOUND instead. |spell-NEEDCOMPOUND|
-+		Set number of n-gram suggestions.  Not supported.
- 
- PSEUDOROOT	(Hunspell)				*spell-PSEUDOROOT*
- 		Use NEEDAFFIX instead. |spell-NEEDAFFIX|
-diff -Naur vim72.orig/runtime/doc/starting.txt vim72/runtime/doc/starting.txt
---- vim72.orig/runtime/doc/starting.txt	2008-08-09 07:23:00.000000000 -0700
-+++ vim72/runtime/doc/starting.txt	2009-01-08 20:57:32.000000000 -0800
-@@ -1,4 +1,4 @@
--*starting.txt*  For Vim version 7.2.  Last change: 2008 Jun 21
-+*starting.txt*  For Vim version 7.2.  Last change: 2008 Nov 09
- 
- 
- 		  VIM REFERENCE MANUAL    by Bram Moolenaar
-@@ -1337,8 +1337,9 @@
- 							*viminfo-read*
- When Vim is started and the 'viminfo' option is non-empty, the contents of
- the viminfo file are read and the info can be used in the appropriate places.
--The marks are not read in at startup (but file marks are).  See
--|initialization| for how to set the 'viminfo' option upon startup.
-+The |v:oldfiles| variable is filled.  The marks are not read in at startup
-+(but file marks are).  See |initialization| for how to set the 'viminfo'
-+option upon startup.
- 
- 							*viminfo-write*
- When Vim exits and 'viminfo' is non-empty, the info is stored in the viminfo
-@@ -1372,6 +1373,8 @@
- that start with any string given with the "r" flag in 'viminfo'.  This can be
- used to avoid saving marks for files on removable media (for MS-DOS you would
- use "ra:,rb:", for Amiga "rdf0:,rdf1:,rdf2:").
-+The |v:oldfiles| variable is filled with the file names that the viminfo file
-+has marks for.
- 
- 							*viminfo-file-marks*
- Uppercase marks ('A to 'Z) are stored when writing the viminfo file.  The
-@@ -1463,8 +1466,8 @@
- 						   *:rv* *:rviminfo* *E195*
- :rv[iminfo][!] [file]	Read from viminfo file [file] (default: see above).
- 			If [!] is given, then any information that is
--			already set (registers, marks, etc.) will be
--			overwritten.  {not in Vi}
-+			already set (registers, marks, |v:oldfiles|, etc.)
-+			will be overwritten   {not in Vi}
- 
- 					*:wv* *:wviminfo* *E137* *E138* *E574*
- :wv[iminfo][!] [file]	Write to viminfo file [file] (default: see above).
-@@ -1479,4 +1482,20 @@
- 			the .viminfo file.
- 			{not in Vi}
- 
-+						*:ol* *:oldfiles*
-+:ol[dfiles]		List the files that have marks stored in the viminfo
-+			file.  This list is read on startup and only changes
-+			afterwards with ":rviminfo!".  Also see |v:oldfiles|.
-+			The number can be used with |c_#<|.
-+			{not in Vi, only when compiled with the +eval feature}
-+
-+:bro[wse] ol[dfiles][!]
-+			List file names as with |:oldfiles|, and then prompt
-+			for a number.  When the number is valid that file from
-+			the list is edited.
-+			If you get the |press-enter| prompt you can press "q"
-+			and still get the prompt to enter a file number.
-+			Use ! to abondon a modified buffer. |abandon|
-+			{not when compiled with tiny or small features}
-+
-  vim:tw=78:ts=8:ft=help:norl:
-diff -Naur vim72.orig/runtime/doc/usr_21.txt vim72/runtime/doc/usr_21.txt
---- vim72.orig/runtime/doc/usr_21.txt	2008-08-09 07:23:01.000000000 -0700
-+++ vim72/runtime/doc/usr_21.txt	2009-01-08 20:57:32.000000000 -0800
-@@ -1,4 +1,4 @@
--*usr_21.txt*	For Vim version 7.2.  Last change: 2007 May 01
-+*usr_21.txt*	For Vim version 7.2.  Last change: 2008 Nov 09
- 
- 		     VIM USER MANUAL - by Bram Moolenaar
- 
-@@ -153,7 +153,7 @@
- to be lost.  Each item can be remembered only once.
- 
- 
--GETTING BACK TO WHERE YOU WERE
-+GETTING BACK TO WHERE YOU STOPPED VIM
- 
- You are halfway editing a file and it's time to leave for holidays.  You exit
- Vim and go enjoy yourselves, forgetting all about your work.  After a couple
-@@ -168,6 +168,48 @@
-    The |:marks| command is useful to find out where '0 to '9 will take you.
- 
- 
-+GETTING BACK TO SOME FILE
-+
-+If you want to go back to a file that you edited recently, but not when
-+exiting Vim, there is a slightly more complicated way.  You can see a list of
-+files by typing the command: >
-+
-+	:oldfiles
-+<	1: ~/.viminfo ~
-+	2: ~/text/resume.txt ~
-+	3: /tmp/draft ~
-+
-+Now you would like to edit the second file, which is in the list preceded by
-+"2:".  You type: >
-+
-+	:e #<2
-+
-+Instead of ":e" you can use any command that has a file name argument, the
-+"#<2" item works in the same place as "%" (current file name) and "#"
-+(alternate file name).  So you can also split the window to edit the third
-+file: >
-+
-+	:split #<3
-+
-+That #<123 thing is a bit complicated when you just want to edit a file.
-+Fortunately there is a simpler way: >
-+
-+	:browse oldfiles
-+<	1: ~/.viminfo ~
-+	2: ~/text/resume.txt ~
-+	3: /tmp/draft ~
-+	-- More --
-+
-+You get the same list of files as with |:oldfiles|.  If you want to edit
-+"resume.txt" first press "q" to stop the listing.  You will get a prompt:
-+
-+	Type number and <Enter> (empty cancels): ~
-+
-+Type "2" and press <Enter> to edit the second file.
-+
-+More info at |:oldfiles|, |v:oldfiles| and |c_#<|.
-+
-+
- MOVE INFO FROM ONE VIM TO ANOTHER
- 
- You can use the ":wviminfo" and ":rviminfo" commands to save and restore the
-diff -Naur vim72.orig/runtime/scripts.vim vim72/runtime/scripts.vim
---- vim72.orig/runtime/scripts.vim	2008-08-08 15:27:21.000000000 -0700
-+++ vim72/runtime/scripts.vim	2009-01-08 20:57:27.000000000 -0800
-@@ -234,6 +234,10 @@
-   elseif s:line1 =~ '\<DTD\s\+XHTML\s'
-     set ft=xhtml
- 
-+    " HTML (e.g.: <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN")
-+  elseif s:line1 =~? '\<DOCTYPE\s\+html\>'
-+    set ft=html
-+
-     " PDF
-   elseif s:line1 =~ '^%PDF-'
-     set ft=pdf
-diff -Naur vim72.orig/src/auto/configure vim72/src/auto/configure
---- vim72.orig/src/auto/configure	2008-07-24 05:40:36.000000000 -0700
-+++ vim72/src/auto/configure	2009-01-08 20:57:39.000000000 -0800
-@@ -16819,21 +16819,29 @@
-   LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
- fi
- 
--{ $as_echo "$as_me:$LINENO: checking for GCC 3 or later" >&5
--$as_echo_n "checking for GCC 3 or later... " >&6; }
- DEPEND_CFLAGS_FILTER=
- if test "$GCC" = yes; then
-+  { $as_echo "$as_me:$LINENO: checking for GCC 3 or later" >&5
-+$as_echo_n "checking for GCC 3 or later... " >&6; }
-   gccmajor=`echo "$gccversion" | sed -e 's/^\([1-9]\)\..*$/\1/g'`
-   if test "$gccmajor" -gt "2"; then
-     DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
--  fi
--fi
--if test "$DEPEND_CFLAGS_FILTER" = ""; then
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+    { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-+  else
-+    { $as_echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
--else
--  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+  fi
-+      { $as_echo "$as_me:$LINENO: checking whether we need -D_FORTIFY_SOURCE=1" >&5
-+$as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; }
-+  if test "$gccmajor" -gt "3"; then
-+    CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1"
-+    { $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
-+  else
-+    { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-+  fi
- fi
- 
- 
-diff -Naur vim72.orig/src/buffer.c vim72/src/buffer.c
---- vim72.orig/src/buffer.c	2008-08-06 04:00:48.000000000 -0700
-+++ vim72/src/buffer.c	2009-01-08 20:57:54.000000000 -0800
-@@ -437,10 +437,6 @@
- 	return;
- #endif
- 
--#ifdef FEAT_NETBEANS_INTG
--    if (usingNetbeans)
--	netbeans_file_closed(buf);
--#endif
-     /* Change directories when the 'acd' option is set. */
-     DO_AUTOCHDIR
- 
-@@ -639,6 +635,10 @@
- #ifdef FEAT_SIGNS
-     buf_delete_signs(buf);		/* delete any signs */
- #endif
-+#ifdef FEAT_NETBEANS_INTG
-+    if (usingNetbeans)
-+        netbeans_file_killed(buf);
-+#endif
- #ifdef FEAT_LOCALMAP
-     map_clear_int(buf, MAP_ALL_MODES, TRUE, FALSE);  /* clear local mappings */
-     map_clear_int(buf, MAP_ALL_MODES, TRUE, TRUE);   /* clear local abbrevs */
-@@ -647,6 +647,9 @@
-     vim_free(buf->b_start_fenc);
-     buf->b_start_fenc = NULL;
- #endif
-+#ifdef FEAT_SPELL
-+    ga_clear(&buf->b_langp);
-+#endif
- }
- 
- /*
-@@ -812,9 +815,6 @@
-     int		bnr;		/* buffer number */
-     char_u	*p;
- 
--#ifdef FEAT_NETBEANS_INTG
--    netbeansCloseFile = 1;
--#endif
-     if (addr_count == 0)
-     {
- 	(void)do_buffer(command, DOBUF_CURRENT, FORWARD, 0, forceit);
-@@ -909,9 +909,6 @@
- 	}
-     }
- 
--#ifdef FEAT_NETBEANS_INTG
--    netbeansCloseFile = 0;
--#endif
- 
-     return errormsg;
- }
-@@ -1237,7 +1234,7 @@
- 	 * "buf" if one exists */
- 	if ((swb_flags & SWB_USEOPEN) && buf_jump_open_win(buf))
- 	    return OK;
--	/* If 'switchbuf' contians "usetab": jump to first window in any tab
-+	/* If 'switchbuf' contains "usetab": jump to first window in any tab
- 	 * page containing "buf" if one exists */
- 	if ((swb_flags & SWB_USETAB) && buf_jump_open_tab(buf))
- 	    return OK;
-@@ -1351,11 +1348,12 @@
- 	}
-     }
- #ifdef FEAT_AUTOCMD
-+    /* An autocommand may have deleted "buf", already entered it (e.g., when
-+     * it did ":bunload") or aborted the script processing! */
- # ifdef FEAT_EVAL
--    /* An autocommand may have deleted buf or aborted the script processing! */
--    if (buf_valid(buf) && !aborting())
-+    if (buf_valid(buf) && buf != curbuf && !aborting())
- # else
--    if (buf_valid(buf))	    /* an autocommand may have deleted buf! */
-+    if (buf_valid(buf) && buf != curbuf)
- # endif
- #endif
- 	enter_buffer(buf);
-@@ -1397,6 +1395,9 @@
-     curwin->w_cursor.coladd = 0;
- #endif
-     curwin->w_set_curswant = TRUE;
-+#ifdef FEAT_AUTOCMD
-+    curwin->w_topline_was_set = FALSE;
-+#endif
- 
-     /* Make sure the buffer is loaded. */
-     if (curbuf->b_ml.ml_mfp == NULL)	/* need to load the file */
-@@ -1436,7 +1437,8 @@
-     maketitle();
- #endif
- #ifdef FEAT_AUTOCMD
--    if (curwin->w_topline == 1)		/* when autocmds didn't change it */
-+	/* when autocmds didn't change it */
-+    if (curwin->w_topline == 1 && !curwin->w_topline_was_set)
- #endif
- 	scroll_cursor_halfway(FALSE);	/* redisplay at correct position */
- 
-@@ -3963,7 +3965,7 @@
-     width = vim_strsize(out);
-     if (maxwidth > 0 && width > maxwidth)
-     {
--	/* Result is too long, must trunctate somewhere. */
-+	/* Result is too long, must truncate somewhere. */
- 	l = 0;
- 	if (itemcnt == 0)
- 	    s = out;
-@@ -5062,7 +5064,7 @@
-     {
- 	if (buf->b_sfname != NULL)
- 	    return (char *)buf->b_sfname;
--	return "[Scratch]";
-+	return _("[Scratch]");
-     }
- #endif
-     if (buf->b_fname == NULL)
-diff -Naur vim72.orig/src/configure.in vim72/src/configure.in
---- vim72.orig/src/configure.in	2008-07-24 05:40:26.000000000 -0700
-+++ vim72/src/configure.in	2009-01-08 20:57:39.000000000 -0800
-@@ -3152,18 +3152,25 @@
- dnl But only when making dependencies, cproto and lint don't take "-isystem".
- dnl Mac gcc returns "powerpc-apple-darwin8-gcc-4.0.1 (GCC)...", need to allow
- dnl the number before the version number.
--AC_MSG_CHECKING(for GCC 3 or later)
- DEPEND_CFLAGS_FILTER=
- if test "$GCC" = yes; then
-+  AC_MSG_CHECKING(for GCC 3 or later)
-   gccmajor=`echo "$gccversion" | sed -e 's/^\([[1-9]]\)\..*$/\1/g'`
-   if test "$gccmajor" -gt "2"; then
-     DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
-+    AC_MSG_RESULT(yes)
-+  else
-+    AC_MSG_RESULT(no)
-+  fi
-+  dnl -D_FORTIFY_SOURCE=2 crashes Vim on strcpy(buf, "000") when buf is
-+  dnl declared as char x[1] but actually longer.  Introduced in gcc 4.0.
-+  AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)
-+  if test "$gccmajor" -gt "3"; then
-+    CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1"
-+    AC_MSG_RESULT(yes)
-+  else
-+    AC_MSG_RESULT(no)
-   fi
--fi
--if test "$DEPEND_CFLAGS_FILTER" = ""; then
--  AC_MSG_RESULT(no)
--else
--  AC_MSG_RESULT(yes)
- fi
- AC_SUBST(DEPEND_CFLAGS_FILTER)
- 
-diff -Naur vim72.orig/src/diff.c vim72/src/diff.c
---- vim72.orig/src/diff.c	2008-03-05 03:16:56.000000000 -0800
-+++ vim72/src/diff.c	2009-01-08 20:57:45.000000000 -0800
-@@ -73,6 +73,8 @@
- 	{
- 	    tp->tp_diffbuf[i] = NULL;
- 	    tp->tp_diff_invalid = TRUE;
-+	    if (tp == curtab)
-+		diff_redraw(TRUE);
- 	}
-     }
- }
-@@ -102,6 +104,7 @@
- 	    {
- 		curtab->tp_diffbuf[i] = NULL;
- 		curtab->tp_diff_invalid = TRUE;
-+		diff_redraw(TRUE);
- 	    }
- 	}
-     }
-@@ -131,6 +134,7 @@
- 	{
- 	    curtab->tp_diffbuf[i] = buf;
- 	    curtab->tp_diff_invalid = TRUE;
-+	    diff_redraw(TRUE);
- 	    return;
- 	}
- 
-@@ -661,6 +665,7 @@
-     char_u	*tmp_diff;
-     FILE	*fd;
-     int		ok;
-+    int		io_error = FALSE;
- 
-     /* Delete all diffblocks. */
-     diff_clear(curtab);
-@@ -697,18 +702,26 @@
-     {
- 	ok = FALSE;
- 	fd = mch_fopen((char *)tmp_orig, "w");
--	if (fd != NULL)
-+	if (fd == NULL)
-+	    io_error = TRUE;
-+	else
- 	{
--	    fwrite("line1\n", (size_t)6, (size_t)1, fd);
-+	    if (fwrite("line1\n", (size_t)6, (size_t)1, fd) != 1)
-+		io_error = TRUE;
- 	    fclose(fd);
- 	    fd = mch_fopen((char *)tmp_new, "w");
--	    if (fd != NULL)
-+	    if (fd == NULL)
-+		io_error = TRUE;
-+	    else
- 	    {
--		fwrite("line2\n", (size_t)6, (size_t)1, fd);
-+		if (fwrite("line2\n", (size_t)6, (size_t)1, fd) != 1)
-+		    io_error = TRUE;
- 		fclose(fd);
- 		diff_file(tmp_orig, tmp_new, tmp_diff);
- 		fd = mch_fopen((char *)tmp_diff, "r");
--		if (fd != NULL)
-+		if (fd == NULL)
-+		    io_error = TRUE;
-+		else
- 		{
- 		    char_u	linebuf[LBUFLEN];
- 
-@@ -761,6 +774,8 @@
-     }
-     if (!ok)
-     {
-+	if (io_error)
-+	    EMSG(_("E810: Cannot read or write temp files"));
- 	EMSG(_("E97: Cannot create diffs"));
- 	diff_a_works = MAYBE;
- #if defined(MSWIN) || defined(MSDOS)
-@@ -925,10 +940,10 @@
-     {
- # ifdef TEMPDIRNAMES
- 	if (vim_tempdir != NULL)
--	    mch_chdir((char *)vim_tempdir);
-+	    ignored = mch_chdir((char *)vim_tempdir);
- 	else
- # endif
--	    mch_chdir("/tmp");
-+	    ignored = mch_chdir("/tmp");
- 	shorten_fnames(TRUE);
-     }
- #endif
-diff -Naur vim72.orig/src/eval.c vim72/src/eval.c
---- vim72.orig/src/eval.c	2008-08-07 12:37:22.000000000 -0700
-+++ vim72/src/eval.c	2009-01-08 20:57:46.000000000 -0800
-@@ -32,6 +32,9 @@
- 
- #define DICT_MAXNEST 100	/* maximum nesting of lists and dicts */
- 
-+#define DO_NOT_FREE_CNT 99999	/* refcount for dict or list that should not
-+				   be freed. */
-+
- /*
-  * In a hashtab item "hi_key" points to "di_key" in a dictitem.
-  * This avoids adding a pointer to the hashtab item.
-@@ -348,6 +351,7 @@
-     {VV_NAME("mouse_col",	 VAR_NUMBER), 0},
-     {VV_NAME("operator",	 VAR_STRING), VV_RO},
-     {VV_NAME("searchforward",	 VAR_NUMBER), 0},
-+    {VV_NAME("oldfiles",	 VAR_LIST), 0},
- };
- 
- /* shorthand */
-@@ -355,6 +359,7 @@
- #define vv_nr		vv_di.di_tv.vval.v_number
- #define vv_float	vv_di.di_tv.vval.v_float
- #define vv_str		vv_di.di_tv.vval.v_string
-+#define vv_list		vv_di.di_tv.vval.v_list
- #define vv_tv		vv_di.di_tv
- 
- /*
-@@ -426,7 +431,6 @@
- static long list_idx_of_item __ARGS((list_T *l, listitem_T *item));
- static void list_append __ARGS((list_T *l, listitem_T *item));
- static int list_append_tv __ARGS((list_T *l, typval_T *tv));
--static int list_append_string __ARGS((list_T *l, char_u *str, int len));
- static int list_append_number __ARGS((list_T *l, varnumber_T n));
- static int list_insert_tv __ARGS((list_T *l, typval_T *tv, listitem_T *item));
- static int list_extend __ARGS((list_T	*l1, list_T *l2, listitem_T *bef));
-@@ -788,6 +792,8 @@
- static void func_unref __ARGS((char_u *name));
- static void func_ref __ARGS((char_u *name));
- static void call_user_func __ARGS((ufunc_T *fp, int argcount, typval_T *argvars, typval_T *rettv, linenr_T firstline, linenr_T lastline, dict_T *selfdict));
-+static int can_free_funccal __ARGS((funccall_T *fc, int copyID)) ;
-+static void free_funccal __ARGS((funccall_T *fc, int free_val));
- static void add_nr_var __ARGS((dict_T *dp, dictitem_T *v, char *name, varnumber_T nr));
- static win_T *find_win_by_nr __ARGS((typval_T *vp, tabpage_T *tp));
- static void getwinvar __ARGS((typval_T *argvars, typval_T *rettv, int off));
-@@ -845,11 +851,17 @@
- 	p = &vimvars[i];
- 	if (p->vv_di.di_tv.v_type == VAR_STRING)
- 	{
--	    vim_free(p->vv_di.di_tv.vval.v_string);
--	    p->vv_di.di_tv.vval.v_string = NULL;
-+	    vim_free(p->vv_str);
-+	    p->vv_str = NULL;
-+	}
-+	else if (p->vv_di.di_tv.v_type == VAR_LIST)
-+	{
-+	    list_unref(p->vv_list);
-+	    p->vv_list = NULL;
- 	}
-     }
-     hash_clear(&vimvarht);
-+    hash_init(&vimvarht);  /* garbage_collect() will access it */
-     hash_clear(&compat_hashtab);
- 
-     /* script-local variables */
-@@ -916,6 +928,10 @@
- /* pointer to funccal for currently active function */
- funccall_T *current_funccal = NULL;
- 
-+/* pointer to list of previously used funccal, still around because some
-+ * item in it is still being used. */
-+funccall_T *previous_funccal = NULL;
-+
- /*
-  * Return TRUE when a function was ended by a ":return" command.
-  */
-@@ -1256,23 +1272,26 @@
- 
- /*
-  * Top level evaluation function, returning a string.
-+ * When "convert" is TRUE convert a List into a sequence of lines and convert
-+ * a Float to a String.
-  * Return pointer to allocated memory, or NULL for failure.
-  */
-     char_u *
--eval_to_string(arg, nextcmd, dolist)
-+eval_to_string(arg, nextcmd, convert)
-     char_u	*arg;
-     char_u	**nextcmd;
--    int		dolist;		/* turn List into sequence of lines */
-+    int		convert;
- {
-     typval_T	tv;
-     char_u	*retval;
-     garray_T	ga;
-+    char_u	numbuf[NUMBUFLEN];
- 
-     if (eval0(arg, &tv, nextcmd, TRUE) == FAIL)
- 	retval = NULL;
-     else
-     {
--	if (dolist && tv.v_type == VAR_LIST)
-+	if (convert && tv.v_type == VAR_LIST)
- 	{
- 	    ga_init2(&ga, (int)sizeof(char), 80);
- 	    if (tv.vval.v_list != NULL)
-@@ -1280,6 +1299,13 @@
- 	    ga_append(&ga, NUL);
- 	    retval = (char_u *)ga.ga_data;
- 	}
-+#ifdef FEAT_FLOAT
-+	else if (convert && tv.v_type == VAR_FLOAT)
-+	{
-+	    vim_snprintf((char *)numbuf, NUMBUFLEN, "%g", tv.vval.v_float);
-+	    retval = vim_strsave(numbuf);
-+	}
-+#endif
- 	else
- 	    retval = vim_strsave(get_tv_string(&tv));
- 	clear_tv(&tv);
-@@ -3277,7 +3303,7 @@
- 
-     if (*startarg != '(')
-     {
--	EMSG2(_("E107: Missing braces: %s"), eap->arg);
-+	EMSG2(_("E107: Missing parentheses: %s"), eap->arg);
- 	goto end;
-     }
- 
-@@ -3657,8 +3683,8 @@
- }
- 
- /*
-- * Return TRUE if typeval "tv" is locked: Either tha value is locked itself or
-- * it refers to a List or Dictionary that is locked.
-+ * Return TRUE if typeval "tv" is locked: Either that value is locked itself
-+ * or it refers to a List or Dictionary that is locked.
-  */
-     static int
- tv_islocked(tv)
-@@ -6047,6 +6073,25 @@
- }
- 
- /*
-+ * Get list item "l[idx - 1]" as a string.  Returns NULL for failure.
-+ */
-+    char_u *
-+list_find_str(l, idx)
-+    list_T	*l;
-+    long	idx;
-+{
-+    listitem_T	*li;
-+
-+    li = list_find(l, idx - 1);
-+    if (li == NULL)
-+    {
-+	EMSGN(_(e_listidx), idx);
-+	return NULL;
-+    }
-+    return get_tv_string(&li->li_tv);
-+}
-+
-+/*
-  * Locate "item" list "l" and return its index.
-  * Returns -1 when "item" is not in the list.
-  */
-@@ -6137,7 +6182,7 @@
-  * When "len" >= 0 use "str[len]".
-  * Returns FAIL when out of memory.
-  */
--    static int
-+    int
- list_append_string(l, str, len)
-     list_T	*l;
-     char_u	*str;
-@@ -6454,7 +6499,7 @@
-     buf_T	*buf;
-     win_T	*wp;
-     int		i;
--    funccall_T	*fc;
-+    funccall_T	*fc, **pfc;
-     int		did_free = FALSE;
- #ifdef FEAT_WINDOWS
-     tabpage_T	*tp;
-@@ -6497,6 +6542,9 @@
- 	set_ref_in_ht(&fc->l_avars.dv_hashtab, copyID);
-     }
- 
-+    /* v: vars */
-+    set_ref_in_ht(&vimvarht, copyID);
-+
-     /*
-      * 2. Go through the list of dicts and free items without the copyID.
-      */
-@@ -6535,6 +6583,20 @@
- 	else
- 	    ll = ll->lv_used_next;
- 
-+    /* check if any funccal can be freed now */
-+    for (pfc = &previous_funccal; *pfc != NULL; )
-+    {
-+	if (can_free_funccal(*pfc, copyID))
-+	{
-+	    fc = *pfc;
-+	    *pfc = fc->caller;
-+	    free_funccal(fc, TRUE);
-+	    did_free = TRUE;
-+	}
-+	else
-+	    pfc = &(*pfc)->caller;
-+    }
-+
-     return did_free;
- }
- 
-@@ -6587,7 +6649,7 @@
-     {
- 	case VAR_DICT:
- 	    dd = tv->vval.v_dict;
--	    if (dd->dv_copyID != copyID)
-+	    if (dd != NULL && dd->dv_copyID != copyID)
- 	    {
- 		/* Didn't see this dict yet. */
- 		dd->dv_copyID = copyID;
-@@ -6597,7 +6659,7 @@
- 
- 	case VAR_LIST:
- 	    ll = tv->vval.v_list;
--	    if (ll->lv_copyID != copyID)
-+	    if (ll != NULL && ll->lv_copyID != copyID)
- 	    {
- 		/* Didn't see this list yet. */
- 		ll->lv_copyID = copyID;
-@@ -7525,8 +7587,8 @@
-     {"getwinposx",	0, 0, f_getwinposx},
-     {"getwinposy",	0, 0, f_getwinposy},
-     {"getwinvar",	2, 2, f_getwinvar},
--    {"glob",		1, 1, f_glob},
--    {"globpath",	2, 2, f_globpath},
-+    {"glob",		1, 2, f_glob},
-+    {"globpath",	2, 3, f_globpath},
-     {"has",		1, 1, f_has},
-     {"has_key",		2, 2, f_has_key},
-     {"haslocaldir",	0, 0, f_haslocaldir},
-@@ -9518,7 +9580,7 @@
-     else
-     {
- 	/* When the optional second argument is non-zero, don't remove matches
--	 * for 'suffixes' and 'wildignore' */
-+	 * for 'wildignore' and don't put matches for 'suffixes' at the end. */
- 	if (argvars[1].v_type != VAR_UNKNOWN
- 				    && get_tv_number_chk(&argvars[1], &error))
- 	    flags |= WILD_KEEP_ALL;
-@@ -10300,7 +10362,8 @@
-     s = get_tv_string(&argvars[0]);
-     if (s == NULL || *s == NUL || VIM_ISDIGIT(*s))
- 	EMSG2(_(e_invarg2), s);
--    else if (!function_exists(s))
-+    /* Don't check an autoload name for existence here. */
-+    else if (vim_strchr(s, AUTOLOAD_CHAR) == NULL && !function_exists(s))
- 	EMSG2(_("E700: Unknown function: %s"), s);
-     else
-     {
-@@ -10602,7 +10665,7 @@
- # ifdef FEAT_WINDOWS
- 	    win_T	*wp;
- # endif
--	    int		n = 1;
-+	    int		winnr = 1;
- 
- 	    if (row >= 0 && col >= 0)
- 	    {
-@@ -10612,9 +10675,9 @@
- 		(void)mouse_comp_pos(win, &row, &col, &lnum);
- # ifdef FEAT_WINDOWS
- 		for (wp = firstwin; wp != win; wp = wp->w_next)
--		    ++n;
-+		    ++winnr;
- # endif
--		vimvars[VV_MOUSE_WIN].vv_nr = n;
-+		vimvars[VV_MOUSE_WIN].vv_nr = winnr;
- 		vimvars[VV_MOUSE_LNUM].vv_nr = lnum;
- 		vimvars[VV_MOUSE_COL].vv_nr = col + 1;
- 	    }
-@@ -11284,13 +11347,25 @@
-     typval_T	*argvars;
-     typval_T	*rettv;
- {
-+    int		flags = WILD_SILENT|WILD_USE_NL;
-     expand_T	xpc;
-+    int		error = FALSE;
- 
--    ExpandInit(&xpc);
--    xpc.xp_context = EXPAND_FILES;
-+    /* When the optional second argument is non-zero, don't remove matches
-+    * for 'wildignore' and don't put matches for 'suffixes' at the end. */
-+    if (argvars[1].v_type != VAR_UNKNOWN
-+				&& get_tv_number_chk(&argvars[1], &error))
-+	flags |= WILD_KEEP_ALL;
-     rettv->v_type = VAR_STRING;
--    rettv->vval.v_string = ExpandOne(&xpc, get_tv_string(&argvars[0]),
--				     NULL, WILD_USE_NL|WILD_SILENT, WILD_ALL);
-+    if (!error)
-+    {
-+	ExpandInit(&xpc);
-+	xpc.xp_context = EXPAND_FILES;
-+	rettv->vval.v_string = ExpandOne(&xpc, get_tv_string(&argvars[0]),
-+						       NULL, flags, WILD_ALL);
-+    }
-+    else
-+	rettv->vval.v_string = NULL;
- }
- 
- /*
-@@ -11301,14 +11376,22 @@
-     typval_T	*argvars;
-     typval_T	*rettv;
- {
-+    int		flags = 0;
-     char_u	buf1[NUMBUFLEN];
-     char_u	*file = get_tv_string_buf_chk(&argvars[1], buf1);
-+    int		error = FALSE;
- 
-+    /* When the optional second argument is non-zero, don't remove matches
-+    * for 'wildignore' and don't put matches for 'suffixes' at the end. */
-+    if (argvars[2].v_type != VAR_UNKNOWN
-+				&& get_tv_number_chk(&argvars[2], &error))
-+	flags |= WILD_KEEP_ALL;
-     rettv->v_type = VAR_STRING;
--    if (file == NULL)
-+    if (file == NULL || error)
- 	rettv->vval.v_string = NULL;
-     else
--	rettv->vval.v_string = globpath(get_tv_string(&argvars[0]), file);
-+	rettv->vval.v_string = globpath(get_tv_string(&argvars[0]), file,
-+								       flags);
- }
- 
- /*
-@@ -11782,6 +11865,10 @@
- 	    n = has_patch(atoi((char *)name + 5));
- 	else if (STRICMP(name, "vim_starting") == 0)
- 	    n = (starting != 0);
-+#ifdef FEAT_MBYTE
-+	else if (STRICMP(name, "multi_byte_encoding") == 0)
-+	    n = has_mbyte;
-+#endif
- #if defined(FEAT_BEVAL) && defined(FEAT_GUI_W32)
- 	else if (STRICMP(name, "balloon_multiline") == 0)
- 	    n = multiline_balloon_available();
-@@ -15838,10 +15925,9 @@
-     if (res == FAIL)
- 	res = ITEM_COMPARE_FAIL;
-     else
--	/* return value has wrong type */
- 	res = get_tv_number_chk(&rettv, &item_compare_func_err);
-     if (item_compare_func_err)
--	res = ITEM_COMPARE_FAIL;
-+	res = ITEM_COMPARE_FAIL;  /* return value has wrong type */
-     clear_tv(&rettv);
-     return res;
- }
-@@ -16590,8 +16676,11 @@
- 		p = highlight_has_attr(id, HL_INVERSE, modec);
- 		break;
- 
--	case 's':					/* standout */
--		p = highlight_has_attr(id, HL_STANDOUT, modec);
-+	case 's':
-+		if (TOLOWER_ASC(what[1]) == 'p')	/* sp[#] */
-+		    p = highlight_color(id, what, modec);
-+		else					/* standout */
-+		    p = highlight_has_attr(id, HL_STANDOUT, modec);
- 		break;
- 
- 	case 'u':
-@@ -16658,7 +16747,7 @@
-     col = get_tv_number(&argvars[1]) - 1;	/* -1 on type error */
- 
-     if (lnum >= 1 && lnum <= curbuf->b_ml.ml_line_count
--	    && col >= 0 && col < (long)STRLEN(ml_get(lnum))
-+	    && col >= 0 && (col == 0 || col < (long)STRLEN(ml_get(lnum)))
- 	    && rettv_list_alloc(rettv) != FAIL)
-     {
- 	(void)syn_get_id(curwin, lnum, (colnr_T)col, FALSE, NULL, TRUE);
-@@ -18097,14 +18186,28 @@
- }
- 
- /*
-- * Set v:count, v:count1 and v:prevcount.
-+ * Get List v: variable value.  Caller must take care of reference count when
-+ * needed.
-+ */
-+    list_T *
-+get_vim_var_list(idx)
-+    int		idx;
-+{
-+    return vimvars[idx].vv_list;
-+}
-+
-+/*
-+ * Set v:count to "count" and v:count1 to "count1".
-+ * When "set_prevcount" is TRUE first set v:prevcount from v:count.
-  */
-     void
--set_vcount(count, count1)
-+set_vcount(count, count1, set_prevcount)
-     long	count;
-     long	count1;
-+    int		set_prevcount;
- {
--    vimvars[VV_PREVCOUNT].vv_nr = vimvars[VV_COUNT].vv_nr;
-+    if (set_prevcount)
-+	vimvars[VV_PREVCOUNT].vv_nr = vimvars[VV_COUNT].vv_nr;
-     vimvars[VV_COUNT].vv_nr = count;
-     vimvars[VV_COUNT1].vv_nr = count1;
- }
-@@ -18132,6 +18235,20 @@
- }
- 
- /*
-+ * Set List v: variable to "val".
-+ */
-+    void
-+set_vim_var_list(idx, val)
-+    int		idx;
-+    list_T	*val;
-+{
-+    list_unref(vimvars[idx].vv_list);
-+    vimvars[idx].vv_list = val;
-+    if (val != NULL)
-+	++val->lv_refcount;
-+}
-+
-+/*
-  * Set v:register if needed.
-  */
-     void
-@@ -18868,7 +18985,7 @@
-     dictitem_T	*dict_var;
- {
-     hash_init(&dict->dv_hashtab);
--    dict->dv_refcount = 99999;
-+    dict->dv_refcount = DO_NOT_FREE_CNT;
-     dict_var->di_tv.vval.v_dict = dict;
-     dict_var->di_tv.v_type = VAR_DICT;
-     dict_var->di_tv.v_lock = VAR_FIXED;
-@@ -19205,6 +19322,8 @@
-  * Copy the values from typval_T "from" to typval_T "to".
-  * When needed allocates string or increases reference count.
-  * Does not make a copy of a list or dict but copies the reference!
-+ * It is OK for "from" and "to" to point to the same item.  This is used to
-+ * make a copy later.
-  */
-     static void
- copy_tv(from, to)
-@@ -20590,6 +20709,9 @@
-     int		st_len = 0;
- 
-     todo = (int)func_hashtab.ht_used;
-+    if (todo == 0)
-+	return;     /* nothing to dump */
-+
-     sorttab = (ufunc_T **)alloc((unsigned)(sizeof(ufunc_T) * todo));
- 
-     for (hi = func_hashtab.ht_array; todo > 0; ++hi)
-@@ -20638,6 +20760,8 @@
- 							      prof_self_cmp);
- 	prof_sort_list(fd, sorttab, st_len, "SELF", TRUE);
-     }
-+
-+    vim_free(sorttab);
- }
- 
-     static void
-@@ -21012,7 +21136,7 @@
-     char_u	*save_sourcing_name;
-     linenr_T	save_sourcing_lnum;
-     scid_T	save_current_SID;
--    funccall_T	fc;
-+    funccall_T	*fc;
-     int		save_did_emsg;
-     static int	depth = 0;
-     dictitem_T	*v;
-@@ -21038,36 +21162,37 @@
- 
-     line_breakcheck();		/* check for CTRL-C hit */
- 
--    fc.caller = current_funccal;
--    current_funccal = &fc;
--    fc.func = fp;
--    fc.rettv = rettv;
-+    fc = (funccall_T *)alloc(sizeof(funccall_T));
-+    fc->caller = current_funccal;
-+    current_funccal = fc;
-+    fc->func = fp;
-+    fc->rettv = rettv;
-     rettv->vval.v_number = 0;
--    fc.linenr = 0;
--    fc.returned = FALSE;
--    fc.level = ex_nesting_level;
-+    fc->linenr = 0;
-+    fc->returned = FALSE;
-+    fc->level = ex_nesting_level;
-     /* Check if this function has a breakpoint. */
--    fc.breakpoint = dbg_find_breakpoint(FALSE, fp->uf_name, (linenr_T)0);
--    fc.dbg_tick = debug_tick;
-+    fc->breakpoint = dbg_find_breakpoint(FALSE, fp->uf_name, (linenr_T)0);
-+    fc->dbg_tick = debug_tick;
- 
-     /*
--     * Note about using fc.fixvar[]: This is an array of FIXVAR_CNT variables
-+     * Note about using fc->fixvar[]: This is an array of FIXVAR_CNT variables
-      * with names up to VAR_SHORT_LEN long.  This avoids having to alloc/free
-      * each argument variable and saves a lot of time.
-      */
-     /*
-      * Init l: variables.
-      */
--    init_var_dict(&fc.l_vars, &fc.l_vars_var);
-+    init_var_dict(&fc->l_vars, &fc->l_vars_var);
-     if (selfdict != NULL)
-     {
- 	/* Set l:self to "selfdict".  Use "name" to avoid a warning from
- 	 * some compiler that checks the destination size. */
--	v = &fc.fixvar[fixvar_idx++].var;
-+	v = &fc->fixvar[fixvar_idx++].var;
- 	name = v->di_key;
- 	STRCPY(name, "self");
- 	v->di_flags = DI_FLAGS_RO + DI_FLAGS_FIX;
--	hash_add(&fc.l_vars.dv_hashtab, DI2HIKEY(v));
-+	hash_add(&fc->l_vars.dv_hashtab, DI2HIKEY(v));
- 	v->di_tv.v_type = VAR_DICT;
- 	v->di_tv.v_lock = 0;
- 	v->di_tv.vval.v_dict = selfdict;
-@@ -21079,28 +21204,31 @@
-      * Set a:0 to "argcount".
-      * Set a:000 to a list with room for the "..." arguments.
-      */
--    init_var_dict(&fc.l_avars, &fc.l_avars_var);
--    add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "0",
-+    init_var_dict(&fc->l_avars, &fc->l_avars_var);
-+    add_nr_var(&fc->l_avars, &fc->fixvar[fixvar_idx++].var, "0",
- 				(varnumber_T)(argcount - fp->uf_args.ga_len));
--    v = &fc.fixvar[fixvar_idx++].var;
--    STRCPY(v->di_key, "000");
-+    /* Use "name" to avoid a warning from some compiler that checks the
-+     * destination size. */
-+    v = &fc->fixvar[fixvar_idx++].var;
-+    name = v->di_key;
-+    STRCPY(name, "000");
-     v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
--    hash_add(&fc.l_avars.dv_hashtab, DI2HIKEY(v));
-+    hash_add(&fc->l_avars.dv_hashtab, DI2HIKEY(v));
-     v->di_tv.v_type = VAR_LIST;
-     v->di_tv.v_lock = VAR_FIXED;
--    v->di_tv.vval.v_list = &fc.l_varlist;
--    vim_memset(&fc.l_varlist, 0, sizeof(list_T));
--    fc.l_varlist.lv_refcount = 99999;
--    fc.l_varlist.lv_lock = VAR_FIXED;
-+    v->di_tv.vval.v_list = &fc->l_varlist;
-+    vim_memset(&fc->l_varlist, 0, sizeof(list_T));
-+    fc->l_varlist.lv_refcount = DO_NOT_FREE_CNT;
-+    fc->l_varlist.lv_lock = VAR_FIXED;
- 
-     /*
-      * Set a:firstline to "firstline" and a:lastline to "lastline".
-      * Set a:name to named arguments.
-      * Set a:N to the "..." arguments.
-      */
--    add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "firstline",
-+    add_nr_var(&fc->l_avars, &fc->fixvar[fixvar_idx++].var, "firstline",
- 						      (varnumber_T)firstline);
--    add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "lastline",
-+    add_nr_var(&fc->l_avars, &fc->fixvar[fixvar_idx++].var, "lastline",
- 						       (varnumber_T)lastline);
-     for (i = 0; i < argcount; ++i)
-     {
-@@ -21116,7 +21244,7 @@
- 	}
- 	if (fixvar_idx < FIXVAR_CNT && STRLEN(name) <= VAR_SHORT_LEN)
- 	{
--	    v = &fc.fixvar[fixvar_idx++].var;
-+	    v = &fc->fixvar[fixvar_idx++].var;
- 	    v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
- 	}
- 	else
-@@ -21128,7 +21256,7 @@
- 	    v->di_flags = DI_FLAGS_RO;
- 	}
- 	STRCPY(v->di_key, name);
--	hash_add(&fc.l_avars.dv_hashtab, DI2HIKEY(v));
-+	hash_add(&fc->l_avars.dv_hashtab, DI2HIKEY(v));
- 
- 	/* Note: the values are copied directly to avoid alloc/free.
- 	 * "argvars" must have VAR_FIXED for v_lock. */
-@@ -21137,9 +21265,9 @@
- 
- 	if (ai >= 0 && ai < MAX_FUNC_ARGS)
- 	{
--	    list_append(&fc.l_varlist, &fc.l_listitems[ai]);
--	    fc.l_listitems[ai].li_tv = argvars[i];
--	    fc.l_listitems[ai].li_tv.v_lock = VAR_FIXED;
-+	    list_append(&fc->l_varlist, &fc->l_listitems[ai]);
-+	    fc->l_listitems[ai].li_tv = argvars[i];
-+	    fc->l_listitems[ai].li_tv.v_lock = VAR_FIXED;
- 	}
-     }
- 
-@@ -21204,7 +21332,7 @@
- 	if (!fp->uf_profiling && has_profiling(FALSE, fp->uf_name, NULL))
- 	    func_do_profile(fp);
- 	if (fp->uf_profiling
--		       || (fc.caller != NULL && &fc.caller->func->uf_profiling))
-+		    || (fc->caller != NULL && fc->caller->func->uf_profiling))
- 	{
- 	    ++fp->uf_tm_count;
- 	    profile_start(&call_start);
-@@ -21220,7 +21348,7 @@
-     did_emsg = FALSE;
- 
-     /* call do_cmdline() to execute the lines */
--    do_cmdline(NULL, get_func_line, (void *)&fc,
-+    do_cmdline(NULL, get_func_line, (void *)fc,
- 				     DOCMD_NOWAIT|DOCMD_VERBOSE|DOCMD_REPEAT);
- 
-     --RedrawingDisabled;
-@@ -21235,16 +21363,16 @@
- 
- #ifdef FEAT_PROFILE
-     if (do_profiling == PROF_YES && (fp->uf_profiling
--		    || (fc.caller != NULL && &fc.caller->func->uf_profiling)))
-+		    || (fc->caller != NULL && fc->caller->func->uf_profiling)))
-     {
- 	profile_end(&call_start);
- 	profile_sub_wait(&wait_start, &call_start);
- 	profile_add(&fp->uf_tm_total, &call_start);
- 	profile_self(&fp->uf_tm_self, &call_start, &fp->uf_tm_children);
--	if (fc.caller != NULL && &fc.caller->func->uf_profiling)
-+	if (fc->caller != NULL && fc->caller->func->uf_profiling)
- 	{
--	    profile_add(&fc.caller->func->uf_tm_children, &call_start);
--	    profile_add(&fc.caller->func->uf_tml_children, &call_start);
-+	    profile_add(&fc->caller->func->uf_tm_children, &call_start);
-+	    profile_add(&fc->caller->func->uf_tml_children, &call_start);
- 	}
-     }
- #endif
-@@ -21257,9 +21385,9 @@
- 
- 	if (aborting())
- 	    smsg((char_u *)_("%s aborted"), sourcing_name);
--	else if (fc.rettv->v_type == VAR_NUMBER)
-+	else if (fc->rettv->v_type == VAR_NUMBER)
- 	    smsg((char_u *)_("%s returning #%ld"), sourcing_name,
--					       (long)fc.rettv->vval.v_number);
-+					       (long)fc->rettv->vval.v_number);
- 	else
- 	{
- 	    char_u	buf[MSG_BUF_LEN];
-@@ -21270,7 +21398,7 @@
- 	    /* The value may be very long.  Skip the middle part, so that we
- 	     * have some idea how it starts and ends. smsg() would always
- 	     * truncate it at the end. */
--	    s = tv2string(fc.rettv, &tofree, numbuf2, 0);
-+	    s = tv2string(fc->rettv, &tofree, numbuf2, 0);
- 	    if (s != NULL)
- 	    {
- 		trunc_string(s, buf, MSG_BUF_CLEN);
-@@ -21306,14 +21434,84 @@
-     }
- 
-     did_emsg |= save_did_emsg;
--    current_funccal = fc.caller;
-+    current_funccal = fc->caller;
-+    --depth;
- 
--    /* The a: variables typevals were not allocated, only free the allocated
--     * variables. */
--    vars_clear_ext(&fc.l_avars.dv_hashtab, FALSE);
-+    /* if the a:000 list and the a: dict are not referenced we can free the
-+     * funccall_T and what's in it. */
-+    if (fc->l_varlist.lv_refcount == DO_NOT_FREE_CNT
-+	    && fc->l_vars.dv_refcount == DO_NOT_FREE_CNT
-+	    && fc->l_avars.dv_refcount == DO_NOT_FREE_CNT)
-+    {
-+	free_funccal(fc, FALSE);
-+    }
-+    else
-+    {
-+	hashitem_T	*hi;
-+	listitem_T	*li;
-+	int		todo;
- 
--    vars_clear(&fc.l_vars.dv_hashtab);		/* free all l: variables */
--    --depth;
-+	/* "fc" is still in use.  This can happen when returning "a:000" or
-+	 * assigning "l:" to a global variable.
-+	 * Link "fc" in the list for garbage collection later. */
-+	fc->caller = previous_funccal;
-+	previous_funccal = fc;
-+
-+	/* Make a copy of the a: variables, since we didn't do that above. */
-+	todo = (int)fc->l_avars.dv_hashtab.ht_used;
-+	for (hi = fc->l_avars.dv_hashtab.ht_array; todo > 0; ++hi)
-+	{
-+	    if (!HASHITEM_EMPTY(hi))
-+	    {
-+		--todo;
-+		v = HI2DI(hi);
-+		copy_tv(&v->di_tv, &v->di_tv);
-+	    }
-+	}
-+
-+	/* Make a copy of the a:000 items, since we didn't do that above. */
-+	for (li = fc->l_varlist.lv_first; li != NULL; li = li->li_next)
-+	    copy_tv(&li->li_tv, &li->li_tv);
-+    }
-+}
-+
-+/*
-+ * Return TRUE if items in "fc" do not have "copyID".  That means they are not
-+ * referenced from anywyere.
-+ */
-+    static int
-+can_free_funccal(fc, copyID)
-+    funccall_T	*fc;
-+    int		copyID;
-+{
-+    return (fc->l_varlist.lv_copyID != copyID
-+	    && fc->l_vars.dv_copyID != copyID
-+	    && fc->l_avars.dv_copyID != copyID);
-+}
-+
-+/*
-+ * Free "fc" and what it contains.
-+ */
-+   static void
-+free_funccal(fc, free_val)
-+    funccall_T	*fc;
-+    int		free_val;  /* a: vars were allocated */
-+{
-+    listitem_T	*li;
-+
-+    /* The a: variables typevals may not have been allocated, only free the
-+     * allocated variables. */
-+    vars_clear_ext(&fc->l_avars.dv_hashtab, free_val);
-+
-+    /* free all l: variables */
-+    vars_clear(&fc->l_vars.dv_hashtab);
-+
-+    /* Free the a:000 variables if they were allocated. */
-+    if (free_val)
-+	for (li = fc->l_varlist.lv_first; li != NULL; li = li->li_next)
-+	    clear_tv(&li->li_tv);
-+
-+    vim_free(fc);
- }
- 
- /*
-@@ -21886,6 +22084,62 @@
-     }
- }
- 
-+/*
-+ * List v:oldfiles in a nice way.
-+ */
-+/*ARGSUSED*/
-+    void
-+ex_oldfiles(eap)
-+    exarg_T	*eap;
-+{
-+    list_T	*l = vimvars[VV_OLDFILES].vv_list;
-+    listitem_T	*li;
-+    int		nr = 0;
-+
-+    if (l == NULL)
-+	msg((char_u *)_("No old files"));
-+    else
-+    {
-+	msg_start();
-+	msg_scroll = TRUE;
-+	for (li = l->lv_first; li != NULL && !got_int; li = li->li_next)
-+	{
-+	    msg_outnum((long)++nr);
-+	    MSG_PUTS(": ");
-+	    msg_outtrans(get_tv_string(&li->li_tv));
-+	    msg_putchar('\n');
-+	    out_flush();	    /* output one line at a time */
-+	    ui_breakcheck();
-+	}
-+	/* Assume "got_int" was set to truncate the listing. */
-+	got_int = FALSE;
-+
-+#ifdef FEAT_BROWSE_CMD
-+	if (cmdmod.browse)
-+	{
-+	    quit_more = FALSE;
-+	    nr = prompt_for_number(FALSE);
-+	    msg_starthere();
-+	    if (nr > 0)
-+	    {
-+		char_u *p = list_find_str(get_vim_var_list(VV_OLDFILES),
-+								    (long)nr);
-+
-+		if (p != NULL)
-+		{
-+		    p = expand_env_save(p);
-+		    eap->arg = p;
-+		    eap->cmdidx = CMD_edit;
-+		    cmdmod.browse = FALSE;
-+		    do_exedit(eap, NULL);
-+		    vim_free(p);
-+		}
-+	    }
-+	}
-+#endif
-+    }
-+}
-+
- #endif /* FEAT_EVAL */
- 
- 
-diff -Naur vim72.orig/src/ex_cmds.c vim72/src/ex_cmds.c
---- vim72.orig/src/ex_cmds.c	2008-08-04 12:15:00.000000000 -0700
-+++ vim72/src/ex_cmds.c	2009-01-08 20:57:44.000000000 -0800
-@@ -24,7 +24,7 @@
- static void do_filter __ARGS((linenr_T line1, linenr_T line2, exarg_T *eap, char_u *cmd, int do_in, int do_out));
- #ifdef FEAT_VIMINFO
- static char_u *viminfo_filename __ARGS((char_u	*));
--static void do_viminfo __ARGS((FILE *fp_in, FILE *fp_out, int want_info, int want_marks, int force_read));
-+static void do_viminfo __ARGS((FILE *fp_in, FILE *fp_out, int flags));
- static int viminfo_encoding __ARGS((vir_T *virp));
- static int read_viminfo_up_to_marks __ARGS((vir_T *virp, int forceit, int writing));
- #endif
-@@ -1676,14 +1676,12 @@
- 
- /*
-  * read_viminfo() -- Read the viminfo file.  Registers etc. which are already
-- * set are not over-written unless force is TRUE. -- webb
-+ * set are not over-written unless "flags" includes VIF_FORCEIT. -- webb
-  */
-     int
--read_viminfo(file, want_info, want_marks, forceit)
--    char_u	*file;
--    int		want_info;
--    int		want_marks;
--    int		forceit;
-+read_viminfo(file, flags)
-+    char_u	*file;	    /* file name or NULL to use default name */
-+    int		flags;	    /* VIF_WANT_INFO et al. */
- {
-     FILE	*fp;
-     char_u	*fname;
-@@ -1691,7 +1689,7 @@
-     if (no_viminfo())
- 	return FAIL;
- 
--    fname = viminfo_filename(file);	    /* may set to default if NULL */
-+    fname = viminfo_filename(file);	/* get file name in allocated buffer */
-     if (fname == NULL)
- 	return FAIL;
-     fp = mch_fopen((char *)fname, READBIN);
-@@ -1701,8 +1699,9 @@
- 	verbose_enter();
- 	smsg((char_u *)_("Reading viminfo file \"%s\"%s%s%s"),
- 		fname,
--		want_info ? _(" info") : "",
--		want_marks ? _(" marks") : "",
-+		(flags & VIF_WANT_INFO) ? _(" info") : "",
-+		(flags & VIF_WANT_MARKS) ? _(" marks") : "",
-+		(flags & VIF_GET_OLDFILES) ? _(" oldfiles") : "",
- 		fp == NULL ? _(" FAILED") : "");
- 	verbose_leave();
-     }
-@@ -1712,10 +1711,9 @@
- 	return FAIL;
- 
-     viminfo_errcnt = 0;
--    do_viminfo(fp, NULL, want_info, want_marks, forceit);
-+    do_viminfo(fp, NULL, flags);
- 
-     fclose(fp);
--
-     return OK;
- }
- 
-@@ -1943,7 +1941,7 @@
- 	     * root.
- 	     */
- 	    if (fp_out != NULL)
--		(void)fchown(fileno(fp_out), st_old.st_uid, st_old.st_gid);
-+		ignored = fchown(fileno(fp_out), st_old.st_uid, st_old.st_gid);
- #endif
- 	}
-     }
-@@ -1968,7 +1966,7 @@
-     }
- 
-     viminfo_errcnt = 0;
--    do_viminfo(fp_in, fp_out, !forceit, !forceit, FALSE);
-+    do_viminfo(fp_in, fp_out, forceit ? 0 : (VIF_WANT_INFO | VIF_WANT_MARKS));
- 
-     fclose(fp_out);	    /* errors are ignored !? */
-     if (fp_in != NULL)
-@@ -2041,12 +2039,10 @@
-  * do_viminfo() -- Should only be called from read_viminfo() & write_viminfo().
-  */
-     static void
--do_viminfo(fp_in, fp_out, want_info, want_marks, force_read)
-+do_viminfo(fp_in, fp_out, flags)
-     FILE	*fp_in;
-     FILE	*fp_out;
--    int		want_info;
--    int		want_marks;
--    int		force_read;
-+    int		flags;
- {
-     int		count = 0;
-     int		eof = FALSE;
-@@ -2061,8 +2057,9 @@
- 
-     if (fp_in != NULL)
-     {
--	if (want_info)
--	    eof = read_viminfo_up_to_marks(&vir, force_read, fp_out != NULL);
-+	if (flags & VIF_WANT_INFO)
-+	    eof = read_viminfo_up_to_marks(&vir,
-+					 flags & VIF_FORCEIT, fp_out != NULL);
- 	else
- 	    /* Skip info, find start of marks */
- 	    while (!(eof = viminfo_readline(&vir))
-@@ -2092,8 +2089,9 @@
- 	write_viminfo_bufferlist(fp_out);
- 	count = write_viminfo_marks(fp_out);
-     }
--    if (fp_in != NULL && want_marks)
--	copy_viminfo_marks(&vir, fp_out, count, eof);
-+    if (fp_in != NULL
-+	    && (flags & (VIF_WANT_MARKS | VIF_GET_OLDFILES | VIF_FORCEIT)))
-+	copy_viminfo_marks(&vir, fp_out, count, eof, flags);
- 
-     vim_free(vir.vir_line);
- #ifdef FEAT_MBYTE
-@@ -5059,6 +5057,7 @@
- 
- 	    if (did_sub)
- 		++sub_nlines;
-+	    vim_free(new_start);	/* for when substitute was cancelled */
- 	    vim_free(sub_firstline);	/* free the copy of the original line */
- 	    sub_firstline = NULL;
- 	}
-diff -Naur vim72.orig/src/ex_cmds.h vim72/src/ex_cmds.h
---- vim72.orig/src/ex_cmds.h	2008-06-21 11:47:57.000000000 -0700
-+++ vim72/src/ex_cmds.h	2009-01-08 20:57:32.000000000 -0800
-@@ -278,7 +278,7 @@
- EX(CMD_crewind,		"crewind",	ex_cc,
- 			RANGE|NOTADR|COUNT|TRLBAR|BANG),
- EX(CMD_cscope,		"cscope",	do_cscope,
--			EXTRA|NOTRLCOM|SBOXOK|XFILE),
-+			EXTRA|NOTRLCOM|XFILE),
- EX(CMD_cstag,		"cstag",	do_cstag,
- 			BANG|TRLBAR|WORD1),
- EX(CMD_cunmap,		"cunmap",	ex_unmap,
-@@ -506,7 +506,7 @@
- EX(CMD_lclose,		"lclose",	ex_cclose,
- 			RANGE|NOTADR|COUNT|TRLBAR),
- EX(CMD_lcscope,		"lcscope",	do_cscope,
--			EXTRA|NOTRLCOM|SBOXOK|XFILE),
-+			EXTRA|NOTRLCOM|XFILE),
- EX(CMD_left,		"left",		ex_align,
- 			TRLBAR|RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY),
- EX(CMD_leftabove,	"leftabove",	ex_wrongmodifier,
-@@ -635,6 +635,8 @@
- 			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
- EX(CMD_noremap,		"noremap",	ex_map,
- 			BANG|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
-+EX(CMD_noautocmd,	"noautocmd",	ex_wrongmodifier,
-+			NEEDARG|EXTRA|NOTRLCOM),
- EX(CMD_nohlsearch,	"nohlsearch",	ex_nohlsearch,
- 			TRLBAR|SBOXOK|CMDWIN),
- EX(CMD_noreabbrev,	"noreabbrev",	ex_abbreviate,
-@@ -651,6 +653,8 @@
- 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
- EX(CMD_open,		"open",		ex_open,
- 			RANGE|EXTRA),
-+EX(CMD_oldfiles,	"oldfiles",	ex_oldfiles,
-+			BANG|TRLBAR|SBOXOK|CMDWIN),
- EX(CMD_omap,		"omap",		ex_map,
- 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
- EX(CMD_omapclear,	"omapclear",	ex_mapclear,
-@@ -802,7 +806,7 @@
- EX(CMD_scriptencoding,	"scriptencoding", ex_scriptencoding,
- 			WORD1|TRLBAR|CMDWIN),
- EX(CMD_scscope,		"scscope",	do_scscope,
--			EXTRA|NOTRLCOM|SBOXOK),
-+			EXTRA|NOTRLCOM),
- EX(CMD_set,		"set",		ex_set,
- 			TRLBAR|EXTRA|CMDWIN|SBOXOK),
- EX(CMD_setfiletype,	"setfiletype",	ex_setfiletype,
-diff -Naur vim72.orig/src/ex_cmds2.c vim72/src/ex_cmds2.c
---- vim72.orig/src/ex_cmds2.c	2008-07-13 09:18:22.000000000 -0700
-+++ vim72/src/ex_cmds2.c	2009-01-08 20:57:30.000000000 -0800
-@@ -3145,8 +3145,8 @@
- 	verbose_leave();
-     }
- #ifdef STARTUPTIME
--    vim_snprintf(IObuff, IOSIZE, "sourcing %s", fname);
--    time_msg(IObuff, &tv_start);
-+    vim_snprintf((char *)IObuff, IOSIZE, "sourcing %s", fname);
-+    time_msg((char *)IObuff, &tv_start);
-     time_pop(&tv_rel);
- #endif
- 
-diff -Naur vim72.orig/src/ex_docmd.c vim72/src/ex_docmd.c
---- vim72.orig/src/ex_docmd.c	2008-07-26 04:51:05.000000000 -0700
-+++ vim72/src/ex_docmd.c	2009-01-08 20:57:45.000000000 -0800
-@@ -364,6 +364,7 @@
- # define ex_function		ex_ni
- # define ex_delfunction		ex_ni
- # define ex_return		ex_ni
-+# define ex_oldfiles		ex_ni
- #endif
- static char_u	*arg_all __ARGS((void));
- #ifdef FEAT_SESSION
-@@ -1770,7 +1771,7 @@
- 			}
- 			if (checkforcmd(&ea.cmd, "browse", 3))
- 			{
--#ifdef FEAT_BROWSE
-+#ifdef FEAT_BROWSE_CMD
- 			    cmdmod.browse = TRUE;
- #endif
- 			    continue;
-@@ -2978,6 +2979,7 @@
-     {"keepmarks", 3, FALSE},
-     {"leftabove", 5, FALSE},
-     {"lockmarks", 3, FALSE},
-+    {"noautocmd", 3, FALSE},
-     {"rightbelow", 6, FALSE},
-     {"sandbox", 3, FALSE},
-     {"silent", 3, FALSE},
-@@ -3608,6 +3610,7 @@
- 	    return set_context_in_autocmd(xp, arg, FALSE);
- 
- 	case CMD_doautocmd:
-+	case CMD_doautoall:
- 	    return set_context_in_autocmd(xp, arg, TRUE);
- #endif
- 	case CMD_set:
-@@ -8749,8 +8752,8 @@
- 		else if (*dirnow != NUL
- 			&& (ssop_flags & SSOP_CURDIR) && globaldir != NULL)
- 		{
--		    (void)mch_chdir((char *)globaldir);
--		    shorten_fnames(TRUE);
-+		    if (mch_chdir((char *)globaldir) == OK)
-+			shorten_fnames(TRUE);
- 		}
- 
- 		failed |= (makeopens(fd, dirnow) == FAIL);
-@@ -9506,24 +9509,50 @@
- 		    break;
- 		}
- 		s = src + 1;
-+		if (*s == '<')		/* "#<99" uses v:oldfiles */
-+		    ++s;
- 		i = (int)getdigits(&s);
- 		*usedlen = (int)(s - src); /* length of what we expand */
- 
--		buf = buflist_findnr(i);
--		if (buf == NULL)
-+		if (src[1] == '<')
- 		{
--		    *errormsg = (char_u *)_("E194: No alternate file name to substitute for '#'");
-+		    if (*usedlen < 2)
-+		    {
-+			/* Should we give an error message for #<text? */
-+			*usedlen = 1;
-+			return NULL;
-+		    }
-+#ifdef FEAT_EVAL
-+		    result = list_find_str(get_vim_var_list(VV_OLDFILES),
-+								     (long)i);
-+		    if (result == NULL)
-+		    {
-+			*errormsg = (char_u *)"";
-+			return NULL;
-+		    }
-+#else
-+		    *errormsg = (char_u *)_("E809: #< is not available without the +eval feature");
- 		    return NULL;
-+#endif
- 		}
--		if (lnump != NULL)
--		    *lnump = ECMD_LAST;
--		if (buf->b_fname == NULL)
-+		else
- 		{
--		    result = (char_u *)"";
--		    valid = 0;	    /* Must have ":p:h" to be valid */
-+		    buf = buflist_findnr(i);
-+		    if (buf == NULL)
-+		    {
-+			*errormsg = (char_u *)_("E194: No alternate file name to substitute for '#'");
-+			return NULL;
-+		    }
-+		    if (lnump != NULL)
-+			*lnump = ECMD_LAST;
-+		    if (buf->b_fname == NULL)
-+		    {
-+			result = (char_u *)"";
-+			valid = 0;	    /* Must have ":p:h" to be valid */
-+		    }
-+		    else
-+			result = buf->b_fname;
- 		}
--		else
--		    result = buf->b_fname;
- 		break;
- 
- #ifdef FEAT_SEARCHPATH
-@@ -9541,6 +9570,15 @@
- #ifdef FEAT_AUTOCMD
- 	case SPEC_AFILE:	/* file name for autocommand */
- 		result = autocmd_fname;
-+		if (result != NULL && !autocmd_fname_full)
-+		{
-+		    /* Still need to turn the fname into a full path.  It is
-+		     * postponed to avoid a delay when <afile> is not used. */
-+		    autocmd_fname_full = TRUE;
-+		    result = FullName_save(autocmd_fname, FALSE);
-+		    vim_free(autocmd_fname);
-+		    autocmd_fname = result;
-+		}
- 		if (result == NULL)
- 		{
- 		    *errormsg = (char_u *)_("E495: no autocommand file name to substitute for \"<afile>\"");
-@@ -10067,7 +10105,7 @@
-      */
-     if (put_line(fd, "let s:sx = expand(\"<sfile>:p:r\").\"x.vim\"") == FAIL
- 	    || put_line(fd, "if file_readable(s:sx)") == FAIL
--	    || put_line(fd, "  exe \"source \" . s:sx") == FAIL
-+	    || put_line(fd, "  exe \"source \" . fnameescape(s:sx)") == FAIL
- 	    || put_line(fd, "endif") == FAIL)
- 	return FAIL;
- 
-@@ -10689,7 +10727,8 @@
- 	p_viminfo = (char_u *)"'100";
-     if (eap->cmdidx == CMD_rviminfo)
-     {
--	if (read_viminfo(eap->arg, TRUE, TRUE, eap->forceit) == FAIL)
-+	if (read_viminfo(eap->arg, VIF_WANT_INFO | VIF_WANT_MARKS
-+				  | (eap->forceit ? VIF_FORCEIT : 0)) == FAIL)
- 	    EMSG(_("E195: Cannot open viminfo file for reading"));
-     }
-     else
-diff -Naur vim72.orig/src/ex_getln.c vim72/src/ex_getln.c
---- vim72.orig/src/ex_getln.c	2008-08-08 02:31:33.000000000 -0700
-+++ vim72/src/ex_getln.c	2009-01-08 20:57:43.000000000 -0800
-@@ -31,6 +31,8 @@
-     int		cmdattr;	/* attributes for prompt */
-     int		overstrike;	/* Typing mode on the command line.  Shared by
- 				   getcmdline() and put_on_cmdline(). */
-+    expand_T	*xpc;		/* struct being used for expansion, xp_pattern
-+				   may point into cmdbuff */
-     int		xp_context;	/* type of expansion */
- # ifdef FEAT_EVAL
-     char_u	*xp_arg;	/* user-defined expansion arg */
-@@ -38,7 +40,11 @@
- # endif
- };
- 
--static struct cmdline_info ccline;	/* current cmdline_info */
-+/* The current cmdline_info.  It is initialized in getcmdline() and after that
-+ * used by other functions.  When invoking getcmdline() recursively it needs
-+ * to be saved with save_cmdline() and restored with restore_cmdline().
-+ * TODO: make it local to getcmdline() and pass it around. */
-+static struct cmdline_info ccline;
- 
- static int	cmd_showtail;		/* Only show path tail in lists ? */
- 
-@@ -238,6 +244,7 @@
-     }
- 
-     ExpandInit(&xpc);
-+    ccline.xpc = &xpc;
- 
- #ifdef FEAT_RIGHTLEFT
-     if (curwin->w_p_rl && *curwin->w_p_rlc == 's'
-@@ -408,9 +415,10 @@
- #endif
- 
- 	/*
--	 * <S-Tab> works like CTRL-P (unless 'wc' is <S-Tab>).
-+	 * When there are matching completions to select <S-Tab> works like
-+	 * CTRL-P (unless 'wc' is <S-Tab>).
- 	 */
--	if (c != p_wc && c == K_S_TAB && xpc.xp_numfiles != -1)
-+	if (c != p_wc && c == K_S_TAB && xpc.xp_numfiles > 0)
- 	    c = Ctrl_P;
- 
- #ifdef FEAT_WILDMENU
-@@ -1513,6 +1521,7 @@
- 		    int		old_firstc;
- 
- 		    vim_free(ccline.cmdbuff);
-+		    xpc.xp_context = EXPAND_NOTHING;
- 		    if (hiscnt == hislen)
- 			p = lookfor;	/* back to the old one */
- 		    else
-@@ -1839,6 +1848,7 @@
- #endif
- 
-     ExpandCleanup(&xpc);
-+    ccline.xpc = NULL;
- 
- #ifdef FEAT_SEARCH_EXTRA
-     if (did_incsearch)
-@@ -2508,6 +2518,20 @@
-     }
-     mch_memmove(ccline.cmdbuff, p, (size_t)ccline.cmdlen + 1);
-     vim_free(p);
-+
-+    if (ccline.xpc != NULL
-+	    && ccline.xpc->xp_pattern != NULL
-+	    && ccline.xpc->xp_context != EXPAND_NOTHING
-+	    && ccline.xpc->xp_context != EXPAND_UNSUCCESSFUL)
-+    {
-+	int i = (int)(ccline.xpc->xp_pattern - p);
-+
-+	/* If xp_pattern points inside the old cmdbuff it needs to be adjusted
-+	 * to point into the newly allocated memory. */
-+	if (i >= 0 && i <= ccline.cmdlen)
-+	    ccline.xpc->xp_pattern = ccline.cmdbuff + i;
-+    }
-+
-     return OK;
- }
- 
-@@ -2875,6 +2899,7 @@
-     prev_ccline = ccline;
-     ccline.cmdbuff = NULL;
-     ccline.cmdprompt = NULL;
-+    ccline.xpc = NULL;
- }
- 
- /*
-@@ -3582,6 +3607,7 @@
- ExpandInit(xp)
-     expand_T	*xp;
- {
-+    xp->xp_pattern = NULL;
-     xp->xp_backslash = XP_BS_NONE;
- #ifndef BACKSLASH_IN_FILENAME
-     xp->xp_shell = FALSE;
-@@ -4871,7 +4897,7 @@
-     if (s == NULL)
- 	return FAIL;
-     sprintf((char *)s, "%s/%s*.vim", dirname, pat);
--    all = globpath(p_rtp, s);
-+    all = globpath(p_rtp, s, 0);
-     vim_free(s);
-     if (all == NULL)
- 	return FAIL;
-@@ -4912,9 +4938,10 @@
-  * newlines.  Returns NULL for an error or no matches.
-  */
-     char_u *
--globpath(path, file)
-+globpath(path, file, expand_options)
-     char_u	*path;
-     char_u	*file;
-+    int		expand_options;
- {
-     expand_T	xpc;
-     char_u	*buf;
-@@ -4943,10 +4970,10 @@
- 	{
- 	    add_pathsep(buf);
- 	    STRCAT(buf, file);
--	    if (ExpandFromContext(&xpc, buf, &num_p, &p, WILD_SILENT) != FAIL
--								 && num_p > 0)
-+	    if (ExpandFromContext(&xpc, buf, &num_p, &p,
-+			     WILD_SILENT|expand_options) != FAIL && num_p > 0)
- 	    {
--		ExpandEscape(&xpc, buf, num_p, p, WILD_SILENT);
-+		ExpandEscape(&xpc, buf, num_p, p, WILD_SILENT|expand_options);
- 		for (len = 0, i = 0; i < num_p; ++i)
- 		    len += (int)STRLEN(p[i]) + 1;
- 
-diff -Naur vim72.orig/src/feature.h vim72/src/feature.h
---- vim72.orig/src/feature.h	2008-08-06 04:00:39.000000000 -0700
-+++ vim72/src/feature.h	2009-01-08 20:57:32.000000000 -0800
-@@ -767,9 +767,13 @@
- 
- /*
-  * +browse		":browse" command.
-+ *			or just the ":browse" command modifier
-  */
--#if defined(FEAT_NORMAL) && (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MAC))
--# define FEAT_BROWSE
-+#if defined(FEAT_NORMAL)
-+# define FEAT_BROWSE_CMD
-+# if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MAC)
-+#  define FEAT_BROWSE
-+# endif
- #endif
- 
- /*
-diff -Naur vim72.orig/src/fileio.c vim72/src/fileio.c
---- vim72.orig/src/fileio.c	2008-08-06 04:01:03.000000000 -0700
-+++ vim72/src/fileio.c	2009-01-08 20:57:54.000000000 -0800
-@@ -932,7 +932,10 @@
-     else
-     {
- 	if (eap != NULL && eap->force_ff != 0)
-+	{
- 	    fileformat = get_fileformat_force(curbuf, eap);
-+	    try_unix = try_dos = try_mac = FALSE;
-+	}
- 	else if (curbuf->b_p_bin)
- 	    fileformat = EOL_UNIX;		/* binary: use Unix format */
- 	else if (*p_ffs == NUL)
-@@ -2211,7 +2214,7 @@
-     {
- 	/* Use stderr for stdin, makes shell commands work. */
- 	close(0);
--	dup(2);
-+	ignored = dup(2);
-     }
- #endif
- 
-@@ -2341,11 +2344,6 @@
- 		STRCAT(IObuff, _("[CR missing]"));
- 		c = TRUE;
- 	    }
--	    if (ff_error == EOL_MAC)
--	    {
--		STRCAT(IObuff, _("[NL found]"));
--		c = TRUE;
--	    }
- 	    if (split)
- 	    {
- 		STRCAT(IObuff, _("[long lines split]"));
-@@ -2711,7 +2709,7 @@
- {
-     if (!curbuf->b_marks_read && get_viminfo_parameter('\'') > 0
- 						  && curbuf->b_ffname != NULL)
--	read_viminfo(NULL, FALSE, TRUE, FALSE);
-+	read_viminfo(NULL, VIF_WANT_MARKS);
- 
-     /* Always set b_marks_read; needed when 'viminfo' is changed to include
-      * the ' parameter after opening a buffer. */
-@@ -3451,7 +3449,7 @@
- 		{
- # ifdef UNIX
- #  ifdef HAVE_FCHOWN
--		    fchown(fd, st_old.st_uid, st_old.st_gid);
-+		    ignored = fchown(fd, st_old.st_uid, st_old.st_gid);
- #  endif
- 		    if (mch_stat((char *)IObuff, &st) < 0
- 			    || st.st_uid != st_old.st_uid
-@@ -4367,7 +4365,7 @@
- 		|| st.st_uid != st_old.st_uid
- 		|| st.st_gid != st_old.st_gid)
- 	{
--	    fchown(fd, st_old.st_uid, st_old.st_gid);
-+	    ignored = fchown(fd, st_old.st_uid, st_old.st_gid);
- 	    if (perm >= 0)	/* set permission again, may have changed */
- 		(void)mch_setperm(wfname, perm);
- 	}
-@@ -5550,9 +5548,10 @@
- 	    name = "ucs-4le";	/* FF FE 00 00 */
- 	    len = 4;
- 	}
--	else if (flags == FIO_ALL || flags == (FIO_UCS2 | FIO_ENDIAN_L))
-+	else if (flags == (FIO_UCS2 | FIO_ENDIAN_L))
- 	    name = "ucs-2le";	/* FF FE */
--	else if (flags == (FIO_UTF16 | FIO_ENDIAN_L))
-+	else if (flags == FIO_ALL || flags == (FIO_UTF16 | FIO_ENDIAN_L))
-+	    /* utf-16le is preferred, it also works for ucs-2le text */
- 	    name = "utf-16le";	/* FF FE */
-     }
-     else if (p[0] == 0xfe && p[1] == 0xff
-@@ -6031,9 +6030,9 @@
- 	{
- 	    tbuf[FGETS_SIZE - 2] = NUL;
- #ifdef USE_CR
--	    fgets_cr((char *)tbuf, FGETS_SIZE, fp);
-+	    ignoredp = fgets_cr((char *)tbuf, FGETS_SIZE, fp);
- #else
--	    fgets((char *)tbuf, FGETS_SIZE, fp);
-+	    ignoredp = fgets((char *)tbuf, FGETS_SIZE, fp);
- #endif
- 	} while (tbuf[FGETS_SIZE - 2] != NUL && tbuf[FGETS_SIZE - 2] != '\n');
-     }
-@@ -6107,12 +6106,24 @@
- #ifdef HAVE_ACL
-     vim_acl_T	acl;		/* ACL from original file */
- #endif
-+#if defined(UNIX) || defined(CASE_INSENSITIVE_FILENAME)
-+    int		use_tmp_file = FALSE;
-+#endif
- 
-     /*
--     * When the names are identical, there is nothing to do.
-+     * When the names are identical, there is nothing to do.  When they refer
-+     * to the same file (ignoring case and slash/backslash differences) but
-+     * the file name differs we need to go through a temp file.
-      */
-     if (fnamecmp(from, to) == 0)
--	return 0;
-+    {
-+#ifdef CASE_INSENSITIVE_FILENAME
-+	if (STRCMP(gettail(from), gettail(to)) != 0)
-+	    use_tmp_file = TRUE;
-+	else
-+#endif
-+	    return 0;
-+    }
- 
-     /*
-      * Fail if the "from" file doesn't exist.  Avoids that "to" is deleted.
-@@ -6120,6 +6131,55 @@
-     if (mch_stat((char *)from, &st) < 0)
- 	return -1;
- 
-+#ifdef UNIX
-+    {
-+	struct stat	st_to;
-+
-+	/* It's possible for the source and destination to be the same file.
-+	 * This happens when "from" and "to" differ in case and are on a FAT32
-+	 * filesystem.  In that case go through a temp file name. */
-+	if (mch_stat((char *)to, &st_to) >= 0
-+		&& st.st_dev == st_to.st_dev
-+		&& st.st_ino == st_to.st_ino)
-+	    use_tmp_file = TRUE;
-+    }
-+#endif
-+
-+#if defined(UNIX) || defined(CASE_INSENSITIVE_FILENAME)
-+    if (use_tmp_file)
-+    {
-+	char	tempname[MAXPATHL + 1];
-+
-+	/*
-+	 * Find a name that doesn't exist and is in the same directory.
-+	 * Rename "from" to "tempname" and then rename "tempname" to "to".
-+	 */
-+	if (STRLEN(from) >= MAXPATHL - 5)
-+	    return -1;
-+	STRCPY(tempname, from);
-+	for (n = 123; n < 99999; ++n)
-+	{
-+	    sprintf((char *)gettail((char_u *)tempname), "%d", n);
-+	    if (mch_stat(tempname, &st) < 0)
-+	    {
-+		if (mch_rename((char *)from, tempname) == 0)
-+		{
-+		    if (mch_rename(tempname, (char *)to) == 0)
-+			return 0;
-+		    /* Strange, the second step failed.  Try moving the
-+		     * file back and return failure. */
-+		    mch_rename(tempname, (char *)from);
-+		    return -1;
-+		}
-+		/* If it fails for one temp name it will most likely fail
-+		 * for any temp name, give up. */
-+		return -1;
-+	    }
-+	}
-+	return -1;
-+    }
-+#endif
-+
-     /*
-      * Delete the "to" file, this is required on some systems to make the
-      * mch_rename() work, on other systems it makes sure that we don't have
-@@ -8523,6 +8583,7 @@
-     char_u	*save_sourcing_name;
-     linenr_T	save_sourcing_lnum;
-     char_u	*save_autocmd_fname;
-+    int		save_autocmd_fname_full;
-     int		save_autocmd_bufnr;
-     char_u	*save_autocmd_match;
-     int		save_autocmd_busy;
-@@ -8601,6 +8662,7 @@
-      * Save the autocmd_* variables and info about the current buffer.
-      */
-     save_autocmd_fname = autocmd_fname;
-+    save_autocmd_fname_full = autocmd_fname_full;
-     save_autocmd_bufnr = autocmd_bufnr;
-     save_autocmd_match = autocmd_match;
-     save_autocmd_busy = autocmd_busy;
-@@ -8618,14 +8680,15 @@
- 	if (fname != NULL && *fname != NUL)
- 	    autocmd_fname = fname;
- 	else if (buf != NULL)
--	    autocmd_fname = buf->b_fname;
-+	    autocmd_fname = buf->b_ffname;
- 	else
- 	    autocmd_fname = NULL;
-     }
-     else
- 	autocmd_fname = fname_io;
-     if (autocmd_fname != NULL)
--	autocmd_fname = FullName_save(autocmd_fname, FALSE);
-+	autocmd_fname = vim_strsave(autocmd_fname);
-+    autocmd_fname_full = FALSE; /* call FullName_save() later */
- 
-     /*
-      * Set the buffer number to be used for <abuf>.
-@@ -8810,6 +8873,7 @@
-     sourcing_lnum = save_sourcing_lnum;
-     vim_free(autocmd_fname);
-     autocmd_fname = save_autocmd_fname;
-+    autocmd_fname_full = save_autocmd_fname_full;
-     autocmd_bufnr = save_autocmd_bufnr;
-     autocmd_match = save_autocmd_match;
- #ifdef FEAT_EVAL
-@@ -8918,7 +8982,7 @@
-     {
- 	apc->curpat = NULL;
- 
--	/* only use a pattern when it has not been removed, has commands and
-+	/* Only use a pattern when it has not been removed, has commands and
- 	 * the group matches. For buffer-local autocommands only check the
- 	 * buffer number. */
- 	if (ap->pat != NULL && ap->cmds != NULL
-@@ -9104,7 +9168,7 @@
- set_context_in_autocmd(xp, arg, doautocmd)
-     expand_T	*xp;
-     char_u	*arg;
--    int		doautocmd;	/* TRUE for :doautocmd, FALSE for :autocmd */
-+    int		doautocmd;	/* TRUE for :doauto*, FALSE for :autocmd */
- {
-     char_u	*p;
-     int		group;
-diff -Naur vim72.orig/src/fold.c vim72/src/fold.c
---- vim72.orig/src/fold.c	2008-08-06 04:01:12.000000000 -0700
-+++ vim72/src/fold.c	2009-01-08 20:57:54.000000000 -0800
-@@ -48,7 +48,7 @@
- static int foldFind __ARGS((garray_T *gap, linenr_T lnum, fold_T **fpp));
- static int foldLevelWin __ARGS((win_T *wp, linenr_T lnum));
- static void checkupdate __ARGS((win_T *wp));
--static void setFoldRepeat __ARGS((linenr_T lnum, long count, int open));
-+static void setFoldRepeat __ARGS((linenr_T lnum, long count, int do_open));
- static linenr_T setManualFold __ARGS((linenr_T lnum, int opening, int recurse, int *donep));
- static linenr_T setManualFoldWin __ARGS((win_T *wp, linenr_T lnum, int opening, int recurse, int *donep));
- static void foldOpenNested __ARGS((fold_T *fpr));
-@@ -740,7 +740,7 @@
-     garray_T	*found_ga;
-     fold_T	*found_fp = NULL;
-     linenr_T	found_off = 0;
--    int		use_level = FALSE;
-+    int		use_level;
-     int		maybe_small = FALSE;
-     int		level = 0;
-     linenr_T	lnum = start;
-@@ -757,6 +757,7 @@
- 	gap = &curwin->w_folds;
- 	found_ga = NULL;
- 	lnum_off = 0;
-+	use_level = FALSE;
- 	for (;;)
- 	{
- 	    if (!foldFind(gap, lnum - lnum_off, &fp))
-@@ -783,20 +784,21 @@
- 	else
- 	{
- 	    lnum = found_fp->fd_top + found_fp->fd_len + found_off;
--	    did_one = TRUE;
- 
- 	    if (foldmethodIsManual(curwin))
- 		deleteFoldEntry(found_ga,
- 		    (int)(found_fp - (fold_T *)found_ga->ga_data), recursive);
- 	    else
- 	    {
--		if (found_fp->fd_top + found_off < first_lnum)
--		    first_lnum = found_fp->fd_top;
--		if (lnum > last_lnum)
-+		if (first_lnum > found_fp->fd_top + found_off)
-+		    first_lnum = found_fp->fd_top + found_off;
-+		if (last_lnum < lnum)
- 		    last_lnum = lnum;
--		parseMarker(curwin);
-+		if (!did_one)
-+		    parseMarker(curwin);
- 		deleteFoldMarkers(found_fp, recursive, found_off);
- 	    }
-+	    did_one = TRUE;
- 
- 	    /* redraw window */
- 	    changed_window_setting();
-@@ -811,6 +813,10 @@
- 	    redraw_curbuf_later(INVERTED);
- #endif
-     }
-+    else
-+	/* Deleting markers may make cursor column invalid. */
-+	check_cursor_col();
-+
-     if (last_lnum > 0)
- 	changed_lines(first_lnum, (colnr_T)0, last_lnum, 0L);
- }
-@@ -1241,10 +1247,10 @@
-  * Repeat "count" times.
-  */
-     static void
--setFoldRepeat(lnum, count, open)
-+setFoldRepeat(lnum, count, do_open)
-     linenr_T	lnum;
-     long	count;
--    int		open;
-+    int		do_open;
- {
-     int		done;
-     long	n;
-@@ -1252,7 +1258,7 @@
-     for (n = 0; n < count; ++n)
-     {
- 	done = DONE_NOTHING;
--	(void)setManualFold(lnum, open, FALSE, &done);
-+	(void)setManualFold(lnum, do_open, FALSE, &done);
- 	if (!(done & DONE_ACTION))
- 	{
- 	    /* Only give an error message when no fold could be opened. */
-diff -Naur vim72.orig/src/getchar.c vim72/src/getchar.c
---- vim72.orig/src/getchar.c	2008-07-22 09:57:48.000000000 -0700
-+++ vim72/src/getchar.c	2009-01-08 20:57:43.000000000 -0800
-@@ -4702,7 +4702,7 @@
- 			return FAIL;
- 		    if (mp->m_noremap != REMAP_YES && fprintf(fd, "nore") < 0)
- 			return FAIL;
--		    if (fprintf(fd, cmd) < 0)
-+		    if (fputs(cmd, fd) < 0)
- 			return FAIL;
- 		    if (buf != NULL && fputs(" <buffer>", fd) < 0)
- 			return FAIL;
-@@ -4801,7 +4801,7 @@
- 	    }
- 	    if (IS_SPECIAL(c) || modifiers)	/* special key */
- 	    {
--		if (fprintf(fd, (char *)get_special_key_name(c, modifiers)) < 0)
-+		if (fputs((char *)get_special_key_name(c, modifiers), fd) < 0)
- 		    return FAIL;
- 		continue;
- 	    }
-diff -Naur vim72.orig/src/globals.h vim72/src/globals.h
---- vim72.orig/src/globals.h	2008-07-26 04:53:29.000000000 -0700
-+++ vim72/src/globals.h	2009-01-08 20:57:54.000000000 -0800
-@@ -1022,6 +1022,7 @@
- #endif
- #ifdef FEAT_AUTOCMD
- EXTERN char_u	*autocmd_fname INIT(= NULL); /* fname for <afile> on cmdline */
-+EXTERN int	autocmd_fname_full;	     /* autocmd_fname is full path */
- EXTERN int	autocmd_bufnr INIT(= 0);     /* fnum for <abuf> on cmdline */
- EXTERN char_u	*autocmd_match INIT(= NULL); /* name for <amatch> on cmdline */
- EXTERN int	did_cursorhold INIT(= FALSE); /* set when CursorHold t'gerd */
-@@ -1339,7 +1340,6 @@
- 
- #ifdef FEAT_NETBEANS_INTG
- EXTERN char *netbeansArg INIT(= NULL);	/* the -nb[:host:port:passwd] arg */
--EXTERN int netbeansCloseFile INIT(= 0);	/* send killed if != 0 */
- EXTERN int netbeansFireChanges INIT(= 1); /* send buffer changes if != 0 */
- EXTERN int netbeansForcedQuit INIT(= 0);/* don't write modified files */
- EXTERN int netbeansReadFile INIT(= 1);	/* OK to read from disk if != 0 */
-@@ -1548,6 +1548,14 @@
- EXTERN time_t starttime;
- 
- /*
-+ * Some compilers warn for not using a return value, but in some situations we
-+ * can't do anything useful with the value.  Assign to this variable to avoid
-+ * the warning.
-+ */
-+EXTERN int ignored;
-+EXTERN char *ignoredp;
-+
-+/*
-  * Optional Farsi support.  Include it here, so EXTERN and INIT are defined.
-  */
- #ifdef FEAT_FKMAP
-diff -Naur vim72.orig/src/gui.c vim72/src/gui.c
---- vim72.orig/src/gui.c	2008-07-27 12:32:14.000000000 -0700
-+++ vim72/src/gui.c	2009-01-08 20:57:45.000000000 -0800
-@@ -139,7 +139,7 @@
- 		/* The read returns when the child closes the pipe (or when
- 		 * the child dies for some reason). */
- 		close(pipefd[1]);
--		(void)read(pipefd[0], &dummy, (size_t)1);
-+		ignored = (int)read(pipefd[0], &dummy, (size_t)1);
- 		close(pipefd[0]);
- 	    }
- 
-@@ -3241,7 +3241,7 @@
- 	    i = Rows;
- 	    gui_update_tabline();
- 	    Rows = i;
--	    need_set_size = RESIZE_VERT;
-+	    need_set_size |= RESIZE_VERT;
- 	    if (using_tabline)
- 		fix_size = TRUE;
- 	    if (!gui_use_tabline())
-@@ -3275,9 +3275,9 @@
- 		if (gui.which_scrollbars[i] != prev_which_scrollbars[i])
- 		{
- 		    if (i == SBAR_BOTTOM)
--			need_set_size = RESIZE_VERT;
-+			need_set_size |= RESIZE_VERT;
- 		    else
--			need_set_size = RESIZE_HOR;
-+			need_set_size |= RESIZE_HOR;
- 		    if (gui.which_scrollbars[i])
- 			fix_size = TRUE;
- 		}
-@@ -3297,7 +3297,7 @@
- 	    gui_mch_enable_menu(gui.menu_is_active);
- 	    Rows = i;
- 	    prev_menu_is_active = gui.menu_is_active;
--	    need_set_size = RESIZE_VERT;
-+	    need_set_size |= RESIZE_VERT;
- 	    if (gui.menu_is_active)
- 		fix_size = TRUE;
- 	}
-@@ -3308,7 +3308,7 @@
- 	{
- 	    gui_mch_show_toolbar(using_toolbar);
- 	    prev_toolbar = using_toolbar;
--	    need_set_size = RESIZE_VERT;
-+	    need_set_size |= RESIZE_VERT;
- 	    if (using_toolbar)
- 		fix_size = TRUE;
- 	}
-@@ -3318,7 +3318,7 @@
- 	{
- 	    gui_mch_enable_footer(using_footer);
- 	    prev_footer = using_footer;
--	    need_set_size = RESIZE_VERT;
-+	    need_set_size |= RESIZE_VERT;
- 	    if (using_footer)
- 		fix_size = TRUE;
- 	}
-@@ -3330,10 +3330,11 @@
- 	    prev_tearoff = using_tearoff;
- 	}
- #endif
--	if (need_set_size)
-+	if (need_set_size != 0)
- 	{
- #ifdef FEAT_GUI_GTK
--	    long    c = Columns;
-+	    long    prev_Columns = Columns;
-+	    long    prev_Rows = Rows;
- #endif
- 	    /* Adjust the size of the window to make the text area keep the
- 	     * same size and to avoid that part of our window is off-screen
-@@ -3349,11 +3350,14 @@
- 	     * If you remove this, please test this command for resizing
- 	     * effects (with optional left scrollbar): ":vsp|q|vsp|q|vsp|q".
- 	     * Don't do this while starting up though.
--	     * And don't change Rows, it may have be reduced intentionally
--	     * when adding menu/toolbar/tabline. */
--	    if (!gui.starting)
-+	     * Don't change Rows when adding menu/toolbar/tabline.
-+	     * Don't change Columns when adding vertical toolbar. */
-+	    if (!gui.starting && need_set_size != (RESIZE_VERT | RESIZE_HOR))
- 		(void)char_avail();
--	    Columns = c;
-+	    if ((need_set_size & RESIZE_VERT) == 0)
-+		Rows = prev_Rows;
-+	    if ((need_set_size & RESIZE_HOR) == 0)
-+		Columns = prev_Columns;
- #endif
- 	}
- #ifdef FEAT_WINDOWS
-diff -Naur vim72.orig/src/gui_at_sb.c vim72/src/gui_at_sb.c
---- vim72.orig/src/gui_at_sb.c	2004-06-07 07:32:25.000000000 -0700
-+++ vim72/src/gui_at_sb.c	2009-01-08 20:57:44.000000000 -0800
-@@ -1078,6 +1078,12 @@
-     Cardinal	*num_params;	/* unused */
- {
-     ScrollbarWidget sbw = (ScrollbarWidget)w;
-+    /* Use a union to avoid a warning for the weird conversion from float to
-+     * XtPointer.  Comes from Xaw/Scrollbar.c. */
-+    union {
-+	XtPointer xtp;
-+	float xtf;
-+    } xtpf;
- 
-     if (LookAhead(w, event))
- 	return;
-@@ -1085,7 +1091,8 @@
-     /* thumbProc is not pretty, but is necessary for backwards
-        compatibility on those architectures for which it work{s,ed};
-        the intent is to pass a (truncated) float by value. */
--    XtCallCallbacks(w, XtNthumbProc, *(XtPointer*)&sbw->scrollbar.top);
-+    xtpf.xtf = sbw->scrollbar.top;
-+    XtCallCallbacks(w, XtNthumbProc, xtpf.xtp);
-     XtCallCallbacks(w, XtNjumpProc, (XtPointer)&sbw->scrollbar.top);
- }
- 
-diff -Naur vim72.orig/src/gui_gtk_x11.c vim72/src/gui_gtk_x11.c
---- vim72.orig/src/gui_gtk_x11.c	2008-07-04 03:46:24.000000000 -0700
-+++ vim72/src/gui_gtk_x11.c	2009-01-08 20:57:44.000000000 -0800
-@@ -4070,14 +4070,14 @@
- 
- 	if (mask & (XValue | YValue))
- 	{
--	    int w, h;
--	    gui_mch_get_screen_dimensions(&w, &h);
--	    h += p_ghr + get_menu_tool_height();
--	    w += get_menu_tool_width();
-+	    int ww, hh;
-+	    gui_mch_get_screen_dimensions(&ww, &hh);
-+	    hh += p_ghr + get_menu_tool_height();
-+	    ww += get_menu_tool_width();
- 	    if (mask & XNegative)
--		x += w - pixel_width;
-+		x += ww - pixel_width;
- 	    if (mask & YNegative)
--		y += h - pixel_height;
-+		y += hh - pixel_height;
- #ifdef HAVE_GTK2
- 	    gtk_window_move(GTK_WINDOW(gui.mainwin), x, y);
- #else
-diff -Naur vim72.orig/src/gui_x11.c vim72/src/gui_x11.c
---- vim72.orig/src/gui_x11.c	2008-06-08 08:13:45.000000000 -0700
-+++ vim72/src/gui_x11.c	2009-01-08 20:57:33.000000000 -0800
-@@ -2450,7 +2450,7 @@
- 	*colorPtr = colortable[closest];
-     }
- 
--    free(colortable);
-+    vim_free(colortable);
-     return OK;
- }
- 
-diff -Naur vim72.orig/src/gui_xmdlg.c vim72/src/gui_xmdlg.c
---- vim72.orig/src/gui_xmdlg.c	2008-06-21 09:05:32.000000000 -0700
-+++ vim72/src/gui_xmdlg.c	2009-01-08 20:57:44.000000000 -0800
-@@ -369,10 +369,10 @@
-     char	buf[TEMP_BUF_SIZE];
-     XmString	items[MAX_ENTRIES_IN_LIST];
-     int		i;
--    int		index;
-+    int		idx;
- 
--    for (index = (int)ENCODING; index < (int)NONE; ++index)
--	count[index] = 0;
-+    for (idx = (int)ENCODING; idx < (int)NONE; ++idx)
-+	count[idx] = 0;
- 
-     /* First we insert the wild char into every single list. */
-     if (fix != ENCODING)
-@@ -503,14 +503,14 @@
-     /*
-      * Now loop trough the remaining lists and set them up.
-      */
--    for (index = (int)NAME; index < (int)NONE; ++index)
-+    for (idx = (int)NAME; idx < (int)NONE; ++idx)
-     {
- 	Widget w;
- 
--	if (fix == (enum ListSpecifier)index)
-+	if (fix == (enum ListSpecifier)idx)
- 	    continue;
- 
--	switch ((enum ListSpecifier)index)
-+	switch ((enum ListSpecifier)idx)
- 	{
- 	    case NAME:
- 		w = data->list[NAME];
-@@ -525,21 +525,21 @@
- 		w = (Widget)0;	/* for lint */
- 	}
- 
--	for (i = 0; i < count[index]; ++i)
-+	for (i = 0; i < count[idx]; ++i)
- 	{
--	    items[i] = XmStringCreateLocalized(list[index][i]);
--	    XtFree(list[index][i]);
-+	    items[i] = XmStringCreateLocalized(list[idx][i]);
-+	    XtFree(list[idx][i]);
- 	}
- 	XmListDeleteAllItems(w);
--	XmListAddItems(w, items, count[index], 1);
--	if (data->sel[index])
-+	XmListAddItems(w, items, count[idx], 1);
-+	if (data->sel[idx])
- 	{
- 	    XmStringFree(items[0]);
--	    items[0] = XmStringCreateLocalized(data->sel[index]);
-+	    items[0] = XmStringCreateLocalized(data->sel[idx]);
- 	    XmListSelectItem(w, items[0], False);
- 	    XmListSetBottomItem(w, items[0]);
- 	}
--	for (i = 0; i < count[index]; ++i)
-+	for (i = 0; i < count[idx]; ++i)
- 	    XmStringFree(items[i]);
-     }
- }
-@@ -695,14 +695,14 @@
- 	int	    n;
- 	XmString    str;
- 	Arg	    args[4];
--	char	    *msg = _("no specific match");
-+	char	    *nomatch_msg = _("no specific match");
- 
- 	n = 0;
--	str = XmStringCreateLocalized(msg);
-+	str = XmStringCreateLocalized(nomatch_msg);
- 	XtSetArg(args[n], XmNlabelString, str); ++n;
- 	XtSetValues(data->sample, args, n);
- 	apply_fontlist(data->sample);
--	XmTextSetString(data->name, msg);
-+	XmTextSetString(data->name, nomatch_msg);
- 	XmStringFree(str);
- 
- 	return False;
-@@ -886,21 +886,21 @@
-     {
- 	int	i;
- 	int	max;
--	int	index = 0;
-+	int	idx = 0;
- 	int	size;
--	char	str[128];
-+	char	buf[128];
- 
- 	for (i = 0, max = 0; i < data->num; i++)
- 	{
--	    get_part(fn(data, i), 7, str);
--	    size = atoi(str);
-+	    get_part(fn(data, i), 7, buf);
-+	    size = atoi(buf);
- 	    if ((size > max) && (size < MAX_DISPLAY_SIZE))
- 	    {
--		index = i;
-+		idx = i;
- 		max = size;
- 	    }
- 	}
--	strcpy(big_font, fn(data, index));
-+	strcpy(big_font, fn(data, idx));
-     }
-     data->old = XLoadQueryFont(XtDisplay(parent), big_font);
-     data->old_list = gui_motif_create_fontlist(data->old);
-@@ -1217,28 +1217,28 @@
- 
- 	if (i != 0)
- 	{
--	    char name[TEMP_BUF_SIZE];
--	    char style[TEMP_BUF_SIZE];
--	    char size[TEMP_BUF_SIZE];
--	    char encoding[TEMP_BUF_SIZE];
-+	    char namebuf[TEMP_BUF_SIZE];
-+	    char stylebuf[TEMP_BUF_SIZE];
-+	    char sizebuf[TEMP_BUF_SIZE];
-+	    char encodingbuf[TEMP_BUF_SIZE];
- 	    char *found;
- 
- 	    found = names[0];
- 
--	    name_part(found, name);
--	    style_part(found, style);
--	    size_part(found, size, data->in_pixels);
--	    encoding_part(found, encoding);
--
--	    if (strlen(name) > 0
--		    && strlen(style) > 0
--		    && strlen(size) > 0
--		    && strlen(encoding) > 0)
-+	    name_part(found, namebuf);
-+	    style_part(found, stylebuf);
-+	    size_part(found, sizebuf, data->in_pixels);
-+	    encoding_part(found, encodingbuf);
-+
-+	    if (strlen(namebuf) > 0
-+		    && strlen(stylebuf) > 0
-+		    && strlen(sizebuf) > 0
-+		    && strlen(encodingbuf) > 0)
- 	    {
--		data->sel[NAME] = XtNewString(name);
--		data->sel[STYLE] = XtNewString(style);
--		data->sel[SIZE] = XtNewString(size);
--		data->sel[ENCODING] = XtNewString(encoding);
-+		data->sel[NAME] = XtNewString(namebuf);
-+		data->sel[STYLE] = XtNewString(stylebuf);
-+		data->sel[SIZE] = XtNewString(sizebuf);
-+		data->sel[ENCODING] = XtNewString(encodingbuf);
- 		data->font_name = XtNewString(names[0]);
- 		display_sample(data);
- 		XmTextSetString(data->name, data->font_name);
-diff -Naur vim72.orig/src/gui_xmebw.c vim72/src/gui_xmebw.c
---- vim72.orig/src/gui_xmebw.c	2007-09-06 03:57:51.000000000 -0700
-+++ vim72/src/gui_xmebw.c	2009-01-08 20:57:44.000000000 -0800
-@@ -1256,7 +1256,7 @@
-     }
-     else
-     {
--	int adjust = 0;
-+	adjust = 0;
- 
- #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
- 	/*
-@@ -1268,12 +1268,11 @@
- 	{
- 	    case XmEXTERNAL_HIGHLIGHT:
- 		adjust = (eb->primitive.highlight_thickness -
--			(eb->pushbutton.default_button_shadow_thickness ?
--			 Xm3D_ENHANCE_PIXEL : 0));
-+			 (eb->pushbutton.default_button_shadow_thickness
-+			  ?  Xm3D_ENHANCE_PIXEL : 0));
- 		break;
- 
- 	    case XmINTERNAL_HIGHLIGHT:
--		adjust = 0;
- 		break;
- 
- 	    default:
-diff -Naur vim72.orig/src/if_cscope.c vim72/src/if_cscope.c
---- vim72.orig/src/if_cscope.c	2008-06-24 09:32:34.000000000 -0700
-+++ vim72/src/if_cscope.c	2009-01-08 20:57:27.000000000 -0800
-@@ -74,7 +74,7 @@
-     { "add",	cs_add,
- 		N_("Add a new database"),     "add file|dir [pre-path] [flags]", 0 },
-     { "find",	cs_find,
--		N_("Query for a pattern"),    FIND_USAGE, 1 },
-+		N_("Query for a pattern"),    "find c|d|e|f|g|i|s|t name", 1 },
-     { "help",	cs_help,
- 		N_("Show this message"),      "help", 0 },
-     { "kill",	cs_kill,
-@@ -1180,7 +1180,16 @@
- 	(void)smsg((char_u *)_("%-5s: %-30s (Usage: %s)"),
- 				      cmdp->name, _(cmdp->help), cmdp->usage);
- 	if (strcmp(cmdp->name, "find") == 0)
--	    MSG_PUTS(FIND_HELP);
-+	    MSG_PUTS(_("\n"
-+		       "       c: Find functions calling this function\n"
-+		       "       d: Find functions called by this function\n"
-+		       "       e: Find this egrep pattern\n"
-+		       "       f: Find this file\n"
-+		       "       g: Find this definition\n"
-+		       "       i: Find files #including this file\n"
-+		       "       s: Find this C symbol\n"
-+		       "       t: Find assignments to\n"));
-+
- 	cmdp++;
-     }
- 
-diff -Naur vim72.orig/src/if_cscope.h vim72/src/if_cscope.h
---- vim72.orig/src/if_cscope.h	2007-09-02 07:51:08.000000000 -0700
-+++ vim72/src/if_cscope.h	2009-01-08 20:57:27.000000000 -0800
-@@ -42,17 +42,6 @@
-  * f 7name	Find this file
-  * i 8name	Find files #including this file
-  */
--#define	FIND_USAGE "find c|d|e|f|g|i|s|t name"
--#define FIND_HELP "\n\
--       c: Find functions calling this function\n\
--       d: Find functions called by this function\n\
--       e: Find this egrep pattern\n\
--       f: Find this file\n\
--       g: Find this definition\n\
--       i: Find files #including this file\n\
--       s: Find this C symbol\n\
--       t: Find assignments to\n"
--
- 
- typedef struct {
-     char *  name;
-diff -Naur vim72.orig/src/if_perl.xs vim72/src/if_perl.xs
---- vim72.orig/src/if_perl.xs	2008-07-17 13:55:09.000000000 -0700
-+++ vim72/src/if_perl.xs	2009-01-08 20:57:45.000000000 -0800
-@@ -136,6 +136,9 @@
- #  define Perl_newXS_flags dll_Perl_newXS_flags
- #endif
- # define Perl_sv_free dll_Perl_sv_free
-+# if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
-+#  define Perl_sv_free2 dll_Perl_sv_free2
-+# endif
- # define Perl_sv_isa dll_Perl_sv_isa
- # define Perl_sv_magic dll_Perl_sv_magic
- # define Perl_sv_setiv dll_Perl_sv_setiv
-@@ -163,7 +166,7 @@
- # define Perl_Isv_yes_ptr dll_Perl_Isv_yes_ptr
- # define boot_DynaLoader dll_boot_DynaLoader
- 
--# define Perl_sys_init3 dll_Perl_sys_init3
-+# define Perl_sys_init dll_Perl_sys_init
- # define Perl_sys_term dll_Perl_sys_term
- # define Perl_ISv_ptr dll_Perl_ISv_ptr
- # define Perl_Istack_max_ptr dll_Perl_Istack_max_ptr
-@@ -268,7 +271,8 @@
- static void (*boot_DynaLoader)_((pTHX_ CV*));
- 
- #if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
--static void (*Perl_sys_init3)(int* argc, char*** argv, char*** env);
-+static void (*Perl_sv_free2)(pTHX_ SV*);
-+static void (*Perl_sys_init)(int* argc, char*** argv);
- static void (*Perl_sys_term)(void);
- static SV** (*Perl_ISv_ptr)(register PerlInterpreter*);
- static SV*** (*Perl_Istack_max_ptr)(register PerlInterpreter*);
-@@ -367,7 +371,8 @@
-     {"Perl_TXpv_ptr", (PERL_PROC*)&Perl_TXpv_ptr},
-     {"Perl_Tna_ptr", (PERL_PROC*)&Perl_Tna_ptr},
- #else
--    {"Perl_sys_init3", (PERL_PROC*)&Perl_sys_init3},
-+    {"Perl_sv_free2", (PERL_PROC*)&Perl_sv_free2},
-+    {"Perl_sys_init", (PERL_PROC*)&Perl_sys_init},
-     {"Perl_sys_term", (PERL_PROC*)&Perl_sys_term},
-     {"Perl_ISv_ptr", (PERL_PROC*)&Perl_ISv_ptr},
-     {"Perl_Istack_sp_ptr", (PERL_PROC*)&Perl_Istack_sp_ptr},
-@@ -455,7 +460,7 @@
-     static char *argv[] = { "", "-e", "" };
- 
- #if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
--    Perl_sys_init3(&argc, (char***)&argv, NULL);
-+    Perl_sys_init(&argc, (char***)&argv);
- #endif
-     perl_interp = perl_alloc();
-     perl_construct(perl_interp);
-diff -Naur vim72.orig/src/if_python.c vim72/src/if_python.c
---- vim72.orig/src/if_python.c	2008-07-17 14:09:32.000000000 -0700
-+++ vim72/src/if_python.c	2009-01-08 20:57:39.000000000 -0800
-@@ -531,6 +531,12 @@
- 	if (PythonMod_Init())
- 	    goto fail;
- 
-+	/* Remove the element from sys.path that was added because of our
-+	 * argv[0] value in PythonMod_Init().  Previously we used an empty
-+	 * string, but dependinding on the OS we then get an empty entry or
-+	 * the current directory in sys.path. */
-+	PyRun_SimpleString("import sys; sys.path = filter(lambda x: x != '/must>not&exist', sys.path)");
-+
- 	/* the first python thread is vim's, release the lock */
- 	Python_SaveThread();
- 
-@@ -2345,7 +2351,8 @@
- {
-     PyObject *mod;
-     PyObject *dict;
--    static char *(argv[2]) = {"", NULL};
-+    /* The special value is removed from sys.path in Python_Init(). */
-+    static char *(argv[2]) = {"/must>not&exist/foo", NULL};
- 
-     /* Fixups... */
-     BufferType.ob_type = &PyType_Type;
-diff -Naur vim72.orig/src/if_xcmdsrv.c vim72/src/if_xcmdsrv.c
---- vim72.orig/src/if_xcmdsrv.c	2008-07-18 06:05:03.000000000 -0700
-+++ vim72/src/if_xcmdsrv.c	2009-01-08 20:57:36.000000000 -0800
-@@ -736,7 +736,7 @@
- 		+ serverReply.ga_len;
- 	    e.id = w;
- 	    ga_init2(&e.strings, 1, 100);
--	    memcpy(p, &e, sizeof(e));
-+	    mch_memmove(p, &e, sizeof(e));
- 	    serverReply.ga_len++;
- 	}
-     }
-@@ -1018,7 +1018,7 @@
- 	p++;
- 	count = numItems - (p - regProp);
- 	if (count > 0)
--	    memcpy(entry, p, count);
-+	    mch_memmove(entry, p, count);
- 	XChangeProperty(dpy, RootWindow(dpy, 0), registryProperty, XA_STRING,
- 			8, PropModeReplace, regProp,
- 			(int)(numItems - (p - entry)));
-@@ -1072,7 +1072,7 @@
- 		p++;
- 		lastHalf = numItems - (p - regProp);
- 		if (lastHalf > 0)
--		    memcpy(entry, p, lastHalf);
-+		    mch_memmove(entry, p, lastHalf);
- 		numItems = (entry - regProp) + lastHalf;
- 		p = entry;
- 		continue;
-diff -Naur vim72.orig/src/main.c vim72/src/main.c
---- vim72.orig/src/main.c	2008-07-24 01:40:56.000000000 -0700
-+++ vim72/src/main.c	2009-01-08 20:57:44.000000000 -0800
-@@ -645,11 +645,12 @@
- 
- #ifdef FEAT_VIMINFO
-     /*
--     * Read in registers, history etc, but not marks, from the viminfo file
-+     * Read in registers, history etc, but not marks, from the viminfo file.
-+     * This is where v:oldfiles gets filled.
-      */
-     if (*p_viminfo != NUL)
-     {
--	read_viminfo(NULL, TRUE, FALSE, FALSE);
-+	read_viminfo(NULL, VIF_WANT_INFO | VIF_GET_OLDFILES);
- 	TIME_MSG("reading viminfo");
-     }
- #endif
-@@ -1457,7 +1458,8 @@
- 	++initstr;
-     }
- 
--    if (TOLOWER_ASC(initstr[0]) == 'g' || initstr[0] == 'k')
-+    /* "gvim" starts the GUI.  Also accept "Gvim" for MS-Windows. */
-+    if (TOLOWER_ASC(initstr[0]) == 'g')
-     {
- 	main_start_gui();
- #ifdef FEAT_GUI
-@@ -1508,7 +1510,8 @@
- early_arg_scan(parmp)
-     mparm_T	*parmp;
- {
--#if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER)
-+#if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER) \
-+	|| !defined(FEAT_NETBEANS_INTG)
-     int		argc = parmp->argc;
-     char	**argv = parmp->argv;
-     int		i;
-@@ -1580,6 +1583,14 @@
- 	else if (STRICMP(argv[i], "--echo-wid") == 0)
- 	    echo_wid_arg = TRUE;
- # endif
-+# ifndef FEAT_NETBEANS_INTG
-+	else if (strncmp(argv[i], "-nb", (size_t)3) == 0)
-+        {
-+            mch_errmsg(_("'-nb' cannot be used: not enabled at compile time\n"));
-+            mch_exit(2);
-+        }
-+# endif
-+
-     }
- #endif
- }
-@@ -2361,7 +2372,7 @@
-      * Is there any other system that cannot do this?
-      */
-     close(0);
--    dup(2);
-+    ignored = dup(2);
- #endif
- }
- 
-diff -Naur vim72.orig/src/mark.c vim72/src/mark.c
---- vim72.orig/src/mark.c	2008-08-08 15:06:49.000000000 -0700
-+++ vim72/src/mark.c	2009-01-08 20:57:32.000000000 -0800
-@@ -1627,15 +1627,17 @@
- 
- /*
-  * Handle marks in the viminfo file:
-- * fp_out == NULL   read marks for current buffer only
-- * fp_out != NULL   copy marks for buffers not in buffer list
-+ * fp_out != NULL: copy marks for buffers not in buffer list
-+ * fp_out == NULL && (flags & VIF_WANT_MARKS): read marks for curbuf only
-+ * fp_out == NULL && (flags & VIF_GET_OLDFILES | VIF_FORCEIT): fill v:oldfiles
-  */
-     void
--copy_viminfo_marks(virp, fp_out, count, eof)
-+copy_viminfo_marks(virp, fp_out, count, eof, flags)
-     vir_T	*virp;
-     FILE	*fp_out;
-     int		count;
-     int		eof;
-+    int		flags;
- {
-     char_u	*line = virp->vir_line;
-     buf_T	*buf;
-@@ -1647,10 +1649,23 @@
-     char_u	*p;
-     char_u	*name_buf;
-     pos_T	pos;
-+#ifdef FEAT_EVAL
-+    list_T	*list = NULL;
-+#endif
- 
-     if ((name_buf = alloc(LSIZE)) == NULL)
- 	return;
-     *name_buf = NUL;
-+
-+#ifdef FEAT_EVAL
-+    if (fp_out == NULL && (flags & (VIF_GET_OLDFILES | VIF_FORCEIT)))
-+    {
-+	list = list_alloc();
-+	if (list != NULL)
-+	    set_vim_var_list(VV_OLDFILES, list);
-+    }
-+#endif
-+
-     num_marked_files = get_viminfo_parameter('\'');
-     while (!eof && (count < num_marked_files || fp_out == NULL))
-     {
-@@ -1681,6 +1696,11 @@
- 	    p++;
- 	*p = NUL;
- 
-+#ifdef FEAT_EVAL
-+	if (list != NULL)
-+	    list_append_string(list, str, -1);
-+#endif
-+
- 	/*
- 	 * If fp_out == NULL, load marks for current buffer.
- 	 * If fp_out != NULL, copy marks for buffers not in buflist.
-@@ -1688,7 +1708,7 @@
- 	load_marks = copy_marks_out = FALSE;
- 	if (fp_out == NULL)
- 	{
--	    if (curbuf->b_ffname != NULL)
-+	    if ((flags & VIF_WANT_MARKS) && curbuf->b_ffname != NULL)
- 	    {
- 		if (*name_buf == NUL)	    /* only need to do this once */
- 		    home_replace(NULL, curbuf->b_ffname, name_buf, LSIZE, TRUE);
-diff -Naur vim72.orig/src/mbyte.c vim72/src/mbyte.c
---- vim72.orig/src/mbyte.c	2008-07-14 05:38:05.000000000 -0700
-+++ vim72/src/mbyte.c	2009-01-08 20:57:44.000000000 -0800
-@@ -717,7 +717,7 @@
- 		     * where mblen() returns 0 for invalid character.
- 		     * Therefore, following condition includes 0.
- 		     */
--		    (void)mblen(NULL, 0);	/* First reset the state. */
-+		    ignored = mblen(NULL, 0);	/* First reset the state. */
- 		    if (mblen(buf, (size_t)1) <= 0)
- 			n = 2;
- 		    else
-@@ -2540,7 +2540,6 @@
-     return (int)(p - q);
- }
- 
--#if defined(FEAT_EVAL) || defined(PROTO)
- /*
-  * Copy a character from "*fp" to "*tp" and advance the pointers.
-  */
-@@ -2555,7 +2554,6 @@
-     *tp += l;
-     *fp += l;
- }
--#endif
- 
- /*
-  * Return the offset from "p" to the first byte of a character.  When "p" is
-@@ -3133,7 +3131,7 @@
- 	else
- 	    s = p + 1;
-     }
--    for (i = 0; s[i] != NUL && s + i < buf + sizeof(buf) - 1; ++i)
-+    for (i = 0; s[i] != NUL && i < sizeof(buf) - 1; ++i)
-     {
- 	if (s[i] == '_' || s[i] == '-')
- 	    buf[i] = '-';
-@@ -5280,7 +5278,7 @@
- 
- /*ARGSUSED*/
-     static void
--preedit_start_cbproc(XIC xic, XPointer client_data, XPointer call_data)
-+preedit_start_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
- {
- #ifdef XIM_DEBUG
-     xim_log("xim_decide_input_style()\n");
-@@ -5314,7 +5312,7 @@
- 
- /*ARGSUSED*/
-     static void
--preedit_draw_cbproc(XIC xic, XPointer client_data, XPointer call_data)
-+preedit_draw_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
- {
-     XIMPreeditDrawCallbackStruct *draw_data;
-     XIMText	*text;
-@@ -5386,7 +5384,7 @@
- 			draw_feedback = (char *)alloc(draw_data->chg_first
- 							      + text->length);
- 		    else
--			draw_feedback = realloc(draw_feedback,
-+			draw_feedback = vim_realloc(draw_feedback,
- 					 draw_data->chg_first + text->length);
- 		    if (draw_feedback != NULL)
- 		    {
-@@ -5455,7 +5453,7 @@
- 
- /*ARGSUSED*/
-     static void
--preedit_caret_cbproc(XIC xic, XPointer client_data, XPointer call_data)
-+preedit_caret_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
- {
- #ifdef XIM_DEBUG
-     xim_log("preedit_caret_cbproc()\n");
-@@ -5464,7 +5462,7 @@
- 
- /*ARGSUSED*/
-     static void
--preedit_done_cbproc(XIC xic, XPointer client_data, XPointer call_data)
-+preedit_done_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
- {
- #ifdef XIM_DEBUG
-     xim_log("preedit_done_cbproc()\n");
-diff -Naur vim72.orig/src/menu.c vim72/src/menu.c
---- vim72.orig/src/menu.c	2008-06-21 12:53:43.000000000 -0700
-+++ vim72/src/menu.c	2009-01-08 20:57:27.000000000 -0800
-@@ -1120,6 +1120,7 @@
- 	parent = menu;
- 	menu = menu->children;
-     }
-+    vim_free(path_name);
- 
-     /* Now we have found the matching menu, and we list the mappings */
- 						    /* Highlight title */
-diff -Naur vim72.orig/src/message.c vim72/src/message.c
---- vim72.orig/src/message.c	2008-07-09 11:24:55.000000000 -0700
-+++ vim72/src/message.c	2009-01-08 20:57:44.000000000 -0800
-@@ -4585,61 +4585,62 @@
- 			if (remove_trailing_zeroes)
- 			{
- 			    int i;
--			    char *p;
-+			    char *tp;
- 
- 			    /* Using %g or %G: remove superfluous zeroes. */
- 			    if (fmt_spec == 'f')
--				p = tmp + str_arg_l - 1;
-+				tp = tmp + str_arg_l - 1;
- 			    else
- 			    {
--				p = (char *)vim_strchr((char_u *)tmp,
-+				tp = (char *)vim_strchr((char_u *)tmp,
- 						 fmt_spec == 'e' ? 'e' : 'E');
--				if (p != NULL)
-+				if (tp != NULL)
- 				{
- 				    /* Remove superfluous '+' and leading
- 				     * zeroes from the exponent. */
--				    if (p[1] == '+')
-+				    if (tp[1] == '+')
- 				    {
- 					/* Change "1.0e+07" to "1.0e07" */
--					STRMOVE(p + 1, p + 2);
-+					STRMOVE(tp + 1, tp + 2);
- 					--str_arg_l;
- 				    }
--				    i = (p[1] == '-') ? 2 : 1;
--				    while (p[i] == '0')
-+				    i = (tp[1] == '-') ? 2 : 1;
-+				    while (tp[i] == '0')
- 				    {
- 					/* Change "1.0e07" to "1.0e7" */
--					STRMOVE(p + i, p + i + 1);
-+					STRMOVE(tp + i, tp + i + 1);
- 					--str_arg_l;
- 				    }
--				    --p;
-+				    --tp;
- 				}
- 			    }
- 
--			    if (p != NULL && !precision_specified)
-+			    if (tp != NULL && !precision_specified)
- 				/* Remove trailing zeroes, but keep the one
- 				 * just after a dot. */
--				while (p > tmp + 2 && *p == '0' && p[-1] != '.')
-+				while (tp > tmp + 2 && *tp == '0'
-+							     && tp[-1] != '.')
- 				{
--				    STRMOVE(p, p + 1);
--				    --p;
-+				    STRMOVE(tp, tp + 1);
-+				    --tp;
- 				    --str_arg_l;
- 				}
- 			}
- 			else
- 			{
--			    char *p;
-+			    char *tp;
- 
- 			    /* Be consistent: some printf("%e") use 1.0e+12
- 			     * and some 1.0e+012.  Remove one zero in the last
- 			     * case. */
--			    p = (char *)vim_strchr((char_u *)tmp,
-+			    tp = (char *)vim_strchr((char_u *)tmp,
- 						 fmt_spec == 'e' ? 'e' : 'E');
--			    if (p != NULL && (p[1] == '+' || p[1] == '-')
--					  && p[2] == '0'
--					  && vim_isdigit(p[3])
--					  && vim_isdigit(p[4]))
-+			    if (tp != NULL && (tp[1] == '+' || tp[1] == '-')
-+					  && tp[2] == '0'
-+					  && vim_isdigit(tp[3])
-+					  && vim_isdigit(tp[4]))
- 			    {
--				STRMOVE(p + 2, p + 3);
-+				STRMOVE(tp + 2, tp + 3);
- 				--str_arg_l;
- 			    }
- 			}
-diff -Naur vim72.orig/src/misc1.c vim72/src/misc1.c
---- vim72.orig/src/misc1.c	2008-07-12 12:20:53.000000000 -0700
-+++ vim72/src/misc1.c	2009-01-08 20:57:32.000000000 -0800
-@@ -3245,9 +3245,9 @@
- 
-     /* When using ":silent" assume that <CR> was entered. */
-     if (mouse_used != NULL)
--	MSG_PUTS(_("Type number or click with mouse (<Enter> cancels): "));
-+	MSG_PUTS(_("Type number and <Enter> or click with mouse (empty cancels): "));
-     else
--	MSG_PUTS(_("Choice number (<Enter> cancels): "));
-+	MSG_PUTS(_("Type number and <Enter> (empty cancels): "));
- 
-     /* Set the state such that text can be selected/copied/pasted and we still
-      * get mouse events. */
-diff -Naur vim72.orig/src/misc2.c vim72/src/misc2.c
---- vim72.orig/src/misc2.c	2008-07-23 12:12:56.000000000 -0700
-+++ vim72/src/misc2.c	2009-01-08 20:57:52.000000000 -0800
-@@ -873,7 +873,7 @@
- 	    /* 3. check for available memory: call mch_avail_mem() */
- 	    if (mch_avail_mem(TRUE) < KEEP_ROOM && !releasing)
- 	    {
--		vim_free((char *)p);	/* System is low... no go! */
-+		free((char *)p);	/* System is low... no go! */
- 		p = NULL;
- 	    }
- 	    else
-@@ -1257,7 +1257,6 @@
-     return escaped_string;
- }
- 
--#if !defined(BACKSLASH_IN_FILENAME) || defined(FEAT_EVAL) || defined(PROTO)
- /*
-  * Return TRUE when 'shell' has "csh" in the tail.
-  */
-@@ -1266,9 +1265,7 @@
- {
-     return (strstr((char *)gettail(p_sh), "csh") != NULL);
- }
--#endif
- 
--#if defined(FEAT_EVAL) || defined(PROTO)
- /*
-  * Escape "string" for use as a shell argument with system().
-  * This uses single quotes, except when we know we need to use double qoutes
-@@ -1391,7 +1388,6 @@
- 
-     return escaped_string;
- }
--#endif
- 
- /*
-  * Like vim_strsave(), but make all characters uppercase.
-@@ -2565,7 +2561,7 @@
-     int		key;
-     int		dlen = 0;
- 
--    key = find_special_key(srcp, &modifiers, keycode);
-+    key = find_special_key(srcp, &modifiers, keycode, FALSE);
-     if (key == 0)
- 	return 0;
- 
-@@ -2601,10 +2597,11 @@
-  * returns 0 if there is no match.
-  */
-     int
--find_special_key(srcp, modp, keycode)
-+find_special_key(srcp, modp, keycode, keep_x_key)
-     char_u	**srcp;
-     int		*modp;
--    int		keycode; /* prefer key code, e.g. K_DEL instead of DEL */
-+    int		keycode;     /* prefer key code, e.g. K_DEL instead of DEL */
-+    int		keep_x_key;  /* don't translate xHome to Home key */
- {
-     char_u	*last_dash;
-     char_u	*end_of_name;
-@@ -2672,7 +2669,8 @@
- 	    else
- 	    {
- 		key = get_special_key_code(last_dash + 1);
--		key = handle_x_keys(key);
-+		if (!keep_x_key)
-+		    key = handle_x_keys(key);
- 	    }
- 
- 	    /*
-diff -Naur vim72.orig/src/move.c vim72/src/move.c
---- vim72.orig/src/move.c	2008-07-12 09:26:47.000000000 -0700
-+++ vim72/src/move.c	2009-01-08 20:57:39.000000000 -0800
-@@ -280,18 +280,20 @@
- 
- 	if (curwin->w_botline <= curbuf->b_ml.ml_line_count)
- 	{
--	    if (curwin->w_cursor.lnum < curwin->w_botline
--		    && ((long)curwin->w_cursor.lnum
-+	    if (curwin->w_cursor.lnum < curwin->w_botline)
-+	    {
-+	      if (((long)curwin->w_cursor.lnum
- 					     >= (long)curwin->w_botline - p_so
- #ifdef FEAT_FOLDING
- 			|| hasAnyFolding(curwin)
- #endif
- 			))
--	    {
-+	      {
- 		lineoff_T	loff;
- 
--		/* Cursor is above botline, check if there are 'scrolloff'
--		 * window lines below the cursor.  If not, need to scroll. */
-+		/* Cursor is (a few lines) above botline, check if there are
-+		 * 'scrolloff' window lines below the cursor.  If not, need to
-+		 * scroll. */
- 		n = curwin->w_empty_rows;
- 		loff.lnum = curwin->w_cursor.lnum;
- #ifdef FEAT_FOLDING
-@@ -317,6 +319,10 @@
- 		if (n >= p_so)
- 		    /* sufficient context, no need to scroll */
- 		    check_botline = FALSE;
-+	      }
-+	      else
-+		  /* sufficient context, no need to scroll */
-+		  check_botline = FALSE;
- 	    }
- 	    if (check_botline)
- 	    {
-@@ -509,6 +515,9 @@
-     /* Approximate the value of w_botline */
-     wp->w_botline += lnum - wp->w_topline;
-     wp->w_topline = lnum;
-+#ifdef FEAT_AUTOCMD
-+    wp->w_topline_was_set = TRUE;
-+#endif
- #ifdef FEAT_DIFF
-     wp->w_topfill = 0;
- #endif
-diff -Naur vim72.orig/src/netbeans.c vim72/src/netbeans.c
---- vim72.orig/src/netbeans.c	2008-07-13 09:19:54.000000000 -0700
-+++ vim72/src/netbeans.c	2009-01-08 20:57:54.000000000 -0800
-@@ -1043,7 +1043,7 @@
- 	nbdebug(("EVT: %s", buf));
- /*	nb_send(buf, "netbeans_end");    avoid "write failed" messages */
- 	if (sd >= 0)
--	    sock_write(sd, buf, (int)STRLEN(buf));  /* ignore errors */
-+	    ignored = sock_write(sd, buf, (int)STRLEN(buf));
-     }
- }
- 
-@@ -2277,9 +2277,6 @@
- 	    int serNum;
- 	    int localTypeNum;
- 	    int typeNum;
--# ifdef NBDEBUG
--	    int len;
--# endif
- 	    pos_T *pos;
- 
- 	    if (buf == NULL || buf->bufp == NULL)
-@@ -2303,13 +2300,10 @@
- 	    pos = get_off_or_lnum(buf->bufp, &args);
- 
- 	    cp = (char *)args;
--# ifdef NBDEBUG
--	    len =
--# endif
--		strtol(cp, &cp, 10);
-+	    ignored = (int)strtol(cp, &cp, 10);
- 	    args = (char_u *)cp;
- # ifdef NBDEBUG
--	    if (len != -1)
-+	    if (ignored != -1)
- 	    {
- 		nbdebug(("    partial line annotation -- Not Yet Implemented!\n"));
- 	    }
-@@ -2924,44 +2918,26 @@
- }
- 
- /*
-- * Tell netbeans a file was closed.
-+ * Tell netbeans that a file was deleted or wiped out.
-  */
-     void
--netbeans_file_closed(buf_T *bufp)
-+netbeans_file_killed(buf_T *bufp)
- {
-     int		bufno = nb_getbufno(bufp);
-     nbbuf_T	*nbbuf = nb_get_buf(bufno);
-     char	buffer[2*MAXPATHL];
- 
--    if (!haveConnection || bufno < 0)
--	return;
--
--    if (!netbeansCloseFile)
--    {
--	nbdebug(("Ignoring file_closed for %s. File was closed from IDE\n",
--		    bufp->b_ffname));
-+    if (!haveConnection || bufno == -1)
- 	return;
--    }
--
--    nbdebug(("netbeans_file_closed:\n"));
--    nbdebug(("    Closing bufno: %d", bufno));
--    if (curbuf != NULL && curbuf != bufp)
--    {
--	nbdebug(("    Curbuf bufno:  %d\n", nb_getbufno(curbuf)));
--    }
--    else if (curbuf == bufp)
--    {
--	nbdebug(("    curbuf == bufp\n"));
--    }
- 
--    if (bufno <= 0)
--	return;
-+    nbdebug(("netbeans_file_killed:\n"));
-+    nbdebug(("    Killing bufno: %d", bufno));
- 
-     sprintf(buffer, "%d:killed=%d\n", bufno, r_cmdno);
- 
-     nbdebug(("EVT: %s", buffer));
- 
--    nb_send(buffer, "netbeans_file_closed");
-+    nb_send(buffer, "netbeans_file_killed");
- 
-     if (nbbuf != NULL)
- 	nbbuf->bufp = NULL;
-diff -Naur vim72.orig/src/normal.c vim72/src/normal.c
---- vim72.orig/src/normal.c	2008-07-31 13:03:08.000000000 -0700
-+++ vim72/src/normal.c	2009-01-08 20:57:40.000000000 -0800
-@@ -183,6 +183,8 @@
- static void	nv_cursorhold __ARGS((cmdarg_T *cap));
- #endif
- 
-+static char *e_noident = N_("E349: No identifier under cursor");
-+
- /*
-  * Function to be called for a Normal or Visual mode command.
-  * The argument is a cmdarg_T.
-@@ -578,6 +580,9 @@
-     static int	old_mapped_len = 0;
- #endif
-     int		idx;
-+#ifdef FEAT_EVAL
-+    int		set_prevcount = FALSE;
-+#endif
- 
-     vim_memset(&ca, 0, sizeof(ca));	/* also resets ca.retval */
-     ca.oap = oap;
-@@ -613,7 +618,12 @@
-     /* When not finishing an operator and no register name typed, reset the
-      * count. */
-     if (!finish_op && !oap->regname)
-+    {
- 	ca.opcount = 0;
-+#ifdef FEAT_EVAL
-+	set_prevcount = TRUE;
-+#endif
-+    }
- 
- #ifdef FEAT_AUTOCMD
-     /* Restore counts from before receiving K_CURSORHOLD.  This means after
-@@ -717,7 +727,15 @@
- 	     * command, so that v:count can be used in an expression mapping
- 	     * right after the count. */
- 	    if (toplevel && stuff_empty())
--		set_vcount(ca.count0, ca.count0 == 0 ? 1 : ca.count0);
-+	    {
-+		long count = ca.count0;
-+
-+		/* multiply with ca.opcount the same way as below */
-+		if (ca.opcount != 0)
-+		    count = ca.opcount * (count == 0 ? 1 : count);
-+		set_vcount(count, count == 0 ? 1 : count, set_prevcount);
-+		set_prevcount = FALSE;  /* only set v:prevcount once */
-+	    }
- #endif
- 	    if (ctrl_w)
- 	    {
-@@ -804,7 +822,7 @@
-      * Only set v:count when called from main() and not a stuffed command.
-      */
-     if (toplevel && stuff_empty())
--	set_vcount(ca.count0, ca.count1);
-+	set_vcount(ca.count0, ca.count1, set_prevcount);
- #endif
- 
-     /*
-@@ -1132,7 +1150,8 @@
- 	out_flush();
- #endif
- #ifdef FEAT_AUTOCMD
--    did_cursorhold = FALSE;
-+    if (ca.cmdchar != K_IGNORE)
-+	did_cursorhold = FALSE;
- #endif
- 
-     State = NORMAL;
-@@ -3509,7 +3528,7 @@
- 	if (find_type & FIND_STRING)
- 	    EMSG(_("E348: No string under cursor"));
- 	else
--	    EMSG(_("E349: No identifier under cursor"));
-+	    EMSG(_(e_noident));
- 	return 0;
-     }
-     ptr += col;
-@@ -5469,6 +5488,20 @@
- 		STRCPY(buf, "he! ");
- 	    else
- 	    {
-+		/* An external command will probably use an argument starting
-+		 * with "-" as an option.  To avoid trouble we skip the "-". */
-+		while (*ptr == '-' && n > 0)
-+		{
-+		    ++ptr;
-+		    --n;
-+		}
-+		if (n == 0)
-+		{
-+		    EMSG(_(e_noident));	 /* found dashes only */
-+		    vim_free(buf);
-+		    return;
-+		}
-+
- 		/* When a count is given, turn it into a range.  Is this
- 		 * really what we want? */
- 		isman = (STRCMP(kp, "man") == 0);
-@@ -5511,37 +5544,59 @@
-     /*
-      * Now grab the chars in the identifier
-      */
--    if (cmdchar == '*')
--	aux_ptr = (char_u *)(p_magic ? "/.*~[^$\\" : "/^$\\");
--    else if (cmdchar == '#')
--	aux_ptr = (char_u *)(p_magic ? "/?.*~[^$\\" : "/?^$\\");
--    else if (cmdchar == 'K' && !kp_help)
--	aux_ptr = (char_u *)" \t\\\"|!";
--    else
--	/* Don't escape spaces and Tabs in a tag with a backslash */
--	aux_ptr = (char_u *)"\\|\"";
--
--    p = buf + STRLEN(buf);
--    while (n-- > 0)
--    {
--	/* put a backslash before \ and some others */
--	if (vim_strchr(aux_ptr, *ptr) != NULL)
--	    *p++ = '\\';
--#ifdef FEAT_MBYTE
--	/* When current byte is a part of multibyte character, copy all bytes
--	 * of that character. */
--	if (has_mbyte)
-+    if (cmdchar == 'K' && !kp_help)
-+    {
-+	/* Escape the argument properly for a shell command */
-+	ptr = vim_strnsave(ptr, n);
-+	p = vim_strsave_shellescape(ptr, TRUE);
-+	vim_free(ptr);
-+	if (p == NULL)
- 	{
--	    int i;
--	    int len = (*mb_ptr2len)(ptr) - 1;
--
--	    for (i = 0; i < len && n >= 1; ++i, --n)
--		*p++ = *ptr++;
-+	    vim_free(buf);
-+	    return;
- 	}
-+	buf = (char_u *)vim_realloc(buf, STRLEN(buf) + STRLEN(p) + 1);
-+	if (buf == NULL)
-+	{
-+	    vim_free(buf);
-+	    vim_free(p);
-+	    return;
-+	}
-+	STRCAT(buf, p);
-+	vim_free(p);
-+    }
-+    else
-+    {
-+	if (cmdchar == '*')
-+	    aux_ptr = (char_u *)(p_magic ? "/.*~[^$\\" : "/^$\\");
-+	else if (cmdchar == '#')
-+	    aux_ptr = (char_u *)(p_magic ? "/?.*~[^$\\" : "/?^$\\");
-+	else
-+	    /* Don't escape spaces and Tabs in a tag with a backslash */
-+	    aux_ptr = (char_u *)"\\|\"\n*?[";
-+
-+	p = buf + STRLEN(buf);
-+	while (n-- > 0)
-+	{
-+	    /* put a backslash before \ and some others */
-+	    if (vim_strchr(aux_ptr, *ptr) != NULL)
-+		*p++ = '\\';
-+#ifdef FEAT_MBYTE
-+	    /* When current byte is a part of multibyte character, copy all
-+	     * bytes of that character. */
-+	    if (has_mbyte)
-+	    {
-+		int i;
-+		int len = (*mb_ptr2len)(ptr) - 1;
-+
-+		for (i = 0; i < len && n >= 1; ++i, --n)
-+		    *p++ = *ptr++;
-+	    }
- #endif
--	*p++ = *ptr++;
-+	    *p++ = *ptr++;
-+	}
-+	*p = NUL;
-     }
--    *p = NUL;
- 
-     /*
-      * Execute the command.
-diff -Naur vim72.orig/src/ops.c vim72/src/ops.c
---- vim72.orig/src/ops.c	2008-06-21 13:08:59.000000000 -0700
-+++ vim72/src/ops.c	2009-01-08 20:57:45.000000000 -0800
-@@ -2209,12 +2209,15 @@
-     {
- 	for (; pos.lnum <= oap->end.lnum; ++pos.lnum)
- 	{
-+	    int one_change;
-+
- 	    block_prep(oap, &bd, pos.lnum, FALSE);
- 	    pos.col = bd.textcol;
--	    did_change = swapchars(oap->op_type, &pos, bd.textlen);
-+	    one_change = swapchars(oap->op_type, &pos, bd.textlen);
-+	    did_change |= one_change;
- 
- # ifdef FEAT_NETBEANS_INTG
--	    if (usingNetbeans && did_change)
-+	    if (usingNetbeans && one_change)
- 	    {
- 		char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE);
- 
-diff -Naur vim72.orig/src/option.c vim72/src/option.c
---- vim72.orig/src/option.c	2008-07-18 06:05:33.000000000 -0700
-+++ vim72/src/option.c	2009-01-08 20:57:52.000000000 -0800
-@@ -2593,13 +2593,13 @@
- #ifdef FEAT_VIMINFO
- 			    (char_u *)&p_viminfo, PV_NONE,
- #if defined(MSDOS) || defined(MSWIN) || defined(OS2)
--			    {(char_u *)"", (char_u *)"'20,<50,s10,h,rA:,rB:"}
-+			    {(char_u *)"", (char_u *)"'100,<50,s10,h,rA:,rB:"}
- #else
- # ifdef AMIGA
- 			    {(char_u *)"",
--				 (char_u *)"'20,<50,s10,h,rdf0:,rdf1:,rdf2:"}
-+				 (char_u *)"'100,<50,s10,h,rdf0:,rdf1:,rdf2:"}
- # else
--			    {(char_u *)"", (char_u *)"'20,<50,s10,h"}
-+			    {(char_u *)"", (char_u *)"'100,<50,s10,h"}
- # endif
- #endif
- #else
-@@ -7974,6 +7974,11 @@
- 	else /* curwin->w_p_scr > curwin->w_height */
- 	    curwin->w_p_scr = curwin->w_height;
-     }
-+    if (p_hi < 0)
-+    {
-+	errmsg = e_positive;
-+	p_hi = 0;
-+    }
-     if (p_report < 0)
-     {
- 	errmsg = e_positive;
-@@ -8227,13 +8232,13 @@
- 	    {
- 		if (number == 0 && string != NULL)
- 		{
--		    int index;
-+		    int idx;
- 
- 		    /* Either we are given a string or we are setting option
- 		     * to zero. */
--		    for (index = 0; string[index] == '0'; ++index)
-+		    for (idx = 0; string[idx] == '0'; ++idx)
- 			;
--		    if (string[index] != NUL || index == 0)
-+		    if (string[idx] != NUL || idx == 0)
- 		    {
- 			/* There's another character after zeros or the string
- 			 * is empty.  In both cases, we are trying to set a
-@@ -8323,7 +8328,7 @@
-     {
- 	--arg;			    /* put arg at the '<' */
- 	modifiers = 0;
--	key = find_special_key(&arg, &modifiers, TRUE);
-+	key = find_special_key(&arg, &modifiers, TRUE, TRUE);
- 	if (modifiers)		    /* can't handle modifiers here */
- 	    key = 0;
-     }
-diff -Naur vim72.orig/src/os_unix.c vim72/src/os_unix.c
---- vim72.orig/src/os_unix.c	2008-08-06 04:01:40.000000000 -0700
-+++ vim72/src/os_unix.c	2009-01-08 20:57:44.000000000 -0800
-@@ -315,12 +315,15 @@
-     {-1,	    "Unknown!", FALSE}
- };
- 
-+/*
-+ * Write s[len] to the screen.
-+ */
-     void
- mch_write(s, len)
-     char_u	*s;
-     int		len;
- {
--    write(1, (char *)s, len);
-+    ignored = (int)write(1, (char *)s, len);
-     if (p_wd)		/* Unix is too fast, slow down a bit more */
- 	RealWaitForChar(read_cmd_fd, p_wd, NULL);
- }
-@@ -2905,7 +2908,7 @@
-      * Ignore any errors.
-      */
- #if defined(HAVE_SIGALTSTACK) || defined(HAVE_SIGSTACK)
--    signal_stack = malloc(SIGSTKSZ);
-+    signal_stack = (char *)alloc(SIGSTKSZ);
-     init_signal_stack();
- #endif
- }
-@@ -2936,7 +2939,8 @@
-     }
- #  endif
- # endif
--# ifdef FEAT_X11
-+    /* Don't close the display for GTK 1, it is done in exit(). */
-+# if defined(FEAT_X11) && (!defined(FEAT_GUI_GTK) || defined(HAVE_GTK2))
-     if (x11_display != NULL
- #  ifdef FEAT_XCLIPBOARD
- 	    && x11_display != xterm_dpy
-@@ -3926,9 +3930,9 @@
- 		 */
- 		if (fd >= 0)
- 		{
--		    dup(fd); /* To replace stdin  (file descriptor 0) */
--		    dup(fd); /* To replace stdout (file descriptor 1) */
--		    dup(fd); /* To replace stderr (file descriptor 2) */
-+		    ignored = dup(fd); /* To replace stdin  (fd 0) */
-+		    ignored = dup(fd); /* To replace stdout (fd 1) */
-+		    ignored = dup(fd); /* To replace stderr (fd 2) */
- 
- 		    /* Don't need this now that we've duplicated it */
- 		    close(fd);
-@@ -3996,13 +4000,13 @@
- 
- 		    /* set up stdin/stdout/stderr for the child */
- 		    close(0);
--		    dup(pty_slave_fd);
-+		    ignored = dup(pty_slave_fd);
- 		    close(1);
--		    dup(pty_slave_fd);
-+		    ignored = dup(pty_slave_fd);
- 		    if (gui.in_use)
- 		    {
- 			close(2);
--			dup(pty_slave_fd);
-+			ignored = dup(pty_slave_fd);
- 		    }
- 
- 		    close(pty_slave_fd);    /* has been dupped, close it now */
-@@ -4013,13 +4017,13 @@
- 		    /* set up stdin for the child */
- 		    close(fd_toshell[1]);
- 		    close(0);
--		    dup(fd_toshell[0]);
-+		    ignored = dup(fd_toshell[0]);
- 		    close(fd_toshell[0]);
- 
- 		    /* set up stdout for the child */
- 		    close(fd_fromshell[0]);
- 		    close(1);
--		    dup(fd_fromshell[1]);
-+		    ignored = dup(fd_fromshell[1]);
- 		    close(fd_fromshell[1]);
- 
- # ifdef FEAT_GUI
-@@ -4027,7 +4031,7 @@
- 		    {
- 			/* set up stderr for the child */
- 			close(2);
--			dup(1);
-+			ignored = dup(1);
- 		    }
- # endif
- 		}
-@@ -4158,7 +4162,8 @@
- 					    && (lnum !=
- 						    curbuf->b_ml.ml_line_count
- 						    || curbuf->b_p_eol)))
--				    write(toshell_fd, "\n", (size_t)1);
-+				    ignored = write(toshell_fd, "\n",
-+								   (size_t)1);
- 				++lnum;
- 				if (lnum > curbuf->b_op_end.lnum)
- 				{
-@@ -6814,7 +6819,8 @@
-     if (xsmp_icefd != -1)
-     {
- 	SmcCloseConnection(xsmp.smcconn, 0, NULL);
--	vim_free(xsmp.clientid);
-+	if (xsmp.clientid != NULL)
-+	    free(xsmp.clientid);
- 	xsmp.clientid = NULL;
- 	xsmp_icefd = -1;
-     }
-diff -Naur vim72.orig/src/proto/eval.pro vim72/src/proto/eval.pro
---- vim72.orig/src/proto/eval.pro	2008-08-09 07:31:25.000000000 -0700
-+++ vim72/src/proto/eval.pro	2009-01-08 20:57:40.000000000 -0800
-@@ -17,7 +17,7 @@
- int eval_to_bool __ARGS((char_u *arg, int *error, char_u **nextcmd, int skip));
- char_u *eval_to_string_skip __ARGS((char_u *arg, char_u **nextcmd, int skip));
- int skip_expr __ARGS((char_u **pp));
--char_u *eval_to_string __ARGS((char_u *arg, char_u **nextcmd, int dolist));
-+char_u *eval_to_string __ARGS((char_u *arg, char_u **nextcmd, int convert));
- char_u *eval_to_string_safe __ARGS((char_u *arg, char_u **nextcmd, int use_sandbox));
- int eval_to_number __ARGS((char_u *expr));
- list_T *eval_spell_expr __ARGS((char_u *badword, char_u *expr));
-@@ -46,7 +46,9 @@
- void list_unref __ARGS((list_T *l));
- void list_free __ARGS((list_T *l, int recurse));
- dictitem_T *dict_lookup __ARGS((hashitem_T *hi));
-+char_u *list_find_str __ARGS((list_T *l, long idx));
- int list_append_dict __ARGS((list_T *list, dict_T *dict));
-+int list_append_string __ARGS((list_T *l, char_u *str, int len));
- int garbage_collect __ARGS((void));
- dict_T *dict_alloc __ARGS((void));
- int dict_add_nr_str __ARGS((dict_T *d, char *key, long nr, char_u *str));
-@@ -58,8 +60,10 @@
- void set_vim_var_nr __ARGS((int idx, long val));
- long get_vim_var_nr __ARGS((int idx));
- char_u *get_vim_var_str __ARGS((int idx));
--void set_vcount __ARGS((long count, long count1));
-+list_T *get_vim_var_list __ARGS((int idx));
-+void set_vcount __ARGS((long count, long count1, int set_prevcount));
- void set_vim_var_string __ARGS((int idx, char_u *val, int len));
-+void set_vim_var_list __ARGS((int idx, list_T *val));
- void set_reg_var __ARGS((int c));
- char_u *v_exception __ARGS((char_u *oldval));
- char_u *v_throwpoint __ARGS((char_u *oldval));
-@@ -94,6 +98,7 @@
- void write_viminfo_varlist __ARGS((FILE *fp));
- int store_session_globals __ARGS((FILE *fd));
- void last_set_msg __ARGS((scid_T scriptID));
-+void ex_oldfiles __ARGS((exarg_T *eap));
- int modify_fname __ARGS((char_u *src, int *usedlen, char_u **fnamep, char_u **bufp, int *fnamelen));
- char_u *do_string_sub __ARGS((char_u *str, char_u *pat, char_u *sub, char_u *flags));
- /* vim: set ft=c : */
-diff -Naur vim72.orig/src/proto/ex_cmds.pro vim72/src/proto/ex_cmds.pro
---- vim72.orig/src/proto/ex_cmds.pro	2008-08-09 07:31:25.000000000 -0700
-+++ vim72/src/proto/ex_cmds.pro	2009-01-08 20:57:32.000000000 -0800
-@@ -11,7 +11,7 @@
- char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp));
- void append_redir __ARGS((char_u *buf, char_u *opt, char_u *fname));
- int viminfo_error __ARGS((char *errnum, char *message, char_u *line));
--int read_viminfo __ARGS((char_u *file, int want_info, int want_marks, int forceit));
-+int read_viminfo __ARGS((char_u *file, int flags));
- void write_viminfo __ARGS((char_u *file, int forceit));
- int viminfo_readline __ARGS((vir_T *virp));
- char_u *viminfo_readstring __ARGS((vir_T *virp, int off, int convert));
-diff -Naur vim72.orig/src/proto/ex_getln.pro vim72/src/proto/ex_getln.pro
---- vim72.orig/src/proto/ex_getln.pro	2008-08-09 07:31:28.000000000 -0700
-+++ vim72/src/proto/ex_getln.pro	2009-01-08 20:57:43.000000000 -0800
-@@ -31,7 +31,7 @@
- void set_cmd_context __ARGS((expand_T *xp, char_u *str, int len, int col));
- int expand_cmdline __ARGS((expand_T *xp, char_u *str, int col, int *matchcount, char_u ***matches));
- int ExpandGeneric __ARGS((expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file, char_u *((*func)(expand_T *, int))));
--char_u *globpath __ARGS((char_u *path, char_u *file));
-+char_u *globpath __ARGS((char_u *path, char_u *file, int expand_options));
- void init_history __ARGS((void));
- int get_histtype __ARGS((char_u *name));
- void add_to_history __ARGS((int histype, char_u *new_entry, int in_map, int sep));
-diff -Naur vim72.orig/src/proto/mark.pro vim72/src/proto/mark.pro
---- vim72.orig/src/proto/mark.pro	2008-08-09 07:31:36.000000000 -0700
-+++ vim72/src/proto/mark.pro	2009-01-08 20:57:32.000000000 -0800
-@@ -26,5 +26,5 @@
- void write_viminfo_filemarks __ARGS((FILE *fp));
- int removable __ARGS((char_u *name));
- int write_viminfo_marks __ARGS((FILE *fp_out));
--void copy_viminfo_marks __ARGS((vir_T *virp, FILE *fp_out, int count, int eof));
-+void copy_viminfo_marks __ARGS((vir_T *virp, FILE *fp_out, int count, int eof, int flags));
- /* vim: set ft=c : */
-diff -Naur vim72.orig/src/proto/misc2.pro vim72/src/proto/misc2.pro
---- vim72.orig/src/proto/misc2.pro	2008-08-09 07:31:40.000000000 -0700
-+++ vim72/src/proto/misc2.pro	2009-01-08 20:57:52.000000000 -0800
-@@ -59,7 +59,7 @@
- int handle_x_keys __ARGS((int key));
- char_u *get_special_key_name __ARGS((int c, int modifiers));
- int trans_special __ARGS((char_u **srcp, char_u *dst, int keycode));
--int find_special_key __ARGS((char_u **srcp, int *modp, int keycode));
-+int find_special_key __ARGS((char_u **srcp, int *modp, int keycode, int keep_x_key));
- int extract_modifiers __ARGS((int key, int *modp));
- int find_special_key_in_table __ARGS((int c));
- int get_special_key_code __ARGS((char_u *name));
-diff -Naur vim72.orig/src/proto/netbeans.pro vim72/src/proto/netbeans.pro
---- vim72.orig/src/proto/netbeans.pro	2008-08-09 07:31:56.000000000 -0700
-+++ vim72/src/proto/netbeans.pro	2009-01-08 20:57:54.000000000 -0800
-@@ -11,7 +11,7 @@
- void netbeans_frame_moved __ARGS((int new_x, int new_y));
- void netbeans_file_activated __ARGS((buf_T *bufp));
- void netbeans_file_opened __ARGS((buf_T *bufp));
--void netbeans_file_closed __ARGS((buf_T *bufp));
-+void netbeans_file_killed __ARGS((buf_T *bufp));
- void netbeans_inserted __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, char_u *txt, int newlen));
- void netbeans_removed __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, long len));
- void netbeans_unmodified __ARGS((buf_T *bufp));
-diff -Naur vim72.orig/src/pty.c vim72/src/pty.c
---- vim72.orig/src/pty.c	2008-06-21 11:52:58.000000000 -0700
-+++ vim72/src/pty.c	2009-01-08 20:57:27.000000000 -0800
-@@ -270,9 +270,10 @@
- }
- #endif
- 
--#if defined(HAVE_SVR4_PTYS) && !defined(PTY_DONE) && !defined(hpux)
-+#if defined(HAVE_SVR4_PTYS) && !defined(PTY_DONE) && !defined(hpux) && !defined(MACOS_X)
- 
--/* NOTE: Even though HPUX can have /dev/ptmx, the code below doesn't work! */
-+/* NOTE: Even though HPUX can have /dev/ptmx, the code below doesn't work!
-+ * Same for Mac OS X Leopard. */
- #define PTY_DONE
-     int
- OpenPTY(ttyn)
-diff -Naur vim72.orig/src/screen.c vim72/src/screen.c
---- vim72.orig/src/screen.c	2008-07-24 07:45:07.000000000 -0700
-+++ vim72/src/screen.c	2009-01-08 20:57:31.000000000 -0800
-@@ -2439,9 +2439,17 @@
- 
- #ifdef FEAT_SYN_HL
-     /* Show 'cursorcolumn' in the fold line. */
--    if (wp->w_p_cuc && (int)wp->w_virtcol + txtcol < W_WIDTH(wp))
--	ScreenAttrs[off + wp->w_virtcol + txtcol] = hl_combine_attr(
--		 ScreenAttrs[off + wp->w_virtcol + txtcol], hl_attr(HLF_CUC));
-+    if (wp->w_p_cuc)
-+    {
-+	txtcol += wp->w_virtcol;
-+	if (wp->w_p_wrap)
-+	    txtcol -= wp->w_skipcol;
-+	else
-+	    txtcol -= wp->w_leftcol;
-+	if (txtcol >= 0 && txtcol < W_WIDTH(wp))
-+	    ScreenAttrs[off + txtcol] = hl_combine_attr(
-+				 ScreenAttrs[off + txtcol], hl_attr(HLF_CUC));
-+    }
- #endif
- 
-     SCREEN_LINE(row + W_WINROW(wp), W_WINCOL(wp), (int)W_WIDTH(wp),
-diff -Naur vim72.orig/src/spell.c vim72/src/spell.c
---- vim72.orig/src/spell.c	2008-07-12 12:20:55.000000000 -0700
-+++ vim72/src/spell.c	2009-01-08 20:57:46.000000000 -0800
-@@ -77,7 +77,7 @@
- 
- /*
-  * Do the opposite: based on a maximum end score and a known sound score,
-- * compute the the maximum word score that can be used.
-+ * compute the maximum word score that can be used.
-  */
- #define MAXSCORE(word_score, sound_score) ((4 * word_score - sound_score) / 3)
- 
-@@ -469,6 +469,7 @@
-     garray_T	sl_comppat;	/* CHECKCOMPOUNDPATTERN items */
-     regprog_T	*sl_compprog;	/* COMPOUNDRULE turned into a regexp progrm
- 				 * (NULL when no compounding) */
-+    char_u	*sl_comprules;	/* all COMPOUNDRULE concatenated (or NULL) */
-     char_u	*sl_compstartflags; /* flags for first compound word */
-     char_u	*sl_compallflags; /* all flags for compound words */
-     char_u	sl_nobreak;	/* When TRUE: no spaces between words */
-@@ -625,7 +626,7 @@
- /* TRUE if a word appears in the list of banned words.  */
- #define WAS_BANNED(su, word) (!HASHITEM_EMPTY(hash_find(&su->su_banned, word)))
- 
--/* Number of suggestions kept when cleaning up.  we need to keep more than
-+/* Number of suggestions kept when cleaning up.  We need to keep more than
-  * what is displayed, because when rescore_suggestions() is called the score
-  * may change and wrong suggestions may be removed later. */
- #define SUG_CLEAN_COUNT(su)    ((su)->su_maxcount < 130 ? 150 : (su)->su_maxcount + 20)
-@@ -839,7 +840,10 @@
- static void slang_clear __ARGS((slang_T *lp));
- static void slang_clear_sug __ARGS((slang_T *lp));
- static void find_word __ARGS((matchinf_T *mip, int mode));
-+static int match_checkcompoundpattern __ARGS((char_u *ptr, int wlen, garray_T *gap));
- static int can_compound __ARGS((slang_T *slang, char_u *word, char_u *flags));
-+static int can_be_compound __ARGS((trystate_T *sp, slang_T *slang, char_u *compflags, int flag));
-+static int match_compoundrule __ARGS((slang_T *slang, char_u *compflags));
- static int valid_word_prefix __ARGS((int totprefcnt, int arridx, int flags, char_u *word, slang_T *slang, int cond_req));
- static void find_prefix __ARGS((matchinf_T *mip, int mode));
- static int fold_more __ARGS((matchinf_T *mip));
-@@ -1519,6 +1523,11 @@
- 					    ((unsigned)flags >> 24)))
- 		    continue;
- 
-+		/* If there is a match with a CHECKCOMPOUNDPATTERN rule
-+		 * discard the compound word. */
-+		if (match_checkcompoundpattern(ptr, wlen, &slang->sl_comppat))
-+		    continue;
-+
- 		if (mode == FIND_COMPOUND)
- 		{
- 		    int	    capflags;
-@@ -1577,6 +1586,11 @@
- 		    if (!can_compound(slang, fword, mip->mi_compflags))
- 			continue;
- 		}
-+		else if (slang->sl_comprules != NULL
-+			     && !match_compoundrule(slang, mip->mi_compflags))
-+		    /* The compound flags collected so far do not match any
-+		     * COMPOUNDRULE, discard the compounded word. */
-+		    continue;
- 	    }
- 
- 	    /* Check NEEDCOMPOUND: can't use word without compounding. */
-@@ -1727,6 +1741,39 @@
- }
- 
- /*
-+ * Return TRUE if there is a match between the word ptr[wlen] and
-+ * CHECKCOMPOUNDPATTERN rules, assuming that we will concatenate with another
-+ * word.
-+ * A match means that the first part of CHECKCOMPOUNDPATTERN matches at the
-+ * end of ptr[wlen] and the second part matches after it.
-+ */
-+    static int
-+match_checkcompoundpattern(ptr, wlen, gap)
-+    char_u	*ptr;
-+    int		wlen;
-+    garray_T	*gap;  /* &sl_comppat */
-+{
-+    int		i;
-+    char_u	*p;
-+    int		len;
-+
-+    for (i = 0; i + 1 < gap->ga_len; i += 2)
-+    {
-+	p = ((char_u **)gap->ga_data)[i + 1];
-+	if (STRNCMP(ptr + wlen, p, STRLEN(p)) == 0)
-+	{
-+	    /* Second part matches at start of following compound word, now
-+	     * check if first part matches at end of previous word. */
-+	    p = ((char_u **)gap->ga_data)[i];
-+	    len = (int)STRLEN(p);
-+	    if (len <= wlen && STRNCMP(ptr + wlen - len, p, len) == 0)
-+		return TRUE;
-+	}
-+    }
-+    return FALSE;
-+}
-+
-+/*
-  * Return TRUE if "flags" is a valid sequence of compound flags and "word"
-  * does not have too many syllables.
-  */
-@@ -1773,6 +1820,98 @@
- }
- 
- /*
-+ * Return TRUE when the sequence of flags in "compflags" plus "flag" can
-+ * possibly form a valid compounded word.  This also checks the COMPOUNDRULE
-+ * lines if they don't contain wildcards.
-+ */
-+    static int
-+can_be_compound(sp, slang, compflags, flag)
-+    trystate_T	*sp;
-+    slang_T	*slang;
-+    char_u	*compflags;
-+    int		flag;
-+{
-+    /* If the flag doesn't appear in sl_compstartflags or sl_compallflags
-+     * then it can't possibly compound. */
-+    if (!byte_in_str(sp->ts_complen == sp->ts_compsplit
-+		? slang->sl_compstartflags : slang->sl_compallflags, flag))
-+	return FALSE;
-+
-+    /* If there are no wildcards, we can check if the flags collected so far
-+     * possibly can form a match with COMPOUNDRULE patterns.  This only
-+     * makes sense when we have two or more words. */
-+    if (slang->sl_comprules != NULL && sp->ts_complen > sp->ts_compsplit)
-+    {
-+	int v;
-+
-+	compflags[sp->ts_complen] = flag;
-+	compflags[sp->ts_complen + 1] = NUL;
-+	v = match_compoundrule(slang, compflags + sp->ts_compsplit);
-+	compflags[sp->ts_complen] = NUL;
-+	return v;
-+    }
-+
-+    return TRUE;
-+}
-+
-+
-+/*
-+ * Return TRUE if the compound flags in compflags[] match the start of any
-+ * compound rule.  This is used to stop trying a compound if the flags
-+ * collected so far can't possibly match any compound rule.
-+ * Caller must check that slang->sl_comprules is not NULL.
-+ */
-+    static int
-+match_compoundrule(slang, compflags)
-+    slang_T	*slang;
-+    char_u	*compflags;
-+{
-+    char_u	*p;
-+    int		i;
-+    int		c;
-+
-+    /* loop over all the COMPOUNDRULE entries */
-+    for (p = slang->sl_comprules; *p != NUL; ++p)
-+    {
-+	/* loop over the flags in the compound word we have made, match
-+	 * them against the current rule entry */
-+	for (i = 0; ; ++i)
-+	{
-+	    c = compflags[i];
-+	    if (c == NUL)
-+		/* found a rule that matches for the flags we have so far */
-+		return TRUE;
-+	    if (*p == '/' || *p == NUL)
-+		break;  /* end of rule, it's too short */
-+	    if (*p == '[')
-+	    {
-+		int match = FALSE;
-+
-+		/* compare against all the flags in [] */
-+		++p;
-+		while (*p != ']' && *p != NUL)
-+		    if (*p++ == c)
-+			match = TRUE;
-+		if (!match)
-+		    break;  /* none matches */
-+	    }
-+	    else if (*p != c)
-+		break;  /* flag of word doesn't match flag in pattern */
-+	    ++p;
-+	}
-+
-+	/* Skip to the next "/", where the next pattern starts. */
-+	p = vim_strchr(p, '/');
-+	if (p == NULL)
-+	    break;
-+    }
-+
-+    /* Checked all the rules and none of them match the flags, so there
-+     * can't possibly be a compound starting with these flags. */
-+    return FALSE;
-+}
-+
-+/*
-  * Return non-zero if the prefix indicated by "arridx" matches with the prefix
-  * ID in "flags" for the word "word".
-  * The WF_RAREPFX flag is included in the return value for a rare prefix.
-@@ -2513,9 +2652,11 @@
-     lp->sl_midword = NULL;
- 
-     vim_free(lp->sl_compprog);
-+    vim_free(lp->sl_comprules);
-     vim_free(lp->sl_compstartflags);
-     vim_free(lp->sl_compallflags);
-     lp->sl_compprog = NULL;
-+    lp->sl_comprules = NULL;
-     lp->sl_compstartflags = NULL;
-     lp->sl_compallflags = NULL;
- 
-@@ -3460,6 +3601,7 @@
-     char_u	*pp;
-     char_u	*cp;
-     char_u	*ap;
-+    char_u	*crp;
-     int		cnt;
-     garray_T	*gap;
- 
-@@ -3545,6 +3687,12 @@
-     slang->sl_compallflags = ap;
-     *ap = NUL;
- 
-+    /* And a list of all patterns in their original form, for checking whether
-+     * compounding may work in match_compoundrule().  This is freed when we
-+     * encounter a wildcard, the check doesn't work then. */
-+    crp = alloc(todo + 1);
-+    slang->sl_comprules = crp;
-+
-     pp = pat;
-     *pp++ = '^';
-     *pp++ = '\\';
-@@ -3587,6 +3735,20 @@
- 		    atstart = 0;
- 	    }
- 	}
-+
-+	/* Copy flag to "sl_comprules", unless we run into a wildcard. */
-+	if (crp != NULL)
-+	{
-+	    if (c == '+' || c == '*')
-+	    {
-+		vim_free(slang->sl_comprules);
-+		slang->sl_comprules = NULL;
-+		crp = NULL;
-+	    }
-+	    else
-+		*crp++ = c;
-+	}
-+
- 	if (c == '/')	    /* slash separates two items */
- 	{
- 	    *pp++ = '\\';
-@@ -3611,6 +3773,9 @@
-     *pp++ = '$';
-     *pp = NUL;
- 
-+    if (crp != NULL)
-+	*crp = NUL;
-+
-     slang->sl_compprog = vim_regcomp(pat, RE_MAGIC + RE_STRING + RE_STRICT);
-     vim_free(pat);
-     if (slang->sl_compprog == NULL)
-@@ -4915,6 +5080,7 @@
- } spellinfo_T;
- 
- static afffile_T *spell_read_aff __ARGS((spellinfo_T *spin, char_u *fname));
-+static int is_aff_rule __ARGS((char_u **items, int itemcnt, char *rulename, int	 mincount));
- static void aff_process_flags __ARGS((afffile_T *affile, affentry_T *entry));
- static int spell_info_item __ARGS((char_u *s));
- static unsigned affitem2flag __ARGS((int flagtype, char_u *item, char_u	*fname, int lnum));
-@@ -4950,7 +5116,7 @@
- static void put_sugtime __ARGS((spellinfo_T *spin, FILE *fd));
- static int write_vim_spell __ARGS((spellinfo_T *spin, char_u *fname));
- static void clear_node __ARGS((wordnode_T *node));
--static int put_node __ARGS((FILE *fd, wordnode_T *node, int index, int regionmask, int prefixtree));
-+static int put_node __ARGS((FILE *fd, wordnode_T *node, int idx, int regionmask, int prefixtree));
- static void spell_make_sugfile __ARGS((spellinfo_T *spin, char_u *wfname));
- static int sug_filltree __ARGS((spellinfo_T *spin, slang_T *slang));
- static int sug_maketable __ARGS((spellinfo_T *spin));
-@@ -5223,8 +5389,7 @@
- 	/* Handle non-empty lines. */
- 	if (itemcnt > 0)
- 	{
--	    if (STRCMP(items[0], "SET") == 0 && itemcnt == 2
--						       && aff->af_enc == NULL)
-+	    if (is_aff_rule(items, itemcnt, "SET", 2) && aff->af_enc == NULL)
- 	    {
- #ifdef FEAT_MBYTE
- 		/* Setup for conversion from "ENC" to 'encoding'. */
-@@ -5239,7 +5404,7 @@
- 		    smsg((char_u *)_("Conversion in %s not supported"), fname);
- #endif
- 	    }
--	    else if (STRCMP(items[0], "FLAG") == 0 && itemcnt == 2
-+	    else if (is_aff_rule(items, itemcnt, "FLAG", 2)
- 					      && aff->af_flagtype == AFT_CHAR)
- 	    {
- 		if (STRCMP(items[1], "long") == 0)
-@@ -5284,69 +5449,71 @@
- 			spin->si_info = p;
- 		    }
- 	    }
--	    else if (STRCMP(items[0], "MIDWORD") == 0 && itemcnt == 2
-+	    else if (is_aff_rule(items, itemcnt, "MIDWORD", 2)
- 							   && midword == NULL)
- 	    {
- 		midword = getroom_save(spin, items[1]);
- 	    }
--	    else if (STRCMP(items[0], "TRY") == 0 && itemcnt == 2)
-+	    else if (is_aff_rule(items, itemcnt, "TRY", 2))
- 	    {
- 		/* ignored, we look in the tree for what chars may appear */
- 	    }
- 	    /* TODO: remove "RAR" later */
--	    else if ((STRCMP(items[0], "RAR") == 0
--			|| STRCMP(items[0], "RARE") == 0) && itemcnt == 2
--						       && aff->af_rare == 0)
-+	    else if ((is_aff_rule(items, itemcnt, "RAR", 2)
-+			|| is_aff_rule(items, itemcnt, "RARE", 2))
-+							 && aff->af_rare == 0)
- 	    {
- 		aff->af_rare = affitem2flag(aff->af_flagtype, items[1],
- 								 fname, lnum);
- 	    }
- 	    /* TODO: remove "KEP" later */
--	    else if ((STRCMP(items[0], "KEP") == 0
--		    || STRCMP(items[0], "KEEPCASE") == 0) && itemcnt == 2
-+	    else if ((is_aff_rule(items, itemcnt, "KEP", 2)
-+			|| is_aff_rule(items, itemcnt, "KEEPCASE", 2))
- 						     && aff->af_keepcase == 0)
- 	    {
- 		aff->af_keepcase = affitem2flag(aff->af_flagtype, items[1],
- 								 fname, lnum);
- 	    }
--	    else if (STRCMP(items[0], "BAD") == 0 && itemcnt == 2
--						       && aff->af_bad == 0)
-+	    else if ((is_aff_rule(items, itemcnt, "BAD", 2)
-+			|| is_aff_rule(items, itemcnt, "FORBIDDENWORD", 2))
-+							  && aff->af_bad == 0)
- 	    {
- 		aff->af_bad = affitem2flag(aff->af_flagtype, items[1],
- 								 fname, lnum);
- 	    }
--	    else if (STRCMP(items[0], "NEEDAFFIX") == 0 && itemcnt == 2
-+	    else if (is_aff_rule(items, itemcnt, "NEEDAFFIX", 2)
- 						    && aff->af_needaffix == 0)
- 	    {
- 		aff->af_needaffix = affitem2flag(aff->af_flagtype, items[1],
- 								 fname, lnum);
- 	    }
--	    else if (STRCMP(items[0], "CIRCUMFIX") == 0 && itemcnt == 2
-+	    else if (is_aff_rule(items, itemcnt, "CIRCUMFIX", 2)
- 						    && aff->af_circumfix == 0)
- 	    {
- 		aff->af_circumfix = affitem2flag(aff->af_flagtype, items[1],
- 								 fname, lnum);
- 	    }
--	    else if (STRCMP(items[0], "NOSUGGEST") == 0 && itemcnt == 2
-+	    else if (is_aff_rule(items, itemcnt, "NOSUGGEST", 2)
- 						    && aff->af_nosuggest == 0)
- 	    {
- 		aff->af_nosuggest = affitem2flag(aff->af_flagtype, items[1],
- 								 fname, lnum);
- 	    }
--	    else if (STRCMP(items[0], "NEEDCOMPOUND") == 0 && itemcnt == 2
-+	    else if ((is_aff_rule(items, itemcnt, "NEEDCOMPOUND", 2)
-+			|| is_aff_rule(items, itemcnt, "ONLYINCOMPOUND", 2))
- 						     && aff->af_needcomp == 0)
- 	    {
- 		aff->af_needcomp = affitem2flag(aff->af_flagtype, items[1],
- 								 fname, lnum);
- 	    }
--	    else if (STRCMP(items[0], "COMPOUNDROOT") == 0 && itemcnt == 2
-+	    else if (is_aff_rule(items, itemcnt, "COMPOUNDROOT", 2)
- 						     && aff->af_comproot == 0)
- 	    {
- 		aff->af_comproot = affitem2flag(aff->af_flagtype, items[1],
- 								 fname, lnum);
- 	    }
--	    else if (STRCMP(items[0], "COMPOUNDFORBIDFLAG") == 0
--				   && itemcnt == 2 && aff->af_compforbid == 0)
-+	    else if (is_aff_rule(items, itemcnt, "COMPOUNDFORBIDFLAG", 2)
-+						   && aff->af_compforbid == 0)
- 	    {
- 		aff->af_compforbid = affitem2flag(aff->af_flagtype, items[1],
- 								 fname, lnum);
-@@ -5354,8 +5521,8 @@
- 		    smsg((char_u *)_("Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line %d"),
- 			    fname, lnum);
- 	    }
--	    else if (STRCMP(items[0], "COMPOUNDPERMITFLAG") == 0
--				   && itemcnt == 2 && aff->af_comppermit == 0)
-+	    else if (is_aff_rule(items, itemcnt, "COMPOUNDPERMITFLAG", 2)
-+						   && aff->af_comppermit == 0)
- 	    {
- 		aff->af_comppermit = affitem2flag(aff->af_flagtype, items[1],
- 								 fname, lnum);
-@@ -5363,7 +5530,7 @@
- 		    smsg((char_u *)_("Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line %d"),
- 			    fname, lnum);
- 	    }
--	    else if (STRCMP(items[0], "COMPOUNDFLAG") == 0 && itemcnt == 2
-+	    else if (is_aff_rule(items, itemcnt, "COMPOUNDFLAG", 2)
- 							 && compflags == NULL)
- 	    {
- 		/* Turn flag "c" into COMPOUNDRULE compatible string "c+",
-@@ -5376,7 +5543,15 @@
- 		    compflags = p;
- 		}
- 	    }
--	    else if (STRCMP(items[0], "COMPOUNDRULE") == 0 && itemcnt == 2)
-+	    else if (is_aff_rule(items, itemcnt, "COMPOUNDRULES", 2))
-+	    {
-+		/* We don't use the count, but do check that it's a number and
-+		 * not COMPOUNDRULE mistyped. */
-+		if (atoi((char *)items[1]) == 0)
-+		    smsg((char_u *)_("Wrong COMPOUNDRULES value in %s line %d: %s"),
-+						       fname, lnum, items[1]);
-+	    }
-+	    else if (is_aff_rule(items, itemcnt, "COMPOUNDRULE", 2))
- 	    {
- 		/* Concatenate this string to previously defined ones, using a
- 		 * slash to separate them. */
-@@ -5395,7 +5570,7 @@
- 		    compflags = p;
- 		}
- 	    }
--	    else if (STRCMP(items[0], "COMPOUNDWORDMAX") == 0 && itemcnt == 2
-+	    else if (is_aff_rule(items, itemcnt, "COMPOUNDWORDMAX", 2)
- 							      && compmax == 0)
- 	    {
- 		compmax = atoi((char *)items[1]);
-@@ -5403,7 +5578,7 @@
- 		    smsg((char_u *)_("Wrong COMPOUNDWORDMAX value in %s line %d: %s"),
- 						       fname, lnum, items[1]);
- 	    }
--	    else if (STRCMP(items[0], "COMPOUNDMIN") == 0 && itemcnt == 2
-+	    else if (is_aff_rule(items, itemcnt, "COMPOUNDMIN", 2)
- 							   && compminlen == 0)
- 	    {
- 		compminlen = atoi((char *)items[1]);
-@@ -5411,7 +5586,7 @@
- 		    smsg((char_u *)_("Wrong COMPOUNDMIN value in %s line %d: %s"),
- 						       fname, lnum, items[1]);
- 	    }
--	    else if (STRCMP(items[0], "COMPOUNDSYLMAX") == 0 && itemcnt == 2
-+	    else if (is_aff_rule(items, itemcnt, "COMPOUNDSYLMAX", 2)
- 							   && compsylmax == 0)
- 	    {
- 		compsylmax = atoi((char *)items[1]);
-@@ -5419,32 +5594,29 @@
- 		    smsg((char_u *)_("Wrong COMPOUNDSYLMAX value in %s line %d: %s"),
- 						       fname, lnum, items[1]);
- 	    }
--	    else if (STRCMP(items[0], "CHECKCOMPOUNDDUP") == 0 && itemcnt == 1)
-+	    else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDDUP", 1))
- 	    {
- 		compoptions |= COMP_CHECKDUP;
- 	    }
--	    else if (STRCMP(items[0], "CHECKCOMPOUNDREP") == 0 && itemcnt == 1)
-+	    else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDREP", 1))
- 	    {
- 		compoptions |= COMP_CHECKREP;
- 	    }
--	    else if (STRCMP(items[0], "CHECKCOMPOUNDCASE") == 0 && itemcnt == 1)
-+	    else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDCASE", 1))
- 	    {
- 		compoptions |= COMP_CHECKCASE;
- 	    }
--	    else if (STRCMP(items[0], "CHECKCOMPOUNDTRIPLE") == 0
--							      && itemcnt == 1)
-+	    else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDTRIPLE", 1))
- 	    {
- 		compoptions |= COMP_CHECKTRIPLE;
- 	    }
--	    else if (STRCMP(items[0], "CHECKCOMPOUNDPATTERN") == 0
--							      && itemcnt == 2)
-+	    else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDPATTERN", 2))
- 	    {
- 		if (atoi((char *)items[1]) == 0)
- 		    smsg((char_u *)_("Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"),
- 						       fname, lnum, items[1]);
- 	    }
--	    else if (STRCMP(items[0], "CHECKCOMPOUNDPATTERN") == 0
--							      && itemcnt == 3)
-+	    else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDPATTERN", 3))
- 	    {
- 		garray_T    *gap = &spin->si_comppat;
- 		int	    i;
-@@ -5463,24 +5635,24 @@
- 					       = getroom_save(spin, items[2]);
- 		}
- 	    }
--	    else if (STRCMP(items[0], "SYLLABLE") == 0 && itemcnt == 2
-+	    else if (is_aff_rule(items, itemcnt, "SYLLABLE", 2)
- 							  && syllable == NULL)
- 	    {
- 		syllable = getroom_save(spin, items[1]);
- 	    }
--	    else if (STRCMP(items[0], "NOBREAK") == 0 && itemcnt == 1)
-+	    else if (is_aff_rule(items, itemcnt, "NOBREAK", 1))
- 	    {
- 		spin->si_nobreak = TRUE;
- 	    }
--	    else if (STRCMP(items[0], "NOSPLITSUGS") == 0 && itemcnt == 1)
-+	    else if (is_aff_rule(items, itemcnt, "NOSPLITSUGS", 1))
- 	    {
- 		spin->si_nosplitsugs = TRUE;
- 	    }
--	    else if (STRCMP(items[0], "NOSUGFILE") == 0 && itemcnt == 1)
-+	    else if (is_aff_rule(items, itemcnt, "NOSUGFILE", 1))
- 	    {
- 		spin->si_nosugfile = TRUE;
- 	    }
--	    else if (STRCMP(items[0], "PFXPOSTPONE") == 0 && itemcnt == 1)
-+	    else if (is_aff_rule(items, itemcnt, "PFXPOSTPONE", 1))
- 	    {
- 		aff->af_pfxpostpone = TRUE;
- 	    }
-@@ -5771,24 +5943,20 @@
- 		    }
- 		}
- 	    }
--	    else if (STRCMP(items[0], "FOL") == 0 && itemcnt == 2
--							       && fol == NULL)
-+	    else if (is_aff_rule(items, itemcnt, "FOL", 2) && fol == NULL)
- 	    {
- 		fol = vim_strsave(items[1]);
- 	    }
--	    else if (STRCMP(items[0], "LOW") == 0 && itemcnt == 2
--							       && low == NULL)
-+	    else if (is_aff_rule(items, itemcnt, "LOW", 2) && low == NULL)
- 	    {
- 		low = vim_strsave(items[1]);
- 	    }
--	    else if (STRCMP(items[0], "UPP") == 0 && itemcnt == 2
--							       && upp == NULL)
-+	    else if (is_aff_rule(items, itemcnt, "UPP", 2) && upp == NULL)
- 	    {
- 		upp = vim_strsave(items[1]);
- 	    }
--	    else if ((STRCMP(items[0], "REP") == 0
--			|| STRCMP(items[0], "REPSAL") == 0)
--		    && itemcnt == 2)
-+	    else if (is_aff_rule(items, itemcnt, "REP", 2)
-+		     || is_aff_rule(items, itemcnt, "REPSAL", 2))
- 	    {
- 		/* Ignore REP/REPSAL count */;
- 		if (!isdigit(*items[1]))
-@@ -5819,7 +5987,7 @@
- 					 : &spin->si_rep, items[1], items[2]);
- 		}
- 	    }
--	    else if (STRCMP(items[0], "MAP") == 0 && itemcnt == 2)
-+	    else if (is_aff_rule(items, itemcnt, "MAP", 2))
- 	    {
- 		/* MAP item or count */
- 		if (!found_map)
-@@ -5856,9 +6024,8 @@
- 		    ga_append(&spin->si_map, '/');
- 		}
- 	    }
--	    /* Accept "SAL from to" and "SAL from to # comment". */
--	    else if (STRCMP(items[0], "SAL") == 0
--		    && (itemcnt == 3 || (itemcnt > 3 && items[3][0] == '#')))
-+	    /* Accept "SAL from to" and "SAL from to  #comment". */
-+	    else if (is_aff_rule(items, itemcnt, "SAL", 3))
- 	    {
- 		if (do_sal)
- 		{
-@@ -5877,12 +6044,12 @@
- 								: items[2]);
- 		}
- 	    }
--	    else if (STRCMP(items[0], "SOFOFROM") == 0 && itemcnt == 2
-+	    else if (is_aff_rule(items, itemcnt, "SOFOFROM", 2)
- 							  && sofofrom == NULL)
- 	    {
- 		sofofrom = getroom_save(spin, items[1]);
- 	    }
--	    else if (STRCMP(items[0], "SOFOTO") == 0 && itemcnt == 2
-+	    else if (is_aff_rule(items, itemcnt, "SOFOTO", 2)
- 							    && sofoto == NULL)
- 	    {
- 		sofoto = getroom_save(spin, items[1]);
-@@ -5980,7 +6147,7 @@
- 	else if (spin->si_newprefID == 0 || spin->si_newprefID == 127)
- 	    MSG(_("Too many compound flags"));
- 	else
--	    MSG(_("Too many posponed prefixes and/or compound flags"));
-+	    MSG(_("Too many postponed prefixes and/or compound flags"));
-     }
- 
-     if (syllable != NULL)
-@@ -6017,6 +6184,22 @@
- }
- 
- /*
-+ * Return TRUE when items[0] equals "rulename", there are "mincount" items or
-+ * a comment is following after item "mincount".
-+ */
-+    static int
-+is_aff_rule(items, itemcnt, rulename, mincount)
-+    char_u	**items;
-+    int		itemcnt;
-+    char	*rulename;
-+    int		mincount;
-+{
-+    return (STRCMP(items[0], rulename) == 0
-+	    && (itemcnt == mincount
-+		|| (itemcnt > mincount && items[mincount][0] == '#')));
-+}
-+
-+/*
-  * For affix "entry" move COMPOUNDFORBIDFLAG and COMPOUNDPERMITFLAG from
-  * ae_flags to ae_comppermit and ae_compforbid.
-  */
-@@ -7926,6 +8109,8 @@
-     char_u	*p;
-     int		rr;
-     int		retval = OK;
-+    size_t	fwv = 1;  /* collect return value of fwrite() to avoid
-+			     warnings from picky compiler */
- 
-     fd = mch_fopen((char *)fname, "w");
-     if (fd == NULL)
-@@ -7936,11 +8121,11 @@
- 
-     /* <HEADER>: <fileID> <versionnr> */
- 							    /* <fileID> */
--    if (fwrite(VIMSPELLMAGIC, VIMSPELLMAGICL, (size_t)1, fd) != 1)
--    {
--	EMSG(_(e_write));
--	retval = FAIL;
--    }
-+    fwv &= fwrite(VIMSPELLMAGIC, VIMSPELLMAGICL, (size_t)1, fd);
-+    if (fwv != (size_t)1)
-+	/* Catch first write error, don't try writing more. */
-+	goto theend;
-+
-     putc(VIMSPELLVERSION, fd);				    /* <versionnr> */
- 
-     /*
-@@ -7955,7 +8140,7 @@
- 
- 	i = (int)STRLEN(spin->si_info);
- 	put_bytes(fd, (long_u)i, 4);			/* <sectionlen> */
--	fwrite(spin->si_info, (size_t)i, (size_t)1, fd); /* <infotext> */
-+	fwv &= fwrite(spin->si_info, (size_t)i, (size_t)1, fd); /* <infotext> */
-     }
- 
-     /* SN_REGION: <regionname> ...
-@@ -7966,7 +8151,7 @@
- 	putc(SNF_REQUIRED, fd);				/* <sectionflags> */
- 	l = spin->si_region_count * 2;
- 	put_bytes(fd, (long_u)l, 4);			/* <sectionlen> */
--	fwrite(spin->si_region_name, (size_t)l, (size_t)1, fd);
-+	fwv &= fwrite(spin->si_region_name, (size_t)l, (size_t)1, fd);
- 							/* <regionname> ... */
- 	regionmask = (1 << spin->si_region_count) - 1;
-     }
-@@ -8016,7 +8201,7 @@
- 	}
- 
- 	put_bytes(fd, (long_u)l, 2);			/* <folcharslen> */
--	fwrite(folchars, (size_t)l, (size_t)1, fd);	/* <folchars> */
-+	fwv &= fwrite(folchars, (size_t)l, (size_t)1, fd); /* <folchars> */
-     }
- 
-     /* SN_MIDWORD: <midword> */
-@@ -8027,7 +8212,8 @@
- 
- 	i = (int)STRLEN(spin->si_midword);
- 	put_bytes(fd, (long_u)i, 4);			/* <sectionlen> */
--	fwrite(spin->si_midword, (size_t)i, (size_t)1, fd); /* <midword> */
-+	fwv &= fwrite(spin->si_midword, (size_t)i, (size_t)1, fd);
-+							/* <midword> */
-     }
- 
-     /* SN_PREFCOND: <prefcondcnt> <prefcond> ... */
-@@ -8113,7 +8299,8 @@
- 		p = rr == 1 ? ftp->ft_from : ftp->ft_to;
- 		l = (int)STRLEN(p);
- 		putc(l, fd);
--		fwrite(p, l, (size_t)1, fd);
-+		if (l > 0)
-+		    fwv &= fwrite(p, l, (size_t)1, fd);
- 	    }
- 	}
- 
-@@ -8131,11 +8318,11 @@
- 							/* <sectionlen> */
- 
- 	put_bytes(fd, (long_u)l, 2);			/* <sofofromlen> */
--	fwrite(spin->si_sofofr, l, (size_t)1, fd);	/* <sofofrom> */
-+	fwv &= fwrite(spin->si_sofofr, l, (size_t)1, fd); /* <sofofrom> */
- 
- 	l = (int)STRLEN(spin->si_sofoto);
- 	put_bytes(fd, (long_u)l, 2);			/* <sofotolen> */
--	fwrite(spin->si_sofoto, l, (size_t)1, fd);	/* <sofoto> */
-+	fwv &= fwrite(spin->si_sofoto, l, (size_t)1, fd); /* <sofoto> */
-     }
- 
-     /* SN_WORDS: <word> ...
-@@ -8160,7 +8347,7 @@
- 		    l = (int)STRLEN(hi->hi_key) + 1;
- 		    len += l;
- 		    if (round == 2)			/* <word> */
--			fwrite(hi->hi_key, (size_t)l, (size_t)1, fd);
-+			fwv &= fwrite(hi->hi_key, (size_t)l, (size_t)1, fd);
- 		    --todo;
- 		}
- 	    if (round == 1)
-@@ -8176,7 +8363,7 @@
- 	putc(0, fd);					/* <sectionflags> */
- 	l = spin->si_map.ga_len;
- 	put_bytes(fd, (long_u)l, 4);			/* <sectionlen> */
--	fwrite(spin->si_map.ga_data, (size_t)l, (size_t)1, fd);
-+	fwv &= fwrite(spin->si_map.ga_data, (size_t)l, (size_t)1, fd);
- 							/* <mapstr> */
-     }
- 
-@@ -8232,10 +8419,11 @@
- 	{
- 	    p = ((char_u **)(spin->si_comppat.ga_data))[i];
- 	    putc((int)STRLEN(p), fd);			/* <comppatlen> */
--	    fwrite(p, (size_t)STRLEN(p), (size_t)1, fd);/* <comppattext> */
-+	    fwv &= fwrite(p, (size_t)STRLEN(p), (size_t)1, fd);
-+							/* <comppattext> */
- 	}
- 							/* <compflags> */
--	fwrite(spin->si_compflags, (size_t)STRLEN(spin->si_compflags),
-+	fwv &= fwrite(spin->si_compflags, (size_t)STRLEN(spin->si_compflags),
- 							       (size_t)1, fd);
-     }
- 
-@@ -8259,7 +8447,8 @@
- 
- 	l = (int)STRLEN(spin->si_syllable);
- 	put_bytes(fd, (long_u)l, 4);			/* <sectionlen> */
--	fwrite(spin->si_syllable, (size_t)l, (size_t)1, fd); /* <syllable> */
-+	fwv &= fwrite(spin->si_syllable, (size_t)l, (size_t)1, fd);
-+							/* <syllable> */
-     }
- 
-     /* end of <SECTIONS> */
-@@ -8295,13 +8484,18 @@
- 	(void)put_node(fd, tree, 0, regionmask, round == 3);
-     }
- 
--    /* Write another byte to check for errors. */
-+    /* Write another byte to check for errors (file system full). */
-     if (putc(0, fd) == EOF)
- 	retval = FAIL;
--
-+theend:
-     if (fclose(fd) == EOF)
- 	retval = FAIL;
- 
-+    if (fwv != (size_t)1)
-+	retval = FAIL;
-+    if (retval == FAIL)
-+	EMSG(_(e_write));
-+
-     return retval;
- }
- 
-@@ -9890,6 +10084,7 @@
-     char_u	*p;
-     int		len;
-     int		totlen;
-+    size_t	x = 1;  /* collect return value of fwrite() */
- 
-     if (fd != NULL)
- 	put_bytes(fd, (long_u)gap->ga_len, 2);	    /* <prefcondcnt> */
-@@ -9906,7 +10101,7 @@
- 	    if (fd != NULL)
- 	    {
- 		fputc(len, fd);
--		fwrite(p, (size_t)len, (size_t)1, fd);
-+		x &= fwrite(p, (size_t)len, (size_t)1, fd);
- 	    }
- 	    totlen += len;
- 	}
-@@ -11480,15 +11675,24 @@
- 		    vim_strncpy(preword + sp->ts_prewordlen,
- 			    tword + sp->ts_splitoff,
- 			    sp->ts_twordlen - sp->ts_splitoff);
--		    p = preword;
--		    while (*skiptowhite(p) != NUL)
--			p = skipwhite(skiptowhite(p));
--		    if (fword_ends && !can_compound(slang, p,
--						compflags + sp->ts_compsplit))
--			/* Compound is not allowed.  But it may still be
--			 * possible if we add another (short) word. */
-+
-+		    /* Verify CHECKCOMPOUNDPATTERN  rules. */
-+		    if (match_checkcompoundpattern(preword,  sp->ts_prewordlen,
-+							  &slang->sl_comppat))
- 			compound_ok = FALSE;
- 
-+		    if (compound_ok)
-+		    {
-+			p = preword;
-+			while (*skiptowhite(p) != NUL)
-+			    p = skipwhite(skiptowhite(p));
-+			if (fword_ends && !can_compound(slang, p,
-+						compflags + sp->ts_compsplit))
-+			    /* Compound is not allowed.  But it may still be
-+			     * possible if we add another (short) word. */
-+			    compound_ok = FALSE;
-+		    }
-+
- 		    /* Get pointer to last char of previous word. */
- 		    p = preword + sp->ts_prewordlen;
- 		    mb_ptr_back(preword, p);
-@@ -11685,10 +11889,9 @@
- 			&& (slang->sl_compsylmax < MAXWLEN
- 			    || sp->ts_complen + 1 - sp->ts_compsplit
- 							  < slang->sl_compmax)
--			&& (byte_in_str(sp->ts_complen == sp->ts_compsplit
--					    ? slang->sl_compstartflags
--					    : slang->sl_compallflags,
--						    ((unsigned)flags >> 24))))
-+			&& (can_be_compound(sp, slang,
-+					 compflags, ((unsigned)flags >> 24))))
-+
- 		{
- 		    try_compound = TRUE;
- 		    compflags[sp->ts_complen] = ((unsigned)flags >> 24);
-diff -Naur vim72.orig/src/structs.h vim72/src/structs.h
---- vim72.orig/src/structs.h	2008-07-30 13:02:50.000000000 -0700
-+++ vim72/src/structs.h	2009-01-08 20:57:39.000000000 -0800
-@@ -459,7 +459,7 @@
- typedef struct
- {
-     int		hide;			/* TRUE when ":hide" was used */
--# ifdef FEAT_BROWSE
-+# ifdef FEAT_BROWSE_CMD
-     int		browse;			/* TRUE to invoke file dialog */
- # endif
- # ifdef FEAT_WINDOWS
-@@ -1784,10 +1784,15 @@
- #endif
- 
-     /*
--     * The next three specify the offsets for displaying the buffer:
-+     * "w_topline", "w_leftcol" and "w_skipcol" specify the offsets for
-+     * displaying the buffer.
-      */
-     linenr_T	w_topline;	    /* buffer line number of the line at the
- 				       top of the window */
-+#ifdef FEAT_AUTOCMD
-+    char	w_topline_was_set;  /* flag set to TRUE when topline is set,
-+				       e.g. by winrestview() */
-+#endif
- #ifdef FEAT_DIFF
-     int		w_topfill;	    /* number of filler lines above w_topline */
-     int		w_old_topfill;	    /* w_topfill at last redraw */
-diff -Naur vim72.orig/src/tag.c vim72/src/tag.c
---- vim72.orig/src/tag.c	2008-07-16 14:31:30.000000000 -0700
-+++ vim72/src/tag.c	2009-01-08 20:57:45.000000000 -0800
-@@ -2725,7 +2725,24 @@
- 	 */
- 	p_7f = vim_strchr(lbuf, 0x7f);
- 	if (p_7f == NULL)
-+	{
-+etag_fail:
-+	    if (vim_strchr(lbuf, '\n') == NULL)
-+	    {
-+		/* Truncated line.  Ignore it. */
-+		if (p_verbose >= 5)
-+		{
-+		    verbose_enter();
-+		    MSG(_("Ignoring long line in tags file"));
-+		    verbose_leave();
-+		}
-+		tagp->command = lbuf;
-+		tagp->tagname = lbuf;
-+		tagp->tagname_end = lbuf;
-+		return OK;
-+	    }
- 	    return FAIL;
-+	}
- 
- 	/* Find ^A.  If not found the line number is after the 0x7f */
- 	p = vim_strchr(p_7f, Ctrl_A);
-@@ -2735,7 +2752,7 @@
- 	    ++p;
- 
- 	if (!VIM_ISDIGIT(*p))	    /* check for start of line number */
--	    return FAIL;
-+	    goto etag_fail;
- 	tagp->command = p;
- 
- 
-@@ -2749,7 +2766,7 @@
- 	    /* find end of tagname */
- 	    for (p = p_7f - 1; !vim_iswordc(*p); --p)
- 		if (p == lbuf)
--		    return FAIL;
-+		    goto etag_fail;
- 	    tagp->tagname_end = p + 1;
- 	    while (p >= lbuf && vim_iswordc(*p))
- 		--p;
-diff -Naur vim72.orig/src/testdir/Make_ming.mak vim72/src/testdir/Make_ming.mak
---- vim72.orig/src/testdir/Make_ming.mak	1969-12-31 16:00:00.000000000 -0800
-+++ vim72/src/testdir/Make_ming.mak	2009-01-08 20:57:31.000000000 -0800
-@@ -0,0 +1,91 @@
-+# Makefile to run tests for Vim, on Dos-like machines
-+# with sh.exe or zsh.exe in the path or not.
-+#
-+# Author: Bill McCarthy
-+#
-+# Note that test54 has been removed until it is fixed.
-+#
-+# Requires a set of Unix tools: echo, diff, etc.
-+
-+ifneq (sh.exe, $(SHELL))
-+DEL = rm -f
-+MV = mv
-+CP = cp
-+DIRSLASH = /
-+else
-+DEL = del
-+MV = rename
-+CP = copy
-+DIRSLASH = \\
-+endif
-+
-+VIMPROG = ..$(DIRSLASH)vim
-+
-+# Omitted:
-+# test2		"\\tmp" doesn't work.
-+# test10	'errorformat' is different
-+# test12	can't unlink a swap file
-+# test25	uses symbolic link
-+# test27	can't edit file with "*" in file name
-+# test31	16 bit version runs out of memory...
-+
-+SCRIPTS16 =	test1.out test19.out test20.out test22.out \
-+		test23.out test24.out test28.out test29.out \
-+		test35.out test36.out test43.out \
-+		test44.out test45.out test46.out test47.out \
-+		test48.out test51.out test53.out            \
-+		test55.out test56.out test57.out test58.out test59.out \
-+		test60.out test61.out test62.out test63.out test64.out
-+
-+# Had to remove test54 which doesn't work yet.
-+#		                                 test54.out
-+
-+SCRIPTS =	test3.out test4.out test5.out test6.out test7.out \
-+		test8.out test9.out test11.out test13.out test14.out \
-+		test15.out test17.out test18.out test21.out test26.out \
-+		test30.out test31.out test32.out test33.out test34.out \
-+		test37.out test38.out test39.out test40.out test41.out \
-+		test42.out test52.out test65.out
-+
-+SCRIPTS32 =	test50.out
-+
-+SCRIPTS_GUI = test16.out
-+
-+.SUFFIXES: .in .out
-+
-+vimall:	fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS32)
-+	echo ALL DONE
-+
-+nongui:	fixff $(SCRIPTS16) $(SCRIPTS)
-+	echo ALL DONE
-+
-+small:
-+	echo ALL DONE
-+
-+gui:	fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI)
-+	echo ALL DONE
-+
-+win32:	fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32)
-+	echo ALL DONE
-+
-+fixff:
-+	-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
-+
-+clean:
-+	-$(DEL) *.out
-+	-$(DEL) test.ok
-+	-$(DEL) small.vim
-+	-$(DEL) tiny.vim
-+	-$(DEL) mbyte.vim
-+	-$(DEL) X*
-+	-$(DEL) viminfo
-+
-+.in.out:
-+	$(CP) $*.ok test.ok
-+	$(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $*.in
-+	diff test.out $*.ok
-+	-$(DEL) $*.out
-+	$(MV) test.out $*.out
-+	-$(DEL) X*
-+	-$(DEL) test.ok
-+	-$(DEL) viminfo
-diff -Naur vim72.orig/src/testdir/Makefile vim72/src/testdir/Makefile
---- vim72.orig/src/testdir/Makefile	2008-06-19 13:29:46.000000000 -0700
-+++ vim72/src/testdir/Makefile	2009-01-08 20:57:31.000000000 -0800
-@@ -26,15 +26,17 @@
- 
- .SUFFIXES: .in .out
- 
--nongui:	nolog $(SCRIPTS)
--	@echo
--	@cat test.log
--	@echo ALL DONE
-+nongui:	nolog $(SCRIPTS) report
-+
-+gui:	nolog $(SCRIPTS) $(SCRIPTS_GUI) report
- 
--gui:	nolog $(SCRIPTS) $(SCRIPTS_GUI)
-+report:
- 	@echo
--	@cat test.log
--	@echo ALL DONE
-+	@echo 'Test results:'
-+	@/bin/sh -c "if test -f test.log; \
-+		then cat test.log; echo TEST FAILURE; exit 1; \
-+		else echo ALL DONE; \
-+		fi"
- 
- $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
- 
-@@ -71,4 +73,4 @@
- test60.out: test60.vim
- 
- nolog:
--	-echo Test results: >test.log
-+	-rm -f test.log
-diff -Naur vim72.orig/src/testdir/test42.ok vim72/src/testdir/test42.ok
---- vim72.orig/src/testdir/test42.ok	2008-02-20 04:27:37.000000000 -0800
-+++ vim72/src/testdir/test42.ok	2009-01-08 20:57:32.000000000 -0800
-@@ -20,7 +20,7 @@
- ucs-2
- 
- 
--  fileencoding=ucs-2le
-+  fileencoding=utf-16le
-   bomb
- ucs-2le
- 
-diff -Naur vim72.orig/src/ui.c vim72/src/ui.c
---- vim72.orig/src/ui.c	2008-07-14 11:14:56.000000000 -0700
-+++ vim72/src/ui.c	2009-01-08 20:57:44.000000000 -0800
-@@ -1820,7 +1820,7 @@
- #ifdef HAVE_DUP
- 	    /* Use stderr for stdin, also works for shell commands. */
- 	    close(0);
--	    dup(2);
-+	    ignored = dup(2);
- #else
- 	    read_cmd_fd = 2;	/* read from stderr instead of stdin */
- #endif
-@@ -2020,7 +2020,7 @@
- 
-     if (value == NULL || *length == 0)
-     {
--	clip_free_selection(cbd);	/* ???  [what's the query?] */
-+	clip_free_selection(cbd);	/* nothing received, clear register */
- 	*(int *)success = FALSE;
- 	return;
-     }
-@@ -2076,7 +2076,7 @@
- 	text_prop.value = (unsigned char *)value;
- 	text_prop.encoding = *type;
- 	text_prop.format = *format;
--	text_prop.nitems = STRLEN(value);
-+	text_prop.nitems = len;
- 	status = XmbTextPropertyToTextList(X_DISPLAY, &text_prop,
- 							 &text_list, &n_text);
- 	if (status != Success || n_text < 1)
-@@ -2110,6 +2110,8 @@
-     int		i;
-     int		nbytes = 0;
-     char_u	*buffer;
-+    time_t	start_time;
-+    int		timed_out = FALSE;
- 
-     for (i =
- #ifdef FEAT_MBYTE
-@@ -2129,6 +2131,7 @@
- 	    case 3:  type = text_atom;		break;
- 	    default: type = XA_STRING;
- 	}
-+	success = MAYBE;
- 	XtGetSelectionValue(myShell, cbd->sel_atom, type,
- 	    clip_x11_request_selection_cb, (XtPointer)&success, CurrentTime);
- 
-@@ -2141,27 +2144,48 @@
- 	 * characters, then they will appear before the one that requested the
- 	 * paste!  Don't worry, we will catch up with any other events later.
- 	 */
--	for (;;)
-+	start_time = time(NULL);
-+	while (success == MAYBE)
- 	{
--	    if (XCheckTypedEvent(dpy, SelectionNotify, &event))
--		break;
--	    if (XCheckTypedEvent(dpy, SelectionRequest, &event))
--		/* We may get a SelectionRequest here and if we don't handle
--		 * it we hang.  KDE klipper does this, for example. */
-+	    if (XCheckTypedEvent(dpy, SelectionNotify, &event)
-+		    || XCheckTypedEvent(dpy, SelectionRequest, &event)
-+		    || XCheckTypedEvent(dpy, PropertyNotify, &event))
-+	    {
-+		/* This is where clip_x11_request_selection_cb() should be
-+		 * called.  It may actually happen a bit later, so we loop
-+		 * until "success" changes.
-+		 * We may get a SelectionRequest here and if we don't handle
-+		 * it we hang.  KDE klipper does this, for example.
-+		 * We need to handle a PropertyNotify for large selections. */
- 		XtDispatchEvent(&event);
-+		continue;
-+	    }
-+
-+	    /* Time out after 2 to 3 seconds to avoid that we hang when the
-+	     * other process doesn't respond.  Note that the SelectionNotify
-+	     * event may still come later when the selection owner comes back
-+	     * to life and the text gets inserted unexpectedly.  Don't know
-+	     * why that happens or how to avoid that :-(. */
-+	    if (time(NULL) > start_time + 2)
-+	    {
-+		timed_out = TRUE;
-+		break;
-+	    }
- 
- 	    /* Do we need this?  Probably not. */
- 	    XSync(dpy, False);
- 
--	    /* Bernhard Walle solved a slow paste response in an X terminal by
--	     * adding: usleep(10000); here. */
-+	    /* Wait for 1 msec to avoid that we eat up all CPU time. */
-+	    ui_delay(1L, TRUE);
- 	}
- 
--	/* this is where clip_x11_request_selection_cb() is actually called */
--	XtDispatchEvent(&event);
--
--	if (success)
-+	if (success == TRUE)
- 	    return;
-+
-+	/* don't do a retry with another type after timing out, otherwise we
-+	 * hang for 15 seconds. */
-+	if (timed_out)
-+	    break;
-     }
- 
-     /* Final fallback position - use the X CUT_BUFFER0 store */
-diff -Naur vim72.orig/src/version.c vim72/src/version.c
---- vim72.orig/src/version.c	2008-08-09 07:24:52.000000000 -0700
-+++ vim72/src/version.c	2009-01-08 20:57:54.000000000 -0800
-@@ -677,9 +677,166 @@
- static int included_patches[] =
- {   /* Add new patch number below this line */
- /**/
-+    79,
-+/**/
-+    78,
-+/**/
-+    77,
-+/**/
-+    76,
-+/**/
-+    75,
-+/**/
-+    73,
-+/**/
-+    70,
-+/**/
-+    69,
-+/**/
-+    68,
-+/**/
-+    67,
-+/**/
-+    66,
-+/**/
-+    65,
-+/**/
-+    64,
-+/**/
-+    63,
-+/**/
-+    62,
-+/**/
-+    61,
-+/**/
-+    60,
-+/**/
-+    59,
-+/**/
-+    58,
-+/**/
-+    57,
-+/**/
-+    56,
-+/**/
-+    55,
-+/**/
-+    54,
-+/**/
-+    53,
-+/**/
-+    52,
-+/**/
-+    51,
-+/**/
-+    50,
-+/**/
-+    48,
-+/**/
-+    47,
-+/**/
-+    46,
-+/**/
-+    45,
-+/**/
-+    44,
-+/**/
-+    43,
-+/**/
-+    42,
-+/**/
-+    40,
-+/**/
-+    39,
-+/**/
-+    38,
-+/**/
-+    37,
-+/**/
-+    35,
-+/**/
-+    34,
-+/**/
-+    33,
-+/**/
-+    32,
-+/**/
-+    31,
-+/**/
-+    30,
-+/**/
-+    29,
-+/**/
-+    28,
-+/**/
-+    27,
-+/**/
-+    26,
-+/**/
-+    25,
-+/**/
-+    24,
-+/**/
-+    23,
-+/**/
-+    22,
-+/**/
-+    21,
-+/**/
-+    20,
-+/**/
-+    19,
-+/**/
-+    18,
-+/**/
-+    17,
-+/**/
-+    16,
-+/**/
-+    15,
-+/**/
-+    14,
-+/**/
-+    13,
-+/**/
-+    12,
-+/**/
-+    11,
-+/**/
-+    10,
-+/**/
-+    9,
-+/**/
-+    8,
-+/**/
-+    6,
-+/**/
-+    5,
-+/**/
-+    4,
-+/**/
-+    3,
-+/**/
-+    2,
-+/**/
-+    1,
-+/**/
-     0
- };
- 
-+/*
-+ * Place to put a short description when adding a feature with a patch.
-+ * Keep it short, e.g.,: "relative numbers", "persistent undo".
-+ * Also add a comment marker to separate the lines.
-+ * See the official Vim patches for the diff format: It must use a context of
-+ * one line only.  Create it by hand or use "diff -C2" and edit the patch.
-+ */
-+static char *(extra_patches[]) =
-+{   /* Add your patch description below this line */
-+/**/
-+    NULL
-+};
-+
-     int
- highest_patch()
- {
-@@ -786,7 +943,7 @@
-     MSG_PUTS(_("\nRISC OS version"));
- #endif
- #ifdef VMS
--    MSG_PUTS("\nOpenVMS version");
-+    MSG_PUTS(_("\nOpenVMS version"));
- # ifdef HAVE_PATHDEF
-     if (*compiled_arch != NUL)
-     {
-@@ -825,6 +982,19 @@
- 	}
-     }
- 
-+    /* Print the list of extra patch descriptions if there is at least one. */
-+    if (extra_patches[0] != NULL)
-+    {
-+	MSG_PUTS(_("\nExtra patches: "));
-+	s = "";
-+	for (i = 0; extra_patches[i] != NULL; ++i)
-+	{
-+	    MSG_PUTS(s);
-+	    s = ", ";
-+	    MSG_PUTS(extra_patches[i]);
-+	}
-+    }
-+
- #ifdef MODIFIED_BY
-     MSG_PUTS("\n");
-     MSG_PUTS(_("Modified by "));
-diff -Naur vim72.orig/src/vim.h vim72/src/vim.h
---- vim72.orig/src/vim.h	2008-08-09 09:03:38.000000000 -0700
-+++ vim72/src/vim.h	2009-01-08 20:57:39.000000000 -0800
-@@ -341,8 +341,14 @@
- #ifdef BACKSLASH_IN_FILENAME
- # define PATH_ESC_CHARS ((char_u *)" \t\n*?[{`%#'\"|!<")
- #else
--# define PATH_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<")
--# define SHELL_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<>();&")
-+# ifdef VMS
-+    /* VMS allows a lot of characters in the file name */
-+#  define PATH_ESC_CHARS ((char_u *)" \t\n*?{`\\%#'\"|!")
-+#  define SHELL_ESC_CHARS ((char_u *)" \t\n*?{`\\%#'|!()&")
-+# else
-+#  define PATH_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<")
-+#  define SHELL_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<>();&")
-+# endif
- #endif
- 
- #define NUMBUFLEN 30	    /* length of a buffer to store a number in ASCII */
-@@ -370,7 +376,7 @@
-    * Define __w64 as an empty token for everything but MSVC 7.x or later.
-    */
- # if !defined(_MSC_VER)	|| (_MSC_VER < 1300)
--#  define __w64 
-+#  define __w64
- # endif
- typedef unsigned long __w64	long_u;
- typedef		 long __w64     long_i;
-@@ -1728,7 +1734,8 @@
- #define VV_MOUSE_COL	51
- #define VV_OP		52
- #define VV_SEARCHFORWARD 53
--#define VV_LEN		54	/* number of v: vars */
-+#define VV_OLDFILES	54
-+#define VV_LEN		55	/* number of v: vars */
- 
- #ifdef FEAT_CLIPBOARD
- 
-@@ -1979,6 +1986,9 @@
- # endif
- #endif
- 
-+#ifndef FEAT_NETBEANS_INTG
-+# undef NBDEBUG
-+#endif
- #ifdef NBDEBUG /* Netbeans debugging. */
- # include "nbdebug.h"
- #else
-@@ -2054,4 +2064,10 @@
- #define DOSO_VIMRC	1	/* loading vimrc file */
- #define DOSO_GVIMRC	2	/* loading gvimrc file */
- 
-+/* flags for read_viminfo() and children */
-+#define VIF_WANT_INFO		1	/* load non-mark info */
-+#define VIF_WANT_MARKS		2	/* load file marks */
-+#define VIF_FORCEIT		4	/* overwrite info already read */
-+#define VIF_GET_OLDFILES	8	/* load v:oldfiles */
-+
- #endif /* VIM__H */
-diff -Naur vim72.orig/src/window.c vim72/src/window.c
---- vim72.orig/src/window.c	2008-08-06 04:00:30.000000000 -0700
-+++ vim72/src/window.c	2009-01-08 20:57:44.000000000 -0800
-@@ -4028,14 +4028,14 @@
- 	    if (mch_dirname(cwd, MAXPATHL) == OK)
- 		globaldir = vim_strsave(cwd);
- 	}
--	mch_chdir((char *)curwin->w_localdir);
--	shorten_fnames(TRUE);
-+	if (mch_chdir((char *)curwin->w_localdir) == 0)
-+	    shorten_fnames(TRUE);
-     }
-     else if (globaldir != NULL)
-     {
- 	/* Window doesn't have a local directory and we are not in the global
- 	 * directory: Change to the global directory. */
--	mch_chdir((char *)globaldir);
-+	ignored = mch_chdir((char *)globaldir);
- 	vim_free(globaldir);
- 	globaldir = NULL;
- 	shorten_fnames(TRUE);
-diff -Naur vim72.orig/src/workshop.c vim72/src/workshop.c
---- vim72.orig/src/workshop.c	2008-06-21 11:53:26.000000000 -0700
-+++ vim72/src/workshop.c	2009-01-08 20:57:43.000000000 -0800
-@@ -1121,8 +1121,12 @@
- 				      ? (char *)curbuf->b_sfname : "<None>");
- #endif
- 
--    strcpy(ffname, (char *) curbuf->b_ffname);
--    *filename = ffname;		/* copy so nobody can change b_ffname */
-+    if (curbuf->b_ffname == NULL)
-+	ffname[0] = NUL;
-+    else
-+	/* copy so nobody can change b_ffname */
-+	strcpy(ffname, (char *) curbuf->b_ffname);
-+    *filename = ffname;
-     *curLine = curwin->w_cursor.lnum;
-     *curCol = curwin->w_cursor.col;
- 
Index: patches/vim-7.2-branch_update-5.patch
===================================================================
--- patches/vim-7.2-branch_update-5.patch	(revision 7352c103dc5e14ed00078707635ac0f08be49e3f)
+++ patches/vim-7.2-branch_update-5.patch	(revision 7352c103dc5e14ed00078707635ac0f08be49e3f)
@@ -0,0 +1,5843 @@
+Submitted By: Jim Gifford (jim at cross-lfs dot org)
+Date: 01-19-2009
+Initial Package Version: 7.2
+Origin: Upstream
+Upstream Status: Applied
+Description: Contains all upstream patches up to 7.2.084
+             The following patches were skipped
+             007 036 041 049 071 072 074
+
+diff -Naur vim72.orig/Filelist vim72/Filelist
+--- vim72.orig/Filelist	2008-07-06 11:02:23.000000000 -0700
++++ vim72/Filelist	2009-01-19 00:08:05.000000000 -0800
+@@ -285,6 +285,7 @@
+ 		src/proto/os_win32.pro \
+ 		src/proto/os_mswin.pro \
+ 		src/testdir/Make_dos.mak \
++		src/testdir/Make_ming.mak \
+ 		src/testdir/dos.vim \
+ 		src/uninstal.c \
+ 		src/vim.def \
+diff -Naur vim72.orig/runtime/doc/cmdline.txt vim72/runtime/doc/cmdline.txt
+--- vim72.orig/runtime/doc/cmdline.txt	2008-08-09 07:22:59.000000000 -0700
++++ vim72/runtime/doc/cmdline.txt	2009-01-19 00:08:30.000000000 -0800
+@@ -1,4 +1,4 @@
+-*cmdline.txt*   For Vim version 7.2.  Last change: 2008 Jul 29
++*cmdline.txt*   For Vim version 7.2.  Last change: 2008 Sep 18
+ 
+ 
+ 		  VIM REFERENCE MANUAL    by Bram Moolenaar
+@@ -157,6 +157,11 @@
+ 				(doesn't work at the expression prompt; some
+ 				things such as changing the buffer or current
+ 				window are not allowed to avoid side effects)
++				When the result is a |List| the items are used
++				as lines.  They can have line breaks inside
++				too.
++				When the result is a Float it's automatically
++				converted to a String.
+ 		See |registers| about registers.  {not in Vi}
+ 		Implementation detail: When using the |expression| register
+ 		and invoking setcmdpos(), this sets the position before
+@@ -730,19 +735,29 @@
+ In Ex commands, at places where a file name can be used, the following
+ characters have a special meaning.  These can also be used in the expression
+ function expand() |expand()|.
+-	%	is replaced with the current file name			*:_%*
+-	#	is replaced with the alternate file name		*:_#*
++	%	Is replaced with the current file name.		  *:_%* *c_%*
++	#	Is replaced with the alternate file name.	  *:_#* *c_#*
+ 	#n	(where n is a number) is replaced with the file name of
+-		buffer n.  "#0" is the same as "#"
+-	##	is replaced with all names in the argument list		*:_##*
++		buffer n.  "#0" is the same as "#".
++	##	Is replaced with all names in the argument list	  *:_##* *c_##*
+ 		concatenated, separated by spaces.  Each space in a name
+ 		is preceded with a backslash.
+-Note that these give the file name as it was typed.  If an absolute path is
+-needed (when using the file name from a different directory), you need to add
+-":p".  See |filename-modifiers|.
++	#<n	(where n is a number > 0) is replaced with old	  *:_#<* *c_#<*
++		file name n.  See |:oldfiles| or |v:oldfiles| to get the
++		number.							*E809*
++		{only when compiled with the +eval and +viminfo features}
++
++Note that these, except "#<n", give the file name as it was typed.  If an
++absolute path is needed (when using the file name from a different directory),
++you need to add ":p".  See |filename-modifiers|.
++
++The "#<n" item returns an absolute path, but it will start with "~/" for files
++below your home directory.
++
+ Note that backslashes are inserted before spaces, so that the command will
+ correctly interpret the file name.  But this doesn't happen for shell
+-commands.  For those you probably have to use quotes: >
++commands.  For those you probably have to use quotes (this fails for files
++that contain a quote and wildcards): >
+ 	:!ls "%"
+ 	:r !spell "%"
+ 
+diff -Naur vim72.orig/runtime/doc/eval.txt vim72/runtime/doc/eval.txt
+--- vim72.orig/runtime/doc/eval.txt	2008-08-09 07:22:59.000000000 -0700
++++ vim72/runtime/doc/eval.txt	2009-01-19 00:10:10.000000000 -0800
+@@ -1,4 +1,4 @@
+-*eval.txt*	For Vim version 7.2.  Last change: 2008 Aug 09
++*eval.txt*	For Vim version 7.2.  Last change: 2008 Nov 27
+ 
+ 
+ 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
+@@ -1484,6 +1484,17 @@
+ 		This is the screen column number, like with |virtcol()|.  The
+ 		value is zero when there was no mouse button click.
+ 
++					*v:oldfiles* *oldfiles-variable*
++v:oldfiles	List of file names that is loaded from the |viminfo| file on
++		startup.  These are the files that Vim remembers marks for.
++		The length of the List is limited by the ' argument of the
++		'viminfo' option (default is 100).
++		Also see |:oldfiles| and |c_#<|.
++		The List can be modified, but this has no effect on what is
++		stored in the |viminfo| file later.  If you use values other
++		than String this will cause trouble.
++		{only when compiled with the +viminfo feature}
++
+ 					*v:operator* *operator-variable*
+ v:operator	The last operator given in Normal mode.  This is a single
+ 		character except for commands starting with <g> or <z>,
+@@ -1695,7 +1706,7 @@
+ exists( {expr})			Number	TRUE if {expr} exists
+ extend({expr1}, {expr2} [, {expr3}])
+ 				List/Dict insert items of {expr2} into {expr1}
+-expand( {expr})			String	expand special keywords in {expr}
++expand( {expr} [, {flag}])	String	expand special keywords in {expr}
+ feedkeys( {string} [, {mode}])	Number	add key sequence to typeahead buffer
+ filereadable( {file})		Number	TRUE if {file} is a readable file
+ filewritable( {file})		Number	TRUE if {file} is a writable file
+@@ -1747,8 +1758,9 @@
+ getwinposx()			Number	X coord in pixels of GUI Vim window
+ getwinposy()			Number	Y coord in pixels of GUI Vim window
+ getwinvar( {nr}, {varname})	any	variable {varname} in window {nr}
+-glob( {expr})			String	expand file wildcards in {expr}
+-globpath( {path}, {expr})	String	do glob({expr}) for all dirs in {path}
++glob( {expr} [, {flag}])	String	expand file wildcards in {expr}
++globpath( {path}, {expr} [, {flag}])
++				String	do glob({expr}) for all dirs in {path}
+ has( {feature})			Number	TRUE if feature {feature} supported
+ has_key( {dict}, {key})		Number	TRUE if {dict} has entry {key}
+ haslocaldir()			Number	TRUE if current window executed |:lcd|
+@@ -3275,14 +3287,16 @@
+ 			:let list_is_on = getwinvar(2, '&list')
+ 			:echo "myvar = " . getwinvar(1, 'myvar')
+ <
+-							*glob()*
+-glob({expr})	Expand the file wildcards in {expr}.  See |wildcards| for the
++glob({expr} [, {flag}])					*glob()*
++		Expand the file wildcards in {expr}.  See |wildcards| for the
+ 		use of special characters.
+ 		The result is a String.
+ 		When there are several matches, they are separated by <NL>
+ 		characters.
+-		The 'wildignore' option applies: Names matching one of the
+-		patterns in 'wildignore' will be skipped.
++		Unless the optional {flag} argument is given and is non-zero,
++		the 'suffixes' and 'wildignore' options apply: Names matching
++		one of the patterns in 'wildignore' will be skipped and
++		'suffixes' affect the ordering of matches.
+ 		If the expansion fails, the result is an empty string.
+ 		A name for a non-existing file is not included.
+ 
+@@ -3296,20 +3310,22 @@
+ 		See |expand()| for expanding special Vim variables.  See
+ 		|system()| for getting the raw output of an external command.
+ 
+-globpath({path}, {expr})				*globpath()*
++globpath({path}, {expr} [, {flag}])			*globpath()*
+ 		Perform glob() on all directories in {path} and concatenate
+ 		the results.  Example: >
+ 			:echo globpath(&rtp, "syntax/c.vim")
+ <		{path} is a comma-separated list of directory names.  Each
+ 		directory name is prepended to {expr} and expanded like with
+-		glob().  A path separator is inserted when needed.
++		|glob()|.  A path separator is inserted when needed.
+ 		To add a comma inside a directory name escape it with a
+ 		backslash.  Note that on MS-Windows a directory may have a
+ 		trailing backslash, remove it if you put a comma after it.
+ 		If the expansion fails for one of the directories, there is no
+ 		error message.
+-		The 'wildignore' option applies: Names matching one of the
+-		patterns in 'wildignore' will be skipped.
++		Unless the optional {flag} argument is given and is non-zero,
++		the 'suffixes' and 'wildignore' options apply: Names matching
++		one of the patterns in 'wildignore' will be skipped and
++		'suffixes' affect the ordering of matches.
+ 
+ 		The "**" item can be used to search in a directory tree.
+ 		For example, to find all "README.txt" files in the directories
+@@ -5332,10 +5348,12 @@
+ 		"fg"		foreground color (GUI: color name used to set
+ 				the color, cterm: color number as a string,
+ 				term: empty string)
+-		"bg"		background color (like "fg")
++		"bg"		background color (as with "fg")
++		"sp"		special color (as with "fg") |highlight-guisp|
+ 		"fg#"		like "fg", but for the GUI and the GUI is
+ 				running the name in "#RRGGBB" form
+ 		"bg#"		like "fg#" for "bg"
++		"sp#"		like "fg#" for "sp"
+ 		"bold"		"1" if bold
+ 		"italic"	"1" if italic
+ 		"reverse"	"1" if reverse
+@@ -5823,7 +5841,8 @@
+ mouse_pterm		Compiled with support for qnx pterm mouse.
+ mouse_sysmouse		Compiled with support for sysmouse (*BSD console mouse)
+ mouse_xterm		Compiled with support for xterm mouse.
+-multi_byte		Compiled with support for editing Korean et al.
++multi_byte		Compiled with support for 'encoding'
++multi_byte_encoding	'encoding' is set to a multi-byte encoding.
+ multi_byte_ime		Compiled with support for IME input method.
+ multi_lang		Compiled with support for multiple languages.
+ mzscheme		Compiled with MzScheme interface |mzscheme|.
+diff -Naur vim72.orig/runtime/doc/netbeans.txt vim72/runtime/doc/netbeans.txt
+--- vim72.orig/runtime/doc/netbeans.txt	2008-08-09 07:22:59.000000000 -0700
++++ vim72/runtime/doc/netbeans.txt	2009-01-19 00:10:45.000000000 -0800
+@@ -1,4 +1,4 @@
+-*netbeans.txt*  For Vim version 7.2.  Last change: 2008 Jun 28
++*netbeans.txt*  For Vim version 7.2.  Last change: 2009 Jan 06
+ 
+ 
+ 		  VIM REFERENCE MANUAL    by Gordon Prieur et al.
+@@ -722,8 +722,10 @@
+ 		of the cursor.
+ 		New in version 2.1.
+ 
+-killed		A file was closed by the user.  Only for files that have been
+-		assigned a number by the IDE.
++killed		A file was deleted or wiped out by the user and the buffer
++		annotations have been removed.  The bufID number for this
++		buffer has become invalid.  Only for files that have been
++		assigned a bufID number by the IDE.
+ 
+ newDotAndMark off off
+ 		Reports the position of the cursor being at "off" bytes into
+diff -Naur vim72.orig/runtime/doc/options.txt vim72/runtime/doc/options.txt
+--- vim72.orig/runtime/doc/options.txt	2008-08-09 07:22:59.000000000 -0700
++++ vim72/runtime/doc/options.txt	2009-01-19 00:09:28.000000000 -0800
+@@ -1,4 +1,4 @@
+-*options.txt*	For Vim version 7.2.  Last change: 2008 Aug 06
++*options.txt*	For Vim version 7.2.  Last change: 2008 Nov 25
+ 
+ 
+ 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
+@@ -7472,7 +7472,9 @@
+ 			{not available when compiled without the |+wildignore|
+ 			feature}
+ 	A list of file patterns.  A file that matches with one of these
+-	patterns is ignored when completing file or directory names.
++	patterns is ignored when completing file or directory names, and
++	influences the result of |expand()|, |glob()| and |globpath()| unless
++	a flag is passed to disable this.
+ 	The pattern is used like with |:autocmd|, see |autocmd-patterns|.
+ 	Also see 'suffixes'.
+ 	Example: >
+diff -Naur vim72.orig/runtime/doc/spell.txt vim72/runtime/doc/spell.txt
+--- vim72.orig/runtime/doc/spell.txt	2008-08-09 07:23:00.000000000 -0700
++++ vim72/runtime/doc/spell.txt	2009-01-19 00:09:54.000000000 -0800
+@@ -1,4 +1,4 @@
+-*spell.txt*	For Vim version 7.2.  Last change: 2008 Jun 21
++*spell.txt*	For Vim version 7.2.  Last change: 2008 Nov 30
+ 
+ 
+ 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
+@@ -831,8 +831,11 @@
+ 
+ 	# comment line ~
+ 
+-With some items it's also possible to put a comment after it, but this isn't
+-supported in general.
++Items with a fixed number of arguments can be followed by a comment.  But only
++if none of the arguments can contain white space.  The comment must start with
++a "#" character.  Example:
++
++	KEEPCASE =  # fix case for words with this flag ~
+ 
+ 
+ ENCODING							*spell-SET*
+@@ -965,6 +968,9 @@
+ 
+ Note: When using utf-8 only characters up to 65000 may be used for flags.
+ 
++Note: even when using "num" or "long" the number of flags available to
++compounding and prefixes is limited to about 250.
++
+ 
+ AFFIXES
+ 					    *spell-PFX* *spell-SFX*
+@@ -1178,6 +1184,9 @@
+ The flag also applies to the word with affixes, thus this can be used to mark
+ a whole bunch of related words as bad.
+ 
++							*spell-FORBIDDENWORD*
++FORBIDDENWORD can be used just like BAD.  For compatibility with Hunspell.
++
+ 							*spell-NEEDAFFIX*
+ The NEEDAFFIX flag is used to require that a word is used with an affix.  The
+ word itself is not a good word (unless there is an empty affix).  Example:
+@@ -1268,6 +1277,10 @@
+ 
+ 	NEEDCOMPOUND & ~
+ 
++							*spell-ONLYINCOMPOUND*
++The ONLYINCOMPOUND does exactly the same as NEEDCOMPOUND.  Supported for
++compatiblity with Hunspell.
++
+ 							*spell-COMPOUNDMIN*
+ The minimal character length of a word used for compounding is specified with
+ COMPOUNDMIN.  Example:
+@@ -1328,6 +1341,20 @@
+ rules.  Can also be used for an affix to count the affix as a compounding
+ word.
+ 
++						*spell-CHECKCOMPOUNDPATTERN*
++CHECKCOMPOUNDPATTERN is used to define patterns that, when matching at the
++position where two words are compounded together forbids the compound.
++For example:
++	CHECKCOMPOUNDPATTERN o e ~
++
++This forbids compounding if the first word ends in "o" and the second word
++starts with "e".
++
++The arguments must be plain text, no patterns are actually supported, despite
++the item name.  Case is always ignored.
++
++The Hunspell feature to use three arguments and flags is not supported.
++
+ 							*spell-SYLLABLE*
+ The SYLLABLE item defines characters or character sequences that are used to
+ count the number of syllables in a word.  Example:
+@@ -1496,6 +1523,10 @@
+ ACCENT		(Hunspell)				*spell-ACCENT*
+ 		Use MAP instead. |spell-MAP|
+ 
++BREAK		(Hunspell)				*spell-BREAK*
++		Define break points.  Unclear how it works exactly.
++		Not supported.
++
+ CHECKCOMPOUNDCASE  (Hunspell)			*spell-CHECKCOMPOUNDCASE*
+ 		Disallow uppercase letters at compound word boundaries.
+ 		Not supported.
+@@ -1512,9 +1543,6 @@
+ 		Forbid three identical characters when compounding.  Not
+ 		supported.
+ 
+-CHECKCOMPOUNDPATTERN  (Hunspell)		*spell-CHECKCOMPOUNDPATTERN*
+-		Forbid compounding when patterns match.  Not supported.
+-
+ COMPLEXPREFIXES  (Hunspell)				*spell-COMPLEXPREFIXES*
+ 		Enables using two prefixes.  Not supported.
+ 
+@@ -1536,13 +1564,18 @@
+ COMPOUNDMIDDLE	(Hunspell)				*spell-COMPOUNDMIDDLE*
+ 		Use COMPOUNDRULE instead. |spell-COMPOUNDRULE|
+ 
++COMPOUNDRULES	(Hunspell)				*spell-COMPOUNDRULES*
++		Number of COMPOUNDRULE lines following.  Ignored, but the
++		argument must be a number.
++
+ COMPOUNDSYLLABLE  (Hunspell)			*spell-COMPOUNDSYLLABLE*
+ 		Use SYLLABLE and COMPOUNDSYLMAX instead. |spell-SYLLABLE|
+ 		|spell-COMPOUNDSYLMAX|
+ 
+-FORBIDDENWORD	(Hunspell)				*spell-FORBIDDENWORD*
+-		Use BAD instead. |spell-BAD|
+-
++KEY		(Hunspell)				*spell-KEY*
++		Define characters that are close together on the keyboard.
++		Used to give better suggestions.  Not supported.
++		
+ LANG		(Hunspell)				*spell-LANG*
+ 		This specifies language-specific behavior.  This actually
+ 		moves part of the language knowledge into the program,
+@@ -1553,10 +1586,7 @@
+ 		Only needed for morphological analysis.
+ 
+ MAXNGRAMSUGS	(Hunspell)				*spell-MAXNGRAMSUGS*
+-		Not supported.
+-
+-ONLYINCOMPOUND	(Hunspell)				*spell-ONLYINCOMPOUND*
+-		Use NEEDCOMPOUND instead. |spell-NEEDCOMPOUND|
++		Set number of n-gram suggestions.  Not supported.
+ 
+ PSEUDOROOT	(Hunspell)				*spell-PSEUDOROOT*
+ 		Use NEEDAFFIX instead. |spell-NEEDAFFIX|
+diff -Naur vim72.orig/runtime/doc/starting.txt vim72/runtime/doc/starting.txt
+--- vim72.orig/runtime/doc/starting.txt	2008-08-09 07:23:00.000000000 -0700
++++ vim72/runtime/doc/starting.txt	2009-01-19 00:08:31.000000000 -0800
+@@ -1,4 +1,4 @@
+-*starting.txt*  For Vim version 7.2.  Last change: 2008 Jun 21
++*starting.txt*  For Vim version 7.2.  Last change: 2008 Nov 09
+ 
+ 
+ 		  VIM REFERENCE MANUAL    by Bram Moolenaar
+@@ -1337,8 +1337,9 @@
+ 							*viminfo-read*
+ When Vim is started and the 'viminfo' option is non-empty, the contents of
+ the viminfo file are read and the info can be used in the appropriate places.
+-The marks are not read in at startup (but file marks are).  See
+-|initialization| for how to set the 'viminfo' option upon startup.
++The |v:oldfiles| variable is filled.  The marks are not read in at startup
++(but file marks are).  See |initialization| for how to set the 'viminfo'
++option upon startup.
+ 
+ 							*viminfo-write*
+ When Vim exits and 'viminfo' is non-empty, the info is stored in the viminfo
+@@ -1372,6 +1373,8 @@
+ that start with any string given with the "r" flag in 'viminfo'.  This can be
+ used to avoid saving marks for files on removable media (for MS-DOS you would
+ use "ra:,rb:", for Amiga "rdf0:,rdf1:,rdf2:").
++The |v:oldfiles| variable is filled with the file names that the viminfo file
++has marks for.
+ 
+ 							*viminfo-file-marks*
+ Uppercase marks ('A to 'Z) are stored when writing the viminfo file.  The
+@@ -1463,8 +1466,8 @@
+ 						   *:rv* *:rviminfo* *E195*
+ :rv[iminfo][!] [file]	Read from viminfo file [file] (default: see above).
+ 			If [!] is given, then any information that is
+-			already set (registers, marks, etc.) will be
+-			overwritten.  {not in Vi}
++			already set (registers, marks, |v:oldfiles|, etc.)
++			will be overwritten   {not in Vi}
+ 
+ 					*:wv* *:wviminfo* *E137* *E138* *E574*
+ :wv[iminfo][!] [file]	Write to viminfo file [file] (default: see above).
+@@ -1479,4 +1482,20 @@
+ 			the .viminfo file.
+ 			{not in Vi}
+ 
++						*:ol* *:oldfiles*
++:ol[dfiles]		List the files that have marks stored in the viminfo
++			file.  This list is read on startup and only changes
++			afterwards with ":rviminfo!".  Also see |v:oldfiles|.
++			The number can be used with |c_#<|.
++			{not in Vi, only when compiled with the +eval feature}
++
++:bro[wse] ol[dfiles][!]
++			List file names as with |:oldfiles|, and then prompt
++			for a number.  When the number is valid that file from
++			the list is edited.
++			If you get the |press-enter| prompt you can press "q"
++			and still get the prompt to enter a file number.
++			Use ! to abondon a modified buffer. |abandon|
++			{not when compiled with tiny or small features}
++
+  vim:tw=78:ts=8:ft=help:norl:
+diff -Naur vim72.orig/runtime/doc/usr_21.txt vim72/runtime/doc/usr_21.txt
+--- vim72.orig/runtime/doc/usr_21.txt	2008-08-09 07:23:01.000000000 -0700
++++ vim72/runtime/doc/usr_21.txt	2009-01-19 00:08:31.000000000 -0800
+@@ -1,4 +1,4 @@
+-*usr_21.txt*	For Vim version 7.2.  Last change: 2007 May 01
++*usr_21.txt*	For Vim version 7.2.  Last change: 2008 Nov 09
+ 
+ 		     VIM USER MANUAL - by Bram Moolenaar
+ 
+@@ -153,7 +153,7 @@
+ to be lost.  Each item can be remembered only once.
+ 
+ 
+-GETTING BACK TO WHERE YOU WERE
++GETTING BACK TO WHERE YOU STOPPED VIM
+ 
+ You are halfway editing a file and it's time to leave for holidays.  You exit
+ Vim and go enjoy yourselves, forgetting all about your work.  After a couple
+@@ -168,6 +168,48 @@
+    The |:marks| command is useful to find out where '0 to '9 will take you.
+ 
+ 
++GETTING BACK TO SOME FILE
++
++If you want to go back to a file that you edited recently, but not when
++exiting Vim, there is a slightly more complicated way.  You can see a list of
++files by typing the command: >
++
++	:oldfiles
++<	1: ~/.viminfo ~
++	2: ~/text/resume.txt ~
++	3: /tmp/draft ~
++
++Now you would like to edit the second file, which is in the list preceded by
++"2:".  You type: >
++
++	:e #<2
++
++Instead of ":e" you can use any command that has a file name argument, the
++"#<2" item works in the same place as "%" (current file name) and "#"
++(alternate file name).  So you can also split the window to edit the third
++file: >
++
++	:split #<3
++
++That #<123 thing is a bit complicated when you just want to edit a file.
++Fortunately there is a simpler way: >
++
++	:browse oldfiles
++<	1: ~/.viminfo ~
++	2: ~/text/resume.txt ~
++	3: /tmp/draft ~
++	-- More --
++
++You get the same list of files as with |:oldfiles|.  If you want to edit
++"resume.txt" first press "q" to stop the listing.  You will get a prompt:
++
++	Type number and <Enter> (empty cancels): ~
++
++Type "2" and press <Enter> to edit the second file.
++
++More info at |:oldfiles|, |v:oldfiles| and |c_#<|.
++
++
+ MOVE INFO FROM ONE VIM TO ANOTHER
+ 
+ You can use the ":wviminfo" and ":rviminfo" commands to save and restore the
+diff -Naur vim72.orig/runtime/scripts.vim vim72/runtime/scripts.vim
+--- vim72.orig/runtime/scripts.vim	2008-08-08 15:27:21.000000000 -0700
++++ vim72/runtime/scripts.vim	2009-01-19 00:07:18.000000000 -0800
+@@ -234,6 +234,10 @@
+   elseif s:line1 =~ '\<DTD\s\+XHTML\s'
+     set ft=xhtml
+ 
++    " HTML (e.g.: <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN")
++  elseif s:line1 =~? '\<DOCTYPE\s\+html\>'
++    set ft=html
++
+     " PDF
+   elseif s:line1 =~ '^%PDF-'
+     set ft=pdf
+diff -Naur vim72.orig/src/auto/configure vim72/src/auto/configure
+--- vim72.orig/src/auto/configure	2008-07-24 05:40:36.000000000 -0700
++++ vim72/src/auto/configure	2009-01-19 00:09:07.000000000 -0800
+@@ -16819,21 +16819,29 @@
+   LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for GCC 3 or later" >&5
+-$as_echo_n "checking for GCC 3 or later... " >&6; }
+ DEPEND_CFLAGS_FILTER=
+ if test "$GCC" = yes; then
++  { $as_echo "$as_me:$LINENO: checking for GCC 3 or later" >&5
++$as_echo_n "checking for GCC 3 or later... " >&6; }
+   gccmajor=`echo "$gccversion" | sed -e 's/^\([1-9]\)\..*$/\1/g'`
+   if test "$gccmajor" -gt "2"; then
+     DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
+-  fi
+-fi
+-if test "$DEPEND_CFLAGS_FILTER" = ""; then
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++    { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++  else
++    { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
+-else
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
++  fi
++      { $as_echo "$as_me:$LINENO: checking whether we need -D_FORTIFY_SOURCE=1" >&5
++$as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; }
++  if test "$gccmajor" -gt "3"; then
++    CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1"
++    { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
++  else
++    { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++  fi
+ fi
+ 
+ 
+diff -Naur vim72.orig/src/buffer.c vim72/src/buffer.c
+--- vim72.orig/src/buffer.c	2008-08-06 04:00:48.000000000 -0700
++++ vim72/src/buffer.c	2009-01-19 00:10:45.000000000 -0800
+@@ -437,10 +437,6 @@
+ 	return;
+ #endif
+ 
+-#ifdef FEAT_NETBEANS_INTG
+-    if (usingNetbeans)
+-	netbeans_file_closed(buf);
+-#endif
+     /* Change directories when the 'acd' option is set. */
+     DO_AUTOCHDIR
+ 
+@@ -639,6 +635,10 @@
+ #ifdef FEAT_SIGNS
+     buf_delete_signs(buf);		/* delete any signs */
+ #endif
++#ifdef FEAT_NETBEANS_INTG
++    if (usingNetbeans)
++        netbeans_file_killed(buf);
++#endif
+ #ifdef FEAT_LOCALMAP
+     map_clear_int(buf, MAP_ALL_MODES, TRUE, FALSE);  /* clear local mappings */
+     map_clear_int(buf, MAP_ALL_MODES, TRUE, TRUE);   /* clear local abbrevs */
+@@ -647,6 +647,9 @@
+     vim_free(buf->b_start_fenc);
+     buf->b_start_fenc = NULL;
+ #endif
++#ifdef FEAT_SPELL
++    ga_clear(&buf->b_langp);
++#endif
+ }
+ 
+ /*
+@@ -812,9 +815,6 @@
+     int		bnr;		/* buffer number */
+     char_u	*p;
+ 
+-#ifdef FEAT_NETBEANS_INTG
+-    netbeansCloseFile = 1;
+-#endif
+     if (addr_count == 0)
+     {
+ 	(void)do_buffer(command, DOBUF_CURRENT, FORWARD, 0, forceit);
+@@ -909,9 +909,6 @@
+ 	}
+     }
+ 
+-#ifdef FEAT_NETBEANS_INTG
+-    netbeansCloseFile = 0;
+-#endif
+ 
+     return errormsg;
+ }
+@@ -1237,7 +1234,7 @@
+ 	 * "buf" if one exists */
+ 	if ((swb_flags & SWB_USEOPEN) && buf_jump_open_win(buf))
+ 	    return OK;
+-	/* If 'switchbuf' contians "usetab": jump to first window in any tab
++	/* If 'switchbuf' contains "usetab": jump to first window in any tab
+ 	 * page containing "buf" if one exists */
+ 	if ((swb_flags & SWB_USETAB) && buf_jump_open_tab(buf))
+ 	    return OK;
+@@ -1351,11 +1348,12 @@
+ 	}
+     }
+ #ifdef FEAT_AUTOCMD
++    /* An autocommand may have deleted "buf", already entered it (e.g., when
++     * it did ":bunload") or aborted the script processing! */
+ # ifdef FEAT_EVAL
+-    /* An autocommand may have deleted buf or aborted the script processing! */
+-    if (buf_valid(buf) && !aborting())
++    if (buf_valid(buf) && buf != curbuf && !aborting())
+ # else
+-    if (buf_valid(buf))	    /* an autocommand may have deleted buf! */
++    if (buf_valid(buf) && buf != curbuf)
+ # endif
+ #endif
+ 	enter_buffer(buf);
+@@ -1397,6 +1395,9 @@
+     curwin->w_cursor.coladd = 0;
+ #endif
+     curwin->w_set_curswant = TRUE;
++#ifdef FEAT_AUTOCMD
++    curwin->w_topline_was_set = FALSE;
++#endif
+ 
+     /* Make sure the buffer is loaded. */
+     if (curbuf->b_ml.ml_mfp == NULL)	/* need to load the file */
+@@ -1436,7 +1437,8 @@
+     maketitle();
+ #endif
+ #ifdef FEAT_AUTOCMD
+-    if (curwin->w_topline == 1)		/* when autocmds didn't change it */
++	/* when autocmds didn't change it */
++    if (curwin->w_topline == 1 && !curwin->w_topline_was_set)
+ #endif
+ 	scroll_cursor_halfway(FALSE);	/* redisplay at correct position */
+ 
+@@ -3963,7 +3965,7 @@
+     width = vim_strsize(out);
+     if (maxwidth > 0 && width > maxwidth)
+     {
+-	/* Result is too long, must trunctate somewhere. */
++	/* Result is too long, must truncate somewhere. */
+ 	l = 0;
+ 	if (itemcnt == 0)
+ 	    s = out;
+@@ -5062,7 +5064,7 @@
+     {
+ 	if (buf->b_sfname != NULL)
+ 	    return (char *)buf->b_sfname;
+-	return "[Scratch]";
++	return _("[Scratch]");
+     }
+ #endif
+     if (buf->b_fname == NULL)
+diff -Naur vim72.orig/src/configure.in vim72/src/configure.in
+--- vim72.orig/src/configure.in	2008-07-24 05:40:26.000000000 -0700
++++ vim72/src/configure.in	2009-01-19 00:09:07.000000000 -0800
+@@ -3152,18 +3152,25 @@
+ dnl But only when making dependencies, cproto and lint don't take "-isystem".
+ dnl Mac gcc returns "powerpc-apple-darwin8-gcc-4.0.1 (GCC)...", need to allow
+ dnl the number before the version number.
+-AC_MSG_CHECKING(for GCC 3 or later)
+ DEPEND_CFLAGS_FILTER=
+ if test "$GCC" = yes; then
++  AC_MSG_CHECKING(for GCC 3 or later)
+   gccmajor=`echo "$gccversion" | sed -e 's/^\([[1-9]]\)\..*$/\1/g'`
+   if test "$gccmajor" -gt "2"; then
+     DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
++    AC_MSG_RESULT(yes)
++  else
++    AC_MSG_RESULT(no)
++  fi
++  dnl -D_FORTIFY_SOURCE=2 crashes Vim on strcpy(buf, "000") when buf is
++  dnl declared as char x[1] but actually longer.  Introduced in gcc 4.0.
++  AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)
++  if test "$gccmajor" -gt "3"; then
++    CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1"
++    AC_MSG_RESULT(yes)
++  else
++    AC_MSG_RESULT(no)
+   fi
+-fi
+-if test "$DEPEND_CFLAGS_FILTER" = ""; then
+-  AC_MSG_RESULT(no)
+-else
+-  AC_MSG_RESULT(yes)
+ fi
+ AC_SUBST(DEPEND_CFLAGS_FILTER)
+ 
+diff -Naur vim72.orig/src/diff.c vim72/src/diff.c
+--- vim72.orig/src/diff.c	2008-03-05 03:16:56.000000000 -0800
++++ vim72/src/diff.c	2009-01-19 00:09:50.000000000 -0800
+@@ -73,6 +73,8 @@
+ 	{
+ 	    tp->tp_diffbuf[i] = NULL;
+ 	    tp->tp_diff_invalid = TRUE;
++	    if (tp == curtab)
++		diff_redraw(TRUE);
+ 	}
+     }
+ }
+@@ -102,6 +104,7 @@
+ 	    {
+ 		curtab->tp_diffbuf[i] = NULL;
+ 		curtab->tp_diff_invalid = TRUE;
++		diff_redraw(TRUE);
+ 	    }
+ 	}
+     }
+@@ -131,6 +134,7 @@
+ 	{
+ 	    curtab->tp_diffbuf[i] = buf;
+ 	    curtab->tp_diff_invalid = TRUE;
++	    diff_redraw(TRUE);
+ 	    return;
+ 	}
+ 
+@@ -661,6 +665,7 @@
+     char_u	*tmp_diff;
+     FILE	*fd;
+     int		ok;
++    int		io_error = FALSE;
+ 
+     /* Delete all diffblocks. */
+     diff_clear(curtab);
+@@ -697,18 +702,26 @@
+     {
+ 	ok = FALSE;
+ 	fd = mch_fopen((char *)tmp_orig, "w");
+-	if (fd != NULL)
++	if (fd == NULL)
++	    io_error = TRUE;
++	else
+ 	{
+-	    fwrite("line1\n", (size_t)6, (size_t)1, fd);
++	    if (fwrite("line1\n", (size_t)6, (size_t)1, fd) != 1)
++		io_error = TRUE;
+ 	    fclose(fd);
+ 	    fd = mch_fopen((char *)tmp_new, "w");
+-	    if (fd != NULL)
++	    if (fd == NULL)
++		io_error = TRUE;
++	    else
+ 	    {
+-		fwrite("line2\n", (size_t)6, (size_t)1, fd);
++		if (fwrite("line2\n", (size_t)6, (size_t)1, fd) != 1)
++		    io_error = TRUE;
+ 		fclose(fd);
+ 		diff_file(tmp_orig, tmp_new, tmp_diff);
+ 		fd = mch_fopen((char *)tmp_diff, "r");
+-		if (fd != NULL)
++		if (fd == NULL)
++		    io_error = TRUE;
++		else
+ 		{
+ 		    char_u	linebuf[LBUFLEN];
+ 
+@@ -761,6 +774,8 @@
+     }
+     if (!ok)
+     {
++	if (io_error)
++	    EMSG(_("E810: Cannot read or write temp files"));
+ 	EMSG(_("E97: Cannot create diffs"));
+ 	diff_a_works = MAYBE;
+ #if defined(MSWIN) || defined(MSDOS)
+@@ -925,10 +940,10 @@
+     {
+ # ifdef TEMPDIRNAMES
+ 	if (vim_tempdir != NULL)
+-	    mch_chdir((char *)vim_tempdir);
++	    ignored = mch_chdir((char *)vim_tempdir);
+ 	else
+ # endif
+-	    mch_chdir("/tmp");
++	    ignored = mch_chdir("/tmp");
+ 	shorten_fnames(TRUE);
+     }
+ #endif
+diff -Naur vim72.orig/src/edit.c vim72/src/edit.c
+--- vim72.orig/src/edit.c	2008-08-06 05:51:17.000000000 -0700
++++ vim72/src/edit.c	2009-01-19 00:10:48.000000000 -0800
+@@ -147,6 +147,7 @@
+ static int  ins_compl_bs __ARGS((void));
+ static void ins_compl_new_leader __ARGS((void));
+ static void ins_compl_addleader __ARGS((int c));
++static int ins_compl_len __ARGS((void));
+ static void ins_compl_restart __ARGS((void));
+ static void ins_compl_set_original_text __ARGS((char_u *str));
+ static void ins_compl_addfrommatch __ARGS((void));
+@@ -197,7 +198,8 @@
+ static void mb_replace_pop_ins __ARGS((int cc));
+ #endif
+ static void replace_flush __ARGS((void));
+-static void replace_do_bs __ARGS((void));
++static void replace_do_bs __ARGS((int limit_col));
++static int del_char_after_col __ARGS((int limit_col));
+ #ifdef FEAT_CINDENT
+ static int cindent_on __ARGS((void));
+ #endif
+@@ -1933,6 +1935,8 @@
+ /*
+  * Backspace the cursor until the given column.  Handles REPLACE and VREPLACE
+  * modes correctly.  May also be used when not in insert mode at all.
++ * Will attempt not to go before "col" even when there is a composing
++ * character.
+  */
+     void
+ backspace_until_column(col)
+@@ -1942,13 +1946,49 @@
+     {
+ 	curwin->w_cursor.col--;
+ 	if (State & REPLACE_FLAG)
+-	    replace_do_bs();
+-	else
+-	    (void)del_char(FALSE);
++	    replace_do_bs(col);
++	else if (!del_char_after_col(col))
++	    break;
+     }
+ }
+ #endif
+ 
++/*
++ * Like del_char(), but make sure not to go before column "limit_col".
++ * Only matters when there are composing characters.
++ * Return TRUE when something was deleted.
++ */
++   static int
++del_char_after_col(limit_col)
++    int limit_col;
++{
++#ifdef FEAT_MBYTE
++    if (enc_utf8 && limit_col >= 0)
++    {
++	int ecol = curwin->w_cursor.col + 1;
++
++	/* Make sure the cursor is at the start of a character, but
++	 * skip forward again when going too far back because of a
++	 * composing character. */
++	mb_adjust_cursor();
++	while (curwin->w_cursor.col < limit_col)
++	{
++	    int l = utf_ptr2len(ml_get_cursor());
++
++	    if (l == 0)  /* end of line */
++		break;
++	    curwin->w_cursor.col += l;
++	}
++	if (*ml_get_cursor() == NUL || curwin->w_cursor.col == ecol)
++	    return FALSE;
++	del_bytes((long)(ecol - curwin->w_cursor.col), FALSE, TRUE);
++    }
++    else
++#endif
++	(void)del_char(FALSE);
++    return TRUE;
++}
++
+ #if defined(FEAT_INS_EXPAND) || defined(PROTO)
+ /*
+  * CTRL-X pressed in Insert mode.
+@@ -2418,7 +2458,7 @@
+ 	{
+ 	    had_match = (curwin->w_cursor.col > compl_col);
+ 	    ins_compl_delete();
+-	    ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
++	    ins_bytes(compl_leader + ins_compl_len());
+ 	    ins_redraw(FALSE);
+ 
+ 	    /* When the match isn't there (to avoid matching itself) remove it
+@@ -2470,7 +2510,7 @@
+ 	    *p = NUL;
+ 	    had_match = (curwin->w_cursor.col > compl_col);
+ 	    ins_compl_delete();
+-	    ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
++	    ins_bytes(compl_leader + ins_compl_len());
+ 	    ins_redraw(FALSE);
+ 
+ 	    /* When the match isn't there (to avoid matching itself) remove it
+@@ -3209,7 +3249,7 @@
+ {
+     ins_compl_del_pum();
+     ins_compl_delete();
+-    ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
++    ins_bytes(compl_leader + ins_compl_len());
+     compl_used_match = FALSE;
+ 
+     if (compl_started)
+@@ -3264,6 +3304,20 @@
+ }
+ 
+ /*
++ * Return the length of the completion, from the completion start column to
++ * the cursor column.  Making sure it never goes below zero.
++ */
++    static int
++ins_compl_len()
++{
++    int off = curwin->w_cursor.col - compl_col;
++
++    if (off < 0)
++	return 0;
++    return off;
++}
++
++/*
+  * Append one character to the match leader.  May reduce the number of
+  * matches.
+  */
+@@ -3621,10 +3675,9 @@
+ 	    {
+ 		ins_compl_delete();
+ 		if (compl_leader != NULL)
+-		    ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
++		    ins_bytes(compl_leader + ins_compl_len());
+ 		else if (compl_first_match != NULL)
+-		    ins_bytes(compl_orig_text
+-					  + curwin->w_cursor.col - compl_col);
++		    ins_bytes(compl_orig_text + ins_compl_len());
+ 		retval = TRUE;
+ 	    }
+ 
+@@ -4256,7 +4309,7 @@
+     static void
+ ins_compl_insert()
+ {
+-    ins_bytes(compl_shown_match->cp_str + curwin->w_cursor.col - compl_col);
++    ins_bytes(compl_shown_match->cp_str + ins_compl_len());
+     if (compl_shown_match->cp_flags & ORIGINAL_TEXT)
+ 	compl_used_match = FALSE;
+     else
+@@ -4425,7 +4478,7 @@
+ 	if (!compl_get_longest || compl_used_match)
+ 	    ins_compl_insert();
+ 	else
+-	    ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
++	    ins_bytes(compl_leader + ins_compl_len());
+     }
+     else
+ 	compl_used_match = FALSE;
+@@ -7123,9 +7176,12 @@
+  * cc == 0: character was inserted, delete it
+  * cc > 0: character was replaced, put cc (first byte of original char) back
+  * and check for more characters to be put back
++ * When "limit_col" is >= 0, don't delete before this column.  Matters when
++ * using composing characters, use del_char_after_col() instead of del_char().
+  */
+     static void
+-replace_do_bs()
++replace_do_bs(limit_col)
++    int		limit_col;
+ {
+     int		cc;
+ #ifdef FEAT_VREPLACE
+@@ -7153,7 +7209,7 @@
+ #ifdef FEAT_MBYTE
+ 	if (has_mbyte)
+ 	{
+-	    del_char(FALSE);
++	    (void)del_char_after_col(limit_col);
+ # ifdef FEAT_VREPLACE
+ 	    if (State & VREPLACE_FLAG)
+ 		orig_len = (int)STRLEN(ml_get_cursor());
+@@ -7203,7 +7259,7 @@
+ 	changed_bytes(curwin->w_cursor.lnum, curwin->w_cursor.col);
+     }
+     else if (cc == 0)
+-	(void)del_char(FALSE);
++	(void)del_char_after_col(limit_col);
+ }
+ 
+ #ifdef FEAT_CINDENT
+@@ -8239,7 +8295,7 @@
+ 	 * Replace mode */
+ 	if (curwin->w_cursor.lnum != Insstart.lnum
+ 		|| curwin->w_cursor.col >= Insstart.col)
+-	    replace_do_bs();
++	    replace_do_bs(-1);
+     }
+     else
+ 	(void)del_char(FALSE);
+@@ -8556,7 +8612,7 @@
+ 		break;
+ 	    }
+ 	    if (State & REPLACE_FLAG)
+-		replace_do_bs();
++		replace_do_bs(-1);
+ 	    else
+ 	    {
+ #ifdef FEAT_MBYTE
+diff -Naur vim72.orig/src/eval.c vim72/src/eval.c
+--- vim72.orig/src/eval.c	2008-08-07 12:37:22.000000000 -0700
++++ vim72/src/eval.c	2009-01-19 00:10:21.000000000 -0800
+@@ -32,6 +32,9 @@
+ 
+ #define DICT_MAXNEST 100	/* maximum nesting of lists and dicts */
+ 
++#define DO_NOT_FREE_CNT 99999	/* refcount for dict or list that should not
++				   be freed. */
++
+ /*
+  * In a hashtab item "hi_key" points to "di_key" in a dictitem.
+  * This avoids adding a pointer to the hashtab item.
+@@ -348,6 +351,7 @@
+     {VV_NAME("mouse_col",	 VAR_NUMBER), 0},
+     {VV_NAME("operator",	 VAR_STRING), VV_RO},
+     {VV_NAME("searchforward",	 VAR_NUMBER), 0},
++    {VV_NAME("oldfiles",	 VAR_LIST), 0},
+ };
+ 
+ /* shorthand */
+@@ -355,6 +359,7 @@
+ #define vv_nr		vv_di.di_tv.vval.v_number
+ #define vv_float	vv_di.di_tv.vval.v_float
+ #define vv_str		vv_di.di_tv.vval.v_string
++#define vv_list		vv_di.di_tv.vval.v_list
+ #define vv_tv		vv_di.di_tv
+ 
+ /*
+@@ -426,7 +431,6 @@
+ static long list_idx_of_item __ARGS((list_T *l, listitem_T *item));
+ static void list_append __ARGS((list_T *l, listitem_T *item));
+ static int list_append_tv __ARGS((list_T *l, typval_T *tv));
+-static int list_append_string __ARGS((list_T *l, char_u *str, int len));
+ static int list_append_number __ARGS((list_T *l, varnumber_T n));
+ static int list_insert_tv __ARGS((list_T *l, typval_T *tv, listitem_T *item));
+ static int list_extend __ARGS((list_T	*l1, list_T *l2, listitem_T *bef));
+@@ -788,6 +792,8 @@
+ static void func_unref __ARGS((char_u *name));
+ static void func_ref __ARGS((char_u *name));
+ static void call_user_func __ARGS((ufunc_T *fp, int argcount, typval_T *argvars, typval_T *rettv, linenr_T firstline, linenr_T lastline, dict_T *selfdict));
++static int can_free_funccal __ARGS((funccall_T *fc, int copyID)) ;
++static void free_funccal __ARGS((funccall_T *fc, int free_val));
+ static void add_nr_var __ARGS((dict_T *dp, dictitem_T *v, char *name, varnumber_T nr));
+ static win_T *find_win_by_nr __ARGS((typval_T *vp, tabpage_T *tp));
+ static void getwinvar __ARGS((typval_T *argvars, typval_T *rettv, int off));
+@@ -845,11 +851,17 @@
+ 	p = &vimvars[i];
+ 	if (p->vv_di.di_tv.v_type == VAR_STRING)
+ 	{
+-	    vim_free(p->vv_di.di_tv.vval.v_string);
+-	    p->vv_di.di_tv.vval.v_string = NULL;
++	    vim_free(p->vv_str);
++	    p->vv_str = NULL;
++	}
++	else if (p->vv_di.di_tv.v_type == VAR_LIST)
++	{
++	    list_unref(p->vv_list);
++	    p->vv_list = NULL;
+ 	}
+     }
+     hash_clear(&vimvarht);
++    hash_init(&vimvarht);  /* garbage_collect() will access it */
+     hash_clear(&compat_hashtab);
+ 
+     /* script-local variables */
+@@ -916,6 +928,10 @@
+ /* pointer to funccal for currently active function */
+ funccall_T *current_funccal = NULL;
+ 
++/* pointer to list of previously used funccal, still around because some
++ * item in it is still being used. */
++funccall_T *previous_funccal = NULL;
++
+ /*
+  * Return TRUE when a function was ended by a ":return" command.
+  */
+@@ -1256,23 +1272,26 @@
+ 
+ /*
+  * Top level evaluation function, returning a string.
++ * When "convert" is TRUE convert a List into a sequence of lines and convert
++ * a Float to a String.
+  * Return pointer to allocated memory, or NULL for failure.
+  */
+     char_u *
+-eval_to_string(arg, nextcmd, dolist)
++eval_to_string(arg, nextcmd, convert)
+     char_u	*arg;
+     char_u	**nextcmd;
+-    int		dolist;		/* turn List into sequence of lines */
++    int		convert;
+ {
+     typval_T	tv;
+     char_u	*retval;
+     garray_T	ga;
++    char_u	numbuf[NUMBUFLEN];
+ 
+     if (eval0(arg, &tv, nextcmd, TRUE) == FAIL)
+ 	retval = NULL;
+     else
+     {
+-	if (dolist && tv.v_type == VAR_LIST)
++	if (convert && tv.v_type == VAR_LIST)
+ 	{
+ 	    ga_init2(&ga, (int)sizeof(char), 80);
+ 	    if (tv.vval.v_list != NULL)
+@@ -1280,6 +1299,13 @@
+ 	    ga_append(&ga, NUL);
+ 	    retval = (char_u *)ga.ga_data;
+ 	}
++#ifdef FEAT_FLOAT
++	else if (convert && tv.v_type == VAR_FLOAT)
++	{
++	    vim_snprintf((char *)numbuf, NUMBUFLEN, "%g", tv.vval.v_float);
++	    retval = vim_strsave(numbuf);
++	}
++#endif
+ 	else
+ 	    retval = vim_strsave(get_tv_string(&tv));
+ 	clear_tv(&tv);
+@@ -3277,7 +3303,7 @@
+ 
+     if (*startarg != '(')
+     {
+-	EMSG2(_("E107: Missing braces: %s"), eap->arg);
++	EMSG2(_("E107: Missing parentheses: %s"), eap->arg);
+ 	goto end;
+     }
+ 
+@@ -3657,8 +3683,8 @@
+ }
+ 
+ /*
+- * Return TRUE if typeval "tv" is locked: Either tha value is locked itself or
+- * it refers to a List or Dictionary that is locked.
++ * Return TRUE if typeval "tv" is locked: Either that value is locked itself
++ * or it refers to a List or Dictionary that is locked.
+  */
+     static int
+ tv_islocked(tv)
+@@ -6047,6 +6073,25 @@
+ }
+ 
+ /*
++ * Get list item "l[idx - 1]" as a string.  Returns NULL for failure.
++ */
++    char_u *
++list_find_str(l, idx)
++    list_T	*l;
++    long	idx;
++{
++    listitem_T	*li;
++
++    li = list_find(l, idx - 1);
++    if (li == NULL)
++    {
++	EMSGN(_(e_listidx), idx);
++	return NULL;
++    }
++    return get_tv_string(&li->li_tv);
++}
++
++/*
+  * Locate "item" list "l" and return its index.
+  * Returns -1 when "item" is not in the list.
+  */
+@@ -6137,7 +6182,7 @@
+  * When "len" >= 0 use "str[len]".
+  * Returns FAIL when out of memory.
+  */
+-    static int
++    int
+ list_append_string(l, str, len)
+     list_T	*l;
+     char_u	*str;
+@@ -6454,7 +6499,7 @@
+     buf_T	*buf;
+     win_T	*wp;
+     int		i;
+-    funccall_T	*fc;
++    funccall_T	*fc, **pfc;
+     int		did_free = FALSE;
+ #ifdef FEAT_WINDOWS
+     tabpage_T	*tp;
+@@ -6497,6 +6542,9 @@
+ 	set_ref_in_ht(&fc->l_avars.dv_hashtab, copyID);
+     }
+ 
++    /* v: vars */
++    set_ref_in_ht(&vimvarht, copyID);
++
+     /*
+      * 2. Go through the list of dicts and free items without the copyID.
+      */
+@@ -6535,6 +6583,20 @@
+ 	else
+ 	    ll = ll->lv_used_next;
+ 
++    /* check if any funccal can be freed now */
++    for (pfc = &previous_funccal; *pfc != NULL; )
++    {
++	if (can_free_funccal(*pfc, copyID))
++	{
++	    fc = *pfc;
++	    *pfc = fc->caller;
++	    free_funccal(fc, TRUE);
++	    did_free = TRUE;
++	}
++	else
++	    pfc = &(*pfc)->caller;
++    }
++
+     return did_free;
+ }
+ 
+@@ -6587,7 +6649,7 @@
+     {
+ 	case VAR_DICT:
+ 	    dd = tv->vval.v_dict;
+-	    if (dd->dv_copyID != copyID)
++	    if (dd != NULL && dd->dv_copyID != copyID)
+ 	    {
+ 		/* Didn't see this dict yet. */
+ 		dd->dv_copyID = copyID;
+@@ -6597,7 +6659,7 @@
+ 
+ 	case VAR_LIST:
+ 	    ll = tv->vval.v_list;
+-	    if (ll->lv_copyID != copyID)
++	    if (ll != NULL && ll->lv_copyID != copyID)
+ 	    {
+ 		/* Didn't see this list yet. */
+ 		ll->lv_copyID = copyID;
+@@ -7525,8 +7587,8 @@
+     {"getwinposx",	0, 0, f_getwinposx},
+     {"getwinposy",	0, 0, f_getwinposy},
+     {"getwinvar",	2, 2, f_getwinvar},
+-    {"glob",		1, 1, f_glob},
+-    {"globpath",	2, 2, f_globpath},
++    {"glob",		1, 2, f_glob},
++    {"globpath",	2, 3, f_globpath},
+     {"has",		1, 1, f_has},
+     {"has_key",		2, 2, f_has_key},
+     {"haslocaldir",	0, 0, f_haslocaldir},
+@@ -9518,7 +9580,7 @@
+     else
+     {
+ 	/* When the optional second argument is non-zero, don't remove matches
+-	 * for 'suffixes' and 'wildignore' */
++	 * for 'wildignore' and don't put matches for 'suffixes' at the end. */
+ 	if (argvars[1].v_type != VAR_UNKNOWN
+ 				    && get_tv_number_chk(&argvars[1], &error))
+ 	    flags |= WILD_KEEP_ALL;
+@@ -10300,7 +10362,8 @@
+     s = get_tv_string(&argvars[0]);
+     if (s == NULL || *s == NUL || VIM_ISDIGIT(*s))
+ 	EMSG2(_(e_invarg2), s);
+-    else if (!function_exists(s))
++    /* Don't check an autoload name for existence here. */
++    else if (vim_strchr(s, AUTOLOAD_CHAR) == NULL && !function_exists(s))
+ 	EMSG2(_("E700: Unknown function: %s"), s);
+     else
+     {
+@@ -10602,7 +10665,7 @@
+ # ifdef FEAT_WINDOWS
+ 	    win_T	*wp;
+ # endif
+-	    int		n = 1;
++	    int		winnr = 1;
+ 
+ 	    if (row >= 0 && col >= 0)
+ 	    {
+@@ -10612,9 +10675,9 @@
+ 		(void)mouse_comp_pos(win, &row, &col, &lnum);
+ # ifdef FEAT_WINDOWS
+ 		for (wp = firstwin; wp != win; wp = wp->w_next)
+-		    ++n;
++		    ++winnr;
+ # endif
+-		vimvars[VV_MOUSE_WIN].vv_nr = n;
++		vimvars[VV_MOUSE_WIN].vv_nr = winnr;
+ 		vimvars[VV_MOUSE_LNUM].vv_nr = lnum;
+ 		vimvars[VV_MOUSE_COL].vv_nr = col + 1;
+ 	    }
+@@ -11284,13 +11347,25 @@
+     typval_T	*argvars;
+     typval_T	*rettv;
+ {
++    int		flags = WILD_SILENT|WILD_USE_NL;
+     expand_T	xpc;
++    int		error = FALSE;
+ 
+-    ExpandInit(&xpc);
+-    xpc.xp_context = EXPAND_FILES;
++    /* When the optional second argument is non-zero, don't remove matches
++    * for 'wildignore' and don't put matches for 'suffixes' at the end. */
++    if (argvars[1].v_type != VAR_UNKNOWN
++				&& get_tv_number_chk(&argvars[1], &error))
++	flags |= WILD_KEEP_ALL;
+     rettv->v_type = VAR_STRING;
+-    rettv->vval.v_string = ExpandOne(&xpc, get_tv_string(&argvars[0]),
+-				     NULL, WILD_USE_NL|WILD_SILENT, WILD_ALL);
++    if (!error)
++    {
++	ExpandInit(&xpc);
++	xpc.xp_context = EXPAND_FILES;
++	rettv->vval.v_string = ExpandOne(&xpc, get_tv_string(&argvars[0]),
++						       NULL, flags, WILD_ALL);
++    }
++    else
++	rettv->vval.v_string = NULL;
+ }
+ 
+ /*
+@@ -11301,14 +11376,22 @@
+     typval_T	*argvars;
+     typval_T	*rettv;
+ {
++    int		flags = 0;
+     char_u	buf1[NUMBUFLEN];
+     char_u	*file = get_tv_string_buf_chk(&argvars[1], buf1);
++    int		error = FALSE;
+ 
++    /* When the optional second argument is non-zero, don't remove matches
++    * for 'wildignore' and don't put matches for 'suffixes' at the end. */
++    if (argvars[2].v_type != VAR_UNKNOWN
++				&& get_tv_number_chk(&argvars[2], &error))
++	flags |= WILD_KEEP_ALL;
+     rettv->v_type = VAR_STRING;
+-    if (file == NULL)
++    if (file == NULL || error)
+ 	rettv->vval.v_string = NULL;
+     else
+-	rettv->vval.v_string = globpath(get_tv_string(&argvars[0]), file);
++	rettv->vval.v_string = globpath(get_tv_string(&argvars[0]), file,
++								       flags);
+ }
+ 
+ /*
+@@ -11782,6 +11865,10 @@
+ 	    n = has_patch(atoi((char *)name + 5));
+ 	else if (STRICMP(name, "vim_starting") == 0)
+ 	    n = (starting != 0);
++#ifdef FEAT_MBYTE
++	else if (STRICMP(name, "multi_byte_encoding") == 0)
++	    n = has_mbyte;
++#endif
+ #if defined(FEAT_BEVAL) && defined(FEAT_GUI_W32)
+ 	else if (STRICMP(name, "balloon_multiline") == 0)
+ 	    n = multiline_balloon_available();
+@@ -15838,10 +15925,9 @@
+     if (res == FAIL)
+ 	res = ITEM_COMPARE_FAIL;
+     else
+-	/* return value has wrong type */
+ 	res = get_tv_number_chk(&rettv, &item_compare_func_err);
+     if (item_compare_func_err)
+-	res = ITEM_COMPARE_FAIL;
++	res = ITEM_COMPARE_FAIL;  /* return value has wrong type */
+     clear_tv(&rettv);
+     return res;
+ }
+@@ -16590,8 +16676,11 @@
+ 		p = highlight_has_attr(id, HL_INVERSE, modec);
+ 		break;
+ 
+-	case 's':					/* standout */
+-		p = highlight_has_attr(id, HL_STANDOUT, modec);
++	case 's':
++		if (TOLOWER_ASC(what[1]) == 'p')	/* sp[#] */
++		    p = highlight_color(id, what, modec);
++		else					/* standout */
++		    p = highlight_has_attr(id, HL_STANDOUT, modec);
+ 		break;
+ 
+ 	case 'u':
+@@ -16658,7 +16747,7 @@
+     col = get_tv_number(&argvars[1]) - 1;	/* -1 on type error */
+ 
+     if (lnum >= 1 && lnum <= curbuf->b_ml.ml_line_count
+-	    && col >= 0 && col < (long)STRLEN(ml_get(lnum))
++	    && col >= 0 && (col == 0 || col < (long)STRLEN(ml_get(lnum)))
+ 	    && rettv_list_alloc(rettv) != FAIL)
+     {
+ 	(void)syn_get_id(curwin, lnum, (colnr_T)col, FALSE, NULL, TRUE);
+@@ -18097,14 +18186,28 @@
+ }
+ 
+ /*
+- * Set v:count, v:count1 and v:prevcount.
++ * Get List v: variable value.  Caller must take care of reference count when
++ * needed.
++ */
++    list_T *
++get_vim_var_list(idx)
++    int		idx;
++{
++    return vimvars[idx].vv_list;
++}
++
++/*
++ * Set v:count to "count" and v:count1 to "count1".
++ * When "set_prevcount" is TRUE first set v:prevcount from v:count.
+  */
+     void
+-set_vcount(count, count1)
++set_vcount(count, count1, set_prevcount)
+     long	count;
+     long	count1;
++    int		set_prevcount;
+ {
+-    vimvars[VV_PREVCOUNT].vv_nr = vimvars[VV_COUNT].vv_nr;
++    if (set_prevcount)
++	vimvars[VV_PREVCOUNT].vv_nr = vimvars[VV_COUNT].vv_nr;
+     vimvars[VV_COUNT].vv_nr = count;
+     vimvars[VV_COUNT1].vv_nr = count1;
+ }
+@@ -18132,6 +18235,20 @@
+ }
+ 
+ /*
++ * Set List v: variable to "val".
++ */
++    void
++set_vim_var_list(idx, val)
++    int		idx;
++    list_T	*val;
++{
++    list_unref(vimvars[idx].vv_list);
++    vimvars[idx].vv_list = val;
++    if (val != NULL)
++	++val->lv_refcount;
++}
++
++/*
+  * Set v:register if needed.
+  */
+     void
+@@ -18868,7 +18985,7 @@
+     dictitem_T	*dict_var;
+ {
+     hash_init(&dict->dv_hashtab);
+-    dict->dv_refcount = 99999;
++    dict->dv_refcount = DO_NOT_FREE_CNT;
+     dict_var->di_tv.vval.v_dict = dict;
+     dict_var->di_tv.v_type = VAR_DICT;
+     dict_var->di_tv.v_lock = VAR_FIXED;
+@@ -19205,6 +19322,8 @@
+  * Copy the values from typval_T "from" to typval_T "to".
+  * When needed allocates string or increases reference count.
+  * Does not make a copy of a list or dict but copies the reference!
++ * It is OK for "from" and "to" to point to the same item.  This is used to
++ * make a copy later.
+  */
+     static void
+ copy_tv(from, to)
+@@ -20590,6 +20709,9 @@
+     int		st_len = 0;
+ 
+     todo = (int)func_hashtab.ht_used;
++    if (todo == 0)
++	return;     /* nothing to dump */
++
+     sorttab = (ufunc_T **)alloc((unsigned)(sizeof(ufunc_T) * todo));
+ 
+     for (hi = func_hashtab.ht_array; todo > 0; ++hi)
+@@ -20638,6 +20760,8 @@
+ 							      prof_self_cmp);
+ 	prof_sort_list(fd, sorttab, st_len, "SELF", TRUE);
+     }
++
++    vim_free(sorttab);
+ }
+ 
+     static void
+@@ -21012,7 +21136,7 @@
+     char_u	*save_sourcing_name;
+     linenr_T	save_sourcing_lnum;
+     scid_T	save_current_SID;
+-    funccall_T	fc;
++    funccall_T	*fc;
+     int		save_did_emsg;
+     static int	depth = 0;
+     dictitem_T	*v;
+@@ -21038,36 +21162,37 @@
+ 
+     line_breakcheck();		/* check for CTRL-C hit */
+ 
+-    fc.caller = current_funccal;
+-    current_funccal = &fc;
+-    fc.func = fp;
+-    fc.rettv = rettv;
++    fc = (funccall_T *)alloc(sizeof(funccall_T));
++    fc->caller = current_funccal;
++    current_funccal = fc;
++    fc->func = fp;
++    fc->rettv = rettv;
+     rettv->vval.v_number = 0;
+-    fc.linenr = 0;
+-    fc.returned = FALSE;
+-    fc.level = ex_nesting_level;
++    fc->linenr = 0;
++    fc->returned = FALSE;
++    fc->level = ex_nesting_level;
+     /* Check if this function has a breakpoint. */
+-    fc.breakpoint = dbg_find_breakpoint(FALSE, fp->uf_name, (linenr_T)0);
+-    fc.dbg_tick = debug_tick;
++    fc->breakpoint = dbg_find_breakpoint(FALSE, fp->uf_name, (linenr_T)0);
++    fc->dbg_tick = debug_tick;
+ 
+     /*
+-     * Note about using fc.fixvar[]: This is an array of FIXVAR_CNT variables
++     * Note about using fc->fixvar[]: This is an array of FIXVAR_CNT variables
+      * with names up to VAR_SHORT_LEN long.  This avoids having to alloc/free
+      * each argument variable and saves a lot of time.
+      */
+     /*
+      * Init l: variables.
+      */
+-    init_var_dict(&fc.l_vars, &fc.l_vars_var);
++    init_var_dict(&fc->l_vars, &fc->l_vars_var);
+     if (selfdict != NULL)
+     {
+ 	/* Set l:self to "selfdict".  Use "name" to avoid a warning from
+ 	 * some compiler that checks the destination size. */
+-	v = &fc.fixvar[fixvar_idx++].var;
++	v = &fc->fixvar[fixvar_idx++].var;
+ 	name = v->di_key;
+ 	STRCPY(name, "self");
+ 	v->di_flags = DI_FLAGS_RO + DI_FLAGS_FIX;
+-	hash_add(&fc.l_vars.dv_hashtab, DI2HIKEY(v));
++	hash_add(&fc->l_vars.dv_hashtab, DI2HIKEY(v));
+ 	v->di_tv.v_type = VAR_DICT;
+ 	v->di_tv.v_lock = 0;
+ 	v->di_tv.vval.v_dict = selfdict;
+@@ -21079,28 +21204,31 @@
+      * Set a:0 to "argcount".
+      * Set a:000 to a list with room for the "..." arguments.
+      */
+-    init_var_dict(&fc.l_avars, &fc.l_avars_var);
+-    add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "0",
++    init_var_dict(&fc->l_avars, &fc->l_avars_var);
++    add_nr_var(&fc->l_avars, &fc->fixvar[fixvar_idx++].var, "0",
+ 				(varnumber_T)(argcount - fp->uf_args.ga_len));
+-    v = &fc.fixvar[fixvar_idx++].var;
+-    STRCPY(v->di_key, "000");
++    /* Use "name" to avoid a warning from some compiler that checks the
++     * destination size. */
++    v = &fc->fixvar[fixvar_idx++].var;
++    name = v->di_key;
++    STRCPY(name, "000");
+     v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
+-    hash_add(&fc.l_avars.dv_hashtab, DI2HIKEY(v));
++    hash_add(&fc->l_avars.dv_hashtab, DI2HIKEY(v));
+     v->di_tv.v_type = VAR_LIST;
+     v->di_tv.v_lock = VAR_FIXED;
+-    v->di_tv.vval.v_list = &fc.l_varlist;
+-    vim_memset(&fc.l_varlist, 0, sizeof(list_T));
+-    fc.l_varlist.lv_refcount = 99999;
+-    fc.l_varlist.lv_lock = VAR_FIXED;
++    v->di_tv.vval.v_list = &fc->l_varlist;
++    vim_memset(&fc->l_varlist, 0, sizeof(list_T));
++    fc->l_varlist.lv_refcount = DO_NOT_FREE_CNT;
++    fc->l_varlist.lv_lock = VAR_FIXED;
+ 
+     /*
+      * Set a:firstline to "firstline" and a:lastline to "lastline".
+      * Set a:name to named arguments.
+      * Set a:N to the "..." arguments.
+      */
+-    add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "firstline",
++    add_nr_var(&fc->l_avars, &fc->fixvar[fixvar_idx++].var, "firstline",
+ 						      (varnumber_T)firstline);
+-    add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "lastline",
++    add_nr_var(&fc->l_avars, &fc->fixvar[fixvar_idx++].var, "lastline",
+ 						       (varnumber_T)lastline);
+     for (i = 0; i < argcount; ++i)
+     {
+@@ -21116,7 +21244,7 @@
+ 	}
+ 	if (fixvar_idx < FIXVAR_CNT && STRLEN(name) <= VAR_SHORT_LEN)
+ 	{
+-	    v = &fc.fixvar[fixvar_idx++].var;
++	    v = &fc->fixvar[fixvar_idx++].var;
+ 	    v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
+ 	}
+ 	else
+@@ -21128,7 +21256,7 @@
+ 	    v->di_flags = DI_FLAGS_RO;
+ 	}
+ 	STRCPY(v->di_key, name);
+-	hash_add(&fc.l_avars.dv_hashtab, DI2HIKEY(v));
++	hash_add(&fc->l_avars.dv_hashtab, DI2HIKEY(v));
+ 
+ 	/* Note: the values are copied directly to avoid alloc/free.
+ 	 * "argvars" must have VAR_FIXED for v_lock. */
+@@ -21137,9 +21265,9 @@
+ 
+ 	if (ai >= 0 && ai < MAX_FUNC_ARGS)
+ 	{
+-	    list_append(&fc.l_varlist, &fc.l_listitems[ai]);
+-	    fc.l_listitems[ai].li_tv = argvars[i];
+-	    fc.l_listitems[ai].li_tv.v_lock = VAR_FIXED;
++	    list_append(&fc->l_varlist, &fc->l_listitems[ai]);
++	    fc->l_listitems[ai].li_tv = argvars[i];
++	    fc->l_listitems[ai].li_tv.v_lock = VAR_FIXED;
+ 	}
+     }
+ 
+@@ -21204,7 +21332,7 @@
+ 	if (!fp->uf_profiling && has_profiling(FALSE, fp->uf_name, NULL))
+ 	    func_do_profile(fp);
+ 	if (fp->uf_profiling
+-		       || (fc.caller != NULL && &fc.caller->func->uf_profiling))
++		    || (fc->caller != NULL && fc->caller->func->uf_profiling))
+ 	{
+ 	    ++fp->uf_tm_count;
+ 	    profile_start(&call_start);
+@@ -21220,7 +21348,7 @@
+     did_emsg = FALSE;
+ 
+     /* call do_cmdline() to execute the lines */
+-    do_cmdline(NULL, get_func_line, (void *)&fc,
++    do_cmdline(NULL, get_func_line, (void *)fc,
+ 				     DOCMD_NOWAIT|DOCMD_VERBOSE|DOCMD_REPEAT);
+ 
+     --RedrawingDisabled;
+@@ -21235,16 +21363,16 @@
+ 
+ #ifdef FEAT_PROFILE
+     if (do_profiling == PROF_YES && (fp->uf_profiling
+-		    || (fc.caller != NULL && &fc.caller->func->uf_profiling)))
++		    || (fc->caller != NULL && fc->caller->func->uf_profiling)))
+     {
+ 	profile_end(&call_start);
+ 	profile_sub_wait(&wait_start, &call_start);
+ 	profile_add(&fp->uf_tm_total, &call_start);
+ 	profile_self(&fp->uf_tm_self, &call_start, &fp->uf_tm_children);
+-	if (fc.caller != NULL && &fc.caller->func->uf_profiling)
++	if (fc->caller != NULL && fc->caller->func->uf_profiling)
+ 	{
+-	    profile_add(&fc.caller->func->uf_tm_children, &call_start);
+-	    profile_add(&fc.caller->func->uf_tml_children, &call_start);
++	    profile_add(&fc->caller->func->uf_tm_children, &call_start);
++	    profile_add(&fc->caller->func->uf_tml_children, &call_start);
+ 	}
+     }
+ #endif
+@@ -21257,9 +21385,9 @@
+ 
+ 	if (aborting())
+ 	    smsg((char_u *)_("%s aborted"), sourcing_name);
+-	else if (fc.rettv->v_type == VAR_NUMBER)
++	else if (fc->rettv->v_type == VAR_NUMBER)
+ 	    smsg((char_u *)_("%s returning #%ld"), sourcing_name,
+-					       (long)fc.rettv->vval.v_number);
++					       (long)fc->rettv->vval.v_number);
+ 	else
+ 	{
+ 	    char_u	buf[MSG_BUF_LEN];
+@@ -21270,7 +21398,7 @@
+ 	    /* The value may be very long.  Skip the middle part, so that we
+ 	     * have some idea how it starts and ends. smsg() would always
+ 	     * truncate it at the end. */
+-	    s = tv2string(fc.rettv, &tofree, numbuf2, 0);
++	    s = tv2string(fc->rettv, &tofree, numbuf2, 0);
+ 	    if (s != NULL)
+ 	    {
+ 		trunc_string(s, buf, MSG_BUF_CLEN);
+@@ -21306,14 +21434,84 @@
+     }
+ 
+     did_emsg |= save_did_emsg;
+-    current_funccal = fc.caller;
++    current_funccal = fc->caller;
++    --depth;
+ 
+-    /* The a: variables typevals were not allocated, only free the allocated
+-     * variables. */
+-    vars_clear_ext(&fc.l_avars.dv_hashtab, FALSE);
++    /* if the a:000 list and the a: dict are not referenced we can free the
++     * funccall_T and what's in it. */
++    if (fc->l_varlist.lv_refcount == DO_NOT_FREE_CNT
++	    && fc->l_vars.dv_refcount == DO_NOT_FREE_CNT
++	    && fc->l_avars.dv_refcount == DO_NOT_FREE_CNT)
++    {
++	free_funccal(fc, FALSE);
++    }
++    else
++    {
++	hashitem_T	*hi;
++	listitem_T	*li;
++	int		todo;
+ 
+-    vars_clear(&fc.l_vars.dv_hashtab);		/* free all l: variables */
+-    --depth;
++	/* "fc" is still in use.  This can happen when returning "a:000" or
++	 * assigning "l:" to a global variable.
++	 * Link "fc" in the list for garbage collection later. */
++	fc->caller = previous_funccal;
++	previous_funccal = fc;
++
++	/* Make a copy of the a: variables, since we didn't do that above. */
++	todo = (int)fc->l_avars.dv_hashtab.ht_used;
++	for (hi = fc->l_avars.dv_hashtab.ht_array; todo > 0; ++hi)
++	{
++	    if (!HASHITEM_EMPTY(hi))
++	    {
++		--todo;
++		v = HI2DI(hi);
++		copy_tv(&v->di_tv, &v->di_tv);
++	    }
++	}
++
++	/* Make a copy of the a:000 items, since we didn't do that above. */
++	for (li = fc->l_varlist.lv_first; li != NULL; li = li->li_next)
++	    copy_tv(&li->li_tv, &li->li_tv);
++    }
++}
++
++/*
++ * Return TRUE if items in "fc" do not have "copyID".  That means they are not
++ * referenced from anywyere.
++ */
++    static int
++can_free_funccal(fc, copyID)
++    funccall_T	*fc;
++    int		copyID;
++{
++    return (fc->l_varlist.lv_copyID != copyID
++	    && fc->l_vars.dv_copyID != copyID
++	    && fc->l_avars.dv_copyID != copyID);
++}
++
++/*
++ * Free "fc" and what it contains.
++ */
++   static void
++free_funccal(fc, free_val)
++    funccall_T	*fc;
++    int		free_val;  /* a: vars were allocated */
++{
++    listitem_T	*li;
++
++    /* The a: variables typevals may not have been allocated, only free the
++     * allocated variables. */
++    vars_clear_ext(&fc->l_avars.dv_hashtab, free_val);
++
++    /* free all l: variables */
++    vars_clear(&fc->l_vars.dv_hashtab);
++
++    /* Free the a:000 variables if they were allocated. */
++    if (free_val)
++	for (li = fc->l_varlist.lv_first; li != NULL; li = li->li_next)
++	    clear_tv(&li->li_tv);
++
++    vim_free(fc);
+ }
+ 
+ /*
+@@ -21886,6 +22084,62 @@
+     }
+ }
+ 
++/*
++ * List v:oldfiles in a nice way.
++ */
++/*ARGSUSED*/
++    void
++ex_oldfiles(eap)
++    exarg_T	*eap;
++{
++    list_T	*l = vimvars[VV_OLDFILES].vv_list;
++    listitem_T	*li;
++    int		nr = 0;
++
++    if (l == NULL)
++	msg((char_u *)_("No old files"));
++    else
++    {
++	msg_start();
++	msg_scroll = TRUE;
++	for (li = l->lv_first; li != NULL && !got_int; li = li->li_next)
++	{
++	    msg_outnum((long)++nr);
++	    MSG_PUTS(": ");
++	    msg_outtrans(get_tv_string(&li->li_tv));
++	    msg_putchar('\n');
++	    out_flush();	    /* output one line at a time */
++	    ui_breakcheck();
++	}
++	/* Assume "got_int" was set to truncate the listing. */
++	got_int = FALSE;
++
++#ifdef FEAT_BROWSE_CMD
++	if (cmdmod.browse)
++	{
++	    quit_more = FALSE;
++	    nr = prompt_for_number(FALSE);
++	    msg_starthere();
++	    if (nr > 0)
++	    {
++		char_u *p = list_find_str(get_vim_var_list(VV_OLDFILES),
++								    (long)nr);
++
++		if (p != NULL)
++		{
++		    p = expand_env_save(p);
++		    eap->arg = p;
++		    eap->cmdidx = CMD_edit;
++		    cmdmod.browse = FALSE;
++		    do_exedit(eap, NULL);
++		    vim_free(p);
++		}
++	    }
++	}
++#endif
++    }
++}
++
+ #endif /* FEAT_EVAL */
+ 
+ 
+diff -Naur vim72.orig/src/ex_cmds.c vim72/src/ex_cmds.c
+--- vim72.orig/src/ex_cmds.c	2008-08-04 12:15:00.000000000 -0700
++++ vim72/src/ex_cmds.c	2009-01-19 00:10:54.000000000 -0800
+@@ -24,7 +24,7 @@
+ static void do_filter __ARGS((linenr_T line1, linenr_T line2, exarg_T *eap, char_u *cmd, int do_in, int do_out));
+ #ifdef FEAT_VIMINFO
+ static char_u *viminfo_filename __ARGS((char_u	*));
+-static void do_viminfo __ARGS((FILE *fp_in, FILE *fp_out, int want_info, int want_marks, int force_read));
++static void do_viminfo __ARGS((FILE *fp_in, FILE *fp_out, int flags));
+ static int viminfo_encoding __ARGS((vir_T *virp));
+ static int read_viminfo_up_to_marks __ARGS((vir_T *virp, int forceit, int writing));
+ #endif
+@@ -49,6 +49,7 @@
+     exarg_T	*eap;
+ {
+     int		c;
++    int		cval;
+     char	buf1[20];
+     char	buf2[20];
+     char_u	buf3[7];
+@@ -75,6 +76,10 @@
+     {
+ 	if (c == NL)	    /* NUL is stored as NL */
+ 	    c = NUL;
++	if (c == CAR && get_fileformat(curbuf) == EOL_MAC)
++	    cval = NL;	    /* NL is stored as CR */
++	else
++	    cval = c;
+ 	if (vim_isprintc_strict(c) && (c < ' '
+ #ifndef EBCDIC
+ 		    || c > '~'
+@@ -94,7 +99,7 @@
+ 	    buf2[0] = NUL;
+ 	vim_snprintf((char *)IObuff, IOSIZE,
+ 		_("<%s>%s%s  %d,  Hex %02x,  Octal %03o"),
+-					   transchar(c), buf1, buf2, c, c, c);
++				  transchar(c), buf1, buf2, cval, cval, cval);
+ #ifdef FEAT_MBYTE
+ 	if (enc_utf8)
+ 	    c = cc[ci++];
+@@ -1676,14 +1681,12 @@
+ 
+ /*
+  * read_viminfo() -- Read the viminfo file.  Registers etc. which are already
+- * set are not over-written unless force is TRUE. -- webb
++ * set are not over-written unless "flags" includes VIF_FORCEIT. -- webb
+  */
+     int
+-read_viminfo(file, want_info, want_marks, forceit)
+-    char_u	*file;
+-    int		want_info;
+-    int		want_marks;
+-    int		forceit;
++read_viminfo(file, flags)
++    char_u	*file;	    /* file name or NULL to use default name */
++    int		flags;	    /* VIF_WANT_INFO et al. */
+ {
+     FILE	*fp;
+     char_u	*fname;
+@@ -1691,7 +1694,7 @@
+     if (no_viminfo())
+ 	return FAIL;
+ 
+-    fname = viminfo_filename(file);	    /* may set to default if NULL */
++    fname = viminfo_filename(file);	/* get file name in allocated buffer */
+     if (fname == NULL)
+ 	return FAIL;
+     fp = mch_fopen((char *)fname, READBIN);
+@@ -1701,8 +1704,9 @@
+ 	verbose_enter();
+ 	smsg((char_u *)_("Reading viminfo file \"%s\"%s%s%s"),
+ 		fname,
+-		want_info ? _(" info") : "",
+-		want_marks ? _(" marks") : "",
++		(flags & VIF_WANT_INFO) ? _(" info") : "",
++		(flags & VIF_WANT_MARKS) ? _(" marks") : "",
++		(flags & VIF_GET_OLDFILES) ? _(" oldfiles") : "",
+ 		fp == NULL ? _(" FAILED") : "");
+ 	verbose_leave();
+     }
+@@ -1712,10 +1716,9 @@
+ 	return FAIL;
+ 
+     viminfo_errcnt = 0;
+-    do_viminfo(fp, NULL, want_info, want_marks, forceit);
++    do_viminfo(fp, NULL, flags);
+ 
+     fclose(fp);
+-
+     return OK;
+ }
+ 
+@@ -1943,7 +1946,7 @@
+ 	     * root.
+ 	     */
+ 	    if (fp_out != NULL)
+-		(void)fchown(fileno(fp_out), st_old.st_uid, st_old.st_gid);
++		ignored = fchown(fileno(fp_out), st_old.st_uid, st_old.st_gid);
+ #endif
+ 	}
+     }
+@@ -1968,7 +1971,7 @@
+     }
+ 
+     viminfo_errcnt = 0;
+-    do_viminfo(fp_in, fp_out, !forceit, !forceit, FALSE);
++    do_viminfo(fp_in, fp_out, forceit ? 0 : (VIF_WANT_INFO | VIF_WANT_MARKS));
+ 
+     fclose(fp_out);	    /* errors are ignored !? */
+     if (fp_in != NULL)
+@@ -2041,12 +2044,10 @@
+  * do_viminfo() -- Should only be called from read_viminfo() & write_viminfo().
+  */
+     static void
+-do_viminfo(fp_in, fp_out, want_info, want_marks, force_read)
++do_viminfo(fp_in, fp_out, flags)
+     FILE	*fp_in;
+     FILE	*fp_out;
+-    int		want_info;
+-    int		want_marks;
+-    int		force_read;
++    int		flags;
+ {
+     int		count = 0;
+     int		eof = FALSE;
+@@ -2061,8 +2062,9 @@
+ 
+     if (fp_in != NULL)
+     {
+-	if (want_info)
+-	    eof = read_viminfo_up_to_marks(&vir, force_read, fp_out != NULL);
++	if (flags & VIF_WANT_INFO)
++	    eof = read_viminfo_up_to_marks(&vir,
++					 flags & VIF_FORCEIT, fp_out != NULL);
+ 	else
+ 	    /* Skip info, find start of marks */
+ 	    while (!(eof = viminfo_readline(&vir))
+@@ -2092,8 +2094,9 @@
+ 	write_viminfo_bufferlist(fp_out);
+ 	count = write_viminfo_marks(fp_out);
+     }
+-    if (fp_in != NULL && want_marks)
+-	copy_viminfo_marks(&vir, fp_out, count, eof);
++    if (fp_in != NULL
++	    && (flags & (VIF_WANT_MARKS | VIF_GET_OLDFILES | VIF_FORCEIT)))
++	copy_viminfo_marks(&vir, fp_out, count, eof, flags);
+ 
+     vim_free(vir.vir_line);
+ #ifdef FEAT_MBYTE
+@@ -5059,6 +5062,7 @@
+ 
+ 	    if (did_sub)
+ 		++sub_nlines;
++	    vim_free(new_start);	/* for when substitute was cancelled */
+ 	    vim_free(sub_firstline);	/* free the copy of the original line */
+ 	    sub_firstline = NULL;
+ 	}
+diff -Naur vim72.orig/src/ex_cmds.h vim72/src/ex_cmds.h
+--- vim72.orig/src/ex_cmds.h	2008-06-21 11:47:57.000000000 -0700
++++ vim72/src/ex_cmds.h	2009-01-19 00:08:31.000000000 -0800
+@@ -278,7 +278,7 @@
+ EX(CMD_crewind,		"crewind",	ex_cc,
+ 			RANGE|NOTADR|COUNT|TRLBAR|BANG),
+ EX(CMD_cscope,		"cscope",	do_cscope,
+-			EXTRA|NOTRLCOM|SBOXOK|XFILE),
++			EXTRA|NOTRLCOM|XFILE),
+ EX(CMD_cstag,		"cstag",	do_cstag,
+ 			BANG|TRLBAR|WORD1),
+ EX(CMD_cunmap,		"cunmap",	ex_unmap,
+@@ -506,7 +506,7 @@
+ EX(CMD_lclose,		"lclose",	ex_cclose,
+ 			RANGE|NOTADR|COUNT|TRLBAR),
+ EX(CMD_lcscope,		"lcscope",	do_cscope,
+-			EXTRA|NOTRLCOM|SBOXOK|XFILE),
++			EXTRA|NOTRLCOM|XFILE),
+ EX(CMD_left,		"left",		ex_align,
+ 			TRLBAR|RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY),
+ EX(CMD_leftabove,	"leftabove",	ex_wrongmodifier,
+@@ -635,6 +635,8 @@
+ 			RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+ EX(CMD_noremap,		"noremap",	ex_map,
+ 			BANG|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
++EX(CMD_noautocmd,	"noautocmd",	ex_wrongmodifier,
++			NEEDARG|EXTRA|NOTRLCOM),
+ EX(CMD_nohlsearch,	"nohlsearch",	ex_nohlsearch,
+ 			TRLBAR|SBOXOK|CMDWIN),
+ EX(CMD_noreabbrev,	"noreabbrev",	ex_abbreviate,
+@@ -651,6 +653,8 @@
+ 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+ EX(CMD_open,		"open",		ex_open,
+ 			RANGE|EXTRA),
++EX(CMD_oldfiles,	"oldfiles",	ex_oldfiles,
++			BANG|TRLBAR|SBOXOK|CMDWIN),
+ EX(CMD_omap,		"omap",		ex_map,
+ 			EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+ EX(CMD_omapclear,	"omapclear",	ex_mapclear,
+@@ -802,7 +806,7 @@
+ EX(CMD_scriptencoding,	"scriptencoding", ex_scriptencoding,
+ 			WORD1|TRLBAR|CMDWIN),
+ EX(CMD_scscope,		"scscope",	do_scscope,
+-			EXTRA|NOTRLCOM|SBOXOK),
++			EXTRA|NOTRLCOM),
+ EX(CMD_set,		"set",		ex_set,
+ 			TRLBAR|EXTRA|CMDWIN|SBOXOK),
+ EX(CMD_setfiletype,	"setfiletype",	ex_setfiletype,
+diff -Naur vim72.orig/src/ex_cmds2.c vim72/src/ex_cmds2.c
+--- vim72.orig/src/ex_cmds2.c	2008-07-13 09:18:22.000000000 -0700
++++ vim72/src/ex_cmds2.c	2009-01-19 00:07:35.000000000 -0800
+@@ -3145,8 +3145,8 @@
+ 	verbose_leave();
+     }
+ #ifdef STARTUPTIME
+-    vim_snprintf(IObuff, IOSIZE, "sourcing %s", fname);
+-    time_msg(IObuff, &tv_start);
++    vim_snprintf((char *)IObuff, IOSIZE, "sourcing %s", fname);
++    time_msg((char *)IObuff, &tv_start);
+     time_pop(&tv_rel);
+ #endif
+ 
+diff -Naur vim72.orig/src/ex_docmd.c vim72/src/ex_docmd.c
+--- vim72.orig/src/ex_docmd.c	2008-07-26 04:51:05.000000000 -0700
++++ vim72/src/ex_docmd.c	2009-01-19 00:10:13.000000000 -0800
+@@ -364,6 +364,7 @@
+ # define ex_function		ex_ni
+ # define ex_delfunction		ex_ni
+ # define ex_return		ex_ni
++# define ex_oldfiles		ex_ni
+ #endif
+ static char_u	*arg_all __ARGS((void));
+ #ifdef FEAT_SESSION
+@@ -1770,7 +1771,7 @@
+ 			}
+ 			if (checkforcmd(&ea.cmd, "browse", 3))
+ 			{
+-#ifdef FEAT_BROWSE
++#ifdef FEAT_BROWSE_CMD
+ 			    cmdmod.browse = TRUE;
+ #endif
+ 			    continue;
+@@ -2978,6 +2979,7 @@
+     {"keepmarks", 3, FALSE},
+     {"leftabove", 5, FALSE},
+     {"lockmarks", 3, FALSE},
++    {"noautocmd", 3, FALSE},
+     {"rightbelow", 6, FALSE},
+     {"sandbox", 3, FALSE},
+     {"silent", 3, FALSE},
+@@ -3608,6 +3610,7 @@
+ 	    return set_context_in_autocmd(xp, arg, FALSE);
+ 
+ 	case CMD_doautocmd:
++	case CMD_doautoall:
+ 	    return set_context_in_autocmd(xp, arg, TRUE);
+ #endif
+ 	case CMD_set:
+@@ -8749,8 +8752,8 @@
+ 		else if (*dirnow != NUL
+ 			&& (ssop_flags & SSOP_CURDIR) && globaldir != NULL)
+ 		{
+-		    (void)mch_chdir((char *)globaldir);
+-		    shorten_fnames(TRUE);
++		    if (mch_chdir((char *)globaldir) == OK)
++			shorten_fnames(TRUE);
+ 		}
+ 
+ 		failed |= (makeopens(fd, dirnow) == FAIL);
+@@ -9506,24 +9509,50 @@
+ 		    break;
+ 		}
+ 		s = src + 1;
++		if (*s == '<')		/* "#<99" uses v:oldfiles */
++		    ++s;
+ 		i = (int)getdigits(&s);
+ 		*usedlen = (int)(s - src); /* length of what we expand */
+ 
+-		buf = buflist_findnr(i);
+-		if (buf == NULL)
++		if (src[1] == '<')
+ 		{
+-		    *errormsg = (char_u *)_("E194: No alternate file name to substitute for '#'");
++		    if (*usedlen < 2)
++		    {
++			/* Should we give an error message for #<text? */
++			*usedlen = 1;
++			return NULL;
++		    }
++#ifdef FEAT_EVAL
++		    result = list_find_str(get_vim_var_list(VV_OLDFILES),
++								     (long)i);
++		    if (result == NULL)
++		    {
++			*errormsg = (char_u *)"";
++			return NULL;
++		    }
++#else
++		    *errormsg = (char_u *)_("E809: #< is not available without the +eval feature");
+ 		    return NULL;
++#endif
+ 		}
+-		if (lnump != NULL)
+-		    *lnump = ECMD_LAST;
+-		if (buf->b_fname == NULL)
++		else
+ 		{
+-		    result = (char_u *)"";
+-		    valid = 0;	    /* Must have ":p:h" to be valid */
++		    buf = buflist_findnr(i);
++		    if (buf == NULL)
++		    {
++			*errormsg = (char_u *)_("E194: No alternate file name to substitute for '#'");
++			return NULL;
++		    }
++		    if (lnump != NULL)
++			*lnump = ECMD_LAST;
++		    if (buf->b_fname == NULL)
++		    {
++			result = (char_u *)"";
++			valid = 0;	    /* Must have ":p:h" to be valid */
++		    }
++		    else
++			result = buf->b_fname;
+ 		}
+-		else
+-		    result = buf->b_fname;
+ 		break;
+ 
+ #ifdef FEAT_SEARCHPATH
+@@ -9541,6 +9570,15 @@
+ #ifdef FEAT_AUTOCMD
+ 	case SPEC_AFILE:	/* file name for autocommand */
+ 		result = autocmd_fname;
++		if (result != NULL && !autocmd_fname_full)
++		{
++		    /* Still need to turn the fname into a full path.  It is
++		     * postponed to avoid a delay when <afile> is not used. */
++		    autocmd_fname_full = TRUE;
++		    result = FullName_save(autocmd_fname, FALSE);
++		    vim_free(autocmd_fname);
++		    autocmd_fname = result;
++		}
+ 		if (result == NULL)
+ 		{
+ 		    *errormsg = (char_u *)_("E495: no autocommand file name to substitute for \"<afile>\"");
+@@ -10067,7 +10105,7 @@
+      */
+     if (put_line(fd, "let s:sx = expand(\"<sfile>:p:r\").\"x.vim\"") == FAIL
+ 	    || put_line(fd, "if file_readable(s:sx)") == FAIL
+-	    || put_line(fd, "  exe \"source \" . s:sx") == FAIL
++	    || put_line(fd, "  exe \"source \" . fnameescape(s:sx)") == FAIL
+ 	    || put_line(fd, "endif") == FAIL)
+ 	return FAIL;
+ 
+@@ -10689,7 +10727,8 @@
+ 	p_viminfo = (char_u *)"'100";
+     if (eap->cmdidx == CMD_rviminfo)
+     {
+-	if (read_viminfo(eap->arg, TRUE, TRUE, eap->forceit) == FAIL)
++	if (read_viminfo(eap->arg, VIF_WANT_INFO | VIF_WANT_MARKS
++				  | (eap->forceit ? VIF_FORCEIT : 0)) == FAIL)
+ 	    EMSG(_("E195: Cannot open viminfo file for reading"));
+     }
+     else
+diff -Naur vim72.orig/src/ex_getln.c vim72/src/ex_getln.c
+--- vim72.orig/src/ex_getln.c	2008-08-08 02:31:33.000000000 -0700
++++ vim72/src/ex_getln.c	2009-01-19 00:09:28.000000000 -0800
+@@ -31,6 +31,8 @@
+     int		cmdattr;	/* attributes for prompt */
+     int		overstrike;	/* Typing mode on the command line.  Shared by
+ 				   getcmdline() and put_on_cmdline(). */
++    expand_T	*xpc;		/* struct being used for expansion, xp_pattern
++				   may point into cmdbuff */
+     int		xp_context;	/* type of expansion */
+ # ifdef FEAT_EVAL
+     char_u	*xp_arg;	/* user-defined expansion arg */
+@@ -38,7 +40,11 @@
+ # endif
+ };
+ 
+-static struct cmdline_info ccline;	/* current cmdline_info */
++/* The current cmdline_info.  It is initialized in getcmdline() and after that
++ * used by other functions.  When invoking getcmdline() recursively it needs
++ * to be saved with save_cmdline() and restored with restore_cmdline().
++ * TODO: make it local to getcmdline() and pass it around. */
++static struct cmdline_info ccline;
+ 
+ static int	cmd_showtail;		/* Only show path tail in lists ? */
+ 
+@@ -238,6 +244,7 @@
+     }
+ 
+     ExpandInit(&xpc);
++    ccline.xpc = &xpc;
+ 
+ #ifdef FEAT_RIGHTLEFT
+     if (curwin->w_p_rl && *curwin->w_p_rlc == 's'
+@@ -408,9 +415,10 @@
+ #endif
+ 
+ 	/*
+-	 * <S-Tab> works like CTRL-P (unless 'wc' is <S-Tab>).
++	 * When there are matching completions to select <S-Tab> works like
++	 * CTRL-P (unless 'wc' is <S-Tab>).
+ 	 */
+-	if (c != p_wc && c == K_S_TAB && xpc.xp_numfiles != -1)
++	if (c != p_wc && c == K_S_TAB && xpc.xp_numfiles > 0)
+ 	    c = Ctrl_P;
+ 
+ #ifdef FEAT_WILDMENU
+@@ -1513,6 +1521,7 @@
+ 		    int		old_firstc;
+ 
+ 		    vim_free(ccline.cmdbuff);
++		    xpc.xp_context = EXPAND_NOTHING;
+ 		    if (hiscnt == hislen)
+ 			p = lookfor;	/* back to the old one */
+ 		    else
+@@ -1839,6 +1848,7 @@
+ #endif
+ 
+     ExpandCleanup(&xpc);
++    ccline.xpc = NULL;
+ 
+ #ifdef FEAT_SEARCH_EXTRA
+     if (did_incsearch)
+@@ -2508,6 +2518,20 @@
+     }
+     mch_memmove(ccline.cmdbuff, p, (size_t)ccline.cmdlen + 1);
+     vim_free(p);
++
++    if (ccline.xpc != NULL
++	    && ccline.xpc->xp_pattern != NULL
++	    && ccline.xpc->xp_context != EXPAND_NOTHING
++	    && ccline.xpc->xp_context != EXPAND_UNSUCCESSFUL)
++    {
++	int i = (int)(ccline.xpc->xp_pattern - p);
++
++	/* If xp_pattern points inside the old cmdbuff it needs to be adjusted
++	 * to point into the newly allocated memory. */
++	if (i >= 0 && i <= ccline.cmdlen)
++	    ccline.xpc->xp_pattern = ccline.cmdbuff + i;
++    }
++
+     return OK;
+ }
+ 
+@@ -2875,6 +2899,7 @@
+     prev_ccline = ccline;
+     ccline.cmdbuff = NULL;
+     ccline.cmdprompt = NULL;
++    ccline.xpc = NULL;
+ }
+ 
+ /*
+@@ -3582,6 +3607,7 @@
+ ExpandInit(xp)
+     expand_T	*xp;
+ {
++    xp->xp_pattern = NULL;
+     xp->xp_backslash = XP_BS_NONE;
+ #ifndef BACKSLASH_IN_FILENAME
+     xp->xp_shell = FALSE;
+@@ -4871,7 +4897,7 @@
+     if (s == NULL)
+ 	return FAIL;
+     sprintf((char *)s, "%s/%s*.vim", dirname, pat);
+-    all = globpath(p_rtp, s);
++    all = globpath(p_rtp, s, 0);
+     vim_free(s);
+     if (all == NULL)
+ 	return FAIL;
+@@ -4912,9 +4938,10 @@
+  * newlines.  Returns NULL for an error or no matches.
+  */
+     char_u *
+-globpath(path, file)
++globpath(path, file, expand_options)
+     char_u	*path;
+     char_u	*file;
++    int		expand_options;
+ {
+     expand_T	xpc;
+     char_u	*buf;
+@@ -4943,10 +4970,10 @@
+ 	{
+ 	    add_pathsep(buf);
+ 	    STRCAT(buf, file);
+-	    if (ExpandFromContext(&xpc, buf, &num_p, &p, WILD_SILENT) != FAIL
+-								 && num_p > 0)
++	    if (ExpandFromContext(&xpc, buf, &num_p, &p,
++			     WILD_SILENT|expand_options) != FAIL && num_p > 0)
+ 	    {
+-		ExpandEscape(&xpc, buf, num_p, p, WILD_SILENT);
++		ExpandEscape(&xpc, buf, num_p, p, WILD_SILENT|expand_options);
+ 		for (len = 0, i = 0; i < num_p; ++i)
+ 		    len += (int)STRLEN(p[i]) + 1;
+ 
+diff -Naur vim72.orig/src/feature.h vim72/src/feature.h
+--- vim72.orig/src/feature.h	2008-08-06 04:00:39.000000000 -0700
++++ vim72/src/feature.h	2009-01-19 00:08:31.000000000 -0800
+@@ -767,9 +767,13 @@
+ 
+ /*
+  * +browse		":browse" command.
++ *			or just the ":browse" command modifier
+  */
+-#if defined(FEAT_NORMAL) && (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MAC))
+-# define FEAT_BROWSE
++#if defined(FEAT_NORMAL)
++# define FEAT_BROWSE_CMD
++# if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MAC)
++#  define FEAT_BROWSE
++# endif
+ #endif
+ 
+ /*
+diff -Naur vim72.orig/src/fileio.c vim72/src/fileio.c
+--- vim72.orig/src/fileio.c	2008-08-06 04:01:03.000000000 -0700
++++ vim72/src/fileio.c	2009-01-19 00:10:40.000000000 -0800
+@@ -932,7 +932,10 @@
+     else
+     {
+ 	if (eap != NULL && eap->force_ff != 0)
++	{
+ 	    fileformat = get_fileformat_force(curbuf, eap);
++	    try_unix = try_dos = try_mac = FALSE;
++	}
+ 	else if (curbuf->b_p_bin)
+ 	    fileformat = EOL_UNIX;		/* binary: use Unix format */
+ 	else if (*p_ffs == NUL)
+@@ -2211,7 +2214,7 @@
+     {
+ 	/* Use stderr for stdin, makes shell commands work. */
+ 	close(0);
+-	dup(2);
++	ignored = dup(2);
+     }
+ #endif
+ 
+@@ -2341,11 +2344,6 @@
+ 		STRCAT(IObuff, _("[CR missing]"));
+ 		c = TRUE;
+ 	    }
+-	    if (ff_error == EOL_MAC)
+-	    {
+-		STRCAT(IObuff, _("[NL found]"));
+-		c = TRUE;
+-	    }
+ 	    if (split)
+ 	    {
+ 		STRCAT(IObuff, _("[long lines split]"));
+@@ -2711,7 +2709,7 @@
+ {
+     if (!curbuf->b_marks_read && get_viminfo_parameter('\'') > 0
+ 						  && curbuf->b_ffname != NULL)
+-	read_viminfo(NULL, FALSE, TRUE, FALSE);
++	read_viminfo(NULL, VIF_WANT_MARKS);
+ 
+     /* Always set b_marks_read; needed when 'viminfo' is changed to include
+      * the ' parameter after opening a buffer. */
+@@ -3451,7 +3449,7 @@
+ 		{
+ # ifdef UNIX
+ #  ifdef HAVE_FCHOWN
+-		    fchown(fd, st_old.st_uid, st_old.st_gid);
++		    ignored = fchown(fd, st_old.st_uid, st_old.st_gid);
+ #  endif
+ 		    if (mch_stat((char *)IObuff, &st) < 0
+ 			    || st.st_uid != st_old.st_uid
+@@ -4367,7 +4365,7 @@
+ 		|| st.st_uid != st_old.st_uid
+ 		|| st.st_gid != st_old.st_gid)
+ 	{
+-	    fchown(fd, st_old.st_uid, st_old.st_gid);
++	    ignored = fchown(fd, st_old.st_uid, st_old.st_gid);
+ 	    if (perm >= 0)	/* set permission again, may have changed */
+ 		(void)mch_setperm(wfname, perm);
+ 	}
+@@ -5550,9 +5548,10 @@
+ 	    name = "ucs-4le";	/* FF FE 00 00 */
+ 	    len = 4;
+ 	}
+-	else if (flags == FIO_ALL || flags == (FIO_UCS2 | FIO_ENDIAN_L))
++	else if (flags == (FIO_UCS2 | FIO_ENDIAN_L))
+ 	    name = "ucs-2le";	/* FF FE */
+-	else if (flags == (FIO_UTF16 | FIO_ENDIAN_L))
++	else if (flags == FIO_ALL || flags == (FIO_UTF16 | FIO_ENDIAN_L))
++	    /* utf-16le is preferred, it also works for ucs-2le text */
+ 	    name = "utf-16le";	/* FF FE */
+     }
+     else if (p[0] == 0xfe && p[1] == 0xff
+@@ -6031,9 +6030,9 @@
+ 	{
+ 	    tbuf[FGETS_SIZE - 2] = NUL;
+ #ifdef USE_CR
+-	    fgets_cr((char *)tbuf, FGETS_SIZE, fp);
++	    ignoredp = fgets_cr((char *)tbuf, FGETS_SIZE, fp);
+ #else
+-	    fgets((char *)tbuf, FGETS_SIZE, fp);
++	    ignoredp = fgets((char *)tbuf, FGETS_SIZE, fp);
+ #endif
+ 	} while (tbuf[FGETS_SIZE - 2] != NUL && tbuf[FGETS_SIZE - 2] != '\n');
+     }
+@@ -6107,12 +6106,24 @@
+ #ifdef HAVE_ACL
+     vim_acl_T	acl;		/* ACL from original file */
+ #endif
++#if defined(UNIX) || defined(CASE_INSENSITIVE_FILENAME)
++    int		use_tmp_file = FALSE;
++#endif
+ 
+     /*
+-     * When the names are identical, there is nothing to do.
++     * When the names are identical, there is nothing to do.  When they refer
++     * to the same file (ignoring case and slash/backslash differences) but
++     * the file name differs we need to go through a temp file.
+      */
+     if (fnamecmp(from, to) == 0)
+-	return 0;
++    {
++#ifdef CASE_INSENSITIVE_FILENAME
++	if (STRCMP(gettail(from), gettail(to)) != 0)
++	    use_tmp_file = TRUE;
++	else
++#endif
++	    return 0;
++    }
+ 
+     /*
+      * Fail if the "from" file doesn't exist.  Avoids that "to" is deleted.
+@@ -6120,6 +6131,55 @@
+     if (mch_stat((char *)from, &st) < 0)
+ 	return -1;
+ 
++#ifdef UNIX
++    {
++	struct stat	st_to;
++
++	/* It's possible for the source and destination to be the same file.
++	 * This happens when "from" and "to" differ in case and are on a FAT32
++	 * filesystem.  In that case go through a temp file name. */
++	if (mch_stat((char *)to, &st_to) >= 0
++		&& st.st_dev == st_to.st_dev
++		&& st.st_ino == st_to.st_ino)
++	    use_tmp_file = TRUE;
++    }
++#endif
++
++#if defined(UNIX) || defined(CASE_INSENSITIVE_FILENAME)
++    if (use_tmp_file)
++    {
++	char	tempname[MAXPATHL + 1];
++
++	/*
++	 * Find a name that doesn't exist and is in the same directory.
++	 * Rename "from" to "tempname" and then rename "tempname" to "to".
++	 */
++	if (STRLEN(from) >= MAXPATHL - 5)
++	    return -1;
++	STRCPY(tempname, from);
++	for (n = 123; n < 99999; ++n)
++	{
++	    sprintf((char *)gettail((char_u *)tempname), "%d", n);
++	    if (mch_stat(tempname, &st) < 0)
++	    {
++		if (mch_rename((char *)from, tempname) == 0)
++		{
++		    if (mch_rename(tempname, (char *)to) == 0)
++			return 0;
++		    /* Strange, the second step failed.  Try moving the
++		     * file back and return failure. */
++		    mch_rename(tempname, (char *)from);
++		    return -1;
++		}
++		/* If it fails for one temp name it will most likely fail
++		 * for any temp name, give up. */
++		return -1;
++	    }
++	}
++	return -1;
++    }
++#endif
++
+     /*
+      * Delete the "to" file, this is required on some systems to make the
+      * mch_rename() work, on other systems it makes sure that we don't have
+@@ -8523,6 +8583,7 @@
+     char_u	*save_sourcing_name;
+     linenr_T	save_sourcing_lnum;
+     char_u	*save_autocmd_fname;
++    int		save_autocmd_fname_full;
+     int		save_autocmd_bufnr;
+     char_u	*save_autocmd_match;
+     int		save_autocmd_busy;
+@@ -8601,6 +8662,7 @@
+      * Save the autocmd_* variables and info about the current buffer.
+      */
+     save_autocmd_fname = autocmd_fname;
++    save_autocmd_fname_full = autocmd_fname_full;
+     save_autocmd_bufnr = autocmd_bufnr;
+     save_autocmd_match = autocmd_match;
+     save_autocmd_busy = autocmd_busy;
+@@ -8618,14 +8680,15 @@
+ 	if (fname != NULL && *fname != NUL)
+ 	    autocmd_fname = fname;
+ 	else if (buf != NULL)
+-	    autocmd_fname = buf->b_fname;
++	    autocmd_fname = buf->b_ffname;
+ 	else
+ 	    autocmd_fname = NULL;
+     }
+     else
+ 	autocmd_fname = fname_io;
+     if (autocmd_fname != NULL)
+-	autocmd_fname = FullName_save(autocmd_fname, FALSE);
++	autocmd_fname = vim_strsave(autocmd_fname);
++    autocmd_fname_full = FALSE; /* call FullName_save() later */
+ 
+     /*
+      * Set the buffer number to be used for <abuf>.
+@@ -8810,6 +8873,7 @@
+     sourcing_lnum = save_sourcing_lnum;
+     vim_free(autocmd_fname);
+     autocmd_fname = save_autocmd_fname;
++    autocmd_fname_full = save_autocmd_fname_full;
+     autocmd_bufnr = save_autocmd_bufnr;
+     autocmd_match = save_autocmd_match;
+ #ifdef FEAT_EVAL
+@@ -8918,7 +8982,7 @@
+     {
+ 	apc->curpat = NULL;
+ 
+-	/* only use a pattern when it has not been removed, has commands and
++	/* Only use a pattern when it has not been removed, has commands and
+ 	 * the group matches. For buffer-local autocommands only check the
+ 	 * buffer number. */
+ 	if (ap->pat != NULL && ap->cmds != NULL
+@@ -9104,7 +9168,7 @@
+ set_context_in_autocmd(xp, arg, doautocmd)
+     expand_T	*xp;
+     char_u	*arg;
+-    int		doautocmd;	/* TRUE for :doautocmd, FALSE for :autocmd */
++    int		doautocmd;	/* TRUE for :doauto*, FALSE for :autocmd */
+ {
+     char_u	*p;
+     int		group;
+diff -Naur vim72.orig/src/fold.c vim72/src/fold.c
+--- vim72.orig/src/fold.c	2008-08-06 04:01:12.000000000 -0700
++++ vim72/src/fold.c	2009-01-19 00:10:42.000000000 -0800
+@@ -48,7 +48,7 @@
+ static int foldFind __ARGS((garray_T *gap, linenr_T lnum, fold_T **fpp));
+ static int foldLevelWin __ARGS((win_T *wp, linenr_T lnum));
+ static void checkupdate __ARGS((win_T *wp));
+-static void setFoldRepeat __ARGS((linenr_T lnum, long count, int open));
++static void setFoldRepeat __ARGS((linenr_T lnum, long count, int do_open));
+ static linenr_T setManualFold __ARGS((linenr_T lnum, int opening, int recurse, int *donep));
+ static linenr_T setManualFoldWin __ARGS((win_T *wp, linenr_T lnum, int opening, int recurse, int *donep));
+ static void foldOpenNested __ARGS((fold_T *fpr));
+@@ -740,7 +740,7 @@
+     garray_T	*found_ga;
+     fold_T	*found_fp = NULL;
+     linenr_T	found_off = 0;
+-    int		use_level = FALSE;
++    int		use_level;
+     int		maybe_small = FALSE;
+     int		level = 0;
+     linenr_T	lnum = start;
+@@ -757,6 +757,7 @@
+ 	gap = &curwin->w_folds;
+ 	found_ga = NULL;
+ 	lnum_off = 0;
++	use_level = FALSE;
+ 	for (;;)
+ 	{
+ 	    if (!foldFind(gap, lnum - lnum_off, &fp))
+@@ -783,20 +784,21 @@
+ 	else
+ 	{
+ 	    lnum = found_fp->fd_top + found_fp->fd_len + found_off;
+-	    did_one = TRUE;
+ 
+ 	    if (foldmethodIsManual(curwin))
+ 		deleteFoldEntry(found_ga,
+ 		    (int)(found_fp - (fold_T *)found_ga->ga_data), recursive);
+ 	    else
+ 	    {
+-		if (found_fp->fd_top + found_off < first_lnum)
+-		    first_lnum = found_fp->fd_top;
+-		if (lnum > last_lnum)
++		if (first_lnum > found_fp->fd_top + found_off)
++		    first_lnum = found_fp->fd_top + found_off;
++		if (last_lnum < lnum)
+ 		    last_lnum = lnum;
+-		parseMarker(curwin);
++		if (!did_one)
++		    parseMarker(curwin);
+ 		deleteFoldMarkers(found_fp, recursive, found_off);
+ 	    }
++	    did_one = TRUE;
+ 
+ 	    /* redraw window */
+ 	    changed_window_setting();
+@@ -811,6 +813,10 @@
+ 	    redraw_curbuf_later(INVERTED);
+ #endif
+     }
++    else
++	/* Deleting markers may make cursor column invalid. */
++	check_cursor_col();
++
+     if (last_lnum > 0)
+ 	changed_lines(first_lnum, (colnr_T)0, last_lnum, 0L);
+ }
+@@ -1241,10 +1247,10 @@
+  * Repeat "count" times.
+  */
+     static void
+-setFoldRepeat(lnum, count, open)
++setFoldRepeat(lnum, count, do_open)
+     linenr_T	lnum;
+     long	count;
+-    int		open;
++    int		do_open;
+ {
+     int		done;
+     long	n;
+@@ -1252,7 +1258,7 @@
+     for (n = 0; n < count; ++n)
+     {
+ 	done = DONE_NOTHING;
+-	(void)setManualFold(lnum, open, FALSE, &done);
++	(void)setManualFold(lnum, do_open, FALSE, &done);
+ 	if (!(done & DONE_ACTION))
+ 	{
+ 	    /* Only give an error message when no fold could be opened. */
+diff -Naur vim72.orig/src/getchar.c vim72/src/getchar.c
+--- vim72.orig/src/getchar.c	2008-07-22 09:57:48.000000000 -0700
++++ vim72/src/getchar.c	2009-01-19 00:09:36.000000000 -0800
+@@ -4702,7 +4702,7 @@
+ 			return FAIL;
+ 		    if (mp->m_noremap != REMAP_YES && fprintf(fd, "nore") < 0)
+ 			return FAIL;
+-		    if (fprintf(fd, cmd) < 0)
++		    if (fputs(cmd, fd) < 0)
+ 			return FAIL;
+ 		    if (buf != NULL && fputs(" <buffer>", fd) < 0)
+ 			return FAIL;
+@@ -4801,7 +4801,7 @@
+ 	    }
+ 	    if (IS_SPECIAL(c) || modifiers)	/* special key */
+ 	    {
+-		if (fprintf(fd, (char *)get_special_key_name(c, modifiers)) < 0)
++		if (fputs((char *)get_special_key_name(c, modifiers), fd) < 0)
+ 		    return FAIL;
+ 		continue;
+ 	    }
+diff -Naur vim72.orig/src/globals.h vim72/src/globals.h
+--- vim72.orig/src/globals.h	2008-07-26 04:53:29.000000000 -0700
++++ vim72/src/globals.h	2009-01-19 00:10:45.000000000 -0800
+@@ -1022,6 +1022,7 @@
+ #endif
+ #ifdef FEAT_AUTOCMD
+ EXTERN char_u	*autocmd_fname INIT(= NULL); /* fname for <afile> on cmdline */
++EXTERN int	autocmd_fname_full;	     /* autocmd_fname is full path */
+ EXTERN int	autocmd_bufnr INIT(= 0);     /* fnum for <abuf> on cmdline */
+ EXTERN char_u	*autocmd_match INIT(= NULL); /* name for <amatch> on cmdline */
+ EXTERN int	did_cursorhold INIT(= FALSE); /* set when CursorHold t'gerd */
+@@ -1339,7 +1340,6 @@
+ 
+ #ifdef FEAT_NETBEANS_INTG
+ EXTERN char *netbeansArg INIT(= NULL);	/* the -nb[:host:port:passwd] arg */
+-EXTERN int netbeansCloseFile INIT(= 0);	/* send killed if != 0 */
+ EXTERN int netbeansFireChanges INIT(= 1); /* send buffer changes if != 0 */
+ EXTERN int netbeansForcedQuit INIT(= 0);/* don't write modified files */
+ EXTERN int netbeansReadFile INIT(= 1);	/* OK to read from disk if != 0 */
+@@ -1548,6 +1548,14 @@
+ EXTERN time_t starttime;
+ 
+ /*
++ * Some compilers warn for not using a return value, but in some situations we
++ * can't do anything useful with the value.  Assign to this variable to avoid
++ * the warning.
++ */
++EXTERN int ignored;
++EXTERN char *ignoredp;
++
++/*
+  * Optional Farsi support.  Include it here, so EXTERN and INIT are defined.
+  */
+ #ifdef FEAT_FKMAP
+diff -Naur vim72.orig/src/gui.c vim72/src/gui.c
+--- vim72.orig/src/gui.c	2008-07-27 12:32:14.000000000 -0700
++++ vim72/src/gui.c	2009-01-19 00:10:07.000000000 -0800
+@@ -139,7 +139,7 @@
+ 		/* The read returns when the child closes the pipe (or when
+ 		 * the child dies for some reason). */
+ 		close(pipefd[1]);
+-		(void)read(pipefd[0], &dummy, (size_t)1);
++		ignored = (int)read(pipefd[0], &dummy, (size_t)1);
+ 		close(pipefd[0]);
+ 	    }
+ 
+@@ -3241,7 +3241,7 @@
+ 	    i = Rows;
+ 	    gui_update_tabline();
+ 	    Rows = i;
+-	    need_set_size = RESIZE_VERT;
++	    need_set_size |= RESIZE_VERT;
+ 	    if (using_tabline)
+ 		fix_size = TRUE;
+ 	    if (!gui_use_tabline())
+@@ -3275,9 +3275,9 @@
+ 		if (gui.which_scrollbars[i] != prev_which_scrollbars[i])
+ 		{
+ 		    if (i == SBAR_BOTTOM)
+-			need_set_size = RESIZE_VERT;
++			need_set_size |= RESIZE_VERT;
+ 		    else
+-			need_set_size = RESIZE_HOR;
++			need_set_size |= RESIZE_HOR;
+ 		    if (gui.which_scrollbars[i])
+ 			fix_size = TRUE;
+ 		}
+@@ -3297,7 +3297,7 @@
+ 	    gui_mch_enable_menu(gui.menu_is_active);
+ 	    Rows = i;
+ 	    prev_menu_is_active = gui.menu_is_active;
+-	    need_set_size = RESIZE_VERT;
++	    need_set_size |= RESIZE_VERT;
+ 	    if (gui.menu_is_active)
+ 		fix_size = TRUE;
+ 	}
+@@ -3308,7 +3308,7 @@
+ 	{
+ 	    gui_mch_show_toolbar(using_toolbar);
+ 	    prev_toolbar = using_toolbar;
+-	    need_set_size = RESIZE_VERT;
++	    need_set_size |= RESIZE_VERT;
+ 	    if (using_toolbar)
+ 		fix_size = TRUE;
+ 	}
+@@ -3318,7 +3318,7 @@
+ 	{
+ 	    gui_mch_enable_footer(using_footer);
+ 	    prev_footer = using_footer;
+-	    need_set_size = RESIZE_VERT;
++	    need_set_size |= RESIZE_VERT;
+ 	    if (using_footer)
+ 		fix_size = TRUE;
+ 	}
+@@ -3330,10 +3330,11 @@
+ 	    prev_tearoff = using_tearoff;
+ 	}
+ #endif
+-	if (need_set_size)
++	if (need_set_size != 0)
+ 	{
+ #ifdef FEAT_GUI_GTK
+-	    long    c = Columns;
++	    long    prev_Columns = Columns;
++	    long    prev_Rows = Rows;
+ #endif
+ 	    /* Adjust the size of the window to make the text area keep the
+ 	     * same size and to avoid that part of our window is off-screen
+@@ -3349,11 +3350,14 @@
+ 	     * If you remove this, please test this command for resizing
+ 	     * effects (with optional left scrollbar): ":vsp|q|vsp|q|vsp|q".
+ 	     * Don't do this while starting up though.
+-	     * And don't change Rows, it may have be reduced intentionally
+-	     * when adding menu/toolbar/tabline. */
+-	    if (!gui.starting)
++	     * Don't change Rows when adding menu/toolbar/tabline.
++	     * Don't change Columns when adding vertical toolbar. */
++	    if (!gui.starting && need_set_size != (RESIZE_VERT | RESIZE_HOR))
+ 		(void)char_avail();
+-	    Columns = c;
++	    if ((need_set_size & RESIZE_VERT) == 0)
++		Rows = prev_Rows;
++	    if ((need_set_size & RESIZE_HOR) == 0)
++		Columns = prev_Columns;
+ #endif
+ 	}
+ #ifdef FEAT_WINDOWS
+diff -Naur vim72.orig/src/gui_at_sb.c vim72/src/gui_at_sb.c
+--- vim72.orig/src/gui_at_sb.c	2004-06-07 07:32:25.000000000 -0700
++++ vim72/src/gui_at_sb.c	2009-01-19 00:09:39.000000000 -0800
+@@ -1078,6 +1078,12 @@
+     Cardinal	*num_params;	/* unused */
+ {
+     ScrollbarWidget sbw = (ScrollbarWidget)w;
++    /* Use a union to avoid a warning for the weird conversion from float to
++     * XtPointer.  Comes from Xaw/Scrollbar.c. */
++    union {
++	XtPointer xtp;
++	float xtf;
++    } xtpf;
+ 
+     if (LookAhead(w, event))
+ 	return;
+@@ -1085,7 +1091,8 @@
+     /* thumbProc is not pretty, but is necessary for backwards
+        compatibility on those architectures for which it work{s,ed};
+        the intent is to pass a (truncated) float by value. */
+-    XtCallCallbacks(w, XtNthumbProc, *(XtPointer*)&sbw->scrollbar.top);
++    xtpf.xtf = sbw->scrollbar.top;
++    XtCallCallbacks(w, XtNthumbProc, xtpf.xtp);
+     XtCallCallbacks(w, XtNjumpProc, (XtPointer)&sbw->scrollbar.top);
+ }
+ 
+diff -Naur vim72.orig/src/gui_gtk_x11.c vim72/src/gui_gtk_x11.c
+--- vim72.orig/src/gui_gtk_x11.c	2008-07-04 03:46:24.000000000 -0700
++++ vim72/src/gui_gtk_x11.c	2009-01-19 00:09:39.000000000 -0800
+@@ -4070,14 +4070,14 @@
+ 
+ 	if (mask & (XValue | YValue))
+ 	{
+-	    int w, h;
+-	    gui_mch_get_screen_dimensions(&w, &h);
+-	    h += p_ghr + get_menu_tool_height();
+-	    w += get_menu_tool_width();
++	    int ww, hh;
++	    gui_mch_get_screen_dimensions(&ww, &hh);
++	    hh += p_ghr + get_menu_tool_height();
++	    ww += get_menu_tool_width();
+ 	    if (mask & XNegative)
+-		x += w - pixel_width;
++		x += ww - pixel_width;
+ 	    if (mask & YNegative)
+-		y += h - pixel_height;
++		y += hh - pixel_height;
+ #ifdef HAVE_GTK2
+ 	    gtk_window_move(GTK_WINDOW(gui.mainwin), x, y);
+ #else
+diff -Naur vim72.orig/src/gui_x11.c vim72/src/gui_x11.c
+--- vim72.orig/src/gui_x11.c	2008-06-08 08:13:45.000000000 -0700
++++ vim72/src/gui_x11.c	2009-01-19 00:08:42.000000000 -0800
+@@ -2450,7 +2450,7 @@
+ 	*colorPtr = colortable[closest];
+     }
+ 
+-    free(colortable);
++    vim_free(colortable);
+     return OK;
+ }
+ 
+diff -Naur vim72.orig/src/gui_xmdlg.c vim72/src/gui_xmdlg.c
+--- vim72.orig/src/gui_xmdlg.c	2008-06-21 09:05:32.000000000 -0700
++++ vim72/src/gui_xmdlg.c	2009-01-19 00:09:39.000000000 -0800
+@@ -369,10 +369,10 @@
+     char	buf[TEMP_BUF_SIZE];
+     XmString	items[MAX_ENTRIES_IN_LIST];
+     int		i;
+-    int		index;
++    int		idx;
+ 
+-    for (index = (int)ENCODING; index < (int)NONE; ++index)
+-	count[index] = 0;
++    for (idx = (int)ENCODING; idx < (int)NONE; ++idx)
++	count[idx] = 0;
+ 
+     /* First we insert the wild char into every single list. */
+     if (fix != ENCODING)
+@@ -503,14 +503,14 @@
+     /*
+      * Now loop trough the remaining lists and set them up.
+      */
+-    for (index = (int)NAME; index < (int)NONE; ++index)
++    for (idx = (int)NAME; idx < (int)NONE; ++idx)
+     {
+ 	Widget w;
+ 
+-	if (fix == (enum ListSpecifier)index)
++	if (fix == (enum ListSpecifier)idx)
+ 	    continue;
+ 
+-	switch ((enum ListSpecifier)index)
++	switch ((enum ListSpecifier)idx)
+ 	{
+ 	    case NAME:
+ 		w = data->list[NAME];
+@@ -525,21 +525,21 @@
+ 		w = (Widget)0;	/* for lint */
+ 	}
+ 
+-	for (i = 0; i < count[index]; ++i)
++	for (i = 0; i < count[idx]; ++i)
+ 	{
+-	    items[i] = XmStringCreateLocalized(list[index][i]);
+-	    XtFree(list[index][i]);
++	    items[i] = XmStringCreateLocalized(list[idx][i]);
++	    XtFree(list[idx][i]);
+ 	}
+ 	XmListDeleteAllItems(w);
+-	XmListAddItems(w, items, count[index], 1);
+-	if (data->sel[index])
++	XmListAddItems(w, items, count[idx], 1);
++	if (data->sel[idx])
+ 	{
+ 	    XmStringFree(items[0]);
+-	    items[0] = XmStringCreateLocalized(data->sel[index]);
++	    items[0] = XmStringCreateLocalized(data->sel[idx]);
+ 	    XmListSelectItem(w, items[0], False);
+ 	    XmListSetBottomItem(w, items[0]);
+ 	}
+-	for (i = 0; i < count[index]; ++i)
++	for (i = 0; i < count[idx]; ++i)
+ 	    XmStringFree(items[i]);
+     }
+ }
+@@ -695,14 +695,14 @@
+ 	int	    n;
+ 	XmString    str;
+ 	Arg	    args[4];
+-	char	    *msg = _("no specific match");
++	char	    *nomatch_msg = _("no specific match");
+ 
+ 	n = 0;
+-	str = XmStringCreateLocalized(msg);
++	str = XmStringCreateLocalized(nomatch_msg);
+ 	XtSetArg(args[n], XmNlabelString, str); ++n;
+ 	XtSetValues(data->sample, args, n);
+ 	apply_fontlist(data->sample);
+-	XmTextSetString(data->name, msg);
++	XmTextSetString(data->name, nomatch_msg);
+ 	XmStringFree(str);
+ 
+ 	return False;
+@@ -886,21 +886,21 @@
+     {
+ 	int	i;
+ 	int	max;
+-	int	index = 0;
++	int	idx = 0;
+ 	int	size;
+-	char	str[128];
++	char	buf[128];
+ 
+ 	for (i = 0, max = 0; i < data->num; i++)
+ 	{
+-	    get_part(fn(data, i), 7, str);
+-	    size = atoi(str);
++	    get_part(fn(data, i), 7, buf);
++	    size = atoi(buf);
+ 	    if ((size > max) && (size < MAX_DISPLAY_SIZE))
+ 	    {
+-		index = i;
++		idx = i;
+ 		max = size;
+ 	    }
+ 	}
+-	strcpy(big_font, fn(data, index));
++	strcpy(big_font, fn(data, idx));
+     }
+     data->old = XLoadQueryFont(XtDisplay(parent), big_font);
+     data->old_list = gui_motif_create_fontlist(data->old);
+@@ -1217,28 +1217,28 @@
+ 
+ 	if (i != 0)
+ 	{
+-	    char name[TEMP_BUF_SIZE];
+-	    char style[TEMP_BUF_SIZE];
+-	    char size[TEMP_BUF_SIZE];
+-	    char encoding[TEMP_BUF_SIZE];
++	    char namebuf[TEMP_BUF_SIZE];
++	    char stylebuf[TEMP_BUF_SIZE];
++	    char sizebuf[TEMP_BUF_SIZE];
++	    char encodingbuf[TEMP_BUF_SIZE];
+ 	    char *found;
+ 
+ 	    found = names[0];
+ 
+-	    name_part(found, name);
+-	    style_part(found, style);
+-	    size_part(found, size, data->in_pixels);
+-	    encoding_part(found, encoding);
+-
+-	    if (strlen(name) > 0
+-		    && strlen(style) > 0
+-		    && strlen(size) > 0
+-		    && strlen(encoding) > 0)
++	    name_part(found, namebuf);
++	    style_part(found, stylebuf);
++	    size_part(found, sizebuf, data->in_pixels);
++	    encoding_part(found, encodingbuf);
++
++	    if (strlen(namebuf) > 0
++		    && strlen(stylebuf) > 0
++		    && strlen(sizebuf) > 0
++		    && strlen(encodingbuf) > 0)
+ 	    {
+-		data->sel[NAME] = XtNewString(name);
+-		data->sel[STYLE] = XtNewString(style);
+-		data->sel[SIZE] = XtNewString(size);
+-		data->sel[ENCODING] = XtNewString(encoding);
++		data->sel[NAME] = XtNewString(namebuf);
++		data->sel[STYLE] = XtNewString(stylebuf);
++		data->sel[SIZE] = XtNewString(sizebuf);
++		data->sel[ENCODING] = XtNewString(encodingbuf);
+ 		data->font_name = XtNewString(names[0]);
+ 		display_sample(data);
+ 		XmTextSetString(data->name, data->font_name);
+diff -Naur vim72.orig/src/gui_xmebw.c vim72/src/gui_xmebw.c
+--- vim72.orig/src/gui_xmebw.c	2007-09-06 03:57:51.000000000 -0700
++++ vim72/src/gui_xmebw.c	2009-01-19 00:09:39.000000000 -0800
+@@ -1256,7 +1256,7 @@
+     }
+     else
+     {
+-	int adjust = 0;
++	adjust = 0;
+ 
+ #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
+ 	/*
+@@ -1268,12 +1268,11 @@
+ 	{
+ 	    case XmEXTERNAL_HIGHLIGHT:
+ 		adjust = (eb->primitive.highlight_thickness -
+-			(eb->pushbutton.default_button_shadow_thickness ?
+-			 Xm3D_ENHANCE_PIXEL : 0));
++			 (eb->pushbutton.default_button_shadow_thickness
++			  ?  Xm3D_ENHANCE_PIXEL : 0));
+ 		break;
+ 
+ 	    case XmINTERNAL_HIGHLIGHT:
+-		adjust = 0;
+ 		break;
+ 
+ 	    default:
+diff -Naur vim72.orig/src/if_cscope.c vim72/src/if_cscope.c
+--- vim72.orig/src/if_cscope.c	2008-06-24 09:32:34.000000000 -0700
++++ vim72/src/if_cscope.c	2009-01-19 00:07:11.000000000 -0800
+@@ -74,7 +74,7 @@
+     { "add",	cs_add,
+ 		N_("Add a new database"),     "add file|dir [pre-path] [flags]", 0 },
+     { "find",	cs_find,
+-		N_("Query for a pattern"),    FIND_USAGE, 1 },
++		N_("Query for a pattern"),    "find c|d|e|f|g|i|s|t name", 1 },
+     { "help",	cs_help,
+ 		N_("Show this message"),      "help", 0 },
+     { "kill",	cs_kill,
+@@ -1180,7 +1180,16 @@
+ 	(void)smsg((char_u *)_("%-5s: %-30s (Usage: %s)"),
+ 				      cmdp->name, _(cmdp->help), cmdp->usage);
+ 	if (strcmp(cmdp->name, "find") == 0)
+-	    MSG_PUTS(FIND_HELP);
++	    MSG_PUTS(_("\n"
++		       "       c: Find functions calling this function\n"
++		       "       d: Find functions called by this function\n"
++		       "       e: Find this egrep pattern\n"
++		       "       f: Find this file\n"
++		       "       g: Find this definition\n"
++		       "       i: Find files #including this file\n"
++		       "       s: Find this C symbol\n"
++		       "       t: Find assignments to\n"));
++
+ 	cmdp++;
+     }
+ 
+diff -Naur vim72.orig/src/if_cscope.h vim72/src/if_cscope.h
+--- vim72.orig/src/if_cscope.h	2007-09-02 07:51:08.000000000 -0700
++++ vim72/src/if_cscope.h	2009-01-19 00:07:11.000000000 -0800
+@@ -42,17 +42,6 @@
+  * f 7name	Find this file
+  * i 8name	Find files #including this file
+  */
+-#define	FIND_USAGE "find c|d|e|f|g|i|s|t name"
+-#define FIND_HELP "\n\
+-       c: Find functions calling this function\n\
+-       d: Find functions called by this function\n\
+-       e: Find this egrep pattern\n\
+-       f: Find this file\n\
+-       g: Find this definition\n\
+-       i: Find files #including this file\n\
+-       s: Find this C symbol\n\
+-       t: Find assignments to\n"
+-
+ 
+ typedef struct {
+     char *  name;
+diff -Naur vim72.orig/src/if_perl.xs vim72/src/if_perl.xs
+--- vim72.orig/src/if_perl.xs	2008-07-17 13:55:09.000000000 -0700
++++ vim72/src/if_perl.xs	2009-01-19 00:10:02.000000000 -0800
+@@ -136,6 +136,9 @@
+ #  define Perl_newXS_flags dll_Perl_newXS_flags
+ #endif
+ # define Perl_sv_free dll_Perl_sv_free
++# if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
++#  define Perl_sv_free2 dll_Perl_sv_free2
++# endif
+ # define Perl_sv_isa dll_Perl_sv_isa
+ # define Perl_sv_magic dll_Perl_sv_magic
+ # define Perl_sv_setiv dll_Perl_sv_setiv
+@@ -163,7 +166,7 @@
+ # define Perl_Isv_yes_ptr dll_Perl_Isv_yes_ptr
+ # define boot_DynaLoader dll_boot_DynaLoader
+ 
+-# define Perl_sys_init3 dll_Perl_sys_init3
++# define Perl_sys_init dll_Perl_sys_init
+ # define Perl_sys_term dll_Perl_sys_term
+ # define Perl_ISv_ptr dll_Perl_ISv_ptr
+ # define Perl_Istack_max_ptr dll_Perl_Istack_max_ptr
+@@ -268,7 +271,8 @@
+ static void (*boot_DynaLoader)_((pTHX_ CV*));
+ 
+ #if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
+-static void (*Perl_sys_init3)(int* argc, char*** argv, char*** env);
++static void (*Perl_sv_free2)(pTHX_ SV*);
++static void (*Perl_sys_init)(int* argc, char*** argv);
+ static void (*Perl_sys_term)(void);
+ static SV** (*Perl_ISv_ptr)(register PerlInterpreter*);
+ static SV*** (*Perl_Istack_max_ptr)(register PerlInterpreter*);
+@@ -367,7 +371,8 @@
+     {"Perl_TXpv_ptr", (PERL_PROC*)&Perl_TXpv_ptr},
+     {"Perl_Tna_ptr", (PERL_PROC*)&Perl_Tna_ptr},
+ #else
+-    {"Perl_sys_init3", (PERL_PROC*)&Perl_sys_init3},
++    {"Perl_sv_free2", (PERL_PROC*)&Perl_sv_free2},
++    {"Perl_sys_init", (PERL_PROC*)&Perl_sys_init},
+     {"Perl_sys_term", (PERL_PROC*)&Perl_sys_term},
+     {"Perl_ISv_ptr", (PERL_PROC*)&Perl_ISv_ptr},
+     {"Perl_Istack_sp_ptr", (PERL_PROC*)&Perl_Istack_sp_ptr},
+@@ -455,7 +460,7 @@
+     static char *argv[] = { "", "-e", "" };
+ 
+ #if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
+-    Perl_sys_init3(&argc, (char***)&argv, NULL);
++    Perl_sys_init(&argc, (char***)&argv);
+ #endif
+     perl_interp = perl_alloc();
+     perl_construct(perl_interp);
+diff -Naur vim72.orig/src/if_python.c vim72/src/if_python.c
+--- vim72.orig/src/if_python.c	2008-07-17 14:09:32.000000000 -0700
++++ vim72/src/if_python.c	2009-01-19 00:10:59.000000000 -0800
+@@ -531,6 +531,12 @@
+ 	if (PythonMod_Init())
+ 	    goto fail;
+ 
++	/* Remove the element from sys.path that was added because of our
++	 * argv[0] value in PythonMod_Init().  Previously we used an empty
++	 * string, but dependinding on the OS we then get an empty entry or
++	 * the current directory in sys.path. */
++	PyRun_SimpleString("import sys; sys.path = filter(lambda x: x != '/must>not&exist', sys.path)");
++
+ 	/* the first python thread is vim's, release the lock */
+ 	Python_SaveThread();
+ 
+@@ -1145,14 +1151,23 @@
+ 
+     /* Check if we run into a recursive loop.  The item must be in lookupDict
+      * then and we can use it again. */
+-    sprintf(ptrBuf, PRINTF_DECIMAL_LONG_U, (long_u)our_tv);
+-    result = PyDict_GetItemString(lookupDict, ptrBuf);
+-    if (result != NULL)
+-	Py_INCREF(result);
+-    else if (our_tv->v_type == VAR_STRING)
++    if ((our_tv->v_type == VAR_LIST && our_tv->vval.v_list != NULL)
++	    || (our_tv->v_type == VAR_DICT && our_tv->vval.v_dict != NULL))
++    {
++	sprintf(ptrBuf, PRINTF_DECIMAL_LONG_U,
++	        our_tv->v_type == VAR_LIST ? (long_u)our_tv->vval.v_list
++		                           : (long_u)our_tv->vval.v_dict);
++	result = PyDict_GetItemString(lookupDict, ptrBuf);
++	if (result != NULL)
++	{
++	    Py_INCREF(result);
++	    return result;
++	}
++    }
++
++    if (our_tv->v_type == VAR_STRING)
+     {
+ 	result = Py_BuildValue("s", our_tv->vval.v_string);
+-	PyDict_SetItemString(lookupDict, ptrBuf, result);
+     }
+     else if (our_tv->v_type == VAR_NUMBER)
+     {
+@@ -1161,7 +1176,6 @@
+ 	/* For backwards compatibility numbers are stored as strings. */
+ 	sprintf(buf, "%ld", (long)our_tv->vval.v_number);
+ 	result = Py_BuildValue("s", buf);
+-	PyDict_SetItemString(lookupDict, ptrBuf, result);
+     }
+ # ifdef FEAT_FLOAT
+     else if (our_tv->v_type == VAR_FLOAT)
+@@ -1170,7 +1184,6 @@
+ 
+ 	sprintf(buf, "%f", our_tv->vval.v_float);
+ 	result = Py_BuildValue("s", buf);
+-	PyDict_SetItemString(lookupDict, ptrBuf, result);
+     }
+ # endif
+     else if (our_tv->v_type == VAR_LIST)
+@@ -1179,10 +1192,11 @@
+ 	listitem_T	*curr;
+ 
+ 	result = PyList_New(0);
+-	PyDict_SetItemString(lookupDict, ptrBuf, result);
+ 
+ 	if (list != NULL)
+ 	{
++	    PyDict_SetItemString(lookupDict, ptrBuf, result);
++
+ 	    for (curr = list->lv_first; curr != NULL; curr = curr->li_next)
+ 	    {
+ 		newObj = VimToPython(&curr->li_tv, depth + 1, lookupDict);
+@@ -1194,7 +1208,6 @@
+     else if (our_tv->v_type == VAR_DICT)
+     {
+ 	result = PyDict_New();
+-	PyDict_SetItemString(lookupDict, ptrBuf, result);
+ 
+ 	if (our_tv->vval.v_dict != NULL)
+ 	{
+@@ -1203,6 +1216,8 @@
+ 	    hashitem_T	*hi;
+ 	    dictitem_T	*di;
+ 
++	    PyDict_SetItemString(lookupDict, ptrBuf, result);
++
+ 	    for (hi = ht->ht_array; todo > 0; ++hi)
+ 	    {
+ 		if (!HASHITEM_EMPTY(hi))
+@@ -2345,7 +2360,8 @@
+ {
+     PyObject *mod;
+     PyObject *dict;
+-    static char *(argv[2]) = {"", NULL};
++    /* The special value is removed from sys.path in Python_Init(). */
++    static char *(argv[2]) = {"/must>not&exist/foo", NULL};
+ 
+     /* Fixups... */
+     BufferType.ob_type = &PyType_Type;
+diff -Naur vim72.orig/src/if_xcmdsrv.c vim72/src/if_xcmdsrv.c
+--- vim72.orig/src/if_xcmdsrv.c	2008-07-18 06:05:03.000000000 -0700
++++ vim72/src/if_xcmdsrv.c	2009-01-19 00:08:50.000000000 -0800
+@@ -736,7 +736,7 @@
+ 		+ serverReply.ga_len;
+ 	    e.id = w;
+ 	    ga_init2(&e.strings, 1, 100);
+-	    memcpy(p, &e, sizeof(e));
++	    mch_memmove(p, &e, sizeof(e));
+ 	    serverReply.ga_len++;
+ 	}
+     }
+@@ -1018,7 +1018,7 @@
+ 	p++;
+ 	count = numItems - (p - regProp);
+ 	if (count > 0)
+-	    memcpy(entry, p, count);
++	    mch_memmove(entry, p, count);
+ 	XChangeProperty(dpy, RootWindow(dpy, 0), registryProperty, XA_STRING,
+ 			8, PropModeReplace, regProp,
+ 			(int)(numItems - (p - entry)));
+@@ -1072,7 +1072,7 @@
+ 		p++;
+ 		lastHalf = numItems - (p - regProp);
+ 		if (lastHalf > 0)
+-		    memcpy(entry, p, lastHalf);
++		    mch_memmove(entry, p, lastHalf);
+ 		numItems = (entry - regProp) + lastHalf;
+ 		p = entry;
+ 		continue;
+diff -Naur vim72.orig/src/main.c vim72/src/main.c
+--- vim72.orig/src/main.c	2008-07-24 01:40:56.000000000 -0700
++++ vim72/src/main.c	2009-01-19 00:09:39.000000000 -0800
+@@ -645,11 +645,12 @@
+ 
+ #ifdef FEAT_VIMINFO
+     /*
+-     * Read in registers, history etc, but not marks, from the viminfo file
++     * Read in registers, history etc, but not marks, from the viminfo file.
++     * This is where v:oldfiles gets filled.
+      */
+     if (*p_viminfo != NUL)
+     {
+-	read_viminfo(NULL, TRUE, FALSE, FALSE);
++	read_viminfo(NULL, VIF_WANT_INFO | VIF_GET_OLDFILES);
+ 	TIME_MSG("reading viminfo");
+     }
+ #endif
+@@ -1457,7 +1458,8 @@
+ 	++initstr;
+     }
+ 
+-    if (TOLOWER_ASC(initstr[0]) == 'g' || initstr[0] == 'k')
++    /* "gvim" starts the GUI.  Also accept "Gvim" for MS-Windows. */
++    if (TOLOWER_ASC(initstr[0]) == 'g')
+     {
+ 	main_start_gui();
+ #ifdef FEAT_GUI
+@@ -1508,7 +1510,8 @@
+ early_arg_scan(parmp)
+     mparm_T	*parmp;
+ {
+-#if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER)
++#if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER) \
++	|| !defined(FEAT_NETBEANS_INTG)
+     int		argc = parmp->argc;
+     char	**argv = parmp->argv;
+     int		i;
+@@ -1580,6 +1583,14 @@
+ 	else if (STRICMP(argv[i], "--echo-wid") == 0)
+ 	    echo_wid_arg = TRUE;
+ # endif
++# ifndef FEAT_NETBEANS_INTG
++	else if (strncmp(argv[i], "-nb", (size_t)3) == 0)
++        {
++            mch_errmsg(_("'-nb' cannot be used: not enabled at compile time\n"));
++            mch_exit(2);
++        }
++# endif
++
+     }
+ #endif
+ }
+@@ -2361,7 +2372,7 @@
+      * Is there any other system that cannot do this?
+      */
+     close(0);
+-    dup(2);
++    ignored = dup(2);
+ #endif
+ }
+ 
+diff -Naur vim72.orig/src/mark.c vim72/src/mark.c
+--- vim72.orig/src/mark.c	2008-08-08 15:06:49.000000000 -0700
++++ vim72/src/mark.c	2009-01-19 00:08:31.000000000 -0800
+@@ -1627,15 +1627,17 @@
+ 
+ /*
+  * Handle marks in the viminfo file:
+- * fp_out == NULL   read marks for current buffer only
+- * fp_out != NULL   copy marks for buffers not in buffer list
++ * fp_out != NULL: copy marks for buffers not in buffer list
++ * fp_out == NULL && (flags & VIF_WANT_MARKS): read marks for curbuf only
++ * fp_out == NULL && (flags & VIF_GET_OLDFILES | VIF_FORCEIT): fill v:oldfiles
+  */
+     void
+-copy_viminfo_marks(virp, fp_out, count, eof)
++copy_viminfo_marks(virp, fp_out, count, eof, flags)
+     vir_T	*virp;
+     FILE	*fp_out;
+     int		count;
+     int		eof;
++    int		flags;
+ {
+     char_u	*line = virp->vir_line;
+     buf_T	*buf;
+@@ -1647,10 +1649,23 @@
+     char_u	*p;
+     char_u	*name_buf;
+     pos_T	pos;
++#ifdef FEAT_EVAL
++    list_T	*list = NULL;
++#endif
+ 
+     if ((name_buf = alloc(LSIZE)) == NULL)
+ 	return;
+     *name_buf = NUL;
++
++#ifdef FEAT_EVAL
++    if (fp_out == NULL && (flags & (VIF_GET_OLDFILES | VIF_FORCEIT)))
++    {
++	list = list_alloc();
++	if (list != NULL)
++	    set_vim_var_list(VV_OLDFILES, list);
++    }
++#endif
++
+     num_marked_files = get_viminfo_parameter('\'');
+     while (!eof && (count < num_marked_files || fp_out == NULL))
+     {
+@@ -1681,6 +1696,11 @@
+ 	    p++;
+ 	*p = NUL;
+ 
++#ifdef FEAT_EVAL
++	if (list != NULL)
++	    list_append_string(list, str, -1);
++#endif
++
+ 	/*
+ 	 * If fp_out == NULL, load marks for current buffer.
+ 	 * If fp_out != NULL, copy marks for buffers not in buflist.
+@@ -1688,7 +1708,7 @@
+ 	load_marks = copy_marks_out = FALSE;
+ 	if (fp_out == NULL)
+ 	{
+-	    if (curbuf->b_ffname != NULL)
++	    if ((flags & VIF_WANT_MARKS) && curbuf->b_ffname != NULL)
+ 	    {
+ 		if (*name_buf == NUL)	    /* only need to do this once */
+ 		    home_replace(NULL, curbuf->b_ffname, name_buf, LSIZE, TRUE);
+diff -Naur vim72.orig/src/mbyte.c vim72/src/mbyte.c
+--- vim72.orig/src/mbyte.c	2008-07-14 05:38:05.000000000 -0700
++++ vim72/src/mbyte.c	2009-01-19 00:09:39.000000000 -0800
+@@ -717,7 +717,7 @@
+ 		     * where mblen() returns 0 for invalid character.
+ 		     * Therefore, following condition includes 0.
+ 		     */
+-		    (void)mblen(NULL, 0);	/* First reset the state. */
++		    ignored = mblen(NULL, 0);	/* First reset the state. */
+ 		    if (mblen(buf, (size_t)1) <= 0)
+ 			n = 2;
+ 		    else
+@@ -2540,7 +2540,6 @@
+     return (int)(p - q);
+ }
+ 
+-#if defined(FEAT_EVAL) || defined(PROTO)
+ /*
+  * Copy a character from "*fp" to "*tp" and advance the pointers.
+  */
+@@ -2555,7 +2554,6 @@
+     *tp += l;
+     *fp += l;
+ }
+-#endif
+ 
+ /*
+  * Return the offset from "p" to the first byte of a character.  When "p" is
+@@ -3133,7 +3131,7 @@
+ 	else
+ 	    s = p + 1;
+     }
+-    for (i = 0; s[i] != NUL && s + i < buf + sizeof(buf) - 1; ++i)
++    for (i = 0; s[i] != NUL && i < sizeof(buf) - 1; ++i)
+     {
+ 	if (s[i] == '_' || s[i] == '-')
+ 	    buf[i] = '-';
+@@ -5280,7 +5278,7 @@
+ 
+ /*ARGSUSED*/
+     static void
+-preedit_start_cbproc(XIC xic, XPointer client_data, XPointer call_data)
++preedit_start_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
+ {
+ #ifdef XIM_DEBUG
+     xim_log("xim_decide_input_style()\n");
+@@ -5314,7 +5312,7 @@
+ 
+ /*ARGSUSED*/
+     static void
+-preedit_draw_cbproc(XIC xic, XPointer client_data, XPointer call_data)
++preedit_draw_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
+ {
+     XIMPreeditDrawCallbackStruct *draw_data;
+     XIMText	*text;
+@@ -5386,7 +5384,7 @@
+ 			draw_feedback = (char *)alloc(draw_data->chg_first
+ 							      + text->length);
+ 		    else
+-			draw_feedback = realloc(draw_feedback,
++			draw_feedback = vim_realloc(draw_feedback,
+ 					 draw_data->chg_first + text->length);
+ 		    if (draw_feedback != NULL)
+ 		    {
+@@ -5455,7 +5453,7 @@
+ 
+ /*ARGSUSED*/
+     static void
+-preedit_caret_cbproc(XIC xic, XPointer client_data, XPointer call_data)
++preedit_caret_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
+ {
+ #ifdef XIM_DEBUG
+     xim_log("preedit_caret_cbproc()\n");
+@@ -5464,7 +5462,7 @@
+ 
+ /*ARGSUSED*/
+     static void
+-preedit_done_cbproc(XIC xic, XPointer client_data, XPointer call_data)
++preedit_done_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
+ {
+ #ifdef XIM_DEBUG
+     xim_log("preedit_done_cbproc()\n");
+diff -Naur vim72.orig/src/menu.c vim72/src/menu.c
+--- vim72.orig/src/menu.c	2008-06-21 12:53:43.000000000 -0700
++++ vim72/src/menu.c	2009-01-19 00:07:05.000000000 -0800
+@@ -1120,6 +1120,7 @@
+ 	parent = menu;
+ 	menu = menu->children;
+     }
++    vim_free(path_name);
+ 
+     /* Now we have found the matching menu, and we list the mappings */
+ 						    /* Highlight title */
+diff -Naur vim72.orig/src/message.c vim72/src/message.c
+--- vim72.orig/src/message.c	2008-07-09 11:24:55.000000000 -0700
++++ vim72/src/message.c	2009-01-19 00:10:51.000000000 -0800
+@@ -4556,7 +4556,13 @@
+ 			remove_trailing_zeroes = TRUE;
+ 		    }
+ 
+-		    if (fmt_spec == 'f' && abs_f > 1.0e307)
++		    if (fmt_spec == 'f' &&
++#ifdef VAX
++			    abs_f > 1.0e38
++#else
++			    abs_f > 1.0e307
++#endif
++			    )
+ 		    {
+ 			/* Avoid a buffer overflow */
+ 			strcpy(tmp, "inf");
+@@ -4585,61 +4591,62 @@
+ 			if (remove_trailing_zeroes)
+ 			{
+ 			    int i;
+-			    char *p;
++			    char *tp;
+ 
+ 			    /* Using %g or %G: remove superfluous zeroes. */
+ 			    if (fmt_spec == 'f')
+-				p = tmp + str_arg_l - 1;
++				tp = tmp + str_arg_l - 1;
+ 			    else
+ 			    {
+-				p = (char *)vim_strchr((char_u *)tmp,
++				tp = (char *)vim_strchr((char_u *)tmp,
+ 						 fmt_spec == 'e' ? 'e' : 'E');
+-				if (p != NULL)
++				if (tp != NULL)
+ 				{
+ 				    /* Remove superfluous '+' and leading
+ 				     * zeroes from the exponent. */
+-				    if (p[1] == '+')
++				    if (tp[1] == '+')
+ 				    {
+ 					/* Change "1.0e+07" to "1.0e07" */
+-					STRMOVE(p + 1, p + 2);
++					STRMOVE(tp + 1, tp + 2);
+ 					--str_arg_l;
+ 				    }
+-				    i = (p[1] == '-') ? 2 : 1;
+-				    while (p[i] == '0')
++				    i = (tp[1] == '-') ? 2 : 1;
++				    while (tp[i] == '0')
+ 				    {
+ 					/* Change "1.0e07" to "1.0e7" */
+-					STRMOVE(p + i, p + i + 1);
++					STRMOVE(tp + i, tp + i + 1);
+ 					--str_arg_l;
+ 				    }
+-				    --p;
++				    --tp;
+ 				}
+ 			    }
+ 
+-			    if (p != NULL && !precision_specified)
++			    if (tp != NULL && !precision_specified)
+ 				/* Remove trailing zeroes, but keep the one
+ 				 * just after a dot. */
+-				while (p > tmp + 2 && *p == '0' && p[-1] != '.')
++				while (tp > tmp + 2 && *tp == '0'
++							     && tp[-1] != '.')
+ 				{
+-				    STRMOVE(p, p + 1);
+-				    --p;
++				    STRMOVE(tp, tp + 1);
++				    --tp;
+ 				    --str_arg_l;
+ 				}
+ 			}
+ 			else
+ 			{
+-			    char *p;
++			    char *tp;
+ 
+ 			    /* Be consistent: some printf("%e") use 1.0e+12
+ 			     * and some 1.0e+012.  Remove one zero in the last
+ 			     * case. */
+-			    p = (char *)vim_strchr((char_u *)tmp,
++			    tp = (char *)vim_strchr((char_u *)tmp,
+ 						 fmt_spec == 'e' ? 'e' : 'E');
+-			    if (p != NULL && (p[1] == '+' || p[1] == '-')
+-					  && p[2] == '0'
+-					  && vim_isdigit(p[3])
+-					  && vim_isdigit(p[4]))
++			    if (tp != NULL && (tp[1] == '+' || tp[1] == '-')
++					  && tp[2] == '0'
++					  && vim_isdigit(tp[3])
++					  && vim_isdigit(tp[4]))
+ 			    {
+-				STRMOVE(p + 2, p + 3);
++				STRMOVE(tp + 2, tp + 3);
+ 				--str_arg_l;
+ 			    }
+ 			}
+diff -Naur vim72.orig/src/misc1.c vim72/src/misc1.c
+--- vim72.orig/src/misc1.c	2008-07-12 12:20:53.000000000 -0700
++++ vim72/src/misc1.c	2009-01-19 00:08:31.000000000 -0800
+@@ -3245,9 +3245,9 @@
+ 
+     /* When using ":silent" assume that <CR> was entered. */
+     if (mouse_used != NULL)
+-	MSG_PUTS(_("Type number or click with mouse (<Enter> cancels): "));
++	MSG_PUTS(_("Type number and <Enter> or click with mouse (empty cancels): "));
+     else
+-	MSG_PUTS(_("Choice number (<Enter> cancels): "));
++	MSG_PUTS(_("Type number and <Enter> (empty cancels): "));
+ 
+     /* Set the state such that text can be selected/copied/pasted and we still
+      * get mouse events. */
+diff -Naur vim72.orig/src/misc2.c vim72/src/misc2.c
+--- vim72.orig/src/misc2.c	2008-07-23 12:12:56.000000000 -0700
++++ vim72/src/misc2.c	2009-01-19 00:10:29.000000000 -0800
+@@ -873,7 +873,7 @@
+ 	    /* 3. check for available memory: call mch_avail_mem() */
+ 	    if (mch_avail_mem(TRUE) < KEEP_ROOM && !releasing)
+ 	    {
+-		vim_free((char *)p);	/* System is low... no go! */
++		free((char *)p);	/* System is low... no go! */
+ 		p = NULL;
+ 	    }
+ 	    else
+@@ -1257,7 +1257,6 @@
+     return escaped_string;
+ }
+ 
+-#if !defined(BACKSLASH_IN_FILENAME) || defined(FEAT_EVAL) || defined(PROTO)
+ /*
+  * Return TRUE when 'shell' has "csh" in the tail.
+  */
+@@ -1266,9 +1265,7 @@
+ {
+     return (strstr((char *)gettail(p_sh), "csh") != NULL);
+ }
+-#endif
+ 
+-#if defined(FEAT_EVAL) || defined(PROTO)
+ /*
+  * Escape "string" for use as a shell argument with system().
+  * This uses single quotes, except when we know we need to use double qoutes
+@@ -1391,7 +1388,6 @@
+ 
+     return escaped_string;
+ }
+-#endif
+ 
+ /*
+  * Like vim_strsave(), but make all characters uppercase.
+@@ -2565,7 +2561,7 @@
+     int		key;
+     int		dlen = 0;
+ 
+-    key = find_special_key(srcp, &modifiers, keycode);
++    key = find_special_key(srcp, &modifiers, keycode, FALSE);
+     if (key == 0)
+ 	return 0;
+ 
+@@ -2601,10 +2597,11 @@
+  * returns 0 if there is no match.
+  */
+     int
+-find_special_key(srcp, modp, keycode)
++find_special_key(srcp, modp, keycode, keep_x_key)
+     char_u	**srcp;
+     int		*modp;
+-    int		keycode; /* prefer key code, e.g. K_DEL instead of DEL */
++    int		keycode;     /* prefer key code, e.g. K_DEL instead of DEL */
++    int		keep_x_key;  /* don't translate xHome to Home key */
+ {
+     char_u	*last_dash;
+     char_u	*end_of_name;
+@@ -2672,7 +2669,8 @@
+ 	    else
+ 	    {
+ 		key = get_special_key_code(last_dash + 1);
+-		key = handle_x_keys(key);
++		if (!keep_x_key)
++		    key = handle_x_keys(key);
+ 	    }
+ 
+ 	    /*
+diff -Naur vim72.orig/src/move.c vim72/src/move.c
+--- vim72.orig/src/move.c	2008-07-12 09:26:47.000000000 -0700
++++ vim72/src/move.c	2009-01-19 00:09:02.000000000 -0800
+@@ -280,18 +280,20 @@
+ 
+ 	if (curwin->w_botline <= curbuf->b_ml.ml_line_count)
+ 	{
+-	    if (curwin->w_cursor.lnum < curwin->w_botline
+-		    && ((long)curwin->w_cursor.lnum
++	    if (curwin->w_cursor.lnum < curwin->w_botline)
++	    {
++	      if (((long)curwin->w_cursor.lnum
+ 					     >= (long)curwin->w_botline - p_so
+ #ifdef FEAT_FOLDING
+ 			|| hasAnyFolding(curwin)
+ #endif
+ 			))
+-	    {
++	      {
+ 		lineoff_T	loff;
+ 
+-		/* Cursor is above botline, check if there are 'scrolloff'
+-		 * window lines below the cursor.  If not, need to scroll. */
++		/* Cursor is (a few lines) above botline, check if there are
++		 * 'scrolloff' window lines below the cursor.  If not, need to
++		 * scroll. */
+ 		n = curwin->w_empty_rows;
+ 		loff.lnum = curwin->w_cursor.lnum;
+ #ifdef FEAT_FOLDING
+@@ -317,6 +319,10 @@
+ 		if (n >= p_so)
+ 		    /* sufficient context, no need to scroll */
+ 		    check_botline = FALSE;
++	      }
++	      else
++		  /* sufficient context, no need to scroll */
++		  check_botline = FALSE;
+ 	    }
+ 	    if (check_botline)
+ 	    {
+@@ -509,6 +515,9 @@
+     /* Approximate the value of w_botline */
+     wp->w_botline += lnum - wp->w_topline;
+     wp->w_topline = lnum;
++#ifdef FEAT_AUTOCMD
++    wp->w_topline_was_set = TRUE;
++#endif
+ #ifdef FEAT_DIFF
+     wp->w_topfill = 0;
+ #endif
+diff -Naur vim72.orig/src/netbeans.c vim72/src/netbeans.c
+--- vim72.orig/src/netbeans.c	2008-07-13 09:19:54.000000000 -0700
++++ vim72/src/netbeans.c	2009-01-19 00:10:45.000000000 -0800
+@@ -1043,7 +1043,7 @@
+ 	nbdebug(("EVT: %s", buf));
+ /*	nb_send(buf, "netbeans_end");    avoid "write failed" messages */
+ 	if (sd >= 0)
+-	    sock_write(sd, buf, (int)STRLEN(buf));  /* ignore errors */
++	    ignored = sock_write(sd, buf, (int)STRLEN(buf));
+     }
+ }
+ 
+@@ -2277,9 +2277,6 @@
+ 	    int serNum;
+ 	    int localTypeNum;
+ 	    int typeNum;
+-# ifdef NBDEBUG
+-	    int len;
+-# endif
+ 	    pos_T *pos;
+ 
+ 	    if (buf == NULL || buf->bufp == NULL)
+@@ -2303,13 +2300,10 @@
+ 	    pos = get_off_or_lnum(buf->bufp, &args);
+ 
+ 	    cp = (char *)args;
+-# ifdef NBDEBUG
+-	    len =
+-# endif
+-		strtol(cp, &cp, 10);
++	    ignored = (int)strtol(cp, &cp, 10);
+ 	    args = (char_u *)cp;
+ # ifdef NBDEBUG
+-	    if (len != -1)
++	    if (ignored != -1)
+ 	    {
+ 		nbdebug(("    partial line annotation -- Not Yet Implemented!\n"));
+ 	    }
+@@ -2924,44 +2918,26 @@
+ }
+ 
+ /*
+- * Tell netbeans a file was closed.
++ * Tell netbeans that a file was deleted or wiped out.
+  */
+     void
+-netbeans_file_closed(buf_T *bufp)
++netbeans_file_killed(buf_T *bufp)
+ {
+     int		bufno = nb_getbufno(bufp);
+     nbbuf_T	*nbbuf = nb_get_buf(bufno);
+     char	buffer[2*MAXPATHL];
+ 
+-    if (!haveConnection || bufno < 0)
+-	return;
+-
+-    if (!netbeansCloseFile)
+-    {
+-	nbdebug(("Ignoring file_closed for %s. File was closed from IDE\n",
+-		    bufp->b_ffname));
++    if (!haveConnection || bufno == -1)
+ 	return;
+-    }
+-
+-    nbdebug(("netbeans_file_closed:\n"));
+-    nbdebug(("    Closing bufno: %d", bufno));
+-    if (curbuf != NULL && curbuf != bufp)
+-    {
+-	nbdebug(("    Curbuf bufno:  %d\n", nb_getbufno(curbuf)));
+-    }
+-    else if (curbuf == bufp)
+-    {
+-	nbdebug(("    curbuf == bufp\n"));
+-    }
+ 
+-    if (bufno <= 0)
+-	return;
++    nbdebug(("netbeans_file_killed:\n"));
++    nbdebug(("    Killing bufno: %d", bufno));
+ 
+     sprintf(buffer, "%d:killed=%d\n", bufno, r_cmdno);
+ 
+     nbdebug(("EVT: %s", buffer));
+ 
+-    nb_send(buffer, "netbeans_file_closed");
++    nb_send(buffer, "netbeans_file_killed");
+ 
+     if (nbbuf != NULL)
+ 	nbbuf->bufp = NULL;
+diff -Naur vim72.orig/src/normal.c vim72/src/normal.c
+--- vim72.orig/src/normal.c	2008-07-31 13:03:08.000000000 -0700
++++ vim72/src/normal.c	2009-01-19 00:09:18.000000000 -0800
+@@ -183,6 +183,8 @@
+ static void	nv_cursorhold __ARGS((cmdarg_T *cap));
+ #endif
+ 
++static char *e_noident = N_("E349: No identifier under cursor");
++
+ /*
+  * Function to be called for a Normal or Visual mode command.
+  * The argument is a cmdarg_T.
+@@ -578,6 +580,9 @@
+     static int	old_mapped_len = 0;
+ #endif
+     int		idx;
++#ifdef FEAT_EVAL
++    int		set_prevcount = FALSE;
++#endif
+ 
+     vim_memset(&ca, 0, sizeof(ca));	/* also resets ca.retval */
+     ca.oap = oap;
+@@ -613,7 +618,12 @@
+     /* When not finishing an operator and no register name typed, reset the
+      * count. */
+     if (!finish_op && !oap->regname)
++    {
+ 	ca.opcount = 0;
++#ifdef FEAT_EVAL
++	set_prevcount = TRUE;
++#endif
++    }
+ 
+ #ifdef FEAT_AUTOCMD
+     /* Restore counts from before receiving K_CURSORHOLD.  This means after
+@@ -717,7 +727,15 @@
+ 	     * command, so that v:count can be used in an expression mapping
+ 	     * right after the count. */
+ 	    if (toplevel && stuff_empty())
+-		set_vcount(ca.count0, ca.count0 == 0 ? 1 : ca.count0);
++	    {
++		long count = ca.count0;
++
++		/* multiply with ca.opcount the same way as below */
++		if (ca.opcount != 0)
++		    count = ca.opcount * (count == 0 ? 1 : count);
++		set_vcount(count, count == 0 ? 1 : count, set_prevcount);
++		set_prevcount = FALSE;  /* only set v:prevcount once */
++	    }
+ #endif
+ 	    if (ctrl_w)
+ 	    {
+@@ -804,7 +822,7 @@
+      * Only set v:count when called from main() and not a stuffed command.
+      */
+     if (toplevel && stuff_empty())
+-	set_vcount(ca.count0, ca.count1);
++	set_vcount(ca.count0, ca.count1, set_prevcount);
+ #endif
+ 
+     /*
+@@ -1132,7 +1150,8 @@
+ 	out_flush();
+ #endif
+ #ifdef FEAT_AUTOCMD
+-    did_cursorhold = FALSE;
++    if (ca.cmdchar != K_IGNORE)
++	did_cursorhold = FALSE;
+ #endif
+ 
+     State = NORMAL;
+@@ -3509,7 +3528,7 @@
+ 	if (find_type & FIND_STRING)
+ 	    EMSG(_("E348: No string under cursor"));
+ 	else
+-	    EMSG(_("E349: No identifier under cursor"));
++	    EMSG(_(e_noident));
+ 	return 0;
+     }
+     ptr += col;
+@@ -5469,6 +5488,20 @@
+ 		STRCPY(buf, "he! ");
+ 	    else
+ 	    {
++		/* An external command will probably use an argument starting
++		 * with "-" as an option.  To avoid trouble we skip the "-". */
++		while (*ptr == '-' && n > 0)
++		{
++		    ++ptr;
++		    --n;
++		}
++		if (n == 0)
++		{
++		    EMSG(_(e_noident));	 /* found dashes only */
++		    vim_free(buf);
++		    return;
++		}
++
+ 		/* When a count is given, turn it into a range.  Is this
+ 		 * really what we want? */
+ 		isman = (STRCMP(kp, "man") == 0);
+@@ -5511,37 +5544,59 @@
+     /*
+      * Now grab the chars in the identifier
+      */
+-    if (cmdchar == '*')
+-	aux_ptr = (char_u *)(p_magic ? "/.*~[^$\\" : "/^$\\");
+-    else if (cmdchar == '#')
+-	aux_ptr = (char_u *)(p_magic ? "/?.*~[^$\\" : "/?^$\\");
+-    else if (cmdchar == 'K' && !kp_help)
+-	aux_ptr = (char_u *)" \t\\\"|!";
+-    else
+-	/* Don't escape spaces and Tabs in a tag with a backslash */
+-	aux_ptr = (char_u *)"\\|\"";
+-
+-    p = buf + STRLEN(buf);
+-    while (n-- > 0)
+-    {
+-	/* put a backslash before \ and some others */
+-	if (vim_strchr(aux_ptr, *ptr) != NULL)
+-	    *p++ = '\\';
+-#ifdef FEAT_MBYTE
+-	/* When current byte is a part of multibyte character, copy all bytes
+-	 * of that character. */
+-	if (has_mbyte)
++    if (cmdchar == 'K' && !kp_help)
++    {
++	/* Escape the argument properly for a shell command */
++	ptr = vim_strnsave(ptr, n);
++	p = vim_strsave_shellescape(ptr, TRUE);
++	vim_free(ptr);
++	if (p == NULL)
+ 	{
+-	    int i;
+-	    int len = (*mb_ptr2len)(ptr) - 1;
+-
+-	    for (i = 0; i < len && n >= 1; ++i, --n)
+-		*p++ = *ptr++;
++	    vim_free(buf);
++	    return;
+ 	}
++	buf = (char_u *)vim_realloc(buf, STRLEN(buf) + STRLEN(p) + 1);
++	if (buf == NULL)
++	{
++	    vim_free(buf);
++	    vim_free(p);
++	    return;
++	}
++	STRCAT(buf, p);
++	vim_free(p);
++    }
++    else
++    {
++	if (cmdchar == '*')
++	    aux_ptr = (char_u *)(p_magic ? "/.*~[^$\\" : "/^$\\");
++	else if (cmdchar == '#')
++	    aux_ptr = (char_u *)(p_magic ? "/?.*~[^$\\" : "/?^$\\");
++	else
++	    /* Don't escape spaces and Tabs in a tag with a backslash */
++	    aux_ptr = (char_u *)"\\|\"\n*?[";
++
++	p = buf + STRLEN(buf);
++	while (n-- > 0)
++	{
++	    /* put a backslash before \ and some others */
++	    if (vim_strchr(aux_ptr, *ptr) != NULL)
++		*p++ = '\\';
++#ifdef FEAT_MBYTE
++	    /* When current byte is a part of multibyte character, copy all
++	     * bytes of that character. */
++	    if (has_mbyte)
++	    {
++		int i;
++		int len = (*mb_ptr2len)(ptr) - 1;
++
++		for (i = 0; i < len && n >= 1; ++i, --n)
++		    *p++ = *ptr++;
++	    }
+ #endif
+-	*p++ = *ptr++;
++	    *p++ = *ptr++;
++	}
++	*p = NUL;
+     }
+-    *p = NUL;
+ 
+     /*
+      * Execute the command.
+diff -Naur vim72.orig/src/ops.c vim72/src/ops.c
+--- vim72.orig/src/ops.c	2008-06-21 13:08:59.000000000 -0700
++++ vim72/src/ops.c	2009-01-19 00:10:04.000000000 -0800
+@@ -2209,12 +2209,15 @@
+     {
+ 	for (; pos.lnum <= oap->end.lnum; ++pos.lnum)
+ 	{
++	    int one_change;
++
+ 	    block_prep(oap, &bd, pos.lnum, FALSE);
+ 	    pos.col = bd.textcol;
+-	    did_change = swapchars(oap->op_type, &pos, bd.textlen);
++	    one_change = swapchars(oap->op_type, &pos, bd.textlen);
++	    did_change |= one_change;
+ 
+ # ifdef FEAT_NETBEANS_INTG
+-	    if (usingNetbeans && did_change)
++	    if (usingNetbeans && one_change)
+ 	    {
+ 		char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE);
+ 
+diff -Naur vim72.orig/src/option.c vim72/src/option.c
+--- vim72.orig/src/option.c	2008-07-18 06:05:33.000000000 -0700
++++ vim72/src/option.c	2009-01-19 00:10:29.000000000 -0800
+@@ -2593,13 +2593,13 @@
+ #ifdef FEAT_VIMINFO
+ 			    (char_u *)&p_viminfo, PV_NONE,
+ #if defined(MSDOS) || defined(MSWIN) || defined(OS2)
+-			    {(char_u *)"", (char_u *)"'20,<50,s10,h,rA:,rB:"}
++			    {(char_u *)"", (char_u *)"'100,<50,s10,h,rA:,rB:"}
+ #else
+ # ifdef AMIGA
+ 			    {(char_u *)"",
+-				 (char_u *)"'20,<50,s10,h,rdf0:,rdf1:,rdf2:"}
++				 (char_u *)"'100,<50,s10,h,rdf0:,rdf1:,rdf2:"}
+ # else
+-			    {(char_u *)"", (char_u *)"'20,<50,s10,h"}
++			    {(char_u *)"", (char_u *)"'100,<50,s10,h"}
+ # endif
+ #endif
+ #else
+@@ -7974,6 +7974,11 @@
+ 	else /* curwin->w_p_scr > curwin->w_height */
+ 	    curwin->w_p_scr = curwin->w_height;
+     }
++    if (p_hi < 0)
++    {
++	errmsg = e_positive;
++	p_hi = 0;
++    }
+     if (p_report < 0)
+     {
+ 	errmsg = e_positive;
+@@ -8227,13 +8232,13 @@
+ 	    {
+ 		if (number == 0 && string != NULL)
+ 		{
+-		    int index;
++		    int idx;
+ 
+ 		    /* Either we are given a string or we are setting option
+ 		     * to zero. */
+-		    for (index = 0; string[index] == '0'; ++index)
++		    for (idx = 0; string[idx] == '0'; ++idx)
+ 			;
+-		    if (string[index] != NUL || index == 0)
++		    if (string[idx] != NUL || idx == 0)
+ 		    {
+ 			/* There's another character after zeros or the string
+ 			 * is empty.  In both cases, we are trying to set a
+@@ -8323,7 +8328,7 @@
+     {
+ 	--arg;			    /* put arg at the '<' */
+ 	modifiers = 0;
+-	key = find_special_key(&arg, &modifiers, TRUE);
++	key = find_special_key(&arg, &modifiers, TRUE, TRUE);
+ 	if (modifiers)		    /* can't handle modifiers here */
+ 	    key = 0;
+     }
+diff -Naur vim72.orig/src/os_unix.c vim72/src/os_unix.c
+--- vim72.orig/src/os_unix.c	2008-08-06 04:01:40.000000000 -0700
++++ vim72/src/os_unix.c	2009-01-19 00:09:40.000000000 -0800
+@@ -315,12 +315,15 @@
+     {-1,	    "Unknown!", FALSE}
+ };
+ 
++/*
++ * Write s[len] to the screen.
++ */
+     void
+ mch_write(s, len)
+     char_u	*s;
+     int		len;
+ {
+-    write(1, (char *)s, len);
++    ignored = (int)write(1, (char *)s, len);
+     if (p_wd)		/* Unix is too fast, slow down a bit more */
+ 	RealWaitForChar(read_cmd_fd, p_wd, NULL);
+ }
+@@ -2905,7 +2908,7 @@
+      * Ignore any errors.
+      */
+ #if defined(HAVE_SIGALTSTACK) || defined(HAVE_SIGSTACK)
+-    signal_stack = malloc(SIGSTKSZ);
++    signal_stack = (char *)alloc(SIGSTKSZ);
+     init_signal_stack();
+ #endif
+ }
+@@ -2936,7 +2939,8 @@
+     }
+ #  endif
+ # endif
+-# ifdef FEAT_X11
++    /* Don't close the display for GTK 1, it is done in exit(). */
++# if defined(FEAT_X11) && (!defined(FEAT_GUI_GTK) || defined(HAVE_GTK2))
+     if (x11_display != NULL
+ #  ifdef FEAT_XCLIPBOARD
+ 	    && x11_display != xterm_dpy
+@@ -3926,9 +3930,9 @@
+ 		 */
+ 		if (fd >= 0)
+ 		{
+-		    dup(fd); /* To replace stdin  (file descriptor 0) */
+-		    dup(fd); /* To replace stdout (file descriptor 1) */
+-		    dup(fd); /* To replace stderr (file descriptor 2) */
++		    ignored = dup(fd); /* To replace stdin  (fd 0) */
++		    ignored = dup(fd); /* To replace stdout (fd 1) */
++		    ignored = dup(fd); /* To replace stderr (fd 2) */
+ 
+ 		    /* Don't need this now that we've duplicated it */
+ 		    close(fd);
+@@ -3996,13 +4000,13 @@
+ 
+ 		    /* set up stdin/stdout/stderr for the child */
+ 		    close(0);
+-		    dup(pty_slave_fd);
++		    ignored = dup(pty_slave_fd);
+ 		    close(1);
+-		    dup(pty_slave_fd);
++		    ignored = dup(pty_slave_fd);
+ 		    if (gui.in_use)
+ 		    {
+ 			close(2);
+-			dup(pty_slave_fd);
++			ignored = dup(pty_slave_fd);
+ 		    }
+ 
+ 		    close(pty_slave_fd);    /* has been dupped, close it now */
+@@ -4013,13 +4017,13 @@
+ 		    /* set up stdin for the child */
+ 		    close(fd_toshell[1]);
+ 		    close(0);
+-		    dup(fd_toshell[0]);
++		    ignored = dup(fd_toshell[0]);
+ 		    close(fd_toshell[0]);
+ 
+ 		    /* set up stdout for the child */
+ 		    close(fd_fromshell[0]);
+ 		    close(1);
+-		    dup(fd_fromshell[1]);
++		    ignored = dup(fd_fromshell[1]);
+ 		    close(fd_fromshell[1]);
+ 
+ # ifdef FEAT_GUI
+@@ -4027,7 +4031,7 @@
+ 		    {
+ 			/* set up stderr for the child */
+ 			close(2);
+-			dup(1);
++			ignored = dup(1);
+ 		    }
+ # endif
+ 		}
+@@ -4158,7 +4162,8 @@
+ 					    && (lnum !=
+ 						    curbuf->b_ml.ml_line_count
+ 						    || curbuf->b_p_eol)))
+-				    write(toshell_fd, "\n", (size_t)1);
++				    ignored = write(toshell_fd, "\n",
++								   (size_t)1);
+ 				++lnum;
+ 				if (lnum > curbuf->b_op_end.lnum)
+ 				{
+@@ -6814,7 +6819,8 @@
+     if (xsmp_icefd != -1)
+     {
+ 	SmcCloseConnection(xsmp.smcconn, 0, NULL);
+-	vim_free(xsmp.clientid);
++	if (xsmp.clientid != NULL)
++	    free(xsmp.clientid);
+ 	xsmp.clientid = NULL;
+ 	xsmp_icefd = -1;
+     }
+diff -Naur vim72.orig/src/proto/eval.pro vim72/src/proto/eval.pro
+--- vim72.orig/src/proto/eval.pro	2008-08-09 07:31:25.000000000 -0700
++++ vim72/src/proto/eval.pro	2009-01-19 00:09:18.000000000 -0800
+@@ -17,7 +17,7 @@
+ int eval_to_bool __ARGS((char_u *arg, int *error, char_u **nextcmd, int skip));
+ char_u *eval_to_string_skip __ARGS((char_u *arg, char_u **nextcmd, int skip));
+ int skip_expr __ARGS((char_u **pp));
+-char_u *eval_to_string __ARGS((char_u *arg, char_u **nextcmd, int dolist));
++char_u *eval_to_string __ARGS((char_u *arg, char_u **nextcmd, int convert));
+ char_u *eval_to_string_safe __ARGS((char_u *arg, char_u **nextcmd, int use_sandbox));
+ int eval_to_number __ARGS((char_u *expr));
+ list_T *eval_spell_expr __ARGS((char_u *badword, char_u *expr));
+@@ -46,7 +46,9 @@
+ void list_unref __ARGS((list_T *l));
+ void list_free __ARGS((list_T *l, int recurse));
+ dictitem_T *dict_lookup __ARGS((hashitem_T *hi));
++char_u *list_find_str __ARGS((list_T *l, long idx));
+ int list_append_dict __ARGS((list_T *list, dict_T *dict));
++int list_append_string __ARGS((list_T *l, char_u *str, int len));
+ int garbage_collect __ARGS((void));
+ dict_T *dict_alloc __ARGS((void));
+ int dict_add_nr_str __ARGS((dict_T *d, char *key, long nr, char_u *str));
+@@ -58,8 +60,10 @@
+ void set_vim_var_nr __ARGS((int idx, long val));
+ long get_vim_var_nr __ARGS((int idx));
+ char_u *get_vim_var_str __ARGS((int idx));
+-void set_vcount __ARGS((long count, long count1));
++list_T *get_vim_var_list __ARGS((int idx));
++void set_vcount __ARGS((long count, long count1, int set_prevcount));
+ void set_vim_var_string __ARGS((int idx, char_u *val, int len));
++void set_vim_var_list __ARGS((int idx, list_T *val));
+ void set_reg_var __ARGS((int c));
+ char_u *v_exception __ARGS((char_u *oldval));
+ char_u *v_throwpoint __ARGS((char_u *oldval));
+@@ -94,6 +98,7 @@
+ void write_viminfo_varlist __ARGS((FILE *fp));
+ int store_session_globals __ARGS((FILE *fd));
+ void last_set_msg __ARGS((scid_T scriptID));
++void ex_oldfiles __ARGS((exarg_T *eap));
+ int modify_fname __ARGS((char_u *src, int *usedlen, char_u **fnamep, char_u **bufp, int *fnamelen));
+ char_u *do_string_sub __ARGS((char_u *str, char_u *pat, char_u *sub, char_u *flags));
+ /* vim: set ft=c : */
+diff -Naur vim72.orig/src/proto/ex_cmds.pro vim72/src/proto/ex_cmds.pro
+--- vim72.orig/src/proto/ex_cmds.pro	2008-08-09 07:31:25.000000000 -0700
++++ vim72/src/proto/ex_cmds.pro	2009-01-19 00:08:31.000000000 -0800
+@@ -11,7 +11,7 @@
+ char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp));
+ void append_redir __ARGS((char_u *buf, char_u *opt, char_u *fname));
+ int viminfo_error __ARGS((char *errnum, char *message, char_u *line));
+-int read_viminfo __ARGS((char_u *file, int want_info, int want_marks, int forceit));
++int read_viminfo __ARGS((char_u *file, int flags));
+ void write_viminfo __ARGS((char_u *file, int forceit));
+ int viminfo_readline __ARGS((vir_T *virp));
+ char_u *viminfo_readstring __ARGS((vir_T *virp, int off, int convert));
+diff -Naur vim72.orig/src/proto/ex_getln.pro vim72/src/proto/ex_getln.pro
+--- vim72.orig/src/proto/ex_getln.pro	2008-08-09 07:31:28.000000000 -0700
++++ vim72/src/proto/ex_getln.pro	2009-01-19 00:09:28.000000000 -0800
+@@ -31,7 +31,7 @@
+ void set_cmd_context __ARGS((expand_T *xp, char_u *str, int len, int col));
+ int expand_cmdline __ARGS((expand_T *xp, char_u *str, int col, int *matchcount, char_u ***matches));
+ int ExpandGeneric __ARGS((expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file, char_u *((*func)(expand_T *, int))));
+-char_u *globpath __ARGS((char_u *path, char_u *file));
++char_u *globpath __ARGS((char_u *path, char_u *file, int expand_options));
+ void init_history __ARGS((void));
+ int get_histtype __ARGS((char_u *name));
+ void add_to_history __ARGS((int histype, char_u *new_entry, int in_map, int sep));
+diff -Naur vim72.orig/src/proto/mark.pro vim72/src/proto/mark.pro
+--- vim72.orig/src/proto/mark.pro	2008-08-09 07:31:36.000000000 -0700
++++ vim72/src/proto/mark.pro	2009-01-19 00:08:31.000000000 -0800
+@@ -26,5 +26,5 @@
+ void write_viminfo_filemarks __ARGS((FILE *fp));
+ int removable __ARGS((char_u *name));
+ int write_viminfo_marks __ARGS((FILE *fp_out));
+-void copy_viminfo_marks __ARGS((vir_T *virp, FILE *fp_out, int count, int eof));
++void copy_viminfo_marks __ARGS((vir_T *virp, FILE *fp_out, int count, int eof, int flags));
+ /* vim: set ft=c : */
+diff -Naur vim72.orig/src/proto/misc2.pro vim72/src/proto/misc2.pro
+--- vim72.orig/src/proto/misc2.pro	2008-08-09 07:31:40.000000000 -0700
++++ vim72/src/proto/misc2.pro	2009-01-19 00:10:29.000000000 -0800
+@@ -59,7 +59,7 @@
+ int handle_x_keys __ARGS((int key));
+ char_u *get_special_key_name __ARGS((int c, int modifiers));
+ int trans_special __ARGS((char_u **srcp, char_u *dst, int keycode));
+-int find_special_key __ARGS((char_u **srcp, int *modp, int keycode));
++int find_special_key __ARGS((char_u **srcp, int *modp, int keycode, int keep_x_key));
+ int extract_modifiers __ARGS((int key, int *modp));
+ int find_special_key_in_table __ARGS((int c));
+ int get_special_key_code __ARGS((char_u *name));
+diff -Naur vim72.orig/src/proto/netbeans.pro vim72/src/proto/netbeans.pro
+--- vim72.orig/src/proto/netbeans.pro	2008-08-09 07:31:56.000000000 -0700
++++ vim72/src/proto/netbeans.pro	2009-01-19 00:10:45.000000000 -0800
+@@ -11,7 +11,7 @@
+ void netbeans_frame_moved __ARGS((int new_x, int new_y));
+ void netbeans_file_activated __ARGS((buf_T *bufp));
+ void netbeans_file_opened __ARGS((buf_T *bufp));
+-void netbeans_file_closed __ARGS((buf_T *bufp));
++void netbeans_file_killed __ARGS((buf_T *bufp));
+ void netbeans_inserted __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, char_u *txt, int newlen));
+ void netbeans_removed __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, long len));
+ void netbeans_unmodified __ARGS((buf_T *bufp));
+diff -Naur vim72.orig/src/pty.c vim72/src/pty.c
+--- vim72.orig/src/pty.c	2008-06-21 11:52:58.000000000 -0700
++++ vim72/src/pty.c	2009-01-19 00:07:02.000000000 -0800
+@@ -270,9 +270,10 @@
+ }
+ #endif
+ 
+-#if defined(HAVE_SVR4_PTYS) && !defined(PTY_DONE) && !defined(hpux)
++#if defined(HAVE_SVR4_PTYS) && !defined(PTY_DONE) && !defined(hpux) && !defined(MACOS_X)
+ 
+-/* NOTE: Even though HPUX can have /dev/ptmx, the code below doesn't work! */
++/* NOTE: Even though HPUX can have /dev/ptmx, the code below doesn't work!
++ * Same for Mac OS X Leopard. */
+ #define PTY_DONE
+     int
+ OpenPTY(ttyn)
+diff -Naur vim72.orig/src/screen.c vim72/src/screen.c
+--- vim72.orig/src/screen.c	2008-07-24 07:45:07.000000000 -0700
++++ vim72/src/screen.c	2009-01-19 00:08:07.000000000 -0800
+@@ -2439,9 +2439,17 @@
+ 
+ #ifdef FEAT_SYN_HL
+     /* Show 'cursorcolumn' in the fold line. */
+-    if (wp->w_p_cuc && (int)wp->w_virtcol + txtcol < W_WIDTH(wp))
+-	ScreenAttrs[off + wp->w_virtcol + txtcol] = hl_combine_attr(
+-		 ScreenAttrs[off + wp->w_virtcol + txtcol], hl_attr(HLF_CUC));
++    if (wp->w_p_cuc)
++    {
++	txtcol += wp->w_virtcol;
++	if (wp->w_p_wrap)
++	    txtcol -= wp->w_skipcol;
++	else
++	    txtcol -= wp->w_leftcol;
++	if (txtcol >= 0 && txtcol < W_WIDTH(wp))
++	    ScreenAttrs[off + txtcol] = hl_combine_attr(
++				 ScreenAttrs[off + txtcol], hl_attr(HLF_CUC));
++    }
+ #endif
+ 
+     SCREEN_LINE(row + W_WINROW(wp), W_WINCOL(wp), (int)W_WIDTH(wp),
+diff -Naur vim72.orig/src/spell.c vim72/src/spell.c
+--- vim72.orig/src/spell.c	2008-07-12 12:20:55.000000000 -0700
++++ vim72/src/spell.c	2009-01-19 00:10:18.000000000 -0800
+@@ -77,7 +77,7 @@
+ 
+ /*
+  * Do the opposite: based on a maximum end score and a known sound score,
+- * compute the the maximum word score that can be used.
++ * compute the maximum word score that can be used.
+  */
+ #define MAXSCORE(word_score, sound_score) ((4 * word_score - sound_score) / 3)
+ 
+@@ -469,6 +469,7 @@
+     garray_T	sl_comppat;	/* CHECKCOMPOUNDPATTERN items */
+     regprog_T	*sl_compprog;	/* COMPOUNDRULE turned into a regexp progrm
+ 				 * (NULL when no compounding) */
++    char_u	*sl_comprules;	/* all COMPOUNDRULE concatenated (or NULL) */
+     char_u	*sl_compstartflags; /* flags for first compound word */
+     char_u	*sl_compallflags; /* all flags for compound words */
+     char_u	sl_nobreak;	/* When TRUE: no spaces between words */
+@@ -625,7 +626,7 @@
+ /* TRUE if a word appears in the list of banned words.  */
+ #define WAS_BANNED(su, word) (!HASHITEM_EMPTY(hash_find(&su->su_banned, word)))
+ 
+-/* Number of suggestions kept when cleaning up.  we need to keep more than
++/* Number of suggestions kept when cleaning up.  We need to keep more than
+  * what is displayed, because when rescore_suggestions() is called the score
+  * may change and wrong suggestions may be removed later. */
+ #define SUG_CLEAN_COUNT(su)    ((su)->su_maxcount < 130 ? 150 : (su)->su_maxcount + 20)
+@@ -839,7 +840,10 @@
+ static void slang_clear __ARGS((slang_T *lp));
+ static void slang_clear_sug __ARGS((slang_T *lp));
+ static void find_word __ARGS((matchinf_T *mip, int mode));
++static int match_checkcompoundpattern __ARGS((char_u *ptr, int wlen, garray_T *gap));
+ static int can_compound __ARGS((slang_T *slang, char_u *word, char_u *flags));
++static int can_be_compound __ARGS((trystate_T *sp, slang_T *slang, char_u *compflags, int flag));
++static int match_compoundrule __ARGS((slang_T *slang, char_u *compflags));
+ static int valid_word_prefix __ARGS((int totprefcnt, int arridx, int flags, char_u *word, slang_T *slang, int cond_req));
+ static void find_prefix __ARGS((matchinf_T *mip, int mode));
+ static int fold_more __ARGS((matchinf_T *mip));
+@@ -1519,6 +1523,11 @@
+ 					    ((unsigned)flags >> 24)))
+ 		    continue;
+ 
++		/* If there is a match with a CHECKCOMPOUNDPATTERN rule
++		 * discard the compound word. */
++		if (match_checkcompoundpattern(ptr, wlen, &slang->sl_comppat))
++		    continue;
++
+ 		if (mode == FIND_COMPOUND)
+ 		{
+ 		    int	    capflags;
+@@ -1577,6 +1586,11 @@
+ 		    if (!can_compound(slang, fword, mip->mi_compflags))
+ 			continue;
+ 		}
++		else if (slang->sl_comprules != NULL
++			     && !match_compoundrule(slang, mip->mi_compflags))
++		    /* The compound flags collected so far do not match any
++		     * COMPOUNDRULE, discard the compounded word. */
++		    continue;
+ 	    }
+ 
+ 	    /* Check NEEDCOMPOUND: can't use word without compounding. */
+@@ -1727,6 +1741,39 @@
+ }
+ 
+ /*
++ * Return TRUE if there is a match between the word ptr[wlen] and
++ * CHECKCOMPOUNDPATTERN rules, assuming that we will concatenate with another
++ * word.
++ * A match means that the first part of CHECKCOMPOUNDPATTERN matches at the
++ * end of ptr[wlen] and the second part matches after it.
++ */
++    static int
++match_checkcompoundpattern(ptr, wlen, gap)
++    char_u	*ptr;
++    int		wlen;
++    garray_T	*gap;  /* &sl_comppat */
++{
++    int		i;
++    char_u	*p;
++    int		len;
++
++    for (i = 0; i + 1 < gap->ga_len; i += 2)
++    {
++	p = ((char_u **)gap->ga_data)[i + 1];
++	if (STRNCMP(ptr + wlen, p, STRLEN(p)) == 0)
++	{
++	    /* Second part matches at start of following compound word, now
++	     * check if first part matches at end of previous word. */
++	    p = ((char_u **)gap->ga_data)[i];
++	    len = (int)STRLEN(p);
++	    if (len <= wlen && STRNCMP(ptr + wlen - len, p, len) == 0)
++		return TRUE;
++	}
++    }
++    return FALSE;
++}
++
++/*
+  * Return TRUE if "flags" is a valid sequence of compound flags and "word"
+  * does not have too many syllables.
+  */
+@@ -1773,6 +1820,98 @@
+ }
+ 
+ /*
++ * Return TRUE when the sequence of flags in "compflags" plus "flag" can
++ * possibly form a valid compounded word.  This also checks the COMPOUNDRULE
++ * lines if they don't contain wildcards.
++ */
++    static int
++can_be_compound(sp, slang, compflags, flag)
++    trystate_T	*sp;
++    slang_T	*slang;
++    char_u	*compflags;
++    int		flag;
++{
++    /* If the flag doesn't appear in sl_compstartflags or sl_compallflags
++     * then it can't possibly compound. */
++    if (!byte_in_str(sp->ts_complen == sp->ts_compsplit
++		? slang->sl_compstartflags : slang->sl_compallflags, flag))
++	return FALSE;
++
++    /* If there are no wildcards, we can check if the flags collected so far
++     * possibly can form a match with COMPOUNDRULE patterns.  This only
++     * makes sense when we have two or more words. */
++    if (slang->sl_comprules != NULL && sp->ts_complen > sp->ts_compsplit)
++    {
++	int v;
++
++	compflags[sp->ts_complen] = flag;
++	compflags[sp->ts_complen + 1] = NUL;
++	v = match_compoundrule(slang, compflags + sp->ts_compsplit);
++	compflags[sp->ts_complen] = NUL;
++	return v;
++    }
++
++    return TRUE;
++}
++
++
++/*
++ * Return TRUE if the compound flags in compflags[] match the start of any
++ * compound rule.  This is used to stop trying a compound if the flags
++ * collected so far can't possibly match any compound rule.
++ * Caller must check that slang->sl_comprules is not NULL.
++ */
++    static int
++match_compoundrule(slang, compflags)
++    slang_T	*slang;
++    char_u	*compflags;
++{
++    char_u	*p;
++    int		i;
++    int		c;
++
++    /* loop over all the COMPOUNDRULE entries */
++    for (p = slang->sl_comprules; *p != NUL; ++p)
++    {
++	/* loop over the flags in the compound word we have made, match
++	 * them against the current rule entry */
++	for (i = 0; ; ++i)
++	{
++	    c = compflags[i];
++	    if (c == NUL)
++		/* found a rule that matches for the flags we have so far */
++		return TRUE;
++	    if (*p == '/' || *p == NUL)
++		break;  /* end of rule, it's too short */
++	    if (*p == '[')
++	    {
++		int match = FALSE;
++
++		/* compare against all the flags in [] */
++		++p;
++		while (*p != ']' && *p != NUL)
++		    if (*p++ == c)
++			match = TRUE;
++		if (!match)
++		    break;  /* none matches */
++	    }
++	    else if (*p != c)
++		break;  /* flag of word doesn't match flag in pattern */
++	    ++p;
++	}
++
++	/* Skip to the next "/", where the next pattern starts. */
++	p = vim_strchr(p, '/');
++	if (p == NULL)
++	    break;
++    }
++
++    /* Checked all the rules and none of them match the flags, so there
++     * can't possibly be a compound starting with these flags. */
++    return FALSE;
++}
++
++/*
+  * Return non-zero if the prefix indicated by "arridx" matches with the prefix
+  * ID in "flags" for the word "word".
+  * The WF_RAREPFX flag is included in the return value for a rare prefix.
+@@ -2513,9 +2652,11 @@
+     lp->sl_midword = NULL;
+ 
+     vim_free(lp->sl_compprog);
++    vim_free(lp->sl_comprules);
+     vim_free(lp->sl_compstartflags);
+     vim_free(lp->sl_compallflags);
+     lp->sl_compprog = NULL;
++    lp->sl_comprules = NULL;
+     lp->sl_compstartflags = NULL;
+     lp->sl_compallflags = NULL;
+ 
+@@ -3460,6 +3601,7 @@
+     char_u	*pp;
+     char_u	*cp;
+     char_u	*ap;
++    char_u	*crp;
+     int		cnt;
+     garray_T	*gap;
+ 
+@@ -3545,6 +3687,12 @@
+     slang->sl_compallflags = ap;
+     *ap = NUL;
+ 
++    /* And a list of all patterns in their original form, for checking whether
++     * compounding may work in match_compoundrule().  This is freed when we
++     * encounter a wildcard, the check doesn't work then. */
++    crp = alloc(todo + 1);
++    slang->sl_comprules = crp;
++
+     pp = pat;
+     *pp++ = '^';
+     *pp++ = '\\';
+@@ -3587,6 +3735,20 @@
+ 		    atstart = 0;
+ 	    }
+ 	}
++
++	/* Copy flag to "sl_comprules", unless we run into a wildcard. */
++	if (crp != NULL)
++	{
++	    if (c == '+' || c == '*')
++	    {
++		vim_free(slang->sl_comprules);
++		slang->sl_comprules = NULL;
++		crp = NULL;
++	    }
++	    else
++		*crp++ = c;
++	}
++
+ 	if (c == '/')	    /* slash separates two items */
+ 	{
+ 	    *pp++ = '\\';
+@@ -3611,6 +3773,9 @@
+     *pp++ = '$';
+     *pp = NUL;
+ 
++    if (crp != NULL)
++	*crp = NUL;
++
+     slang->sl_compprog = vim_regcomp(pat, RE_MAGIC + RE_STRING + RE_STRICT);
+     vim_free(pat);
+     if (slang->sl_compprog == NULL)
+@@ -4915,6 +5080,7 @@
+ } spellinfo_T;
+ 
+ static afffile_T *spell_read_aff __ARGS((spellinfo_T *spin, char_u *fname));
++static int is_aff_rule __ARGS((char_u **items, int itemcnt, char *rulename, int	 mincount));
+ static void aff_process_flags __ARGS((afffile_T *affile, affentry_T *entry));
+ static int spell_info_item __ARGS((char_u *s));
+ static unsigned affitem2flag __ARGS((int flagtype, char_u *item, char_u	*fname, int lnum));
+@@ -4950,7 +5116,7 @@
+ static void put_sugtime __ARGS((spellinfo_T *spin, FILE *fd));
+ static int write_vim_spell __ARGS((spellinfo_T *spin, char_u *fname));
+ static void clear_node __ARGS((wordnode_T *node));
+-static int put_node __ARGS((FILE *fd, wordnode_T *node, int index, int regionmask, int prefixtree));
++static int put_node __ARGS((FILE *fd, wordnode_T *node, int idx, int regionmask, int prefixtree));
+ static void spell_make_sugfile __ARGS((spellinfo_T *spin, char_u *wfname));
+ static int sug_filltree __ARGS((spellinfo_T *spin, slang_T *slang));
+ static int sug_maketable __ARGS((spellinfo_T *spin));
+@@ -5223,8 +5389,7 @@
+ 	/* Handle non-empty lines. */
+ 	if (itemcnt > 0)
+ 	{
+-	    if (STRCMP(items[0], "SET") == 0 && itemcnt == 2
+-						       && aff->af_enc == NULL)
++	    if (is_aff_rule(items, itemcnt, "SET", 2) && aff->af_enc == NULL)
+ 	    {
+ #ifdef FEAT_MBYTE
+ 		/* Setup for conversion from "ENC" to 'encoding'. */
+@@ -5239,7 +5404,7 @@
+ 		    smsg((char_u *)_("Conversion in %s not supported"), fname);
+ #endif
+ 	    }
+-	    else if (STRCMP(items[0], "FLAG") == 0 && itemcnt == 2
++	    else if (is_aff_rule(items, itemcnt, "FLAG", 2)
+ 					      && aff->af_flagtype == AFT_CHAR)
+ 	    {
+ 		if (STRCMP(items[1], "long") == 0)
+@@ -5284,69 +5449,71 @@
+ 			spin->si_info = p;
+ 		    }
+ 	    }
+-	    else if (STRCMP(items[0], "MIDWORD") == 0 && itemcnt == 2
++	    else if (is_aff_rule(items, itemcnt, "MIDWORD", 2)
+ 							   && midword == NULL)
+ 	    {
+ 		midword = getroom_save(spin, items[1]);
+ 	    }
+-	    else if (STRCMP(items[0], "TRY") == 0 && itemcnt == 2)
++	    else if (is_aff_rule(items, itemcnt, "TRY", 2))
+ 	    {
+ 		/* ignored, we look in the tree for what chars may appear */
+ 	    }
+ 	    /* TODO: remove "RAR" later */
+-	    else if ((STRCMP(items[0], "RAR") == 0
+-			|| STRCMP(items[0], "RARE") == 0) && itemcnt == 2
+-						       && aff->af_rare == 0)
++	    else if ((is_aff_rule(items, itemcnt, "RAR", 2)
++			|| is_aff_rule(items, itemcnt, "RARE", 2))
++							 && aff->af_rare == 0)
+ 	    {
+ 		aff->af_rare = affitem2flag(aff->af_flagtype, items[1],
+ 								 fname, lnum);
+ 	    }
+ 	    /* TODO: remove "KEP" later */
+-	    else if ((STRCMP(items[0], "KEP") == 0
+-		    || STRCMP(items[0], "KEEPCASE") == 0) && itemcnt == 2
++	    else if ((is_aff_rule(items, itemcnt, "KEP", 2)
++			|| is_aff_rule(items, itemcnt, "KEEPCASE", 2))
+ 						     && aff->af_keepcase == 0)
+ 	    {
+ 		aff->af_keepcase = affitem2flag(aff->af_flagtype, items[1],
+ 								 fname, lnum);
+ 	    }
+-	    else if (STRCMP(items[0], "BAD") == 0 && itemcnt == 2
+-						       && aff->af_bad == 0)
++	    else if ((is_aff_rule(items, itemcnt, "BAD", 2)
++			|| is_aff_rule(items, itemcnt, "FORBIDDENWORD", 2))
++							  && aff->af_bad == 0)
+ 	    {
+ 		aff->af_bad = affitem2flag(aff->af_flagtype, items[1],
+ 								 fname, lnum);
+ 	    }
+-	    else if (STRCMP(items[0], "NEEDAFFIX") == 0 && itemcnt == 2
++	    else if (is_aff_rule(items, itemcnt, "NEEDAFFIX", 2)
+ 						    && aff->af_needaffix == 0)
+ 	    {
+ 		aff->af_needaffix = affitem2flag(aff->af_flagtype, items[1],
+ 								 fname, lnum);
+ 	    }
+-	    else if (STRCMP(items[0], "CIRCUMFIX") == 0 && itemcnt == 2
++	    else if (is_aff_rule(items, itemcnt, "CIRCUMFIX", 2)
+ 						    && aff->af_circumfix == 0)
+ 	    {
+ 		aff->af_circumfix = affitem2flag(aff->af_flagtype, items[1],
+ 								 fname, lnum);
+ 	    }
+-	    else if (STRCMP(items[0], "NOSUGGEST") == 0 && itemcnt == 2
++	    else if (is_aff_rule(items, itemcnt, "NOSUGGEST", 2)
+ 						    && aff->af_nosuggest == 0)
+ 	    {
+ 		aff->af_nosuggest = affitem2flag(aff->af_flagtype, items[1],
+ 								 fname, lnum);
+ 	    }
+-	    else if (STRCMP(items[0], "NEEDCOMPOUND") == 0 && itemcnt == 2
++	    else if ((is_aff_rule(items, itemcnt, "NEEDCOMPOUND", 2)
++			|| is_aff_rule(items, itemcnt, "ONLYINCOMPOUND", 2))
+ 						     && aff->af_needcomp == 0)
+ 	    {
+ 		aff->af_needcomp = affitem2flag(aff->af_flagtype, items[1],
+ 								 fname, lnum);
+ 	    }
+-	    else if (STRCMP(items[0], "COMPOUNDROOT") == 0 && itemcnt == 2
++	    else if (is_aff_rule(items, itemcnt, "COMPOUNDROOT", 2)
+ 						     && aff->af_comproot == 0)
+ 	    {
+ 		aff->af_comproot = affitem2flag(aff->af_flagtype, items[1],
+ 								 fname, lnum);
+ 	    }
+-	    else if (STRCMP(items[0], "COMPOUNDFORBIDFLAG") == 0
+-				   && itemcnt == 2 && aff->af_compforbid == 0)
++	    else if (is_aff_rule(items, itemcnt, "COMPOUNDFORBIDFLAG", 2)
++						   && aff->af_compforbid == 0)
+ 	    {
+ 		aff->af_compforbid = affitem2flag(aff->af_flagtype, items[1],
+ 								 fname, lnum);
+@@ -5354,8 +5521,8 @@
+ 		    smsg((char_u *)_("Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line %d"),
+ 			    fname, lnum);
+ 	    }
+-	    else if (STRCMP(items[0], "COMPOUNDPERMITFLAG") == 0
+-				   && itemcnt == 2 && aff->af_comppermit == 0)
++	    else if (is_aff_rule(items, itemcnt, "COMPOUNDPERMITFLAG", 2)
++						   && aff->af_comppermit == 0)
+ 	    {
+ 		aff->af_comppermit = affitem2flag(aff->af_flagtype, items[1],
+ 								 fname, lnum);
+@@ -5363,7 +5530,7 @@
+ 		    smsg((char_u *)_("Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line %d"),
+ 			    fname, lnum);
+ 	    }
+-	    else if (STRCMP(items[0], "COMPOUNDFLAG") == 0 && itemcnt == 2
++	    else if (is_aff_rule(items, itemcnt, "COMPOUNDFLAG", 2)
+ 							 && compflags == NULL)
+ 	    {
+ 		/* Turn flag "c" into COMPOUNDRULE compatible string "c+",
+@@ -5376,7 +5543,15 @@
+ 		    compflags = p;
+ 		}
+ 	    }
+-	    else if (STRCMP(items[0], "COMPOUNDRULE") == 0 && itemcnt == 2)
++	    else if (is_aff_rule(items, itemcnt, "COMPOUNDRULES", 2))
++	    {
++		/* We don't use the count, but do check that it's a number and
++		 * not COMPOUNDRULE mistyped. */
++		if (atoi((char *)items[1]) == 0)
++		    smsg((char_u *)_("Wrong COMPOUNDRULES value in %s line %d: %s"),
++						       fname, lnum, items[1]);
++	    }
++	    else if (is_aff_rule(items, itemcnt, "COMPOUNDRULE", 2))
+ 	    {
+ 		/* Concatenate this string to previously defined ones, using a
+ 		 * slash to separate them. */
+@@ -5395,7 +5570,7 @@
+ 		    compflags = p;
+ 		}
+ 	    }
+-	    else if (STRCMP(items[0], "COMPOUNDWORDMAX") == 0 && itemcnt == 2
++	    else if (is_aff_rule(items, itemcnt, "COMPOUNDWORDMAX", 2)
+ 							      && compmax == 0)
+ 	    {
+ 		compmax = atoi((char *)items[1]);
+@@ -5403,7 +5578,7 @@
+ 		    smsg((char_u *)_("Wrong COMPOUNDWORDMAX value in %s line %d: %s"),
+ 						       fname, lnum, items[1]);
+ 	    }
+-	    else if (STRCMP(items[0], "COMPOUNDMIN") == 0 && itemcnt == 2
++	    else if (is_aff_rule(items, itemcnt, "COMPOUNDMIN", 2)
+ 							   && compminlen == 0)
+ 	    {
+ 		compminlen = atoi((char *)items[1]);
+@@ -5411,7 +5586,7 @@
+ 		    smsg((char_u *)_("Wrong COMPOUNDMIN value in %s line %d: %s"),
+ 						       fname, lnum, items[1]);
+ 	    }
+-	    else if (STRCMP(items[0], "COMPOUNDSYLMAX") == 0 && itemcnt == 2
++	    else if (is_aff_rule(items, itemcnt, "COMPOUNDSYLMAX", 2)
+ 							   && compsylmax == 0)
+ 	    {
+ 		compsylmax = atoi((char *)items[1]);
+@@ -5419,32 +5594,29 @@
+ 		    smsg((char_u *)_("Wrong COMPOUNDSYLMAX value in %s line %d: %s"),
+ 						       fname, lnum, items[1]);
+ 	    }
+-	    else if (STRCMP(items[0], "CHECKCOMPOUNDDUP") == 0 && itemcnt == 1)
++	    else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDDUP", 1))
+ 	    {
+ 		compoptions |= COMP_CHECKDUP;
+ 	    }
+-	    else if (STRCMP(items[0], "CHECKCOMPOUNDREP") == 0 && itemcnt == 1)
++	    else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDREP", 1))
+ 	    {
+ 		compoptions |= COMP_CHECKREP;
+ 	    }
+-	    else if (STRCMP(items[0], "CHECKCOMPOUNDCASE") == 0 && itemcnt == 1)
++	    else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDCASE", 1))
+ 	    {
+ 		compoptions |= COMP_CHECKCASE;
+ 	    }
+-	    else if (STRCMP(items[0], "CHECKCOMPOUNDTRIPLE") == 0
+-							      && itemcnt == 1)
++	    else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDTRIPLE", 1))
+ 	    {
+ 		compoptions |= COMP_CHECKTRIPLE;
+ 	    }
+-	    else if (STRCMP(items[0], "CHECKCOMPOUNDPATTERN") == 0
+-							      && itemcnt == 2)
++	    else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDPATTERN", 2))
+ 	    {
+ 		if (atoi((char *)items[1]) == 0)
+ 		    smsg((char_u *)_("Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"),
+ 						       fname, lnum, items[1]);
+ 	    }
+-	    else if (STRCMP(items[0], "CHECKCOMPOUNDPATTERN") == 0
+-							      && itemcnt == 3)
++	    else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDPATTERN", 3))
+ 	    {
+ 		garray_T    *gap = &spin->si_comppat;
+ 		int	    i;
+@@ -5463,24 +5635,24 @@
+ 					       = getroom_save(spin, items[2]);
+ 		}
+ 	    }
+-	    else if (STRCMP(items[0], "SYLLABLE") == 0 && itemcnt == 2
++	    else if (is_aff_rule(items, itemcnt, "SYLLABLE", 2)
+ 							  && syllable == NULL)
+ 	    {
+ 		syllable = getroom_save(spin, items[1]);
+ 	    }
+-	    else if (STRCMP(items[0], "NOBREAK") == 0 && itemcnt == 1)
++	    else if (is_aff_rule(items, itemcnt, "NOBREAK", 1))
+ 	    {
+ 		spin->si_nobreak = TRUE;
+ 	    }
+-	    else if (STRCMP(items[0], "NOSPLITSUGS") == 0 && itemcnt == 1)
++	    else if (is_aff_rule(items, itemcnt, "NOSPLITSUGS", 1))
+ 	    {
+ 		spin->si_nosplitsugs = TRUE;
+ 	    }
+-	    else if (STRCMP(items[0], "NOSUGFILE") == 0 && itemcnt == 1)
++	    else if (is_aff_rule(items, itemcnt, "NOSUGFILE", 1))
+ 	    {
+ 		spin->si_nosugfile = TRUE;
+ 	    }
+-	    else if (STRCMP(items[0], "PFXPOSTPONE") == 0 && itemcnt == 1)
++	    else if (is_aff_rule(items, itemcnt, "PFXPOSTPONE", 1))
+ 	    {
+ 		aff->af_pfxpostpone = TRUE;
+ 	    }
+@@ -5771,24 +5943,20 @@
+ 		    }
+ 		}
+ 	    }
+-	    else if (STRCMP(items[0], "FOL") == 0 && itemcnt == 2
+-							       && fol == NULL)
++	    else if (is_aff_rule(items, itemcnt, "FOL", 2) && fol == NULL)
+ 	    {
+ 		fol = vim_strsave(items[1]);
+ 	    }
+-	    else if (STRCMP(items[0], "LOW") == 0 && itemcnt == 2
+-							       && low == NULL)
++	    else if (is_aff_rule(items, itemcnt, "LOW", 2) && low == NULL)
+ 	    {
+ 		low = vim_strsave(items[1]);
+ 	    }
+-	    else if (STRCMP(items[0], "UPP") == 0 && itemcnt == 2
+-							       && upp == NULL)
++	    else if (is_aff_rule(items, itemcnt, "UPP", 2) && upp == NULL)
+ 	    {
+ 		upp = vim_strsave(items[1]);
+ 	    }
+-	    else if ((STRCMP(items[0], "REP") == 0
+-			|| STRCMP(items[0], "REPSAL") == 0)
+-		    && itemcnt == 2)
++	    else if (is_aff_rule(items, itemcnt, "REP", 2)
++		     || is_aff_rule(items, itemcnt, "REPSAL", 2))
+ 	    {
+ 		/* Ignore REP/REPSAL count */;
+ 		if (!isdigit(*items[1]))
+@@ -5819,7 +5987,7 @@
+ 					 : &spin->si_rep, items[1], items[2]);
+ 		}
+ 	    }
+-	    else if (STRCMP(items[0], "MAP") == 0 && itemcnt == 2)
++	    else if (is_aff_rule(items, itemcnt, "MAP", 2))
+ 	    {
+ 		/* MAP item or count */
+ 		if (!found_map)
+@@ -5856,9 +6024,8 @@
+ 		    ga_append(&spin->si_map, '/');
+ 		}
+ 	    }
+-	    /* Accept "SAL from to" and "SAL from to # comment". */
+-	    else if (STRCMP(items[0], "SAL") == 0
+-		    && (itemcnt == 3 || (itemcnt > 3 && items[3][0] == '#')))
++	    /* Accept "SAL from to" and "SAL from to  #comment". */
++	    else if (is_aff_rule(items, itemcnt, "SAL", 3))
+ 	    {
+ 		if (do_sal)
+ 		{
+@@ -5877,12 +6044,12 @@
+ 								: items[2]);
+ 		}
+ 	    }
+-	    else if (STRCMP(items[0], "SOFOFROM") == 0 && itemcnt == 2
++	    else if (is_aff_rule(items, itemcnt, "SOFOFROM", 2)
+ 							  && sofofrom == NULL)
+ 	    {
+ 		sofofrom = getroom_save(spin, items[1]);
+ 	    }
+-	    else if (STRCMP(items[0], "SOFOTO") == 0 && itemcnt == 2
++	    else if (is_aff_rule(items, itemcnt, "SOFOTO", 2)
+ 							    && sofoto == NULL)
+ 	    {
+ 		sofoto = getroom_save(spin, items[1]);
+@@ -5980,7 +6147,7 @@
+ 	else if (spin->si_newprefID == 0 || spin->si_newprefID == 127)
+ 	    MSG(_("Too many compound flags"));
+ 	else
+-	    MSG(_("Too many posponed prefixes and/or compound flags"));
++	    MSG(_("Too many postponed prefixes and/or compound flags"));
+     }
+ 
+     if (syllable != NULL)
+@@ -6017,6 +6184,22 @@
+ }
+ 
+ /*
++ * Return TRUE when items[0] equals "rulename", there are "mincount" items or
++ * a comment is following after item "mincount".
++ */
++    static int
++is_aff_rule(items, itemcnt, rulename, mincount)
++    char_u	**items;
++    int		itemcnt;
++    char	*rulename;
++    int		mincount;
++{
++    return (STRCMP(items[0], rulename) == 0
++	    && (itemcnt == mincount
++		|| (itemcnt > mincount && items[mincount][0] == '#')));
++}
++
++/*
+  * For affix "entry" move COMPOUNDFORBIDFLAG and COMPOUNDPERMITFLAG from
+  * ae_flags to ae_comppermit and ae_compforbid.
+  */
+@@ -7926,6 +8109,8 @@
+     char_u	*p;
+     int		rr;
+     int		retval = OK;
++    size_t	fwv = 1;  /* collect return value of fwrite() to avoid
++			     warnings from picky compiler */
+ 
+     fd = mch_fopen((char *)fname, "w");
+     if (fd == NULL)
+@@ -7936,11 +8121,11 @@
+ 
+     /* <HEADER>: <fileID> <versionnr> */
+ 							    /* <fileID> */
+-    if (fwrite(VIMSPELLMAGIC, VIMSPELLMAGICL, (size_t)1, fd) != 1)
+-    {
+-	EMSG(_(e_write));
+-	retval = FAIL;
+-    }
++    fwv &= fwrite(VIMSPELLMAGIC, VIMSPELLMAGICL, (size_t)1, fd);
++    if (fwv != (size_t)1)
++	/* Catch first write error, don't try writing more. */
++	goto theend;
++
+     putc(VIMSPELLVERSION, fd);				    /* <versionnr> */
+ 
+     /*
+@@ -7955,7 +8140,7 @@
+ 
+ 	i = (int)STRLEN(spin->si_info);
+ 	put_bytes(fd, (long_u)i, 4);			/* <sectionlen> */
+-	fwrite(spin->si_info, (size_t)i, (size_t)1, fd); /* <infotext> */
++	fwv &= fwrite(spin->si_info, (size_t)i, (size_t)1, fd); /* <infotext> */
+     }
+ 
+     /* SN_REGION: <regionname> ...
+@@ -7966,7 +8151,7 @@
+ 	putc(SNF_REQUIRED, fd);				/* <sectionflags> */
+ 	l = spin->si_region_count * 2;
+ 	put_bytes(fd, (long_u)l, 4);			/* <sectionlen> */
+-	fwrite(spin->si_region_name, (size_t)l, (size_t)1, fd);
++	fwv &= fwrite(spin->si_region_name, (size_t)l, (size_t)1, fd);
+ 							/* <regionname> ... */
+ 	regionmask = (1 << spin->si_region_count) - 1;
+     }
+@@ -8016,7 +8201,7 @@
+ 	}
+ 
+ 	put_bytes(fd, (long_u)l, 2);			/* <folcharslen> */
+-	fwrite(folchars, (size_t)l, (size_t)1, fd);	/* <folchars> */
++	fwv &= fwrite(folchars, (size_t)l, (size_t)1, fd); /* <folchars> */
+     }
+ 
+     /* SN_MIDWORD: <midword> */
+@@ -8027,7 +8212,8 @@
+ 
+ 	i = (int)STRLEN(spin->si_midword);
+ 	put_bytes(fd, (long_u)i, 4);			/* <sectionlen> */
+-	fwrite(spin->si_midword, (size_t)i, (size_t)1, fd); /* <midword> */
++	fwv &= fwrite(spin->si_midword, (size_t)i, (size_t)1, fd);
++							/* <midword> */
+     }
+ 
+     /* SN_PREFCOND: <prefcondcnt> <prefcond> ... */
+@@ -8113,7 +8299,8 @@
+ 		p = rr == 1 ? ftp->ft_from : ftp->ft_to;
+ 		l = (int)STRLEN(p);
+ 		putc(l, fd);
+-		fwrite(p, l, (size_t)1, fd);
++		if (l > 0)
++		    fwv &= fwrite(p, l, (size_t)1, fd);
+ 	    }
+ 	}
+ 
+@@ -8131,11 +8318,11 @@
+ 							/* <sectionlen> */
+ 
+ 	put_bytes(fd, (long_u)l, 2);			/* <sofofromlen> */
+-	fwrite(spin->si_sofofr, l, (size_t)1, fd);	/* <sofofrom> */
++	fwv &= fwrite(spin->si_sofofr, l, (size_t)1, fd); /* <sofofrom> */
+ 
+ 	l = (int)STRLEN(spin->si_sofoto);
+ 	put_bytes(fd, (long_u)l, 2);			/* <sofotolen> */
+-	fwrite(spin->si_sofoto, l, (size_t)1, fd);	/* <sofoto> */
++	fwv &= fwrite(spin->si_sofoto, l, (size_t)1, fd); /* <sofoto> */
+     }
+ 
+     /* SN_WORDS: <word> ...
+@@ -8160,7 +8347,7 @@
+ 		    l = (int)STRLEN(hi->hi_key) + 1;
+ 		    len += l;
+ 		    if (round == 2)			/* <word> */
+-			fwrite(hi->hi_key, (size_t)l, (size_t)1, fd);
++			fwv &= fwrite(hi->hi_key, (size_t)l, (size_t)1, fd);
+ 		    --todo;
+ 		}
+ 	    if (round == 1)
+@@ -8176,7 +8363,7 @@
+ 	putc(0, fd);					/* <sectionflags> */
+ 	l = spin->si_map.ga_len;
+ 	put_bytes(fd, (long_u)l, 4);			/* <sectionlen> */
+-	fwrite(spin->si_map.ga_data, (size_t)l, (size_t)1, fd);
++	fwv &= fwrite(spin->si_map.ga_data, (size_t)l, (size_t)1, fd);
+ 							/* <mapstr> */
+     }
+ 
+@@ -8232,10 +8419,11 @@
+ 	{
+ 	    p = ((char_u **)(spin->si_comppat.ga_data))[i];
+ 	    putc((int)STRLEN(p), fd);			/* <comppatlen> */
+-	    fwrite(p, (size_t)STRLEN(p), (size_t)1, fd);/* <comppattext> */
++	    fwv &= fwrite(p, (size_t)STRLEN(p), (size_t)1, fd);
++							/* <comppattext> */
+ 	}
+ 							/* <compflags> */
+-	fwrite(spin->si_compflags, (size_t)STRLEN(spin->si_compflags),
++	fwv &= fwrite(spin->si_compflags, (size_t)STRLEN(spin->si_compflags),
+ 							       (size_t)1, fd);
+     }
+ 
+@@ -8259,7 +8447,8 @@
+ 
+ 	l = (int)STRLEN(spin->si_syllable);
+ 	put_bytes(fd, (long_u)l, 4);			/* <sectionlen> */
+-	fwrite(spin->si_syllable, (size_t)l, (size_t)1, fd); /* <syllable> */
++	fwv &= fwrite(spin->si_syllable, (size_t)l, (size_t)1, fd);
++							/* <syllable> */
+     }
+ 
+     /* end of <SECTIONS> */
+@@ -8295,13 +8484,18 @@
+ 	(void)put_node(fd, tree, 0, regionmask, round == 3);
+     }
+ 
+-    /* Write another byte to check for errors. */
++    /* Write another byte to check for errors (file system full). */
+     if (putc(0, fd) == EOF)
+ 	retval = FAIL;
+-
++theend:
+     if (fclose(fd) == EOF)
+ 	retval = FAIL;
+ 
++    if (fwv != (size_t)1)
++	retval = FAIL;
++    if (retval == FAIL)
++	EMSG(_(e_write));
++
+     return retval;
+ }
+ 
+@@ -9890,6 +10084,7 @@
+     char_u	*p;
+     int		len;
+     int		totlen;
++    size_t	x = 1;  /* collect return value of fwrite() */
+ 
+     if (fd != NULL)
+ 	put_bytes(fd, (long_u)gap->ga_len, 2);	    /* <prefcondcnt> */
+@@ -9906,7 +10101,7 @@
+ 	    if (fd != NULL)
+ 	    {
+ 		fputc(len, fd);
+-		fwrite(p, (size_t)len, (size_t)1, fd);
++		x &= fwrite(p, (size_t)len, (size_t)1, fd);
+ 	    }
+ 	    totlen += len;
+ 	}
+@@ -11480,15 +11675,24 @@
+ 		    vim_strncpy(preword + sp->ts_prewordlen,
+ 			    tword + sp->ts_splitoff,
+ 			    sp->ts_twordlen - sp->ts_splitoff);
+-		    p = preword;
+-		    while (*skiptowhite(p) != NUL)
+-			p = skipwhite(skiptowhite(p));
+-		    if (fword_ends && !can_compound(slang, p,
+-						compflags + sp->ts_compsplit))
+-			/* Compound is not allowed.  But it may still be
+-			 * possible if we add another (short) word. */
++
++		    /* Verify CHECKCOMPOUNDPATTERN  rules. */
++		    if (match_checkcompoundpattern(preword,  sp->ts_prewordlen,
++							  &slang->sl_comppat))
+ 			compound_ok = FALSE;
+ 
++		    if (compound_ok)
++		    {
++			p = preword;
++			while (*skiptowhite(p) != NUL)
++			    p = skipwhite(skiptowhite(p));
++			if (fword_ends && !can_compound(slang, p,
++						compflags + sp->ts_compsplit))
++			    /* Compound is not allowed.  But it may still be
++			     * possible if we add another (short) word. */
++			    compound_ok = FALSE;
++		    }
++
+ 		    /* Get pointer to last char of previous word. */
+ 		    p = preword + sp->ts_prewordlen;
+ 		    mb_ptr_back(preword, p);
+@@ -11685,10 +11889,9 @@
+ 			&& (slang->sl_compsylmax < MAXWLEN
+ 			    || sp->ts_complen + 1 - sp->ts_compsplit
+ 							  < slang->sl_compmax)
+-			&& (byte_in_str(sp->ts_complen == sp->ts_compsplit
+-					    ? slang->sl_compstartflags
+-					    : slang->sl_compallflags,
+-						    ((unsigned)flags >> 24))))
++			&& (can_be_compound(sp, slang,
++					 compflags, ((unsigned)flags >> 24))))
++
+ 		{
+ 		    try_compound = TRUE;
+ 		    compflags[sp->ts_complen] = ((unsigned)flags >> 24);
+diff -Naur vim72.orig/src/structs.h vim72/src/structs.h
+--- vim72.orig/src/structs.h	2008-07-30 13:02:50.000000000 -0700
++++ vim72/src/structs.h	2009-01-19 00:09:02.000000000 -0800
+@@ -459,7 +459,7 @@
+ typedef struct
+ {
+     int		hide;			/* TRUE when ":hide" was used */
+-# ifdef FEAT_BROWSE
++# ifdef FEAT_BROWSE_CMD
+     int		browse;			/* TRUE to invoke file dialog */
+ # endif
+ # ifdef FEAT_WINDOWS
+@@ -1784,10 +1784,15 @@
+ #endif
+ 
+     /*
+-     * The next three specify the offsets for displaying the buffer:
++     * "w_topline", "w_leftcol" and "w_skipcol" specify the offsets for
++     * displaying the buffer.
+      */
+     linenr_T	w_topline;	    /* buffer line number of the line at the
+ 				       top of the window */
++#ifdef FEAT_AUTOCMD
++    char	w_topline_was_set;  /* flag set to TRUE when topline is set,
++				       e.g. by winrestview() */
++#endif
+ #ifdef FEAT_DIFF
+     int		w_topfill;	    /* number of filler lines above w_topline */
+     int		w_old_topfill;	    /* w_topfill at last redraw */
+diff -Naur vim72.orig/src/tag.c vim72/src/tag.c
+--- vim72.orig/src/tag.c	2008-07-16 14:31:30.000000000 -0700
++++ vim72/src/tag.c	2009-01-19 00:10:57.000000000 -0800
+@@ -515,7 +515,7 @@
+ 	     * If a count is supplied to the ":tag <name>" command, then
+ 	     * jump to count'th matching tag.
+ 	     */
+-	    if (type == DT_TAG && count > 0)
++	    if (type == DT_TAG && *tag != NUL && count > 0)
+ 		cur_match = count - 1;
+ 
+ 	    if (type == DT_SELECT || type == DT_JUMP
+@@ -2725,7 +2725,24 @@
+ 	 */
+ 	p_7f = vim_strchr(lbuf, 0x7f);
+ 	if (p_7f == NULL)
++	{
++etag_fail:
++	    if (vim_strchr(lbuf, '\n') == NULL)
++	    {
++		/* Truncated line.  Ignore it. */
++		if (p_verbose >= 5)
++		{
++		    verbose_enter();
++		    MSG(_("Ignoring long line in tags file"));
++		    verbose_leave();
++		}
++		tagp->command = lbuf;
++		tagp->tagname = lbuf;
++		tagp->tagname_end = lbuf;
++		return OK;
++	    }
+ 	    return FAIL;
++	}
+ 
+ 	/* Find ^A.  If not found the line number is after the 0x7f */
+ 	p = vim_strchr(p_7f, Ctrl_A);
+@@ -2735,7 +2752,7 @@
+ 	    ++p;
+ 
+ 	if (!VIM_ISDIGIT(*p))	    /* check for start of line number */
+-	    return FAIL;
++	    goto etag_fail;
+ 	tagp->command = p;
+ 
+ 
+@@ -2749,7 +2766,7 @@
+ 	    /* find end of tagname */
+ 	    for (p = p_7f - 1; !vim_iswordc(*p); --p)
+ 		if (p == lbuf)
+-		    return FAIL;
++		    goto etag_fail;
+ 	    tagp->tagname_end = p + 1;
+ 	    while (p >= lbuf && vim_iswordc(*p))
+ 		--p;
+diff -Naur vim72.orig/src/testdir/Make_ming.mak vim72/src/testdir/Make_ming.mak
+--- vim72.orig/src/testdir/Make_ming.mak	1969-12-31 16:00:00.000000000 -0800
++++ vim72/src/testdir/Make_ming.mak	2009-01-19 00:08:05.000000000 -0800
+@@ -0,0 +1,91 @@
++# Makefile to run tests for Vim, on Dos-like machines
++# with sh.exe or zsh.exe in the path or not.
++#
++# Author: Bill McCarthy
++#
++# Note that test54 has been removed until it is fixed.
++#
++# Requires a set of Unix tools: echo, diff, etc.
++
++ifneq (sh.exe, $(SHELL))
++DEL = rm -f
++MV = mv
++CP = cp
++DIRSLASH = /
++else
++DEL = del
++MV = rename
++CP = copy
++DIRSLASH = \\
++endif
++
++VIMPROG = ..$(DIRSLASH)vim
++
++# Omitted:
++# test2		"\\tmp" doesn't work.
++# test10	'errorformat' is different
++# test12	can't unlink a swap file
++# test25	uses symbolic link
++# test27	can't edit file with "*" in file name
++# test31	16 bit version runs out of memory...
++
++SCRIPTS16 =	test1.out test19.out test20.out test22.out \
++		test23.out test24.out test28.out test29.out \
++		test35.out test36.out test43.out \
++		test44.out test45.out test46.out test47.out \
++		test48.out test51.out test53.out            \
++		test55.out test56.out test57.out test58.out test59.out \
++		test60.out test61.out test62.out test63.out test64.out
++
++# Had to remove test54 which doesn't work yet.
++#		                                 test54.out
++
++SCRIPTS =	test3.out test4.out test5.out test6.out test7.out \
++		test8.out test9.out test11.out test13.out test14.out \
++		test15.out test17.out test18.out test21.out test26.out \
++		test30.out test31.out test32.out test33.out test34.out \
++		test37.out test38.out test39.out test40.out test41.out \
++		test42.out test52.out test65.out
++
++SCRIPTS32 =	test50.out
++
++SCRIPTS_GUI = test16.out
++
++.SUFFIXES: .in .out
++
++vimall:	fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS32)
++	echo ALL DONE
++
++nongui:	fixff $(SCRIPTS16) $(SCRIPTS)
++	echo ALL DONE
++
++small:
++	echo ALL DONE
++
++gui:	fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI)
++	echo ALL DONE
++
++win32:	fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32)
++	echo ALL DONE
++
++fixff:
++	-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
++
++clean:
++	-$(DEL) *.out
++	-$(DEL) test.ok
++	-$(DEL) small.vim
++	-$(DEL) tiny.vim
++	-$(DEL) mbyte.vim
++	-$(DEL) X*
++	-$(DEL) viminfo
++
++.in.out:
++	$(CP) $*.ok test.ok
++	$(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $*.in
++	diff test.out $*.ok
++	-$(DEL) $*.out
++	$(MV) test.out $*.out
++	-$(DEL) X*
++	-$(DEL) test.ok
++	-$(DEL) viminfo
+diff -Naur vim72.orig/src/testdir/Makefile vim72/src/testdir/Makefile
+--- vim72.orig/src/testdir/Makefile	2008-06-19 13:29:46.000000000 -0700
++++ vim72/src/testdir/Makefile	2009-01-19 00:07:44.000000000 -0800
+@@ -26,15 +26,17 @@
+ 
+ .SUFFIXES: .in .out
+ 
+-nongui:	nolog $(SCRIPTS)
+-	@echo
+-	@cat test.log
+-	@echo ALL DONE
++nongui:	nolog $(SCRIPTS) report
++
++gui:	nolog $(SCRIPTS) $(SCRIPTS_GUI) report
+ 
+-gui:	nolog $(SCRIPTS) $(SCRIPTS_GUI)
++report:
+ 	@echo
+-	@cat test.log
+-	@echo ALL DONE
++	@echo 'Test results:'
++	@/bin/sh -c "if test -f test.log; \
++		then cat test.log; echo TEST FAILURE; exit 1; \
++		else echo ALL DONE; \
++		fi"
+ 
+ $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
+ 
+@@ -71,4 +73,4 @@
+ test60.out: test60.vim
+ 
+ nolog:
+-	-echo Test results: >test.log
++	-rm -f test.log
+diff -Naur vim72.orig/src/testdir/test42.ok vim72/src/testdir/test42.ok
+--- vim72.orig/src/testdir/test42.ok	2008-02-20 04:27:37.000000000 -0800
++++ vim72/src/testdir/test42.ok	2009-01-19 00:08:36.000000000 -0800
+@@ -20,7 +20,7 @@
+ ucs-2
+ 
+ 
+-  fileencoding=ucs-2le
++  fileencoding=utf-16le
+   bomb
+ ucs-2le
+ 
+diff -Naur vim72.orig/src/ui.c vim72/src/ui.c
+--- vim72.orig/src/ui.c	2008-07-14 11:14:56.000000000 -0700
++++ vim72/src/ui.c	2009-01-19 00:09:40.000000000 -0800
+@@ -1820,7 +1820,7 @@
+ #ifdef HAVE_DUP
+ 	    /* Use stderr for stdin, also works for shell commands. */
+ 	    close(0);
+-	    dup(2);
++	    ignored = dup(2);
+ #else
+ 	    read_cmd_fd = 2;	/* read from stderr instead of stdin */
+ #endif
+@@ -2020,7 +2020,7 @@
+ 
+     if (value == NULL || *length == 0)
+     {
+-	clip_free_selection(cbd);	/* ???  [what's the query?] */
++	clip_free_selection(cbd);	/* nothing received, clear register */
+ 	*(int *)success = FALSE;
+ 	return;
+     }
+@@ -2076,7 +2076,7 @@
+ 	text_prop.value = (unsigned char *)value;
+ 	text_prop.encoding = *type;
+ 	text_prop.format = *format;
+-	text_prop.nitems = STRLEN(value);
++	text_prop.nitems = len;
+ 	status = XmbTextPropertyToTextList(X_DISPLAY, &text_prop,
+ 							 &text_list, &n_text);
+ 	if (status != Success || n_text < 1)
+@@ -2110,6 +2110,8 @@
+     int		i;
+     int		nbytes = 0;
+     char_u	*buffer;
++    time_t	start_time;
++    int		timed_out = FALSE;
+ 
+     for (i =
+ #ifdef FEAT_MBYTE
+@@ -2129,6 +2131,7 @@
+ 	    case 3:  type = text_atom;		break;
+ 	    default: type = XA_STRING;
+ 	}
++	success = MAYBE;
+ 	XtGetSelectionValue(myShell, cbd->sel_atom, type,
+ 	    clip_x11_request_selection_cb, (XtPointer)&success, CurrentTime);
+ 
+@@ -2141,27 +2144,48 @@
+ 	 * characters, then they will appear before the one that requested the
+ 	 * paste!  Don't worry, we will catch up with any other events later.
+ 	 */
+-	for (;;)
++	start_time = time(NULL);
++	while (success == MAYBE)
+ 	{
+-	    if (XCheckTypedEvent(dpy, SelectionNotify, &event))
+-		break;
+-	    if (XCheckTypedEvent(dpy, SelectionRequest, &event))
+-		/* We may get a SelectionRequest here and if we don't handle
+-		 * it we hang.  KDE klipper does this, for example. */
++	    if (XCheckTypedEvent(dpy, SelectionNotify, &event)
++		    || XCheckTypedEvent(dpy, SelectionRequest, &event)
++		    || XCheckTypedEvent(dpy, PropertyNotify, &event))
++	    {
++		/* This is where clip_x11_request_selection_cb() should be
++		 * called.  It may actually happen a bit later, so we loop
++		 * until "success" changes.
++		 * We may get a SelectionRequest here and if we don't handle
++		 * it we hang.  KDE klipper does this, for example.
++		 * We need to handle a PropertyNotify for large selections. */
+ 		XtDispatchEvent(&event);
++		continue;
++	    }
++
++	    /* Time out after 2 to 3 seconds to avoid that we hang when the
++	     * other process doesn't respond.  Note that the SelectionNotify
++	     * event may still come later when the selection owner comes back
++	     * to life and the text gets inserted unexpectedly.  Don't know
++	     * why that happens or how to avoid that :-(. */
++	    if (time(NULL) > start_time + 2)
++	    {
++		timed_out = TRUE;
++		break;
++	    }
+ 
+ 	    /* Do we need this?  Probably not. */
+ 	    XSync(dpy, False);
+ 
+-	    /* Bernhard Walle solved a slow paste response in an X terminal by
+-	     * adding: usleep(10000); here. */
++	    /* Wait for 1 msec to avoid that we eat up all CPU time. */
++	    ui_delay(1L, TRUE);
+ 	}
+ 
+-	/* this is where clip_x11_request_selection_cb() is actually called */
+-	XtDispatchEvent(&event);
+-
+-	if (success)
++	if (success == TRUE)
+ 	    return;
++
++	/* don't do a retry with another type after timing out, otherwise we
++	 * hang for 15 seconds. */
++	if (timed_out)
++	    break;
+     }
+ 
+     /* Final fallback position - use the X CUT_BUFFER0 store */
+diff -Naur vim72.orig/src/version.c vim72/src/version.c
+--- vim72.orig/src/version.c	2008-08-09 07:24:52.000000000 -0700
++++ vim72/src/version.c	2009-01-19 00:10:59.000000000 -0800
+@@ -677,9 +677,176 @@
+ static int included_patches[] =
+ {   /* Add new patch number below this line */
+ /**/
++    84,
++/**/
++    83,
++/**/
++    82,
++/**/
++    81,
++/**/
++    80,
++/**/
++    79,
++/**/
++    78,
++/**/
++    77,
++/**/
++    76,
++/**/
++    75,
++/**/
++    73,
++/**/
++    70,
++/**/
++    69,
++/**/
++    68,
++/**/
++    67,
++/**/
++    66,
++/**/
++    65,
++/**/
++    64,
++/**/
++    63,
++/**/
++    62,
++/**/
++    61,
++/**/
++    60,
++/**/
++    59,
++/**/
++    58,
++/**/
++    57,
++/**/
++    56,
++/**/
++    55,
++/**/
++    54,
++/**/
++    53,
++/**/
++    52,
++/**/
++    51,
++/**/
++    50,
++/**/
++    48,
++/**/
++    47,
++/**/
++    46,
++/**/
++    45,
++/**/
++    44,
++/**/
++    43,
++/**/
++    42,
++/**/
++    40,
++/**/
++    39,
++/**/
++    38,
++/**/
++    37,
++/**/
++    35,
++/**/
++    34,
++/**/
++    33,
++/**/
++    32,
++/**/
++    31,
++/**/
++    30,
++/**/
++    29,
++/**/
++    28,
++/**/
++    27,
++/**/
++    26,
++/**/
++    25,
++/**/
++    24,
++/**/
++    23,
++/**/
++    22,
++/**/
++    21,
++/**/
++    20,
++/**/
++    19,
++/**/
++    18,
++/**/
++    17,
++/**/
++    16,
++/**/
++    15,
++/**/
++    14,
++/**/
++    13,
++/**/
++    12,
++/**/
++    11,
++/**/
++    10,
++/**/
++    9,
++/**/
++    8,
++/**/
++    6,
++/**/
++    5,
++/**/
++    4,
++/**/
++    3,
++/**/
++    2,
++/**/
++    1,
++/**/
+     0
+ };
+ 
++/*
++ * Place to put a short description when adding a feature with a patch.
++ * Keep it short, e.g.,: "relative numbers", "persistent undo".
++ * Also add a comment marker to separate the lines.
++ * See the official Vim patches for the diff format: It must use a context of
++ * one line only.  Create it by hand or use "diff -C2" and edit the patch.
++ */
++static char *(extra_patches[]) =
++{   /* Add your patch description below this line */
++/**/
++    NULL
++};
++
+     int
+ highest_patch()
+ {
+@@ -786,7 +953,7 @@
+     MSG_PUTS(_("\nRISC OS version"));
+ #endif
+ #ifdef VMS
+-    MSG_PUTS("\nOpenVMS version");
++    MSG_PUTS(_("\nOpenVMS version"));
+ # ifdef HAVE_PATHDEF
+     if (*compiled_arch != NUL)
+     {
+@@ -825,6 +992,19 @@
+ 	}
+     }
+ 
++    /* Print the list of extra patch descriptions if there is at least one. */
++    if (extra_patches[0] != NULL)
++    {
++	MSG_PUTS(_("\nExtra patches: "));
++	s = "";
++	for (i = 0; extra_patches[i] != NULL; ++i)
++	{
++	    MSG_PUTS(s);
++	    s = ", ";
++	    MSG_PUTS(extra_patches[i]);
++	}
++    }
++
+ #ifdef MODIFIED_BY
+     MSG_PUTS("\n");
+     MSG_PUTS(_("Modified by "));
+diff -Naur vim72.orig/src/vim.h vim72/src/vim.h
+--- vim72.orig/src/vim.h	2008-08-09 09:03:38.000000000 -0700
++++ vim72/src/vim.h	2009-01-19 00:09:15.000000000 -0800
+@@ -341,8 +341,14 @@
+ #ifdef BACKSLASH_IN_FILENAME
+ # define PATH_ESC_CHARS ((char_u *)" \t\n*?[{`%#'\"|!<")
+ #else
+-# define PATH_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<")
+-# define SHELL_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<>();&")
++# ifdef VMS
++    /* VMS allows a lot of characters in the file name */
++#  define PATH_ESC_CHARS ((char_u *)" \t\n*?{`\\%#'\"|!")
++#  define SHELL_ESC_CHARS ((char_u *)" \t\n*?{`\\%#'|!()&")
++# else
++#  define PATH_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<")
++#  define SHELL_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<>();&")
++# endif
+ #endif
+ 
+ #define NUMBUFLEN 30	    /* length of a buffer to store a number in ASCII */
+@@ -370,7 +376,7 @@
+    * Define __w64 as an empty token for everything but MSVC 7.x or later.
+    */
+ # if !defined(_MSC_VER)	|| (_MSC_VER < 1300)
+-#  define __w64 
++#  define __w64
+ # endif
+ typedef unsigned long __w64	long_u;
+ typedef		 long __w64     long_i;
+@@ -1728,7 +1734,8 @@
+ #define VV_MOUSE_COL	51
+ #define VV_OP		52
+ #define VV_SEARCHFORWARD 53
+-#define VV_LEN		54	/* number of v: vars */
++#define VV_OLDFILES	54
++#define VV_LEN		55	/* number of v: vars */
+ 
+ #ifdef FEAT_CLIPBOARD
+ 
+@@ -1979,6 +1986,9 @@
+ # endif
+ #endif
+ 
++#ifndef FEAT_NETBEANS_INTG
++# undef NBDEBUG
++#endif
+ #ifdef NBDEBUG /* Netbeans debugging. */
+ # include "nbdebug.h"
+ #else
+@@ -2054,4 +2064,10 @@
+ #define DOSO_VIMRC	1	/* loading vimrc file */
+ #define DOSO_GVIMRC	2	/* loading gvimrc file */
+ 
++/* flags for read_viminfo() and children */
++#define VIF_WANT_INFO		1	/* load non-mark info */
++#define VIF_WANT_MARKS		2	/* load file marks */
++#define VIF_FORCEIT		4	/* overwrite info already read */
++#define VIF_GET_OLDFILES	8	/* load v:oldfiles */
++
+ #endif /* VIM__H */
+diff -Naur vim72.orig/src/window.c vim72/src/window.c
+--- vim72.orig/src/window.c	2008-08-06 04:00:30.000000000 -0700
++++ vim72/src/window.c	2009-01-19 00:09:40.000000000 -0800
+@@ -4028,14 +4028,14 @@
+ 	    if (mch_dirname(cwd, MAXPATHL) == OK)
+ 		globaldir = vim_strsave(cwd);
+ 	}
+-	mch_chdir((char *)curwin->w_localdir);
+-	shorten_fnames(TRUE);
++	if (mch_chdir((char *)curwin->w_localdir) == 0)
++	    shorten_fnames(TRUE);
+     }
+     else if (globaldir != NULL)
+     {
+ 	/* Window doesn't have a local directory and we are not in the global
+ 	 * directory: Change to the global directory. */
+-	mch_chdir((char *)globaldir);
++	ignored = mch_chdir((char *)globaldir);
+ 	vim_free(globaldir);
+ 	globaldir = NULL;
+ 	shorten_fnames(TRUE);
+diff -Naur vim72.orig/src/workshop.c vim72/src/workshop.c
+--- vim72.orig/src/workshop.c	2008-06-21 11:53:26.000000000 -0700
++++ vim72/src/workshop.c	2009-01-19 00:09:33.000000000 -0800
+@@ -1121,8 +1121,12 @@
+ 				      ? (char *)curbuf->b_sfname : "<None>");
+ #endif
+ 
+-    strcpy(ffname, (char *) curbuf->b_ffname);
+-    *filename = ffname;		/* copy so nobody can change b_ffname */
++    if (curbuf->b_ffname == NULL)
++	ffname[0] = NUL;
++    else
++	/* copy so nobody can change b_ffname */
++	strcpy(ffname, (char *) curbuf->b_ffname);
++    *filename = ffname;
+     *curLine = curwin->w_cursor.lnum;
+     *curCol = curwin->w_cursor.col;
+ 
