Changeset 711c29d6 for patches

Timestamp:

01/08/11 15:25:06 (14 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

7c23afb

Parents:

5f1d44b

Message:

Updated the NCurses Branch Update Patch to -22.

File:

• patches/ncurses-5.7-branch_update-22.patch (moved) (moved from patches/ncurses-5.7-branch_update-21.patch ) (3189 diffs)

patches/ncurses-5.7-branch_update-22.patch

@@ -22 +22 @@
              ncurses-5.7-20100724.patch.gz
              ncurses-5.7-20100731.patch.gz
+             ncurses-5.7-20100807.patch.gz
+             ncurses-5.7-20100814.patch.gz
+             ncurses-5.7-20100828.patch.gz
+             ncurses-5.7-20100904.patch.gz
+             ncurses-5.7-20100911.patch.gz
+             ncurses-5.7-20100918.patch.gz
+             ncurses-5.7-20100925.patch.gz
+             ncurses-5.7-20101002.patch.gz
+             ncurses-5.7-20101009.patch.gz
+             ncurses-5.7-20101023.patch.gz
+             ncurses-5.7-20101106.patch.gz
+             ncurses-5.7-20101113.patch.gz
+             ncurses-5.7-20101120.patch.gz
+             ncurses-5.7-20101127.patch.gz
+             ncurses-5.7-20101128.patch.gz
+             ncurses-5.7-20101204.patch.gz
+             ncurses-5.7-20101211.patch.gz
+             ncurses-5.7-20101225.patch.gz
+             ncurses-5.7-20110101.patch.gz
+
 
 
 diff -Naur ncurses-5.7.orig/Ada95/Makefile.in ncurses-5.7/Ada95/Makefile.in
---- ncurses-5.7.orig/Ada95/Makefile.in  2003-10-25 15:39:18.000000000 +0000
-+++ ncurses-5.7/Ada95/Makefile.in       2010-08-02 00:57:09.593590289 +0000
+--- ncurses-5.7.orig/Ada95/Makefile.in  2003-10-25 11:39:18.000000000 -0400
++++ ncurses-5.7/Ada95/Makefile.in       2011-01-08 18:18:29.554659961 -0500
 @@ -1,5 +1,6 @@
-+# $Id: Makefile.in,v 1.20 2010/06/12 19:03:37 tom Exp $
++# $Id: Makefile.in,v 1.21 2010/11/27 21:45:27 tom Exp $
  ##############################################################################
 -# Copyright (c) 1998 Free Software Foundation, Inc.                          #
@@ -35 +55 @@
  # Permission is hereby granted, free of charge, to any person obtaining a    #
  # copy of this software and associated documentation files (the "Software"), #
-@@ -29,7 +30,7 @@
+@@ -29,9 +30,10 @@
  #  Author:  Juergen Pfeifer, 1996
  #
  #  Version Control
 -#  $Revision: 1.15 $
-+#  $Revision: 1.20 $
++#  $Revision: 1.21 $
  #
  SHELL          = /bin/sh
++VPATH          = @srcdir@
  THIS           = Makefile
-@@ -61,7 +62,19 @@
+ 
+ SUBDIRS         = @ADA_SUBDIRS@
+@@ -61,7 +63,19 @@
         for d in $(SUBDIRS); do \
                 (cd $$d ; $(MAKE) $(CF_MFLAGS) $@) ;\
@@ -66 +89 @@
         @
 diff -Naur ncurses-5.7.orig/Ada95/aclocal.m4 ncurses-5.7/Ada95/aclocal.m4
---- ncurses-5.7.orig/Ada95/aclocal.m4   1970-01-01 00:00:00.000000000 +0000
-+++ ncurses-5.7/Ada95/aclocal.m4        2010-08-02 00:58:05.030407717 +0000
-@@ -0,0 +1,3406 @@
+--- ncurses-5.7.orig/Ada95/aclocal.m4   1969-12-31 19:00:00.000000000 -0500
++++ ncurses-5.7/Ada95/aclocal.m4        2011-01-08 18:18:29.470656442 -0500
+@@ -0,0 +1,3447 @@
 +dnl***************************************************************************
 +dnl Copyright (c) 2010 Free Software Foundation, Inc.                        *
@@ -99 +122 @@
 +dnl Author: Thomas E. Dickey
 +dnl
-+dnl $Id: aclocal.m4,v 1.15 2010/07/24 21:33:12 tom Exp $
++dnl $Id: aclocal.m4,v 1.18 2010/11/13 19:19:59 tom Exp $
 +dnl Macros used in NCURSES Ada95 auto-configuration script.
 +dnl
@@ -361 +384 @@
 +])dnl
 +dnl ---------------------------------------------------------------------------
-+dnl CF_ANSI_CC_CHECK version: 9 updated: 2001/12/30 17:53:34
++dnl CF_ANSI_CC_CHECK version: 10 updated: 2010/10/23 15:52:32
 +dnl ----------------
 +dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES'
@@ -367 +390 @@
 +AC_DEFUN([CF_ANSI_CC_CHECK],
 +[
-+AC_CACHE_CHECK(for ${CC-cc} option to accept ANSI C, cf_cv_ansi_cc,[
++AC_CACHE_CHECK(for ${CC:-cc} option to accept ANSI C, cf_cv_ansi_cc,[
 +cf_cv_ansi_cc=no
 +cf_save_CFLAGS="$CFLAGS"
@@ -878 +901 @@
 +])dnl
 +dnl ---------------------------------------------------------------------------
-+dnl CF_GCC_ATTRIBUTES version: 13 updated: 2009/08/11 20:19:56
++dnl CF_GCC_ATTRIBUTES version: 14 updated: 2010/10/23 15:52:32
 +dnl -----------------
 +dnl Test for availability of useful gcc __attribute__ directives to quiet
@@ -905 +928 @@
 +       AC_CHECKING([for $CC __attribute__ directives])
 +cat > conftest.$ac_ext <<EOF
-+#line __oline__ "${as_me-configure}"
++#line __oline__ "${as_me:-configure}"
 +#include "confdefs.h"
 +#include "conftest.h"
@@ -1002 +1025 @@
 +])dnl
 +dnl ---------------------------------------------------------------------------
-+dnl CF_GCC_WARNINGS version: 25 updated: 2010/04/24 11:03:31
++dnl CF_GCC_WARNINGS version: 27 updated: 2010/10/23 15:52:32
 +dnl ---------------
 +dnl Check if the compiler supports useful warning options.  There's a few that
@@ -1027 +1050 @@
 +
 +cat > conftest.$ac_ext <<EOF
-+#line __oline__ "${as_me-configure}"
++#line __oline__ "${as_me:-configure}"
 +int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
 +EOF
@@ -1106 +1129 @@
 +       CFLAGS="$cf_save_CFLAGS"
 +fi
-+rm -f conftest*
++rm -rf conftest*
 +
 +AC_SUBST(EXTRA_CFLAGS)
++])dnl
++dnl ---------------------------------------------------------------------------
++dnl CF_GNAT_GENERICS version: 1 updated: 2010/11/13 14:15:18
++dnl ----------------
++AC_DEFUN([CF_GNAT_GENERICS],
++[
++AC_MSG_CHECKING(if GNAT supports generics)
++case $cf_gnat_version in #(vi
++3.[[1-9]]*|[[4-9]].*) #(vi
++       cf_gnat_generics=yes
++       ;;
++*)
++       cf_gnat_generics=no
++       ;;
++esac
++AC_MSG_RESULT($cf_gnat_generics)
++
++if test "$cf_gnat_generics" = yes
++then
++       cf_compile_generics=generics
++       cf_generic_objects="\${GENOBJS}"
++else
++       cf_compile_generics=
++       cf_generic_objects=
++fi
++
++AC_SUBST(cf_compile_generics)
++AC_SUBST(cf_generic_objects)
 +])dnl
 +dnl ---------------------------------------------------------------------------
@@ -1140 +1191 @@
 +])dnl
 +dnl ---------------------------------------------------------------------------
-+dnl CF_GNAT_TRY_LINK version: 1 updated: 2004/08/21 19:02:08
++dnl CF_GNAT_PROJECTS version: 1 updated: 2010/11/13 14:15:18
++dnl ----------------
++AC_DEFUN([CF_GNAT_PROJECTS],
++[
++AC_MSG_CHECKING(if GNAT supports project files)
++case $cf_gnat_version in #(vi
++3.[[0-9]]*) #(vi
++       cf_gnat_projects=no
++       ;;
++*)
++       case $cf_cv_system_name in #(vi
++       cygwin*) #(vi
++               cf_gnat_projects=no
++               ;;
++       *)
++               cf_gnat_projects=yes
++               ;;
++       esac
++       ;;
++esac
++AC_MSG_RESULT($cf_gnat_projects)
++
++if test "$cf_gnat_projects" = yes
++then
++       USE_OLD_MAKERULES="#"
++       USE_GNAT_PROJECTS=""
++else
++       USE_OLD_MAKERULES=""
++       USE_GNAT_PROJECTS="#"
++fi
++
++AC_SUBST(USE_OLD_MAKERULES)
++AC_SUBST(USE_GNAT_PROJECTS)
++])dnl
++dnl ---------------------------------------------------------------------------
++dnl CF_GNAT_TRY_LINK version: 2 updated: 2010/08/14 18:25:37
 +dnl ----------------
 +dnl Verify that a test program compiles/links with GNAT.
@@ -1152 +1238 @@
 +AC_DEFUN([CF_GNAT_TRY_LINK],
 +[
-+rm -f conftest*
++rm -rf conftest*
 +cat >>conftest.ads <<CF_EOF
 +$1
@@ -1164 +1250 @@
 +   $4])
 +fi
-+rm -f conftest*
++rm -rf conftest*
 +])dnl
 +dnl ---------------------------------------------------------------------------
-+dnl CF_GNAT_TRY_RUN version: 3 updated: 2004/08/21 19:02:08
++dnl CF_GNAT_TRY_RUN version: 4 updated: 2010/08/14 18:25:37
 +dnl ---------------
 +dnl Verify that a test program compiles and runs with GNAT
@@ -1179 +1265 @@
 +AC_DEFUN([CF_GNAT_TRY_RUN],
 +[
-+rm -f conftest*
++rm -rf conftest*
 +cat >>conftest.ads <<CF_EOF
 +$1
@@ -1195 +1281 @@
 +   $4])
 +fi
-+rm -f conftest*
++rm -rf conftest*
 +])dnl
 +dnl ---------------------------------------------------------------------------
-+dnl CF_GNAT_VERSION version: 14 updated: 2010/07/03 17:45:09
++dnl CF_GNAT_VERSION version: 16 updated: 2010/11/13 14:15:18
 +dnl ---------------
 +dnl Verify version of GNAT.
@@ -1204 +1290 @@
 +[
 +AC_MSG_CHECKING(for gnat version)
-+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/ .*//'`
++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/ .*//'`
 +AC_MSG_RESULT($cf_gnat_version)
 +
-+case $cf_gnat_version in
-+  3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*)
-+    cf_cv_prog_gnat_correct=yes
-+    ;;
-+  *) echo Unsupported GNAT version $cf_gnat_version. Required is 3.11 or better. Disabling Ada95 binding.
-+     cf_cv_prog_gnat_correct=no
-+     ;;
++case $cf_gnat_version in #(vi
++3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*) #(vi
++       cf_cv_prog_gnat_correct=yes
++       ;;
++*)
++       AC_MSG_WARN(Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding.)
++       cf_cv_prog_gnat_correct=no
++       ;;
 +esac
 +
-+case $cf_gnat_version in
-+  3.[[1-9]]*|[[4-9]].*)
-+      cf_compile_generics=generics
-+      cf_generic_objects="\${GENOBJS}"
-+      ;;
-+  *)  cf_compile_generics=
-+      cf_generic_objects=
-+      ;;
-+esac
-+
-+case $cf_gnat_version in
-+  3.[[0-9]]*)
-+    USE_OLD_MAKERULES=""
-+    USE_GNAT_PROJECTS="#"
-+    ;;
-+  *)
-+    USE_OLD_MAKERULES="#"
-+    USE_GNAT_PROJECTS=""
-+    ;;
-+esac
-+
-+AC_SUBST(cf_compile_generics)
-+AC_SUBST(cf_generic_objects)
-+
-+AC_SUBST(USE_OLD_MAKERULES)
-+AC_SUBST(USE_GNAT_PROJECTS)
++CF_GNAT_GENERICS
++CF_GNAT_PROJECTS
 +])
 +dnl ---------------------------------------------------------------------------
@@ -1530 +1594 @@
 +])dnl
 +dnl ---------------------------------------------------------------------------
-+dnl CF_LIB_SONAME version: 4 updated: 2010/05/29 16:31:02
++dnl CF_LIB_SONAME version: 5 updated: 2010/08/14 18:25:37
 +dnl -------------
 +dnl Find the and soname for the given shared library.  Set the cache variable
@@ -1561 +1625 @@
 +               fi
 +       fi
-+rm -f conftest*
++rm -rf conftest*
 +LIBS="$cf_save_LIBS"
 +fi
@@ -1779 +1843 @@
 +])dnl
 +dnl ---------------------------------------------------------------------------
-+dnl CF_MAKEFLAGS version: 12 updated: 2006/10/21 08:27:03
++dnl CF_MAKEFLAGS version: 13 updated: 2010/10/23 15:52:32
 +dnl ------------
 +dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make'
@@ -1796 +1860 @@
 +       @ echo '.$cf_option'
 +CF_EOF
-+               cf_result=`${MAKE-make} -k -f cf_makeflags.tmp 2>/dev/null | sed -e 's,[[       ]]*$,,'`
++               cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | sed -e 's,[[      ]]*$,,'`
 +               case "$cf_result" in
 +               .*k)
-+                       cf_result=`${MAKE-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
++                       cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
 +                       case "$cf_result" in
 +                       .*CC=*) cf_cv_makeflags=
@@ -1819 +1883 @@
 +])dnl
 +dnl ---------------------------------------------------------------------------
-+dnl CF_MAKE_TAGS version: 5 updated: 2010/04/03 20:07:32
++dnl CF_MAKE_TAGS version: 6 updated: 2010/10/23 15:52:32
 +dnl ------------
 +dnl Generate tags/TAGS targets for makefiles.  Do not generate TAGS if we have
@@ -1829 +1893 @@
 +AC_CHECK_PROGS(ETAGS, exetags etags)
 +
-+AC_CHECK_PROG(MAKE_LOWER_TAGS, ${CTAGS-ctags}, yes, no)
++AC_CHECK_PROG(MAKE_LOWER_TAGS, ${CTAGS:-ctags}, yes, no)
 +
 +if test "$cf_cv_mixedcase" = yes ; then
-+       AC_CHECK_PROG(MAKE_UPPER_TAGS, ${ETAGS-etags}, yes, no)
++       AC_CHECK_PROG(MAKE_UPPER_TAGS, ${ETAGS:-etags}, yes, no)
 +else
 +       MAKE_UPPER_TAGS=no
@@ -1886 +1950 @@
 +])dnl
 +dnl ---------------------------------------------------------------------------
-+dnl CF_MKSTEMP version: 6 updated: 2010/05/22 14:44:30
++dnl CF_MKSTEMP version: 7 updated: 2010/08/14 18:25:37
 +dnl ----------
 +dnl Check for a working mkstemp.  This creates two files, checks that they are
@@ -1892 +1956 @@
 +AC_DEFUN([CF_MKSTEMP],[
 +AC_CACHE_CHECK(for working mkstemp, cf_cv_func_mkstemp,[
-+rm -f conftest*
++rm -rf conftest*
 +AC_TRY_RUN([
 +#include <sys/types.h>
@@ -1936 +2000 @@
 +])dnl
 +dnl ---------------------------------------------------------------------------
-+dnl CF_MSG_LOG version: 4 updated: 2007/07/29 09:55:12
++dnl CF_MSG_LOG version: 5 updated: 2010/10/23 15:52:32
 +dnl ----------
 +dnl Write a debug message to config.log, along with the line number in the
 +dnl configure script.
 +AC_DEFUN([CF_MSG_LOG],[
-+echo "${as_me-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
++echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
 +])dnl
 +dnl ---------------------------------------------------------------------------
-+dnl CF_NCURSES_ADDON version: 2 updated: 2010/02/27 18:27:44
++dnl CF_NCURSES_ADDON version: 3 updated: 2010/10/23 15:54:49
 +dnl ----------------
 +dnl Configure an ncurses add-on, built outside the ncurses tree.
@@ -1980 +2044 @@
 +do
 +cat >conftest.$ac_ext <<CF_EOF
-+#include <${cf_cv_ncurses_header-curses.h}>
++#include <${cf_cv_ncurses_header:-curses.h}>
 +AUTOCONF_$cf_name NCURSES_VERSION_$cf_name
 +CF_EOF
@@ -2210 +2274 @@
 +])dnl
 +dnl ---------------------------------------------------------------------------
-+dnl CF_NCURSES_LIBS version: 14 updated: 2010/06/20 09:24:28
++dnl CF_NCURSES_LIBS version: 15 updated: 2010/10/23 15:54:49
 +dnl ---------------
 +dnl Look for the ncurses library.  This is a little complicated on Linux,
@@ -2254 +2318 @@
 +else
 +       CF_FIND_LIBRARY($cf_nculib_root,$cf_nculib_root,
-+               [#include <${cf_cv_ncurses_header-curses.h}>],
++               [#include <${cf_cv_ncurses_header:-curses.h}>],
 +               [initscr()],
 +               initscr)
@@ -2268 +2332 @@
 +               fi
 +       done
-+       AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>],
++       AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
 +               [initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);],
 +               [AC_MSG_RESULT(yes)],
@@ -2279 +2343 @@
 +])dnl
 +dnl ---------------------------------------------------------------------------
-+dnl CF_NCURSES_VERSION version: 12 updated: 2007/04/28 09:15:55
++dnl CF_NCURSES_VERSION version: 13 updated: 2010/10/23 15:54:49
 +dnl ------------------
 +dnl Check for the version of ncurses, to aid in reporting bugs, etc.
@@ -2292 +2356 @@
 +       rm -f $cf_tempfile
 +       AC_TRY_RUN([
-+#include <${cf_cv_ncurses_header-curses.h}>
++#include <${cf_cv_ncurses_header:-curses.h}>
 +#include <stdio.h>
 +int main()
@@ -2310 +2374 @@
 +# endif
 +#endif
-+       ${cf_cv_main_return-return}(0);
++       ${cf_cv_main_return:-return}(0);
 +}],[
 +       cf_cv_ncurses_version=`cat $cf_tempfile`],,[
@@ -2317 +2381 @@
 +       # Autoconf token.  The 'unproto' program does that.
 +       cat > conftest.$ac_ext <<EOF
-+#include <${cf_cv_ncurses_header-curses.h}>
++#include <${cf_cv_ncurses_header:-curses.h}>
 +#undef Autoconf
 +#ifdef NCURSES_VERSION
@@ -2580 +2644 @@
 +])dnl
 +dnl ---------------------------------------------------------------------------
