Changeset 06b2d12

Timestamp:

Aug 26, 2012, 6:48:21 PM (13 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

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

Children:

68a11fb

Parents:

6ecbe33

Message:

delete old patches and add new patches.

Location:

patches

Files:

• binutils-2.22-branch_update-1.patch (added)
• flex-2.5.35-gcc44-1.patch (deleted)
• gcc-4.6.3-branch_update-1.patch (added)
• iproute2-3.3.0-libdir-1.patch (deleted)
• iproute2-3.4.0-libdir-1.patch (added)
• ncurses-5.9-branch_update-4.patch (moved) (moved from patches/ncurses-5.9-branch_update-3.patch ) (1599 diffs)
• perl-5.14.2-Configure_multilib-1.patch (deleted)
• perl-5.14.2-libc-1.patch (deleted)
• perl-5.16.1-Configure_multilib-1.patch (added)
• perl-5.16.1-libc-1.patch (added)

patches/ncurses-5.9-branch_update-4.patch

@@ -1 +1 @@
 Submitted By: Jonathan Norman (jonathan at bluesquarelinux dot co dot uk)
-Date: 2012-02-16
+Date: 2012-08-25
 Initial Package Version: 5.9
 Origin: Upstream
 Upstream Status: Applied
-Description: Contains all upstream patches up to 5.9-20111224
+Description: Contains all upstream patches up to 5.9-20120616
 
 diff -Naur ncurses-5.9.orig/Ada95/aclocal.m4 ncurses-5.9/Ada95/aclocal.m4
---- ncurses-5.9.orig/Ada95/aclocal.m4   2012-02-16 18:25:12.619808985 +0000
-+++ ncurses-5.9/Ada95/aclocal.m4        2012-02-16 18:25:13.167823445 +0000
+--- ncurses-5.9.orig/Ada95/aclocal.m4   2012-08-25 19:57:59.386567678 +0000
++++ ncurses-5.9/Ada95/aclocal.m4        2012-08-25 19:58:02.099888180 +0000
 @@ -1,5 +1,5 @@
  dnl***************************************************************************
@@ -21 +21 @@
  dnl
 -dnl $Id: aclocal.m4,v 1.24 2011/03/31 23:32:36 tom Exp $
-+dnl $Id: aclocal.m4,v 1.44 2012/01/22 00:33:42 tom Exp $
++dnl $Id: aclocal.m4,v 1.52 2012/08/04 18:12:47 tom Exp $
  dnl Macros used in NCURSES Ada95 auto-configuration script.
  dnl
@@ -94 +94 @@
  cf_cv_ansi_cc=no
  cf_save_CFLAGS="$CFLAGS"
-@@ -504,7 +550,7 @@
+@@ -413,6 +459,35 @@
+ AC_SUBST(ARFLAGS)
+ ])
+ dnl ---------------------------------------------------------------------------
++dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31
++dnl --------------
++dnl Allow user to disable a normally-on option.
++AC_DEFUN([CF_ARG_DISABLE],
++[CF_ARG_OPTION($1,[$2],[$3],[$4],yes)])dnl
++dnl ---------------------------------------------------------------------------
++dnl CF_ARG_OPTION version: 4 updated: 2010/05/26 05:38:42
++dnl -------------
++dnl Restricted form of AC_ARG_ENABLE that ensures user doesn't give bogus
++dnl values.
++dnl
++dnl Parameters:
++dnl $1 = option name
++dnl $2 = help-string
++dnl $3 = action to perform if option is not default
++dnl $4 = action if perform if option is default
++dnl $5 = default option value (either 'yes' or 'no')
++AC_DEFUN([CF_ARG_OPTION],
++[AC_ARG_ENABLE([$1],[$2],[test "$enableval" != ifelse([$5],no,yes,no) && enableval=ifelse([$5],no,no,yes)
++  if test "$enableval" != "$5" ; then
++ifelse([$3],,[    :]dnl
++,[    $3]) ifelse([$4],,,[
++  else
++    $4])
++  fi],[enableval=$5 ifelse([$4],,,[
++  $4
++])dnl
++  ])])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_BUILD_CC version: 6 updated: 2006/10/14 15:23:15
+ dnl -----------
+ dnl If we're cross-compiling, allow the user to override the tools and their
+@@ -504,7 +579,7 @@
  AC_SUBST(BUILD_OBJEXT)
  ])dnl
@@ -103 +139 @@
  dnl Determine the default configuration into which we'll install ncurses.  This
  dnl can be overridden by the user's command-line options.  There's two items to
-@@ -522,7 +568,7 @@
+@@ -522,7 +597,7 @@
  if test "x$prefix" = "xNONE" ; then
         case "$cf_cv_system_name" in
@@ -112 +148 @@
                 ;;
         *)      prefix=$ac_default_prefix
-@@ -593,7 +639,7 @@
+@@ -593,7 +668,40 @@
  fi
  ])dnl
  dnl ---------------------------------------------------------------------------
 -dnl CF_CURSES_HEADER version: 2 updated: 2010/04/28 06:02:16
++dnl CF_CLANG_COMPILER version: 1 updated: 2012/06/16 14:55:39
++dnl -----------------
++dnl Check if the given compiler is really clang.  clang's C driver defines
++dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does
++dnl not ignore some gcc options.
++dnl
++dnl This macro should be run "soon" after AC_PROG_CC or AC_PROG_CPLUSPLUS, to
++dnl ensure that it is not mistaken for gcc/g++.  It is normally invoked from
++dnl the wrappers for gcc and g++ warnings.
++dnl
++dnl $1 = GCC (default) or GXX
++dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS
++dnl $3 = CFLAGS (default) or CXXFLAGS
++AC_DEFUN([CF_CLANG_COMPILER],[
++ifelse([$2],,CLANG_COMPILER,[$2])=no
++
++if test "$ifelse([$1],,[$1],GCC)" = yes ; then
++       AC_MSG_CHECKING(if this is really Clang ifelse([$1],GXX,C++,C) compiler)
++       cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])"
++       ifelse([$3],,CFLAGS,[$3])="$ifelse([$3],,CFLAGS,[$3]) -Qunused-arguments"
++       AC_TRY_COMPILE([],[
++#ifdef __clang__
++#else
++make an error
++#endif
++],[ifelse([$2],,CLANG_COMPILER,[$2])=yes
++cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
++],[])
++       ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS"
++       AC_MSG_RESULT($ifelse([$2],,CLANG_COMPILER,[$2]))
++fi
++])
++dnl ---------------------------------------------------------------------------
 +dnl CF_CURSES_HEADER version: 3 updated: 2011/05/01 19:47:45
  dnl ----------------
  dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
  dnl variations of ncurses' installs.
-@@ -603,10 +649,10 @@
+@@ -603,10 +711,10 @@
  AC_CACHE_CHECK(if we have identified curses headers,cf_cv_ncurses_header,[
  cf_cv_ncurses_header=none
@@ -136 +205 @@
  AC_TRY_COMPILE([#include <${cf_header}>],
         [initscr(); tgoto("?", 0,0)],
-@@ -627,6 +673,31 @@
+@@ -627,6 +735,67 @@
  dnl "dirname" is not portable, so we fake it with a shell script.
  AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's%/[[^/]]*$%%'`])dnl
  dnl ---------------------------------------------------------------------------
-+dnl CF_ENABLE_PC_FILES version: 7 updated: 2011/12/10 18:58:47
++dnl CF_DISABLE_ECHO version: 11 updated: 2009/12/13 13:16:57
++dnl ---------------
++dnl You can always use "make -n" to see the actual options, but it's hard to
++dnl pick out/analyze warning messages when the compile-line is long.
++dnl
++dnl Sets:
++dnl    ECHO_LT - symbol to control if libtool is verbose
++dnl    ECHO_LD - symbol to prefix "cc -o" lines
++dnl    RULE_CC - symbol to put before implicit "cc -c" lines (e.g., .c.o)
++dnl    SHOW_CC - symbol to put before explicit "cc -c" lines
++dnl    ECHO_CC - symbol to put before any "cc" line
++dnl
++AC_DEFUN([CF_DISABLE_ECHO],[
++AC_MSG_CHECKING(if you want to see long compiling messages)
++CF_ARG_DISABLE(echo,
++       [  --disable-echo          display "compiling" commands],
++       [
++    ECHO_LT='--silent'
++    ECHO_LD='@echo linking [$]@;'
++    RULE_CC='@echo compiling [$]<'
++    SHOW_CC='@echo compiling [$]@'
++    ECHO_CC='@'
++],[
++    ECHO_LT=''
++    ECHO_LD=''
++    RULE_CC=''
++    SHOW_CC=''
++    ECHO_CC=''
++])
++AC_MSG_RESULT($enableval)
++AC_SUBST(ECHO_LT)
++AC_SUBST(ECHO_LD)
++AC_SUBST(RULE_CC)
++AC_SUBST(SHOW_CC)
++AC_SUBST(ECHO_CC)
++])dnl
++dnl ---------------------------------------------------------------------------
++dnl CF_ENABLE_PC_FILES version: 9 updated: 2012/08/04 13:59:54
 +dnl ------------------
 +dnl This is the "--enable-pc-files" option, which is available if there is a
@@ -149 +255 @@
 +
 +if test "$PKG_CONFIG" != none ; then
-+       if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
-+               AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG)
-+               AC_ARG_ENABLE(pc-files,
-+                       [  --enable-pc-files       generate and install .pc files for pkg-config],
-+                       [enable_pc_files=$enableval],
-+                       [enable_pc_files=no])
-+               AC_MSG_RESULT($enable_pc_files)
-+       elif test -z "$PKG_CONFIG_LIBDIR" || test "$PKG_CONFIG_LIBDIR" != no; then
-+               enable_pc_files=no
-+               AC_MSG_WARN(did not find $PKG_CONFIG library)
++       AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG)
++       AC_ARG_ENABLE(pc-files,
++               [  --enable-pc-files       generate and install .pc files for pkg-config],
++               [enable_pc_files=$enableval],
++               [enable_pc_files=no])
++       AC_MSG_RESULT($enable_pc_files)
++       if test "$enable_pc_files" != no
++       then
++               CF_PATH_SYNTAX(PKG_CONFIG_LIBDIR)
 +       fi
 +else
@@ -168 +273 @@
  dnl ---------------
  dnl Look for a non-standard library, given parameters for AC_TRY_LINK.  We
-@@ -1070,53 +1141,6 @@
+@@ -807,6 +976,25 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_FIXUP_ADAFLAGS version: 1 updated: 2012/03/31 18:48:10
++dnl -----------------
++dnl make ADAFLAGS consistent with CFLAGS
++AC_DEFUN([CF_FIXUP_ADAFLAGS],[
++       AC_MSG_CHECKING(optimization options for ADAFLAGS)
++       case "$CFLAGS" in
++       *-g*)
++               CF_ADD_ADAFLAGS(-g)
++               ;;
++       esac
++       case "$CFLAGS" in
++       *-O*)
++               cf_O_flag=`echo "$CFLAGS" |sed -e 's/^.*-O/-O/' -e 's/[[        ]].*//'`
++               CF_ADD_ADAFLAGS($cf_O_flag)
++               ;;
++       esac
++       AC_MSG_RESULT($ADAFLAGS)
++])dnl
++dnl ---------------------------------------------------------------------------
+ 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
+@@ -931,7 +1119,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_GCC_WARNINGS version: 27 updated: 2010/10/23 15:52:32
++dnl CF_GCC_WARNINGS version: 29 updated: 2012/06/16 14:55:39
+ dnl ---------------
+ dnl Check if the compiler supports useful warning options.  There's a few that
+ dnl we don't use, simply because they're too noisy:
+@@ -954,6 +1142,7 @@
+ [
+ AC_REQUIRE([CF_GCC_VERSION])
+ CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
++CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
+ 
+ cat > conftest.$ac_ext <<EOF
+ #line __oline__ "${as_me:-configure}"
+@@ -1029,6 +1218,13 @@
+                                        continue;;
+                                esac
+                                ;;
++                       Wpointer-arith) #(vi
++                               case $GCC_VERSION in
++                               [[12]].*)
++                                       CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
++                                       continue;;
++                               esac
++                               ;;
+                        esac
+                        EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+                fi
+@@ -1070,53 +1266,6 @@
  AC_SUBST(cf_generic_objects)
  ])dnl
@@ -222 +384 @@
  dnl --------------------
  dnl Check if the gnat pragma "Unreferenced" works.
-@@ -1253,6 +1277,53 @@
+@@ -1253,6 +1402,53 @@
  AC_SUBST(USE_GNAT_LIBRARIES)
  ])dnl
@@ -276 +438 @@
  dnl ----------------
  dnl Verify that a test program compiles/links with GNAT.
-@@ -1311,7 +1382,7 @@
+@@ -1311,7 +1507,7 @@
  rm -rf conftest* *~conftest*
  ])dnl
@@ -285 +447 @@
  dnl Verify version of GNAT.
  AC_DEFUN([CF_GNAT_VERSION],
-@@ -1323,7 +1394,7 @@
+@@ -1323,7 +1519,7 @@
  AC_MSG_RESULT($cf_gnat_version)
  
@@ -294 +456 @@
         ;;
  *)
-@@ -1518,7 +1589,7 @@
+@@ -1518,7 +1714,7 @@
  ])
  ])
@@ -303 +465 @@
  dnl For the given system and compiler, find the compiler flags to pass to the
  dnl loader to use the "rpath" feature.
-@@ -1539,10 +1610,10 @@
+@@ -1539,10 +1735,10 @@
  linux*|gnu*|k*bsd*-gnu) #(vi
         LD_RPATH_OPT="-Wl,-rpath,"
@@ -316 +478 @@
         ;;
  netbsd*) #(vi
-@@ -1601,11 +1672,11 @@
+@@ -1601,11 +1797,11 @@
  $1="$cf_library_path_list [$]$1"
  ])dnl
@@ -330 +492 @@
         case $cf_cv_system_name in #(vi
         OS/2*|os2*) #(vi
-@@ -1655,7 +1726,7 @@
+@@ -1655,7 +1851,7 @@
  ])
  ])
  dnl ---------------------------------------------------------------------------
 -dnl CF_LIB_SUFFIX version: 16 updated: 2008/12/27 12:30:03
-+dnl CF_LIB_SUFFIX version: 17 updated: 2011/07/02 15:36:04
++dnl CF_LIB_SUFFIX version: 18 updated: 2012/02/25 15:20:07
  dnl -------------
  dnl Compute the library file-suffix from the given model name
  dnl $1 = model name
-@@ -1684,7 +1755,7 @@
+@@ -1684,11 +1880,11 @@
                 ;;
         shared) #(vi
@@ -348 +510 @@
                         $3=[$]$2
                         ;;
-@@ -2141,7 +2212,7 @@
+-               cygwin*) #(vi
++               cygwin*|mingw*) #(vi
+                        $2='.dll'
+                        $3='.dll.a'
+                        ;;
+@@ -1974,7 +2170,7 @@
+ test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_MKSTEMP version: 7 updated: 2010/08/14 18:25:37
++dnl CF_MKSTEMP version: 8 updated: 2012/02/13 20:34:56
+ dnl ----------
+ dnl Check for a working mkstemp.  This creates two files, checks that they are
+ dnl successfully created and distinct (AmigaOS apparently fails on the last).
+@@ -2016,9 +2212,11 @@
+ }
+ ],[cf_cv_func_mkstemp=yes
+ ],[cf_cv_func_mkstemp=no
+-],[AC_CHECK_FUNC(mkstemp)
+-])
++],[cf_cv_func_mkstemp=maybe])
+ ])
++if test "x$cf_cv_func_mkstemp" = xmaybe ; then
++       AC_CHECK_FUNC(mkstemp)
++fi
+ if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then
+        AC_DEFINE(HAVE_MKSTEMP)
+ fi
+@@ -2141,7 +2339,7 @@
         ,[$1=no])
  ])dnl
@@ -357 +547 @@
  dnl Tie together the configure-script macros for ncurses.
  dnl Prefer the "-config" script from ncurses 6.x, to simplify analysis.
-@@ -2153,7 +2224,10 @@
+@@ -2153,7 +2351,10 @@
  cf_ncuconfig_root=ifelse($1,,ncurses,$1)
  
@@ -369 +559 @@
  if test "$NCURSES_CONFIG" != none ; then
  
-@@ -2546,7 +2620,7 @@
+@@ -2509,7 +2710,7 @@
+        AC_SUBST(PATH_SEPARATOR)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_PATH_SYNTAX version: 13 updated: 2010/05/26 05:38:42
++dnl CF_PATH_SYNTAX version: 14 updated: 2012/06/19 20:58:54
+ dnl --------------
+ dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
+ dnl begins with one of the prefix/exec_prefix variables, and then again if the
+@@ -2529,7 +2730,7 @@
+   ;;
+ .[[a-zA-Z]]:[[\\/]]*) #(vi OS/2 EMX
+   ;;
+-.\[$]{*prefix}*) #(vi
++.\[$]{*prefix}*|.\[$]{*dir}*) #(vi
+   eval $1="[$]$1"
+   case ".[$]$1" in #(vi
+   .NONE/*)
+@@ -2546,7 +2747,7 @@
  esac
  ])dnl
@@ -378 +586 @@
  dnl Check for the package-config program, unless disabled by command-line.
  AC_DEFUN([CF_PKG_CONFIG],
-@@ -2563,7 +2637,9 @@
+@@ -2563,7 +2764,9 @@
         PKG_CONFIG=none
         ;;
@@ -389 +597 @@
  *)
         PKG_CONFIG=$withval
-@@ -2746,7 +2822,7 @@
+@@ -2746,7 +2949,7 @@
  test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT")
  ])dnl
@@ -398 +606 @@
  dnl Check for gnatmake, ensure that it is complete.
  AC_DEFUN([CF_PROG_GNAT],[
-@@ -2754,6 +2830,7 @@
+@@ -2754,6 +2957,7 @@
  AC_CHECK_PROG(gnat_exists, $cf_ada_make, yes, no)
  if test "$ac_cv_prog_gnat_exists" = no; then
@@ -406 +614 @@
     CF_GNAT_VERSION
     AC_CHECK_PROG(M4_exists, m4, yes, no)
-@@ -2831,7 +2908,7 @@
+@@ -2831,7 +3035,7 @@
  $1=`echo "$2" | sed -e 's/-l$3[[       ]]//g' -e 's/-l$3[$]//'`
  ])dnl
  dnl ---------------------------------------------------------------------------
 -dnl CF_SHARED_OPTS version: 64 updated: 2010/06/05 16:51:16
-+dnl CF_SHARED_OPTS version: 69 updated: 2011/07/30 19:31:39
++dnl CF_SHARED_OPTS version: 70 updated: 2012/02/25 15:20:07
  dnl --------------
  dnl --------------
  dnl Attempt to determine the appropriate CC/LD options for creating a shared
-@@ -2906,10 +2983,14 @@
+@@ -2906,10 +3110,14 @@
         cf_cv_shlib_version_infix=no
  
@@ -432 +640 @@
                 ;;
         beos*) #(vi
-@@ -2962,9 +3043,19 @@
+@@ -2962,9 +3170,19 @@
                 # readonly to exploit a quirk in the memory manager.
                 INSTALL_LIB="-m 555"
@@ -453 +661 @@
                 # tested with IRIX 5.2 and 'cc'.
                 if test "$GCC" != yes; then
-@@ -2981,18 +3072,18 @@
+@@ -2981,18 +3199,39 @@
                         LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
                 fi
@@ -464 +672 @@
                 ;;
 -       openbsd[[2-9]].*) #(vi
++       mingw*) #(vi
++               cf_cv_shlib_version=mingw
++               cf_cv_shlib_version_infix=mingw
++               CC_SHARED_OPTS=
++               MK_SHARED_LIB='sh ../mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
++               #MK_SHARED_LIB='${CC} ${CFLAGS} -mdll -Wl,-soname,'$cf_cv_shared_soname',-stats -o $[@]'
++               #MK_SHARED_LIB='${DLLTOOL} --export-all-symbols --output-exp --output-lib $[@]'
++               cat >mk_shared_lib.sh <<-CF_EOF
++               #!/bin/sh
++               SHARED_LIB=\[$]1
++               IMPORT_LIB=\`echo "\[$]1" | sed -e 's/[[0-9]]*\.dll[$]/.dll.a/'\`
++               shift
++               cat <<-EOF
++               Linking shared library
++               ** SHARED_LIB \[$]SHARED_LIB
++               ** IMPORT_LIB \[$]IMPORT_LIB
++EOF
++               exec \[$]* -shared -Wl,--out-implib=../lib/\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\[$]{SHARED_LIB}
++CF_EOF
++               chmod +x mk_shared_lib.sh
++               ;;
 +       openbsd[[2-9]].*|mirbsd*) #(vi
                 if test "$DFT_LWR_MODEL" = "shared" ; then
@@ -475 +704 @@
                 CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                 CF_SHARED_SONAME
-@@ -3003,12 +3094,12 @@
+@@ -3003,12 +3242,12 @@
                 MK_SHARED_LIB='${LD} -Bshareable -o $[@]'
                 test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
@@ -491 +720 @@
                 CF_SHARED_SONAME
                 MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $[@]` -o $[@]'
-@@ -3018,7 +3109,7 @@
+@@ -3018,7 +3257,7 @@
                 if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then
                         LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)"
@@ -500 +729 @@
                         if test -f /usr/libexec/ld.elf_so; then
                                 cf_cv_shlib_version=abi
-@@ -3123,9 +3214,9 @@
+@@ -3123,9 +3362,12 @@
                 ;;
         esac
@@ -510 +739 @@
 +       test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}"
 +       test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}"
++
++       CF_VERBOSE(CC_SHARED_OPTS: $CC_SHARED_OPTS)
++       CF_VERBOSE(MK_SHARED_LIB:  $MK_SHARED_LIB)
  
         AC_SUBST(CC_SHARED_OPTS)
         AC_SUBST(LD_RPATH_OPT)
-@@ -3137,6 +3228,7 @@
+@@ -3137,6 +3379,7 @@
         AC_SUBST(LOCAL_LDFLAGS)
         AC_SUBST(LOCAL_LDFLAGS2)
@@ -521 +753 @@
  dnl ---------------------------------------------------------------------------
  dnl CF_SHARED_SONAME version: 3 updated: 2008/09/08 18:34:43
-@@ -3253,6 +3345,45 @@
+@@ -3253,6 +3496,45 @@
  AC_SUBST(top_builddir)
  ])dnl
@@ -567 +799 @@
  dnl --------
  dnl Make an uppercase version of a variable
-@@ -3415,6 +3546,32 @@
+@@ -3415,6 +3697,32 @@
  fi
  ])dnl
@@ -600 +832 @@
  dnl ------------
  dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just
-@@ -3436,7 +3593,50 @@
+@@ -3436,7 +3744,50 @@
  AC_SUBST($3)dnl
  ])dnl
@@ -652 +884 @@
  dnl Check for POSIX thread library.
  AC_DEFUN([CF_WITH_PTHREAD],
-@@ -3452,28 +3652,33 @@
+@@ -3452,28 +3803,33 @@
      AC_CHECK_HEADER(pthread.h,[
          AC_DEFINE(HAVE_PTHREADS_H)
@@ -700 +932 @@
  dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
  dnl or adapt to the vendor's definitions to get equivalent functionality,
-@@ -3489,7 +3694,7 @@
+@@ -3489,7 +3845,7 @@
  cf_xopen_source=
  
@@ -709 +941 @@
         ;;
  cygwin) #(vi
-@@ -3500,6 +3705,7 @@
+@@ -3500,6 +3856,7 @@
         ;;
  darwin*) #(vi
@@ -717 +949 @@
  freebsd*|dragonfly*) #(vi
         # 5.x headers associate
-@@ -3517,15 +3723,23 @@
+@@ -3517,15 +3874,23 @@
         ;;
  irix[[56]].*) #(vi
@@ -743 +975 @@
  openbsd*) #(vi
         # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
-@@ -3539,36 +3753,11 @@
+@@ -3539,36 +3904,11 @@
  sco*) #(vi
         # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
@@ -782 +1014 @@
         ;;
  esac
-@@ -3576,4 +3765,33 @@
+@@ -3576,4 +3916,33 @@
  if test -n "$cf_xopen_source" ; then
         CF_ADD_CFLAGS($cf_xopen_source)
@@ -817 +1049 @@
  ])
 diff -Naur ncurses-5.9.orig/Ada95/configure ncurses-5.9/Ada95/configure
---- ncurses-5.9.orig/Ada95/configure    2012-02-16 18:25:12.619808985 +0000
-+++ ncurses-5.9/Ada95/configure 2012-02-16 18:25:13.179823762 +0000
-@@ -1,5 +1,5 @@
+--- ncurses-5.9.orig/Ada95/configure    2012-08-25 19:57:59.386567678 +0000
++++ ncurses-5.9/Ada95/configure 2012-08-25 19:58:02.283220646 +0000
+@@ -1,7 +1,7 @@
  #! /bin/sh
 -# From configure.in Revision: 1.30 .
-+# From configure.in Revision: 1.38 .
++# From configure.in Revision: 1.41 .
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by Autoconf 2.52.20101002.
+-# Generated by Autoconf 2.52.20101002.
++# Generated by Autoconf 2.52.20120811.
  #
-@@ -645,6 +645,7 @@
+ # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+ # Free Software Foundation, Inc.
+@@ -135,15 +135,16 @@
+ bindir='${exec_prefix}/bin'
+ sbindir='${exec_prefix}/sbin'
+ libexecdir='${exec_prefix}/libexec'
+-datadir='${prefix}/share'
++datarootdir='${prefix}/share'
++datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
+ libdir='${exec_prefix}/lib'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+-infodir='${prefix}/info'
+-mandir='${prefix}/man'
++infodir='${datarootdir}/info'
++mandir='${datarootdir}/man'
+ 
+ # Identity of this package.
+ PACKAGE_NAME=
+@@ -194,6 +195,13 @@
+   | --da=*)
+     datadir=$ac_optarg ;;
+ 
++  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
++  | --dataroo | --dataro | --datar)
++    ac_prev=datarootdir ;;
++  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
++  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
++    datarootdir=$ac_optarg ;;
++
+   -disable-* | --disable-*)
+     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+@@ -469,7 +477,7 @@
+ done
+ 
+ # Be sure to have absolute paths.
+-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
++for ac_var in bindir sbindir libexecdir datarootdir datadir sysconfdir sharedstatedir \
+               localstatedir libdir includedir oldincludedir infodir mandir
+ do
+   eval ac_val=$`echo $ac_var`
+@@ -606,15 +614,16 @@
+   --bindir=DIR            user executables [EPREFIX/bin]
+   --sbindir=DIR           system admin executables [EPREFIX/sbin]
+   --libexecdir=DIR        program executables [EPREFIX/libexec]
+-  --datadir=DIR           read-only architecture-independent data [PREFIX/share]
++  --datarootdir=DIR       read-only architecture-independent data [PREFIX/share]
++  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+   --libdir=DIR            object code libraries [EPREFIX/lib]
+   --includedir=DIR        C header files [PREFIX/include]
+   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+-  --infodir=DIR           info documentation [PREFIX/info]
+-  --mandir=DIR            man documentation [PREFIX/man]
++  --infodir=DIR           info documentation [DATAROOTDIR/info]
++  --mandir=DIR            man documentation [DATAROOTDIR/man]
+ EOF
+ 
+   cat <<\EOF
+@@ -645,6 +654,7 @@
  
    --with-system-type=XXX  test: override derived host system-type
@@ -834 +1132 @@
    --without-tests         suppress build with test-programs
    --enable-mixed-case     tic should assume mixed-case filenames
-@@ -660,6 +661,7 @@
+@@ -660,6 +670,7 @@
    --with-shared           generate shared C-objects (needed for --with-ada-sharedlib)
    --enable-widec          compile with wide-char/UTF-8 code
@@ -842 +1140 @@
    --enable-rpath-link     link sample programs with rpath option
  Fine-Tuning Your Configuration:
-@@ -881,7 +883,7 @@
+@@ -677,7 +688,7 @@
+   --enable-reentrant      compile with experimental reentrant code
+   --with-wrap-prefix=XXX  override prefix used for public variables
+ Testing/development Options:
+-  --enable-echo           build: display "compiling" commands (default)
++  --disable-echo          display "compiling" commands
+   --enable-warnings       build: turn on GCC compiler warnings
+   --enable-assertions     test: turn on generation of assertion code
+   --enable-expanded       test: generate functions for certain macros
+@@ -757,7 +768,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.52.20101002.  Invocation command line was
++generated by GNU Autoconf 2.52.20120811.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -881,7 +892,7 @@
  fi
  for ac_site_file in $CONFIG_SITE; do
    if test -r "$ac_site_file"; then
 -    { echo "$as_me:884: loading site script $ac_site_file" >&5
-+    { echo "$as_me:886: loading site script $ac_site_file" >&5
++    { echo "$as_me:895: loading site script $ac_site_file" >&5
  echo "$as_me: loading site script $ac_site_file" >&6;}
      cat "$ac_site_file" >&5
      . "$ac_site_file"
-@@ -892,7 +894,7 @@
+@@ -892,7 +903,7 @@
    # Some versions of bash will fail to source /dev/null (special
    # files actually), so we avoid doing that.
    if test -f "$cache_file"; then
 -    { echo "$as_me:895: loading cache $cache_file" >&5
-+    { echo "$as_me:897: loading cache $cache_file" >&5
++    { echo "$as_me:906: loading cache $cache_file" >&5
  echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
        [\\/]* | ?:[\\/]* ) . $cache_file;;
-@@ -900,7 +902,7 @@
+@@ -900,7 +911,7 @@
      esac
    fi
  else
 -  { echo "$as_me:903: creating cache $cache_file" >&5
-+  { echo "$as_me:905: creating cache $cache_file" >&5
++  { echo "$as_me:914: creating cache $cache_file" >&5
  echo "$as_me: creating cache $cache_file" >&6;}
    >$cache_file
  fi
-@@ -916,21 +918,21 @@
+@@ -916,21 +927,21 @@
    eval ac_new_val="\$ac_env_${ac_var}_value"
    case $ac_old_set,$ac_new_set in
      set,)
 -      { echo "$as_me:919: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+      { echo "$as_me:921: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++      { echo "$as_me:930: 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:923: error: \`$ac_var' was not set in the previous run" >&5
-+      { echo "$as_me:925: error: \`$ac_var' was not set in the previous run" >&5
++      { echo "$as_me:934: 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=: ;;
@@ -886 +1202 @@
        if test "x$ac_old_val" != "x$ac_new_val"; then
 -        { echo "$as_me:929: error: \`$ac_var' has changed since the previous run:" >&5
-+        { echo "$as_me:931: error: \`$ac_var' has changed since the previous run:" >&5
++        { echo "$as_me:940: 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:931:   former value:  $ac_old_val" >&5
-+        { echo "$as_me:933:   former value:  $ac_old_val" >&5
++        { echo "$as_me:942:   former value:  $ac_old_val" >&5
  echo "$as_me:   former value:  $ac_old_val" >&2;}
 -        { echo "$as_me:933:   current value: $ac_new_val" >&5
-+        { echo "$as_me:935:   current value: $ac_new_val" >&5
++        { echo "$as_me:944:   current value: $ac_new_val" >&5
  echo "$as_me:   current value: $ac_new_val" >&2;}
          ac_cache_corrupted=:
        fi;;
-@@ -949,9 +951,9 @@
+@@ -949,9 +960,9 @@
    fi
  done
  if $ac_cache_corrupted; then
 -  { echo "$as_me:952: error: changes in the environment can compromise the build" >&5
-+  { echo "$as_me:954: error: changes in the environment can compromise the build" >&5
++  { echo "$as_me:963: 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:954: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-+  { { echo "$as_me:956: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++  { { echo "$as_me:965: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
  echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -972,10 +974,10 @@
+@@ -972,10 +983,10 @@
  echo "#! $SHELL" >conftest.sh
  echo  "exit 0"   >>conftest.sh
  chmod +x conftest.sh
 -if { (echo "$as_me:975: PATH=\".;.\"; conftest.sh") >&5
-+if { (echo "$as_me:977: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:986: PATH=\".;.\"; conftest.sh") >&5
    (PATH=".;."; conftest.sh) 2>&5
    ac_status=$?
 -  echo "$as_me:978: \$? = $ac_status" >&5
-+  echo "$as_me:980: \$? = $ac_status" >&5
++  echo "$as_me:989: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    ac_path_separator=';'
  else
-@@ -1005,7 +1007,7 @@
+@@ -1005,7 +1016,7 @@
    fi
  done
  if test -z "$ac_aux_dir"; then
 -  { { echo "$as_me:1008: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-+  { { echo "$as_me:1010: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++  { { echo "$as_me:1019: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
  echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -1015,11 +1017,11 @@
+@@ -1015,11 +1026,11 @@
  
  # Make sure we can run config.sub.
  $ac_config_sub sun4 >/dev/null 2>&1 ||
 -  { { echo "$as_me:1018: error: cannot run $ac_config_sub" >&5
-+  { { echo "$as_me:1020: error: cannot run $ac_config_sub" >&5
++  { { echo "$as_me:1029: error: cannot run $ac_config_sub" >&5
  echo "$as_me: error: cannot run $ac_config_sub" >&2;}
     { (exit 1); exit 1; }; }
  
 -echo "$as_me:1022: checking build system type" >&5
-+echo "$as_me:1024: checking build system type" >&5
++echo "$as_me:1033: checking build system type" >&5
  echo $ECHO_N "checking build system type... $ECHO_C" >&6
  if test "${ac_cv_build+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1028,23 +1030,23 @@
+@@ -1028,23 +1039,23 @@
  test -z "$ac_cv_build_alias" &&
    ac_cv_build_alias=`$ac_config_guess`
  test -z "$ac_cv_build_alias" &&
 -  { { echo "$as_me:1031: error: cannot guess build type; you must specify one" >&5
-+  { { echo "$as_me:1033: error: cannot guess build type; you must specify one" >&5
++  { { echo "$as_me:1042: 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:1035: error: $ac_config_sub $ac_cv_build_alias failed." >&5
-+  { { echo "$as_me:1037: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++  { { echo "$as_me:1046: 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; }; }
@@ -960 +1276 @@
  fi
 -echo "$as_me:1040: result: $ac_cv_build" >&5
-+echo "$as_me:1042: result: $ac_cv_build" >&5
++echo "$as_me:1051: result: $ac_cv_build" >&5
  echo "${ECHO_T}$ac_cv_build" >&6
  build=$ac_cv_build
@@ -968 +1284 @@
  
 -echo "$as_me:1047: checking host system type" >&5
-+echo "$as_me:1049: checking host system type" >&5
++echo "$as_me:1058: checking host system type" >&5
  echo $ECHO_N "checking host system type... $ECHO_C" >&6
  if test "${ac_cv_host+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1053,12 +1055,12 @@
+@@ -1053,12 +1064,12 @@
  test -z "$ac_cv_host_alias" &&
    ac_cv_host_alias=$ac_cv_build_alias
  ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
 -  { { echo "$as_me:1056: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-+  { { echo "$as_me:1058: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++  { { echo "$as_me:1067: 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; }; }
@@ -983 +1299 @@
  fi
 -echo "$as_me:1061: result: $ac_cv_host" >&5
-+echo "$as_me:1063: result: $ac_cv_host" >&5
++echo "$as_me:1072: result: $ac_cv_host" >&5
  echo "${ECHO_T}$ac_cv_host" >&6
  host=$ac_cv_host
  host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-@@ -1066,7 +1068,7 @@
+@@ -1066,7 +1077,7 @@
  host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
  
  if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
 -       echo "$as_me:1069: checking target system type" >&5
-+       echo "$as_me:1071: checking target system type" >&5
++       echo "$as_me:1080: checking target system type" >&5
  echo $ECHO_N "checking target system type... $ECHO_C" >&6
  if test "${ac_cv_target+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1075,12 +1077,12 @@
+@@ -1075,12 +1086,12 @@
  test "x$ac_cv_target_alias" = "x" &&
    ac_cv_target_alias=$ac_cv_host_alias
  ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
 -  { { echo "$as_me:1078: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-+  { { echo "$as_me:1080: error: $ac_config_sub $ac_cv_target_alias failed" >&5
++  { { echo "$as_me:1089: 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; }; }
@@ -1007 +1323 @@
  fi
 -echo "$as_me:1083: result: $ac_cv_target" >&5
-+echo "$as_me:1085: result: $ac_cv_target" >&5
++echo "$as_me:1094: result: $ac_cv_target" >&5
  echo "${ECHO_T}$ac_cv_target" >&6
  target=$ac_cv_target
  target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-@@ -1111,13 +1113,13 @@
+@@ -1111,13 +1122,13 @@
  fi
  
  test -z "$system_name" && system_name="$cf_cv_system_name"
 -test -n "$cf_cv_system_name" && echo "$as_me:1114: result: Configuring for $cf_cv_system_name" >&5
-+test -n "$cf_cv_system_name" && echo "$as_me:1116: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1125: 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:1118: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
-+       echo "$as_me:1120: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++       echo "$as_me:1129: 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:1120: error: \"Please remove config.cache and try again.\"" >&5
-+       { { echo "$as_me:1122: error: \"Please remove config.cache and try again.\"" >&5
++       { { echo "$as_me:1131: error: \"Please remove config.cache and try again.\"" >&5
  echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -1125,7 +1127,7 @@
+@@ -1125,7 +1136,7 @@
  # Check whether --with-system-type or --without-system-type was given.
  if test "${with_system_type+set}" = set; then
    withval="$with_system_type"
 -  { echo "$as_me:1128: WARNING: overriding system type to $withval" >&5
-+  { echo "$as_me:1130: WARNING: overriding system type to $withval" >&5
++  { echo "$as_me:1139: WARNING: overriding system type to $withval" >&5
  echo "$as_me: WARNING: overriding system type to $withval" >&2;}
   cf_cv_system_name=$withval
  fi;
-@@ -1135,23 +1137,23 @@
+@@ -1135,23 +1146,23 @@
  
  ###    Default install-location
  
 -echo "$as_me:1138: checking for prefix" >&5
-+echo "$as_me:1140: checking for prefix" >&5
++echo "$as_me:1149: checking for prefix" >&5
  echo $ECHO_N "checking for prefix... $ECHO_C" >&6
  if test "x$prefix" = "xNONE" ; then
@@ -1056 +1372 @@
  fi
 -echo "$as_me:1150: result: $prefix" >&5
-+echo "$as_me:1152: result: $prefix" >&5
++echo "$as_me:1161: result: $prefix" >&5
  echo "${ECHO_T}$prefix" >&6
  
  if test "x$prefix" = "xNONE" ; then
 -echo "$as_me:1154: checking for default include-directory" >&5
-+echo "$as_me:1156: checking for default include-directory" >&5
++echo "$as_me:1165: checking for default include-directory" >&5
  echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
  test -n "$verbose" && echo 1>&6
  for cf_symbol in \
-@@ -1174,7 +1176,7 @@
+@@ -1174,7 +1185,7 @@
         fi
         test -n "$verbose"  && echo "   tested $cf_dir" 1>&6
  done
 -echo "$as_me:1177: result: $includedir" >&5
-+echo "$as_me:1179: result: $includedir" >&5
++echo "$as_me:1188: result: $includedir" >&5
  echo "${ECHO_T}$includedir" >&6
  fi
  
-@@ -1188,7 +1190,7 @@
+@@ -1186,213 +1197,11 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return=return
  if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-  # 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:1191: checking for $ac_word" >&5
-+echo "$as_me:1193: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1203,7 +1205,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-  ac_save_IFS=$IFS; IFS=$ac_path_separator
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-ac_cv_prog_CC="${ac_tool_prefix}gcc"
 -echo "$as_me:1206: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1208: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1211,10 +1213,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
+-break
+-done
+-
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
 -  echo "$as_me:1214: result: $CC" >&5
-+  echo "$as_me:1216: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
+-echo "${ECHO_T}$CC" >&6
+-else
 -  echo "$as_me:1217: result: no" >&5
-+  echo "$as_me:1219: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1223,7 +1225,7 @@
-   ac_ct_CC=$CC
-   # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-fi
+-if test -z "$ac_cv_prog_CC"; then
+-  ac_ct_CC=$CC
+-  # Extract the first word of "gcc", so it can be a program name with args.
+-set dummy gcc; ac_word=$2
 -echo "$as_me:1226: checking for $ac_word" >&5
-+echo "$as_me:1228: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1238,7 +1240,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_CC="gcc"
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$ac_ct_CC"; then
+-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+-else
+-  ac_save_IFS=$IFS; IFS=$ac_path_separator
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-ac_cv_prog_ac_ct_CC="gcc"
 -echo "$as_me:1241: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1243: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1246,10 +1248,10 @@
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
+-break
+-done
+-
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
 -  echo "$as_me:1249: result: $ac_ct_CC" >&5
-+  echo "$as_me:1251: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6
- else
+-echo "${ECHO_T}$ac_ct_CC" >&6
+-else
 -  echo "$as_me:1252: result: no" >&5
-+  echo "$as_me:1254: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1262,7 +1264,7 @@
-   if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}cc; ac_word=$2
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-  CC=$ac_ct_CC
+-else
+-  CC="$ac_cv_prog_CC"
+-fi
+-
+-if test -z "$CC"; then
+-  if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}cc; ac_word=$2
 -echo "$as_me:1265: checking for $ac_word" >&5
-+echo "$as_me:1267: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1277,7 +1279,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_CC="${ac_tool_prefix}cc"
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-  ac_save_IFS=$IFS; IFS=$ac_path_separator
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-ac_cv_prog_CC="${ac_tool_prefix}cc"
 -echo "$as_me:1280: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1282: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1285,10 +1287,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
+-break
+-done
+-
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
 -  echo "$as_me:1288: result: $CC" >&5
-+  echo "$as_me:1290: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
+-echo "${ECHO_T}$CC" >&6
+-else
 -  echo "$as_me:1291: result: no" >&5
-+  echo "$as_me:1293: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1297,7 +1299,7 @@
-   ac_ct_CC=$CC
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-fi
+-if test -z "$ac_cv_prog_CC"; then
+-  ac_ct_CC=$CC
+-  # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
 -echo "$as_me:1300: checking for $ac_word" >&5
-+echo "$as_me:1302: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1312,7 +1314,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_CC="cc"
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$ac_ct_CC"; then
+-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+-else
+-  ac_save_IFS=$IFS; IFS=$ac_path_separator
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-ac_cv_prog_ac_ct_CC="cc"
 -echo "$as_me:1315: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1317: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1320,10 +1322,10 @@
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
+-break
+-done
+-
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
 -  echo "$as_me:1323: result: $ac_ct_CC" >&5
-+  echo "$as_me:1325: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6
- else
+-echo "${ECHO_T}$ac_ct_CC" >&6
+-else
 -  echo "$as_me:1326: result: no" >&5
-+  echo "$as_me:1328: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1336,7 +1338,7 @@
- if test -z "$CC"; then
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-  CC=$ac_ct_CC
+-else
+-  CC="$ac_cv_prog_CC"
+-fi
+-
+-fi
+-if test -z "$CC"; then
+-  # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
 -echo "$as_me:1339: checking for $ac_word" >&5
-+echo "$as_me:1341: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1356,7 +1358,7 @@
-   continue
- fi
- ac_cv_prog_CC="cc"
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-  ac_prog_rejected=no
+-  ac_save_IFS=$IFS; IFS=$ac_path_separator
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+-  ac_prog_rejected=yes
+-  continue
+-fi
+-ac_cv_prog_CC="cc"
 -echo "$as_me:1359: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1361: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1378,10 +1380,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
+-break
+-done
+-
+-if test $ac_prog_rejected = yes; then
+-  # We found a bogon in the path, so make sure we never use it.
+-  set dummy $ac_cv_prog_CC
+-  shift
+-  if test $# != 0; then
+-    # We chose a different compiler from the bogus one.
+-    # However, it has the same basename, so the bogon will be chosen
+-    # first if we set CC to just the basename; use the full file name.
+-    shift
+-    set dummy "$ac_dir/$ac_word" ${1+"$@"}
+-    shift
+-    ac_cv_prog_CC="$@"
+-  fi
+-fi
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
 -  echo "$as_me:1381: result: $CC" >&5
-+  echo "$as_me:1383: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
+-echo "${ECHO_T}$CC" >&6
+-else
 -  echo "$as_me:1384: result: no" >&5
-+  echo "$as_me:1386: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1392,7 +1394,7 @@
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-fi
+-if test -z "$CC"; then
+-  if test -n "$ac_tool_prefix"; then
+-  for ac_prog in cl
++  for ac_prog in gnatgcc gcc cc
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 -echo "$as_me:1395: checking for $ac_word" >&5
-+echo "$as_me:1397: checking for $ac_word" >&5
++echo "$as_me:1204: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1407,7 +1409,7 @@
+@@ -1407,7 +1216,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
 -echo "$as_me:1410: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1412: found $ac_dir/$ac_word" >&5
++echo "$as_me:1219: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -1415,10 +1417,10 @@
+@@ -1415,10 +1224,10 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
 -  echo "$as_me:1418: result: $CC" >&5
-+  echo "$as_me:1420: result: $CC" >&5
++  echo "$as_me:1227: result: $CC" >&5
  echo "${ECHO_T}$CC" >&6
  else
 -  echo "$as_me:1421: result: no" >&5
-+  echo "$as_me:1423: result: no" >&5
++  echo "$as_me:1230: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -1431,7 +1433,7 @@
+@@ -1427,11 +1236,11 @@
+ fi
+ if test -z "$CC"; then
+   ac_ct_CC=$CC
+-  for ac_prog in cl
++  for ac_prog in gnatgcc gcc cc
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -echo "$as_me:1434: checking for $ac_word" >&5
-+echo "$as_me:1436: checking for $ac_word" >&5
++echo "$as_me:1243: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1446,7 +1448,7 @@
+@@ -1446,7 +1255,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_ac_ct_CC="$ac_prog"
 -echo "$as_me:1449: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1451: found $ac_dir/$ac_word" >&5
++echo "$as_me:1258: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -1454,10 +1456,10 @@
+@@ -1454,10 +1263,10 @@
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
 -  echo "$as_me:1457: result: $ac_ct_CC" >&5
-+  echo "$as_me:1459: result: $ac_ct_CC" >&5
++  echo "$as_me:1266: result: $ac_ct_CC" >&5
  echo "${ECHO_T}$ac_ct_CC" >&6
  else
 -  echo "$as_me:1460: result: no" >&5
-+  echo "$as_me:1462: result: no" >&5
++  echo "$as_me:1269: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -1469,32 +1471,32 @@
- 
- fi
- 
+@@ -1467,34 +1276,32 @@
+   CC=$ac_ct_CC
+ fi
+ 
+-fi
+-
 -test -z "$CC" && { { echo "$as_me:1472: error: no acceptable cc found in \$PATH" >&5
-+test -z "$CC" && { { echo "$as_me:1474: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:1279: error: no acceptable cc found in \$PATH" >&5
  echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
     { (exit 1); exit 1; }; }
@@ -1302 +1677 @@
  # Provide some information about the compiler.
 -echo "$as_me:1477:" \
-+echo "$as_me:1479:" \
++echo "$as_me:1284:" \
       "checking for C compiler version" >&5
  ac_compiler=`set X $ac_compile; echo $2`
 -{ (eval echo "$as_me:1480: \"$ac_compiler --version </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:1482: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1287: \"$ac_compiler --version </dev/null >&5\"") >&5
    (eval $ac_compiler --version </dev/null >&5) 2>&5
    ac_status=$?
 -  echo "$as_me:1483: \$? = $ac_status" >&5
-+  echo "$as_me:1485: \$? = $ac_status" >&5
++  echo "$as_me:1290: \$? = $ac_status" >&5
    (exit $ac_status); }
 -{ (eval echo "$as_me:1485: \"$ac_compiler -v </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:1487: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1292: \"$ac_compiler -v </dev/null >&5\"") >&5
    (eval $ac_compiler -v </dev/null >&5) 2>&5
    ac_status=$?
 -  echo "$as_me:1488: \$? = $ac_status" >&5
-+  echo "$as_me:1490: \$? = $ac_status" >&5
++  echo "$as_me:1295: \$? = $ac_status" >&5
    (exit $ac_status); }
 -{ (eval echo "$as_me:1490: \"$ac_compiler -V </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:1492: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1297: \"$ac_compiler -V </dev/null >&5\"") >&5
    (eval $ac_compiler -V </dev/null >&5) 2>&5
    ac_status=$?
 -  echo "$as_me:1493: \$? = $ac_status" >&5
-+  echo "$as_me:1495: \$? = $ac_status" >&5
++  echo "$as_me:1300: \$? = $ac_status" >&5
    (exit $ac_status); }
  
  cat >conftest.$ac_ext <<_ACEOF
 -#line 1497 "configure"
-+#line 1499 "configure"
++#line 1304 "configure"
  #include "confdefs.h"
  
  int
-@@ -1510,13 +1512,13 @@
+@@ -1510,13 +1317,13 @@
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
 -echo "$as_me:1513: checking for C compiler default output" >&5
-+echo "$as_me:1515: checking for C compiler default output" >&5
++echo "$as_me:1320: 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:1516: \"$ac_link_default\"") >&5
-+if { (eval echo "$as_me:1518: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:1323: \"$ac_link_default\"") >&5
    (eval $ac_link_default) 2>&5
    ac_status=$?
 -  echo "$as_me:1519: \$? = $ac_status" >&5
-+  echo "$as_me:1521: \$? = $ac_status" >&5
++  echo "$as_me:1326: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    # Find the output, starting from the most likely.  This scheme is
  # not robust to junk in `.', hence go to wildcards (a.*) only as a last
-@@ -1539,34 +1541,34 @@
+@@ -1539,34 +1346,34 @@
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
 -{ { echo "$as_me:1542: error: C compiler cannot create executables" >&5
-+{ { echo "$as_me:1544: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:1349: error: C compiler cannot create executables" >&5
  echo "$as_me: error: C compiler cannot create executables" >&2;}
     { (exit 77); exit 77; }; }
@@ -1362 +1737 @@
  ac_exeext=$ac_cv_exeext
 -echo "$as_me:1548: result: $ac_file" >&5
-+echo "$as_me:1550: result: $ac_file" >&5
++echo "$as_me:1355: result: $ac_file" >&5
  echo "${ECHO_T}$ac_file" >&6
  
@@ -1368 +1743 @@
  # the compiler is broken, or we cross compile.
 -echo "$as_me:1553: checking whether the C compiler works" >&5
-+echo "$as_me:1555: checking whether the C compiler works" >&5
++echo "$as_me:1360: 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
@@ -1375 +1750 @@
    if { ac_try='./$ac_file'
 -  { (eval echo "$as_me:1559: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1561: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1366: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1562: \$? = $ac_status" >&5
-+  echo "$as_me:1564: \$? = $ac_status" >&5
++  echo "$as_me:1369: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
      cross_compiling=no
@@ -1387 +1762 @@
      else
 -       { { echo "$as_me:1569: error: cannot run C compiled programs.
-+       { { echo "$as_me:1571: error: cannot run C compiled programs.
++       { { echo "$as_me:1376: error: cannot run C compiled programs.
  If you meant to cross compile, use \`--host'." >&5
  echo "$as_me: error: cannot run C compiled programs.
  If you meant to cross compile, use \`--host'." >&2;}
-@@ -1574,24 +1576,24 @@
+@@ -1574,24 +1381,24 @@
      fi
    fi
  fi
 -echo "$as_me:1577: result: yes" >&5
-+echo "$as_me:1579: result: yes" >&5
++echo "$as_me:1384: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  
@@ -1404 +1779 @@
  # the compiler is broken, or we cross compile.
 -echo "$as_me:1584: checking whether we are cross compiling" >&5
-+echo "$as_me:1586: checking whether we are cross compiling" >&5
++echo "$as_me:1391: checking whether we are cross compiling" >&5
  echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
 -echo "$as_me:1586: result: $cross_compiling" >&5
-+echo "$as_me:1588: result: $cross_compiling" >&5
++echo "$as_me:1393: result: $cross_compiling" >&5
  echo "${ECHO_T}$cross_compiling" >&6
  
 -echo "$as_me:1589: checking for executable suffix" >&5
-+echo "$as_me:1591: checking for executable suffix" >&5
++echo "$as_me:1396: checking for executable suffix" >&5
  echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
 -if { (eval echo "$as_me:1591: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:1593: \"$ac_link\"") >&5
++if { (eval echo "$as_me:1398: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:1594: \$? = $ac_status" >&5
-+  echo "$as_me:1596: \$? = $ac_status" >&5
++  echo "$as_me:1401: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    # If both `conftest.exe' and `conftest' are `present' (well, observable)
  # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-@@ -1607,25 +1609,25 @@
+@@ -1607,25 +1414,25 @@
    esac
  done
  else
 -  { { echo "$as_me:1610: error: cannot compute EXEEXT: cannot compile and link" >&5
-+  { { echo "$as_me:1612: error: cannot compute EXEEXT: cannot compile and link" >&5
++  { { echo "$as_me:1417: 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; }; }
@@ -1434 +1809 @@
  rm -f conftest$ac_cv_exeext
 -echo "$as_me:1616: result: $ac_cv_exeext" >&5
-+echo "$as_me:1618: result: $ac_cv_exeext" >&5
++echo "$as_me:1423: result: $ac_cv_exeext" >&5
  echo "${ECHO_T}$ac_cv_exeext" >&6
  
@@ -1441 +1816 @@
  ac_exeext=$EXEEXT
 -echo "$as_me:1622: checking for object suffix" >&5
-+echo "$as_me:1624: checking for object suffix" >&5
++echo "$as_me:1429: checking for object suffix" >&5
  echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
  if test "${ac_cv_objext+set}" = set; then
@@ -1448 +1823 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1628 "configure"
-+#line 1630 "configure"
++#line 1435 "configure"
  #include "confdefs.h"
  
  int
-@@ -1637,10 +1639,10 @@
+@@ -1637,10 +1444,10 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
 -if { (eval echo "$as_me:1640: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1642: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1447: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:1643: \$? = $ac_status" >&5
-+  echo "$as_me:1645: \$? = $ac_status" >&5
++  echo "$as_me:1450: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
    case $ac_file in
-@@ -1652,24 +1654,24 @@
+@@ -1652,24 +1459,24 @@
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
 -{ { echo "$as_me:1655: error: cannot compute OBJEXT: cannot compile" >&5
-+{ { echo "$as_me:1657: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:1462: error: cannot compute OBJEXT: cannot compile" >&5
  echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
     { (exit 1); exit 1; }; }
@@ -1478 +1853 @@
  fi
 -echo "$as_me:1662: result: $ac_cv_objext" >&5
-+echo "$as_me:1664: result: $ac_cv_objext" >&5
++echo "$as_me:1469: result: $ac_cv_objext" >&5
  echo "${ECHO_T}$ac_cv_objext" >&6
  OBJEXT=$ac_cv_objext
  ac_objext=$OBJEXT
 -echo "$as_me:1666: checking whether we are using the GNU C compiler" >&5
-+echo "$as_me:1668: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:1473: 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
@@ -1490 +1865 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1672 "configure"
-+#line 1674 "configure"
++#line 1479 "configure"
  #include "confdefs.h"
  
  int
-@@ -1684,16 +1686,16 @@
+@@ -1684,16 +1491,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:1687: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1689: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1494: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:1690: \$? = $ac_status" >&5
-+  echo "$as_me:1692: \$? = $ac_status" >&5
++  echo "$as_me:1497: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:1693: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1695: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1500: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1696: \$? = $ac_status" >&5
-+  echo "$as_me:1698: \$? = $ac_status" >&5
++  echo "$as_me:1503: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_compiler_gnu=yes
  else
-@@ -1705,19 +1707,19 @@
+@@ -1705,19 +1512,19 @@
  ac_cv_c_compiler_gnu=$ac_compiler_gnu
  
  fi
 -echo "$as_me:1708: result: $ac_cv_c_compiler_gnu" >&5
-+echo "$as_me:1710: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:1515: result: $ac_cv_c_compiler_gnu" >&5
  echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
  GCC=`test $ac_compiler_gnu = yes && echo yes`
@@ -1527 +1902 @@
  CFLAGS="-g"
 -echo "$as_me:1714: checking whether $CC accepts -g" >&5
-+echo "$as_me:1716: checking whether $CC accepts -g" >&5
++echo "$as_me:1521: 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
@@ -1534 +1909 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1720 "configure"
-+#line 1722 "configure"
++#line 1527 "configure"
  #include "confdefs.h"
  
  int
-@@ -1729,16 +1731,16 @@
+@@ -1729,16 +1536,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:1732: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1734: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1539: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:1735: \$? = $ac_status" >&5
-+  echo "$as_me:1737: \$? = $ac_status" >&5
++  echo "$as_me:1542: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:1738: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1740: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1545: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1741: \$? = $ac_status" >&5
-+  echo "$as_me:1743: \$? = $ac_status" >&5
++  echo "$as_me:1548: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_prog_cc_g=yes
  else
-@@ -1748,7 +1750,7 @@
+@@ -1748,7 +1555,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:1751: result: $ac_cv_prog_cc_g" >&5
-+echo "$as_me:1753: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:1558: result: $ac_cv_prog_cc_g" >&5
  echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
-@@ -1775,16 +1777,16 @@
+@@ -1775,16 +1582,16 @@
  #endif
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:1778: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1780: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1585: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:1781: \$? = $ac_status" >&5
-+  echo "$as_me:1783: \$? = $ac_status" >&5
++  echo "$as_me:1588: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:1784: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1786: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1591: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1787: \$? = $ac_status" >&5
-+  echo "$as_me:1789: \$? = $ac_status" >&5
++  echo "$as_me:1594: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    for ac_declaration in \
     ''\
-@@ -1796,7 +1798,7 @@
+@@ -1796,7 +1603,7 @@
     'void exit (int);'
  do
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1799 "configure"
-+#line 1801 "configure"
++#line 1606 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  $ac_declaration
-@@ -1809,16 +1811,16 @@
+@@ -1809,16 +1616,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:1812: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1814: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1619: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:1815: \$? = $ac_status" >&5
-+  echo "$as_me:1817: \$? = $ac_status" >&5
++  echo "$as_me:1622: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:1818: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1820: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1625: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1821: \$? = $ac_status" >&5
-+  echo "$as_me:1823: \$? = $ac_status" >&5
++  echo "$as_me:1628: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -1828,7 +1830,7 @@
+@@ -1828,7 +1635,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1831 "configure"
-+#line 1833 "configure"
++#line 1638 "configure"
  #include "confdefs.h"
  $ac_declaration
  int
-@@ -1840,16 +1842,16 @@
+@@ -1840,16 +1647,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:1843: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1845: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1650: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:1846: \$? = $ac_status" >&5
-+  echo "$as_me:1848: \$? = $ac_status" >&5
++  echo "$as_me:1653: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:1849: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1851: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1656: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1852: \$? = $ac_status" >&5
-+  echo "$as_me:1854: \$? = $ac_status" >&5
++  echo "$as_me:1659: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -1879,11 +1881,11 @@
+@@ -1879,11 +1686,11 @@
  
  GCC_VERSION=none
  if test "$GCC" = yes ; then
 -       echo "$as_me:1882: checking version of $CC" >&5
-+       echo "$as_me:1884: checking version of $CC" >&5
++       echo "$as_me:1689: 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:1886: result: $GCC_VERSION" >&5
-+       echo "$as_me:1888: result: $GCC_VERSION" >&5
++       echo "$as_me:1693: result: $GCC_VERSION" >&5
  echo "${ECHO_T}$GCC_VERSION" >&6
  fi
  
-@@ -1893,7 +1895,7 @@
+@@ -1893,7 +1700,7 @@
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ac_main_return=return
 -echo "$as_me:1896: checking how to run the C preprocessor" >&5
-+echo "$as_me:1898: checking how to run the C preprocessor" >&5
++echo "$as_me:1703: checking how to run the C preprocessor" >&5
  echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
-@@ -1914,18 +1916,18 @@
+@@ -1914,18 +1721,18 @@
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1917 "configure"
-+#line 1919 "configure"
++#line 1724 "configure"
  #include "confdefs.h"
  #include <assert.h>
@@ -1683 +2058 @@
  _ACEOF
 -if { (eval echo "$as_me:1922: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:1924: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:1729: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -1690 +2065 @@
    cat conftest.err >&5
 -  echo "$as_me:1928: \$? = $ac_status" >&5
-+  echo "$as_me:1930: \$? = $ac_status" >&5
++  echo "$as_me:1735: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -1948,17 +1950,17 @@
+@@ -1948,17 +1755,17 @@
    # OK, works on sane cases.  Now check whether non-existent headers
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1951 "configure"
-+#line 1953 "configure"
++#line 1758 "configure"
  #include "confdefs.h"
  #include <ac_nonexistent.h>
  _ACEOF
 -if { (eval echo "$as_me:1955: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:1957: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:1762: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -1711 +2086 @@
    cat conftest.err >&5
 -  echo "$as_me:1961: \$? = $ac_status" >&5
-+  echo "$as_me:1963: \$? = $ac_status" >&5
++  echo "$as_me:1768: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -1995,7 +1997,7 @@
+@@ -1995,7 +1802,7 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
 -echo "$as_me:1998: result: $CPP" >&5
-+echo "$as_me:2000: result: $CPP" >&5
++echo "$as_me:1805: result: $CPP" >&5
  echo "${ECHO_T}$CPP" >&6
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
-@@ -2005,18 +2007,18 @@
+@@ -2005,18 +1812,18 @@
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 2008 "configure"
-+#line 2010 "configure"
++#line 1815 "configure"
  #include "confdefs.h"
  #include <assert.h>
@@ -1735 +2110 @@
  _ACEOF
 -if { (eval echo "$as_me:2013: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2015: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:1820: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -1742 +2117 @@
    cat conftest.err >&5
 -  echo "$as_me:2019: \$? = $ac_status" >&5
-+  echo "$as_me:2021: \$? = $ac_status" >&5
++  echo "$as_me:1826: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2039,17 +2041,17 @@
+@@ -2039,17 +1846,17 @@
    # OK, works on sane cases.  Now check whether non-existent headers
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 2042 "configure"
-+#line 2044 "configure"
++#line 1849 "configure"
  #include "confdefs.h"
  #include <ac_nonexistent.h>
  _ACEOF
 -if { (eval echo "$as_me:2046: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2048: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:1853: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -1763 +2138 @@
    cat conftest.err >&5
 -  echo "$as_me:2052: \$? = $ac_status" >&5
-+  echo "$as_me:2054: \$? = $ac_status" >&5
++  echo "$as_me:1859: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2077,7 +2079,7 @@
+@@ -2077,7 +1884,7 @@
  if $ac_preproc_ok; then
    :
  else
 -  { { echo "$as_me:2080: error: C preprocessor \"$CPP\" fails sanity check" >&5
-+  { { echo "$as_me:2082: error: C preprocessor \"$CPP\" fails sanity check" >&5
++  { { echo "$as_me:1887: error: C preprocessor \"$CPP\" fails sanity check" >&5
  echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -2090,14 +2092,14 @@
+@@ -2090,14 +1897,14 @@
  ac_main_return=return
  
  if test $ac_cv_c_compiler_gnu = yes; then
 -    echo "$as_me:2093: checking whether $CC needs -traditional" >&5
-+    echo "$as_me:2095: checking whether $CC needs -traditional" >&5
++    echo "$as_me:1900: 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
@@ -1789 +2164 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 2100 "configure"
-+#line 2102 "configure"
++#line 1907 "configure"
  #include "confdefs.h"
  #include <sgtty.h>
  int Autoconf = TIOCGETP;
-@@ -2112,7 +2114,7 @@
+@@ -2112,7 +1919,7 @@
  
    if test $ac_cv_prog_gcc_traditional = no; then
      cat >conftest.$ac_ext <<_ACEOF
 -#line 2115 "configure"
-+#line 2117 "configure"
++#line 1922 "configure"
  #include "confdefs.h"
  #include <termio.h>
  int Autoconf = TCGETA;
-@@ -2125,14 +2127,14 @@
+@@ -2125,14 +1932,14 @@
  
    fi
  fi
 -echo "$as_me:2128: result: $ac_cv_prog_gcc_traditional" >&5
-+echo "$as_me:2130: result: $ac_cv_prog_gcc_traditional" >&5
++echo "$as_me:1935: 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
@@ -1815 +2190 @@
  
 -echo "$as_me:2135: checking whether $CC understands -c and -o together" >&5
-+echo "$as_me:2137: checking whether $CC understands -c and -o together" >&5
++echo "$as_me:1942: checking whether $CC understands -c and -o together" >&5
  echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6
  if test "${cf_cv_prog_CC_c_o+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2148,15 +2150,15 @@
+@@ -2148,15 +1955,15 @@
  # We do the test twice because some compilers refuse to overwrite an
  # existing .o file with -o, though they will create one.
  ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
 -if { (eval echo "$as_me:2151: \"$ac_try\"") >&5
-+if { (eval echo "$as_me:2153: \"$ac_try\"") >&5
++if { (eval echo "$as_me:1958: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2154: \$? = $ac_status" >&5
-+  echo "$as_me:2156: \$? = $ac_status" >&5
++  echo "$as_me:1961: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -  test -f conftest2.$ac_objext && { (eval echo "$as_me:2156: \"$ac_try\"") >&5
-+  test -f conftest2.$ac_objext && { (eval echo "$as_me:2158: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:1963: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2159: \$? = $ac_status" >&5
-+  echo "$as_me:2161: \$? = $ac_status" >&5
++  echo "$as_me:1966: \$? = $ac_status" >&5
    (exit $ac_status); };
  then
    eval cf_cv_prog_CC_c_o=yes
-@@ -2167,19 +2169,19 @@
+@@ -2167,19 +1974,19 @@
  
  fi
  if test $cf_cv_prog_CC_c_o = yes; then
 -  echo "$as_me:2170: result: yes" >&5
-+  echo "$as_me:2172: result: yes" >&5
++  echo "$as_me:1977: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  else
 -  echo "$as_me:2173: result: no" >&5
-+  echo "$as_me:2175: result: no" >&5
++  echo "$as_me:1980: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
 -echo "$as_me:2177: checking for POSIXized ISC" >&5
-+echo "$as_me:2179: checking for POSIXized ISC" >&5
++echo "$as_me:1984: checking for POSIXized ISC" >&5
  echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
  if test -d /etc/conf/kconfig.d &&
@@ -1859 +2234 @@
  then
 -  echo "$as_me:2182: result: yes" >&5
-+  echo "$as_me:2184: result: yes" >&5
++  echo "$as_me:1989: result: yes" >&5
  echo "${ECHO_T}yes" >&6
    ISC=yes # If later tests want to check for ISC.
  
-@@ -2193,12 +2195,115 @@
+@@ -2193,12 +2000,115 @@
      CC="$CC -Xp"
    fi
  else
 -  echo "$as_me:2196: result: no" >&5
-+  echo "$as_me:2198: result: no" >&5
++  echo "$as_me:2003: result: no" >&5
  echo "${ECHO_T}no" >&6
    ISC=
@@ -1880 +2255 @@
 +# into CC.  This will not help with broken scripts that wrap the compiler with
 +# options, but eliminates a more common category of user confusion.
-+echo "$as_me:2209: checking \$CC variable" >&5
++echo "$as_me:2014: checking \$CC variable" >&5
 +echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 +case "$CC" in #(vi
 +*[\ \  ]-[IUD]*)
-+       echo "$as_me:2213: result: broken" >&5
++       echo "$as_me:2018: result: broken" >&5
 +echo "${ECHO_T}broken" >&6
-+       { echo "$as_me:2215: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
++       { echo "$as_me:2020: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
 +echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
 +       # humor him...
@@ -1972 +2347 @@
 +       ;;
 +*)
-+       echo "$as_me:2301: result: ok" >&5
++       echo "$as_me:2106: result: ok" >&5
 +echo "${ECHO_T}ok" >&6
 +       ;;
 +esac
 +
-+echo "$as_me:2306: checking for ${CC:-cc} option to accept ANSI C" >&5
++echo "$as_me:2111: 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
-@@ -2302,7 +2407,7 @@
+@@ -2302,7 +2212,7 @@
  fi
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 2305 "configure"
-+#line 2410 "configure"
++#line 2215 "configure"
  #include "confdefs.h"
  
  #ifndef CC_HAS_PROTOS
-@@ -2323,16 +2428,16 @@
+@@ -2323,16 +2233,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:2326: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2431: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2236: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:2329: \$? = $ac_status" >&5
-+  echo "$as_me:2434: \$? = $ac_status" >&5
++  echo "$as_me:2239: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:2332: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2437: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2242: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2335: \$? = $ac_status" >&5
-+  echo "$as_me:2440: \$? = $ac_status" >&5
++  echo "$as_me:2245: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ansi_cc="$cf_arg"; break
  else
-@@ -2345,7 +2450,7 @@
+@@ -2345,7 +2255,7 @@
  CPPFLAGS="$cf_save_CPPFLAGS"
  
  fi
 -echo "$as_me:2348: result: $cf_cv_ansi_cc" >&5
-+echo "$as_me:2453: result: $cf_cv_ansi_cc" >&5
++echo "$as_me:2258: result: $cf_cv_ansi_cc" >&5
  echo "${ECHO_T}$cf_cv_ansi_cc" >&6
  
  if test "$cf_cv_ansi_cc" != "no"; then
-@@ -2438,7 +2543,7 @@
+@@ -2438,7 +2348,7 @@
  fi
  
  if test "$cf_cv_ansi_cc" = "no"; then
 -       { { echo "$as_me:2441: error: Your compiler does not appear to recognize prototypes.
-+       { { echo "$as_me:2546: error: Your compiler does not appear to recognize prototypes.
++       { { echo "$as_me:2351: error: Your compiler does not appear to recognize prototypes.
  You have the following choices:
         a. adjust your compiler options
         b. get an up-to-date compiler
-@@ -2485,7 +2590,7 @@
+@@ -2485,7 +2395,7 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -echo "$as_me:2488: checking for $ac_word" >&5
-+echo "$as_me:2593: checking for $ac_word" >&5
++echo "$as_me:2398: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_AWK+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2500,7 +2605,7 @@
+@@ -2500,7 +2410,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_AWK="$ac_prog"
 -echo "$as_me:2503: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2608: found $ac_dir/$ac_word" >&5
++echo "$as_me:2413: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -2508,21 +2613,21 @@
+@@ -2508,21 +2418,21 @@
  fi
  AWK=$ac_cv_prog_AWK
  if test -n "$AWK"; then
 -  echo "$as_me:2511: result: $AWK" >&5
-+  echo "$as_me:2616: result: $AWK" >&5
++  echo "$as_me:2421: result: $AWK" >&5
  echo "${ECHO_T}$AWK" >&6
  else
 -  echo "$as_me:2514: result: no" >&5
-+  echo "$as_me:2619: result: no" >&5
++  echo "$as_me:2424: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
@@ -2064 +2439 @@
  
 -test -z "$AWK" && { { echo "$as_me:2521: error: No awk program found" >&5
-+test -z "$AWK" && { { echo "$as_me:2626: error: No awk program found" >&5
++test -z "$AWK" && { { echo "$as_me:2431: error: No awk program found" >&5
  echo "$as_me: error: No awk program found" >&2;}
     { (exit 1); exit 1; }; }
  
 -echo "$as_me:2525: checking for egrep" >&5
-+echo "$as_me:2630: checking for egrep" >&5
++echo "$as_me:2435: checking for egrep" >&5
  echo $ECHO_N "checking for egrep... $ECHO_C" >&6
  if test "${ac_cv_prog_egrep+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2532,11 +2637,11 @@
+@@ -2532,11 +2442,11 @@
      else ac_cv_prog_egrep='egrep'
      fi
  fi
 -echo "$as_me:2535: result: $ac_cv_prog_egrep" >&5
-+echo "$as_me:2640: result: $ac_cv_prog_egrep" >&5
++echo "$as_me:2445: 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:2539: error: No egrep program found" >&5
-+test -z "$EGREP" && { { echo "$as_me:2644: error: No egrep program found" >&5
++test -z "$EGREP" && { { echo "$as_me:2449: error: No egrep program found" >&5
  echo "$as_me: error: No egrep program found" >&2;}
     { (exit 1); exit 1; }; }
  
-@@ -2552,7 +2657,7 @@
+@@ -2552,7 +2462,7 @@
  # AFS /usr/afsws/bin/install, which mishandles nonexistent args
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # ./install, which can be erroneously created by make from ./install.sh.
 -echo "$as_me:2555: checking for a BSD compatible install" >&5
-+echo "$as_me:2660: checking for a BSD compatible install" >&5
++echo "$as_me:2465: checking for a BSD compatible install" >&5
  echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
  if test -z "$INSTALL"; then
  if test "${ac_cv_path_install+set}" = set; then
-@@ -2601,7 +2706,7 @@
+@@ -2601,7 +2511,7 @@
      INSTALL=$ac_install_sh
    fi
  fi
 -echo "$as_me:2604: result: $INSTALL" >&5
-+echo "$as_me:2709: result: $INSTALL" >&5
++echo "$as_me:2514: result: $INSTALL" >&5
  echo "${ECHO_T}$INSTALL" >&6
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2612,18 +2717,18 @@
+@@ -2612,18 +2522,18 @@
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
 -echo "$as_me:2615: checking whether ln -s works" >&5
-+echo "$as_me:2720: checking whether ln -s works" >&5
++echo "$as_me:2525: 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:2619: result: yes" >&5
-+  echo "$as_me:2724: result: yes" >&5
++  echo "$as_me:2529: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  else
 -  echo "$as_me:2622: result: no, using $LN_S" >&5
-+  echo "$as_me:2727: result: no, using $LN_S" >&5
++  echo "$as_me:2532: result: no, using $LN_S" >&5
  echo "${ECHO_T}no, using $LN_S" >&6
  fi
  
 -echo "$as_me:2626: checking if $LN_S -f options work" >&5
-+echo "$as_me:2731: checking if $LN_S -f options work" >&5
++echo "$as_me:2536: checking if $LN_S -f options work" >&5
  echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6
  
  rm -f conf$$.src conf$$dst
-@@ -2635,12 +2740,12 @@
+@@ -2635,12 +2545,12 @@
         cf_prog_ln_sf=no
  fi
  rm -f conf$$.dst conf$$src
 -echo "$as_me:2638: result: $cf_prog_ln_sf" >&5
-+echo "$as_me:2743: result: $cf_prog_ln_sf" >&5
++echo "$as_me:2548: result: $cf_prog_ln_sf" >&5
  echo "${ECHO_T}$cf_prog_ln_sf" >&6
  
@@ -2139 +2514 @@
  
 -echo "$as_me:2643: checking for long file names" >&5
-+echo "$as_me:2748: checking for long file names" >&5
++echo "$as_me:2553: checking for long file names" >&5
  echo $ECHO_N "checking for long file names... $ECHO_C" >&6
  if test "${ac_cv_sys_long_file_names+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2679,7 +2784,7 @@
+@@ -2679,7 +2589,7 @@
    rm -rf $ac_xdir 2>/dev/null
  done
  fi
 -echo "$as_me:2682: result: $ac_cv_sys_long_file_names" >&5
-+echo "$as_me:2787: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:2592: 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
  
-@@ -2691,7 +2796,7 @@
+@@ -2691,7 +2601,7 @@
  
  # if we find pkg-config, check if we should install the ".pc" files.
  
 -echo "$as_me:2694: checking if you want to use pkg-config" >&5
-+echo "$as_me:2799: checking if you want to use pkg-config" >&5
++echo "$as_me:2604: checking if you want to use pkg-config" >&5
  echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
  
  # Check whether --with-pkg-config or --without-pkg-config was given.
-@@ -2701,7 +2806,7 @@
+@@ -2701,7 +2611,7 @@
  else
    cf_pkg_config=yes
  fi;
 -echo "$as_me:2704: result: $cf_pkg_config" >&5
-+echo "$as_me:2809: result: $cf_pkg_config" >&5
++echo "$as_me:2614: result: $cf_pkg_config" >&5
  echo "${ECHO_T}$cf_pkg_config" >&6
  
  case $cf_pkg_config in #(vi
-@@ -2709,10 +2814,11 @@
+@@ -2709,10 +2619,11 @@
         PKG_CONFIG=none
         ;;
@@ -2180 +2555 @@
  set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 -echo "$as_me:2715: checking for $ac_word" >&5
-+echo "$as_me:2821: checking for $ac_word" >&5
++echo "$as_me:2626: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2729,7 +2835,7 @@
+@@ -2729,7 +2640,7 @@
    test -z "$ac_dir" && ac_dir=.
    if $as_executable_p "$ac_dir/$ac_word"; then
     ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
 -   echo "$as_me:2732: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:2838: found $ac_dir/$ac_word" >&5
++   echo "$as_me:2643: found $ac_dir/$ac_word" >&5
     break
  fi
  done
-@@ -2740,10 +2846,10 @@
+@@ -2740,10 +2651,10 @@
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  
  if test -n "$PKG_CONFIG"; then
 -  echo "$as_me:2743: result: $PKG_CONFIG" >&5
-+  echo "$as_me:2849: result: $PKG_CONFIG" >&5
++  echo "$as_me:2654: result: $PKG_CONFIG" >&5
  echo "${ECHO_T}$PKG_CONFIG" >&6
  else
 -  echo "$as_me:2746: result: no" >&5
-+  echo "$as_me:2852: result: no" >&5
++  echo "$as_me:2657: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -2752,7 +2858,7 @@
+@@ -2752,7 +2663,7 @@
    ac_pt_PKG_CONFIG=$PKG_CONFIG
    # 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:2755: checking for $ac_word" >&5
-+echo "$as_me:2861: checking for $ac_word" >&5
++echo "$as_me:2666: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2769,7 +2875,7 @@
+@@ -2769,7 +2680,7 @@
    test -z "$ac_dir" && ac_dir=.
    if $as_executable_p "$ac_dir/$ac_word"; then
     ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
 -   echo "$as_me:2772: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:2878: found $ac_dir/$ac_word" >&5
++   echo "$as_me:2683: found $ac_dir/$ac_word" >&5
     break
  fi
  done
-@@ -2781,10 +2887,10 @@
+@@ -2781,10 +2692,10 @@
  ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
  
  if test -n "$ac_pt_PKG_CONFIG"; then
 -  echo "$as_me:2784: result: $ac_pt_PKG_CONFIG" >&5
-+  echo "$as_me:2890: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:2695: result: $ac_pt_PKG_CONFIG" >&5
  echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
  else
 -  echo "$as_me:2787: result: no" >&5
-+  echo "$as_me:2893: result: no" >&5
++  echo "$as_me:2698: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -2827,7 +2933,7 @@
+@@ -2815,7 +2726,7 @@
+   ;;
+ .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+   ;;
+-.\${*prefix}*) #(vi
++.\${*prefix}*|.\${*dir}*) #(vi
+   eval PKG_CONFIG="$PKG_CONFIG"
+   case ".$PKG_CONFIG" in #(vi
+   .NONE/*)
+@@ -2827,7 +2738,7 @@
    PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
    ;;
  *)
 -  { { echo "$as_me:2830: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
-+  { { echo "$as_me:2936: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++  { { echo "$as_me:2741: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
  echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
     { (exit 1); exit 1; }; }
    ;;
-@@ -2836,15 +2942,51 @@
+@@ -2836,35 +2747,100 @@
  fi
  
@@ -2252 +2636 @@
 -       echo "$as_me:2839: 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
-+       echo "$as_me:2945: checking for $PKG_CONFIG library directory" >&5
++       echo "$as_me:2750: checking for $PKG_CONFIG library directory" >&5
 +echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
  
@@ -2260 +2644 @@
 -       fi
 -       PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'`
+-       if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
+-
+-# Check whether --enable-pc-files or --disable-pc-files was given.
+-if test "${enable_pc_files+set}" = set; then
+-  enableval="$enable_pc_files"
+-  enable_pc_files=$enableval
 +# Check whether --with-pkg-config-libdir or --without-pkg-config-libdir was given.
 +if test "${with_pkg_config_libdir+set}" = set; then
 +  withval="$with_pkg_config_libdir"
 +  PKG_CONFIG_LIBDIR=$withval
-+else
+ else
+-  enable_pc_files=no
 +  PKG_CONFIG_LIBDIR=yes
-+fi;
-+
+ fi;
+-               echo "$as_me:2856: result: $enable_pc_files" >&5
+-echo "${ECHO_T}$enable_pc_files" >&6
+-       else
+-               echo "$as_me:2859: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-               { echo "$as_me:2861: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5
+-echo "$as_me: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&2;}
+-               enable_pc_files=no
+-       fi
+-fi
+ 
+-echo "$as_me:2867: checking if you want to build test-programs" >&5
 +       case x$PKG_CONFIG_LIBDIR in #(vi
 +       x/*) #(vi
@@ -2294 +2696 @@
 +       esac
 +
-+       echo "$as_me:2982: result: $PKG_CONFIG_LIBDIR" >&5
++       echo "$as_me:2787: result: $PKG_CONFIG_LIBDIR" >&5
 +echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 +fi
 +
 +if test "$PKG_CONFIG" != none ; then
-        if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
-+               echo "$as_me:2988: checking if we should install .pc files for $PKG_CONFIG" >&5
++       echo "$as_me:2792: 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
- 
- # Check whether --enable-pc-files or --disable-pc-files was given.
- if test "${enable_pc_files+set}" = set; then
-@@ -2853,18 +2995,18 @@
- else
-   enable_pc_files=no
- fi;
--               echo "$as_me:2856: result: $enable_pc_files" >&5
-+               echo "$as_me:2998: result: $enable_pc_files" >&5
- echo "${ECHO_T}$enable_pc_files" >&6
--       else
--               echo "$as_me:2859: result: no" >&5
--echo "${ECHO_T}no" >&6
--               { echo "$as_me:2861: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5
--echo "$as_me: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&2;}
-+       elif test -z "$PKG_CONFIG_LIBDIR" || test "$PKG_CONFIG_LIBDIR" != no; then
-                enable_pc_files=no
-+               { echo "$as_me:3002: WARNING: did not find $PKG_CONFIG library" >&5
-+echo "$as_me: WARNING: did not find $PKG_CONFIG library" >&2;}
-        fi
++
++# Check whether --enable-pc-files or --disable-pc-files was given.
++if test "${enable_pc_files+set}" = set; then
++  enableval="$enable_pc_files"
++  enable_pc_files=$enableval
++else
++  enable_pc_files=no
++fi;
++       echo "$as_me:2802: result: $enable_pc_files" >&5
++echo "${ECHO_T}$enable_pc_files" >&6
++       if test "$enable_pc_files" != no
++       then
++
++if test "x$prefix" != xNONE; then
++  cf_path_syntax="$prefix"
++else
++  cf_path_syntax="$ac_default_prefix"
++fi
++
++case ".$PKG_CONFIG_LIBDIR" in #(vi
++.\$\(*\)*|.\'*\'*) #(vi
++  ;;
++..|./*|.\\*) #(vi
++  ;;
++.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
++  ;;
++.\${*prefix}*|.\${*dir}*) #(vi
++  eval PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR"
++  case ".$PKG_CONFIG_LIBDIR" in #(vi
++  .NONE/*)
++    PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%`
++    ;;
++  esac
++  ;; #(vi
++.no|.NONE/*)
++  PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%`
++  ;;
++*)
++  { { echo "$as_me:2832: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5
++echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&2;}
++   { (exit 1); exit 1; }; }
++  ;;
++esac
++
++       fi
 +else
 +       enable_pc_files=no
- fi
- 
--echo "$as_me:2867: checking if you want to build test-programs" >&5
-+echo "$as_me:3009: checking if you want to build test-programs" >&5
++fi
++
++echo "$as_me:2843: 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.
-@@ -2874,10 +3016,10 @@
+@@ -2874,10 +2850,10 @@
  else
    cf_with_tests=yes
  fi;
 -echo "$as_me:2877: result: $cf_with_tests" >&5
-+echo "$as_me:3019: result: $cf_with_tests" >&5
++echo "$as_me:2853: result: $cf_with_tests" >&5
  echo "${ECHO_T}$cf_with_tests" >&6
  
 -echo "$as_me:2880: checking if we should assume mixed-case filenames" >&5
-+echo "$as_me:3022: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:2856: checking if we should assume mixed-case filenames" >&5
  echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
  
  # Check whether --enable-mixed-case or --disable-mixed-case was given.
-@@ -2887,11 +3029,11 @@
+@@ -2887,11 +2863,11 @@
  else
    enable_mixedcase=auto
  fi;
 -echo "$as_me:2890: result: $enable_mixedcase" >&5
-+echo "$as_me:3032: result: $enable_mixedcase" >&5
++echo "$as_me:2866: result: $enable_mixedcase" >&5
  echo "${ECHO_T}$enable_mixedcase" >&6
  if test "$enable_mixedcase" = "auto" ; then
  
 -echo "$as_me:2894: checking if filesystem supports mixed-case filenames" >&5
-+echo "$as_me:3036: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:2870: checking if filesystem supports mixed-case filenames" >&5
  echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
  if test "${cf_cv_mixedcase+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2918,7 +3060,7 @@
+@@ -2918,7 +2894,7 @@
  fi
  
  fi
 -echo "$as_me:2921: result: $cf_cv_mixedcase" >&5
-+echo "$as_me:3063: result: $cf_cv_mixedcase" >&5
++echo "$as_me:2897: result: $cf_cv_mixedcase" >&5
  echo "${ECHO_T}$cf_cv_mixedcase" >&6
  test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF
  #define MIXEDCASE_FILENAMES 1
-@@ -2935,7 +3077,7 @@
+@@ -2935,7 +2911,7 @@
  fi
  
  # do this after mixed-case option (tags/TAGS is not as important as tic).
 -echo "$as_me:2938: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "$as_me:3080: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:2914: checking whether ${MAKE-make} sets \${MAKE}" >&5
  echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
  set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
  if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-@@ -2955,11 +3097,11 @@
+@@ -2955,11 +2931,11 @@
  rm -f conftest.make
  fi
  if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
 -  echo "$as_me:2958: result: yes" >&5
-+  echo "$as_me:3100: result: yes" >&5
++  echo "$as_me:2934: result: yes" >&5
  echo "${ECHO_T}yes" >&6
    SET_MAKE=
  else
 -  echo "$as_me:2962: result: no" >&5
-+  echo "$as_me:3104: result: no" >&5
++  echo "$as_me:2938: result: no" >&5
  echo "${ECHO_T}no" >&6
    SET_MAKE="MAKE=${MAKE-make}"
  fi
-@@ -2968,7 +3110,7 @@
+@@ -2968,7 +2944,7 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -echo "$as_me:2971: checking for $ac_word" >&5
-+echo "$as_me:3113: checking for $ac_word" >&5
++echo "$as_me:2947: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_CTAGS+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2983,7 +3125,7 @@
+@@ -2983,7 +2959,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_CTAGS="$ac_prog"
 -echo "$as_me:2986: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3128: found $ac_dir/$ac_word" >&5
++echo "$as_me:2962: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -2991,10 +3133,10 @@
+@@ -2991,10 +2967,10 @@
  fi
  CTAGS=$ac_cv_prog_CTAGS
  if test -n "$CTAGS"; then
 -  echo "$as_me:2994: result: $CTAGS" >&5
-+  echo "$as_me:3136: result: $CTAGS" >&5
++  echo "$as_me:2970: result: $CTAGS" >&5
  echo "${ECHO_T}$CTAGS" >&6
  else
 -  echo "$as_me:2997: result: no" >&5
-+  echo "$as_me:3139: result: no" >&5
++  echo "$as_me:2973: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3005,7 +3147,7 @@
+@@ -3005,7 +2981,7 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -echo "$as_me:3008: checking for $ac_word" >&5
-+echo "$as_me:3150: checking for $ac_word" >&5
++echo "$as_me:2984: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_ETAGS+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3020,7 +3162,7 @@
+@@ -3020,7 +2996,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_ETAGS="$ac_prog"
 -echo "$as_me:3023: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3165: found $ac_dir/$ac_word" >&5
++echo "$as_me:2999: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3028,10 +3170,10 @@
+@@ -3028,10 +3004,10 @@
  fi
  ETAGS=$ac_cv_prog_ETAGS
  if test -n "$ETAGS"; then
 -  echo "$as_me:3031: result: $ETAGS" >&5
-+  echo "$as_me:3173: result: $ETAGS" >&5
++  echo "$as_me:3007: result: $ETAGS" >&5
  echo "${ECHO_T}$ETAGS" >&6
  else
 -  echo "$as_me:3034: result: no" >&5
-+  echo "$as_me:3176: result: no" >&5
++  echo "$as_me:3010: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3040,7 +3182,7 @@
+@@ -3040,7 +3016,7 @@
  
  # 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:3043: checking for $ac_word" >&5
-+echo "$as_me:3185: checking for $ac_word" >&5
++echo "$as_me:3019: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3055,7 +3197,7 @@
+@@ -3055,7 +3031,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_MAKE_LOWER_TAGS="yes"
 -echo "$as_me:3058: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3200: found $ac_dir/$ac_word" >&5
++echo "$as_me:3034: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3064,17 +3206,17 @@
+@@ -3064,17 +3040,17 @@
  fi
  MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
  if test -n "$MAKE_LOWER_TAGS"; then
 -  echo "$as_me:3067: result: $MAKE_LOWER_TAGS" >&5
-+  echo "$as_me:3209: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:3043: result: $MAKE_LOWER_TAGS" >&5
  echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
  else
 -  echo "$as_me:3070: result: no" >&5
-+  echo "$as_me:3212: result: no" >&5
++  echo "$as_me:3046: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
@@ -2487 +2912 @@
  set dummy ${ETAGS:-etags}; ac_word=$2
 -echo "$as_me:3077: checking for $ac_word" >&5
-+echo "$as_me:3219: checking for $ac_word" >&5
++echo "$as_me:3053: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3089,7 +3231,7 @@
+@@ -3089,7 +3065,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_MAKE_UPPER_TAGS="yes"
 -echo "$as_me:3092: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3234: found $ac_dir/$ac_word" >&5
++echo "$as_me:3068: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3098,10 +3240,10 @@
+@@ -3098,10 +3074,10 @@
  fi
  MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
  if test -n "$MAKE_UPPER_TAGS"; then
 -  echo "$as_me:3101: result: $MAKE_UPPER_TAGS" >&5
-+  echo "$as_me:3243: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:3077: result: $MAKE_UPPER_TAGS" >&5
  echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
  else
 -  echo "$as_me:3104: result: no" >&5
-+  echo "$as_me:3246: result: no" >&5
++  echo "$as_me:3080: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3121,7 +3263,7 @@
+@@ -3121,7 +3097,7 @@
         MAKE_LOWER_TAGS="#"
  fi
  
 -echo "$as_me:3124: checking for makeflags variable" >&5
-+echo "$as_me:3266: checking for makeflags variable" >&5
++echo "$as_me:3100: checking for makeflags variable" >&5
  echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
  if test "${cf_cv_makeflags+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3155,13 +3297,13 @@
+@@ -3155,13 +3131,13 @@
         rm -f cf_makeflags.tmp
  
  fi
 -echo "$as_me:3158: result: $cf_cv_makeflags" >&5
-+echo "$as_me:3300: result: $cf_cv_makeflags" >&5
++echo "$as_me:3134: result: $cf_cv_makeflags" >&5
  echo "${ECHO_T}$cf_cv_makeflags" >&6
  
@@ -2534 +2959 @@
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 -echo "$as_me:3164: checking for $ac_word" >&5
-+echo "$as_me:3306: checking for $ac_word" >&5
++echo "$as_me:3140: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3176,7 +3318,7 @@
+@@ -3176,7 +3152,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
 -echo "$as_me:3179: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3321: found $ac_dir/$ac_word" >&5
++echo "$as_me:3155: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3184,10 +3326,10 @@
+@@ -3184,10 +3160,10 @@
  fi
  RANLIB=$ac_cv_prog_RANLIB
  if test -n "$RANLIB"; then
 -  echo "$as_me:3187: result: $RANLIB" >&5
-+  echo "$as_me:3329: result: $RANLIB" >&5
++  echo "$as_me:3163: result: $RANLIB" >&5
  echo "${ECHO_T}$RANLIB" >&6
  else
 -  echo "$as_me:3190: result: no" >&5
-+  echo "$as_me:3332: result: no" >&5
++  echo "$as_me:3166: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3196,7 +3338,7 @@
+@@ -3196,7 +3172,7 @@
    ac_ct_RANLIB=$RANLIB
    # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
 -echo "$as_me:3199: checking for $ac_word" >&5
-+echo "$as_me:3341: checking for $ac_word" >&5
++echo "$as_me:3175: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3211,7 +3353,7 @@
+@@ -3211,7 +3187,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_ac_ct_RANLIB="ranlib"
 -echo "$as_me:3214: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3356: found $ac_dir/$ac_word" >&5
++echo "$as_me:3190: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3220,10 +3362,10 @@
+@@ -3220,10 +3196,10 @@
  fi
  ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
  if test -n "$ac_ct_RANLIB"; then
 -  echo "$as_me:3223: result: $ac_ct_RANLIB" >&5
-+  echo "$as_me:3365: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:3199: result: $ac_ct_RANLIB" >&5
  echo "${ECHO_T}$ac_ct_RANLIB" >&6
  else
 -  echo "$as_me:3226: result: no" >&5
-+  echo "$as_me:3368: result: no" >&5
++  echo "$as_me:3202: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3235,7 +3377,7 @@
+@@ -3235,7 +3211,7 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ld; ac_word=$2
 -echo "$as_me:3238: checking for $ac_word" >&5
-+echo "$as_me:3380: checking for $ac_word" >&5
++echo "$as_me:3214: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3250,7 +3392,7 @@
+@@ -3250,7 +3226,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_LD="${ac_tool_prefix}ld"
 -echo "$as_me:3253: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3395: found $ac_dir/$ac_word" >&5
++echo "$as_me:3229: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3258,10 +3400,10 @@
+@@ -3258,10 +3234,10 @@
  fi
  LD=$ac_cv_prog_LD
  if test -n "$LD"; then
 -  echo "$as_me:3261: result: $LD" >&5
-+  echo "$as_me:3403: result: $LD" >&5
++  echo "$as_me:3237: result: $LD" >&5
  echo "${ECHO_T}$LD" >&6
  else
 -  echo "$as_me:3264: result: no" >&5
-+  echo "$as_me:3406: result: no" >&5
++  echo "$as_me:3240: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3270,7 +3412,7 @@
+@@ -3270,7 +3246,7 @@
    ac_ct_LD=$LD
    # Extract the first word of "ld", so it can be a program name with args.
  set dummy ld; ac_word=$2
 -echo "$as_me:3273: checking for $ac_word" >&5
-+echo "$as_me:3415: checking for $ac_word" >&5
++echo "$as_me:3249: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3285,7 +3427,7 @@
+@@ -3285,7 +3261,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_ac_ct_LD="ld"
 -echo "$as_me:3288: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3430: found $ac_dir/$ac_word" >&5
++echo "$as_me:3264: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3294,10 +3436,10 @@
+@@ -3294,10 +3270,10 @@
  fi
  ac_ct_LD=$ac_cv_prog_ac_ct_LD
  if test -n "$ac_ct_LD"; then
 -  echo "$as_me:3297: result: $ac_ct_LD" >&5
-+  echo "$as_me:3439: result: $ac_ct_LD" >&5
++  echo "$as_me:3273: result: $ac_ct_LD" >&5
  echo "${ECHO_T}$ac_ct_LD" >&6
  else
 -  echo "$as_me:3300: result: no" >&5
-+  echo "$as_me:3442: result: no" >&5
++  echo "$as_me:3276: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3309,7 +3451,7 @@
+@@ -3309,7 +3285,7 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ar; ac_word=$2
 -echo "$as_me:3312: checking for $ac_word" >&5
-+echo "$as_me:3454: checking for $ac_word" >&5
++echo "$as_me:3288: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3324,7 +3466,7 @@
+@@ -3324,7 +3300,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_AR="${ac_tool_prefix}ar"
 -echo "$as_me:3327: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3469: found $ac_dir/$ac_word" >&5
++echo "$as_me:3303: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3332,10 +3474,10 @@
+@@ -3332,10 +3308,10 @@
  fi
  AR=$ac_cv_prog_AR
  if test -n "$AR"; then
 -  echo "$as_me:3335: result: $AR" >&5
-+  echo "$as_me:3477: result: $AR" >&5
++  echo "$as_me:3311: result: $AR" >&5
  echo "${ECHO_T}$AR" >&6
  else
 -  echo "$as_me:3338: result: no" >&5
-+  echo "$as_me:3480: result: no" >&5
++  echo "$as_me:3314: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3344,7 +3486,7 @@
+@@ -3344,7 +3320,7 @@
    ac_ct_AR=$AR
    # Extract the first word of "ar", so it can be a program name with args.
  set dummy ar; ac_word=$2
 -echo "$as_me:3347: checking for $ac_word" >&5
-+echo "$as_me:3489: checking for $ac_word" >&5
++echo "$as_me:3323: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3359,7 +3501,7 @@
+@@ -3359,7 +3335,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_ac_ct_AR="ar"
 -echo "$as_me:3362: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3504: found $ac_dir/$ac_word" >&5
++echo "$as_me:3338: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3368,10 +3510,10 @@
+@@ -3368,10 +3344,10 @@
  fi
  ac_ct_AR=$ac_cv_prog_ac_ct_AR
  if test -n "$ac_ct_AR"; then
 -  echo "$as_me:3371: result: $ac_ct_AR" >&5
-+  echo "$as_me:3513: result: $ac_ct_AR" >&5
++  echo "$as_me:3347: result: $ac_ct_AR" >&5
  echo "${ECHO_T}$ac_ct_AR" >&6
  else
 -  echo "$as_me:3374: result: no" >&5
-+  echo "$as_me:3516: result: no" >&5
++  echo "$as_me:3350: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3383,7 +3525,7 @@
+@@ -3383,7 +3359,7 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ar; ac_word=$2
 -echo "$as_me:3386: checking for $ac_word" >&5
-+echo "$as_me:3528: checking for $ac_word" >&5
++echo "$as_me:3362: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3398,7 +3540,7 @@
+@@ -3398,7 +3374,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_AR="${ac_tool_prefix}ar"
 -echo "$as_me:3401: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3543: found $ac_dir/$ac_word" >&5
++echo "$as_me:3377: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3406,10 +3548,10 @@
+@@ -3406,10 +3382,10 @@
  fi
  AR=$ac_cv_prog_AR
  if test -n "$AR"; then
 -  echo "$as_me:3409: result: $AR" >&5
-+  echo "$as_me:3551: result: $AR" >&5
++  echo "$as_me:3385: result: $AR" >&5
  echo "${ECHO_T}$AR" >&6
  else
 -  echo "$as_me:3412: result: no" >&5
-+  echo "$as_me:3554: result: no" >&5
++  echo "$as_me:3388: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3418,7 +3560,7 @@
+@@ -3418,7 +3394,7 @@
    ac_ct_AR=$AR
    # Extract the first word of "ar", so it can be a program name with args.
  set dummy ar; ac_word=$2
 -echo "$as_me:3421: checking for $ac_word" >&5
-+echo "$as_me:3563: checking for $ac_word" >&5
++echo "$as_me:3397: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3433,7 +3575,7 @@
+@@ -3433,7 +3409,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_ac_ct_AR="ar"
 -echo "$as_me:3436: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3578: found $ac_dir/$ac_word" >&5
++echo "$as_me:3412: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3442,10 +3584,10 @@
+@@ -3442,10 +3418,10 @@
  fi
  ac_ct_AR=$ac_cv_prog_ac_ct_AR
  if test -n "$ac_ct_AR"; then
 -  echo "$as_me:3445: result: $ac_ct_AR" >&5
-+  echo "$as_me:3587: result: $ac_ct_AR" >&5
++  echo "$as_me:3421: result: $ac_ct_AR" >&5
  echo "${ECHO_T}$ac_ct_AR" >&6
  else
 -  echo "$as_me:3448: result: no" >&5
-+  echo "$as_me:3590: result: no" >&5
++  echo "$as_me:3424: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3454,7 +3596,7 @@
+@@ -3454,7 +3430,7 @@
    AR="$ac_cv_prog_AR"
  fi
  
 -echo "$as_me:3457: checking for options to update archives" >&5
-+echo "$as_me:3599: checking for options to update archives" >&5
++echo "$as_me:3433: checking for options to update archives" >&5
  echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
  if test "${cf_cv_ar_flags+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3477,13 +3619,13 @@
+@@ -3477,13 +3453,13 @@
                 rm -f conftest.a
  
                 cat >conftest.$ac_ext <<EOF
 -#line 3480 "configure"
-+#line 3622 "configure"
++#line 3456 "configure"
  int    testdata[3] = { 123, 456, 789 };
  EOF
 -               if { (eval echo "$as_me:3483: \"$ac_compile\"") >&5
-+               if { (eval echo "$as_me:3625: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:3459: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:3486: \$? = $ac_status" >&5
-+  echo "$as_me:3628: \$? = $ac_status" >&5
++  echo "$as_me:3462: \$? = $ac_status" >&5
    (exit $ac_status); } ; then
                         echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5
                         $AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null
-@@ -3494,7 +3636,7 @@
+@@ -3494,7 +3470,7 @@
                 else
                         test -n "$verbose" && echo "    cannot compile test-program" 1>&6
  
 -echo "${as_me:-configure}:3497: testing cannot compile test-program ..." 1>&5
-+echo "${as_me:-configure}:3639: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:3473: testing cannot compile test-program ..." 1>&5
  
                         break
                 fi
-@@ -3502,7 +3644,7 @@
+@@ -3502,7 +3478,7 @@
         rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
  
  fi
 -echo "$as_me:3505: result: $cf_cv_ar_flags" >&5
-+echo "$as_me:3647: result: $cf_cv_ar_flags" >&5
++echo "$as_me:3481: result: $cf_cv_ar_flags" >&5
  echo "${ECHO_T}$cf_cv_ar_flags" >&6
  
  if test -n "$ARFLAGS" ; then
-@@ -3513,7 +3655,7 @@
+@@ -3513,7 +3489,7 @@
         ARFLAGS=$cf_cv_ar_flags
  fi
  
 -echo "$as_me:3516: checking if you have specified an install-prefix" >&5
-+echo "$as_me:3658: checking if you have specified an install-prefix" >&5
++echo "$as_me:3492: checking if you have specified an install-prefix" >&5
  echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
  
  # Check whether --with-install-prefix or --without-install-prefix was given.
-@@ -3526,7 +3668,7 @@
+@@ -3526,7 +3502,7 @@
                 ;;
         esac
  fi;
 -echo "$as_me:3529: result: $DESTDIR" >&5
-+echo "$as_me:3671: result: $DESTDIR" >&5
++echo "$as_me:3505: result: $DESTDIR" >&5
  echo "${ECHO_T}$DESTDIR" >&6
  
  ###############################################################################
-@@ -3554,7 +3696,7 @@
+@@ -3554,7 +3530,7 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -echo "$as_me:3557: checking for $ac_word" >&5
-+echo "$as_me:3699: checking for $ac_word" >&5
++echo "$as_me:3533: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_BUILD_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3569,7 +3711,7 @@
+@@ -3569,7 +3545,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_BUILD_CC="$ac_prog"
 -echo "$as_me:3572: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3714: found $ac_dir/$ac_word" >&5
++echo "$as_me:3548: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3577,10 +3719,10 @@
+@@ -3577,10 +3553,10 @@
  fi
  BUILD_CC=$ac_cv_prog_BUILD_CC
  if test -n "$BUILD_CC"; then
 -  echo "$as_me:3580: result: $BUILD_CC" >&5
-+  echo "$as_me:3722: result: $BUILD_CC" >&5
++  echo "$as_me:3556: result: $BUILD_CC" >&5
  echo "${ECHO_T}$BUILD_CC" >&6
  else
 -  echo "$as_me:3583: result: no" >&5
-+  echo "$as_me:3725: result: no" >&5
++  echo "$as_me:3559: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3588,12 +3730,12 @@
+@@ -3588,12 +3564,12 @@
  done
  
  fi;
 -       echo "$as_me:3591: checking for native build C compiler" >&5
-+       echo "$as_me:3733: checking for native build C compiler" >&5
++       echo "$as_me:3567: checking for native build C compiler" >&5
  echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
 -       echo "$as_me:3593: result: $BUILD_CC" >&5
-+       echo "$as_me:3735: result: $BUILD_CC" >&5
++       echo "$as_me:3569: result: $BUILD_CC" >&5
  echo "${ECHO_T}$BUILD_CC" >&6
  
 -       echo "$as_me:3596: checking for native build C preprocessor" >&5
-+       echo "$as_me:3738: checking for native build C preprocessor" >&5
++       echo "$as_me:3572: checking for native build C preprocessor" >&5
  echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
  
  # Check whether --with-build-cpp or --without-build-cpp was given.
-@@ -3603,10 +3745,10 @@
+@@ -3603,10 +3579,10 @@
  else
    BUILD_CPP='${BUILD_CC} -E'
  fi;
 -       echo "$as_me:3606: result: $BUILD_CPP" >&5
-+       echo "$as_me:3748: result: $BUILD_CPP" >&5
++       echo "$as_me:3582: result: $BUILD_CPP" >&5
  echo "${ECHO_T}$BUILD_CPP" >&6
  
 -       echo "$as_me:3609: checking for native build C flags" >&5
-+       echo "$as_me:3751: checking for native build C flags" >&5
++       echo "$as_me:3585: checking for native build C flags" >&5
  echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
  
  # Check whether --with-build-cflags or --without-build-cflags was given.
-@@ -3614,10 +3756,10 @@
+@@ -3614,10 +3590,10 @@
    withval="$with_build_cflags"
    BUILD_CFLAGS="$withval"
  fi;
 -       echo "$as_me:3617: result: $BUILD_CFLAGS" >&5
-+       echo "$as_me:3759: result: $BUILD_CFLAGS" >&5
++       echo "$as_me:3593: result: $BUILD_CFLAGS" >&5
  echo "${ECHO_T}$BUILD_CFLAGS" >&6
  
 -       echo "$as_me:3620: checking for native build C preprocessor-flags" >&5
-+       echo "$as_me:3762: checking for native build C preprocessor-flags" >&5
++       echo "$as_me:3596: checking for native build C preprocessor-flags" >&5
  echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
  
  # Check whether --with-build-cppflags or --without-build-cppflags was given.
-@@ -3625,10 +3767,10 @@
+@@ -3625,10 +3601,10 @@
    withval="$with_build_cppflags"
    BUILD_CPPFLAGS="$withval"
  fi;
 -       echo "$as_me:3628: result: $BUILD_CPPFLAGS" >&5
-+       echo "$as_me:3770: result: $BUILD_CPPFLAGS" >&5
++       echo "$as_me:3604: result: $BUILD_CPPFLAGS" >&5
  echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
  
 -       echo "$as_me:3631: checking for native build linker-flags" >&5
-+       echo "$as_me:3773: checking for native build linker-flags" >&5
++       echo "$as_me:3607: checking for native build linker-flags" >&5
  echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
  
  # Check whether --with-build-ldflags or --without-build-ldflags was given.
-@@ -3636,10 +3778,10 @@
+@@ -3636,10 +3612,10 @@
    withval="$with_build_ldflags"
    BUILD_LDFLAGS="$withval"
  fi;
 -       echo "$as_me:3639: result: $BUILD_LDFLAGS" >&5
-+       echo "$as_me:3781: result: $BUILD_LDFLAGS" >&5
++       echo "$as_me:3615: result: $BUILD_LDFLAGS" >&5
  echo "${ECHO_T}$BUILD_LDFLAGS" >&6
  
 -       echo "$as_me:3642: checking for native build linker-libraries" >&5
-+       echo "$as_me:3784: checking for native build linker-libraries" >&5
++       echo "$as_me:3618: checking for native build linker-libraries" >&5
  echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
  
  # Check whether --with-build-libs or --without-build-libs was given.
-@@ -3647,7 +3789,7 @@
+@@ -3647,7 +3623,7 @@
    withval="$with_build_libs"
    BUILD_LIBS="$withval"
  fi;
 -       echo "$as_me:3650: result: $BUILD_LIBS" >&5
-+       echo "$as_me:3792: result: $BUILD_LIBS" >&5
++       echo "$as_me:3626: result: $BUILD_LIBS" >&5
  echo "${ECHO_T}$BUILD_LIBS" >&6
  
         # this assumes we're on Unix.
-@@ -3657,7 +3799,7 @@
+@@ -3657,7 +3633,7 @@
         : ${BUILD_CC:='${CC}'}
  
         if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
 -               { { echo "$as_me:3660: error: Cross-build requires two compilers.
-+               { { echo "$as_me:3802: error: Cross-build requires two compilers.
++               { { echo "$as_me:3636: error: Cross-build requires two compilers.
  Use --with-build-cc to specify the native compiler." >&5
  echo "$as_me: error: Cross-build requires two compilers.
  Use --with-build-cc to specify the native compiler." >&2;}
-@@ -3682,7 +3824,7 @@
+@@ -3682,7 +3658,7 @@
  ### shared, for example.
  cf_list_models=""
  
 -echo "$as_me:3685: checking if you want to build shared C-objects" >&5
-+echo "$as_me:3827: checking if you want to build shared C-objects" >&5
++echo "$as_me:3661: checking if you want to build shared C-objects" >&5
  echo $ECHO_N "checking if you want to build shared C-objects... $ECHO_C" >&6
  
  # Check whether --with-shared or --without-shared was given.
-@@ -3692,27 +3834,27 @@
+@@ -3692,27 +3668,27 @@
  else
    with_shared=no
  fi;
 -echo "$as_me:3695: result: $with_shared" >&5
-+echo "$as_me:3837: result: $with_shared" >&5
++echo "$as_me:3671: result: $with_shared" >&5
  echo "${ECHO_T}$with_shared" >&6
  test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
  
 -echo "$as_me:3699: checking for specified models" >&5
-+echo "$as_me:3841: checking for specified models" >&5
++echo "$as_me:3675: 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:3702: result: $cf_list_models" >&5
-+echo "$as_me:3844: result: $cf_list_models" >&5
++echo "$as_me:3678: result: $cf_list_models" >&5
  echo "${ECHO_T}$cf_list_models" >&6
  
@@ -2985 +3410 @@
  ### up test-applications.
 -echo "$as_me:3707: checking for default model" >&5
-+echo "$as_me:3849: checking for default model" >&5
++echo "$as_me:3683: 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:3710: result: $DFT_LWR_MODEL" >&5
-+echo "$as_me:3852: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:3686: result: $DFT_LWR_MODEL" >&5
  echo "${ECHO_T}$DFT_LWR_MODEL" >&6
  
@@ -2995 +3420 @@
  
 -echo "$as_me:3715: checking for specific curses-directory" >&5
-+echo "$as_me:3857: checking for specific curses-directory" >&5
++echo "$as_me:3691: checking for specific curses-directory" >&5
  echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6
  
  # Check whether --with-curses-dir or --without-curses-dir was given.
-@@ -3722,7 +3864,7 @@
+@@ -3722,7 +3698,7 @@
  else
    cf_cv_curses_dir=no
  fi;
 -echo "$as_me:3725: result: $cf_cv_curses_dir" >&5
-+echo "$as_me:3867: result: $cf_cv_curses_dir" >&5
++echo "$as_me:3701: result: $cf_cv_curses_dir" >&5
  echo "${ECHO_T}$cf_cv_curses_dir" >&6
  
  if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
-@@ -3753,7 +3895,7 @@
+@@ -3741,7 +3717,7 @@
+   ;;
+ .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+   ;;
+-.\${*prefix}*) #(vi
++.\${*prefix}*|.\${*dir}*) #(vi
+   eval withval="$withval"
+   case ".$withval" in #(vi
+   .NONE/*)
+@@ -3753,7 +3729,7 @@
    withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    ;;
  *)
 -  { { echo "$as_me:3756: error: expected a pathname, not \"$withval\"" >&5
-+  { { echo "$as_me:3898: error: expected a pathname, not \"$withval\"" >&5
++  { { echo "$as_me:3732: error: expected a pathname, not \"$withval\"" >&5
  echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
     { (exit 1); exit 1; }; }
    ;;
-@@ -3786,7 +3928,7 @@
+@@ -3786,7 +3762,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 3789 "configure"
-+#line 3931 "configure"
++#line 3765 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -3798,16 +3940,16 @@
+@@ -3798,16 +3774,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3801: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3943: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3777: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:3804: \$? = $ac_status" >&5
-+  echo "$as_me:3946: \$? = $ac_status" >&5
++  echo "$as_me:3780: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3807: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3949: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3783: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3810: \$? = $ac_status" >&5
-+  echo "$as_me:3952: \$? = $ac_status" >&5
++  echo "$as_me:3786: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -3824,7 +3966,7 @@
+@@ -3824,7 +3800,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:3827: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:3969: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:3803: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -3858,7 +4000,7 @@
+@@ -3858,7 +3834,7 @@
        if test "$cf_have_libdir" = no ; then
          test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
  
 -echo "${as_me:-configure}:3861: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:4003: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:3837: testing adding $cf_add_libdir to library-path ..." 1>&5
  
          LDFLAGS="-L$cf_add_libdir $LDFLAGS"
        fi
-@@ -3869,7 +4011,7 @@
+@@ -3869,7 +3845,7 @@
         fi
  fi
  
 -echo "$as_me:3872: checking if you want wide-character code" >&5
-+echo "$as_me:4014: checking if you want wide-character code" >&5
++echo "$as_me:3848: checking if you want wide-character code" >&5
  echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
  
  # Check whether --enable-widec or --disable-widec was given.
-@@ -3879,11 +4021,11 @@
+@@ -3879,11 +3855,11 @@
  else
    with_widec=no
  fi;
 -echo "$as_me:3882: result: $with_widec" >&5
-+echo "$as_me:4024: result: $with_widec" >&5
++echo "$as_me:3858: result: $with_widec" >&5
  echo "${ECHO_T}$with_widec" >&6
  if test "$with_widec" = yes ; then
  
 -echo "$as_me:3886: checking for multibyte character support" >&5
-+echo "$as_me:4028: checking for multibyte character support" >&5
++echo "$as_me:3862: checking for multibyte character support" >&5
  echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
  if test "${cf_cv_utf8_lib+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3891,7 +4033,7 @@
+@@ -3891,7 +3867,7 @@
  
         cf_save_LIBS="$LIBS"
         cat >conftest.$ac_ext <<_ACEOF
 -#line 3894 "configure"
-+#line 4036 "configure"
++#line 3870 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -3904,16 +4046,16 @@
+@@ -3904,16 +3880,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:3907: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4049: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3883: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:3910: \$? = $ac_status" >&5
-+  echo "$as_me:4052: \$? = $ac_status" >&5
++  echo "$as_me:3886: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:3913: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4055: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3889: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3916: \$? = $ac_status" >&5
-+  echo "$as_me:4058: \$? = $ac_status" >&5
++  echo "$as_me:3892: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_utf8_lib=yes
  else
-@@ -3925,12 +4067,12 @@
+@@ -3925,12 +3901,12 @@
  cf_cv_header_path_utf8=
  cf_cv_library_path_utf8=
  
 -echo "${as_me:-configure}:3928: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:4070: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:3904: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
  
  cf_save_LIBS="$LIBS"
@@ -3129 +3563 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 3933 "configure"
-+#line 4075 "configure"
++#line 3909 "configure"
  #include "confdefs.h"
  
  #include <libutf8.h>
-@@ -3943,16 +4085,16 @@
+@@ -3943,16 +3919,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:3946: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4088: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3922: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:3949: \$? = $ac_status" >&5
-+  echo "$as_me:4091: \$? = $ac_status" >&5
++  echo "$as_me:3925: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:3952: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4094: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3928: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3955: \$? = $ac_status" >&5
-+  echo "$as_me:4097: \$? = $ac_status" >&5
++  echo "$as_me:3931: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         cf_cv_find_linkage_utf8=yes
-@@ -3966,7 +4108,7 @@
+@@ -3966,7 +3942,7 @@
  LIBS="-lutf8  $cf_save_LIBS"
  
  cat >conftest.$ac_ext <<_ACEOF
 -#line 3969 "configure"
-+#line 4111 "configure"
++#line 3945 "configure"
  #include "confdefs.h"
  
  #include <libutf8.h>
-@@ -3979,16 +4121,16 @@
+@@ -3979,16 +3955,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:3982: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4124: \"$ac_link\"") >&5
++if { (eval echo "$as_me:3958: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:3985: \$? = $ac_status" >&5
-+  echo "$as_me:4127: \$? = $ac_status" >&5
++  echo "$as_me:3961: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:3988: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4130: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3964: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3991: \$? = $ac_status" >&5
-+  echo "$as_me:4133: \$? = $ac_status" >&5
++  echo "$as_me:3967: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         cf_cv_find_linkage_utf8=yes
-@@ -4005,9 +4147,9 @@
+@@ -4005,9 +3981,9 @@
  
      test -n "$verbose" && echo "       find linkage for utf8 library" 1>&6
  
 -echo "${as_me:-configure}:4008: testing find linkage for utf8 library ..." 1>&5
-+echo "${as_me:-configure}:4150: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:3984: testing find linkage for utf8 library ..." 1>&5
  
 -echo "${as_me:-configure}:4010: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:4152: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:3986: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
  
      cf_save_CPPFLAGS="$CPPFLAGS"
      cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -4120,11 +4262,11 @@
+@@ -4120,11 +4096,11 @@
        if test -d $cf_cv_header_path_utf8 ; then
          test -n "$verbose" && echo "   ... testing $cf_cv_header_path_utf8" 1>&6
  
 -echo "${as_me:-configure}:4123: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:4265: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:4099: 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 4127 "configure"
-+#line 4269 "configure"
++#line 4103 "configure"
  #include "confdefs.h"
  
  #include <libutf8.h>
-@@ -4137,21 +4279,21 @@
+@@ -4137,21 +4113,21 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:4140: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4282: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4116: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:4143: \$? = $ac_status" >&5
-+  echo "$as_me:4285: \$? = $ac_status" >&5
++  echo "$as_me:4119: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:4146: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4288: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4122: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4149: \$? = $ac_status" >&5
-+  echo "$as_me:4291: \$? = $ac_status" >&5
++  echo "$as_me:4125: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -3233 +3667 @@
  
 -echo "${as_me:-configure}:4154: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:4296: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:4130: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
  
              cf_cv_find_linkage_utf8=maybe
              cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -4169,7 +4311,7 @@
+@@ -4169,7 +4145,7 @@
  
      if test "$cf_cv_find_linkage_utf8" = maybe ; then
  
 -echo "${as_me:-configure}:4172: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:4314: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:4148: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
  
        cf_save_LIBS="$LIBS"
        cf_save_LDFLAGS="$LDFLAGS"
-@@ -4266,13 +4408,13 @@
+@@ -4266,13 +4242,13 @@
            if test -d $cf_cv_library_path_utf8 ; then
              test -n "$verbose" && echo "       ... testing $cf_cv_library_path_utf8" 1>&6
  
 -echo "${as_me:-configure}:4269: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:4411: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:4245: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
  
              CPPFLAGS="$cf_test_CPPFLAGS"
@@ -3258 +3692 @@
              cat >conftest.$ac_ext <<_ACEOF
 -#line 4275 "configure"
-+#line 4417 "configure"
++#line 4251 "configure"
  #include "confdefs.h"
  
  #include <libutf8.h>
-@@ -4285,21 +4427,21 @@
+@@ -4285,21 +4261,21 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:4288: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4430: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4264: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:4291: \$? = $ac_status" >&5
-+  echo "$as_me:4433: \$? = $ac_status" >&5
++  echo "$as_me:4267: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:4294: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4436: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4270: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4297: \$? = $ac_status" >&5
-+  echo "$as_me:4439: \$? = $ac_status" >&5
++  echo "$as_me:4273: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -3285 +3719 @@
  
 -echo "${as_me:-configure}:4302: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:4444: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:4278: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
  
                  cf_cv_find_linkage_utf8=yes
                  cf_cv_library_file_utf8="-lutf8"
-@@ -4341,7 +4483,7 @@
+@@ -4341,7 +4317,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:4344: result: $cf_cv_utf8_lib" >&5
-+echo "$as_me:4486: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:4320: result: $cf_cv_utf8_lib" >&5
  echo "${ECHO_T}$cf_cv_utf8_lib" >&6
  
  # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
-@@ -4375,7 +4517,7 @@
+@@ -4375,7 +4351,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 4378 "configure"
-+#line 4520 "configure"
++#line 4354 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -4387,16 +4529,16 @@
+@@ -4387,16 +4363,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:4390: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4532: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4366: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:4393: \$? = $ac_status" >&5
-+  echo "$as_me:4535: \$? = $ac_status" >&5
++  echo "$as_me:4369: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:4396: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4538: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4372: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4399: \$? = $ac_status" >&5
-+  echo "$as_me:4541: \$? = $ac_status" >&5
++  echo "$as_me:4375: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -4413,7 +4555,7 @@
+@@ -4413,7 +4389,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:4416: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:4558: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:4392: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -4447,7 +4589,7 @@
+@@ -4447,7 +4423,7 @@
        if test "$cf_have_libdir" = no ; then
          test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
  
 -echo "${as_me:-configure}:4450: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:4592: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:4426: testing adding $cf_add_libdir to library-path ..." 1>&5
  
          LDFLAGS="-L$cf_add_libdir $LDFLAGS"
        fi
-@@ -4461,48 +4603,87 @@
+@@ -4461,48 +4437,87 @@
  cf_ncuconfig_root=ncursesw
  
@@ -3357 +3791 @@
 +    # 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:4612: checking for $ac_word" >&5
++echo "$as_me:4446: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
@@ -3372 +3806 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-+echo "$as_me:4627: found $ac_dir/$ac_word" >&5
++echo "$as_me:4461: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -3380 +3814 @@
 +NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 +if test -n "$NCURSES_CONFIG"; then
-+  echo "$as_me:4635: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:4469: result: $NCURSES_CONFIG" >&5
 +echo "${ECHO_T}$NCURSES_CONFIG" >&6
 +else
-+  echo "$as_me:4638: result: no" >&5
++  echo "$as_me:4472: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -3397 +3831 @@
  set dummy $ac_prog; ac_word=$2
 -echo "$as_me:4468: checking for $ac_word" >&5
-+echo "$as_me:4651: checking for $ac_word" >&5
++echo "$as_me:4485: 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
@@ -3423 +3857 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-+echo "$as_me:4666: found $ac_dir/$ac_word" >&5
++echo "$as_me:4500: found $ac_dir/$ac_word" >&5
 +break
  done
@@ -3438 +3872 @@
 +ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 +if test -n "$ac_ct_NCURSES_CONFIG"; then
-+  echo "$as_me:4674: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:4508: result: $ac_ct_NCURSES_CONFIG" >&5
 +echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
  else
 -  echo "$as_me:4499: result: no" >&5
-+  echo "$as_me:4677: result: no" >&5
++  echo "$as_me:4511: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
@@ -3457 +3891 @@
  if test "$NCURSES_CONFIG" != none ; then
  
-@@ -4511,7 +4692,7 @@
+@@ -4511,7 +4526,7 @@
  
  # even with config script, some packages use no-override for curses.h
  
 -echo "$as_me:4514: checking if we have identified curses headers" >&5
-+echo "$as_me:4695: checking if we have identified curses headers" >&5
++echo "$as_me:4529: 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
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4519,13 +4700,13 @@
+@@ -4519,13 +4534,13 @@
  
  cf_cv_ncurses_header=none
@@ -3481 +3915 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 4528 "configure"
-+#line 4709 "configure"
++#line 4543 "configure"
  #include "confdefs.h"
  #include <${cf_header}>
  int
-@@ -4537,16 +4718,16 @@
+@@ -4537,16 +4552,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:4540: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4721: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4555: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:4543: \$? = $ac_status" >&5
-+  echo "$as_me:4724: \$? = $ac_status" >&5
++  echo "$as_me:4558: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:4546: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4727: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4561: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4549: \$? = $ac_status" >&5
-+  echo "$as_me:4730: \$? = $ac_status" >&5
++  echo "$as_me:4564: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ncurses_header=$cf_header; break
  else
-@@ -4557,11 +4738,11 @@
+@@ -4557,11 +4572,11 @@
  done
  
  fi
 -echo "$as_me:4560: result: $cf_cv_ncurses_header" >&5
-+echo "$as_me:4741: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:4575: 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:4564: error: No curses header-files found" >&5
-+       { { echo "$as_me:4745: error: No curses header-files found" >&5
++       { { echo "$as_me:4579: error: No curses header-files found" >&5
  echo "$as_me: error: No curses header-files found" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -4571,23 +4752,23 @@
+@@ -4571,23 +4586,23 @@
  for ac_header in $cf_cv_ncurses_header
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -echo "$as_me:4574: checking for $ac_header" >&5
-+echo "$as_me:4755: checking for $ac_header" >&5
++echo "$as_me:4589: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -3532 +3966 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 4580 "configure"
-+#line 4761 "configure"
++#line 4595 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
 -if { (eval echo "$as_me:4584: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:4765: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:4599: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -3544 +3978 @@
    cat conftest.err >&5
 -  echo "$as_me:4590: \$? = $ac_status" >&5
-+  echo "$as_me:4771: \$? = $ac_status" >&5
++  echo "$as_me:4605: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -4606,7 +4787,7 @@
+@@ -4606,7 +4621,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:4609: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:4790: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:4624: result: `eval echo '${'$as_ac_Header'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<EOF
-@@ -4659,7 +4840,7 @@
+@@ -4659,7 +4674,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 4662 "configure"
-+#line 4843 "configure"
++#line 4677 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -4671,16 +4852,16 @@
+@@ -4671,16 +4686,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:4674: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4855: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4689: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:4677: \$? = $ac_status" >&5
-+  echo "$as_me:4858: \$? = $ac_status" >&5
++  echo "$as_me:4692: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:4680: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4861: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4695: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4683: \$? = $ac_status" >&5
-+  echo "$as_me:4864: \$? = $ac_status" >&5
++  echo "$as_me:4698: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -4697,7 +4878,7 @@
+@@ -4697,7 +4712,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:4700: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:4881: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:4715: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -4714,7 +4895,7 @@
+@@ -4714,7 +4729,7 @@
  
  }
  
 -echo "$as_me:4717: checking for $cf_ncuhdr_root header in include-path" >&5
-+echo "$as_me:4898: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:4732: 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
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4726,7 +4907,7 @@
+@@ -4726,7 +4741,7 @@
         do
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 4729 "configure"
-+#line 4910 "configure"
++#line 4744 "configure"
  #include "confdefs.h"
  
  #define _XOPEN_SOURCE_EXTENDED
-@@ -4758,16 +4939,16 @@
+@@ -4758,16 +4773,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:4761: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4942: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4776: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:4764: \$? = $ac_status" >&5
-+  echo "$as_me:4945: \$? = $ac_status" >&5
++  echo "$as_me:4779: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:4767: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4948: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4782: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4770: \$? = $ac_status" >&5
-+  echo "$as_me:4951: \$? = $ac_status" >&5
++  echo "$as_me:4785: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ncurses_h=$cf_header
  
-@@ -4782,14 +4963,14 @@
+@@ -4782,14 +4797,14 @@
         done
  
  fi
 -echo "$as_me:4785: result: $cf_cv_ncurses_h" >&5
-+echo "$as_me:4966: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:4800: result: $cf_cv_ncurses_h" >&5
  echo "${ECHO_T}$cf_cv_ncurses_h" >&6
  
@@ -3648 +4082 @@
  
 -echo "$as_me:4792: checking for $cf_ncuhdr_root include-path" >&5
-+echo "$as_me:4973: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:4807: 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
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4929,7 +5110,7 @@
+@@ -4929,7 +4944,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 4932 "configure"
-+#line 5113 "configure"
++#line 4947 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -4941,16 +5122,16 @@
+@@ -4941,16 +4956,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:4944: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5125: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4959: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:4947: \$? = $ac_status" >&5
-+  echo "$as_me:5128: \$? = $ac_status" >&5
++  echo "$as_me:4962: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:4950: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5131: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4965: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4953: \$? = $ac_status" >&5
-+  echo "$as_me:5134: \$? = $ac_status" >&5
++  echo "$as_me:4968: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -4967,7 +5148,7 @@
+@@ -4967,7 +4982,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:4970: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:5151: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:4985: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -4988,7 +5169,7 @@
+@@ -4988,7 +5003,7 @@
                 do
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 4991 "configure"
-+#line 5172 "configure"
++#line 5006 "configure"
  #include "confdefs.h"
  
  #include <$cf_header>
-@@ -5012,16 +5193,16 @@
+@@ -5012,16 +5027,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:5015: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5196: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5030: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:5018: \$? = $ac_status" >&5
-+  echo "$as_me:5199: \$? = $ac_status" >&5
++  echo "$as_me:5033: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:5021: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5202: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5036: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5024: \$? = $ac_status" >&5
-+  echo "$as_me:5205: \$? = $ac_status" >&5
++  echo "$as_me:5039: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ncurses_h2=$cf_header
  
-@@ -5042,12 +5223,12 @@
+@@ -5042,12 +5057,12 @@
                 CPPFLAGS="$cf_save2_CPPFLAGS"
                 test "$cf_cv_ncurses_h2" != no && break
         done
 -       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5045: error: not found" >&5
-+       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5226: error: not found" >&5
++       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5060: error: not found" >&5
  echo "$as_me: error: not found" >&2;}
     { (exit 1); exit 1; }; }
@@ -3732 +4166 @@
  fi
 -echo "$as_me:5050: result: $cf_cv_ncurses_h2" >&5
-+echo "$as_me:5231: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:5065: result: $cf_cv_ncurses_h2" >&5
  echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
  
         cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
-@@ -5080,7 +5261,7 @@
+@@ -5080,7 +5095,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 5083 "configure"
-+#line 5264 "configure"
++#line 5098 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -5092,16 +5273,16 @@
+@@ -5092,16 +5107,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:5095: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5276: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5110: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:5098: \$? = $ac_status" >&5
-+  echo "$as_me:5279: \$? = $ac_status" >&5
++  echo "$as_me:5113: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:5101: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5282: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5116: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5104: \$? = $ac_status" >&5
-+  echo "$as_me:5285: \$? = $ac_status" >&5
++  echo "$as_me:5119: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -5118,7 +5299,7 @@
+@@ -5118,7 +5133,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:5121: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:5302: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:5136: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -5161,7 +5342,7 @@
+@@ -5161,7 +5176,7 @@
         ;;
  esac
  
 -echo "$as_me:5164: checking for terminfo header" >&5
-+echo "$as_me:5345: checking for terminfo header" >&5
++echo "$as_me:5179: checking for terminfo header" >&5
  echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
  if test "${cf_cv_term_header+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5179,7 +5360,7 @@
+@@ -5179,7 +5194,7 @@
  for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
  do
  cat >conftest.$ac_ext <<_ACEOF
 -#line 5182 "configure"
-+#line 5363 "configure"
++#line 5197 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -5194,16 +5375,16 @@
+@@ -5194,16 +5209,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:5197: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5378: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5212: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:5200: \$? = $ac_status" >&5
-+  echo "$as_me:5381: \$? = $ac_status" >&5
++  echo "$as_me:5215: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:5203: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5384: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5218: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5206: \$? = $ac_status" >&5
-+  echo "$as_me:5387: \$? = $ac_status" >&5
++  echo "$as_me:5221: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         cf_cv_term_header="$cf_test"
-@@ -5219,7 +5400,7 @@
+@@ -5219,7 +5234,7 @@
  done
  
  fi
 -echo "$as_me:5222: result: $cf_cv_term_header" >&5
-+echo "$as_me:5403: result: $cf_cv_term_header" >&5
++echo "$as_me:5237: result: $cf_cv_term_header" >&5
  echo "${ECHO_T}$cf_cv_term_header" >&6
  
  # Set definitions to allow ifdef'ing to accommodate subdirectories
-@@ -5253,7 +5434,7 @@
+@@ -5253,7 +5268,7 @@
  #define NCURSES 1
  EOF
  
 -echo "$as_me:5256: checking for ncurses version" >&5
-+echo "$as_me:5437: checking for ncurses version" >&5
++echo "$as_me:5271: checking for ncurses version" >&5
  echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
  if test "${cf_cv_ncurses_version+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5279,10 +5460,10 @@
+@@ -5279,10 +5294,10 @@
  #endif
  EOF
         cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
 -       { (eval echo "$as_me:5282: \"$cf_try\"") >&5
-+       { (eval echo "$as_me:5463: \"$cf_try\"") >&5
++       { (eval echo "$as_me:5297: \"$cf_try\"") >&5
    (eval $cf_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5285: \$? = $ac_status" >&5
-+  echo "$as_me:5466: \$? = $ac_status" >&5
++  echo "$as_me:5300: \$? = $ac_status" >&5
    (exit $ac_status); }
         if test -f conftest.out ; then
                 cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
-@@ -5292,7 +5473,7 @@
+@@ -5292,7 +5307,7 @@
  
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 5295 "configure"
-+#line 5476 "configure"
++#line 5310 "configure"
  #include "confdefs.h"
  
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -5317,15 +5498,15 @@
+@@ -5317,15 +5332,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:5320: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5501: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5335: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5323: \$? = $ac_status" >&5
-+  echo "$as_me:5504: \$? = $ac_status" >&5
++  echo "$as_me:5338: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:5325: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5506: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5340: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5328: \$? = $ac_status" >&5
-+  echo "$as_me:5509: \$? = $ac_status" >&5
++  echo "$as_me:5343: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -5339,7 +5520,7 @@
+@@ -5339,7 +5354,7 @@
         rm -f $cf_tempfile
  
  fi
 -echo "$as_me:5342: result: $cf_cv_ncurses_version" >&5
-+echo "$as_me:5523: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:5357: result: $cf_cv_ncurses_version" >&5
  echo "${ECHO_T}$cf_cv_ncurses_version" >&6
  test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
  #define NCURSES 1
-@@ -5351,7 +5532,7 @@
+@@ -5351,7 +5366,7 @@
         # to link gpm.
  cf_ncurses_LIBS=""
  cf_ncurses_SAVE="$LIBS"
 -echo "$as_me:5354: checking for Gpm_Open in -lgpm" >&5
-+echo "$as_me:5535: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:5369: checking for Gpm_Open in -lgpm" >&5
  echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
  if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5359,7 +5540,7 @@
+@@ -5359,7 +5374,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgpm  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 5362 "configure"
-+#line 5543 "configure"
++#line 5377 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5378,16 +5559,16 @@
+@@ -5378,16 +5393,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5381: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5562: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5396: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5384: \$? = $ac_status" >&5
-+  echo "$as_me:5565: \$? = $ac_status" >&5
++  echo "$as_me:5399: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5387: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5568: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5402: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5390: \$? = $ac_status" >&5
-+  echo "$as_me:5571: \$? = $ac_status" >&5
++  echo "$as_me:5405: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_gpm_Gpm_Open=yes
  else
-@@ -5398,10 +5579,10 @@
+@@ -5398,10 +5413,10 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:5401: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:5582: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:5416: 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:5404: checking for initscr in -lgpm" >&5
-+  echo "$as_me:5585: checking for initscr in -lgpm" >&5
++  echo "$as_me:5419: 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
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5409,7 +5590,7 @@
+@@ -5409,7 +5424,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgpm  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 5412 "configure"
-+#line 5593 "configure"
++#line 5427 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5428,16 +5609,16 @@
+@@ -5428,16 +5443,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5431: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5612: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5446: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5434: \$? = $ac_status" >&5
-+  echo "$as_me:5615: \$? = $ac_status" >&5
++  echo "$as_me:5449: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5437: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5618: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5452: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5440: \$? = $ac_status" >&5
-+  echo "$as_me:5621: \$? = $ac_status" >&5
++  echo "$as_me:5455: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_gpm_initscr=yes
  else
-@@ -5448,7 +5629,7 @@
+@@ -5448,7 +5463,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:5451: result: $ac_cv_lib_gpm_initscr" >&5
-+echo "$as_me:5632: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:5466: 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
    LIBS="$cf_ncurses_SAVE"
-@@ -5463,7 +5644,7 @@
+@@ -5463,7 +5478,7 @@
         # This is only necessary if you are linking against an obsolete
         # version of ncurses (but it should do no harm, since it's static).
         if test "$cf_nculib_root" = ncurses ; then
 -               echo "$as_me:5466: checking for tgoto in -lmytinfo" >&5
-+               echo "$as_me:5647: checking for tgoto in -lmytinfo" >&5
++               echo "$as_me:5481: 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
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5471,7 +5652,7 @@
+@@ -5471,7 +5486,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lmytinfo  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 5474 "configure"
-+#line 5655 "configure"
++#line 5489 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5490,16 +5671,16 @@
+@@ -5490,16 +5505,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5493: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5674: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5508: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5496: \$? = $ac_status" >&5
-+  echo "$as_me:5677: \$? = $ac_status" >&5
++  echo "$as_me:5511: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5499: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5680: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5514: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5502: \$? = $ac_status" >&5
-+  echo "$as_me:5683: \$? = $ac_status" >&5
++  echo "$as_me:5517: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_mytinfo_tgoto=yes
  else
-@@ -5510,7 +5691,7 @@
+@@ -5510,7 +5525,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:5513: result: $ac_cv_lib_mytinfo_tgoto" >&5
-+echo "$as_me:5694: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:5528: 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
    cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
-@@ -5529,13 +5710,13 @@
+@@ -5529,13 +5544,13 @@
  
         eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
         cf_libdir=""
 -       echo "$as_me:5532: checking for initscr" >&5
-+       echo "$as_me:5713: checking for initscr" >&5
++       echo "$as_me:5547: checking for initscr" >&5
  echo $ECHO_N "checking for initscr... $ECHO_C" >&6
  if test "${ac_cv_func_initscr+set}" = set; then
@@ -4034 +4468 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 5538 "configure"
-+#line 5719 "configure"
++#line 5553 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char initscr (); below.  */
-@@ -5566,16 +5747,16 @@
+@@ -5558,7 +5573,7 @@
+ #if defined (__stub_initscr) || defined (__stub___initscr)
+ choke me
+ #else
+-f = initscr;
++f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -5566,16 +5581,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5569: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5750: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5584: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5572: \$? = $ac_status" >&5
-+  echo "$as_me:5753: \$? = $ac_status" >&5
++  echo "$as_me:5587: \$? = $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:5756: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5590: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5578: \$? = $ac_status" >&5
-+  echo "$as_me:5759: \$? = $ac_status" >&5
++  echo "$as_me:5593: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_initscr=yes
  else
-@@ -5585,18 +5766,18 @@
+@@ -5585,18 +5600,18 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:5588: result: $ac_cv_func_initscr" >&5
-+echo "$as_me:5769: result: $ac_cv_func_initscr" >&5
++echo "$as_me:5603: result: $ac_cv_func_initscr" >&5
  echo "${ECHO_T}$ac_cv_func_initscr" >&6
  if test $ac_cv_func_initscr = yes; then
@@ -4072 +4515 @@
                 cf_save_LIBS="$LIBS"
 -               echo "$as_me:5595: checking for initscr in -l$cf_nculib_root" >&5
-+               echo "$as_me:5776: checking for initscr in -l$cf_nculib_root" >&5
++               echo "$as_me:5610: 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 5599 "configure"
-+#line 5780 "configure"
++#line 5614 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -5608,25 +5789,25 @@
+@@ -5608,25 +5623,25 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5611: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5792: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5626: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5614: \$? = $ac_status" >&5
-+  echo "$as_me:5795: \$? = $ac_status" >&5
++  echo "$as_me:5629: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5617: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5798: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5632: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5620: \$? = $ac_status" >&5
-+  echo "$as_me:5801: \$? = $ac_status" >&5
++  echo "$as_me:5635: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  echo "$as_me:5622: result: yes" >&5
-+  echo "$as_me:5803: result: yes" >&5
++  echo "$as_me:5637: result: yes" >&5
  echo "${ECHO_T}yes" >&6
                          eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
@@ -4109 +4552 @@
  cat conftest.$ac_ext >&5
 -echo "$as_me:5629: result: no" >&5
-+echo "$as_me:5810: result: no" >&5
++echo "$as_me:5644: result: no" >&5
  echo "${ECHO_T}no" >&6
  
  cf_search=
-@@ -5716,11 +5897,11 @@
+@@ -5716,11 +5731,11 @@
  
                         for cf_libdir in $cf_search
                         do
 -                               echo "$as_me:5719: checking for -l$cf_nculib_root in $cf_libdir" >&5
-+                               echo "$as_me:5900: checking for -l$cf_nculib_root in $cf_libdir" >&5
++                               echo "$as_me:5734: 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 5723 "configure"
-+#line 5904 "configure"
++#line 5738 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -5732,25 +5913,25 @@
+@@ -5732,25 +5747,25 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5735: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5916: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5750: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5738: \$? = $ac_status" >&5
-+  echo "$as_me:5919: \$? = $ac_status" >&5
++  echo "$as_me:5753: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5741: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5922: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5756: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5744: \$? = $ac_status" >&5
-+  echo "$as_me:5925: \$? = $ac_status" >&5
++  echo "$as_me:5759: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  echo "$as_me:5746: result: yes" >&5
-+  echo "$as_me:5927: result: yes" >&5
++  echo "$as_me:5761: result: yes" >&5
  echo "${ECHO_T}yes" >&6
                                          eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
@@ -4155 +4598 @@
  cat conftest.$ac_ext >&5
 -echo "$as_me:5753: result: no" >&5
-+echo "$as_me:5934: result: no" >&5
++echo "$as_me:5768: result: no" >&5
  echo "${ECHO_T}no" >&6
                                          LIBS="$cf_save_LIBS"
  fi
-@@ -5765,7 +5946,7 @@
+@@ -5765,7 +5780,7 @@
  eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
  
  if test $cf_found_library = no ; then
 -       { { echo "$as_me:5768: error: Cannot link $cf_nculib_root library" >&5
-+       { { echo "$as_me:5949: error: Cannot link $cf_nculib_root library" >&5
++       { { echo "$as_me:5783: error: Cannot link $cf_nculib_root library" >&5
  echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -5773,7 +5954,7 @@
+@@ -5773,7 +5788,7 @@
  fi
  
  if test -n "$cf_ncurses_LIBS" ; then
 -       echo "$as_me:5776: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
-+       echo "$as_me:5957: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++       echo "$as_me:5791: 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"
         for p in $cf_ncurses_LIBS ; do
-@@ -5783,7 +5964,7 @@
+@@ -5783,7 +5798,7 @@
                 fi
         done
         cat >conftest.$ac_ext <<_ACEOF
 -#line 5786 "configure"
-+#line 5967 "configure"
++#line 5801 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -5795,23 +5976,23 @@
+@@ -5795,23 +5810,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5798: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5979: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5813: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5801: \$? = $ac_status" >&5
-+  echo "$as_me:5982: \$? = $ac_status" >&5
++  echo "$as_me:5816: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5804: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5985: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5819: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5807: \$? = $ac_status" >&5
-+  echo "$as_me:5988: \$? = $ac_status" >&5
++  echo "$as_me:5822: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  echo "$as_me:5809: result: yes" >&5
-+  echo "$as_me:5990: result: yes" >&5
++  echo "$as_me:5824: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  else
@@ -4212 +4655 @@
  cat conftest.$ac_ext >&5
 -echo "$as_me:5814: result: no" >&5
-+echo "$as_me:5995: result: no" >&5
++echo "$as_me:5829: result: no" >&5
  echo "${ECHO_T}no" >&6
                  LIBS="$cf_ncurses_SAVE"
  fi
-@@ -5831,48 +6012,87 @@
+@@ -5831,48 +5846,87 @@
  cf_ncuconfig_root=ncurses
  
@@ -4227 +4670 @@
 +    # 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:6021: checking for $ac_word" >&5
++echo "$as_me:5855: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
@@ -4242 +4685 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-+echo "$as_me:6036: found $ac_dir/$ac_word" >&5
++echo "$as_me:5870: found $ac_dir/$ac_word" >&5
 +break
 +done
@@ -4250 +4693 @@
 +NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 +if test -n "$NCURSES_CONFIG"; then
-+  echo "$as_me:6044: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:5878: result: $NCURSES_CONFIG" >&5
 +echo "${ECHO_T}$NCURSES_CONFIG" >&6
 +else
-+  echo "$as_me:6047: result: no" >&5
++  echo "$as_me:5881: result: no" >&5
 +echo "${ECHO_T}no" >&6
 +fi
@@ -4267 +4710 @@
  set dummy $ac_prog; ac_word=$2
 -echo "$as_me:5838: checking for $ac_word" >&5
-+echo "$as_me:6060: checking for $ac_word" >&5
++echo "$as_me:5894: 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
@@ -4293 +4736 @@
 +  $as_executable_p "$ac_dir/$ac_word" || continue
 +ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-+echo "$as_me:6075: found $ac_dir/$ac_word" >&5
++echo "$as_me:5909: found $ac_dir/$ac_word" >&5
 +break
  done
@@ -4308 +4751 @@
 +ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 +if test -n "$ac_ct_NCURSES_CONFIG"; then
-+  echo "$as_me:6083: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:5917: result: $ac_ct_NCURSES_CONFIG" >&5
 +echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
  else
 -  echo "$as_me:5869: result: no" >&5
-+  echo "$as_me:6086: result: no" >&5
++  echo "$as_me:5920: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
@@ -4327 +4770 @@
  if test "$NCURSES_CONFIG" != none ; then
  
-@@ -5881,7 +6101,7 @@
+@@ -5881,7 +5935,7 @@
  
  # even with config script, some packages use no-override for curses.h
  
 -echo "$as_me:5884: checking if we have identified curses headers" >&5
-+echo "$as_me:6104: checking if we have identified curses headers" >&5
++echo "$as_me:5938: 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
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5889,13 +6109,13 @@
+@@ -5889,13 +5943,13 @@
  
  cf_cv_ncurses_header=none
@@ -4351 +4794 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 5898 "configure"
-+#line 6118 "configure"
++#line 5952 "configure"
  #include "confdefs.h"
  #include <${cf_header}>
  int
-@@ -5907,16 +6127,16 @@
+@@ -5907,16 +5961,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:5910: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6130: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5964: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:5913: \$? = $ac_status" >&5
-+  echo "$as_me:6133: \$? = $ac_status" >&5
++  echo "$as_me:5967: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:5916: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6136: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5970: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5919: \$? = $ac_status" >&5
-+  echo "$as_me:6139: \$? = $ac_status" >&5
++  echo "$as_me:5973: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ncurses_header=$cf_header; break
  else
-@@ -5927,11 +6147,11 @@
+@@ -5927,11 +5981,11 @@
  done
  
  fi
 -echo "$as_me:5930: result: $cf_cv_ncurses_header" >&5
-+echo "$as_me:6150: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:5984: 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:5934: error: No curses header-files found" >&5
-+       { { echo "$as_me:6154: error: No curses header-files found" >&5
++       { { echo "$as_me:5988: error: No curses header-files found" >&5
  echo "$as_me: error: No curses header-files found" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -5941,23 +6161,23 @@
+@@ -5941,23 +5995,23 @@
  for ac_header in $cf_cv_ncurses_header
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -echo "$as_me:5944: checking for $ac_header" >&5
-+echo "$as_me:6164: checking for $ac_header" >&5
++echo "$as_me:5998: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -4402 +4845 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 5950 "configure"
-+#line 6170 "configure"
++#line 6004 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
 -if { (eval echo "$as_me:5954: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:6174: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:6008: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -4414 +4857 @@
    cat conftest.err >&5
 -  echo "$as_me:5960: \$? = $ac_status" >&5
-+  echo "$as_me:6180: \$? = $ac_status" >&5
++  echo "$as_me:6014: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -5976,7 +6196,7 @@
+@@ -5976,7 +6030,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:5979: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:6199: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:6033: result: `eval echo '${'$as_ac_Header'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<EOF
-@@ -6029,7 +6249,7 @@
+@@ -6029,7 +6083,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 6032 "configure"
-+#line 6252 "configure"
++#line 6086 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -6041,16 +6261,16 @@
+@@ -6041,16 +6095,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:6044: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6264: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6098: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:6047: \$? = $ac_status" >&5
-+  echo "$as_me:6267: \$? = $ac_status" >&5
++  echo "$as_me:6101: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:6050: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6270: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6104: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6053: \$? = $ac_status" >&5
-+  echo "$as_me:6273: \$? = $ac_status" >&5
++  echo "$as_me:6107: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -6067,7 +6287,7 @@
+@@ -6067,7 +6121,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:6070: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:6290: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6124: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -6084,7 +6304,7 @@
+@@ -6084,7 +6138,7 @@
  
  }
  
 -echo "$as_me:6087: checking for $cf_ncuhdr_root header in include-path" >&5
-+echo "$as_me:6307: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:6141: 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
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6096,7 +6316,7 @@
+@@ -6096,7 +6150,7 @@
         do
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 6099 "configure"
-+#line 6319 "configure"
++#line 6153 "configure"
  #include "confdefs.h"
  
  #include <$cf_header>
-@@ -6120,16 +6340,16 @@
+@@ -6120,16 +6174,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:6123: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6343: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6177: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:6126: \$? = $ac_status" >&5
-+  echo "$as_me:6346: \$? = $ac_status" >&5
++  echo "$as_me:6180: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:6129: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6349: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6183: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6132: \$? = $ac_status" >&5
-+  echo "$as_me:6352: \$? = $ac_status" >&5
++  echo "$as_me:6186: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ncurses_h=$cf_header
  
-@@ -6144,14 +6364,14 @@
+@@ -6144,14 +6198,14 @@
         done
  
  fi
 -echo "$as_me:6147: result: $cf_cv_ncurses_h" >&5
-+echo "$as_me:6367: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:6201: result: $cf_cv_ncurses_h" >&5
  echo "${ECHO_T}$cf_cv_ncurses_h" >&6
  
@@ -4518 +4961 @@
  
 -echo "$as_me:6154: checking for $cf_ncuhdr_root include-path" >&5
-+echo "$as_me:6374: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:6208: 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
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6291,7 +6511,7 @@
+@@ -6291,7 +6345,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 6294 "configure"
-+#line 6514 "configure"
++#line 6348 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -6303,16 +6523,16 @@
+@@ -6303,16 +6357,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:6306: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6526: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6360: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:6309: \$? = $ac_status" >&5
-+  echo "$as_me:6529: \$? = $ac_status" >&5
++  echo "$as_me:6363: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:6312: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6532: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6366: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6315: \$? = $ac_status" >&5
-+  echo "$as_me:6535: \$? = $ac_status" >&5
++  echo "$as_me:6369: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -6329,7 +6549,7 @@
+@@ -6329,7 +6383,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:6332: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:6552: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6386: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -6350,7 +6570,7 @@
+@@ -6350,7 +6404,7 @@
                 do
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 6353 "configure"
-+#line 6573 "configure"
++#line 6407 "configure"
  #include "confdefs.h"
  
  #include <$cf_header>
-@@ -6374,16 +6594,16 @@
+@@ -6374,16 +6428,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:6377: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6597: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6431: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:6380: \$? = $ac_status" >&5
-+  echo "$as_me:6600: \$? = $ac_status" >&5
++  echo "$as_me:6434: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:6383: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6603: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6437: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6386: \$? = $ac_status" >&5
-+  echo "$as_me:6606: \$? = $ac_status" >&5
++  echo "$as_me:6440: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ncurses_h2=$cf_header
  
-@@ -6404,12 +6624,12 @@
+@@ -6404,12 +6458,12 @@
                 CPPFLAGS="$cf_save2_CPPFLAGS"
                 test "$cf_cv_ncurses_h2" != no && break
         done
 -       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6407: error: not found" >&5
-+       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6627: error: not found" >&5
++       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6461: error: not found" >&5
  echo "$as_me: error: not found" >&2;}
     { (exit 1); exit 1; }; }
@@ -4602 +5045 @@
  fi
 -echo "$as_me:6412: result: $cf_cv_ncurses_h2" >&5
-+echo "$as_me:6632: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:6466: result: $cf_cv_ncurses_h2" >&5
  echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
  
         cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
-@@ -6442,7 +6662,7 @@
+@@ -6442,7 +6496,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 6445 "configure"
-+#line 6665 "configure"
++#line 6499 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -6454,16 +6674,16 @@
+@@ -6454,16 +6508,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:6457: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6677: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6511: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:6460: \$? = $ac_status" >&5
-+  echo "$as_me:6680: \$? = $ac_status" >&5
++  echo "$as_me:6514: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:6463: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6683: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6517: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6466: \$? = $ac_status" >&5
-+  echo "$as_me:6686: \$? = $ac_status" >&5
++  echo "$as_me:6520: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -6480,7 +6700,7 @@
+@@ -6480,7 +6534,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:6483: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:6703: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6537: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -6523,7 +6743,7 @@
+@@ -6523,7 +6577,7 @@
         ;;
  esac
  
 -echo "$as_me:6526: checking for terminfo header" >&5
-+echo "$as_me:6746: checking for terminfo header" >&5
++echo "$as_me:6580: checking for terminfo header" >&5
  echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
  if test "${cf_cv_term_header+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6541,7 +6761,7 @@
+@@ -6541,7 +6595,7 @@
  for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
  do
  cat >conftest.$ac_ext <<_ACEOF
 -#line 6544 "configure"
-+#line 6764 "configure"
++#line 6598 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -6556,16 +6776,16 @@
+@@ -6556,16 +6610,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:6559: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6779: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6613: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:6562: \$? = $ac_status" >&5
-+  echo "$as_me:6782: \$? = $ac_status" >&5
++  echo "$as_me:6616: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:6565: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6785: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6619: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6568: \$? = $ac_status" >&5
-+  echo "$as_me:6788: \$? = $ac_status" >&5
++  echo "$as_me:6622: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         cf_cv_term_header="$cf_test"
-@@ -6581,7 +6801,7 @@
+@@ -6581,7 +6635,7 @@
  done
  
  fi
 -echo "$as_me:6584: result: $cf_cv_term_header" >&5
-+echo "$as_me:6804: result: $cf_cv_term_header" >&5
++echo "$as_me:6638: result: $cf_cv_term_header" >&5
  echo "${ECHO_T}$cf_cv_term_header" >&6
  
  # Set definitions to allow ifdef'ing to accommodate subdirectories
-@@ -6615,7 +6835,7 @@
+@@ -6615,7 +6669,7 @@
  #define NCURSES 1
  EOF
  
 -echo "$as_me:6618: checking for ncurses version" >&5
-+echo "$as_me:6838: checking for ncurses version" >&5
++echo "$as_me:6672: checking for ncurses version" >&5
  echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
  if test "${cf_cv_ncurses_version+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6641,10 +6861,10 @@
+@@ -6641,10 +6695,10 @@
  #endif
  EOF
         cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
 -       { (eval echo "$as_me:6644: \"$cf_try\"") >&5
-+       { (eval echo "$as_me:6864: \"$cf_try\"") >&5
++       { (eval echo "$as_me:6698: \"$cf_try\"") >&5
    (eval $cf_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6647: \$? = $ac_status" >&5
-+  echo "$as_me:6867: \$? = $ac_status" >&5
++  echo "$as_me:6701: \$? = $ac_status" >&5
    (exit $ac_status); }
         if test -f conftest.out ; then
                 cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
-@@ -6654,7 +6874,7 @@
+@@ -6654,7 +6708,7 @@
  
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 6657 "configure"
-+#line 6877 "configure"
++#line 6711 "configure"
  #include "confdefs.h"
  
  #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -6679,15 +6899,15 @@
+@@ -6679,15 +6733,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:6682: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6902: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6736: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:6685: \$? = $ac_status" >&5
-+  echo "$as_me:6905: \$? = $ac_status" >&5
++  echo "$as_me:6739: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:6687: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6907: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6741: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6690: \$? = $ac_status" >&5
-+  echo "$as_me:6910: \$? = $ac_status" >&5
++  echo "$as_me:6744: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -6701,7 +6921,7 @@
+@@ -6701,7 +6755,7 @@
         rm -f $cf_tempfile
  
  fi
 -echo "$as_me:6704: result: $cf_cv_ncurses_version" >&5
-+echo "$as_me:6924: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:6758: result: $cf_cv_ncurses_version" >&5
  echo "${ECHO_T}$cf_cv_ncurses_version" >&6
  test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
  #define NCURSES 1
-@@ -6713,7 +6933,7 @@
+@@ -6713,7 +6767,7 @@
         # to link gpm.
  cf_ncurses_LIBS=""
  cf_ncurses_SAVE="$LIBS"
 -echo "$as_me:6716: checking for Gpm_Open in -lgpm" >&5
-+echo "$as_me:6936: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:6770: checking for Gpm_Open in -lgpm" >&5
  echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
  if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6721,7 +6941,7 @@
+@@ -6721,7 +6775,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgpm  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 6724 "configure"
-+#line 6944 "configure"
++#line 6778 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -6740,16 +6960,16 @@
+@@ -6740,16 +6794,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:6743: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6963: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6797: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:6746: \$? = $ac_status" >&5
-+  echo "$as_me:6966: \$? = $ac_status" >&5
++  echo "$as_me:6800: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:6749: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6969: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6803: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6752: \$? = $ac_status" >&5
-+  echo "$as_me:6972: \$? = $ac_status" >&5
++  echo "$as_me:6806: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_gpm_Gpm_Open=yes
  else
-@@ -6760,10 +6980,10 @@
+@@ -6760,10 +6814,10 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:6763: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:6983: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:6817: 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:6766: checking for initscr in -lgpm" >&5
-+  echo "$as_me:6986: checking for initscr in -lgpm" >&5
++  echo "$as_me:6820: 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
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6771,7 +6991,7 @@
+@@ -6771,7 +6825,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgpm  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 6774 "configure"
-+#line 6994 "configure"
++#line 6828 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -6790,16 +7010,16 @@
+@@ -6790,16 +6844,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:6793: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7013: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6847: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:6796: \$? = $ac_status" >&5
-+  echo "$as_me:7016: \$? = $ac_status" >&5
++  echo "$as_me:6850: \$? = $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:7019: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6853: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6802: \$? = $ac_status" >&5
-+  echo "$as_me:7022: \$? = $ac_status" >&5
++  echo "$as_me:6856: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_gpm_initscr=yes
  else
-@@ -6810,7 +7030,7 @@
+@@ -6810,7 +6864,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:6813: result: $ac_cv_lib_gpm_initscr" >&5
-+echo "$as_me:7033: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:6867: 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
    LIBS="$cf_ncurses_SAVE"
-@@ -6825,7 +7045,7 @@
+@@ -6825,7 +6879,7 @@
         # This is only necessary if you are linking against an obsolete
         # version of ncurses (but it should do no harm, since it's static).
         if test "$cf_nculib_root" = ncurses ; then
 -               echo "$as_me:6828: checking for tgoto in -lmytinfo" >&5
-+               echo "$as_me:7048: checking for tgoto in -lmytinfo" >&5
++               echo "$as_me:6882: 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
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6833,7 +7053,7 @@
+@@ -6833,7 +6887,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lmytinfo  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 6836 "configure"
-+#line 7056 "configure"
++#line 6890 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -6852,16 +7072,16 @@
+@@ -6852,16 +6906,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:6855: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7075: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6909: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:6858: \$? = $ac_status" >&5
-+  echo "$as_me:7078: \$? = $ac_status" >&5
++  echo "$as_me:6912: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:6861: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7081: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6915: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6864: \$? = $ac_status" >&5
-+  echo "$as_me:7084: \$? = $ac_status" >&5
++  echo "$as_me:6918: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_mytinfo_tgoto=yes
  else
-@@ -6872,7 +7092,7 @@
+@@ -6872,7 +6926,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:6875: result: $ac_cv_lib_mytinfo_tgoto" >&5
-+echo "$as_me:7095: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:6929: 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
    cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
-@@ -6891,13 +7111,13 @@
+@@ -6891,13 +6945,13 @@
  
         eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
         cf_libdir=""
 -       echo "$as_me:6894: checking for initscr" >&5
-+       echo "$as_me:7114: checking for initscr" >&5
++       echo "$as_me:6948: checking for initscr" >&5
  echo $ECHO_N "checking for initscr... $ECHO_C" >&6
  if test "${ac_cv_func_initscr+set}" = set; then
@@ -4904 +5347 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 6900 "configure"
-+#line 7120 "configure"
++#line 6954 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char initscr (); below.  */
-@@ -6928,16 +7148,16 @@
+@@ -6920,7 +6974,7 @@
+ #if defined (__stub_initscr) || defined (__stub___initscr)
+ choke me
+ #else
+-f = initscr;
++f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -6928,16 +6982,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:6931: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7151: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6985: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:6934: \$? = $ac_status" >&5
-+  echo "$as_me:7154: \$? = $ac_status" >&5
++  echo "$as_me:6988: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:6937: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7157: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6991: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6940: \$? = $ac_status" >&5
-+  echo "$as_me:7160: \$? = $ac_status" >&5
++  echo "$as_me:6994: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_initscr=yes
  else
-@@ -6947,18 +7167,18 @@
+@@ -6947,18 +7001,18 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:6950: result: $ac_cv_func_initscr" >&5
-+echo "$as_me:7170: result: $ac_cv_func_initscr" >&5
++echo "$as_me:7004: result: $ac_cv_func_initscr" >&5
  echo "${ECHO_T}$ac_cv_func_initscr" >&6
  if test $ac_cv_func_initscr = yes; then
@@ -4942 +5394 @@
                 cf_save_LIBS="$LIBS"
 -               echo "$as_me:6957: checking for initscr in -l$cf_nculib_root" >&5
-+               echo "$as_me:7177: checking for initscr in -l$cf_nculib_root" >&5
++               echo "$as_me:7011: 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 6961 "configure"
-+#line 7181 "configure"
++#line 7015 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -6970,25 +7190,25 @@
+@@ -6970,25 +7024,25 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:6973: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7193: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7027: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:6976: \$? = $ac_status" >&5
-+  echo "$as_me:7196: \$? = $ac_status" >&5
++  echo "$as_me:7030: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:6979: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7199: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7033: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6982: \$? = $ac_status" >&5
-+  echo "$as_me:7202: \$? = $ac_status" >&5
++  echo "$as_me:7036: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  echo "$as_me:6984: result: yes" >&5
-+  echo "$as_me:7204: result: yes" >&5
++  echo "$as_me:7038: result: yes" >&5
  echo "${ECHO_T}yes" >&6
                          eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
@@ -4979 +5431 @@
  cat conftest.$ac_ext >&5
 -echo "$as_me:6991: result: no" >&5
-+echo "$as_me:7211: result: no" >&5
++echo "$as_me:7045: result: no" >&5
  echo "${ECHO_T}no" >&6
  
  cf_search=
-@@ -7078,11 +7298,11 @@
+@@ -7078,11 +7132,11 @@
  
                         for cf_libdir in $cf_search
                         do
 -                               echo "$as_me:7081: checking for -l$cf_nculib_root in $cf_libdir" >&5
-+                               echo "$as_me:7301: checking for -l$cf_nculib_root in $cf_libdir" >&5
++                               echo "$as_me:7135: 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 7085 "configure"
-+#line 7305 "configure"
++#line 7139 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -7094,25 +7314,25 @@
+@@ -7094,25 +7148,25 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:7097: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7317: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7151: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:7100: \$? = $ac_status" >&5
-+  echo "$as_me:7320: \$? = $ac_status" >&5
++  echo "$as_me:7154: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:7103: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7323: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7157: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7106: \$? = $ac_status" >&5
-+  echo "$as_me:7326: \$? = $ac_status" >&5
++  echo "$as_me:7160: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  echo "$as_me:7108: result: yes" >&5
-+  echo "$as_me:7328: result: yes" >&5
++  echo "$as_me:7162: result: yes" >&5
  echo "${ECHO_T}yes" >&6
                                          eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
@@ -5025 +5477 @@
  cat conftest.$ac_ext >&5
 -echo "$as_me:7115: result: no" >&5
-+echo "$as_me:7335: result: no" >&5
++echo "$as_me:7169: result: no" >&5
  echo "${ECHO_T}no" >&6
                                          LIBS="$cf_save_LIBS"
  fi
-@@ -7127,7 +7347,7 @@
+@@ -7127,7 +7181,7 @@
  eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
  
  if test $cf_found_library = no ; then
 -       { { echo "$as_me:7130: error: Cannot link $cf_nculib_root library" >&5
-+       { { echo "$as_me:7350: error: Cannot link $cf_nculib_root library" >&5
++       { { echo "$as_me:7184: error: Cannot link $cf_nculib_root library" >&5
  echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -7135,7 +7355,7 @@
+@@ -7135,7 +7189,7 @@
  fi
  
  if test -n "$cf_ncurses_LIBS" ; then
 -       echo "$as_me:7138: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
-+       echo "$as_me:7358: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++       echo "$as_me:7192: 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"
         for p in $cf_ncurses_LIBS ; do
-@@ -7145,7 +7365,7 @@
+@@ -7145,7 +7199,7 @@
                 fi
         done
         cat >conftest.$ac_ext <<_ACEOF
 -#line 7148 "configure"
-+#line 7368 "configure"
++#line 7202 "configure"
  #include "confdefs.h"
  #include <${cf_cv_ncurses_header:-curses.h}>
  int
-@@ -7157,23 +7377,23 @@
+@@ -7157,23 +7211,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:7160: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7380: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7214: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:7163: \$? = $ac_status" >&5
-+  echo "$as_me:7383: \$? = $ac_status" >&5
++  echo "$as_me:7217: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:7166: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7386: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7220: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7169: \$? = $ac_status" >&5
-+  echo "$as_me:7389: \$? = $ac_status" >&5
++  echo "$as_me:7223: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  echo "$as_me:7171: result: yes" >&5
-+  echo "$as_me:7391: result: yes" >&5
++  echo "$as_me:7225: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  else
@@ -5082 +5534 @@
  cat conftest.$ac_ext >&5
 -echo "$as_me:7176: result: no" >&5
-+echo "$as_me:7396: result: no" >&5
++echo "$as_me:7230: result: no" >&5
  echo "${ECHO_T}no" >&6
                  LIBS="$cf_ncurses_SAVE"
  fi
-@@ -7210,10 +7430,10 @@
+@@ -7210,10 +7264,10 @@
  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:7213: \"$cf_try\"") >&5
-+       { (eval echo "$as_me:7433: \"$cf_try\"") >&5
++       { (eval echo "$as_me:7267: \"$cf_try\"") >&5
    (eval $cf_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7216: \$? = $ac_status" >&5
-+  echo "$as_me:7436: \$? = $ac_status" >&5
++  echo "$as_me:7270: \$? = $ac_status" >&5
    (exit $ac_status); }
         if test -f conftest.out ; then
                 cf_result=`cat conftest.out | sed -e "s/^.*AUTOCONF_$cf_name[   ][      ]*//"`
-@@ -7231,9 +7451,25 @@
+@@ -7231,9 +7285,25 @@
  
  cf_cv_timestamp=`date`
  
 -echo "$as_me:7234: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
-+echo "$as_me:7454: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
++echo "$as_me:7288: 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
  
-+echo "$as_me:7457: checking if you want to have a library-prefix" >&5
++echo "$as_me:7291: checking if you want to have a library-prefix" >&5
 +echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6
 +
@@ -5117 +5569 @@
 +  with_lib_prefix=auto
 +fi;
-+echo "$as_me:7467: result: $with_lib_prefix" >&5
++echo "$as_me:7301: result: $with_lib_prefix" >&5
 +echo "${ECHO_T}$with_lib_prefix" >&6
 +
@@ -5126 +5578 @@
         OS/2*|os2*) #(vi
          LIB_PREFIX=''
-@@ -7243,7 +7479,12 @@
+@@ -7243,7 +7313,12 @@
         esac
  cf_prefix=$LIB_PREFIX
@@ -5140 +5592 @@
  LIB_SUFFIX=
  
-@@ -7254,7 +7495,7 @@
+@@ -7254,7 +7329,7 @@
         test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
  fi
  
 -echo "$as_me:7257: checking for default loader flags" >&5
-+echo "$as_me:7498: checking for default loader flags" >&5
++echo "$as_me:7332: checking for default loader flags" >&5
  echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
  case $DFT_LWR_MODEL in
  normal)  LD_MODEL=''   ;;
-@@ -7262,11 +7503,11 @@
+@@ -7262,11 +7337,11 @@
  profile) LD_MODEL='-pg';;
  shared)  LD_MODEL=''   ;;
  esac
 -echo "$as_me:7265: result: $LD_MODEL" >&5
-+echo "$as_me:7506: result: $LD_MODEL" >&5
++echo "$as_me:7340: result: $LD_MODEL" >&5
  echo "${ECHO_T}$LD_MODEL" >&6
  
  LD_RPATH_OPT=
 -echo "$as_me:7269: checking for an rpath option" >&5
-+echo "$as_me:7510: checking for an rpath option" >&5
++echo "$as_me:7344: checking for an rpath option" >&5
  echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
  case $cf_cv_system_name in #(vi
  irix*) #(vi
-@@ -7279,10 +7520,10 @@
+@@ -7279,10 +7354,10 @@
  linux*|gnu*|k*bsd*-gnu) #(vi
         LD_RPATH_OPT="-Wl,-rpath,"
@@ -5176 +5628 @@
         ;;
  netbsd*) #(vi
-@@ -7297,17 +7538,17 @@
+@@ -7297,17 +7372,17 @@
  *)
         ;;
  esac
 -echo "$as_me:7300: result: $LD_RPATH_OPT" >&5
-+echo "$as_me:7541: result: $LD_RPATH_OPT" >&5
++echo "$as_me:7375: result: $LD_RPATH_OPT" >&5
  echo "${ECHO_T}$LD_RPATH_OPT" >&6
  
@@ -5187 +5639 @@
  x-R*)
 -       echo "$as_me:7305: checking if we need a space after rpath option" >&5
-+       echo "$as_me:7546: checking if we need a space after rpath option" >&5
++       echo "$as_me:7380: 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"
@@ -5193 +5645 @@
         cat >conftest.$ac_ext <<_ACEOF
 -#line 7310 "configure"
-+#line 7551 "configure"
++#line 7385 "configure"
  #include "confdefs.h"
  
  int
-@@ -7319,16 +7560,16 @@
+@@ -7319,16 +7394,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:7322: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7563: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7397: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:7325: \$? = $ac_status" >&5
-+  echo "$as_me:7566: \$? = $ac_status" >&5
++  echo "$as_me:7400: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:7328: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7569: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7403: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7331: \$? = $ac_status" >&5
-+  echo "$as_me:7572: \$? = $ac_status" >&5
++  echo "$as_me:7406: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_rpath_space=no
  else
-@@ -7338,7 +7579,7 @@
+@@ -7338,7 +7413,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
         LIBS="$cf_save_LIBS"
 -       echo "$as_me:7341: result: $cf_rpath_space" >&5
-+       echo "$as_me:7582: result: $cf_rpath_space" >&5
++       echo "$as_me:7416: result: $cf_rpath_space" >&5
  echo "${ECHO_T}$cf_rpath_space" >&6
         test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
         ;;
-@@ -7353,7 +7594,7 @@
+@@ -7353,7 +7428,7 @@
         cf_ld_rpath_opt=
         test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
  
 -       echo "$as_me:7356: checking if release/abi version should be used for shared libs" >&5
-+       echo "$as_me:7597: checking if release/abi version should be used for shared libs" >&5
++       echo "$as_me:7431: checking if release/abi version should be used for shared libs" >&5
  echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
  
  # Check whether --with-shlib-version or --without-shlib-version was given.
-@@ -7368,7 +7609,7 @@
+@@ -7368,7 +7443,7 @@
                 cf_cv_shlib_version=$withval
                 ;;
         *)
 -               { { echo "$as_me:7371: error: option value must be one of: rel, abi, auto or no" >&5
-+               { { echo "$as_me:7612: error: option value must be one of: rel, abi, auto or no" >&5
++               { { echo "$as_me:7446: 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; }; }
                 ;;
-@@ -7377,7 +7618,7 @@
+@@ -7377,7 +7452,7 @@
  else
    cf_cv_shlib_version=auto
  fi;
 -       echo "$as_me:7380: result: $cf_cv_shlib_version" >&5
-+       echo "$as_me:7621: result: $cf_cv_shlib_version" >&5
++       echo "$as_me:7455: result: $cf_cv_shlib_version" >&5
  echo "${ECHO_T}$cf_cv_shlib_version" >&6
  
         cf_cv_rm_so_locs=no
-@@ -7386,14 +7627,14 @@
+@@ -7386,14 +7461,14 @@
         CC_SHARED_OPTS=
         if test "$GCC" = yes
         then
 -               echo "$as_me:7389: checking which $CC option to use" >&5
-+               echo "$as_me:7630: checking which $CC option to use" >&5
++               echo "$as_me:7464: checking which $CC option to use" >&5
  echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
                 cf_save_CFLAGS="$CFLAGS"
@@ -5267 +5719 @@
                         cat >conftest.$ac_ext <<_ACEOF
 -#line 7396 "configure"
-+#line 7637 "configure"
++#line 7471 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -7405,16 +7646,16 @@
+@@ -7405,16 +7480,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7408: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7649: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7483: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7411: \$? = $ac_status" >&5
-+  echo "$as_me:7652: \$? = $ac_status" >&5
++  echo "$as_me:7486: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7414: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7655: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7489: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7417: \$? = $ac_status" >&5
-+  echo "$as_me:7658: \$? = $ac_status" >&5
++  echo "$as_me:7492: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -7423,7 +7664,7 @@
+@@ -7423,7 +7498,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
                 done
 -               echo "$as_me:7426: result: $CC_SHARED_OPTS" >&5
-+               echo "$as_me:7667: result: $CC_SHARED_OPTS" >&5
++               echo "$as_me:7501: result: $CC_SHARED_OPTS" >&5
  echo "${ECHO_T}$CC_SHARED_OPTS" >&6
                 CFLAGS="$cf_save_CFLAGS"
         fi
-@@ -7431,10 +7672,14 @@
+@@ -7431,10 +7506,14 @@
         cf_cv_shlib_version_infix=no
  
@@ -5318 +5770 @@
                 ;;
         beos*) #(vi
-@@ -7465,7 +7710,7 @@
+@@ -7465,7 +7544,7 @@
                 MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
                 test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
                 cf_cv_shlib_version_infix=yes
 -               echo "$as_me:7468: checking if ld -search_paths_first works" >&5
-+               echo "$as_me:7713: checking if ld -search_paths_first works" >&5
++               echo "$as_me:7547: checking if ld -search_paths_first works" >&5
  echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
  if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7474,7 +7719,7 @@
+@@ -7474,7 +7553,7 @@
                         cf_save_LDFLAGS=$LDFLAGS
                         LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
                         cat >conftest.$ac_ext <<_ACEOF
 -#line 7477 "configure"
-+#line 7722 "configure"
++#line 7556 "configure"
  #include "confdefs.h"
  
  int
-@@ -7486,16 +7731,16 @@
+@@ -7486,16 +7565,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:7489: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7734: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7568: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:7492: \$? = $ac_status" >&5
-+  echo "$as_me:7737: \$? = $ac_status" >&5
++  echo "$as_me:7571: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:7495: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7740: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7574: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7498: \$? = $ac_status" >&5
-+  echo "$as_me:7743: \$? = $ac_status" >&5
++  echo "$as_me:7577: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ldflags_search_paths_first=yes
  else
-@@ -7506,7 +7751,7 @@
+@@ -7506,7 +7585,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
                                 LDFLAGS=$cf_save_LDFLAGS
  fi
 -echo "$as_me:7509: result: $cf_cv_ldflags_search_paths_first" >&5
-+echo "$as_me:7754: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:7588: result: $cf_cv_ldflags_search_paths_first" >&5
  echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
                 if test $cf_cv_ldflags_search_paths_first = yes; then
                         LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
-@@ -7525,9 +7770,19 @@
+@@ -7525,9 +7604,19 @@
                 # readonly to exploit a quirk in the memory manager.
                 INSTALL_LIB="-m 555"
@@ -5387 +5839 @@
                 # tested with IRIX 5.2 and 'cc'.
                 if test "$GCC" != yes; then
-@@ -7544,7 +7799,7 @@
+@@ -7544,7 +7633,7 @@
                         LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
                 fi
@@ -5396 +5848 @@
  
         test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
-@@ -7556,13 +7811,13 @@
+@@ -7556,13 +7645,34 @@
  
                 MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
                 ;;
 -       openbsd[2-9].*) #(vi
++       mingw*) #(vi
++               cf_cv_shlib_version=mingw
++               cf_cv_shlib_version_infix=mingw
++               CC_SHARED_OPTS=
++               MK_SHARED_LIB='sh ../mk_shared_lib.sh $@ ${CC} ${CFLAGS}'
++               #MK_SHARED_LIB='${CC} ${CFLAGS} -mdll -Wl,-soname,'$cf_cv_shared_soname',-stats -o $[@]'
++               #MK_SHARED_LIB='${DLLTOOL} --export-all-symbols --output-exp --output-lib $[@]'
++               cat >mk_shared_lib.sh <<-CF_EOF
++               #!/bin/sh
++               SHARED_LIB=\$1
++               IMPORT_LIB=\`echo "\$1" | sed -e 's/[0-9]*\.dll$/.dll.a/'\`
++               shift
++               cat <<-EOF
++               Linking shared library
++               ** SHARED_LIB \$SHARED_LIB
++               ** IMPORT_LIB \$IMPORT_LIB
++EOF
++               exec \$* -shared -Wl,--out-implib=../lib/\${IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\${SHARED_LIB}
++CF_EOF
++               chmod +x mk_shared_lib.sh
++               ;;
 +       openbsd[2-9].*|mirbsd*) #(vi
                 if test "$DFT_LWR_MODEL" = "shared" ; then
@@ -5412 +5885 @@
                 CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
  
-@@ -7580,12 +7835,12 @@
+@@ -7580,12 +7690,12 @@
                 MK_SHARED_LIB='${LD} -Bshareable -o $@'
                 test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
@@ -5428 +5901 @@
  
         test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
-@@ -7602,7 +7857,7 @@
+@@ -7602,7 +7712,7 @@
                 if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then
                         LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)"
@@ -5437 +5910 @@
                         if test -f /usr/libexec/ld.elf_so; then
                                 cf_cv_shlib_version=abi
-@@ -7686,7 +7941,7 @@
+@@ -7686,7 +7796,7 @@
                         do
                                 CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
                                 cat >conftest.$ac_ext <<_ACEOF
 -#line 7689 "configure"
-+#line 7944 "configure"
++#line 7799 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -7698,16 +7953,16 @@
+@@ -7698,16 +7808,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7701: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7956: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7811: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7704: \$? = $ac_status" >&5
-+  echo "$as_me:7959: \$? = $ac_status" >&5
++  echo "$as_me:7814: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7707: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7962: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7817: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7710: \$? = $ac_status" >&5
-+  echo "$as_me:7965: \$? = $ac_status" >&5
++  echo "$as_me:7820: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -7744,22 +7999,22 @@
+@@ -7744,22 +7854,30 @@
                         test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
                         ;;
                 *)
 -                       { echo "$as_me:7747: WARNING: ignored --with-shlib-version" >&5
-+                       { echo "$as_me:8002: WARNING: ignored --with-shlib-version" >&5
++                       { echo "$as_me:7857: WARNING: ignored --with-shlib-version" >&5
  echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
                         ;;
@@ -5485 +5958 @@
 +       test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}"
 +       test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}"
++
++       test -n "$verbose" && echo "    CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
++
++echo "${as_me:-configure}:7870: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++
++       test -n "$verbose" && echo "    MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
++
++echo "${as_me:-configure}:7874: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
  
  # The test/sample programs in the original tree link using rpath option.
@@ -5491 +5972 @@
  then
 -       echo "$as_me:7762: checking if you want to link sample programs with rpath option" >&5
-+       echo "$as_me:8017: checking if you want to link sample programs with rpath option" >&5
++       echo "$as_me:7880: checking if you want to link sample programs with rpath option" >&5
  echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6
  
  # Check whether --enable-rpath-link or --disable-rpath-link was given.
-@@ -7769,7 +8024,7 @@
+@@ -7769,7 +7887,7 @@
  else
    with_rpath_link=yes
  fi;
 -       echo "$as_me:7772: result: $with_rpath_link" >&5
-+       echo "$as_me:8027: result: $with_rpath_link" >&5
++       echo "$as_me:7890: result: $with_rpath_link" >&5
  echo "${ECHO_T}$with_rpath_link" >&6
         if test "$with_rpath_link" = no
         then
-@@ -7780,13 +8035,8 @@
+@@ -7780,13 +7898,8 @@
  
  ###############################################################################
@@ -5515 +5996 @@
  ###   use option --enable-broken-linker to force on use of broken-linker support
 -echo "$as_me:7789: checking if you want broken-linker support code" >&5
-+echo "$as_me:8039: checking if you want broken-linker support code" >&5
++echo "$as_me:7902: checking if you want broken-linker support code" >&5
  echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
  
  # Check whether --enable-broken_linker or --disable-broken_linker was given.
-@@ -7796,7 +8046,7 @@
+@@ -7796,7 +7909,7 @@
  else
    with_broken_linker=${BROKEN_LINKER:-no}
  fi;
 -echo "$as_me:7799: result: $with_broken_linker" >&5
-+echo "$as_me:8049: result: $with_broken_linker" >&5
++echo "$as_me:7912: result: $with_broken_linker" >&5
  echo "${ECHO_T}$with_broken_linker" >&6
  
  BROKEN_LINKER=0
-@@ -7816,7 +8066,7 @@
+@@ -7816,7 +7929,7 @@
                 BROKEN_LINKER=1
                 test -n "$verbose" && echo "    cygwin linker is broken anyway" 1>&6
  
 -echo "${as_me:-configure}:7819: testing cygwin linker is broken anyway ..." 1>&5
-+echo "${as_me:-configure}:8069: testing cygwin linker is broken anyway ..." 1>&5
++echo "${as_me:-configure}:7932: testing cygwin linker is broken anyway ..." 1>&5
  
                 ;;
         esac
-@@ -7829,7 +8079,7 @@
+@@ -7829,7 +7942,7 @@
  cf_xopen_source=
  
@@ -5546 +6027 @@
         ;;
  cygwin) #(vi
-@@ -7840,6 +8090,7 @@
+@@ -7840,6 +7953,7 @@
         ;;
  darwin*) #(vi
@@ -5554 +6035 @@
  freebsd*|dragonfly*) #(vi
         # 5.x headers associate
-@@ -7857,17 +8108,18 @@
+@@ -7857,17 +7971,18 @@
         ;;
  irix[56].*) #(vi
@@ -5563 +6044 @@
  
 -echo "$as_me:7863: checking if we must define _GNU_SOURCE" >&5
-+echo "$as_me:8115: checking if we must define _GNU_SOURCE" >&5
++echo "$as_me:7978: 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
@@ -5571 +6052 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 7870 "configure"
-+#line 8122 "configure"
++#line 7985 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  int
-@@ -7882,16 +8134,16 @@
+@@ -7882,16 +7997,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7885: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8137: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8000: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7888: \$? = $ac_status" >&5
-+  echo "$as_me:8140: \$? = $ac_status" >&5
++  echo "$as_me:8003: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7891: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8143: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8006: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7894: \$? = $ac_status" >&5
-+  echo "$as_me:8146: \$? = $ac_status" >&5
++  echo "$as_me:8009: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_gnu_source=no
  else
-@@ -7900,7 +8152,7 @@
+@@ -7900,7 +8015,7 @@
  cf_save="$CPPFLAGS"
          CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
          cat >conftest.$ac_ext <<_ACEOF
 -#line 7903 "configure"
-+#line 8155 "configure"
++#line 8018 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  int
-@@ -7915,16 +8167,16 @@
+@@ -7915,16 +8030,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7918: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8170: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8033: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7921: \$? = $ac_status" >&5
-+  echo "$as_me:8173: \$? = $ac_status" >&5
++  echo "$as_me:8036: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7924: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8176: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8039: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7927: \$? = $ac_status" >&5
-+  echo "$as_me:8179: \$? = $ac_status" >&5
++  echo "$as_me:8042: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_gnu_source=no
  else
-@@ -7939,47 +8191,293 @@
+@@ -7939,51 +8054,45 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
 -echo "$as_me:7942: result: $cf_cv_gnu_source" >&5
-+echo "$as_me:8194: result: $cf_cv_gnu_source" >&5
++echo "$as_me:8057: 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"
@@ -5664 +6145 @@
 -echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
 -if test "${cf_cv_xopen_source+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
 +       # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types
 +       cf_XOPEN_SOURCE=
- 
--       cat >conftest.$ac_ext <<_ACEOF
--#line 7979 "configure"
--#include "confdefs.h"
--#include <sys/types.h>
--int
++
 +cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
 +
@@ -5687 +6161 @@
 +               -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?$//g'`
 +
-+echo "$as_me:8216: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:8079: checking if we should define _POSIX_C_SOURCE" >&5
 +echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
 +if test "${cf_cv_posix_c_source+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+echo "${as_me:-configure}:8222: testing if the symbol is already defined go no further ..." 1>&5
-+
-+       cat >conftest.$ac_ext <<_ACEOF
-+#line 8225 "configure"
-+#include "confdefs.h"
-+#include <sys/types.h>
-+int
-+main ()
-+{
-+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
++echo "${as_me:-configure}:8085: testing if the symbol is already defined go no further ..." 1>&5
++
+        cat >conftest.$ac_ext <<_ACEOF
+-#line 7979 "configure"
++#line 8088 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+ main ()
+ {
+ 
+-#ifndef _XOPEN_SOURCE
 +#ifndef _POSIX_C_SOURCE
-+make an error
-+#endif
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8240: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:8243: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8246: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:8249: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
+ make an error
+ #endif
+   ;
+@@ -7991,32 +8100,44 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7994: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8103: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7997: \$? = $ac_status" >&5
++  echo "$as_me:8106: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8000: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8109: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8003: \$? = $ac_status" >&5
++  echo "$as_me:8112: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  cf_cv_xopen_source=no
 +  cf_cv_posix_c_source=no
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-cf_save="$CPPFLAGS"
+-        CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+-        cat >conftest.$ac_ext <<_ACEOF
+-#line 8012 "configure"
 +cf_want_posix_source=no
 +        case .$cf_POSIX_C_SOURCE in #(vi
@@ -5741 +6226 @@
 +        if test "$cf_want_posix_source" = yes ; then
 +               cat >conftest.$ac_ext <<_ACEOF
-+#line 8270 "configure"
-+#include "confdefs.h"
-+#include <sys/types.h>
-+int
-+main ()
-+{
-+
++#line 8133 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+ main ()
+ {
+ 
+-#ifdef _XOPEN_SOURCE
 +#ifdef _POSIX_SOURCE
-+make an error
-+#endif
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8285: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:8288: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8291: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:8294: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
+ make an error
+ #endif
+   ;
+@@ -8024,33 +8145,278 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8027: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8148: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8030: \$? = $ac_status" >&5
++  echo "$as_me:8151: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8033: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8154: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8036: \$? = $ac_status" >&5
++  echo "$as_me:8157: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  cf_cv_xopen_source=no
 +  :
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-cf_cv_xopen_source=$cf_XOPEN_SOURCE
 +cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE"
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-       CPPFLAGS="$cf_save"
 +        fi
 +
-+echo "${as_me:-configure}:8305: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:8168: 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}:8310: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:8173: testing if the second compile does not leave our definition intact error ..." 1>&5
 +
 +        cat >conftest.$ac_ext <<_ACEOF
-+#line 8313 "configure"
++#line 8176 "configure"
 +#include "confdefs.h"
 +#include <sys/types.h>
@@ -5799 +6292 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8328: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8191: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8331: \$? = $ac_status" >&5
++  echo "$as_me:8194: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8334: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8197: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8337: \$? = $ac_status" >&5
++  echo "$as_me:8200: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  :
@@ -5824 +6317 @@
 +
 +fi
-+echo "$as_me:8353: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:8216: result: $cf_cv_posix_c_source" >&5
 +echo "${ECHO_T}$cf_cv_posix_c_source" >&6
 +
@@ -5937 +6430 @@
 +*)
 +
-+echo "$as_me:8466: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:8329: 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
@@ -5944 +6437 @@
 +
 +       cat >conftest.$ac_ext <<_ACEOF
-+#line 8473 "configure"
++#line 8336 "configure"
 +#include "confdefs.h"
 +
@@ -5951 +6444 @@
 +#include <sys/types.h>
 +
-+int
- main ()
- {
- 
-@@ -7991,16 +8489,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7994: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8492: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7997: \$? = $ac_status" >&5
-+  echo "$as_me:8495: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8000: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8498: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8003: \$? = $ac_status" >&5
-+  echo "$as_me:8501: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8009,9 +8507,13 @@
- cf_save="$CPPFLAGS"
-         CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
-         cat >conftest.$ac_ext <<_ACEOF
--#line 8012 "configure"
-+#line 8510 "configure"
- #include "confdefs.h"
-+
-+#include <stdlib.h>
-+#include <string.h>
- #include <sys/types.h>
-+
- int
- main ()
- {
-@@ -8024,16 +8526,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8027: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8529: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8030: \$? = $ac_status" >&5
-+  echo "$as_me:8532: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8033: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8535: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8036: \$? = $ac_status" >&5
-+  echo "$as_me:8538: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8048,9 +8550,10 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8051: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:8553: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
--       if test "$cf_cv_xopen_source" != no ; then
-+
-+if test "$cf_cv_xopen_source" != no ; then
- 
- CFLAGS=`echo "$CFLAGS" | \
-        sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
-@@ -8060,7 +8563,7 @@
-        sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
-                -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?$//g'`
- 
--               cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
-+       cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
- 
- cf_fix_cppflags=no
- cf_new_cflags=
-@@ -8140,7 +8643,7 @@
-        EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
- 
--       fi
-+fi
- 
- cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
- 
-@@ -8155,16 +8658,16 @@
-        sed     -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?[         ]/ /g' \
-                -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?$//g'`
- 
--echo "$as_me:8158: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:8661: checking if we should define _POSIX_C_SOURCE" >&5
- echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_posix_c_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--echo "${as_me:-configure}:8164: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:8667: testing if the symbol is already defined go no further ..." 1>&5
- 
-        cat >conftest.$ac_ext <<_ACEOF
--#line 8167 "configure"
-+#line 8670 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8179,16 +8682,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8182: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8685: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8185: \$? = $ac_status" >&5
-+  echo "$as_me:8688: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8188: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8691: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8191: \$? = $ac_status" >&5
-+  echo "$as_me:8694: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -8209,7 +8712,7 @@
-         esac
-         if test "$cf_want_posix_source" = yes ; then
-                cat >conftest.$ac_ext <<_ACEOF
--#line 8212 "configure"
-+#line 8715 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8224,16 +8727,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8227: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8730: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8230: \$? = $ac_status" >&5
-+  echo "$as_me:8733: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8233: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8736: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8236: \$? = $ac_status" >&5
-+  echo "$as_me:8739: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8244,15 +8747,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
-         fi
- 
--echo "${as_me:-configure}:8247: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:8750: 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}:8252: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:8755: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
-         cat >conftest.$ac_ext <<_ACEOF
--#line 8255 "configure"
-+#line 8758 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8267,16 +8770,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8270: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8773: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8273: \$? = $ac_status" >&5
-+  echo "$as_me:8776: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8276: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8779: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8279: \$? = $ac_status" >&5
-+  echo "$as_me:8782: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8292,7 +8795,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8295: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:8798: result: $cf_cv_posix_c_source" >&5
- echo "${ECHO_T}$cf_cv_posix_c_source" >&6
- 
- if test "$cf_cv_posix_c_source" != no ; then
-@@ -8464,6 +8967,273 @@
- 
- fi
- 
-+if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-+       echo "$as_me:8971: checking if _XOPEN_SOURCE really is set" >&5
-+echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
-+       cat >conftest.$ac_ext <<_ACEOF
-+#line 8974 "configure"
-+#include "confdefs.h"
-+#include <stdlib.h>
 +int
 +main ()
@@ -6186 +6456 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8989: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8355: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8992: \$? = $ac_status" >&5
++  echo "$as_me:8358: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8995: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8361: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8998: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  cf_XOPEN_SOURCE_set=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+cf_XOPEN_SOURCE_set=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+       echo "$as_me:9007: result: $cf_XOPEN_SOURCE_set" >&5
-+echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
-+       if test $cf_XOPEN_SOURCE_set = yes
-+       then
-+               cat >conftest.$ac_ext <<_ACEOF
-+#line 9012 "configure"
-+#include "confdefs.h"
-+#include <stdlib.h>
-+int
-+main ()
-+{
-+
-+#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE
-+make an error
-+#endif
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:9027: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:9030: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:9033: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:9036: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  cf_XOPEN_SOURCE_set_ok=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+cf_XOPEN_SOURCE_set_ok=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+               if test $cf_XOPEN_SOURCE_set_ok = no
-+               then
-+                       { echo "$as_me:9047: WARNING: _XOPEN_SOURCE is lower than requested" >&5
-+echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
-+               fi
-+       else
-+
-+echo "$as_me:9052: checking if we should define _XOPEN_SOURCE" >&5
-+echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
-+if test "${cf_cv_xopen_source+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+       cat >conftest.$ac_ext <<_ACEOF
-+#line 9059 "configure"
-+#include "confdefs.h"
-+
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/types.h>
-+
-+int
-+main ()
-+{
-+
-+#ifndef _XOPEN_SOURCE
-+make an error
-+#endif
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:9078: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:9081: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:9084: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:9087: \$? = $ac_status" >&5
++  echo "$as_me:8364: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_xopen_source=no
@@ -6293 +6474 @@
 +        CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 +        cat >conftest.$ac_ext <<_ACEOF
-+#line 9096 "configure"
++#line 8373 "configure"
 +#include "confdefs.h"
 +
@@ -6312 +6493 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:9115: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8392: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:9118: \$? = $ac_status" >&5
++  echo "$as_me:8395: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:9121: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8398: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:9124: \$? = $ac_status" >&5
++  echo "$as_me:8401: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_xopen_source=no
@@ -6331 +6512 @@
 +rm -f conftest.$ac_objext conftest.$ac_ext
 +       CPPFLAGS="$cf_save"
-+
+ 
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:8051: result: $cf_cv_xopen_source" >&5
++echo "$as_me:8416: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+-       if test "$cf_cv_xopen_source" != no ; then
++
++if test "$cf_cv_xopen_source" != no ; then
+ 
+ CFLAGS=`echo "$CFLAGS" | \
+        sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
+@@ -8060,7 +8426,7 @@
+        sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
+                -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?$//g'`
+ 
+-               cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
++       cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -8140,7 +8506,7 @@
+        EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+ fi
+ 
+-       fi
 +fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+
+ 
+ cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
+ 
+@@ -8155,16 +8521,16 @@
+        sed     -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?[         ]/ /g' \
+                -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?$//g'`
+ 
+-echo "$as_me:8158: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:8524: checking if we should define _POSIX_C_SOURCE" >&5
+ echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_posix_c_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-echo "${as_me:-configure}:8164: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:8530: testing if the symbol is already defined go no further ..." 1>&5
+ 
+        cat >conftest.$ac_ext <<_ACEOF
+-#line 8167 "configure"
++#line 8533 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -8179,16 +8545,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8182: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8548: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8185: \$? = $ac_status" >&5
++  echo "$as_me:8551: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8188: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8554: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8191: \$? = $ac_status" >&5
++  echo "$as_me:8557: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -8209,7 +8575,7 @@
+         esac
+         if test "$cf_want_posix_source" = yes ; then
+                cat >conftest.$ac_ext <<_ACEOF
+-#line 8212 "configure"
++#line 8578 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -8224,16 +8590,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8227: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8593: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8230: \$? = $ac_status" >&5
++  echo "$as_me:8596: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8233: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8599: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8236: \$? = $ac_status" >&5
++  echo "$as_me:8602: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -8244,15 +8610,15 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+         fi
+ 
+-echo "${as_me:-configure}:8247: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:8613: 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}:8252: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:8618: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+         cat >conftest.$ac_ext <<_ACEOF
+-#line 8255 "configure"
++#line 8621 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -8267,16 +8633,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8270: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8636: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8273: \$? = $ac_status" >&5
++  echo "$as_me:8639: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8276: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8642: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8279: \$? = $ac_status" >&5
++  echo "$as_me:8645: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -8292,7 +8658,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:8295: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:8661: result: $cf_cv_posix_c_source" >&5
+ echo "${ECHO_T}$cf_cv_posix_c_source" >&6
+ 
+ if test "$cf_cv_posix_c_source" != no ; then
+@@ -8362,34 +8728,298 @@
+ esac
+ done
+ 
+-if test -n "$cf_new_cflags" ; then
++if test -n "$cf_new_cflags" ; then
++
++       CFLAGS="$CFLAGS $cf_new_cflags"
 +fi
-+echo "$as_me:9139: result: $cf_cv_xopen_source" >&5
-+echo "${ECHO_T}$cf_cv_xopen_source" >&6
-+
-+if test "$cf_cv_xopen_source" != no ; then
-+
-+CFLAGS=`echo "$CFLAGS" | \
-+       sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
-+               -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?$//g'`
-+
-+CPPFLAGS=`echo "$CPPFLAGS" | \
-+       sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
-+               -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?$//g'`
-+
-+       cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
++
++if test -n "$cf_new_cppflags" ; then
++
++       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
++fi
++
++if test -n "$cf_new_extra_cppflags" ; then
++
++       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
++fi
++
++fi
++
++       ;;
++esac
++
++if test -n "$cf_xopen_source" ; then
 +
 +cf_fix_cppflags=no
@@ -6356 +6696 @@
 +cf_new_extra_cppflags=
 +
-+for cf_add_cflags in $cf_temp_xopen_source
++for cf_add_cflags in $cf_xopen_source
 +do
 +case $cf_fix_cppflags in
@@ -6431 +6771 @@
 +fi
 +
++if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
++       echo "$as_me:8834: checking if _XOPEN_SOURCE really is set" >&5
++echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
++       cat >conftest.$ac_ext <<_ACEOF
++#line 8837 "configure"
++#include "confdefs.h"
++#include <stdlib.h>
++int
++main ()
++{
++
++#ifndef _XOPEN_SOURCE
++make an error
++#endif
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:8852: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:8855: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:8858: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:8861: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  cf_XOPEN_SOURCE_set=yes
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++cf_XOPEN_SOURCE_set=no
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++       echo "$as_me:8870: result: $cf_XOPEN_SOURCE_set" >&5
++echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
++       if test $cf_XOPEN_SOURCE_set = yes
++       then
++               cat >conftest.$ac_ext <<_ACEOF
++#line 8875 "configure"
++#include "confdefs.h"
++#include <stdlib.h>
++int
++main ()
++{
++
++#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE
++make an error
++#endif
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:8890: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:8893: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:8896: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:8899: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  cf_XOPEN_SOURCE_set_ok=yes
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++cf_XOPEN_SOURCE_set_ok=no
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++               if test $cf_XOPEN_SOURCE_set_ok = no
++               then
++                       { echo "$as_me:8910: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
++               fi
++       else
++
++echo "$as_me:8915: checking if we should define _XOPEN_SOURCE" >&5
++echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
++if test "${cf_cv_xopen_source+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++       cat >conftest.$ac_ext <<_ACEOF
++#line 8922 "configure"
++#include "confdefs.h"
++
++#include <stdlib.h>
++#include <string.h>
++#include <sys/types.h>
++
++int
++main ()
++{
++
++#ifndef _XOPEN_SOURCE
++make an error
++#endif
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:8941: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:8944: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:8947: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:8950: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  cf_cv_xopen_source=no
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++cf_save="$CPPFLAGS"
++        CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
++        cat >conftest.$ac_ext <<_ACEOF
++#line 8959 "configure"
++#include "confdefs.h"
+ 
+-       CFLAGS="$CFLAGS $cf_new_cflags"
+-fi
++#include <stdlib.h>
++#include <string.h>
++#include <sys/types.h>
+ 
+-if test -n "$cf_new_cppflags" ; then
++int
++main ()
++{
+ 
+-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
++#ifdef _XOPEN_SOURCE
++make an error
++#endif
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:8978: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:8981: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:8984: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:8987: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  cf_cv_xopen_source=no
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++cf_cv_xopen_source=$cf_XOPEN_SOURCE
+ fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++       CPPFLAGS="$cf_save"
+ 
+-if test -n "$cf_new_extra_cppflags" ; then
+-
+-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+ fi
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
++echo "$as_me:9002: result: $cf_cv_xopen_source" >&5
++echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+-       ;;
+-esac
++if test "$cf_cv_xopen_source" != no ; then
+ 
+-if test -n "$cf_xopen_source" ; then
++CFLAGS=`echo "$CFLAGS" | \
++       sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
++               -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?$//g'`
++
++CPPFLAGS=`echo "$CPPFLAGS" | \
++       sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
++               -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?$//g'`
++
++       cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+ cf_new_cppflags=
+ cf_new_extra_cppflags=
+ 
+-for cf_add_cflags in $cf_xopen_source
++for cf_add_cflags in $cf_temp_xopen_source
+ do
+ case $cf_fix_cppflags in
+ no)
+@@ -8464,6 +9094,9 @@
+ 
+ fi
+ 
 +       fi
 +fi
@@ -6437 +6985 @@
  if test "${enable_largefile+set}" = set; then
    enableval="$enable_largefile"
-@@ -8471,7 +9241,7 @@
+@@ -8471,7 +9104,7 @@
  fi;
  if test "$enable_largefile" != no; then
  
 -  echo "$as_me:8474: checking for special C compiler options needed for large files" >&5
-+  echo "$as_me:9244: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:9107: checking for special C compiler options needed for large files" >&5
  echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
  if test "${ac_cv_sys_largefile_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8483,7 +9253,7 @@
+@@ -8483,7 +9116,7 @@
          # IRIX 6.2 and later do not support large files by default,
          # so use the C compiler's -n32 option if that helps.
           cat >conftest.$ac_ext <<_ACEOF
 -#line 8486 "configure"
-+#line 9256 "configure"
++#line 9119 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
   /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -8503,16 +9273,16 @@
+@@ -8503,16 +9136,16 @@
  }
  _ACEOF
          rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8506: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9276: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9139: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8509: \$? = $ac_status" >&5
-+  echo "$as_me:9279: \$? = $ac_status" >&5
++  echo "$as_me:9142: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8512: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9282: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9145: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8515: \$? = $ac_status" >&5
-+  echo "$as_me:9285: \$? = $ac_status" >&5
++  echo "$as_me:9148: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -8522,16 +9292,16 @@
+@@ -8522,16 +9155,16 @@
  rm -f conftest.$ac_objext
          CC="$CC -n32"
          rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8525: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9295: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9158: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8528: \$? = $ac_status" >&5
-+  echo "$as_me:9298: \$? = $ac_status" >&5
++  echo "$as_me:9161: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8531: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9301: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9164: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8534: \$? = $ac_status" >&5
-+  echo "$as_me:9304: \$? = $ac_status" >&5
++  echo "$as_me:9167: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sys_largefile_CC=' -n32'; break
  else
-@@ -8545,13 +9315,13 @@
+@@ -8545,13 +9178,13 @@
         rm -f conftest.$ac_ext
      fi
  fi
 -echo "$as_me:8548: result: $ac_cv_sys_largefile_CC" >&5
-+echo "$as_me:9318: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:9181: 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
@@ -6509 +7057 @@
  
 -  echo "$as_me:8554: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+  echo "$as_me:9324: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:9187: checking for _FILE_OFFSET_BITS value needed for large files" >&5
  echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
  if test "${ac_cv_sys_file_offset_bits+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8559,7 +9329,7 @@
+@@ -8559,7 +9192,7 @@
    while :; do
    ac_cv_sys_file_offset_bits=no
    cat >conftest.$ac_ext <<_ACEOF
 -#line 8562 "configure"
-+#line 9332 "configure"
++#line 9195 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
   /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -8579,16 +9349,16 @@
+@@ -8579,16 +9212,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8582: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9352: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9215: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8585: \$? = $ac_status" >&5
-+  echo "$as_me:9355: \$? = $ac_status" >&5
++  echo "$as_me:9218: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8588: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9358: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9221: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8591: \$? = $ac_status" >&5
-+  echo "$as_me:9361: \$? = $ac_status" >&5
++  echo "$as_me:9224: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -8597,7 +9367,7 @@
+@@ -8597,7 +9230,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
 -#line 8600 "configure"
-+#line 9370 "configure"
++#line 9233 "configure"
  #include "confdefs.h"
  #define _FILE_OFFSET_BITS 64
  #include <sys/types.h>
-@@ -8618,16 +9388,16 @@
+@@ -8618,16 +9251,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8621: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9391: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9254: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8624: \$? = $ac_status" >&5
-+  echo "$as_me:9394: \$? = $ac_status" >&5
++  echo "$as_me:9257: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8627: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9397: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9260: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8630: \$? = $ac_status" >&5
-+  echo "$as_me:9400: \$? = $ac_status" >&5
++  echo "$as_me:9263: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sys_file_offset_bits=64; break
  else
-@@ -8638,7 +9408,7 @@
+@@ -8638,7 +9271,7 @@
    break
  done
  fi
 -echo "$as_me:8641: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "$as_me:9411: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:9274: 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
  
-@@ -8648,7 +9418,7 @@
+@@ -8648,7 +9281,7 @@
  
  fi
  rm -rf conftest*
 -  echo "$as_me:8651: checking for _LARGE_FILES value needed for large files" >&5
-+  echo "$as_me:9421: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:9284: checking for _LARGE_FILES value needed for large files" >&5
  echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
  if test "${ac_cv_sys_large_files+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8656,7 +9426,7 @@
+@@ -8656,7 +9289,7 @@
    while :; do
    ac_cv_sys_large_files=no
    cat >conftest.$ac_ext <<_ACEOF
 -#line 8659 "configure"
-+#line 9429 "configure"
++#line 9292 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
   /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -8676,16 +9446,16 @@
+@@ -8676,16 +9309,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8679: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9449: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9312: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8682: \$? = $ac_status" >&5
-+  echo "$as_me:9452: \$? = $ac_status" >&5
++  echo "$as_me:9315: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8685: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9455: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9318: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8688: \$? = $ac_status" >&5
-+  echo "$as_me:9458: \$? = $ac_status" >&5
++  echo "$as_me:9321: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -8694,7 +9464,7 @@
+@@ -8694,7 +9327,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
 -#line 8697 "configure"
-+#line 9467 "configure"
++#line 9330 "configure"
  #include "confdefs.h"
  #define _LARGE_FILES 1
  #include <sys/types.h>
-@@ -8715,16 +9485,16 @@
+@@ -8715,16 +9348,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8718: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9488: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9351: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8721: \$? = $ac_status" >&5
-+  echo "$as_me:9491: \$? = $ac_status" >&5
++  echo "$as_me:9354: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8724: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9494: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9357: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8727: \$? = $ac_status" >&5
-+  echo "$as_me:9497: \$? = $ac_status" >&5
++  echo "$as_me:9360: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sys_large_files=1; break
  else
-@@ -8735,7 +9505,7 @@
+@@ -8735,7 +9368,7 @@
    break
  done
  fi
 -echo "$as_me:8738: result: $ac_cv_sys_large_files" >&5
-+echo "$as_me:9508: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:9371: 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
  
-@@ -8748,7 +9518,7 @@
+@@ -8748,7 +9381,7 @@
  fi
  
      if test "$enable_largefile" != no ; then
 -       echo "$as_me:8751: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+       echo "$as_me:9521: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++       echo "$as_me:9384: checking for _LARGEFILE_SOURCE value needed for large files" >&5
  echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
  if test "${ac_cv_sys_largefile_source+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8756,7 +9526,7 @@
+@@ -8756,7 +9389,7 @@
    while :; do
    ac_cv_sys_largefile_source=no
    cat >conftest.$ac_ext <<_ACEOF
 -#line 8759 "configure"
-+#line 9529 "configure"
++#line 9392 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -8768,16 +9538,16 @@
+@@ -8768,16 +9401,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8771: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9541: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9404: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8774: \$? = $ac_status" >&5
-+  echo "$as_me:9544: \$? = $ac_status" >&5
++  echo "$as_me:9407: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8777: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9547: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9410: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8780: \$? = $ac_status" >&5
-+  echo "$as_me:9550: \$? = $ac_status" >&5
++  echo "$as_me:9413: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -8786,7 +9556,7 @@
+@@ -8786,7 +9419,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
 -#line 8789 "configure"
-+#line 9559 "configure"
++#line 9422 "configure"
  #include "confdefs.h"
  #define _LARGEFILE_SOURCE 1
  #include <stdio.h>
-@@ -8799,16 +9569,16 @@
+@@ -8799,16 +9432,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8802: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9572: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9435: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8805: \$? = $ac_status" >&5
-+  echo "$as_me:9575: \$? = $ac_status" >&5
++  echo "$as_me:9438: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8808: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9578: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9441: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8811: \$? = $ac_status" >&5
-+  echo "$as_me:9581: \$? = $ac_status" >&5
++  echo "$as_me:9444: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sys_largefile_source=1; break
  else
-@@ -8819,7 +9589,7 @@
+@@ -8819,7 +9452,7 @@
    break
  done
  fi
 -echo "$as_me:8822: result: $ac_cv_sys_largefile_source" >&5
-+echo "$as_me:9592: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:9455: 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
  
-@@ -8833,13 +9603,13 @@
+@@ -8833,13 +9466,13 @@
  # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
  # in glibc 2.1.3, but that breaks too many other things.
  # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
 -echo "$as_me:8836: checking for fseeko" >&5
-+echo "$as_me:9606: checking for fseeko" >&5
++echo "$as_me:9469: checking for fseeko" >&5
  echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
  if test "${ac_cv_func_fseeko+set}" = set; then
@@ -6750 +7298 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 8842 "configure"
-+#line 9612 "configure"
++#line 9475 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -8851,16 +9621,16 @@
+@@ -8851,16 +9484,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:8854: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9624: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9487: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:8857: \$? = $ac_status" >&5
-+  echo "$as_me:9627: \$? = $ac_status" >&5
++  echo "$as_me:9490: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:8860: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9630: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9493: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8863: \$? = $ac_status" >&5
-+  echo "$as_me:9633: \$? = $ac_status" >&5
++  echo "$as_me:9496: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_fseeko=yes
  else
-@@ -8870,7 +9640,7 @@
+@@ -8870,7 +9503,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:8873: result: $ac_cv_func_fseeko" >&5
-+echo "$as_me:9643: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:9506: result: $ac_cv_func_fseeko" >&5
  echo "${ECHO_T}$ac_cv_func_fseeko" >&6
  if test $ac_cv_func_fseeko = yes; then
  
-@@ -8891,14 +9661,14 @@
+@@ -8891,14 +9524,14 @@
         test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
         test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
  
 -       echo "$as_me:8894: checking whether to use struct dirent64" >&5
-+       echo "$as_me:9664: checking whether to use struct dirent64" >&5
++       echo "$as_me:9527: 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
@@ -6797 +7345 @@
                 cat >conftest.$ac_ext <<_ACEOF
 -#line 8901 "configure"
-+#line 9671 "configure"
++#line 9534 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -8919,16 +9689,16 @@
+@@ -8919,16 +9552,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8922: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9692: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9555: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8925: \$? = $ac_status" >&5
-+  echo "$as_me:9695: \$? = $ac_status" >&5
++  echo "$as_me:9558: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8928: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9698: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9561: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8931: \$? = $ac_status" >&5
-+  echo "$as_me:9701: \$? = $ac_status" >&5
++  echo "$as_me:9564: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_struct_dirent64=yes
  else
-@@ -8939,7 +9709,7 @@
+@@ -8939,7 +9572,7 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
 -echo "$as_me:8942: result: $cf_cv_struct_dirent64" >&5
-+echo "$as_me:9712: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:9575: result: $cf_cv_struct_dirent64" >&5
  echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
         test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF
  #define HAVE_STRUCT_DIRENT64 1
-@@ -8948,7 +9718,7 @@
+@@ -8948,7 +9581,7 @@
      fi
  
  ### Enable compiling-in rcs id's
 -echo "$as_me:8951: checking if RCS identifiers should be compiled-in" >&5
-+echo "$as_me:9721: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:9584: checking if RCS identifiers should be compiled-in" >&5
  echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
  
  # Check whether --with-rcs-ids or --without-rcs-ids was given.
-@@ -8958,7 +9728,7 @@
+@@ -8958,7 +9591,7 @@
  else
    with_rcs_ids=no
  fi;
 -echo "$as_me:8961: result: $with_rcs_ids" >&5
-+echo "$as_me:9731: result: $with_rcs_ids" >&5
++echo "$as_me:9594: result: $with_rcs_ids" >&5
  echo "${ECHO_T}$with_rcs_ids" >&6
  test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF
  #define USE_RCS_IDS 1
-@@ -8967,7 +9737,7 @@
+@@ -8967,7 +9600,7 @@
  ###############################################################################
  
  ### Note that some functions (such as const) are normally disabled anyway.
 -echo "$as_me:8970: checking if you want to build with function extensions" >&5
-+echo "$as_me:9740: checking if you want to build with function extensions" >&5
++echo "$as_me:9603: checking if you want to build with function extensions" >&5
  echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
  
  # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
-@@ -8977,7 +9747,7 @@
+@@ -8977,7 +9610,7 @@
  else
    with_ext_funcs=yes
  fi;
 -echo "$as_me:8980: result: $with_ext_funcs" >&5
-+echo "$as_me:9750: result: $with_ext_funcs" >&5
++echo "$as_me:9613: result: $with_ext_funcs" >&5
  echo "${ECHO_T}$with_ext_funcs" >&6
  if test "$with_ext_funcs" = yes ; then
         NCURSES_EXT_FUNCS=1
-@@ -8994,7 +9764,7 @@
+@@ -8994,7 +9627,7 @@
  fi
  
  ###   use option --enable-const to turn on use of const beyond that in XSI.
 -echo "$as_me:8997: checking for extended use of const keyword" >&5
-+echo "$as_me:9767: checking for extended use of const keyword" >&5
++echo "$as_me:9630: checking for extended use of const keyword" >&5
  echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
  
  # Check whether --enable-const or --disable-const was given.
-@@ -9004,7 +9774,7 @@
+@@ -9004,7 +9637,7 @@
  else
    with_ext_const=no
  fi;
 -echo "$as_me:9007: result: $with_ext_const" >&5
-+echo "$as_me:9777: result: $with_ext_const" >&5
++echo "$as_me:9640: result: $with_ext_const" >&5
  echo "${ECHO_T}$with_ext_const" >&6
  NCURSES_CONST='/*nothing*/'
  if test "$with_ext_const" = yes ; then
-@@ -9014,7 +9784,7 @@
+@@ -9014,7 +9647,7 @@
  ###############################################################################
  # These options are relatively safe to experiment with.
  
 -echo "$as_me:9017: checking if you want all development code" >&5
-+echo "$as_me:9787: checking if you want all development code" >&5
++echo "$as_me:9650: checking if you want all development code" >&5
  echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
  
  # Check whether --with-develop or --without-develop was given.
-@@ -9024,7 +9794,7 @@
+@@ -9024,7 +9657,7 @@
  else
    with_develop=no
  fi;
 -echo "$as_me:9027: result: $with_develop" >&5
-+echo "$as_me:9797: result: $with_develop" >&5
++echo "$as_me:9660: result: $with_develop" >&5
  echo "${ECHO_T}$with_develop" >&6
  
  ###############################################################################
-@@ -9033,7 +9803,7 @@
+@@ -9033,7 +9666,7 @@
  # This is still experimental (20080329), but should ultimately be moved to
  # the script-block --with-normal, etc.
  
 -echo "$as_me:9036: checking if you want to link with the pthread library" >&5
-+echo "$as_me:9806: checking if you want to link with the pthread library" >&5
++echo "$as_me:9669: checking if you want to link with the pthread library" >&5
  echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
  
  # Check whether --with-pthread or --without-pthread was given.
-@@ -9043,27 +9813,27 @@
+@@ -9043,27 +9676,27 @@
  else
    with_pthread=no
  fi;
 -echo "$as_me:9046: result: $with_pthread" >&5
-+echo "$as_me:9816: result: $with_pthread" >&5
++echo "$as_me:9679: result: $with_pthread" >&5
  echo "${ECHO_T}$with_pthread" >&6
  
  if test "$with_pthread" != no ; then
 -    echo "$as_me:9050: checking for pthread.h" >&5
-+    echo "$as_me:9820: checking for pthread.h" >&5
++    echo "$as_me:9683: 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
@@ -6929 +7477 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 9056 "configure"
-+#line 9826 "configure"
++#line 9689 "configure"
  #include "confdefs.h"
  #include <pthread.h>
  _ACEOF
 -if { (eval echo "$as_me:9060: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:9830: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:9693: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -6941 +7489 @@
    cat conftest.err >&5
 -  echo "$as_me:9066: \$? = $ac_status" >&5
-+  echo "$as_me:9836: \$? = $ac_status" >&5
++  echo "$as_me:9699: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -9082,7 +9852,7 @@
+@@ -9082,7 +9715,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:9085: result: $ac_cv_header_pthread_h" >&5
-+echo "$as_me:9855: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:9718: 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
  
-@@ -9090,12 +9860,14 @@
+@@ -9090,12 +9723,14 @@
  #define HAVE_PTHREADS_H 1
  EOF
@@ -6966 +7514 @@
 +       for cf_lib_pthread in pthread c_r
 +       do
-+           echo "$as_me:9865: checking if we can link with the $cf_lib_pthread library" >&5
++           echo "$as_me:9728: checking if we can link with the $cf_lib_pthread library" >&5
 +echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
 +           cf_save_LIBS="$LIBS"
 +           LIBS="-l$cf_lib_pthread $LIBS"
 +           cat >conftest.$ac_ext <<_ACEOF
-+#line 9870 "configure"
++#line 9733 "configure"
  #include "confdefs.h"
  
  #include <pthread.h>
-@@ -9104,23 +9876,24 @@
+@@ -9104,23 +9739,24 @@
  main ()
  {
@@ -6989 +7537 @@
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:9114: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9887: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9750: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:9117: \$? = $ac_status" >&5
-+  echo "$as_me:9890: \$? = $ac_status" >&5
++  echo "$as_me:9753: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:9120: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9893: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9756: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9123: \$? = $ac_status" >&5
-+  echo "$as_me:9896: \$? = $ac_status" >&5
++  echo "$as_me:9759: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    with_pthread=yes
  else
-@@ -9129,27 +9902,29 @@
+@@ -9129,27 +9765,29 @@
  with_pthread=no
  fi
@@ -7012 +7560 @@
 -        echo "$as_me:9133: result: $with_pthread" >&5
 +           LIBS="$cf_save_LIBS"
-+           echo "$as_me:9906: result: $with_pthread" >&5
++           echo "$as_me:9769: result: $with_pthread" >&5
  echo "${ECHO_T}$with_pthread" >&6
 +           test "$with_pthread" = yes && break
@@ -7029 +7577 @@
 -            { { echo "$as_me:9143: error: Cannot link with pthread library" >&5
 +       else
-+           { { echo "$as_me:9918: error: Cannot link with pthread library" >&5
++           { { echo "$as_me:9781: error: Cannot link with pthread library" >&5
  echo "$as_me: error: Cannot link with pthread library" >&2;}
     { (exit 1); exit 1; }; }
@@ -7040 +7588 @@
  
 -echo "$as_me:9152: checking if you want to use weak-symbols for pthreads" >&5
-+echo "$as_me:9927: checking if you want to use weak-symbols for pthreads" >&5
++echo "$as_me:9790: checking if you want to use weak-symbols for pthreads" >&5
  echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
  
  # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
-@@ -9159,18 +9934,18 @@
+@@ -9159,18 +9797,18 @@
  else
    use_weak_symbols=no
  fi;
 -echo "$as_me:9162: result: $use_weak_symbols" >&5
-+echo "$as_me:9937: result: $use_weak_symbols" >&5
++echo "$as_me:9800: result: $use_weak_symbols" >&5
  echo "${ECHO_T}$use_weak_symbols" >&6
  if test "$use_weak_symbols" = yes ; then
  
 -echo "$as_me:9166: checking if $CC supports weak symbols" >&5
-+echo "$as_me:9941: checking if $CC supports weak symbols" >&5
++echo "$as_me:9804: 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
@@ -7062 +7610 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 9173 "configure"
-+#line 9948 "configure"
++#line 9811 "configure"
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -9196,16 +9971,16 @@
+@@ -9196,16 +9834,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:9199: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9974: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9837: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:9202: \$? = $ac_status" >&5
-+  echo "$as_me:9977: \$? = $ac_status" >&5
++  echo "$as_me:9840: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:9205: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9980: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9843: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9208: \$? = $ac_status" >&5
-+  echo "$as_me:9983: \$? = $ac_status" >&5
++  echo "$as_me:9846: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_weak_symbols=yes
  else
-@@ -9216,7 +9991,7 @@
+@@ -9216,7 +9854,7 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
 -echo "$as_me:9219: result: $cf_cv_weak_symbols" >&5
-+echo "$as_me:9994: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:9857: result: $cf_cv_weak_symbols" >&5
  echo "${ECHO_T}$cf_cv_weak_symbols" >&6
  
  else
-@@ -9243,13 +10018,13 @@
+@@ -9243,13 +9881,13 @@
  fi
  
  # OpenSUSE is installing ncurses6, using reentrant option.
 -echo "$as_me:9246: checking for _nc_TABSIZE" >&5
-+echo "$as_me:10021: checking for _nc_TABSIZE" >&5
++echo "$as_me:9884: checking for _nc_TABSIZE" >&5
  echo $ECHO_N "checking for _nc_TABSIZE... $ECHO_C" >&6
  if test "${ac_cv_func__nc_TABSIZE+set}" = set; then
@@ -7108 +7656 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 9252 "configure"
-+#line 10027 "configure"
++#line 9890 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char _nc_TABSIZE (); below.  */
-@@ -9280,16 +10055,16 @@
+@@ -9272,7 +9910,7 @@
+ #if defined (__stub__nc_TABSIZE) || defined (__stub____nc_TABSIZE)
+ choke me
+ #else
+-f = _nc_TABSIZE;
++f = _nc_TABSIZE; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -9280,16 +9918,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:9283: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10058: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9921: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:9286: \$? = $ac_status" >&5
-+  echo "$as_me:10061: \$? = $ac_status" >&5
++  echo "$as_me:9924: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:9289: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10064: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9927: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9292: \$? = $ac_status" >&5
-+  echo "$as_me:10067: \$? = $ac_status" >&5
++  echo "$as_me:9930: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func__nc_TABSIZE=yes
  else
-@@ -9299,7 +10074,7 @@
+@@ -9299,7 +9937,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:9302: result: $ac_cv_func__nc_TABSIZE" >&5
-+echo "$as_me:10077: result: $ac_cv_func__nc_TABSIZE" >&5
++echo "$as_me:9940: result: $ac_cv_func__nc_TABSIZE" >&5
  echo "${ECHO_T}$ac_cv_func__nc_TABSIZE" >&6
  if test $ac_cv_func__nc_TABSIZE = yes; then
    assume_reentrant=yes
-@@ -9311,7 +10086,7 @@
+@@ -9311,7 +9949,7 @@
  # opaque outside of that, so there is no --enable-opaque option.  We can use
  # this option without --with-pthreads, but this will be always set for
  # pthreads.
 -echo "$as_me:9314: checking if you want experimental reentrant code" >&5
-+echo "$as_me:10089: checking if you want experimental reentrant code" >&5
++echo "$as_me:9952: checking if you want experimental reentrant code" >&5
  echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6
  
  # Check whether --enable-reentrant or --disable-reentrant was given.
-@@ -9321,7 +10096,7 @@
+@@ -9321,7 +9959,7 @@
  else
    with_reentrant=$assume_reentrant
  fi;
 -echo "$as_me:9324: result: $with_reentrant" >&5
-+echo "$as_me:10099: result: $with_reentrant" >&5
++echo "$as_me:9962: result: $with_reentrant" >&5
  echo "${ECHO_T}$with_reentrant" >&6
  if test "$with_reentrant" = yes ; then
         cf_cv_enable_reentrant=1
-@@ -9343,7 +10118,7 @@
+@@ -9343,7 +9981,7 @@
  
  ### Allow using a different wrap-prefix
  if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
 -       echo "$as_me:9346: checking for prefix used to wrap public variables" >&5
-+       echo "$as_me:10121: checking for prefix used to wrap public variables" >&5
++       echo "$as_me:9984: checking for prefix used to wrap public variables" >&5
  echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
  
  # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
-@@ -9353,7 +10128,7 @@
+@@ -9353,7 +9991,7 @@
  else
    NCURSES_WRAP_PREFIX=_nc_
  fi;
 -       echo "$as_me:9356: result: $NCURSES_WRAP_PREFIX" >&5
-+       echo "$as_me:10131: result: $NCURSES_WRAP_PREFIX" >&5
++       echo "$as_me:9994: result: $NCURSES_WRAP_PREFIX" >&5
  echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
  else
         NCURSES_WRAP_PREFIX=_nc_
-@@ -9366,7 +10141,7 @@
+@@ -9366,26 +10004,46 @@
  ###############################################################################
  
  ###    use option --disable-echo to suppress full display compiling commands
 -echo "$as_me:9369: checking if you want to display full commands during build" >&5
-+echo "$as_me:10144: 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
+-echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6
++
++echo "$as_me:10008: checking if you want to see long compiling messages" >&5
++echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
  
  # Check whether --enable-echo or --disable-echo was given.
-@@ -9381,11 +10156,11 @@
+ if test "${enable_echo+set}" = set; then
+   enableval="$enable_echo"
+-  with_echo=$enableval
++  test "$enableval" != no && enableval=yes
++  if test "$enableval" != "yes" ; then
++
++    ECHO_LT='--silent'
++    ECHO_LD='@echo linking $@;'
++    RULE_CC='@echo compiling $<'
++    SHOW_CC='@echo compiling $@'
++    ECHO_CC='@'
++
++  else
++
++    ECHO_LT=''
++    ECHO_LD=''
++    RULE_CC=''
++    SHOW_CC=''
++    ECHO_CC=''
++
++  fi
  else
-        ECHO_LINK='@ echo linking $@ ... ;'
- fi
+-  with_echo=yes
++  enableval=yes
++
++    ECHO_LT=''
++    ECHO_LD=''
++    RULE_CC=''
++    SHOW_CC=''
++    ECHO_CC=''
++
+ fi;
+-if test "$with_echo" = yes; then
+-       ECHO_LINK=
+-else
+-       ECHO_LINK='@ echo linking $@ ... ;'
+-fi
 -echo "$as_me:9384: result: $with_echo" >&5
-+echo "$as_me:10159: result: $with_echo" >&5
- echo "${ECHO_T}$with_echo" >&6
+-echo "${ECHO_T}$with_echo" >&6
++echo "$as_me:10042: result: $enableval" >&5
++echo "${ECHO_T}$enableval" >&6
  
  ###    use option --enable-warnings to turn on all gcc warnings
 -echo "$as_me:9388: checking if you want to see compiler warnings" >&5
-+echo "$as_me:10163: checking if you want to see compiler warnings" >&5
++echo "$as_me:10046: checking if you want to see compiler warnings" >&5
  echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
  
  # Check whether --enable-warnings or --disable-warnings was given.
-@@ -9393,7 +10168,7 @@
+@@ -9393,7 +10051,7 @@
    enableval="$enable_warnings"
    with_warnings=$enableval
  fi;
 -echo "$as_me:9396: result: $with_warnings" >&5
-+echo "$as_me:10171: result: $with_warnings" >&5
++echo "$as_me:10054: result: $with_warnings" >&5
  echo "${ECHO_T}$with_warnings" >&6
  
  if test "x$with_warnings" = "xyes"; then
-@@ -9405,12 +10180,12 @@
+@@ -9405,12 +10063,12 @@
  if test "$GCC" = yes ; then
         case $host_os in
         linux*|gnu*)
 -               echo "$as_me:9408: checking if this is really Intel C compiler" >&5
-+               echo "$as_me:10183: checking if this is really Intel C compiler" >&5
++               echo "$as_me:10066: 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"
@@ -7221 +7814 @@
                 cat >conftest.$ac_ext <<_ACEOF
 -#line 9413 "configure"
-+#line 10188 "configure"
++#line 10071 "configure"
  #include "confdefs.h"
  
  int
-@@ -9427,16 +10202,16 @@
+@@ -9427,16 +10085,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:9430: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10205: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10088: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:9433: \$? = $ac_status" >&5
-+  echo "$as_me:10208: \$? = $ac_status" >&5
++  echo "$as_me:10091: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:9436: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10211: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10094: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9439: \$? = $ac_status" >&5
-+  echo "$as_me:10214: \$? = $ac_status" >&5
++  echo "$as_me:10097: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    INTEL_COMPILER=yes
  cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
-@@ -9447,14 +10222,14 @@
+@@ -9447,14 +10105,63 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
                 CFLAGS="$cf_save_CFLAGS"
 -               echo "$as_me:9450: result: $INTEL_COMPILER" >&5
-+               echo "$as_me:10225: result: $INTEL_COMPILER" >&5
++               echo "$as_me:10108: result: $INTEL_COMPILER" >&5
  echo "${ECHO_T}$INTEL_COMPILER" >&6
                 ;;
@@ -7257 +7850 @@
  fi
  
++CLANG_COMPILER=no
++
++if test "$GCC" = yes ; then
++       echo "$as_me:10117: checking if this is really Clang C compiler" >&5
++echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
++       cf_save_CFLAGS="$CFLAGS"
++       CFLAGS="$CFLAGS -Qunused-arguments"
++       cat >conftest.$ac_ext <<_ACEOF
++#line 10122 "configure"
++#include "confdefs.h"
++
++int
++main ()
++{
++
++#ifdef __clang__
++#else
++make an error
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:10139: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:10142: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:10145: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:10148: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  CLANG_COMPILER=yes
++cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
++
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++       CFLAGS="$cf_save_CFLAGS"
++       echo "$as_me:10159: result: $CLANG_COMPILER" >&5
++echo "${ECHO_T}$CLANG_COMPILER" >&6
++fi
++
  cat > conftest.$ac_ext <<EOF
 -#line 9457 "${as_me:-configure}"
-+#line 10232 "${as_me:-configure}"
++#line 10164 "${as_me:-configure}"
  int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
  EOF
  
-@@ -9471,7 +10246,7 @@
+@@ -9471,7 +10178,7 @@
  # remark #981: operands are evaluated in unspecified order
  # warning #279: controlling expression is constant
  
 -       { echo "$as_me:9474: checking for $CC warning options..." >&5
-+       { echo "$as_me:10249: checking for $CC warning options..." >&5
++       { echo "$as_me:10181: checking for $CC warning options..." >&5
  echo "$as_me: checking for $CC warning options..." >&6;}
         cf_save_CFLAGS="$CFLAGS"
         EXTRA_CFLAGS="-Wall"
-@@ -9487,12 +10262,12 @@
+@@ -9487,12 +10194,12 @@
                 wd981
         do
                 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
 -               if { (eval echo "$as_me:9490: \"$ac_compile\"") >&5
-+               if { (eval echo "$as_me:10265: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:10197: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:9493: \$? = $ac_status" >&5
-+  echo "$as_me:10268: \$? = $ac_status" >&5
++  echo "$as_me:10200: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -                       test -n "$verbose" && echo "$as_me:9495: result: ... -$cf_opt" >&5
-+                       test -n "$verbose" && echo "$as_me:10270: result: ... -$cf_opt" >&5
++                       test -n "$verbose" && echo "$as_me:10202: result: ... -$cf_opt" >&5
  echo "${ECHO_T}... -$cf_opt" >&6
                         EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
                 fi
-@@ -9501,7 +10276,7 @@
+@@ -9501,7 +10208,7 @@
  
  elif test "$GCC" = yes
  then
 -       { echo "$as_me:9504: checking for $CC warning options..." >&5
-+       { echo "$as_me:10279: checking for $CC warning options..." >&5
++       { echo "$as_me:10211: checking for $CC warning options..." >&5
  echo "$as_me: checking for $CC warning options..." >&6;}
         cf_save_CFLAGS="$CFLAGS"
         EXTRA_CFLAGS=
-@@ -9521,12 +10296,12 @@
+@@ -9521,12 +10228,12 @@
                 Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum
         do
                 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
 -               if { (eval echo "$as_me:9524: \"$ac_compile\"") >&5
-+               if { (eval echo "$as_me:10299: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:10231: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:9527: \$? = $ac_status" >&5
-+  echo "$as_me:10302: \$? = $ac_status" >&5
++  echo "$as_me:10234: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -                       test -n "$verbose" && echo "$as_me:9529: result: ... -$cf_opt" >&5
-+                       test -n "$verbose" && echo "$as_me:10304: result: ... -$cf_opt" >&5
++                       test -n "$verbose" && echo "$as_me:10236: result: ... -$cf_opt" >&5
  echo "${ECHO_T}... -$cf_opt" >&6
                         case $cf_opt in #(vi
                         Wcast-qual) #(vi
-@@ -9537,7 +10312,7 @@
+@@ -9537,7 +10244,17 @@
                                 [34].*)
                                         test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
  
 -echo "${as_me:-configure}:9540: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:10315: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:10247: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++
++                                       continue;;
++                               esac
++                               ;;
++                       Wpointer-arith) #(vi
++                               case $GCC_VERSION in
++                               [12].*)
++                                       test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
++
++echo "${as_me:-configure}:10257: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
  
                                         continue;;
                                 esac
-@@ -9570,10 +10345,10 @@
+@@ -9570,10 +10287,10 @@
  EOF
  if test "$GCC" = yes
  then
 -       { echo "$as_me:9573: checking for $CC __attribute__ directives..." >&5
-+       { echo "$as_me:10348: checking for $CC __attribute__ directives..." >&5
++       { echo "$as_me:10290: checking for $CC __attribute__ directives..." >&5
  echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
  cat > conftest.$ac_ext <<EOF
 -#line 9576 "${as_me:-configure}"
-+#line 10351 "${as_me:-configure}"
++#line 10293 "${as_me:-configure}"
  #include "confdefs.h"
  #include "conftest.h"
  #include "conftest.i"
-@@ -9622,12 +10397,12 @@
+@@ -9622,12 +10339,12 @@
                         ;;
                 esac
  
 -               if { (eval echo "$as_me:9625: \"$ac_compile\"") >&5
-+               if { (eval echo "$as_me:10400: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:10342: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:9628: \$? = $ac_status" >&5
-+  echo "$as_me:10403: \$? = $ac_status" >&5
++  echo "$as_me:10345: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -                       test -n "$verbose" && echo "$as_me:9630: result: ... $cf_attribute" >&5
-+                       test -n "$verbose" && echo "$as_me:10405: result: ... $cf_attribute" >&5
++                       test -n "$verbose" && echo "$as_me:10347: result: ... $cf_attribute" >&5
  echo "${ECHO_T}... $cf_attribute" >&6
                         cat conftest.h >>confdefs.h
                         case $cf_attribute in #(vi
-@@ -9663,7 +10438,7 @@
+@@ -9663,7 +10380,7 @@
  fi
  
  ###    use option --enable-assertions to turn on generation of assertion code
 -echo "$as_me:9666: checking if you want to enable runtime assertions" >&5
-+echo "$as_me:10441: checking if you want to enable runtime assertions" >&5
++echo "$as_me:10383: checking if you want to enable runtime assertions" >&5
  echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
  
  # Check whether --enable-assertions or --disable-assertions was given.
-@@ -9673,7 +10448,7 @@
+@@ -9673,16 +10390,12 @@
  else
    with_assertions=no
  fi;
 -echo "$as_me:9676: result: $with_assertions" >&5
-+echo "$as_me:10451: result: $with_assertions" >&5
++echo "$as_me:10393: result: $with_assertions" >&5
  echo "${ECHO_T}$with_assertions" >&6
  if test -n "$GCC"
  then
-@@ -9727,7 +10502,7 @@
+        if test "$with_assertions" = no
+        then
+-               cat >>confdefs.h <<\EOF
+-#define NDEBUG 1
+-EOF
+-
+                CPPFLAGS="$CPPFLAGS -DNDEBUG"
+        else
+ 
+@@ -9727,7 +10440,7 @@
         ;;
  esac
  
 -echo "$as_me:9730: checking whether to add trace feature to all models" >&5
-+echo "$as_me:10505: checking whether to add trace feature to all models" >&5
++echo "$as_me:10443: checking whether to add trace feature to all models" >&5
  echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
  
  # Check whether --with-trace or --without-trace was given.
-@@ -9737,7 +10512,7 @@
+@@ -9737,7 +10450,7 @@
  else
    cf_with_trace=$cf_all_traces
  fi;
 -echo "$as_me:9740: result: $cf_with_trace" >&5
-+echo "$as_me:10515: result: $cf_with_trace" >&5
++echo "$as_me:10453: result: $cf_with_trace" >&5
  echo "${ECHO_T}$cf_with_trace" >&6
  
  if test "$cf_with_trace" = yes ; then
-@@ -9830,13 +10605,13 @@
+@@ -9830,13 +10543,13 @@
  *mingw32*) #(vi
         ;;
  *)
 -echo "$as_me:9833: checking for gettimeofday" >&5
-+echo "$as_me:10608: checking for gettimeofday" >&5
++echo "$as_me:10546: checking for gettimeofday" >&5
  echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
  if test "${ac_cv_func_gettimeofday+set}" = set; then
@@ -7399 +8060 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 9839 "configure"
-+#line 10614 "configure"
++#line 10552 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char gettimeofday (); below.  */
-@@ -9867,16 +10642,16 @@
+@@ -9859,7 +10572,7 @@
+ #if defined (__stub_gettimeofday) || defined (__stub___gettimeofday)
+ choke me
+ #else
+-f = gettimeofday;
++f = gettimeofday; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -9867,16 +10580,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:9870: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10645: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10583: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:9873: \$? = $ac_status" >&5
-+  echo "$as_me:10648: \$? = $ac_status" >&5
++  echo "$as_me:10586: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:9876: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10651: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10589: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9879: \$? = $ac_status" >&5
-+  echo "$as_me:10654: \$? = $ac_status" >&5
++  echo "$as_me:10592: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_gettimeofday=yes
  else
-@@ -9886,7 +10661,7 @@
+@@ -9886,7 +10599,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:9889: result: $ac_cv_func_gettimeofday" >&5
-+echo "$as_me:10664: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:10602: result: $ac_cv_func_gettimeofday" >&5
  echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
  if test $ac_cv_func_gettimeofday = yes; then
    cat >>confdefs.h <<\EOF
-@@ -9895,7 +10670,7 @@
+@@ -9895,7 +10608,7 @@
  
  else
  
 -echo "$as_me:9898: checking for gettimeofday in -lbsd" >&5
-+echo "$as_me:10673: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:10611: checking for gettimeofday in -lbsd" >&5
  echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
  if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9903,7 +10678,7 @@
+@@ -9903,7 +10616,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lbsd  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 9906 "configure"
-+#line 10681 "configure"
++#line 10619 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9922,16 +10697,16 @@
+@@ -9922,16 +10635,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:9925: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10700: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10638: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:9928: \$? = $ac_status" >&5
-+  echo "$as_me:10703: \$? = $ac_status" >&5
++  echo "$as_me:10641: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:9931: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10706: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10644: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9934: \$? = $ac_status" >&5
-+  echo "$as_me:10709: \$? = $ac_status" >&5
++  echo "$as_me:10647: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_bsd_gettimeofday=yes
  else
-@@ -9942,7 +10717,7 @@
+@@ -9942,7 +10655,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:9945: result: $ac_cv_lib_bsd_gettimeofday" >&5
-+echo "$as_me:10720: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:10658: result: $ac_cv_lib_bsd_gettimeofday" >&5
  echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
  if test $ac_cv_lib_bsd_gettimeofday = yes; then
    cat >>confdefs.h <<\EOF
-@@ -9957,13 +10732,13 @@
+@@ -9957,13 +10670,13 @@
  esac
  
  ###    Checks for header files.
 -echo "$as_me:9960: checking for ANSI C header files" >&5
-+echo "$as_me:10735: checking for ANSI C header files" >&5
++echo "$as_me:10673: checking for ANSI C header files" >&5
  echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
  if test "${ac_cv_header_stdc+set}" = set; then
@@ -7493 +8163 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 9966 "configure"
-+#line 10741 "configure"
++#line 10679 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -9971,13 +10746,13 @@
+@@ -9971,13 +10684,13 @@
  #include <float.h>
  
  _ACEOF
 -if { (eval echo "$as_me:9974: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:10749: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:10687: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -7509 +8179 @@
    cat conftest.err >&5
 -  echo "$as_me:9980: \$? = $ac_status" >&5
-+  echo "$as_me:10755: \$? = $ac_status" >&5
++  echo "$as_me:10693: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -9999,7 +10774,7 @@
+@@ -9999,7 +10712,7 @@
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10002 "configure"
-+#line 10777 "configure"
++#line 10715 "configure"
  #include "confdefs.h"
  #include <string.h>
  
-@@ -10017,7 +10792,7 @@
+@@ -10017,7 +10730,7 @@
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10020 "configure"
-+#line 10795 "configure"
++#line 10733 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  
-@@ -10038,7 +10813,7 @@
+@@ -10038,7 +10751,7 @@
    :
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10041 "configure"
-+#line 10816 "configure"
++#line 10754 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #if ((' ' & 0x0FF) == 0x020)
-@@ -10064,15 +10839,15 @@
+@@ -10064,15 +10777,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:10067: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10842: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10780: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:10070: \$? = $ac_status" >&5
-+  echo "$as_me:10845: \$? = $ac_status" >&5
++  echo "$as_me:10783: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:10072: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10847: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10785: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10075: \$? = $ac_status" >&5
-+  echo "$as_me:10850: \$? = $ac_status" >&5
++  echo "$as_me:10788: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -10085,7 +10860,7 @@
+@@ -10085,7 +10798,7 @@
  fi
  fi
  fi
 -echo "$as_me:10088: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:10863: result: $ac_cv_header_stdc" >&5
++echo "$as_me:10801: result: $ac_cv_header_stdc" >&5
  echo "${ECHO_T}$ac_cv_header_stdc" >&6
  if test $ac_cv_header_stdc = yes; then
  
-@@ -10098,13 +10873,13 @@
+@@ -10098,13 +10811,13 @@
  ac_header_dirent=no
  for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
    as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
 -echo "$as_me:10101: checking for $ac_hdr that defines DIR" >&5
-+echo "$as_me:10876: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:10814: checking for $ac_hdr that defines DIR" >&5
  echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -7581 +8251 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10107 "configure"
-+#line 10882 "configure"
++#line 10820 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <$ac_hdr>
-@@ -10119,16 +10894,16 @@
+@@ -10119,16 +10832,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:10122: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10897: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10835: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:10125: \$? = $ac_status" >&5
-+  echo "$as_me:10900: \$? = $ac_status" >&5
++  echo "$as_me:10838: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:10128: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10903: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10841: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10131: \$? = $ac_status" >&5
-+  echo "$as_me:10906: \$? = $ac_status" >&5
++  echo "$as_me:10844: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_Header=yes"
  else
-@@ -10138,7 +10913,7 @@
+@@ -10138,7 +10851,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:10141: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:10916: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:10854: result: `eval echo '${'$as_ac_Header'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<EOF
-@@ -10151,7 +10926,7 @@
+@@ -10151,7 +10864,7 @@
  done
  # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
  if test $ac_header_dirent = dirent.h; then
 -  echo "$as_me:10154: checking for opendir in -ldir" >&5
-+  echo "$as_me:10929: checking for opendir in -ldir" >&5
++  echo "$as_me:10867: checking for opendir in -ldir" >&5
  echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
  if test "${ac_cv_lib_dir_opendir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10159,7 +10934,7 @@
+@@ -10159,7 +10872,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldir  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 10162 "configure"
-+#line 10937 "configure"
++#line 10875 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10178,16 +10953,16 @@
+@@ -10178,16 +10891,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:10181: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10956: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10894: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:10184: \$? = $ac_status" >&5
-+  echo "$as_me:10959: \$? = $ac_status" >&5
++  echo "$as_me:10897: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:10187: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10962: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10900: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10190: \$? = $ac_status" >&5
-+  echo "$as_me:10965: \$? = $ac_status" >&5
++  echo "$as_me:10903: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_dir_opendir=yes
  else
-@@ -10198,14 +10973,14 @@
+@@ -10198,14 +10911,14 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:10201: result: $ac_cv_lib_dir_opendir" >&5
-+echo "$as_me:10976: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:10914: result: $ac_cv_lib_dir_opendir" >&5
  echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
  if test $ac_cv_lib_dir_opendir = yes; then
@@ -7667 +8337 @@
  else
 -  echo "$as_me:10208: checking for opendir in -lx" >&5
-+  echo "$as_me:10983: checking for opendir in -lx" >&5
++  echo "$as_me:10921: checking for opendir in -lx" >&5
  echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
  if test "${ac_cv_lib_x_opendir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10213,7 +10988,7 @@
+@@ -10213,7 +10926,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lx  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 10216 "configure"
-+#line 10991 "configure"
++#line 10929 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10232,16 +11007,16 @@
+@@ -10232,16 +10945,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:10235: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11010: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10948: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:10238: \$? = $ac_status" >&5
-+  echo "$as_me:11013: \$? = $ac_status" >&5
++  echo "$as_me:10951: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:10241: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11016: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10954: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10244: \$? = $ac_status" >&5
-+  echo "$as_me:11019: \$? = $ac_status" >&5
++  echo "$as_me:10957: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_x_opendir=yes
  else
-@@ -10252,7 +11027,7 @@
+@@ -10252,7 +10965,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:10255: result: $ac_cv_lib_x_opendir" >&5
-+echo "$as_me:11030: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:10968: result: $ac_cv_lib_x_opendir" >&5
  echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
  if test $ac_cv_lib_x_opendir = yes; then
    LIBS="$LIBS -lx"
-@@ -10260,13 +11035,13 @@
+@@ -10260,13 +10973,13 @@
  
  fi
  
 -echo "$as_me:10263: checking whether time.h and sys/time.h may both be included" >&5
-+echo "$as_me:11038: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:10976: checking whether time.h and sys/time.h may both be included" >&5
  echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
  if test "${ac_cv_header_time+set}" = set; then
@@ -7722 +8392 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10269 "configure"
-+#line 11044 "configure"
++#line 10982 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/time.h>
-@@ -10282,16 +11057,16 @@
+@@ -10282,16 +10995,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:10285: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11060: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10998: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:10288: \$? = $ac_status" >&5
-+  echo "$as_me:11063: \$? = $ac_status" >&5
++  echo "$as_me:11001: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:10291: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11066: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11004: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10294: \$? = $ac_status" >&5
-+  echo "$as_me:11069: \$? = $ac_status" >&5
++  echo "$as_me:11007: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_header_time=yes
  else
-@@ -10301,7 +11076,7 @@
+@@ -10301,7 +11014,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:10304: result: $ac_cv_header_time" >&5
-+echo "$as_me:11079: result: $ac_cv_header_time" >&5
++echo "$as_me:11017: result: $ac_cv_header_time" >&5
  echo "${ECHO_T}$ac_cv_header_time" >&6
  if test $ac_cv_header_time = yes; then
  
-@@ -10319,7 +11094,7 @@
+@@ -10319,7 +11032,7 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ac_main_return=return
  
 -echo "$as_me:10322: checking for $CC option to accept ANSI C" >&5
-+echo "$as_me:11097: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:11035: checking for $CC option to accept ANSI C" >&5
  echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
  if test "${ac_cv_prog_cc_stdc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10327,7 +11102,7 @@
+@@ -10327,7 +11040,7 @@
    ac_cv_prog_cc_stdc=no
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
 -#line 10330 "configure"
-+#line 11105 "configure"
++#line 11043 "configure"
  #include "confdefs.h"
  #include <stdarg.h>
  #include <stdio.h>
-@@ -10376,16 +11151,16 @@
+@@ -10376,16 +11089,16 @@
  do
    CC="$ac_save_CC $ac_arg"
    rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:10379: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11154: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11092: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:10382: \$? = $ac_status" >&5
-+  echo "$as_me:11157: \$? = $ac_status" >&5
++  echo "$as_me:11095: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:10385: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11160: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11098: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10388: \$? = $ac_status" >&5
-+  echo "$as_me:11163: \$? = $ac_status" >&5
++  echo "$as_me:11101: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_prog_cc_stdc=$ac_arg
  break
-@@ -10402,21 +11177,21 @@
+@@ -10402,21 +11115,21 @@
  
  case "x$ac_cv_prog_cc_stdc" in
    x|xno)
 -    echo "$as_me:10405: result: none needed" >&5
-+    echo "$as_me:11180: result: none needed" >&5
++    echo "$as_me:11118: result: none needed" >&5
  echo "${ECHO_T}none needed" >&6 ;;
    *)
 -    echo "$as_me:10408: result: $ac_cv_prog_cc_stdc" >&5
-+    echo "$as_me:11183: result: $ac_cv_prog_cc_stdc" >&5
++    echo "$as_me:11121: result: $ac_cv_prog_cc_stdc" >&5
  echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
      CC="$CC $ac_cv_prog_cc_stdc" ;;
@@ -7810 +8480 @@
  
 -echo "$as_me:10413: checking for an ANSI C-conforming const" >&5
-+echo "$as_me:11188: checking for an ANSI C-conforming const" >&5
++echo "$as_me:11126: checking for an ANSI C-conforming const" >&5
  echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
  if test "${ac_cv_c_const+set}" = set; then
@@ -7817 +8487 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10419 "configure"
-+#line 11194 "configure"
++#line 11132 "configure"
  #include "confdefs.h"
  
  int
-@@ -10474,16 +11249,16 @@
+@@ -10474,16 +11187,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:10477: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11252: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11190: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:10480: \$? = $ac_status" >&5
-+  echo "$as_me:11255: \$? = $ac_status" >&5
++  echo "$as_me:11193: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:10483: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11258: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11196: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10486: \$? = $ac_status" >&5
-+  echo "$as_me:11261: \$? = $ac_status" >&5
++  echo "$as_me:11199: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_c_const=yes
  else
-@@ -10493,7 +11268,7 @@
+@@ -10493,7 +11206,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:10496: result: $ac_cv_c_const" >&5
-+echo "$as_me:11271: result: $ac_cv_c_const" >&5
++echo "$as_me:11209: result: $ac_cv_c_const" >&5
  echo "${ECHO_T}$ac_cv_c_const" >&6
  if test $ac_cv_c_const = no; then
  
-@@ -10505,7 +11280,7 @@
+@@ -10505,7 +11218,7 @@
  
  ###    Checks for external-data
  
 -echo "$as_me:10508: checking if data-only library module links" >&5
-+echo "$as_me:11283: checking if data-only library module links" >&5
++echo "$as_me:11221: checking if data-only library module links" >&5
  echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
  if test "${cf_cv_link_dataonly+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10513,20 +11288,20 @@
+@@ -10513,20 +11226,20 @@
  
         rm -f conftest.a
         cat >conftest.$ac_ext <<EOF
 -#line 10516 "configure"
-+#line 11291 "configure"
++#line 11229 "configure"
  int    testdata[3] = { 123, 456, 789 };
  EOF
 -       if { (eval echo "$as_me:10519: \"$ac_compile\"") >&5
-+       if { (eval echo "$as_me:11294: \"$ac_compile\"") >&5
++       if { (eval echo "$as_me:11232: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:10522: \$? = $ac_status" >&5
-+  echo "$as_me:11297: \$? = $ac_status" >&5
++  echo "$as_me:11235: \$? = $ac_status" >&5
    (exit $ac_status); } ; then
                 mv conftest.o data.o && \
@@ -7881 +8551 @@
         cat >conftest.$ac_ext <<EOF
 -#line 10529 "configure"
-+#line 11304 "configure"
++#line 11242 "configure"
  int    testfunc()
  {
  #if defined(NeXT)
-@@ -10539,10 +11314,10 @@
+@@ -10539,10 +11252,10 @@
  #endif
  }
  EOF
 -       if { (eval echo "$as_me:10542: \"$ac_compile\"") >&5
-+       if { (eval echo "$as_me:11317: \"$ac_compile\"") >&5
++       if { (eval echo "$as_me:11255: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:10545: \$? = $ac_status" >&5
-+  echo "$as_me:11320: \$? = $ac_status" >&5
++  echo "$as_me:11258: \$? = $ac_status" >&5
    (exit $ac_status); }; then
                 mv conftest.o func.o && \
                 ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
-@@ -10555,7 +11330,7 @@
+@@ -10555,7 +11268,7 @@
    cf_cv_link_dataonly=unknown
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10558 "configure"
-+#line 11333 "configure"
++#line 11271 "configure"
  #include "confdefs.h"
  
         int main()
-@@ -10566,15 +11341,15 @@
+@@ -10566,15 +11279,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:10569: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11344: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11282: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:10572: \$? = $ac_status" >&5
-+  echo "$as_me:11347: \$? = $ac_status" >&5
++  echo "$as_me:11285: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:10574: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11349: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11287: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10577: \$? = $ac_status" >&5
-+  echo "$as_me:11352: \$? = $ac_status" >&5
++  echo "$as_me:11290: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_link_dataonly=yes
  else
-@@ -10589,7 +11364,7 @@
+@@ -10589,7 +11302,7 @@
  
  fi
  
 -echo "$as_me:10592: result: $cf_cv_link_dataonly" >&5
-+echo "$as_me:11367: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:11305: result: $cf_cv_link_dataonly" >&5
  echo "${ECHO_T}$cf_cv_link_dataonly" >&6
  
  if test "$cf_cv_link_dataonly" = no ; then
-@@ -10602,7 +11377,7 @@
+@@ -10602,7 +11315,7 @@
  
  ###    Checks for library functions.
  
 -echo "$as_me:10605: checking for working mkstemp" >&5
-+echo "$as_me:11380: checking for working mkstemp" >&5
++echo "$as_me:11318: checking for working mkstemp" >&5
  echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
  if test "${cf_cv_func_mkstemp+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10610,13 +11385,13 @@
+@@ -10610,68 +11323,10 @@
  
  rm -rf conftest*
  if test "$cross_compiling" = yes; then
 -  echo "$as_me:10613: checking for mkstemp" >&5
-+  echo "$as_me:11388: checking for mkstemp" >&5
- echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
- if test "${ac_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
+-echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
+-if test "${ac_cv_func_mkstemp+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
 -#line 10619 "configure"
-+#line 11394 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char mkstemp (); below.  */
-@@ -10647,16 +11422,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-#include "confdefs.h"
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char mkstemp (); below.  */
+-#include <assert.h>
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char mkstemp ();
+-char (*f) ();
+-
+-int
+-main ()
+-{
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_mkstemp) || defined (__stub___mkstemp)
+-choke me
+-#else
+-f = mkstemp;
+-#endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:10650: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11425: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
 -  echo "$as_me:10653: \$? = $ac_status" >&5
-+  echo "$as_me:11428: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:10656: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11431: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
 -  echo "$as_me:10659: \$? = $ac_status" >&5
-+  echo "$as_me:11434: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_mkstemp=yes
- else
-@@ -10666,12 +11441,12 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_mkstemp=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_func_mkstemp=no
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-fi
 -echo "$as_me:10669: result: $ac_cv_func_mkstemp" >&5
-+echo "$as_me:11444: result: $ac_cv_func_mkstemp" >&5
- echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
- 
+-echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+-
++  cf_cv_func_mkstemp=maybe
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10674 "configure"
-+#line 11449 "configure"
++#line 11329 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -10709,15 +11484,15 @@
+@@ -10709,15 +11364,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:10712: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11487: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11367: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:10715: \$? = $ac_status" >&5
-+  echo "$as_me:11490: \$? = $ac_status" >&5
++  echo "$as_me:11370: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:10717: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11492: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11372: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10720: \$? = $ac_status" >&5
-+  echo "$as_me:11495: \$? = $ac_status" >&5
++  echo "$as_me:11375: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_func_mkstemp=yes
  
-@@ -10732,7 +11507,7 @@
+@@ -10732,8 +11387,69 @@
  fi
  
  fi
 -echo "$as_me:10735: result: $cf_cv_func_mkstemp" >&5
-+echo "$as_me:11510: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:11390: result: $cf_cv_func_mkstemp" >&5
  echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
++if test "x$cf_cv_func_mkstemp" = xmaybe ; then
++       echo "$as_me:11393: checking for mkstemp" >&5
++echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
++if test "${ac_cv_func_mkstemp+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++#line 11399 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char mkstemp (); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char mkstemp ();
++char (*f) ();
++
++int
++main ()
++{
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_mkstemp) || defined (__stub___mkstemp)
++choke me
++#else
++f = mkstemp; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:11430: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:11433: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:11436: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:11439: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_mkstemp=yes
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++ac_cv_func_mkstemp=no
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:11449: result: $ac_cv_func_mkstemp" >&5
++echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
++
++fi
  if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then
         cat >>confdefs.h <<\EOF
-@@ -10741,13 +11516,13 @@
+ #define HAVE_MKSTEMP 1
+@@ -10741,13 +11457,13 @@
  
  fi
  
 -echo "$as_me:10744: checking return type of signal handlers" >&5
-+echo "$as_me:11519: checking return type of signal handlers" >&5
++echo "$as_me:11460: checking return type of signal handlers" >&5
  echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
  if test "${ac_cv_type_signal+set}" = set; then
@@ -8038 +8789 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10750 "configure"
-+#line 11525 "configure"
++#line 11466 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <signal.h>
-@@ -10769,16 +11544,16 @@
+@@ -10769,16 +11485,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:10772: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11547: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11488: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:10775: \$? = $ac_status" >&5
-+  echo "$as_me:11550: \$? = $ac_status" >&5
++  echo "$as_me:11491: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:10778: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11553: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11494: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10781: \$? = $ac_status" >&5
-+  echo "$as_me:11556: \$? = $ac_status" >&5
++  echo "$as_me:11497: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_signal=void
  else
-@@ -10788,7 +11563,7 @@
+@@ -10788,7 +11504,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:10791: result: $ac_cv_type_signal" >&5
-+echo "$as_me:11566: result: $ac_cv_type_signal" >&5
++echo "$as_me:11507: result: $ac_cv_type_signal" >&5
  echo "${ECHO_T}$ac_cv_type_signal" >&6
  
  cat >>confdefs.h <<EOF
-@@ -10800,12 +11575,13 @@
+@@ -10800,12 +11516,13 @@
         CXXFLAGS=`echo ${CXXFLAGS} | sed -e 's%-g %%' -e 's%-g$%%'`
  fi
@@ -8083 +8834 @@
  set dummy $cf_ada_make; ac_word=$2
 -echo "$as_me:10808: checking for $ac_word" >&5
-+echo "$as_me:11584: checking for $ac_word" >&5
++echo "$as_me:11525: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_gnat_exists+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10820,7 +11596,7 @@
+@@ -10820,7 +11537,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_gnat_exists="yes"
 -echo "$as_me:10823: found $ac_dir/$ac_word" >&5
-+echo "$as_me:11599: found $ac_dir/$ac_word" >&5
++echo "$as_me:11540: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -10829,31 +11605,32 @@
+@@ -10829,31 +11546,32 @@
  fi
  gnat_exists=$ac_cv_prog_gnat_exists
  if test -n "$gnat_exists"; then
 -  echo "$as_me:10832: result: $gnat_exists" >&5
-+  echo "$as_me:11608: result: $gnat_exists" >&5
++  echo "$as_me:11549: result: $gnat_exists" >&5
  echo "${ECHO_T}$gnat_exists" >&6
  else
 -  echo "$as_me:10835: result: no" >&5
-+  echo "$as_me:11611: result: no" >&5
++  echo "$as_me:11552: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
@@ -8115 +8866 @@
  
 -echo "$as_me:10843: checking for gnat version" >&5
-+echo "$as_me:11620: checking for gnat version" >&5
++echo "$as_me:11561: checking for gnat version" >&5
  echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
  cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
@@ -8121 +8872 @@
      sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 -echo "$as_me:10848: result: $cf_gnat_version" >&5
-+echo "$as_me:11625: result: $cf_gnat_version" >&5
++echo "$as_me:11566: result: $cf_gnat_version" >&5
  echo "${ECHO_T}$cf_gnat_version" >&6
  
@@ -8131 +8882 @@
  *)
 -       { echo "$as_me:10856: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
-+       { echo "$as_me:11633: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++       { echo "$as_me:11574: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
  echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
         cf_cv_prog_gnat_correct=no
         ;;
-@@ -10861,7 +11638,7 @@
+@@ -10861,7 +11579,7 @@
  
     # Extract the first word of "m4", so it can be a program name with args.
  set dummy m4; ac_word=$2
 -echo "$as_me:10864: checking for $ac_word" >&5
-+echo "$as_me:11641: checking for $ac_word" >&5
++echo "$as_me:11582: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_M4_exists+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10876,7 +11653,7 @@
+@@ -10876,7 +11594,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_M4_exists="yes"
 -echo "$as_me:10879: found $ac_dir/$ac_word" >&5
-+echo "$as_me:11656: found $ac_dir/$ac_word" >&5
++echo "$as_me:11597: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -10885,10 +11662,10 @@
+@@ -10885,10 +11603,10 @@
  fi
  M4_exists=$ac_cv_prog_M4_exists
  if test -n "$M4_exists"; then
 -  echo "$as_me:10888: result: $M4_exists" >&5
-+  echo "$as_me:11665: result: $M4_exists" >&5
++  echo "$as_me:11606: result: $M4_exists" >&5
  echo "${ECHO_T}$M4_exists" >&6
  else
 -  echo "$as_me:10891: result: no" >&5
-+  echo "$as_me:11668: result: no" >&5
++  echo "$as_me:11609: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -10897,7 +11674,7 @@
+@@ -10897,7 +11615,7 @@
        echo Ada95 binding required program m4 not found. Ada95 binding disabled.
     fi
     if test "$cf_cv_prog_gnat_correct" = yes; then
 -      echo "$as_me:10900: checking if GNAT works" >&5
-+      echo "$as_me:11677: checking if GNAT works" >&5
++      echo "$as_me:11618: checking if GNAT works" >&5
  echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
  
  rm -rf conftest* *~conftest*
-@@ -10925,7 +11702,7 @@
+@@ -10925,30 +11643,34 @@
  fi
  rm -rf conftest* *~conftest*
  
 -      echo "$as_me:10928: result: $cf_cv_prog_gnat_correct" >&5
-+      echo "$as_me:11705: result: $cf_cv_prog_gnat_correct" >&5
++      echo "$as_me:11646: result: $cf_cv_prog_gnat_correct" >&5
  echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
     fi
  fi
-@@ -10948,7 +11725,7 @@
-                        ;;
-                esac
+ 
+        if test "$cf_cv_prog_gnat_correct" = yes; then
+ 
+-               # make ADAFLAGS consistent with CFLAGS
+-               case "$CFLAGS" in
+-               *-g*)
++       echo "$as_me:11653: checking optimization options for ADAFLAGS" >&5
++echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
++       case "$CFLAGS" in
++       *-g*)
+ 
+        ADAFLAGS="$ADAFLAGS -g"
+ 
+-                       ;;
+-               esac
+-               case "$CFLAGS" in
+-               *-O*)
++               ;;
++       esac
++       case "$CFLAGS" in
++       *-O*)
++               cf_O_flag=`echo "$CFLAGS" |sed -e 's/^.*-O/-O/' -e 's/[         ].*//'`
+ 
+-       ADAFLAGS="$ADAFLAGS -O3"
++       ADAFLAGS="$ADAFLAGS $cf_O_flag"
+ 
+-                       ;;
+-               esac
++               ;;
++       esac
++       echo "$as_me:11670: result: $ADAFLAGS" >&5
++echo "${ECHO_T}$ADAFLAGS" >&6
  
 -echo "$as_me:10951: checking if GNAT supports generics" >&5
-+echo "$as_me:11728: checking if GNAT supports generics" >&5
++echo "$as_me:11673: checking if GNAT supports generics" >&5
  echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
  case $cf_gnat_version in #(vi
  3.[1-9]*|[4-9].*) #(vi
-@@ -10958,7 +11735,7 @@
+@@ -10958,7 +11680,7 @@
         cf_gnat_generics=no
         ;;
  esac
 -echo "$as_me:10961: result: $cf_gnat_generics" >&5
-+echo "$as_me:11738: result: $cf_gnat_generics" >&5
++echo "$as_me:11683: result: $cf_gnat_generics" >&5
  echo "${ECHO_T}$cf_gnat_generics" >&6
  
  if test "$cf_gnat_generics" = yes
-@@ -10970,7 +11747,7 @@
+@@ -10970,7 +11692,7 @@
         cf_generic_objects=
  fi
  
 -echo "$as_me:10973: checking if GNAT supports SIGINT" >&5
-+echo "$as_me:11750: checking if GNAT supports SIGINT" >&5
++echo "$as_me:11695: checking if GNAT supports SIGINT" >&5
  echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
  if test "${cf_cv_gnat_sigint+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -11018,7 +11795,7 @@
+@@ -11018,7 +11740,7 @@
  rm -rf conftest* *~conftest*
  
  fi
 -echo "$as_me:11021: result: $cf_cv_gnat_sigint" >&5
-+echo "$as_me:11798: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:11743: result: $cf_cv_gnat_sigint" >&5
  echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
  
  if test $cf_cv_gnat_sigint = yes ; then
-@@ -11027,7 +11804,7 @@
+@@ -11027,7 +11749,7 @@
         USE_GNAT_SIGINT="#"
  fi
  
 -echo "$as_me:11030: checking if GNAT pragma Unreferenced works" >&5
-+echo "$as_me:11807: checking if GNAT pragma Unreferenced works" >&5
++echo "$as_me:11752: checking if GNAT pragma Unreferenced works" >&5
  echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6
  if test "${cf_cv_pragma_unreferenced+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -11058,7 +11835,7 @@
+@@ -11058,7 +11780,7 @@
  rm -rf conftest* *~conftest*
  
  fi
 -echo "$as_me:11061: result: $cf_cv_pragma_unreferenced" >&5
-+echo "$as_me:11838: result: $cf_cv_pragma_unreferenced" >&5
++echo "$as_me:11783: result: $cf_cv_pragma_unreferenced" >&5
  echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6
  
  # if the pragma is supported, use it (needed in the Trace code).
-@@ -11071,7 +11848,7 @@
+@@ -11071,7 +11793,7 @@
  cf_gnat_libraries=no
  cf_gnat_projects=no
  
 -echo "$as_me:11074: checking if GNAT supports project files" >&5
-+echo "$as_me:11851: checking if GNAT supports project files" >&5
++echo "$as_me:11796: checking if GNAT supports project files" >&5
  echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
  case $cf_gnat_version in #(vi
  3.[0-9]*) #(vi
-@@ -11139,14 +11916,14 @@
+@@ -11139,14 +11861,14 @@
         esac
         ;;
  esac
 -echo "$as_me:11142: result: $cf_gnat_projects" >&5
-+echo "$as_me:11919: result: $cf_gnat_projects" >&5
++echo "$as_me:11864: result: $cf_gnat_projects" >&5
  echo "${ECHO_T}$cf_gnat_projects" >&6
  
@@ -8258 +9038 @@
  then
 -       echo "$as_me:11147: checking if GNAT supports libraries" >&5
-+       echo "$as_me:11924: checking if GNAT supports libraries" >&5
++       echo "$as_me:11869: checking if GNAT supports libraries" >&5
  echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
 -       echo "$as_me:11149: result: $cf_gnat_libraries" >&5
-+       echo "$as_me:11926: result: $cf_gnat_libraries" >&5
++       echo "$as_me:11871: result: $cf_gnat_libraries" >&5
  echo "${ECHO_T}$cf_gnat_libraries" >&6
  fi
  
-@@ -11166,7 +11943,7 @@
+@@ -11166,7 +11888,7 @@
         USE_GNAT_LIBRARIES="#"
  fi
  
 -echo "$as_me:11169: checking for ada-compiler" >&5
-+echo "$as_me:11946: checking for ada-compiler" >&5
++echo "$as_me:11891: checking for ada-compiler" >&5
  echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
  
  # Check whether --with-ada-compiler or --without-ada-compiler was given.
-@@ -11177,12 +11954,12 @@
+@@ -11177,12 +11899,12 @@
    cf_ada_compiler=gnatmake
  fi;
  
 -echo "$as_me:11180: result: $cf_ada_compiler" >&5
-+echo "$as_me:11957: result: $cf_ada_compiler" >&5
++echo "$as_me:11902: result: $cf_ada_compiler" >&5
  echo "${ECHO_T}$cf_ada_compiler" >&6
  
@@ -8285 +9065 @@
  
 -echo "$as_me:11185: checking for ada-include" >&5
-+echo "$as_me:11962: checking for ada-include" >&5
++echo "$as_me:11907: checking for ada-include" >&5
  echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
  
  # Check whether --with-ada-include or --without-ada-include was given.
-@@ -11218,7 +11995,7 @@
+@@ -11206,7 +11928,7 @@
+   ;;
+ .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+   ;;
+-.\${*prefix}*) #(vi
++.\${*prefix}*|.\${*dir}*) #(vi
+   eval withval="$withval"
+   case ".$withval" in #(vi
+   .NONE/*)
+@@ -11218,7 +11940,7 @@
    withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    ;;
  *)
 -  { { echo "$as_me:11221: error: expected a pathname, not \"$withval\"" >&5
-+  { { echo "$as_me:11998: error: expected a pathname, not \"$withval\"" >&5
++  { { echo "$as_me:11943: error: expected a pathname, not \"$withval\"" >&5
  echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
     { (exit 1); exit 1; }; }
    ;;
-@@ -11227,10 +12004,10 @@
+@@ -11227,10 +11949,10 @@
  fi
  ADA_INCLUDE="$withval"
  
 -echo "$as_me:11230: result: $ADA_INCLUDE" >&5
-+echo "$as_me:12007: result: $ADA_INCLUDE" >&5
++echo "$as_me:11952: result: $ADA_INCLUDE" >&5
  echo "${ECHO_T}$ADA_INCLUDE" >&6
  
 -echo "$as_me:11233: checking for ada-objects" >&5
-+echo "$as_me:12010: checking for ada-objects" >&5
++echo "$as_me:11955: checking for ada-objects" >&5
  echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
  
  # Check whether --with-ada-objects or --without-ada-objects was given.
-@@ -11266,7 +12043,7 @@
+@@ -11254,7 +11976,7 @@
+   ;;
+ .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+   ;;
+-.\${*prefix}*) #(vi
++.\${*prefix}*|.\${*dir}*) #(vi
+   eval withval="$withval"
+   case ".$withval" in #(vi
+   .NONE/*)
+@@ -11266,7 +11988,7 @@
    withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    ;;
  *)
 -  { { echo "$as_me:11269: error: expected a pathname, not \"$withval\"" >&5
-+  { { echo "$as_me:12046: error: expected a pathname, not \"$withval\"" >&5
++  { { echo "$as_me:11991: error: expected a pathname, not \"$withval\"" >&5
  echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
     { (exit 1); exit 1; }; }
    ;;
-@@ -11275,10 +12052,10 @@
+@@ -11275,10 +11997,10 @@
  fi
  ADA_OBJECTS="$withval"
  
 -echo "$as_me:11278: result: $ADA_OBJECTS" >&5
-+echo "$as_me:12055: result: $ADA_OBJECTS" >&5
++echo "$as_me:12000: result: $ADA_OBJECTS" >&5
  echo "${ECHO_T}$ADA_OBJECTS" >&6
  
 -echo "$as_me:11281: checking if an Ada95 shared-library should be built" >&5
-+echo "$as_me:12058: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:12003: checking if an Ada95 shared-library should be built" >&5
  echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
  
  # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
-@@ -11288,7 +12065,7 @@
+@@ -11288,7 +12010,7 @@
  else
    with_ada_sharedlib=no
  fi;
 -echo "$as_me:11291: result: $with_ada_sharedlib" >&5
-+echo "$as_me:12068: result: $with_ada_sharedlib" >&5
++echo "$as_me:12013: result: $with_ada_sharedlib" >&5
  echo "${ECHO_T}$with_ada_sharedlib" >&6
  
  ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
-@@ -11304,12 +12081,12 @@
+@@ -11304,12 +12026,12 @@
  fi
  
         else
 -               { { echo "$as_me:11307: error: No usable Ada compiler found" >&5
-+               { { echo "$as_me:12084: error: No usable Ada compiler found" >&5
++               { { echo "$as_me:12029: error: No usable Ada compiler found" >&5
  echo "$as_me: error: No usable Ada compiler found" >&2;}
     { (exit 1); exit 1; }; }
@@ -8353 +9151 @@
  else
 -       { { echo "$as_me:11312: error: The Ada compiler is needed for this package" >&5
-+       { { echo "$as_me:12089: error: The Ada compiler is needed for this package" >&5
++       { { echo "$as_me:12034: error: The Ada compiler is needed for this package" >&5
  echo "$as_me: error: The Ada compiler is needed for this package" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -11317,7 +12094,9 @@
+@@ -11317,7 +12039,9 @@
  ################################################################################
  
@@ -8368 +9166 @@
  ### Construct the list of include-directories to be generated
  
-@@ -11354,7 +12133,7 @@
+@@ -11354,7 +12078,7 @@
  fi
  
  ### Build up pieces for makefile rules
 -echo "$as_me:11357: checking default library suffix" >&5
-+echo "$as_me:12136: checking default library suffix" >&5
++echo "$as_me:12081: checking default library suffix" >&5
  echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
  
         case $DFT_LWR_MODEL in
-@@ -11365,10 +12144,10 @@
+@@ -11365,10 +12089,10 @@
         shared)  DFT_ARG_SUFFIX=''   ;;
         esac
         test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
 -echo "$as_me:11368: result: $DFT_ARG_SUFFIX" >&5
-+echo "$as_me:12147: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:12092: result: $DFT_ARG_SUFFIX" >&5
  echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
  
 -echo "$as_me:11371: checking default library-dependency suffix" >&5
-+echo "$as_me:12150: checking default library-dependency suffix" >&5
++echo "$as_me:12095: checking default library-dependency suffix" >&5
  echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
  
         case $DFT_LWR_MODEL in #(vi
-@@ -11390,7 +12169,7 @@
+@@ -11390,11 +12114,11 @@
                 ;;
         shared) #(vi
@@ -8399 +9197 @@
                         DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
                         ;;
-@@ -11421,10 +12200,10 @@
+-               cygwin*) #(vi
++               cygwin*|mingw*) #(vi
+                        DFT_LIB_SUFFIX='.dll'
+                        DFT_DEP_SUFFIX='.dll.a'
+                        ;;
+@@ -11421,10 +12145,10 @@
         esac
         test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}"
         test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}"
 -echo "$as_me:11424: result: $DFT_DEP_SUFFIX" >&5
-+echo "$as_me:12203: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:12148: result: $DFT_DEP_SUFFIX" >&5
  echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
  
 -echo "$as_me:11427: checking default object directory" >&5
-+echo "$as_me:12206: checking default object directory" >&5
++echo "$as_me:12151: checking default object directory" >&5
  echo $ECHO_N "checking default object directory... $ECHO_C" >&6
  
         case $DFT_LWR_MODEL in
-@@ -11440,7 +12219,7 @@
+@@ -11440,7 +12164,7 @@
                         DFT_OBJ_SUBDIR='obj_s' ;;
                 esac
         esac
 -echo "$as_me:11443: result: $DFT_OBJ_SUBDIR" >&5
-+echo "$as_me:12222: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:12167: result: $DFT_OBJ_SUBDIR" >&5
  echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
  
  ### Set up low-level terminfo dependencies for makefiles.
-@@ -11656,7 +12435,7 @@
+@@ -11656,7 +12380,7 @@
  : ${CONFIG_STATUS=./config.status}
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
 -{ echo "$as_me:11659: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:12438: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:12383: creating $CONFIG_STATUS" >&5
  echo "$as_me: creating $CONFIG_STATUS" >&6;}
  cat >$CONFIG_STATUS <<_ACEOF
  #! $SHELL
-@@ -11832,7 +12611,7 @@
+@@ -11788,7 +12512,7 @@
+ cat >>$CONFIG_STATUS <<EOF
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.52.20101002,
++configured by $0, generated by GNU Autoconf 2.52.20120811,
+   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+ 
+ Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+@@ -11832,7 +12556,7 @@
      echo "$ac_cs_version"; exit 0 ;;
    --he | --h)
      # Conflict between --help and --header
 -    { { echo "$as_me:11835: error: ambiguous option: $1
-+    { { echo "$as_me:12614: error: ambiguous option: $1
++    { { echo "$as_me:12559: error: ambiguous option: $1
  Try \`$0 --help' for more information." >&5
  echo "$as_me: error: ambiguous option: $1
  Try \`$0 --help' for more information." >&2;}
-@@ -11851,7 +12630,7 @@
+@@ -11851,7 +12575,7 @@
      ac_need_defaults=false;;
  
    # This is an error.
 -  -*) { { echo "$as_me:11854: error: unrecognized option: $1
-+  -*) { { echo "$as_me:12633: error: unrecognized option: $1
++  -*) { { echo "$as_me:12578: error: unrecognized option: $1
  Try \`$0 --help' for more information." >&5
  echo "$as_me: error: unrecognized option: $1
  Try \`$0 --help' for more information." >&2;}
-@@ -11894,6 +12673,7 @@
+@@ -11870,7 +12594,7 @@
+ ## Running config.status.  ##
+ ## ----------------------- ##
+ 
+-This file was extended by $as_me 2.52.20101002, executed with
++This file was extended by $as_me 2.52.20120811, executed with
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+   CONFIG_LINKS    = $CONFIG_LINKS
+@@ -11892,8 +12616,8 @@
+ AWK="$AWK"
+ DFT_ARG_SUFFIX="$DFT_ARG_SUFFIX"
  DFT_LWR_MODEL="$DFT_LWR_MODEL"
- ECHO_LINK="$ECHO_LINK"
+-ECHO_LINK="$ECHO_LINK"
  LIB_NAME="$LIB_NAME"
 +LIB_PREFIX="$LIB_PREFIX"
@@ -8456 +9279 @@
  LN_S="$LN_S"
  NCURSES_MAJOR="$NCURSES_MAJOR"
-@@ -11922,7 +12702,7 @@
+@@ -11922,7 +12646,7 @@
    "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
    "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
 -  *) { { echo "$as_me:11925: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:12705: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:12649: error: invalid argument: $ac_config_target" >&5
  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
     { (exit 1); exit 1; }; };;
    esac
-@@ -12061,6 +12841,7 @@
+@@ -11981,6 +12705,7 @@
+ s,@bindir@,$bindir,;t t
+ s,@sbindir@,$sbindir,;t t
+ s,@libexecdir@,$libexecdir,;t t
++s,@datarootdir@,$datarootdir,;t t
+ s,@datadir@,$datadir,;t t
+ s,@sysconfdir@,$sysconfdir,;t t
+ s,@sharedstatedir@,$sharedstatedir,;t t
+@@ -12061,6 +12786,7 @@
  s,@DFT_LWR_MODEL@,$DFT_LWR_MODEL,;t t
  s,@DFT_UPR_MODEL@,$DFT_UPR_MODEL,;t t
@@ -8473 +9304 @@
  s,@NCURSES_MINOR@,$NCURSES_MINOR,;t t
  s,@NCURSES_PATCH@,$NCURSES_PATCH,;t t
-@@ -12083,6 +12864,7 @@
+@@ -12083,13 +12809,18 @@
  s,@LOCAL_LDFLAGS@,$LOCAL_LDFLAGS,;t t
  s,@LOCAL_LDFLAGS2@,$LOCAL_LDFLAGS2,;t t
@@ -8481 +9312 @@
  s,@NCURSES_EXT_FUNCS@,$NCURSES_EXT_FUNCS,;t t
  s,@NCURSES_CONST@,$NCURSES_CONST,;t t
-@@ -12109,7 +12891,8 @@
+ s,@PTHREAD@,$PTHREAD,;t t
+ s,@cf_cv_enable_reentrant@,$cf_cv_enable_reentrant,;t t
+ s,@NCURSES_WRAP_PREFIX@,$NCURSES_WRAP_PREFIX,;t t
+-s,@ECHO_LINK@,$ECHO_LINK,;t t
++s,@ECHO_LT@,$ECHO_LT,;t t
++s,@ECHO_LD@,$ECHO_LD,;t t
++s,@RULE_CC@,$RULE_CC,;t t
++s,@SHOW_CC@,$SHOW_CC,;t t
++s,@ECHO_CC@,$ECHO_CC,;t t
+ s,@ADAFLAGS@,$ADAFLAGS,;t t
+ s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t
+ s,@ADA_TRACE@,$ADA_TRACE,;t t
+@@ -12109,7 +12840,8 @@
  s,@ADA_OBJECTS@,$ADA_OBJECTS,;t t
  s,@ADA_SHAREDLIB@,$ADA_SHAREDLIB,;t t
@@ -8491 +9334 @@
  s,@DFT_ARG_SUFFIX@,$DFT_ARG_SUFFIX,;t t
  s,@DFT_DEP_SUFFIX@,$DFT_DEP_SUFFIX,;t t
-@@ -12237,7 +13020,7 @@
+@@ -12237,7 +12969,7 @@
    esac
  
    if test x"$ac_file" != x-; then
 -    { echo "$as_me:12240: creating $ac_file" >&5
-+    { echo "$as_me:13023: creating $ac_file" >&5
++    { echo "$as_me:12972: creating $ac_file" >&5
  echo "$as_me: creating $ac_file" >&6;}
      rm -f "$ac_file"
    fi
-@@ -12255,7 +13038,7 @@
+@@ -12255,7 +12987,7 @@
        -) echo $tmp/stdin ;;
        [\\/$]*)
           # Absolute (can't be DOS-style, as IFS=:)
 -         test -f "$f" || { { echo "$as_me:12258: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:13041: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:12990: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           echo $f;;
-@@ -12268,7 +13051,7 @@
+@@ -12268,7 +13000,7 @@
             echo $srcdir/$f
           else
             # /dev/null tree
 -           { { echo "$as_me:12271: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:13054: error: cannot find input file: $f" >&5
++           { { echo "$as_me:13003: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           fi;;
-@@ -12334,7 +13117,7 @@
+@@ -12334,7 +13066,7 @@
    * )   ac_file_in=$ac_file.in ;;
    esac
  
 -  test x"$ac_file" != x- && { echo "$as_me:12337: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:13120: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:13069: creating $ac_file" >&5
  echo "$as_me: creating $ac_file" >&6;}
  
    # First look for the input files in the build tree, otherwise in the
-@@ -12345,7 +13128,7 @@
+@@ -12345,7 +13077,7 @@
        -) echo $tmp/stdin ;;
        [\\/$]*)
           # Absolute (can't be DOS-style, as IFS=:)
 -         test -f "$f" || { { echo "$as_me:12348: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:13131: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:13080: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           echo $f;;
-@@ -12358,7 +13141,7 @@
+@@ -12358,7 +13090,7 @@
             echo $srcdir/$f
           else
             # /dev/null tree
 -           { { echo "$as_me:12361: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:13144: error: cannot find input file: $f" >&5
++           { { echo "$as_me:13093: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           fi;;
-@@ -12416,7 +13199,7 @@
+@@ -12416,7 +13148,7 @@
    rm -f $tmp/in
    if test x"$ac_file" != x-; then
      if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
 -      { echo "$as_me:12419: $ac_file is unchanged" >&5
-+      { echo "$as_me:13202: $ac_file is unchanged" >&5
++      { echo "$as_me:13151: $ac_file is unchanged" >&5
  echo "$as_me: $ac_file is unchanged" >&6;}
      else
        ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 diff -Naur ncurses-5.9.orig/Ada95/configure.in ncurses-5.9/Ada95/configure.in
---- ncurses-5.9.orig/Ada95/configure.in 2012-02-16 18:25:12.619808985 +0000
-+++ ncurses-5.9/Ada95/configure.in      2012-02-16 18:25:13.179823762 +0000
+--- ncurses-5.9.orig/Ada95/configure.in 2012-08-25 19:57:59.379901042 +0000
++++ ncurses-5.9/Ada95/configure.in      2012-08-25 19:58:01.333225137 +0000
 @@ -1,5 +1,5 @@
  dnl***************************************************************************
@@ -8569 +9412 @@
  dnl
 -dnl $Id: configure.in,v 1.30 2011/03/31 22:49:22 tom Exp $
-+dnl $Id: configure.in,v 1.38 2012/01/22 00:50:42 tom Exp $
++dnl $Id: configure.in,v 1.41 2012/05/05 20:54:52 tom Exp $
  dnl Process this file with autoconf to produce a configure script.
  dnl
@@ -8577 +9420 @@
  AC_PREREQ(2.13.20020210)
 -AC_REVISION($Revision: 1.30 $)
-+AC_REVISION($Revision: 1.38 $)
++AC_REVISION($Revision: 1.41 $)
  AC_INIT(gen/gen.c)
  AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
  
+@@ -54,7 +54,7 @@
+ CF_CFG_DEFAULTS
+ 
+ ###    Checks for programs.
+-AC_PROG_CC
++AC_PROG_CC(gnatgcc gcc cc)
+ CF_GCC_VERSION
+ 
+ AC_PROG_CPP
 @@ -75,28 +75,8 @@
  
@@ -8632 +9484 @@
  AC_MSG_CHECKING(if you want broken-linker support code)
  AC_ARG_ENABLE(broken_linker,
-@@ -514,7 +490,7 @@
+@@ -394,18 +370,7 @@
+ CF_HELP_MESSAGE(Testing/development Options:)
+ 
+ ###    use option --disable-echo to suppress full display compiling commands
+-AC_MSG_CHECKING(if you want to display full commands during build)
+-AC_ARG_ENABLE(echo,
+-       [  --enable-echo           build: display "compiling" commands (default)],
+-       [with_echo=$enableval],
+-       [with_echo=yes])
+-if test "$with_echo" = yes; then
+-       ECHO_LINK=
+-else
+-       ECHO_LINK='@ echo linking $@ ... ;'
+-fi
+-AC_MSG_RESULT($with_echo)
+-AC_SUBST(ECHO_LINK)
++CF_DISABLE_ECHO
+ 
+ ###    use option --enable-warnings to turn on all gcc warnings
+ AC_MSG_CHECKING(if you want to see compiler warnings)
+@@ -431,7 +396,6 @@
+ then
+        if test "$with_assertions" = no
+        then
+-               AC_DEFINE(NDEBUG)
+                CPPFLAGS="$CPPFLAGS -DNDEBUG"
+        else
+                CF_ADD_ADAFLAGS(-gnata)
+@@ -514,24 +478,13 @@
  fi
  
@@ -8641 +9521 @@
  dnl At the moment we support no other Ada95 compiler.
  if test "$cf_with_ada" != "no" ; then
-@@ -556,8 +532,10 @@
+        CF_PROG_GNAT
+        if test "$cf_cv_prog_gnat_correct" = yes; then
+-
+-               # make ADAFLAGS consistent with CFLAGS
+-               case "$CFLAGS" in
+-               *-g*)
+-                       CF_ADD_ADAFLAGS(-g)
+-                       ;;
+-               esac
+-               case "$CFLAGS" in
+-               *-O*)
+-                       CF_ADD_ADAFLAGS(-O3)
+-                       ;;
+-               esac
++               CF_FIXUP_ADAFLAGS
+ 
+                CF_GNAT_GENERICS
+                CF_GNAT_SIGINT
+@@ -556,8 +509,10 @@
  ################################################################################
  
@@ -8654 +9552 @@
  ### Construct the list of include-directories to be generated
  CF_INCLUDE_DIRS
-@@ -658,6 +636,7 @@
+@@ -656,8 +611,8 @@
+ AWK="$AWK"
+ DFT_ARG_SUFFIX="$DFT_ARG_SUFFIX"
  DFT_LWR_MODEL="$DFT_LWR_MODEL"
- ECHO_LINK="$ECHO_LINK"
+-ECHO_LINK="$ECHO_LINK"
  LIB_NAME="$LIB_NAME"
 +LIB_PREFIX="$LIB_PREFIX"
@@ -8662 +9562 @@
  LN_S="$LN_S"
  NCURSES_MAJOR="$NCURSES_MAJOR"
+diff -Naur ncurses-5.9.orig/Ada95/doc/Makefile.in ncurses-5.9/Ada95/doc/Makefile.in
+--- ncurses-5.9.orig/Ada95/doc/Makefile.in      2012-08-25 19:57:59.376567724 +0000
++++ ncurses-5.9/Ada95/doc/Makefile.in   2012-08-25 19:58:02.286553964 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.in,v 1.2 2011/03/26 19:26:17 tom Exp $
++# $Id: Makefile.in,v 1.3 2012/08/11 21:31:56 tom Exp $
+ ##############################################################################
+ # Copyright (c) 2011 Free Software Foundation, Inc.                          #
+ #                                                                            #
+@@ -38,6 +38,7 @@
+ srcdir         = @srcdir@
+ prefix         = @prefix@
+ exec_prefix    = @exec_prefix@
++datarootdir    = @datarootdir@
+ datadir                = @datadir@
+ mandir         = @mandir@
+ 
 diff -Naur ncurses-5.9.orig/Ada95/gen/Makefile.in ncurses-5.9/Ada95/gen/Makefile.in
---- ncurses-5.9.orig/Ada95/gen/Makefile.in      2012-02-16 18:25:12.619808985 +0000
-+++ ncurses-5.9/Ada95/gen/Makefile.in   2012-02-16 18:25:12.907816584 +0000
+--- ncurses-5.9.orig/Ada95/gen/Makefile.in      2012-08-25 19:57:59.379901042 +0000
++++ ncurses-5.9/Ada95/gen/Makefile.in   2012-08-25 19:58:01.003226698 +0000
+@@ -1,5 +1,5 @@
+ ##############################################################################
+-# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.                #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
 @@ -28,7 +28,7 @@
  #
@@ -8670 +9594 @@
  #
 -#  $Id: Makefile.in,v 1.74 2011/03/26 23:36:30 tom Exp $
-+#  $Id: Makefile.in,v 1.75 2011/09/24 14:41:24 nix Exp $
++#  $Id: Makefile.in,v 1.76 2012/03/17 16:45:38 tom Exp $
  #
  .SUFFIXES:
@@ -8683 +9607 @@
  RANLIB         = @RANLIB@
  
+@@ -179,7 +179,7 @@
+        -rm -f $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
+ 
+ $(PROG_GENERATE):  gen.o
+-       @ECHO_LINK@ $(LINK) $(CFLAGS_NORMAL) gen.o $(LD_FLAGS) -o $@
++       @ECHO_LD@ $(LINK) $(CFLAGS_NORMAL) gen.o $(LD_FLAGS) -o $@
+ 
+ gen.o: $(srcdir)/gen.c
+        $(HOST_CC) $(CFLAGS_NORMAL) -c -o $@ $(srcdir)/gen.c
 @@ -411,7 +411,7 @@
         @mkdir -p $(HTML_DIR)
@@ -8693 +9626 @@
            h=`basename $$f` ;\
 diff -Naur ncurses-5.9.orig/Ada95/gen/gen.c ncurses-5.9/Ada95/gen/gen.c
---- ncurses-5.9.orig/Ada95/gen/gen.c    2012-02-16 18:25:12.619808985 +0000
-+++ ncurses-5.9/Ada95/gen/gen.c 2012-02-16 18:25:12.907816584 +0000
+--- ncurses-5.9.orig/Ada95/gen/gen.c    2012-08-25 19:57:59.379901042 +0000
++++ ncurses-5.9/Ada95/gen/gen.c 2012-08-25 19:57:59.859898773 +0000
 @@ -32,7 +32,7 @@
  
@@ -8779 +9712 @@
    printf("   --               different on your system.");
  }
+diff -Naur ncurses-5.9.orig/Ada95/samples/Makefile.in ncurses-5.9/Ada95/samples/Makefile.in
+--- ncurses-5.9.orig/Ada95/samples/Makefile.in  2012-08-25 19:57:59.376567724 +0000
++++ ncurses-5.9/Ada95/samples/Makefile.in       2012-08-25 19:58:02.286553964 +0000
+@@ -28,7 +28,7 @@
+ #
+ #  Author:  Juergen Pfeifer, 1996
+ #
+-#  $Id: Makefile.in,v 1.46 2011/03/28 23:45:08 tom Exp $
++#  $Id: Makefile.in,v 1.47 2012/08/11 21:31:56 tom Exp $
+ #
+ .SUFFIXES:
+ 
+@@ -42,6 +42,7 @@
+ prefix         = @prefix@
+ exec_prefix    = @exec_prefix@
+ bindir         = @bindir@
++datarootdir    = @datarootdir@
+ datadir                = @datadir@
+ libdir         = @libdir@
+ includedir     = @includedir@
 diff -Naur ncurses-5.9.orig/Ada95/src/Makefile.in ncurses-5.9/Ada95/src/Makefile.in
---- ncurses-5.9.orig/Ada95/src/Makefile.in      2012-02-16 18:25:12.619808985 +0000
-+++ ncurses-5.9/Ada95/src/Makefile.in   2012-02-16 18:25:12.907816584 +0000
+--- ncurses-5.9.orig/Ada95/src/Makefile.in      2012-08-25 19:57:59.383234360 +0000
++++ ncurses-5.9/Ada95/src/Makefile.in   2012-08-25 19:57:59.859898773 +0000
 @@ -28,7 +28,7 @@
  #
@@ -8856 +9809 @@
  install \
 diff -Naur ncurses-5.9.orig/INSTALL ncurses-5.9/INSTALL
---- ncurses-5.9.orig/INSTALL    2012-02-16 18:25:12.635809407 +0000
-+++ ncurses-5.9/INSTALL 2012-02-16 18:25:13.251825661 +0000
+--- ncurses-5.9.orig/INSTALL    2012-08-25 19:57:59.396567629 +0000
++++ ncurses-5.9/INSTALL 2012-08-25 19:58:02.289887281 +0000
 @@ -1,5 +1,5 @@
  -------------------------------------------------------------------------------
@@ -8870 +9823 @@
  -------------------------------------------------------------------------------
 --- $Id: INSTALL,v 1.155 2011/03/31 08:27:24 tom Exp $
-+-- $Id: INSTALL,v 1.163 2012/02/11 16:20:42 tom Exp $
++-- $Id: INSTALL,v 1.166 2012/08/11 20:12:34 tom Exp $
  ---------------------------------------------------------------------
               How to install Ncurses/Terminfo on your system
@@ -8895 +9848 @@
                 configure --with-ticlib --with-shared --disable-tic-depends
  
-@@ -616,6 +617,12 @@
+@@ -555,6 +556,9 @@
+        library by reducing global and static variables.  This option is also
+        set if --with-pthread is used.
+ 
++       Enabling this option adds a "t" to the library names, except for the
++       special case when --enable-weak-symbols is also used.
++
+     --enable-rpath
+        Use rpath option when generating shared libraries, and (with some
+        restrictions) when linking the corresponding programs.  This originally
+@@ -595,6 +599,14 @@
+        reducing the need for juggling the global SP value with set_term() and
+        delscreen().
+ 
++    --enable-string-hacks
++       Controls whether strlcat and strlcpy may be used.  The same issue
++       applies to OpenBSD's warnings about snprintf, noting that this function
++       is weakly standardized.
++
++       Aside from stifling these warnings, there is no functional improvement
++       in ncurses.
++
+     --enable-symlinks
+        If your system supports symbolic links, make tic use symbolic links
+        rather than hard links to save diskspace when writing aliases in the
+@@ -616,6 +628,12 @@
         match is found in the terminfo database.  See also the --enable-getcap
         and --enable-getcap-cache options.
@@ -8908 +9886 @@
         Turn on GCC compiler warnings.  There should be only a few.
  
-@@ -824,7 +831,17 @@
+@@ -824,7 +842,17 @@
         NOTE: a few systems build shared libraries with fixed pathnames; this
         option probably will not work for those configurations.
@@ -8927 +9905 @@
         overrides all other library model specifications.  Note that libtool
         must already be installed, uses makefile rules dependent on GNU make,
-@@ -904,6 +921,10 @@
+@@ -904,6 +932,10 @@
      --with-pkg-config=[DIR]
         Check for pkg-config, optionally specifying its path.
@@ -8938 +9916 @@
         Generate profile-libraries These are named by adding "_p" to the root,
         e.g., libncurses_p.a
-@@ -1000,6 +1021,14 @@
+@@ -996,10 +1028,27 @@
+        library dependencies for tic and other programs built with the tic
+        library.
+ 
++    --with-tparm-arg[=XXX]
++       Override the type used for tparm() arguments, which normally is a
++       "long".  However the function must assume that its arguments can hold a
++       pointer to char's which is not always workable for 64-bit platforms.  A
++       better choice would be intptr_t, which was not available at the time
++       tparm's interface was defined.
++
++       If the option is not given, this defaults to "long".
++
+     --with-trace
         Configure the trace() function as part of the all models of the ncurses
         library.  Normally it is part of the debug (libncurses_g) library only.
@@ -8953 +9944 @@
         For testing, compile with debug option.
         This also sets the --disable-leaks option.
-@@ -1024,6 +1053,8 @@
+@@ -1024,6 +1073,8 @@
         install as "ncurses.h" and modify the installed headers and manpages
         accordingly.
@@ -8962 +9953 @@
         XSI curses declares "bool" as part of the interface.  C++ also declares
         "bool".  Neither specifies the size and type of booleans, but both
-@@ -1726,20 +1757,37 @@
+@@ -1726,20 +1777,37 @@
         By default, there are no entries on the fallback list.  After you have
         built the ncurses suite for the first time, you can change the list
@@ -9005 +9996 @@
         Any non-empty fallback list is const-ed and therefore lives in sharable
 diff -Naur ncurses-5.9.orig/MANIFEST ncurses-5.9/MANIFEST
---- ncurses-5.9.orig/MANIFEST   2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/MANIFEST        2012-02-16 18:25:13.063820699 +0000
-@@ -545,6 +545,7 @@
+--- ncurses-5.9.orig/MANIFEST   2012-08-25 19:57:59.429900806 +0000
++++ ncurses-5.9/MANIFEST        2012-08-25 19:58:01.833222773 +0000
+@@ -545,6 +545,8 @@
  ./include/nc_alloc.h
  ./include/nc_mingw.h
  ./include/nc_panel.h
++./include/nc_string.h
 +./include/nc_termios.h
  ./include/nc_tparm.h
  ./include/ncurses_cfg.hin
  ./include/ncurses_defs
-@@ -764,7 +765,6 @@
+@@ -764,7 +766,6 @@
  ./mk-0th.awk
  ./mk-1st.awk
@@ -9023 +10015 @@
  ./ncurses/Makefile.in
  ./ncurses/README
-@@ -1022,6 +1022,7 @@
+@@ -867,6 +868,12 @@
+ ./ncurses/llib-lncursest
+ ./ncurses/llib-lncursestw
+ ./ncurses/llib-lncursesw
++./ncurses/llib-ltic
++./ncurses/llib-ltictw
++./ncurses/llib-lticw
++./ncurses/llib-ltinfo
++./ncurses/llib-ltinfotw
++./ncurses/llib-ltinfow
+ ./ncurses/modules
+ ./ncurses/tinfo/MKcaptab.awk
+ ./ncurses/tinfo/MKcaptab.sh
+@@ -970,6 +977,14 @@
+ ./ncurses/win32con/gettimeofday.c
+ ./ncurses/win32con/wcwidth.c
+ ./ncurses/win32con/win_driver.c
++./package/debian/changelog
++./package/debian/compat
++./package/debian/control
++./package/debian/copyright
++./package/debian/rules
++./package/debian/source/format
++./package/debian/watch
++./package/ncurses.spec
+ ./panel/Makefile.in
+ ./panel/headers
+ ./panel/llib-lpanel
+@@ -1022,6 +1037,7 @@
  ./test/cardfile.dat
  ./test/chgat.c
@@ -9032 +10052 @@
  ./test/configure.in
 diff -Naur ncurses-5.9.orig/Makefile.in ncurses-5.9/Makefile.in
---- ncurses-5.9.orig/Makefile.in        2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/Makefile.in     2012-02-16 18:25:13.183823867 +0000
+--- ncurses-5.9.orig/Makefile.in        2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/Makefile.in     2012-08-25 19:58:02.289887281 +0000
 @@ -1,6 +1,6 @@
 -# $Id: Makefile.in,v 1.30 2010/11/27 21:45:27 tom Exp $
-+# $Id: Makefile.in,v 1.33 2012/01/21 23:54:30 tom Exp $
++# $Id: Makefile.in,v 1.34 2012/08/11 21:41:19 tom Exp $
  ##############################################################################
 -# Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.                #
@@ -9053 +10073 @@
  @SET_MAKE@
  
-@@ -87,12 +88,9 @@
+@@ -48,6 +49,7 @@
+ 
+ prefix         = @prefix@
+ exec_prefix    = @exec_prefix@
++datarootdir    = @datarootdir@
+ 
+ bindir         = @bindir@
+ ticdir         = @TERMINFO@
+@@ -87,12 +89,9 @@
                 fgrep NCURSES_VERSION $(includedir)/curses.h >/dev/null || \
                 echo '** Will overwrite non-ncurses curses.h'
@@ -9068 +10096 @@
  # directories to visit.
 diff -Naur ncurses-5.9.orig/NEWS ncurses-5.9/NEWS
---- ncurses-5.9.orig/NEWS       2012-02-16 18:25:12.639809512 +0000
-+++ ncurses-5.9/NEWS    2012-02-16 18:25:13.255825766 +0000
+--- ncurses-5.9.orig/NEWS       2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/NEWS    2012-08-25 19:58:02.303220551 +0000
 @@ -1,5 +1,5 @@
  -------------------------------------------------------------------------------
@@ -9082 +10110 @@
  -------------------------------------------------------------------------------
 --- $Id: NEWS,v 1.1682 2011/04/04 00:02:42 tom Exp $
-+-- $Id: NEWS,v 1.1857 2012/02/11 23:39:31 tom Exp $
++-- $Id: NEWS,v 1.1942 2012/08/11 21:30:05 tom Exp $
  -------------------------------------------------------------------------------
  
  This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,467 @@
+@@ -45,6 +45,731 @@
  Changes through 1.9.9e did not credit all contributions;
  it is not possible to add this information.
  
++20120811
++       + update autoconf patch to 2.52.20120811, adding --datarootdir
++         (prompted by discussion with Erwin Waterlander).
++       + improve description of --enable-reentrant option in README and the
++         INSTALL file.
++       + add nsterm-256color, make this the default nsterm -TD
++       + remove bw from nsterm-bce, per testing with tack -TD
++
++20120804
++       + update test/configure, adding check for tinfo library.
++       + improve limit-checks for the getch fifo (report by Werner Fink).
++       + fix a remaining mismatch between $with_echo and the symbols updated
++         by CF_DISABLE_ECHO affecting parameters for mk-2nd.awk (report by
++         Sven Joachim, cf:  20120317).
++       + modify followup check for pkg-config's library directory in the
++         --enable-pc-files option to validate syntax (report by Sven Joachim,
++         cf: 20110716).
++
++20120728
++       + correct path for ncurses_mingw.h in include/headers, in case build
++         is done outside source-tree (patch by Roumen Petrov).
++       + modify some older xterm entries to align with xterm source -TD
++       + separate "xterm-old" alias from "xterm-r6" -TD
++       + add E3 extended capability to xterm-basic and putty -TD
++       + parenthesize parameters of other macros in curses.h -TD
++       + parenthesize parameter of COLOR_PAIR and PAIR_NUMBER in curses.h
++         in case it happens to be a comma-expression, etc.  (patch by Nick
++         Black).
++
++20120721
++       + improved form_request_by_name() and menu_request_by_name().
++       + eliminate two fixed-size buffers in toe.c
++       + extend use_tioctl() to have expected behavior when use_env(FALSE) and
++         use_tioctl(TRUE) are called.
++       + modify ncurses test-program, adding -E and -T options to demonstrate
++         use_env() versus use_tioctl().
++
++20120714
++       + add use_tioctl() function (adapted from patch by Werner Fink,
++         Novell #769788):
++
++20120707
++       + add ncurses_mingw.h to installed headers (prompted by patch by
++         Juergen Pfeifer).
++       + clarify return-codes from wgetch() in response to SIGWINCH (prompted
++         by Novell #769788).
++       + modify resizeterm() to always push a KEY_RESIZE onto the fifo, even
++         if screensize is unchanged.  Modify _nc_update_screensize() to push a
++         KEY_RESIZE if there was a SIGWINCH, even if it does not call
++         resizeterm().  These changes eliminate the case where a SIGWINCH is
++         received, but ERR returned from wgetch or wgetnstr because the screen
++         dimensions did not change (Novell #769788).
++
++20120630
++       + add --enable-interop to sample package scripts (suggested by Juergen
++         Pfeifer).
++       + update CF_PATH_SYNTAX macro, from mawk changes.
++       + modify mk-0th.awk to allow for generating llib-ltic, etc., though
++         some work is needed on cproto to work with lib_gen.c to update
++         llib-lncurses.
++       + remove redundant getenv() cal in database-iterator leftover from
++         cleanup in 20120622 changes (report by Sven Joachim).
++
++20120622
++       + add -d, -e and -q options to test/demo_terminfo and test/demo_termcap
++       + fix caching of environment variables in database-iterator (patch by
++         Philippe Troin, Redhat #831366).
++
++20120616
++       + add configure check to distinguish clang from gcc to eliminate
++         warnings about unused command-line parameters when compiler warnings
++         are enabled.
++       + improve behavior when updating terminfo entries which are hardlinked
++         by allowing for the possibility that an alias has been repurposed to
++         a new primary name.
++       + fix some strict compiler warnings based on package scripts.
++       + further fixes for configure check for working poll (Debian #676461).
++
++20120608
++       + fix an uninitialized variable in -c/-n logic for infocmp changes
++         (cf: 20120526).
++       + corrected fix for building c++ binding with clang 3.0 (report/patch
++         by Richard Yao, Gentoo #417613, cf: 20110409)
++       + correct configure check for working poll, fixing the case where stdin
++         is redirected, e.g., in rpm/dpkg builds (Debian #676461).
++       + add rpm- and dpkg-scripts, to test those build-environments.
++         The resulting packages are used only for testing.
++
++20120602
++       + add kdch1 aka "Remove" to vt220 and vt220-8 entries -TD
++       + add kdch1, etc., to qvt108 -TD
++       + add dl1/il1 to some entries based on dl/il values -TD
++       + add dl to simpleterm -TD
++       + add consistency-checks in tic for insert-line vs delete-line
++         controls, and insert/delete-char keys
++       + correct no-leaks logic in infocmp when doing comparisons, fixing
++         duplicate free of entries given via the command-line, and freeing
++         entries loaded from the last-but-one of files specified on the
++         command-line.
++       + add kdch1 to wsvt25 entry from NetBSD CVS (reported by David Lord,
++         analysis by Martin Husemann).
++       + add cnorm/civis to wsvt25 entry from NetBSD CVS (report/analysis by
++         Onno van der Linden).
++
++20120526
++       + extend -c and -n options of infocmp to allow comparing more than two
++         entries.
++       + correct check in infocmp for number of terminal names when more than
++         two are given.
++       + correct typo in curs_threads.3x (report by Yanhui Shen on
++         freebsd-hackers mailing list).
++
++20120512
++       + corrected 'op' for bterm (report by Samuel Thibault) -TD
++       + modify test/background.c to demonstrate a background character
++         holding a colored ACS_HLINE.  The behavior differs from SVr4 due to
++         the thick- and double-line extension (cf: 20091003).
++       + modify handling of acs characters in PutAttrChar to avoid mapping an
++         unmapped character to a space with A_ALTCHARSET set.
++       + rewrite vt520 entry based on vt420 -TD
++
++20120505
++       + remove p6 (bold) from opus3n1+ for consistency -TD
++       + remove acs stuff from env230 per clues in Ingres termcap -TD
++       + modify env230 sgr/sgr0 to match other capabilities -TD
++       + modify smacs/rmacs in bq300-8 to match sgr/sgr0 -TD
++       + make sgr for dku7202 agree with other caps -TD
++       + make sgr for ibmpc agree with other caps -TD
++       + make sgr for tek4107 agree with other caps -TD
++       + make sgr for ndr9500 agree with other caps -TD
++       + make sgr for sco-ansi agree with other caps -TD
++       + make sgr for d410 agree with other caps -TD
++       + make sgr for d210 agree with other caps -TD
++       + make sgr for d470c, d470c-7b agree with other caps -TD
++       + remove redundant AC_DEFINE for NDEBUG versus Makefile definition.
++       + fix a back-link in _nc_delink_entry(), which is needed if ncurses is
++         configured with --enable-termcap and --disable-getcap.
++
++20120428
++       + fix some inconsistencies between vt320/vt420, e.g., cnorm/civis -TD
++       + add eslok flag to dec+sl -TD
++       + dec+sl applies to vt320 and up -TD
++       + drop wsl width from xterm+sl -TD
++       + reuse xterm+sl in putty and nsca-m -TD
++       + add ansi+tabs to vt520 -TD
++       + add ansi+enq to vt220-vt520 -TD
++       + fix a compiler warning in example in ncurses-intro.doc (Paul Waring).
++       + added paragraph in keyname manpage telling how extended capabilities
++         are interpreted as key definitions.
++       + modify tic's check of conflicting key definitions to include extended
++         capability strings in addition to the existing check on predefined
++         keys.
++
++20120421
++       + improve cleanup of temporary files in tic using atexit().
++       + add msgr to vt420, similar DEC vtXXX entries -TD
++       + add several missing vt420 capabilities from vt220 -TD
++       + factor out ansi+pp from several entries -TD
++       + change xterm+sl and xterm+sl-twm to include only the status-line
++         capabilities and not "use=xterm", making them more generally useful
++         as building-blocks -TD
++       + add dec+sl building block, as example -TD
++
++20120414
++       + add XT to some terminfo entries to improve usefulness for other
++         applications than screen, which would like to pretend that xterm's
++         title is a status-line.  -TD
++       + change use-clauses in ansi-mtabs, hp2626, and hp2622 based on review
++         of ordering and overrides -TD
++       + add consistency check in tic for screen's "XT" capability.
++       + add section in terminfo.src summarizing the user-defined capabilities
++         used in that file -TD
++
++20120407
++       + fix an inconsistency between tic/infocmp "-x" option; tic omits all
++         non-standard capabilities, while infocmp was ignoring only the user
++         definable capabilities.
++       + improve special case in tic parsing of description to allow it to be
++         followed by terminfo capabilities.  Previously the description had to
++         be the last field on an input line to allow tic to distinguish
++         between termcap and terminfo format while still allowing commas to be
++         embedded in the description.
++       + correct variable name in gen_edit.sh which broke configurability of
++         the --with-xterm-kbs option.
++       + revert 2011-07-16 change to "linux" alias, return to "linux2.2" -TD
++       + further amend 20110910 change, providing for configure-script
++         override of the "linux" terminfo entry to install and changing the
++         default for that to "linux2.2" (Debian #665959).
++
++20120331
++       + update Ada95/configure to use CF_DISABLE_ECHO (cf: 20120317).
++       + correct order of use-clauses in st-256color -TD
++       + modify configure script to look for gnatgcc if the Ada95 binding
++         is built, in preference to the default gcc/cc (suggested by
++         Nicolas Boulenguez).
++       + modify configure script to ensure that the same -On option used for
++         the C compiler in CFLAGS is used for ADAFLAGS rather than simply
++         using "-O3" (suggested by Nicolas Boulenguez)
++
++20120324
++       + amend an old fix so that next_char() exits properly for empty files,
++         e.g., from reading /dev/null (cf: 20080804).
++       + modify tic so that it can read from the standard input, or from
++         a character device.  Because tic uses seek's, this requires writing
++         the data to a temporary file first (prompted by remark by Sven
++         Joachim) (cf: 20000923).
++
++20120317
++       + correct a check made in lib_napms.c, so that terminfo applications
++         can again use napms() (cf: 20110604).
++       + add a note in tic.h regarding required casts for ABSENT_BOOLEAN
++         (cf: 20040327).
++       + correct scripting for --disable-echo option in test/configure.
++       + amend check for missing c++ compiler to work when no error is
++         reported, and no variables set (cf: 20021206).
++       + add/use configure macro CF_DISABLE_ECHO.
++
++20120310
++       + fix some strict compiler warnings for abi6 and 64-bits.
++       + use begin_va_copy/end_va_copy macros in lib_printw.c (cf: 20120303).
++       + improve a limit-check in infocmp.c (Werner Fink):
++
++20120303
++       + minor tidying of terminfo.tail, clarify reason for limitation
++         regarding mapping of \0 to \200
++       + minor improvement to _nc_copy_termtype(), using memcpy to replace
++         loops.
++       + fix no-leaks checking in test/demo_termcap.c to account for multiple
++         calls to setupterm().
++       + modified the libgpm change to show previous load as a problem in the
++         debug-trace.
++       > merge some patches from OpenSUSE rpm (Werner Fink):
++       + ncurses-5.7-printw.dif, fixes for varargs handling in lib_printw.c
++       + ncurses-5.7-gpm.dif, do not dlopen libgpm if already loaded by
++         runtime linker
++       + ncurses-5.6-fallback.dif, do not free arrays and strings from static
++         fallback entries
++
++20120228
++       + fix breakage in tic/infocmp from 20120225 (report by Werner Fink).
++
++20120225
++       + modify configure script to allow creating dll's for MinGW when
++         cross-compiling.
++       + add --enable-string-hacks option to control whether strlcat and
++         strlcpy may be used.  The same issue applies to OpenBSD's warnings
++         about snprintf, noting that this function is weakly standardized.
++       + add configure checks for strlcat, strlcpy and snprintf, to help
++         reduce bogus warnings with OpenBSD builds.
++       + build-fix for OpenBSD 4.9 to supply consistent intptr_t declaration
++         (cf:20111231)
++       + update config.guess, config.sub
++
++20120218
++       + correct CF_ETIP_DEFINES configure macro, making it exit properly on
++         the first success (patch by Pierre Labastie).
++       + improve configure macro CF_MKSTEMP by moving existence-check for
++         mkstemp out of the AC_TRY_RUN, to help with cross-compiles.
++       + improve configure macro CF_FUNC_POLL from luit changes to detect
++         broken implementations, e.g., with Mac OS X.
++       + add configure option --with-tparm-arg
++       + build-fix for MinGW cross-compiling, so that make_hash does not
++         depend on TTY definition (cf: 20111008).
++
 +20120211
 +       + make sgr for xterm-pcolor agree with other caps -TD
@@ -9554 +10846 @@
  
  20110402
-@@ -155,7 +616,7 @@
+@@ -100,7 +825,7 @@
+        + modify configure script to provide value for HTML_DIR in
+          Ada95/gen/Makefile.in, which depends on whether the Ada95 binding is
+          distributed separately (report by Nicolas Boulenguez).
+-       + modify configure script to add -g and/or -O3 to ADAFLAGS if the
++       + modify configure script to add "-g" and/or "-O3" to ADAFLAGS if the
+          CFLAGS for the build has these options.
+        + amend change from 20070324, to not add 1 to the result of getmaxx
+          and getmaxy in the Ada binding (report by Nicolas Boulenguez for
+@@ -155,7 +880,7 @@
  20110212
         + regenerated html manpages.
@@ -9563 +10864 @@
  20110205
         + add xterm-utf8 entry as a demo of the U8 feature -TD
-@@ -219,7 +680,7 @@
+@@ -219,7 +944,7 @@
           version which works with termcap.
         + remove obsolete emacs "Local Variables" section from documentation
@@ -9572 +10873 @@
  
  20101128
-@@ -294,8 +755,8 @@
+@@ -294,8 +1019,8 @@
           Sven Joachim).
         + add parameterized cursor-controls to linux-basic (report by Dae) -TD
@@ -9583 +10884 @@
           Joachim).
         + add a check in mk-dlls.sh.in to obtain the size of a pointer to
-@@ -478,7 +939,7 @@
+@@ -478,7 +1203,7 @@
  20100417
         + modify _nc_capcmp() to work with cancelled strings.
@@ -9592 +10893 @@
           which adds rpath options for libraries in unusual places.
         + improve CF_RPATH_HACK_2 by checking if the rpath option for a given
-@@ -8979,15 +9440,18 @@
+@@ -6530,7 +7255,7 @@
+          handling in lynx (reported by Kim DeVaughn).
+ 
+ 990306 pre-release
+-       + add -G option to tic and infocmp, to reverse the -g option.
++       + add -G option to tic and infocmp, to reverse the "-g" option.
+        + recode functions in name_match.c to avoid use of strncpy, which
+          caused a 4-fold slowdown in tic (cf: 980530).
+        + correct a few warnings about sign-extension in recent changes.
+@@ -6901,7 +7626,7 @@
+          since that is a little more efficient.
+        + minor correction to infocmp to avoid displaying "difference" between
+          two capabilities that are rendered in equivalent forms.
+-       + add -g option to tic/infocmp to force character constants to be
++       + add "-g" option to tic/infocmp to force character constants to be
+          displayed in quoted form.  Otherwise their decimal values are shown.
+        + modify setupterm so that cancelled strings are treated the same as
+          absent strings, cancelled and absent booleans false (does not affect
+@@ -8979,15 +9704,18 @@
         + correction to #317.
         > patch 317 (ESR):
@@ -9615 +10934 @@
           (lib_getch.c, lib_twait.c).
         + new function _nc_mvcur_resume()
-@@ -9059,7 +9523,7 @@
+@@ -9059,12 +9787,12 @@
         + corrected typo in dtterm description.
         > patch 313 (ESR):
@@ -9624 +10943 @@
  960810 - snapshot
         + correct nl()/nonl() to work as per SVr4 & XSI.
-@@ -9073,7 +9537,8 @@
+        + minor fixes to ncurses.c (use 'noraw()', mvscanw return-code)
+-       + refine configure-test for -g option (Tim Mooney).
++       + refine configure-test for "-g" option (Tim Mooney).
+        + correct interaction between O_BLANK and NEW_LINE request in form
+          library (Juergen Pfeifer)
+ 
+@@ -9073,7 +9801,8 @@
         > patch 312 (ESR):
           correct terminfo.src corrupted by #310
@@ -9634 +10959 @@
  960803 - snapshot
         + corrected tparm to handle capability strings without explicit pop
-@@ -9083,7 +9548,7 @@
+@@ -9083,7 +9812,7 @@
         > patch 310 (ESR):
         + documentation and prototyping errors for has_color, immedok and idcok
@@ -9643 +10968 @@
  960730
         + eliminate quoted includes in ncurses subdirectory, ensure config.h
-@@ -9095,7 +9560,7 @@
+@@ -9095,7 +9824,7 @@
         + call cbreak() in initscr(), as per XSI & SVr4.
         + turn off hardware echo in initscr() as per XSI & SVr4
@@ -9652 +10977 @@
         + add more symbols to infocmp.
  
-@@ -9114,6 +9579,7 @@
+@@ -9114,6 +9843,7 @@
         > patch 308 (ESR):
         + terminfo changes (9.3.8)
@@ -9660 +10985 @@
  960713 - snapshot
         + always check for <sys/bsdtypes.h> since ISC needs it to declare
-@@ -9122,9 +9588,19 @@
+@@ -9122,9 +9852,19 @@
           by Juergen Pfeifer, Mike Long)
         + add LOCAL_LDFLAGS2 symbol (Juergen Pfeifer)
@@ -9681 +11006 @@
  960707
         + rollback ESR's #305 change to terminfo.src (it breaks existing
-@@ -9139,7 +9615,6 @@
+@@ -9139,7 +9879,6 @@
         + make lib_vidattr.c more readable using macros.
         + filter out rmul, rmso that conflict with sgr0 when reading terminal
@@ -9689 +11014 @@
           (reported by Zeyd).
         + modify man-page install for BSDI to install preformatted .0 files
-@@ -9152,6 +9627,12 @@
+@@ -9152,6 +9891,12 @@
         + disable scrollok during the ncurses 'p' test; if it is enabled the
           stdscr will scroll when putting the box-corners in the lower-right
@@ -9702 +11027 @@
  960629 - snapshot
         + check return code of _nc_mvcur_scrolln() in _nc_scroll_optimize() for
-@@ -9234,6 +9715,7 @@
+@@ -9234,6 +9979,7 @@
         + better fix for nvi refresh-bug (Rick Marshall)
         + fix for bug in handling of interrupted keystroke waits,
@@ -9710 +11035 @@
  960601 - snapshot
         + auto-configure man-page compression-format and renames for Debian.
-@@ -9263,6 +9745,9 @@
+@@ -9248,7 +9994,7 @@
+        + enhancement to the control over the new PC-style soft key format.
+          allow caller now to select whether or not one wants to have
+          the index-line; see curs_slk.3x for documentation (Juergen Pfeifer).
+-       + typos, don't use inline with -g (Philippe De Muyter)
++       + typos, don't use inline with "-g" (Philippe De Muyter)
+        + fixes for menus & wattr-, slk-functions (Juergen Pfeifer)
+ 
+ 960526 - snapshot
+@@ -9263,6 +10009,9 @@
         + include sys/types.h in case stdlib.h does not declare size_t.
         + fixes for makefile (Tim Mooney)
@@ -9720 +11054 @@
  960518 - snapshot
         + revised ncurses.c panner test, let pad abut all 4 sides of screen.
-@@ -9275,6 +9760,8 @@
+@@ -9275,6 +10024,8 @@
           confusion, and made this check for the /usr/lib/terminfo pre-existing
           directory.
@@ -9729 +11063 @@
         + mods to tracing, especially for ACS chars.
         + corrected off-by-one in IDCtransform.
-@@ -9294,13 +9781,21 @@
+@@ -9294,13 +10045,21 @@
         > patches 297, 298 (ESR):
         + implement TERMINFO_DIRS, and -o option of tic
@@ -9754 +11088 @@
  
  960504 - snapshot
-@@ -9326,11 +9821,20 @@
+@@ -9326,11 +10085,20 @@
         + make TIOCGWINSZ configure test less stringent, in case user
           configures via terminal that cannot get screen size.
@@ -9778 +11112 @@
  960418 - snapshot
         + use autoconf 2.9
-@@ -9338,10 +9842,22 @@
+@@ -9338,10 +10106,22 @@
           definitions via <termios.h>, modified macros in lib_raw.c to avoid
           K&R-style substitution)
@@ -9805 +11139 @@
         + fixes for NeXT, ISC and HPUX auto-configure
 diff -Naur ncurses-5.9.orig/README ncurses-5.9/README
---- ncurses-5.9.orig/README     2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/README  2012-02-16 18:25:12.915816795 +0000
+--- ncurses-5.9.orig/README     2012-08-25 19:57:59.409900901 +0000
++++ ncurses-5.9/README  2012-08-25 19:58:02.303220551 +0000
 @@ -1,5 +1,5 @@
  -------------------------------------------------------------------------------
 --- Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.               --
-+-- Copyright (c) 1998-2006,2011 Free Software Foundation, Inc.               --
++-- Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.               --
  --                                                                           --
  -- Permission is hereby granted, free of charge, to any person obtaining a   --
@@ -9819 +11153 @@
  -------------------------------------------------------------------------------
 --- $Id: README,v 1.23 2006/04/22 22:19:37 tom Exp $
-+-- $Id: README,v 1.24 2011/08/20 16:47:16 tom Exp $
++-- $Id: README,v 1.25 2012/08/11 20:11:26 tom Exp $
  -------------------------------------------------------------------------------
                 README file for the ncurses package
  
-@@ -153,8 +153,10 @@
+@@ -78,6 +78,10 @@
+ library interfaces are not binary-compatible with the non-wide-character
+ version.
+ 
++If you configure using the --enable-reentrant option, a "t" is appended to the
++library names (e.g., libncursest.a) and the resulting libraries have a
++different binary interface which makes the ncurses interface more "opaque".
++
+ The ncurses libraries implement the curses API.  The panel, menu and forms
+ libraries implement clones of the SVr4 panel, menu and forms APIs.  The source
+ code for these lives in the `ncurses', `panel', `menu', and `form' directories
+@@ -122,8 +126,9 @@
+        tic             -- terminfo source to binary compiler
+        infocmp         -- terminfo binary to source decompiler/comparator
+        clear           -- emits clear-screen for current terminal
++       tabs            -- set tabs on a terminal
+        tput            -- shell-script access to terminal capabilities.
+-       toe             -- table of entries utility
++       toe             -- table of entries utility
+        tset            -- terminal-initialization utility
+ 
+ The first two (tic and infocmp) are used for manipulating terminfo
+@@ -153,8 +158,10 @@
         configuration scripts, porting, mods to adhere to XSI Curses in the
         areas of background color, terminal modes.  Also memory leak testing,
@@ -9837 +11193 @@
         Beginning with release 4.2, ncurses is distributed under an MIT-style
 diff -Naur ncurses-5.9.orig/README.MinGW ncurses-5.9/README.MinGW
---- ncurses-5.9.orig/README.MinGW       2012-02-16 18:25:12.623809091 +0000
-+++ ncurses-5.9/README.MinGW    2012-02-16 18:25:13.187823972 +0000
+--- ncurses-5.9.orig/README.MinGW       2012-08-25 19:57:59.419900852 +0000
++++ ncurses-5.9/README.MinGW    2012-08-25 19:58:00.359896408 +0000
 @@ -1,5 +1,5 @@
  -------------------------------------------------------------------------------
@@ -9986 +11342 @@
  
 diff -Naur ncurses-5.9.orig/aclocal.m4 ncurses-5.9/aclocal.m4
---- ncurses-5.9.orig/aclocal.m4 2012-02-16 18:25:12.627809197 +0000
-+++ ncurses-5.9/aclocal.m4      2012-02-16 18:25:13.187823972 +0000
+--- ncurses-5.9.orig/aclocal.m4 2012-08-25 19:57:59.429900806 +0000
++++ ncurses-5.9/aclocal.m4      2012-08-25 19:58:02.309887187 +0000
 @@ -1,5 +1,5 @@
  dnl***************************************************************************
@@ -10000 +11356 @@
  dnl
 -dnl $Id: aclocal.m4,v 1.553 2011/03/31 23:35:38 tom Exp $
-+dnl $Id: aclocal.m4,v 1.604 2012/01/22 00:30:35 tom Exp $
++dnl $Id: aclocal.m4,v 1.621 2012/08/11 23:36:44 tom Exp $
  dnl Macros used in NCURSES auto-configuration script.
  dnl
@@ -10166 +11522 @@
  dnl ---------------------------------------------------------------------------
  dnl CF_CHECK_CACHE version: 11 updated: 2008/03/23 14:45:59
-@@ -908,7 +975,28 @@
+@@ -908,7 +975,61 @@
  fi
  ])])dnl
@@ -10192 +11548 @@
 +])dnl
 +dnl ---------------------------------------------------------------------------
++dnl CF_CLANG_COMPILER version: 1 updated: 2012/06/16 14:55:39
++dnl -----------------
++dnl Check if the given compiler is really clang.  clang's C driver defines
++dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does
++dnl not ignore some gcc options.
++dnl
++dnl This macro should be run "soon" after AC_PROG_CC or AC_PROG_CPLUSPLUS, to
++dnl ensure that it is not mistaken for gcc/g++.  It is normally invoked from
++dnl the wrappers for gcc and g++ warnings.
++dnl
++dnl $1 = GCC (default) or GXX
++dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS
++dnl $3 = CFLAGS (default) or CXXFLAGS
++AC_DEFUN([CF_CLANG_COMPILER],[
++ifelse([$2],,CLANG_COMPILER,[$2])=no
++
++if test "$ifelse([$1],,[$1],GCC)" = yes ; then
++       AC_MSG_CHECKING(if this is really Clang ifelse([$1],GXX,C++,C) compiler)
++       cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])"
++       ifelse([$3],,CFLAGS,[$3])="$ifelse([$3],,CFLAGS,[$3]) -Qunused-arguments"
++       AC_TRY_COMPILE([],[
++#ifdef __clang__
++#else
++make an error
++#endif
++],[ifelse([$2],,CLANG_COMPILER,[$2])=yes
++cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
++],[])
++       ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS"
++       AC_MSG_RESULT($ifelse([$2],,CLANG_COMPILER,[$2]))
++fi
++])
++dnl ---------------------------------------------------------------------------
 +dnl CF_CPP_PARAM_INIT version: 5 updated: 2011/12/03 16:54:03
  dnl -----------------
  dnl Check if the C++ compiler accepts duplicate parameter initialization.  This
  dnl is a late feature for the standard and is not in some recent compilers
-@@ -932,7 +1020,7 @@
+@@ -932,7 +1053,7 @@
  {
         value = x;
@@ -10205 +11594 @@
         [cf_cv_cpp_param_init=yes],
         [cf_cv_cpp_param_init=no],
-@@ -999,6 +1087,54 @@
+@@ -999,7 +1120,55 @@
  test "$cf_cv_cpp_static_cast" = yes && AC_DEFINE(CPP_HAS_STATIC_CAST)
  ])dnl
  dnl ---------------------------------------------------------------------------
+-dnl CF_C_INLINE version: 3 updated: 2010/05/01 15:14:41
 +dnl CF_CXX_AR_FLAGS version: 1 updated: 2011/10/29 08:35:34
 +dnl ---------------
@@ -10257 +11647 @@
 +])dnl
 +dnl ---------------------------------------------------------------------------
- dnl CF_C_INLINE version: 3 updated: 2010/05/01 15:14:41
++dnl CF_C_INLINE version: 4 updated: 2012/06/16 14:55:39
  dnl -----------
  dnl Check if the C compiler supports "inline".
-@@ -1123,6 +1259,31 @@
+ dnl $1 is the name of a shell variable to set if inline is supported
+@@ -1012,6 +1181,9 @@
+   if test "$INTEL_COMPILER" = yes
+   then
+     :
++  elif test "$CLANG_COMPILER" = yes
++  then
++    :
+   elif test "$GCC" = yes
+   then
+     AC_CACHE_CHECK(if $CC supports options to tune inlining,cf_cv_gcc_inline,[
+@@ -1057,6 +1229,43 @@
+ AC_SUBST(DIRS_TO_MAKE)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_DISABLE_ECHO version: 11 updated: 2009/12/13 13:16:57
++dnl ---------------
++dnl You can always use "make -n" to see the actual options, but it's hard to
++dnl pick out/analyze warning messages when the compile-line is long.
++dnl
++dnl Sets:
++dnl    ECHO_LT - symbol to control if libtool is verbose
++dnl    ECHO_LD - symbol to prefix "cc -o" lines
++dnl    RULE_CC - symbol to put before implicit "cc -c" lines (e.g., .c.o)
++dnl    SHOW_CC - symbol to put before explicit "cc -c" lines
++dnl    ECHO_CC - symbol to put before any "cc" line
++dnl
++AC_DEFUN([CF_DISABLE_ECHO],[
++AC_MSG_CHECKING(if you want to see long compiling messages)
++CF_ARG_DISABLE(echo,
++       [  --disable-echo          display "compiling" commands],
++       [
++    ECHO_LT='--silent'
++    ECHO_LD='@echo linking [$]@;'
++    RULE_CC='@echo compiling [$]<'
++    SHOW_CC='@echo compiling [$]@'
++    ECHO_CC='@'
++],[
++    ECHO_LT=''
++    ECHO_LD=''
++    RULE_CC=''
++    SHOW_CC=''
++    ECHO_CC=''
++])
++AC_MSG_RESULT($enableval)
++AC_SUBST(ECHO_LT)
++AC_SUBST(ECHO_LD)
++AC_SUBST(RULE_CC)
++AC_SUBST(SHOW_CC)
++AC_SUBST(ECHO_CC)
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_DISABLE_LEAKS version: 6 updated: 2010/07/23 04:14:32
+ dnl ----------------
+ dnl Combine no-leak checks with the libraries or tools that are used for the
+@@ -1123,6 +1332,30 @@
  fi
  ])
  dnl ---------------------------------------------------------------------------
-+dnl CF_ENABLE_PC_FILES version: 7 updated: 2011/12/10 18:58:47
++dnl CF_ENABLE_PC_FILES version: 9 updated: 2012/08/04 13:59:54
 +dnl ------------------
 +dnl This is the "--enable-pc-files" option, which is available if there is a
@@ -10273 +11718 @@
 +
 +if test "$PKG_CONFIG" != none ; then
-+       if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
-+               AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG)
-+               AC_ARG_ENABLE(pc-files,
-+                       [  --enable-pc-files       generate and install .pc files for pkg-config],
-+                       [enable_pc_files=$enableval],
-+                       [enable_pc_files=no])
-+               AC_MSG_RESULT($enable_pc_files)
-+       elif test -z "$PKG_CONFIG_LIBDIR" || test "$PKG_CONFIG_LIBDIR" != no; then
-+               enable_pc_files=no
-+               AC_MSG_WARN(did not find $PKG_CONFIG library)
++       AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG)
++       AC_ARG_ENABLE(pc-files,
++               [  --enable-pc-files       generate and install .pc files for pkg-config],
++               [enable_pc_files=$enableval],
++               [enable_pc_files=no])
++       AC_MSG_RESULT($enable_pc_files)
++       if test "$enable_pc_files" != no
++       then
++               CF_PATH_SYNTAX(PKG_CONFIG_LIBDIR)
 +       fi
 +else
@@ -10292 +11736 @@
  dnl ---------------
  dnl Check if the rpath option should be used, setting cache variable
-@@ -1145,7 +1306,7 @@
+@@ -1137,6 +1370,37 @@
+ AC_MSG_RESULT($cf_cv_enable_rpath)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_ENABLE_STRING_HACKS version: 1 updated: 2012/02/25 06:33:21
++dnl ----------------------
++dnl On a few platforms, the compiler and/or loader nags with untruthful
++dnl comments stating that "most" uses of strcat/strcpy/sprintf are incorrect,
++dnl and implying that most uses of the recommended alternatives are correct.
++dnl
++dnl Factually speaking, no one has actually counted the number of uses of these
++dnl functions versus the total of incorrect uses.  Samples of a few thousand
++dnl instances are meaningless compared to the hundreds of millions of lines of
++dnl existing C code.
++dnl
++dnl strlcat/strlcpy are (as of 2012) non-standard, and are available on some
++dnl platforms, in implementations of varying quality.  Likewise, snprintf is
++dnl standard - but evolved through phases, and older implementations are likely
++dnl to yield surprising results, as documented in manpages on various systems.
++AC_DEFUN([CF_ENABLE_STRING_HACKS],
++[
++AC_MSG_CHECKING(if you want to work around bogus compiler/loader warnings)
++AC_ARG_ENABLE(string-hacks,
++       [  --enable-string-hacks  work around bogus compiler/loader warnings],
++       [with_string_hacks=$enableval],
++       [with_string_hacks=no])
++AC_MSG_RESULT($with_string_hacks)
++
++if test "x$with_string_hacks" = "xyes"; then
++       AC_DEFINE(USE_STRING_HACKS)
++       AC_MSG_WARN(enabling string-hacks to work around bogus compiler/loader warnings)
++       AC_CHECK_FUNCS( strlcat strlcpy snprintf )
++fi
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_ERRNO version: 5 updated: 1997/11/30 12:44:39
+ dnl --------
+ dnl Check if 'errno' is declared in <errno.h>
+@@ -1145,7 +1409,7 @@
  CF_CHECK_ERRNO(errno)
  ])dnl
  dnl ---------------------------------------------------------------------------
 -dnl CF_ETIP_DEFINES version: 3 updated: 2003/03/22 19:13:43
-+dnl CF_ETIP_DEFINES version: 4 updated: 2011/12/03 16:54:03
++dnl CF_ETIP_DEFINES version: 5 updated: 2012/02/18 17:51:07
  dnl ---------------
  dnl Test for conflicting definitions of exception in gcc 2.8.0, etc., between
  dnl math.h and builtin.h, only for ncurses
-@@ -1154,11 +1315,17 @@
+@@ -1154,11 +1418,17 @@
  AC_MSG_CHECKING(for special defines needed for etip.h)
  cf_save_CXXFLAGS="$CXXFLAGS"
@@ -10320 +11802 @@
         test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
  AC_TRY_COMPILE([
-@@ -1769,6 +1936,29 @@
+@@ -1167,7 +1437,7 @@
+        test -n "$cf_math" && AC_DEFINE_UNQUOTED(ETIP_NEEDS_${cf_math})
+        test -n "$cf_excp" && AC_DEFINE_UNQUOTED(ETIP_NEEDS_${cf_excp})
+        cf_result="$cf_math $cf_excp"
+-       break
++       break 2
+ ],[])
+ done
+ done
+@@ -1305,6 +1575,25 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
++dnl CF_FIXUP_ADAFLAGS version: 1 updated: 2012/03/31 18:48:10
++dnl -----------------
++dnl make ADAFLAGS consistent with CFLAGS
++AC_DEFUN([CF_FIXUP_ADAFLAGS],[
++       AC_MSG_CHECKING(optimization options for ADAFLAGS)
++       case "$CFLAGS" in
++       *-g*)
++               CF_ADD_ADAFLAGS(-g)
++               ;;
++       esac
++       case "$CFLAGS" in
++       *-O*)
++               cf_O_flag=`echo "$CFLAGS" |sed -e 's/^.*-O/-O/' -e 's/[[        ]].*//'`
++               CF_ADD_ADAFLAGS($cf_O_flag)
++               ;;
++       esac
++       AC_MSG_RESULT($ADAFLAGS)
++])dnl
++dnl ---------------------------------------------------------------------------
+ dnl CF_FUNC_DLSYM version: 2 updated: 2010/05/29 16:31:02
+ dnl -------------
+ dnl Test for dlsym() and related functions, as well as libdl.
+@@ -1433,14 +1722,17 @@
+ ])
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_FUNC_POLL version: 4 updated: 2006/12/16 12:33:30
++dnl CF_FUNC_POLL version: 7 updated: 2012/06/09 16:22:17
+ dnl ------------
+ dnl See if the poll function really works.  Some platforms have poll(), but
+ dnl it does not work for terminals or files.
+ AC_DEFUN([CF_FUNC_POLL],[
+ AC_CACHE_CHECK(if poll really works,cf_cv_working_poll,[
+ AC_TRY_RUN([
++#include <stdlib.h>
+ #include <stdio.h>
++#include <unistd.h>
++#include <fcntl.h>
+ #ifdef HAVE_POLL_H
+ #include <poll.h>
+ #else
+@@ -1450,11 +1742,34 @@
+        struct pollfd myfds;
+        int ret;
+ 
+-       myfds.fd = 0;
++       /* check for Darwin bug with respect to "devices" */
++       myfds.fd = open("/dev/null", 1);        /* O_WRONLY */
++       if (myfds.fd < 0)
++               myfds.fd = 0;
+        myfds.events = POLLIN;
++       myfds.revents = 0;
+ 
+        ret = poll(&myfds, 1, 100);
+-       ${cf_cv_main_return:-return}(ret != 0);
++
++       if (ret < 0 || (myfds.revents & POLLNVAL)) {
++               ret = -1;
++       } else {
++               int fd = 0;
++               if (!isatty(fd)) {
++                       fd = open("/dev/tty", 2);       /* O_RDWR */
++               }
++
++               if (fd >= 0) {
++                       /* also check with standard input */
++                       myfds.fd = fd;
++                       myfds.events = POLLIN;
++                       myfds.revents = 0;
++                       ret = poll(&myfds, 1, 100);
++               } else {
++                       ret = -1;
++               }
++       }
++       ${cf_cv_main_return:-return}(ret < 0);
+ }],
+        [cf_cv_working_poll=yes],
+        [cf_cv_working_poll=no],
+@@ -1660,7 +1975,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_GCC_WARNINGS version: 27 updated: 2010/10/23 15:52:32
++dnl CF_GCC_WARNINGS version: 29 updated: 2012/06/16 14:55:39
+ dnl ---------------
+ dnl Check if the compiler supports useful warning options.  There's a few that
+ dnl we don't use, simply because they're too noisy:
+@@ -1683,6 +1998,7 @@
+ [
+ AC_REQUIRE([CF_GCC_VERSION])
+ CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
++CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
+ 
+ cat > conftest.$ac_ext <<EOF
+ #line __oline__ "${as_me:-configure}"
+@@ -1758,6 +2074,13 @@
+                                        continue;;
+                                esac
+                                ;;
++                       Wpointer-arith) #(vi
++                               case $GCC_VERSION in
++                               [[12]].*)
++                                       CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
++                                       continue;;
++                               esac
++                               ;;
+                        esac
+                        EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+                fi
+@@ -1769,6 +2092,29 @@
  AC_SUBST(EXTRA_CFLAGS)
  ])dnl
@@ -10350 +11954 @@
  dnl ----------------
  AC_DEFUN([CF_GNAT_GENERICS],
-@@ -2040,7 +2230,7 @@
+@@ -2040,7 +2386,7 @@
  rm -rf conftest* *~conftest*
  ])dnl
@@ -10359 +11963 @@
  dnl Verify version of GNAT.
  AC_DEFUN([CF_GNAT_VERSION],
-@@ -2052,7 +2242,7 @@
+@@ -2052,7 +2398,7 @@
  AC_MSG_RESULT($cf_gnat_version)
  
@@ -10368 +11972 @@
         ;;
  *)
-@@ -2581,7 +2771,7 @@
+@@ -2136,21 +2482,21 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_GXX_VERSION version: 6 updated: 2010/10/23 15:44:18
++dnl CF_GXX_VERSION version: 7 updated: 2012/06/16 14:55:39
+ dnl --------------
+ dnl Check for version of g++
+ AC_DEFUN([CF_GXX_VERSION],[
+ AC_REQUIRE([AC_PROG_CPP])
+ GXX_VERSION=none
+ if test "$GXX" = yes; then
+-       AC_MSG_CHECKING(version of g++)
++       AC_MSG_CHECKING(version of ${CXX:-g++})
+        GXX_VERSION="`${CXX:-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
+        test -z "$GXX_VERSION" && GXX_VERSION=unknown
+        AC_MSG_RESULT($GXX_VERSION)
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_GXX_WARNINGS version: 6 updated: 2010/08/14 18:25:37
++dnl CF_GXX_WARNINGS version: 7 updated: 2012/06/16 14:55:39
+ dnl ---------------
+ dnl Check if the compiler supports useful warning options.
+ dnl
+@@ -2173,6 +2519,7 @@
+ [
+ 
+ CF_INTEL_COMPILER(GXX,INTEL_CPLUSPLUS,CXXFLAGS)
++CF_CLANG_COMPILER(GXX,CLANG_CPLUSPLUS,CXXFLAGS)
+ 
+ AC_REQUIRE([CF_GXX_VERSION])
+ 
+@@ -2581,7 +2928,7 @@
  ])
  ])
@@ -10377 +12014 @@
  dnl Check for compiler/linker flags used to temporarily force usage of static
  dnl libraries.  This depends on the compiler and platform.  Use this to help
-@@ -2602,7 +2792,7 @@
+@@ -2602,7 +2949,7 @@
      esac
  else
@@ -10386 +12023 @@
                 LDFLAGS_SHARED=-bdynamic
                 ;;
-@@ -2652,7 +2842,17 @@
+@@ -2652,7 +2999,17 @@
  int cf_ldflags_static(FILE *fp);
  ],[
@@ -10405 +12042 @@
         rm -f libconftest.*
         LIBS="$cf_save_LIBS"
-@@ -2673,7 +2873,7 @@
+@@ -2673,7 +3030,7 @@
  AC_SUBST(LDFLAGS_SHARED)
  ])
@@ -10414 +12051 @@
  dnl For the given system and compiler, find the compiler flags to pass to the
  dnl loader to use the "rpath" feature.
-@@ -2694,10 +2894,10 @@
+@@ -2694,10 +3051,10 @@
  linux*|gnu*|k*bsd*-gnu) #(vi
         LD_RPATH_OPT="-Wl,-rpath,"
@@ -10427 +12064 @@
         ;;
  netbsd*) #(vi
-@@ -2756,11 +2956,11 @@
+@@ -2756,11 +3113,11 @@
  $1="$cf_library_path_list [$]$1"
  ])dnl
@@ -10441 +12078 @@
         case $cf_cv_system_name in #(vi
         OS/2*|os2*) #(vi
-@@ -2773,7 +2973,7 @@
+@@ -2773,7 +3130,7 @@
         AC_SUBST(LIB_PREFIX)
  ])dnl
  dnl ---------------------------------------------------------------------------
 -dnl CF_LIB_RULES version: 61 updated: 2010/10/23 16:10:30
-+dnl CF_LIB_RULES version: 63 updated: 2012/01/21 19:28:10
++dnl CF_LIB_RULES version: 65 updated: 2012/06/30 17:25:25
  dnl ------------
  dnl Append definitions and rules for the given models to the subdirectory
  dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
-@@ -2788,7 +2988,7 @@
+@@ -2788,13 +3145,15 @@
  dnl    lib<name>.so.<maj>.<minor>
  AC_DEFUN([CF_LIB_RULES],
@@ -10458 +12095 @@
  AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
  
- if test $cf_cv_shlib_version = cygdll ; then
-@@ -3010,6 +3210,7 @@
+-if test $cf_cv_shlib_version = cygdll ; then
++case $cf_cv_shlib_version in #(vi
++cygdll|mingw)
+        TINFO_NAME=$TINFO_ARG_SUFFIX
+        TINFO_SUFFIX=.dll
+-fi
++       ;;
++esac
+ 
+ if test -n "$TINFO_SUFFIX" ; then
+        case $TINFO_SUFFIX in
+@@ -2880,11 +3239,18 @@
+                        # cygwin needs import library, and has unique naming convention
+                        # use autodetected ${cf_prefix} for import lib and static lib, but
+                        # use 'cyg' prefix for shared lib.
+-                       if test $cf_cv_shlib_version = cygdll ; then
++                       case $cf_cv_shlib_version in #(vi
++                       cygdll) #(vi
+                                cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
+                                LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/cyg${cf_dir}${cf_cygsuf}"
+                                continue
+-                       fi
++                               ;;
++                       mingw)
++                               cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
++                               LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/lib${cf_dir}${cf_cygsuf}"
++                               continue
++                               ;;
++                       esac
+                        fi
+                        LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/${cf_prefix}${cf_dir}${cf_suffix}"
+                done
+@@ -2928,7 +3294,7 @@
+                mv $cf_dir/Makefile.out $cf_dir/Makefile
+ 
+                $AWK -f $srcdir/mk-0th.awk \
+-                       libname="${cf_dir}${LIB_SUFFIX}" subsets="$LIB_SUBSETS" \
++                       libname="${cf_dir}${LIB_SUFFIX}" subsets="$LIB_SUBSETS" ticlib="$TICS_LIB_SUFFIX" termlib="$TINFO_LIB_SUFFIX" \
+                        $srcdir/$cf_dir/modules >>$cf_dir/Makefile
+ 
+                for cf_subset in $cf_subsets
+@@ -3010,6 +3376,7 @@
                                 prefix=$cf_prefix \
                                 suffix=$cf_suffix \
@@ -10467 +12144 @@
                                 TermlibRoot=$TINFO_NAME \
                                 TermlibSuffix=$TINFO_SUFFIX \
-@@ -3292,7 +3493,7 @@
+@@ -3292,7 +3659,7 @@
  ])
  ])
  dnl ---------------------------------------------------------------------------
 -dnl CF_LIB_SUFFIX version: 16 updated: 2008/12/27 12:30:03
-+dnl CF_LIB_SUFFIX version: 17 updated: 2011/07/02 15:36:04
++dnl CF_LIB_SUFFIX version: 18 updated: 2012/02/25 15:20:07
  dnl -------------
  dnl Compute the library file-suffix from the given model name
  dnl $1 = model name
-@@ -3321,7 +3522,7 @@
+@@ -3321,11 +3688,11 @@
                 ;;
         shared) #(vi
@@ -10485 +12162 @@
                         $3=[$]$2
                         ;;
-@@ -3799,7 +4000,7 @@
+-               cygwin*) #(vi
++               cygwin*|mingw*) #(vi
+                        $2='.dll'
+                        $3='.dll.a'
+                        ;;
+@@ -3799,7 +4166,7 @@
  AC_MSG_RESULT($MANPAGE_TBL)
  ])dnl
  dnl ---------------------------------------------------------------------------
 -dnl CF_MAN_PAGES version: 39 updated: 2010/10/23 15:44:18
-+dnl CF_MAN_PAGES version: 40 updated: 2011/09/10 16:20:21
++dnl CF_MAN_PAGES version: 41 updated: 2012/08/11 19:35:44
  dnl ------------
  dnl Try to determine if the man-pages on the system are compressed, and if
  dnl so, what format is used.  Use this information to construct a script that
-@@ -3949,7 +4150,9 @@
+@@ -3856,6 +4223,7 @@
+ # this script is generated by the configure-script CF_MAN_PAGES macro.
+ 
+ prefix="$cf_prefix"
++datarootdir="$datarootdir"
+ datadir="$datadir"
+ 
+ NCURSES_MAJOR="$NCURSES_MAJOR"
+@@ -3949,7 +4317,9 @@
  
  if test "$MANPAGE_ALIASES" != no ; then
@@ -10505 +12195 @@
  fi
  
-@@ -3995,6 +4198,13 @@
+@@ -3995,6 +4365,13 @@
  fi
  CF_EOF
@@ -10519 +12209 @@
  cat >>$cf_edit_man <<CF_EOF
         sed -e "/\#[    ]*include/s,curses.h,ncurses.h," < \$TMP >\$TMP.out
-@@ -4376,7 +4586,7 @@
+@@ -4184,7 +4561,7 @@
+ test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_MKSTEMP version: 7 updated: 2010/08/14 18:25:37
++dnl CF_MKSTEMP version: 8 updated: 2012/02/13 20:34:56
+ dnl ----------
+ dnl Check for a working mkstemp.  This creates two files, checks that they are
+ dnl successfully created and distinct (AmigaOS apparently fails on the last).
+@@ -4226,9 +4603,11 @@
+ }
+ ],[cf_cv_func_mkstemp=yes
+ ],[cf_cv_func_mkstemp=no
+-],[AC_CHECK_FUNC(mkstemp)
+-])
++],[cf_cv_func_mkstemp=maybe])
+ ])
++if test "x$cf_cv_func_mkstemp" = xmaybe ; then
++       AC_CHECK_FUNC(mkstemp)
++fi
+ if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then
+        AC_DEFINE(HAVE_MKSTEMP)
+ fi
+@@ -4339,7 +4718,7 @@
+        AC_SUBST(PATH_SEPARATOR)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_PATH_SYNTAX version: 13 updated: 2010/05/26 05:38:42
++dnl CF_PATH_SYNTAX version: 14 updated: 2012/06/19 20:58:54
+ dnl --------------
+ dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
+ dnl begins with one of the prefix/exec_prefix variables, and then again if the
+@@ -4359,7 +4738,7 @@
+   ;;
+ .[[a-zA-Z]]:[[\\/]]*) #(vi OS/2 EMX
+   ;;
+-.\[$]{*prefix}*) #(vi
++.\[$]{*prefix}*|.\[$]{*dir}*) #(vi
+   eval $1="[$]$1"
+   case ".[$]$1" in #(vi
+   .NONE/*)
+@@ -4376,7 +4755,7 @@
  esac
  ])dnl
@@ -10528 +12259 @@
  dnl Check for the package-config program, unless disabled by command-line.
  AC_DEFUN([CF_PKG_CONFIG],
-@@ -4393,7 +4603,9 @@
+@@ -4393,7 +4772,9 @@
         PKG_CONFIG=none
         ;;
@@ -10539 +12270 @@
  *)
         PKG_CONFIG=$withval
-@@ -4658,7 +4870,7 @@
+@@ -4658,7 +5039,7 @@
  test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT")
  ])dnl
@@ -10548 +12279 @@
  dnl Check for gnatmake, ensure that it is complete.
  AC_DEFUN([CF_PROG_GNAT],[
-@@ -4666,6 +4878,7 @@
+@@ -4666,6 +5047,7 @@
  AC_CHECK_PROG(gnat_exists, $cf_ada_make, yes, no)
  if test "$ac_cv_prog_gnat_exists" = no; then
@@ -10556 +12287 @@
     CF_GNAT_VERSION
     AC_CHECK_PROG(M4_exists, m4, yes, no)
-@@ -4709,7 +4922,7 @@
+@@ -4709,7 +5091,7 @@
  esac
  ])dnl
@@ -10565 +12296 @@
  dnl Check for ldconfig, needed to fixup shared libraries that would be built
  dnl and then used in the install.
-@@ -4718,7 +4931,7 @@
+@@ -4718,7 +5100,7 @@
    LDCONFIG=:
  else
@@ -10574 +12305 @@
    ;;
  *) LDPATH=$PATH:/sbin:/usr/sbin
-@@ -4759,7 +4972,7 @@
+@@ -4759,7 +5141,7 @@
  test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
  ])dnl
@@ -10583 +12314 @@
  dnl Attempt to determine if we've got one of the flavors of regular-expression
  dnl code that we can support.
-@@ -4771,7 +4984,7 @@
+@@ -4771,7 +5153,7 @@
  cf_regex_libs="regex re"
  case $host_os in #(vi
@@ -10592 +12323 @@
  esac
  
-@@ -4984,7 +5197,7 @@
+@@ -4984,7 +5366,7 @@
  AC_SUBST(EXTRA_LDFLAGS)
  ])dnl
  dnl ---------------------------------------------------------------------------
 -dnl CF_SHARED_OPTS version: 64 updated: 2010/06/05 16:51:16
-+dnl CF_SHARED_OPTS version: 69 updated: 2011/07/30 19:31:39
++dnl CF_SHARED_OPTS version: 70 updated: 2012/02/25 15:20:07
  dnl --------------
  dnl --------------
  dnl Attempt to determine the appropriate CC/LD options for creating a shared
-@@ -5059,10 +5272,14 @@
+@@ -5059,10 +5441,14 @@
         cf_cv_shlib_version_infix=no
  
@@ -10618 +12349 @@
                 ;;
         beos*) #(vi
-@@ -5115,9 +5332,19 @@
+@@ -5115,9 +5501,19 @@
                 # readonly to exploit a quirk in the memory manager.
                 INSTALL_LIB="-m 555"
@@ -10639 +12370 @@
                 # tested with IRIX 5.2 and 'cc'.
                 if test "$GCC" != yes; then
-@@ -5134,18 +5361,18 @@
+@@ -5134,18 +5530,39 @@
                         LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
                 fi
@@ -10650 +12381 @@
                 ;;
 -       openbsd[[2-9]].*) #(vi
++       mingw*) #(vi
++               cf_cv_shlib_version=mingw
++               cf_cv_shlib_version_infix=mingw
++               CC_SHARED_OPTS=
++               MK_SHARED_LIB='sh ../mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
++               #MK_SHARED_LIB='${CC} ${CFLAGS} -mdll -Wl,-soname,'$cf_cv_shared_soname',-stats -o $[@]'
++               #MK_SHARED_LIB='${DLLTOOL} --export-all-symbols --output-exp --output-lib $[@]'
++               cat >mk_shared_lib.sh <<-CF_EOF
++               #!/bin/sh
++               SHARED_LIB=\[$]1
++               IMPORT_LIB=\`echo "\[$]1" | sed -e 's/[[0-9]]*\.dll[$]/.dll.a/'\`
++               shift
++               cat <<-EOF
++               Linking shared library
++               ** SHARED_LIB \[$]SHARED_LIB
++               ** IMPORT_LIB \[$]IMPORT_LIB
++EOF
++               exec \[$]* -shared -Wl,--out-implib=../lib/\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\[$]{SHARED_LIB}
++CF_EOF
++               chmod +x mk_shared_lib.sh
++               ;;
 +       openbsd[[2-9]].*|mirbsd*) #(vi
                 if test "$DFT_LWR_MODEL" = "shared" ; then
@@ -10661 +12413 @@
                 CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                 CF_SHARED_SONAME
-@@ -5156,12 +5383,12 @@
+@@ -5156,12 +5573,12 @@
                 MK_SHARED_LIB='${LD} -Bshareable -o $[@]'
                 test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
@@ -10677 +12429 @@
                 CF_SHARED_SONAME
                 MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $[@]` -o $[@]'
-@@ -5171,7 +5398,7 @@
+@@ -5171,7 +5588,7 @@
                 if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then
                         LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)"
@@ -10686 +12438 @@
                         if test -f /usr/libexec/ld.elf_so; then
                                 cf_cv_shlib_version=abi
-@@ -5276,9 +5503,9 @@
+@@ -5276,9 +5693,12 @@
                 ;;
         esac
@@ -10696 +12448 @@
 +       test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}"
 +       test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}"
++
++       CF_VERBOSE(CC_SHARED_OPTS: $CC_SHARED_OPTS)
++       CF_VERBOSE(MK_SHARED_LIB:  $MK_SHARED_LIB)
  
         AC_SUBST(CC_SHARED_OPTS)
         AC_SUBST(LD_RPATH_OPT)
-@@ -5290,6 +5517,7 @@
+@@ -5290,6 +5710,7 @@
         AC_SUBST(LOCAL_LDFLAGS)
         AC_SUBST(LOCAL_LDFLAGS2)
@@ -10707 +12462 @@
  dnl ---------------------------------------------------------------------------
  dnl CF_SHARED_SONAME version: 3 updated: 2008/09/08 18:34:43
-@@ -5474,7 +5702,7 @@
+@@ -5474,7 +5895,7 @@
  fi
  ])dnl
@@ -10716 +12471 @@
  dnl For each parameter, test if the source-directory exists, and if it contains
  dnl a 'modules' file.  If so, add to the list $cf_cv_src_modules which we'll
-@@ -5497,6 +5725,7 @@
+@@ -5497,6 +5918,7 @@
         TEST_ARG2="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARG2"
  fi
@@ -10724 +12479 @@
  for cf_dir in $1
  do
-@@ -5535,6 +5764,7 @@
+@@ -5535,6 +5957,7 @@
                                 TEST_ARGS="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARGS"
                                 TEST_ARG2="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARG2"
@@ -10732 +12487 @@
         fi
  done
-@@ -5562,10 +5792,18 @@
+@@ -5562,10 +5985,18 @@
         SRC_SUBDIRS="$SRC_SUBDIRS test"
  fi
@@ -10753 +12508 @@
         ADA_SUBDIRS="gen src"
         if test "x$cf_with_tests" != "xno" ; then
-@@ -5624,13 +5862,13 @@
+@@ -5624,13 +6055,13 @@
  AC_DEFUN([CF_STRIP_G_OPT],
  [$1=`echo ${$1} | sed -e 's%-g %%' -e 's%-g$%%'`])dnl
@@ -10770 +12525 @@
  AC_MSG_CHECKING(whether sigaction needs _POSIX_SOURCE)
  AC_TRY_COMPILE([
-@@ -5645,22 +5883,24 @@
+@@ -5645,22 +6076,24 @@
  #include <signal.h>],
         [struct sigaction act],
@@ -10798 +12553 @@
         AC_CHECK_HEADERS( sys/termio.h )
  fi
-@@ -5680,7 +5920,7 @@
+@@ -5680,7 +6113,7 @@
  #include <termios.h>],
                         [struct termios foo; int x = foo.c_iflag],
@@ -10807 +12562 @@
         AC_MSG_RESULT($termios_bad)
         fi
-@@ -5798,6 +6038,45 @@
+@@ -5798,6 +6231,45 @@
  AC_SUBST(top_builddir)
  ])dnl
@@ -10853 +12608 @@
  dnl ----------------
  dnl Determine the type we should use for chtype (and attr_t, which is treated
-@@ -6182,7 +6461,7 @@
+@@ -6182,7 +6654,7 @@
  fi
  ])
@@ -10862 +12617 @@
  dnl Provide a configure option to incorporate libtool.  Define several useful
  dnl symbols for the makefile rules.
-@@ -6258,7 +6537,7 @@
+@@ -6258,7 +6730,7 @@
                 AC_MSG_ERROR(Cannot find libtool)
         fi
@@ -10871 +12626 @@
         LIB_SUFFIX=.la
         LIB_CLEAN='${LIBTOOL} --mode=clean'
-@@ -6283,7 +6562,7 @@
+@@ -6283,7 +6755,7 @@
         # special hack to add -no-undefined (which libtool should do for itself)
         LT_UNDEF=
@@ -10880 +12635 @@
                 ;;
         esac
-@@ -6323,6 +6602,32 @@
+@@ -6323,6 +6795,32 @@
  
  ])dnl
@@ -10913 +12668 @@
  dnl ------------
  dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just
-@@ -6386,7 +6691,50 @@
+@@ -6386,7 +6884,50 @@
  
  ])dnl
@@ -10965 +12720 @@
  dnl Check for POSIX thread library.
  AC_DEFUN([CF_WITH_PTHREAD],
-@@ -6402,23 +6750,28 @@
+@@ -6402,23 +6943,28 @@
      AC_CHECK_HEADER(pthread.h,[
          AC_DEFINE(HAVE_PTHREADS_H)
@@ -11007 +12762 @@
  fi
  ])
-@@ -6486,7 +6839,7 @@
+@@ -6486,7 +7032,7 @@
         [USE_VALGRIND])
  ])dnl
@@ -11016 +12771 @@
  dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
  dnl or adapt to the vendor's definitions to get equivalent functionality,
-@@ -6502,7 +6855,7 @@
+@@ -6502,7 +7048,7 @@
  cf_xopen_source=
  
@@ -11025 +12780 @@
         ;;
  cygwin) #(vi
-@@ -6513,6 +6866,7 @@
+@@ -6513,6 +7059,7 @@
         ;;
  darwin*) #(vi
@@ -11033 +12788 @@
  freebsd*|dragonfly*) #(vi
         # 5.x headers associate
-@@ -6530,15 +6884,23 @@
+@@ -6530,15 +7077,23 @@
         ;;
  irix[[56]].*) #(vi
@@ -11059 +12814 @@
  openbsd*) #(vi
         # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
-@@ -6552,36 +6914,11 @@
+@@ -6552,36 +7107,11 @@
  sco*) #(vi
         # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
@@ -11098 +12853 @@
         ;;
  esac
-@@ -6589,4 +6926,33 @@
+@@ -6589,4 +7119,33 @@
  if test -n "$cf_xopen_source" ; then
         CF_ADD_CFLAGS($cf_xopen_source)
@@ -11133 +12888 @@
  ])
 diff -Naur ncurses-5.9.orig/announce.html.in ncurses-5.9/announce.html.in
---- ncurses-5.9.orig/announce.html.in   2012-02-16 18:25:12.639809512 +0000
-+++ ncurses-5.9/announce.html.in        2012-02-16 18:25:12.919816901 +0000
+--- ncurses-5.9.orig/announce.html.in   2012-08-25 19:57:59.399900947 +0000
++++ ncurses-5.9/announce.html.in        2012-08-25 19:57:59.893231947 +0000
 @@ -1,6 +1,6 @@
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
@@ -11220 +12975 @@
    <ul>
 diff -Naur ncurses-5.9.orig/c++/Makefile.in ncurses-5.9/c++/Makefile.in
---- ncurses-5.9.orig/c++/Makefile.in    2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/c++/Makefile.in 2012-02-16 18:25:12.919816901 +0000
+--- ncurses-5.9.orig/c++/Makefile.in    2012-08-25 19:57:59.426567488 +0000
++++ ncurses-5.9/c++/Makefile.in 2012-08-25 19:58:01.013226651 +0000
 @@ -1,6 +1,6 @@
 -# $Id: Makefile.in,v 1.93 2010/11/27 21:45:27 tom Exp $
-+# $Id: Makefile.in,v 1.95 2011/07/30 22:52:07 tom Exp $
++# $Id: Makefile.in,v 1.96 2012/03/17 16:45:38 tom Exp $
  ##############################################################################
 -# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.                #
  #                                                                            #
  # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -11248 +13003 @@
  OBJS_DEMO = $(MODEL)/demo$o
  
+@@ -179,7 +180,7 @@
+ demo$x:        $(OBJS_DEMO) \
+        $(MY_LIBRARY)  \
+        @TEST_DEPS@
+-       @ECHO_LINK@ $(LINK) -o $@ $(OBJS_DEMO) $(LDFLAGS_DEFAULT)
++       @ECHO_LD@ $(LINK) -o $@ $(OBJS_DEMO) $(LDFLAGS_DEFAULT)
+ 
+ etip.h:        $(srcdir)/etip.h.in $(srcdir)/edit_cfg.sh
+        cp $(srcdir)/etip.h.in $@
 diff -Naur ncurses-5.9.orig/c++/cursesapp.h ncurses-5.9/c++/cursesapp.h
---- ncurses-5.9.orig/c++/cursesapp.h    2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/c++/cursesapp.h 2012-02-16 18:25:12.919816901 +0000
+--- ncurses-5.9.orig/c++/cursesapp.h    2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/c++/cursesapp.h 2012-08-25 19:57:59.893231947 +0000
 @@ -1,6 +1,6 @@
  // * This makes emacs happy -*-Mode: C++;-*-
@@ -11331 +13095 @@
  };
 diff -Naur ncurses-5.9.orig/c++/cursesf.cc ncurses-5.9/c++/cursesf.cc
---- ncurses-5.9.orig/c++/cursesf.cc     2012-02-16 18:25:12.639809512 +0000
-+++ ncurses-5.9/c++/cursesf.cc  2012-02-16 18:25:12.919816901 +0000
+--- ncurses-5.9.orig/c++/cursesf.cc     2012-08-25 19:57:59.426567488 +0000
++++ ncurses-5.9/c++/cursesf.cc  2012-08-25 19:57:59.896565265 +0000
 @@ -1,6 +1,6 @@
  // * this is for making emacs happy: -*-Mode: C++;-*-
@@ -11409 +13173 @@
    UserDefinedFieldType_With_Choice* udf =
 diff -Naur ncurses-5.9.orig/c++/cursesf.h ncurses-5.9/c++/cursesf.h
---- ncurses-5.9.orig/c++/cursesf.h      2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/c++/cursesf.h   2012-02-16 18:25:12.919816901 +0000
+--- ncurses-5.9.orig/c++/cursesf.h      2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/c++/cursesf.h   2012-08-25 19:58:01.569890686 +0000
 @@ -1,6 +1,6 @@
  // * This makes emacs happy -*-Mode: C++;-*-
  /****************************************************************************
 - * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2005,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -11424 +13188 @@
  
 -// $Id: cursesf.h,v 1.28 2005/08/13 18:08:24 tom Exp $
-+// $Id: cursesf.h,v 1.29 2011/04/09 18:07:01 Alexander.Kolesen Exp $
++// $Id: cursesf.h,v 1.30 2012/06/08 17:43:56 Richard.Yao Exp $
  
  #ifndef NCURSES_CURSESF_H_incl
  #define NCURSES_CURSESF_H_incl 1
-@@ -681,7 +681,7 @@
+@@ -677,7 +677,7 @@
+   }
+ 
+ public:
+-  NCursesUserForm (NCursesFormField Fields[],
++  NCursesUserForm (NCursesFormField* Fields[],
                    const T* p_UserData = STATIC_CAST(T*)(0),
                    bool with_frame=FALSE,
                    bool autoDelete_Fields=FALSE)
--    : NCursesForm (Fields, with_frame, autoDelete_Fields) {
-+    : NCursesForm (&Fields, with_frame, autoDelete_Fields) {
-       if (form)
+@@ -686,7 +686,7 @@
         set_user (const_cast<void *>(p_UserData));
    };
-@@ -694,7 +694,7 @@
-                   const T* p_UserData = STATIC_CAST(T*)(0),
-                   bool with_frame=FALSE,
-                   bool autoDelete_Fields=FALSE)
--    : NCursesForm (Fields, nlines, ncols, begin_y, begin_x,
-+    : NCursesForm (&Fields, nlines, ncols, begin_y, begin_x,
-                   with_frame, autoDelete_Fields) {
-       if (form)
-        set_user (const_cast<void *>(p_UserData));
+ 
+-  NCursesUserForm (NCursesFormField Fields[],
++  NCursesUserForm (NCursesFormField* Fields[],
+                   int nlines,
+                   int ncols,
+                   int begin_y = 0,
 diff -Naur ncurses-5.9.orig/c++/cursesm.cc ncurses-5.9/c++/cursesm.cc
---- ncurses-5.9.orig/c++/cursesm.cc     2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/c++/cursesm.cc  2012-02-16 18:25:12.919816901 +0000
+--- ncurses-5.9.orig/c++/cursesm.cc     2012-08-25 19:57:59.426567488 +0000
++++ ncurses-5.9/c++/cursesm.cc  2012-08-25 19:57:59.899898583 +0000
 @@ -1,6 +1,6 @@
  // * this is for making emacs happy: -*-Mode: C++;-*-
@@ -11507 +13271 @@
  }
 diff -Naur ncurses-5.9.orig/c++/cursesm.h ncurses-5.9/c++/cursesm.h
---- ncurses-5.9.orig/c++/cursesm.h      2012-02-16 18:25:12.639809512 +0000
-+++ ncurses-5.9/c++/cursesm.h   2012-02-16 18:25:12.923817007 +0000
+--- ncurses-5.9.orig/c++/cursesm.h      2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/c++/cursesm.h   2012-08-25 19:58:01.569890686 +0000
 @@ -1,6 +1,6 @@
  // * This makes emacs happy -*-Mode: C++;-*-
  /****************************************************************************
 - * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2005,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -11522 +13286 @@
  
 -// $Id: cursesm.h,v 1.25 2005/08/13 18:10:36 tom Exp $
-+// $Id: cursesm.h,v 1.27 2011/09/17 21:37:01 tom Exp $
++// $Id: cursesm.h,v 1.28 2012/06/08 17:43:56 Richard.Yao Exp $
  
  #ifndef NCURSES_CURSESM_H_incl
@@ -11534 +13298 @@
  
    virtual ~NCursesMenuItem ();
-@@ -639,7 +640,7 @@
+@@ -635,7 +636,7 @@
+   }
+ 
+ public:
+-  NCursesUserMenu (NCursesMenuItem Items[],
++  NCursesUserMenu (NCursesMenuItem* Items[],
                    const T* p_UserData = STATIC_CAST(T*)(0),
                    bool with_frame=FALSE,
                    bool autoDelete_Items=FALSE)
--    : NCursesMenu (Items, with_frame, autoDelete_Items) {
-+    : NCursesMenu (&Items, with_frame, autoDelete_Items) {
-       if (menu)
+@@ -644,7 +645,7 @@
         set_user (const_cast<void *>(p_UserData));
    };
-@@ -651,7 +652,7 @@
-                   int begin_x = 0,
-                   const T* p_UserData = STATIC_CAST(T*)(0),
-                   bool with_frame=FALSE)
--    : NCursesMenu (Items, nlines, ncols, begin_y, begin_x, with_frame) {
-+    : NCursesMenu (&Items, nlines, ncols, begin_y, begin_x, with_frame) {
-       if (menu)
-        set_user (const_cast<void *>(p_UserData));
-   };
+ 
+-  NCursesUserMenu (NCursesMenuItem Items[],
++  NCursesUserMenu (NCursesMenuItem* Items[],
+                   int nlines,
+                   int ncols,
+                   int begin_y = 0,
 diff -Naur ncurses-5.9.orig/c++/cursespad.cc ncurses-5.9/c++/cursespad.cc
---- ncurses-5.9.orig/c++/cursespad.cc   2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/c++/cursespad.cc        2012-02-16 18:25:12.923817007 +0000
+--- ncurses-5.9.orig/c++/cursespad.cc   2012-08-25 19:57:59.426567488 +0000
++++ ncurses-5.9/c++/cursespad.cc        2012-08-25 19:57:59.899898583 +0000
 @@ -1,6 +1,6 @@
  // * this is for making emacs happy: -*-Mode: C++;-*-
@@ -11581 +13345 @@
  
 diff -Naur ncurses-5.9.orig/c++/cursesw.cc ncurses-5.9/c++/cursesw.cc
---- ncurses-5.9.orig/c++/cursesw.cc     2012-02-16 18:25:12.639809512 +0000
-+++ ncurses-5.9/c++/cursesw.cc  2012-02-16 18:25:12.923817007 +0000
+--- ncurses-5.9.orig/c++/cursesw.cc     2012-08-25 19:57:59.426567488 +0000
++++ ncurses-5.9/c++/cursesw.cc  2012-08-25 19:57:59.903231901 +0000
 @@ -1,6 +1,6 @@
  // * this is for making emacs happy: -*-Mode: C++;-*-
@@ -11616 +13380 @@
      RIPOFFINIT init = *prip++;
 diff -Naur ncurses-5.9.orig/c++/cursesw.h ncurses-5.9/c++/cursesw.h
---- ncurses-5.9.orig/c++/cursesw.h      2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/c++/cursesw.h   2012-02-16 18:25:12.923817007 +0000
+--- ncurses-5.9.orig/c++/cursesw.h      2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/c++/cursesw.h   2012-08-25 19:57:59.903231901 +0000
 @@ -1,7 +1,7 @@
  // * This makes emacs happy -*-Mode: C++;-*-
@@ -11672 +13436 @@
    }
    // Disable this call; the viewport subwindow is already defined
+diff -Naur ncurses-5.9.orig/c++/cursslk.cc ncurses-5.9/c++/cursslk.cc
+--- ncurses-5.9.orig/c++/cursslk.cc     2012-08-25 19:57:59.426567488 +0000
++++ ncurses-5.9/c++/cursslk.cc  2012-08-25 19:58:00.879893949 +0000
+@@ -1,6 +1,6 @@
+ // * this is for making emacs happy: -*-Mode: C++;-*-
+ /****************************************************************************
+- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2005,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -35,14 +35,15 @@
+ #include "cursslk.h"
+ #include "cursesapp.h"
+ 
+-MODULE_ID("$Id: cursslk.cc,v 1.15 2005/08/06 22:12:36 tom Exp $")
++MODULE_ID("$Id: cursslk.cc,v 1.16 2012/02/23 10:41:56 tom Exp $")
+ 
+ Soft_Label_Key_Set::Soft_Label_Key&
+   Soft_Label_Key_Set::Soft_Label_Key::operator=(char *text)
+ {
+   delete[] label;
+-  label = new char[1 + ::strlen(text)];
+-  (::strcpy)(label,text);
++  size_t need = 1 + ::strlen(text);
++  label = new char[need];
++  ::_nc_STRCPY(label,text,need);
+   return *this;
+ }
+ 
 diff -Naur ncurses-5.9.orig/c++/demo.cc ncurses-5.9/c++/demo.cc
---- ncurses-5.9.orig/c++/demo.cc        2012-02-16 18:25:12.643809617 +0000
-+++ ncurses-5.9/c++/demo.cc     2012-02-16 18:25:12.923817007 +0000
+--- ncurses-5.9.orig/c++/demo.cc        2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/c++/demo.cc     2012-08-25 19:58:00.879893949 +0000
 @@ -1,6 +1,6 @@
  // * This makes emacs happy -*-Mode: C++;-*-
  /****************************************************************************
 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2008,2011 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -11688 +13482 @@
   *
 - * $Id: demo.cc,v 1.39 2008/12/07 02:07:34 juergen Exp $
-+ * $Id: demo.cc,v 1.40 2011/09/17 22:12:10 tom Exp $
++ * $Id: demo.cc,v 1.41 2012/02/23 10:41:56 tom Exp $
   */
  
@@ -11700 +13494 @@
    }
    bool char_check(int c) {
+@@ -319,7 +320,7 @@
+     for(int i=1; i <= S->labels(); i++) {
+       char buf[8];
+       assert(i < 100);
+-      ::sprintf(buf, "Frm%02d", i);
++      ::_nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) "Frm%02d", i);
+       (*S)[i] = buf;                                      // Text
+       (*S)[i] = Soft_Label_Key_Set::Soft_Label_Key::Left; // Justification
+     }
+@@ -539,7 +540,7 @@
+   for(int i=1; i <= S.labels(); i++) {
+     char buf[8];
+     assert(i < 100);
+-    ::sprintf(buf, "Key%02d", i);
++    ::_nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) "Key%02d", i);
+     S[i] = buf;                                      // Text
+     S[i] = Soft_Label_Key_Set::Soft_Label_Key::Left; // Justification
+   }
 diff -Naur ncurses-5.9.orig/c++/etip.h.in ncurses-5.9/c++/etip.h.in
---- ncurses-5.9.orig/c++/etip.h.in      2012-02-16 18:25:12.639809512 +0000
-+++ ncurses-5.9/c++/etip.h.in   2012-02-16 18:25:12.923817007 +0000
+--- ncurses-5.9.orig/c++/etip.h.in      2012-08-25 19:57:59.426567488 +0000
++++ ncurses-5.9/c++/etip.h.in   2012-08-25 19:57:59.906565219 +0000
 @@ -1,6 +1,6 @@
  // * This makes emacs happy -*-Mode: C++;-*-
@@ -11774 +13586 @@
  
    NCursesFormException (const NCursesForm* form,
+diff -Naur ncurses-5.9.orig/c++/internal.h ncurses-5.9/c++/internal.h
+--- ncurses-5.9.orig/c++/internal.h     2012-08-25 19:57:59.423234170 +0000
++++ ncurses-5.9/c++/internal.h  2012-08-25 19:58:00.879893949 +0000
+@@ -1,6 +1,6 @@
+ // * This makes emacs happy -*-Mode: C++;-*-
+ /****************************************************************************
+- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2008,2012 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -31,7 +31,7 @@
+  *   Author: Juergen Pfeifer, 1997                                          *
+  ****************************************************************************/
+ 
+-// $Id: internal.h,v 1.17 2008/12/07 02:07:34 juergen Exp $
++// $Id: internal.h,v 1.18 2012/02/23 10:41:56 tom Exp $
+ 
+ #ifndef NCURSES_CPLUS_INTERNAL_H
+ #define NCURSES_CPLUS_INTERNAL_H 1
+@@ -62,4 +62,6 @@
+ #define NULL 0
+ #endif
+ 
++#include <nc_string.h>
++
+ #endif /* NCURSES_CPLUS_INTERNAL_H */
 diff -Naur ncurses-5.9.orig/config.guess ncurses-5.9/config.guess
---- ncurses-5.9.orig/config.guess       2012-02-16 18:25:12.607808668 +0000
-+++ ncurses-5.9/config.guess    2012-02-16 18:25:12.923817007 +0000
+--- ncurses-5.9.orig/config.guess       2012-08-25 19:57:59.429900806 +0000
++++ ncurses-5.9/config.guess    2012-08-25 19:58:00.879893949 +0000
 @@ -1,10 +1,10 @@
  #! /bin/sh
@@ -11784 +13623 @@
 -#   Free Software Foundation, Inc.
 +#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-+#   2911 Free Software Foundation, Inc.
++#   2011, 2012 Free Software Foundation, Inc.
  
 -timestamp='2010-09-24'
-+timestamp='2011-01-01'
++timestamp='2012-02-10'
  
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by
-@@ -57,8 +57,8 @@
+@@ -17,9 +17,7 @@
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -57,8 +55,8 @@
  
  Originally written by Per Bothner.
@@ -11797 +13647 @@
 -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
 -Software Foundation, Inc.
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 +Free Software Foundation, Inc.
  
  This is free software; see the source for copying conditions.  There is NO
  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -92,7 +92,7 @@
+@@ -92,7 +90,7 @@
    exit 1
  fi
@@ -11811 +13661 @@
  # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
  # compiler to aid in system detection is discouraged as it requires
-@@ -106,7 +106,7 @@
+@@ -106,7 +104,7 @@
  
  set_cc_for_build='
@@ -11820 +13670 @@
   { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
   { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
-@@ -270,7 +270,10 @@
+@@ -145,7 +143,7 @@
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+     *:NetBSD:*:*)
+        # NetBSD (nbsd) targets should (where applicable) match one or
+-       # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
++       # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+        # *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+        # switched to ELF, *-*-netbsd* would select the old
+        # object file format.  This provides both forward
+@@ -220,10 +218,10 @@
+        exit ;;
+     alpha:OSF1:*:*)
+        case $UNAME_RELEASE in
+-           *4.0)
++       *4.0)
+                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+                ;;
+-           *5.*)
++       *5.*)
+                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+                ;;
+        esac
+@@ -270,7 +268,10 @@
         # A Xn.n version is an unreleased experimental baselevel.
         # 1.2 uses "1.2" for uname -r.
@@ -11832 +13704 @@
         # How do we know it's Interix rather than the generic POSIX subsystem?
         # Should we change UNAME_MACHINE based on the output of uname instead
-@@ -326,8 +329,8 @@
+@@ -326,8 +327,8 @@
             sparc) echo sparc-icl-nx7; exit ;;
         esac ;;
@@ -11843 +13715 @@
         echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
         exit ;;
-@@ -495,7 +498,7 @@
+@@ -495,7 +496,7 @@
         else
             echo i586-dg-dgux${UNAME_RELEASE}
@@ -11852 +13724 @@
         echo m88k-dolphin-sysv3
         exit ;;
+@@ -597,50 +598,50 @@
+                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    case "${sc_cpu_version}" in
+-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+-                      532)                      # CPU_PA_RISC2_0
+-                        case "${sc_kernel_bits}" in
+-                          32) HP_ARCH="hppa2.0n" ;;
+-                          64) HP_ARCH="hppa2.0w" ;;
++                     523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
++                     528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++                     532)                      # CPU_PA_RISC2_0
++                       case "${sc_kernel_bits}" in
++                         32) HP_ARCH="hppa2.0n" ;;
++                         64) HP_ARCH="hppa2.0w" ;;
+                          '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+-                        esac ;;
+-                    esac
++                       esac ;;
++                   esac
+                fi
+                if [ "${HP_ARCH}" = "" ]; then
+                    eval $set_cc_for_build
+-                   sed 's/^              //' << EOF >$dummy.c
++                   sed 's/^            //' << EOF >$dummy.c
++
++               #define _HPUX_SOURCE
++               #include <stdlib.h>
++               #include <unistd.h>
+ 
+-              #define _HPUX_SOURCE
+-              #include <stdlib.h>
+-              #include <unistd.h>
+-
+-              int main ()
+-              {
+-              #if defined(_SC_KERNEL_BITS)
+-                  long bits = sysconf(_SC_KERNEL_BITS);
+-              #endif
+-                  long cpu  = sysconf (_SC_CPU_VERSION);
+-
+-                  switch (cpu)
+-               {
+-               case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+-               case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+-               case CPU_PA_RISC2_0:
+-              #if defined(_SC_KERNEL_BITS)
+-                   switch (bits)
+-                       {
+-                       case 64: puts ("hppa2.0w"); break;
+-                       case 32: puts ("hppa2.0n"); break;
+-                       default: puts ("hppa2.0"); break;
+-                       } break;
+-              #else  /* !defined(_SC_KERNEL_BITS) */
+-                   puts ("hppa2.0"); break;
+-              #endif
+-               default: puts ("hppa1.0"); break;
+-               }
+-                  exit (0);
+-              }
++               int main ()
++               {
++               #if defined(_SC_KERNEL_BITS)
++                   long bits = sysconf(_SC_KERNEL_BITS);
++               #endif
++                   long cpu  = sysconf (_SC_CPU_VERSION);
++
++                   switch (cpu)
++                       {
++                       case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
++                       case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
++                       case CPU_PA_RISC2_0:
++               #if defined(_SC_KERNEL_BITS)
++                           switch (bits)
++                               {
++                               case 64: puts ("hppa2.0w"); break;
++                               case 32: puts ("hppa2.0n"); break;
++                               default: puts ("hppa2.0"); break;
++                               } break;
++               #else  /* !defined(_SC_KERNEL_BITS) */
++                           puts ("hppa2.0"); break;
++               #endif
++                       default: puts ("hppa1.0"); break;
++                       }
++                   exit (0);
++               }
+ EOF
+                    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+                    test -z "$HP_ARCH" && HP_ARCH=hppa
+@@ -789,13 +790,12 @@
+        echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+        exit ;;
+     *:FreeBSD:*:*)
+-       case ${UNAME_MACHINE} in
+-           pc98)
+-               echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++       UNAME_PROCESSOR=`/usr/bin/uname -p`
++       case ${UNAME_PROCESSOR} in
+            amd64)
+                echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+            *)
+-               echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++               echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+        esac
+        exit ;;
+     i*:CYGWIN*:*)
+@@ -804,6 +804,9 @@
+     *:MINGW*:*)
+        echo ${UNAME_MACHINE}-pc-mingw32
+        exit ;;
++    i*:MSYS*:*)
++       echo ${UNAME_MACHINE}-pc-msys
++       exit ;;
+     i*:windows32*:*)
+        # uname -m includes "-pc" on this system.
+        echo ${UNAME_MACHINE}-mingw32
 @@ -820,8 +823,8 @@
                 echo x86_64-unknown-interix${UNAME_RELEASE}
@@ -11863 +13852 @@
      [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
         echo i${UNAME_MACHINE}-pc-mks
-@@ -934,14 +937,14 @@
+@@ -858,15 +861,22 @@
+     i*86:Minix:*:*)
+        echo ${UNAME_MACHINE}-pc-minix
+        exit ;;
++    aarch64:Linux:*:*)
++       echo ${UNAME_MACHINE}-unknown-linux-gnu
++       exit ;;
++    aarch64_be:Linux:*:*)
++       UNAME_MACHINE=aarch64_be
++       echo ${UNAME_MACHINE}-unknown-linux-gnu
++       exit ;;
+     alpha:Linux:*:*)
+        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+-           EV5)   UNAME_MACHINE=alphaev5 ;;
+-           EV56)  UNAME_MACHINE=alphaev56 ;;
+-           PCA56) UNAME_MACHINE=alphapca56 ;;
+-           PCA57) UNAME_MACHINE=alphapca56 ;;
+-           EV6)   UNAME_MACHINE=alphaev6 ;;
+-           EV67)  UNAME_MACHINE=alphaev67 ;;
+-           EV68*) UNAME_MACHINE=alphaev68 ;;
++         EV5)   UNAME_MACHINE=alphaev5 ;;
++         EV56)  UNAME_MACHINE=alphaev56 ;;
++         PCA56) UNAME_MACHINE=alphapca56 ;;
++         PCA57) UNAME_MACHINE=alphapca56 ;;
++         EV6)   UNAME_MACHINE=alphaev6 ;;
++         EV67)  UNAME_MACHINE=alphaev67 ;;
++         EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+        objdump --private-headers /bin/sh | grep -q ld.so.1
+        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+@@ -874,30 +884,39 @@
+        exit ;;
+     arm*:Linux:*:*)
+        eval $set_cc_for_build
+-       if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null | \
+-           grep -q __ARM_EABI__
++       if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
++           | grep -q __ARM_EABI__
+        then
+            echo ${UNAME_MACHINE}-unknown-linux-gnu
+        else
+-           echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++           if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
++               | grep -q __ARM_PCS_VFP
++           then
++               echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++           else
++               echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
++           fi
+        fi
+        exit ;;
+     avr32*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
+     cris:Linux:*:*)
+-       echo cris-axis-linux-gnu
++       echo ${UNAME_MACHINE}-axis-linux-gnu
+        exit ;;
+     crisv32:Linux:*:*)
+-       echo crisv32-axis-linux-gnu
++       echo ${UNAME_MACHINE}-axis-linux-gnu
+        exit ;;
+     frv:Linux:*:*)
+-       echo frv-unknown-linux-gnu
++       echo ${UNAME_MACHINE}-unknown-linux-gnu
++       exit ;;
++    hexagon:Linux:*:*)
++       echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
+     i*86:Linux:*:*)
+        LIBC=gnu
+        eval $set_cc_for_build
+-       sed 's/^        //' << EOF >$dummy.c
++       sed 's/^        //' << EOF >$dummy.c
+        #ifdef __dietlibc__
+        LIBC=dietlibc
+        #endif
+@@ -934,14 +953,14 @@
         test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
         ;;
@@ -11869 +13935 @@
 -       echo or32-unknown-linux-gnu
 -       exit ;;
-+       echo or32-unknown-linux-gnu
++       echo ${UNAME_MACHINE}-unknown-linux-gnu
 +       exit ;;
      padre:Linux:*:*)
@@ -11882 +13948 @@
         # Look for CPU level
         case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+@@ -969,13 +988,13 @@
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
+     tile*:Linux:*:*)
+-       echo ${UNAME_MACHINE}-tilera-linux-gnu
++       echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
+     vax:Linux:*:*)
+        echo ${UNAME_MACHINE}-dec-linux-gnu
+        exit ;;
+     x86_64:Linux:*:*)
+-       echo x86_64-unknown-linux-gnu
++       echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
+     xtensa*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+@@ -1093,7 +1112,7 @@
+          && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+-          && { echo i486-ncr-sysv4; exit; } ;;
++         && { echo i486-ncr-sysv4; exit; } ;;
+     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+        OS_REL='.3'
+        test -r /etc/.relid \
+@@ -1136,8 +1155,8 @@
+                echo ns32k-sni-sysv
+        fi
+        exit ;;
+-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+-                     # says <Richard.M.Bartel@ccMail.Census.GOV>
++    PENTIUM:*:4.0*:*)  # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
++                       # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit ;;
+     *:UNIX_System_V:4*:FTX*)
+@@ -1165,9 +1184,9 @@
+        exit ;;
+     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+        if [ -d /usr/nec ]; then
+-               echo mips-nec-sysv${UNAME_RELEASE}
++               echo mips-nec-sysv${UNAME_RELEASE}
+        else
+-               echo mips-unknown-sysv${UNAME_RELEASE}
++               echo mips-unknown-sysv${UNAME_RELEASE}
+        fi
+        exit ;;
+     BeBox:BeOS:*:*)    # BeOS running on hardware made by Be, PPC only.
+@@ -1212,12 +1231,12 @@
+            i386)
+                eval $set_cc_for_build
+                if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+-                   if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+-                       (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+-                       grep IS_64BIT_ARCH >/dev/null
+-                   then
+-                       UNAME_PROCESSOR="x86_64"
+-                   fi
++                 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++                     (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++                     grep IS_64BIT_ARCH >/dev/null
++                 then
++                     UNAME_PROCESSOR="x86_64"
++                 fi
+                fi ;;
+            unknown) UNAME_PROCESSOR=powerpc ;;
+        esac
+@@ -1226,8 +1245,8 @@
+     *:procnto*:*:* | *:QNX:[0123456789]*:*)
+        UNAME_PROCESSOR=`uname -p`
+        if test "$UNAME_PROCESSOR" = "x86"; then
+-           UNAME_PROCESSOR=i386
+-           UNAME_MACHINE=pc
++               UNAME_PROCESSOR=i386
++               UNAME_MACHINE=pc
+        fi
+        echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+        exit ;;
+@@ -1306,6 +1325,9 @@
+     i*86:AROS:*:*)
+        echo ${UNAME_MACHINE}-pc-aros
+        exit ;;
++    x86_64:VMkernel:*:*)
++       echo ${UNAME_MACHINE}-unknown-esx
++       exit ;;
+ esac
+ 
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+@@ -1328,11 +1350,11 @@
+ #include <sys/param.h>
+   printf ("m68k-sony-newsos%s\n",
+ #ifdef NEWSOS4
+-          "4"
++       "4"
+ #else
+-         ""
++       ""
+ #endif
+-         ); exit (0);
++       ); exit (0);
+ #endif
+ #endif
+ 
 diff -Naur ncurses-5.9.orig/config.sub ncurses-5.9/config.sub
---- ncurses-5.9.orig/config.sub 2012-02-16 18:25:12.627809197 +0000
-+++ ncurses-5.9/config.sub      2012-02-16 18:25:12.927817113 +0000
-@@ -2,9 +2,9 @@
+--- ncurses-5.9.orig/config.sub 2012-08-25 19:57:59.429900806 +0000
++++ ncurses-5.9/config.sub      2012-08-25 19:58:00.879893949 +0000
+@@ -1,10 +1,10 @@
+ #! /bin/sh
  # Configuration validation subroutine script.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 -#   Free Software Foundation, Inc.
-+#   2011 Free Software Foundation, Inc.
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
++#   2011, 2012 Free Software Foundation, Inc.
  
 -timestamp='2010-09-11'
-+timestamp='2011-04-01'
++timestamp='2012-02-10'
  
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
-@@ -76,8 +76,8 @@
+@@ -21,9 +21,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -76,8 +74,8 @@
  GNU config.sub ($timestamp)
  
@@ -11903 +14085 @@
 -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
 -Software Foundation, Inc.
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 +Free Software Foundation, Inc.
  
  This is free software; see the source for copying conditions.  There is NO
  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -175,10 +175,10 @@
+@@ -132,6 +130,10 @@
+     os=-$maybe_os
+     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+     ;;
++  android-linux)
++    os=-linux-android
++    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
++    ;;
+   *)
+     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+     if [ $basic_machine != $1 ]
+@@ -175,10 +177,10 @@
                 os=-chorusos
                 basic_machine=$1
@@ -11922 +14115 @@
                 os=-hiuxwe2
                 ;;
-@@ -283,12 +283,13 @@
+@@ -247,17 +249,22 @@
+        # Some are omitted here because they have special meanings below.
+        1750a | 580 \
+        | a29k \
++       | aarch64 | aarch64_be \
+        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+        | am33_2.0 \
+        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++        | be32 | be64 \
+        | bfin \
+        | c4x | clipper \
+        | d10v | d30v | dlx | dsp16xx \
++       | epiphany \
+        | fido | fr30 | frv \
+        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
++       | hexagon \
+        | i370 | i860 | i960 | ia64 \
+        | ip2k | iq2000 \
++       | le32 | le64 \
+        | lm32 \
+        | m32c | m32r | m32rle | m68000 | m68k | m88k \
+        | maxq | mb | microblaze | mcore | mep | metag \
+@@ -283,25 +290,26 @@
         | moxie \
         | mt \
@@ -11936 +14152 @@
 +       | powerpc | powerpc64 | powerpc64le | powerpcle \
         | pyramid \
-        | rx \
+-       | rx \
++       | rl78 | rx \
         | score \
-@@ -296,12 +297,12 @@
+        | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
         | sh64 | sh64le \
         | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -11947 +14164 @@
 +       | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
         | ubicom32 \
-        | v850 | v850e \
+-       | v850 | v850e \
++       | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
         | we32k \
 -       | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
@@ -11954 +14172 @@
                 basic_machine=$basic_machine-unknown
                 ;;
-@@ -324,7 +325,15 @@
-        ms1)
+@@ -314,8 +322,7 @@
+        c6x)
+                basic_machine=tic6x-unknown
+                ;;
+-       m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+-               # Motorola 68HC11/12.
++       m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+                basic_machine=$basic_machine-unknown
+                os=-none
+                ;;
+@@ -325,12 +332,27 @@
                 basic_machine=mt-unknown
                 ;;
--
+ 
 +       strongarm | thumb | xscale)
 +               basic_machine=arm-unknown
++               ;;
++       xgate)
++               basic_machine=$basic_machine-unknown
++               os=-none
 +               ;;
 +       xscaleeb)
 +               basic_machine=armeb-unknown
 +               ;;
++
 +       xscaleel)
 +               basic_machine=armel-unknown
 +               ;;
++
         # We use `pc' rather than `unknown'
         # because (1) that's what they normally are, and
         # (2) the word "unknown" tends to confuse beginning users.
-@@ -382,24 +391,25 @@
+        i*86 | x86_64)
+-               basic_machine=$basic_machine-pc
+-               ;;
++         basic_machine=$basic_machine-pc
++         ;;
+        # Object if more than one company name word.
+        *-*-*)
+                echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+@@ -339,11 +361,13 @@
+        # Recognize the basic CPU types with company name.
+        580-* \
+        | a29k-* \
++       | aarch64-* | aarch64_be-* \
+        | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+        | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+        | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+        | avr-* | avr32-* \
++       | be32-* | be64-* \
+        | bfin-* | bs2000-* \
+        | c[123]* | c30-* | [cjt]90-* | c4x-* \
+        | clipper-* | craynv-* | cydra-* \
+@@ -352,8 +376,10 @@
+        | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+        | h8300-* | h8500-* \
+        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
++       | hexagon-* \
+        | i*86-* | i860-* | i960-* | ia64-* \
+        | ip2k-* | iq2000-* \
++       | le32-* | le64-* \
+        | lm32-* \
+        | m32c-* | m32r-* | m32rle-* \
+        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+@@ -382,24 +408,26 @@
         | nds32-* | nds32le-* | nds32be-* \
         | nios-* | nios2-* \
@@ -11981 +14247 @@
 +       | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
         | pyramid-* \
-        | romp-* | rs6000-* | rx-* \
+-       | romp-* | rs6000-* | rx-* \
++       | rl78-* | romp-* | rs6000-* | rx-* \
         | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
         | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
@@ -11991 +14258 @@
 +       | tahoe-* \
         | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-        | tile-* | tilegx-* \
+-       | tile-* | tilegx-* \
++       | tile*-* \
         | tron-* \
         | ubicom32-* \
-        | v850-* | v850e-* | vax-* \
+-       | v850-* | v850e-* | vax-* \
++       | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
++       | vax-* \
         | we32k-* \
 -       | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -12001 +14271 @@
         | ymp-* \
         | z8k-* | z80-*)
-@@ -539,7 +549,7 @@
+@@ -539,7 +567,7 @@
                 basic_machine=craynv-cray
                 os=-unicosmp
@@ -12010 +14280 @@
                 os=-elf
                 ;;
-@@ -826,10 +836,10 @@
-                basic_machine=v70-nec
-                os=-sysv
+@@ -697,7 +725,6 @@
+        i370-ibm* | ibm*)
+                basic_machine=i370-ibm
                 ;;
--       next | m*-next )
-+       next | m*-next)
-                basic_machine=m68k-next
-                case $os in
--                   -nextstep* )
-+                   -nextstep*)
-                        ;;
-                    -ns2*)
-                      os=-nextstep2
-@@ -948,11 +958,14 @@
-        pn)
-                basic_machine=pn-gould
+-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+        i*86v32)
+                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+                os=-sysv32
+@@ -794,10 +821,18 @@
+        ms1-*)
+                basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
                 ;;
--       power)  basic_machine=power-ibm
-+       power)
-+               basic_machine=power-ibm
++       msys)
++               basic_machine=i386-pc
++               os=-msys
++               ;;
+        mvs)
+                basic_machine=i370-ibm
+                os=-mvs
+                ;;
++       nacl)
++               basic_machine=le32-unknown
++               os=-nacl
++               ;;
+        ncr3000)
+                basic_machine=i486-ncr
+                os=-sysv4
+@@ -950,9 +985,10 @@
+                ;;
+        power)  basic_machine=power-ibm
                 ;;
 -       ppc)    basic_machine=powerpc-unknown
-+       ppc | ppcbe)
-+               basic_machine=powerpc-unknown
++       ppc | ppcbe)    basic_machine=powerpc-unknown
                 ;;
 -       ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
@@ -12041 +14320 @@
         ppcle | powerpclittle | ppc-le | powerpc-little)
                 basic_machine=powerpcle-unknown
-@@ -960,9 +973,11 @@
-        ppcle-* | powerpclittle-*)
-                basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-                ;;
--       ppc64)  basic_machine=powerpc64-unknown
-+       ppc64)
-+               basic_machine=powerpc64-unknown
-                ;;
--       ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+       ppc64-*)
-+               basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-                ;;
-        ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-                basic_machine=powerpc64le-unknown
-@@ -1046,6 +1061,9 @@
+@@ -1046,6 +1082,9 @@
                 basic_machine=i860-stratus
                 os=-sysv4
@@ -12065 +14330 @@
                 basic_machine=m68000-sun
                 ;;
-@@ -1178,6 +1196,9 @@
+@@ -1102,13 +1141,8 @@
+                basic_machine=t90-cray
+                os=-unicos
+                ;;
+-       # This must be matched before tile*.
+-       tilegx*)
+-               basic_machine=tilegx-unknown
+-               os=-linux-gnu
+-               ;;
+        tile*)
+-               basic_machine=tile-unknown
++               basic_machine=$basic_machine-unknown
+                os=-linux-gnu
+                ;;
+        tx39)
+@@ -1178,6 +1212,9 @@
         xps | xps100)
                 basic_machine=xps100-honeywell
@@ -12075 +14355 @@
                 basic_machine=ymp-cray
                 os=-unicos
-@@ -1400,7 +1421,7 @@
-        -nova*)
-                os=-rtmk-nova
+@@ -1315,7 +1352,7 @@
+              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+              | -chorusos* | -chorusrdb* | -cegcc* \
+-             | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
++             | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+              | -mingw32* | -linux-gnu* | -linux-android* \
+              | -linux-newlib* | -linux-uclibc* \
+              | -uxpv* | -beos* | -mpeix* | -udk* \
+@@ -1527,9 +1564,6 @@
                 ;;
--       -ns2 )
-+       -ns2)
-                os=-nextstep2
+        m68000-sun)
+                os=-sunos3
+-               # This also exists in the configure program, but was not the
+-               # default.
+-               # os=-sunos4
                 ;;
-        -nsk*)
-@@ -1597,7 +1618,7 @@
-        m88k-omron*)
-                os=-luna
-                ;;
--       *-next )
-+       *-next)
-                os=-nextstep
-                ;;
-        *-sequent)
+        m68*-cisco)
+                os=-aout
 diff -Naur ncurses-5.9.orig/configure ncurses-5.9/configure
---- ncurses-5.9.orig/configure  2012-02-16 18:25:12.627809197 +0000
-+++ ncurses-5.9/configure       2012-02-16 18:25:13.283826506 +0000
-@@ -1,5 +1,5 @@
+--- ncurses-5.9.orig/configure  2012-08-25 19:57:59.429900806 +0000
++++ ncurses-5.9/configure       2012-08-25 19:58:02.356553633 +0000
+@@ -1,7 +1,7 @@
  #! /bin/sh
 -# From configure.in Revision: 1.520 .
-+# From configure.in Revision: 1.541 .
++# From configure.in Revision: 1.552 .
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by Autoconf 2.52.20101002.
+-# Generated by Autoconf 2.52.20101002.
++# Generated by Autoconf 2.52.20120811.
  #
-@@ -702,6 +702,7 @@
+ # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+ # Free Software Foundation, Inc.
+@@ -171,15 +171,16 @@
+ bindir='${exec_prefix}/bin'
+ sbindir='${exec_prefix}/sbin'
+ libexecdir='${exec_prefix}/libexec'
+-datadir='${prefix}/share'
++datarootdir='${prefix}/share'
++datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
+ libdir='${exec_prefix}/lib'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+-infodir='${prefix}/info'
+-mandir='${prefix}/man'
++infodir='${datarootdir}/info'
++mandir='${datarootdir}/man'
+ 
+ # Identity of this package.
+ PACKAGE_NAME=
+@@ -230,6 +231,13 @@
+   | --da=*)
+     datadir=$ac_optarg ;;
+ 
++  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
++  | --dataroo | --dataro | --datar)
++    ac_prev=datarootdir ;;
++  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
++  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
++    datarootdir=$ac_optarg ;;
++
+   -disable-* | --disable-*)
+     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+@@ -505,7 +513,7 @@
+ done
+ 
+ # Be sure to have absolute paths.
+-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
++for ac_var in bindir sbindir libexecdir datarootdir datadir sysconfdir sharedstatedir \
+               localstatedir libdir includedir oldincludedir infodir mandir
+ do
+   eval ac_val=$`echo $ac_var`
+@@ -654,15 +662,16 @@
+   --bindir=DIR            user executables [EPREFIX/bin]
+   --sbindir=DIR           system admin executables [EPREFIX/sbin]
+   --libexecdir=DIR        program executables [EPREFIX/libexec]
+-  --datadir=DIR           read-only architecture-independent data [PREFIX/share]
++  --datarootdir=DIR       read-only architecture-independent data [PREFIX/share]
++  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+   --libdir=DIR            object code libraries [EPREFIX/lib]
+   --includedir=DIR        C header files [PREFIX/include]
+   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+-  --infodir=DIR           info documentation [PREFIX/info]
+-  --mandir=DIR            man documentation [PREFIX/man]
++  --infodir=DIR           info documentation [DATAROOTDIR/info]
++  --mandir=DIR            man documentation [DATAROOTDIR/man]
+ EOF
+ 
+   cat <<\EOF
+@@ -694,14 +703,15 @@
+   --with-rel-version=XXX  override derived release version
+   --with-abi-version=XXX  override derived ABI version
+   --with-system-type=XXX  test: override derived host system-type
++  --without-ada           suppress check for Ada95, don't build demo
+   --without-cxx           do not adjust ncurses bool to match C++
+   --without-cxx-binding   do not build C++ binding and demo
+-  --without-ada           suppress check for Ada95, don't build demo
+   --without-manpages      suppress install of manpages
+   --without-progs         suppress build with programs (e.g., tic)
    --without-tests         suppress build with test-programs
    --without-curses-h      install curses.h as ncurses.h only
@@ -12111 +14467 @@
    --enable-mixed-case     tic should assume mixed-case filenames
    --with-install-prefix   prefixes actual install-location ($DESTDIR)
-@@ -719,6 +720,7 @@
+@@ -719,6 +729,7 @@
    --with-normal           generate normal-libraries (default)
    --with-debug            generate debug-libraries (default)
@@ -12119 +14475 @@
    --with-ticlib           generate separate tic library
    --with-gpm              use Alessandro Rubini's GPM library
-@@ -735,6 +737,7 @@
+@@ -735,6 +746,7 @@
    --with-hashed-db        specify hashed-database library
    --with-fallbacks=XXX    specify list of fallback terminal descriptions
@@ -12127 +14483 @@
    --with-default-terminfo-dir=DIR default terminfo directory (default: DATADIR/terminfo)
    --disable-big-core      assume machine has little memory
-@@ -1007,7 +1010,7 @@
+@@ -759,6 +771,7 @@
+   --with-ospeed=TYPE      override type of ospeed variable
+   --with-mmask-t=TYPE     override type of mmask_t
+   --with-ccharw-max=XXX   override size CCHARW_MAX
++  --with-tparm-arg=TYPE   override parameter type of tparm
+   --with-rcs-ids          compile-in RCS identifiers
+ Options to Specify How Manpages are Installed:
+   --with-manpage-format   specify manpage-format: gzip/compress/BSDI/normal and
+@@ -796,8 +809,9 @@
+   --disable-scroll-hints  compile without scroll-hints code
+   --enable-wgetch-events  compile with experimental wgetch-events code
+ Testing/development Options:
+-  --enable-echo           build: display "compiling" commands (default)
++  --disable-echo          display "compiling" commands
+   --enable-warnings       build: turn on GCC compiler warnings
++  --enable-string-hacks  work around bogus compiler/loader warnings
+   --enable-assertions     test: turn on generation of assertion code
+   --with-dmalloc          test: use Gray Watson's dmalloc library
+   --with-dbmalloc         test: use Conor Cahill's dbmalloc library
+@@ -883,7 +897,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.52.20101002.  Invocation command line was
++generated by GNU Autoconf 2.52.20120811.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -1007,7 +1021,7 @@
  fi
  for ac_site_file in $CONFIG_SITE; do
    if test -r "$ac_site_file"; then
 -    { echo "$as_me:1010: loading site script $ac_site_file" >&5
-+    { echo "$as_me:1013: loading site script $ac_site_file" >&5
++    { echo "$as_me:1024: loading site script $ac_site_file" >&5
  echo "$as_me: loading site script $ac_site_file" >&6;}
      cat "$ac_site_file" >&5
      . "$ac_site_file"
-@@ -1018,7 +1021,7 @@
+@@ -1018,7 +1032,7 @@
    # Some versions of bash will fail to source /dev/null (special
    # files actually), so we avoid doing that.
    if test -f "$cache_file"; then
 -    { echo "$as_me:1021: loading cache $cache_file" >&5
-+    { echo "$as_me:1024: loading cache $cache_file" >&5
++    { echo "$as_me:1035: loading cache $cache_file" >&5
  echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
        [\\/]* | ?:[\\/]* ) . $cache_file;;
-@@ -1026,7 +1029,7 @@
+@@ -1026,7 +1040,7 @@
      esac
    fi
  else
 -  { echo "$as_me:1029: creating cache $cache_file" >&5
-+  { echo "$as_me:1032: creating cache $cache_file" >&5
++  { echo "$as_me:1043: creating cache $cache_file" >&5
  echo "$as_me: creating cache $cache_file" >&6;}
    >$cache_file
  fi
-@@ -1042,21 +1045,21 @@
+@@ -1042,21 +1056,21 @@
    eval ac_new_val="\$ac_env_${ac_var}_value"
    case $ac_old_set,$ac_new_set in
      set,)
 -      { echo "$as_me:1045: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+      { echo "$as_me:1048: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++      { echo "$as_me:1059: 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:1049: error: \`$ac_var' was not set in the previous run" >&5
-+      { echo "$as_me:1052: error: \`$ac_var' was not set in the previous run" >&5
++      { echo "$as_me:1063: 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=: ;;
@@ -12171 +14555 @@
        if test "x$ac_old_val" != "x$ac_new_val"; then
 -        { echo "$as_me:1055: error: \`$ac_var' has changed since the previous run:" >&5
-+        { echo "$as_me:1058: error: \`$ac_var' has changed since the previous run:" >&5
++        { echo "$as_me:1069: 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:1057:   former value:  $ac_old_val" >&5
-+        { echo "$as_me:1060:   former value:  $ac_old_val" >&5
++        { echo "$as_me:1071:   former value:  $ac_old_val" >&5
  echo "$as_me:   former value:  $ac_old_val" >&2;}
 -        { echo "$as_me:1059:   current value: $ac_new_val" >&5
-+        { echo "$as_me:1062:   current value: $ac_new_val" >&5
++        { echo "$as_me:1073:   current value: $ac_new_val" >&5
  echo "$as_me:   current value: $ac_new_val" >&2;}
          ac_cache_corrupted=:
        fi;;
-@@ -1075,9 +1078,9 @@
+@@ -1075,9 +1089,9 @@
    fi
  done
  if $ac_cache_corrupted; then
 -  { echo "$as_me:1078: error: changes in the environment can compromise the build" >&5
-+  { echo "$as_me:1081: error: changes in the environment can compromise the build" >&5
++  { echo "$as_me:1092: 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:1080: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-+  { { echo "$as_me:1083: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++  { { echo "$as_me:1094: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
  echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -1098,10 +1101,10 @@
+@@ -1098,10 +1112,10 @@
  echo "#! $SHELL" >conftest.sh
  echo  "exit 0"   >>conftest.sh
  chmod +x conftest.sh
 -if { (echo "$as_me:1101: PATH=\".;.\"; conftest.sh") >&5
-+if { (echo "$as_me:1104: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:1115: PATH=\".;.\"; conftest.sh") >&5
    (PATH=".;."; conftest.sh) 2>&5
    ac_status=$?
 -  echo "$as_me:1104: \$? = $ac_status" >&5
-+  echo "$as_me:1107: \$? = $ac_status" >&5
++  echo "$as_me:1118: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    ac_path_separator=';'
  else
-@@ -1114,7 +1117,7 @@
+@@ -1114,7 +1128,7 @@
  
  top_builddir=`pwd`
  
 -echo "$as_me:1117: checking for egrep" >&5
-+echo "$as_me:1120: checking for egrep" >&5
++echo "$as_me:1131: checking for egrep" >&5
  echo $ECHO_N "checking for egrep... $ECHO_C" >&6
  if test "${ac_cv_prog_egrep+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1124,11 +1127,11 @@
+@@ -1124,11 +1138,11 @@
      else ac_cv_prog_egrep='egrep'
      fi
  fi
 -echo "$as_me:1127: result: $ac_cv_prog_egrep" >&5
-+echo "$as_me:1130: result: $ac_cv_prog_egrep" >&5
++echo "$as_me:1141: 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:1131: error: No egrep program found" >&5
-+test -z "$EGREP" && { { echo "$as_me:1134: error: No egrep program found" >&5
++test -z "$EGREP" && { { echo "$as_me:1145: error: No egrep program found" >&5
  echo "$as_me: error: No egrep program found" >&2;}
     { (exit 1); exit 1; }; }
  
-@@ -1138,7 +1141,7 @@
+@@ -1138,7 +1152,7 @@
  cf_cv_abi_version=${NCURSES_MAJOR}
  cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
  cf_cv_timestamp=`date`
 -echo "$as_me:1141: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
-+echo "$as_me:1144: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
++echo "$as_me:1155: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
  echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
  
  test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
-@@ -1146,7 +1149,7 @@
+@@ -1146,7 +1160,7 @@
  # Check whether --with-rel-version or --without-rel-version was given.
  if test "${with_rel_version+set}" = set; then
    withval="$with_rel_version"
 -  { echo "$as_me:1149: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
-+  { echo "$as_me:1152: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
++  { echo "$as_me:1163: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
  echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;}
   cf_cv_rel_version=$withval
  fi;
-@@ -1159,13 +1162,13 @@
+@@ -1159,13 +1173,13 @@
    [0-9]*) #(vi
         ;;
    *)
 -       { { echo "$as_me:1162: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
-+       { { echo "$as_me:1165: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
++       { { echo "$as_me:1176: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
  echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;}
     { (exit 1); exit 1; }; }
@@ -12259 +14643 @@
  else
 -  { { echo "$as_me:1168: error: Release major-version value is empty" >&5
-+  { { echo "$as_me:1171: error: Release major-version value is empty" >&5
++  { { echo "$as_me:1182: error: Release major-version value is empty" >&5
  echo "$as_me: error: Release major-version value is empty" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -1175,13 +1178,13 @@
+@@ -1175,13 +1189,13 @@
    [0-9]*) #(vi
         ;;
    *)
 -       { { echo "$as_me:1178: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
-+       { { echo "$as_me:1181: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
++       { { echo "$as_me:1192: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
  echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;}
     { (exit 1); exit 1; }; }
@@ -12275 +14659 @@
  else
 -  { { echo "$as_me:1184: error: Release minor-version value is empty" >&5
-+  { { echo "$as_me:1187: error: Release minor-version value is empty" >&5
++  { { echo "$as_me:1198: error: Release minor-version value is empty" >&5
  echo "$as_me: error: Release minor-version value is empty" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -1191,7 +1194,7 @@
+@@ -1191,7 +1205,7 @@
  # Check whether --with-abi-version or --without-abi-version was given.
  if test "${with_abi_version+set}" = set; then
    withval="$with_abi_version"
 -  { echo "$as_me:1194: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
-+  { echo "$as_me:1197: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
++  { echo "$as_me:1208: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
  echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;}
   cf_cv_abi_version=$withval
  fi;
-@@ -1201,13 +1204,13 @@
+@@ -1201,13 +1215,13 @@
    [0-9]*) #(vi
         ;;
    *)
 -       { { echo "$as_me:1204: error: ABI version is not a number: $cf_cv_abi_version" >&5
-+       { { echo "$as_me:1207: error: ABI version is not a number: $cf_cv_abi_version" >&5
++       { { echo "$as_me:1218: error: ABI version is not a number: $cf_cv_abi_version" >&5
  echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;}
     { (exit 1); exit 1; }; }
@@ -12300 +14684 @@
  else
 -  { { echo "$as_me:1210: error: ABI version value is empty" >&5
-+  { { echo "$as_me:1213: error: ABI version value is empty" >&5
++  { { echo "$as_me:1224: error: ABI version value is empty" >&5
  echo "$as_me: error: ABI version value is empty" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -1229,7 +1232,7 @@
+@@ -1229,7 +1243,7 @@
    fi
  done
  if test -z "$ac_aux_dir"; then
 -  { { echo "$as_me:1232: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-+  { { echo "$as_me:1235: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++  { { echo "$as_me:1246: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
  echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -1239,11 +1242,11 @@
+@@ -1239,11 +1253,11 @@
  
  # Make sure we can run config.sub.
  $ac_config_sub sun4 >/dev/null 2>&1 ||
 -  { { echo "$as_me:1242: error: cannot run $ac_config_sub" >&5
-+  { { echo "$as_me:1245: error: cannot run $ac_config_sub" >&5
++  { { echo "$as_me:1256: error: cannot run $ac_config_sub" >&5
  echo "$as_me: error: cannot run $ac_config_sub" >&2;}
     { (exit 1); exit 1; }; }
  
 -echo "$as_me:1246: checking build system type" >&5
-+echo "$as_me:1249: checking build system type" >&5
++echo "$as_me:1260: checking build system type" >&5
  echo $ECHO_N "checking build system type... $ECHO_C" >&6
  if test "${ac_cv_build+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1252,23 +1255,23 @@
+@@ -1252,23 +1266,23 @@
  test -z "$ac_cv_build_alias" &&
    ac_cv_build_alias=`$ac_config_guess`
  test -z "$ac_cv_build_alias" &&
 -  { { echo "$as_me:1255: error: cannot guess build type; you must specify one" >&5
-+  { { echo "$as_me:1258: error: cannot guess build type; you must specify one" >&5
++  { { echo "$as_me:1269: 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:1259: error: $ac_config_sub $ac_cv_build_alias failed." >&5
-+  { { echo "$as_me:1262: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++  { { echo "$as_me:1273: 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; }; }
@@ -12343 +14727 @@
  fi
 -echo "$as_me:1264: result: $ac_cv_build" >&5
-+echo "$as_me:1267: result: $ac_cv_build" >&5
++echo "$as_me:1278: result: $ac_cv_build" >&5
  echo "${ECHO_T}$ac_cv_build" >&6
  build=$ac_cv_build
@@ -12351 +14735 @@
  
 -echo "$as_me:1271: checking host system type" >&5
-+echo "$as_me:1274: checking host system type" >&5
++echo "$as_me:1285: checking host system type" >&5
  echo $ECHO_N "checking host system type... $ECHO_C" >&6
  if test "${ac_cv_host+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1277,12 +1280,12 @@
+@@ -1277,12 +1291,12 @@
  test -z "$ac_cv_host_alias" &&
    ac_cv_host_alias=$ac_cv_build_alias
  ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
 -  { { echo "$as_me:1280: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-+  { { echo "$as_me:1283: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++  { { echo "$as_me:1294: 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; }; }
@@ -12366 +14750 @@
  fi
 -echo "$as_me:1285: result: $ac_cv_host" >&5
-+echo "$as_me:1288: result: $ac_cv_host" >&5
++echo "$as_me:1299: result: $ac_cv_host" >&5
  echo "${ECHO_T}$ac_cv_host" >&6
  host=$ac_cv_host
  host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-@@ -1290,7 +1293,7 @@
+@@ -1290,7 +1304,7 @@
  host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
  
  if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
 -       echo "$as_me:1293: checking target system type" >&5
-+       echo "$as_me:1296: checking target system type" >&5
++       echo "$as_me:1307: checking target system type" >&5
  echo $ECHO_N "checking target system type... $ECHO_C" >&6
  if test "${ac_cv_target+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1299,12 +1302,12 @@
+@@ -1299,12 +1313,12 @@
  test "x$ac_cv_target_alias" = "x" &&
    ac_cv_target_alias=$ac_cv_host_alias
  ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
 -  { { echo "$as_me:1302: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-+  { { echo "$as_me:1305: error: $ac_config_sub $ac_cv_target_alias failed" >&5
++  { { echo "$as_me:1316: 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; }; }
@@ -12390 +14774 @@
  fi
 -echo "$as_me:1307: result: $ac_cv_target" >&5
-+echo "$as_me:1310: result: $ac_cv_target" >&5
++echo "$as_me:1321: result: $ac_cv_target" >&5
  echo "${ECHO_T}$ac_cv_target" >&6
  target=$ac_cv_target
  target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-@@ -1335,13 +1338,13 @@
+@@ -1335,13 +1349,13 @@
  fi
  
  test -z "$system_name" && system_name="$cf_cv_system_name"
 -test -n "$cf_cv_system_name" && echo "$as_me:1338: result: Configuring for $cf_cv_system_name" >&5
-+test -n "$cf_cv_system_name" && echo "$as_me:1341: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1352: 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:1342: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
-+       echo "$as_me:1345: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++       echo "$as_me:1356: 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:1344: error: \"Please remove config.cache and try again.\"" >&5
-+       { { echo "$as_me:1347: error: \"Please remove config.cache and try again.\"" >&5
++       { { echo "$as_me:1358: error: \"Please remove config.cache and try again.\"" >&5
  echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -1349,7 +1352,7 @@
+@@ -1349,7 +1363,7 @@
  # Check whether --with-system-type or --without-system-type was given.
  if test "${with_system_type+set}" = set; then
    withval="$with_system_type"
 -  { echo "$as_me:1352: WARNING: overriding system type to $withval" >&5
-+  { echo "$as_me:1355: WARNING: overriding system type to $withval" >&5
++  { echo "$as_me:1366: WARNING: overriding system type to $withval" >&5
  echo "$as_me: WARNING: overriding system type to $withval" >&2;}
   cf_cv_system_name=$withval
  fi;
-@@ -1359,23 +1362,23 @@
+@@ -1359,23 +1373,23 @@
  
  ###    Default install-location
  
 -echo "$as_me:1362: checking for prefix" >&5
-+echo "$as_me:1365: checking for prefix" >&5
++echo "$as_me:1376: checking for prefix" >&5
  echo $ECHO_N "checking for prefix... $ECHO_C" >&6
  if test "x$prefix" = "xNONE" ; then
@@ -12439 +14823 @@
  fi
 -echo "$as_me:1374: result: $prefix" >&5
-+echo "$as_me:1377: result: $prefix" >&5
++echo "$as_me:1388: result: $prefix" >&5
  echo "${ECHO_T}$prefix" >&6
  
  if test "x$prefix" = "xNONE" ; then
 -echo "$as_me:1378: checking for default include-directory" >&5
-+echo "$as_me:1381: checking for default include-directory" >&5
++echo "$as_me:1392: checking for default include-directory" >&5
  echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
  test -n "$verbose" && echo 1>&6
  for cf_symbol in \
-@@ -1398,7 +1401,7 @@
+@@ -1398,11 +1412,26 @@
         fi
         test -n "$verbose"  && echo "   tested $cf_dir" 1>&6
  done
 -echo "$as_me:1401: result: $includedir" >&5
-+echo "$as_me:1404: result: $includedir" >&5
++echo "$as_me:1415: result: $includedir" >&5
  echo "${ECHO_T}$includedir" >&6
  fi
  
-@@ -1412,7 +1415,7 @@
+ ###    Checks for programs.
++
++# Check whether --with-ada or --without-ada was given.
++if test "${with_ada+set}" = set; then
++  withval="$with_ada"
++  cf_with_ada=$withval
++else
++  cf_with_ada=yes
++fi;
++if test x"$cf_with_ada" = xyes
++then
++       cf_PROG_CC="gnatgcc gcc cc"
++else
++       cf_PROG_CC="gcc cc"
++fi
++
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -1410,213 +1439,11 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return=return
  if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-  # 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:1415: checking for $ac_word" >&5
-+echo "$as_me:1418: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1427,7 +1430,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-  ac_save_IFS=$IFS; IFS=$ac_path_separator
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-ac_cv_prog_CC="${ac_tool_prefix}gcc"
 -echo "$as_me:1430: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1433: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1435,10 +1438,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
+-break
+-done
+-
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
 -  echo "$as_me:1438: result: $CC" >&5
-+  echo "$as_me:1441: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
+-echo "${ECHO_T}$CC" >&6
+-else
 -  echo "$as_me:1441: result: no" >&5
-+  echo "$as_me:1444: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1447,7 +1450,7 @@
-   ac_ct_CC=$CC
-   # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-fi
+-if test -z "$ac_cv_prog_CC"; then
+-  ac_ct_CC=$CC
+-  # Extract the first word of "gcc", so it can be a program name with args.
+-set dummy gcc; ac_word=$2
 -echo "$as_me:1450: checking for $ac_word" >&5
-+echo "$as_me:1453: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1462,7 +1465,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_CC="gcc"
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$ac_ct_CC"; then
+-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+-else
+-  ac_save_IFS=$IFS; IFS=$ac_path_separator
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-ac_cv_prog_ac_ct_CC="gcc"
 -echo "$as_me:1465: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1468: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1470,10 +1473,10 @@
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
+-break
+-done
+-
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
 -  echo "$as_me:1473: result: $ac_ct_CC" >&5
-+  echo "$as_me:1476: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6
- else
+-echo "${ECHO_T}$ac_ct_CC" >&6
+-else
 -  echo "$as_me:1476: result: no" >&5
-+  echo "$as_me:1479: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1486,7 +1489,7 @@
-   if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}cc; ac_word=$2
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-  CC=$ac_ct_CC
+-else
+-  CC="$ac_cv_prog_CC"
+-fi
+-
+-if test -z "$CC"; then
+-  if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}cc; ac_word=$2
 -echo "$as_me:1489: checking for $ac_word" >&5
-+echo "$as_me:1492: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1501,7 +1504,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_CC="${ac_tool_prefix}cc"
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-  ac_save_IFS=$IFS; IFS=$ac_path_separator
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-ac_cv_prog_CC="${ac_tool_prefix}cc"
 -echo "$as_me:1504: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1507: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1509,10 +1512,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
+-break
+-done
+-
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
 -  echo "$as_me:1512: result: $CC" >&5
-+  echo "$as_me:1515: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
+-echo "${ECHO_T}$CC" >&6
+-else
 -  echo "$as_me:1515: result: no" >&5
-+  echo "$as_me:1518: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1521,7 +1524,7 @@
-   ac_ct_CC=$CC
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-fi
+-if test -z "$ac_cv_prog_CC"; then
+-  ac_ct_CC=$CC
+-  # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
 -echo "$as_me:1524: checking for $ac_word" >&5
-+echo "$as_me:1527: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1536,7 +1539,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_CC="cc"
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$ac_ct_CC"; then
+-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+-else
+-  ac_save_IFS=$IFS; IFS=$ac_path_separator
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-ac_cv_prog_ac_ct_CC="cc"
 -echo "$as_me:1539: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1542: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1544,10 +1547,10 @@
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
+-break
+-done
+-
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
 -  echo "$as_me:1547: result: $ac_ct_CC" >&5
-+  echo "$as_me:1550: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6
- else
+-echo "${ECHO_T}$ac_ct_CC" >&6
+-else
 -  echo "$as_me:1550: result: no" >&5
-+  echo "$as_me:1553: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1560,7 +1563,7 @@
- if test -z "$CC"; then
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-  CC=$ac_ct_CC
+-else
+-  CC="$ac_cv_prog_CC"
+-fi
+-
+-fi
+-if test -z "$CC"; then
+-  # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
 -echo "$as_me:1563: checking for $ac_word" >&5
-+echo "$as_me:1566: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1580,7 +1583,7 @@
-   continue
- fi
- ac_cv_prog_CC="cc"
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-  ac_prog_rejected=no
+-  ac_save_IFS=$IFS; IFS=$ac_path_separator
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+-  ac_prog_rejected=yes
+-  continue
+-fi
+-ac_cv_prog_CC="cc"
 -echo "$as_me:1583: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1586: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1602,10 +1605,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
+-break
+-done
+-
+-if test $ac_prog_rejected = yes; then
+-  # We found a bogon in the path, so make sure we never use it.
+-  set dummy $ac_cv_prog_CC
+-  shift
+-  if test $# != 0; then
+-    # We chose a different compiler from the bogus one.
+-    # However, it has the same basename, so the bogon will be chosen
+-    # first if we set CC to just the basename; use the full file name.
+-    shift
+-    set dummy "$ac_dir/$ac_word" ${1+"$@"}
+-    shift
+-    ac_cv_prog_CC="$@"
+-  fi
+-fi
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
 -  echo "$as_me:1605: result: $CC" >&5
-+  echo "$as_me:1608: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
+-echo "${ECHO_T}$CC" >&6
+-else
 -  echo "$as_me:1608: result: no" >&5
-+  echo "$as_me:1611: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1616,7 +1619,7 @@
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-fi
+-if test -z "$CC"; then
+-  if test -n "$ac_tool_prefix"; then
+-  for ac_prog in cl
++  for ac_prog in $cf_PROG_CC
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 -echo "$as_me:1619: checking for $ac_word" >&5
-+echo "$as_me:1622: checking for $ac_word" >&5
++echo "$as_me:1446: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1631,7 +1634,7 @@
+@@ -1631,7 +1458,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
 -echo "$as_me:1634: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1637: found $ac_dir/$ac_word" >&5
++echo "$as_me:1461: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -1639,10 +1642,10 @@
+@@ -1639,10 +1466,10 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
 -  echo "$as_me:1642: result: $CC" >&5
-+  echo "$as_me:1645: result: $CC" >&5
++  echo "$as_me:1469: result: $CC" >&5
  echo "${ECHO_T}$CC" >&6
  else
 -  echo "$as_me:1645: result: no" >&5
-+  echo "$as_me:1648: result: no" >&5
++  echo "$as_me:1472: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -1655,7 +1658,7 @@
+@@ -1651,11 +1478,11 @@
+ fi
+ if test -z "$CC"; then
+   ac_ct_CC=$CC
+-  for ac_prog in cl
++  for ac_prog in $cf_PROG_CC
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -echo "$as_me:1658: checking for $ac_word" >&5
-+echo "$as_me:1661: checking for $ac_word" >&5
++echo "$as_me:1485: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1670,7 +1673,7 @@
+@@ -1670,7 +1497,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_ac_ct_CC="$ac_prog"
 -echo "$as_me:1673: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1676: found $ac_dir/$ac_word" >&5
++echo "$as_me:1500: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -1678,10 +1681,10 @@
+@@ -1678,10 +1505,10 @@
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
 -  echo "$as_me:1681: result: $ac_ct_CC" >&5
-+  echo "$as_me:1684: result: $ac_ct_CC" >&5
++  echo "$as_me:1508: result: $ac_ct_CC" >&5
  echo "${ECHO_T}$ac_ct_CC" >&6
  else
 -  echo "$as_me:1684: result: no" >&5
-+  echo "$as_me:1687: result: no" >&5
++  echo "$as_me:1511: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -1693,32 +1696,32 @@
- 
- fi
- 
+@@ -1691,34 +1518,32 @@
+   CC=$ac_ct_CC
+ fi
+ 
+-fi
+-
 -test -z "$CC" && { { echo "$as_me:1696: error: no acceptable cc found in \$PATH" >&5
-+test -z "$CC" && { { echo "$as_me:1699: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:1521: error: no acceptable cc found in \$PATH" >&5
  echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
     { (exit 1); exit 1; }; }
@@ -12685 +15147 @@
  # Provide some information about the compiler.
 -echo "$as_me:1701:" \
-+echo "$as_me:1704:" \
++echo "$as_me:1526:" \
       "checking for C compiler version" >&5
  ac_compiler=`set X $ac_compile; echo $2`
 -{ (eval echo "$as_me:1704: \"$ac_compiler --version </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:1707: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1529: \"$ac_compiler --version </dev/null >&5\"") >&5
    (eval $ac_compiler --version </dev/null >&5) 2>&5
    ac_status=$?
 -  echo "$as_me:1707: \$? = $ac_status" >&5
-+  echo "$as_me:1710: \$? = $ac_status" >&5
++  echo "$as_me:1532: \$? = $ac_status" >&5
    (exit $ac_status); }
 -{ (eval echo "$as_me:1709: \"$ac_compiler -v </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:1712: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1534: \"$ac_compiler -v </dev/null >&5\"") >&5
    (eval $ac_compiler -v </dev/null >&5) 2>&5
    ac_status=$?
 -  echo "$as_me:1712: \$? = $ac_status" >&5
-+  echo "$as_me:1715: \$? = $ac_status" >&5
++  echo "$as_me:1537: \$? = $ac_status" >&5
    (exit $ac_status); }
 -{ (eval echo "$as_me:1714: \"$ac_compiler -V </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:1717: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1539: \"$ac_compiler -V </dev/null >&5\"") >&5
    (eval $ac_compiler -V </dev/null >&5) 2>&5
    ac_status=$?
 -  echo "$as_me:1717: \$? = $ac_status" >&5
-+  echo "$as_me:1720: \$? = $ac_status" >&5
++  echo "$as_me:1542: \$? = $ac_status" >&5
    (exit $ac_status); }
  
  cat >conftest.$ac_ext <<_ACEOF
 -#line 1721 "configure"
-+#line 1724 "configure"
++#line 1546 "configure"
  #include "confdefs.h"
  
  int
-@@ -1734,13 +1737,13 @@
+@@ -1734,13 +1559,13 @@
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
 -echo "$as_me:1737: checking for C compiler default output" >&5
-+echo "$as_me:1740: checking for C compiler default output" >&5
++echo "$as_me:1562: 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:1740: \"$ac_link_default\"") >&5
-+if { (eval echo "$as_me:1743: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:1565: \"$ac_link_default\"") >&5
    (eval $ac_link_default) 2>&5
    ac_status=$?
 -  echo "$as_me:1743: \$? = $ac_status" >&5
-+  echo "$as_me:1746: \$? = $ac_status" >&5
++  echo "$as_me:1568: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    # Find the output, starting from the most likely.  This scheme is
  # not robust to junk in `.', hence go to wildcards (a.*) only as a last
-@@ -1763,34 +1766,34 @@
+@@ -1763,34 +1588,34 @@
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
 -{ { echo "$as_me:1766: error: C compiler cannot create executables" >&5
-+{ { echo "$as_me:1769: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:1591: error: C compiler cannot create executables" >&5
  echo "$as_me: error: C compiler cannot create executables" >&2;}
     { (exit 77); exit 77; }; }
@@ -12745 +15207 @@
  ac_exeext=$ac_cv_exeext
 -echo "$as_me:1772: result: $ac_file" >&5
-+echo "$as_me:1775: result: $ac_file" >&5
++echo "$as_me:1597: result: $ac_file" >&5
  echo "${ECHO_T}$ac_file" >&6
  
@@ -12751 +15213 @@
  # the compiler is broken, or we cross compile.
 -echo "$as_me:1777: checking whether the C compiler works" >&5
-+echo "$as_me:1780: checking whether the C compiler works" >&5
++echo "$as_me:1602: 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
@@ -12758 +15220 @@
    if { ac_try='./$ac_file'
 -  { (eval echo "$as_me:1783: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1786: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1608: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1786: \$? = $ac_status" >&5
-+  echo "$as_me:1789: \$? = $ac_status" >&5
++  echo "$as_me:1611: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
      cross_compiling=no
@@ -12770 +15232 @@
      else
 -       { { echo "$as_me:1793: error: cannot run C compiled programs.
-+       { { echo "$as_me:1796: error: cannot run C compiled programs.
++       { { echo "$as_me:1618: error: cannot run C compiled programs.
  If you meant to cross compile, use \`--host'." >&5
  echo "$as_me: error: cannot run C compiled programs.
  If you meant to cross compile, use \`--host'." >&2;}
-@@ -1798,24 +1801,24 @@
+@@ -1798,24 +1623,24 @@
      fi
    fi
  fi
 -echo "$as_me:1801: result: yes" >&5
-+echo "$as_me:1804: result: yes" >&5
++echo "$as_me:1626: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  
@@ -12787 +15249 @@
  # the compiler is broken, or we cross compile.
 -echo "$as_me:1808: checking whether we are cross compiling" >&5
-+echo "$as_me:1811: checking whether we are cross compiling" >&5
++echo "$as_me:1633: checking whether we are cross compiling" >&5
  echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
 -echo "$as_me:1810: result: $cross_compiling" >&5
-+echo "$as_me:1813: result: $cross_compiling" >&5
++echo "$as_me:1635: result: $cross_compiling" >&5
  echo "${ECHO_T}$cross_compiling" >&6
  
 -echo "$as_me:1813: checking for executable suffix" >&5
-+echo "$as_me:1816: checking for executable suffix" >&5
++echo "$as_me:1638: checking for executable suffix" >&5
  echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
 -if { (eval echo "$as_me:1815: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:1818: \"$ac_link\"") >&5
++if { (eval echo "$as_me:1640: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:1818: \$? = $ac_status" >&5
-+  echo "$as_me:1821: \$? = $ac_status" >&5
++  echo "$as_me:1643: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    # If both `conftest.exe' and `conftest' are `present' (well, observable)
  # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-@@ -1831,25 +1834,25 @@
+@@ -1831,25 +1656,25 @@
    esac
  done
  else
 -  { { echo "$as_me:1834: error: cannot compute EXEEXT: cannot compile and link" >&5
-+  { { echo "$as_me:1837: error: cannot compute EXEEXT: cannot compile and link" >&5
++  { { echo "$as_me:1659: 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; }; }
@@ -12817 +15279 @@
  rm -f conftest$ac_cv_exeext
 -echo "$as_me:1840: result: $ac_cv_exeext" >&5
-+echo "$as_me:1843: result: $ac_cv_exeext" >&5
++echo "$as_me:1665: result: $ac_cv_exeext" >&5
  echo "${ECHO_T}$ac_cv_exeext" >&6
  
@@ -12824 +15286 @@
  ac_exeext=$EXEEXT
 -echo "$as_me:1846: checking for object suffix" >&5
-+echo "$as_me:1849: checking for object suffix" >&5
++echo "$as_me:1671: checking for object suffix" >&5
  echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
  if test "${ac_cv_objext+set}" = set; then
@@ -12831 +15293 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1852 "configure"
-+#line 1855 "configure"
++#line 1677 "configure"
  #include "confdefs.h"
  
  int
-@@ -1861,10 +1864,10 @@
+@@ -1861,10 +1686,10 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
 -if { (eval echo "$as_me:1864: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1867: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1689: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:1867: \$? = $ac_status" >&5
-+  echo "$as_me:1870: \$? = $ac_status" >&5
++  echo "$as_me:1692: \$? = $ac_status" >&5
    (exit $ac_status); }; then
    for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
    case $ac_file in
-@@ -1876,24 +1879,24 @@
+@@ -1876,24 +1701,24 @@
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
 -{ { echo "$as_me:1879: error: cannot compute OBJEXT: cannot compile" >&5
-+{ { echo "$as_me:1882: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:1704: error: cannot compute OBJEXT: cannot compile" >&5
  echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
     { (exit 1); exit 1; }; }
@@ -12861 +15323 @@
  fi
 -echo "$as_me:1886: result: $ac_cv_objext" >&5
-+echo "$as_me:1889: result: $ac_cv_objext" >&5
++echo "$as_me:1711: result: $ac_cv_objext" >&5
  echo "${ECHO_T}$ac_cv_objext" >&6
  OBJEXT=$ac_cv_objext
  ac_objext=$OBJEXT
 -echo "$as_me:1890: checking whether we are using the GNU C compiler" >&5
-+echo "$as_me:1893: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:1715: 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
@@ -12873 +15335 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1896 "configure"
-+#line 1899 "configure"
++#line 1721 "configure"
  #include "confdefs.h"
  
  int
-@@ -1908,16 +1911,16 @@
+@@ -1908,16 +1733,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:1911: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1914: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1736: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:1914: \$? = $ac_status" >&5
-+  echo "$as_me:1917: \$? = $ac_status" >&5
++  echo "$as_me:1739: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:1917: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1920: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1742: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1920: \$? = $ac_status" >&5
-+  echo "$as_me:1923: \$? = $ac_status" >&5
++  echo "$as_me:1745: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_compiler_gnu=yes
  else
-@@ -1929,19 +1932,19 @@
+@@ -1929,19 +1754,19 @@
  ac_cv_c_compiler_gnu=$ac_compiler_gnu
  
  fi
 -echo "$as_me:1932: result: $ac_cv_c_compiler_gnu" >&5
-+echo "$as_me:1935: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:1757: result: $ac_cv_c_compiler_gnu" >&5
  echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
  GCC=`test $ac_compiler_gnu = yes && echo yes`
@@ -12910 +15372 @@
  CFLAGS="-g"
 -echo "$as_me:1938: checking whether $CC accepts -g" >&5
-+echo "$as_me:1941: checking whether $CC accepts -g" >&5
++echo "$as_me:1763: 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
@@ -12917 +15379 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1944 "configure"
-+#line 1947 "configure"
++#line 1769 "configure"
  #include "confdefs.h"
  
  int
-@@ -1953,16 +1956,16 @@
+@@ -1953,16 +1778,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:1956: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1959: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1781: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:1959: \$? = $ac_status" >&5
-+  echo "$as_me:1962: \$? = $ac_status" >&5
++  echo "$as_me:1784: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:1962: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1965: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1787: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1965: \$? = $ac_status" >&5
-+  echo "$as_me:1968: \$? = $ac_status" >&5
++  echo "$as_me:1790: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_prog_cc_g=yes
  else
-@@ -1972,7 +1975,7 @@
+@@ -1972,7 +1797,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:1975: result: $ac_cv_prog_cc_g" >&5
-+echo "$as_me:1978: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:1800: result: $ac_cv_prog_cc_g" >&5
  echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
-@@ -1999,16 +2002,16 @@
+@@ -1999,16 +1824,16 @@
  #endif
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:2002: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2005: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1827: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:2005: \$? = $ac_status" >&5
-+  echo "$as_me:2008: \$? = $ac_status" >&5
++  echo "$as_me:1830: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:2008: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2011: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1833: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2011: \$? = $ac_status" >&5
-+  echo "$as_me:2014: \$? = $ac_status" >&5
++  echo "$as_me:1836: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    for ac_declaration in \
     ''\
-@@ -2020,7 +2023,7 @@
+@@ -2020,7 +1845,7 @@
     'void exit (int);'
  do
    cat >conftest.$ac_ext <<_ACEOF
 -#line 2023 "configure"
-+#line 2026 "configure"
++#line 1848 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  $ac_declaration
-@@ -2033,16 +2036,16 @@
+@@ -2033,16 +1858,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:2036: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2039: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1861: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:2039: \$? = $ac_status" >&5
-+  echo "$as_me:2042: \$? = $ac_status" >&5
++  echo "$as_me:1864: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:2042: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2045: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1867: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2045: \$? = $ac_status" >&5
-+  echo "$as_me:2048: \$? = $ac_status" >&5
++  echo "$as_me:1870: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -2052,7 +2055,7 @@
+@@ -2052,7 +1877,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
 -#line 2055 "configure"
-+#line 2058 "configure"
++#line 1880 "configure"
  #include "confdefs.h"
  $ac_declaration
  int
-@@ -2064,16 +2067,16 @@
+@@ -2064,16 +1889,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:2067: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2070: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1892: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:2070: \$? = $ac_status" >&5
-+  echo "$as_me:2073: \$? = $ac_status" >&5
++  echo "$as_me:1895: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:2073: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2076: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1898: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2076: \$? = $ac_status" >&5
-+  echo "$as_me:2079: \$? = $ac_status" >&5
++  echo "$as_me:1901: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -2103,11 +2106,11 @@
+@@ -2103,11 +1928,11 @@
  
  GCC_VERSION=none
  if test "$GCC" = yes ; then
 -       echo "$as_me:2106: checking version of $CC" >&5
-+       echo "$as_me:2109: checking version of $CC" >&5
++       echo "$as_me:1931: 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:2110: result: $GCC_VERSION" >&5
-+       echo "$as_me:2113: result: $GCC_VERSION" >&5
++       echo "$as_me:1935: result: $GCC_VERSION" >&5
  echo "${ECHO_T}$GCC_VERSION" >&6
  fi
  
-@@ -2117,7 +2120,7 @@
+@@ -2117,7 +1942,7 @@
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ac_main_return=return
 -echo "$as_me:2120: checking how to run the C preprocessor" >&5
-+echo "$as_me:2123: checking how to run the C preprocessor" >&5
++echo "$as_me:1945: checking how to run the C preprocessor" >&5
  echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
-@@ -2138,18 +2141,18 @@
+@@ -2138,18 +1963,18 @@
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 2141 "configure"
-+#line 2144 "configure"
++#line 1966 "configure"
  #include "confdefs.h"
  #include <assert.h>
@@ -13066 +15528 @@
  _ACEOF
 -if { (eval echo "$as_me:2146: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2149: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:1971: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -13073 +15535 @@
    cat conftest.err >&5
 -  echo "$as_me:2152: \$? = $ac_status" >&5
-+  echo "$as_me:2155: \$? = $ac_status" >&5
++  echo "$as_me:1977: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2172,17 +2175,17 @@
+@@ -2172,17 +1997,17 @@
    # OK, works on sane cases.  Now check whether non-existent headers
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 2175 "configure"
-+#line 2178 "configure"
++#line 2000 "configure"
  #include "confdefs.h"
  #include <ac_nonexistent.h>
  _ACEOF
 -if { (eval echo "$as_me:2179: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2182: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2004: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -13094 +15556 @@
    cat conftest.err >&5
 -  echo "$as_me:2185: \$? = $ac_status" >&5
-+  echo "$as_me:2188: \$? = $ac_status" >&5
++  echo "$as_me:2010: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2219,7 +2222,7 @@
+@@ -2219,7 +2044,7 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
 -echo "$as_me:2222: result: $CPP" >&5
-+echo "$as_me:2225: result: $CPP" >&5
++echo "$as_me:2047: result: $CPP" >&5
  echo "${ECHO_T}$CPP" >&6
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
-@@ -2229,18 +2232,18 @@
+@@ -2229,18 +2054,18 @@
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 2232 "configure"
-+#line 2235 "configure"
++#line 2057 "configure"
  #include "confdefs.h"
  #include <assert.h>
@@ -13118 +15580 @@
  _ACEOF
 -if { (eval echo "$as_me:2237: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2240: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2062: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -13125 +15587 @@
    cat conftest.err >&5
 -  echo "$as_me:2243: \$? = $ac_status" >&5
-+  echo "$as_me:2246: \$? = $ac_status" >&5
++  echo "$as_me:2068: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2263,17 +2266,17 @@
+@@ -2263,17 +2088,17 @@
    # OK, works on sane cases.  Now check whether non-existent headers
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 2266 "configure"
-+#line 2269 "configure"
++#line 2091 "configure"
  #include "confdefs.h"
  #include <ac_nonexistent.h>
  _ACEOF
 -if { (eval echo "$as_me:2270: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2273: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:2095: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -13146 +15608 @@
    cat conftest.err >&5
 -  echo "$as_me:2276: \$? = $ac_status" >&5
-+  echo "$as_me:2279: \$? = $ac_status" >&5
++  echo "$as_me:2101: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2301,7 +2304,7 @@
+@@ -2301,7 +2126,7 @@
  if $ac_preproc_ok; then
    :
  else
 -  { { echo "$as_me:2304: error: C preprocessor \"$CPP\" fails sanity check" >&5
-+  { { echo "$as_me:2307: error: C preprocessor \"$CPP\" fails sanity check" >&5
++  { { echo "$as_me:2129: error: C preprocessor \"$CPP\" fails sanity check" >&5
  echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -2314,14 +2317,14 @@
+@@ -2314,14 +2139,14 @@
  ac_main_return=return
  
  if test $ac_cv_c_compiler_gnu = yes; then
 -    echo "$as_me:2317: checking whether $CC needs -traditional" >&5
-+    echo "$as_me:2320: checking whether $CC needs -traditional" >&5
++    echo "$as_me:2142: 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
@@ -13172 +15634 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 2324 "configure"
-+#line 2327 "configure"
++#line 2149 "configure"
  #include "confdefs.h"
  #include <sgtty.h>
  int Autoconf = TIOCGETP;
-@@ -2336,7 +2339,7 @@
+@@ -2336,7 +2161,7 @@
  
    if test $ac_cv_prog_gcc_traditional = no; then
      cat >conftest.$ac_ext <<_ACEOF
 -#line 2339 "configure"
-+#line 2342 "configure"
++#line 2164 "configure"
  #include "confdefs.h"
  #include <termio.h>
  int Autoconf = TCGETA;
-@@ -2349,14 +2352,14 @@
+@@ -2349,14 +2174,14 @@
  
    fi
  fi
 -echo "$as_me:2352: result: $ac_cv_prog_gcc_traditional" >&5
-+echo "$as_me:2355: result: $ac_cv_prog_gcc_traditional" >&5
++echo "$as_me:2177: 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
@@ -13198 +15660 @@
  
 -echo "$as_me:2359: checking whether $CC understands -c and -o together" >&5
-+echo "$as_me:2362: checking whether $CC understands -c and -o together" >&5
++echo "$as_me:2184: checking whether $CC understands -c and -o together" >&5
  echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6
  if test "${cf_cv_prog_CC_c_o+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2372,15 +2375,15 @@
+@@ -2372,15 +2197,15 @@
  # We do the test twice because some compilers refuse to overwrite an
  # existing .o file with -o, though they will create one.
  ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
 -if { (eval echo "$as_me:2375: \"$ac_try\"") >&5
-+if { (eval echo "$as_me:2378: \"$ac_try\"") >&5
++if { (eval echo "$as_me:2200: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2378: \$? = $ac_status" >&5
-+  echo "$as_me:2381: \$? = $ac_status" >&5
++  echo "$as_me:2203: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -  test -f conftest2.$ac_objext && { (eval echo "$as_me:2380: \"$ac_try\"") >&5
-+  test -f conftest2.$ac_objext && { (eval echo "$as_me:2383: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:2205: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2383: \$? = $ac_status" >&5
-+  echo "$as_me:2386: \$? = $ac_status" >&5
++  echo "$as_me:2208: \$? = $ac_status" >&5
    (exit $ac_status); };
  then
    eval cf_cv_prog_CC_c_o=yes
-@@ -2391,19 +2394,19 @@
+@@ -2391,19 +2216,19 @@
  
  fi
  if test $cf_cv_prog_CC_c_o = yes; then
 -  echo "$as_me:2394: result: yes" >&5
-+  echo "$as_me:2397: result: yes" >&5
++  echo "$as_me:2219: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  else
 -  echo "$as_me:2397: result: no" >&5
-+  echo "$as_me:2400: result: no" >&5
++  echo "$as_me:2222: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
 -echo "$as_me:2401: checking for POSIXized ISC" >&5
-+echo "$as_me:2404: checking for POSIXized ISC" >&5
++echo "$as_me:2226: checking for POSIXized ISC" >&5
  echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
  if test -d /etc/conf/kconfig.d &&
@@ -13242 +15704 @@
  then
 -  echo "$as_me:2406: result: yes" >&5
-+  echo "$as_me:2409: result: yes" >&5
++  echo "$as_me:2231: result: yes" >&5
  echo "${ECHO_T}yes" >&6
    ISC=yes # If later tests want to check for ISC.
  
-@@ -2417,12 +2420,115 @@
+@@ -2417,12 +2242,115 @@
      CC="$CC -Xp"
    fi
  else
 -  echo "$as_me:2420: result: no" >&5
-+  echo "$as_me:2423: result: no" >&5
++  echo "$as_me:2245: result: no" >&5
  echo "${ECHO_T}no" >&6
    ISC=
@@ -13263 +15725 @@
 +# into CC.  This will not help with broken scripts that wrap the compiler with
 +# options, but eliminates a more common category of user confusion.
-+echo "$as_me:2434: checking \$CC variable" >&5
++echo "$as_me:2256: checking \$CC variable" >&5
 +echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 +case "$CC" in #(vi
 +*[\ \  ]-[IUD]*)
-+       echo "$as_me:2438: result: broken" >&5
++       echo "$as_me:2260: result: broken" >&5
 +echo "${ECHO_T}broken" >&6
-+       { echo "$as_me:2440: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
++       { echo "$as_me:2262: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
 +echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
 +       # humor him...
@@ -13355 +15817 @@
 +       ;;
 +*)
-+       echo "$as_me:2526: result: ok" >&5
++       echo "$as_me:2348: result: ok" >&5
 +echo "${ECHO_T}ok" >&6
 +       ;;
 +esac
 +
-+echo "$as_me:2531: checking for ${CC:-cc} option to accept ANSI C" >&5
++echo "$as_me:2353: 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
-@@ -2526,7 +2632,7 @@
+@@ -2526,7 +2454,7 @@
  fi
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 2529 "configure"
-+#line 2635 "configure"
++#line 2457 "configure"
  #include "confdefs.h"
  
  #ifndef CC_HAS_PROTOS
-@@ -2547,16 +2653,16 @@
+@@ -2547,16 +2475,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:2550: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2656: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2478: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:2553: \$? = $ac_status" >&5
-+  echo "$as_me:2659: \$? = $ac_status" >&5
++  echo "$as_me:2481: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:2556: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2662: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2484: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2559: \$? = $ac_status" >&5
-+  echo "$as_me:2665: \$? = $ac_status" >&5
++  echo "$as_me:2487: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ansi_cc="$cf_arg"; break
  else
-@@ -2569,7 +2675,7 @@
+@@ -2569,7 +2497,7 @@
  CPPFLAGS="$cf_save_CPPFLAGS"
  
  fi
 -echo "$as_me:2572: result: $cf_cv_ansi_cc" >&5
-+echo "$as_me:2678: result: $cf_cv_ansi_cc" >&5
++echo "$as_me:2500: result: $cf_cv_ansi_cc" >&5
  echo "${ECHO_T}$cf_cv_ansi_cc" >&6
  
  if test "$cf_cv_ansi_cc" != "no"; then
-@@ -2662,7 +2768,7 @@
+@@ -2662,7 +2590,7 @@
  fi
  
  if test "$cf_cv_ansi_cc" = "no"; then
 -       { { echo "$as_me:2665: error: Your compiler does not appear to recognize prototypes.
-+       { { echo "$as_me:2771: error: Your compiler does not appear to recognize prototypes.
++       { { echo "$as_me:2593: error: Your compiler does not appear to recognize prototypes.
  You have the following choices:
         a. adjust your compiler options
         b. get an up-to-date compiler
-@@ -2696,13 +2802,13 @@
+@@ -2696,13 +2624,13 @@
    LDCONFIG=:
  else
@@ -13424 +15886 @@
  set dummy ldconfig; ac_word=$2
 -echo "$as_me:2705: checking for $ac_word" >&5
-+echo "$as_me:2811: checking for $ac_word" >&5
++echo "$as_me:2633: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_path_LDCONFIG+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2719,7 +2825,7 @@
+@@ -2719,7 +2647,7 @@
    test -z "$ac_dir" && ac_dir=.
    if $as_executable_p "$ac_dir/$ac_word"; then
     ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
 -   echo "$as_me:2722: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:2828: found $ac_dir/$ac_word" >&5
++   echo "$as_me:2650: found $ac_dir/$ac_word" >&5
     break
  fi
  done
-@@ -2730,10 +2836,10 @@
+@@ -2730,10 +2658,10 @@
  LDCONFIG=$ac_cv_path_LDCONFIG
  
  if test -n "$LDCONFIG"; then
 -  echo "$as_me:2733: result: $LDCONFIG" >&5
-+  echo "$as_me:2839: result: $LDCONFIG" >&5
++  echo "$as_me:2661: result: $LDCONFIG" >&5
  echo "${ECHO_T}$LDCONFIG" >&6
  else
 -  echo "$as_me:2736: result: no" >&5
-+  echo "$as_me:2842: result: no" >&5
++  echo "$as_me:2664: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -2741,7 +2847,7 @@
+@@ -2741,7 +2669,7 @@
  esac
  fi
  
 -echo "$as_me:2744: checking if you want to ensure bool is consistent with C++" >&5
-+echo "$as_me:2850: checking if you want to ensure bool is consistent with C++" >&5
++echo "$as_me:2672: checking if you want to ensure bool is consistent with C++" >&5
  echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6
  
  # Check whether --with-cxx or --without-cxx was given.
-@@ -2751,7 +2857,7 @@
+@@ -2751,7 +2679,7 @@
  else
    cf_with_cxx=yes
  fi;
 -echo "$as_me:2754: result: $cf_with_cxx" >&5
-+echo "$as_me:2860: result: $cf_with_cxx" >&5
++echo "$as_me:2682: result: $cf_with_cxx" >&5
  echo "${ECHO_T}$cf_with_cxx" >&6
  if test "X$cf_with_cxx" = Xno ; then
         CXX=""
-@@ -2769,7 +2875,7 @@
+@@ -2769,7 +2697,7 @@
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 -echo "$as_me:2772: checking for $ac_word" >&5
-+echo "$as_me:2878: checking for $ac_word" >&5
++echo "$as_me:2700: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2784,7 +2890,7 @@
+@@ -2784,7 +2712,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
 -echo "$as_me:2787: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2893: found $ac_dir/$ac_word" >&5
++echo "$as_me:2715: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -2792,10 +2898,10 @@
+@@ -2792,10 +2720,10 @@
  fi
  CXX=$ac_cv_prog_CXX
  if test -n "$CXX"; then
 -  echo "$as_me:2795: result: $CXX" >&5
-+  echo "$as_me:2901: result: $CXX" >&5
++  echo "$as_me:2723: result: $CXX" >&5
  echo "${ECHO_T}$CXX" >&6
  else
 -  echo "$as_me:2798: result: no" >&5
-+  echo "$as_me:2904: result: no" >&5
++  echo "$as_me:2726: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -2808,7 +2914,7 @@
+@@ -2808,7 +2736,7 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -echo "$as_me:2811: checking for $ac_word" >&5
-+echo "$as_me:2917: checking for $ac_word" >&5
++echo "$as_me:2739: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2823,7 +2929,7 @@
+@@ -2823,7 +2751,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_ac_ct_CXX="$ac_prog"
 -echo "$as_me:2826: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2932: found $ac_dir/$ac_word" >&5
++echo "$as_me:2754: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -2831,10 +2937,10 @@
+@@ -2831,10 +2759,10 @@
  fi
  ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
  if test -n "$ac_ct_CXX"; then
 -  echo "$as_me:2834: result: $ac_ct_CXX" >&5
-+  echo "$as_me:2940: result: $ac_ct_CXX" >&5
++  echo "$as_me:2762: result: $ac_ct_CXX" >&5
  echo "${ECHO_T}$ac_ct_CXX" >&6
  else
 -  echo "$as_me:2837: result: no" >&5
-+  echo "$as_me:2943: result: no" >&5
++  echo "$as_me:2765: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -2846,32 +2952,32 @@
+@@ -2846,32 +2774,32 @@
  fi
  
  # Provide some information about the compiler.
 -echo "$as_me:2849:" \
-+echo "$as_me:2955:" \
++echo "$as_me:2777:" \
       "checking for C++ compiler version" >&5
  ac_compiler=`set X $ac_compile; echo $2`
 -{ (eval echo "$as_me:2852: \"$ac_compiler --version </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:2958: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:2780: \"$ac_compiler --version </dev/null >&5\"") >&5
    (eval $ac_compiler --version </dev/null >&5) 2>&5
    ac_status=$?
 -  echo "$as_me:2855: \$? = $ac_status" >&5
-+  echo "$as_me:2961: \$? = $ac_status" >&5
++  echo "$as_me:2783: \$? = $ac_status" >&5
    (exit $ac_status); }
 -{ (eval echo "$as_me:2857: \"$ac_compiler -v </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:2963: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:2785: \"$ac_compiler -v </dev/null >&5\"") >&5
    (eval $ac_compiler -v </dev/null >&5) 2>&5
    ac_status=$?
 -  echo "$as_me:2860: \$? = $ac_status" >&5
-+  echo "$as_me:2966: \$? = $ac_status" >&5
++  echo "$as_me:2788: \$? = $ac_status" >&5
    (exit $ac_status); }
 -{ (eval echo "$as_me:2862: \"$ac_compiler -V </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:2968: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:2790: \"$ac_compiler -V </dev/null >&5\"") >&5
    (eval $ac_compiler -V </dev/null >&5) 2>&5
    ac_status=$?
 -  echo "$as_me:2865: \$? = $ac_status" >&5
-+  echo "$as_me:2971: \$? = $ac_status" >&5
++  echo "$as_me:2793: \$? = $ac_status" >&5
    (exit $ac_status); }
  
 -echo "$as_me:2868: checking whether we are using the GNU C++ compiler" >&5
-+echo "$as_me:2974: checking whether we are using the GNU C++ compiler" >&5
++echo "$as_me:2796: checking whether we are using the GNU C++ compiler" >&5
  echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
  if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
@@ -13568 +16030 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 2874 "configure"
-+#line 2980 "configure"
++#line 2802 "configure"
  #include "confdefs.h"
  
  int
-@@ -2886,16 +2992,16 @@
+@@ -2886,16 +2814,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:2889: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2995: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2817: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:2892: \$? = $ac_status" >&5
-+  echo "$as_me:2998: \$? = $ac_status" >&5
++  echo "$as_me:2820: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:2895: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3001: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2823: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2898: \$? = $ac_status" >&5
-+  echo "$as_me:3004: \$? = $ac_status" >&5
++  echo "$as_me:2826: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_compiler_gnu=yes
  else
-@@ -2907,19 +3013,19 @@
+@@ -2907,19 +2835,19 @@
  ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
  
  fi
 -echo "$as_me:2910: result: $ac_cv_cxx_compiler_gnu" >&5
-+echo "$as_me:3016: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "$as_me:2838: result: $ac_cv_cxx_compiler_gnu" >&5
  echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
  GXX=`test $ac_compiler_gnu = yes && echo yes`
@@ -13605 +16067 @@
  CXXFLAGS="-g"
 -echo "$as_me:2916: checking whether $CXX accepts -g" >&5
-+echo "$as_me:3022: checking whether $CXX accepts -g" >&5
++echo "$as_me:2844: checking whether $CXX accepts -g" >&5
  echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
  if test "${ac_cv_prog_cxx_g+set}" = set; then
@@ -13612 +16074 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 2922 "configure"
-+#line 3028 "configure"
++#line 2850 "configure"
  #include "confdefs.h"
  
  int
-@@ -2931,16 +3037,16 @@
+@@ -2931,16 +2859,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:2934: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3040: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2862: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:2937: \$? = $ac_status" >&5
-+  echo "$as_me:3043: \$? = $ac_status" >&5
++  echo "$as_me:2865: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:2940: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3046: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2868: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2943: \$? = $ac_status" >&5
-+  echo "$as_me:3049: \$? = $ac_status" >&5
++  echo "$as_me:2871: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_prog_cxx_g=yes
  else
-@@ -2950,7 +3056,7 @@
+@@ -2950,7 +2878,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:2953: result: $ac_cv_prog_cxx_g" >&5
-+echo "$as_me:3059: result: $ac_cv_prog_cxx_g" >&5
++echo "$as_me:2881: result: $ac_cv_prog_cxx_g" >&5
  echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
  if test "$ac_test_CXXFLAGS" = set; then
    CXXFLAGS=$ac_save_CXXFLAGS
-@@ -2977,7 +3083,7 @@
+@@ -2977,7 +2905,7 @@
     'void exit (int);'
  do
    cat >conftest.$ac_ext <<_ACEOF
 -#line 2980 "configure"
-+#line 3086 "configure"
++#line 2908 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  $ac_declaration
-@@ -2990,16 +3096,16 @@
+@@ -2990,16 +2918,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:2993: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3099: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2921: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:2996: \$? = $ac_status" >&5
-+  echo "$as_me:3102: \$? = $ac_status" >&5
++  echo "$as_me:2924: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:2999: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3105: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2927: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3002: \$? = $ac_status" >&5
-+  echo "$as_me:3108: \$? = $ac_status" >&5
++  echo "$as_me:2930: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -3009,7 +3115,7 @@
+@@ -3009,7 +2937,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
 -#line 3012 "configure"
-+#line 3118 "configure"
++#line 2940 "configure"
  #include "confdefs.h"
  $ac_declaration
  int
-@@ -3021,16 +3127,16 @@
+@@ -3021,16 +2949,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3024: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3130: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2952: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:3027: \$? = $ac_status" >&5
-+  echo "$as_me:3133: \$? = $ac_status" >&5
++  echo "$as_me:2955: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3030: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3136: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2958: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3033: \$? = $ac_status" >&5
-+  echo "$as_me:3139: \$? = $ac_status" >&5
++  echo "$as_me:2961: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -3057,7 +3163,7 @@
+@@ -3053,11 +2981,11 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return=return
+ 
+-               # autoconf 2.5x removed the error - by hardcoding it to g++.
++               # autoconf 2.5x removed the error (hardcoding it to g++, or just blank)
         if test "$CXX" = "g++" ; then
                 # Extract the first word of "g++", so it can be a program name with args.
  set dummy g++; ac_word=$2
 -echo "$as_me:3060: checking for $ac_word" >&5
-+echo "$as_me:3166: checking for $ac_word" >&5
++echo "$as_me:2988: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_path_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3074,7 +3180,7 @@
+@@ -3074,7 +3002,7 @@
    test -z "$ac_dir" && ac_dir=.
    if $as_executable_p "$ac_dir/$ac_word"; then
     ac_cv_path_CXX="$ac_dir/$ac_word"
 -   echo "$as_me:3077: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:3183: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3005: found $ac_dir/$ac_word" >&5
     break
  fi
  done
-@@ -3085,16 +3191,16 @@
+@@ -3085,28 +3013,30 @@
  CXX=$ac_cv_path_CXX
  
  if test -n "$CXX"; then
 -  echo "$as_me:3088: result: $CXX" >&5
-+  echo "$as_me:3194: result: $CXX" >&5
++  echo "$as_me:3016: result: $CXX" >&5
  echo "${ECHO_T}$CXX" >&6
  else
 -  echo "$as_me:3091: result: no" >&5
-+  echo "$as_me:3197: result: no" >&5
++  echo "$as_me:3019: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
         fi
-        if test "$CXX" = "g++" ; then
+-       if test "$CXX" = "g++" ; then
 -               { echo "$as_me:3097: WARNING: ignoring hardcoded g++" >&5
-+               { echo "$as_me:3203: WARNING: ignoring hardcoded g++" >&5
- echo "$as_me: WARNING: ignoring hardcoded g++" >&2;}
+-echo "$as_me: WARNING: ignoring hardcoded g++" >&2;}
++       case "x$CXX" in #(vi
++       x|xg++)
++               { echo "$as_me:3026: WARNING: You don't have any C++ compiler, too bad" >&5
++echo "$as_me: WARNING: You don't have any C++ compiler, too bad" >&2;}
                 cf_with_cxx=no; CXX=""; GXX="";
-        fi
-@@ -3102,11 +3208,11 @@
+-       fi
++               ;;
++       esac
+ fi
  
  GXX_VERSION=none
  if test "$GXX" = yes; then
 -       echo "$as_me:3105: checking version of g++" >&5
-+       echo "$as_me:3211: checking version of g++" >&5
- echo $ECHO_N "checking version of g++... $ECHO_C" >&6
+-echo $ECHO_N "checking version of g++... $ECHO_C" >&6
++       echo "$as_me:3035: checking version of ${CXX:-g++}" >&5
++echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
         GXX_VERSION="`${CXX:-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
         test -z "$GXX_VERSION" && GXX_VERSION=unknown
 -       echo "$as_me:3109: result: $GXX_VERSION" >&5
-+       echo "$as_me:3215: result: $GXX_VERSION" >&5
++       echo "$as_me:3039: result: $GXX_VERSION" >&5
  echo "${ECHO_T}$GXX_VERSION" >&6
  fi
  
-@@ -3114,12 +3220,12 @@
+@@ -3114,12 +3044,12 @@
  1*|2.[0-6]*)
         # GXX=""; CXX=""; ac_cv_prog_gxx=no
         # cf_cxx_library=no
 -       { echo "$as_me:3117: WARNING: templates do not work" >&5
-+       { echo "$as_me:3223: WARNING: templates do not work" >&5
++       { echo "$as_me:3047: WARNING: templates do not work" >&5
  echo "$as_me: WARNING: templates do not work" >&2;}
         ;;
@@ -13769 +16242 @@
  
 -echo "$as_me:3122: checking if you want to build C++ binding and demo" >&5
-+echo "$as_me:3228: checking if you want to build C++ binding and demo" >&5
++echo "$as_me:3052: checking if you want to build C++ binding and demo" >&5
  echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6
  
  # Check whether --with-cxx-binding or --without-cxx-binding was given.
-@@ -3129,10 +3235,10 @@
+@@ -3129,23 +3059,15 @@
  else
    cf_with_cxx_binding=$cf_with_cxx
  fi;
 -echo "$as_me:3132: result: $cf_with_cxx_binding" >&5
-+echo "$as_me:3238: result: $cf_with_cxx_binding" >&5
++echo "$as_me:3062: result: $cf_with_cxx_binding" >&5
  echo "${ECHO_T}$cf_with_cxx_binding" >&6
  
 -echo "$as_me:3135: checking if you want to build with Ada95" >&5
-+echo "$as_me:3241: checking if you want to build with Ada95" >&5
++echo "$as_me:3065: checking if you want to build with Ada95" >&5
  echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6
- 
- # Check whether --with-ada or --without-ada was given.
-@@ -3142,10 +3248,10 @@
- else
-   cf_with_ada=yes
- fi;
+-
+-# Check whether --with-ada or --without-ada was given.
+-if test "${with_ada+set}" = set; then
+-  withval="$with_ada"
+-  cf_with_ada=$withval
+-else
+-  cf_with_ada=yes
+-fi;
 -echo "$as_me:3145: result: $cf_with_ada" >&5
-+echo "$as_me:3251: result: $cf_with_ada" >&5
++echo "$as_me:3067: result: $cf_with_ada" >&5
  echo "${ECHO_T}$cf_with_ada" >&6
  
 -echo "$as_me:3148: checking if you want to install manpages" >&5
-+echo "$as_me:3254: checking if you want to install manpages" >&5
++echo "$as_me:3070: checking if you want to install manpages" >&5
  echo $ECHO_N "checking if you want to install manpages... $ECHO_C" >&6
  
  # Check whether --with-manpages or --without-manpages was given.
-@@ -3155,10 +3261,10 @@
+@@ -3155,10 +3077,10 @@
  else
    cf_with_manpages=yes
  fi;
 -echo "$as_me:3158: result: $cf_with_manpages" >&5
-+echo "$as_me:3264: result: $cf_with_manpages" >&5
++echo "$as_me:3080: result: $cf_with_manpages" >&5
  echo "${ECHO_T}$cf_with_manpages" >&6
  
 -echo "$as_me:3161: checking if you want to build programs such as tic" >&5
-+echo "$as_me:3267: checking if you want to build programs such as tic" >&5
++echo "$as_me:3083: checking if you want to build programs such as tic" >&5
  echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6
  
  # Check whether --with-progs or --without-progs was given.
-@@ -3168,10 +3274,10 @@
+@@ -3168,10 +3090,10 @@
  else
    cf_with_progs=yes
  fi;
 -echo "$as_me:3171: result: $cf_with_progs" >&5
-+echo "$as_me:3277: result: $cf_with_progs" >&5
++echo "$as_me:3093: result: $cf_with_progs" >&5
  echo "${ECHO_T}$cf_with_progs" >&6
  
 -echo "$as_me:3174: checking if you want to build test-programs" >&5
-+echo "$as_me:3280: checking if you want to build test-programs" >&5
++echo "$as_me:3096: 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.
-@@ -3181,10 +3287,10 @@
+@@ -3181,10 +3103,10 @@
  else
    cf_with_tests=yes
  fi;
 -echo "$as_me:3184: result: $cf_with_tests" >&5
-+echo "$as_me:3290: result: $cf_with_tests" >&5
++echo "$as_me:3106: result: $cf_with_tests" >&5
  echo "${ECHO_T}$cf_with_tests" >&6
  
 -echo "$as_me:3187: checking if you wish to install curses.h" >&5
-+echo "$as_me:3293: checking if you wish to install curses.h" >&5
++echo "$as_me:3109: checking if you wish to install curses.h" >&5
  echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6
  
  # Check whether --with-curses-h or --without-curses-h was given.
-@@ -3194,7 +3300,7 @@
+@@ -3194,7 +3116,7 @@
  else
    with_curses_h=yes
  fi;
 -echo "$as_me:3197: result: $with_curses_h" >&5
-+echo "$as_me:3303: result: $with_curses_h" >&5
++echo "$as_me:3119: result: $with_curses_h" >&5
  echo "${ECHO_T}$with_curses_h" >&6
  
  modules_to_build="ncurses"
-@@ -3220,7 +3326,7 @@
+@@ -3220,7 +3142,7 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -echo "$as_me:3223: checking for $ac_word" >&5
-+echo "$as_me:3329: checking for $ac_word" >&5
++echo "$as_me:3145: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_AWK+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3235,7 +3341,7 @@
+@@ -3235,7 +3157,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_AWK="$ac_prog"
 -echo "$as_me:3238: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3344: found $ac_dir/$ac_word" >&5
++echo "$as_me:3160: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3243,21 +3349,21 @@
+@@ -3243,21 +3165,21 @@
  fi
  AWK=$ac_cv_prog_AWK
  if test -n "$AWK"; then
 -  echo "$as_me:3246: result: $AWK" >&5
-+  echo "$as_me:3352: result: $AWK" >&5
++  echo "$as_me:3168: result: $AWK" >&5
  echo "${ECHO_T}$AWK" >&6
  else
 -  echo "$as_me:3249: result: no" >&5
-+  echo "$as_me:3355: result: no" >&5
++  echo "$as_me:3171: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
@@ -13882 +16357 @@
  
 -test -z "$AWK" && { { echo "$as_me:3256: error: No awk program found" >&5
-+test -z "$AWK" && { { echo "$as_me:3362: error: No awk program found" >&5
++test -z "$AWK" && { { echo "$as_me:3178: error: No awk program found" >&5
  echo "$as_me: error: No awk program found" >&2;}
     { (exit 1); exit 1; }; }
  
 -echo "$as_me:3260: checking for egrep" >&5
-+echo "$as_me:3366: checking for egrep" >&5
++echo "$as_me:3182: checking for egrep" >&5
  echo $ECHO_N "checking for egrep... $ECHO_C" >&6
  if test "${ac_cv_prog_egrep+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3267,11 +3373,11 @@
+@@ -3267,11 +3189,11 @@
      else ac_cv_prog_egrep='egrep'
      fi
  fi
 -echo "$as_me:3270: result: $ac_cv_prog_egrep" >&5
-+echo "$as_me:3376: result: $ac_cv_prog_egrep" >&5
++echo "$as_me:3192: 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:3274: error: No egrep program found" >&5
-+test -z "$EGREP" && { { echo "$as_me:3380: error: No egrep program found" >&5
++test -z "$EGREP" && { { echo "$as_me:3196: error: No egrep program found" >&5
  echo "$as_me: error: No egrep program found" >&2;}
     { (exit 1); exit 1; }; }
  
-@@ -3287,7 +3393,7 @@
+@@ -3287,7 +3209,7 @@
  # AFS /usr/afsws/bin/install, which mishandles nonexistent args
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # ./install, which can be erroneously created by make from ./install.sh.
 -echo "$as_me:3290: checking for a BSD compatible install" >&5
-+echo "$as_me:3396: checking for a BSD compatible install" >&5
++echo "$as_me:3212: checking for a BSD compatible install" >&5
  echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
  if test -z "$INSTALL"; then
  if test "${ac_cv_path_install+set}" = set; then
-@@ -3336,7 +3442,7 @@
+@@ -3336,7 +3258,7 @@
      INSTALL=$ac_install_sh
    fi
  fi
 -echo "$as_me:3339: result: $INSTALL" >&5
-+echo "$as_me:3445: result: $INSTALL" >&5
++echo "$as_me:3261: result: $INSTALL" >&5
  echo "${ECHO_T}$INSTALL" >&6
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -3361,7 +3467,7 @@
+@@ -3361,7 +3283,7 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -echo "$as_me:3364: checking for $ac_word" >&5
-+echo "$as_me:3470: checking for $ac_word" >&5
++echo "$as_me:3286: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_LINT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3376,7 +3482,7 @@
+@@ -3376,7 +3298,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_LINT="$ac_prog"
 -echo "$as_me:3379: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3485: found $ac_dir/$ac_word" >&5
++echo "$as_me:3301: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3384,28 +3490,28 @@
+@@ -3384,28 +3306,28 @@
  fi
  LINT=$ac_cv_prog_LINT
  if test -n "$LINT"; then
 -  echo "$as_me:3387: result: $LINT" >&5
-+  echo "$as_me:3493: result: $LINT" >&5
++  echo "$as_me:3309: result: $LINT" >&5
  echo "${ECHO_T}$LINT" >&6
  else
 -  echo "$as_me:3390: result: no" >&5
-+  echo "$as_me:3496: result: no" >&5
++  echo "$as_me:3312: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
@@ -13958 +16433 @@
  
 -echo "$as_me:3397: checking whether ln -s works" >&5
-+echo "$as_me:3503: checking whether ln -s works" >&5
++echo "$as_me:3319: 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:3401: result: yes" >&5
-+  echo "$as_me:3507: result: yes" >&5
++  echo "$as_me:3323: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  else
 -  echo "$as_me:3404: result: no, using $LN_S" >&5
-+  echo "$as_me:3510: result: no, using $LN_S" >&5
++  echo "$as_me:3326: result: no, using $LN_S" >&5
  echo "${ECHO_T}no, using $LN_S" >&6
  fi
  
 -echo "$as_me:3408: checking if $LN_S -f options work" >&5
-+echo "$as_me:3514: checking if $LN_S -f options work" >&5
++echo "$as_me:3330: checking if $LN_S -f options work" >&5
  echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6
  
  rm -f conf$$.src conf$$dst
-@@ -3417,12 +3523,12 @@
+@@ -3417,12 +3339,12 @@
         cf_prog_ln_sf=no
  fi
  rm -f conf$$.dst conf$$src
 -echo "$as_me:3420: result: $cf_prog_ln_sf" >&5
-+echo "$as_me:3526: result: $cf_prog_ln_sf" >&5
++echo "$as_me:3342: result: $cf_prog_ln_sf" >&5
  echo "${ECHO_T}$cf_prog_ln_sf" >&6
  
@@ -13987 +16462 @@
  
 -echo "$as_me:3425: checking for long file names" >&5
-+echo "$as_me:3531: checking for long file names" >&5
++echo "$as_me:3347: checking for long file names" >&5
  echo $ECHO_N "checking for long file names... $ECHO_C" >&6
  if test "${ac_cv_sys_long_file_names+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3461,7 +3567,7 @@
+@@ -3461,7 +3383,7 @@
    rm -rf $ac_xdir 2>/dev/null
  done
  fi
 -echo "$as_me:3464: result: $ac_cv_sys_long_file_names" >&5
-+echo "$as_me:3570: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:3386: 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
  
-@@ -3473,7 +3579,7 @@
+@@ -3473,7 +3395,7 @@
  
  # if we find pkg-config, check if we should install the ".pc" files.
  
 -echo "$as_me:3476: checking if you want to use pkg-config" >&5
-+echo "$as_me:3582: checking if you want to use pkg-config" >&5
++echo "$as_me:3398: checking if you want to use pkg-config" >&5
  echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
  
  # Check whether --with-pkg-config or --without-pkg-config was given.
-@@ -3483,7 +3589,7 @@
+@@ -3483,7 +3405,7 @@
  else
    cf_pkg_config=yes
  fi;
 -echo "$as_me:3486: result: $cf_pkg_config" >&5
-+echo "$as_me:3592: result: $cf_pkg_config" >&5
++echo "$as_me:3408: result: $cf_pkg_config" >&5
  echo "${ECHO_T}$cf_pkg_config" >&6
  
  case $cf_pkg_config in #(vi
-@@ -3491,10 +3597,11 @@
+@@ -3491,10 +3413,11 @@
         PKG_CONFIG=none
         ;;
@@ -14028 +16503 @@
  set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 -echo "$as_me:3497: checking for $ac_word" >&5
-+echo "$as_me:3604: checking for $ac_word" >&5
++echo "$as_me:3420: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3511,7 +3618,7 @@
+@@ -3511,7 +3434,7 @@
    test -z "$ac_dir" && ac_dir=.
    if $as_executable_p "$ac_dir/$ac_word"; then
     ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
 -   echo "$as_me:3514: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:3621: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3437: found $ac_dir/$ac_word" >&5
     break
  fi
  done
-@@ -3522,10 +3629,10 @@
+@@ -3522,10 +3445,10 @@
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  
  if test -n "$PKG_CONFIG"; then
 -  echo "$as_me:3525: result: $PKG_CONFIG" >&5
-+  echo "$as_me:3632: result: $PKG_CONFIG" >&5
++  echo "$as_me:3448: result: $PKG_CONFIG" >&5
  echo "${ECHO_T}$PKG_CONFIG" >&6
  else
 -  echo "$as_me:3528: result: no" >&5
-+  echo "$as_me:3635: result: no" >&5
++  echo "$as_me:3451: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3534,7 +3641,7 @@
+@@ -3534,7 +3457,7 @@
    ac_pt_PKG_CONFIG=$PKG_CONFIG
    # 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:3537: checking for $ac_word" >&5
-+echo "$as_me:3644: checking for $ac_word" >&5
++echo "$as_me:3460: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3551,7 +3658,7 @@
+@@ -3551,7 +3474,7 @@
    test -z "$ac_dir" && ac_dir=.
    if $as_executable_p "$ac_dir/$ac_word"; then
     ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
 -   echo "$as_me:3554: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:3661: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3477: found $ac_dir/$ac_word" >&5
     break
  fi
  done
-@@ -3563,10 +3670,10 @@
+@@ -3563,10 +3486,10 @@
  ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
  
  if test -n "$ac_pt_PKG_CONFIG"; then
 -  echo "$as_me:3566: result: $ac_pt_PKG_CONFIG" >&5
-+  echo "$as_me:3673: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:3489: result: $ac_pt_PKG_CONFIG" >&5
  echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
  else
 -  echo "$as_me:3569: result: no" >&5
-+  echo "$as_me:3676: result: no" >&5
++  echo "$as_me:3492: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3609,7 +3716,7 @@
+@@ -3597,7 +3520,7 @@
+   ;;
+ .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+   ;;
+-.\${*prefix}*) #(vi
++.\${*prefix}*|.\${*dir}*) #(vi
+   eval PKG_CONFIG="$PKG_CONFIG"
+   case ".$PKG_CONFIG" in #(vi
+   .NONE/*)
+@@ -3609,7 +3532,7 @@
    PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
    ;;
  *)
 -  { { echo "$as_me:3612: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
-+  { { echo "$as_me:3719: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++  { { echo "$as_me:3535: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
  echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
     { (exit 1); exit 1; }; }
    ;;
-@@ -3617,16 +3724,52 @@
+@@ -3617,16 +3540,51 @@
  
  fi
@@ -14102 +16586 @@
 -echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6
 +if test "$PKG_CONFIG" != none ; then
-+       echo "$as_me:3728: checking for $PKG_CONFIG library directory" >&5
++       echo "$as_me:3544: checking for $PKG_CONFIG library directory" >&5
 +echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
  
@@ -14110 +16594 @@
 -       fi
 -       PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'`
+-       if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
 +# Check whether --with-pkg-config-libdir or --without-pkg-config-libdir was given.
 +if test "${with_pkg_config_libdir+set}" = set; then
@@ -14144 +16629 @@
 +       esac
 +
-+       echo "$as_me:3765: result: $PKG_CONFIG_LIBDIR" >&5
++       echo "$as_me:3581: result: $PKG_CONFIG_LIBDIR" >&5
 +echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
 +fi
 +
 +if test "$PKG_CONFIG" != none ; then
-        if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
-+               echo "$as_me:3771: checking if we should install .pc files for $PKG_CONFIG" >&5
++       echo "$as_me:3586: 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
  
  # Check whether --enable-pc-files or --disable-pc-files was given.
  if test "${enable_pc_files+set}" = set; then
-@@ -3635,18 +3778,18 @@
+@@ -3635,18 +3593,48 @@
  else
    enable_pc_files=no
  fi;
 -               echo "$as_me:3638: result: $enable_pc_files" >&5
-+               echo "$as_me:3781: result: $enable_pc_files" >&5
++       echo "$as_me:3596: result: $enable_pc_files" >&5
  echo "${ECHO_T}$enable_pc_files" >&6
 -       else
@@ -14167 +16651 @@
 -               { echo "$as_me:3643: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5
 -echo "$as_me: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&2;}
-+       elif test -z "$PKG_CONFIG_LIBDIR" || test "$PKG_CONFIG_LIBDIR" != no; then
-                enable_pc_files=no
-+               { echo "$as_me:3785: WARNING: did not find $PKG_CONFIG library" >&5
-+echo "$as_me: WARNING: did not find $PKG_CONFIG library" >&2;}
+-               enable_pc_files=no
++       if test "$enable_pc_files" != no
++       then
++
++if test "x$prefix" != xNONE; then
++  cf_path_syntax="$prefix"
++else
++  cf_path_syntax="$ac_default_prefix"
++fi
++
++case ".$PKG_CONFIG_LIBDIR" in #(vi
++.\$\(*\)*|.\'*\'*) #(vi
++  ;;
++..|./*|.\\*) #(vi
++  ;;
++.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
++  ;;
++.\${*prefix}*|.\${*dir}*) #(vi
++  eval PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR"
++  case ".$PKG_CONFIG_LIBDIR" in #(vi
++  .NONE/*)
++    PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%`
++    ;;
++  esac
++  ;; #(vi
++.no|.NONE/*)
++  PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%`
++  ;;
++*)
++  { { echo "$as_me:3626: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5
++echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&2;}
++   { (exit 1); exit 1; }; }
++  ;;
++esac
++
         fi
 +else
@@ -14177 +16692 @@
  
 -echo "$as_me:3649: checking if we should assume mixed-case filenames" >&5
-+echo "$as_me:3792: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:3637: checking if we should assume mixed-case filenames" >&5
  echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
  
  # Check whether --enable-mixed-case or --disable-mixed-case was given.
-@@ -3656,11 +3799,11 @@
+@@ -3656,11 +3644,11 @@
  else
    enable_mixedcase=auto
  fi;
 -echo "$as_me:3659: result: $enable_mixedcase" >&5
-+echo "$as_me:3802: result: $enable_mixedcase" >&5
++echo "$as_me:3647: result: $enable_mixedcase" >&5
  echo "${ECHO_T}$enable_mixedcase" >&6
  if test "$enable_mixedcase" = "auto" ; then
  
 -echo "$as_me:3663: checking if filesystem supports mixed-case filenames" >&5
-+echo "$as_me:3806: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:3651: checking if filesystem supports mixed-case filenames" >&5
  echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
  if test "${cf_cv_mixedcase+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3687,7 +3830,7 @@
+@@ -3687,7 +3675,7 @@
  fi
  
  fi
 -echo "$as_me:3690: result: $cf_cv_mixedcase" >&5
-+echo "$as_me:3833: result: $cf_cv_mixedcase" >&5
++echo "$as_me:3678: result: $cf_cv_mixedcase" >&5
  echo "${ECHO_T}$cf_cv_mixedcase" >&6
  test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF
  #define MIXEDCASE_FILENAMES 1
-@@ -3704,7 +3847,7 @@
+@@ -3704,7 +3692,7 @@
  fi
  
  # do this after mixed-case option (tags/TAGS is not as important as tic).
 -echo "$as_me:3707: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "$as_me:3850: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:3695: checking whether ${MAKE-make} sets \${MAKE}" >&5
  echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
  set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
  if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-@@ -3724,11 +3867,11 @@
+@@ -3724,11 +3712,11 @@
  rm -f conftest.make
  fi
  if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
 -  echo "$as_me:3727: result: yes" >&5
-+  echo "$as_me:3870: result: yes" >&5
++  echo "$as_me:3715: result: yes" >&5
  echo "${ECHO_T}yes" >&6
    SET_MAKE=
  else
 -  echo "$as_me:3731: result: no" >&5
-+  echo "$as_me:3874: result: no" >&5
++  echo "$as_me:3719: result: no" >&5
  echo "${ECHO_T}no" >&6
    SET_MAKE="MAKE=${MAKE-make}"
  fi
-@@ -3737,7 +3880,7 @@
+@@ -3737,7 +3725,7 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -echo "$as_me:3740: checking for $ac_word" >&5
-+echo "$as_me:3883: checking for $ac_word" >&5
++echo "$as_me:3728: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_CTAGS+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3752,7 +3895,7 @@
+@@ -3752,7 +3740,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_CTAGS="$ac_prog"
 -echo "$as_me:3755: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3898: found $ac_dir/$ac_word" >&5
++echo "$as_me:3743: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3760,10 +3903,10 @@
+@@ -3760,10 +3748,10 @@
  fi
  CTAGS=$ac_cv_prog_CTAGS
  if test -n "$CTAGS"; then
 -  echo "$as_me:3763: result: $CTAGS" >&5
-+  echo "$as_me:3906: result: $CTAGS" >&5
++  echo "$as_me:3751: result: $CTAGS" >&5
  echo "${ECHO_T}$CTAGS" >&6
  else
 -  echo "$as_me:3766: result: no" >&5
-+  echo "$as_me:3909: result: no" >&5
++  echo "$as_me:3754: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3774,7 +3917,7 @@
+@@ -3774,7 +3762,7 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -echo "$as_me:3777: checking for $ac_word" >&5
-+echo "$as_me:3920: checking for $ac_word" >&5
++echo "$as_me:3765: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_ETAGS+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3789,7 +3932,7 @@
+@@ -3789,7 +3777,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_ETAGS="$ac_prog"
 -echo "$as_me:3792: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3935: found $ac_dir/$ac_word" >&5
++echo "$as_me:3780: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3797,10 +3940,10 @@
+@@ -3797,10 +3785,10 @@
  fi
  ETAGS=$ac_cv_prog_ETAGS
  if test -n "$ETAGS"; then
 -  echo "$as_me:3800: result: $ETAGS" >&5
-+  echo "$as_me:3943: result: $ETAGS" >&5
++  echo "$as_me:3788: result: $ETAGS" >&5
  echo "${ECHO_T}$ETAGS" >&6
  else
 -  echo "$as_me:3803: result: no" >&5
-+  echo "$as_me:3946: result: no" >&5
++  echo "$as_me:3791: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3809,7 +3952,7 @@
+@@ -3809,7 +3797,7 @@
  
  # 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:3812: checking for $ac_word" >&5
-+echo "$as_me:3955: checking for $ac_word" >&5
++echo "$as_me:3800: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3824,7 +3967,7 @@
+@@ -3824,7 +3812,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_MAKE_LOWER_TAGS="yes"
 -echo "$as_me:3827: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3970: found $ac_dir/$ac_word" >&5
++echo "$as_me:3815: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3833,17 +3976,17 @@
+@@ -3833,17 +3821,17 @@
  fi
  MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
  if test -n "$MAKE_LOWER_TAGS"; then
 -  echo "$as_me:3836: result: $MAKE_LOWER_TAGS" >&5
-+  echo "$as_me:3979: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:3824: result: $MAKE_LOWER_TAGS" >&5
  echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
  else
 -  echo "$as_me:3839: result: no" >&5
-+  echo "$as_me:3982: result: no" >&5
++  echo "$as_me:3827: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
@@ -14324 +16839 @@
  set dummy ${ETAGS:-etags}; ac_word=$2
 -echo "$as_me:3846: checking for $ac_word" >&5
-+echo "$as_me:3989: checking for $ac_word" >&5
++echo "$as_me:3834: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3858,7 +4001,7 @@
+@@ -3858,7 +3846,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_MAKE_UPPER_TAGS="yes"
 -echo "$as_me:3861: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4004: found $ac_dir/$ac_word" >&5
++echo "$as_me:3849: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3867,10 +4010,10 @@
+@@ -3867,10 +3855,10 @@
  fi
  MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
  if test -n "$MAKE_UPPER_TAGS"; then
 -  echo "$as_me:3870: result: $MAKE_UPPER_TAGS" >&5
-+  echo "$as_me:4013: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:3858: result: $MAKE_UPPER_TAGS" >&5
  echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
  else
 -  echo "$as_me:3873: result: no" >&5
-+  echo "$as_me:4016: result: no" >&5
++  echo "$as_me:3861: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3890,7 +4033,7 @@
+@@ -3890,7 +3878,7 @@
         MAKE_LOWER_TAGS="#"
  fi
  
 -echo "$as_me:3893: checking for makeflags variable" >&5
-+echo "$as_me:4036: checking for makeflags variable" >&5
++echo "$as_me:3881: checking for makeflags variable" >&5
  echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
  if test "${cf_cv_makeflags+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3924,13 +4067,13 @@
+@@ -3924,13 +3912,13 @@
         rm -f cf_makeflags.tmp
  
  fi
 -echo "$as_me:3927: result: $cf_cv_makeflags" >&5
-+echo "$as_me:4070: result: $cf_cv_makeflags" >&5
++echo "$as_me:3915: result: $cf_cv_makeflags" >&5
  echo "${ECHO_T}$cf_cv_makeflags" >&6
  
@@ -14371 +16886 @@
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 -echo "$as_me:3933: checking for $ac_word" >&5
-+echo "$as_me:4076: checking for $ac_word" >&5
++echo "$as_me:3921: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3945,7 +4088,7 @@
+@@ -3945,7 +3933,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
 -echo "$as_me:3948: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4091: found $ac_dir/$ac_word" >&5
++echo "$as_me:3936: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3953,10 +4096,10 @@
+@@ -3953,10 +3941,10 @@
  fi
  RANLIB=$ac_cv_prog_RANLIB
  if test -n "$RANLIB"; then
 -  echo "$as_me:3956: result: $RANLIB" >&5
-+  echo "$as_me:4099: result: $RANLIB" >&5
++  echo "$as_me:3944: result: $RANLIB" >&5
  echo "${ECHO_T}$RANLIB" >&6
  else
 -  echo "$as_me:3959: result: no" >&5
-+  echo "$as_me:4102: result: no" >&5
++  echo "$as_me:3947: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -3965,7 +4108,7 @@
+@@ -3965,7 +3953,7 @@
    ac_ct_RANLIB=$RANLIB
    # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
 -echo "$as_me:3968: checking for $ac_word" >&5
-+echo "$as_me:4111: checking for $ac_word" >&5
++echo "$as_me:3956: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3980,7 +4123,7 @@
+@@ -3980,7 +3968,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_ac_ct_RANLIB="ranlib"
 -echo "$as_me:3983: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4126: found $ac_dir/$ac_word" >&5
++echo "$as_me:3971: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -3989,10 +4132,10 @@
+@@ -3989,10 +3977,10 @@
  fi
  ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
  if test -n "$ac_ct_RANLIB"; then
 -  echo "$as_me:3992: result: $ac_ct_RANLIB" >&5
-+  echo "$as_me:4135: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:3980: result: $ac_ct_RANLIB" >&5
  echo "${ECHO_T}$ac_ct_RANLIB" >&6
  else
 -  echo "$as_me:3995: result: no" >&5
-+  echo "$as_me:4138: result: no" >&5
++  echo "$as_me:3983: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -4004,7 +4147,7 @@
+@@ -4004,7 +3992,7 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ld; ac_word=$2
 -echo "$as_me:4007: checking for $ac_word" >&5
-+echo "$as_me:4150: checking for $ac_word" >&5
++echo "$as_me:3995: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4019,7 +4162,7 @@
+@@ -4019,7 +4007,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_LD="${ac_tool_prefix}ld"
 -echo "$as_me:4022: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4165: found $ac_dir/$ac_word" >&5
++echo "$as_me:4010: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -4027,10 +4170,10 @@
+@@ -4027,10 +4015,10 @@
  fi
  LD=$ac_cv_prog_LD
  if test -n "$LD"; then
 -  echo "$as_me:4030: result: $LD" >&5
-+  echo "$as_me:4173: result: $LD" >&5
++  echo "$as_me:4018: result: $LD" >&5
  echo "${ECHO_T}$LD" >&6
  else
 -  echo "$as_me:4033: result: no" >&5
-+  echo "$as_me:4176: result: no" >&5
++  echo "$as_me:4021: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -4039,7 +4182,7 @@
+@@ -4039,7 +4027,7 @@
    ac_ct_LD=$LD
    # Extract the first word of "ld", so it can be a program name with args.
  set dummy ld; ac_word=$2
 -echo "$as_me:4042: checking for $ac_word" >&5
-+echo "$as_me:4185: checking for $ac_word" >&5
++echo "$as_me:4030: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4054,7 +4197,7 @@
+@@ -4054,7 +4042,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_ac_ct_LD="ld"
 -echo "$as_me:4057: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4200: found $ac_dir/$ac_word" >&5
++echo "$as_me:4045: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -4063,10 +4206,10 @@
+@@ -4063,10 +4051,10 @@
  fi
  ac_ct_LD=$ac_cv_prog_ac_ct_LD
  if test -n "$ac_ct_LD"; then
 -  echo "$as_me:4066: result: $ac_ct_LD" >&5
-+  echo "$as_me:4209: result: $ac_ct_LD" >&5
++  echo "$as_me:4054: result: $ac_ct_LD" >&5
  echo "${ECHO_T}$ac_ct_LD" >&6
  else
 -  echo "$as_me:4069: result: no" >&5
-+  echo "$as_me:4212: result: no" >&5
++  echo "$as_me:4057: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -4078,7 +4221,7 @@
+@@ -4078,7 +4066,7 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ar; ac_word=$2
 -echo "$as_me:4081: checking for $ac_word" >&5
-+echo "$as_me:4224: checking for $ac_word" >&5
++echo "$as_me:4069: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4093,7 +4236,7 @@
+@@ -4093,7 +4081,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_AR="${ac_tool_prefix}ar"
 -echo "$as_me:4096: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4239: found $ac_dir/$ac_word" >&5
++echo "$as_me:4084: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -4101,10 +4244,10 @@
+@@ -4101,10 +4089,10 @@
  fi
  AR=$ac_cv_prog_AR
  if test -n "$AR"; then
 -  echo "$as_me:4104: result: $AR" >&5
-+  echo "$as_me:4247: result: $AR" >&5
++  echo "$as_me:4092: result: $AR" >&5
  echo "${ECHO_T}$AR" >&6
  else
 -  echo "$as_me:4107: result: no" >&5
-+  echo "$as_me:4250: result: no" >&5
++  echo "$as_me:4095: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -4113,7 +4256,7 @@
+@@ -4113,7 +4101,7 @@
    ac_ct_AR=$AR
    # Extract the first word of "ar", so it can be a program name with args.
  set dummy ar; ac_word=$2
 -echo "$as_me:4116: checking for $ac_word" >&5
-+echo "$as_me:4259: checking for $ac_word" >&5
++echo "$as_me:4104: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4128,7 +4271,7 @@
+@@ -4128,7 +4116,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_ac_ct_AR="ar"
 -echo "$as_me:4131: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4274: found $ac_dir/$ac_word" >&5
++echo "$as_me:4119: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -4137,10 +4280,10 @@
+@@ -4137,10 +4125,10 @@
  fi
  ac_ct_AR=$ac_cv_prog_ac_ct_AR
  if test -n "$ac_ct_AR"; then
 -  echo "$as_me:4140: result: $ac_ct_AR" >&5
-+  echo "$as_me:4283: result: $ac_ct_AR" >&5
++  echo "$as_me:4128: result: $ac_ct_AR" >&5
  echo "${ECHO_T}$ac_ct_AR" >&6
  else
 -  echo "$as_me:4143: result: no" >&5
-+  echo "$as_me:4286: result: no" >&5
++  echo "$as_me:4131: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -4152,7 +4295,7 @@
+@@ -4152,7 +4140,7 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ar; ac_word=$2
 -echo "$as_me:4155: checking for $ac_word" >&5
-+echo "$as_me:4298: checking for $ac_word" >&5
++echo "$as_me:4143: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4167,7 +4310,7 @@
+@@ -4167,7 +4155,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_AR="${ac_tool_prefix}ar"
 -echo "$as_me:4170: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4313: found $ac_dir/$ac_word" >&5
++echo "$as_me:4158: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -4175,10 +4318,10 @@
+@@ -4175,10 +4163,10 @@
  fi
  AR=$ac_cv_prog_AR
  if test -n "$AR"; then
 -  echo "$as_me:4178: result: $AR" >&5
-+  echo "$as_me:4321: result: $AR" >&5
++  echo "$as_me:4166: result: $AR" >&5
  echo "${ECHO_T}$AR" >&6
  else
 -  echo "$as_me:4181: result: no" >&5
-+  echo "$as_me:4324: result: no" >&5
++  echo "$as_me:4169: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -4187,7 +4330,7 @@
+@@ -4187,7 +4175,7 @@
    ac_ct_AR=$AR
    # Extract the first word of "ar", so it can be a program name with args.
  set dummy ar; ac_word=$2
 -echo "$as_me:4190: checking for $ac_word" >&5
-+echo "$as_me:4333: checking for $ac_word" >&5
++echo "$as_me:4178: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4202,7 +4345,7 @@
+@@ -4202,7 +4190,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_ac_ct_AR="ar"
 -echo "$as_me:4205: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4348: found $ac_dir/$ac_word" >&5
++echo "$as_me:4193: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -4211,10 +4354,10 @@
+@@ -4211,10 +4199,10 @@
  fi
  ac_ct_AR=$ac_cv_prog_ac_ct_AR
  if test -n "$ac_ct_AR"; then
 -  echo "$as_me:4214: result: $ac_ct_AR" >&5
-+  echo "$as_me:4357: result: $ac_ct_AR" >&5
++  echo "$as_me:4202: result: $ac_ct_AR" >&5
  echo "${ECHO_T}$ac_ct_AR" >&6
  else
 -  echo "$as_me:4217: result: no" >&5
-+  echo "$as_me:4360: result: no" >&5
++  echo "$as_me:4205: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -4223,7 +4366,7 @@
+@@ -4223,7 +4211,7 @@
    AR="$ac_cv_prog_AR"
  fi
  
 -echo "$as_me:4226: checking for options to update archives" >&5
-+echo "$as_me:4369: checking for options to update archives" >&5
++echo "$as_me:4214: checking for options to update archives" >&5
  echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
  if test "${cf_cv_ar_flags+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4246,13 +4389,13 @@
+@@ -4246,13 +4234,13 @@
                 rm -f conftest.a
  
                 cat >conftest.$ac_ext <<EOF
 -#line 4249 "configure"
-+#line 4392 "configure"
++#line 4237 "configure"
  int    testdata[3] = { 123, 456, 789 };
  EOF
 -               if { (eval echo "$as_me:4252: \"$ac_compile\"") >&5
-+               if { (eval echo "$as_me:4395: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:4240: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:4255: \$? = $ac_status" >&5
-+  echo "$as_me:4398: \$? = $ac_status" >&5
++  echo "$as_me:4243: \$? = $ac_status" >&5
    (exit $ac_status); } ; then
                         echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5
                         $AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null
-@@ -4263,7 +4406,7 @@
+@@ -4263,7 +4251,7 @@
                 else
                         test -n "$verbose" && echo "    cannot compile test-program" 1>&6
  
 -echo "${as_me:-configure}:4266: testing cannot compile test-program ..." 1>&5
-+echo "${as_me:-configure}:4409: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:4254: testing cannot compile test-program ..." 1>&5
  
                         break
                 fi
-@@ -4271,7 +4414,7 @@
+@@ -4271,7 +4259,7 @@
         rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
  
  fi
 -echo "$as_me:4274: result: $cf_cv_ar_flags" >&5
-+echo "$as_me:4417: result: $cf_cv_ar_flags" >&5
++echo "$as_me:4262: result: $cf_cv_ar_flags" >&5
  echo "${ECHO_T}$cf_cv_ar_flags" >&6
  
  if test -n "$ARFLAGS" ; then
-@@ -4282,7 +4425,7 @@
+@@ -4282,7 +4270,7 @@
         ARFLAGS=$cf_cv_ar_flags
  fi
  
 -echo "$as_me:4285: checking if you have specified an install-prefix" >&5
-+echo "$as_me:4428: checking if you have specified an install-prefix" >&5
++echo "$as_me:4273: checking if you have specified an install-prefix" >&5
  echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
  
  # Check whether --with-install-prefix or --without-install-prefix was given.
-@@ -4295,7 +4438,7 @@
+@@ -4295,7 +4283,7 @@
                 ;;
         esac
  fi;
 -echo "$as_me:4298: result: $DESTDIR" >&5
-+echo "$as_me:4441: result: $DESTDIR" >&5
++echo "$as_me:4286: result: $DESTDIR" >&5
  echo "${ECHO_T}$DESTDIR" >&6
  
  ###############################################################################
-@@ -4323,7 +4466,7 @@
+@@ -4323,7 +4311,7 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
 -echo "$as_me:4326: checking for $ac_word" >&5
-+echo "$as_me:4469: checking for $ac_word" >&5
++echo "$as_me:4314: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_BUILD_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4338,7 +4481,7 @@
+@@ -4338,7 +4326,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_BUILD_CC="$ac_prog"
 -echo "$as_me:4341: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4484: found $ac_dir/$ac_word" >&5
++echo "$as_me:4329: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -4346,10 +4489,10 @@
+@@ -4346,10 +4334,10 @@
  fi
  BUILD_CC=$ac_cv_prog_BUILD_CC
  if test -n "$BUILD_CC"; then
 -  echo "$as_me:4349: result: $BUILD_CC" >&5
-+  echo "$as_me:4492: result: $BUILD_CC" >&5
++  echo "$as_me:4337: result: $BUILD_CC" >&5
  echo "${ECHO_T}$BUILD_CC" >&6
  else
 -  echo "$as_me:4352: result: no" >&5
-+  echo "$as_me:4495: result: no" >&5
++  echo "$as_me:4340: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -4357,12 +4500,12 @@
+@@ -4357,12 +4345,12 @@
  done
  
  fi;
 -       echo "$as_me:4360: checking for native build C compiler" >&5
-+       echo "$as_me:4503: checking for native build C compiler" >&5
++       echo "$as_me:4348: checking for native build C compiler" >&5
  echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
 -       echo "$as_me:4362: result: $BUILD_CC" >&5
-+       echo "$as_me:4505: result: $BUILD_CC" >&5
++       echo "$as_me:4350: result: $BUILD_CC" >&5
  echo "${ECHO_T}$BUILD_CC" >&6
  
 -       echo "$as_me:4365: checking for native build C preprocessor" >&5
-+       echo "$as_me:4508: checking for native build C preprocessor" >&5
++       echo "$as_me:4353: checking for native build C preprocessor" >&5
  echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
  
  # Check whether --with-build-cpp or --without-build-cpp was given.
-@@ -4372,10 +4515,10 @@
+@@ -4372,10 +4360,10 @@
  else
    BUILD_CPP='${BUILD_CC} -E'
  fi;
 -       echo "$as_me:4375: result: $BUILD_CPP" >&5
-+       echo "$as_me:4518: result: $BUILD_CPP" >&5
++       echo "$as_me:4363: result: $BUILD_CPP" >&5
  echo "${ECHO_T}$BUILD_CPP" >&6
  
 -       echo "$as_me:4378: checking for native build C flags" >&5
-+       echo "$as_me:4521: checking for native build C flags" >&5
++       echo "$as_me:4366: checking for native build C flags" >&5
  echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
  
  # Check whether --with-build-cflags or --without-build-cflags was given.
-@@ -4383,10 +4526,10 @@
+@@ -4383,10 +4371,10 @@
    withval="$with_build_cflags"
    BUILD_CFLAGS="$withval"
  fi;
 -       echo "$as_me:4386: result: $BUILD_CFLAGS" >&5
-+       echo "$as_me:4529: result: $BUILD_CFLAGS" >&5
++       echo "$as_me:4374: result: $BUILD_CFLAGS" >&5
  echo "${ECHO_T}$BUILD_CFLAGS" >&6
  
 -       echo "$as_me:4389: checking for native build C preprocessor-flags" >&5
-+       echo "$as_me:4532: checking for native build C preprocessor-flags" >&5
++       echo "$as_me:4377: checking for native build C preprocessor-flags" >&5
  echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
  
  # Check whether --with-build-cppflags or --without-build-cppflags was given.
-@@ -4394,10 +4537,10 @@
+@@ -4394,10 +4382,10 @@
    withval="$with_build_cppflags"
    BUILD_CPPFLAGS="$withval"
  fi;
 -       echo "$as_me:4397: result: $BUILD_CPPFLAGS" >&5
-+       echo "$as_me:4540: result: $BUILD_CPPFLAGS" >&5
++       echo "$as_me:4385: result: $BUILD_CPPFLAGS" >&5
  echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
  
 -       echo "$as_me:4400: checking for native build linker-flags" >&5
-+       echo "$as_me:4543: checking for native build linker-flags" >&5
++       echo "$as_me:4388: checking for native build linker-flags" >&5
  echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
  
  # Check whether --with-build-ldflags or --without-build-ldflags was given.
-@@ -4405,10 +4548,10 @@
+@@ -4405,10 +4393,10 @@
    withval="$with_build_ldflags"
    BUILD_LDFLAGS="$withval"
  fi;
 -       echo "$as_me:4408: result: $BUILD_LDFLAGS" >&5
-+       echo "$as_me:4551: result: $BUILD_LDFLAGS" >&5
++       echo "$as_me:4396: result: $BUILD_LDFLAGS" >&5
  echo "${ECHO_T}$BUILD_LDFLAGS" >&6
  
 -       echo "$as_me:4411: checking for native build linker-libraries" >&5
-+       echo "$as_me:4554: checking for native build linker-libraries" >&5
++       echo "$as_me:4399: checking for native build linker-libraries" >&5
  echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
  
  # Check whether --with-build-libs or --without-build-libs was given.
-@@ -4416,7 +4559,7 @@
+@@ -4416,7 +4404,7 @@
    withval="$with_build_libs"
    BUILD_LIBS="$withval"
  fi;
 -       echo "$as_me:4419: result: $BUILD_LIBS" >&5
-+       echo "$as_me:4562: result: $BUILD_LIBS" >&5
++       echo "$as_me:4407: result: $BUILD_LIBS" >&5
  echo "${ECHO_T}$BUILD_LIBS" >&6
  
         # this assumes we're on Unix.
-@@ -4426,7 +4569,7 @@
+@@ -4426,7 +4414,7 @@
         : ${BUILD_CC:='${CC}'}
  
         if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
 -               { { echo "$as_me:4429: error: Cross-build requires two compilers.
-+               { { echo "$as_me:4572: error: Cross-build requires two compilers.
++               { { echo "$as_me:4417: error: Cross-build requires two compilers.
  Use --with-build-cc to specify the native compiler." >&5
  echo "$as_me: error: Cross-build requires two compilers.
  Use --with-build-cc to specify the native compiler." >&2;}
-@@ -4451,7 +4594,7 @@
+@@ -4451,7 +4439,7 @@
  ### shared, for example.
  cf_list_models=""
  
 -echo "$as_me:4454: checking if libtool -version-number should be used" >&5
-+echo "$as_me:4597: checking if libtool -version-number should be used" >&5
++echo "$as_me:4442: checking if libtool -version-number should be used" >&5
  echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6
  
  # Check whether --enable-libtool-version or --disable-libtool-version was given.
-@@ -4468,7 +4611,7 @@
+@@ -4468,7 +4456,7 @@
    cf_libtool_version=yes
  
  fi;
 -echo "$as_me:4471: result: $cf_libtool_version" >&5
-+echo "$as_me:4614: result: $cf_libtool_version" >&5
++echo "$as_me:4459: result: $cf_libtool_version" >&5
  echo "${ECHO_T}$cf_libtool_version" >&6
  
  if test "$cf_libtool_version" = yes ; then
-@@ -4493,7 +4636,7 @@
+@@ -4493,7 +4481,7 @@
  LIB_INSTALL=
  LIB_UNINSTALL=
  
 -echo "$as_me:4496: checking if you want to build libraries with libtool" >&5
-+echo "$as_me:4639: checking if you want to build libraries with libtool" >&5
++echo "$as_me:4484: checking if you want to build libraries with libtool" >&5
  echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6
  
  # Check whether --with-libtool or --without-libtool was given.
-@@ -4503,7 +4646,7 @@
+@@ -4503,7 +4491,7 @@
  else
    with_libtool=no
  fi;
 -echo "$as_me:4506: result: $with_libtool" >&5
-+echo "$as_me:4649: result: $with_libtool" >&5
++echo "$as_me:4494: result: $with_libtool" >&5
  echo "${ECHO_T}$with_libtool" >&6
  if test "$with_libtool" != "no"; then
  
-@@ -4534,7 +4677,7 @@
+@@ -4522,7 +4510,7 @@
+   ;;
+ .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+   ;;
+-.\${*prefix}*) #(vi
++.\${*prefix}*|.\${*dir}*) #(vi
+   eval with_libtool="$with_libtool"
+   case ".$with_libtool" in #(vi
+   .NONE/*)
+@@ -4534,7 +4522,7 @@
    with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
    ;;
  *)
 -  { { echo "$as_me:4537: error: expected a pathname, not \"$with_libtool\"" >&5
-+  { { echo "$as_me:4680: error: expected a pathname, not \"$with_libtool\"" >&5
++  { { echo "$as_me:4525: error: expected a pathname, not \"$with_libtool\"" >&5
  echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
     { (exit 1); exit 1; }; }
    ;;
-@@ -4544,7 +4687,7 @@
+@@ -4544,7 +4532,7 @@
         else
                 # Extract the first word of "libtool", so it can be a program name with args.
  set dummy libtool; ac_word=$2
 -echo "$as_me:4547: checking for $ac_word" >&5
-+echo "$as_me:4690: checking for $ac_word" >&5
++echo "$as_me:4535: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_path_LIBTOOL+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4561,7 +4704,7 @@
+@@ -4561,7 +4549,7 @@
    test -z "$ac_dir" && ac_dir=.
    if $as_executable_p "$ac_dir/$ac_word"; then
     ac_cv_path_LIBTOOL="$ac_dir/$ac_word"
 -   echo "$as_me:4564: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:4707: found $ac_dir/$ac_word" >&5
++   echo "$as_me:4552: found $ac_dir/$ac_word" >&5
     break
  fi
  done
-@@ -4572,20 +4715,20 @@
+@@ -4572,20 +4560,20 @@
  LIBTOOL=$ac_cv_path_LIBTOOL
  
  if test -n "$LIBTOOL"; then
 -  echo "$as_me:4575: result: $LIBTOOL" >&5
-+  echo "$as_me:4718: result: $LIBTOOL" >&5
++  echo "$as_me:4563: result: $LIBTOOL" >&5
  echo "${ECHO_T}$LIBTOOL" >&6
  else
 -  echo "$as_me:4578: result: no" >&5
-+  echo "$as_me:4721: result: no" >&5
++  echo "$as_me:4566: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
@@ -14872 +17396 @@
         if test -z "$LIBTOOL" ; then
 -               { { echo "$as_me:4584: error: Cannot find libtool" >&5
-+               { { echo "$as_me:4727: error: Cannot find libtool" >&5
++               { { echo "$as_me:4572: error: Cannot find libtool" >&5
  echo "$as_me: error: Cannot find libtool" >&2;}
     { (exit 1); exit 1; }; }
@@ -14881 +17405 @@
         LIB_SUFFIX=.la
         LIB_CLEAN='${LIBTOOL} --mode=clean'
-@@ -4596,17 +4739,17 @@
+@@ -4596,17 +4584,17 @@
         LIB_PREP=:
  
         # Show the version of libtool
 -       echo "$as_me:4599: checking version of libtool" >&5
-+       echo "$as_me:4742: checking version of libtool" >&5
++       echo "$as_me:4587: checking version of libtool" >&5
  echo $ECHO_N "checking version of libtool... $ECHO_C" >&6
  
@@ -14894 +17418 @@
         cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'`
 -       echo "$as_me:4606: result: $cf_cv_libtool_version" >&5
-+       echo "$as_me:4749: result: $cf_cv_libtool_version" >&5
++       echo "$as_me:4594: result: $cf_cv_libtool_version" >&5
  echo "${ECHO_T}$cf_cv_libtool_version" >&6
         if test -z "$cf_cv_libtool_version" ; then
 -               { { echo "$as_me:4609: error: This is not GNU libtool" >&5
-+               { { echo "$as_me:4752: error: This is not GNU libtool" >&5
++               { { echo "$as_me:4597: error: This is not GNU libtool" >&5
  echo "$as_me: error: This is not GNU libtool" >&2;}
     { (exit 1); exit 1; }; }
         fi
-@@ -4614,7 +4757,7 @@
+@@ -4614,7 +4602,7 @@
         # special hack to add -no-undefined (which libtool should do for itself)
         LT_UNDEF=
@@ -14911 +17435 @@
                 ;;
         esac
-@@ -4642,7 +4785,7 @@
+@@ -4642,7 +4630,7 @@
  
  else
  
 -echo "$as_me:4645: checking if you want to build shared libraries" >&5
-+echo "$as_me:4788: checking if you want to build shared libraries" >&5
++echo "$as_me:4633: checking if you want to build shared libraries" >&5
  echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6
  
  # Check whether --with-shared or --without-shared was given.
-@@ -4652,11 +4795,11 @@
+@@ -4652,11 +4640,11 @@
  else
    with_shared=no
  fi;
 -echo "$as_me:4655: result: $with_shared" >&5
-+echo "$as_me:4798: result: $with_shared" >&5
++echo "$as_me:4643: result: $with_shared" >&5
  echo "${ECHO_T}$with_shared" >&6
  test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
  
 -echo "$as_me:4659: checking if you want to build static libraries" >&5
-+echo "$as_me:4802: checking if you want to build static libraries" >&5
++echo "$as_me:4647: checking if you want to build static libraries" >&5
  echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6
  
  # Check whether --with-normal or --without-normal was given.
-@@ -4666,11 +4809,11 @@
+@@ -4666,11 +4654,11 @@
  else
    with_normal=yes
  fi;
 -echo "$as_me:4669: result: $with_normal" >&5
-+echo "$as_me:4812: result: $with_normal" >&5
++echo "$as_me:4657: result: $with_normal" >&5
  echo "${ECHO_T}$with_normal" >&6
  test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal"
  
 -echo "$as_me:4673: checking if you want to build debug libraries" >&5
-+echo "$as_me:4816: checking if you want to build debug libraries" >&5
++echo "$as_me:4661: checking if you want to build debug libraries" >&5
  echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6
  
  # Check whether --with-debug or --without-debug was given.
-@@ -4680,11 +4823,11 @@
+@@ -4680,11 +4668,11 @@
  else
    with_debug=yes
  fi;
 -echo "$as_me:4683: result: $with_debug" >&5
-+echo "$as_me:4826: result: $with_debug" >&5
++echo "$as_me:4671: result: $with_debug" >&5
  echo "${ECHO_T}$with_debug" >&6
  test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug"
  
 -echo "$as_me:4687: checking if you want to build profiling libraries" >&5
-+echo "$as_me:4830: checking if you want to build profiling libraries" >&5
++echo "$as_me:4675: checking if you want to build profiling libraries" >&5
  echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6
  
  # Check whether --with-profile or --without-profile was given.
-@@ -4694,7 +4837,7 @@
+@@ -4694,7 +4682,7 @@
  else
    with_profile=no
  fi;
 -echo "$as_me:4697: result: $with_profile" >&5
-+echo "$as_me:4840: result: $with_profile" >&5
++echo "$as_me:4685: result: $with_profile" >&5
  echo "${ECHO_T}$with_profile" >&6
  test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile"
  
-@@ -4702,19 +4845,19 @@
+@@ -4702,19 +4690,19 @@
  
  ###############################################################################
  
 -echo "$as_me:4705: checking for specified models" >&5
-+echo "$as_me:4848: checking for specified models" >&5
++echo "$as_me:4693: checking for specified models" >&5
  echo $ECHO_N "checking for specified models... $ECHO_C" >&6
  test -z "$cf_list_models" && cf_list_models=normal
  test "$with_libtool" != "no" && cf_list_models=libtool
 -echo "$as_me:4709: result: $cf_list_models" >&5
-+echo "$as_me:4852: result: $cf_list_models" >&5
++echo "$as_me:4697: result: $cf_list_models" >&5
  echo "${ECHO_T}$cf_list_models" >&6
  
@@ -14987 +17511 @@
  ### up test-applications.
 -echo "$as_me:4714: checking for default model" >&5
-+echo "$as_me:4857: checking for default model" >&5
++echo "$as_me:4702: 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:4717: result: $DFT_LWR_MODEL" >&5
-+echo "$as_me:4860: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:4705: result: $DFT_LWR_MODEL" >&5
  echo "${ECHO_T}$DFT_LWR_MODEL" >&6
  
  DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-@@ -4728,6 +4871,22 @@
+@@ -4728,6 +4716,22 @@
  LIB_DIR=../lib
  LIB_2ND=../../lib
  
-+echo "$as_me:4874: checking if you want to have a library-prefix" >&5
++echo "$as_me:4719: checking if you want to have a library-prefix" >&5
 +echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6
 +
@@ -15009 +17533 @@
 +  with_lib_prefix=auto
 +fi;
-+echo "$as_me:4884: result: $with_lib_prefix" >&5
++echo "$as_me:4729: result: $with_lib_prefix" >&5
 +echo "${ECHO_T}$with_lib_prefix" >&6
 +
@@ -15018 +17542 @@
         OS/2*|os2*) #(vi
          LIB_PREFIX=''
-@@ -4737,13 +4896,18 @@
+@@ -4737,13 +4741,18 @@
         esac
  cf_prefix=$LIB_PREFIX
@@ -15035 +17559 @@
  
 -echo "$as_me:4746: checking if you want to build a separate terminfo library" >&5
-+echo "$as_me:4910: checking if you want to build a separate terminfo library" >&5
++echo "$as_me:4755: checking if you want to build a separate terminfo library" >&5
  echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6
  
  # Check whether --with-termlib or --without-termlib was given.
-@@ -4753,10 +4917,10 @@
+@@ -4753,10 +4762,10 @@
  else
    with_termlib=no
  fi;
 -echo "$as_me:4756: result: $with_termlib" >&5
-+echo "$as_me:4920: result: $with_termlib" >&5
++echo "$as_me:4765: result: $with_termlib" >&5
  echo "${ECHO_T}$with_termlib" >&6
  
 -echo "$as_me:4759: checking if you want to build a separate tic library" >&5
-+echo "$as_me:4923: checking if you want to build a separate tic library" >&5
++echo "$as_me:4768: checking if you want to build a separate tic library" >&5
  echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6
  
  # Check whether --with-ticlib or --without-ticlib was given.
-@@ -4766,13 +4930,13 @@
+@@ -4766,13 +4775,13 @@
  else
    with_ticlib=no
  fi;
 -echo "$as_me:4769: result: $with_ticlib" >&5
-+echo "$as_me:4933: result: $with_ticlib" >&5
++echo "$as_me:4778: result: $with_ticlib" >&5
  echo "${ECHO_T}$with_ticlib" >&6
  
@@ -15064 +17588 @@
  
 -echo "$as_me:4775: checking if you want to link with the GPM mouse library" >&5
-+echo "$as_me:4939: checking if you want to link with the GPM mouse library" >&5
++echo "$as_me:4784: checking if you want to link with the GPM mouse library" >&5
  echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6
  
  # Check whether --with-gpm or --without-gpm was given.
-@@ -4782,27 +4946,27 @@
+@@ -4782,27 +4791,27 @@
  else
    with_gpm=maybe
  fi;
 -echo "$as_me:4785: result: $with_gpm" >&5
-+echo "$as_me:4949: result: $with_gpm" >&5
++echo "$as_me:4794: result: $with_gpm" >&5
  echo "${ECHO_T}$with_gpm" >&6
  
  if test "$with_gpm" != no ; then
 -       echo "$as_me:4789: checking for gpm.h" >&5
-+       echo "$as_me:4953: checking for gpm.h" >&5
++       echo "$as_me:4798: checking for gpm.h" >&5
  echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6
  if test "${ac_cv_header_gpm_h+set}" = set; then
@@ -15085 +17609 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 4795 "configure"
-+#line 4959 "configure"
++#line 4804 "configure"
  #include "confdefs.h"
  #include <gpm.h>
  _ACEOF
 -if { (eval echo "$as_me:4799: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:4963: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:4808: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -15097 +17621 @@
    cat conftest.err >&5
 -  echo "$as_me:4805: \$? = $ac_status" >&5
-+  echo "$as_me:4969: \$? = $ac_status" >&5
++  echo "$as_me:4814: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -4821,7 +4985,7 @@
+@@ -4821,7 +4830,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:4824: result: $ac_cv_header_gpm_h" >&5
-+echo "$as_me:4988: result: $ac_cv_header_gpm_h" >&5
++echo "$as_me:4833: result: $ac_cv_header_gpm_h" >&5
  echo "${ECHO_T}$ac_cv_header_gpm_h" >&6
  if test $ac_cv_header_gpm_h = yes; then
  
-@@ -4832,14 +4996,14 @@
+@@ -4832,14 +4841,14 @@
                 if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then
                         test -n "$verbose" && echo "    assuming we really have GPM library" 1>&6
  
 -echo "${as_me:-configure}:4835: testing assuming we really have GPM library ..." 1>&5
-+echo "${as_me:-configure}:4999: testing assuming we really have GPM library ..." 1>&5
++echo "${as_me:-configure}:4844: testing assuming we really have GPM library ..." 1>&5
  
                         cat >>confdefs.h <<\EOF
@@ -15123 +17647 @@
                 else
 -                       echo "$as_me:4842: checking for Gpm_Open in -lgpm" >&5
-+                       echo "$as_me:5006: checking for Gpm_Open in -lgpm" >&5
++                       echo "$as_me:4851: checking for Gpm_Open in -lgpm" >&5
  echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
  if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4847,7 +5011,7 @@
+@@ -4847,7 +4856,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgpm  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 4850 "configure"
-+#line 5014 "configure"
++#line 4859 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4866,16 +5030,16 @@
+@@ -4866,16 +4875,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:4869: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5033: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4878: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:4872: \$? = $ac_status" >&5
-+  echo "$as_me:5036: \$? = $ac_status" >&5
++  echo "$as_me:4881: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:4875: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5039: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4884: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4878: \$? = $ac_status" >&5
-+  echo "$as_me:5042: \$? = $ac_status" >&5
++  echo "$as_me:4887: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_gpm_Gpm_Open=yes
  else
-@@ -4886,13 +5050,13 @@
+@@ -4886,13 +4895,13 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:4889: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:5053: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:4898: 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
@@ -15169 +17693 @@
  
 -                               { { echo "$as_me:4895: error: Cannot link with GPM library" >&5
-+                               { { echo "$as_me:5059: error: Cannot link with GPM library" >&5
++                               { { echo "$as_me:4904: error: Cannot link with GPM library" >&5
  echo "$as_me: error: Cannot link with GPM library" >&2;}
     { (exit 1); exit 1; }; }
                 fi
-@@ -4902,7 +5066,7 @@
+@@ -4902,7 +4911,7 @@
  
  else
  
 -               test "$with_gpm" != maybe && { echo "$as_me:4905: WARNING: Cannot find GPM header" >&5
-+               test "$with_gpm" != maybe && { echo "$as_me:5069: WARNING: Cannot find GPM header" >&5
++               test "$with_gpm" != maybe && { echo "$as_me:4914: WARNING: Cannot find GPM header" >&5
  echo "$as_me: WARNING: Cannot find GPM header" >&2;}
                 with_gpm=no
  
-@@ -4911,7 +5075,7 @@
+@@ -4911,7 +4920,7 @@
  fi
  
  if test "$with_gpm" != no ; then
 -       echo "$as_me:4914: checking if you want to load GPM dynamically" >&5
-+       echo "$as_me:5078: checking if you want to load GPM dynamically" >&5
++       echo "$as_me:4923: checking if you want to load GPM dynamically" >&5
  echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6
  
  # Check whether --with-dlsym or --without-dlsym was given.
-@@ -4921,18 +5085,18 @@
+@@ -4921,18 +4930,18 @@
  else
    with_dlsym=yes
  fi;
 -       echo "$as_me:4924: result: $with_dlsym" >&5
-+       echo "$as_me:5088: result: $with_dlsym" >&5
++       echo "$as_me:4933: result: $with_dlsym" >&5
  echo "${ECHO_T}$with_dlsym" >&6
         if test "$with_dlsym" = yes ; then
@@ -15202 +17726 @@
  cf_have_dlsym=no
 -echo "$as_me:4929: checking for dlsym" >&5
-+echo "$as_me:5093: checking for dlsym" >&5
++echo "$as_me:4938: checking for dlsym" >&5
  echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
  if test "${ac_cv_func_dlsym+set}" = set; then
@@ -15209 +17733 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 4935 "configure"
-+#line 5099 "configure"
++#line 4944 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char dlsym (); below.  */
-@@ -4963,16 +5127,16 @@
+@@ -4955,7 +4964,7 @@
+ #if defined (__stub_dlsym) || defined (__stub___dlsym)
+ choke me
+ #else
+-f = dlsym;
++f = dlsym; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -4963,16 +4972,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:4966: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5130: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4975: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:4969: \$? = $ac_status" >&5
-+  echo "$as_me:5133: \$? = $ac_status" >&5
++  echo "$as_me:4978: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:4972: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5136: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4981: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4975: \$? = $ac_status" >&5
-+  echo "$as_me:5139: \$? = $ac_status" >&5
++  echo "$as_me:4984: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_dlsym=yes
  else
-@@ -4982,14 +5146,14 @@
+@@ -4982,14 +4991,14 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:4985: result: $ac_cv_func_dlsym" >&5
-+echo "$as_me:5149: result: $ac_cv_func_dlsym" >&5
++echo "$as_me:4994: result: $ac_cv_func_dlsym" >&5
  echo "${ECHO_T}$ac_cv_func_dlsym" >&6
  if test $ac_cv_func_dlsym = yes; then
@@ -15247 +17780 @@
  cf_have_libdl=no
 -echo "$as_me:4992: checking for dlsym in -ldl" >&5
-+echo "$as_me:5156: checking for dlsym in -ldl" >&5
++echo "$as_me:5001: checking for dlsym in -ldl" >&5
  echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
  if test "${ac_cv_lib_dl_dlsym+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4997,7 +5161,7 @@
+@@ -4997,7 +5006,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldl  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 5000 "configure"
-+#line 5164 "configure"
++#line 5009 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5016,16 +5180,16 @@
+@@ -5016,16 +5025,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5019: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5183: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5028: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5022: \$? = $ac_status" >&5
-+  echo "$as_me:5186: \$? = $ac_status" >&5
++  echo "$as_me:5031: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5025: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5189: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5034: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5028: \$? = $ac_status" >&5
-+  echo "$as_me:5192: \$? = $ac_status" >&5
++  echo "$as_me:5037: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_dl_dlsym=yes
  else
-@@ -5036,7 +5200,7 @@
+@@ -5036,7 +5045,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:5039: result: $ac_cv_lib_dl_dlsym" >&5
-+echo "$as_me:5203: result: $ac_cv_lib_dl_dlsym" >&5
++echo "$as_me:5048: result: $ac_cv_lib_dl_dlsym" >&5
  echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
  if test $ac_cv_lib_dl_dlsym = yes; then
  
-@@ -5049,10 +5213,10 @@
+@@ -5049,10 +5058,10 @@
  if test "$cf_have_dlsym" = yes ; then
         test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS"
  
 -       echo "$as_me:5052: checking whether able to link to dl*() functions" >&5
-+       echo "$as_me:5216: checking whether able to link to dl*() functions" >&5
++       echo "$as_me:5061: checking whether able to link to dl*() functions" >&5
  echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
         cat >conftest.$ac_ext <<_ACEOF
 -#line 5055 "configure"
-+#line 5219 "configure"
++#line 5064 "configure"
  #include "confdefs.h"
  #include <dlfcn.h>
  int
-@@ -5070,16 +5234,16 @@
+@@ -5070,16 +5079,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5073: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5237: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5082: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5076: \$? = $ac_status" >&5
-+  echo "$as_me:5240: \$? = $ac_status" >&5
++  echo "$as_me:5085: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5079: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5243: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5088: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5082: \$? = $ac_status" >&5
-+  echo "$as_me:5246: \$? = $ac_status" >&5
++  echo "$as_me:5091: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
                 cat >>confdefs.h <<\EOF
-@@ -5090,15 +5254,15 @@
+@@ -5090,15 +5099,15 @@
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
  
 -               { { echo "$as_me:5093: error: Cannot link test program for libdl" >&5
-+               { { echo "$as_me:5257: error: Cannot link test program for libdl" >&5
++               { { echo "$as_me:5102: error: Cannot link test program for libdl" >&5
  echo "$as_me: error: Cannot link test program for libdl" >&2;}
     { (exit 1); exit 1; }; }
@@ -15335 +17868 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 -       echo "$as_me:5098: result: ok" >&5
-+       echo "$as_me:5262: result: ok" >&5
++       echo "$as_me:5107: result: ok" >&5
  echo "${ECHO_T}ok" >&6
  else
 -       { { echo "$as_me:5101: error: Cannot find dlsym function" >&5
-+       { { echo "$as_me:5265: error: Cannot find dlsym function" >&5
++       { { echo "$as_me:5110: error: Cannot find dlsym function" >&5
  echo "$as_me: error: Cannot find dlsym function" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -5106,12 +5270,12 @@
+@@ -5106,12 +5115,12 @@
                 if test "$with_gpm" != yes ; then
                         test -n "$verbose" && echo "    assuming soname for gpm is $with_gpm" 1>&6
  
 -echo "${as_me:-configure}:5109: testing assuming soname for gpm is $with_gpm ..." 1>&5
-+echo "${as_me:-configure}:5273: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me:-configure}:5118: testing assuming soname for gpm is $with_gpm ..." 1>&5
  
                         cf_cv_gpm_soname="$with_gpm"
@@ -15354 +17887 @@
  
 -echo "$as_me:5114: checking for soname of gpm library" >&5
-+echo "$as_me:5278: checking for soname of gpm library" >&5
++echo "$as_me:5123: checking for soname of gpm library" >&5
  echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6
  if test "${cf_cv_gpm_soname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5129,15 +5293,15 @@
+@@ -5129,15 +5138,15 @@
  CF_EOF
  cf_save_LIBS="$LIBS"
         LIBS="-lgpm $LIBS"
 -       if { (eval echo "$as_me:5132: \"$ac_compile\"") >&5
-+       if { (eval echo "$as_me:5296: \"$ac_compile\"") >&5
++       if { (eval echo "$as_me:5141: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:5135: \$? = $ac_status" >&5
-+  echo "$as_me:5299: \$? = $ac_status" >&5
++  echo "$as_me:5144: \$? = $ac_status" >&5
    (exit $ac_status); } ; then
 -               if { (eval echo "$as_me:5137: \"$ac_link\"") >&5
-+               if { (eval echo "$as_me:5301: \"$ac_link\"") >&5
++               if { (eval echo "$as_me:5146: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5140: \$? = $ac_status" >&5
-+  echo "$as_me:5304: \$? = $ac_status" >&5
++  echo "$as_me:5149: \$? = $ac_status" >&5
    (exit $ac_status); } ; then
                         cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
                         test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
-@@ -5148,7 +5312,7 @@
+@@ -5148,7 +5157,7 @@
  fi
  
  fi
 -echo "$as_me:5151: result: $cf_cv_gpm_soname" >&5
-+echo "$as_me:5315: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:5160: result: $cf_cv_gpm_soname" >&5
  echo "${ECHO_T}$cf_cv_gpm_soname" >&6
  
                 fi
-@@ -5165,7 +5329,7 @@
+@@ -5165,7 +5174,7 @@
  #define HAVE_LIBGPM 1
  EOF
  
 -echo "$as_me:5168: checking for Gpm_Wgetch in -lgpm" >&5
-+echo "$as_me:5332: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:5177: checking for Gpm_Wgetch in -lgpm" >&5
  echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6
  if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5173,7 +5337,7 @@
+@@ -5173,7 +5182,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgpm  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 5176 "configure"
-+#line 5340 "configure"
++#line 5185 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5192,16 +5356,16 @@
+@@ -5192,16 +5201,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5195: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5359: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5204: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5198: \$? = $ac_status" >&5
-+  echo "$as_me:5362: \$? = $ac_status" >&5
++  echo "$as_me:5207: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5201: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5365: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5210: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5204: \$? = $ac_status" >&5
-+  echo "$as_me:5368: \$? = $ac_status" >&5
++  echo "$as_me:5213: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_gpm_Gpm_Wgetch=yes
  else
-@@ -5212,11 +5376,11 @@
+@@ -5212,11 +5221,11 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:5215: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
-+echo "$as_me:5379: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:5224: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
  echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6
  if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then
  
 -echo "$as_me:5219: checking if GPM is weakly bound to curses library" >&5
-+echo "$as_me:5383: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:5228: checking if GPM is weakly bound to curses library" >&5
  echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6
  if test "${cf_cv_check_gpm_wgetch+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5240,15 +5404,15 @@
+@@ -5240,15 +5249,15 @@
         # to rely on the static library, noting that some packagers may not
         # include it.
         LIBS="-static -lgpm -dynamic $LIBS"
 -       if { (eval echo "$as_me:5243: \"$ac_compile\"") >&5
-+       if { (eval echo "$as_me:5407: \"$ac_compile\"") >&5
++       if { (eval echo "$as_me:5252: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:5246: \$? = $ac_status" >&5
-+  echo "$as_me:5410: \$? = $ac_status" >&5
++  echo "$as_me:5255: \$? = $ac_status" >&5
    (exit $ac_status); } ; then
 -               if { (eval echo "$as_me:5248: \"$ac_link\"") >&5
-+               if { (eval echo "$as_me:5412: \"$ac_link\"") >&5
++               if { (eval echo "$as_me:5257: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5251: \$? = $ac_status" >&5
-+  echo "$as_me:5415: \$? = $ac_status" >&5
++  echo "$as_me:5260: \$? = $ac_status" >&5
    (exit $ac_status); } ; then
                         cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'`
                         test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
-@@ -5260,11 +5424,11 @@
+@@ -5260,11 +5269,11 @@
  fi
  
  fi
 -echo "$as_me:5263: result: $cf_cv_check_gpm_wgetch" >&5
-+echo "$as_me:5427: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:5272: result: $cf_cv_check_gpm_wgetch" >&5
  echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6
  
  if test "$cf_cv_check_gpm_wgetch" != yes ; then
 -       { echo "$as_me:5267: WARNING: GPM library is already linked with curses - read the FAQ" >&5
-+       { echo "$as_me:5431: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++       { echo "$as_me:5276: WARNING: GPM library is already linked with curses - read the FAQ" >&5
  echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;}
  fi
  
-@@ -5274,7 +5438,7 @@
+@@ -5274,7 +5283,7 @@
  
  # not everyone has "test -c"
  if test -c /dev/sysmouse 2>/dev/null ; then
 -echo "$as_me:5277: checking if you want to use sysmouse" >&5
-+echo "$as_me:5441: checking if you want to use sysmouse" >&5
++echo "$as_me:5286: checking if you want to use sysmouse" >&5
  echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6
  
  # Check whether --with-sysmouse or --without-sysmouse was given.
-@@ -5286,7 +5450,7 @@
+@@ -5286,7 +5295,7 @@
  fi;
         if test "$cf_with_sysmouse" != no ; then
         cat >conftest.$ac_ext <<_ACEOF
 -#line 5289 "configure"
-+#line 5453 "configure"
++#line 5298 "configure"
  #include "confdefs.h"
  
  #include <osreldate.h>
-@@ -5309,16 +5473,16 @@
+@@ -5309,16 +5318,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:5312: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5476: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5321: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:5315: \$? = $ac_status" >&5
-+  echo "$as_me:5479: \$? = $ac_status" >&5
++  echo "$as_me:5324: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:5318: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5482: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5327: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5321: \$? = $ac_status" >&5
-+  echo "$as_me:5485: \$? = $ac_status" >&5
++  echo "$as_me:5330: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_with_sysmouse=yes
  else
-@@ -5328,7 +5492,7 @@
+@@ -5328,7 +5337,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
         fi
 -echo "$as_me:5331: result: $cf_with_sysmouse" >&5
-+echo "$as_me:5495: result: $cf_with_sysmouse" >&5
++echo "$as_me:5340: result: $cf_with_sysmouse" >&5
  echo "${ECHO_T}$cf_with_sysmouse" >&6
  test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF
  #define USE_SYSMOUSE 1
-@@ -5346,7 +5510,7 @@
+@@ -5346,7 +5355,7 @@
         test -n "$GXX" && test "${ac_cv_prog_cxx_g}" != yes && CXX_G_OPT=''
  fi
  
 -echo "$as_me:5349: checking for default loader flags" >&5
-+echo "$as_me:5513: checking for default loader flags" >&5
++echo "$as_me:5358: checking for default loader flags" >&5
  echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
  case $DFT_LWR_MODEL in
  libtool) LD_MODEL=''   ;;
-@@ -5355,13 +5519,13 @@
+@@ -5355,13 +5364,13 @@
  profile) LD_MODEL='-pg';;
  shared)  LD_MODEL=''   ;;
  esac
 -echo "$as_me:5358: result: $LD_MODEL" >&5
-+echo "$as_me:5522: result: $LD_MODEL" >&5
++echo "$as_me:5367: result: $LD_MODEL" >&5
  echo "${ECHO_T}$LD_MODEL" >&6
  
@@ -15543 +18076 @@
  
 -echo "$as_me:5364: checking if rpath option should be used" >&5
-+echo "$as_me:5528: checking if rpath option should be used" >&5
++echo "$as_me:5373: checking if rpath option should be used" >&5
  echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
  
  # Check whether --enable-rpath or --disable-rpath was given.
-@@ -5371,10 +5535,10 @@
+@@ -5371,10 +5380,10 @@
  else
    cf_cv_enable_rpath=no
  fi;
 -echo "$as_me:5374: result: $cf_cv_enable_rpath" >&5
-+echo "$as_me:5538: result: $cf_cv_enable_rpath" >&5
++echo "$as_me:5383: result: $cf_cv_enable_rpath" >&5
  echo "${ECHO_T}$cf_cv_enable_rpath" >&6
  
 -echo "$as_me:5377: checking if shared libraries should be relinked during install" >&5
-+echo "$as_me:5541: checking if shared libraries should be relinked during install" >&5
++echo "$as_me:5386: checking if shared libraries should be relinked during install" >&5
  echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6
  
  # Check whether --enable-relink or --disable-relink was given.
-@@ -5384,13 +5548,13 @@
+@@ -5384,13 +5393,13 @@
  else
    cf_cv_do_relink=yes
  fi;
 -echo "$as_me:5387: result: $cf_cv_do_relink" >&5
-+echo "$as_me:5551: result: $cf_cv_do_relink" >&5
++echo "$as_me:5396: result: $cf_cv_do_relink" >&5
  echo "${ECHO_T}$cf_cv_do_relink" >&6
         ;;
@@ -15572 +18105 @@
  LD_RPATH_OPT=
 -echo "$as_me:5393: checking for an rpath option" >&5
-+echo "$as_me:5557: checking for an rpath option" >&5
++echo "$as_me:5402: checking for an rpath option" >&5
  echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
  case $cf_cv_system_name in #(vi
  irix*) #(vi
-@@ -5403,10 +5567,10 @@
+@@ -5403,10 +5412,10 @@
  linux*|gnu*|k*bsd*-gnu) #(vi
         LD_RPATH_OPT="-Wl,-rpath,"
@@ -15589 +18122 @@
         ;;
  netbsd*) #(vi
-@@ -5421,17 +5585,17 @@
+@@ -5421,17 +5430,17 @@
  *)
         ;;
  esac
 -echo "$as_me:5424: result: $LD_RPATH_OPT" >&5
-+echo "$as_me:5588: result: $LD_RPATH_OPT" >&5
++echo "$as_me:5433: result: $LD_RPATH_OPT" >&5
  echo "${ECHO_T}$LD_RPATH_OPT" >&6
  
@@ -15600 +18133 @@
  x-R*)
 -       echo "$as_me:5429: checking if we need a space after rpath option" >&5
-+       echo "$as_me:5593: checking if we need a space after rpath option" >&5
++       echo "$as_me:5438: 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"
@@ -15606 +18139 @@
         cat >conftest.$ac_ext <<_ACEOF
 -#line 5434 "configure"
-+#line 5598 "configure"
++#line 5443 "configure"
  #include "confdefs.h"
  
  int
-@@ -5443,16 +5607,16 @@
+@@ -5443,16 +5452,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5446: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5610: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5455: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5449: \$? = $ac_status" >&5
-+  echo "$as_me:5613: \$? = $ac_status" >&5
++  echo "$as_me:5458: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5452: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5616: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5461: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5455: \$? = $ac_status" >&5
-+  echo "$as_me:5619: \$? = $ac_status" >&5
++  echo "$as_me:5464: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_rpath_space=no
  else
-@@ -5462,7 +5626,7 @@
+@@ -5462,7 +5471,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
         LIBS="$cf_save_LIBS"
 -       echo "$as_me:5465: result: $cf_rpath_space" >&5
-+       echo "$as_me:5629: result: $cf_rpath_space" >&5
++       echo "$as_me:5474: result: $cf_rpath_space" >&5
  echo "${ECHO_T}$cf_rpath_space" >&6
         test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
         ;;
-@@ -5477,7 +5641,7 @@
+@@ -5477,7 +5486,7 @@
         cf_ld_rpath_opt=
         test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
  
 -       echo "$as_me:5480: checking if release/abi version should be used for shared libs" >&5
-+       echo "$as_me:5644: checking if release/abi version should be used for shared libs" >&5
++       echo "$as_me:5489: checking if release/abi version should be used for shared libs" >&5
  echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
  
  # Check whether --with-shlib-version or --without-shlib-version was given.
-@@ -5492,7 +5656,7 @@
+@@ -5492,7 +5501,7 @@
                 cf_cv_shlib_version=$withval
                 ;;
         *)
 -               { { echo "$as_me:5495: error: option value must be one of: rel, abi, auto or no" >&5
-+               { { echo "$as_me:5659: error: option value must be one of: rel, abi, auto or no" >&5
++               { { echo "$as_me:5504: 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; }; }
                 ;;
-@@ -5501,7 +5665,7 @@
+@@ -5501,7 +5510,7 @@
  else
    cf_cv_shlib_version=auto
  fi;
 -       echo "$as_me:5504: result: $cf_cv_shlib_version" >&5
-+       echo "$as_me:5668: result: $cf_cv_shlib_version" >&5
++       echo "$as_me:5513: result: $cf_cv_shlib_version" >&5
  echo "${ECHO_T}$cf_cv_shlib_version" >&6
  
         cf_cv_rm_so_locs=no
-@@ -5510,14 +5674,14 @@
+@@ -5510,14 +5519,14 @@
         CC_SHARED_OPTS=
         if test "$GCC" = yes
         then
 -               echo "$as_me:5513: checking which $CC option to use" >&5
-+               echo "$as_me:5677: checking which $CC option to use" >&5
++               echo "$as_me:5522: checking which $CC option to use" >&5
  echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
                 cf_save_CFLAGS="$CFLAGS"
@@ -15680 +18213 @@
                         cat >conftest.$ac_ext <<_ACEOF
 -#line 5520 "configure"
-+#line 5684 "configure"
++#line 5529 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -5529,16 +5693,16 @@
+@@ -5529,16 +5538,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:5532: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5696: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5541: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:5535: \$? = $ac_status" >&5
-+  echo "$as_me:5699: \$? = $ac_status" >&5
++  echo "$as_me:5544: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:5538: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5702: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5547: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5541: \$? = $ac_status" >&5
-+  echo "$as_me:5705: \$? = $ac_status" >&5
++  echo "$as_me:5550: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -5547,7 +5711,7 @@
+@@ -5547,7 +5556,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
                 done
 -               echo "$as_me:5550: result: $CC_SHARED_OPTS" >&5
-+               echo "$as_me:5714: result: $CC_SHARED_OPTS" >&5
++               echo "$as_me:5559: result: $CC_SHARED_OPTS" >&5
  echo "${ECHO_T}$CC_SHARED_OPTS" >&6
                 CFLAGS="$cf_save_CFLAGS"
         fi
-@@ -5555,10 +5719,14 @@
+@@ -5555,10 +5564,14 @@
         cf_cv_shlib_version_infix=no
  
@@ -15731 +18264 @@
                 ;;
         beos*) #(vi
-@@ -5589,7 +5757,7 @@
+@@ -5589,7 +5602,7 @@
                 MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
                 test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
                 cf_cv_shlib_version_infix=yes
 -               echo "$as_me:5592: checking if ld -search_paths_first works" >&5
-+               echo "$as_me:5760: checking if ld -search_paths_first works" >&5
++               echo "$as_me:5605: checking if ld -search_paths_first works" >&5
  echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
  if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5598,7 +5766,7 @@
+@@ -5598,7 +5611,7 @@
                         cf_save_LDFLAGS=$LDFLAGS
                         LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
                         cat >conftest.$ac_ext <<_ACEOF
 -#line 5601 "configure"
-+#line 5769 "configure"
++#line 5614 "configure"
  #include "confdefs.h"
  
  int
-@@ -5610,16 +5778,16 @@
+@@ -5610,16 +5623,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5613: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5781: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5626: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5616: \$? = $ac_status" >&5
-+  echo "$as_me:5784: \$? = $ac_status" >&5
++  echo "$as_me:5629: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5619: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5787: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5632: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5622: \$? = $ac_status" >&5
-+  echo "$as_me:5790: \$? = $ac_status" >&5
++  echo "$as_me:5635: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_ldflags_search_paths_first=yes
  else
-@@ -5630,7 +5798,7 @@
+@@ -5630,7 +5643,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
                                 LDFLAGS=$cf_save_LDFLAGS
  fi
 -echo "$as_me:5633: result: $cf_cv_ldflags_search_paths_first" >&5
-+echo "$as_me:5801: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:5646: result: $cf_cv_ldflags_search_paths_first" >&5
  echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
                 if test $cf_cv_ldflags_search_paths_first = yes; then
                         LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
-@@ -5649,9 +5817,19 @@
+@@ -5649,9 +5662,19 @@
                 # readonly to exploit a quirk in the memory manager.
                 INSTALL_LIB="-m 555"
@@ -15800 +18333 @@
                 # tested with IRIX 5.2 and 'cc'.
                 if test "$GCC" != yes; then
-@@ -5668,7 +5846,7 @@
+@@ -5668,7 +5691,7 @@
                         LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
                 fi
@@ -15809 +18342 @@
  
         test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
-@@ -5680,13 +5858,13 @@
+@@ -5680,13 +5703,34 @@
  
                 MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
                 ;;
 -       openbsd[2-9].*) #(vi
++       mingw*) #(vi
++               cf_cv_shlib_version=mingw
++               cf_cv_shlib_version_infix=mingw
++               CC_SHARED_OPTS=
++               MK_SHARED_LIB='sh ../mk_shared_lib.sh $@ ${CC} ${CFLAGS}'
++               #MK_SHARED_LIB='${CC} ${CFLAGS} -mdll -Wl,-soname,'$cf_cv_shared_soname',-stats -o $[@]'
++               #MK_SHARED_LIB='${DLLTOOL} --export-all-symbols --output-exp --output-lib $[@]'
++               cat >mk_shared_lib.sh <<-CF_EOF
++               #!/bin/sh
++               SHARED_LIB=\$1
++               IMPORT_LIB=\`echo "\$1" | sed -e 's/[0-9]*\.dll$/.dll.a/'\`
++               shift
++               cat <<-EOF
++               Linking shared library
++               ** SHARED_LIB \$SHARED_LIB
++               ** IMPORT_LIB \$IMPORT_LIB
++EOF
++               exec \$* -shared -Wl,--out-implib=../lib/\${IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\${SHARED_LIB}
++CF_EOF
++               chmod +x mk_shared_lib.sh
++               ;;
 +       openbsd[2-9].*|mirbsd*) #(vi
                 if test "$DFT_LWR_MODEL" = "shared" ; then
@@ -15825 +18379 @@
                 CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
  
-@@ -5704,12 +5882,12 @@
+@@ -5704,12 +5748,12 @@
                 MK_SHARED_LIB='${LD} -Bshareable -o $@'
                 test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
@@ -15841 +18395 @@
  
         test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
-@@ -5726,7 +5904,7 @@
+@@ -5726,7 +5770,7 @@
                 if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then
                         LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)"
@@ -15850 +18404 @@
                         if test -f /usr/libexec/ld.elf_so; then
                                 cf_cv_shlib_version=abi
-@@ -5810,7 +5988,7 @@
+@@ -5810,7 +5854,7 @@
                         do
                                 CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
                                 cat >conftest.$ac_ext <<_ACEOF
 -#line 5813 "configure"
-+#line 5991 "configure"
++#line 5857 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -5822,16 +6000,16 @@
+@@ -5822,16 +5866,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:5825: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6003: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5869: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:5828: \$? = $ac_status" >&5
-+  echo "$as_me:6006: \$? = $ac_status" >&5
++  echo "$as_me:5872: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:5831: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6009: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5875: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5834: \$? = $ac_status" >&5
-+  echo "$as_me:6012: \$? = $ac_status" >&5
++  echo "$as_me:5878: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -5868,21 +6046,21 @@
+@@ -5868,21 +5912,29 @@
                         test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
                         ;;
                 *)
 -                       { echo "$as_me:5871: WARNING: ignored --with-shlib-version" >&5
-+                       { echo "$as_me:6049: WARNING: ignored --with-shlib-version" >&5
++                       { echo "$as_me:5915: WARNING: ignored --with-shlib-version" >&5
  echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
                         ;;
@@ -15898 +18452 @@
 +       test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}"
 +       test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}"
++
++       test -n "$verbose" && echo "    CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
++
++echo "${as_me:-configure}:5928: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++
++       test -n "$verbose" && echo "    MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
++
++echo "${as_me:-configure}:5932: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
  
  if test "$CC_SHARED_OPTS" = "unknown"; then
@@ -15903 +18465 @@
                 if test "$model" = "shared"; then
 -                       { { echo "$as_me:5885: error: Shared libraries are not supported in this version" >&5
-+                       { { echo "$as_me:6063: error: Shared libraries are not supported in this version" >&5
++                       { { echo "$as_me:5937: error: Shared libraries are not supported in this version" >&5
  echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
     { (exit 1); exit 1; }; }
                 fi
-@@ -5892,7 +6070,7 @@
+@@ -5892,7 +5944,7 @@
  ### If we're building with rpath, try to link non-standard libs that way too.
  if test "$DFT_LWR_MODEL" = "shared"; then
  
 -echo "$as_me:5895: checking if rpath-hack should be disabled" >&5
-+echo "$as_me:6073: checking if rpath-hack should be disabled" >&5
++echo "$as_me:5947: checking if rpath-hack should be disabled" >&5
  echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
  
  # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
-@@ -5909,21 +6087,21 @@
+@@ -5909,21 +5961,21 @@
    cf_disable_rpath_hack=no
  
  fi;
 -echo "$as_me:5912: result: $cf_disable_rpath_hack" >&5
-+echo "$as_me:6090: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:5964: result: $cf_disable_rpath_hack" >&5
  echo "${ECHO_T}$cf_disable_rpath_hack" >&6
  if test "$cf_disable_rpath_hack" = no ; then
  
 -echo "$as_me:5916: checking for updated LDFLAGS" >&5
-+echo "$as_me:6094: checking for updated LDFLAGS" >&5
++echo "$as_me:5968: checking for updated LDFLAGS" >&5
  echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
  if test -n "$LD_RPATH_OPT" ; then
 -       echo "$as_me:5919: result: maybe" >&5
-+       echo "$as_me:6097: result: maybe" >&5
++       echo "$as_me:5971: result: maybe" >&5
  echo "${ECHO_T}maybe" >&6
  
@@ -15938 +18500 @@
  set dummy $ac_prog; ac_word=$2
 -echo "$as_me:5926: checking for $ac_word" >&5
-+echo "$as_me:6104: checking for $ac_word" >&5
++echo "$as_me:5978: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5938,7 +6116,7 @@
+@@ -5938,7 +5990,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_cf_ldd_prog="$ac_prog"
 -echo "$as_me:5941: found $ac_dir/$ac_word" >&5
-+echo "$as_me:6119: found $ac_dir/$ac_word" >&5
++echo "$as_me:5993: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -5946,10 +6124,10 @@
+@@ -5946,10 +5998,10 @@
  fi
  cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
  if test -n "$cf_ldd_prog"; then
 -  echo "$as_me:5949: result: $cf_ldd_prog" >&5
-+  echo "$as_me:6127: result: $cf_ldd_prog" >&5
++  echo "$as_me:6001: result: $cf_ldd_prog" >&5
  echo "${ECHO_T}$cf_ldd_prog" >&6
  else
 -  echo "$as_me:5952: result: no" >&5
-+  echo "$as_me:6130: result: no" >&5
++  echo "$as_me:6004: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -5963,7 +6141,7 @@
+@@ -5963,7 +6015,7 @@
                 cf_rpath_oops=
  
  cat >conftest.$ac_ext <<_ACEOF
 -#line 5966 "configure"
-+#line 6144 "configure"
++#line 6018 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -5975,16 +6153,16 @@
+@@ -5975,16 +6027,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5978: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6156: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6030: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:5981: \$? = $ac_status" >&5
-+  echo "$as_me:6159: \$? = $ac_status" >&5
++  echo "$as_me:6033: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5984: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6162: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6036: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5987: \$? = $ac_status" >&5
-+  echo "$as_me:6165: \$? = $ac_status" >&5
++  echo "$as_me:6039: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort -u`
                  cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[      ]/%/%' -e 's%/[^/][^/]*$%%' |sort -u`
-@@ -6012,7 +6190,7 @@
+@@ -6012,7 +6064,7 @@
                                         then
                                                 test -n "$verbose" && echo "    ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
  
 -echo "${as_me:-configure}:6015: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
-+echo "${as_me:-configure}:6193: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:6067: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
  
                                                 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
                                                 break
-@@ -6024,11 +6202,11 @@
+@@ -6024,11 +6076,11 @@
  
         test -n "$verbose" && echo "    ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
  
 -echo "${as_me:-configure}:6027: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6205: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:6079: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
  
  test -n "$verbose" && echo "   ...checking LDFLAGS $LDFLAGS" 1>&6
  
 -echo "${as_me:-configure}:6031: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6209: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:6083: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
  
  cf_rpath_dst=
  for cf_rpath_src in $LDFLAGS
-@@ -6065,7 +6243,7 @@
+@@ -6065,7 +6117,7 @@
                         then
                                 test -n "$verbose" && echo "    ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
  
 -echo "${as_me:-configure}:6068: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:6246: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:6120: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
  
                                 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
                         fi
-@@ -6078,11 +6256,11 @@
+@@ -6078,11 +6130,11 @@
  
  test -n "$verbose" && echo "   ...checked LDFLAGS $LDFLAGS" 1>&6
  
 -echo "${as_me:-configure}:6081: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6259: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:6133: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
  
  test -n "$verbose" && echo "   ...checking LIBS $LIBS" 1>&6
  
 -echo "${as_me:-configure}:6085: testing ...checking LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:6263: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:6137: testing ...checking LIBS $LIBS ..." 1>&5
  
  cf_rpath_dst=
  for cf_rpath_src in $LIBS
-@@ -6119,7 +6297,7 @@
+@@ -6119,7 +6171,7 @@
                         then
                                 test -n "$verbose" && echo "    ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
  
 -echo "${as_me:-configure}:6122: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:6300: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:6174: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
  
                                 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
                         fi
-@@ -6132,11 +6310,11 @@
+@@ -6132,11 +6184,11 @@
  
  test -n "$verbose" && echo "   ...checked LIBS $LIBS" 1>&6
  
 -echo "${as_me:-configure}:6135: testing ...checked LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:6313: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:6187: testing ...checked LIBS $LIBS ..." 1>&5
  
         test -n "$verbose" && echo "    ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
  
 -echo "${as_me:-configure}:6139: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6317: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- fi
- 
-@@ -6147,7 +6325,7 @@
++echo "${as_me:-configure}:6191: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ fi
+ 
+@@ -6147,7 +6199,7 @@
  ###############################################################################
  
  ###    use option --disable-overwrite to leave out the link to -lcurses
 -echo "$as_me:6150: checking if you wish to install ncurses overwriting curses" >&5
-+echo "$as_me:6328: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:6202: checking if you wish to install ncurses overwriting curses" >&5
  echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
  
  # Check whether --enable-overwrite or --disable-overwrite was given.
-@@ -6157,10 +6335,10 @@
+@@ -6157,10 +6209,10 @@
  else
    if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
  fi;
 -echo "$as_me:6160: result: $with_overwrite" >&5
-+echo "$as_me:6338: result: $with_overwrite" >&5
++echo "$as_me:6212: result: $with_overwrite" >&5
  echo "${ECHO_T}$with_overwrite" >&6
  
 -echo "$as_me:6163: checking if external terminfo-database is used" >&5
-+echo "$as_me:6341: checking if external terminfo-database is used" >&5
++echo "$as_me:6215: checking if external terminfo-database is used" >&5
  echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
  
  # Check whether --enable-database or --disable-database was given.
-@@ -6170,7 +6348,7 @@
+@@ -6170,7 +6222,7 @@
  else
    use_database=yes
  fi;
 -echo "$as_me:6173: result: $use_database" >&5
-+echo "$as_me:6351: result: $use_database" >&5
++echo "$as_me:6225: result: $use_database" >&5
  echo "${ECHO_T}$use_database" >&6
  
  case $host_os in #(vi
-@@ -6182,17 +6360,12 @@
+@@ -6182,17 +6234,12 @@
         ;;
  esac
@@ -16109 +18671 @@
  
 -       echo "$as_me:6195: checking which terminfo source-file will be installed" >&5
-+       echo "$as_me:6368: checking which terminfo source-file will be installed" >&5
++       echo "$as_me:6242: checking which terminfo source-file will be installed" >&5
  echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
  
  # Check whether --with-database or --without-database was given.
-@@ -6200,10 +6373,10 @@
+@@ -6200,10 +6247,10 @@
    withval="$with_database"
    TERMINFO_SRC=$withval
  fi;
 -       echo "$as_me:6203: result: $TERMINFO_SRC" >&5
-+       echo "$as_me:6376: result: $TERMINFO_SRC" >&5
++       echo "$as_me:6250: result: $TERMINFO_SRC" >&5
  echo "${ECHO_T}$TERMINFO_SRC" >&6
  
 -       echo "$as_me:6206: checking whether to use hashed database instead of directory/tree" >&5
-+       echo "$as_me:6379: checking whether to use hashed database instead of directory/tree" >&5
++       echo "$as_me:6253: checking whether to use hashed database instead of directory/tree" >&5
  echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
  
  # Check whether --with-hashed-db or --without-hashed-db was given.
-@@ -6213,13 +6386,13 @@
+@@ -6213,13 +6260,13 @@
  else
    with_hashed_db=no
  fi;
 -       echo "$as_me:6216: result: $with_hashed_db" >&5
-+       echo "$as_me:6389: result: $with_hashed_db" >&5
++       echo "$as_me:6263: result: $with_hashed_db" >&5
  echo "${ECHO_T}$with_hashed_db" >&6
  else
@@ -16138 +18700 @@
  
 -echo "$as_me:6222: checking for list of fallback descriptions" >&5
-+echo "$as_me:6395: checking for list of fallback descriptions" >&5
++echo "$as_me:6269: checking for list of fallback descriptions" >&5
  echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
  
  # Check whether --with-fallbacks or --without-fallbacks was given.
-@@ -6229,11 +6402,11 @@
+@@ -6229,11 +6276,11 @@
  else
    with_fallback=
  fi;
 -echo "$as_me:6232: result: $with_fallback" >&5
-+echo "$as_me:6405: result: $with_fallback" >&5
++echo "$as_me:6279: result: $with_fallback" >&5
  echo "${ECHO_T}$with_fallback" >&6
  FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
  
 -echo "$as_me:6236: checking if you want modern xterm or antique" >&5
-+echo "$as_me:6409: checking if you want modern xterm or antique" >&5
++echo "$as_me:6283: checking if you want modern xterm or antique" >&5
  echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
  
  # Check whether --with-xterm-new or --without-xterm-new was given.
-@@ -6247,19 +6420,49 @@
+@@ -6247,19 +6294,49 @@
  no)    with_xterm_new=xterm-old;;
  *)     with_xterm_new=xterm-new;;
  esac
 -echo "$as_me:6250: result: $with_xterm_new" >&5
-+echo "$as_me:6423: result: $with_xterm_new" >&5
++echo "$as_me:6297: result: $with_xterm_new" >&5
  echo "${ECHO_T}$with_xterm_new" >&6
  WHICH_XTERM=$with_xterm_new
  
-+echo "$as_me:6427: checking if xterm backspace sends BS or DEL" >&5
++echo "$as_me:6301: checking if xterm backspace sends BS or DEL" >&5
 +echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6
 +
@@ -16186 +18748 @@
 +       ;;
 +esac
-+echo "$as_me:6448: result: $with_xterm_kbs" >&5
++echo "$as_me:6322: result: $with_xterm_kbs" >&5
 +echo "${ECHO_T}$with_xterm_kbs" >&6
 +XTERM_KBS=$with_xterm_kbs
@@ -16197 +18759 @@
  
 -echo "$as_me:6260: checking for list of terminfo directories" >&5
-+echo "$as_me:6458: checking for list of terminfo directories" >&5
++echo "$as_me:6332: checking for list of terminfo directories" >&5
  echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
  
@@ -16208 +18770 @@
  if test "${with_terminfo_dirs+set}" = set; then
    withval="$with_terminfo_dirs"
-@@ -6297,7 +6500,7 @@
+@@ -6285,7 +6362,7 @@
+   ;;
+ .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+   ;;
+-.\${*prefix}*) #(vi
++.\${*prefix}*|.\${*dir}*) #(vi
+   eval cf_src_path="$cf_src_path"
+   case ".$cf_src_path" in #(vi
+   .NONE/*)
+@@ -6297,7 +6374,7 @@
    cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
    ;;
  *)
 -  { { echo "$as_me:6300: error: expected a pathname, not \"$cf_src_path\"" >&5
-+  { { echo "$as_me:6503: error: expected a pathname, not \"$cf_src_path\"" >&5
++  { { echo "$as_me:6377: error: expected a pathname, not \"$cf_src_path\"" >&5
  echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
     { (exit 1); exit 1; }; }
    ;;
-@@ -6310,13 +6513,13 @@
+@@ -6310,13 +6387,13 @@
  
  eval 'TERMINFO_DIRS="$cf_dst_path"'
  
 -echo "$as_me:6313: result: $TERMINFO_DIRS" >&5
-+echo "$as_me:6516: result: $TERMINFO_DIRS" >&5
++echo "$as_me:6390: result: $TERMINFO_DIRS" >&5
  echo "${ECHO_T}$TERMINFO_DIRS" >&6
  test -n "$TERMINFO_DIRS" && cat >>confdefs.h <<EOF
@@ -16229 +18800 @@
  
 -echo "$as_me:6319: checking for default terminfo directory" >&5
-+echo "$as_me:6522: checking for default terminfo directory" >&5
++echo "$as_me:6396: checking for default terminfo directory" >&5
  echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
  
  # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
-@@ -6352,7 +6555,7 @@
+@@ -6340,7 +6417,7 @@
+   ;;
+ .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+   ;;
+-.\${*prefix}*) #(vi
++.\${*prefix}*|.\${*dir}*) #(vi
+   eval withval="$withval"
+   case ".$withval" in #(vi
+   .NONE/*)
+@@ -6352,7 +6429,7 @@
    withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    ;;
  *)
 -  { { echo "$as_me:6355: error: expected a pathname, not \"$withval\"" >&5
-+  { { echo "$as_me:6558: error: expected a pathname, not \"$withval\"" >&5
++  { { echo "$as_me:6432: error: expected a pathname, not \"$withval\"" >&5
  echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
     { (exit 1); exit 1; }; }
    ;;
-@@ -6361,7 +6564,7 @@
+@@ -6361,7 +6438,7 @@
  fi
  TERMINFO="$withval"
  
 -echo "$as_me:6364: result: $TERMINFO" >&5
-+echo "$as_me:6567: result: $TERMINFO" >&5
++echo "$as_me:6441: result: $TERMINFO" >&5
  echo "${ECHO_T}$TERMINFO" >&6
  cat >>confdefs.h <<EOF
  #define TERMINFO "$TERMINFO"
-@@ -6371,7 +6574,7 @@
+@@ -6371,7 +6448,7 @@
  
  ###    use option --disable-big-core to make tic run on small machines
  ###    We need 4Mb, check if we can allocate 50% more than that.
 -echo "$as_me:6374: checking if big-core option selected" >&5
-+echo "$as_me:6577: checking if big-core option selected" >&5
++echo "$as_me:6451: checking if big-core option selected" >&5
  echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
  
  # Check whether --enable-big-core or --disable-big-core was given.
-@@ -6383,7 +6586,7 @@
+@@ -6383,7 +6460,7 @@
    with_big_core=no
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 6386 "configure"
-+#line 6589 "configure"
++#line 6463 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -6397,15 +6600,15 @@
+@@ -6397,15 +6474,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:6400: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6603: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6477: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:6403: \$? = $ac_status" >&5
-+  echo "$as_me:6606: \$? = $ac_status" >&5
++  echo "$as_me:6480: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:6405: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6608: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6482: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6408: \$? = $ac_status" >&5
-+  echo "$as_me:6611: \$? = $ac_status" >&5
++  echo "$as_me:6485: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    with_big_core=yes
  else
-@@ -6417,7 +6620,7 @@
+@@ -6417,7 +6494,7 @@
  rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi;
 -echo "$as_me:6420: result: $with_big_core" >&5
-+echo "$as_me:6623: result: $with_big_core" >&5
++echo "$as_me:6497: result: $with_big_core" >&5
  echo "${ECHO_T}$with_big_core" >&6
  test "$with_big_core" = "yes" && cat >>confdefs.h <<\EOF
  #define HAVE_BIG_CORE 1
-@@ -6426,7 +6629,7 @@
+@@ -6426,7 +6503,7 @@
  ### ISO C only guarantees 512-char strings, we have tables which load faster
  ### when constructed using "big" strings.  More than the C compiler, the awk
  ### program is a limit on most vendor UNIX systems.  Check that we can build.
 -echo "$as_me:6429: checking if big-strings option selected" >&5
-+echo "$as_me:6632: checking if big-strings option selected" >&5
++echo "$as_me:6506: checking if big-strings option selected" >&5
  echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
  
  # Check whether --enable-big-strings or --disable-big-strings was given.
-@@ -6440,8 +6643,8 @@
+@@ -6440,8 +6517,8 @@
                 eval with_big_strings=no
                 ;;
@@ -16318 +18898 @@
                 else
                         eval with_big_strings=no
-@@ -6450,14 +6653,14 @@
+@@ -6450,14 +6527,14 @@
         esac
  
  fi;
 -echo "$as_me:6453: result: $with_big_strings" >&5
-+echo "$as_me:6656: result: $with_big_strings" >&5
++echo "$as_me:6530: result: $with_big_strings" >&5
  echo "${ECHO_T}$with_big_strings" >&6
  
@@ -16331 +18911 @@
  ###    use option --enable-termcap to compile in the termcap fallback support
 -echo "$as_me:6460: checking if you want termcap-fallback support" >&5
-+echo "$as_me:6663: checking if you want termcap-fallback support" >&5
++echo "$as_me:6537: checking if you want termcap-fallback support" >&5
  echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
  
  # Check whether --enable-termcap or --disable-termcap was given.
-@@ -6467,13 +6670,13 @@
+@@ -6467,13 +6544,13 @@
  else
    with_termcap=no
  fi;
 -echo "$as_me:6470: result: $with_termcap" >&5
-+echo "$as_me:6673: result: $with_termcap" >&5
++echo "$as_me:6547: result: $with_termcap" >&5
  echo "${ECHO_T}$with_termcap" >&6
  
@@ -16347 +18927 @@
                 if test -z "$with_fallback" ; then
 -                       { { echo "$as_me:6476: error: You have disabled the database w/o specifying fallbacks" >&5
-+                       { { echo "$as_me:6679: error: You have disabled the database w/o specifying fallbacks" >&5
++                       { { echo "$as_me:6553: error: You have disabled the database w/o specifying fallbacks" >&5
  echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
     { (exit 1); exit 1; }; }
                 fi
-@@ -6485,7 +6688,7 @@
+@@ -6485,7 +6562,7 @@
  else
  
  if test "$with_ticlib" != no ; then
 -       { { echo "$as_me:6488: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
-+       { { echo "$as_me:6691: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++       { { echo "$as_me:6565: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
  echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -6494,7 +6697,7 @@
+@@ -6494,7 +6571,7 @@
  #define USE_TERMCAP 1
  EOF
  
 -echo "$as_me:6497: checking for list of termcap files" >&5
-+echo "$as_me:6700: checking for list of termcap files" >&5
++echo "$as_me:6574: checking for list of termcap files" >&5
  echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
  
  # Check whether --with-termpath or --without-termpath was given.
-@@ -6534,7 +6737,7 @@
+@@ -6522,7 +6599,7 @@
+   ;;
+ .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+   ;;
+-.\${*prefix}*) #(vi
++.\${*prefix}*|.\${*dir}*) #(vi
+   eval cf_src_path="$cf_src_path"
+   case ".$cf_src_path" in #(vi
+   .NONE/*)
+@@ -6534,7 +6611,7 @@
    cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
    ;;
  *)
 -  { { echo "$as_me:6537: error: expected a pathname, not \"$cf_src_path\"" >&5
-+  { { echo "$as_me:6740: error: expected a pathname, not \"$cf_src_path\"" >&5
++  { { echo "$as_me:6614: error: expected a pathname, not \"$cf_src_path\"" >&5
  echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
     { (exit 1); exit 1; }; }
    ;;
-@@ -6547,14 +6750,14 @@
+@@ -6547,14 +6624,14 @@
  
  eval 'TERMPATH="$cf_dst_path"'
  
 -echo "$as_me:6550: result: $TERMPATH" >&5
-+echo "$as_me:6753: result: $TERMPATH" >&5
++echo "$as_me:6627: result: $TERMPATH" >&5
  echo "${ECHO_T}$TERMPATH" >&6
  test -n "$TERMPATH" && cat >>confdefs.h <<EOF
@@ -16391 +18980 @@
  ###    use option --enable-getcap to use a hacked getcap for reading termcaps
 -echo "$as_me:6557: checking if fast termcap-loader is needed" >&5
-+echo "$as_me:6760: checking if fast termcap-loader is needed" >&5
++echo "$as_me:6634: checking if fast termcap-loader is needed" >&5
  echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
  
  # Check whether --enable-getcap or --disable-getcap was given.
-@@ -6564,13 +6767,13 @@
+@@ -6564,13 +6641,13 @@
  else
    with_getcap=no
  fi;
 -echo "$as_me:6567: result: $with_getcap" >&5
-+echo "$as_me:6770: result: $with_getcap" >&5
++echo "$as_me:6644: result: $with_getcap" >&5
  echo "${ECHO_T}$with_getcap" >&6
  test "$with_getcap" = "yes" && cat >>confdefs.h <<\EOF
@@ -16407 +18996 @@
  
 -echo "$as_me:6573: checking if translated termcaps will be cached in ~/.terminfo" >&5
-+echo "$as_me:6776: checking if translated termcaps will be cached in ~/.terminfo" >&5
++echo "$as_me:6650: checking if translated termcaps will be cached in ~/.terminfo" >&5
  echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
  
  # Check whether --enable-getcap-cache or --disable-getcap-cache was given.
-@@ -6580,7 +6783,7 @@
+@@ -6580,7 +6657,7 @@
  else
    with_getcap_cache=no
  fi;
 -echo "$as_me:6583: result: $with_getcap_cache" >&5
-+echo "$as_me:6786: result: $with_getcap_cache" >&5
++echo "$as_me:6660: result: $with_getcap_cache" >&5
  echo "${ECHO_T}$with_getcap_cache" >&6
  test "$with_getcap_cache" = "yes" && cat >>confdefs.h <<\EOF
  #define USE_GETCAP_CACHE 1
-@@ -6589,7 +6792,7 @@
+@@ -6589,7 +6666,7 @@
  fi
  
  ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
 -echo "$as_me:6592: checking if ~/.terminfo is wanted" >&5
-+echo "$as_me:6795: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:6669: checking if ~/.terminfo is wanted" >&5
  echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
  
  # Check whether --enable-home-terminfo or --disable-home-terminfo was given.
-@@ -6599,13 +6802,13 @@
+@@ -6599,13 +6676,13 @@
  else
    with_home_terminfo=yes
  fi;
 -echo "$as_me:6602: result: $with_home_terminfo" >&5
-+echo "$as_me:6805: result: $with_home_terminfo" >&5
++echo "$as_me:6679: result: $with_home_terminfo" >&5
  echo "${ECHO_T}$with_home_terminfo" >&6
  test "$with_home_terminfo" = "yes" && cat >>confdefs.h <<\EOF
@@ -16441 +19030 @@
  
 -echo "$as_me:6608: checking if you want to use restricted environment when running as root" >&5
-+echo "$as_me:6811: checking if you want to use restricted environment when running as root" >&5
++echo "$as_me:6685: checking if you want to use restricted environment when running as root" >&5
  echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
  
  # Check whether --enable-root-environ or --disable-root-environ was given.
-@@ -6615,7 +6818,7 @@
+@@ -6615,7 +6692,7 @@
  else
    with_root_environ=yes
  fi;
 -echo "$as_me:6618: result: $with_root_environ" >&5
-+echo "$as_me:6821: result: $with_root_environ" >&5
++echo "$as_me:6695: result: $with_root_environ" >&5
  echo "${ECHO_T}$with_root_environ" >&6
  test "$with_root_environ" = yes && cat >>confdefs.h <<\EOF
  #define USE_ROOT_ENVIRON 1
-@@ -6629,13 +6832,13 @@
+@@ -6629,13 +6706,13 @@
         unlink
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -echo "$as_me:6632: checking for $ac_func" >&5
-+echo "$as_me:6835: checking for $ac_func" >&5
++echo "$as_me:6709: checking for $ac_func" >&5
  echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
  if eval "test \"\${$as_ac_var+set}\" = set"; then
@@ -16466 +19055 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 6638 "configure"
-+#line 6841 "configure"
++#line 6715 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func (); below.  */
-@@ -6666,16 +6869,16 @@
+@@ -6658,7 +6735,7 @@
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+-f = $ac_func;
++f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -6666,16 +6743,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:6669: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6872: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6746: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:6672: \$? = $ac_status" >&5
-+  echo "$as_me:6875: \$? = $ac_status" >&5
++  echo "$as_me:6749: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:6675: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6878: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6752: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6678: \$? = $ac_status" >&5
-+  echo "$as_me:6881: \$? = $ac_status" >&5
++  echo "$as_me:6755: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_var=yes"
  else
-@@ -6685,7 +6888,7 @@
+@@ -6685,7 +6762,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:6688: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:6891: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:6765: result: `eval echo '${'$as_ac_var'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<EOF
-@@ -6702,13 +6905,13 @@
+@@ -6702,13 +6779,13 @@
                 symlink
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -echo "$as_me:6705: checking for $ac_func" >&5
-+echo "$as_me:6908: checking for $ac_func" >&5
++echo "$as_me:6782: checking for $ac_func" >&5
  echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
  if eval "test \"\${$as_ac_var+set}\" = set"; then
@@ -16512 +19110 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 6711 "configure"
-+#line 6914 "configure"
++#line 6788 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func (); below.  */
-@@ -6739,16 +6942,16 @@
+@@ -6731,7 +6808,7 @@
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+-f = $ac_func;
++f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -6739,16 +6816,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:6742: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6945: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6819: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:6745: \$? = $ac_status" >&5
-+  echo "$as_me:6948: \$? = $ac_status" >&5
++  echo "$as_me:6822: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:6748: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6951: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6825: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6751: \$? = $ac_status" >&5
-+  echo "$as_me:6954: \$? = $ac_status" >&5
++  echo "$as_me:6828: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_var=yes"
  else
-@@ -6758,7 +6961,7 @@
+@@ -6758,7 +6835,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:6761: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:6964: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:6838: result: `eval echo '${'$as_ac_var'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<EOF
-@@ -6769,7 +6972,7 @@
+@@ -6769,7 +6846,7 @@
  done
  
  else
 -       echo "$as_me:6772: checking if link/symlink functions work" >&5
-+       echo "$as_me:6975: checking if link/symlink functions work" >&5
++       echo "$as_me:6849: checking if link/symlink functions work" >&5
  echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
  if test "${cf_cv_link_funcs+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6782,7 +6985,7 @@
+@@ -6782,7 +6859,7 @@
                         eval 'ac_cv_func_'$cf_func'=error'
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 6785 "configure"
-+#line 6988 "configure"
++#line 6862 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -6812,15 +7015,15 @@
+@@ -6812,15 +6889,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:6815: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7018: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6892: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:6818: \$? = $ac_status" >&5
-+  echo "$as_me:7021: \$? = $ac_status" >&5
++  echo "$as_me:6895: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:6820: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7023: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6897: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:6823: \$? = $ac_status" >&5
-+  echo "$as_me:7026: \$? = $ac_status" >&5
++  echo "$as_me:6900: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
                         cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
-@@ -6838,7 +7041,7 @@
+@@ -6838,7 +6915,7 @@
                 test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
  
  fi
 -echo "$as_me:6841: result: $cf_cv_link_funcs" >&5
-+echo "$as_me:7044: result: $cf_cv_link_funcs" >&5
++echo "$as_me:6918: result: $cf_cv_link_funcs" >&5
  echo "${ECHO_T}$cf_cv_link_funcs" >&6
         test "$ac_cv_func_link"    = yes && cat >>confdefs.h <<\EOF
  #define HAVE_LINK 1
-@@ -6856,7 +7059,7 @@
+@@ -6856,7 +6933,7 @@
  # soft links (symbolic links) are useful for some systems where hard links do
  # not work, or to make it simpler to copy terminfo trees around.
  if test "$ac_cv_func_symlink" = yes ; then
 -    echo "$as_me:6859: checking if tic should use symbolic links" >&5
-+    echo "$as_me:7062: checking if tic should use symbolic links" >&5
++    echo "$as_me:6936: checking if tic should use symbolic links" >&5
  echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
  
  # Check whether --enable-symlinks or --disable-symlinks was given.
-@@ -6866,21 +7069,21 @@
+@@ -6866,21 +6943,21 @@
  else
    with_symlinks=no
  fi;
 -    echo "$as_me:6869: result: $with_symlinks" >&5
-+    echo "$as_me:7072: result: $with_symlinks" >&5
++    echo "$as_me:6946: result: $with_symlinks" >&5
  echo "${ECHO_T}$with_symlinks" >&6
  fi
@@ -16615 +19222 @@
  if test "$with_symlinks" = no ; then
 -    echo "$as_me:6876: checking if tic should use hard links" >&5
-+    echo "$as_me:7079: checking if tic should use hard links" >&5
++    echo "$as_me:6953: checking if tic should use hard links" >&5
  echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
      if test "$ac_cv_func_link" = yes ; then
@@ -16623 +19230 @@
      fi
 -    echo "$as_me:6883: result: $with_links" >&5
-+    echo "$as_me:7086: result: $with_links" >&5
++    echo "$as_me:6960: result: $with_links" >&5
  echo "${ECHO_T}$with_links" >&6
  fi
  
-@@ -6893,7 +7096,7 @@
+@@ -6893,7 +6970,7 @@
  EOF
  
  ###   use option --enable-broken-linker to force on use of broken-linker support
 -echo "$as_me:6896: checking if you want broken-linker support code" >&5
-+echo "$as_me:7099: checking if you want broken-linker support code" >&5
++echo "$as_me:6973: checking if you want broken-linker support code" >&5
  echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
  
  # Check whether --enable-broken_linker or --disable-broken_linker was given.
-@@ -6903,7 +7106,7 @@
+@@ -6903,7 +6980,7 @@
  else
    with_broken_linker=${BROKEN_LINKER:-no}
  fi;
 -echo "$as_me:6906: result: $with_broken_linker" >&5
-+echo "$as_me:7109: result: $with_broken_linker" >&5
++echo "$as_me:6983: result: $with_broken_linker" >&5
  echo "${ECHO_T}$with_broken_linker" >&6
  
  BROKEN_LINKER=0
-@@ -6923,14 +7126,14 @@
+@@ -6923,14 +7000,14 @@
                 BROKEN_LINKER=1
                 test -n "$verbose" && echo "    cygwin linker is broken anyway" 1>&6
  
 -echo "${as_me:-configure}:6926: testing cygwin linker is broken anyway ..." 1>&5
-+echo "${as_me:-configure}:7129: testing cygwin linker is broken anyway ..." 1>&5
++echo "${as_me:-configure}:7003: testing cygwin linker is broken anyway ..." 1>&5
  
                 ;;
@@ -16658 +19265 @@
  ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
 -echo "$as_me:6933: checking if tputs should process BSD-style prefix padding" >&5
-+echo "$as_me:7136: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:7010: checking if tputs should process BSD-style prefix padding" >&5
  echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
  
  # Check whether --enable-bsdpad or --disable-bsdpad was given.
-@@ -6940,7 +7143,7 @@
+@@ -6940,7 +7017,7 @@
  else
    with_bsdpad=no
  fi;
 -echo "$as_me:6943: result: $with_bsdpad" >&5
-+echo "$as_me:7146: result: $with_bsdpad" >&5
++echo "$as_me:7020: result: $with_bsdpad" >&5
  echo "${ECHO_T}$with_bsdpad" >&6
  test "$with_bsdpad" = yes && cat >>confdefs.h <<\EOF
  #define BSD_TPUTS 1
-@@ -6962,7 +7165,7 @@
+@@ -6962,7 +7039,7 @@
  cf_xopen_source=
  
@@ -16680 +19287 @@
         ;;
  cygwin) #(vi
-@@ -6973,6 +7176,7 @@
+@@ -6973,6 +7050,7 @@
         ;;
  darwin*) #(vi
@@ -16688 +19295 @@
  freebsd*|dragonfly*) #(vi
         # 5.x headers associate
-@@ -6990,17 +7194,18 @@
+@@ -6990,17 +7068,18 @@
         ;;
  irix[56].*) #(vi
@@ -16697 +19304 @@
  
 -echo "$as_me:6996: checking if we must define _GNU_SOURCE" >&5
-+echo "$as_me:7201: checking if we must define _GNU_SOURCE" >&5
++echo "$as_me:7075: 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
@@ -16705 +19312 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 7003 "configure"
-+#line 7208 "configure"
++#line 7082 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  int
-@@ -7015,16 +7220,16 @@
+@@ -7015,16 +7094,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7018: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7223: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7097: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7021: \$? = $ac_status" >&5
-+  echo "$as_me:7226: \$? = $ac_status" >&5
++  echo "$as_me:7100: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7024: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7229: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7103: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7027: \$? = $ac_status" >&5
-+  echo "$as_me:7232: \$? = $ac_status" >&5
++  echo "$as_me:7106: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_gnu_source=no
  else
-@@ -7033,7 +7238,7 @@
+@@ -7033,7 +7112,7 @@
  cf_save="$CPPFLAGS"
          CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
          cat >conftest.$ac_ext <<_ACEOF
 -#line 7036 "configure"
-+#line 7241 "configure"
++#line 7115 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  int
-@@ -7048,16 +7253,16 @@
+@@ -7048,16 +7127,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7051: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7256: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7130: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7054: \$? = $ac_status" >&5
-+  echo "$as_me:7259: \$? = $ac_status" >&5
++  echo "$as_me:7133: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7057: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7262: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7136: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7060: \$? = $ac_status" >&5
-+  echo "$as_me:7265: \$? = $ac_status" >&5
++  echo "$as_me:7139: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_gnu_source=no
  else
-@@ -7072,51 +7277,45 @@
+@@ -7072,51 +7151,45 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
 -echo "$as_me:7075: result: $cf_cv_gnu_source" >&5
-+echo "$as_me:7280: result: $cf_cv_gnu_source" >&5
++echo "$as_me:7154: 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"
@@ -16814 +19421 @@
 +               -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?$//g'`
 +
-+echo "$as_me:7302: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:7176: 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
@@ -16820 +19427 @@
  else
  
-+echo "${as_me:-configure}:7308: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:7182: testing if the symbol is already defined go no further ..." 1>&5
 +
         cat >conftest.$ac_ext <<_ACEOF
 -#line 7112 "configure"
-+#line 7311 "configure"
++#line 7185 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
@@ -16836 +19443 @@
  #endif
    ;
-@@ -7124,32 +7323,44 @@
+@@ -7124,32 +7197,44 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7127: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7326: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7200: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7130: \$? = $ac_status" >&5
-+  echo "$as_me:7329: \$? = $ac_status" >&5
++  echo "$as_me:7203: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7133: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7332: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7206: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7136: \$? = $ac_status" >&5
-+  echo "$as_me:7335: \$? = $ac_status" >&5
++  echo "$as_me:7209: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  cf_cv_xopen_source=no
@@ -16879 +19486 @@
 +        if test "$cf_want_posix_source" = yes ; then
 +               cat >conftest.$ac_ext <<_ACEOF
-+#line 7356 "configure"
++#line 7230 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
@@ -16891 +19498 @@
  #endif
    ;
-@@ -7157,57 +7368,94 @@
+@@ -7157,50 +7242,87 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7160: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7371: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7245: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7163: \$? = $ac_status" >&5
-+  echo "$as_me:7374: \$? = $ac_status" >&5
++  echo "$as_me:7248: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7166: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7377: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7251: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7169: \$? = $ac_status" >&5
-+  echo "$as_me:7380: \$? = $ac_status" >&5
++  echo "$as_me:7254: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  cf_cv_xopen_source=no
@@ -16916 +19523 @@
  cat conftest.$ac_ext >&5
 -cf_cv_xopen_source=$cf_XOPEN_SOURCE
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
++cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
 -       CPPFLAGS="$cf_save"
--
-+cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE"
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
 +        fi
- 
--fi
--echo "$as_me:7184: result: $cf_cv_xopen_source" >&5
--echo "${ECHO_T}$cf_cv_xopen_source" >&6
--       if test "$cf_cv_xopen_source" != no ; then
--
--CFLAGS=`echo "$CFLAGS" | \
--       sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
--               -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?$//g'`
-+echo "${as_me:-configure}:7391: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
- 
--CPPFLAGS=`echo "$CPPFLAGS" | \
--       sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
--               -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?$//g'`
++
++echo "${as_me:-configure}:7265: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++
 +        CFLAGS="$cf_trim_CFLAGS"
 +        CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
- 
--               cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
-+echo "${as_me:-configure}:7396: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
--cf_fix_cppflags=no
--cf_new_cflags=
--cf_new_cppflags=
--cf_new_extra_cppflags=
++
++echo "${as_me:-configure}:7270: testing if the second compile does not leave our definition intact error ..." 1>&5
++
 +        cat >conftest.$ac_ext <<_ACEOF
-+#line 7399 "configure"
++#line 7273 "configure"
 +#include "confdefs.h"
 +#include <sys/types.h>
@@ -16956 +19544 @@
 +{
  
--for cf_add_cflags in $cf_temp_xopen_source
--do
--case $cf_fix_cppflags in
--no)
--       case $cf_add_cflags in #(vi
--       -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
--               case $cf_add_cflags in
--               -D*)
 +#ifndef _POSIX_C_SOURCE
 +make an error
@@ -16972 +19552 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:7414: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7288: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7417: \$? = $ac_status" >&5
++  echo "$as_me:7291: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:7420: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7294: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7423: \$? = $ac_status" >&5
++  echo "$as_me:7297: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  :
@@ -16988 +19568 @@
 +cat conftest.$ac_ext >&5
 +cf_cv_posix_c_source=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
 +        CFLAGS="$cf_save_CFLAGS"
 +        CPPFLAGS="$cf_save_CPPFLAGS"
-+
+ 
+ fi
+-echo "$as_me:7184: result: $cf_cv_xopen_source" >&5
+-echo "${ECHO_T}$cf_cv_xopen_source" >&6
+-       if test "$cf_cv_xopen_source" != no ; then
+-
+-CFLAGS=`echo "$CFLAGS" | \
+-       sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
+-               -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?$//g'`
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+-CPPFLAGS=`echo "$CPPFLAGS" | \
+-       sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
+-               -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?$//g'`
 +fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+echo "$as_me:7439: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:7313: result: $cf_cv_posix_c_source" >&5
 +echo "${ECHO_T}$cf_cv_posix_c_source" >&6
-+
+ 
+-               cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
 +if test "$cf_cv_posix_c_source" != no ; then
 +       CFLAGS="$cf_trim_CFLAGS"
 +       CPPFLAGS="$cf_trim_CPPFLAGS"
-+
-+cf_fix_cppflags=no
-+cf_new_cflags=
-+cf_new_cppflags=
-+cf_new_extra_cppflags=
-+
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+ cf_new_cppflags=
+ cf_new_extra_cppflags=
+ 
+-for cf_add_cflags in $cf_temp_xopen_source
 +for cf_add_cflags in $cf_cv_posix_c_source
-+do
-+case $cf_fix_cppflags in
-+no)
-+       case $cf_add_cflags in #(vi
-+       -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
-+               case $cf_add_cflags in
-+               -D*)
-                        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
- 
-                        test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-@@ -7273,7 +7521,215 @@
+ do
+ case $cf_fix_cppflags in
+ no)
+@@ -7273,9 +7395,217 @@
         EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
  fi
@@ -17026 +19611 @@
 -       fi
 +fi
-+
+ 
+-cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
 +       ;;
 +netbsd*) #(vi
@@ -17053 +19639 @@
 +*)
 +
-+echo "$as_me:7552: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:7426: 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
@@ -17060 +19646 @@
 +
 +       cat >conftest.$ac_ext <<_ACEOF
-+#line 7559 "configure"
++#line 7433 "configure"
 +#include "confdefs.h"
 +
@@ -17079 +19665 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:7578: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7452: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7581: \$? = $ac_status" >&5
++  echo "$as_me:7455: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:7584: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7458: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7587: \$? = $ac_status" >&5
++  echo "$as_me:7461: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_xopen_source=no
@@ -17097 +19683 @@
 +        CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 +        cat >conftest.$ac_ext <<_ACEOF
-+#line 7596 "configure"
++#line 7470 "configure"
 +#include "confdefs.h"
 +
@@ -17116 +19702 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:7615: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7489: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7618: \$? = $ac_status" >&5
++  echo "$as_me:7492: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:7621: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7495: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:7624: \$? = $ac_status" >&5
++  echo "$as_me:7498: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_xopen_source=no
@@ -17140 +19726 @@
 +
 +fi
-+echo "$as_me:7639: result: $cf_cv_xopen_source" >&5
++echo "$as_me:7513: result: $cf_cv_xopen_source" >&5
 +echo "${ECHO_T}$cf_cv_xopen_source" >&6
 +
@@ -17234 +19820 @@
 +
 +fi
- 
- cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
- 
-@@ -7288,16 +7744,16 @@
++
++cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
+ 
+ cf_save_CFLAGS="$CFLAGS"
+ cf_save_CPPFLAGS="$CPPFLAGS"
+@@ -7288,16 +7618,16 @@
         sed     -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?[         ]/ /g' \
                 -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^     ]*\)\?$//g'`
  
 -echo "$as_me:7291: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:7747: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:7621: 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
@@ -17249 +19837 @@
  
 -echo "${as_me:-configure}:7297: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:7753: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:7627: testing if the symbol is already defined go no further ..." 1>&5
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 7300 "configure"
-+#line 7756 "configure"
++#line 7630 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  int
-@@ -7312,16 +7768,16 @@
+@@ -7312,16 +7642,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7315: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7771: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7645: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7318: \$? = $ac_status" >&5
-+  echo "$as_me:7774: \$? = $ac_status" >&5
++  echo "$as_me:7648: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7321: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7777: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7651: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7324: \$? = $ac_status" >&5
-+  echo "$as_me:7780: \$? = $ac_status" >&5
++  echo "$as_me:7654: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_posix_c_source=no
  else
-@@ -7342,7 +7798,7 @@
+@@ -7342,14 +7672,362 @@
          esac
          if test "$cf_want_posix_source" = yes ; then
                 cat >conftest.$ac_ext <<_ACEOF
 -#line 7345 "configure"
-+#line 7801 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -7357,16 +7813,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7360: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7816: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7363: \$? = $ac_status" >&5
-+  echo "$as_me:7819: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7366: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7822: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7369: \$? = $ac_status" >&5
-+  echo "$as_me:7825: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -7377,15 +7833,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
-         fi
- 
--echo "${as_me:-configure}:7380: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:7836: 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}:7385: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:7841: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
-         cat >conftest.$ac_ext <<_ACEOF
--#line 7388 "configure"
-+#line 7844 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -7400,16 +7856,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7403: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7859: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7406: \$? = $ac_status" >&5
-+  echo "$as_me:7862: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7409: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7865: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7412: \$? = $ac_status" >&5
-+  echo "$as_me:7868: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -7417,27 +7873,112 @@
- cat conftest.$ac_ext >&5
- cf_cv_posix_c_source=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--        CFLAGS="$cf_save_CFLAGS"
--        CPPFLAGS="$cf_save_CPPFLAGS"
++#line 7675 "configure"
++#include "confdefs.h"
++#include <sys/types.h>
++int
++main ()
++{
++
++#ifdef _POSIX_SOURCE
++make an error
++#endif
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:7690: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:7693: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:7696: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:7699: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE"
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++        fi
++
++echo "${as_me:-configure}:7710: 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}:7715: testing if the second compile does not leave our definition intact error ..." 1>&5
++
++        cat >conftest.$ac_ext <<_ACEOF
++#line 7718 "configure"
++#include "confdefs.h"
++#include <sys/types.h>
++int
++main ()
++{
++
++#ifndef _POSIX_C_SOURCE
++make an error
++#endif
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:7733: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:7736: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:7739: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:7742: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++cf_cv_posix_c_source=no
++fi
 +rm -f conftest.$ac_objext conftest.$ac_ext
 +        CFLAGS="$cf_save_CFLAGS"
@@ -17363 +19954 @@
 +
 +fi
-+echo "$as_me:7884: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:7758: result: $cf_cv_posix_c_source" >&5
 +echo "${ECHO_T}$cf_cv_posix_c_source" >&6
 +
@@ -17439 +20030 @@
 +
 +if test -n "$cf_new_cppflags" ; then
- 
++
 +       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
- 
++fi
++
 +if test -n "$cf_new_extra_cppflags" ; then
 +
 +       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
--echo "$as_me:7428: result: $cf_cv_posix_c_source" >&5
--echo "${ECHO_T}$cf_cv_posix_c_source" >&6
- 
--if test "$cf_cv_posix_c_source" != no ; then
--       CFLAGS="$cf_trim_CFLAGS"
--       CPPFLAGS="$cf_trim_CPPFLAGS"
++fi
++
 +fi
 +
@@ -17460 +20045 @@
 +
 +if test -n "$cf_xopen_source" ; then
- 
- cf_fix_cppflags=no
- cf_new_cflags=
- cf_new_cppflags=
- cf_new_extra_cppflags=
- 
--for cf_add_cflags in $cf_cv_posix_c_source
++
++cf_fix_cppflags=no
++cf_new_cflags=
++cf_new_cppflags=
++cf_new_extra_cppflags=
++
 +for cf_add_cflags in $cf_xopen_source
- do
- case $cf_fix_cppflags in
- no)
-@@ -7512,17 +8053,196 @@
- 
- fi
- 
--       ;;
--esac
++do
++case $cf_fix_cppflags in
++no)
++       case $cf_add_cflags in #(vi
++       -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
++               case $cf_add_cflags in
++               -D*)
++                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
++
++                       test "${cf_add_cflags}" != "${cf_tst_cflags}" \
++                               && test -z "${cf_tst_cflags}" \
++                               && cf_fix_cppflags=yes
++
++                       if test $cf_fix_cppflags = yes ; then
++                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
++                               continue
++                       elif test "${cf_tst_cflags}" = "\"'" ; then
++                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
++                               continue
++                       fi
++                       ;;
++               esac
++               case "$CPPFLAGS" in
++               *$cf_add_cflags) #(vi
++                       ;;
++               *) #(vi
++                       case $cf_add_cflags in #(vi
++                       -D*)
++                               cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
++
++CPPFLAGS=`echo "$CPPFLAGS" | \
++       sed     -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^    ]*\)\?[         ]/ /g' \
++               -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^    ]*\)\?$//g'`
++
++                               ;;
++                       esac
++                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
++                       ;;
++               esac
++               ;;
++       *)
++               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
++               ;;
++       esac
++       ;;
++yes)
++       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
++
++       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
++
++       test "${cf_add_cflags}" != "${cf_tst_cflags}" \
++               && test -z "${cf_tst_cflags}" \
++               && cf_fix_cppflags=no
++       ;;
++esac
++done
++
++if test -n "$cf_new_cflags" ; then
++
++       CFLAGS="$CFLAGS $cf_new_cflags"
++fi
++
++if test -n "$cf_new_cppflags" ; then
++
++       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
++fi
++
++if test -n "$cf_new_extra_cppflags" ; then
++
++       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
++fi
++
++fi
++
 +if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-+       echo "$as_me:8057: checking if _XOPEN_SOURCE really is set" >&5
++       echo "$as_me:7931: checking if _XOPEN_SOURCE really is set" >&5
 +echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
 +       cat >conftest.$ac_ext <<_ACEOF
-+#line 8060 "configure"
++#line 7934 "configure"
 +#include "confdefs.h"
 +#include <stdlib.h>
@@ -17487 +20136 @@
 +main ()
 +{
- 
--if test -n "$cf_xopen_source" ; then
++
 +#ifndef _XOPEN_SOURCE
 +make an error
@@ -17497 +20145 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8075: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7949: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8078: \$? = $ac_status" >&5
++  echo "$as_me:7952: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8081: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7955: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8084: \$? = $ac_status" >&5
++  echo "$as_me:7958: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_XOPEN_SOURCE_set=yes
@@ -17515 +20163 @@
 +fi
 +rm -f conftest.$ac_objext conftest.$ac_ext
-+       echo "$as_me:8093: result: $cf_XOPEN_SOURCE_set" >&5
++       echo "$as_me:7967: result: $cf_XOPEN_SOURCE_set" >&5
 +echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
 +       if test $cf_XOPEN_SOURCE_set = yes
 +       then
 +               cat >conftest.$ac_ext <<_ACEOF
-+#line 8098 "configure"
++#line 7972 "configure"
 +#include "confdefs.h"
 +#include <stdlib.h>
@@ -17535 +20183 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8113: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7987: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8116: \$? = $ac_status" >&5
++  echo "$as_me:7990: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8119: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7993: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8122: \$? = $ac_status" >&5
++  echo "$as_me:7996: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_XOPEN_SOURCE_set_ok=yes
@@ -17555 +20203 @@
 +               if test $cf_XOPEN_SOURCE_set_ok = no
 +               then
-+                       { echo "$as_me:8133: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++                       { echo "$as_me:8007: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 +echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 +               fi
 +       else
 +
-+echo "$as_me:8138: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:8012: 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
@@ -17567 +20215 @@
 +
 +       cat >conftest.$ac_ext <<_ACEOF
-+#line 8145 "configure"
-+#include "confdefs.h"
++#line 8019 "configure"
+ #include "confdefs.h"
 +
 +#include <stdlib.h>
 +#include <string.h>
-+#include <sys/types.h>
-+
-+int
-+main ()
-+{
-+
+ #include <sys/types.h>
++
+ int
+ main ()
+ {
+ 
+-#ifdef _POSIX_SOURCE
 +#ifndef _XOPEN_SOURCE
-+make an error
-+#endif
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8164: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:8167: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8170: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:8173: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
+ make an error
+ #endif
+   ;
+@@ -7357,42 +8035,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7360: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8038: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7363: \$? = $ac_status" >&5
++  echo "$as_me:8041: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7366: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8044: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7369: \$? = $ac_status" >&5
++  echo "$as_me:8047: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  :
 +  cf_cv_xopen_source=no
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE"
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-        fi
+-
+-echo "${as_me:-configure}:7380: 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}:7385: testing if the second compile does not leave our definition intact error ..." 1>&5
+-
 +cf_save="$CPPFLAGS"
 +        CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
-+        cat >conftest.$ac_ext <<_ACEOF
-+#line 8182 "configure"
-+#include "confdefs.h"
+         cat >conftest.$ac_ext <<_ACEOF
+-#line 7388 "configure"
++#line 8056 "configure"
+ #include "confdefs.h"
 +
 +#include <stdlib.h>
 +#include <string.h>
-+#include <sys/types.h>
-+
-+int
-+main ()
-+{
-+
+ #include <sys/types.h>
++
+ int
+ main ()
+ {
+ 
+-#ifndef _POSIX_C_SOURCE
 +#ifdef _XOPEN_SOURCE
-+make an error
-+#endif
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8201: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:8204: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8207: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:8210: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
+ make an error
+ #endif
+   ;
+@@ -7400,129 +8072,51 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7403: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8075: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7406: \$? = $ac_status" >&5
++  echo "$as_me:8078: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7409: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8081: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7412: \$? = $ac_status" >&5
++  echo "$as_me:8084: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  :
 +  cf_cv_xopen_source=no
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-cf_cv_posix_c_source=no
 +cf_cv_xopen_source=$cf_XOPEN_SOURCE
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-        CFLAGS="$cf_save_CFLAGS"
+-        CPPFLAGS="$cf_save_CPPFLAGS"
 +       CPPFLAGS="$cf_save"
-+
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+echo "$as_me:8225: result: $cf_cv_xopen_source" >&5
+ 
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:7428: result: $cf_cv_posix_c_source" >&5
+-echo "${ECHO_T}$cf_cv_posix_c_source" >&6
+-
+-if test "$cf_cv_posix_c_source" != no ; then
+-       CFLAGS="$cf_trim_CFLAGS"
+-       CPPFLAGS="$cf_trim_CPPFLAGS"
+-
+-cf_fix_cppflags=no
+-cf_new_cflags=
+-cf_new_cppflags=
+-cf_new_extra_cppflags=
+-
+-for cf_add_cflags in $cf_cv_posix_c_source
+-do
+-case $cf_fix_cppflags in
+-no)
+-       case $cf_add_cflags in #(vi
+-       -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+-               case $cf_add_cflags in
+-               -D*)
+-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
++echo "$as_me:8099: result: $cf_cv_xopen_source" >&5
 +echo "${ECHO_T}$cf_cv_xopen_source" >&6
-+
+ 
+-                       test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+-                               && test -z "${cf_tst_cflags}" \
+-                               && cf_fix_cppflags=yes
 +if test "$cf_cv_xopen_source" != no ; then
-+
+ 
+-                       if test $cf_fix_cppflags = yes ; then
+-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+-                               continue
+-                       elif test "${cf_tst_cflags}" = "\"'" ; then
+-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+-                               continue
+-                       fi
+-                       ;;
+-               esac
+-               case "$CPPFLAGS" in
+-               *$cf_add_cflags) #(vi
+-                       ;;
+-               *) #(vi
+-                       case $cf_add_cflags in #(vi
+-                       -D*)
+-                               cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 +CFLAGS=`echo "$CFLAGS" | \
 +       sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
 +               -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?$//g'`
-+
-+CPPFLAGS=`echo "$CPPFLAGS" | \
+ 
+ CPPFLAGS=`echo "$CPPFLAGS" | \
+-       sed     -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^    ]*\)\?[         ]/ /g' \
+-               -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^    ]*\)\?$//g'`
+-
+-                               ;;
+-                       esac
+-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+-                       ;;
+-               esac
+-               ;;
+-       *)
+-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+-               ;;
+-       esac
+-       ;;
+-yes)
+-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+-
+-       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+-
+-       test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+-               && test -z "${cf_tst_cflags}" \
+-               && cf_fix_cppflags=no
+-       ;;
+-esac
+-done
+-
+-if test -n "$cf_new_cflags" ; then
+-
+-       CFLAGS="$CFLAGS $cf_new_cflags"
+-fi
+-
+-if test -n "$cf_new_cppflags" ; then
+-
+-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+-fi
+-
+-if test -n "$cf_new_extra_cppflags" ; then
+-
+-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+-fi
+-
+-fi
+-
+-       ;;
+-esac
 +       sed     -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?[         ]/ /g' \
 +               -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^       ]*\)\?$//g'`
-+
+ 
+-if test -n "$cf_xopen_source" ; then
 +       cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
  
@@ -17672 +20434 @@
  case $cf_fix_cppflags in
  no)
-@@ -7597,16 +8317,19 @@
+@@ -7597,16 +8191,19 @@
  
  fi
@@ -17682 +20444 @@
  
 -echo "$as_me:7602: checking if SIGWINCH is defined" >&5
-+echo "$as_me:8325: checking if SIGWINCH is defined" >&5
++echo "$as_me:8199: checking if SIGWINCH is defined" >&5
  echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
  if test "${cf_cv_define_sigwinch+set}" = set; then
@@ -17690 +20452 @@
         cat >conftest.$ac_ext <<_ACEOF
 -#line 7609 "configure"
-+#line 8332 "configure"
++#line 8206 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -7621,23 +8344,23 @@
+@@ -7621,23 +8218,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7624: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8347: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8221: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7627: \$? = $ac_status" >&5
-+  echo "$as_me:8350: \$? = $ac_status" >&5
++  echo "$as_me:8224: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7630: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8353: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8227: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7633: \$? = $ac_status" >&5
-+  echo "$as_me:8356: \$? = $ac_status" >&5
++  echo "$as_me:8230: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_define_sigwinch=yes
@@ -17719 +20481 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 7640 "configure"
-+#line 8363 "configure"
++#line 8237 "configure"
  #include "confdefs.h"
  
  #undef _XOPEN_SOURCE
-@@ -7655,16 +8378,16 @@
+@@ -7655,16 +8252,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7658: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8381: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8255: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7661: \$? = $ac_status" >&5
-+  echo "$as_me:8384: \$? = $ac_status" >&5
++  echo "$as_me:8258: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7664: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8387: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8261: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7667: \$? = $ac_status" >&5
-+  echo "$as_me:8390: \$? = $ac_status" >&5
++  echo "$as_me:8264: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_define_sigwinch=maybe
  else
-@@ -7678,11 +8401,11 @@
+@@ -7678,11 +8275,11 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
 -echo "$as_me:7681: result: $cf_cv_define_sigwinch" >&5
-+echo "$as_me:8404: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:8278: result: $cf_cv_define_sigwinch" >&5
  echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
  
  if test "$cf_cv_define_sigwinch" = maybe ; then
 -echo "$as_me:7685: checking for actual SIGWINCH definition" >&5
-+echo "$as_me:8408: checking for actual SIGWINCH definition" >&5
++echo "$as_me:8282: checking for actual SIGWINCH definition" >&5
  echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
  if test "${cf_cv_fixup_sigwinch+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7693,7 +8416,7 @@
+@@ -7693,7 +8290,7 @@
  while test $cf_sigwinch != 1
  do
         cat >conftest.$ac_ext <<_ACEOF
 -#line 7696 "configure"
-+#line 8419 "configure"
++#line 8293 "configure"
  #include "confdefs.h"
  
  #undef _XOPEN_SOURCE
-@@ -7715,16 +8438,16 @@
+@@ -7715,16 +8312,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7718: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8441: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8315: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7721: \$? = $ac_status" >&5
-+  echo "$as_me:8444: \$? = $ac_status" >&5
++  echo "$as_me:8318: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7724: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8447: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8321: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7727: \$? = $ac_status" >&5
-+  echo "$as_me:8450: \$? = $ac_status" >&5
++  echo "$as_me:8324: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_fixup_sigwinch=$cf_sigwinch
          break
-@@ -7738,7 +8461,7 @@
+@@ -7738,7 +8335,7 @@
  done
  
  fi
 -echo "$as_me:7741: result: $cf_cv_fixup_sigwinch" >&5
-+echo "$as_me:8464: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:8338: result: $cf_cv_fixup_sigwinch" >&5
  echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
  
         if test "$cf_cv_fixup_sigwinch" != unknown ; then
-@@ -7748,13 +8471,13 @@
+@@ -7748,13 +8345,13 @@
  
  # Checks for CODESET support.
  
 -  echo "$as_me:7751: checking for nl_langinfo and CODESET" >&5
-+  echo "$as_me:8474: checking for nl_langinfo and CODESET" >&5
++  echo "$as_me:8348: checking for nl_langinfo and CODESET" >&5
  echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
  if test "${am_cv_langinfo_codeset+set}" = set; then
@@ -17809 +20571 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 7757 "configure"
-+#line 8480 "configure"
++#line 8354 "configure"
  #include "confdefs.h"
  #include <langinfo.h>
  int
-@@ -7766,16 +8489,16 @@
+@@ -7766,16 +8363,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:7769: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8492: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8366: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:7772: \$? = $ac_status" >&5
-+  echo "$as_me:8495: \$? = $ac_status" >&5
++  echo "$as_me:8369: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:7775: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8498: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8372: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7778: \$? = $ac_status" >&5
-+  echo "$as_me:8501: \$? = $ac_status" >&5
++  echo "$as_me:8375: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    am_cv_langinfo_codeset=yes
  else
-@@ -7786,7 +8509,7 @@
+@@ -7786,7 +8383,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  
  fi
 -echo "$as_me:7789: result: $am_cv_langinfo_codeset" >&5
-+echo "$as_me:8512: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:8386: result: $am_cv_langinfo_codeset" >&5
  echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
    if test $am_cv_langinfo_codeset = yes; then
  
-@@ -7800,7 +8523,7 @@
+@@ -7800,7 +8397,7 @@
  NCURSES_OK_WCHAR_T=
  NCURSES_OK_WINT_T=
  
 -echo "$as_me:7803: checking if you want wide-character code" >&5
-+echo "$as_me:8526: checking if you want wide-character code" >&5
++echo "$as_me:8400: checking if you want wide-character code" >&5
  echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
  
  # Check whether --enable-widec or --disable-widec was given.
-@@ -7810,7 +8533,7 @@
+@@ -7810,7 +8407,7 @@
  else
    with_widec=no
  fi;
 -echo "$as_me:7813: result: $with_widec" >&5
-+echo "$as_me:8536: result: $with_widec" >&5
++echo "$as_me:8410: result: $with_widec" >&5
  echo "${ECHO_T}$with_widec" >&6
  if test "$with_widec" = yes ; then
         LIB_SUFFIX="w${LIB_SUFFIX}"
-@@ -7818,15 +8541,63 @@
+@@ -7818,15 +8415,63 @@
  #define USE_WIDEC_SUPPORT 1
  EOF
@@ -17873 +20635 @@
 +EOF
 +
-+echo "$as_me:8548: checking if wchar.h can be used as is" >&5
++echo "$as_me:8422: checking if wchar.h can be used as is" >&5
 +echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6
 +if test "${cf_cv_wchar_h_okay+set}" = set; then
@@ -17880 +20642 @@
 +
 +cat >conftest.$ac_ext <<_ACEOF
-+#line 8555 "configure"
++#line 8429 "configure"
 +#include "confdefs.h"
 +
@@ -17897 +20659 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:8572: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8446: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8575: \$? = $ac_status" >&5
++  echo "$as_me:8449: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:8578: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8452: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:8581: \$? = $ac_status" >&5
++  echo "$as_me:8455: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_wchar_h_okay=yes
@@ -17916 +20678 @@
 +rm -f conftest.$ac_objext conftest.$ac_ext
 +fi
-+echo "$as_me:8591: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:8465: result: $cf_cv_wchar_h_okay" >&5
 +echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6
 +
@@ -17923 +20685 @@
  
 -echo "$as_me:7826: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
-+echo "$as_me:8597: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:8471: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
  echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
 -#line 7829 "configure"
-+#line 8600 "configure"
++#line 8474 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  
-@@ -7842,16 +8613,16 @@
+@@ -7842,16 +8487,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7845: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8616: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8490: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7848: \$? = $ac_status" >&5
-+  echo "$as_me:8619: \$? = $ac_status" >&5
++  echo "$as_me:8493: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7851: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8622: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8496: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7854: \$? = $ac_status" >&5
-+  echo "$as_me:8625: \$? = $ac_status" >&5
++  echo "$as_me:8499: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=no
  else
-@@ -7860,16 +8631,16 @@
+@@ -7860,16 +8505,16 @@
  cf_result=yes
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
 -echo "$as_me:7863: result: $cf_result" >&5
-+echo "$as_me:8634: result: $cf_result" >&5
++echo "$as_me:8508: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  
@@ -17964 +20726 @@
  elif test "x" != "x" ; then
 -       echo "$as_me:7869: checking checking for compatible value versus " >&5
-+       echo "$as_me:8640: checking checking for compatible value versus " >&5
++       echo "$as_me:8514: checking checking for compatible value versus " >&5
  echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
         cat >conftest.$ac_ext <<_ACEOF
 -#line 7872 "configure"
-+#line 8643 "configure"
++#line 8517 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  
-@@ -7885,16 +8656,16 @@
+@@ -7885,16 +8530,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:7888: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8659: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8533: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:7891: \$? = $ac_status" >&5
-+  echo "$as_me:8662: \$? = $ac_status" >&5
++  echo "$as_me:8536: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:7894: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8665: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8539: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7897: \$? = $ac_status" >&5
-+  echo "$as_me:8668: \$? = $ac_status" >&5
++  echo "$as_me:8542: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_result=yes
  else
-@@ -7903,7 +8674,7 @@
+@@ -7903,7 +8548,7 @@
  cf_result=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
 -       echo "$as_me:7906: result: $cf_result" >&5
-+       echo "$as_me:8677: result: $cf_result" >&5
++       echo "$as_me:8551: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
         if test "$cf_result" = no ; then
                 # perhaps we can override it - try...
-@@ -7911,8 +8682,7 @@
+@@ -7911,8 +8556,7 @@
         fi
  fi
@@ -18012 +20774 @@
         # with_overwrite=no
         NCURSES_CH_T=cchar_t
-@@ -7920,13 +8690,13 @@
+@@ -7920,13 +8564,13 @@
  for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -echo "$as_me:7923: checking for $ac_func" >&5
-+echo "$as_me:8693: checking for $ac_func" >&5
++echo "$as_me:8567: checking for $ac_func" >&5
  echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
  if eval "test \"\${$as_ac_var+set}\" = set"; then
@@ -18024 +20786 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 7929 "configure"
-+#line 8699 "configure"
++#line 8573 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func (); below.  */
-@@ -7957,16 +8727,16 @@
+@@ -7949,7 +8593,7 @@
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+-f = $ac_func;
++f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -7957,16 +8601,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:7960: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8730: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8604: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:7963: \$? = $ac_status" >&5
-+  echo "$as_me:8733: \$? = $ac_status" >&5
++  echo "$as_me:8607: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:7966: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8736: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8610: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:7969: \$? = $ac_status" >&5
-+  echo "$as_me:8739: \$? = $ac_status" >&5
++  echo "$as_me:8613: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_var=yes"
  else
-@@ -7976,7 +8746,7 @@
+@@ -7976,7 +8620,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:7979: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:8749: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:8623: result: `eval echo '${'$as_ac_var'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<EOF
-@@ -7988,7 +8758,7 @@
+@@ -7988,7 +8632,7 @@
  
         if test "$ac_cv_func_putwc" != yes ; then
  
 -echo "$as_me:7991: checking for multibyte character support" >&5
-+echo "$as_me:8761: checking for multibyte character support" >&5
++echo "$as_me:8635: checking for multibyte character support" >&5
  echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
  if test "${cf_cv_utf8_lib+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7996,7 +8766,7 @@
+@@ -7996,7 +8640,7 @@
  
         cf_save_LIBS="$LIBS"
         cat >conftest.$ac_ext <<_ACEOF
 -#line 7999 "configure"
-+#line 8769 "configure"
++#line 8643 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -8009,16 +8779,16 @@
+@@ -8009,16 +8653,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:8012: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8782: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8656: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:8015: \$? = $ac_status" >&5
-+  echo "$as_me:8785: \$? = $ac_status" >&5
++  echo "$as_me:8659: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:8018: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8788: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8662: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8021: \$? = $ac_status" >&5
-+  echo "$as_me:8791: \$? = $ac_status" >&5
++  echo "$as_me:8665: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_utf8_lib=yes
  else
-@@ -8030,12 +8800,12 @@
+@@ -8030,12 +8674,12 @@
  cf_cv_header_path_utf8=
  cf_cv_library_path_utf8=
  
 -echo "${as_me:-configure}:8033: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:8803: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8677: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
  
  cf_save_LIBS="$LIBS"
@@ -18108 +20879 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 8038 "configure"
-+#line 8808 "configure"
++#line 8682 "configure"
  #include "confdefs.h"
  
  #include <libutf8.h>
-@@ -8048,16 +8818,16 @@
+@@ -8048,16 +8692,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:8051: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8821: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8695: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:8054: \$? = $ac_status" >&5
-+  echo "$as_me:8824: \$? = $ac_status" >&5
++  echo "$as_me:8698: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:8057: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8827: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8701: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8060: \$? = $ac_status" >&5
-+  echo "$as_me:8830: \$? = $ac_status" >&5
++  echo "$as_me:8704: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         cf_cv_find_linkage_utf8=yes
-@@ -8071,7 +8841,7 @@
+@@ -8071,7 +8715,7 @@
  LIBS="-lutf8  $cf_save_LIBS"
  
  cat >conftest.$ac_ext <<_ACEOF
 -#line 8074 "configure"
-+#line 8844 "configure"
++#line 8718 "configure"
  #include "confdefs.h"
  
  #include <libutf8.h>
-@@ -8084,16 +8854,16 @@
+@@ -8084,16 +8728,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:8087: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8857: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8731: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:8090: \$? = $ac_status" >&5
-+  echo "$as_me:8860: \$? = $ac_status" >&5
++  echo "$as_me:8734: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:8093: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8863: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8737: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8096: \$? = $ac_status" >&5
-+  echo "$as_me:8866: \$? = $ac_status" >&5
++  echo "$as_me:8740: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         cf_cv_find_linkage_utf8=yes
-@@ -8110,9 +8880,9 @@
+@@ -8110,9 +8754,9 @@
  
      test -n "$verbose" && echo "       find linkage for utf8 library" 1>&6
  
 -echo "${as_me:-configure}:8113: testing find linkage for utf8 library ..." 1>&5
-+echo "${as_me:-configure}:8883: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:8757: testing find linkage for utf8 library ..." 1>&5
  
 -echo "${as_me:-configure}:8115: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:8885: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8759: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
  
      cf_save_CPPFLAGS="$CPPFLAGS"
      cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -8225,11 +8995,11 @@
+@@ -8225,11 +8869,11 @@
        if test -d $cf_cv_header_path_utf8 ; then
          test -n "$verbose" && echo "   ... testing $cf_cv_header_path_utf8" 1>&6
  
 -echo "${as_me:-configure}:8228: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:8998: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8872: 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 8232 "configure"
-+#line 9002 "configure"
++#line 8876 "configure"
  #include "confdefs.h"
  
  #include <libutf8.h>
-@@ -8242,21 +9012,21 @@
+@@ -8242,21 +8886,21 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8245: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9015: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8889: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8248: \$? = $ac_status" >&5
-+  echo "$as_me:9018: \$? = $ac_status" >&5
++  echo "$as_me:8892: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8251: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9021: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8895: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8254: \$? = $ac_status" >&5
-+  echo "$as_me:9024: \$? = $ac_status" >&5
++  echo "$as_me:8898: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -18212 +20983 @@
  
 -echo "${as_me:-configure}:8259: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9029: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:8903: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
  
              cf_cv_find_linkage_utf8=maybe
              cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -8274,7 +9044,7 @@
+@@ -8274,7 +8918,7 @@
  
      if test "$cf_cv_find_linkage_utf8" = maybe ; then
  
 -echo "${as_me:-configure}:8277: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9047: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:8921: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
  
        cf_save_LIBS="$LIBS"
        cf_save_LDFLAGS="$LDFLAGS"
-@@ -8371,13 +9141,13 @@
+@@ -8371,13 +9015,13 @@
            if test -d $cf_cv_library_path_utf8 ; then
              test -n "$verbose" && echo "       ... testing $cf_cv_library_path_utf8" 1>&6
  
 -echo "${as_me:-configure}:8374: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9144: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:9018: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
  
              CPPFLAGS="$cf_test_CPPFLAGS"
@@ -18237 +21008 @@
              cat >conftest.$ac_ext <<_ACEOF
 -#line 8380 "configure"
-+#line 9150 "configure"
++#line 9024 "configure"
  #include "confdefs.h"
  
  #include <libutf8.h>
-@@ -8390,21 +9160,21 @@
+@@ -8390,21 +9034,21 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:8393: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9163: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9037: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:8396: \$? = $ac_status" >&5
-+  echo "$as_me:9166: \$? = $ac_status" >&5
++  echo "$as_me:9040: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:8399: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9169: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9043: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8402: \$? = $ac_status" >&5
-+  echo "$as_me:9172: \$? = $ac_status" >&5
++  echo "$as_me:9046: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -18264 +21035 @@
  
 -echo "${as_me:-configure}:8407: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9177: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:9051: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
  
                  cf_cv_find_linkage_utf8=yes
                  cf_cv_library_file_utf8="-lutf8"
-@@ -8446,7 +9216,7 @@
+@@ -8446,7 +9090,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:8449: result: $cf_cv_utf8_lib" >&5
-+echo "$as_me:9219: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:9093: result: $cf_cv_utf8_lib" >&5
  echo "${ECHO_T}$cf_cv_utf8_lib" >&6
  
  # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
-@@ -8480,7 +9250,7 @@
+@@ -8480,7 +9124,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 8483 "configure"
-+#line 9253 "configure"
++#line 9127 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -8492,16 +9262,16 @@
+@@ -8492,16 +9136,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8495: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9265: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9139: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8498: \$? = $ac_status" >&5
-+  echo "$as_me:9268: \$? = $ac_status" >&5
++  echo "$as_me:9142: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8501: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9271: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9145: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8504: \$? = $ac_status" >&5
-+  echo "$as_me:9274: \$? = $ac_status" >&5
++  echo "$as_me:9148: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -8518,7 +9288,7 @@
+@@ -8518,7 +9162,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:8521: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:9291: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:9165: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -8552,7 +9322,7 @@
+@@ -8552,7 +9196,7 @@
        if test "$cf_have_libdir" = no ; then
          test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
  
 -echo "${as_me:-configure}:8555: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:9325: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:9199: testing adding $cf_add_libdir to library-path ..." 1>&5
  
          LDFLAGS="-L$cf_add_libdir $LDFLAGS"
        fi
-@@ -8569,14 +9339,14 @@
+@@ -8569,14 +9213,14 @@
         fi
  
  # This is needed on Tru64 5.0 to declare mbstate_t
 -echo "$as_me:8572: checking if we must include wchar.h to declare mbstate_t" >&5
-+echo "$as_me:9342: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:9216: checking if we must include wchar.h to declare mbstate_t" >&5
  echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
  if test "${cf_cv_mbstate_t+set}" = set; then
@@ -18338 +21109 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 8579 "configure"
-+#line 9349 "configure"
++#line 9223 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -8594,23 +9364,23 @@
+@@ -8594,23 +9238,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8597: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9367: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9241: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8600: \$? = $ac_status" >&5
-+  echo "$as_me:9370: \$? = $ac_status" >&5
++  echo "$as_me:9244: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8603: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9373: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9247: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8606: \$? = $ac_status" >&5
-+  echo "$as_me:9376: \$? = $ac_status" >&5
++  echo "$as_me:9250: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_mbstate_t=no
@@ -18367 +21138 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 8613 "configure"
-+#line 9383 "configure"
++#line 9257 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -8629,16 +9399,16 @@
+@@ -8629,16 +9273,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8632: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9402: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9276: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8635: \$? = $ac_status" >&5
-+  echo "$as_me:9405: \$? = $ac_status" >&5
++  echo "$as_me:9279: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8638: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9408: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9282: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8641: \$? = $ac_status" >&5
-+  echo "$as_me:9411: \$? = $ac_status" >&5
++  echo "$as_me:9285: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_mbstate_t=yes
  else
-@@ -8650,7 +9420,7 @@
+@@ -8650,7 +9294,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:8653: result: $cf_cv_mbstate_t" >&5
-+echo "$as_me:9423: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:9297: result: $cf_cv_mbstate_t" >&5
  echo "${ECHO_T}$cf_cv_mbstate_t" >&6
  
  if test "$cf_cv_mbstate_t" = yes ; then
-@@ -8667,14 +9437,14 @@
+@@ -8667,14 +9311,14 @@
  fi
  
  # This is needed on Tru64 5.0 to declare wchar_t
 -echo "$as_me:8670: checking if we must include wchar.h to declare wchar_t" >&5
-+echo "$as_me:9440: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:9314: checking if we must include wchar.h to declare wchar_t" >&5
  echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
  if test "${cf_cv_wchar_t+set}" = set; then
@@ -18414 +21185 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 8677 "configure"
-+#line 9447 "configure"
++#line 9321 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -8692,23 +9462,23 @@
+@@ -8692,23 +9336,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8695: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9465: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9339: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8698: \$? = $ac_status" >&5
-+  echo "$as_me:9468: \$? = $ac_status" >&5
++  echo "$as_me:9342: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8701: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9471: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9345: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8704: \$? = $ac_status" >&5
-+  echo "$as_me:9474: \$? = $ac_status" >&5
++  echo "$as_me:9348: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_wchar_t=no
@@ -18443 +21214 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 8711 "configure"
-+#line 9481 "configure"
++#line 9355 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -8727,16 +9497,16 @@
+@@ -8727,16 +9371,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8730: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9500: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9374: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8733: \$? = $ac_status" >&5
-+  echo "$as_me:9503: \$? = $ac_status" >&5
++  echo "$as_me:9377: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8736: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9506: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9380: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8739: \$? = $ac_status" >&5
-+  echo "$as_me:9509: \$? = $ac_status" >&5
++  echo "$as_me:9383: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_wchar_t=yes
  else
-@@ -8748,7 +9518,7 @@
+@@ -8748,7 +9392,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:8751: result: $cf_cv_wchar_t" >&5
-+echo "$as_me:9521: result: $cf_cv_wchar_t" >&5
++echo "$as_me:9395: result: $cf_cv_wchar_t" >&5
  echo "${ECHO_T}$cf_cv_wchar_t" >&6
  
  if test "$cf_cv_wchar_t" = yes ; then
-@@ -8770,14 +9540,14 @@
+@@ -8770,14 +9414,14 @@
  fi
  
  # This is needed on Tru64 5.0 to declare wint_t
 -echo "$as_me:8773: checking if we must include wchar.h to declare wint_t" >&5
-+echo "$as_me:9543: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:9417: checking if we must include wchar.h to declare wint_t" >&5
  echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
  if test "${cf_cv_wint_t+set}" = set; then
@@ -18490 +21261 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 8780 "configure"
-+#line 9550 "configure"
++#line 9424 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -8795,23 +9565,23 @@
+@@ -8795,23 +9439,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8798: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9568: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9442: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8801: \$? = $ac_status" >&5
-+  echo "$as_me:9571: \$? = $ac_status" >&5
++  echo "$as_me:9445: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8804: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9574: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9448: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8807: \$? = $ac_status" >&5
-+  echo "$as_me:9577: \$? = $ac_status" >&5
++  echo "$as_me:9451: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_wint_t=no
@@ -18519 +21290 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 8814 "configure"
-+#line 9584 "configure"
++#line 9458 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -8830,16 +9600,16 @@
+@@ -8830,16 +9474,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8833: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9603: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9477: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8836: \$? = $ac_status" >&5
-+  echo "$as_me:9606: \$? = $ac_status" >&5
++  echo "$as_me:9480: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8839: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9609: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9483: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8842: \$? = $ac_status" >&5
-+  echo "$as_me:9612: \$? = $ac_status" >&5
++  echo "$as_me:9486: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_wint_t=yes
  else
-@@ -8851,7 +9621,7 @@
+@@ -8851,7 +9495,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:8854: result: $cf_cv_wint_t" >&5
-+echo "$as_me:9624: result: $cf_cv_wint_t" >&5
++echo "$as_me:9498: result: $cf_cv_wint_t" >&5
  echo "${ECHO_T}$cf_cv_wint_t" >&6
  
  if test "$cf_cv_wint_t" = yes ; then
-@@ -8890,7 +9660,7 @@
+@@ -8890,7 +9534,7 @@
         ;;
  esac
  
 -echo "$as_me:8893: checking whether to enable _LP64 definition in curses.h" >&5
-+echo "$as_me:9663: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:9537: checking whether to enable _LP64 definition in curses.h" >&5
  echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
  
  # Check whether --enable-lp64 or --disable-lp64 was given.
-@@ -8900,7 +9670,7 @@
+@@ -8900,7 +9544,7 @@
  else
    with_lp64=$default_with_lp64
  fi;
 -echo "$as_me:8903: result: $with_lp64" >&5
-+echo "$as_me:9673: result: $with_lp64" >&5
++echo "$as_me:9547: result: $with_lp64" >&5
  echo "${ECHO_T}$with_lp64" >&6
  
  if test "$with_lp64" = yes ; then
-@@ -8916,7 +9686,7 @@
+@@ -8916,7 +9560,7 @@
  fi;
  if test "$enable_largefile" != no; then
  
 -  echo "$as_me:8919: checking for special C compiler options needed for large files" >&5
-+  echo "$as_me:9689: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:9563: checking for special C compiler options needed for large files" >&5
  echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
  if test "${ac_cv_sys_largefile_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8928,7 +9698,7 @@
+@@ -8928,7 +9572,7 @@
          # IRIX 6.2 and later do not support large files by default,
          # so use the C compiler's -n32 option if that helps.
           cat >conftest.$ac_ext <<_ACEOF
 -#line 8931 "configure"
-+#line 9701 "configure"
++#line 9575 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
   /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -8948,16 +9718,16 @@
+@@ -8948,16 +9592,16 @@
  }
  _ACEOF
          rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8951: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9721: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9595: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8954: \$? = $ac_status" >&5
-+  echo "$as_me:9724: \$? = $ac_status" >&5
++  echo "$as_me:9598: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8957: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9727: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9601: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8960: \$? = $ac_status" >&5
-+  echo "$as_me:9730: \$? = $ac_status" >&5
++  echo "$as_me:9604: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -8967,16 +9737,16 @@
+@@ -8967,16 +9611,16 @@
  rm -f conftest.$ac_objext
          CC="$CC -n32"
          rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:8970: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9740: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9614: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:8973: \$? = $ac_status" >&5
-+  echo "$as_me:9743: \$? = $ac_status" >&5
++  echo "$as_me:9617: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:8976: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9746: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9620: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:8979: \$? = $ac_status" >&5
-+  echo "$as_me:9749: \$? = $ac_status" >&5
++  echo "$as_me:9623: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sys_largefile_CC=' -n32'; break
  else
-@@ -8990,13 +9760,13 @@
+@@ -8990,13 +9634,13 @@
         rm -f conftest.$ac_ext
      fi
  fi
 -echo "$as_me:8993: result: $ac_cv_sys_largefile_CC" >&5
-+echo "$as_me:9763: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:9637: 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
@@ -18643 +21414 @@
  
 -  echo "$as_me:8999: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+  echo "$as_me:9769: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:9643: checking for _FILE_OFFSET_BITS value needed for large files" >&5
  echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
  if test "${ac_cv_sys_file_offset_bits+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9004,7 +9774,7 @@
+@@ -9004,7 +9648,7 @@
    while :; do
    ac_cv_sys_file_offset_bits=no
    cat >conftest.$ac_ext <<_ACEOF
 -#line 9007 "configure"
-+#line 9777 "configure"
++#line 9651 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
   /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -9024,16 +9794,16 @@
+@@ -9024,16 +9668,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:9027: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9797: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9671: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:9030: \$? = $ac_status" >&5
-+  echo "$as_me:9800: \$? = $ac_status" >&5
++  echo "$as_me:9674: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:9033: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9803: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9677: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9036: \$? = $ac_status" >&5
-+  echo "$as_me:9806: \$? = $ac_status" >&5
++  echo "$as_me:9680: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -9042,7 +9812,7 @@
+@@ -9042,7 +9686,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
 -#line 9045 "configure"
-+#line 9815 "configure"
++#line 9689 "configure"
  #include "confdefs.h"
  #define _FILE_OFFSET_BITS 64
  #include <sys/types.h>
-@@ -9063,16 +9833,16 @@
+@@ -9063,16 +9707,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:9066: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9836: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9710: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:9069: \$? = $ac_status" >&5
-+  echo "$as_me:9839: \$? = $ac_status" >&5
++  echo "$as_me:9713: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:9072: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9842: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9716: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9075: \$? = $ac_status" >&5
-+  echo "$as_me:9845: \$? = $ac_status" >&5
++  echo "$as_me:9719: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sys_file_offset_bits=64; break
  else
-@@ -9083,7 +9853,7 @@
+@@ -9083,7 +9727,7 @@
    break
  done
  fi
 -echo "$as_me:9086: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "$as_me:9856: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:9730: 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
  
-@@ -9093,7 +9863,7 @@
+@@ -9093,7 +9737,7 @@
  
  fi
  rm -rf conftest*
 -  echo "$as_me:9096: checking for _LARGE_FILES value needed for large files" >&5
-+  echo "$as_me:9866: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:9740: checking for _LARGE_FILES value needed for large files" >&5
  echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
  if test "${ac_cv_sys_large_files+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9101,7 +9871,7 @@
+@@ -9101,7 +9745,7 @@
    while :; do
    ac_cv_sys_large_files=no
    cat >conftest.$ac_ext <<_ACEOF
 -#line 9104 "configure"
-+#line 9874 "configure"
++#line 9748 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
   /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -9121,16 +9891,16 @@
+@@ -9121,16 +9765,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:9124: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9894: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9768: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:9127: \$? = $ac_status" >&5
-+  echo "$as_me:9897: \$? = $ac_status" >&5
++  echo "$as_me:9771: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:9130: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9900: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9774: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9133: \$? = $ac_status" >&5
-+  echo "$as_me:9903: \$? = $ac_status" >&5
++  echo "$as_me:9777: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -9139,7 +9909,7 @@
+@@ -9139,7 +9783,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
 -#line 9142 "configure"
-+#line 9912 "configure"
++#line 9786 "configure"
  #include "confdefs.h"
  #define _LARGE_FILES 1
  #include <sys/types.h>
-@@ -9160,16 +9930,16 @@
+@@ -9160,16 +9804,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:9163: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9933: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9807: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:9166: \$? = $ac_status" >&5
-+  echo "$as_me:9936: \$? = $ac_status" >&5
++  echo "$as_me:9810: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:9169: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9939: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9813: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9172: \$? = $ac_status" >&5
-+  echo "$as_me:9942: \$? = $ac_status" >&5
++  echo "$as_me:9816: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sys_large_files=1; break
  else
-@@ -9180,7 +9950,7 @@
+@@ -9180,7 +9824,7 @@
    break
  done
  fi
 -echo "$as_me:9183: result: $ac_cv_sys_large_files" >&5
-+echo "$as_me:9953: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:9827: 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
  
-@@ -9193,7 +9963,7 @@
+@@ -9193,7 +9837,7 @@
  fi
  
      if test "$enable_largefile" != no ; then
 -       echo "$as_me:9196: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+       echo "$as_me:9966: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++       echo "$as_me:9840: checking for _LARGEFILE_SOURCE value needed for large files" >&5
  echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
  if test "${ac_cv_sys_largefile_source+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9201,7 +9971,7 @@
+@@ -9201,7 +9845,7 @@
    while :; do
    ac_cv_sys_largefile_source=no
    cat >conftest.$ac_ext <<_ACEOF
 -#line 9204 "configure"
-+#line 9974 "configure"
++#line 9848 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -9213,16 +9983,16 @@
+@@ -9213,16 +9857,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:9216: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9986: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9860: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:9219: \$? = $ac_status" >&5
-+  echo "$as_me:9989: \$? = $ac_status" >&5
++  echo "$as_me:9863: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:9222: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9992: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9866: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9225: \$? = $ac_status" >&5
-+  echo "$as_me:9995: \$? = $ac_status" >&5
++  echo "$as_me:9869: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
-@@ -9231,7 +10001,7 @@
+@@ -9231,7 +9875,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
 -#line 9234 "configure"
-+#line 10004 "configure"
++#line 9878 "configure"
  #include "confdefs.h"
  #define _LARGEFILE_SOURCE 1
  #include <stdio.h>
-@@ -9244,16 +10014,16 @@
+@@ -9244,16 +9888,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:9247: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10017: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9891: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:9250: \$? = $ac_status" >&5
-+  echo "$as_me:10020: \$? = $ac_status" >&5
++  echo "$as_me:9894: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:9253: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10023: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9897: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9256: \$? = $ac_status" >&5
-+  echo "$as_me:10026: \$? = $ac_status" >&5
++  echo "$as_me:9900: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sys_largefile_source=1; break
  else
-@@ -9264,7 +10034,7 @@
+@@ -9264,7 +9908,7 @@
    break
  done
  fi
 -echo "$as_me:9267: result: $ac_cv_sys_largefile_source" >&5
-+echo "$as_me:10037: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:9911: 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
  
-@@ -9278,13 +10048,13 @@
+@@ -9278,13 +9922,13 @@
  # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
  # in glibc 2.1.3, but that breaks too many other things.
  # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
 -echo "$as_me:9281: checking for fseeko" >&5
-+echo "$as_me:10051: checking for fseeko" >&5
++echo "$as_me:9925: checking for fseeko" >&5
  echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
  if test "${ac_cv_func_fseeko+set}" = set; then
@@ -18884 +21655 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 9287 "configure"
-+#line 10057 "configure"
++#line 9931 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -9296,16 +10066,16 @@
+@@ -9296,16 +9940,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:9299: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10069: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9943: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:9302: \$? = $ac_status" >&5
-+  echo "$as_me:10072: \$? = $ac_status" >&5
++  echo "$as_me:9946: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:9305: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10075: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9949: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9308: \$? = $ac_status" >&5
-+  echo "$as_me:10078: \$? = $ac_status" >&5
++  echo "$as_me:9952: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_fseeko=yes
  else
-@@ -9315,7 +10085,7 @@
+@@ -9315,7 +9959,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:9318: result: $ac_cv_func_fseeko" >&5
-+echo "$as_me:10088: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:9962: result: $ac_cv_func_fseeko" >&5
  echo "${ECHO_T}$ac_cv_func_fseeko" >&6
  if test $ac_cv_func_fseeko = yes; then
  
-@@ -9336,14 +10106,14 @@
+@@ -9336,14 +9980,14 @@
         test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
         test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
  
 -       echo "$as_me:9339: checking whether to use struct dirent64" >&5
-+       echo "$as_me:10109: checking whether to use struct dirent64" >&5
++       echo "$as_me:9983: 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
@@ -18931 +21702 @@
                 cat >conftest.$ac_ext <<_ACEOF
 -#line 9346 "configure"
-+#line 10116 "configure"
++#line 9990 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -9364,16 +10134,16 @@
+@@ -9364,16 +10008,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:9367: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10137: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10011: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:9370: \$? = $ac_status" >&5
-+  echo "$as_me:10140: \$? = $ac_status" >&5
++  echo "$as_me:10014: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:9373: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10143: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10017: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:9376: \$? = $ac_status" >&5
-+  echo "$as_me:10146: \$? = $ac_status" >&5
++  echo "$as_me:10020: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_struct_dirent64=yes
  else
-@@ -9384,7 +10154,7 @@
+@@ -9384,7 +10028,7 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
 -echo "$as_me:9387: result: $cf_cv_struct_dirent64" >&5
-+echo "$as_me:10157: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:10031: result: $cf_cv_struct_dirent64" >&5
  echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
         test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF
  #define HAVE_STRUCT_DIRENT64 1
-@@ -9393,7 +10163,7 @@
+@@ -9393,7 +10037,7 @@
      fi
  
  ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
 -echo "$as_me:9396: checking if you want tparm not to use X/Open fixed-parameter list" >&5
-+echo "$as_me:10166: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:10040: checking if you want tparm not to use X/Open fixed-parameter list" >&5
  echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6
  
  # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given.
-@@ -9403,14 +10173,14 @@
+@@ -9403,14 +10047,14 @@
  else
    with_tparm_varargs=yes
  fi;
 -echo "$as_me:9406: result: $with_tparm_varargs" >&5
-+echo "$as_me:10176: result: $with_tparm_varargs" >&5
++echo "$as_me:10050: result: $with_tparm_varargs" >&5
  echo "${ECHO_T}$with_tparm_varargs" >&6
  NCURSES_TPARM_VARARGS=0
@@ -18987 +21758 @@
  if test "$with_ticlib" != no ; then
 -echo "$as_me:9413: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
-+echo "$as_me:10183: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:10057: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
  echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6
  
  # Check whether --enable-tic-depends or --disable-tic-depends was given.
-@@ -9420,14 +10190,14 @@
+@@ -9420,14 +10064,14 @@
  else
    with_tic_depends=yes
  fi;
 -echo "$as_me:9423: result: $with_tic_depends" >&5
-+echo "$as_me:10193: result: $with_tic_depends" >&5
++echo "$as_me:10067: result: $with_tic_depends" >&5
  echo "${ECHO_T}$with_tic_depends" >&6
  else
@@ -19004 +21775 @@
  ###   use option --with-bool to override bool's type
 -echo "$as_me:9430: checking for type of bool" >&5
-+echo "$as_me:10200: checking for type of bool" >&5
++echo "$as_me:10074: checking for type of bool" >&5
  echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
  
  # Check whether --with-bool or --without-bool was given.
-@@ -9437,10 +10207,10 @@
+@@ -9437,10 +10081,10 @@
  else
    NCURSES_BOOL=auto
  fi;
 -echo "$as_me:9440: result: $NCURSES_BOOL" >&5
-+echo "$as_me:10210: result: $NCURSES_BOOL" >&5
++echo "$as_me:10084: result: $NCURSES_BOOL" >&5
  echo "${ECHO_T}$NCURSES_BOOL" >&6
  
 -echo "$as_me:9443: checking for alternate terminal capabilities file" >&5
-+echo "$as_me:10213: checking for alternate terminal capabilities file" >&5
++echo "$as_me:10087: checking for alternate terminal capabilities file" >&5
  echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
  
  # Check whether --with-caps or --without-caps was given.
-@@ -9451,11 +10221,11 @@
+@@ -9451,11 +10095,11 @@
    TERMINFO_CAPS=Caps
  fi;
  test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
 -echo "$as_me:9454: result: $TERMINFO_CAPS" >&5
-+echo "$as_me:10224: result: $TERMINFO_CAPS" >&5
++echo "$as_me:10098: result: $TERMINFO_CAPS" >&5
  echo "${ECHO_T}$TERMINFO_CAPS" >&6
  
  ###   use option --with-chtype to override chtype's type
 -echo "$as_me:9458: checking for type of chtype" >&5
-+echo "$as_me:10228: checking for type of chtype" >&5
++echo "$as_me:10102: checking for type of chtype" >&5
  echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
  
  # Check whether --with-chtype or --without-chtype was given.
-@@ -9465,11 +10235,11 @@
+@@ -9465,11 +10109,11 @@
  else
    NCURSES_CHTYPE=auto
  fi;
 -echo "$as_me:9468: result: $NCURSES_CHTYPE" >&5
-+echo "$as_me:10238: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:10112: result: $NCURSES_CHTYPE" >&5
  echo "${ECHO_T}$NCURSES_CHTYPE" >&6
  
  ###   use option --with-ospeed to override ospeed's type
 -echo "$as_me:9472: checking for type of ospeed" >&5
-+echo "$as_me:10242: checking for type of ospeed" >&5
++echo "$as_me:10116: checking for type of ospeed" >&5
  echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
  
  # Check whether --with-ospeed or --without-ospeed was given.
-@@ -9479,11 +10249,11 @@
+@@ -9479,11 +10123,11 @@
  else
    NCURSES_OSPEED=short
  fi;
 -echo "$as_me:9482: result: $NCURSES_OSPEED" >&5
-+echo "$as_me:10252: result: $NCURSES_OSPEED" >&5
++echo "$as_me:10126: result: $NCURSES_OSPEED" >&5
  echo "${ECHO_T}$NCURSES_OSPEED" >&6
  
  ###   use option --with-mmask-t to override mmask_t's type
 -echo "$as_me:9486: checking for type of mmask_t" >&5
-+echo "$as_me:10256: checking for type of mmask_t" >&5
++echo "$as_me:10130: checking for type of mmask_t" >&5
  echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
  
  # Check whether --with-mmask-t or --without-mmask-t was given.
-@@ -9493,11 +10263,11 @@
+@@ -9493,11 +10137,11 @@
  else
    NCURSES_MMASK_T=auto
  fi;
 -echo "$as_me:9496: result: $NCURSES_MMASK_T" >&5
-+echo "$as_me:10266: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:10140: result: $NCURSES_MMASK_T" >&5
  echo "${ECHO_T}$NCURSES_MMASK_T" >&6
  
  ###   use option --with-ccharw-max to override CCHARW_MAX size
 -echo "$as_me:9500: checking for size CCHARW_MAX" >&5
-+echo "$as_me:10270: checking for size CCHARW_MAX" >&5
++echo "$as_me:10144: checking for size CCHARW_MAX" >&5
  echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6
  
  # Check whether --with-ccharw-max or --without-ccharw-max was given.
-@@ -9507,11 +10277,11 @@
+@@ -9507,11 +10151,25 @@
  else
    NCURSES_CCHARW_MAX=5
  fi;
 -echo "$as_me:9510: result: $NCURSES_CCHARW_MAX" >&5
-+echo "$as_me:10280: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:10154: result: $NCURSES_CCHARW_MAX" >&5
  echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
  
++###   use option --with-tparm-arg to override tparm's argument type
++echo "$as_me:10158: checking for type of tparm args" >&5
++echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6
++
++# Check whether --with-tparm-arg or --without-tparm-arg was given.
++if test "${with_tparm_arg+set}" = set; then
++  withval="$with_tparm_arg"
++  NCURSES_TPARM_ARG="$withval"
++else
++  NCURSES_TPARM_ARG=long
++fi;
++echo "$as_me:10168: result: $NCURSES_TPARM_ARG" >&5
++echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
++
  ### Enable compiling-in rcs id's
 -echo "$as_me:9514: checking if RCS identifiers should be compiled-in" >&5
-+echo "$as_me:10284: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:10172: checking if RCS identifiers should be compiled-in" >&5
  echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
  
  # Check whether --with-rcs-ids or --without-rcs-ids was given.
-@@ -9521,7 +10291,7 @@
+@@ -9521,7 +10179,7 @@
  else
    with_rcs_ids=no
  fi;
 -echo "$as_me:9524: result: $with_rcs_ids" >&5
-+echo "$as_me:10294: result: $with_rcs_ids" >&5
++echo "$as_me:10182: result: $with_rcs_ids" >&5
  echo "${ECHO_T}$with_rcs_ids" >&6
  test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF
  #define USE_RCS_IDS 1
-@@ -9529,7 +10299,7 @@
+@@ -9529,7 +10187,7 @@
  
  ###############################################################################
  
 -echo "$as_me:9532: checking format of man-pages" >&5
-+echo "$as_me:10302: checking format of man-pages" >&5
++echo "$as_me:10190: checking format of man-pages" >&5
  echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
  
  # Check whether --with-manpage-format or --without-manpage-format was given.
-@@ -9618,14 +10388,14 @@
+@@ -9618,14 +10276,14 @@
    ;;
  esac
  
 -echo "$as_me:9621: result: $MANPAGE_FORMAT" >&5
-+echo "$as_me:10391: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:10279: result: $MANPAGE_FORMAT" >&5
  echo "${ECHO_T}$MANPAGE_FORMAT" >&6
  if test -n "$cf_unknown" ; then
 -  { echo "$as_me:9624: WARNING: Unexpected manpage-format $cf_unknown" >&5
-+  { echo "$as_me:10394: WARNING: Unexpected manpage-format $cf_unknown" >&5
++  { echo "$as_me:10282: WARNING: Unexpected manpage-format $cf_unknown" >&5
  echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
  fi
  
 -echo "$as_me:9628: checking for manpage renaming" >&5
-+echo "$as_me:10398: checking for manpage renaming" >&5
++echo "$as_me:10286: checking for manpage renaming" >&5
  echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
  
  # Check whether --with-manpage-renames or --without-manpage-renames was given.
-@@ -9653,7 +10423,7 @@
+@@ -9653,7 +10311,7 @@
    if test -f $srcdir/man/$MANPAGE_RENAMES ; then
      MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
    elif test ! -f $MANPAGE_RENAMES ; then
 -    { { echo "$as_me:9656: error: not a filename: $MANPAGE_RENAMES" >&5
-+    { { echo "$as_me:10426: error: not a filename: $MANPAGE_RENAMES" >&5
++    { { echo "$as_me:10314: error: not a filename: $MANPAGE_RENAMES" >&5
  echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
     { (exit 1); exit 1; }; }
    fi
-@@ -9667,10 +10437,10 @@
+@@ -9667,10 +10325,10 @@
    fi
  fi
  
 -echo "$as_me:9670: result: $MANPAGE_RENAMES" >&5
-+echo "$as_me:10440: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:10328: result: $MANPAGE_RENAMES" >&5
  echo "${ECHO_T}$MANPAGE_RENAMES" >&6
  
 -echo "$as_me:9673: checking if manpage aliases will be installed" >&5
-+echo "$as_me:10443: checking if manpage aliases will be installed" >&5
++echo "$as_me:10331: checking if manpage aliases will be installed" >&5
  echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
  
  # Check whether --with-manpage-aliases or --without-manpage-aliases was given.
-@@ -9681,7 +10451,7 @@
+@@ -9681,7 +10339,7 @@
    MANPAGE_ALIASES=yes
  fi;
  
 -echo "$as_me:9684: result: $MANPAGE_ALIASES" >&5
-+echo "$as_me:10454: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:10342: result: $MANPAGE_ALIASES" >&5
  echo "${ECHO_T}$MANPAGE_ALIASES" >&6
  
  case "x$LN_S" in #(vi
-@@ -9695,7 +10465,7 @@
+@@ -9695,7 +10353,7 @@
  
  MANPAGE_SYMLINKS=no
  if test "$MANPAGE_ALIASES" = yes ; then
 -echo "$as_me:9698: checking if manpage symlinks should be used" >&5
-+echo "$as_me:10468: checking if manpage symlinks should be used" >&5
++echo "$as_me:10356: checking if manpage symlinks should be used" >&5
  echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
  
  # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
-@@ -9708,17 +10478,17 @@
+@@ -9708,17 +10366,17 @@
  
  if test "$$cf_use_symlinks" = no; then
  if test "$MANPAGE_SYMLINKS" = yes ; then
 -       { echo "$as_me:9711: WARNING: cannot make symlinks" >&5
-+       { echo "$as_me:10481: WARNING: cannot make symlinks" >&5
++       { echo "$as_me:10369: WARNING: cannot make symlinks" >&5
  echo "$as_me: WARNING: cannot make symlinks" >&2;}
         MANPAGE_SYMLINKS=no
@@ -19179 +21964 @@
  
 -echo "$as_me:9717: result: $MANPAGE_SYMLINKS" >&5
-+echo "$as_me:10487: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:10375: result: $MANPAGE_SYMLINKS" >&5
  echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
  fi
  
 -echo "$as_me:9721: checking for manpage tbl" >&5
-+echo "$as_me:10491: checking for manpage tbl" >&5
++echo "$as_me:10379: checking for manpage tbl" >&5
  echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
  
  # Check whether --with-manpage-tbl or --without-manpage-tbl was given.
-@@ -9729,7 +10499,7 @@
+@@ -9729,7 +10387,7 @@
    MANPAGE_TBL=no
  fi;
  
 -echo "$as_me:9732: result: $MANPAGE_TBL" >&5
-+echo "$as_me:10502: result: $MANPAGE_TBL" >&5
++echo "$as_me:10390: result: $MANPAGE_TBL" >&5
  echo "${ECHO_T}$MANPAGE_TBL" >&6
  
    if test "$prefix" = "NONE" ; then
-@@ -9869,7 +10639,9 @@
+@@ -9776,6 +10434,7 @@
+ # this script is generated by the configure-script CF_MAN_PAGES macro.
+ 
+ prefix="$cf_prefix"
++datarootdir="$datarootdir"
+ datadir="$datadir"
+ 
+ NCURSES_MAJOR="$NCURSES_MAJOR"
+@@ -9869,7 +10528,9 @@
  
  if test "$MANPAGE_ALIASES" != no ; then
@@ -19208 +22001 @@
  fi
  
-@@ -9915,6 +10687,13 @@
+@@ -9915,6 +10576,13 @@
  fi
  CF_EOF
@@ -19222 +22015 @@
  cat >>$cf_edit_man <<CF_EOF
         sed -e "/\#[    ]*include/s,curses.h,ncurses.h," < \$TMP >\$TMP.out
-@@ -10051,7 +10830,7 @@
+@@ -10051,7 +10719,7 @@
  ###############################################################################
  
  ### Note that some functions (such as const) are normally disabled anyway.
 -echo "$as_me:10054: checking if you want to build with function extensions" >&5
-+echo "$as_me:10833: checking if you want to build with function extensions" >&5
++echo "$as_me:10722: checking if you want to build with function extensions" >&5
  echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
  
  # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
-@@ -10061,11 +10840,15 @@
+@@ -10061,11 +10729,15 @@
  else
    with_ext_funcs=yes
  fi;
 -echo "$as_me:10064: result: $with_ext_funcs" >&5
-+echo "$as_me:10843: result: $with_ext_funcs" >&5
++echo "$as_me:10732: result: $with_ext_funcs" >&5
  echo "${ECHO_T}$with_ext_funcs" >&6
  if test "$with_ext_funcs" = yes ; then
@@ -19248 +22041 @@
  EOF
  
-@@ -10090,6 +10873,14 @@
+@@ -10090,6 +10762,14 @@
  EOF
  
@@ -19263 +22056 @@
  EOF
  
-@@ -10103,7 +10894,7 @@
+@@ -10103,7 +10783,7 @@
         GENERATED_EXT_FUNCS=
  fi
  
 -echo "$as_me:10106: checking if you want to build with experimental SCREEN extensions" >&5
-+echo "$as_me:10897: checking if you want to build with experimental SCREEN extensions" >&5
++echo "$as_me:10786: checking if you want to build with experimental SCREEN extensions" >&5
  echo $ECHO_N "checking if you want to build with experimental SCREEN extensions... $ECHO_C" >&6
  
  # Check whether --enable-sp-funcs or --disable-sp-funcs was given.
-@@ -10113,7 +10904,7 @@
+@@ -10113,7 +10793,7 @@
  else
    with_sp_funcs=no
  fi;
 -echo "$as_me:10116: result: $with_sp_funcs" >&5
-+echo "$as_me:10907: result: $with_sp_funcs" >&5
++echo "$as_me:10796: result: $with_sp_funcs" >&5
  echo "${ECHO_T}$with_sp_funcs" >&6
  if test "$with_sp_funcs" = yes ; then
         NCURSES_SP_FUNCS=1
-@@ -10127,7 +10918,7 @@
+@@ -10127,7 +10807,7 @@
         GENERATED_SP_FUNCS=
  fi
  
 -echo "$as_me:10130: checking if you want to build with experimental terminal-driver" >&5
-+echo "$as_me:10921: checking if you want to build with experimental terminal-driver" >&5
++echo "$as_me:10810: checking if you want to build with experimental terminal-driver" >&5
  echo $ECHO_N "checking if you want to build with experimental terminal-driver... $ECHO_C" >&6
  
  # Check whether --enable-term-driver or --disable-term-driver was given.
-@@ -10137,7 +10928,7 @@
+@@ -10137,7 +10817,7 @@
  else
    with_term_driver=no
  fi;
 -echo "$as_me:10140: result: $with_term_driver" >&5
-+echo "$as_me:10931: result: $with_term_driver" >&5
++echo "$as_me:10820: result: $with_term_driver" >&5
  echo "${ECHO_T}$with_term_driver" >&6
  if test "$with_term_driver" = yes ; then
         cat >>confdefs.h <<\EOF
-@@ -10145,14 +10936,14 @@
+@@ -10145,14 +10825,14 @@
  EOF
  
         if test "$with_sp_funcs" != yes ; then
 -               { { echo "$as_me:10148: error: The term-driver option relies upon sp-funcs" >&5
-+               { { echo "$as_me:10939: error: The term-driver option relies upon sp-funcs" >&5
++               { { echo "$as_me:10828: error: The term-driver option relies upon sp-funcs" >&5
  echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;}
     { (exit 1); exit 1; }; }
@@ -19312 +22105 @@
  ###   use option --enable-const to turn on use of const beyond that in XSI.
 -echo "$as_me:10155: checking for extended use of const keyword" >&5
-+echo "$as_me:10946: checking for extended use of const keyword" >&5
++echo "$as_me:10835: checking for extended use of const keyword" >&5
  echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
  
  # Check whether --enable-const or --disable-const was given.
-@@ -10162,7 +10953,7 @@
+@@ -10162,7 +10842,7 @@
  else
    with_ext_const=no
  fi;
 -echo "$as_me:10165: result: $with_ext_const" >&5
-+echo "$as_me:10956: result: $with_ext_const" >&5
++echo "$as_me:10845: result: $with_ext_const" >&5
  echo "${ECHO_T}$with_ext_const" >&6
  NCURSES_CONST='/*nothing*/'
  if test "$with_ext_const" = yes ; then
-@@ -10170,7 +10961,7 @@
+@@ -10170,7 +10850,7 @@
  fi
  
  ###   use option --enable-ext-colors to turn on use of colors beyond 16.
 -echo "$as_me:10173: checking if you want to use extended colors" >&5
-+echo "$as_me:10964: checking if you want to use extended colors" >&5
++echo "$as_me:10853: checking if you want to use extended colors" >&5
  echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6
  
  # Check whether --enable-ext-colors or --disable-ext-colors was given.
-@@ -10180,12 +10971,12 @@
+@@ -10180,12 +10860,12 @@
  else
    with_ext_colors=no
  fi;
 -echo "$as_me:10183: result: $with_ext_colors" >&5
-+echo "$as_me:10974: result: $with_ext_colors" >&5
++echo "$as_me:10863: result: $with_ext_colors" >&5
  echo "${ECHO_T}$with_ext_colors" >&6
  NCURSES_EXT_COLORS=0
@@ -19345 +22138 @@
         if test "$with_widec" != yes ; then
 -               { { echo "$as_me:10188: error: This option applies only to wide-character library" >&5
-+               { { echo "$as_me:10979: error: This option applies only to wide-character library" >&5
++               { { echo "$as_me:10868: error: This option applies only to wide-character library" >&5
  echo "$as_me: error: This option applies only to wide-character library" >&2;}
     { (exit 1); exit 1; }; }
         else
-@@ -10196,7 +10987,7 @@
+@@ -10196,7 +10876,7 @@
         5.*)
                 cf_cv_rel_version=6.0
                 cf_cv_abi_version=6
 -               { echo "$as_me:10199: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
-+               { echo "$as_me:10990: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
++               { echo "$as_me:10879: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
  echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
                 ;;
         esac
-@@ -10211,7 +11002,7 @@
+@@ -10211,7 +10891,7 @@
  fi
  
  ###   use option --enable-ext-mouse to modify coding to support 5-button mice
 -echo "$as_me:10214: checking if you want to use extended mouse encoding" >&5
-+echo "$as_me:11005: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:10894: checking if you want to use extended mouse encoding" >&5
  echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6
  
  # Check whether --enable-ext-mouse or --disable-ext-mouse was given.
-@@ -10221,7 +11012,7 @@
+@@ -10221,7 +10901,7 @@
  else
    with_ext_mouse=no
  fi;
 -echo "$as_me:10224: result: $with_ext_mouse" >&5
-+echo "$as_me:11015: result: $with_ext_mouse" >&5
++echo "$as_me:10904: result: $with_ext_mouse" >&5
  echo "${ECHO_T}$with_ext_mouse" >&6
  NCURSES_MOUSE_VERSION=1
  if test "$with_ext_mouse" = yes ; then
-@@ -10232,7 +11023,7 @@
+@@ -10232,7 +10912,7 @@
         5.*)
                 cf_cv_rel_version=6.0
                 cf_cv_abi_version=6
 -               { echo "$as_me:10235: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
-+               { echo "$as_me:11026: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
++               { echo "$as_me:10915: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
  echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
                 ;;
         esac
-@@ -10240,7 +11031,7 @@
+@@ -10240,7 +10920,7 @@
  
  fi
  
 -echo "$as_me:10243: checking if you want \$NCURSES_NO_PADDING code" >&5
-+echo "$as_me:11034: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:10923: checking if you want \$NCURSES_NO_PADDING code" >&5
  echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
  
  # Check whether --enable-no-padding or --disable-no-padding was given.
-@@ -10250,19 +11041,19 @@
+@@ -10250,19 +10930,19 @@
  else
    with_no_padding=$with_ext_funcs
  fi;
 -echo "$as_me:10253: result: $with_no_padding" >&5
-+echo "$as_me:11044: result: $with_no_padding" >&5
++echo "$as_me:10933: result: $with_no_padding" >&5
  echo "${ECHO_T}$with_no_padding" >&6
  test "$with_no_padding" = yes && cat >>confdefs.h <<\EOF
@@ -19406 +22199 @@
  
 -echo "$as_me:10259: checking for ANSI C header files" >&5
-+echo "$as_me:11050: checking for ANSI C header files" >&5
++echo "$as_me:10939: checking for ANSI C header files" >&5
  echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
  if test "${ac_cv_header_stdc+set}" = set; then
@@ -19413 +22206 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10265 "configure"
-+#line 11056 "configure"
++#line 10945 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -10270,13 +11061,13 @@
+@@ -10270,13 +10950,13 @@
  #include <float.h>
  
  _ACEOF
 -if { (eval echo "$as_me:10273: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:11064: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:10953: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -19429 +22222 @@
    cat conftest.err >&5
 -  echo "$as_me:10279: \$? = $ac_status" >&5
-+  echo "$as_me:11070: \$? = $ac_status" >&5
++  echo "$as_me:10959: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -10298,7 +11089,7 @@
+@@ -10298,7 +10978,7 @@
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10301 "configure"
-+#line 11092 "configure"
++#line 10981 "configure"
  #include "confdefs.h"
  #include <string.h>
  
-@@ -10316,7 +11107,7 @@
+@@ -10316,7 +10996,7 @@
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10319 "configure"
-+#line 11110 "configure"
++#line 10999 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  
-@@ -10337,7 +11128,7 @@
+@@ -10337,7 +11017,7 @@
    :
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10340 "configure"
-+#line 11131 "configure"
++#line 11020 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #if ((' ' & 0x0FF) == 0x020)
-@@ -10363,15 +11154,15 @@
+@@ -10363,15 +11043,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:10366: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11157: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11046: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:10369: \$? = $ac_status" >&5
-+  echo "$as_me:11160: \$? = $ac_status" >&5
++  echo "$as_me:11049: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:10371: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11162: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11051: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10374: \$? = $ac_status" >&5
-+  echo "$as_me:11165: \$? = $ac_status" >&5
++  echo "$as_me:11054: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -10384,7 +11175,7 @@
+@@ -10384,7 +11064,7 @@
  fi
  fi
  fi
 -echo "$as_me:10387: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:11178: result: $ac_cv_header_stdc" >&5
++echo "$as_me:11067: result: $ac_cv_header_stdc" >&5
  echo "${ECHO_T}$ac_cv_header_stdc" >&6
  if test $ac_cv_header_stdc = yes; then
  
-@@ -10400,28 +11191,28 @@
+@@ -10400,28 +11080,28 @@
                    inttypes.h stdint.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -echo "$as_me:10403: checking for $ac_header" >&5
-+echo "$as_me:11194: checking for $ac_header" >&5
++echo "$as_me:11083: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -19501 +22294 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10409 "configure"
-+#line 11200 "configure"
++#line 11089 "configure"
  #include "confdefs.h"
  $ac_includes_default
@@ -19508 +22301 @@
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:10415: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11206: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11095: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:10418: \$? = $ac_status" >&5
-+  echo "$as_me:11209: \$? = $ac_status" >&5
++  echo "$as_me:11098: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:10421: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11212: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11101: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10424: \$? = $ac_status" >&5
-+  echo "$as_me:11215: \$? = $ac_status" >&5
++  echo "$as_me:11104: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_Header=yes"
  else
-@@ -10431,7 +11222,7 @@
+@@ -10431,7 +11111,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:10434: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:11225: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:11114: result: `eval echo '${'$as_ac_Header'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<EOF
-@@ -10441,13 +11232,13 @@
+@@ -10441,13 +11121,13 @@
  fi
  done
  
 -echo "$as_me:10444: checking for signed char" >&5
-+echo "$as_me:11235: checking for signed char" >&5
++echo "$as_me:11124: checking for signed char" >&5
  echo $ECHO_N "checking for signed char... $ECHO_C" >&6
  if test "${ac_cv_type_signed_char+set}" = set; then
@@ -19545 +22338 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10450 "configure"
-+#line 11241 "configure"
++#line 11130 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -10462,16 +11253,16 @@
+@@ -10462,16 +11142,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:10465: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11256: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11145: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:10468: \$? = $ac_status" >&5
-+  echo "$as_me:11259: \$? = $ac_status" >&5
++  echo "$as_me:11148: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:10471: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11262: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11151: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10474: \$? = $ac_status" >&5
-+  echo "$as_me:11265: \$? = $ac_status" >&5
++  echo "$as_me:11154: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_signed_char=yes
  else
-@@ -10481,10 +11272,10 @@
+@@ -10481,10 +11161,10 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:10484: result: $ac_cv_type_signed_char" >&5
-+echo "$as_me:11275: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:11164: result: $ac_cv_type_signed_char" >&5
  echo "${ECHO_T}$ac_cv_type_signed_char" >&6
  
 -echo "$as_me:10487: checking size of signed char" >&5
-+echo "$as_me:11278: checking size of signed char" >&5
++echo "$as_me:11167: checking size of signed char" >&5
  echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
  if test "${ac_cv_sizeof_signed_char+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10493,7 +11284,7 @@
+@@ -10493,7 +11173,7 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
 -#line 10496 "configure"
-+#line 11287 "configure"
++#line 11176 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -10505,21 +11296,21 @@
+@@ -10505,21 +11185,21 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:10508: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11299: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11188: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:10511: \$? = $ac_status" >&5
-+  echo "$as_me:11302: \$? = $ac_status" >&5
++  echo "$as_me:11191: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:10514: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11305: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11194: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10517: \$? = $ac_status" >&5
-+  echo "$as_me:11308: \$? = $ac_status" >&5
++  echo "$as_me:11197: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_lo=0 ac_mid=0
@@ -19615 +22408 @@
      cat >conftest.$ac_ext <<_ACEOF
 -#line 10522 "configure"
-+#line 11313 "configure"
++#line 11202 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -10531,16 +11322,16 @@
+@@ -10531,16 +11211,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:10534: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11325: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11214: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:10537: \$? = $ac_status" >&5
-+  echo "$as_me:11328: \$? = $ac_status" >&5
++  echo "$as_me:11217: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:10540: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11331: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11220: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10543: \$? = $ac_status" >&5
-+  echo "$as_me:11334: \$? = $ac_status" >&5
++  echo "$as_me:11223: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_hi=$ac_mid; break
  else
-@@ -10556,7 +11347,7 @@
+@@ -10556,7 +11236,7 @@
  ac_hi=-1 ac_mid=-1
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
 -#line 10559 "configure"
-+#line 11350 "configure"
++#line 11239 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -10568,16 +11359,16 @@
+@@ -10568,16 +11248,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:10571: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11362: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11251: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:10574: \$? = $ac_status" >&5
-+  echo "$as_me:11365: \$? = $ac_status" >&5
++  echo "$as_me:11254: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:10577: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11368: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11257: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10580: \$? = $ac_status" >&5
-+  echo "$as_me:11371: \$? = $ac_status" >&5
++  echo "$as_me:11260: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_lo=$ac_mid; break
  else
-@@ -10593,7 +11384,7 @@
+@@ -10593,7 +11273,7 @@
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10596 "configure"
-+#line 11387 "configure"
++#line 11276 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -10605,16 +11396,16 @@
+@@ -10605,16 +11285,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:10608: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11399: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11288: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:10611: \$? = $ac_status" >&5
-+  echo "$as_me:11402: \$? = $ac_status" >&5
++  echo "$as_me:11291: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:10614: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11405: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11294: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10617: \$? = $ac_status" >&5
-+  echo "$as_me:11408: \$? = $ac_status" >&5
++  echo "$as_me:11297: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_hi=$ac_mid
  else
-@@ -10627,12 +11418,12 @@
+@@ -10627,12 +11307,12 @@
  ac_cv_sizeof_signed_char=$ac_lo
  else
    if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:10630: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:11421: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:11310: error: cannot run test program while cross compiling" >&5
  echo "$as_me: error: cannot run test program while cross compiling" >&2;}
     { (exit 1); exit 1; }; }
@@ -19711 +22504 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10635 "configure"
-+#line 11426 "configure"
++#line 11315 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -10648,15 +11439,15 @@
+@@ -10648,15 +11328,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:10651: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11442: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11331: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:10654: \$? = $ac_status" >&5
-+  echo "$as_me:11445: \$? = $ac_status" >&5
++  echo "$as_me:11334: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:10656: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11447: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11336: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10659: \$? = $ac_status" >&5
-+  echo "$as_me:11450: \$? = $ac_status" >&5
++  echo "$as_me:11339: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_sizeof_signed_char=`cat conftest.val`
  else
-@@ -10672,7 +11463,7 @@
+@@ -10672,7 +11352,7 @@
    ac_cv_sizeof_signed_char=0
  fi
  fi
 -echo "$as_me:10675: result: $ac_cv_sizeof_signed_char" >&5
-+echo "$as_me:11466: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:11355: result: $ac_cv_sizeof_signed_char" >&5
  echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
  cat >>confdefs.h <<EOF
  #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
-@@ -10683,7 +11474,7 @@
+@@ -10683,7 +11363,7 @@
  else
         NCURSES_SBOOL="char"
  fi
 -echo "$as_me:10686: checking if you want to use signed Boolean array in term.h" >&5
-+echo "$as_me:11477: checking if you want to use signed Boolean array in term.h" >&5
++echo "$as_me:11366: checking if you want to use signed Boolean array in term.h" >&5
  echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
  
  # Check whether --enable-signed-char or --disable-signed-char was given.
-@@ -10693,12 +11484,12 @@
+@@ -10693,12 +11373,12 @@
  else
    with_signed_char=no
  fi;
 -echo "$as_me:10696: result: $with_signed_char" >&5
-+echo "$as_me:11487: result: $with_signed_char" >&5
++echo "$as_me:11376: result: $with_signed_char" >&5
  echo "${ECHO_T}$with_signed_char" >&6
  test "$with_signed_char" != yes && NCURSES_SBOOL="char"
@@ -19764 +22557 @@
  ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
 -echo "$as_me:10701: checking if you want SIGWINCH handler" >&5
-+echo "$as_me:11492: checking if you want SIGWINCH handler" >&5
++echo "$as_me:11381: checking if you want SIGWINCH handler" >&5
  echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
  
  # Check whether --enable-sigwinch or --disable-sigwinch was given.
-@@ -10708,14 +11499,14 @@
+@@ -10708,14 +11388,14 @@
  else
    with_sigwinch=$with_ext_funcs
  fi;
 -echo "$as_me:10711: result: $with_sigwinch" >&5
-+echo "$as_me:11502: result: $with_sigwinch" >&5
++echo "$as_me:11391: result: $with_sigwinch" >&5
  echo "${ECHO_T}$with_sigwinch" >&6
  test "$with_sigwinch" = yes && cat >>confdefs.h <<\EOF
@@ -19781 +22574 @@
  ###   use option --enable-tcap-names to allow user to define new capabilities
 -echo "$as_me:10718: checking if you want user-definable terminal capabilities like termcap" >&5
-+echo "$as_me:11509: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:11398: checking if you want user-definable terminal capabilities like termcap" >&5
  echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
  
  # Check whether --enable-tcap-names or --disable-tcap-names was given.
-@@ -10725,7 +11516,7 @@
+@@ -10725,7 +11405,7 @@
  else
    with_tcap_names=$with_ext_funcs
  fi;
 -echo "$as_me:10728: result: $with_tcap_names" >&5
-+echo "$as_me:11519: result: $with_tcap_names" >&5
++echo "$as_me:11408: result: $with_tcap_names" >&5
  echo "${ECHO_T}$with_tcap_names" >&6
  NCURSES_XNAMES=0
  test "$with_tcap_names" = yes && NCURSES_XNAMES=1
-@@ -10733,7 +11524,7 @@
+@@ -10733,7 +11413,7 @@
  ###############################################################################
  # These options are relatively safe to experiment with.
  
 -echo "$as_me:10736: checking if you want all development code" >&5
-+echo "$as_me:11527: checking if you want all development code" >&5
++echo "$as_me:11416: checking if you want all development code" >&5
  echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
  
  # Check whether --with-develop or --without-develop was given.
-@@ -10743,11 +11534,11 @@
+@@ -10743,11 +11423,11 @@
  else
    with_develop=no
  fi;
 -echo "$as_me:10746: result: $with_develop" >&5
-+echo "$as_me:11537: result: $with_develop" >&5
++echo "$as_me:11426: result: $with_develop" >&5
  echo "${ECHO_T}$with_develop" >&6
  
  ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
 -echo "$as_me:10750: checking if you want hard-tabs code" >&5
-+echo "$as_me:11541: checking if you want hard-tabs code" >&5
++echo "$as_me:11430: checking if you want hard-tabs code" >&5
  echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
  
  # Check whether --enable-hard-tabs or --disable-hard-tabs was given.
-@@ -10757,14 +11548,14 @@
+@@ -10757,14 +11437,14 @@
  else
    enable_hard_tabs=$with_develop
  fi;
 -echo "$as_me:10760: result: $enable_hard_tabs" >&5
-+echo "$as_me:11551: result: $enable_hard_tabs" >&5
++echo "$as_me:11440: result: $enable_hard_tabs" >&5
  echo "${ECHO_T}$enable_hard_tabs" >&6
  test "$enable_hard_tabs" = yes && cat >>confdefs.h <<\EOF
@@ -19830 +22623 @@
  ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
 -echo "$as_me:10767: checking if you want limited support for xmc" >&5
-+echo "$as_me:11558: checking if you want limited support for xmc" >&5
++echo "$as_me:11447: checking if you want limited support for xmc" >&5
  echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
  
  # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
-@@ -10774,7 +11565,7 @@
+@@ -10774,7 +11454,7 @@
  else
    enable_xmc_glitch=$with_develop
  fi;
 -echo "$as_me:10777: result: $enable_xmc_glitch" >&5
-+echo "$as_me:11568: result: $enable_xmc_glitch" >&5
++echo "$as_me:11457: result: $enable_xmc_glitch" >&5
  echo "${ECHO_T}$enable_xmc_glitch" >&6
  test "$enable_xmc_glitch" = yes && cat >>confdefs.h <<\EOF
  #define USE_XMC_SUPPORT 1
-@@ -10783,7 +11574,7 @@
+@@ -10783,7 +11463,7 @@
  ###############################################################################
  # These are just experimental, probably should not be in a package:
  
 -echo "$as_me:10786: checking if you do not want to assume colors are white-on-black" >&5
-+echo "$as_me:11577: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:11466: checking if you do not want to assume colors are white-on-black" >&5
  echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
  
  # Check whether --enable-assumed-color or --disable-assumed-color was given.
-@@ -10793,14 +11584,14 @@
+@@ -10793,14 +11473,14 @@
  else
    with_assumed_color=yes
  fi;
 -echo "$as_me:10796: result: $with_assumed_color" >&5
-+echo "$as_me:11587: result: $with_assumed_color" >&5
++echo "$as_me:11476: result: $with_assumed_color" >&5
  echo "${ECHO_T}$with_assumed_color" >&6
  test "$with_assumed_color" = yes && cat >>confdefs.h <<\EOF
@@ -19865 +22658 @@
  ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
 -echo "$as_me:10803: checking if you want hashmap scrolling-optimization code" >&5
-+echo "$as_me:11594: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:11483: checking if you want hashmap scrolling-optimization code" >&5
  echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
  
  # Check whether --enable-hashmap or --disable-hashmap was given.
-@@ -10810,14 +11601,14 @@
+@@ -10810,14 +11490,14 @@
  else
    with_hashmap=yes
  fi;
 -echo "$as_me:10813: result: $with_hashmap" >&5
-+echo "$as_me:11604: result: $with_hashmap" >&5
++echo "$as_me:11493: result: $with_hashmap" >&5
  echo "${ECHO_T}$with_hashmap" >&6
  test "$with_hashmap" = yes && cat >>confdefs.h <<\EOF
@@ -19882 +22675 @@
  ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
 -echo "$as_me:10820: checking if you want colorfgbg code" >&5
-+echo "$as_me:11611: checking if you want colorfgbg code" >&5
++echo "$as_me:11500: checking if you want colorfgbg code" >&5
  echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
  
  # Check whether --enable-colorfgbg or --disable-colorfgbg was given.
-@@ -10827,14 +11618,14 @@
+@@ -10827,14 +11507,14 @@
  else
    with_colorfgbg=no
  fi;
 -echo "$as_me:10830: result: $with_colorfgbg" >&5
-+echo "$as_me:11621: result: $with_colorfgbg" >&5
++echo "$as_me:11510: result: $with_colorfgbg" >&5
  echo "${ECHO_T}$with_colorfgbg" >&6
  test "$with_colorfgbg" = yes && cat >>confdefs.h <<\EOF
@@ -19899 +22692 @@
  ###   use option --enable-interop to turn on use of bindings used for interop
 -echo "$as_me:10837: checking if you want interop bindings" >&5
-+echo "$as_me:11628: checking if you want interop bindings" >&5
++echo "$as_me:11517: checking if you want interop bindings" >&5
  echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6
  
  # Check whether --enable-interop or --disable-interop was given.
-@@ -10844,7 +11635,7 @@
+@@ -10844,7 +11524,7 @@
  else
    with_exp_interop=no
  fi;
 -echo "$as_me:10847: result: $with_exp_interop" >&5
-+echo "$as_me:11638: result: $with_exp_interop" >&5
++echo "$as_me:11527: result: $with_exp_interop" >&5
  echo "${ECHO_T}$with_exp_interop" >&6
  
  NCURSES_INTEROP_FUNCS=0
-@@ -10853,7 +11644,7 @@
+@@ -10853,7 +11533,7 @@
  # This is still experimental (20080329), but should ultimately be moved to
  # the script-block --with-normal, etc.
  
 -echo "$as_me:10856: checking if you want to link with the pthread library" >&5
-+echo "$as_me:11647: checking if you want to link with the pthread library" >&5
++echo "$as_me:11536: checking if you want to link with the pthread library" >&5
  echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
  
  # Check whether --with-pthread or --without-pthread was given.
-@@ -10863,27 +11654,27 @@
+@@ -10863,27 +11543,27 @@
  else
    with_pthread=no
  fi;
 -echo "$as_me:10866: result: $with_pthread" >&5
-+echo "$as_me:11657: result: $with_pthread" >&5
++echo "$as_me:11546: result: $with_pthread" >&5
  echo "${ECHO_T}$with_pthread" >&6
  
  if test "$with_pthread" != no ; then
 -    echo "$as_me:10870: checking for pthread.h" >&5
-+    echo "$as_me:11661: checking for pthread.h" >&5
++    echo "$as_me:11550: 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
@@ -19938 +22731 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10876 "configure"
-+#line 11667 "configure"
++#line 11556 "configure"
  #include "confdefs.h"
  #include <pthread.h>
  _ACEOF
 -if { (eval echo "$as_me:10880: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:11671: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:11560: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -19950 +22743 @@
    cat conftest.err >&5
 -  echo "$as_me:10886: \$? = $ac_status" >&5
-+  echo "$as_me:11677: \$? = $ac_status" >&5
++  echo "$as_me:11566: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -10902,7 +11693,7 @@
+@@ -10902,7 +11582,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:10905: result: $ac_cv_header_pthread_h" >&5
-+echo "$as_me:11696: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:11585: 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
  
-@@ -10910,12 +11701,14 @@
+@@ -10910,12 +11590,14 @@
  #define HAVE_PTHREADS_H 1
  EOF
@@ -19975 +22768 @@
 +       for cf_lib_pthread in pthread c_r
 +       do
-+           echo "$as_me:11706: checking if we can link with the $cf_lib_pthread library" >&5
++           echo "$as_me:11595: checking if we can link with the $cf_lib_pthread library" >&5
 +echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
 +           cf_save_LIBS="$LIBS"
 +           LIBS="-l$cf_lib_pthread $LIBS"
 +           cat >conftest.$ac_ext <<_ACEOF
-+#line 11711 "configure"
++#line 11600 "configure"
  #include "confdefs.h"
  
  #include <pthread.h>
-@@ -10924,23 +11717,24 @@
+@@ -10924,23 +11606,24 @@
  main ()
  {
@@ -19998 +22791 @@
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:10934: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11728: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11617: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:10937: \$? = $ac_status" >&5
-+  echo "$as_me:11731: \$? = $ac_status" >&5
++  echo "$as_me:11620: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:10940: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11734: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11623: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:10943: \$? = $ac_status" >&5
-+  echo "$as_me:11737: \$? = $ac_status" >&5
++  echo "$as_me:11626: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    with_pthread=yes
  else
-@@ -10949,34 +11743,36 @@
+@@ -10949,34 +11632,36 @@
  with_pthread=no
  fi
@@ -20021 +22814 @@
 -        echo "$as_me:10953: result: $with_pthread" >&5
 +           LIBS="$cf_save_LIBS"
-+           echo "$as_me:11747: result: $with_pthread" >&5
++           echo "$as_me:11636: result: $with_pthread" >&5
  echo "${ECHO_T}$with_pthread" >&6
 +           test "$with_pthread" = yes && break
@@ -20038 +22831 @@
 -            { { echo "$as_me:10963: error: Cannot link with pthread library" >&5
 +       else
-+           { { echo "$as_me:11759: error: Cannot link with pthread library" >&5
++           { { echo "$as_me:11648: error: Cannot link with pthread library" >&5
  echo "$as_me: error: Cannot link with pthread library" >&2;}
     { (exit 1); exit 1; }; }
@@ -20050 +22843 @@
  if test "x$with_pthread" != xno; then
 -       echo "$as_me:10973: checking for pthread_kill" >&5
-+       echo "$as_me:11769: checking for pthread_kill" >&5
++       echo "$as_me:11658: checking for pthread_kill" >&5
  echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6
  if test "${ac_cv_func_pthread_kill+set}" = set; then
@@ -20057 +22850 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 10979 "configure"
-+#line 11775 "configure"
++#line 11664 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char pthread_kill (); below.  */
-@@ -11007,16 +11803,16 @@
+@@ -10999,7 +11684,7 @@
+ #if defined (__stub_pthread_kill) || defined (__stub___pthread_kill)
+ choke me
+ #else
+-f = pthread_kill;
++f = pthread_kill; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -11007,16 +11692,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:11010: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11806: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11695: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:11013: \$? = $ac_status" >&5
-+  echo "$as_me:11809: \$? = $ac_status" >&5
++  echo "$as_me:11698: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:11016: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11812: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11701: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:11019: \$? = $ac_status" >&5
-+  echo "$as_me:11815: \$? = $ac_status" >&5
++  echo "$as_me:11704: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_pthread_kill=yes
  else
-@@ -11026,11 +11822,11 @@
+@@ -11026,11 +11711,11 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:11029: result: $ac_cv_func_pthread_kill" >&5
-+echo "$as_me:11825: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:11714: result: $ac_cv_func_pthread_kill" >&5
  echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6
  if test $ac_cv_func_pthread_kill = yes; then
  
 -               echo "$as_me:11033: checking if you want to allow EINTR in wgetch with pthreads" >&5
-+               echo "$as_me:11829: checking if you want to allow EINTR in wgetch with pthreads" >&5
++               echo "$as_me:11718: checking if you want to allow EINTR in wgetch with pthreads" >&5
  echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6
  
  # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given.
-@@ -11040,7 +11836,7 @@
+@@ -11040,7 +11725,7 @@
  else
    use_pthreads_eintr=no
  fi;
 -               echo "$as_me:11043: result: $use_pthreads_eintr" >&5
-+               echo "$as_me:11839: result: $use_pthreads_eintr" >&5
++               echo "$as_me:11728: result: $use_pthreads_eintr" >&5
  echo "${ECHO_T}$use_pthreads_eintr" >&6
                 if test $use_pthreads_eintr = yes ; then
                         cat >>confdefs.h <<\EOF
-@@ -11050,7 +11846,7 @@
+@@ -11050,7 +11735,7 @@
                 fi
  fi
  
 -       echo "$as_me:11053: checking if you want to use weak-symbols for pthreads" >&5
-+       echo "$as_me:11849: checking if you want to use weak-symbols for pthreads" >&5
++       echo "$as_me:11738: checking if you want to use weak-symbols for pthreads" >&5
  echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
  
  # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
-@@ -11060,18 +11856,18 @@
+@@ -11060,18 +11745,18 @@
  else
    use_weak_symbols=no
  fi;
 -       echo "$as_me:11063: result: $use_weak_symbols" >&5
-+       echo "$as_me:11859: result: $use_weak_symbols" >&5
++       echo "$as_me:11748: result: $use_weak_symbols" >&5
  echo "${ECHO_T}$use_weak_symbols" >&6
         if test "$use_weak_symbols" = yes ; then
  
 -echo "$as_me:11067: checking if $CC supports weak symbols" >&5
-+echo "$as_me:11863: checking if $CC supports weak symbols" >&5
++echo "$as_me:11752: 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
@@ -20132 +22934 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 11074 "configure"
-+#line 11870 "configure"
++#line 11759 "configure"
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -11097,16 +11893,16 @@
+@@ -11097,16 +11782,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:11100: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11896: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11785: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:11103: \$? = $ac_status" >&5
-+  echo "$as_me:11899: \$? = $ac_status" >&5
++  echo "$as_me:11788: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:11106: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11902: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11791: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:11109: \$? = $ac_status" >&5
-+  echo "$as_me:11905: \$? = $ac_status" >&5
++  echo "$as_me:11794: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_weak_symbols=yes
  else
-@@ -11117,7 +11913,7 @@
+@@ -11117,7 +11802,7 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
 -echo "$as_me:11120: result: $cf_cv_weak_symbols" >&5
-+echo "$as_me:11916: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:11805: result: $cf_cv_weak_symbols" >&5
  echo "${ECHO_T}$cf_cv_weak_symbols" >&6
  
         else
-@@ -11148,7 +11944,7 @@
+@@ -11148,7 +11833,7 @@
  # opaque outside of that, so there is no --enable-opaque option.  We can use
  # this option without --with-pthreads, but this will be always set for
  # pthreads.
 -echo "$as_me:11151: checking if you want experimental reentrant code" >&5
-+echo "$as_me:11947: checking if you want experimental reentrant code" >&5
++echo "$as_me:11836: checking if you want experimental reentrant code" >&5
  echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6
  
  # Check whether --enable-reentrant or --disable-reentrant was given.
-@@ -11158,7 +11954,7 @@
+@@ -11158,7 +11843,7 @@
  else
    with_reentrant=no
  fi;
 -echo "$as_me:11161: result: $with_reentrant" >&5
-+echo "$as_me:11957: result: $with_reentrant" >&5
++echo "$as_me:11846: result: $with_reentrant" >&5
  echo "${ECHO_T}$with_reentrant" >&6
  if test "$with_reentrant" = yes ; then
         cf_cv_enable_reentrant=1
-@@ -11184,7 +11980,7 @@
+@@ -11184,7 +11869,7 @@
         5.*)
                 cf_cv_rel_version=6.0
                 cf_cv_abi_version=6
 -               { echo "$as_me:11187: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
-+               { echo "$as_me:11983: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
++               { echo "$as_me:11872: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
  echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
                 ;;
         esac
-@@ -11199,7 +11995,7 @@
+@@ -11199,7 +11884,7 @@
  
  ### Allow using a different wrap-prefix
  if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
 -       echo "$as_me:11202: checking for prefix used to wrap public variables" >&5
-+       echo "$as_me:11998: checking for prefix used to wrap public variables" >&5
++       echo "$as_me:11887: checking for prefix used to wrap public variables" >&5
  echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
  
  # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
-@@ -11209,7 +12005,7 @@
+@@ -11209,7 +11894,7 @@
  else
    NCURSES_WRAP_PREFIX=_nc_
  fi;
 -       echo "$as_me:11212: result: $NCURSES_WRAP_PREFIX" >&5
-+       echo "$as_me:12008: result: $NCURSES_WRAP_PREFIX" >&5
++       echo "$as_me:11897: result: $NCURSES_WRAP_PREFIX" >&5
  echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
  else
         NCURSES_WRAP_PREFIX=_nc_
-@@ -11219,7 +12015,7 @@
+@@ -11219,7 +11904,7 @@
  #define NCURSES_WRAP_PREFIX "$NCURSES_WRAP_PREFIX"
  EOF
  
 -echo "$as_me:11222: checking if you want experimental safe-sprintf code" >&5
-+echo "$as_me:12018: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:11907: checking if you want experimental safe-sprintf code" >&5
  echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
  
  # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
-@@ -11229,7 +12025,7 @@
+@@ -11229,7 +11914,7 @@
  else
    with_safe_sprintf=no
  fi;
 -echo "$as_me:11232: result: $with_safe_sprintf" >&5
-+echo "$as_me:12028: result: $with_safe_sprintf" >&5
++echo "$as_me:11917: result: $with_safe_sprintf" >&5
  echo "${ECHO_T}$with_safe_sprintf" >&6
  test "$with_safe_sprintf" = yes && cat >>confdefs.h <<\EOF
  #define USE_SAFE_SPRINTF 1
-@@ -11238,7 +12034,7 @@
+@@ -11238,7 +11923,7 @@
  ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
  # when hashmap is used scroll hints are useless
  if test "$with_hashmap" = no ; then
 -echo "$as_me:11241: checking if you want to experiment without scrolling-hints code" >&5
-+echo "$as_me:12037: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:11926: checking if you want to experiment without scrolling-hints code" >&5
  echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
  
  # Check whether --enable-scroll-hints or --disable-scroll-hints was given.
-@@ -11248,7 +12044,7 @@
+@@ -11248,7 +11933,7 @@
  else
    with_scroll_hints=yes
  fi;
 -echo "$as_me:11251: result: $with_scroll_hints" >&5
-+echo "$as_me:12047: result: $with_scroll_hints" >&5
++echo "$as_me:11936: result: $with_scroll_hints" >&5
  echo "${ECHO_T}$with_scroll_hints" >&6
  test "$with_scroll_hints" = yes && cat >>confdefs.h <<\EOF
  #define USE_SCROLL_HINTS 1
-@@ -11256,7 +12052,7 @@
+@@ -11256,7 +11941,7 @@
  
  fi
  
 -echo "$as_me:11259: checking if you want experimental wgetch-events code" >&5
-+echo "$as_me:12055: checking if you want experimental wgetch-events code" >&5
++echo "$as_me:11944: checking if you want experimental wgetch-events code" >&5
  echo $ECHO_N "checking if you want experimental wgetch-events code... $ECHO_C" >&6
  
  # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
-@@ -11266,7 +12062,7 @@
+@@ -11266,7 +11951,7 @@
  else
    with_wgetch_events=no
  fi;
 -echo "$as_me:11269: result: $with_wgetch_events" >&5
-+echo "$as_me:12065: result: $with_wgetch_events" >&5
++echo "$as_me:11954: result: $with_wgetch_events" >&5
  echo "${ECHO_T}$with_wgetch_events" >&6
  test "$with_wgetch_events" = yes && cat >>confdefs.h <<\EOF
  #define NCURSES_WGETCH_EVENTS 1
-@@ -11275,7 +12071,7 @@
+@@ -11275,28 +11960,54 @@
  ###############################################################################
  
  ###    use option --disable-echo to suppress full display compiling commands
 -echo "$as_me:11278: checking if you want to display full commands during build" >&5
-+echo "$as_me:12074: 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
+-echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6
++
++echo "$as_me:11964: checking if you want to see long compiling messages" >&5
++echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
  
  # Check whether --enable-echo or --disable-echo was given.
-@@ -11292,11 +12088,11 @@
+ if test "${enable_echo+set}" = set; then
+   enableval="$enable_echo"
+-  with_echo=$enableval
++  test "$enableval" != no && enableval=yes
++  if test "$enableval" != "yes" ; then
++
++    ECHO_LT='--silent'
++    ECHO_LD='@echo linking $@;'
++    RULE_CC='@echo compiling $<'
++    SHOW_CC='@echo compiling $@'
++    ECHO_CC='@'
++
++  else
++
++    ECHO_LT=''
++    ECHO_LD=''
++    RULE_CC=''
++    SHOW_CC=''
++    ECHO_CC=''
++
++  fi
+ else
+-  with_echo=yes
++  enableval=yes
++
++    ECHO_LT=''
++    ECHO_LD=''
++    RULE_CC=''
++    SHOW_CC=''
++    ECHO_CC=''
++
+ fi;
+-if test "$with_echo" = yes; then
++echo "$as_me:11998: result: $enableval" >&5
++echo "${ECHO_T}$enableval" >&6
++
++if test "$enable_echo" = yes; then
+        ECHO_LINK=
+ else
+        ECHO_LINK='@ echo linking $@ ... ;'
         test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent"
         test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent"
  fi
 -echo "$as_me:11295: result: $with_echo" >&5
-+echo "$as_me:12091: result: $with_echo" >&5
- echo "${ECHO_T}$with_echo" >&6
+-echo "${ECHO_T}$with_echo" >&6
  
  ###    use option --enable-warnings to turn on all gcc warnings
 -echo "$as_me:11299: checking if you want to see compiler warnings" >&5
-+echo "$as_me:12095: checking if you want to see compiler warnings" >&5
++echo "$as_me:12010: checking if you want to see compiler warnings" >&5
  echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
  
  # Check whether --enable-warnings or --disable-warnings was given.
-@@ -11304,7 +12100,7 @@
+@@ -11304,7 +12015,7 @@
    enableval="$enable_warnings"
    with_warnings=$enableval
  fi;
 -echo "$as_me:11307: result: $with_warnings" >&5
-+echo "$as_me:12103: result: $with_warnings" >&5
++echo "$as_me:12018: result: $with_warnings" >&5
  echo "${ECHO_T}$with_warnings" >&6
  
  if test "x$with_warnings" = "xyes"; then
-@@ -11316,12 +12112,12 @@
+@@ -11316,12 +12027,12 @@
  if test "$GCC" = yes ; then
         case $host_os in
         linux*|gnu*)
 -               echo "$as_me:11319: checking if this is really Intel C compiler" >&5
-+               echo "$as_me:12115: checking if this is really Intel C compiler" >&5
++               echo "$as_me:12030: 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"
@@ -20308 +23150 @@
                 cat >conftest.$ac_ext <<_ACEOF
 -#line 11324 "configure"
-+#line 12120 "configure"
++#line 12035 "configure"
  #include "confdefs.h"
  
  int
-@@ -11338,16 +12134,16 @@
+@@ -11338,16 +12049,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:11341: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12137: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12052: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:11344: \$? = $ac_status" >&5
-+  echo "$as_me:12140: \$? = $ac_status" >&5
++  echo "$as_me:12055: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:11347: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12143: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12058: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:11350: \$? = $ac_status" >&5
-+  echo "$as_me:12146: \$? = $ac_status" >&5
++  echo "$as_me:12061: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    INTEL_COMPILER=yes
  cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
-@@ -11358,14 +12154,14 @@
+@@ -11357,15 +12068,64 @@
+ cat conftest.$ac_ext >&5
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
-                CFLAGS="$cf_save_CFLAGS"
+-               CFLAGS="$cf_save_CFLAGS"
 -               echo "$as_me:11361: result: $INTEL_COMPILER" >&5
-+               echo "$as_me:12157: result: $INTEL_COMPILER" >&5
- echo "${ECHO_T}$INTEL_COMPILER" >&6
-                ;;
-        esac
+-echo "${ECHO_T}$INTEL_COMPILER" >&6
+-               ;;
+-       esac
++               CFLAGS="$cf_save_CFLAGS"
++               echo "$as_me:12072: result: $INTEL_COMPILER" >&5
++echo "${ECHO_T}$INTEL_COMPILER" >&6
++               ;;
++       esac
++fi
++
++CLANG_COMPILER=no
++
++if test "$GCC" = yes ; then
++       echo "$as_me:12081: checking if this is really Clang C compiler" >&5
++echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
++       cf_save_CFLAGS="$CFLAGS"
++       CFLAGS="$CFLAGS -Qunused-arguments"
++       cat >conftest.$ac_ext <<_ACEOF
++#line 12086 "configure"
++#include "confdefs.h"
++
++int
++main ()
++{
++
++#ifdef __clang__
++#else
++make an error
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:12103: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:12106: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:12109: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:12112: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  CLANG_COMPILER=yes
++cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
++
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++       CFLAGS="$cf_save_CFLAGS"
++       echo "$as_me:12123: result: $CLANG_COMPILER" >&5
++echo "${ECHO_T}$CLANG_COMPILER" >&6
  fi
  
  cat > conftest.$ac_ext <<EOF
 -#line 11368 "${as_me:-configure}"
-+#line 12164 "${as_me:-configure}"
++#line 12128 "${as_me:-configure}"
  int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
  EOF
  
-@@ -11382,7 +12178,7 @@
+@@ -11382,7 +12142,7 @@
  # remark #981: operands are evaluated in unspecified order
  # warning #279: controlling expression is constant
  
 -       { echo "$as_me:11385: checking for $CC warning options..." >&5
-+       { echo "$as_me:12181: checking for $CC warning options..." >&5
++       { echo "$as_me:12145: checking for $CC warning options..." >&5
  echo "$as_me: checking for $CC warning options..." >&6;}
         cf_save_CFLAGS="$CFLAGS"
         EXTRA_CFLAGS="-Wall"
-@@ -11398,12 +12194,12 @@
+@@ -11398,12 +12158,12 @@
                 wd981
         do
                 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
 -               if { (eval echo "$as_me:11401: \"$ac_compile\"") >&5
-+               if { (eval echo "$as_me:12197: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:12161: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:11404: \$? = $ac_status" >&5
-+  echo "$as_me:12200: \$? = $ac_status" >&5
++  echo "$as_me:12164: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -                       test -n "$verbose" && echo "$as_me:11406: result: ... -$cf_opt" >&5
-+                       test -n "$verbose" && echo "$as_me:12202: result: ... -$cf_opt" >&5
++                       test -n "$verbose" && echo "$as_me:12166: result: ... -$cf_opt" >&5
  echo "${ECHO_T}... -$cf_opt" >&6
                         EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
                 fi
-@@ -11412,7 +12208,7 @@
+@@ -11412,7 +12172,7 @@
  
  elif test "$GCC" = yes
  then
 -       { echo "$as_me:11415: checking for $CC warning options..." >&5
-+       { echo "$as_me:12211: checking for $CC warning options..." >&5
++       { echo "$as_me:12175: checking for $CC warning options..." >&5
  echo "$as_me: checking for $CC warning options..." >&6;}
         cf_save_CFLAGS="$CFLAGS"
         EXTRA_CFLAGS=
-@@ -11432,12 +12228,12 @@
+@@ -11432,12 +12192,12 @@
                 Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum
         do
                 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
 -               if { (eval echo "$as_me:11435: \"$ac_compile\"") >&5
-+               if { (eval echo "$as_me:12231: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:12195: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:11438: \$? = $ac_status" >&5
-+  echo "$as_me:12234: \$? = $ac_status" >&5
++  echo "$as_me:12198: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -                       test -n "$verbose" && echo "$as_me:11440: result: ... -$cf_opt" >&5
-+                       test -n "$verbose" && echo "$as_me:12236: result: ... -$cf_opt" >&5
++                       test -n "$verbose" && echo "$as_me:12200: result: ... -$cf_opt" >&5
  echo "${ECHO_T}... -$cf_opt" >&6
                         case $cf_opt in #(vi
                         Wcast-qual) #(vi
-@@ -11448,7 +12244,7 @@
+@@ -11448,7 +12208,17 @@
                                 [34].*)
                                         test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
  
 -echo "${as_me:-configure}:11451: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:12247: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:12211: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++
++                                       continue;;
++                               esac
++                               ;;
++                       Wpointer-arith) #(vi
++                               case $GCC_VERSION in
++                               [12].*)
++                                       test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
++
++echo "${as_me:-configure}:12221: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
  
                                         continue;;
                                 esac
-@@ -11468,12 +12264,12 @@
+@@ -11468,12 +12238,12 @@
  if test "$GCC" = yes ; then
         case $host_os in
         linux*|gnu*)
 -               echo "$as_me:11471: checking if this is really Intel C++ compiler" >&5
-+               echo "$as_me:12267: checking if this is really Intel C++ compiler" >&5
++               echo "$as_me:12241: checking if this is really Intel C++ compiler" >&5
  echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6
                 cf_save_CFLAGS="$CXXFLAGS"
@@ -20420 +23326 @@
                 cat >conftest.$ac_ext <<_ACEOF
 -#line 11476 "configure"
-+#line 12272 "configure"
++#line 12246 "configure"
  #include "confdefs.h"
  
  int
-@@ -11490,16 +12286,16 @@
+@@ -11490,16 +12260,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:11493: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12289: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12263: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:11496: \$? = $ac_status" >&5
-+  echo "$as_me:12292: \$? = $ac_status" >&5
++  echo "$as_me:12266: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:11499: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12295: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12269: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:11502: \$? = $ac_status" >&5
-+  echo "$as_me:12298: \$? = $ac_status" >&5
++  echo "$as_me:12272: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    INTEL_CPLUSPLUS=yes
  cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
-@@ -11510,7 +12306,7 @@
+@@ -11510,12 +12280,61 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
                 CXXFLAGS="$cf_save_CFLAGS"
 -               echo "$as_me:11513: result: $INTEL_CPLUSPLUS" >&5
-+               echo "$as_me:12309: result: $INTEL_CPLUSPLUS" >&5
++               echo "$as_me:12283: result: $INTEL_CPLUSPLUS" >&5
  echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
                 ;;
         esac
-@@ -11524,7 +12320,7 @@
+ fi
+ 
++CLANG_CPLUSPLUS=no
++
++if test "$GCC" = yes ; then
++       echo "$as_me:12292: checking if this is really Clang C++ compiler" >&5
++echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6
++       cf_save_CFLAGS="$CXXFLAGS"
++       CXXFLAGS="$CXXFLAGS -Qunused-arguments"
++       cat >conftest.$ac_ext <<_ACEOF
++#line 12297 "configure"
++#include "confdefs.h"
++
++int
++main ()
++{
++
++#ifdef __clang__
++#else
++make an error
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:12314: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:12317: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:12320: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:12323: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  CLANG_CPLUSPLUS=yes
++cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
++
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++       CXXFLAGS="$cf_save_CFLAGS"
++       echo "$as_me:12334: result: $CLANG_CPLUSPLUS" >&5
++echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
++fi
++
+ ac_ext=cc
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -11524,7 +12343,7 @@
  ac_main_return=return
  
  cat > conftest.$ac_ext <<EOF
 -#line 11527 "configure"
-+#line 12323 "configure"
++#line 12346 "configure"
  int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
  EOF
  
-@@ -11542,7 +12338,7 @@
+@@ -11542,7 +12361,7 @@
  # remark #981: operands are evaluated in unspecified order
  # warning #269: invalid format string conversion
  
 -       { echo "$as_me:11545: checking for $CC warning options..." >&5
-+       { echo "$as_me:12341: checking for $CC warning options..." >&5
++       { echo "$as_me:12364: checking for $CC warning options..." >&5
  echo "$as_me: checking for $CC warning options..." >&6;}
         cf_save_CXXFLAGS="$CXXFLAGS"
         EXTRA_CXXFLAGS="-Wall"
-@@ -11559,12 +12355,12 @@
+@@ -11559,12 +12378,12 @@
                 wd981
         do
                 CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
 -               if { (eval echo "$as_me:11562: \"$ac_compile\"") >&5
-+               if { (eval echo "$as_me:12358: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:12381: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:11565: \$? = $ac_status" >&5
-+  echo "$as_me:12361: \$? = $ac_status" >&5
++  echo "$as_me:12384: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -                       test -n "$verbose" && echo "$as_me:11567: result: ... -$cf_opt" >&5
-+                       test -n "$verbose" && echo "$as_me:12363: result: ... -$cf_opt" >&5
++                       test -n "$verbose" && echo "$as_me:12386: result: ... -$cf_opt" >&5
  echo "${ECHO_T}... -$cf_opt" >&6
                         EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
                 fi
-@@ -11573,7 +12369,7 @@
+@@ -11573,7 +12392,7 @@
  
  elif test "$GXX" = yes
  then
 -       { echo "$as_me:11576: checking for $CXX warning options..." >&5
-+       { echo "$as_me:12372: checking for $CXX warning options..." >&5
++       { echo "$as_me:12395: checking for $CXX warning options..." >&5
  echo "$as_me: checking for $CXX warning options..." >&6;}
         cf_save_CXXFLAGS="$CXXFLAGS"
         EXTRA_CXXFLAGS="-W -Wall"
-@@ -11602,16 +12398,16 @@
+@@ -11602,16 +12421,16 @@
                 Wundef $cf_gxx_extra_warnings Wno-unused
         do
                 CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
 -               if { (eval echo "$as_me:11605: \"$ac_compile\"") >&5
-+               if { (eval echo "$as_me:12401: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:12424: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:11608: \$? = $ac_status" >&5
-+  echo "$as_me:12404: \$? = $ac_status" >&5
++  echo "$as_me:12427: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -                       test -n "$verbose" && echo "$as_me:11610: result: ... -$cf_opt" >&5
-+                       test -n "$verbose" && echo "$as_me:12406: result: ... -$cf_opt" >&5
++                       test -n "$verbose" && echo "$as_me:12429: result: ... -$cf_opt" >&5
  echo "${ECHO_T}... -$cf_opt" >&6
                         EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
                 else
 -                       test -n "$verbose" && echo "$as_me:11614: result: ... no -$cf_opt" >&5
-+                       test -n "$verbose" && echo "$as_me:12410: result: ... no -$cf_opt" >&5
++                       test -n "$verbose" && echo "$as_me:12433: result: ... no -$cf_opt" >&5
  echo "${ECHO_T}... no -$cf_opt" >&6
                 fi
         done
-@@ -11647,10 +12443,10 @@
+@@ -11647,10 +12466,10 @@
  EOF
  if test "$GCC" = yes
  then
 -       { echo "$as_me:11650: checking for $CC __attribute__ directives..." >&5
-+       { echo "$as_me:12446: checking for $CC __attribute__ directives..." >&5
++       { echo "$as_me:12469: checking for $CC __attribute__ directives..." >&5
  echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
  cat > conftest.$ac_ext <<EOF
 -#line 11653 "${as_me:-configure}"
-+#line 12449 "${as_me:-configure}"
++#line 12472 "${as_me:-configure}"
  #include "confdefs.h"
  #include "conftest.h"
  #include "conftest.i"
-@@ -11699,12 +12495,12 @@
+@@ -11699,12 +12518,12 @@
                         ;;
                 esac
  
 -               if { (eval echo "$as_me:11702: \"$ac_compile\"") >&5
-+               if { (eval echo "$as_me:12498: \"$ac_compile\"") >&5
++               if { (eval echo "$as_me:12521: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:11705: \$? = $ac_status" >&5
-+  echo "$as_me:12501: \$? = $ac_status" >&5
++  echo "$as_me:12524: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -                       test -n "$verbose" && echo "$as_me:11707: result: ... $cf_attribute" >&5
-+                       test -n "$verbose" && echo "$as_me:12503: result: ... $cf_attribute" >&5
++                       test -n "$verbose" && echo "$as_me:12526: result: ... $cf_attribute" >&5
  echo "${ECHO_T}... $cf_attribute" >&6
                         cat conftest.h >>confdefs.h
                         case $cf_attribute in #(vi
-@@ -11740,7 +12536,7 @@
- fi
- 
+@@ -11739,8 +12558,100 @@
+ rm -rf conftest*
+ fi
+ 
++echo "$as_me:12561: checking if you want to work around bogus compiler/loader warnings" >&5
++echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6
++
++# Check whether --enable-string-hacks or --disable-string-hacks was given.
++if test "${enable_string_hacks+set}" = set; then
++  enableval="$enable_string_hacks"
++  with_string_hacks=$enableval
++else
++  with_string_hacks=no
++fi;
++echo "$as_me:12571: result: $with_string_hacks" >&5
++echo "${ECHO_T}$with_string_hacks" >&6
++
++if test "x$with_string_hacks" = "xyes"; then
++       cat >>confdefs.h <<\EOF
++#define USE_STRING_HACKS 1
++EOF
++
++       { echo "$as_me:12579: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}
++
++for ac_func in strlcat strlcpy snprintf
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:12585: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++#line 12591 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++char (*f) ();
++
++int
++main ()
++{
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:12622: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:12625: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:12628: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:12631: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++eval "$as_ac_var=no"
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:12641: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<EOF
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++EOF
++
++fi
++done
++
++fi
++
  ###    use option --enable-assertions to turn on generation of assertion code
 -echo "$as_me:11743: checking if you want to enable runtime assertions" >&5
-+echo "$as_me:12539: checking if you want to enable runtime assertions" >&5
++echo "$as_me:12654: checking if you want to enable runtime assertions" >&5
  echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
  
  # Check whether --enable-assertions or --disable-assertions was given.
-@@ -11750,7 +12546,7 @@
+@@ -11750,16 +12661,12 @@
  else
    with_assertions=no
  fi;
 -echo "$as_me:11753: result: $with_assertions" >&5
-+echo "$as_me:12549: result: $with_assertions" >&5
++echo "$as_me:12664: result: $with_assertions" >&5
  echo "${ECHO_T}$with_assertions" >&6
  if test -n "$GCC"
  then
-@@ -11770,7 +12566,7 @@
+        if test "$with_assertions" = no
+        then
+-               cat >>confdefs.h <<\EOF
+-#define NDEBUG 1
+-EOF
+-
+                CPPFLAGS="$CPPFLAGS -DNDEBUG"
+        else
+ 
+@@ -11770,7 +12677,7 @@
  
  ###    use option --disable-leaks to suppress "permanent" leaks, for testing
  
 -echo "$as_me:11773: checking if you want to use dmalloc for testing" >&5
-+echo "$as_me:12569: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:12680: checking if you want to use dmalloc for testing" >&5
  echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
  
  # Check whether --with-dmalloc or --without-dmalloc was given.
-@@ -11786,7 +12582,7 @@
+@@ -11786,7 +12693,7 @@
  else
    with_dmalloc=
  fi;
 -echo "$as_me:11789: result: ${with_dmalloc:-no}" >&5
-+echo "$as_me:12585: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:12696: result: ${with_dmalloc:-no}" >&5
  echo "${ECHO_T}${with_dmalloc:-no}" >&6
  
  case .$with_cflags in #(vi
-@@ -11880,23 +12676,23 @@
+@@ -11880,23 +12787,23 @@
  esac
  
  if test "$with_dmalloc" = yes ; then
 -       echo "$as_me:11883: checking for dmalloc.h" >&5
-+       echo "$as_me:12679: checking for dmalloc.h" >&5
++       echo "$as_me:12790: checking for dmalloc.h" >&5
  echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
  if test "${ac_cv_header_dmalloc_h+set}" = set; then
@@ -20595 +23657 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 11889 "configure"
-+#line 12685 "configure"
++#line 12796 "configure"
  #include "confdefs.h"
  #include <dmalloc.h>
  _ACEOF
 -if { (eval echo "$as_me:11893: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:12689: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:12800: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -20607 +23669 @@
    cat conftest.err >&5
 -  echo "$as_me:11899: \$? = $ac_status" >&5
-+  echo "$as_me:12695: \$? = $ac_status" >&5
++  echo "$as_me:12806: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -11915,11 +12711,11 @@
+@@ -11915,11 +12822,11 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:11918: result: $ac_cv_header_dmalloc_h" >&5
-+echo "$as_me:12714: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:12825: result: $ac_cv_header_dmalloc_h" >&5
  echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
  if test $ac_cv_header_dmalloc_h = yes; then
  
 -echo "$as_me:11922: checking for dmalloc_debug in -ldmalloc" >&5
-+echo "$as_me:12718: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:12829: checking for dmalloc_debug in -ldmalloc" >&5
  echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
  if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -11927,7 +12723,7 @@
+@@ -11927,7 +12834,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldmalloc  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 11930 "configure"
-+#line 12726 "configure"
++#line 12837 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -11946,16 +12742,16 @@
+@@ -11946,16 +12853,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:11949: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12745: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12856: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:11952: \$? = $ac_status" >&5
-+  echo "$as_me:12748: \$? = $ac_status" >&5
++  echo "$as_me:12859: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:11955: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12751: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12862: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:11958: \$? = $ac_status" >&5
-+  echo "$as_me:12754: \$? = $ac_status" >&5
++  echo "$as_me:12865: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_dmalloc_dmalloc_debug=yes
  else
-@@ -11966,7 +12762,7 @@
+@@ -11966,7 +12873,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:11969: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
-+echo "$as_me:12765: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:12876: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
  echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
  if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
    cat >>confdefs.h <<EOF
-@@ -11981,7 +12777,7 @@
+@@ -11981,7 +12888,7 @@
  
  fi
  
 -echo "$as_me:11984: checking if you want to use dbmalloc for testing" >&5
-+echo "$as_me:12780: checking if you want to use dbmalloc for testing" >&5
++echo "$as_me:12891: checking if you want to use dbmalloc for testing" >&5
  echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
  
  # Check whether --with-dbmalloc or --without-dbmalloc was given.
-@@ -11997,7 +12793,7 @@
+@@ -11997,7 +12904,7 @@
  else
    with_dbmalloc=
  fi;
 -echo "$as_me:12000: result: ${with_dbmalloc:-no}" >&5
-+echo "$as_me:12796: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:12907: result: ${with_dbmalloc:-no}" >&5
  echo "${ECHO_T}${with_dbmalloc:-no}" >&6
  
  case .$with_cflags in #(vi
-@@ -12091,23 +12887,23 @@
+@@ -12091,23 +12998,23 @@
  esac
  
  if test "$with_dbmalloc" = yes ; then
 -       echo "$as_me:12094: checking for dbmalloc.h" >&5
-+       echo "$as_me:12890: checking for dbmalloc.h" >&5
++       echo "$as_me:13001: checking for dbmalloc.h" >&5
  echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
  if test "${ac_cv_header_dbmalloc_h+set}" = set; then
@@ -20694 +23756 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 12100 "configure"
-+#line 12896 "configure"
++#line 13007 "configure"
  #include "confdefs.h"
  #include <dbmalloc.h>
  _ACEOF
 -if { (eval echo "$as_me:12104: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:12900: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13011: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -20706 +23768 @@
    cat conftest.err >&5
 -  echo "$as_me:12110: \$? = $ac_status" >&5
-+  echo "$as_me:12906: \$? = $ac_status" >&5
++  echo "$as_me:13017: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12126,11 +12922,11 @@
+@@ -12126,11 +13033,11 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:12129: result: $ac_cv_header_dbmalloc_h" >&5
-+echo "$as_me:12925: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:13036: result: $ac_cv_header_dbmalloc_h" >&5
  echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
  if test $ac_cv_header_dbmalloc_h = yes; then
  
 -echo "$as_me:12133: checking for debug_malloc in -ldbmalloc" >&5
-+echo "$as_me:12929: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:13040: checking for debug_malloc in -ldbmalloc" >&5
  echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
  if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12138,7 +12934,7 @@
+@@ -12138,7 +13045,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldbmalloc  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 12141 "configure"
-+#line 12937 "configure"
++#line 13048 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12157,16 +12953,16 @@
+@@ -12157,16 +13064,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:12160: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12956: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13067: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:12163: \$? = $ac_status" >&5
-+  echo "$as_me:12959: \$? = $ac_status" >&5
++  echo "$as_me:13070: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:12166: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12962: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13073: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12169: \$? = $ac_status" >&5
-+  echo "$as_me:12965: \$? = $ac_status" >&5
++  echo "$as_me:13076: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_dbmalloc_debug_malloc=yes
  else
-@@ -12177,7 +12973,7 @@
+@@ -12177,7 +13084,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:12180: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
-+echo "$as_me:12976: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:13087: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
  echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
  if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
    cat >>confdefs.h <<EOF
-@@ -12192,7 +12988,7 @@
+@@ -12192,7 +13099,7 @@
  
  fi
  
 -echo "$as_me:12195: checking if you want to use valgrind for testing" >&5
-+echo "$as_me:12991: checking if you want to use valgrind for testing" >&5
++echo "$as_me:13102: checking if you want to use valgrind for testing" >&5
  echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
  
  # Check whether --with-valgrind or --without-valgrind was given.
-@@ -12208,7 +13004,7 @@
+@@ -12208,7 +13115,7 @@
  else
    with_valgrind=
  fi;
 -echo "$as_me:12211: result: ${with_valgrind:-no}" >&5
-+echo "$as_me:13007: result: ${with_valgrind:-no}" >&5
++echo "$as_me:13118: result: ${with_valgrind:-no}" >&5
  echo "${ECHO_T}${with_valgrind:-no}" >&6
  
  case .$with_cflags in #(vi
-@@ -12301,7 +13097,7 @@
+@@ -12301,7 +13208,7 @@
         ;;
  esac
  
 -echo "$as_me:12304: checking if you want to perform memory-leak testing" >&5
-+echo "$as_me:13100: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:13211: checking if you want to perform memory-leak testing" >&5
  echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
  
  # Check whether --enable-leaks or --disable-leaks was given.
-@@ -12311,7 +13107,7 @@
+@@ -12311,7 +13218,7 @@
  else
    : ${with_no_leaks:=no}
  fi;
 -echo "$as_me:12314: result: $with_no_leaks" >&5
-+echo "$as_me:13110: result: $with_no_leaks" >&5
++echo "$as_me:13221: result: $with_no_leaks" >&5
  echo "${ECHO_T}$with_no_leaks" >&6
  
  if test "$with_no_leaks" = yes ; then
-@@ -12360,7 +13156,7 @@
+@@ -12360,7 +13267,7 @@
         ;;
  esac
  
 -echo "$as_me:12363: checking whether to add trace feature to all models" >&5
-+echo "$as_me:13159: checking whether to add trace feature to all models" >&5
++echo "$as_me:13270: checking whether to add trace feature to all models" >&5
  echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
  
  # Check whether --with-trace or --without-trace was given.
-@@ -12370,7 +13166,7 @@
+@@ -12370,7 +13277,7 @@
  else
    cf_with_trace=$cf_all_traces
  fi;
 -echo "$as_me:12373: result: $cf_with_trace" >&5
-+echo "$as_me:13169: result: $cf_with_trace" >&5
++echo "$as_me:13280: result: $cf_with_trace" >&5
  echo "${ECHO_T}$cf_with_trace" >&6
  
  if test "$cf_with_trace" = yes ; then
-@@ -12465,13 +13261,13 @@
+@@ -12465,13 +13372,13 @@
  *mingw32*) #(vi
         ;;
  *)
 -echo "$as_me:12468: checking for gettimeofday" >&5
-+echo "$as_me:13264: checking for gettimeofday" >&5
++echo "$as_me:13375: checking for gettimeofday" >&5
  echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
  if test "${ac_cv_func_gettimeofday+set}" = set; then
@@ -20829 +23891 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 12474 "configure"
-+#line 13270 "configure"
++#line 13381 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char gettimeofday (); below.  */
-@@ -12502,16 +13298,16 @@
+@@ -12494,7 +13401,7 @@
+ #if defined (__stub_gettimeofday) || defined (__stub___gettimeofday)
+ choke me
+ #else
+-f = gettimeofday;
++f = gettimeofday; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -12502,16 +13409,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:12505: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13301: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13412: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:12508: \$? = $ac_status" >&5
-+  echo "$as_me:13304: \$? = $ac_status" >&5
++  echo "$as_me:13415: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:12511: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13307: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13418: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12514: \$? = $ac_status" >&5
-+  echo "$as_me:13310: \$? = $ac_status" >&5
++  echo "$as_me:13421: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_gettimeofday=yes
  else
-@@ -12521,7 +13317,7 @@
+@@ -12521,7 +13428,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:12524: result: $ac_cv_func_gettimeofday" >&5
-+echo "$as_me:13320: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:13431: result: $ac_cv_func_gettimeofday" >&5
  echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
  if test $ac_cv_func_gettimeofday = yes; then
    cat >>confdefs.h <<\EOF
-@@ -12530,7 +13326,7 @@
+@@ -12530,7 +13437,7 @@
  
  else
  
 -echo "$as_me:12533: checking for gettimeofday in -lbsd" >&5
-+echo "$as_me:13329: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:13440: checking for gettimeofday in -lbsd" >&5
  echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
  if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12538,7 +13334,7 @@
+@@ -12538,7 +13445,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lbsd  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 12541 "configure"
-+#line 13337 "configure"
++#line 13448 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12557,16 +13353,16 @@
+@@ -12557,16 +13464,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:12560: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13356: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13467: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:12563: \$? = $ac_status" >&5
-+  echo "$as_me:13359: \$? = $ac_status" >&5
++  echo "$as_me:13470: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:12566: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13362: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13473: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12569: \$? = $ac_status" >&5
-+  echo "$as_me:13365: \$? = $ac_status" >&5
++  echo "$as_me:13476: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_bsd_gettimeofday=yes
  else
-@@ -12577,7 +13373,7 @@
+@@ -12577,7 +13484,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:12580: result: $ac_cv_lib_bsd_gettimeofday" >&5
-+echo "$as_me:13376: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:13487: result: $ac_cv_lib_bsd_gettimeofday" >&5
  echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
  if test $ac_cv_lib_bsd_gettimeofday = yes; then
    cat >>confdefs.h <<\EOF
-@@ -12591,14 +13387,14 @@
+@@ -12591,14 +13498,14 @@
         ;;
  esac
  
 -echo "$as_me:12594: checking if -lm needed for math functions" >&5
-+echo "$as_me:13390: checking if -lm needed for math functions" >&5
++echo "$as_me:13501: checking if -lm needed for math functions" >&5
  echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
  if test "${cf_cv_need_libm+set}" = set; then
@@ -20924 +23995 @@
         cat >conftest.$ac_ext <<_ACEOF
 -#line 12601 "configure"
-+#line 13397 "configure"
++#line 13508 "configure"
  #include "confdefs.h"
  
         #include <stdio.h>
-@@ -12613,16 +13409,16 @@
+@@ -12613,16 +13520,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:12616: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13412: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13523: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:12619: \$? = $ac_status" >&5
-+  echo "$as_me:13415: \$? = $ac_status" >&5
++  echo "$as_me:13526: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:12622: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13418: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13529: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12625: \$? = $ac_status" >&5
-+  echo "$as_me:13421: \$? = $ac_status" >&5
++  echo "$as_me:13532: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_need_libm=no
  else
-@@ -12632,7 +13428,7 @@
+@@ -12632,7 +13539,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:12635: result: $cf_cv_need_libm" >&5
-+echo "$as_me:13431: result: $cf_cv_need_libm" >&5
++echo "$as_me:13542: result: $cf_cv_need_libm" >&5
  echo "${ECHO_T}$cf_cv_need_libm" >&6
  if test "$cf_cv_need_libm" = yes
  then
-@@ -12640,13 +13436,13 @@
+@@ -12640,13 +13547,13 @@
  fi
  
  ###    Checks for header files.
 -echo "$as_me:12643: checking for ANSI C header files" >&5
-+echo "$as_me:13439: checking for ANSI C header files" >&5
++echo "$as_me:13550: checking for ANSI C header files" >&5
  echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
  if test "${ac_cv_header_stdc+set}" = set; then
@@ -20970 +24041 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 12649 "configure"
-+#line 13445 "configure"
++#line 13556 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -12654,13 +13450,13 @@
+@@ -12654,13 +13561,13 @@
  #include <float.h>
  
  _ACEOF
 -if { (eval echo "$as_me:12657: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13453: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:13564: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -20986 +24057 @@
    cat conftest.err >&5
 -  echo "$as_me:12663: \$? = $ac_status" >&5
-+  echo "$as_me:13459: \$? = $ac_status" >&5
++  echo "$as_me:13570: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12682,7 +13478,7 @@
+@@ -12682,7 +13589,7 @@
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 12685 "configure"
-+#line 13481 "configure"
++#line 13592 "configure"
  #include "confdefs.h"
  #include <string.h>
  
-@@ -12700,7 +13496,7 @@
+@@ -12700,7 +13607,7 @@
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 12703 "configure"
-+#line 13499 "configure"
++#line 13610 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  
-@@ -12721,7 +13517,7 @@
+@@ -12721,7 +13628,7 @@
    :
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 12724 "configure"
-+#line 13520 "configure"
++#line 13631 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #if ((' ' & 0x0FF) == 0x020)
-@@ -12747,15 +13543,15 @@
+@@ -12747,15 +13654,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:12750: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13546: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13657: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:12753: \$? = $ac_status" >&5
-+  echo "$as_me:13549: \$? = $ac_status" >&5
++  echo "$as_me:13660: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:12755: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13551: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13662: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12758: \$? = $ac_status" >&5
-+  echo "$as_me:13554: \$? = $ac_status" >&5
++  echo "$as_me:13665: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -12768,7 +13564,7 @@
+@@ -12768,7 +13675,7 @@
  fi
  fi
  fi
 -echo "$as_me:12771: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:13567: result: $ac_cv_header_stdc" >&5
++echo "$as_me:13678: result: $ac_cv_header_stdc" >&5
  echo "${ECHO_T}$ac_cv_header_stdc" >&6
  if test $ac_cv_header_stdc = yes; then
  
-@@ -12781,13 +13577,13 @@
+@@ -12781,13 +13688,13 @@
  ac_header_dirent=no
  for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
    as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
 -echo "$as_me:12784: checking for $ac_hdr that defines DIR" >&5
-+echo "$as_me:13580: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:13691: checking for $ac_hdr that defines DIR" >&5
  echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -21058 +24129 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 12790 "configure"
-+#line 13586 "configure"
++#line 13697 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <$ac_hdr>
-@@ -12802,16 +13598,16 @@
+@@ -12802,16 +13709,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:12805: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13601: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13712: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:12808: \$? = $ac_status" >&5
-+  echo "$as_me:13604: \$? = $ac_status" >&5
++  echo "$as_me:13715: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:12811: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13607: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13718: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12814: \$? = $ac_status" >&5
-+  echo "$as_me:13610: \$? = $ac_status" >&5
++  echo "$as_me:13721: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_Header=yes"
  else
-@@ -12821,7 +13617,7 @@
+@@ -12821,7 +13728,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:12824: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:13620: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:13731: result: `eval echo '${'$as_ac_Header'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<EOF
-@@ -12834,7 +13630,7 @@
+@@ -12834,7 +13741,7 @@
  done
  # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
  if test $ac_header_dirent = dirent.h; then
 -  echo "$as_me:12837: checking for opendir in -ldir" >&5
-+  echo "$as_me:13633: checking for opendir in -ldir" >&5
++  echo "$as_me:13744: checking for opendir in -ldir" >&5
  echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
  if test "${ac_cv_lib_dir_opendir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12842,7 +13638,7 @@
+@@ -12842,7 +13749,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldir  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 12845 "configure"
-+#line 13641 "configure"
++#line 13752 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12861,16 +13657,16 @@
+@@ -12861,16 +13768,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:12864: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13660: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13771: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:12867: \$? = $ac_status" >&5
-+  echo "$as_me:13663: \$? = $ac_status" >&5
++  echo "$as_me:13774: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:12870: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13666: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13777: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12873: \$? = $ac_status" >&5
-+  echo "$as_me:13669: \$? = $ac_status" >&5
++  echo "$as_me:13780: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_dir_opendir=yes
  else
-@@ -12881,14 +13677,14 @@
+@@ -12881,14 +13788,14 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:12884: result: $ac_cv_lib_dir_opendir" >&5
-+echo "$as_me:13680: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:13791: result: $ac_cv_lib_dir_opendir" >&5
  echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
  if test $ac_cv_lib_dir_opendir = yes; then
@@ -21144 +24215 @@
  else
 -  echo "$as_me:12891: checking for opendir in -lx" >&5
-+  echo "$as_me:13687: checking for opendir in -lx" >&5
++  echo "$as_me:13798: checking for opendir in -lx" >&5
  echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
  if test "${ac_cv_lib_x_opendir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12896,7 +13692,7 @@
+@@ -12896,7 +13803,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lx  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 12899 "configure"
-+#line 13695 "configure"
++#line 13806 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12915,16 +13711,16 @@
+@@ -12915,16 +13822,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:12918: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13714: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13825: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:12921: \$? = $ac_status" >&5
-+  echo "$as_me:13717: \$? = $ac_status" >&5
++  echo "$as_me:13828: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:12924: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13720: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13831: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12927: \$? = $ac_status" >&5
-+  echo "$as_me:13723: \$? = $ac_status" >&5
++  echo "$as_me:13834: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_x_opendir=yes
  else
-@@ -12935,7 +13731,7 @@
+@@ -12935,7 +13842,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:12938: result: $ac_cv_lib_x_opendir" >&5
-+echo "$as_me:13734: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:13845: result: $ac_cv_lib_x_opendir" >&5
  echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
  if test $ac_cv_lib_x_opendir = yes; then
    LIBS="$LIBS -lx"
-@@ -12943,13 +13739,13 @@
+@@ -12943,13 +13850,13 @@
  
  fi
  
 -echo "$as_me:12946: checking whether time.h and sys/time.h may both be included" >&5
-+echo "$as_me:13742: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:13853: checking whether time.h and sys/time.h may both be included" >&5
  echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
  if test "${ac_cv_header_time+set}" = set; then
@@ -21199 +24270 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 12952 "configure"
-+#line 13748 "configure"
++#line 13859 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/time.h>
-@@ -12965,16 +13761,16 @@
+@@ -12965,16 +13872,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:12968: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13764: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13875: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:12971: \$? = $ac_status" >&5
-+  echo "$as_me:13767: \$? = $ac_status" >&5
++  echo "$as_me:13878: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:12974: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13770: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13881: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:12977: \$? = $ac_status" >&5
-+  echo "$as_me:13773: \$? = $ac_status" >&5
++  echo "$as_me:13884: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_header_time=yes
  else
-@@ -12984,7 +13780,7 @@
+@@ -12984,7 +13891,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:12987: result: $ac_cv_header_time" >&5
-+echo "$as_me:13783: result: $ac_cv_header_time" >&5
++echo "$as_me:13894: result: $ac_cv_header_time" >&5
  echo "${ECHO_T}$ac_cv_header_time" >&6
  if test $ac_cv_header_time = yes; then
  
-@@ -12999,17 +13795,17 @@
+@@ -12999,17 +13906,17 @@
  cf_regex_libs="regex re"
  case $host_os in #(vi
@@ -21243 +24314 @@
  
 -echo "$as_me:13006: checking for regcomp" >&5
-+echo "$as_me:13802: checking for regcomp" >&5
++echo "$as_me:13913: checking for regcomp" >&5
  echo $ECHO_N "checking for regcomp... $ECHO_C" >&6
  if test "${ac_cv_func_regcomp+set}" = set; then
@@ -21250 +24321 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 13012 "configure"
-+#line 13808 "configure"
++#line 13919 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char regcomp (); below.  */
-@@ -13040,16 +13836,16 @@
+@@ -13032,7 +13939,7 @@
+ #if defined (__stub_regcomp) || defined (__stub___regcomp)
+ choke me
+ #else
+-f = regcomp;
++f = regcomp; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -13040,16 +13947,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:13043: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13839: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13950: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:13046: \$? = $ac_status" >&5
-+  echo "$as_me:13842: \$? = $ac_status" >&5
++  echo "$as_me:13953: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:13049: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13845: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13956: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13052: \$? = $ac_status" >&5
-+  echo "$as_me:13848: \$? = $ac_status" >&5
++  echo "$as_me:13959: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_regcomp=yes
  else
-@@ -13059,7 +13855,7 @@
+@@ -13059,7 +13966,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:13062: result: $ac_cv_func_regcomp" >&5
-+echo "$as_me:13858: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:13969: result: $ac_cv_func_regcomp" >&5
  echo "${ECHO_T}$ac_cv_func_regcomp" >&6
  if test $ac_cv_func_regcomp = yes; then
    cf_regex_func=regcomp
-@@ -13068,7 +13864,7 @@
+@@ -13068,7 +13975,7 @@
         for cf_regex_lib in $cf_regex_libs
         do
                 as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`
 -echo "$as_me:13071: checking for regcomp in -l$cf_regex_lib" >&5
-+echo "$as_me:13867: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:13978: checking for regcomp in -l$cf_regex_lib" >&5
  echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Lib+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13076,7 +13872,7 @@
+@@ -13076,7 +13983,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-l$cf_regex_lib  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 13079 "configure"
-+#line 13875 "configure"
++#line 13986 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13095,16 +13891,16 @@
+@@ -13095,16 +14002,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:13098: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13894: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14005: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:13101: \$? = $ac_status" >&5
-+  echo "$as_me:13897: \$? = $ac_status" >&5
++  echo "$as_me:14008: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:13104: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13900: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14011: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13107: \$? = $ac_status" >&5
-+  echo "$as_me:13903: \$? = $ac_status" >&5
++  echo "$as_me:14014: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_Lib=yes"
  else
-@@ -13115,7 +13911,7 @@
+@@ -13115,7 +14022,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:13118: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:13914: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:14025: result: `eval echo '${'$as_ac_Lib'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
  if test `eval echo '${'$as_ac_Lib'}'` = yes; then
  
-@@ -13129,13 +13925,13 @@
+@@ -13129,13 +14036,13 @@
  fi
  
  if test "$cf_regex_func" = no ; then
 -       echo "$as_me:13132: checking for compile" >&5
-+       echo "$as_me:13928: checking for compile" >&5
++       echo "$as_me:14039: checking for compile" >&5
  echo $ECHO_N "checking for compile... $ECHO_C" >&6
  if test "${ac_cv_func_compile+set}" = set; then
@@ -21344 +24424 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 13138 "configure"
-+#line 13934 "configure"
++#line 14045 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char compile (); below.  */
-@@ -13166,16 +13962,16 @@
+@@ -13158,7 +14065,7 @@
+ #if defined (__stub_compile) || defined (__stub___compile)
+ choke me
+ #else
+-f = compile;
++f = compile; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -13166,16 +14073,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:13169: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13965: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14076: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:13172: \$? = $ac_status" >&5
-+  echo "$as_me:13968: \$? = $ac_status" >&5
++  echo "$as_me:14079: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:13175: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13971: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14082: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13178: \$? = $ac_status" >&5
-+  echo "$as_me:13974: \$? = $ac_status" >&5
++  echo "$as_me:14085: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_compile=yes
  else
-@@ -13185,13 +13981,13 @@
+@@ -13185,13 +14092,13 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:13188: result: $ac_cv_func_compile" >&5
-+echo "$as_me:13984: result: $ac_cv_func_compile" >&5
++echo "$as_me:14095: result: $ac_cv_func_compile" >&5
  echo "${ECHO_T}$ac_cv_func_compile" >&6
  if test $ac_cv_func_compile = yes; then
@@ -21381 +24470 @@
  
 -               echo "$as_me:13194: checking for compile in -lgen" >&5
-+               echo "$as_me:13990: checking for compile in -lgen" >&5
++               echo "$as_me:14101: checking for compile in -lgen" >&5
  echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6
  if test "${ac_cv_lib_gen_compile+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13199,7 +13995,7 @@
+@@ -13199,7 +14106,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgen  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 13202 "configure"
-+#line 13998 "configure"
++#line 14109 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13218,16 +14014,16 @@
+@@ -13218,16 +14125,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:13221: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14017: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14128: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:13224: \$? = $ac_status" >&5
-+  echo "$as_me:14020: \$? = $ac_status" >&5
++  echo "$as_me:14131: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:13227: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14023: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14134: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13230: \$? = $ac_status" >&5
-+  echo "$as_me:14026: \$? = $ac_status" >&5
++  echo "$as_me:14137: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_gen_compile=yes
  else
-@@ -13238,7 +14034,7 @@
+@@ -13238,7 +14145,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:13241: result: $ac_cv_lib_gen_compile" >&5
-+echo "$as_me:14037: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:14148: result: $ac_cv_lib_gen_compile" >&5
  echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
  if test $ac_cv_lib_gen_compile = yes; then
  
-@@ -13251,11 +14047,11 @@
+@@ -13251,11 +14158,11 @@
  fi
  
  if test "$cf_regex_func" = no ; then
 -       { echo "$as_me:13254: WARNING: cannot find regular expression library" >&5
-+       { echo "$as_me:14050: WARNING: cannot find regular expression library" >&5
++       { echo "$as_me:14161: WARNING: cannot find regular expression library" >&5
  echo "$as_me: WARNING: cannot find regular expression library" >&2;}
  fi
  
 -echo "$as_me:13258: checking for regular-expression headers" >&5
-+echo "$as_me:14054: checking for regular-expression headers" >&5
++echo "$as_me:14165: checking for regular-expression headers" >&5
  echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
  if test "${cf_cv_regex_hdrs+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13267,7 +14063,7 @@
+@@ -13267,7 +14174,7 @@
         for cf_regex_hdr in regexp.h regexpr.h
         do
                 cat >conftest.$ac_ext <<_ACEOF
 -#line 13270 "configure"
-+#line 14066 "configure"
++#line 14177 "configure"
  #include "confdefs.h"
  #include <$cf_regex_hdr>
  int
-@@ -13282,16 +14078,16 @@
+@@ -13282,16 +14189,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:13285: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14081: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14192: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:13288: \$? = $ac_status" >&5
-+  echo "$as_me:14084: \$? = $ac_status" >&5
++  echo "$as_me:14195: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:13291: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14087: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14198: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13294: \$? = $ac_status" >&5
-+  echo "$as_me:14090: \$? = $ac_status" >&5
++  echo "$as_me:14201: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
                         cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -13308,7 +14104,7 @@
+@@ -13308,7 +14215,7 @@
         for cf_regex_hdr in regex.h
         do
                 cat >conftest.$ac_ext <<_ACEOF
 -#line 13311 "configure"
-+#line 14107 "configure"
++#line 14218 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <$cf_regex_hdr>
-@@ -13326,16 +14122,16 @@
+@@ -13326,16 +14233,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:13329: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14125: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14236: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:13332: \$? = $ac_status" >&5
-+  echo "$as_me:14128: \$? = $ac_status" >&5
++  echo "$as_me:14239: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:13335: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14131: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14242: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13338: \$? = $ac_status" >&5
-+  echo "$as_me:14134: \$? = $ac_status" >&5
++  echo "$as_me:14245: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
                         cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -13351,11 +14147,11 @@
+@@ -13351,11 +14258,11 @@
  esac
  
  fi
 -echo "$as_me:13354: result: $cf_cv_regex_hdrs" >&5
-+echo "$as_me:14150: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:14261: result: $cf_cv_regex_hdrs" >&5
  echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
  
  case $cf_cv_regex_hdrs in #(vi
 -    no)               { echo "$as_me:13358: WARNING: no regular expression header found" >&5
-+    no)               { echo "$as_me:14154: WARNING: no regular expression header found" >&5
++    no)               { echo "$as_me:14265: WARNING: no regular expression header found" >&5
  echo "$as_me: WARNING: no regular expression header found" >&2;} ;; #(vi
      regex.h)   cat >>confdefs.h <<\EOF
  #define HAVE_REGEX_H_FUNCS 1
-@@ -13391,23 +14187,71 @@
+@@ -13391,23 +14298,71 @@
  
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -echo "$as_me:13394: checking for $ac_header" >&5
-+echo "$as_me:14190: checking for $ac_header" >&5
++echo "$as_me:14301: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -21523 +24612 @@
 +else
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 14196 "configure"
++#line 14307 "configure"
 +#include "confdefs.h"
 +#include <$ac_header>
 +_ACEOF
-+if { (eval echo "$as_me:14200: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:14311: \"$ac_cpp conftest.$ac_ext\"") >&5
 +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +  ac_status=$?
@@ -21533 +24622 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:14206: \$? = $ac_status" >&5
++  echo "$as_me:14317: \$? = $ac_status" >&5
 +  (exit $ac_status); } >/dev/null; then
 +  if test -s conftest.err; then
@@ -21552 +24641 @@
 +rm -f conftest.err conftest.$ac_ext
 +fi
-+echo "$as_me:14225: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:14336: 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
@@ -21565 +24654 @@
 +do
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+echo "$as_me:14238: checking for $ac_header" >&5
++echo "$as_me:14349: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -21572 +24661 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 13400 "configure"
-+#line 14244 "configure"
++#line 14355 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
 -if { (eval echo "$as_me:13404: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:14248: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:14359: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -21584 +24673 @@
    cat conftest.err >&5
 -  echo "$as_me:13410: \$? = $ac_status" >&5
-+  echo "$as_me:14254: \$? = $ac_status" >&5
++  echo "$as_me:14365: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13426,7 +14270,7 @@
+@@ -13426,7 +14381,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:13429: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:14273: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:14384: result: `eval echo '${'$as_ac_Header'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<EOF
-@@ -13436,11 +14280,64 @@
+@@ -13436,11 +14391,64 @@
  fi
  done
  
-+echo "$as_me:14283: checking for header declaring getopt variables" >&5
++echo "$as_me:14394: checking for header declaring getopt variables" >&5
 +echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
 +if test "${cf_cv_getopt_header+set}" = set; then
@@ -21611 +24700 @@
 +do
 +cat >conftest.$ac_ext <<_ACEOF
-+#line 14293 "configure"
++#line 14404 "configure"
 +#include "confdefs.h"
 +
@@ -21624 +24713 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:14306: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14417: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:14309: \$? = $ac_status" >&5
++  echo "$as_me:14420: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:14312: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14423: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:14315: \$? = $ac_status" >&5
++  echo "$as_me:14426: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  cf_cv_getopt_header=$cf_header
@@ -21645 +24734 @@
 +
 +fi
-+echo "$as_me:14327: result: $cf_cv_getopt_header" >&5
++echo "$as_me:14438: result: $cf_cv_getopt_header" >&5
 +echo "${ECHO_T}$cf_cv_getopt_header" >&6
 +if test $cf_cv_getopt_header != none ; then
@@ -21659 +24748 @@
  
 -echo "$as_me:13443: checking for main in -lcposix" >&5
-+echo "$as_me:14340: checking for main in -lcposix" >&5
++echo "$as_me:14451: checking for main in -lcposix" >&5
  echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
  if test "${ac_cv_lib_cposix_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13448,7 +14345,7 @@
+@@ -13448,7 +14456,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lcposix  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 13451 "configure"
-+#line 14348 "configure"
++#line 14459 "configure"
  #include "confdefs.h"
  
  int
-@@ -13460,16 +14357,16 @@
+@@ -13460,16 +14468,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:13463: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14360: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14471: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:13466: \$? = $ac_status" >&5
-+  echo "$as_me:14363: \$? = $ac_status" >&5
++  echo "$as_me:14474: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:13469: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14366: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14477: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13472: \$? = $ac_status" >&5
-+  echo "$as_me:14369: \$? = $ac_status" >&5
++  echo "$as_me:14480: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_cposix_main=yes
  else
-@@ -13480,7 +14377,7 @@
+@@ -13480,7 +14488,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:13483: result: $ac_cv_lib_cposix_main" >&5
-+echo "$as_me:14380: result: $ac_cv_lib_cposix_main" >&5
++echo "$as_me:14491: result: $ac_cv_lib_cposix_main" >&5
  echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
  if test $ac_cv_lib_cposix_main = yes; then
    cat >>confdefs.h <<EOF
-@@ -13491,7 +14388,7 @@
+@@ -13491,7 +14499,7 @@
  
  fi
  
 -       echo "$as_me:13494: checking for bzero in -linet" >&5
-+       echo "$as_me:14391: checking for bzero in -linet" >&5
++       echo "$as_me:14502: checking for bzero in -linet" >&5
  echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
  if test "${ac_cv_lib_inet_bzero+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13499,7 +14396,7 @@
+@@ -13499,7 +14507,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-linet  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 13502 "configure"
-+#line 14399 "configure"
++#line 14510 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13518,16 +14415,16 @@
+@@ -13518,16 +14526,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:13521: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14418: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14529: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:13524: \$? = $ac_status" >&5
-+  echo "$as_me:14421: \$? = $ac_status" >&5
++  echo "$as_me:14532: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:13527: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14424: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14535: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13530: \$? = $ac_status" >&5
-+  echo "$as_me:14427: \$? = $ac_status" >&5
++  echo "$as_me:14538: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_inet_bzero=yes
  else
-@@ -13538,21 +14435,21 @@
+@@ -13538,21 +14546,21 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:13541: result: $ac_cv_lib_inet_bzero" >&5
-+echo "$as_me:14438: result: $ac_cv_lib_inet_bzero" >&5
++echo "$as_me:14549: result: $ac_cv_lib_inet_bzero" >&5
  echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
  if test $ac_cv_lib_inet_bzero = yes; then
@@ -21754 +24843 @@
  
 -echo "$as_me:13548: checking if sys/time.h works with sys/select.h" >&5
-+echo "$as_me:14445: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:14556: checking if sys/time.h works with sys/select.h" >&5
  echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
  if test "${cf_cv_sys_time_select+set}" = set; then
@@ -21762 +24851 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 13555 "configure"
-+#line 14452 "configure"
++#line 14563 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -13572,16 +14469,16 @@
+@@ -13572,16 +14580,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:13575: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14472: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14583: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:13578: \$? = $ac_status" >&5
-+  echo "$as_me:14475: \$? = $ac_status" >&5
++  echo "$as_me:14586: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:13581: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14478: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14589: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13584: \$? = $ac_status" >&5
-+  echo "$as_me:14481: \$? = $ac_status" >&5
++  echo "$as_me:14592: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_sys_time_select=yes
  else
-@@ -13593,7 +14490,7 @@
+@@ -13593,7 +14601,7 @@
  
  fi
  
 -echo "$as_me:13596: result: $cf_cv_sys_time_select" >&5
-+echo "$as_me:14493: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:14604: result: $cf_cv_sys_time_select" >&5
  echo "${ECHO_T}$cf_cv_sys_time_select" >&6
  test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF
  #define HAVE_SYS_TIME_SELECT 1
-@@ -13607,7 +14504,7 @@
+@@ -13607,7 +14615,7 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ac_main_return=return
  
 -echo "$as_me:13610: checking for $CC option to accept ANSI C" >&5
-+echo "$as_me:14507: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:14618: checking for $CC option to accept ANSI C" >&5
  echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
  if test "${ac_cv_prog_cc_stdc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13615,7 +14512,7 @@
+@@ -13615,7 +14623,7 @@
    ac_cv_prog_cc_stdc=no
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
 -#line 13618 "configure"
-+#line 14515 "configure"
++#line 14626 "configure"
  #include "confdefs.h"
  #include <stdarg.h>
  #include <stdio.h>
-@@ -13664,16 +14561,16 @@
+@@ -13664,16 +14672,16 @@
  do
    CC="$ac_save_CC $ac_arg"
    rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:13667: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14564: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14675: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:13670: \$? = $ac_status" >&5
-+  echo "$as_me:14567: \$? = $ac_status" >&5
++  echo "$as_me:14678: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:13673: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14570: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14681: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13676: \$? = $ac_status" >&5
-+  echo "$as_me:14573: \$? = $ac_status" >&5
++  echo "$as_me:14684: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_prog_cc_stdc=$ac_arg
  break
-@@ -13690,21 +14587,21 @@
+@@ -13690,21 +14698,21 @@
  
  case "x$ac_cv_prog_cc_stdc" in
    x|xno)
 -    echo "$as_me:13693: result: none needed" >&5
-+    echo "$as_me:14590: result: none needed" >&5
++    echo "$as_me:14701: result: none needed" >&5
  echo "${ECHO_T}none needed" >&6 ;;
    *)
 -    echo "$as_me:13696: result: $ac_cv_prog_cc_stdc" >&5
-+    echo "$as_me:14593: result: $ac_cv_prog_cc_stdc" >&5
++    echo "$as_me:14704: result: $ac_cv_prog_cc_stdc" >&5
  echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
      CC="$CC $ac_cv_prog_cc_stdc" ;;
@@ -21850 +24939 @@
  
 -echo "$as_me:13701: checking for an ANSI C-conforming const" >&5
-+echo "$as_me:14598: checking for an ANSI C-conforming const" >&5
++echo "$as_me:14709: checking for an ANSI C-conforming const" >&5
  echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
  if test "${ac_cv_c_const+set}" = set; then
@@ -21857 +24946 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 13707 "configure"
-+#line 14604 "configure"
++#line 14715 "configure"
  #include "confdefs.h"
  
  int
-@@ -13762,16 +14659,16 @@
+@@ -13762,16 +14770,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:13765: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14662: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14773: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:13768: \$? = $ac_status" >&5
-+  echo "$as_me:14665: \$? = $ac_status" >&5
++  echo "$as_me:14776: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:13771: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14668: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14779: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13774: \$? = $ac_status" >&5
-+  echo "$as_me:14671: \$? = $ac_status" >&5
++  echo "$as_me:14782: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_c_const=yes
  else
-@@ -13781,7 +14678,7 @@
+@@ -13781,7 +14789,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:13784: result: $ac_cv_c_const" >&5
-+echo "$as_me:14681: result: $ac_cv_c_const" >&5
++echo "$as_me:14792: result: $ac_cv_c_const" >&5
  echo "${ECHO_T}$ac_cv_c_const" >&6
  if test $ac_cv_c_const = no; then
  
-@@ -13791,7 +14688,7 @@
+@@ -13791,7 +14799,7 @@
  
  fi
  
 -echo "$as_me:13794: checking for inline" >&5
-+echo "$as_me:14691: checking for inline" >&5
++echo "$as_me:14802: checking for inline" >&5
  echo $ECHO_N "checking for inline... $ECHO_C" >&6
  if test "${ac_cv_c_inline+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13799,7 +14696,7 @@
+@@ -13799,7 +14807,7 @@
    ac_cv_c_inline=no
  for ac_kw in inline __inline__ __inline; do
    cat >conftest.$ac_ext <<_ACEOF
 -#line 13802 "configure"
-+#line 14699 "configure"
++#line 14810 "configure"
  #include "confdefs.h"
  #ifndef __cplusplus
  static $ac_kw int static_foo () {return 0; }
-@@ -13808,16 +14705,16 @@
+@@ -13808,16 +14816,16 @@
  
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:13811: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14708: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14819: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:13814: \$? = $ac_status" >&5
-+  echo "$as_me:14711: \$? = $ac_status" >&5
++  echo "$as_me:14822: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:13817: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14714: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14825: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13820: \$? = $ac_status" >&5
-+  echo "$as_me:14717: \$? = $ac_status" >&5
++  echo "$as_me:14828: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_c_inline=$ac_kw; break
  else
-@@ -13828,7 +14725,7 @@
+@@ -13828,7 +14836,7 @@
  done
  
  fi
 -echo "$as_me:13831: result: $ac_cv_c_inline" >&5
-+echo "$as_me:14728: result: $ac_cv_c_inline" >&5
++echo "$as_me:14839: result: $ac_cv_c_inline" >&5
  echo "${ECHO_T}$ac_cv_c_inline" >&6
  case $ac_cv_c_inline in
    inline | yes) ;;
-@@ -13851,7 +14748,7 @@
+@@ -13849,9 +14857,12 @@
+   if test "$INTEL_COMPILER" = yes
+   then
      :
++  elif test "$CLANG_COMPILER" = yes
++  then
++    :
    elif test "$GCC" = yes
    then
 -    echo "$as_me:13854: checking if $CC supports options to tune inlining" >&5
-+    echo "$as_me:14751: checking if $CC supports options to tune inlining" >&5
++    echo "$as_me:14865: checking if $CC supports options to tune inlining" >&5
  echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6
  if test "${cf_cv_gcc_inline+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13860,7 +14757,7 @@
+@@ -13860,7 +14871,7 @@
        cf_save_CFLAGS=$CFLAGS
        CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
        cat >conftest.$ac_ext <<_ACEOF
 -#line 13863 "configure"
-+#line 14760 "configure"
++#line 14874 "configure"
  #include "confdefs.h"
  inline int foo(void) { return 1; }
  int
-@@ -13872,16 +14769,16 @@
+@@ -13872,16 +14883,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:13875: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14772: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14886: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:13878: \$? = $ac_status" >&5
-+  echo "$as_me:14775: \$? = $ac_status" >&5
++  echo "$as_me:14889: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:13881: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14778: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14892: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:13884: \$? = $ac_status" >&5
-+  echo "$as_me:14781: \$? = $ac_status" >&5
++  echo "$as_me:14895: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_gcc_inline=yes
  else
-@@ -13893,7 +14790,7 @@
+@@ -13893,7 +14904,7 @@
        CFLAGS=$cf_save_CFLAGS
  
  fi
 -echo "$as_me:13896: result: $cf_cv_gcc_inline" >&5
-+echo "$as_me:14793: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:14907: result: $cf_cv_gcc_inline" >&5
  echo "${ECHO_T}$cf_cv_gcc_inline" >&6
      if test "$cf_cv_gcc_inline" = yes ; then
  
-@@ -13979,7 +14876,7 @@
+@@ -13979,7 +14990,7 @@
    fi
  fi
  
 -echo "$as_me:13982: checking for signal global datatype" >&5
-+echo "$as_me:14879: checking for signal global datatype" >&5
++echo "$as_me:14993: checking for signal global datatype" >&5
  echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
  if test "${cf_cv_sig_atomic_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13991,7 +14888,7 @@
+@@ -13991,7 +15002,7 @@
                 "int"
         do
         cat >conftest.$ac_ext <<_ACEOF
 -#line 13994 "configure"
-+#line 14891 "configure"
++#line 15005 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -14014,16 +14911,16 @@
+@@ -14014,16 +15025,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:14017: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14914: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15028: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14020: \$? = $ac_status" >&5
-+  echo "$as_me:14917: \$? = $ac_status" >&5
++  echo "$as_me:15031: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:14023: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14920: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15034: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14026: \$? = $ac_status" >&5
-+  echo "$as_me:14923: \$? = $ac_status" >&5
++  echo "$as_me:15037: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_sig_atomic_t=$cf_type
  else
-@@ -14037,7 +14934,7 @@
+@@ -14037,7 +15048,7 @@
  
  fi
  
 -echo "$as_me:14040: result: $cf_cv_sig_atomic_t" >&5
-+echo "$as_me:14937: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:15051: result: $cf_cv_sig_atomic_t" >&5
  echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
  test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <<EOF
  #define SIG_ATOMIC_T $cf_cv_sig_atomic_t
-@@ -14045,7 +14942,7 @@
+@@ -14045,7 +15056,7 @@
  
  if test $NCURSES_CHTYPE = auto ; then
  
 -echo "$as_me:14048: checking for type of chtype" >&5
-+echo "$as_me:14945: checking for type of chtype" >&5
++echo "$as_me:15059: checking for type of chtype" >&5
  echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
  if test "${cf_cv_typeof_chtype+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14055,7 +14952,7 @@
+@@ -14055,7 +15066,7 @@
    cf_cv_typeof_chtype=long
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 14058 "configure"
-+#line 14955 "configure"
++#line 15069 "configure"
  #include "confdefs.h"
  
  #define WANT_BITS 31
-@@ -14090,15 +14987,15 @@
+@@ -14090,15 +15101,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:14093: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14990: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15104: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:14096: \$? = $ac_status" >&5
-+  echo "$as_me:14993: \$? = $ac_status" >&5
++  echo "$as_me:15107: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:14098: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14995: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15109: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14101: \$? = $ac_status" >&5
-+  echo "$as_me:14998: \$? = $ac_status" >&5
++  echo "$as_me:15112: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_typeof_chtype=`cat cf_test.out`
  else
-@@ -14113,7 +15010,7 @@
+@@ -14113,7 +15124,7 @@
  
  fi
  
 -echo "$as_me:14116: result: $cf_cv_typeof_chtype" >&5
-+echo "$as_me:15013: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:15127: result: $cf_cv_typeof_chtype" >&5
  echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
  
  cat >>confdefs.h <<EOF
-@@ -14125,14 +15022,14 @@
+@@ -14125,14 +15136,14 @@
  fi
  test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
  
 -echo "$as_me:14128: checking if unsigned literals are legal" >&5
-+echo "$as_me:15025: checking if unsigned literals are legal" >&5
++echo "$as_me:15139: checking if unsigned literals are legal" >&5
  echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
  if test "${cf_cv_unsigned_literals+set}" = set; then
@@ -22095 +25189 @@
         cat >conftest.$ac_ext <<_ACEOF
 -#line 14135 "configure"
-+#line 15032 "configure"
++#line 15146 "configure"
  #include "confdefs.h"
  
  int
-@@ -14144,16 +15041,16 @@
+@@ -14144,16 +15155,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:14147: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15044: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15158: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14150: \$? = $ac_status" >&5
-+  echo "$as_me:15047: \$? = $ac_status" >&5
++  echo "$as_me:15161: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:14153: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15050: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15164: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14156: \$? = $ac_status" >&5
-+  echo "$as_me:15053: \$? = $ac_status" >&5
++  echo "$as_me:15167: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_unsigned_literals=yes
  else
-@@ -14165,7 +15062,7 @@
+@@ -14165,7 +15176,7 @@
  
  fi
  
 -echo "$as_me:14168: result: $cf_cv_unsigned_literals" >&5
-+echo "$as_me:15065: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:15179: result: $cf_cv_unsigned_literals" >&5
  echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
  
  cf_cv_1UL="1"
-@@ -14181,14 +15078,14 @@
+@@ -14181,14 +15192,14 @@
  
  ###    Checks for external-data
  
 -echo "$as_me:14184: checking if external errno is declared" >&5
-+echo "$as_me:15081: checking if external errno is declared" >&5
++echo "$as_me:15195: checking if external errno is declared" >&5
  echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
  if test "${cf_cv_dcl_errno+set}" = set; then
@@ -22142 +25236 @@
      cat >conftest.$ac_ext <<_ACEOF
 -#line 14191 "configure"
-+#line 15088 "configure"
++#line 15202 "configure"
  #include "confdefs.h"
  
  #ifdef HAVE_STDLIB_H
-@@ -14206,16 +15103,16 @@
+@@ -14206,16 +15217,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:14209: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15106: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15220: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14212: \$? = $ac_status" >&5
-+  echo "$as_me:15109: \$? = $ac_status" >&5
++  echo "$as_me:15223: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:14215: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15112: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15226: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14218: \$? = $ac_status" >&5
-+  echo "$as_me:15115: \$? = $ac_status" >&5
++  echo "$as_me:15229: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_dcl_errno=yes
  else
-@@ -14226,7 +15123,7 @@
+@@ -14226,7 +15237,7 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  
  fi
 -echo "$as_me:14229: result: $cf_cv_dcl_errno" >&5
-+echo "$as_me:15126: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:15240: result: $cf_cv_dcl_errno" >&5
  echo "${ECHO_T}$cf_cv_dcl_errno" >&6
  
  if test "$cf_cv_dcl_errno" = no ; then
-@@ -14241,14 +15138,14 @@
+@@ -14241,14 +15252,14 @@
  
  # It's possible (for near-UNIX clones) that the data doesn't exist
  
 -echo "$as_me:14244: checking if external errno exists" >&5
-+echo "$as_me:15141: checking if external errno exists" >&5
++echo "$as_me:15255: checking if external errno exists" >&5
  echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
  if test "${cf_cv_have_errno+set}" = set; then
@@ -22189 +25283 @@
      cat >conftest.$ac_ext <<_ACEOF
 -#line 14251 "configure"
-+#line 15148 "configure"
++#line 15262 "configure"
  #include "confdefs.h"
  
  #undef errno
-@@ -14263,16 +15160,16 @@
+@@ -14263,16 +15274,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:14266: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15163: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15277: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:14269: \$? = $ac_status" >&5
-+  echo "$as_me:15166: \$? = $ac_status" >&5
++  echo "$as_me:15280: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:14272: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15169: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15283: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14275: \$? = $ac_status" >&5
-+  echo "$as_me:15172: \$? = $ac_status" >&5
++  echo "$as_me:15286: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_have_errno=yes
  else
-@@ -14283,7 +15180,7 @@
+@@ -14283,7 +15294,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  
  fi
 -echo "$as_me:14286: result: $cf_cv_have_errno" >&5
-+echo "$as_me:15183: result: $cf_cv_have_errno" >&5
++echo "$as_me:15297: result: $cf_cv_have_errno" >&5
  echo "${ECHO_T}$cf_cv_have_errno" >&6
  
  if test "$cf_cv_have_errno" = yes ; then
-@@ -14296,7 +15193,7 @@
+@@ -14296,7 +15307,7 @@
  
  fi
  
 -echo "$as_me:14299: checking if data-only library module links" >&5
-+echo "$as_me:15196: checking if data-only library module links" >&5
++echo "$as_me:15310: checking if data-only library module links" >&5
  echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
  if test "${cf_cv_link_dataonly+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14304,20 +15201,20 @@
+@@ -14304,20 +15315,20 @@
  
         rm -f conftest.a
         cat >conftest.$ac_ext <<EOF
 -#line 14307 "configure"
-+#line 15204 "configure"
++#line 15318 "configure"
  int    testdata[3] = { 123, 456, 789 };
  EOF
 -       if { (eval echo "$as_me:14310: \"$ac_compile\"") >&5
-+       if { (eval echo "$as_me:15207: \"$ac_compile\"") >&5
++       if { (eval echo "$as_me:15321: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14313: \$? = $ac_status" >&5
-+  echo "$as_me:15210: \$? = $ac_status" >&5
++  echo "$as_me:15324: \$? = $ac_status" >&5
    (exit $ac_status); } ; then
                 mv conftest.o data.o && \
@@ -22253 +25347 @@
         cat >conftest.$ac_ext <<EOF
 -#line 14320 "configure"
-+#line 15217 "configure"
++#line 15331 "configure"
  int    testfunc()
  {
  #if defined(NeXT)
-@@ -14330,10 +15227,10 @@
+@@ -14330,10 +15341,10 @@
  #endif
  }
  EOF
 -       if { (eval echo "$as_me:14333: \"$ac_compile\"") >&5
-+       if { (eval echo "$as_me:15230: \"$ac_compile\"") >&5
++       if { (eval echo "$as_me:15344: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14336: \$? = $ac_status" >&5
-+  echo "$as_me:15233: \$? = $ac_status" >&5
++  echo "$as_me:15347: \$? = $ac_status" >&5
    (exit $ac_status); }; then
                 mv conftest.o func.o && \
                 ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
-@@ -14346,7 +15243,7 @@
+@@ -14346,7 +15357,7 @@
    cf_cv_link_dataonly=unknown
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 14349 "configure"
-+#line 15246 "configure"
++#line 15360 "configure"
  #include "confdefs.h"
  
         int main()
-@@ -14357,15 +15254,15 @@
+@@ -14357,15 +15368,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:14360: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15257: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15371: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:14363: \$? = $ac_status" >&5
-+  echo "$as_me:15260: \$? = $ac_status" >&5
++  echo "$as_me:15374: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:14365: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15262: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15376: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14368: \$? = $ac_status" >&5
-+  echo "$as_me:15265: \$? = $ac_status" >&5
++  echo "$as_me:15379: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_link_dataonly=yes
  else
-@@ -14380,7 +15277,7 @@
+@@ -14380,7 +15391,7 @@
  
  fi
  
 -echo "$as_me:14383: result: $cf_cv_link_dataonly" >&5
-+echo "$as_me:15280: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:15394: result: $cf_cv_link_dataonly" >&5
  echo "${ECHO_T}$cf_cv_link_dataonly" >&6
  
  if test "$cf_cv_link_dataonly" = no ; then
-@@ -14415,13 +15312,13 @@
+@@ -14400,10 +15411,12 @@
+ getttynam \
+ issetugid \
+ poll \
++putenv \
+ remove \
+ select \
+ setbuf \
+ setbuffer \
++setenv \
+ setvbuf \
+ sigaction \
+ sigvec \
+@@ -14415,13 +15428,13 @@
  
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -echo "$as_me:14418: checking for $ac_func" >&5
-+echo "$as_me:15315: checking for $ac_func" >&5
++echo "$as_me:15431: checking for $ac_func" >&5
  echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
  if eval "test \"\${$as_ac_var+set}\" = set"; then
@@ -22320 +25427 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 14424 "configure"
-+#line 15321 "configure"
++#line 15437 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func (); below.  */
-@@ -14452,16 +15349,16 @@
+@@ -14444,7 +15457,7 @@
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+-f = $ac_func;
++f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -14452,16 +15465,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:14455: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15352: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15468: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:14458: \$? = $ac_status" >&5
-+  echo "$as_me:15355: \$? = $ac_status" >&5
++  echo "$as_me:15471: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:14461: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15358: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15474: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14464: \$? = $ac_status" >&5
-+  echo "$as_me:15361: \$? = $ac_status" >&5
++  echo "$as_me:15477: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_var=yes"
  else
-@@ -14471,7 +15368,7 @@
+@@ -14471,7 +15484,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:14474: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:15371: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:15487: result: `eval echo '${'$as_ac_var'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<EOF
-@@ -14483,14 +15380,14 @@
+@@ -14483,14 +15496,70 @@
  
  if test "$with_getcap" = "yes" ; then
  
 -echo "$as_me:14486: checking for terminal-capability database functions" >&5
-+echo "$as_me:15383: checking for terminal-capability database functions" >&5
++echo "$as_me:15499: checking for terminal-capability database functions" >&5
  echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
  if test "${cf_cv_cgetent+set}" = set; then
@@ -22367 +25483 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 14493 "configure"
-+#line 15390 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -14501,7 +15398,7 @@
-        char temp[128];
-        char *buf = temp;
-        char *db_array = temp;
--       cgetent(&buf, /* int *, */ &db_array, "vt100");
-+       cgetent(&buf, &db_array, "vt100");
-        cgetcap(buf, "tc", '=');
-        cgetmatch(buf, "tc");
- 
-@@ -14510,16 +15407,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14513: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15410: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14516: \$? = $ac_status" >&5
-+  echo "$as_me:15413: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14519: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15416: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14522: \$? = $ac_status" >&5
-+  echo "$as_me:15419: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cgetent=yes
- else
-@@ -14530,23 +15427,85 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--
--echo "$as_me:14534: result: $cf_cv_cgetent" >&5
-+echo "$as_me:15430: result: $cf_cv_cgetent" >&5
- echo "${ECHO_T}$cf_cv_cgetent" >&6
--test "$cf_cv_cgetent" = yes && cat >>confdefs.h <<\EOF
-+
-+if test "$cf_cv_cgetent" = yes
-+then
-+       cat >>confdefs.h <<\EOF
- #define HAVE_BSD_CGETENT 1
- EOF
- 
-+echo "$as_me:15439: checking if cgetent uses const parameter" >&5
-+echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
-+if test "${cf_cv_cgetent_const+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 15446 "configure"
++#line 15506 "configure"
 +#include "confdefs.h"
 +
@@ -22434 +25493 @@
 +       char temp[128];
 +       char *buf = temp;
-+#ifndef _NETBSD_SOURCE                 /* given, since April 2004 in stdlib.h */
-+       const char *db_array = temp;
++       char *db_array = temp;
 +       cgetent(&buf, &db_array, "vt100");
-+#endif
 +       cgetcap(buf, "tc", '=');
 +       cgetmatch(buf, "tc");
@@ -22446 +25503 @@
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:15468: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15526: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
-+  echo "$as_me:15471: \$? = $ac_status" >&5
++  echo "$as_me:15529: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:15474: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15532: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:15477: \$? = $ac_status" >&5
++  echo "$as_me:15535: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
-+  cf_cv_cgetent_const=yes
++  cf_cv_cgetent=yes
 +else
 +  echo "$as_me: failed program was:" >&5
 +cat conftest.$ac_ext >&5
-+cf_cv_cgetent_const=no
++cf_cv_cgetent=no
 +fi
 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 +
 +fi
-+echo "$as_me:15488: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:15546: result: $cf_cv_cgetent" >&5
++echo "${ECHO_T}$cf_cv_cgetent" >&6
++
++if test "$cf_cv_cgetent" = yes
++then
++       cat >>confdefs.h <<\EOF
++#define HAVE_BSD_CGETENT 1
++EOF
++
++echo "$as_me:15555: checking if cgetent uses const parameter" >&5
++echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
++if test "${cf_cv_cgetent_const+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++cat >conftest.$ac_ext <<_ACEOF
++#line 15562 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -14500,8 +15569,10 @@
+ 
+        char temp[128];
+        char *buf = temp;
+-       char *db_array = temp;
+-       cgetent(&buf, /* int *, */ &db_array, "vt100");
++#ifndef _NETBSD_SOURCE                 /* given, since April 2004 in stdlib.h */
++       const char *db_array = temp;
++       cgetent(&buf, &db_array, "vt100");
++#endif
+        cgetcap(buf, "tc", '=');
+        cgetmatch(buf, "tc");
+ 
+@@ -14510,43 +15581,47 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14513: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15584: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14516: \$? = $ac_status" >&5
++  echo "$as_me:15587: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14519: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15590: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14522: \$? = $ac_status" >&5
++  echo "$as_me:15593: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  cf_cv_cgetent=yes
++  cf_cv_cgetent_const=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-cf_cv_cgetent=no
++cf_cv_cgetent_const=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-
+-echo "$as_me:14534: result: $cf_cv_cgetent" >&5
+-echo "${ECHO_T}$cf_cv_cgetent" >&6
+-test "$cf_cv_cgetent" = yes && cat >>confdefs.h <<\EOF
+-#define HAVE_BSD_CGETENT 1
++echo "$as_me:15604: result: $cf_cv_cgetent_const" >&5
 +echo "${ECHO_T}$cf_cv_cgetent_const" >&6
 +       if test "$cf_cv_cgetent_const" = yes
@@ -22472 +25597 @@
 +               cat >>confdefs.h <<EOF
 +#define CGETENT_CONST const
-+EOF
-+
+ EOF
+ 
 +       fi
 +fi
@@ -22480 +25605 @@
  
 -echo "$as_me:14542: checking for isascii" >&5
-+echo "$as_me:15501: checking for isascii" >&5
++echo "$as_me:15617: checking for isascii" >&5
  echo $ECHO_N "checking for isascii... $ECHO_C" >&6
  if test "${cf_cv_have_isascii+set}" = set; then
@@ -22488 +25613 @@
         cat >conftest.$ac_ext <<_ACEOF
 -#line 14549 "configure"
-+#line 15508 "configure"
++#line 15624 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  int
-@@ -14558,16 +15517,16 @@
+@@ -14558,16 +15633,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:14561: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15520: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15636: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:14564: \$? = $ac_status" >&5
-+  echo "$as_me:15523: \$? = $ac_status" >&5
++  echo "$as_me:15639: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:14567: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15526: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15642: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14570: \$? = $ac_status" >&5
-+  echo "$as_me:15529: \$? = $ac_status" >&5
++  echo "$as_me:15645: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_have_isascii=yes
  else
-@@ -14578,17 +15537,17 @@
+@@ -14578,17 +15653,17 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  
  fi
 -echo "$as_me:14581: result: $cf_cv_have_isascii" >&5
-+echo "$as_me:15540: result: $cf_cv_have_isascii" >&5
++echo "$as_me:15656: result: $cf_cv_have_isascii" >&5
  echo "${ECHO_T}$cf_cv_have_isascii" >&6
  test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF
@@ -22526 +25651 @@
  if test "$ac_cv_func_sigaction" = yes; then
 -echo "$as_me:14588: checking whether sigaction needs _POSIX_SOURCE" >&5
-+echo "$as_me:15547: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:15663: checking whether sigaction needs _POSIX_SOURCE" >&5
  echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
 -#line 14591 "configure"
-+#line 15550 "configure"
++#line 15666 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -14602,16 +15561,16 @@
+@@ -14602,16 +15677,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:14605: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15564: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15680: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14608: \$? = $ac_status" >&5
-+  echo "$as_me:15567: \$? = $ac_status" >&5
++  echo "$as_me:15683: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:14611: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15570: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15686: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14614: \$? = $ac_status" >&5
-+  echo "$as_me:15573: \$? = $ac_status" >&5
++  echo "$as_me:15689: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    sigact_bad=no
  else
-@@ -14619,7 +15578,7 @@
+@@ -14619,7 +15694,7 @@
  cat conftest.$ac_ext >&5
  
  cat >conftest.$ac_ext <<_ACEOF
 -#line 14622 "configure"
-+#line 15581 "configure"
++#line 15697 "configure"
  #include "confdefs.h"
  
  #define _POSIX_SOURCE
-@@ -14634,20 +15593,20 @@
+@@ -14634,20 +15709,20 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:14637: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15596: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15712: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14640: \$? = $ac_status" >&5
-+  echo "$as_me:15599: \$? = $ac_status" >&5
++  echo "$as_me:15715: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:14643: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15602: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15718: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14646: \$? = $ac_status" >&5
-+  echo "$as_me:15605: \$? = $ac_status" >&5
++  echo "$as_me:15721: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    sigact_bad=yes
@@ -22590 +25715 @@
  
  else
-@@ -14658,11 +15617,11 @@
+@@ -14658,11 +15733,11 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
 -echo "$as_me:14661: result: $sigact_bad" >&5
-+echo "$as_me:15620: result: $sigact_bad" >&5
++echo "$as_me:15736: result: $sigact_bad" >&5
  echo "${ECHO_T}$sigact_bad" >&6
  fi
  
 -echo "$as_me:14665: checking if nanosleep really works" >&5
-+echo "$as_me:15624: checking if nanosleep really works" >&5
++echo "$as_me:15740: checking if nanosleep really works" >&5
  echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
  if test "${cf_cv_func_nanosleep+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14672,7 +15631,7 @@
+@@ -14672,7 +15747,7 @@
    cf_cv_func_nanosleep=unknown
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 14675 "configure"
-+#line 15634 "configure"
++#line 15750 "configure"
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -14697,15 +15656,15 @@
+@@ -14697,15 +15772,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:14700: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15659: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15775: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:14703: \$? = $ac_status" >&5
-+  echo "$as_me:15662: \$? = $ac_status" >&5
++  echo "$as_me:15778: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:14705: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15664: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15780: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14708: \$? = $ac_status" >&5
-+  echo "$as_me:15667: \$? = $ac_status" >&5
++  echo "$as_me:15783: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_func_nanosleep=yes
  else
-@@ -14717,7 +15676,7 @@
+@@ -14717,7 +15792,7 @@
  rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
 -echo "$as_me:14720: result: $cf_cv_func_nanosleep" >&5
-+echo "$as_me:15679: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:15795: result: $cf_cv_func_nanosleep" >&5
  echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
  
  test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF
-@@ -14731,23 +15690,23 @@
+@@ -14731,23 +15806,23 @@
  
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -echo "$as_me:14734: checking for $ac_header" >&5
-+echo "$as_me:15693: checking for $ac_header" >&5
++echo "$as_me:15809: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -22654 +25779 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 14740 "configure"
-+#line 15699 "configure"
++#line 15815 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
 -if { (eval echo "$as_me:14744: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15703: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15819: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -22666 +25791 @@
    cat conftest.err >&5
 -  echo "$as_me:14750: \$? = $ac_status" >&5
-+  echo "$as_me:15709: \$? = $ac_status" >&5
++  echo "$as_me:15825: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -14766,7 +15725,7 @@
+@@ -14766,7 +15841,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:14769: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:15728: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:15844: result: `eval echo '${'$as_ac_Header'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<EOF
-@@ -14781,23 +15740,23 @@
+@@ -14781,23 +15856,23 @@
  for ac_header in sys/termio.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -echo "$as_me:14784: checking for $ac_header" >&5
-+echo "$as_me:15743: checking for $ac_header" >&5
++echo "$as_me:15859: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -22691 +25816 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 14790 "configure"
-+#line 15749 "configure"
++#line 15865 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
 -if { (eval echo "$as_me:14794: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15753: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15869: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -22703 +25828 @@
    cat conftest.err >&5
 -  echo "$as_me:14800: \$? = $ac_status" >&5
-+  echo "$as_me:15759: \$? = $ac_status" >&5
++  echo "$as_me:15875: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -14816,7 +15775,7 @@
+@@ -14816,7 +15891,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:14819: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:15778: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:15894: result: `eval echo '${'$as_ac_Header'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<EOF
-@@ -14834,10 +15793,10 @@
+@@ -14834,10 +15909,10 @@
         *)      termios_bad=maybe ;;
         esac
         if test "$termios_bad" = maybe ; then
 -       echo "$as_me:14837: checking whether termios.h needs _POSIX_SOURCE" >&5
-+       echo "$as_me:15796: checking whether termios.h needs _POSIX_SOURCE" >&5
++       echo "$as_me:15912: checking whether termios.h needs _POSIX_SOURCE" >&5
  echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
         cat >conftest.$ac_ext <<_ACEOF
 -#line 14840 "configure"
-+#line 15799 "configure"
++#line 15915 "configure"
  #include "confdefs.h"
  #include <termios.h>
  int
-@@ -14849,16 +15808,16 @@
+@@ -14849,16 +15924,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:14852: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15811: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15927: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14855: \$? = $ac_status" >&5
-+  echo "$as_me:15814: \$? = $ac_status" >&5
++  echo "$as_me:15930: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:14858: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15817: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15933: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14861: \$? = $ac_status" >&5
-+  echo "$as_me:15820: \$? = $ac_status" >&5
++  echo "$as_me:15936: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    termios_bad=no
  else
-@@ -14866,7 +15825,7 @@
+@@ -14866,7 +15941,7 @@
  cat conftest.$ac_ext >&5
  
                 cat >conftest.$ac_ext <<_ACEOF
 -#line 14869 "configure"
-+#line 15828 "configure"
++#line 15944 "configure"
  #include "confdefs.h"
  
  #define _POSIX_SOURCE
-@@ -14880,23 +15839,23 @@
+@@ -14880,23 +15955,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:14883: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15842: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15958: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:14886: \$? = $ac_status" >&5
-+  echo "$as_me:15845: \$? = $ac_status" >&5
++  echo "$as_me:15961: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:14889: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15848: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15964: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14892: \$? = $ac_status" >&5
-+  echo "$as_me:15851: \$? = $ac_status" >&5
++  echo "$as_me:15967: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    termios_bad=unknown
@@ -22788 +25913 @@
  
  fi
-@@ -14904,19 +15863,19 @@
+@@ -14904,19 +15979,19 @@
  
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
 -       echo "$as_me:14907: result: $termios_bad" >&5
-+       echo "$as_me:15866: result: $termios_bad" >&5
++       echo "$as_me:15982: result: $termios_bad" >&5
  echo "${ECHO_T}$termios_bad" >&6
         fi
@@ -22799 +25924 @@
  
 -echo "$as_me:14912: checking for tcgetattr" >&5
-+echo "$as_me:15871: checking for tcgetattr" >&5
++echo "$as_me:15987: checking for tcgetattr" >&5
  echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
  if test "${cf_cv_have_tcgetattr+set}" = set; then
@@ -22807 +25932 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 14919 "configure"
-+#line 15878 "configure"
++#line 15994 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -14944,16 +15903,16 @@
+@@ -14944,16 +16019,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:14947: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15906: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16022: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:14950: \$? = $ac_status" >&5
-+  echo "$as_me:15909: \$? = $ac_status" >&5
++  echo "$as_me:16025: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:14953: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15912: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16028: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:14956: \$? = $ac_status" >&5
-+  echo "$as_me:15915: \$? = $ac_status" >&5
++  echo "$as_me:16031: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_have_tcgetattr=yes
  else
-@@ -14963,20 +15922,20 @@
+@@ -14963,20 +16038,20 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:14966: result: $cf_cv_have_tcgetattr" >&5
-+echo "$as_me:15925: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:16041: result: $cf_cv_have_tcgetattr" >&5
  echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
  test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF
@@ -22844 +25969 @@
  
 -echo "$as_me:14972: checking for vsscanf function or workaround" >&5
-+echo "$as_me:15931: checking for vsscanf function or workaround" >&5
++echo "$as_me:16047: checking for vsscanf function or workaround" >&5
  echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
  if test "${cf_cv_func_vsscanf+set}" = set; then
@@ -22852 +25977 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 14979 "configure"
-+#line 15938 "configure"
++#line 16054 "configure"
  #include "confdefs.h"
  
  #include <stdarg.h>
-@@ -14992,16 +15951,16 @@
+@@ -14992,16 +16067,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:14995: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15954: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16070: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:14998: \$? = $ac_status" >&5
-+  echo "$as_me:15957: \$? = $ac_status" >&5
++  echo "$as_me:16073: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:15001: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15960: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16076: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15004: \$? = $ac_status" >&5
-+  echo "$as_me:15963: \$? = $ac_status" >&5
++  echo "$as_me:16079: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_func_vsscanf=vsscanf
  else
-@@ -15009,7 +15968,7 @@
+@@ -15009,7 +16084,7 @@
  cat conftest.$ac_ext >&5
  
  cat >conftest.$ac_ext <<_ACEOF
 -#line 15012 "configure"
-+#line 15971 "configure"
++#line 16087 "configure"
  #include "confdefs.h"
  
  #include <stdarg.h>
-@@ -15031,16 +15990,16 @@
+@@ -15031,16 +16106,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:15034: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15993: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16109: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:15037: \$? = $ac_status" >&5
-+  echo "$as_me:15996: \$? = $ac_status" >&5
++  echo "$as_me:16112: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:15040: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15999: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16115: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15043: \$? = $ac_status" >&5
-+  echo "$as_me:16002: \$? = $ac_status" >&5
++  echo "$as_me:16118: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_func_vsscanf=vfscanf
  else
-@@ -15048,7 +16007,7 @@
+@@ -15048,7 +16123,7 @@
  cat conftest.$ac_ext >&5
  
  cat >conftest.$ac_ext <<_ACEOF
 -#line 15051 "configure"
-+#line 16010 "configure"
++#line 16126 "configure"
  #include "confdefs.h"
  
  #include <stdarg.h>
-@@ -15070,16 +16029,16 @@
+@@ -15070,16 +16145,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:15073: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16032: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16148: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:15076: \$? = $ac_status" >&5
-+  echo "$as_me:16035: \$? = $ac_status" >&5
++  echo "$as_me:16151: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:15079: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16038: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16154: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15082: \$? = $ac_status" >&5
-+  echo "$as_me:16041: \$? = $ac_status" >&5
++  echo "$as_me:16157: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_func_vsscanf=_doscan
  else
-@@ -15094,7 +16053,7 @@
+@@ -15094,7 +16169,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:15097: result: $cf_cv_func_vsscanf" >&5
-+echo "$as_me:16056: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:16172: result: $cf_cv_func_vsscanf" >&5
  echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
  
  case $cf_cv_func_vsscanf in #(vi
-@@ -15112,7 +16071,7 @@
+@@ -15112,7 +16187,7 @@
  ;;
  esac
  
 -echo "$as_me:15115: checking for working mkstemp" >&5
-+echo "$as_me:16074: checking for working mkstemp" >&5
++echo "$as_me:16190: checking for working mkstemp" >&5
  echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
  if test "${cf_cv_func_mkstemp+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15120,13 +16079,13 @@
+@@ -15120,68 +16195,10 @@
  
  rm -rf conftest*
  if test "$cross_compiling" = yes; then
 -  echo "$as_me:15123: checking for mkstemp" >&5
-+  echo "$as_me:16082: checking for mkstemp" >&5
- echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
- if test "${ac_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
+-echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
+-if test "${ac_cv_func_mkstemp+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
 -#line 15129 "configure"
-+#line 16088 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char mkstemp (); below.  */
-@@ -15157,16 +16116,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+-#include "confdefs.h"
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char mkstemp (); below.  */
+-#include <assert.h>
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char mkstemp ();
+-char (*f) ();
+-
+-int
+-main ()
+-{
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_mkstemp) || defined (__stub___mkstemp)
+-choke me
+-#else
+-f = mkstemp;
+-#endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:15160: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16119: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
 -  echo "$as_me:15163: \$? = $ac_status" >&5
-+  echo "$as_me:16122: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:15166: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16125: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
 -  echo "$as_me:15169: \$? = $ac_status" >&5
-+  echo "$as_me:16128: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_mkstemp=yes
- else
-@@ -15176,12 +16135,12 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_mkstemp=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_func_mkstemp=no
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-fi
 -echo "$as_me:15179: result: $ac_cv_func_mkstemp" >&5
-+echo "$as_me:16138: result: $ac_cv_func_mkstemp" >&5
- echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
- 
+-echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+-
++  cf_cv_func_mkstemp=maybe
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 15184 "configure"
-+#line 16143 "configure"
++#line 16201 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -15219,15 +16178,15 @@
+@@ -15219,15 +16236,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:15222: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16181: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16239: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:15225: \$? = $ac_status" >&5
-+  echo "$as_me:16184: \$? = $ac_status" >&5
++  echo "$as_me:16242: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:15227: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16186: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16244: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15230: \$? = $ac_status" >&5
-+  echo "$as_me:16189: \$? = $ac_status" >&5
++  echo "$as_me:16247: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_func_mkstemp=yes
  
-@@ -15242,7 +16201,7 @@
+@@ -15242,8 +16259,69 @@
  fi
  
  fi
 -echo "$as_me:15245: result: $cf_cv_func_mkstemp" >&5
-+echo "$as_me:16204: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:16262: result: $cf_cv_func_mkstemp" >&5
  echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
++if test "x$cf_cv_func_mkstemp" = xmaybe ; then
++       echo "$as_me:16265: checking for mkstemp" >&5
++echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
++if test "${ac_cv_func_mkstemp+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++#line 16271 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char mkstemp (); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char mkstemp ();
++char (*f) ();
++
++int
++main ()
++{
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_mkstemp) || defined (__stub___mkstemp)
++choke me
++#else
++f = mkstemp; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:16302: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:16305: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:16308: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:16311: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_mkstemp=yes
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++ac_cv_func_mkstemp=no
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:16321: result: $ac_cv_func_mkstemp" >&5
++echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
++
++fi
  if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then
         cat >>confdefs.h <<\EOF
-@@ -15260,21 +16219,21 @@
+ #define HAVE_MKSTEMP 1
+@@ -15260,21 +16338,21 @@
  fi
  
  if test "$cross_compiling" = yes ; then
 -       { echo "$as_me:15263: WARNING: cross compiling: assume setvbuf params not reversed" >&5
-+       { echo "$as_me:16222: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++       { echo "$as_me:16341: WARNING: cross compiling: assume setvbuf params not reversed" >&5
  echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
  else
 -       echo "$as_me:15266: checking whether setvbuf arguments are reversed" >&5
-+       echo "$as_me:16225: checking whether setvbuf arguments are reversed" >&5
++       echo "$as_me:16344: checking whether setvbuf arguments are reversed" >&5
  echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
  if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
@@ -23052 +26258 @@
    if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:15272: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:16231: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:16350: error: cannot run test program while cross compiling" >&5
  echo "$as_me: error: cannot run test program while cross compiling" >&2;}
     { (exit 1); exit 1; }; }
@@ -23058 +26264 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 15277 "configure"
-+#line 16236 "configure"
++#line 16355 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  /* If setvbuf has the reversed format, exit 0. */
-@@ -15291,15 +16250,15 @@
+@@ -15291,15 +16369,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:15294: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16253: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16372: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:15297: \$? = $ac_status" >&5
-+  echo "$as_me:16256: \$? = $ac_status" >&5
++  echo "$as_me:16375: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:15299: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16258: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16377: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15302: \$? = $ac_status" >&5
-+  echo "$as_me:16261: \$? = $ac_status" >&5
++  echo "$as_me:16380: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_setvbuf_reversed=yes
  else
-@@ -15312,7 +16271,7 @@
+@@ -15312,7 +16390,7 @@
  fi
  rm -f core core.* *.core
  fi
 -echo "$as_me:15315: result: $ac_cv_func_setvbuf_reversed" >&5
-+echo "$as_me:16274: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:16393: result: $ac_cv_func_setvbuf_reversed" >&5
  echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
  if test $ac_cv_func_setvbuf_reversed = yes; then
  
-@@ -15323,13 +16282,13 @@
+@@ -15323,13 +16401,13 @@
  fi
  
  fi
 -echo "$as_me:15326: checking return type of signal handlers" >&5
-+echo "$as_me:16285: checking return type of signal handlers" >&5
++echo "$as_me:16404: checking return type of signal handlers" >&5
  echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
  if test "${ac_cv_type_signal+set}" = set; then
@@ -23103 +26309 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 15332 "configure"
-+#line 16291 "configure"
++#line 16410 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <signal.h>
-@@ -15351,16 +16310,16 @@
+@@ -15351,16 +16429,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:15354: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16313: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16432: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:15357: \$? = $ac_status" >&5
-+  echo "$as_me:16316: \$? = $ac_status" >&5
++  echo "$as_me:16435: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:15360: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16319: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16438: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15363: \$? = $ac_status" >&5
-+  echo "$as_me:16322: \$? = $ac_status" >&5
++  echo "$as_me:16441: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_signal=void
  else
-@@ -15370,21 +16329,73 @@
+@@ -15370,21 +16448,73 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:15373: result: $ac_cv_type_signal" >&5
-+echo "$as_me:16332: result: $ac_cv_type_signal" >&5
++echo "$as_me:16451: result: $ac_cv_type_signal" >&5
  echo "${ECHO_T}$ac_cv_type_signal" >&6
  
@@ -23141 +26347 @@
  
 -echo "$as_me:15380: checking for type sigaction_t" >&5
-+echo "$as_me:16339: checking for intptr_t" >&5
++echo "$as_me:16458: checking for intptr_t" >&5
 +echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
 +if test "${ac_cv_type_intptr_t+set}" = set; then
@@ -23147 +26353 @@
 +else
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 16345 "configure"
++#line 16464 "configure"
 +#include "confdefs.h"
 +$ac_includes_default
@@ -23162 +26368 @@
 +_ACEOF
 +rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:16360: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16479: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
-+  echo "$as_me:16363: \$? = $ac_status" >&5
++  echo "$as_me:16482: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:16366: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16485: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
-+  echo "$as_me:16369: \$? = $ac_status" >&5
++  echo "$as_me:16488: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_type_intptr_t=yes
@@ -23181 +26387 @@
 +rm -f conftest.$ac_objext conftest.$ac_ext
 +fi
-+echo "$as_me:16379: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:16498: result: $ac_cv_type_intptr_t" >&5
 +echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
 +if test $ac_cv_type_intptr_t = yes; then
@@ -23193 +26399 @@
 +fi
 +
-+echo "$as_me:16391: checking for type sigaction_t" >&5
++echo "$as_me:16510: checking for type sigaction_t" >&5
  echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
  if test "${cf_cv_type_sigaction+set}" = set; then
@@ -23201 +26407 @@
         cat >conftest.$ac_ext <<_ACEOF
 -#line 15387 "configure"
-+#line 16398 "configure"
++#line 16517 "configure"
  #include "confdefs.h"
  
  #include <signal.h>
-@@ -15397,16 +16408,16 @@
+@@ -15397,16 +16527,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:15400: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16411: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16530: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:15403: \$? = $ac_status" >&5
-+  echo "$as_me:16414: \$? = $ac_status" >&5
++  echo "$as_me:16533: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:15406: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16417: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16536: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15409: \$? = $ac_status" >&5
-+  echo "$as_me:16420: \$? = $ac_status" >&5
++  echo "$as_me:16539: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_type_sigaction=yes
  else
-@@ -15417,13 +16428,13 @@
+@@ -15417,13 +16547,13 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
  
 -echo "$as_me:15420: result: $cf_cv_type_sigaction" >&5
-+echo "$as_me:16431: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:16550: result: $cf_cv_type_sigaction" >&5
  echo "${ECHO_T}$cf_cv_type_sigaction" >&6
  test "$cf_cv_type_sigaction" = yes && cat >>confdefs.h <<\EOF
@@ -23238 +26444 @@
  
 -echo "$as_me:15426: checking declaration of size-change" >&5
-+echo "$as_me:16437: checking declaration of size-change" >&5
++echo "$as_me:16556: checking declaration of size-change" >&5
  echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
  if test "${cf_cv_sizechange+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15438,7 +16449,7 @@
+@@ -15438,7 +16568,7 @@
      CPPFLAGS="$cf_save_CPPFLAGS"
      test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
      cat >conftest.$ac_ext <<_ACEOF
 -#line 15441 "configure"
-+#line 16452 "configure"
++#line 16571 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #ifdef HAVE_TERMIOS_H
-@@ -15482,16 +16493,16 @@
+@@ -15482,16 +16612,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:15485: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16496: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16615: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:15488: \$? = $ac_status" >&5
-+  echo "$as_me:16499: \$? = $ac_status" >&5
++  echo "$as_me:16618: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:15491: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16502: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16621: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15494: \$? = $ac_status" >&5
-+  echo "$as_me:16505: \$? = $ac_status" >&5
++  echo "$as_me:16624: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_sizechange=yes
  else
-@@ -15510,7 +16521,7 @@
+@@ -15510,7 +16640,7 @@
  done
  
  fi
 -echo "$as_me:15513: result: $cf_cv_sizechange" >&5
-+echo "$as_me:16524: result: $cf_cv_sizechange" >&5
++echo "$as_me:16643: result: $cf_cv_sizechange" >&5
  echo "${ECHO_T}$cf_cv_sizechange" >&6
  if test "$cf_cv_sizechange" != no ; then
         cat >>confdefs.h <<\EOF
-@@ -15527,13 +16538,13 @@
+@@ -15527,13 +16657,13 @@
         esac
  fi
  
 -echo "$as_me:15530: checking for memmove" >&5
-+echo "$as_me:16541: checking for memmove" >&5
++echo "$as_me:16660: checking for memmove" >&5
  echo $ECHO_N "checking for memmove... $ECHO_C" >&6
  if test "${ac_cv_func_memmove+set}" = set; then
@@ -23293 +26499 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 15536 "configure"
-+#line 16547 "configure"
++#line 16666 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char memmove (); below.  */
-@@ -15564,16 +16575,16 @@
+@@ -15556,7 +16686,7 @@
+ #if defined (__stub_memmove) || defined (__stub___memmove)
+ choke me
+ #else
+-f = memmove;
++f = memmove; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -15564,16 +16694,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:15567: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16578: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16697: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:15570: \$? = $ac_status" >&5
-+  echo "$as_me:16581: \$? = $ac_status" >&5
++  echo "$as_me:16700: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:15573: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16584: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16703: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15576: \$? = $ac_status" >&5
-+  echo "$as_me:16587: \$? = $ac_status" >&5
++  echo "$as_me:16706: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_memmove=yes
  else
-@@ -15583,19 +16594,19 @@
+@@ -15583,19 +16713,19 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:15586: result: $ac_cv_func_memmove" >&5
-+echo "$as_me:16597: result: $ac_cv_func_memmove" >&5
++echo "$as_me:16716: result: $ac_cv_func_memmove" >&5
  echo "${ECHO_T}$ac_cv_func_memmove" >&6
  if test $ac_cv_func_memmove = yes; then
@@ -23330 +26545 @@
  
 -echo "$as_me:15592: checking for bcopy" >&5
-+echo "$as_me:16603: checking for bcopy" >&5
++echo "$as_me:16722: checking for bcopy" >&5
  echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
  if test "${ac_cv_func_bcopy+set}" = set; then
@@ -23337 +26552 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 15598 "configure"
-+#line 16609 "configure"
++#line 16728 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char bcopy (); below.  */
-@@ -15626,16 +16637,16 @@
+@@ -15618,7 +16748,7 @@
+ #if defined (__stub_bcopy) || defined (__stub___bcopy)
+ choke me
+ #else
+-f = bcopy;
++f = bcopy; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -15626,16 +16756,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:15629: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16640: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16759: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:15632: \$? = $ac_status" >&5
-+  echo "$as_me:16643: \$? = $ac_status" >&5
++  echo "$as_me:16762: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:15635: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16646: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16765: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15638: \$? = $ac_status" >&5
-+  echo "$as_me:16649: \$? = $ac_status" >&5
++  echo "$as_me:16768: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_bcopy=yes
  else
-@@ -15645,11 +16656,11 @@
+@@ -15645,11 +16775,11 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:15648: result: $ac_cv_func_bcopy" >&5
-+echo "$as_me:16659: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:16778: result: $ac_cv_func_bcopy" >&5
  echo "${ECHO_T}$ac_cv_func_bcopy" >&6
  if test $ac_cv_func_bcopy = yes; then
  
 -       echo "$as_me:15652: checking if bcopy does overlapping moves" >&5
-+       echo "$as_me:16663: checking if bcopy does overlapping moves" >&5
++       echo "$as_me:16782: checking if bcopy does overlapping moves" >&5
  echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
  if test "${cf_cv_good_bcopy+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15659,7 +16670,7 @@
+@@ -15659,7 +16789,7 @@
    cf_cv_good_bcopy=unknown
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 15662 "configure"
-+#line 16673 "configure"
++#line 16792 "configure"
  #include "confdefs.h"
  
  int main() {
-@@ -15673,15 +16684,15 @@
+@@ -15673,15 +16803,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:15676: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16687: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16806: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:15679: \$? = $ac_status" >&5
-+  echo "$as_me:16690: \$? = $ac_status" >&5
++  echo "$as_me:16809: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:15681: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16692: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16811: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15684: \$? = $ac_status" >&5
-+  echo "$as_me:16695: \$? = $ac_status" >&5
++  echo "$as_me:16814: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_good_bcopy=yes
  else
-@@ -15694,7 +16705,7 @@
+@@ -15694,7 +16824,7 @@
  fi
  
  fi
 -echo "$as_me:15697: result: $cf_cv_good_bcopy" >&5
-+echo "$as_me:16708: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:16827: result: $cf_cv_good_bcopy" >&5
  echo "${ECHO_T}$cf_cv_good_bcopy" >&6
  
  else
-@@ -15715,7 +16726,7 @@
+@@ -15715,7 +16845,7 @@
  
  fi
  
 -echo "$as_me:15718: checking if poll really works" >&5
-+echo "$as_me:16729: checking if poll really works" >&5
++echo "$as_me:16848: checking if poll really works" >&5
  echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
  if test "${cf_cv_working_poll+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15725,7 +16736,7 @@
+@@ -15725,10 +16855,13 @@
    cf_cv_working_poll=unknown
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 15728 "configure"
-+#line 16739 "configure"
++#line 16858 "configure"
  #include "confdefs.h"
  
++#include <stdlib.h>
  #include <stdio.h>
-@@ -15746,15 +16757,15 @@
++#include <unistd.h>
++#include <fcntl.h>
+ #ifdef HAVE_POLL_H
+ #include <poll.h>
+ #else
+@@ -15738,23 +16871,46 @@
+        struct pollfd myfds;
+        int ret;
+ 
+-       myfds.fd = 0;
++       /* check for Darwin bug with respect to "devices" */
++       myfds.fd = open("/dev/null", 1);        /* O_WRONLY */
++       if (myfds.fd < 0)
++               myfds.fd = 0;
+        myfds.events = POLLIN;
++       myfds.revents = 0;
+ 
+        ret = poll(&myfds, 1, 100);
+-       ${cf_cv_main_return:-return}(ret != 0);
++
++       if (ret < 0 || (myfds.revents & POLLNVAL)) {
++               ret = -1;
++       } else {
++               int fd = 0;
++               if (!isatty(fd)) {
++                       fd = open("/dev/tty", 2);       /* O_RDWR */
++               }
++
++               if (fd >= 0) {
++                       /* also check with standard input */
++                       myfds.fd = fd;
++                       myfds.events = POLLIN;
++                       myfds.revents = 0;
++                       ret = poll(&myfds, 1, 100);
++               } else {
++                       ret = -1;
++               }
++       }
++       ${cf_cv_main_return:-return}(ret < 0);
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:15749: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16760: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16905: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:15752: \$? = $ac_status" >&5
-+  echo "$as_me:16763: \$? = $ac_status" >&5
++  echo "$as_me:16908: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:15754: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16765: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16910: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15757: \$? = $ac_status" >&5
-+  echo "$as_me:16768: \$? = $ac_status" >&5
++  echo "$as_me:16913: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_working_poll=yes
  else
-@@ -15766,20 +16777,20 @@
+@@ -15766,20 +16922,20 @@
  rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
 -echo "$as_me:15769: result: $cf_cv_working_poll" >&5
-+echo "$as_me:16780: result: $cf_cv_working_poll" >&5
++echo "$as_me:16925: result: $cf_cv_working_poll" >&5
  echo "${ECHO_T}$cf_cv_working_poll" >&6
  test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF
@@ -23464 +26727 @@
  
 -echo "$as_me:15775: checking for va_copy" >&5
-+echo "$as_me:16786: checking for va_copy" >&5
++echo "$as_me:16931: checking for va_copy" >&5
  echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
  if test "${cf_cv_have_va_copy+set}" = set; then
@@ -23472 +26735 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 15782 "configure"
-+#line 16793 "configure"
++#line 16938 "configure"
  #include "confdefs.h"
  
  #include <stdarg.h>
-@@ -15796,16 +16807,16 @@
+@@ -15796,16 +16952,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:15799: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16810: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16955: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:15802: \$? = $ac_status" >&5
-+  echo "$as_me:16813: \$? = $ac_status" >&5
++  echo "$as_me:16958: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:15805: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16816: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16961: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15808: \$? = $ac_status" >&5
-+  echo "$as_me:16819: \$? = $ac_status" >&5
++  echo "$as_me:16964: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_have_va_copy=yes
  else
-@@ -15815,21 +16826,21 @@
+@@ -15815,21 +16971,21 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:15818: result: $cf_cv_have_va_copy" >&5
-+echo "$as_me:16829: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:16974: result: $cf_cv_have_va_copy" >&5
  echo "${ECHO_T}$cf_cv_have_va_copy" >&6
  
@@ -23510 +26773 @@
  
 -echo "$as_me:15825: checking for __va_copy" >&5
-+echo "$as_me:16836: checking for __va_copy" >&5
++echo "$as_me:16981: checking for __va_copy" >&5
  echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
  if test "${cf_cv_have___va_copy+set}" = set; then
@@ -23518 +26781 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 15832 "configure"
-+#line 16843 "configure"
++#line 16988 "configure"
  #include "confdefs.h"
  
  #include <stdarg.h>
-@@ -15846,16 +16857,16 @@
+@@ -15846,16 +17002,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:15849: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16860: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17005: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:15852: \$? = $ac_status" >&5
-+  echo "$as_me:16863: \$? = $ac_status" >&5
++  echo "$as_me:17008: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:15855: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16866: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17011: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15858: \$? = $ac_status" >&5
-+  echo "$as_me:16869: \$? = $ac_status" >&5
++  echo "$as_me:17014: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_have___va_copy=yes
  else
-@@ -15865,20 +16876,20 @@
+@@ -15865,20 +17021,20 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:15868: result: $cf_cv_have___va_copy" >&5
-+echo "$as_me:16879: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:17024: result: $cf_cv_have___va_copy" >&5
  echo "${ECHO_T}$cf_cv_have___va_copy" >&6
  
@@ -23556 +26819 @@
  
 -echo "$as_me:15875: checking for pid_t" >&5
-+echo "$as_me:16886: checking for pid_t" >&5
++echo "$as_me:17031: checking for pid_t" >&5
  echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
  if test "${ac_cv_type_pid_t+set}" = set; then
@@ -23563 +26826 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 15881 "configure"
-+#line 16892 "configure"
++#line 17037 "configure"
  #include "confdefs.h"
  $ac_includes_default
  int
-@@ -15893,16 +16904,16 @@
+@@ -15893,16 +17049,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:15896: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16907: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17052: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:15899: \$? = $ac_status" >&5
-+  echo "$as_me:16910: \$? = $ac_status" >&5
++  echo "$as_me:17055: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:15902: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16913: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17058: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:15905: \$? = $ac_status" >&5
-+  echo "$as_me:16916: \$? = $ac_status" >&5
++  echo "$as_me:17061: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_pid_t=yes
  else
-@@ -15912,7 +16923,7 @@
+@@ -15912,7 +17068,7 @@
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:15915: result: $ac_cv_type_pid_t" >&5
-+echo "$as_me:16926: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:17071: result: $ac_cv_type_pid_t" >&5
  echo "${ECHO_T}$ac_cv_type_pid_t" >&6
  if test $ac_cv_type_pid_t = yes; then
    :
-@@ -15927,23 +16938,23 @@
+@@ -15927,23 +17083,23 @@
  for ac_header in unistd.h vfork.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -echo "$as_me:15930: checking for $ac_header" >&5
-+echo "$as_me:16941: checking for $ac_header" >&5
++echo "$as_me:17086: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -23609 +26872 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 15936 "configure"
-+#line 16947 "configure"
++#line 17092 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
 -if { (eval echo "$as_me:15940: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16951: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17096: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -23621 +26884 @@
    cat conftest.err >&5
 -  echo "$as_me:15946: \$? = $ac_status" >&5
-+  echo "$as_me:16957: \$? = $ac_status" >&5
++  echo "$as_me:17102: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -15962,7 +16973,7 @@
+@@ -15962,7 +17118,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:15965: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:16976: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:17121: result: `eval echo '${'$as_ac_Header'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<EOF
-@@ -15975,13 +16986,13 @@
+@@ -15975,13 +17131,13 @@
  for ac_func in fork vfork
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -echo "$as_me:15978: checking for $ac_func" >&5
-+echo "$as_me:16989: checking for $ac_func" >&5
++echo "$as_me:17134: checking for $ac_func" >&5
  echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
  if eval "test \"\${$as_ac_var+set}\" = set"; then
@@ -23646 +26909 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 15984 "configure"
-+#line 16995 "configure"
++#line 17140 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func (); below.  */
-@@ -16012,16 +17023,16 @@
+@@ -16004,7 +17160,7 @@
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+-f = $ac_func;
++f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
+ #endif
+ 
+   ;
+@@ -16012,16 +17168,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:16015: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17026: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17171: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:16018: \$? = $ac_status" >&5
-+  echo "$as_me:17029: \$? = $ac_status" >&5
++  echo "$as_me:17174: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:16021: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17032: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17177: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16024: \$? = $ac_status" >&5
-+  echo "$as_me:17035: \$? = $ac_status" >&5
++  echo "$as_me:17180: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_var=yes"
  else
-@@ -16031,7 +17042,7 @@
+@@ -16031,7 +17187,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:16034: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:17045: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:17190: result: `eval echo '${'$as_ac_var'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<EOF
-@@ -16043,7 +17054,7 @@
+@@ -16043,7 +17199,7 @@
  
  ac_cv_func_fork_works=$ac_cv_func_fork
  if test "x$ac_cv_func_fork" = xyes; then
 -  echo "$as_me:16046: checking for working fork" >&5
-+  echo "$as_me:17057: checking for working fork" >&5
++  echo "$as_me:17202: checking for working fork" >&5
  echo $ECHO_N "checking for working fork... $ECHO_C" >&6
  if test "${ac_cv_func_fork_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16066,15 +17077,15 @@
+@@ -16066,15 +17222,15 @@
        }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:16069: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17080: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17225: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:16072: \$? = $ac_status" >&5
-+  echo "$as_me:17083: \$? = $ac_status" >&5
++  echo "$as_me:17228: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:16074: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17085: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17230: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16077: \$? = $ac_status" >&5
-+  echo "$as_me:17088: \$? = $ac_status" >&5
++  echo "$as_me:17233: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_fork_works=yes
  else
-@@ -16086,7 +17097,7 @@
+@@ -16086,7 +17242,7 @@
  rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
 -echo "$as_me:16089: result: $ac_cv_func_fork_works" >&5
-+echo "$as_me:17100: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:17245: result: $ac_cv_func_fork_works" >&5
  echo "${ECHO_T}$ac_cv_func_fork_works" >&6
  
  fi
-@@ -16100,12 +17111,12 @@
+@@ -16100,12 +17256,12 @@
        ac_cv_func_fork_works=yes
        ;;
    esac
 -  { echo "$as_me:16103: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:17114: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:17259: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
  echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
  fi
@@ -23729 +27001 @@
  if test "x$ac_cv_func_vfork" = xyes; then
 -  echo "$as_me:16108: checking for working vfork" >&5
-+  echo "$as_me:17119: checking for working vfork" >&5
++  echo "$as_me:17264: checking for working vfork" >&5
  echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
  if test "${ac_cv_func_vfork_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16114,7 +17125,7 @@
+@@ -16114,7 +17270,7 @@
    ac_cv_func_vfork_works=cross
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 16117 "configure"
-+#line 17128 "configure"
++#line 17273 "configure"
  #include "confdefs.h"
  /* Thanks to Paul Eggert for this test.  */
  #include <stdio.h>
-@@ -16211,15 +17222,15 @@
+@@ -16211,15 +17367,15 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:16214: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17225: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17370: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:16217: \$? = $ac_status" >&5
-+  echo "$as_me:17228: \$? = $ac_status" >&5
++  echo "$as_me:17373: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:16219: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17230: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17375: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16222: \$? = $ac_status" >&5
-+  echo "$as_me:17233: \$? = $ac_status" >&5
++  echo "$as_me:17378: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_vfork_works=yes
  else
-@@ -16231,13 +17242,13 @@
+@@ -16231,13 +17387,13 @@
  rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
 -echo "$as_me:16234: result: $ac_cv_func_vfork_works" >&5
-+echo "$as_me:17245: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:17390: result: $ac_cv_func_vfork_works" >&5
  echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
  
@@ -23774 +27046 @@
    ac_cv_func_vfork_works=ac_cv_func_vfork
 -  { echo "$as_me:16240: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:17251: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:17396: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
  echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
  fi
  
-@@ -16264,7 +17275,7 @@
+@@ -16264,7 +17420,7 @@
  
  # special check for test/ditto.c
  
 -echo "$as_me:16267: checking for openpty in -lutil" >&5
-+echo "$as_me:17278: checking for openpty in -lutil" >&5
++echo "$as_me:17423: checking for openpty in -lutil" >&5
  echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
  if test "${ac_cv_lib_util_openpty+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16272,7 +17283,7 @@
+@@ -16272,7 +17428,7 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lutil  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 16275 "configure"
-+#line 17286 "configure"
++#line 17431 "configure"
  #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -16291,16 +17302,16 @@
+@@ -16291,16 +17447,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:16294: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17305: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17450: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:16297: \$? = $ac_status" >&5
-+  echo "$as_me:17308: \$? = $ac_status" >&5
++  echo "$as_me:17453: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:16300: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17311: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17456: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16303: \$? = $ac_status" >&5
-+  echo "$as_me:17314: \$? = $ac_status" >&5
++  echo "$as_me:17459: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_util_openpty=yes
  else
-@@ -16311,7 +17322,7 @@
+@@ -16311,7 +17467,7 @@
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:16314: result: $ac_cv_lib_util_openpty" >&5
-+echo "$as_me:17325: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:17470: result: $ac_cv_lib_util_openpty" >&5
  echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
  if test $ac_cv_lib_util_openpty = yes; then
    cf_cv_lib_util=yes
-@@ -16319,7 +17330,7 @@
+@@ -16319,7 +17475,7 @@
    cf_cv_lib_util=no
  fi
  
 -echo "$as_me:16322: checking for openpty header" >&5
-+echo "$as_me:17333: checking for openpty header" >&5
++echo "$as_me:17478: checking for openpty header" >&5
  echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
  if test "${cf_cv_func_openpty+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16330,7 +17341,7 @@
+@@ -16330,7 +17486,7 @@
      for cf_header in pty.h libutil.h util.h
      do
      cat >conftest.$ac_ext <<_ACEOF
 -#line 16333 "configure"
-+#line 17344 "configure"
++#line 17489 "configure"
  #include "confdefs.h"
  
  #include <$cf_header>
-@@ -16347,16 +17358,16 @@
+@@ -16347,16 +17503,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:16350: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17361: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17506: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:16353: \$? = $ac_status" >&5
-+  echo "$as_me:17364: \$? = $ac_status" >&5
++  echo "$as_me:17509: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:16356: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17367: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17512: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16359: \$? = $ac_status" >&5
-+  echo "$as_me:17370: \$? = $ac_status" >&5
++  echo "$as_me:17515: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
          cf_cv_func_openpty=$cf_header
-@@ -16374,7 +17385,7 @@
+@@ -16374,7 +17530,7 @@
      LIBS="$cf_save_LIBS"
  
  fi
 -echo "$as_me:16377: result: $cf_cv_func_openpty" >&5
-+echo "$as_me:17388: result: $cf_cv_func_openpty" >&5
++echo "$as_me:17533: result: $cf_cv_func_openpty" >&5
  echo "${ECHO_T}$cf_cv_func_openpty" >&6
  
  if test "$cf_cv_func_openpty" != no ; then
-@@ -16426,7 +17437,7 @@
+@@ -16426,7 +17582,7 @@
                           cf_save_CPPFLAGS=$CPPFLAGS
                           CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                           cat >conftest.$ac_ext <<_ACEOF
 -#line 16429 "configure"
-+#line 17440 "configure"
++#line 17585 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int
-@@ -16438,16 +17449,16 @@
+@@ -16438,16 +17594,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:16441: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17452: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17597: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:16444: \$? = $ac_status" >&5
-+  echo "$as_me:17455: \$? = $ac_status" >&5
++  echo "$as_me:17600: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:16447: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17458: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17603: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16450: \$? = $ac_status" >&5
-+  echo "$as_me:17461: \$? = $ac_status" >&5
++  echo "$as_me:17606: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
-@@ -16464,7 +17475,7 @@
+@@ -16464,7 +17620,7 @@
                 if test "$cf_have_incdir" = no ; then
                   test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
  
 -echo "${as_me:-configure}:16467: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:17478: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:17623: testing adding $cf_add_incdir to include-path ..." 1>&5
  
                   CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
  
-@@ -16498,7 +17509,7 @@
+@@ -16498,7 +17654,7 @@
        if test "$cf_have_libdir" = no ; then
          test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
  
 -echo "${as_me:-configure}:16501: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:17512: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:17657: testing adding $cf_add_libdir to library-path ..." 1>&5
  
          LDFLAGS="-L$cf_add_libdir $LDFLAGS"
        fi
-@@ -16509,23 +17520,23 @@
+@@ -16509,23 +17665,23 @@
      fi
  esac
  
 -echo "$as_me:16512: checking for db.h" >&5
-+echo "$as_me:17523: checking for db.h" >&5
++echo "$as_me:17668: checking for db.h" >&5
  echo $ECHO_N "checking for db.h... $ECHO_C" >&6
  if test "${ac_cv_header_db_h+set}" = set; then
@@ -23934 +27206 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 16518 "configure"
-+#line 17529 "configure"
++#line 17674 "configure"
  #include "confdefs.h"
  #include <db.h>
  _ACEOF
 -if { (eval echo "$as_me:16522: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:17533: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17678: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -23946 +27218 @@
    cat conftest.err >&5
 -  echo "$as_me:16528: \$? = $ac_status" >&5
-+  echo "$as_me:17539: \$? = $ac_status" >&5
++  echo "$as_me:17684: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16544,11 +17555,11 @@
+@@ -16544,11 +17700,11 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:16547: result: $ac_cv_header_db_h" >&5
-+echo "$as_me:17558: result: $ac_cv_header_db_h" >&5
++echo "$as_me:17703: result: $ac_cv_header_db_h" >&5
  echo "${ECHO_T}$ac_cv_header_db_h" >&6
  if test $ac_cv_header_db_h = yes; then
  
 -echo "$as_me:16551: checking for version of db" >&5
-+echo "$as_me:17562: checking for version of db" >&5
++echo "$as_me:17707: checking for version of db" >&5
  echo $ECHO_N "checking for version of db... $ECHO_C" >&6
  if test "${cf_cv_hashed_db_version+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16559,10 +17570,10 @@
+@@ -16559,10 +17715,10 @@
  for cf_db_version in 1 2 3 4 5
  do
  
 -echo "${as_me:-configure}:16562: testing checking for db version $cf_db_version ..." 1>&5
-+echo "${as_me:-configure}:17573: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:17718: testing checking for db version $cf_db_version ..." 1>&5
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 16565 "configure"
-+#line 17576 "configure"
++#line 17721 "configure"
  #include "confdefs.h"
  
  $ac_includes_default
-@@ -16592,16 +17603,16 @@
+@@ -16592,16 +17748,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:16595: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17606: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17751: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:16598: \$? = $ac_status" >&5
-+  echo "$as_me:17609: \$? = $ac_status" >&5
++  echo "$as_me:17754: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:16601: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17612: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17757: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16604: \$? = $ac_status" >&5
-+  echo "$as_me:17615: \$? = $ac_status" >&5
++  echo "$as_me:17760: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         cf_cv_hashed_db_version=$cf_db_version
-@@ -16615,16 +17626,16 @@
+@@ -16615,16 +17771,16 @@
  done
  
  fi
 -echo "$as_me:16618: result: $cf_cv_hashed_db_version" >&5
-+echo "$as_me:17629: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:17774: result: $cf_cv_hashed_db_version" >&5
  echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
  
  if test "$cf_cv_hashed_db_version" = unknown ; then
 -       { { echo "$as_me:16622: error: Cannot determine version of db" >&5
-+       { { echo "$as_me:17633: error: Cannot determine version of db" >&5
++       { { echo "$as_me:17778: error: Cannot determine version of db" >&5
  echo "$as_me: error: Cannot determine version of db" >&2;}
     { (exit 1); exit 1; }; }
@@ -24014 +27286 @@
  
 -echo "$as_me:16627: checking for db libraries" >&5
-+echo "$as_me:17638: checking for db libraries" >&5
++echo "$as_me:17783: checking for db libraries" >&5
  echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
  if test "${cf_cv_hashed_db_libs+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16638,10 +17649,10 @@
+@@ -16638,10 +17794,10 @@
                 LIBS="-l$cf_db_libs $LIBS"
         fi
  
 -echo "${as_me:-configure}:16641: testing checking for library "$cf_db_libs" ..." 1>&5
-+echo "${as_me:-configure}:17652: testing checking for library "$cf_db_libs" ..." 1>&5
++echo "${as_me:-configure}:17797: testing checking for library "$cf_db_libs" ..." 1>&5
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 16644 "configure"
-+#line 17655 "configure"
++#line 17800 "configure"
  #include "confdefs.h"
  
  $ac_includes_default
-@@ -16696,16 +17707,16 @@
+@@ -16696,16 +17852,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:16699: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17710: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17855: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:16702: \$? = $ac_status" >&5
-+  echo "$as_me:17713: \$? = $ac_status" >&5
++  echo "$as_me:17858: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:16705: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17716: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17861: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16708: \$? = $ac_status" >&5
-+  echo "$as_me:17719: \$? = $ac_status" >&5
++  echo "$as_me:17864: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         if test -n "$cf_db_libs" ; then
-@@ -16725,11 +17736,11 @@
+@@ -16725,11 +17881,11 @@
  done
  
  fi
 -echo "$as_me:16728: result: $cf_cv_hashed_db_libs" >&5
-+echo "$as_me:17739: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:17884: result: $cf_cv_hashed_db_libs" >&5
  echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
  
         if test "$cf_cv_hashed_db_libs" = unknown ; then
 -               { { echo "$as_me:16732: error: Cannot determine library for db" >&5
-+               { { echo "$as_me:17743: error: Cannot determine library for db" >&5
++               { { echo "$as_me:17888: error: Cannot determine library for db" >&5
  echo "$as_me: error: Cannot determine library for db" >&2;}
     { (exit 1); exit 1; }; }
         elif test "$cf_cv_hashed_db_libs" != default ; then
-@@ -16739,7 +17750,7 @@
+@@ -16739,7 +17895,7 @@
  
  else
  
 -       { { echo "$as_me:16742: error: Cannot find db.h" >&5
-+       { { echo "$as_me:17753: error: Cannot find db.h" >&5
++       { { echo "$as_me:17898: error: Cannot find db.h" >&5
  echo "$as_me: error: Cannot find db.h" >&2;}
     { (exit 1); exit 1; }; }
  
-@@ -16754,7 +17765,7 @@
+@@ -16754,7 +17910,7 @@
  
  # Just in case, check if the C compiler has a bool type.
  
 -echo "$as_me:16757: checking if we should include stdbool.h" >&5
-+echo "$as_me:17768: checking if we should include stdbool.h" >&5
++echo "$as_me:17913: checking if we should include stdbool.h" >&5
  echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
  
  if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -16762,7 +17773,7 @@
+@@ -16762,7 +17918,7 @@
  else
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 16765 "configure"
-+#line 17776 "configure"
++#line 17921 "configure"
  #include "confdefs.h"
  
  int
-@@ -16774,23 +17785,23 @@
+@@ -16774,23 +17930,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:16777: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17788: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17933: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:16780: \$? = $ac_status" >&5
-+  echo "$as_me:17791: \$? = $ac_status" >&5
++  echo "$as_me:17936: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:16783: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17794: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17939: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16786: \$? = $ac_status" >&5
-+  echo "$as_me:17797: \$? = $ac_status" >&5
++  echo "$as_me:17942: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_header_stdbool_h=0
@@ -24118 +27390 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 16793 "configure"
-+#line 17804 "configure"
++#line 17949 "configure"
  #include "confdefs.h"
  
  #ifndef __BEOS__
-@@ -16806,16 +17817,16 @@
+@@ -16806,16 +17962,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:16809: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17820: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17965: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:16812: \$? = $ac_status" >&5
-+  echo "$as_me:17823: \$? = $ac_status" >&5
++  echo "$as_me:17968: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:16815: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17826: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17971: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16818: \$? = $ac_status" >&5
-+  echo "$as_me:17829: \$? = $ac_status" >&5
++  echo "$as_me:17974: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_header_stdbool_h=1
  else
-@@ -16829,13 +17840,13 @@
+@@ -16829,13 +17985,13 @@
  fi
  
  if test "$cf_cv_header_stdbool_h" = 1
 -then   echo "$as_me:16832: result: yes" >&5
-+then   echo "$as_me:17843: result: yes" >&5
++then   echo "$as_me:17988: result: yes" >&5
  echo "${ECHO_T}yes" >&6
 -else   echo "$as_me:16834: result: no" >&5
-+else   echo "$as_me:17845: result: no" >&5
++else   echo "$as_me:17990: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
 -echo "$as_me:16838: checking for builtin bool type" >&5
-+echo "$as_me:17849: checking for builtin bool type" >&5
++echo "$as_me:17994: checking for builtin bool type" >&5
  echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
  
  if test "${cf_cv_cc_bool_type+set}" = set; then
-@@ -16843,7 +17854,7 @@
+@@ -16843,7 +17999,7 @@
  else
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 16846 "configure"
-+#line 17857 "configure"
++#line 18002 "configure"
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -16858,16 +17869,16 @@
+@@ -16858,16 +18014,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:16861: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17872: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18017: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:16864: \$? = $ac_status" >&5
-+  echo "$as_me:17875: \$? = $ac_status" >&5
++  echo "$as_me:18020: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:16867: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17878: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18023: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16870: \$? = $ac_status" >&5
-+  echo "$as_me:17881: \$? = $ac_status" >&5
++  echo "$as_me:18026: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_cc_bool_type=1
  else
-@@ -16880,9 +17891,9 @@
+@@ -16880,9 +18036,9 @@
  fi
  
  if test "$cf_cv_cc_bool_type" = 1
 -then   echo "$as_me:16883: result: yes" >&5
-+then   echo "$as_me:17894: result: yes" >&5
++then   echo "$as_me:18039: result: yes" >&5
  echo "${ECHO_T}yes" >&6
 -else   echo "$as_me:16885: result: no" >&5
-+else   echo "$as_me:17896: result: no" >&5
++else   echo "$as_me:18041: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -16904,7 +17915,7 @@
+@@ -16904,7 +18060,7 @@
         cf_stdcpp_libname=stdc++
         ;;
  esac
 -echo "$as_me:16907: checking for library $cf_stdcpp_libname" >&5
-+echo "$as_me:17918: checking for library $cf_stdcpp_libname" >&5
++echo "$as_me:18063: checking for library $cf_stdcpp_libname" >&5
  echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
  if test "${cf_cv_libstdcpp+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16913,7 +17924,7 @@
+@@ -16913,7 +18069,7 @@
         cf_save="$LIBS"
         LIBS="-l$cf_stdcpp_libname $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 16916 "configure"
-+#line 17927 "configure"
++#line 18072 "configure"
  #include "confdefs.h"
  
  #include <strstream.h>
-@@ -16929,16 +17940,16 @@
+@@ -16929,16 +18085,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:16932: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17943: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18088: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:16935: \$? = $ac_status" >&5
-+  echo "$as_me:17946: \$? = $ac_status" >&5
++  echo "$as_me:18091: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:16938: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17949: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18094: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16941: \$? = $ac_status" >&5
-+  echo "$as_me:17952: \$? = $ac_status" >&5
++  echo "$as_me:18097: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_libstdcpp=yes
  else
-@@ -16950,12 +17961,12 @@
+@@ -16950,12 +18106,12 @@
         LIBS="$cf_save"
  
  fi
 -echo "$as_me:16953: result: $cf_cv_libstdcpp" >&5
-+echo "$as_me:17964: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:18109: result: $cf_cv_libstdcpp" >&5
  echo "${ECHO_T}$cf_cv_libstdcpp" >&6
  test "$cf_cv_libstdcpp" = yes && CXXLIBS="-l$cf_stdcpp_libname $CXXLIBS"
@@ -24252 +27524 @@
  
 -       echo "$as_me:16958: checking whether $CXX understands -c and -o together" >&5
-+       echo "$as_me:17969: checking whether $CXX understands -c and -o together" >&5
++       echo "$as_me:18114: checking whether $CXX understands -c and -o together" >&5
  echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
  if test "${cf_cv_prog_CXX_c_o+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16971,15 +17982,15 @@
+@@ -16971,15 +18127,15 @@
  # We do the test twice because some compilers refuse to overwrite an
  # existing .o file with -o, though they will create one.
  ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
 -if { (eval echo "$as_me:16974: \"$ac_try\"") >&5
-+if { (eval echo "$as_me:17985: \"$ac_try\"") >&5
++if { (eval echo "$as_me:18130: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16977: \$? = $ac_status" >&5
-+  echo "$as_me:17988: \$? = $ac_status" >&5
++  echo "$as_me:18133: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -  test -f conftest2.$ac_objext && { (eval echo "$as_me:16979: \"$ac_try\"") >&5
-+  test -f conftest2.$ac_objext && { (eval echo "$as_me:17990: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:18135: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:16982: \$? = $ac_status" >&5
-+  echo "$as_me:17993: \$? = $ac_status" >&5
++  echo "$as_me:18138: \$? = $ac_status" >&5
    (exit $ac_status); };
  then
    eval cf_cv_prog_CXX_c_o=yes
-@@ -16990,10 +18001,10 @@
+@@ -16990,10 +18146,10 @@
  
  fi
  if test $cf_cv_prog_CXX_c_o = yes; then
 -  echo "$as_me:16993: result: yes" >&5
-+  echo "$as_me:18004: result: yes" >&5
++  echo "$as_me:18149: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  else
 -  echo "$as_me:16996: result: no" >&5
-+  echo "$as_me:18007: result: no" >&5
++  echo "$as_me:18152: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -17013,12 +18024,12 @@
+@@ -17013,12 +18169,12 @@
         ;;
  esac
  if test "$GXX" = yes; then
 -       echo "$as_me:17016: checking for lib$cf_gpp_libname" >&5
-+       echo "$as_me:18027: checking for lib$cf_gpp_libname" >&5
++       echo "$as_me:18172: checking for lib$cf_gpp_libname" >&5
  echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
         cf_save="$LIBS"
@@ -24300 +27572 @@
         cat >conftest.$ac_ext <<_ACEOF
 -#line 17021 "configure"
-+#line 18032 "configure"
++#line 18177 "configure"
  #include "confdefs.h"
  
  #include <$cf_gpp_libname/builtin.h>
-@@ -17032,16 +18043,16 @@
+@@ -17032,16 +18188,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:17035: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18046: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18191: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:17038: \$? = $ac_status" >&5
-+  echo "$as_me:18049: \$? = $ac_status" >&5
++  echo "$as_me:18194: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:17041: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18052: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18197: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:17044: \$? = $ac_status" >&5
-+  echo "$as_me:18055: \$? = $ac_status" >&5
++  echo "$as_me:18200: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cxx_library=yes
          CXXLIBS="-l$cf_gpp_libname $CXXLIBS"
-@@ -17060,7 +18071,7 @@
+@@ -17060,7 +18216,7 @@
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
  cat >conftest.$ac_ext <<_ACEOF
 -#line 17063 "configure"
-+#line 18074 "configure"
++#line 18219 "configure"
  #include "confdefs.h"
  
  #include <builtin.h>
-@@ -17074,16 +18085,16 @@
+@@ -17074,16 +18230,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:17077: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18088: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18233: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:17080: \$? = $ac_status" >&5
-+  echo "$as_me:18091: \$? = $ac_status" >&5
++  echo "$as_me:18236: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:17083: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18094: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18239: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:17086: \$? = $ac_status" >&5
-+  echo "$as_me:18097: \$? = $ac_status" >&5
++  echo "$as_me:18242: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cxx_library=yes
          CXXLIBS="-l$cf_gpp_libname $CXXLIBS"
-@@ -17100,7 +18111,7 @@
+@@ -17100,7 +18256,7 @@
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
         LIBS="$cf_save"
 -       echo "$as_me:17103: result: $cf_cxx_library" >&5
-+       echo "$as_me:18114: result: $cf_cxx_library" >&5
++       echo "$as_me:18259: result: $cf_cxx_library" >&5
  echo "${ECHO_T}$cf_cxx_library" >&6
  fi
  
-@@ -17116,7 +18127,7 @@
+@@ -17116,7 +18272,7 @@
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  ac_main_return=return
 -echo "$as_me:17119: checking how to run the C++ preprocessor" >&5
-+echo "$as_me:18130: checking how to run the C++ preprocessor" >&5
++echo "$as_me:18275: checking how to run the C++ preprocessor" >&5
  echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
  if test -z "$CXXCPP"; then
    if test "${ac_cv_prog_CXXCPP+set}" = set; then
-@@ -17133,18 +18144,18 @@
+@@ -17133,18 +18289,18 @@
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 17136 "configure"
-+#line 18147 "configure"
++#line 18292 "configure"
  #include "confdefs.h"
  #include <assert.h>
@@ -24384 +27656 @@
  _ACEOF
 -if { (eval echo "$as_me:17141: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18152: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:18297: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -24391 +27663 @@
    cat conftest.err >&5
 -  echo "$as_me:17147: \$? = $ac_status" >&5
-+  echo "$as_me:18158: \$? = $ac_status" >&5
++  echo "$as_me:18303: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -17167,17 +18178,17 @@
+@@ -17167,17 +18323,17 @@
    # OK, works on sane cases.  Now check whether non-existent headers
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 17170 "configure"
-+#line 18181 "configure"
++#line 18326 "configure"
  #include "confdefs.h"
  #include <ac_nonexistent.h>
  _ACEOF
 -if { (eval echo "$as_me:17174: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18185: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:18330: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -24412 +27684 @@
    cat conftest.err >&5
 -  echo "$as_me:17180: \$? = $ac_status" >&5
-+  echo "$as_me:18191: \$? = $ac_status" >&5
++  echo "$as_me:18336: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -17214,7 +18225,7 @@
+@@ -17214,7 +18370,7 @@
  else
    ac_cv_prog_CXXCPP=$CXXCPP
  fi
 -echo "$as_me:17217: result: $CXXCPP" >&5
-+echo "$as_me:18228: result: $CXXCPP" >&5
++echo "$as_me:18373: result: $CXXCPP" >&5
  echo "${ECHO_T}$CXXCPP" >&6
  ac_preproc_ok=false
  for ac_cxx_preproc_warn_flag in '' yes
-@@ -17224,18 +18235,18 @@
+@@ -17224,18 +18380,18 @@
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 17227 "configure"
-+#line 18238 "configure"
++#line 18383 "configure"
  #include "confdefs.h"
  #include <assert.h>
@@ -24436 +27708 @@
  _ACEOF
 -if { (eval echo "$as_me:17232: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18243: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:18388: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -24443 +27715 @@
    cat conftest.err >&5
 -  echo "$as_me:17238: \$? = $ac_status" >&5
-+  echo "$as_me:18249: \$? = $ac_status" >&5
++  echo "$as_me:18394: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -17258,17 +18269,17 @@
+@@ -17258,17 +18414,17 @@
    # OK, works on sane cases.  Now check whether non-existent headers
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 17261 "configure"
-+#line 18272 "configure"
++#line 18417 "configure"
  #include "confdefs.h"
  #include <ac_nonexistent.h>
  _ACEOF
 -if { (eval echo "$as_me:17265: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18276: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:18421: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -24464 +27736 @@
    cat conftest.err >&5
 -  echo "$as_me:17271: \$? = $ac_status" >&5
-+  echo "$as_me:18282: \$? = $ac_status" >&5
++  echo "$as_me:18427: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -17296,7 +18307,7 @@
+@@ -17296,7 +18452,7 @@
  if $ac_preproc_ok; then
    :
  else
 -  { { echo "$as_me:17299: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
-+  { { echo "$as_me:18310: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:18455: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
  echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -17308,26 +18319,74 @@
+@@ -17308,26 +18464,74 @@
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  ac_main_return=return
@@ -24485 +27757 @@
 +do
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+echo "$as_me:18325: checking for $ac_header" >&5
++echo "$as_me:18470: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -24491 +27763 @@
 +else
 +  cat >conftest.$ac_ext <<_ACEOF
-+#line 18331 "configure"
++#line 18476 "configure"
 +#include "confdefs.h"
 +#include <$ac_header>
 +_ACEOF
-+if { (eval echo "$as_me:18335: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:18480: \"$ac_cpp conftest.$ac_ext\"") >&5
 +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +  ac_status=$?
@@ -24501 +27773 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:18341: \$? = $ac_status" >&5
++  echo "$as_me:18486: \$? = $ac_status" >&5
 +  (exit $ac_status); } >/dev/null; then
 +  if test -s conftest.err; then
@@ -24520 +27792 @@
 +rm -f conftest.err conftest.$ac_ext
 +fi
-+echo "$as_me:18360: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:18505: 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
@@ -24534 +27806 @@
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -echo "$as_me:17314: checking for $ac_header" >&5
-+echo "$as_me:18373: checking for $ac_header" >&5
++echo "$as_me:18518: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -24541 +27813 @@
    cat >conftest.$ac_ext <<_ACEOF
 -#line 17320 "configure"
-+#line 18379 "configure"
++#line 18524 "configure"
  #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
 -if { (eval echo "$as_me:17324: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18383: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:18528: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
@@ -24553 +27825 @@
    cat conftest.err >&5
 -  echo "$as_me:17330: \$? = $ac_status" >&5
-+  echo "$as_me:18389: \$? = $ac_status" >&5
++  echo "$as_me:18534: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -17346,7 +18405,7 @@
+@@ -17346,7 +18550,7 @@
  fi
  rm -f conftest.err conftest.$ac_ext
  fi
 -echo "$as_me:17349: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:18408: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:18553: result: `eval echo '${'$as_ac_Header'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<EOF
-@@ -17356,11 +18415,11 @@
+@@ -17356,11 +18560,11 @@
  fi
  done
@@ -24573 +27845 @@
 -        echo "$as_me:17360: checking if iostream uses std-namespace" >&5
 +if test x"$ac_cv_header_iostream" = xyes ; then
-+       echo "$as_me:18419: checking if iostream uses std-namespace" >&5
++       echo "$as_me:18564: checking if iostream uses std-namespace" >&5
  echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
 -        cat >conftest.$ac_ext <<_ACEOF
 -#line 17363 "configure"
 +       cat >conftest.$ac_ext <<_ACEOF
-+#line 18422 "configure"
++#line 18567 "configure"
  #include "confdefs.h"
  
  #include <iostream>
-@@ -17377,16 +18436,16 @@
+@@ -17377,16 +18581,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:17380: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18439: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18584: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:17383: \$? = $ac_status" >&5
-+  echo "$as_me:18442: \$? = $ac_status" >&5
++  echo "$as_me:18587: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:17386: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18445: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18590: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:17389: \$? = $ac_status" >&5
-+  echo "$as_me:18448: \$? = $ac_status" >&5
++  echo "$as_me:18593: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_iostream_namespace=yes
  else
-@@ -17395,17 +18454,17 @@
+@@ -17395,17 +18599,17 @@
  cf_iostream_namespace=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
 -        echo "$as_me:17398: result: $cf_iostream_namespace" >&5
-+       echo "$as_me:18457: result: $cf_iostream_namespace" >&5
++       echo "$as_me:18602: result: $cf_iostream_namespace" >&5
  echo "${ECHO_T}$cf_iostream_namespace" >&6
 -        if test "$cf_iostream_namespace" = yes ; then
@@ -24623 +27895 @@
  
 -echo "$as_me:17408: checking if we should include stdbool.h" >&5
-+echo "$as_me:18467: checking if we should include stdbool.h" >&5
++echo "$as_me:18612: checking if we should include stdbool.h" >&5
  echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
  
  if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -17413,7 +18472,7 @@
+@@ -17413,7 +18617,7 @@
  else
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 17416 "configure"
-+#line 18475 "configure"
++#line 18620 "configure"
  #include "confdefs.h"
  
  int
-@@ -17425,23 +18484,23 @@
+@@ -17425,23 +18629,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:17428: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18487: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18632: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:17431: \$? = $ac_status" >&5
-+  echo "$as_me:18490: \$? = $ac_status" >&5
++  echo "$as_me:18635: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:17434: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18493: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18638: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:17437: \$? = $ac_status" >&5
-+  echo "$as_me:18496: \$? = $ac_status" >&5
++  echo "$as_me:18641: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_header_stdbool_h=0
@@ -24661 +27933 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 17444 "configure"
-+#line 18503 "configure"
++#line 18648 "configure"
  #include "confdefs.h"
  
  #ifndef __BEOS__
-@@ -17457,16 +18516,16 @@
+@@ -17457,16 +18661,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:17460: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18519: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18664: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:17463: \$? = $ac_status" >&5
-+  echo "$as_me:18522: \$? = $ac_status" >&5
++  echo "$as_me:18667: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:17466: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18525: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18670: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:17469: \$? = $ac_status" >&5
-+  echo "$as_me:18528: \$? = $ac_status" >&5
++  echo "$as_me:18673: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_header_stdbool_h=1
  else
-@@ -17480,13 +18539,13 @@
+@@ -17480,13 +18684,13 @@
  fi
  
  if test "$cf_cv_header_stdbool_h" = 1
 -then   echo "$as_me:17483: result: yes" >&5
-+then   echo "$as_me:18542: result: yes" >&5
++then   echo "$as_me:18687: result: yes" >&5
  echo "${ECHO_T}yes" >&6
 -else   echo "$as_me:17485: result: no" >&5
-+else   echo "$as_me:18544: result: no" >&5
++else   echo "$as_me:18689: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
 -echo "$as_me:17489: checking for builtin bool type" >&5
-+echo "$as_me:18548: checking for builtin bool type" >&5
++echo "$as_me:18693: checking for builtin bool type" >&5
  echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
  
  if test "${cf_cv_builtin_bool+set}" = set; then
-@@ -17494,7 +18553,7 @@
+@@ -17494,7 +18698,7 @@
  else
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 17497 "configure"
-+#line 18556 "configure"
++#line 18701 "configure"
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -17509,16 +18568,16 @@
+@@ -17509,16 +18713,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:17512: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18571: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18716: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:17515: \$? = $ac_status" >&5
-+  echo "$as_me:18574: \$? = $ac_status" >&5
++  echo "$as_me:18719: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:17518: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18577: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18722: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:17521: \$? = $ac_status" >&5
-+  echo "$as_me:18580: \$? = $ac_status" >&5
++  echo "$as_me:18725: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_builtin_bool=1
  else
-@@ -17531,13 +18590,13 @@
+@@ -17531,13 +18735,13 @@
  fi
  
  if test "$cf_cv_builtin_bool" = 1
 -then   echo "$as_me:17534: result: yes" >&5
-+then   echo "$as_me:18593: result: yes" >&5
++then   echo "$as_me:18738: result: yes" >&5
  echo "${ECHO_T}yes" >&6
 -else   echo "$as_me:17536: result: no" >&5
-+else   echo "$as_me:18595: result: no" >&5
++else   echo "$as_me:18740: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
 -echo "$as_me:17540: checking for size of bool" >&5
-+echo "$as_me:18599: checking for size of bool" >&5
++echo "$as_me:18744: checking for size of bool" >&5
  echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
  if test "${cf_cv_type_of_bool+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17548,7 +18607,7 @@
+@@ -17548,7 +18752,7 @@
    cf_cv_type_of_bool=unknown
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 17551 "configure"
-+#line 18610 "configure"
++#line 18755 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -17590,15 +18649,15 @@
+@@ -17590,15 +18794,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:17593: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18652: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18797: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:17596: \$? = $ac_status" >&5
-+  echo "$as_me:18655: \$? = $ac_status" >&5
++  echo "$as_me:18800: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:17598: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18657: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18802: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:17601: \$? = $ac_status" >&5
-+  echo "$as_me:18660: \$? = $ac_status" >&5
++  echo "$as_me:18805: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_type_of_bool=`cat cf_test.out`
                  if test -z "$cf_cv_type_of_bool"; then
-@@ -17616,30 +18675,36 @@
+@@ -17616,30 +18820,36 @@
  fi
  
         rm -f cf_test.out
 -echo "$as_me:17619: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:18678: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:18823: result: $cf_cv_type_of_bool" >&5
  echo "${ECHO_T}$cf_cv_type_of_bool" >&6
  if test "$cf_cv_type_of_bool" = unknown ; then
@@ -24791 +28063 @@
         esac
 -       { echo "$as_me:17625: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+       { echo "$as_me:18684: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++       { echo "$as_me:18829: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
  echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
         cf_cv_type_of_bool=$NCURSES_BOOL
@@ -24797 +28069 @@
  
 -echo "$as_me:17630: checking for special defines needed for etip.h" >&5
-+echo "$as_me:18689: checking for special defines needed for etip.h" >&5
++echo "$as_me:18834: checking for special defines needed for etip.h" >&5
  echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
  cf_save_CXXFLAGS="$CXXFLAGS"
@@ -24817 +28089 @@
  cat >conftest.$ac_ext <<_ACEOF
 -#line 17642 "configure"
-+#line 18707 "configure"
++#line 18852 "configure"
  #include "confdefs.h"
  
  #include <etip.h.in>
-@@ -17653,16 +18718,16 @@
+@@ -17653,16 +18863,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:17656: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18721: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:18866: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:17659: \$? = $ac_status" >&5
-+  echo "$as_me:18724: \$? = $ac_status" >&5
++  echo "$as_me:18869: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:17662: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18727: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18872: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:17665: \$? = $ac_status" >&5
-+  echo "$as_me:18730: \$? = $ac_status" >&5
++  echo "$as_me:18875: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
         test -n "$cf_math" && cat >>confdefs.h <<EOF
-@@ -17683,12 +18748,12 @@
+@@ -17674,7 +18884,7 @@
+ EOF
+ 
+        cf_result="$cf_math $cf_excp"
+-       break
++       break 2
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -17683,12 +18893,12 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  done
  done
 -echo "$as_me:17686: result: $cf_result" >&5
-+echo "$as_me:18751: result: $cf_result" >&5
++echo "$as_me:18896: result: $cf_result" >&5
  echo "${ECHO_T}$cf_result" >&6
  CXXFLAGS="$cf_save_CXXFLAGS"
@@ -24853 +28134 @@
  if test -n "$CXX"; then
 -echo "$as_me:17691: checking if $CXX accepts parameter initialization" >&5
-+echo "$as_me:18756: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:18901: checking if $CXX accepts parameter initialization" >&5
  echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
  if test "${cf_cv_cpp_param_init+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17705,7 +18770,7 @@
+@@ -17705,7 +18915,7 @@
    cf_cv_cpp_param_init=unknown
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 17708 "configure"
-+#line 18773 "configure"
++#line 18918 "configure"
  #include "confdefs.h"
  
  class TEST {
-@@ -17720,19 +18785,19 @@
+@@ -17720,19 +18930,19 @@
  {
         value = x;
@@ -24876 +28157 @@
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:17727: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18792: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18937: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:17730: \$? = $ac_status" >&5
-+  echo "$as_me:18795: \$? = $ac_status" >&5
++  echo "$as_me:18940: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:17732: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18797: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18942: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:17735: \$? = $ac_status" >&5
-+  echo "$as_me:18800: \$? = $ac_status" >&5
++  echo "$as_me:18945: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_cpp_param_init=yes
  else
-@@ -17751,7 +18816,7 @@
+@@ -17751,7 +18961,7 @@
  ac_main_return=return
  
  fi
 -echo "$as_me:17754: result: $cf_cv_cpp_param_init" >&5
-+echo "$as_me:18819: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:18964: result: $cf_cv_cpp_param_init" >&5
  echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
  fi
  test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF
-@@ -17760,7 +18825,7 @@
+@@ -17760,7 +18970,7 @@
  
  if test -n "$CXX"; then
  
 -echo "$as_me:17763: checking if $CXX accepts static_cast" >&5
-+echo "$as_me:18828: checking if $CXX accepts static_cast" >&5
++echo "$as_me:18973: checking if $CXX accepts static_cast" >&5
  echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
  if test "${cf_cv_cpp_static_cast+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17774,7 +18839,7 @@
+@@ -17774,7 +18984,7 @@
  ac_main_return=return
  
         cat >conftest.$ac_ext <<_ACEOF
 -#line 17777 "configure"
-+#line 18842 "configure"
++#line 18987 "configure"
  #include "confdefs.h"
  
  class NCursesPanel
-@@ -17818,16 +18883,16 @@
+@@ -17818,16 +19028,16 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:17821: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18886: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19031: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:17824: \$? = $ac_status" >&5
-+  echo "$as_me:18889: \$? = $ac_status" >&5
++  echo "$as_me:19034: \$? = $ac_status" >&5
    (exit $ac_status); } &&
           { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:17827: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18892: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19037: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:17830: \$? = $ac_status" >&5
-+  echo "$as_me:18895: \$? = $ac_status" >&5
++  echo "$as_me:19040: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_cpp_static_cast=yes
  else
-@@ -17845,7 +18910,7 @@
+@@ -17845,7 +19055,7 @@
  ac_main_return=return
  
  fi
 -echo "$as_me:17848: result: $cf_cv_cpp_static_cast" >&5
-+echo "$as_me:18913: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:19058: result: $cf_cv_cpp_static_cast" >&5
  echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
  
  fi
-@@ -17893,7 +18958,7 @@
+@@ -17893,7 +19103,7 @@
         else
                 if test "$cf_cv_header_stdbool_h" = 1 ; then
  
 -echo "$as_me:17896: checking for size of bool" >&5
-+echo "$as_me:18961: checking for size of bool" >&5
++echo "$as_me:19106: checking for size of bool" >&5
  echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
  if test "${cf_cv_type_of_bool+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17904,7 +18969,7 @@
+@@ -17904,7 +19114,7 @@
    cf_cv_type_of_bool=unknown
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 17907 "configure"
-+#line 18972 "configure"
++#line 19117 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -17946,15 +19011,15 @@
+@@ -17946,15 +19156,15 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:17949: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19014: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19159: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:17952: \$? = $ac_status" >&5
-+  echo "$as_me:19017: \$? = $ac_status" >&5
++  echo "$as_me:19162: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:17954: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19019: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19164: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:17957: \$? = $ac_status" >&5
-+  echo "$as_me:19022: \$? = $ac_status" >&5
++  echo "$as_me:19167: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    cf_cv_type_of_bool=`cat cf_test.out`
                  if test -z "$cf_cv_type_of_bool"; then
-@@ -17972,25 +19037,25 @@
+@@ -17972,25 +19182,25 @@
  fi
  
         rm -f cf_test.out
 -echo "$as_me:17975: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:19040: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:19185: result: $cf_cv_type_of_bool" >&5
  echo "${ECHO_T}$cf_cv_type_of_bool" >&6
  if test "$cf_cv_type_of_bool" = unknown ; then
@@ -24998 +28279 @@
         esac
 -       { echo "$as_me:17981: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+       { echo "$as_me:19046: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++       { echo "$as_me:19191: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
  echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
         cf_cv_type_of_bool=$NCURSES_BOOL
@@ -25005 +28286 @@
                 else
 -                       echo "$as_me:17987: checking for fallback type of bool" >&5
-+                       echo "$as_me:19052: checking for fallback type of bool" >&5
++                       echo "$as_me:19197: checking for fallback type of bool" >&5
  echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
                         case "$host_cpu" in #(vi
@@ -25012 +28293 @@
                         esac
 -                       echo "$as_me:17993: result: $cf_cv_type_of_bool" >&5
-+                       echo "$as_me:19058: result: $cf_cv_type_of_bool" >&5
++                       echo "$as_me:19203: result: $cf_cv_type_of_bool" >&5
  echo "${ECHO_T}$cf_cv_type_of_bool" >&6
                 fi
         fi
-@@ -18019,7 +19084,7 @@
+@@ -18019,7 +19229,7 @@
  
         if test "$cf_with_ada" != "no" ; then
                 if test "$with_libtool" != "no"; then
 -                       { echo "$as_me:18022: WARNING: libtool does not support Ada - disabling feature" >&5
-+                       { echo "$as_me:19087: WARNING: libtool does not support Ada - disabling feature" >&5
++                       { echo "$as_me:19232: WARNING: libtool does not support Ada - disabling feature" >&5
  echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
                         cf_with_ada=no
                 fi
-@@ -18030,7 +19095,7 @@
+@@ -18030,7 +19240,7 @@
  cf_ada_make=gnatmake
  # Extract the first word of "$cf_ada_make", so it can be a program name with args.
  set dummy $cf_ada_make; ac_word=$2
 -echo "$as_me:18033: checking for $ac_word" >&5
-+echo "$as_me:19098: checking for $ac_word" >&5
++echo "$as_me:19243: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_gnat_exists+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18045,7 +19110,7 @@
+@@ -18045,7 +19255,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_gnat_exists="yes"
 -echo "$as_me:18048: found $ac_dir/$ac_word" >&5
-+echo "$as_me:19113: found $ac_dir/$ac_word" >&5
++echo "$as_me:19258: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -18054,31 +19119,32 @@
+@@ -18054,31 +19264,32 @@
  fi
  gnat_exists=$ac_cv_prog_gnat_exists
  if test -n "$gnat_exists"; then
 -  echo "$as_me:18057: result: $gnat_exists" >&5
-+  echo "$as_me:19122: result: $gnat_exists" >&5
++  echo "$as_me:19267: result: $gnat_exists" >&5
  echo "${ECHO_T}$gnat_exists" >&6
  else
 -  echo "$as_me:18060: result: no" >&5
-+  echo "$as_me:19125: result: no" >&5
++  echo "$as_me:19270: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
@@ -25062 +28343 @@
  
 -echo "$as_me:18068: checking for gnat version" >&5
-+echo "$as_me:19134: checking for gnat version" >&5
++echo "$as_me:19279: checking for gnat version" >&5
  echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
  cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
@@ -25068 +28349 @@
      sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 -echo "$as_me:18073: result: $cf_gnat_version" >&5
-+echo "$as_me:19139: result: $cf_gnat_version" >&5
++echo "$as_me:19284: result: $cf_gnat_version" >&5
  echo "${ECHO_T}$cf_gnat_version" >&6
  
@@ -25078 +28359 @@
  *)
 -       { echo "$as_me:18081: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
-+       { echo "$as_me:19147: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++       { echo "$as_me:19292: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
  echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
         cf_cv_prog_gnat_correct=no
         ;;
-@@ -18086,7 +19152,7 @@
+@@ -18086,7 +19297,7 @@
  
     # Extract the first word of "m4", so it can be a program name with args.
  set dummy m4; ac_word=$2
 -echo "$as_me:18089: checking for $ac_word" >&5
-+echo "$as_me:19155: checking for $ac_word" >&5
++echo "$as_me:19300: checking for $ac_word" >&5
  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_M4_exists+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18101,7 +19167,7 @@
+@@ -18101,7 +19312,7 @@
    test -z "$ac_dir" && ac_dir=.
    $as_executable_p "$ac_dir/$ac_word" || continue
  ac_cv_prog_M4_exists="yes"
 -echo "$as_me:18104: found $ac_dir/$ac_word" >&5
-+echo "$as_me:19170: found $ac_dir/$ac_word" >&5
++echo "$as_me:19315: found $ac_dir/$ac_word" >&5
  break
  done
  
-@@ -18110,10 +19176,10 @@
+@@ -18110,10 +19321,10 @@
  fi
  M4_exists=$ac_cv_prog_M4_exists
  if test -n "$M4_exists"; then
 -  echo "$as_me:18113: result: $M4_exists" >&5
-+  echo "$as_me:19179: result: $M4_exists" >&5
++  echo "$as_me:19324: result: $M4_exists" >&5
  echo "${ECHO_T}$M4_exists" >&6
  else
 -  echo "$as_me:18116: result: no" >&5
-+  echo "$as_me:19182: result: no" >&5
++  echo "$as_me:19327: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi
  
-@@ -18122,7 +19188,7 @@
+@@ -18122,7 +19333,7 @@
        echo Ada95 binding required program m4 not found. Ada95 binding disabled.
     fi
     if test "$cf_cv_prog_gnat_correct" = yes; then
 -      echo "$as_me:18125: checking if GNAT works" >&5
-+      echo "$as_me:19191: checking if GNAT works" >&5
++      echo "$as_me:19336: checking if GNAT works" >&5
  echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
  
  rm -rf conftest* *~conftest*
-@@ -18150,7 +19216,7 @@
+@@ -18150,7 +19361,7 @@
  fi
  rm -rf conftest* *~conftest*
  
 -      echo "$as_me:18153: result: $cf_cv_prog_gnat_correct" >&5
-+      echo "$as_me:19219: result: $cf_cv_prog_gnat_correct" >&5
++      echo "$as_me:19364: result: $cf_cv_prog_gnat_correct" >&5
  echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
     fi
  fi
-@@ -18175,7 +19241,7 @@
-                                ;;
-                        esac
+@@ -18159,23 +19370,27 @@
+ 
+        ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-                       # make ADAFLAGS consistent with CFLAGS
+-                       case "$CFLAGS" in
+-                       *-g*)
++       echo "$as_me:19373: checking optimization options for ADAFLAGS" >&5
++echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
++       case "$CFLAGS" in
++       *-g*)
+ 
+        ADAFLAGS="$ADAFLAGS -g"
+ 
+-                               ;;
+-                       esac
+-                       case "$CFLAGS" in
+-                       *-O*)
++               ;;
++       esac
++       case "$CFLAGS" in
++       *-O*)
++               cf_O_flag=`echo "$CFLAGS" |sed -e 's/^.*-O/-O/' -e 's/[         ].*//'`
+ 
+-       ADAFLAGS="$ADAFLAGS -O3"
++       ADAFLAGS="$ADAFLAGS $cf_O_flag"
+ 
+-                               ;;
+-                       esac
++               ;;
++       esac
++       echo "$as_me:19390: result: $ADAFLAGS" >&5
++echo "${ECHO_T}$ADAFLAGS" >&6
  
 -echo "$as_me:18178: checking if GNAT supports generics" >&5
-+echo "$as_me:19244: checking if GNAT supports generics" >&5
++echo "$as_me:19393: checking if GNAT supports generics" >&5
  echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
  case $cf_gnat_version in #(vi
  3.[1-9]*|[4-9].*) #(vi
-@@ -18185,7 +19251,7 @@
+@@ -18185,7 +19400,7 @@
         cf_gnat_generics=no
         ;;
  esac
 -echo "$as_me:18188: result: $cf_gnat_generics" >&5
-+echo "$as_me:19254: result: $cf_gnat_generics" >&5
++echo "$as_me:19403: result: $cf_gnat_generics" >&5
  echo "${ECHO_T}$cf_gnat_generics" >&6
  
  if test "$cf_gnat_generics" = yes
-@@ -18197,7 +19263,7 @@
+@@ -18197,7 +19412,7 @@
         cf_generic_objects=
  fi
  
 -echo "$as_me:18200: checking if GNAT supports SIGINT" >&5
-+echo "$as_me:19266: checking if GNAT supports SIGINT" >&5
++echo "$as_me:19415: checking if GNAT supports SIGINT" >&5
  echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
  if test "${cf_cv_gnat_sigint+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18245,7 +19311,7 @@
+@@ -18245,7 +19460,7 @@
  rm -rf conftest* *~conftest*
  
  fi
 -echo "$as_me:18248: result: $cf_cv_gnat_sigint" >&5
-+echo "$as_me:19314: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:19463: result: $cf_cv_gnat_sigint" >&5
  echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
  
  if test $cf_cv_gnat_sigint = yes ; then
-@@ -18254,7 +19320,7 @@
+@@ -18254,7 +19469,7 @@
         USE_GNAT_SIGINT="#"
  fi
  
 -echo "$as_me:18257: checking if GNAT pragma Unreferenced works" >&5
-+echo "$as_me:19323: checking if GNAT pragma Unreferenced works" >&5
++echo "$as_me:19472: checking if GNAT pragma Unreferenced works" >&5
  echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6
  if test "${cf_cv_pragma_unreferenced+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18285,7 +19351,7 @@
+@@ -18285,7 +19500,7 @@
  rm -rf conftest* *~conftest*
  
  fi
 -echo "$as_me:18288: result: $cf_cv_pragma_unreferenced" >&5
-+echo "$as_me:19354: result: $cf_cv_pragma_unreferenced" >&5
++echo "$as_me:19503: result: $cf_cv_pragma_unreferenced" >&5
  echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6
  
  # if the pragma is supported, use it (needed in the Trace code).
-@@ -18298,7 +19364,7 @@
+@@ -18298,7 +19513,7 @@
  cf_gnat_libraries=no
  cf_gnat_projects=no
  
 -echo "$as_me:18301: checking if GNAT supports project files" >&5
-+echo "$as_me:19367: checking if GNAT supports project files" >&5
++echo "$as_me:19516: checking if GNAT supports project files" >&5
  echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
  case $cf_gnat_version in #(vi
  3.[0-9]*) #(vi
-@@ -18366,14 +19432,14 @@
+@@ -18366,14 +19581,14 @@
         esac
         ;;
  esac
 -echo "$as_me:18369: result: $cf_gnat_projects" >&5
-+echo "$as_me:19435: result: $cf_gnat_projects" >&5
++echo "$as_me:19584: result: $cf_gnat_projects" >&5
  echo "${ECHO_T}$cf_gnat_projects" >&6
  
@@ -25205 +28516 @@
  then
 -       echo "$as_me:18374: checking if GNAT supports libraries" >&5
-+       echo "$as_me:19440: checking if GNAT supports libraries" >&5
++       echo "$as_me:19589: checking if GNAT supports libraries" >&5
  echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
 -       echo "$as_me:18376: result: $cf_gnat_libraries" >&5
-+       echo "$as_me:19442: result: $cf_gnat_libraries" >&5
++       echo "$as_me:19591: result: $cf_gnat_libraries" >&5
  echo "${ECHO_T}$cf_gnat_libraries" >&6
  fi
  
-@@ -18393,7 +19459,7 @@
+@@ -18393,7 +19608,7 @@
         USE_GNAT_LIBRARIES="#"
  fi
  
 -echo "$as_me:18396: checking for ada-compiler" >&5
-+echo "$as_me:19462: checking for ada-compiler" >&5
++echo "$as_me:19611: checking for ada-compiler" >&5
  echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
  
  # Check whether --with-ada-compiler or --without-ada-compiler was given.
-@@ -18404,12 +19470,12 @@
+@@ -18404,12 +19619,12 @@
    cf_ada_compiler=gnatmake
  fi;
  
 -echo "$as_me:18407: result: $cf_ada_compiler" >&5
-+echo "$as_me:19473: result: $cf_ada_compiler" >&5
++echo "$as_me:19622: result: $cf_ada_compiler" >&5
  echo "${ECHO_T}$cf_ada_compiler" >&6
  
@@ -25232 +28543 @@
  
 -echo "$as_me:18412: checking for ada-include" >&5
-+echo "$as_me:19478: checking for ada-include" >&5
++echo "$as_me:19627: checking for ada-include" >&5
  echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
  
  # Check whether --with-ada-include or --without-ada-include was given.
-@@ -18445,7 +19511,7 @@
+@@ -18433,7 +19648,7 @@
+   ;;
+ .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+   ;;
+-.\${*prefix}*) #(vi
++.\${*prefix}*|.\${*dir}*) #(vi
+   eval withval="$withval"
+   case ".$withval" in #(vi
+   .NONE/*)
+@@ -18445,7 +19660,7 @@
    withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    ;;
  *)
 -  { { echo "$as_me:18448: error: expected a pathname, not \"$withval\"" >&5
-+  { { echo "$as_me:19514: error: expected a pathname, not \"$withval\"" >&5
++  { { echo "$as_me:19663: error: expected a pathname, not \"$withval\"" >&5
  echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
     { (exit 1); exit 1; }; }
    ;;
-@@ -18454,10 +19520,10 @@
+@@ -18454,10 +19669,10 @@
  fi
  ADA_INCLUDE="$withval"
  
 -echo "$as_me:18457: result: $ADA_INCLUDE" >&5
-+echo "$as_me:19523: result: $ADA_INCLUDE" >&5
++echo "$as_me:19672: result: $ADA_INCLUDE" >&5
  echo "${ECHO_T}$ADA_INCLUDE" >&6
  
 -echo "$as_me:18460: checking for ada-objects" >&5
-+echo "$as_me:19526: checking for ada-objects" >&5
++echo "$as_me:19675: checking for ada-objects" >&5
  echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
  
  # Check whether --with-ada-objects or --without-ada-objects was given.
-@@ -18493,7 +19559,7 @@
+@@ -18481,7 +19696,7 @@
+   ;;
+ .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+   ;;
+-.\${*prefix}*) #(vi
++.\${*prefix}*|.\${*dir}*) #(vi
+   eval withval="$withval"
+   case ".$withval" in #(vi
+   .NONE/*)
+@@ -18493,7 +19708,7 @@
    withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    ;;
  *)
 -  { { echo "$as_me:18496: error: expected a pathname, not \"$withval\"" >&5
-+  { { echo "$as_me:19562: error: expected a pathname, not \"$withval\"" >&5
++  { { echo "$as_me:19711: error: expected a pathname, not \"$withval\"" >&5
  echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
     { (exit 1); exit 1; }; }
    ;;
-@@ -18502,10 +19568,10 @@
+@@ -18502,10 +19717,10 @@
  fi
  ADA_OBJECTS="$withval"
  
 -echo "$as_me:18505: result: $ADA_OBJECTS" >&5
-+echo "$as_me:19571: result: $ADA_OBJECTS" >&5
++echo "$as_me:19720: result: $ADA_OBJECTS" >&5
  echo "${ECHO_T}$ADA_OBJECTS" >&6
  
 -echo "$as_me:18508: checking if an Ada95 shared-library should be built" >&5
-+echo "$as_me:19574: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:19723: checking if an Ada95 shared-library should be built" >&5
  echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
  
  # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
-@@ -18515,7 +19581,7 @@
+@@ -18515,7 +19730,7 @@
  else
    with_ada_sharedlib=no
  fi;
 -echo "$as_me:18518: result: $with_ada_sharedlib" >&5
-+echo "$as_me:19584: result: $with_ada_sharedlib" >&5
++echo "$as_me:19733: result: $with_ada_sharedlib" >&5
  echo "${ECHO_T}$with_ada_sharedlib" >&6
  
  ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
-@@ -18546,7 +19612,7 @@
+@@ -18546,7 +19761,7 @@
  ### chooses to split module lists into libraries.
  ###
  ### (see CF_LIB_RULES).
 -echo "$as_me:18549: checking for library subsets" >&5
-+echo "$as_me:19615: checking for library subsets" >&5
++echo "$as_me:19764: checking for library subsets" >&5
  echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
  LIB_SUBSETS=
  
-@@ -18587,7 +19653,7 @@
+@@ -18587,7 +19802,7 @@
  test "$with_widec"     = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
  test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
  
 -echo "$as_me:18590: result: $LIB_SUBSETS" >&5
-+echo "$as_me:19656: result: $LIB_SUBSETS" >&5
++echo "$as_me:19805: result: $LIB_SUBSETS" >&5
  echo "${ECHO_T}$LIB_SUBSETS" >&6
  
  ### Construct the list of include-directories to be generated
-@@ -18625,7 +19691,7 @@
+@@ -18625,7 +19840,7 @@
  fi
  
  ### Build up pieces for makefile rules
 -echo "$as_me:18628: checking default library suffix" >&5
-+echo "$as_me:19694: checking default library suffix" >&5
++echo "$as_me:19843: checking default library suffix" >&5
  echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
  
         case $DFT_LWR_MODEL in
-@@ -18636,10 +19702,10 @@
+@@ -18636,10 +19851,10 @@
         shared)  DFT_ARG_SUFFIX=''   ;;
         esac
         test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
 -echo "$as_me:18639: result: $DFT_ARG_SUFFIX" >&5
-+echo "$as_me:19705: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:19854: result: $DFT_ARG_SUFFIX" >&5
  echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
  
 -echo "$as_me:18642: checking default library-dependency suffix" >&5
-+echo "$as_me:19708: checking default library-dependency suffix" >&5
++echo "$as_me:19857: checking default library-dependency suffix" >&5
  echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
  
         case $DFT_LWR_MODEL in #(vi
-@@ -18661,7 +19727,7 @@
+@@ -18661,11 +19876,11 @@
                 ;;
         shared) #(vi
@@ -25338 +28667 @@
                         DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
                         ;;
-@@ -18692,10 +19758,10 @@
+-               cygwin*) #(vi
++               cygwin*|mingw*) #(vi
+                        DFT_LIB_SUFFIX='.dll'
+                        DFT_DEP_SUFFIX='.dll.a'
+                        ;;
+@@ -18692,10 +19907,10 @@
         esac
         test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}"
         test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}"
 -echo "$as_me:18695: result: $DFT_DEP_SUFFIX" >&5
-+echo "$as_me:19761: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:19910: result: $DFT_DEP_SUFFIX" >&5
  echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
  
 -echo "$as_me:18698: checking default object directory" >&5
-+echo "$as_me:19764: checking default object directory" >&5
++echo "$as_me:19913: checking default object directory" >&5
  echo $ECHO_N "checking default object directory... $ECHO_C" >&6
  
         case $DFT_LWR_MODEL in
-@@ -18711,12 +19777,12 @@
+@@ -18711,12 +19926,12 @@
                         DFT_OBJ_SUBDIR='obj_s' ;;
                 esac
         esac
 -echo "$as_me:18714: result: $DFT_OBJ_SUBDIR" >&5
-+echo "$as_me:19780: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:19929: result: $DFT_OBJ_SUBDIR" >&5
  echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
  
@@ -25362 +28696 @@
  if test "$cf_with_cxx" = yes ; then
 -echo "$as_me:18719: checking c++ library-dependency suffix" >&5
-+echo "$as_me:19785: checking c++ library-dependency suffix" >&5
++echo "$as_me:19934: checking c++ library-dependency suffix" >&5
  echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
  if test "$with_libtool" != "no"; then
         CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX
-@@ -18741,7 +19807,7 @@
+@@ -18741,11 +19956,11 @@
                 ;;
         shared) #(vi
@@ -25375 +28709 @@
                         CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
                         ;;
-@@ -18773,7 +19839,7 @@
+-               cygwin*) #(vi
++               cygwin*|mingw*) #(vi
+                        CXX_LIB_SUFFIX='.dll'
+                        CXX_DEP_SUFFIX='.dll.a'
+                        ;;
+@@ -18773,7 +19988,7 @@
         test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}"
         test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}"
  fi
 -echo "$as_me:18776: result: $CXX_LIB_SUFFIX" >&5
-+echo "$as_me:19842: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:19991: result: $CXX_LIB_SUFFIX" >&5
  echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
  
  fi
-@@ -18812,9 +19878,11 @@
+@@ -18812,9 +20027,11 @@
                 TICS_DEP_SUFFIX="${TICS_NAME}${DFT_DEP_SUFFIX}"
                 TICS_LIB_SUFFIX="${TICS_NAME}${LIB_SUFFIX}"
@@ -25398 +28737 @@
  
  if test "$with_termlib" != no ; then
-@@ -18837,14 +19905,22 @@
+@@ -18837,14 +20054,22 @@
         if test "$DFT_LWR_MODEL" = "libtool"; then
                 TEST_ARGS="${TEST_DEPS}"
@@ -25424 +28763 @@
         fi
  else
-@@ -18858,7 +19934,8 @@
+@@ -18858,7 +20083,8 @@
                 TICS_LIST="$SHLIB_LIST"
         fi
@@ -25434 +28773 @@
  
  if test "$DFT_LWR_MODEL" = shared ; then
-@@ -18882,7 +19959,7 @@
+@@ -18882,7 +20108,7 @@
  fi
  
@@ -25443 +28782 @@
  case $DFT_LWR_MODEL in
  normal|debug|profile)
-@@ -18900,7 +19977,7 @@
+@@ -18900,7 +20126,7 @@
      esac
  else
@@ -25452 +28791 @@
                 LDFLAGS_SHARED=-bdynamic
                 ;;
-@@ -18927,19 +20004,19 @@
+@@ -18927,19 +20153,19 @@
  
  if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
  then
 -       echo "$as_me:18930: checking if linker supports switching between static/dynamic" >&5
-+       echo "$as_me:20007: checking if linker supports switching between static/dynamic" >&5
++       echo "$as_me:20156: checking if linker supports switching between static/dynamic" >&5
  echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
  
@@ -25463 +28802 @@
         cat >conftest.$ac_ext <<EOF
 -#line 18935 "configure"
-+#line 20012 "configure"
++#line 20161 "configure"
  #include <stdio.h>
  int cf_ldflags_static(FILE *fp) { return fflush(fp); }
  EOF
 -       if { (eval echo "$as_me:18939: \"$ac_compile\"") >&5
-+       if { (eval echo "$as_me:20016: \"$ac_compile\"") >&5
++       if { (eval echo "$as_me:20165: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:18942: \$? = $ac_status" >&5