Changeset 06b2d12

Timestamp:

Aug 27, 2012, 1:48:21 AM (12 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