-+dnl CF_PROG_CC_C_O version: 2 updated: 2006/12/16 15:55:46
++dnl CF_PROG_CC_C_O version: 3 updated: 2010/08/14 18:25:37
 +dnl --------------
 +dnl Analogous to AC_PROG_CC_C_O, but more useful: tests only $CC, ensures that
@@ -2610 +2674 @@
 +  eval cf_cv_prog_$1_c_o=no
 +fi
-+rm -f conftest*
++rm -rf conftest*
 +])dnl
 +if test $cf_cv_prog_$1_c_o = yes; then
@@ -2692 +2756 @@
 +])dnl
 +dnl ---------------------------------------------------------------------------
-+dnl CF_PROG_LN_S version: 1 updated: 2010/07/24 17:12:40
++dnl CF_PROG_LN_S version: 2 updated: 2010/08/14 18:25:37
 +dnl ------------
 +dnl Combine checks for "ln -s" and "ln -sf", updating $LN_S to include "-f"
@@ -2708 +2772 @@
 +       cf_prog_ln_sf=no
 +fi
-+
++rm -f conf$$.dst conf$$src
 +AC_MSG_RESULT($cf_prog_ln_sf)
 +
@@ -3110 +3174 @@
 +])dnl
 +dnl ---------------------------------------------------------------------------
-+dnl CF_TERM_HEADER version: 1 updated: 2005/12/31 13:26:39
++dnl CF_TERM_HEADER version: 2 updated: 2010/10/23 15:54:49
 +dnl --------------
 +dnl Look for term.h, which is part of X/Open curses.  It defines the interface
@@ -3129 +3193 @@
 +do
 +AC_TRY_COMPILE([#include <stdio.h>
-+#include <${cf_cv_ncurses_header-curses.h}>
++#include <${cf_cv_ncurses_header:-curses.h}>
 +#include <$cf_test>
 +],[int x = auto_left_margin],[
@@ -3316 +3380 @@
 +])dnl
 +dnl ---------------------------------------------------------------------------
-+dnl CF_WITH_PATH version: 9 updated: 2010/05/26 05:38:42
++dnl CF_WITH_PATH version: 10 updated: 2010/10/23 15:44:18
 +dnl ------------
 +dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just
@@ -3329 +3393 @@
 +AC_DEFUN([CF_WITH_PATH],
 +[AC_ARG_WITH($1,[$2 ](default: ifelse([$4],,empty,[$4])),,
-+ifelse([$4],,[withval="${$3}"],[withval="${$3-ifelse([$5],,[$4],[$5])}"]))dnl
++ifelse([$4],,[withval="${$3}"],[withval="${$3:-ifelse([$5],,[$4],[$5])}"]))dnl
 +if ifelse([$5],,true,[test -n "$5"]) ; then
 +CF_PATH_SYNTAX(withval)
@@ -3476 +3540 @@
 +])
 diff -Naur ncurses-5.7.orig/Ada95/configure ncurses-5.7/Ada95/configure
---- ncurses-5.7.orig/Ada95/configure    1970-01-01 00:00:00.000000000 +0000
-+++ ncurses-5.7/Ada95/configure 2010-08-02 00:58:05.038451873 +0000
-@@ -0,0 +1,12078 @@
+--- ncurses-5.7.orig/Ada95/configure    1969-12-31 19:00:00.000000000 -0500
++++ ncurses-5.7/Ada95/configure 2011-01-08 18:18:29.470656442 -0500
+@@ -0,0 +1,12128 @@
 +#! /bin/sh
-+# From configure.in Revision: 1.18 .
++# From configure.in Revision: 1.21 .
 +# Guess values for system-dependent variables and create Makefiles.
-+# Generated by Autoconf 2.52.20100530.
++# Generated by Autoconf 2.52.20101001.
 +#
 +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -4127 +4191 @@
 +  --with-pkg-config{=path} enable/disable use of pkg-config
 +  --enable-pc-files       generate and install .pc files for pkg-config
++  --without-tests         suppress build with test-programs
 +  --enable-mixed-case     tic should assume mixed-case filenames
 +  --with-install-prefix   prefixes actual install-location ($DESTDIR)
@@ -4235 +4300 @@
 +
 +It was created by $as_me, which was
-+generated by GNU Autoconf 2.52.20100530.  Invocation command line was
++generated by GNU Autoconf 2.52.20101001.  Invocation command line was
 +
 +  $ $0 $@
@@ -4359 +4424 @@
 +for ac_site_file in $CONFIG_SITE; do
 +  if test -r "$ac_site_file"; then
-+    { echo "$as_me:881: loading site script $ac_site_file" >&5
++    { echo "$as_me:882: loading site script $ac_site_file" >&5
 +echo "$as_me: loading site script $ac_site_file" >&6;}
 +    cat "$ac_site_file" >&5
@@ -4370 +4435 @@
 +  # files actually), so we avoid doing that.
 +  if test -f "$cache_file"; then
-+    { echo "$as_me:892: loading cache $cache_file" >&5
++    { echo "$as_me:893: loading cache $cache_file" >&5
 +echo "$as_me: loading cache $cache_file" >&6;}
 +    case $cache_file in
@@ -4378 +4443 @@
 +  fi
 +else
-+  { echo "$as_me:900: creating cache $cache_file" >&5
++  { echo "$as_me:901: creating cache $cache_file" >&5
 +echo "$as_me: creating cache $cache_file" >&6;}
 +  >$cache_file
@@ -4394 +4459 @@
 +  case $ac_old_set,$ac_new_set in
 +    set,)
-+      { echo "$as_me:916: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++      { echo "$as_me:917: 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:920: error: \`$ac_var' was not set in the previous run" >&5
++      { echo "$as_me:921: 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=: ;;
@@ -4404 +4469 @@
 +    *)
 +      if test "x$ac_old_val" != "x$ac_new_val"; then
-+        { echo "$as_me:926: error: \`$ac_var' has changed since the previous run:" >&5
++        { echo "$as_me:927: 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:928:   former value:  $ac_old_val" >&5
++        { echo "$as_me:929:   former value:  $ac_old_val" >&5
 +echo "$as_me:   former value:  $ac_old_val" >&2;}
-+        { echo "$as_me:930:   current value: $ac_new_val" >&5
++        { echo "$as_me:931:   current value: $ac_new_val" >&5
 +echo "$as_me:   current value: $ac_new_val" >&2;}
 +        ac_cache_corrupted=:
@@ -4427 +4492 @@
 +done
 +if $ac_cache_corrupted; then
-+  { echo "$as_me:949: error: changes in the environment can compromise the build" >&5
++  { echo "$as_me:950: 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:951: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++  { { echo "$as_me:952: 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; }; }
@@ -4450 +4515 @@
 +echo  "exit 0"   >>conftest.sh
 +chmod +x conftest.sh
-+if { (echo "$as_me:972: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:973: PATH=\".;.\"; conftest.sh") >&5
 +  (PATH=".;."; conftest.sh) 2>&5
 +  ac_status=$?
-+  echo "$as_me:975: \$? = $ac_status" >&5
++  echo "$as_me:976: \$? = $ac_status" >&5
 +  (exit $ac_status); }; then
 +  ac_path_separator=';'
@@ -4483 +4548 @@
 +done
 +if test -z "$ac_aux_dir"; then
-+  { { echo "$as_me:1005: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++  { { echo "$as_me:1006: 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; }; }
@@ -4493 +4558 @@
 +# Make sure we can run config.sub.
 +$ac_config_sub sun4 >/dev/null 2>&1 ||
-+  { { echo "$as_me:1015: error: cannot run $ac_config_sub" >&5
++  { { echo "$as_me:1016: error: cannot run $ac_config_sub" >&5
 +echo "$as_me: error: cannot run $ac_config_sub" >&2;}
 +   { (exit 1); exit 1; }; }
 +
-+echo "$as_me:1019: checking build system type" >&5
++echo "$as_me:1020: checking build system type" >&5
 +echo $ECHO_N "checking build system type... $ECHO_C" >&6
 +if test "${ac_cv_build+set}" = set; then
@@ -4506 +4571 @@
 +  ac_cv_build_alias=`$ac_config_guess`
 +test -z "$ac_cv_build_alias" &&
-+  { { echo "$as_me:1028: error: cannot guess build type; you must specify one" >&5
++  { { echo "$as_me:1029: 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:1032: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++  { { echo "$as_me:1033: 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:1037: result: $ac_cv_build" >&5
++echo "$as_me:1038: result: $ac_cv_build" >&5
 +echo "${ECHO_T}$ac_cv_build" >&6
 +build=$ac_cv_build
@@ -4522 +4587 @@
 +build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 +
-+echo "$as_me:1044: checking host system type" >&5
++echo "$as_me:1045: checking host system type" >&5
 +echo $ECHO_N "checking host system type... $ECHO_C" >&6
 +if test "${ac_cv_host+set}" = set; then
@@ -4531 +4596 @@
 +  ac_cv_host_alias=$ac_cv_build_alias
 +ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-+  { { echo "$as_me:1053: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++  { { echo "$as_me:1054: 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:1058: result: $ac_cv_host" >&5
++echo "$as_me:1059: result: $ac_cv_host" >&5
 +echo "${ECHO_T}$ac_cv_host" >&6
 +host=$ac_cv_host
@@ -4544 +4609 @@
 +
 +if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
-+       echo "$as_me:1066: checking target system type" >&5
++       echo "$as_me:1067: checking target system type" >&5
 +echo $ECHO_N "checking target system type... $ECHO_C" >&6
 +if test "${ac_cv_target+set}" = set; then
@@ -4553 +4618 @@
 +  ac_cv_target_alias=$ac_cv_host_alias
 +ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-+  { { echo "$as_me:1075: error: $ac_config_sub $ac_cv_target_alias failed" >&5
++  { { echo "$as_me:1076: 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:1080: result: $ac_cv_target" >&5
++echo "$as_me:1081: result: $ac_cv_target" >&5
 +echo "${ECHO_T}$ac_cv_target" >&6
 +target=$ac_cv_target
@@ -4589 +4654 @@
 +
 +test -z "$system_name" && system_name="$cf_cv_system_name"
-+test -n "$cf_cv_system_name" && echo "$as_me:1111: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1112: 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:1115: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++       echo "$as_me:1116: 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:1117: error: \"Please remove config.cache and try again.\"" >&5
++       { { echo "$as_me:1118: 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; }; }
@@ -4603 +4668 @@
 +if test "${with_system_type+set}" = set; then
 +  withval="$with_system_type"
-+  { echo "$as_me:1125: WARNING: overriding system type to $withval" >&5
++  { echo "$as_me:1126: WARNING: overriding system type to $withval" >&5
 +echo "$as_me: WARNING: overriding system type to $withval" >&2;}
 + cf_cv_system_name=$withval
@@ -4613 +4678 @@
 +###    Default install-location
 +
-+echo "$as_me:1135: checking for prefix" >&5
++echo "$as_me:1136: checking for prefix" >&5
 +echo $ECHO_N "checking for prefix... $ECHO_C" >&6
 +if test "x$prefix" = "xNONE" ; then
@@ -4625 +4690 @@
 +       esac
 +fi
-+echo "$as_me:1147: result: $prefix" >&5
++echo "$as_me:1148: result: $prefix" >&5
 +echo "${ECHO_T}$prefix" >&6
 +
 +if test "x$prefix" = "xNONE" ; then
-+echo "$as_me:1151: checking for default include-directory" >&5
++echo "$as_me:1152: checking for default include-directory" >&5
 +echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
 +test -n "$verbose" && echo 1>&6
@@ -4652 +4717 @@
 +       test -n "$verbose"  && echo "   tested $cf_dir" 1>&6
 +done
-+echo "$as_me:1174: result: $includedir" >&5
++echo "$as_me:1175: result: $includedir" >&5
 +echo "${ECHO_T}$includedir" >&6
 +fi
@@ -4666 +4731 @@
 +  # 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:1188: checking for $ac_word" >&5
++echo "$as_me:1189: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +if test "${ac_cv_prog_CC+set}" = set; then
@@ -4681 +4746 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_CC="${ac_tool_prefix}gcc"
-+echo "$as_me:1203: found $ac_dir/$ac_word" >&5
++echo "$as_me:1204: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -4689 +4754 @@
 +CC=$ac_cv_prog_CC
 +if test -n "$CC"; then
-+  echo "$as_me:1211: result: $CC" >&5
++  echo "$as_me:1212: result: $CC" >&5
 +echo "${ECHO_T}$CC" >&6
 +else
-+  echo "$as_me:1214: result: no" >&5
++  echo "$as_me:1215: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -4701 +4766 @@
 +  # Extract the first word of "gcc", so it can be a program name with args.
 +set dummy gcc; ac_word=$2
-+echo "$as_me:1223: checking for $ac_word" >&5
++echo "$as_me:1224: 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
@@ -4716 +4781 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_ac_ct_CC="gcc"
-+echo "$as_me:1238: found $ac_dir/$ac_word" >&5
++echo "$as_me:1239: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -4724 +4789 @@
 +ac_ct_CC=$ac_cv_prog_ac_ct_CC
 +if test -n "$ac_ct_CC"; then
-+  echo "$as_me:1246: result: $ac_ct_CC" >&5
++  echo "$as_me:1247: result: $ac_ct_CC" >&5
 +echo "${ECHO_T}$ac_ct_CC" >&6
 +else
-+  echo "$as_me:1249: result: no" >&5
++  echo "$as_me:1250: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -4740 +4805 @@
 +  # 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:1262: checking for $ac_word" >&5
++echo "$as_me:1263: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +if test "${ac_cv_prog_CC+set}" = set; then
@@ -4755 +4820 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_CC="${ac_tool_prefix}cc"
-+echo "$as_me:1277: found $ac_dir/$ac_word" >&5
++echo "$as_me:1278: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -4763 +4828 @@
 +CC=$ac_cv_prog_CC
 +if test -n "$CC"; then
-+  echo "$as_me:1285: result: $CC" >&5
++  echo "$as_me:1286: result: $CC" >&5
 +echo "${ECHO_T}$CC" >&6
 +else
-+  echo "$as_me:1288: result: no" >&5
++  echo "$as_me:1289: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -4775 +4840 @@
 +  # Extract the first word of "cc", so it can be a program name with args.
 +set dummy cc; ac_word=$2
-+echo "$as_me:1297: checking for $ac_word" >&5
++echo "$as_me:1298: 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
@@ -4790 +4855 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_ac_ct_CC="cc"
-+echo "$as_me:1312: found $ac_dir/$ac_word" >&5
++echo "$as_me:1313: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -4798 +4863 @@
 +ac_ct_CC=$ac_cv_prog_ac_ct_CC
 +if test -n "$ac_ct_CC"; then
-+  echo "$as_me:1320: result: $ac_ct_CC" >&5
++  echo "$as_me:1321: result: $ac_ct_CC" >&5
 +echo "${ECHO_T}$ac_ct_CC" >&6
 +else
-+  echo "$as_me:1323: result: no" >&5
++  echo "$as_me:1324: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -4814 +4879 @@
 +  # Extract the first word of "cc", so it can be a program name with args.
 +set dummy cc; ac_word=$2
-+echo "$as_me:1336: checking for $ac_word" >&5
++echo "$as_me:1337: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +if test "${ac_cv_prog_CC+set}" = set; then
@@ -4834 +4899 @@
 +fi
 +ac_cv_prog_CC="cc"
-+echo "$as_me:1356: found $ac_dir/$ac_word" >&5
++echo "$as_me:1357: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -4856 +4921 @@
 +CC=$ac_cv_prog_CC
 +if test -n "$CC"; then
-+  echo "$as_me:1378: result: $CC" >&5
++  echo "$as_me:1379: result: $CC" >&5
 +echo "${ECHO_T}$CC" >&6
 +else
-+  echo "$as_me:1381: result: no" >&5
++  echo "$as_me:1382: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -4870 +4935 @@
 +    # 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:1392: checking for $ac_word" >&5
++echo "$as_me:1393: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +if test "${ac_cv_prog_CC+set}" = set; then
@@ -4885 +4950 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-+echo "$as_me:1407: found $ac_dir/$ac_word" >&5
++echo "$as_me:1408: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -4893 +4958 @@
 +CC=$ac_cv_prog_CC
 +if test -n "$CC"; then
-+  echo "$as_me:1415: result: $CC" >&5
++  echo "$as_me:1416: result: $CC" >&5
 +echo "${ECHO_T}$CC" >&6
 +else
-+  echo "$as_me:1418: result: no" >&5
++  echo "$as_me:1419: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -4909 +4974 @@
 +  # 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:1431: checking for $ac_word" >&5
++echo "$as_me:1432: 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
@@ -4924 +4989 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_ac_ct_CC="$ac_prog"
-+echo "$as_me:1446: found $ac_dir/$ac_word" >&5
++echo "$as_me:1447: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -4932 +4997 @@
 +ac_ct_CC=$ac_cv_prog_ac_ct_CC
 +if test -n "$ac_ct_CC"; then
-+  echo "$as_me:1454: result: $ac_ct_CC" >&5
++  echo "$as_me:1455: result: $ac_ct_CC" >&5
 +echo "${ECHO_T}$ac_ct_CC" >&6
 +else
-+  echo "$as_me:1457: result: no" >&5
++  echo "$as_me:1458: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -4947 +5012 @@
 +fi
 +
-+test -z "$CC" && { { echo "$as_me:1469: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:1470: 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:1474:" \
++echo "$as_me:1475:" \
 +     "checking for C compiler version" >&5
 +ac_compiler=`set X $ac_compile; echo $2`
-+{ (eval echo "$as_me:1477: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1478: \"$ac_compiler --version </dev/null >&5\"") >&5
 +  (eval $ac_compiler --version </dev/null >&5) 2>&5
 +  ac_status=$?
-+  echo "$as_me:1480: \$? = $ac_status" >&5
++  echo "$as_me:1481: \$? = $ac_status" >&5
 +  (exit $ac_status); }
-+{ (eval echo "$as_me:1482: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1483: \"$ac_compiler -v </dev/null >&5\"") >&5
 +  (eval $ac_compiler -v </dev/null >&5) 2>&5
 +  ac_status=$?
-+  echo "$as_me:1485: \$? = $ac_status" >&5
++  echo "$as_me:1486: \$? = $ac_status" >&5
 +  (exit $ac_status); }
-+{ (eval echo "$as_me:1487: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1488: \"$ac_compiler -V </dev/null >&5\"") >&5
 +  (eval $ac_compiler -V </dev/null >&5) 2>&5
 +  ac_status=$?
-+  echo "$as_me:1490: \$? = $ac_status" >&5
++  echo "$as_me:1491: \$? = $ac_status" >&5
 +  (exit $ac_status); }
 +
 +cat >conftest.$ac_ext <<_ACEOF
-+#line 1494 "configure"
++#line 1495 "configure"
 +#include "confdefs.h"
 +
@@ -4988 +5053 @@
 +# It will help us diagnose broken compilers, and finding out an intuition
 +# of exeext.
-+echo "$as_me:1510: checking for C compiler default output" >&5
++echo "$as_me:1511: 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:1513: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:1514: \"$ac_link_default\"") >&5
 +  (eval $ac_link_default) 2>&5
 +  ac_status=$?
-+  echo "$as_me:1516: \$? = $ac_status" >&5
++  echo "$as_me:1517: \$? = $ac_status" >&5
 +  (exit $ac_status); }; then
 +  # Find the output, starting from the most likely.  This scheme is
@@ -5017 +5082 @@
 +  echo "$as_me: failed program was:" >&5
 +cat conftest.$ac_ext >&5
-+{ { echo "$as_me:1539: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:1540: error: C compiler cannot create executables" >&5
 +echo "$as_me: error: C compiler cannot create executables" >&2;}
 +   { (exit 77); exit 77; }; }
@@ -5023 +5088 @@
 +
 +ac_exeext=$ac_cv_exeext
-+echo "$as_me:1545: result: $ac_file" >&5
++echo "$as_me:1546: 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:1550: checking whether the C compiler works" >&5
++echo "$as_me:1551: 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
@@ -5034 +5099 @@
 +if test "$cross_compiling" != yes; then
 +  if { ac_try='./$ac_file'
-+  { (eval echo "$as_me:1556: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1557: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:1559: \$? = $ac_status" >&5
++  echo "$as_me:1560: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +    cross_compiling=no
@@ -5044 +5109 @@
 +       cross_compiling=yes
 +    else
-+       { { echo "$as_me:1566: error: cannot run C compiled programs.
++       { { echo "$as_me:1567: error: cannot run C compiled programs.
 +If you meant to cross compile, use \`--host'." >&5
 +echo "$as_me: error: cannot run C compiled programs.
@@ -5052 +5117 @@
 +  fi
 +fi
-+echo "$as_me:1574: result: yes" >&5
++echo "$as_me:1575: result: yes" >&5
 +echo "${ECHO_T}yes" >&6
 +
@@ -5059 +5124 @@
 +# Check the compiler produces executables we can run.  If not, either
 +# the compiler is broken, or we cross compile.
-+echo "$as_me:1581: checking whether we are cross compiling" >&5
++echo "$as_me:1582: checking whether we are cross compiling" >&5
 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-+echo "$as_me:1583: result: $cross_compiling" >&5
++echo "$as_me:1584: result: $cross_compiling" >&5
 +echo "${ECHO_T}$cross_compiling" >&6
 +
-+echo "$as_me:1586: checking for executable suffix" >&5
++echo "$as_me:1587: checking for executable suffix" >&5
 +echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-+if { (eval echo "$as_me:1588: \"$ac_link\"") >&5
++if { (eval echo "$as_me:1589: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:1591: \$? = $ac_status" >&5
++  echo "$as_me:1592: \$? = $ac_status" >&5
 +  (exit $ac_status); }; then
 +  # If both `conftest.exe' and `conftest' are `present' (well, observable)
@@ -5085 +5150 @@
 +done
 +else
-+  { { echo "$as_me:1607: error: cannot compute EXEEXT: cannot compile and link" >&5
++  { { echo "$as_me:1608: 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; }; }
@@ -5091 +5156 @@
 +
 +rm -f conftest$ac_cv_exeext
-+echo "$as_me:1613: result: $ac_cv_exeext" >&5
++echo "$as_me:1614: result: $ac_cv_exeext" >&5
 +echo "${ECHO_T}$ac_cv_exeext" >&6
 +
@@ -5097 +5162 @@
 +EXEEXT=$ac_cv_exeext
 +ac_exeext=$EXEEXT
-+echo "$as_me:1619: checking for object suffix" >&5
++echo "$as_me:1620: checking for object suffix" >&5
 +echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 +if test "${ac_cv_objext+set}" = set; then
@@ -5103 +5168 @@
 +else
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 1625 "configure"
++#line 1626 "configure"
 +#include "confdefs.h"
 +
@@ -5115 +5180 @@
 +_ACEOF
 +rm -f conftest.o conftest.obj
-+if { (eval echo "$as_me:1637: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1638: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:1640: \$? = $ac_status" >&5
++  echo "$as_me:1641: \$? = $ac_status" >&5
 +  (exit $ac_status); }; then
 +  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
@@ -5130 +5195 @@
 +  echo "$as_me: failed program was:" >&5
 +cat conftest.$ac_ext >&5
-+{ { echo "$as_me:1652: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:1653: error: cannot compute OBJEXT: cannot compile" >&5
 +echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
 +   { (exit 1); exit 1; }; }
@@ -5137 +5202 @@
 +rm -f conftest.$ac_cv_objext conftest.$ac_ext
 +fi
-+echo "$as_me:1659: result: $ac_cv_objext" >&5
++echo "$as_me:1660: result: $ac_cv_objext" >&5
 +echo "${ECHO_T}$ac_cv_objext" >&6
 +OBJEXT=$ac_cv_objext
 +ac_objext=$OBJEXT
-+echo "$as_me:1663: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:1664: 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
@@ -5147 +5212 @@
 +else
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 1669 "configure"
++#line 1670 "configure"
 +#include "confdefs.h"
 +
@@ -5162 +5227 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:1684: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1685: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:1687: \$? = $ac_status" >&5
++  echo "$as_me:1688: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:1690: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1691: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:1693: \$? = $ac_status" >&5
++  echo "$as_me:1694: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_compiler_gnu=yes
@@ -5183 +5248 @@
 +
 +fi
-+echo "$as_me:1705: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:1706: result: $ac_cv_c_compiler_gnu" >&5
 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 +GCC=`test $ac_compiler_gnu = yes && echo yes`
@@ -5189 +5254 @@
 +ac_save_CFLAGS=$CFLAGS
 +CFLAGS="-g"
-+echo "$as_me:1711: checking whether $CC accepts -g" >&5
++echo "$as_me:1712: 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
@@ -5195 +5260 @@
 +else
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 1717 "configure"
++#line 1718 "configure"
 +#include "confdefs.h"
 +
@@ -5207 +5272 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:1729: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1730: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:1732: \$? = $ac_status" >&5
++  echo "$as_me:1733: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:1735: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1736: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:1738: \$? = $ac_status" >&5
++  echo "$as_me:1739: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_prog_cc_g=yes
@@ -5226 +5291 @@
 +rm -f conftest.$ac_objext conftest.$ac_ext
 +fi
-+echo "$as_me:1748: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:1749: result: $ac_cv_prog_cc_g" >&5
 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 +if test "$ac_test_CFLAGS" = set; then
@@ -5253 +5318 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:1775: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1776: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:1778: \$? = $ac_status" >&5
++  echo "$as_me:1779: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:1781: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1782: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:1784: \$? = $ac_status" >&5
++  echo "$as_me:1785: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  for ac_declaration in \
@@ -5274 +5339 @@
 +do
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 1796 "configure"
++#line 1797 "configure"
 +#include "confdefs.h"
 +#include <stdlib.h>
@@ -5287 +5352 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:1809: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1810: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:1812: \$? = $ac_status" >&5
++  echo "$as_me:1813: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:1815: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1816: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:1818: \$? = $ac_status" >&5
++  echo "$as_me:1819: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  :
@@ -5306 +5371 @@
 +rm -f conftest.$ac_objext conftest.$ac_ext
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 1828 "configure"
++#line 1829 "configure"
 +#include "confdefs.h"
 +$ac_declaration
@@ -5318 +5383 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:1840: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1841: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:1843: \$? = $ac_status" >&5
++  echo "$as_me:1844: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:1846: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1847: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:1849: \$? = $ac_status" >&5
++  echo "$as_me:1850: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  break
@@ -5336 +5401 @@
 +rm -f conftest.$ac_objext conftest.$ac_ext
 +done
-+rm -f conftest*
++rm -rf conftest*
 +if test -n "$ac_declaration"; then
 +  echo '#ifdef __cplusplus' >>confdefs.h
@@ -5357 +5422 @@
 +GCC_VERSION=none
 +if test "$GCC" = yes ; then
-+       echo "$as_me:1879: checking version of $CC" >&5
++       echo "$as_me:1880: checking version of $CC" >&5
 +echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 +       GCC_VERSION="`${CC} --version 2>/dev/null | 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:1883: result: $GCC_VERSION" >&5
++       echo "$as_me:1884: result: $GCC_VERSION" >&5
 +echo "${ECHO_T}$GCC_VERSION" >&6
 +fi
@@ -5371 +5436 @@
 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
 +ac_main_return=return
-+echo "$as_me:1893: checking how to run the C preprocessor" >&5
++echo "$as_me:1894: 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.
@@ -5392 +5457 @@
 +  # not just through cpp. "Syntax error" is here to catch this case.
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 1914 "configure"
++#line 1915 "configure"
 +#include "confdefs.h"
 +#include <assert.h>
 +                     Syntax error
 +_ACEOF
-+if { (eval echo "$as_me:1919: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:1920: \"$ac_cpp conftest.$ac_ext\"") >&5
 +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +  ac_status=$?
@@ -5403 +5468 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:1925: \$? = $ac_status" >&5
++  echo "$as_me:1926: \$? = $ac_status" >&5
 +  (exit $ac_status); } >/dev/null; then
 +  if test -s conftest.err; then
@@ -5426 +5491 @@
 +  # can be detected and how.
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 1948 "configure"
++#line 1949 "configure"
 +#include "confdefs.h"
 +#include <ac_nonexistent.h>
 +_ACEOF
-+if { (eval echo "$as_me:1952: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:1953: \"$ac_cpp conftest.$ac_ext\"") >&5
 +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +  ac_status=$?
@@ -5436 +5501 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:1958: \$? = $ac_status" >&5
++  echo "$as_me:1959: \$? = $ac_status" >&5
 +  (exit $ac_status); } >/dev/null; then
 +  if test -s conftest.err; then
@@ -5473 +5538 @@
 +  ac_cv_prog_CPP=$CPP
 +fi
-+echo "$as_me:1995: result: $CPP" >&5
++echo "$as_me:1996: result: $CPP" >&5
 +echo "${ECHO_T}$CPP" >&6
 +ac_preproc_ok=false
@@ -5483 +5548 @@
 +  # not just through cpp. "Syntax error" is here to catch this case.
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 2005 "configure"
++#line 2006 "configure"
 +#include "confdefs.h"
 +#include <assert.h>
 +                     Syntax error
 +_ACEOF
-+if { (eval echo "$as_me:2010: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2011: \"$ac_cpp conftest.$ac_ext\"") >&5
 +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +  ac_status=$?
@@ -5494 +5559 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:2016: \$? = $ac_status" >&5
++  echo "$as_me:2017: \$? = $ac_status" >&5
 +  (exit $ac_status); } >/dev/null; then
 +  if test -s conftest.err; then
@@ -5517 +5582 @@
 +  # can be detected and how.
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 2039 "configure"
++#line 2040 "configure"
 +#include "confdefs.h"
 +#include <ac_nonexistent.h>
 +_ACEOF
-+if { (eval echo "$as_me:2043: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2044: \"$ac_cpp conftest.$ac_ext\"") >&5
 +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +  ac_status=$?
@@ -5527 +5592 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:2049: \$? = $ac_status" >&5
++  echo "$as_me:2050: \$? = $ac_status" >&5
 +  (exit $ac_status); } >/dev/null; then
 +  if test -s conftest.err; then
@@ -5555 +5620 @@
 +  :
 +else
-+  { { echo "$as_me:2077: error: C preprocessor \"$CPP\" fails sanity check" >&5
++  { { echo "$as_me:2078: error: C preprocessor \"$CPP\" fails sanity check" >&5
 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
 +   { (exit 1); exit 1; }; }
@@ -5568 +5633 @@
 +
 +if test $ac_cv_c_compiler_gnu = yes; then
-+    echo "$as_me:2090: checking whether $CC needs -traditional" >&5
++    echo "$as_me:2091: 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
@@ -5575 +5640 @@
 +    ac_pattern="Autoconf.*'x'"
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 2097 "configure"
++#line 2098 "configure"
 +#include "confdefs.h"
 +#include <sgtty.h>
@@ -5586 +5651 @@
 +  ac_cv_prog_gcc_traditional=no
 +fi
-+rm -f conftest*
++rm -rf conftest*
 +
 +  if test $ac_cv_prog_gcc_traditional = no; then
 +    cat >conftest.$ac_ext <<_ACEOF
-+#line 2112 "configure"
++#line 2113 "configure"
 +#include "confdefs.h"
 +#include <termio.h>
@@ -5599 +5664 @@
 +  ac_cv_prog_gcc_traditional=yes
 +fi
-+rm -f conftest*
++rm -rf conftest*
 +
 +  fi
 +fi
-+echo "$as_me:2125: result: $ac_cv_prog_gcc_traditional" >&5
++echo "$as_me:2126: 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
@@ -5610 +5675 @@
 +fi
 +
-+echo "$as_me:2132: checking whether $CC understands -c and -o together" >&5
++echo "$as_me:2133: 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
@@ -5626 +5691 @@
 +# 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:2148: \"$ac_try\"") >&5
++if { (eval echo "$as_me:2149: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:2151: \$? = $ac_status" >&5
++  echo "$as_me:2152: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
-+  test -f conftest2.$ac_objext && { (eval echo "$as_me:2153: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:2154: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:2156: \$? = $ac_status" >&5
++  echo "$as_me:2157: \$? = $ac_status" >&5
 +  (exit $ac_status); };
 +then
@@ -5641 +5706 @@
 +  eval cf_cv_prog_CC_c_o=no
 +fi
-+rm -f conftest*
++rm -rf conftest*
 +
 +fi
 +if test $cf_cv_prog_CC_c_o = yes; then
-+  echo "$as_me:2167: result: yes" >&5
++  echo "$as_me:2168: result: yes" >&5
 +echo "${ECHO_T}yes" >&6
 +else
-+  echo "$as_me:2170: result: no" >&5
++  echo "$as_me:2171: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
 +
-+echo "$as_me:2174: checking for POSIXized ISC" >&5
++echo "$as_me:2175: 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:2179: result: yes" >&5
++  echo "$as_me:2180: result: yes" >&5
 +echo "${ECHO_T}yes" >&6
 +  ISC=yes # If later tests want to check for ISC.
@@ -5671 +5736 @@
 +  fi
 +else
-+  echo "$as_me:2193: result: no" >&5
++  echo "$as_me:2194: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +  ISC=
 +fi
 +
-+echo "$as_me:2198: 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
++echo "$as_me:2199: 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
@@ -5780 +5845 @@
 +
 +       cat >conftest.$ac_ext <<_ACEOF
-+#line 2302 "configure"
++#line 2303 "configure"
 +#include "confdefs.h"
 +
@@ -5801 +5866 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:2323: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2324: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:2326: \$? = $ac_status" >&5
++  echo "$as_me:2327: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:2329: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2330: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:2332: \$? = $ac_status" >&5
++  echo "$as_me:2333: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_ansi_cc="$cf_arg"; break
@@ -5823 +5888 @@
 +
 +fi
-+echo "$as_me:2345: result: $cf_cv_ansi_cc" >&5
++echo "$as_me:2346: result: $cf_cv_ansi_cc" >&5
 +echo "${ECHO_T}$cf_cv_ansi_cc" >&6
 +
@@ -5916 +5981 @@
 +
 +if test "$cf_cv_ansi_cc" = "no"; then
-+       { { echo "$as_me:2438: error: Your compiler does not appear to recognize prototypes.
++       { { echo "$as_me:2439: error: Your compiler does not appear to recognize prototypes.
 +You have the following choices:
 +       a. adjust your compiler options
@@ -5963 +6028 @@
 +  # 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:2485: checking for $ac_word" >&5
++echo "$as_me:2486: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +if test "${ac_cv_prog_AWK+set}" = set; then
@@ -5978 +6043 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_AWK="$ac_prog"
-+echo "$as_me:2500: found $ac_dir/$ac_word" >&5
++echo "$as_me:2501: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -5986 +6051 @@
 +AWK=$ac_cv_prog_AWK
 +if test -n "$AWK"; then
-+  echo "$as_me:2508: result: $AWK" >&5
++  echo "$as_me:2509: result: $AWK" >&5
 +echo "${ECHO_T}$AWK" >&6
 +else
-+  echo "$as_me:2511: result: no" >&5
++  echo "$as_me:2512: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -5996 +6061 @@
 +done
 +
-+test -z "$AWK" && { { echo "$as_me:2518: error: No awk program found" >&5
++test -z "$AWK" && { { echo "$as_me:2519: error: No awk program found" >&5
 +echo "$as_me: error: No awk program found" >&2;}
 +   { (exit 1); exit 1; }; }
 +
-+echo "$as_me:2522: checking for egrep" >&5
++echo "$as_me:2523: checking for egrep" >&5
 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6
 +if test "${ac_cv_prog_egrep+set}" = set; then
@@ -6010 +6075 @@
 +    fi
 +fi
-+echo "$as_me:2532: result: $ac_cv_prog_egrep" >&5
++echo "$as_me:2533: 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:2536: error: No egrep program found" >&5
++test -z "$EGREP" && { { echo "$as_me:2537: error: No egrep program found" >&5
 +echo "$as_me: error: No egrep program found" >&2;}
 +   { (exit 1); exit 1; }; }
@@ -6030 +6095 @@
 +# 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:2552: checking for a BSD compatible install" >&5
++echo "$as_me:2553: checking for a BSD compatible install" >&5
 +echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 +if test -z "$INSTALL"; then
@@ -6079 +6144 @@
 +  fi
 +fi
-+echo "$as_me:2601: result: $INSTALL" >&5
++echo "$as_me:2602: result: $INSTALL" >&5
 +echo "${ECHO_T}$INSTALL" >&6
 +
@@ -6090 +6155 @@
 +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 +
-+echo "$as_me:2612: checking whether ln -s works" >&5
++echo "$as_me:2613: 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:2616: result: yes" >&5
++  echo "$as_me:2617: result: yes" >&5
 +echo "${ECHO_T}yes" >&6
 +else
-+  echo "$as_me:2619: result: no, using $LN_S" >&5
++  echo "$as_me:2620: result: no, using $LN_S" >&5
 +echo "${ECHO_T}no, using $LN_S" >&6
 +fi
 +
-+echo "$as_me:2623: checking if $LN_S -f options work" >&5
++echo "$as_me:2624: checking if $LN_S -f options work" >&5
 +echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6
 +
@@ -6112 +6177 @@
 +       cf_prog_ln_sf=no
 +fi
-+
-+echo "$as_me:2635: result: $cf_prog_ln_sf" >&5
++rm -f conf$$.dst conf$$src
++echo "$as_me:2636: result: $cf_prog_ln_sf" >&5
 +echo "${ECHO_T}$cf_prog_ln_sf" >&6
 +
 +test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
 +
-+echo "$as_me:2640: checking for long file names" >&5
++echo "$as_me:2641: 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
@@ -6157 +6222 @@
 +done
 +fi
-+echo "$as_me:2679: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:2680: 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
@@ -6169 +6234 @@
 +# if we find pkg-config, check if we should install the ".pc" files.
 +
-+echo "$as_me:2691: checking if you want to use pkg-config" >&5
++echo "$as_me:2692: checking if you want to use pkg-config" >&5
 +echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
 +
@@ -6179 +6244 @@
 +  cf_pkg_config=yes
 +fi;
-+echo "$as_me:2701: result: $cf_pkg_config" >&5
++echo "$as_me:2702: result: $cf_pkg_config" >&5
 +echo "${ECHO_T}$cf_pkg_config" >&6
 +
@@ -6189 +6254 @@
 +       # 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:2711: checking for $ac_word" >&5
++echo "$as_me:2712: 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
@@ -6206 +6271 @@
 +  if $as_executable_p "$ac_dir/$ac_word"; then
 +   ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-+   echo "$as_me:2728: found $ac_dir/$ac_word" >&5
++   echo "$as_me:2729: found $ac_dir/$ac_word" >&5
 +   break
 +fi
@@ -6218 +6283 @@
 +
 +if test -n "$PKG_CONFIG"; then
-+  echo "$as_me:2740: result: $PKG_CONFIG" >&5
++  echo "$as_me:2741: result: $PKG_CONFIG" >&5
 +echo "${ECHO_T}$PKG_CONFIG" >&6
 +else
-+  echo "$as_me:2743: result: no" >&5
++  echo "$as_me:2744: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -6259 +6324 @@
 +  ;;
 +*)
-+  { { echo "$as_me:2781: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++  { { echo "$as_me:2782: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
 +echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
 +   { (exit 1); exit 1; }; }
@@ -6268 +6333 @@
 +
 +if test "$PKG_CONFIG" != no ; then
-+       echo "$as_me:2790: checking if we should install .pc files for $PKG_CONFIG" >&5
++       echo "$as_me:2791: 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
 +
@@ -6285 +6350 @@
 +  enable_pc_files=no
 +fi;
-+               echo "$as_me:2807: result: $enable_pc_files" >&5
++               echo "$as_me:2808: result: $enable_pc_files" >&5
 +echo "${ECHO_T}$enable_pc_files" >&6
 +       else
-+               echo "$as_me:2810: result: no" >&5
++               echo "$as_me:2811: result: no" >&5
 +echo "${ECHO_T}no" >&6
-+               { echo "$as_me:2812: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5
++               { echo "$as_me:2813: 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
@@ -6296 +6361 @@
 +fi
 +
-+echo "$as_me:2818: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:2819: checking if you want to build test-programs" >&5
++echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6
++
++# Check whether --with-tests or --without-tests was given.
++if test "${with_tests+set}" = set; then
++  withval="$with_tests"
++  cf_with_tests=$withval
++else
++  cf_with_tests=yes
++fi;
++echo "$as_me:2829: result: $cf_with_tests" >&5
++echo "${ECHO_T}$cf_with_tests" >&6
++
++echo "$as_me:2832: checking if we should assume mixed-case filenames" >&5
 +echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
 +
@@ -6306 +6384 @@
 +  enable_mixedcase=auto
 +fi;
-+echo "$as_me:2828: result: $enable_mixedcase" >&5
++echo "$as_me:2842: result: $enable_mixedcase" >&5
 +echo "${ECHO_T}$enable_mixedcase" >&6
 +if test "$enable_mixedcase" = "auto" ; then
 +
-+echo "$as_me:2832: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:2846: 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
@@ -6337 +6415 @@
 +
 +fi
-+echo "$as_me:2859: result: $cf_cv_mixedcase" >&5
++echo "$as_me:2873: result: $cf_cv_mixedcase" >&5
 +echo "${ECHO_T}$cf_cv_mixedcase" >&6
 +test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF
@@ -6354 +6432 @@
 +
 +# do this after mixed-case option (tags/TAGS is not as important as tic).
-+echo "$as_me:2876: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:2890: 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_,'`
@@ -6374 +6452 @@
 +fi
 +if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-+  echo "$as_me:2896: result: yes" >&5
++  echo "$as_me:2910: result: yes" >&5
 +echo "${ECHO_T}yes" >&6
 +  SET_MAKE=
 +else
-+  echo "$as_me:2900: result: no" >&5
++  echo "$as_me:2914: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +  SET_MAKE="MAKE=${MAKE-make}"
@@ -6387 +6465 @@
 +  # 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:2909: checking for $ac_word" >&5
++echo "$as_me:2923: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +if test "${ac_cv_prog_CTAGS+set}" = set; then
@@ -6402 +6480 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_CTAGS="$ac_prog"
-+echo "$as_me:2924: found $ac_dir/$ac_word" >&5
++echo "$as_me:2938: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -6410 +6488 @@
 +CTAGS=$ac_cv_prog_CTAGS
 +if test -n "$CTAGS"; then
-+  echo "$as_me:2932: result: $CTAGS" >&5
++  echo "$as_me:2946: result: $CTAGS" >&5
 +echo "${ECHO_T}$CTAGS" >&6
 +else
-+  echo "$as_me:2935: result: no" >&5
++  echo "$as_me:2949: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -6424 +6502 @@
 +  # 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:2946: checking for $ac_word" >&5
++echo "$as_me:2960: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +if test "${ac_cv_prog_ETAGS+set}" = set; then
@@ -6439 +6517 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_ETAGS="$ac_prog"
-+echo "$as_me:2961: found $ac_dir/$ac_word" >&5
++echo "$as_me:2975: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -6447 +6525 @@
 +ETAGS=$ac_cv_prog_ETAGS
 +if test -n "$ETAGS"; then
-+  echo "$as_me:2969: result: $ETAGS" >&5
++  echo "$as_me:2983: result: $ETAGS" >&5
 +echo "${ECHO_T}$ETAGS" >&6
 +else
-+  echo "$as_me:2972: result: no" >&5
++  echo "$as_me:2986: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -6457 +6535 @@
 +done
 +
-+# Extract the first word of "${CTAGS-ctags}", so it can be a program name with args.
-+set dummy ${CTAGS-ctags}; ac_word=$2
-+echo "$as_me:2981: checking for $ac_word" >&5
++# Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
++set dummy ${CTAGS:-ctags}; ac_word=$2
++echo "$as_me:2995: 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
@@ -6474 +6552 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_MAKE_LOWER_TAGS="yes"
-+echo "$as_me:2996: found $ac_dir/$ac_word" >&5
++echo "$as_me:3010: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -6483 +6561 @@
 +MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 +if test -n "$MAKE_LOWER_TAGS"; then
-+  echo "$as_me:3005: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:3019: result: $MAKE_LOWER_TAGS" >&5
 +echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 +else
-+  echo "$as_me:3008: result: no" >&5
++  echo "$as_me:3022: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
 +
 +if test "$cf_cv_mixedcase" = yes ; then
-+       # Extract the first word of "${ETAGS-etags}", so it can be a program name with args.
-+set dummy ${ETAGS-etags}; ac_word=$2
-+echo "$as_me:3015: checking for $ac_word" >&5
++       # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
++set dummy ${ETAGS:-etags}; ac_word=$2
++echo "$as_me:3029: 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
@@ -6508 +6586 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_MAKE_UPPER_TAGS="yes"
-+echo "$as_me:3030: found $ac_dir/$ac_word" >&5
++echo "$as_me:3044: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -6517 +6595 @@
 +MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 +if test -n "$MAKE_UPPER_TAGS"; then
-+  echo "$as_me:3039: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:3053: result: $MAKE_UPPER_TAGS" >&5
 +echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 +else
-+  echo "$as_me:3042: result: no" >&5
++  echo "$as_me:3056: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -6540 +6618 @@
 +fi
 +
-+echo "$as_me:3062: checking for makeflags variable" >&5
++echo "$as_me:3076: checking for makeflags variable" >&5
 +echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
 +if test "${cf_cv_makeflags+set}" = set; then
@@ -6554 +6632 @@
 +       @ echo '.$cf_option'
 +CF_EOF
-+               cf_result=`${MAKE-make} -k -f cf_makeflags.tmp 2>/dev/null | sed -e 's,[        ]*$,,'`
++               cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | sed -e 's,[       ]*$,,'`
 +               case "$cf_result" in
 +               .*k)
-+                       cf_result=`${MAKE-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
++                       cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
 +                       case "$cf_result" in
 +                       .*CC=*) cf_cv_makeflags=
@@ -6574 +6652 @@
 +
 +fi
-+echo "$as_me:3096: result: $cf_cv_makeflags" >&5
++echo "$as_me:3110: result: $cf_cv_makeflags" >&5
 +echo "${ECHO_T}$cf_cv_makeflags" >&6
 +
@@ -6580 +6658 @@
 +  # 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:3102: checking for $ac_word" >&5
++echo "$as_me:3116: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +if test "${ac_cv_prog_RANLIB+set}" = set; then
@@ -6595 +6673 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-+echo "$as_me:3117: found $ac_dir/$ac_word" >&5
++echo "$as_me:3131: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -6603 +6681 @@
 +RANLIB=$ac_cv_prog_RANLIB
 +if test -n "$RANLIB"; then
-+  echo "$as_me:3125: result: $RANLIB" >&5
++  echo "$as_me:3139: result: $RANLIB" >&5
 +echo "${ECHO_T}$RANLIB" >&6
 +else
-+  echo "$as_me:3128: result: no" >&5
++  echo "$as_me:3142: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -6615 +6693 @@
 +  # Extract the first word of "ranlib", so it can be a program name with args.
 +set dummy ranlib; ac_word=$2
-+echo "$as_me:3137: checking for $ac_word" >&5
++echo "$as_me:3151: 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
@@ -6630 +6708 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_ac_ct_RANLIB="ranlib"
-+echo "$as_me:3152: found $ac_dir/$ac_word" >&5
++echo "$as_me:3166: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -6639 +6717 @@
 +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 +if test -n "$ac_ct_RANLIB"; then
-+  echo "$as_me:3161: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:3175: result: $ac_ct_RANLIB" >&5
 +echo "${ECHO_T}$ac_ct_RANLIB" >&6
 +else
-+  echo "$as_me:3164: result: no" >&5
++  echo "$as_me:3178: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -6654 +6732 @@
 +  # 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:3176: checking for $ac_word" >&5
++echo "$as_me:3190: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +if test "${ac_cv_prog_LD+set}" = set; then
@@ -6669 +6747 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_LD="${ac_tool_prefix}ld"
-+echo "$as_me:3191: found $ac_dir/$ac_word" >&5
++echo "$as_me:3205: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -6677 +6755 @@
 +LD=$ac_cv_prog_LD
 +if test -n "$LD"; then
-+  echo "$as_me:3199: result: $LD" >&5
++  echo "$as_me:3213: result: $LD" >&5
 +echo "${ECHO_T}$LD" >&6
 +else
-+  echo "$as_me:3202: result: no" >&5
++  echo "$as_me:3216: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -6689 +6767 @@
 +  # Extract the first word of "ld", so it can be a program name with args.
 +set dummy ld; ac_word=$2
-+echo "$as_me:3211: checking for $ac_word" >&5
++echo "$as_me:3225: 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
@@ -6704 +6782 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_ac_ct_LD="ld"
-+echo "$as_me:3226: found $ac_dir/$ac_word" >&5
++echo "$as_me:3240: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -6713 +6791 @@
 +ac_ct_LD=$ac_cv_prog_ac_ct_LD
 +if test -n "$ac_ct_LD"; then
-+  echo "$as_me:3235: result: $ac_ct_LD" >&5
++  echo "$as_me:3249: result: $ac_ct_LD" >&5
 +echo "${ECHO_T}$ac_ct_LD" >&6
 +else
-+  echo "$as_me:3238: result: no" >&5
++  echo "$as_me:3252: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -6728 +6806 @@
 +  # 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:3250: checking for $ac_word" >&5
++echo "$as_me:3264: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +if test "${ac_cv_prog_AR+set}" = set; then
@@ -6743 +6821 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_AR="${ac_tool_prefix}ar"
-+echo "$as_me:3265: found $ac_dir/$ac_word" >&5
++echo "$as_me:3279: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -6751 +6829 @@
 +AR=$ac_cv_prog_AR
 +if test -n "$AR"; then
-+  echo "$as_me:3273: result: $AR" >&5
++  echo "$as_me:3287: result: $AR" >&5
 +echo "${ECHO_T}$AR" >&6
 +else
-+  echo "$as_me:3276: result: no" >&5
++  echo "$as_me:3290: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -6763 +6841 @@
 +  # Extract the first word of "ar", so it can be a program name with args.
 +set dummy ar; ac_word=$2
-+echo "$as_me:3285: checking for $ac_word" >&5
++echo "$as_me:3299: 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
@@ -6778 +6856 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_ac_ct_AR="ar"
-+echo "$as_me:3300: found $ac_dir/$ac_word" >&5
++echo "$as_me:3314: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -6787 +6865 @@
 +ac_ct_AR=$ac_cv_prog_ac_ct_AR
 +if test -n "$ac_ct_AR"; then
-+  echo "$as_me:3309: result: $ac_ct_AR" >&5
++  echo "$as_me:3323: result: $ac_ct_AR" >&5
 +echo "${ECHO_T}$ac_ct_AR" >&6
 +else
-+  echo "$as_me:3312: result: no" >&5
++  echo "$as_me:3326: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -6802 +6880 @@
 +  # 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:3324: checking for $ac_word" >&5
++echo "$as_me:3338: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +if test "${ac_cv_prog_AR+set}" = set; then
@@ -6817 +6895 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_AR="${ac_tool_prefix}ar"
-+echo "$as_me:3339: found $ac_dir/$ac_word" >&5
++echo "$as_me:3353: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -6825 +6903 @@
 +AR=$ac_cv_prog_AR
 +if test -n "$AR"; then
-+  echo "$as_me:3347: result: $AR" >&5
++  echo "$as_me:3361: result: $AR" >&5
 +echo "${ECHO_T}$AR" >&6
 +else
-+  echo "$as_me:3350: result: no" >&5
++  echo "$as_me:3364: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -6837 +6915 @@
 +  # Extract the first word of "ar", so it can be a program name with args.
 +set dummy ar; ac_word=$2
-+echo "$as_me:3359: checking for $ac_word" >&5
++echo "$as_me:3373: 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
@@ -6852 +6930 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_ac_ct_AR="ar"
-+echo "$as_me:3374: found $ac_dir/$ac_word" >&5
++echo "$as_me:3388: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -6861 +6939 @@
 +ac_ct_AR=$ac_cv_prog_ac_ct_AR
 +if test -n "$ac_ct_AR"; then
-+  echo "$as_me:3383: result: $ac_ct_AR" >&5
++  echo "$as_me:3397: result: $ac_ct_AR" >&5
 +echo "${ECHO_T}$ac_ct_AR" >&6
 +else
-+  echo "$as_me:3386: result: no" >&5
++  echo "$as_me:3400: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -6873 +6951 @@
 +fi
 +
-+echo "$as_me:3395: checking for options to update archives" >&5
++echo "$as_me:3409: 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
@@ -6896 +6974 @@
 +
 +               cat >conftest.$ac_ext <<EOF
-+#line 3418 "configure"
++#line 3432 "configure"
 +int    testdata[3] = { 123, 456, 789 };
 +EOF
-+               if { (eval echo "$as_me:3421: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:3435: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:3424: \$? = $ac_status" >&5
++  echo "$as_me:3438: \$? = $ac_status" >&5
 +  (exit $ac_status); } ; then
 +                       echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5
@@ -6913 +6991 @@
 +                       test -n "$verbose" && echo "    cannot compile test-program" 1>&6
 +
-+echo "${as_me-configure}:3435: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:3449: testing cannot compile test-program ..." 1>&5
 +
 +                       break
@@ -6921 +6999 @@
 +
 +fi
-+echo "$as_me:3443: result: $cf_cv_ar_flags" >&5
++echo "$as_me:3457: result: $cf_cv_ar_flags" >&5
 +echo "${ECHO_T}$cf_cv_ar_flags" >&6
 +
@@ -6932 +7010 @@
 +fi
 +
-+echo "$as_me:3454: checking if you have specified an install-prefix" >&5
++echo "$as_me:3468: checking if you have specified an install-prefix" >&5
 +echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
 +
@@ -6945 +7023 @@
 +       esac
 +fi;
-+echo "$as_me:3467: result: $DESTDIR" >&5
++echo "$as_me:3481: result: $DESTDIR" >&5
 +echo "${ECHO_T}$DESTDIR" >&6
 +
@@ -6973 +7051 @@
 +  # 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:3495: checking for $ac_word" >&5
++echo "$as_me:3509: 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
@@ -6988 +7066 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_BUILD_CC="$ac_prog"
-+echo "$as_me:3510: found $ac_dir/$ac_word" >&5
++echo "$as_me:3524: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -6996 +7074 @@
 +BUILD_CC=$ac_cv_prog_BUILD_CC
 +if test -n "$BUILD_CC"; then
-+  echo "$as_me:3518: result: $BUILD_CC" >&5
++  echo "$as_me:3532: result: $BUILD_CC" >&5
 +echo "${ECHO_T}$BUILD_CC" >&6
 +else
-+  echo "$as_me:3521: result: no" >&5
++  echo "$as_me:3535: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -7007 +7085 @@
 +
 +fi;
-+       echo "$as_me:3529: checking for native build C compiler" >&5
++       echo "$as_me:3543: checking for native build C compiler" >&5
 +echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-+       echo "$as_me:3531: result: $BUILD_CC" >&5
++       echo "$as_me:3545: result: $BUILD_CC" >&5
 +echo "${ECHO_T}$BUILD_CC" >&6
 +
-+       echo "$as_me:3534: checking for native build C preprocessor" >&5
++       echo "$as_me:3548: checking for native build C preprocessor" >&5
 +echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
 +
@@ -7022 +7100 @@
 +  BUILD_CPP='${BUILD_CC} -E'
 +fi;
-+       echo "$as_me:3544: result: $BUILD_CPP" >&5
++       echo "$as_me:3558: result: $BUILD_CPP" >&5
 +echo "${ECHO_T}$BUILD_CPP" >&6
 +
-+       echo "$as_me:3547: checking for native build C flags" >&5
++       echo "$as_me:3561: checking for native build C flags" >&5
 +echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
 +
@@ -7033 +7111 @@
 +  BUILD_CFLAGS="$withval"
 +fi;
-+       echo "$as_me:3555: result: $BUILD_CFLAGS" >&5
++       echo "$as_me:3569: result: $BUILD_CFLAGS" >&5
 +echo "${ECHO_T}$BUILD_CFLAGS" >&6
 +
-+       echo "$as_me:3558: checking for native build C preprocessor-flags" >&5
++       echo "$as_me:3572: checking for native build C preprocessor-flags" >&5
 +echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
 +
@@ -7044 +7122 @@
 +  BUILD_CPPFLAGS="$withval"
 +fi;
-+       echo "$as_me:3566: result: $BUILD_CPPFLAGS" >&5
++       echo "$as_me:3580: result: $BUILD_CPPFLAGS" >&5
 +echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 +
-+       echo "$as_me:3569: checking for native build linker-flags" >&5
++       echo "$as_me:3583: checking for native build linker-flags" >&5
 +echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
 +
@@ -7055 +7133 @@
 +  BUILD_LDFLAGS="$withval"
 +fi;
-+       echo "$as_me:3577: result: $BUILD_LDFLAGS" >&5
++       echo "$as_me:3591: result: $BUILD_LDFLAGS" >&5
 +echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 +
-+       echo "$as_me:3580: checking for native build linker-libraries" >&5
++       echo "$as_me:3594: checking for native build linker-libraries" >&5
 +echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
 +
@@ -7066 +7144 @@
 +  BUILD_LIBS="$withval"
 +fi;
-+       echo "$as_me:3588: result: $BUILD_LIBS" >&5
++       echo "$as_me:3602: result: $BUILD_LIBS" >&5
 +echo "${ECHO_T}$BUILD_LIBS" >&6
 +
@@ -7076 +7154 @@
 +
 +       if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
-+               { { echo "$as_me:3598: error: Cross-build requires two compilers.
++               { { echo "$as_me:3612: 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.
@@ -7100 +7178 @@
 +### shared, for example.
 +cf_list_models=""
-+echo "$as_me:3622: checking for specified models" >&5
++echo "$as_me:3636: checking for specified models" >&5
 +echo $ECHO_N "checking for specified models... $ECHO_C" >&6
 +test -z "$cf_list_models" && cf_list_models=normal
-+echo "$as_me:3625: result: $cf_list_models" >&5
++echo "$as_me:3639: 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:3630: checking for default model" >&5
++echo "$as_me:3644: 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:3633: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:3647: result: $DFT_LWR_MODEL" >&5
 +echo "${ECHO_T}$DFT_LWR_MODEL" >&6
 +
@@ -7145 +7223 @@
 +  ;;
 +*)
-+  { { echo "$as_me:3667: error: expected a pathname, not \"$withval\"" >&5
++  { { echo "$as_me:3681: error: expected a pathname, not \"$withval\"" >&5
 +echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
 +   { (exit 1); exit 1; }; }
@@ -7156 +7234 @@
 +fi;
 +
-+echo "$as_me:3678: checking if you want wide-character code" >&5
++echo "$as_me:3692: checking if you want wide-character code" >&5
 +echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
 +
@@ -7166 +7244 @@
 +  with_widec=no
 +fi;
-+echo "$as_me:3688: result: $with_widec" >&5
++echo "$as_me:3702: result: $with_widec" >&5
 +echo "${ECHO_T}$with_widec" >&6
 +if test "$with_widec" = yes ; then
 +
-+echo "$as_me:3692: checking for multibyte character support" >&5
++echo "$as_me:3706: 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
@@ -7178 +7256 @@
 +       cf_save_LIBS="$LIBS"
 +       cat >conftest.$ac_ext <<_ACEOF
-+#line 3700 "configure"
++#line 3714 "configure"
 +#include "confdefs.h"
 +
@@ -7191 +7269 @@
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:3713: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3727: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:3716: \$? = $ac_status" >&5
++  echo "$as_me:3730: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:3719: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3733: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:3722: \$? = $ac_status" >&5
++  echo "$as_me:3736: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_utf8_lib=yes
@@ -7212 +7290 @@
 +cf_cv_library_path_utf8=
 +
-+echo "${as_me-configure}:3734: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:3748: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 +
 +cf_save_LIBS="$LIBS"
 +
 +cat >conftest.$ac_ext <<_ACEOF
-+#line 3739 "configure"
++#line 3753 "configure"
 +#include "confdefs.h"
 +
@@ -7230 +7308 @@
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:3752: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3766: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:3755: \$? = $ac_status" >&5
++  echo "$as_me:3769: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:3758: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3772: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:3761: \$? = $ac_status" >&5
++  echo "$as_me:3775: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +
@@ -7253 +7331 @@
 +
 +cat >conftest.$ac_ext <<_ACEOF
-+#line 3775 "configure"
++#line 3789 "configure"
 +#include "confdefs.h"
 +
@@ -7266 +7344 @@
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:3788: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3802: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:3791: \$? = $ac_status" >&5
++  echo "$as_me:3805: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:3794: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3808: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:3797: \$? = $ac_status" >&5
++  echo "$as_me:3811: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +
@@ -7292 +7370 @@
 +    test -n "$verbose" && echo "       find linkage for utf8 library" 1>&6
 +
-+echo "${as_me-configure}:3814: testing find linkage for utf8 library ..." 1>&5
-+
-+echo "${as_me-configure}:3816: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:3828: testing find linkage for utf8 library ..." 1>&5
++
++echo "${as_me:-configure}:3830: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 +
 +    cf_save_CPPFLAGS="$CPPFLAGS"
@@ -7407 +7485 @@
 +        test -n "$verbose" && echo "   ... testing $cf_cv_header_path_utf8" 1>&6
 +
-+echo "${as_me-configure}:3929: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:3943: 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 3933 "configure"
++#line 3947 "configure"
 +#include "confdefs.h"
 +
@@ -7424 +7502 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:3946: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3960: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:3949: \$? = $ac_status" >&5
++  echo "$as_me:3963: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:3952: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3966: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:3955: \$? = $ac_status" >&5
++  echo "$as_me:3969: \$? = $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}:3960: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:3974: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 +
 +            cf_cv_find_linkage_utf8=maybe
@@ -7456 +7534 @@
 +    if test "$cf_cv_find_linkage_utf8" = maybe ; then
 +
-+echo "${as_me-configure}:3978: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:3992: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 +
 +      cf_save_LIBS="$LIBS"
@@ -7553 +7631 @@
 +            test -n "$verbose" && echo "       ... testing $cf_cv_library_path_utf8" 1>&6
 +
-+echo "${as_me-configure}:4075: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:4089: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
 +
 +            CPPFLAGS="$cf_test_CPPFLAGS"
@@ -7559 +7637 @@
 +            LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
 +            cat >conftest.$ac_ext <<_ACEOF
-+#line 4081 "configure"
++#line 4095 "configure"
 +#include "confdefs.h"
 +
@@ -7572 +7650 @@
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:4094: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4108: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:4097: \$? = $ac_status" >&5
++  echo "$as_me:4111: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:4100: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4114: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:4103: \$? = $ac_status" >&5
++  echo "$as_me:4117: \$? = $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}:4108: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:4122: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 +
 +                cf_cv_find_linkage_utf8=yes
@@ -7628 +7706 @@
 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 +fi
-+echo "$as_me:4150: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:4164: result: $cf_cv_utf8_lib" >&5
 +echo "${ECHO_T}$cf_cv_utf8_lib" >&6
 +
@@ -7662 +7740 @@
 +                         CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 +                         cat >conftest.$ac_ext <<_ACEOF
-+#line 4184 "configure"
++#line 4198 "configure"
 +#include "confdefs.h"
 +#include <stdio.h>
@@ -7674 +7752 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:4196: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4210: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:4199: \$? = $ac_status" >&5
++  echo "$as_me:4213: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:4202: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4216: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:4205: \$? = $ac_status" >&5
++  echo "$as_me:4219: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  :
@@ -7700 +7778 @@
 +                 test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 +
-+echo "${as_me-configure}:4222: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:4236: testing adding $cf_add_incdir to include-path ..." 1>&5
 +
 +                 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -7734 +7812 @@
 +        test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
 +
-+echo "${as_me-configure}:4256: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:4270: testing adding $cf_add_libdir to library-path ..." 1>&5
 +
 +        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
@@ -7752 +7830 @@
 +  # 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:4274: checking for $ac_word" >&5
++echo "$as_me:4288: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then
@@ -7769 +7847 @@
 +  if $as_executable_p "$ac_dir/$ac_word"; then
 +   ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word"
-+   echo "$as_me:4291: found $ac_dir/$ac_word" >&5
++   echo "$as_me:4305: found $ac_dir/$ac_word" >&5
 +   break
 +fi
@@ -7780 +7858 @@
 +
 +if test -n "$NCURSES_CONFIG"; then
-+  echo "$as_me:4302: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:4316: result: $NCURSES_CONFIG" >&5
 +echo "${ECHO_T}$NCURSES_CONFIG" >&6
 +else
-+  echo "$as_me:4305: result: no" >&5
++  echo "$as_me:4319: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -7798 +7876 @@
 +# even with config script, some packages use no-override for curses.h
 +
-+echo "$as_me:4320: checking if we have identified curses headers" >&5
++echo "$as_me:4334: checking if we have identified curses headers" >&5
 +echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 +if test "${cf_cv_ncurses_header+set}" = set; then
@@ -7812 +7890 @@
 +do
 +cat >conftest.$ac_ext <<_ACEOF
-+#line 4334 "configure"
++#line 4348 "configure"
 +#include "confdefs.h"
 +#include <${cf_header}>
@@ -7824 +7902 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:4346: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4360: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:4349: \$? = $ac_status" >&5
++  echo "$as_me:4363: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:4352: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4366: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:4355: \$? = $ac_status" >&5
++  echo "$as_me:4369: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_ncurses_header=$cf_header; break
@@ -7844 +7922 @@
 +
 +fi
-+echo "$as_me:4366: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:4380: result: $cf_cv_ncurses_header" >&5
 +echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 +
 +if test "$cf_cv_ncurses_header" = none ; then
-+       { { echo "$as_me:4370: error: No curses header-files found" >&5
++       { { echo "$as_me:4384: error: No curses header-files found" >&5
 +echo "$as_me: error: No curses header-files found" >&2;}
 +   { (exit 1); exit 1; }; }
@@ -7858 +7936 @@
 +do
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+echo "$as_me:4380: checking for $ac_header" >&5
++echo "$as_me:4394: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -7864 +7942 @@
 +else
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 4386 "configure"
++#line 4400 "configure"
 +#include "confdefs.h"
 +#include <$ac_header>
 +_ACEOF
-+if { (eval echo "$as_me:4390: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:4404: \"$ac_cpp conftest.$ac_ext\"") >&5
 +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +  ac_status=$?
@@ -7874 +7952 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:4396: \$? = $ac_status" >&5
++  echo "$as_me:4410: \$? = $ac_status" >&5
 +  (exit $ac_status); } >/dev/null; then
 +  if test -s conftest.err; then
@@ -7893 +7971 @@
 +rm -f conftest.err conftest.$ac_ext
 +fi
-+echo "$as_me:4415: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:4429: 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
@@ -7946 +8024 @@
 +                         CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 +                         cat >conftest.$ac_ext <<_ACEOF
-+#line 4468 "configure"
++#line 4482 "configure"
 +#include "confdefs.h"
 +#include <stdio.h>
@@ -7958 +8036 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:4480: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4494: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:4483: \$? = $ac_status" >&5
++  echo "$as_me:4497: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:4486: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4500: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:4489: \$? = $ac_status" >&5
++  echo "$as_me:4503: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  :
@@ -7984 +8062 @@
 +                 test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 +
-+echo "${as_me-configure}:4506: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:4520: testing adding $cf_add_incdir to include-path ..." 1>&5
 +
 +                 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -8001 +8079 @@
 +}
 +
-+echo "$as_me:4523: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:4537: checking for $cf_ncuhdr_root header in include-path" >&5
 +echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 +if test "${cf_cv_ncurses_h+set}" = set; then
@@ -8013 +8091 @@
 +
 +       cat >conftest.$ac_ext <<_ACEOF
-+#line 4535 "configure"
++#line 4549 "configure"
 +#include "confdefs.h"
 +
@@ -8045 +8123 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:4567: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4581: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:4570: \$? = $ac_status" >&5
++  echo "$as_me:4584: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:4573: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4587: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:4576: \$? = $ac_status" >&5
++  echo "$as_me:4590: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_ncurses_h=$cf_header
@@ -8069 +8147 @@
 +
 +fi
-+echo "$as_me:4591: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:4605: result: $cf_cv_ncurses_h" >&5
 +echo "${ECHO_T}$cf_cv_ncurses_h" >&6
 +
@@ -8076 +8154 @@
 +else
 +
-+echo "$as_me:4598: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:4612: checking for $cf_ncuhdr_root include-path" >&5
 +echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 +if test "${cf_cv_ncurses_h2+set}" = set; then
@@ -8216 +8294 @@
 +                         CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 +                         cat >conftest.$ac_ext <<_ACEOF
-+#line 4738 "configure"
++#line 4752 "configure"
 +#include "confdefs.h"
 +#include <stdio.h>
@@ -8228 +8306 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:4750: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4764: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:4753: \$? = $ac_status" >&5
++  echo "$as_me:4767: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:4756: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4770: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:4759: \$? = $ac_status" >&5
++  echo "$as_me:4773: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  :
@@ -8254 +8332 @@
 +                 test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 +
-+echo "${as_me-configure}:4776: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:4790: testing adding $cf_add_incdir to include-path ..." 1>&5
 +
 +                 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -8275 +8353 @@
 +
 +       cat >conftest.$ac_ext <<_ACEOF
-+#line 4797 "configure"
++#line 4811 "configure"
 +#include "confdefs.h"
 +
@@ -8299 +8377 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:4821: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4835: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:4824: \$? = $ac_status" >&5
++  echo "$as_me:4838: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:4827: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4841: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:4830: \$? = $ac_status" >&5
++  echo "$as_me:4844: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_ncurses_h2=$cf_header
@@ -8329 +8407 @@
 +               test "$cf_cv_ncurses_h2" != no && break
 +       done
-+       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:4851: error: not found" >&5
++       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:4865: error: not found" >&5
 +echo "$as_me: error: not found" >&2;}
 +   { (exit 1); exit 1; }; }
 +
 +fi
-+echo "$as_me:4856: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:4870: result: $cf_cv_ncurses_h2" >&5
 +echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 +
@@ -8367 +8445 @@
 +                         CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 +                         cat >conftest.$ac_ext <<_ACEOF
-+#line 4889 "configure"
++#line 4903 "configure"
 +#include "confdefs.h"
 +#include <stdio.h>
@@ -8379 +8457 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:4901: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4915: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:4904: \$? = $ac_status" >&5
++  echo "$as_me:4918: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:4907: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4921: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:4910: \$? = $ac_status" >&5
++  echo "$as_me:4924: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  :
@@ -8405 +8483 @@
 +                 test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 +
-+echo "${as_me-configure}:4927: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:4941: testing adding $cf_add_incdir to include-path ..." 1>&5
 +
 +                 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -8448 +8526 @@
 +esac
 +
-+echo "$as_me:4970: checking for terminfo header" >&5
++echo "$as_me:4984: checking for terminfo header" >&5
 +echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 +if test "${cf_cv_term_header+set}" = set; then
@@ -8466 +8544 @@
 +do
 +cat >conftest.$ac_ext <<_ACEOF
-+#line 4988 "configure"
++#line 5002 "configure"
 +#include "confdefs.h"
 +#include <stdio.h>
-+#include <${cf_cv_ncurses_header-curses.h}>
++#include <${cf_cv_ncurses_header:-curses.h}>
 +#include <$cf_test>
 +
@@ -8481 +8559 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:5003: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5017: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:5006: \$? = $ac_status" >&5
++  echo "$as_me:5020: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:5009: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5023: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:5012: \$? = $ac_status" >&5
++  echo "$as_me:5026: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +
@@ -8506 +8584 @@
 +
 +fi
-+echo "$as_me:5028: result: $cf_cv_term_header" >&5
++echo "$as_me:5042: result: $cf_cv_term_header" >&5
 +echo "${ECHO_T}$cf_cv_term_header" >&6
 +
@@ -8540 +8618 @@
 +EOF
 +
-+echo "$as_me:5062: checking for ncurses version" >&5
++echo "$as_me:5076: checking for ncurses version" >&5
 +echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 +if test "${cf_cv_ncurses_version+set}" = set; then
@@ -8554 +8632 @@
 +       # Autoconf token.  The 'unproto' program does that.
 +       cat > conftest.$ac_ext <<EOF
-+#include <${cf_cv_ncurses_header-curses.h}>
++#include <${cf_cv_ncurses_header:-curses.h}>
 +#undef Autoconf
 +#ifdef NCURSES_VERSION
@@ -8566 +8644 @@
 +EOF
 +       cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-+       { (eval echo "$as_me:5088: \"$cf_try\"") >&5
++       { (eval echo "$as_me:5102: \"$cf_try\"") >&5
 +  (eval $cf_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:5091: \$? = $ac_status" >&5
++  echo "$as_me:5105: \$? = $ac_status" >&5
 +  (exit $ac_status); }
 +       if test -f conftest.out ; then
@@ -8579 +8657 @@
 +else
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 5101 "configure"
++#line 5115 "configure"
 +#include "confdefs.h"
 +
-+#include <${cf_cv_ncurses_header-curses.h}>
++#include <${cf_cv_ncurses_header:-curses.h}>
 +#include <stdio.h>
 +int main()
@@ -8600 +8678 @@
 +# endif
 +#endif
-+       ${cf_cv_main_return-return}(0);
++       ${cf_cv_main_return:-return}(0);
 +}
 +_ACEOF
 +rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:5126: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5140: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:5129: \$? = $ac_status" >&5
++  echo "$as_me:5143: \$? = $ac_status" >&5
 +  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+  { (eval echo "$as_me:5131: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5145: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:5134: \$? = $ac_status" >&5
++  echo "$as_me:5148: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +
@@ -8626 +8704 @@
 +
 +fi
-+echo "$as_me:5148: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:5162: result: $cf_cv_ncurses_version" >&5
 +echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 +test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
@@ -8638 +8716 @@
 +cf_ncurses_LIBS=""
 +cf_ncurses_SAVE="$LIBS"
-+echo "$as_me:5160: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:5174: 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
@@ -8646 +8724 @@
 +LIBS="-lgpm  $LIBS"
 +cat >conftest.$ac_ext <<_ACEOF
-+#line 5168 "configure"
++#line 5182 "configure"
 +#include "confdefs.h"
 +
@@ -8665 +8743 @@
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:5187: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5201: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:5190: \$? = $ac_status" >&5
++  echo "$as_me:5204: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:5193: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5207: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:5196: \$? = $ac_status" >&5
++  echo "$as_me:5210: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_lib_gpm_Gpm_Open=yes
@@ -8685 +8763 @@
 +LIBS=$ac_check_lib_save_LIBS
 +fi
-+echo "$as_me:5207: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:5221: 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
-+  echo "$as_me:5210: checking for initscr in -lgpm" >&5
++  echo "$as_me:5224: checking for initscr in -lgpm" >&5
 +echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
 +if test "${ac_cv_lib_gpm_initscr+set}" = set; then
@@ -8696 +8774 @@
 +LIBS="-lgpm  $LIBS"
 +cat >conftest.$ac_ext <<_ACEOF
-+#line 5218 "configure"
++#line 5232 "configure"
 +#include "confdefs.h"
 +
@@ -8715 +8793 @@
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:5237: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5251: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:5240: \$? = $ac_status" >&5
++  echo "$as_me:5254: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:5243: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5257: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:5246: \$? = $ac_status" >&5
++  echo "$as_me:5260: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_lib_gpm_initscr=yes
@@ -8735 +8813 @@
 +LIBS=$ac_check_lib_save_LIBS
 +fi
-+echo "$as_me:5257: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:5271: result: $ac_cv_lib_gpm_initscr" >&5
 +echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 +if test $ac_cv_lib_gpm_initscr = yes; then
@@ -8750 +8828 @@
 +       # version of ncurses (but it should do no harm, since it's static).
 +       if test "$cf_nculib_root" = ncurses ; then
-+               echo "$as_me:5272: checking for tgoto in -lmytinfo" >&5
++               echo "$as_me:5286: checking for tgoto in -lmytinfo" >&5
 +echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 +if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
@@ -8758 +8836 @@
 +LIBS="-lmytinfo  $LIBS"
 +cat >conftest.$ac_ext <<_ACEOF
-+#line 5280 "configure"
++#line 5294 "configure"
 +#include "confdefs.h"
 +
@@ -8777 +8855 @@
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:5299: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5313: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:5302: \$? = $ac_status" >&5
++  echo "$as_me:5316: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:5305: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5319: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:5308: \$? = $ac_status" >&5
++  echo "$as_me:5322: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_lib_mytinfo_tgoto=yes
@@ -8797 +8875 @@
 +LIBS=$ac_check_lib_save_LIBS
 +fi
-+echo "$as_me:5319: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:5333: result: $ac_cv_lib_mytinfo_tgoto" >&5
 +echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 +if test $ac_cv_lib_mytinfo_tgoto = yes; then
@@ -8831 +8909 @@
 +        test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
 +
-+echo "${as_me-configure}:5353: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:5367: testing adding $cf_add_libdir to library-path ..." 1>&5
 +
 +        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
@@ -8844 +8922 @@
 +       eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 +       cf_libdir=""
-+       echo "$as_me:5366: checking for initscr" >&5
++       echo "$as_me:5380: checking for initscr" >&5
 +echo $ECHO_N "checking for initscr... $ECHO_C" >&6
 +if test "${ac_cv_func_initscr+set}" = set; then
@@ -8850 +8928 @@
 +else
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 5372 "configure"
++#line 5386 "configure"
 +#include "confdefs.h"
 +/* System header to define __stub macros and hopefully few prototypes,
@@ -8881 +8959 @@
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:5403: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5417: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:5406: \$? = $ac_status" >&5
++  echo "$as_me:5420: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:5409: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5423: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:5412: \$? = $ac_status" >&5
++  echo "$as_me:5426: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_func_initscr=yes
@@ -8900 +8978 @@
 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 +fi
-+echo "$as_me:5422: result: $ac_cv_func_initscr" >&5
++echo "$as_me:5436: result: $ac_cv_func_initscr" >&5
 +echo "${ECHO_T}$ac_cv_func_initscr" >&6
 +if test $ac_cv_func_initscr = yes; then
@@ -8907 +8985 @@
 +
 +               cf_save_LIBS="$LIBS"
-+               echo "$as_me:5429: checking for initscr in -l$cf_nculib_root" >&5
++               echo "$as_me:5443: checking for initscr in -l$cf_nculib_root" >&5
 +echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
 +               LIBS="-l$cf_nculib_root $LIBS"
 +               cat >conftest.$ac_ext <<_ACEOF
-+#line 5433 "configure"
++#line 5447 "configure"
 +#include "confdefs.h"
-+#include <${cf_cv_ncurses_header-curses.h}>
++#include <${cf_cv_ncurses_header:-curses.h}>
 +int
 +main ()
@@ -8923 +9001 @@
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:5445: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5459: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:5448: \$? = $ac_status" >&5
++  echo "$as_me:5462: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:5451: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5465: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:5454: \$? = $ac_status" >&5
++  echo "$as_me:5468: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
-+  echo "$as_me:5456: result: yes" >&5
++  echo "$as_me:5470: result: yes" >&5
 +echo "${ECHO_T}yes" >&6
 +                        eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
@@ -8941 +9019 @@
 +  echo "$as_me: failed program was:" >&5
 +cat conftest.$ac_ext >&5
-+echo "$as_me:5463: result: no" >&5
++echo "$as_me:5477: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +
@@ -9031 +9109 @@
 +                       for cf_libdir in $cf_search
 +                       do
-+                               echo "$as_me:5553: checking for -l$cf_nculib_root in $cf_libdir" >&5
++                               echo "$as_me:5567: checking for -l$cf_nculib_root in $cf_libdir" >&5
 +echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
 +                               LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
 +                               cat >conftest.$ac_ext <<_ACEOF
-+#line 5557 "configure"
++#line 5571 "configure"
 +#include "confdefs.h"
-+#include <${cf_cv_ncurses_header-curses.h}>
++#include <${cf_cv_ncurses_header:-curses.h}>
 +int
 +main ()
@@ -9047 +9125 @@
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:5569: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5583: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:5572: \$? = $ac_status" >&5
++  echo "$as_me:5586: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:5575: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5589: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:5578: \$? = $ac_status" >&5
++  echo "$as_me:5592: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
-+  echo "$as_me:5580: result: yes" >&5
++  echo "$as_me:5594: result: yes" >&5
 +echo "${ECHO_T}yes" >&6
 +                                        eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
@@ -9065 +9143 @@
 +  echo "$as_me: failed program was:" >&5
 +cat conftest.$ac_ext >&5
-+echo "$as_me:5587: result: no" >&5
++echo "$as_me:5601: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +                                        LIBS="$cf_save_LIBS"
@@ -9080 +9158 @@
 +
 +if test $cf_found_library = no ; then
-+       { { echo "$as_me:5602: error: Cannot link $cf_nculib_root library" >&5
++       { { echo "$as_me:5616: error: Cannot link $cf_nculib_root library" >&5
 +echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
 +   { (exit 1); exit 1; }; }
@@ -9088 +9166 @@
 +
 +if test -n "$cf_ncurses_LIBS" ; then
-+       echo "$as_me:5610: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++       echo "$as_me:5624: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
 +echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
 +       cf_ncurses_SAVE="$LIBS"
@@ -9098 +9176 @@
 +       done
 +       cat >conftest.$ac_ext <<_ACEOF
-+#line 5620 "configure"
++#line 5634 "configure"
 +#include "confdefs.h"
-+#include <${cf_cv_ncurses_header-curses.h}>
++#include <${cf_cv_ncurses_header:-curses.h}>
 +int
 +main ()
@@ -9110 +9188 @@
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:5632: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5646: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:5635: \$? = $ac_status" >&5
++  echo "$as_me:5649: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:5638: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5652: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:5641: \$? = $ac_status" >&5
++  echo "$as_me:5655: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
-+  echo "$as_me:5643: result: yes" >&5
++  echo "$as_me:5657: result: yes" >&5
 +echo "${ECHO_T}yes" >&6
 +else
 +  echo "$as_me: failed program was:" >&5
 +cat conftest.$ac_ext >&5
-+echo "$as_me:5648: result: no" >&5
++echo "$as_me:5662: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +                LIBS="$cf_ncurses_SAVE"
@@ -9150 +9228 @@
 +  # 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:5672: checking for $ac_word" >&5
++echo "$as_me:5686: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then
@@ -9167 +9245 @@
 +  if $as_executable_p "$ac_dir/$ac_word"; then
 +   ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word"
-+   echo "$as_me:5689: found $ac_dir/$ac_word" >&5
++   echo "$as_me:5703: found $ac_dir/$ac_word" >&5
 +   break
 +fi
@@ -9178 +9256 @@
 +
 +if test -n "$NCURSES_CONFIG"; then
-+  echo "$as_me:5700: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:5714: result: $NCURSES_CONFIG" >&5
 +echo "${ECHO_T}$NCURSES_CONFIG" >&6
 +else
-+  echo "$as_me:5703: result: no" >&5
++  echo "$as_me:5717: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -9196 +9274 @@
 +# even with config script, some packages use no-override for curses.h
 +
-+echo "$as_me:5718: checking if we have identified curses headers" >&5
++echo "$as_me:5732: checking if we have identified curses headers" >&5
 +echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 +if test "${cf_cv_ncurses_header+set}" = set; then
@@ -9210 +9288 @@
 +do
 +cat >conftest.$ac_ext <<_ACEOF
-+#line 5732 "configure"
++#line 5746 "configure"
 +#include "confdefs.h"
 +#include <${cf_header}>
@@ -9222 +9300 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:5744: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5758: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:5747: \$? = $ac_status" >&5
++  echo "$as_me:5761: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:5750: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5764: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:5753: \$? = $ac_status" >&5
++  echo "$as_me:5767: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_ncurses_header=$cf_header; break
@@ -9242 +9320 @@
 +
 +fi
-+echo "$as_me:5764: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:5778: result: $cf_cv_ncurses_header" >&5
 +echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 +
 +if test "$cf_cv_ncurses_header" = none ; then
-+       { { echo "$as_me:5768: error: No curses header-files found" >&5
++       { { echo "$as_me:5782: error: No curses header-files found" >&5
 +echo "$as_me: error: No curses header-files found" >&2;}
 +   { (exit 1); exit 1; }; }
@@ -9256 +9334 @@
 +do
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+echo "$as_me:5778: checking for $ac_header" >&5
++echo "$as_me:5792: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -9262 +9340 @@
 +else
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 5784 "configure"
++#line 5798 "configure"
 +#include "confdefs.h"
 +#include <$ac_header>
 +_ACEOF
-+if { (eval echo "$as_me:5788: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:5802: \"$ac_cpp conftest.$ac_ext\"") >&5
 +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +  ac_status=$?
@@ -9272 +9350 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:5794: \$? = $ac_status" >&5
++  echo "$as_me:5808: \$? = $ac_status" >&5
 +  (exit $ac_status); } >/dev/null; then
 +  if test -s conftest.err; then
@@ -9291 +9369 @@
 +rm -f conftest.err conftest.$ac_ext
 +fi
-+echo "$as_me:5813: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:5827: 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
@@ -9344 +9422 @@
 +                         CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 +                         cat >conftest.$ac_ext <<_ACEOF
-+#line 5866 "configure"
++#line 5880 "configure"
 +#include "confdefs.h"
 +#include <stdio.h>
@@ -9356 +9434 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:5878: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5892: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:5881: \$? = $ac_status" >&5
++  echo "$as_me:5895: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:5884: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5898: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:5887: \$? = $ac_status" >&5
++  echo "$as_me:5901: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  :
@@ -9382 +9460 @@
 +                 test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 +
-+echo "${as_me-configure}:5904: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:5918: testing adding $cf_add_incdir to include-path ..." 1>&5
 +
 +                 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -9399 +9477 @@
 +}
 +
-+echo "$as_me:5921: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:5935: checking for $cf_ncuhdr_root header in include-path" >&5
 +echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 +if test "${cf_cv_ncurses_h+set}" = set; then
@@ -9411 +9489 @@
 +
 +       cat >conftest.$ac_ext <<_ACEOF
-+#line 5933 "configure"
++#line 5947 "configure"
 +#include "confdefs.h"
 +
@@ -9435 +9513 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:5957: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5971: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:5960: \$? = $ac_status" >&5
++  echo "$as_me:5974: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:5963: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5977: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:5966: \$? = $ac_status" >&5
++  echo "$as_me:5980: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_ncurses_h=$cf_header
@@ -9459 +9537 @@
 +
 +fi
-+echo "$as_me:5981: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:5995: result: $cf_cv_ncurses_h" >&5
 +echo "${ECHO_T}$cf_cv_ncurses_h" >&6
 +
@@ -9466 +9544 @@
 +else
 +
-+echo "$as_me:5988: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:6002: checking for $cf_ncuhdr_root include-path" >&5
 +echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 +if test "${cf_cv_ncurses_h2+set}" = set; then
@@ -9606 +9684 @@
 +                         CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 +                         cat >conftest.$ac_ext <<_ACEOF
-+#line 6128 "configure"
++#line 6142 "configure"
 +#include "confdefs.h"
 +#include <stdio.h>
@@ -9618 +9696 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:6140: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6154: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:6143: \$? = $ac_status" >&5
++  echo "$as_me:6157: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:6146: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6160: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:6149: \$? = $ac_status" >&5
++  echo "$as_me:6163: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  :
@@ -9644 +9722 @@
 +                 test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 +
-+echo "${as_me-configure}:6166: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6180: testing adding $cf_add_incdir to include-path ..." 1>&5
 +
 +                 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -9665 +9743 @@
 +
 +       cat >conftest.$ac_ext <<_ACEOF
-+#line 6187 "configure"
++#line 6201 "configure"
 +#include "confdefs.h"
 +
@@ -9689 +9767 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:6211: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6225: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:6214: \$? = $ac_status" >&5
++  echo "$as_me:6228: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:6217: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6231: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:6220: \$? = $ac_status" >&5
++  echo "$as_me:6234: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_ncurses_h2=$cf_header
@@ -9719 +9797 @@
 +               test "$cf_cv_ncurses_h2" != no && break
 +       done
-+       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6241: error: not found" >&5
++       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6255: error: not found" >&5
 +echo "$as_me: error: not found" >&2;}
 +   { (exit 1); exit 1; }; }
 +
 +fi
-+echo "$as_me:6246: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:6260: result: $cf_cv_ncurses_h2" >&5
 +echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 +
@@ -9757 +9835 @@
 +                         CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 +                         cat >conftest.$ac_ext <<_ACEOF
-+#line 6279 "configure"
++#line 6293 "configure"
 +#include "confdefs.h"
 +#include <stdio.h>
@@ -9769 +9847 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:6291: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6305: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:6294: \$? = $ac_status" >&5
++  echo "$as_me:6308: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:6297: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6311: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:6300: \$? = $ac_status" >&5
++  echo "$as_me:6314: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  :
@@ -9795 +9873 @@
 +                 test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
 +
-+echo "${as_me-configure}:6317: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6331: testing adding $cf_add_incdir to include-path ..." 1>&5
 +
 +                 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -9838 +9916 @@
 +esac
 +
-+echo "$as_me:6360: checking for terminfo header" >&5
++echo "$as_me:6374: checking for terminfo header" >&5
 +echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 +if test "${cf_cv_term_header+set}" = set; then
@@ -9856 +9934 @@
 +do
 +cat >conftest.$ac_ext <<_ACEOF
-+#line 6378 "configure"
++#line 6392 "configure"
 +#include "confdefs.h"
 +#include <stdio.h>
-+#include <${cf_cv_ncurses_header-curses.h}>
++#include <${cf_cv_ncurses_header:-curses.h}>
 +#include <$cf_test>
 +
@@ -9871 +9949 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:6393: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6407: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:6396: \$? = $ac_status" >&5
++  echo "$as_me:6410: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:6399: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6413: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:6402: \$? = $ac_status" >&5
++  echo "$as_me:6416: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +
@@ -9896 +9974 @@
 +
 +fi
-+echo "$as_me:6418: result: $cf_cv_term_header" >&5
++echo "$as_me:6432: result: $cf_cv_term_header" >&5
 +echo "${ECHO_T}$cf_cv_term_header" >&6
 +
@@ -9930 +10008 @@
 +EOF
 +
-+echo "$as_me:6452: checking for ncurses version" >&5
++echo "$as_me:6466: checking for ncurses version" >&5
 +echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 +if test "${cf_cv_ncurses_version+set}" = set; then
@@ -9944 +10022 @@
 +       # Autoconf token.  The 'unproto' program does that.
 +       cat > conftest.$ac_ext <<EOF
-+#include <${cf_cv_ncurses_header-curses.h}>
++#include <${cf_cv_ncurses_header:-curses.h}>
 +#undef Autoconf
 +#ifdef NCURSES_VERSION
@@ -9956 +10034 @@
 +EOF
 +       cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-+       { (eval echo "$as_me:6478: \"$cf_try\"") >&5
++       { (eval echo "$as_me:6492: \"$cf_try\"") >&5
 +  (eval $cf_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:6481: \$? = $ac_status" >&5
++  echo "$as_me:6495: \$? = $ac_status" >&5
 +  (exit $ac_status); }
 +       if test -f conftest.out ; then
@@ -9969 +10047 @@
 +else
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 6491 "configure"
++#line 6505 "configure"
 +#include "confdefs.h"
 +
-+#include <${cf_cv_ncurses_header-curses.h}>
++#include <${cf_cv_ncurses_header:-curses.h}>
 +#include <stdio.h>
 +int main()
@@ -9990 +10068 @@
 +# endif
 +#endif
-+       ${cf_cv_main_return-return}(0);
++       ${cf_cv_main_return:-return}(0);
 +}
 +_ACEOF
 +rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:6516: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6530: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:6519: \$? = $ac_status" >&5
++  echo "$as_me:6533: \$? = $ac_status" >&5
 +  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+  { (eval echo "$as_me:6521: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6535: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:6524: \$? = $ac_status" >&5
++  echo "$as_me:6538: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +
@@ -10016 +10094 @@
 +
 +fi
-+echo "$as_me:6538: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:6552: result: $cf_cv_ncurses_version" >&5
 +echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 +test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
@@ -10028 +10106 @@
 +cf_ncurses_LIBS=""
 +cf_ncurses_SAVE="$LIBS"
-+echo "$as_me:6550: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:6564: 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
@@ -10036 +10114 @@
 +LIBS="-lgpm  $LIBS"
 +cat >conftest.$ac_ext <<_ACEOF
-+#line 6558 "configure"
++#line 6572 "configure"
 +#include "confdefs.h"
 +
@@ -10055 +10133 @@
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:6577: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6591: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:6580: \$? = $ac_status" >&5
++  echo "$as_me:6594: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:6583: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6597: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:6586: \$? = $ac_status" >&5
++  echo "$as_me:6600: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_lib_gpm_Gpm_Open=yes
@@ -10075 +10153 @@
 +LIBS=$ac_check_lib_save_LIBS
 +fi
-+echo "$as_me:6597: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:6611: 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
-+  echo "$as_me:6600: checking for initscr in -lgpm" >&5
++  echo "$as_me:6614: checking for initscr in -lgpm" >&5
 +echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
 +if test "${ac_cv_lib_gpm_initscr+set}" = set; then
@@ -10086 +10164 @@
 +LIBS="-lgpm  $LIBS"
 +cat >conftest.$ac_ext <<_ACEOF
-+#line 6608 "configure"
++#line 6622 "configure"
 +#include "confdefs.h"
 +
@@ -10105 +10183 @@
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:6627: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6641: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:6630: \$? = $ac_status" >&5
++  echo "$as_me:6644: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:6633: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6647: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:6636: \$? = $ac_status" >&5
++  echo "$as_me:6650: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_lib_gpm_initscr=yes
@@ -10125 +10203 @@
 +LIBS=$ac_check_lib_save_LIBS
 +fi
-+echo "$as_me:6647: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:6661: result: $ac_cv_lib_gpm_initscr" >&5
 +echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 +if test $ac_cv_lib_gpm_initscr = yes; then
@@ -10140 +10218 @@
 +       # version of ncurses (but it should do no harm, since it's static).
 +       if test "$cf_nculib_root" = ncurses ; then
-+               echo "$as_me:6662: checking for tgoto in -lmytinfo" >&5
++               echo "$as_me:6676: checking for tgoto in -lmytinfo" >&5
 +echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 +if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
@@ -10148 +10226 @@
 +LIBS="-lmytinfo  $LIBS"
 +cat >conftest.$ac_ext <<_ACEOF
-+#line 6670 "configure"
++#line 6684 "configure"
 +#include "confdefs.h"
 +
@@ -10167 +10245 @@
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:6689: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6703: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:6692: \$? = $ac_status" >&5
++  echo "$as_me:6706: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:6695: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6709: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:6698: \$? = $ac_status" >&5
++  echo "$as_me:6712: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_lib_mytinfo_tgoto=yes
@@ -10187 +10265 @@
 +LIBS=$ac_check_lib_save_LIBS
 +fi
-+echo "$as_me:6709: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:6723: result: $ac_cv_lib_mytinfo_tgoto" >&5
 +echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 +if test $ac_cv_lib_mytinfo_tgoto = yes; then
@@ -10221 +10299 @@
 +        test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
 +
-+echo "${as_me-configure}:6743: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:6757: testing adding $cf_add_libdir to library-path ..." 1>&5
 +
 +        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
@@ -10234 +10312 @@
 +       eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 +       cf_libdir=""
-+       echo "$as_me:6756: checking for initscr" >&5
++       echo "$as_me:6770: checking for initscr" >&5
 +echo $ECHO_N "checking for initscr... $ECHO_C" >&6
 +if test "${ac_cv_func_initscr+set}" = set; then
@@ -10240 +10318 @@
 +else
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 6762 "configure"
++#line 6776 "configure"
 +#include "confdefs.h"
 +/* System header to define __stub macros and hopefully few prototypes,
@@ -10271 +10349 @@
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:6793: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6807: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:6796: \$? = $ac_status" >&5
++  echo "$as_me:6810: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:6799: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6813: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:6802: \$? = $ac_status" >&5
++  echo "$as_me:6816: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_func_initscr=yes
@@ -10290 +10368 @@
 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 +fi
-+echo "$as_me:6812: result: $ac_cv_func_initscr" >&5
++echo "$as_me:6826: result: $ac_cv_func_initscr" >&5
 +echo "${ECHO_T}$ac_cv_func_initscr" >&6
 +if test $ac_cv_func_initscr = yes; then
@@ -10297 +10375 @@
 +
 +               cf_save_LIBS="$LIBS"
-+               echo "$as_me:6819: checking for initscr in -l$cf_nculib_root" >&5
++               echo "$as_me:6833: checking for initscr in -l$cf_nculib_root" >&5
 +echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
 +               LIBS="-l$cf_nculib_root $LIBS"
 +               cat >conftest.$ac_ext <<_ACEOF
-+#line 6823 "configure"
++#line 6837 "configure"
 +#include "confdefs.h"
-+#include <${cf_cv_ncurses_header-curses.h}>
++#include <${cf_cv_ncurses_header:-curses.h}>
 +int
 +main ()
@@ -10313 +10391 @@
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:6835: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6849: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:6838: \$? = $ac_status" >&5
++  echo "$as_me:6852: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:6841: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6855: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:6844: \$? = $ac_status" >&5
++  echo "$as_me:6858: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
-+  echo "$as_me:6846: result: yes" >&5
++  echo "$as_me:6860: result: yes" >&5
 +echo "${ECHO_T}yes" >&6
 +                        eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
@@ -10331 +10409 @@
 +  echo "$as_me: failed program was:" >&5
 +cat conftest.$ac_ext >&5
-+echo "$as_me:6853: result: no" >&5
++echo "$as_me:6867: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +
@@ -10421 +10499 @@
 +                       for cf_libdir in $cf_search
 +                       do
-+                               echo "$as_me:6943: checking for -l$cf_nculib_root in $cf_libdir" >&5
++                               echo "$as_me:6957: checking for -l$cf_nculib_root in $cf_libdir" >&5
 +echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
 +                               LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
 +                               cat >conftest.$ac_ext <<_ACEOF
-+#line 6947 "configure"
++#line 6961 "configure"
 +#include "confdefs.h"
-+#include <${cf_cv_ncurses_header-curses.h}>
++#include <${cf_cv_ncurses_header:-curses.h}>
 +int
 +main ()
@@ -10437 +10515 @@
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:6959: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6973: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:6962: \$? = $ac_status" >&5
++  echo "$as_me:6976: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:6965: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6979: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:6968: \$? = $ac_status" >&5
++  echo "$as_me:6982: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
-+  echo "$as_me:6970: result: yes" >&5
++  echo "$as_me:6984: result: yes" >&5
 +echo "${ECHO_T}yes" >&6
 +                                        eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
@@ -10455 +10533 @@
 +  echo "$as_me: failed program was:" >&5
 +cat conftest.$ac_ext >&5
-+echo "$as_me:6977: result: no" >&5
++echo "$as_me:6991: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +                                        LIBS="$cf_save_LIBS"
@@ -10470 +10548 @@
 +
 +if test $cf_found_library = no ; then
-+       { { echo "$as_me:6992: error: Cannot link $cf_nculib_root library" >&5
++       { { echo "$as_me:7006: error: Cannot link $cf_nculib_root library" >&5
 +echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
 +   { (exit 1); exit 1; }; }
@@ -10478 +10556 @@
 +
 +if test -n "$cf_ncurses_LIBS" ; then
-+       echo "$as_me:7000: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++       echo "$as_me:7014: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
 +echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
 +       cf_ncurses_SAVE="$LIBS"
@@ -10488 +10566 @@
 +       done
 +       cat >conftest.$ac_ext <<_ACEOF
-+#line 7010 "configure"
++#line 7024 "configure"
 +#include "confdefs.h"
-+#include <${cf_cv_ncurses_header-curses.h}>
++#include <${cf_cv_ncurses_header:-curses.h}>
 +int
 +main ()
@@ -10500 +10578 @@
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:7022: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7036: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7025: \$? = $ac_status" >&5
++  echo "$as_me:7039: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:7028: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7042: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7031: \$? = $ac_status" >&5
++  echo "$as_me:7045: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
-+  echo "$as_me:7033: result: yes" >&5
++  echo "$as_me:7047: result: yes" >&5
 +echo "${ECHO_T}yes" >&6
 +else
 +  echo "$as_me: failed program was:" >&5
 +cat conftest.$ac_ext >&5
-+echo "$as_me:7038: result: no" >&5
++echo "$as_me:7052: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +                LIBS="$cf_ncurses_SAVE"
@@ -10549 +10627 @@
 +do
 +cat >conftest.$ac_ext <<CF_EOF
-+#include <${cf_cv_ncurses_header-curses.h}>
++#include <${cf_cv_ncurses_header:-curses.h}>
 +AUTOCONF_$cf_name NCURSES_VERSION_$cf_name
 +CF_EOF
 +       cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out"
-+       { (eval echo "$as_me:7075: \"$cf_try\"") >&5
++       { (eval echo "$as_me:7089: \"$cf_try\"") >&5
 +  (eval $cf_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7078: \$? = $ac_status" >&5
++  echo "$as_me:7092: \$? = $ac_status" >&5
 +  (exit $ac_status); }
 +       if test -f conftest.out ; then
@@ -10574 +10652 @@
 +cf_cv_timestamp=`date`
 +
-+echo "$as_me:7096: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
++echo "$as_me:7110: 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
 +
@@ -10597 +10675 @@
 +fi
 +
-+echo "$as_me:7119: checking for default loader flags" >&5
++echo "$as_me:7133: checking for default loader flags" >&5
 +echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
 +case $DFT_LWR_MODEL in
@@ -10605 +10683 @@
 +shared)  LD_MODEL=''   ;;
 +esac
-+echo "$as_me:7127: result: $LD_MODEL" >&5
++echo "$as_me:7141: result: $LD_MODEL" >&5
 +echo "${ECHO_T}$LD_MODEL" >&6
 +
 +LD_RPATH_OPT=
-+echo "$as_me:7131: checking for an rpath option" >&5
++echo "$as_me:7145: checking for an rpath option" >&5
 +echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 +case $cf_cv_system_name in #(vi
@@ -10640 +10718 @@
 +       ;;
 +esac
-+echo "$as_me:7162: result: $LD_RPATH_OPT" >&5
++echo "$as_me:7176: result: $LD_RPATH_OPT" >&5
 +echo "${ECHO_T}$LD_RPATH_OPT" >&6
 +
 +case "x$LD_RPATH_OPT" in #(vi
 +x-R*)
-+       echo "$as_me:7167: checking if we need a space after rpath option" >&5
++       echo "$as_me:7181: 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="${LD_RPATH_OPT}$libdir $LIBS"
 +       cat >conftest.$ac_ext <<_ACEOF
-+#line 7172 "configure"
++#line 7186 "configure"
 +#include "confdefs.h"
 +
@@ -10662 +10740 @@
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:7184: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7198: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7187: \$? = $ac_status" >&5
++  echo "$as_me:7201: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:7190: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7204: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7193: \$? = $ac_status" >&5
++  echo "$as_me:7207: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_rpath_space=no
@@ -10681 +10759 @@
 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 +       LIBS="$cf_save_LIBS"
-+       echo "$as_me:7203: result: $cf_rpath_space" >&5
++       echo "$as_me:7217: result: $cf_rpath_space" >&5
 +echo "${ECHO_T}$cf_rpath_space" >&6
 +       test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
@@ -10696 +10774 @@
 +       test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 +
-+       echo "$as_me:7218: checking if release/abi version should be used for shared libs" >&5
++       echo "$as_me:7232: 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
 +
@@ -10711 +10789 @@
 +               ;;
 +       *)
-+               { { echo "$as_me:7233: error: option value must be one of: rel, abi, auto or no" >&5
++               { { echo "$as_me:7247: 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; }; }
@@ -10720 +10798 @@
 +  cf_cv_shlib_version=auto
 +fi;
-+       echo "$as_me:7242: result: $cf_cv_shlib_version" >&5
++       echo "$as_me:7256: result: $cf_cv_shlib_version" >&5
 +echo "${ECHO_T}$cf_cv_shlib_version" >&6
 +
@@ -10729 +10807 @@
 +       if test "$GCC" = yes
 +       then
-+               echo "$as_me:7251: checking which $CC option to use" >&5
++               echo "$as_me:7265: checking which $CC option to use" >&5
 +echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
 +               cf_save_CFLAGS="$CFLAGS"
@@ -10736 +10814 @@
 +                       CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
 +                       cat >conftest.$ac_ext <<_ACEOF
-+#line 7258 "configure"
++#line 7272 "configure"
 +#include "confdefs.h"
 +#include <stdio.h>
@@ -10748 +10826 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:7270: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7284: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7273: \$? = $ac_status" >&5
++  echo "$as_me:7287: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:7276: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7290: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7279: \$? = $ac_status" >&5
++  echo "$as_me:7293: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  break
@@ -10766 +10844 @@
 +rm -f conftest.$ac_objext conftest.$ac_ext
 +               done
-+               echo "$as_me:7288: result: $CC_SHARED_OPTS" >&5
++               echo "$as_me:7302: result: $CC_SHARED_OPTS" >&5
 +echo "${ECHO_T}$CC_SHARED_OPTS" >&6
 +               CFLAGS="$cf_save_CFLAGS"
@@ -10808 +10886 @@
 +               test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
 +               cf_cv_shlib_version_infix=yes
-+               echo "$as_me:7330: checking if ld -search_paths_first works" >&5
++               echo "$as_me:7344: 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
@@ -10817 +10895 @@
 +                       LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 +                       cat >conftest.$ac_ext <<_ACEOF
-+#line 7339 "configure"
++#line 7353 "configure"
 +#include "confdefs.h"
 +
@@ -10829 +10907 @@
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:7351: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7365: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7354: \$? = $ac_status" >&5
++  echo "$as_me:7368: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:7357: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7371: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7360: \$? = $ac_status" >&5
++  echo "$as_me:7374: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_ldflags_search_paths_first=yes
@@ -10849 +10927 @@
 +                               LDFLAGS=$cf_save_LDFLAGS
 +fi
-+echo "$as_me:7371: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:7385: 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
@@ -11029 +11107 @@
 +                               CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
 +                               cat >conftest.$ac_ext <<_ACEOF
-+#line 7551 "configure"
++#line 7565 "configure"
 +#include "confdefs.h"
 +#include <stdio.h>
@@ -11041 +11119 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:7563: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7577: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7566: \$? = $ac_status" >&5
++  echo "$as_me:7580: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:7569: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7583: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7572: \$? = $ac_status" >&5
++  echo "$as_me:7586: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  break
@@ -11087 +11165 @@
 +                       ;;
 +               *)
-+                       { echo "$as_me:7609: WARNING: ignored --with-shlib-version" >&5
++                       { echo "$as_me:7623: WARNING: ignored --with-shlib-version" >&5
 +echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
 +                       ;;
@@ -11106 +11184 @@
 +
 +###   use option --enable-broken-linker to force on use of broken-linker support
-+echo "$as_me:7628: checking if you want broken-linker support code" >&5
++echo "$as_me:7642: checking if you want broken-linker support code" >&5
 +echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
 +
@@ -11114 +11192 @@
 +  with_broken_linker=$enableval
 +else
-+  with_broken_linker=${BROKEN_LINKER-no}
++  with_broken_linker=${BROKEN_LINKER:-no}
 +fi;
-+echo "$as_me:7638: result: $with_broken_linker" >&5
++echo "$as_me:7652: result: $with_broken_linker" >&5
 +echo "${ECHO_T}$with_broken_linker" >&6
 +
@@ -11136 +11214 @@
 +               test -n "$verbose" && echo "    cygwin linker is broken anyway" 1>&6
 +
-+echo "${as_me-configure}:7658: testing cygwin linker is broken anyway ..." 1>&5
++echo "${as_me:-configure}:7672: testing cygwin linker is broken anyway ..." 1>&5
 +
 +               ;;
@@ -11177 +11255 @@
 +linux*|gnu*|mint*|k*bsd*-gnu) #(vi
 +
-+echo "$as_me:7699: checking if we must define _GNU_SOURCE" >&5
++echo "$as_me:7713: 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
@@ -11184 +11262 @@
 +
 +cat >conftest.$ac_ext <<_ACEOF
-+#line 7706 "configure"
++#line 7720 "configure"
 +#include "confdefs.h"
 +#include <sys/types.h>
@@ -11199 +11277 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:7721: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7735: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7724: \$? = $ac_status" >&5
++  echo "$as_me:7738: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:7727: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7741: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7730: \$? = $ac_status" >&5
++  echo "$as_me:7744: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_gnu_source=no
@@ -11217 +11295 @@
 +        CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 +        cat >conftest.$ac_ext <<_ACEOF
-+#line 7739 "configure"
++#line 7753 "configure"
 +#include "confdefs.h"
 +#include <sys/types.h>
@@ -11232 +11310 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:7754: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7768: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7757: \$? = $ac_status" >&5
++  echo "$as_me:7771: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:7760: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7774: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7763: \$? = $ac_status" >&5
++  echo "$as_me:7777: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_gnu_source=no
@@ -11256 +11334 @@
 +
 +fi
-+echo "$as_me:7778: result: $cf_cv_gnu_source" >&5
++echo "$as_me:7792: 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"
@@ -11286 +11364 @@
 +       ;;
 +*)
-+       echo "$as_me:7808: checking if we should define _XOPEN_SOURCE" >&5
++       echo "$as_me:7822: 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
@@ -11293 +11371 @@
 +
 +       cat >conftest.$ac_ext <<_ACEOF
-+#line 7815 "configure"
++#line 7829 "configure"
 +#include "confdefs.h"
 +#include <sys/types.h>
@@ -11308 +11386 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:7830: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7844: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7833: \$? = $ac_status" >&5
++  echo "$as_me:7847: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:7836: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7850: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7839: \$? = $ac_status" >&5
++  echo "$as_me:7853: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_xopen_source=no
@@ -11326 +11404 @@
 +        CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 +        cat >conftest.$ac_ext <<_ACEOF
-+#line 7848 "configure"
++#line 7862 "configure"
 +#include "confdefs.h"
 +#include <sys/types.h>
@@ -11341 +11419 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:7863: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7877: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7866: \$? = $ac_status" >&5
++  echo "$as_me:7880: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:7869: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7883: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7872: \$? = $ac_status" >&5
++  echo "$as_me:7886: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_xopen_source=no
@@ -11365 +11443 @@
 +
 +fi
-+echo "$as_me:7887: result: $cf_cv_xopen_source" >&5
++echo "$as_me:7901: result: $cf_cv_xopen_source" >&5
 +echo "${ECHO_T}$cf_cv_xopen_source" >&6
 +       if test "$cf_cv_xopen_source" != no ; then
@@ -11472 +11550 @@
 +               -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?$//g'`
 +
-+echo "$as_me:7994: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:8008: 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
@@ -11478 +11556 @@
 +else
 +
-+echo "${as_me-configure}:8000: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:8014: testing if the symbol is already defined go no further ..." 1>&5
 +
 +       cat >conftest.$ac_ext <<_ACEOF
-+#line 8003 "configure"
++#line 8017 "configure"
 +#include "confdefs.h"
 +#include <sys/types.h>
@@ -11496 +11574 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8018: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8032: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8021: \$? = $ac_status" >&5
++  echo "$as_me:8035: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8024: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8038: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8027: \$? = $ac_status" >&5
++  echo "$as_me:8041: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_posix_c_source=no
@@ -11526 +11604 @@
 +        if test "$cf_want_posix_source" = yes ; then
 +               cat >conftest.$ac_ext <<_ACEOF
-+#line 8048 "configure"
++#line 8062 "configure"
 +#include "confdefs.h"
 +#include <sys/types.h>
@@ -11541 +11619 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8063: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8077: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8066: \$? = $ac_status" >&5
++  echo "$as_me:8080: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8069: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8083: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8072: \$? = $ac_status" >&5
++  echo "$as_me:8086: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  :
@@ -11561 +11639 @@
 +        fi
 +
-+echo "${as_me-configure}:8083: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:8097: 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}:8088: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:8102: testing if the second compile does not leave our definition intact error ..." 1>&5
 +
 +        cat >conftest.$ac_ext <<_ACEOF
-+#line 8091 "configure"
++#line 8105 "configure"
 +#include "confdefs.h"
 +#include <sys/types.h>
@@ -11584 +11662 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8106: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8120: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8109: \$? = $ac_status" >&5
++  echo "$as_me:8123: \$? = $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:8126: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8115: \$? = $ac_status" >&5
++  echo "$as_me:8129: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  :
@@ -11609 +11687 @@
 +
 +fi
-+echo "$as_me:8131: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:8145: result: $cf_cv_posix_c_source" >&5
 +echo "${ECHO_T}$cf_cv_posix_c_source" >&6
 +
@@ -11788 +11866 @@
 +if test "$enable_largefile" != no; then
 +
-+  echo "$as_me:8310: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:8324: 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
@@ -11800 +11878 @@
 +        # so use the C compiler's -n32 option if that helps.
 +         cat >conftest.$ac_ext <<_ACEOF
-+#line 8322 "configure"
++#line 8336 "configure"
 +#include "confdefs.h"
 +#include <sys/types.h>
@@ -11820 +11898 @@
 +_ACEOF
 +        rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8342: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8356: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8345: \$? = $ac_status" >&5
++  echo "$as_me:8359: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8348: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8362: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8351: \$? = $ac_status" >&5
++  echo "$as_me:8365: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  break
@@ -11839 +11917 @@
 +        CC="$CC -n32"
 +        rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8361: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8375: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8364: \$? = $ac_status" >&5
++  echo "$as_me:8378: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8367: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8381: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8370: \$? = $ac_status" >&5
++  echo "$as_me:8384: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_sys_largefile_CC=' -n32'; break
@@ -11862 +11940 @@
 +    fi
 +fi
-+echo "$as_me:8384: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:8398: 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
@@ -11868 +11946 @@
 +  fi
 +
-+  echo "$as_me:8390: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:8404: 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
@@ -11876 +11954 @@
 +  ac_cv_sys_file_offset_bits=no
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 8398 "configure"
++#line 8412 "configure"
 +#include "confdefs.h"
 +#include <sys/types.h>
@@ -11896 +11974 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8418: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8432: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8421: \$? = $ac_status" >&5
++  echo "$as_me:8435: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8424: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8438: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8427: \$? = $ac_status" >&5
++  echo "$as_me:8441: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  break
@@ -11914 +11992 @@
 +rm -f conftest.$ac_objext conftest.$ac_ext
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 8436 "configure"
++#line 8450 "configure"
 +#include "confdefs.h"
 +#define _FILE_OFFSET_BITS 64
@@ -11935 +12013 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8457: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8471: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8460: \$? = $ac_status" >&5
++  echo "$as_me:8474: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8463: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8477: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8466: \$? = $ac_status" >&5
++  echo "$as_me:8480: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_sys_file_offset_bits=64; break
@@ -11955 +12033 @@
 +done
 +fi
-+echo "$as_me:8477: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:8491: 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
@@ -11964 +12042 @@
 +
 +fi
-+rm -f conftest*
-+  echo "$as_me:8487: checking for _LARGE_FILES value needed for large files" >&5
++rm -rf conftest*
++  echo "$as_me:8501: 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
@@ -11973 +12051 @@
 +  ac_cv_sys_large_files=no
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 8495 "configure"
++#line 8509 "configure"
 +#include "confdefs.h"
 +#include <sys/types.h>
@@ -11993 +12071 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8515: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8529: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8518: \$? = $ac_status" >&5
++  echo "$as_me:8532: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8521: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8535: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8524: \$? = $ac_status" >&5
++  echo "$as_me:8538: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  break
@@ -12011 +12089 @@
 +rm -f conftest.$ac_objext conftest.$ac_ext
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 8533 "configure"
++#line 8547 "configure"
 +#include "confdefs.h"
 +#define _LARGE_FILES 1
@@ -12032 +12110 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8554: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8568: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8557: \$? = $ac_status" >&5
++  echo "$as_me:8571: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8560: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8574: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8563: \$? = $ac_status" >&5
++  echo "$as_me:8577: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_sys_large_files=1; break
@@ -12052 +12130 @@
 +done
 +fi
-+echo "$as_me:8574: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:8588: 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
@@ -12061 +12139 @@
 +
 +fi
-+rm -f conftest*
++rm -rf conftest*
 +fi
 +
 +    if test "$enable_largefile" != no ; then
-+       echo "$as_me:8587: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++       echo "$as_me:8601: 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
@@ -12073 +12151 @@
 +  ac_cv_sys_largefile_source=no
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 8595 "configure"
++#line 8609 "configure"
 +#include "confdefs.h"
 +#include <stdio.h>
@@ -12085 +12163 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8607: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8621: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8610: \$? = $ac_status" >&5
++  echo "$as_me:8624: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8613: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8627: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8616: \$? = $ac_status" >&5
++  echo "$as_me:8630: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  break
@@ -12103 +12181 @@
 +rm -f conftest.$ac_objext conftest.$ac_ext
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 8625 "configure"
++#line 8639 "configure"
 +#include "confdefs.h"
 +#define _LARGEFILE_SOURCE 1
@@ -12116 +12194 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8638: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8652: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8641: \$? = $ac_status" >&5
++  echo "$as_me:8655: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8644: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8658: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8647: \$? = $ac_status" >&5
++  echo "$as_me:8661: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_sys_largefile_source=1; break
@@ -12136 +12214 @@
 +done
 +fi
-+echo "$as_me:8658: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:8672: 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
@@ -12145 +12223 @@
 +
 +fi
-+rm -f conftest*
++rm -rf conftest*
 +
 +# 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:8672: checking for fseeko" >&5
++echo "$as_me:8686: checking for fseeko" >&5
 +echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
 +if test "${ac_cv_func_fseeko+set}" = set; then
@@ -12156 +12234 @@
 +else
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 8678 "configure"
++#line 8692 "configure"
 +#include "confdefs.h"
 +#include <stdio.h>
@@ -12168 +12246 @@
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:8690: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8704: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8693: \$? = $ac_status" >&5
++  echo "$as_me:8707: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:8696: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8710: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8699: \$? = $ac_status" >&5
++  echo "$as_me:8713: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_func_fseeko=yes
@@ -12187 +12265 @@
 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 +fi
-+echo "$as_me:8709: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:8723: result: $ac_cv_func_fseeko" >&5
 +echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 +if test $ac_cv_func_fseeko = yes; then
@@ -12208 +12286 @@
 +       test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
 +
-+       echo "$as_me:8730: checking whether to use struct dirent64" >&5
++       echo "$as_me:8744: 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
@@ -12215 +12293 @@
 +
 +               cat >conftest.$ac_ext <<_ACEOF
-+#line 8737 "configure"
++#line 8751 "configure"
 +#include "confdefs.h"
 +
@@ -12236 +12314 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8758: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8772: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8761: \$? = $ac_status" >&5
++  echo "$as_me:8775: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8764: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8778: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8767: \$? = $ac_status" >&5
++  echo "$as_me:8781: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_struct_dirent64=yes
@@ -12256 +12334 @@
 +
 +fi
-+echo "$as_me:8778: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:8792: result: $cf_cv_struct_dirent64" >&5
 +echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 +       test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF
@@ -12265 +12343 @@
 +
 +### Enable compiling-in rcs id's
-+echo "$as_me:8787: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:8801: checking if RCS identifiers should be compiled-in" >&5
 +echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
 +
@@ -12275 +12353 @@
 +  with_rcs_ids=no
 +fi;
-+echo "$as_me:8797: result: $with_rcs_ids" >&5
++echo "$as_me:8811: result: $with_rcs_ids" >&5
 +echo "${ECHO_T}$with_rcs_ids" >&6
 +test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF
@@ -12284 +12362 @@
 +
 +### Note that some functions (such as const) are normally disabled anyway.
-+echo "$as_me:8806: checking if you want to build with function extensions" >&5
++echo "$as_me:8820: 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
 +
@@ -12294 +12372 @@
 +  with_ext_funcs=yes
 +fi;
-+echo "$as_me:8816: result: $with_ext_funcs" >&5
++echo "$as_me:8830: result: $with_ext_funcs" >&5
 +echo "${ECHO_T}$with_ext_funcs" >&6
 +if test "$with_ext_funcs" = yes ; then
@@ -12311 +12389 @@
 +
 +###   use option --enable-const to turn on use of const beyond that in XSI.
-+echo "$as_me:8833: checking for extended use of const keyword" >&5
++echo "$as_me:8847: checking for extended use of const keyword" >&5
 +echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
 +
@@ -12321 +12399 @@
 +  with_ext_const=no
 +fi;
-+echo "$as_me:8843: result: $with_ext_const" >&5
++echo "$as_me:8857: result: $with_ext_const" >&5
 +echo "${ECHO_T}$with_ext_const" >&6
 +NCURSES_CONST='/*nothing*/'
@@ -12331 +12409 @@
 +# These options are relatively safe to experiment with.
 +
-+echo "$as_me:8853: checking if you want all development code" >&5
++echo "$as_me:8867: checking if you want all development code" >&5
 +echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
 +
@@ -12341 +12419 @@
 +  with_develop=no
 +fi;
-+echo "$as_me:8863: result: $with_develop" >&5
++echo "$as_me:8877: result: $with_develop" >&5
 +echo "${ECHO_T}$with_develop" >&6
 +
@@ -12350 +12428 @@
 +# the script-block --with-normal, etc.
 +
-+echo "$as_me:8872: checking if you want to link with the pthread library" >&5
++echo "$as_me:8886: 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
 +
@@ -12360 +12438 @@
 +  with_pthread=no
 +fi;
-+echo "$as_me:8882: result: $with_pthread" >&5
++echo "$as_me:8896: result: $with_pthread" >&5
 +echo "${ECHO_T}$with_pthread" >&6
 +
 +if test "$with_pthread" != no ; then
-+    echo "$as_me:8886: checking for pthread.h" >&5
++    echo "$as_me:8900: 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
@@ -12370 +12448 @@
 +else
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 8892 "configure"
++#line 8906 "configure"
 +#include "confdefs.h"
 +#include <pthread.h>
 +_ACEOF
-+if { (eval echo "$as_me:8896: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:8910: \"$ac_cpp conftest.$ac_ext\"") >&5
 +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +  ac_status=$?
@@ -12380 +12458 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:8902: \$? = $ac_status" >&5
++  echo "$as_me:8916: \$? = $ac_status" >&5
 +  (exit $ac_status); } >/dev/null; then
 +  if test -s conftest.err; then
@@ -12399 +12477 @@
 +rm -f conftest.err conftest.$ac_ext
 +fi
-+echo "$as_me:8921: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:8935: 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
@@ -12407 +12485 @@
 +EOF
 +
-+        echo "$as_me:8929: checking if we can link with the pthread library" >&5
++        echo "$as_me:8943: 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 8934 "configure"
++#line 8948 "configure"
 +#include "confdefs.h"
 +
@@ -12428 +12506 @@
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:8950: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8964: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8953: \$? = $ac_status" >&5
++  echo "$as_me:8967: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:8956: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8970: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8959: \$? = $ac_status" >&5
++  echo "$as_me:8973: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  with_pthread=yes
@@ -12447 +12525 @@
 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 +        LIBS="$cf_save_LIBS"
-+        echo "$as_me:8969: result: $with_pthread" >&5
++        echo "$as_me:8983: result: $with_pthread" >&5
 +echo "${ECHO_T}$with_pthread" >&6
 +
@@ -12457 +12535 @@
 +
 +        else
-+            { { echo "$as_me:8979: error: Cannot link with pthread library" >&5
++            { { echo "$as_me:8993: error: Cannot link with pthread library" >&5
 +echo "$as_me: error: Cannot link with pthread library" >&2;}
 +   { (exit 1); exit 1; }; }
@@ -12466 +12544 @@
 +fi
 +
-+echo "$as_me:8988: checking if you want to use weak-symbols for pthreads" >&5
++echo "$as_me:9002: 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
 +
@@ -12476 +12554 @@
 +  use_weak_symbols=no
 +fi;
-+echo "$as_me:8998: result: $use_weak_symbols" >&5
++echo "$as_me:9012: result: $use_weak_symbols" >&5
 +echo "${ECHO_T}$use_weak_symbols" >&6
 +if test "$use_weak_symbols" = yes ; then
 +
-+echo "$as_me:9002: checking if $CC supports weak symbols" >&5
++echo "$as_me:9016: 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
@@ -12487 +12565 @@
 +
 +cat >conftest.$ac_ext <<_ACEOF
-+#line 9009 "configure"
++#line 9023 "configure"
 +#include "confdefs.h"
 +
@@ -12513 +12591 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:9035: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9049: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:9038: \$? = $ac_status" >&5
++  echo "$as_me:9052: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:9041: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9055: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:9044: \$? = $ac_status" >&5
++  echo "$as_me:9058: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_weak_symbols=yes
@@ -12533 +12611 @@
 +
 +fi
-+echo "$as_me:9055: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:9069: result: $cf_cv_weak_symbols" >&5
 +echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 +
@@ -12563 +12641 @@
 +# this option without --with-pthreads, but this will be always set for
 +# pthreads.
-+echo "$as_me:9085: checking if you want experimental reentrant code" >&5
++echo "$as_me:9099: checking if you want experimental reentrant code" >&5
 +echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6
 +
@@ -12573 +12651 @@
 +  with_reentrant=no
 +fi;
-+echo "$as_me:9095: result: $with_reentrant" >&5
++echo "$as_me:9109: result: $with_reentrant" >&5
 +echo "${ECHO_T}$with_reentrant" >&6
 +if test "$with_reentrant" = yes ; then
@@ -12595 +12673 @@
 +### Allow using a different wrap-prefix
 +if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
-+       echo "$as_me:9117: checking for prefix used to wrap public variables" >&5
++       echo "$as_me:9131: checking for prefix used to wrap public variables" >&5
 +echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
 +
@@ -12605 +12683 @@
 +  NCURSES_WRAP_PREFIX=_nc_
 +fi;
-+       echo "$as_me:9127: result: $NCURSES_WRAP_PREFIX" >&5
++       echo "$as_me:9141: result: $NCURSES_WRAP_PREFIX" >&5
 +echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 +else
@@ -12618 +12696 @@
 +
 +###    use option --disable-echo to suppress full display compiling commands
-+echo "$as_me:9140: checking if you want to display full commands during build" >&5
++echo "$as_me:9154: 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
 +
@@ -12633 +12711 @@
 +       ECHO_LINK='@ echo linking $@ ... ;'
 +fi
-+echo "$as_me:9155: result: $with_echo" >&5
++echo "$as_me:9169: result: $with_echo" >&5
 +echo "${ECHO_T}$with_echo" >&6
 +
 +###    use option --enable-warnings to turn on all gcc warnings
-+echo "$as_me:9159: checking if you want to see compiler warnings" >&5
++echo "$as_me:9173: checking if you want to see compiler warnings" >&5
 +echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
 +
@@ -12645 +12723 @@
 +  with_warnings=$enableval
 +fi;
-+echo "$as_me:9167: result: $with_warnings" >&5
++echo "$as_me:9181: result: $with_warnings" >&5
 +echo "${ECHO_T}$with_warnings" >&6
 +
@@ -12656 +12734 @@
 +       case $host_os in
 +       linux*|gnu*)
-+               echo "$as_me:9178: checking if this is really Intel C compiler" >&5
++               echo "$as_me:9192: 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 9183 "configure"
++#line 9197 "configure"
 +#include "confdefs.h"
 +
@@ -12678 +12756 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:9200: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9214: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:9203: \$? = $ac_status" >&5
++  echo "$as_me:9217: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:9206: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9220: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:9209: \$? = $ac_status" >&5
++  echo "$as_me:9223: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  INTEL_COMPILER=yes
@@ -12698 +12776 @@
 +rm -f conftest.$ac_objext conftest.$ac_ext
 +               CFLAGS="$cf_save_CFLAGS"
-+               echo "$as_me:9220: result: $INTEL_COMPILER" >&5
++               echo "$as_me:9234: result: $INTEL_COMPILER" >&5
 +echo "${ECHO_T}$INTEL_COMPILER" >&6
 +               ;;
@@ -12705 +12783 @@
 +
 +cat > conftest.$ac_ext <<EOF
-+#line 9227 "${as_me-configure}"
++#line 9241 "${as_me:-configure}"
 +int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 +EOF
@@ -12722 +12800 @@
 +# warning #279: controlling expression is constant
 +
-+       { echo "$as_me:9244: checking for $CC warning options..." >&5
++       { echo "$as_me:9258: checking for $CC warning options..." >&5
 +echo "$as_me: checking for $CC warning options..." >&6;}
 +       cf_save_CFLAGS="$CFLAGS"
@@ -12738 +12816 @@
 +       do
 +               CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-+               if { (eval echo "$as_me:9260: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:9274: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:9263: \$? = $ac_status" >&5
++  echo "$as_me:9277: \$? = $ac_status" >&5
 +  (exit $ac_status); }; then
-+                       test -n "$verbose" && echo "$as_me:9265: result: ... -$cf_opt" >&5
++                       test -n "$verbose" && echo "$as_me:9279: result: ... -$cf_opt" >&5
 +echo "${ECHO_T}... -$cf_opt" >&6
 +                       EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
@@ -12752 +12830 @@
 +elif test "$GCC" = yes
 +then
-+       { echo "$as_me:9274: checking for $CC warning options..." >&5
++       { echo "$as_me:9288: checking for $CC warning options..." >&5
 +echo "$as_me: checking for $CC warning options..." >&6;}
 +       cf_save_CFLAGS="$CFLAGS"
@@ -12772 +12850 @@
 +       do
 +               CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-+               if { (eval echo "$as_me:9294: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:9308: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:9297: \$? = $ac_status" >&5
++  echo "$as_me:9311: \$? = $ac_status" >&5
 +  (exit $ac_status); }; then
-+                       test -n "$verbose" && echo "$as_me:9299: result: ... -$cf_opt" >&5
++                       test -n "$verbose" && echo "$as_me:9313: result: ... -$cf_opt" >&5
 +echo "${ECHO_T}... -$cf_opt" >&6
 +                       case $cf_opt in #(vi
@@ -12788 +12866 @@
 +                                       test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
 +
-+echo "${as_me-configure}:9310: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:9324: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 +
 +                                       continue;;
@@ -12799 +12877 @@
 +       CFLAGS="$cf_save_CFLAGS"
 +fi
-+rm -f conftest*
++rm -rf conftest*
 +
 +fi
@@ -12821 +12899 @@
 +if test "$GCC" = yes
 +then
-+       { echo "$as_me:9343: checking for $CC __attribute__ directives..." >&5
++       { echo "$as_me:9357: checking for $CC __attribute__ directives..." >&5
 +echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 +cat > conftest.$ac_ext <<EOF
-+#line 9346 "${as_me-configure}"
++#line 9360 "${as_me:-configure}"
 +#include "confdefs.h"
 +#include "conftest.h"
@@ -12873 +12951 @@
 +               esac
 +
-+               if { (eval echo "$as_me:9395: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:9409: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:9398: \$? = $ac_status" >&5
++  echo "$as_me:9412: \$? = $ac_status" >&5
 +  (exit $ac_status); }; then
-+                       test -n "$verbose" && echo "$as_me:9400: result: ... $cf_attribute" >&5
++                       test -n "$verbose" && echo "$as_me:9414: result: ... $cf_attribute" >&5
 +echo "${ECHO_T}... $cf_attribute" >&6
 +                       cat conftest.h >>confdefs.h
@@ -12914 +12992 @@
 +
 +###    use option --enable-assertions to turn on generation of assertion code
-+echo "$as_me:9436: checking if you want to enable runtime assertions" >&5
++echo "$as_me:9450: checking if you want to enable runtime assertions" >&5
 +echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
 +
@@ -12924 +13002 @@
 +  with_assertions=no
 +fi;