Changeset 06b2d12


Ignore:
Timestamp:
Aug 26, 2012, 6:48:21 PM (7 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:
5 added
4 deleted
1 moved

Legend:

Unmodified
Added
Removed
  • patches/ncurses-5.9-branch_update-4.patch

    r6ecbe33 r06b2d12  
    11Submitted By: Jonathan Norman (jonathan at bluesquarelinux dot co dot uk)
    2 Date: 2012-02-16
     2Date: 2012-08-25
    33Initial Package Version: 5.9
    44Origin: Upstream
    55Upstream Status: Applied
    6 Description: Contains all upstream patches up to 5.9-20111224
     6Description: Contains all upstream patches up to 5.9-20120616
    77
    88diff -Naur ncurses-5.9.orig/Ada95/aclocal.m4 ncurses-5.9/Ada95/aclocal.m4
    9 --- ncurses-5.9.orig/Ada95/aclocal.m4   2012-02-16 18:25:12.619808985 +0000
    10 +++ ncurses-5.9/Ada95/aclocal.m4        2012-02-16 18:25:13.167823445 +0000
     9--- ncurses-5.9.orig/Ada95/aclocal.m4   2012-08-25 19:57:59.386567678 +0000
     10+++ ncurses-5.9/Ada95/aclocal.m4        2012-08-25 19:58:02.099888180 +0000
    1111@@ -1,5 +1,5 @@
    1212 dnl***************************************************************************
     
    2121 dnl
    2222-dnl $Id: aclocal.m4,v 1.24 2011/03/31 23:32:36 tom Exp $
    23 +dnl $Id: aclocal.m4,v 1.44 2012/01/22 00:33:42 tom Exp $
     23+dnl $Id: aclocal.m4,v 1.52 2012/08/04 18:12:47 tom Exp $
    2424 dnl Macros used in NCURSES Ada95 auto-configuration script.
    2525 dnl
     
    9494 cf_cv_ansi_cc=no
    9595 cf_save_CFLAGS="$CFLAGS"
    96 @@ -504,7 +550,7 @@
     96@@ -413,6 +459,35 @@
     97 AC_SUBST(ARFLAGS)
     98 ])
     99 dnl ---------------------------------------------------------------------------
     100+dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31
     101+dnl --------------
     102+dnl Allow user to disable a normally-on option.
     103+AC_DEFUN([CF_ARG_DISABLE],
     104+[CF_ARG_OPTION($1,[$2],[$3],[$4],yes)])dnl
     105+dnl ---------------------------------------------------------------------------
     106+dnl CF_ARG_OPTION version: 4 updated: 2010/05/26 05:38:42
     107+dnl -------------
     108+dnl Restricted form of AC_ARG_ENABLE that ensures user doesn't give bogus
     109+dnl values.
     110+dnl
     111+dnl Parameters:
     112+dnl $1 = option name
     113+dnl $2 = help-string
     114+dnl $3 = action to perform if option is not default
     115+dnl $4 = action if perform if option is default
     116+dnl $5 = default option value (either 'yes' or 'no')
     117+AC_DEFUN([CF_ARG_OPTION],
     118+[AC_ARG_ENABLE([$1],[$2],[test "$enableval" != ifelse([$5],no,yes,no) && enableval=ifelse([$5],no,no,yes)
     119+  if test "$enableval" != "$5" ; then
     120+ifelse([$3],,[    :]dnl
     121+,[    $3]) ifelse([$4],,,[
     122+  else
     123+    $4])
     124+  fi],[enableval=$5 ifelse([$4],,,[
     125+  $4
     126+])dnl
     127+  ])])dnl
     128+dnl ---------------------------------------------------------------------------
     129 dnl CF_BUILD_CC version: 6 updated: 2006/10/14 15:23:15
     130 dnl -----------
     131 dnl If we're cross-compiling, allow the user to override the tools and their
     132@@ -504,7 +579,7 @@
    97133 AC_SUBST(BUILD_OBJEXT)
    98134 ])dnl
     
    103139 dnl Determine the default configuration into which we'll install ncurses.  This
    104140 dnl can be overridden by the user's command-line options.  There's two items to
    105 @@ -522,7 +568,7 @@
     141@@ -522,7 +597,7 @@
    106142 if test "x$prefix" = "xNONE" ; then
    107143        case "$cf_cv_system_name" in
     
    112148                ;;
    113149        *)      prefix=$ac_default_prefix
    114 @@ -593,7 +639,7 @@
     150@@ -593,7 +668,40 @@
    115151 fi
    116152 ])dnl
    117153 dnl ---------------------------------------------------------------------------
    118154-dnl CF_CURSES_HEADER version: 2 updated: 2010/04/28 06:02:16
     155+dnl CF_CLANG_COMPILER version: 1 updated: 2012/06/16 14:55:39
     156+dnl -----------------
     157+dnl Check if the given compiler is really clang.  clang's C driver defines
     158+dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does
     159+dnl not ignore some gcc options.
     160+dnl
     161+dnl This macro should be run "soon" after AC_PROG_CC or AC_PROG_CPLUSPLUS, to
     162+dnl ensure that it is not mistaken for gcc/g++.  It is normally invoked from
     163+dnl the wrappers for gcc and g++ warnings.
     164+dnl
     165+dnl $1 = GCC (default) or GXX
     166+dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS
     167+dnl $3 = CFLAGS (default) or CXXFLAGS
     168+AC_DEFUN([CF_CLANG_COMPILER],[
     169+ifelse([$2],,CLANG_COMPILER,[$2])=no
     170+
     171+if test "$ifelse([$1],,[$1],GCC)" = yes ; then
     172+       AC_MSG_CHECKING(if this is really Clang ifelse([$1],GXX,C++,C) compiler)
     173+       cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])"
     174+       ifelse([$3],,CFLAGS,[$3])="$ifelse([$3],,CFLAGS,[$3]) -Qunused-arguments"
     175+       AC_TRY_COMPILE([],[
     176+#ifdef __clang__
     177+#else
     178+make an error
     179+#endif
     180+],[ifelse([$2],,CLANG_COMPILER,[$2])=yes
     181+cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
     182+],[])
     183+       ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS"
     184+       AC_MSG_RESULT($ifelse([$2],,CLANG_COMPILER,[$2]))
     185+fi
     186+])
     187+dnl ---------------------------------------------------------------------------
    119188+dnl CF_CURSES_HEADER version: 3 updated: 2011/05/01 19:47:45
    120189 dnl ----------------
    121190 dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
    122191 dnl variations of ncurses' installs.
    123 @@ -603,10 +649,10 @@
     192@@ -603,10 +711,10 @@
    124193 AC_CACHE_CHECK(if we have identified curses headers,cf_cv_ncurses_header,[
    125194 cf_cv_ncurses_header=none
     
    136205 AC_TRY_COMPILE([#include <${cf_header}>],
    137206        [initscr(); tgoto("?", 0,0)],
    138 @@ -627,6 +673,31 @@
     207@@ -627,6 +735,67 @@
    139208 dnl "dirname" is not portable, so we fake it with a shell script.
    140209 AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's%/[[^/]]*$%%'`])dnl
    141210 dnl ---------------------------------------------------------------------------
    142 +dnl CF_ENABLE_PC_FILES version: 7 updated: 2011/12/10 18:58:47
     211+dnl CF_DISABLE_ECHO version: 11 updated: 2009/12/13 13:16:57
     212+dnl ---------------
     213+dnl You can always use "make -n" to see the actual options, but it's hard to
     214+dnl pick out/analyze warning messages when the compile-line is long.
     215+dnl
     216+dnl Sets:
     217+dnl    ECHO_LT - symbol to control if libtool is verbose
     218+dnl    ECHO_LD - symbol to prefix "cc -o" lines
     219+dnl    RULE_CC - symbol to put before implicit "cc -c" lines (e.g., .c.o)
     220+dnl    SHOW_CC - symbol to put before explicit "cc -c" lines
     221+dnl    ECHO_CC - symbol to put before any "cc" line
     222+dnl
     223+AC_DEFUN([CF_DISABLE_ECHO],[
     224+AC_MSG_CHECKING(if you want to see long compiling messages)
     225+CF_ARG_DISABLE(echo,
     226+       [  --disable-echo          display "compiling" commands],
     227+       [
     228+    ECHO_LT='--silent'
     229+    ECHO_LD='@echo linking [$]@;'
     230+    RULE_CC='@echo compiling [$]<'
     231+    SHOW_CC='@echo compiling [$]@'
     232+    ECHO_CC='@'
     233+],[
     234+    ECHO_LT=''
     235+    ECHO_LD=''
     236+    RULE_CC=''
     237+    SHOW_CC=''
     238+    ECHO_CC=''
     239+])
     240+AC_MSG_RESULT($enableval)
     241+AC_SUBST(ECHO_LT)
     242+AC_SUBST(ECHO_LD)
     243+AC_SUBST(RULE_CC)
     244+AC_SUBST(SHOW_CC)
     245+AC_SUBST(ECHO_CC)
     246+])dnl
     247+dnl ---------------------------------------------------------------------------
     248+dnl CF_ENABLE_PC_FILES version: 9 updated: 2012/08/04 13:59:54
    143249+dnl ------------------
    144250+dnl This is the "--enable-pc-files" option, which is available if there is a
     
    149255+
    150256+if test "$PKG_CONFIG" != none ; then
    151 +       if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
    152 +               AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG)
    153 +               AC_ARG_ENABLE(pc-files,
    154 +                       [  --enable-pc-files       generate and install .pc files for pkg-config],
    155 +                       [enable_pc_files=$enableval],
    156 +                       [enable_pc_files=no])
    157 +               AC_MSG_RESULT($enable_pc_files)
    158 +       elif test -z "$PKG_CONFIG_LIBDIR" || test "$PKG_CONFIG_LIBDIR" != no; then
    159 +               enable_pc_files=no
    160 +               AC_MSG_WARN(did not find $PKG_CONFIG library)
     257+       AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG)
     258+       AC_ARG_ENABLE(pc-files,
     259+               [  --enable-pc-files       generate and install .pc files for pkg-config],
     260+               [enable_pc_files=$enableval],
     261+               [enable_pc_files=no])
     262+       AC_MSG_RESULT($enable_pc_files)
     263+       if test "$enable_pc_files" != no
     264+       then
     265+               CF_PATH_SYNTAX(PKG_CONFIG_LIBDIR)
    161266+       fi
    162267+else
     
    168273 dnl ---------------
    169274 dnl Look for a non-standard library, given parameters for AC_TRY_LINK.  We
    170 @@ -1070,53 +1141,6 @@
     275@@ -807,6 +976,25 @@
     276 fi
     277 ])dnl
     278 dnl ---------------------------------------------------------------------------
     279+dnl CF_FIXUP_ADAFLAGS version: 1 updated: 2012/03/31 18:48:10
     280+dnl -----------------
     281+dnl make ADAFLAGS consistent with CFLAGS
     282+AC_DEFUN([CF_FIXUP_ADAFLAGS],[
     283+       AC_MSG_CHECKING(optimization options for ADAFLAGS)
     284+       case "$CFLAGS" in
     285+       *-g*)
     286+               CF_ADD_ADAFLAGS(-g)
     287+               ;;
     288+       esac
     289+       case "$CFLAGS" in
     290+       *-O*)
     291+               cf_O_flag=`echo "$CFLAGS" |sed -e 's/^.*-O/-O/' -e 's/[[        ]].*//'`
     292+               CF_ADD_ADAFLAGS($cf_O_flag)
     293+               ;;
     294+       esac
     295+       AC_MSG_RESULT($ADAFLAGS)
     296+])dnl
     297+dnl ---------------------------------------------------------------------------
     298 dnl CF_GCC_ATTRIBUTES version: 14 updated: 2010/10/23 15:52:32
     299 dnl -----------------
     300 dnl Test for availability of useful gcc __attribute__ directives to quiet
     301@@ -931,7 +1119,7 @@
     302 fi
     303 ])dnl
     304 dnl ---------------------------------------------------------------------------
     305-dnl CF_GCC_WARNINGS version: 27 updated: 2010/10/23 15:52:32
     306+dnl CF_GCC_WARNINGS version: 29 updated: 2012/06/16 14:55:39
     307 dnl ---------------
     308 dnl Check if the compiler supports useful warning options.  There's a few that
     309 dnl we don't use, simply because they're too noisy:
     310@@ -954,6 +1142,7 @@
     311 [
     312 AC_REQUIRE([CF_GCC_VERSION])
     313 CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
     314+CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
     315 
     316 cat > conftest.$ac_ext <<EOF
     317 #line __oline__ "${as_me:-configure}"
     318@@ -1029,6 +1218,13 @@
     319                                        continue;;
     320                                esac
     321                                ;;
     322+                       Wpointer-arith) #(vi
     323+                               case $GCC_VERSION in
     324+                               [[12]].*)
     325+                                       CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
     326+                                       continue;;
     327+                               esac
     328+                               ;;
     329                        esac
     330                        EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
     331                fi
     332@@ -1070,53 +1266,6 @@
    171333 AC_SUBST(cf_generic_objects)
    172334 ])dnl
     
    222384 dnl --------------------
    223385 dnl Check if the gnat pragma "Unreferenced" works.
    224 @@ -1253,6 +1277,53 @@
     386@@ -1253,6 +1402,53 @@
    225387 AC_SUBST(USE_GNAT_LIBRARIES)
    226388 ])dnl
     
    276438 dnl ----------------
    277439 dnl Verify that a test program compiles/links with GNAT.
    278 @@ -1311,7 +1382,7 @@
     440@@ -1311,7 +1507,7 @@
    279441 rm -rf conftest* *~conftest*
    280442 ])dnl
     
    285447 dnl Verify version of GNAT.
    286448 AC_DEFUN([CF_GNAT_VERSION],
    287 @@ -1323,7 +1394,7 @@
     449@@ -1323,7 +1519,7 @@
    288450 AC_MSG_RESULT($cf_gnat_version)
    289451 
     
    294456        ;;
    295457 *)
    296 @@ -1518,7 +1589,7 @@
     458@@ -1518,7 +1714,7 @@
    297459 ])
    298460 ])
     
    303465 dnl For the given system and compiler, find the compiler flags to pass to the
    304466 dnl loader to use the "rpath" feature.
    305 @@ -1539,10 +1610,10 @@
     467@@ -1539,10 +1735,10 @@
    306468 linux*|gnu*|k*bsd*-gnu) #(vi
    307469        LD_RPATH_OPT="-Wl,-rpath,"
     
    316478        ;;
    317479 netbsd*) #(vi
    318 @@ -1601,11 +1672,11 @@
     480@@ -1601,11 +1797,11 @@
    319481 $1="$cf_library_path_list [$]$1"
    320482 ])dnl
     
    330492        case $cf_cv_system_name in #(vi
    331493        OS/2*|os2*) #(vi
    332 @@ -1655,7 +1726,7 @@
     494@@ -1655,7 +1851,7 @@
    333495 ])
    334496 ])
    335497 dnl ---------------------------------------------------------------------------
    336498-dnl CF_LIB_SUFFIX version: 16 updated: 2008/12/27 12:30:03
    337 +dnl CF_LIB_SUFFIX version: 17 updated: 2011/07/02 15:36:04
     499+dnl CF_LIB_SUFFIX version: 18 updated: 2012/02/25 15:20:07
    338500 dnl -------------
    339501 dnl Compute the library file-suffix from the given model name
    340502 dnl $1 = model name
    341 @@ -1684,7 +1755,7 @@
     503@@ -1684,11 +1880,11 @@
    342504                ;;
    343505        shared) #(vi
     
    348510                        $3=[$]$2
    349511                        ;;
    350 @@ -2141,7 +2212,7 @@
     512-               cygwin*) #(vi
     513+               cygwin*|mingw*) #(vi
     514                        $2='.dll'
     515                        $3='.dll.a'
     516                        ;;
     517@@ -1974,7 +2170,7 @@
     518 test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES)
     519 ])dnl
     520 dnl ---------------------------------------------------------------------------
     521-dnl CF_MKSTEMP version: 7 updated: 2010/08/14 18:25:37
     522+dnl CF_MKSTEMP version: 8 updated: 2012/02/13 20:34:56
     523 dnl ----------
     524 dnl Check for a working mkstemp.  This creates two files, checks that they are
     525 dnl successfully created and distinct (AmigaOS apparently fails on the last).
     526@@ -2016,9 +2212,11 @@
     527 }
     528 ],[cf_cv_func_mkstemp=yes
     529 ],[cf_cv_func_mkstemp=no
     530-],[AC_CHECK_FUNC(mkstemp)
     531-])
     532+],[cf_cv_func_mkstemp=maybe])
     533 ])
     534+if test "x$cf_cv_func_mkstemp" = xmaybe ; then
     535+       AC_CHECK_FUNC(mkstemp)
     536+fi
     537 if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then
     538        AC_DEFINE(HAVE_MKSTEMP)
     539 fi
     540@@ -2141,7 +2339,7 @@
    351541        ,[$1=no])
    352542 ])dnl
     
    357547 dnl Tie together the configure-script macros for ncurses.
    358548 dnl Prefer the "-config" script from ncurses 6.x, to simplify analysis.
    359 @@ -2153,7 +2224,10 @@
     549@@ -2153,7 +2351,10 @@
    360550 cf_ncuconfig_root=ifelse($1,,ncurses,$1)
    361551 
     
    369559 if test "$NCURSES_CONFIG" != none ; then
    370560 
    371 @@ -2546,7 +2620,7 @@
     561@@ -2509,7 +2710,7 @@
     562        AC_SUBST(PATH_SEPARATOR)
     563 ])dnl
     564 dnl ---------------------------------------------------------------------------
     565-dnl CF_PATH_SYNTAX version: 13 updated: 2010/05/26 05:38:42
     566+dnl CF_PATH_SYNTAX version: 14 updated: 2012/06/19 20:58:54
     567 dnl --------------
     568 dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
     569 dnl begins with one of the prefix/exec_prefix variables, and then again if the
     570@@ -2529,7 +2730,7 @@
     571   ;;
     572 .[[a-zA-Z]]:[[\\/]]*) #(vi OS/2 EMX
     573   ;;
     574-.\[$]{*prefix}*) #(vi
     575+.\[$]{*prefix}*|.\[$]{*dir}*) #(vi
     576   eval $1="[$]$1"
     577   case ".[$]$1" in #(vi
     578   .NONE/*)
     579@@ -2546,7 +2747,7 @@
    372580 esac
    373581 ])dnl
     
    378586 dnl Check for the package-config program, unless disabled by command-line.
    379587 AC_DEFUN([CF_PKG_CONFIG],
    380 @@ -2563,7 +2637,9 @@
     588@@ -2563,7 +2764,9 @@
    381589        PKG_CONFIG=none
    382590        ;;
     
    389597 *)
    390598        PKG_CONFIG=$withval
    391 @@ -2746,7 +2822,7 @@
     599@@ -2746,7 +2949,7 @@
    392600 test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT")
    393601 ])dnl
     
    398606 dnl Check for gnatmake, ensure that it is complete.
    399607 AC_DEFUN([CF_PROG_GNAT],[
    400 @@ -2754,6 +2830,7 @@
     608@@ -2754,6 +2957,7 @@
    401609 AC_CHECK_PROG(gnat_exists, $cf_ada_make, yes, no)
    402610 if test "$ac_cv_prog_gnat_exists" = no; then
     
    406614    CF_GNAT_VERSION
    407615    AC_CHECK_PROG(M4_exists, m4, yes, no)
    408 @@ -2831,7 +2908,7 @@
     616@@ -2831,7 +3035,7 @@
    409617 $1=`echo "$2" | sed -e 's/-l$3[[       ]]//g' -e 's/-l$3[$]//'`
    410618 ])dnl
    411619 dnl ---------------------------------------------------------------------------
    412620-dnl CF_SHARED_OPTS version: 64 updated: 2010/06/05 16:51:16
    413 +dnl CF_SHARED_OPTS version: 69 updated: 2011/07/30 19:31:39
     621+dnl CF_SHARED_OPTS version: 70 updated: 2012/02/25 15:20:07
    414622 dnl --------------
    415623 dnl --------------
    416624 dnl Attempt to determine the appropriate CC/LD options for creating a shared
    417 @@ -2906,10 +2983,14 @@
     625@@ -2906,10 +3110,14 @@
    418626        cf_cv_shlib_version_infix=no
    419627 
     
    432640                ;;
    433641        beos*) #(vi
    434 @@ -2962,9 +3043,19 @@
     642@@ -2962,9 +3170,19 @@
    435643                # readonly to exploit a quirk in the memory manager.
    436644                INSTALL_LIB="-m 555"
     
    453661                # tested with IRIX 5.2 and 'cc'.
    454662                if test "$GCC" != yes; then
    455 @@ -2981,18 +3072,18 @@
     663@@ -2981,18 +3199,39 @@
    456664                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    457665                fi
     
    464672                ;;
    465673-       openbsd[[2-9]].*) #(vi
     674+       mingw*) #(vi
     675+               cf_cv_shlib_version=mingw
     676+               cf_cv_shlib_version_infix=mingw
     677+               CC_SHARED_OPTS=
     678+               MK_SHARED_LIB='sh ../mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
     679+               #MK_SHARED_LIB='${CC} ${CFLAGS} -mdll -Wl,-soname,'$cf_cv_shared_soname',-stats -o $[@]'
     680+               #MK_SHARED_LIB='${DLLTOOL} --export-all-symbols --output-exp --output-lib $[@]'
     681+               cat >mk_shared_lib.sh <<-CF_EOF
     682+               #!/bin/sh
     683+               SHARED_LIB=\[$]1
     684+               IMPORT_LIB=\`echo "\[$]1" | sed -e 's/[[0-9]]*\.dll[$]/.dll.a/'\`
     685+               shift
     686+               cat <<-EOF
     687+               Linking shared library
     688+               ** SHARED_LIB \[$]SHARED_LIB
     689+               ** IMPORT_LIB \[$]IMPORT_LIB
     690+EOF
     691+               exec \[$]* -shared -Wl,--out-implib=../lib/\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\[$]{SHARED_LIB}
     692+CF_EOF
     693+               chmod +x mk_shared_lib.sh
     694+               ;;
    466695+       openbsd[[2-9]].*|mirbsd*) #(vi
    467696                if test "$DFT_LWR_MODEL" = "shared" ; then
     
    475704                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
    476705                CF_SHARED_SONAME
    477 @@ -3003,12 +3094,12 @@
     706@@ -3003,12 +3242,12 @@
    478707                MK_SHARED_LIB='${LD} -Bshareable -o $[@]'
    479708                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
     
    491720                CF_SHARED_SONAME
    492721                MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $[@]` -o $[@]'
    493 @@ -3018,7 +3109,7 @@
     722@@ -3018,7 +3257,7 @@
    494723                if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then
    495724                        LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)"
     
    500729                        if test -f /usr/libexec/ld.elf_so; then
    501730                                cf_cv_shlib_version=abi
    502 @@ -3123,9 +3214,9 @@
     731@@ -3123,9 +3362,12 @@
    503732                ;;
    504733        esac
     
    510739+       test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}"
    511740+       test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}"
     741+
     742+       CF_VERBOSE(CC_SHARED_OPTS: $CC_SHARED_OPTS)
     743+       CF_VERBOSE(MK_SHARED_LIB:  $MK_SHARED_LIB)
    512744 
    513745        AC_SUBST(CC_SHARED_OPTS)
    514746        AC_SUBST(LD_RPATH_OPT)
    515 @@ -3137,6 +3228,7 @@
     747@@ -3137,6 +3379,7 @@
    516748        AC_SUBST(LOCAL_LDFLAGS)
    517749        AC_SUBST(LOCAL_LDFLAGS2)
     
    521753 dnl ---------------------------------------------------------------------------
    522754 dnl CF_SHARED_SONAME version: 3 updated: 2008/09/08 18:34:43
    523 @@ -3253,6 +3345,45 @@
     755@@ -3253,6 +3496,45 @@
    524756 AC_SUBST(top_builddir)
    525757 ])dnl
     
    567799 dnl --------
    568800 dnl Make an uppercase version of a variable
    569 @@ -3415,6 +3546,32 @@
     801@@ -3415,6 +3697,32 @@
    570802 fi
    571803 ])dnl
     
    600832 dnl ------------
    601833 dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just
    602 @@ -3436,7 +3593,50 @@
     834@@ -3436,7 +3744,50 @@
    603835 AC_SUBST($3)dnl
    604836 ])dnl
     
    652884 dnl Check for POSIX thread library.
    653885 AC_DEFUN([CF_WITH_PTHREAD],
    654 @@ -3452,28 +3652,33 @@
     886@@ -3452,28 +3803,33 @@
    655887     AC_CHECK_HEADER(pthread.h,[
    656888         AC_DEFINE(HAVE_PTHREADS_H)
     
    700932 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
    701933 dnl or adapt to the vendor's definitions to get equivalent functionality,
    702 @@ -3489,7 +3694,7 @@
     934@@ -3489,7 +3845,7 @@
    703935 cf_xopen_source=
    704936 
     
    709941        ;;
    710942 cygwin) #(vi
    711 @@ -3500,6 +3705,7 @@
     943@@ -3500,6 +3856,7 @@
    712944        ;;
    713945 darwin*) #(vi
     
    717949 freebsd*|dragonfly*) #(vi
    718950        # 5.x headers associate
    719 @@ -3517,15 +3723,23 @@
     951@@ -3517,15 +3874,23 @@
    720952        ;;
    721953 irix[[56]].*) #(vi
     
    743975 openbsd*) #(vi
    744976        # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
    745 @@ -3539,36 +3753,11 @@
     977@@ -3539,36 +3904,11 @@
    746978 sco*) #(vi
    747979        # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
     
    7821014        ;;
    7831015 esac
    784 @@ -3576,4 +3765,33 @@
     1016@@ -3576,4 +3916,33 @@
    7851017 if test -n "$cf_xopen_source" ; then
    7861018        CF_ADD_CFLAGS($cf_xopen_source)
     
    8171049 ])
    8181050diff -Naur ncurses-5.9.orig/Ada95/configure ncurses-5.9/Ada95/configure
    819 --- ncurses-5.9.orig/Ada95/configure    2012-02-16 18:25:12.619808985 +0000
    820 +++ ncurses-5.9/Ada95/configure 2012-02-16 18:25:13.179823762 +0000
    821 @@ -1,5 +1,5 @@
     1051--- ncurses-5.9.orig/Ada95/configure    2012-08-25 19:57:59.386567678 +0000
     1052+++ ncurses-5.9/Ada95/configure 2012-08-25 19:58:02.283220646 +0000
     1053@@ -1,7 +1,7 @@
    8221054 #! /bin/sh
    8231055-# From configure.in Revision: 1.30 .
    824 +# From configure.in Revision: 1.38 .
     1056+# From configure.in Revision: 1.41 .
    8251057 # Guess values for system-dependent variables and create Makefiles.
    826  # Generated by Autoconf 2.52.20101002.
     1058-# Generated by Autoconf 2.52.20101002.
     1059+# Generated by Autoconf 2.52.20120811.
    8271060 #
    828 @@ -645,6 +645,7 @@
     1061 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
     1062 # Free Software Foundation, Inc.
     1063@@ -135,15 +135,16 @@
     1064 bindir='${exec_prefix}/bin'
     1065 sbindir='${exec_prefix}/sbin'
     1066 libexecdir='${exec_prefix}/libexec'
     1067-datadir='${prefix}/share'
     1068+datarootdir='${prefix}/share'
     1069+datadir='${datarootdir}'
     1070 sysconfdir='${prefix}/etc'
     1071 sharedstatedir='${prefix}/com'
     1072 localstatedir='${prefix}/var'
     1073 libdir='${exec_prefix}/lib'
     1074 includedir='${prefix}/include'
     1075 oldincludedir='/usr/include'
     1076-infodir='${prefix}/info'
     1077-mandir='${prefix}/man'
     1078+infodir='${datarootdir}/info'
     1079+mandir='${datarootdir}/man'
     1080 
     1081 # Identity of this package.
     1082 PACKAGE_NAME=
     1083@@ -194,6 +195,13 @@
     1084   | --da=*)
     1085     datadir=$ac_optarg ;;
     1086 
     1087+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
     1088+  | --dataroo | --dataro | --datar)
     1089+    ac_prev=datarootdir ;;
     1090+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
     1091+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
     1092+    datarootdir=$ac_optarg ;;
     1093+
     1094   -disable-* | --disable-*)
     1095     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     1096     # Reject names that are not valid shell variable names.
     1097@@ -469,7 +477,7 @@
     1098 done
     1099 
     1100 # Be sure to have absolute paths.
     1101-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
     1102+for ac_var in bindir sbindir libexecdir datarootdir datadir sysconfdir sharedstatedir \
     1103               localstatedir libdir includedir oldincludedir infodir mandir
     1104 do
     1105   eval ac_val=$`echo $ac_var`
     1106@@ -606,15 +614,16 @@
     1107   --bindir=DIR            user executables [EPREFIX/bin]
     1108   --sbindir=DIR           system admin executables [EPREFIX/sbin]
     1109   --libexecdir=DIR        program executables [EPREFIX/libexec]
     1110-  --datadir=DIR           read-only architecture-independent data [PREFIX/share]
     1111+  --datarootdir=DIR       read-only architecture-independent data [PREFIX/share]
     1112+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
     1113   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
     1114   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
     1115   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
     1116   --libdir=DIR            object code libraries [EPREFIX/lib]
     1117   --includedir=DIR        C header files [PREFIX/include]
     1118   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
     1119-  --infodir=DIR           info documentation [PREFIX/info]
     1120-  --mandir=DIR            man documentation [PREFIX/man]
     1121+  --infodir=DIR           info documentation [DATAROOTDIR/info]
     1122+  --mandir=DIR            man documentation [DATAROOTDIR/man]
     1123 EOF
     1124 
     1125   cat <<\EOF
     1126@@ -645,6 +654,7 @@
    8291127 
    8301128   --with-system-type=XXX  test: override derived host system-type
     
    8341132   --without-tests         suppress build with test-programs
    8351133   --enable-mixed-case     tic should assume mixed-case filenames
    836 @@ -660,6 +661,7 @@
     1134@@ -660,6 +670,7 @@
    8371135   --with-shared           generate shared C-objects (needed for --with-ada-sharedlib)
    8381136   --enable-widec          compile with wide-char/UTF-8 code
     
    8421140   --enable-rpath-link     link sample programs with rpath option
    8431141 Fine-Tuning Your Configuration:
    844 @@ -881,7 +883,7 @@
     1142@@ -677,7 +688,7 @@
     1143   --enable-reentrant      compile with experimental reentrant code
     1144   --with-wrap-prefix=XXX  override prefix used for public variables
     1145 Testing/development Options:
     1146-  --enable-echo           build: display "compiling" commands (default)
     1147+  --disable-echo          display "compiling" commands
     1148   --enable-warnings       build: turn on GCC compiler warnings
     1149   --enable-assertions     test: turn on generation of assertion code
     1150   --enable-expanded       test: generate functions for certain macros
     1151@@ -757,7 +768,7 @@
     1152 running configure, to aid debugging if configure makes a mistake.
     1153 
     1154 It was created by $as_me, which was
     1155-generated by GNU Autoconf 2.52.20101002.  Invocation command line was
     1156+generated by GNU Autoconf 2.52.20120811.  Invocation command line was
     1157 
     1158   $ $0 $@
     1159 
     1160@@ -881,7 +892,7 @@
    8451161 fi
    8461162 for ac_site_file in $CONFIG_SITE; do
    8471163   if test -r "$ac_site_file"; then
    8481164-    { echo "$as_me:884: loading site script $ac_site_file" >&5
    849 +    { echo "$as_me:886: loading site script $ac_site_file" >&5
     1165+    { echo "$as_me:895: loading site script $ac_site_file" >&5
    8501166 echo "$as_me: loading site script $ac_site_file" >&6;}
    8511167     cat "$ac_site_file" >&5
    8521168     . "$ac_site_file"
    853 @@ -892,7 +894,7 @@
     1169@@ -892,7 +903,7 @@
    8541170   # Some versions of bash will fail to source /dev/null (special
    8551171   # files actually), so we avoid doing that.
    8561172   if test -f "$cache_file"; then
    8571173-    { echo "$as_me:895: loading cache $cache_file" >&5
    858 +    { echo "$as_me:897: loading cache $cache_file" >&5
     1174+    { echo "$as_me:906: loading cache $cache_file" >&5
    8591175 echo "$as_me: loading cache $cache_file" >&6;}
    8601176     case $cache_file in
    8611177       [\\/]* | ?:[\\/]* ) . $cache_file;;
    862 @@ -900,7 +902,7 @@
     1178@@ -900,7 +911,7 @@
    8631179     esac
    8641180   fi
    8651181 else
    8661182-  { echo "$as_me:903: creating cache $cache_file" >&5
    867 +  { echo "$as_me:905: creating cache $cache_file" >&5
     1183+  { echo "$as_me:914: creating cache $cache_file" >&5
    8681184 echo "$as_me: creating cache $cache_file" >&6;}
    8691185   >$cache_file
    8701186 fi
    871 @@ -916,21 +918,21 @@
     1187@@ -916,21 +927,21 @@
    8721188   eval ac_new_val="\$ac_env_${ac_var}_value"
    8731189   case $ac_old_set,$ac_new_set in
    8741190     set,)
    8751191-      { echo "$as_me:919: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
    876 +      { echo "$as_me:921: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
     1192+      { echo "$as_me:930: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
    8771193 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
    8781194       ac_cache_corrupted=: ;;
    8791195     ,set)
    8801196-      { echo "$as_me:923: error: \`$ac_var' was not set in the previous run" >&5
    881 +      { echo "$as_me:925: error: \`$ac_var' was not set in the previous run" >&5
     1197+      { echo "$as_me:934: error: \`$ac_var' was not set in the previous run" >&5
    8821198 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
    8831199       ac_cache_corrupted=: ;;
     
    8861202       if test "x$ac_old_val" != "x$ac_new_val"; then
    8871203-        { echo "$as_me:929: error: \`$ac_var' has changed since the previous run:" >&5
    888 +        { echo "$as_me:931: error: \`$ac_var' has changed since the previous run:" >&5
     1204+        { echo "$as_me:940: error: \`$ac_var' has changed since the previous run:" >&5
    8891205 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
    8901206-        { echo "$as_me:931:   former value:  $ac_old_val" >&5
    891 +        { echo "$as_me:933:   former value:  $ac_old_val" >&5
     1207+        { echo "$as_me:942:   former value:  $ac_old_val" >&5
    8921208 echo "$as_me:   former value:  $ac_old_val" >&2;}
    8931209-        { echo "$as_me:933:   current value: $ac_new_val" >&5
    894 +        { echo "$as_me:935:   current value: $ac_new_val" >&5
     1210+        { echo "$as_me:944:   current value: $ac_new_val" >&5
    8951211 echo "$as_me:   current value: $ac_new_val" >&2;}
    8961212         ac_cache_corrupted=:
    8971213       fi;;
    898 @@ -949,9 +951,9 @@
     1214@@ -949,9 +960,9 @@
    8991215   fi
    9001216 done
    9011217 if $ac_cache_corrupted; then
    9021218-  { echo "$as_me:952: error: changes in the environment can compromise the build" >&5
    903 +  { echo "$as_me:954: error: changes in the environment can compromise the build" >&5
     1219+  { echo "$as_me:963: error: changes in the environment can compromise the build" >&5
    9041220 echo "$as_me: error: changes in the environment can compromise the build" >&2;}
    9051221-  { { echo "$as_me:954: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
    906 +  { { echo "$as_me:956: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
     1222+  { { echo "$as_me:965: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
    9071223 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    9081224    { (exit 1); exit 1; }; }
    9091225 fi
    910 @@ -972,10 +974,10 @@
     1226@@ -972,10 +983,10 @@
    9111227 echo "#! $SHELL" >conftest.sh
    9121228 echo  "exit 0"   >>conftest.sh
    9131229 chmod +x conftest.sh
    9141230-if { (echo "$as_me:975: PATH=\".;.\"; conftest.sh") >&5
    915 +if { (echo "$as_me:977: PATH=\".;.\"; conftest.sh") >&5
     1231+if { (echo "$as_me:986: PATH=\".;.\"; conftest.sh") >&5
    9161232   (PATH=".;."; conftest.sh) 2>&5
    9171233   ac_status=$?
    9181234-  echo "$as_me:978: \$? = $ac_status" >&5
    919 +  echo "$as_me:980: \$? = $ac_status" >&5
     1235+  echo "$as_me:989: \$? = $ac_status" >&5
    9201236   (exit $ac_status); }; then
    9211237   ac_path_separator=';'
    9221238 else
    923 @@ -1005,7 +1007,7 @@
     1239@@ -1005,7 +1016,7 @@
    9241240   fi
    9251241 done
    9261242 if test -z "$ac_aux_dir"; then
    9271243-  { { echo "$as_me:1008: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
    928 +  { { echo "$as_me:1010: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
     1244+  { { echo "$as_me:1019: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
    9291245 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    9301246    { (exit 1); exit 1; }; }
    9311247 fi
    932 @@ -1015,11 +1017,11 @@
     1248@@ -1015,11 +1026,11 @@
    9331249 
    9341250 # Make sure we can run config.sub.
    9351251 $ac_config_sub sun4 >/dev/null 2>&1 ||
    9361252-  { { echo "$as_me:1018: error: cannot run $ac_config_sub" >&5
    937 +  { { echo "$as_me:1020: error: cannot run $ac_config_sub" >&5
     1253+  { { echo "$as_me:1029: error: cannot run $ac_config_sub" >&5
    9381254 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    9391255    { (exit 1); exit 1; }; }
    9401256 
    9411257-echo "$as_me:1022: checking build system type" >&5
    942 +echo "$as_me:1024: checking build system type" >&5
     1258+echo "$as_me:1033: checking build system type" >&5
    9431259 echo $ECHO_N "checking build system type... $ECHO_C" >&6
    9441260 if test "${ac_cv_build+set}" = set; then
    9451261   echo $ECHO_N "(cached) $ECHO_C" >&6
    946 @@ -1028,23 +1030,23 @@
     1262@@ -1028,23 +1039,23 @@
    9471263 test -z "$ac_cv_build_alias" &&
    9481264   ac_cv_build_alias=`$ac_config_guess`
    9491265 test -z "$ac_cv_build_alias" &&
    9501266-  { { echo "$as_me:1031: error: cannot guess build type; you must specify one" >&5
    951 +  { { echo "$as_me:1033: error: cannot guess build type; you must specify one" >&5
     1267+  { { echo "$as_me:1042: error: cannot guess build type; you must specify one" >&5
    9521268 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    9531269    { (exit 1); exit 1; }; }
    9541270 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
    9551271-  { { echo "$as_me:1035: error: $ac_config_sub $ac_cv_build_alias failed." >&5
    956 +  { { echo "$as_me:1037: error: $ac_config_sub $ac_cv_build_alias failed." >&5
     1272+  { { echo "$as_me:1046: error: $ac_config_sub $ac_cv_build_alias failed." >&5
    9571273 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
    9581274    { (exit 1); exit 1; }; }
     
    9601276 fi
    9611277-echo "$as_me:1040: result: $ac_cv_build" >&5
    962 +echo "$as_me:1042: result: $ac_cv_build" >&5
     1278+echo "$as_me:1051: result: $ac_cv_build" >&5
    9631279 echo "${ECHO_T}$ac_cv_build" >&6
    9641280 build=$ac_cv_build
     
    9681284 
    9691285-echo "$as_me:1047: checking host system type" >&5
    970 +echo "$as_me:1049: checking host system type" >&5
     1286+echo "$as_me:1058: checking host system type" >&5
    9711287 echo $ECHO_N "checking host system type... $ECHO_C" >&6
    9721288 if test "${ac_cv_host+set}" = set; then
    9731289   echo $ECHO_N "(cached) $ECHO_C" >&6
    974 @@ -1053,12 +1055,12 @@
     1290@@ -1053,12 +1064,12 @@
    9751291 test -z "$ac_cv_host_alias" &&
    9761292   ac_cv_host_alias=$ac_cv_build_alias
    9771293 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
    9781294-  { { echo "$as_me:1056: error: $ac_config_sub $ac_cv_host_alias failed" >&5
    979 +  { { echo "$as_me:1058: error: $ac_config_sub $ac_cv_host_alias failed" >&5
     1295+  { { echo "$as_me:1067: error: $ac_config_sub $ac_cv_host_alias failed" >&5
    9801296 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    9811297    { (exit 1); exit 1; }; }
     
    9831299 fi
    9841300-echo "$as_me:1061: result: $ac_cv_host" >&5
    985 +echo "$as_me:1063: result: $ac_cv_host" >&5
     1301+echo "$as_me:1072: result: $ac_cv_host" >&5
    9861302 echo "${ECHO_T}$ac_cv_host" >&6
    9871303 host=$ac_cv_host
    9881304 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
    989 @@ -1066,7 +1068,7 @@
     1305@@ -1066,7 +1077,7 @@
    9901306 host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
    9911307 
    9921308 if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
    9931309-       echo "$as_me:1069: checking target system type" >&5
    994 +       echo "$as_me:1071: checking target system type" >&5
     1310+       echo "$as_me:1080: checking target system type" >&5
    9951311 echo $ECHO_N "checking target system type... $ECHO_C" >&6
    9961312 if test "${ac_cv_target+set}" = set; then
    9971313   echo $ECHO_N "(cached) $ECHO_C" >&6
    998 @@ -1075,12 +1077,12 @@
     1314@@ -1075,12 +1086,12 @@
    9991315 test "x$ac_cv_target_alias" = "x" &&
    10001316   ac_cv_target_alias=$ac_cv_host_alias
    10011317 ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
    10021318-  { { echo "$as_me:1078: error: $ac_config_sub $ac_cv_target_alias failed" >&5
    1003 +  { { echo "$as_me:1080: error: $ac_config_sub $ac_cv_target_alias failed" >&5
     1319+  { { echo "$as_me:1089: error: $ac_config_sub $ac_cv_target_alias failed" >&5
    10041320 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
    10051321    { (exit 1); exit 1; }; }
     
    10071323 fi
    10081324-echo "$as_me:1083: result: $ac_cv_target" >&5
    1009 +echo "$as_me:1085: result: $ac_cv_target" >&5
     1325+echo "$as_me:1094: result: $ac_cv_target" >&5
    10101326 echo "${ECHO_T}$ac_cv_target" >&6
    10111327 target=$ac_cv_target
    10121328 target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
    1013 @@ -1111,13 +1113,13 @@
     1329@@ -1111,13 +1122,13 @@
    10141330 fi
    10151331 
    10161332 test -z "$system_name" && system_name="$cf_cv_system_name"
    10171333-test -n "$cf_cv_system_name" && echo "$as_me:1114: result: Configuring for $cf_cv_system_name" >&5
    1018 +test -n "$cf_cv_system_name" && echo "$as_me:1116: result: Configuring for $cf_cv_system_name" >&5
     1334+test -n "$cf_cv_system_name" && echo "$as_me:1125: result: Configuring for $cf_cv_system_name" >&5
    10191335 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
    10201336 
    10211337 if test ".$system_name" != ".$cf_cv_system_name" ; then
    10221338-       echo "$as_me:1118: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
    1023 +       echo "$as_me:1120: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
     1339+       echo "$as_me:1129: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
    10241340 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
    10251341-       { { echo "$as_me:1120: error: \"Please remove config.cache and try again.\"" >&5
    1026 +       { { echo "$as_me:1122: error: \"Please remove config.cache and try again.\"" >&5
     1342+       { { echo "$as_me:1131: error: \"Please remove config.cache and try again.\"" >&5
    10271343 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
    10281344    { (exit 1); exit 1; }; }
    10291345 fi
    1030 @@ -1125,7 +1127,7 @@
     1346@@ -1125,7 +1136,7 @@
    10311347 # Check whether --with-system-type or --without-system-type was given.
    10321348 if test "${with_system_type+set}" = set; then
    10331349   withval="$with_system_type"
    10341350-  { echo "$as_me:1128: WARNING: overriding system type to $withval" >&5
    1035 +  { echo "$as_me:1130: WARNING: overriding system type to $withval" >&5
     1351+  { echo "$as_me:1139: WARNING: overriding system type to $withval" >&5
    10361352 echo "$as_me: WARNING: overriding system type to $withval" >&2;}
    10371353  cf_cv_system_name=$withval
    10381354 fi;
    1039 @@ -1135,23 +1137,23 @@
     1355@@ -1135,23 +1146,23 @@
    10401356 
    10411357 ###    Default install-location
    10421358 
    10431359-echo "$as_me:1138: checking for prefix" >&5
    1044 +echo "$as_me:1140: checking for prefix" >&5
     1360+echo "$as_me:1149: checking for prefix" >&5
    10451361 echo $ECHO_N "checking for prefix... $ECHO_C" >&6
    10461362 if test "x$prefix" = "xNONE" ; then
     
    10561372 fi
    10571373-echo "$as_me:1150: result: $prefix" >&5
    1058 +echo "$as_me:1152: result: $prefix" >&5
     1374+echo "$as_me:1161: result: $prefix" >&5
    10591375 echo "${ECHO_T}$prefix" >&6
    10601376 
    10611377 if test "x$prefix" = "xNONE" ; then
    10621378-echo "$as_me:1154: checking for default include-directory" >&5
    1063 +echo "$as_me:1156: checking for default include-directory" >&5
     1379+echo "$as_me:1165: checking for default include-directory" >&5
    10641380 echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
    10651381 test -n "$verbose" && echo 1>&6
    10661382 for cf_symbol in \
    1067 @@ -1174,7 +1176,7 @@
     1383@@ -1174,7 +1185,7 @@
    10681384        fi
    10691385        test -n "$verbose"  && echo "   tested $cf_dir" 1>&6
    10701386 done
    10711387-echo "$as_me:1177: result: $includedir" >&5
    1072 +echo "$as_me:1179: result: $includedir" >&5
     1388+echo "$as_me:1188: result: $includedir" >&5
    10731389 echo "${ECHO_T}$includedir" >&6
    10741390 fi
    10751391 
    1076 @@ -1188,7 +1190,7 @@
     1392@@ -1186,213 +1197,11 @@
     1393 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     1394 ac_main_return=return
    10771395 if test -n "$ac_tool_prefix"; then
    1078    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
    1079  set dummy ${ac_tool_prefix}gcc; ac_word=$2
     1396-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
     1397-set dummy ${ac_tool_prefix}gcc; ac_word=$2
    10801398-echo "$as_me:1191: checking for $ac_word" >&5
    1081 +echo "$as_me:1193: checking for $ac_word" >&5
    1082  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    1083  if test "${ac_cv_prog_CC+set}" = set; then
    1084    echo $ECHO_N "(cached) $ECHO_C" >&6
    1085 @@ -1203,7 +1205,7 @@
    1086    test -z "$ac_dir" && ac_dir=.
    1087    $as_executable_p "$ac_dir/$ac_word" || continue
    1088  ac_cv_prog_CC="${ac_tool_prefix}gcc"
     1399-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     1400-if test "${ac_cv_prog_CC+set}" = set; then
     1401-  echo $ECHO_N "(cached) $ECHO_C" >&6
     1402-else
     1403-  if test -n "$CC"; then
     1404-  ac_cv_prog_CC="$CC" # Let the user override the test.
     1405-else
     1406-  ac_save_IFS=$IFS; IFS=$ac_path_separator
     1407-ac_dummy="$PATH"
     1408-for ac_dir in $ac_dummy; do
     1409-  IFS=$ac_save_IFS
     1410-  test -z "$ac_dir" && ac_dir=.
     1411-  $as_executable_p "$ac_dir/$ac_word" || continue
     1412-ac_cv_prog_CC="${ac_tool_prefix}gcc"
    10891413-echo "$as_me:1206: found $ac_dir/$ac_word" >&5
    1090 +echo "$as_me:1208: found $ac_dir/$ac_word" >&5
    1091  break
    1092  done
    1093  
    1094 @@ -1211,10 +1213,10 @@
    1095  fi
    1096  CC=$ac_cv_prog_CC
    1097  if test -n "$CC"; then
     1414-break
     1415-done
     1416-
     1417-fi
     1418-fi
     1419-CC=$ac_cv_prog_CC
     1420-if test -n "$CC"; then
    10981421-  echo "$as_me:1214: result: $CC" >&5
    1099 +  echo "$as_me:1216: result: $CC" >&5
    1100  echo "${ECHO_T}$CC" >&6
    1101  else
     1422-echo "${ECHO_T}$CC" >&6
     1423-else
    11021424-  echo "$as_me:1217: result: no" >&5
    1103 +  echo "$as_me:1219: result: no" >&5
    1104  echo "${ECHO_T}no" >&6
    1105  fi
    1106  
    1107 @@ -1223,7 +1225,7 @@
    1108    ac_ct_CC=$CC
    1109    # Extract the first word of "gcc", so it can be a program name with args.
    1110  set dummy gcc; ac_word=$2
     1425-echo "${ECHO_T}no" >&6
     1426-fi
     1427-
     1428-fi
     1429-if test -z "$ac_cv_prog_CC"; then
     1430-  ac_ct_CC=$CC
     1431-  # Extract the first word of "gcc", so it can be a program name with args.
     1432-set dummy gcc; ac_word=$2
    11111433-echo "$as_me:1226: checking for $ac_word" >&5
    1112 +echo "$as_me:1228: checking for $ac_word" >&5
    1113  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    1114  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    1115    echo $ECHO_N "(cached) $ECHO_C" >&6
    1116 @@ -1238,7 +1240,7 @@
    1117    test -z "$ac_dir" && ac_dir=.
    1118    $as_executable_p "$ac_dir/$ac_word" || continue
    1119  ac_cv_prog_ac_ct_CC="gcc"
     1434-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     1435-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
     1436-  echo $ECHO_N "(cached) $ECHO_C" >&6
     1437-else
     1438-  if test -n "$ac_ct_CC"; then
     1439-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
     1440-else
     1441-  ac_save_IFS=$IFS; IFS=$ac_path_separator
     1442-ac_dummy="$PATH"
     1443-for ac_dir in $ac_dummy; do
     1444-  IFS=$ac_save_IFS
     1445-  test -z "$ac_dir" && ac_dir=.
     1446-  $as_executable_p "$ac_dir/$ac_word" || continue
     1447-ac_cv_prog_ac_ct_CC="gcc"
    11201448-echo "$as_me:1241: found $ac_dir/$ac_word" >&5
    1121 +echo "$as_me:1243: found $ac_dir/$ac_word" >&5
    1122  break
    1123  done
    1124  
    1125 @@ -1246,10 +1248,10 @@
    1126  fi
    1127  ac_ct_CC=$ac_cv_prog_ac_ct_CC
    1128  if test -n "$ac_ct_CC"; then
     1449-break
     1450-done
     1451-
     1452-fi
     1453-fi
     1454-ac_ct_CC=$ac_cv_prog_ac_ct_CC
     1455-if test -n "$ac_ct_CC"; then
    11291456-  echo "$as_me:1249: result: $ac_ct_CC" >&5
    1130 +  echo "$as_me:1251: result: $ac_ct_CC" >&5
    1131  echo "${ECHO_T}$ac_ct_CC" >&6
    1132  else
     1457-echo "${ECHO_T}$ac_ct_CC" >&6
     1458-else
    11331459-  echo "$as_me:1252: result: no" >&5
    1134 +  echo "$as_me:1254: result: no" >&5
    1135  echo "${ECHO_T}no" >&6
    1136  fi
    1137  
    1138 @@ -1262,7 +1264,7 @@
    1139    if test -n "$ac_tool_prefix"; then
    1140    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
    1141  set dummy ${ac_tool_prefix}cc; ac_word=$2
     1460-echo "${ECHO_T}no" >&6
     1461-fi
     1462-
     1463-  CC=$ac_ct_CC
     1464-else
     1465-  CC="$ac_cv_prog_CC"
     1466-fi
     1467-
     1468-if test -z "$CC"; then
     1469-  if test -n "$ac_tool_prefix"; then
     1470-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
     1471-set dummy ${ac_tool_prefix}cc; ac_word=$2
    11421472-echo "$as_me:1265: checking for $ac_word" >&5
    1143 +echo "$as_me:1267: checking for $ac_word" >&5
    1144  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    1145  if test "${ac_cv_prog_CC+set}" = set; then
    1146    echo $ECHO_N "(cached) $ECHO_C" >&6
    1147 @@ -1277,7 +1279,7 @@
    1148    test -z "$ac_dir" && ac_dir=.
    1149    $as_executable_p "$ac_dir/$ac_word" || continue
    1150  ac_cv_prog_CC="${ac_tool_prefix}cc"
     1473-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     1474-if test "${ac_cv_prog_CC+set}" = set; then
     1475-  echo $ECHO_N "(cached) $ECHO_C" >&6
     1476-else
     1477-  if test -n "$CC"; then
     1478-  ac_cv_prog_CC="$CC" # Let the user override the test.
     1479-else
     1480-  ac_save_IFS=$IFS; IFS=$ac_path_separator
     1481-ac_dummy="$PATH"
     1482-for ac_dir in $ac_dummy; do
     1483-  IFS=$ac_save_IFS
     1484-  test -z "$ac_dir" && ac_dir=.
     1485-  $as_executable_p "$ac_dir/$ac_word" || continue
     1486-ac_cv_prog_CC="${ac_tool_prefix}cc"
    11511487-echo "$as_me:1280: found $ac_dir/$ac_word" >&5
    1152 +echo "$as_me:1282: found $ac_dir/$ac_word" >&5
    1153  break
    1154  done
    1155  
    1156 @@ -1285,10 +1287,10 @@
    1157  fi
    1158  CC=$ac_cv_prog_CC
    1159  if test -n "$CC"; then
     1488-break
     1489-done
     1490-
     1491-fi
     1492-fi
     1493-CC=$ac_cv_prog_CC
     1494-if test -n "$CC"; then
    11601495-  echo "$as_me:1288: result: $CC" >&5
    1161 +  echo "$as_me:1290: result: $CC" >&5
    1162  echo "${ECHO_T}$CC" >&6
    1163  else
     1496-echo "${ECHO_T}$CC" >&6
     1497-else
    11641498-  echo "$as_me:1291: result: no" >&5
    1165 +  echo "$as_me:1293: result: no" >&5
    1166  echo "${ECHO_T}no" >&6
    1167  fi
    1168  
    1169 @@ -1297,7 +1299,7 @@
    1170    ac_ct_CC=$CC
    1171    # Extract the first word of "cc", so it can be a program name with args.
    1172  set dummy cc; ac_word=$2
     1499-echo "${ECHO_T}no" >&6
     1500-fi
     1501-
     1502-fi
     1503-if test -z "$ac_cv_prog_CC"; then
     1504-  ac_ct_CC=$CC
     1505-  # Extract the first word of "cc", so it can be a program name with args.
     1506-set dummy cc; ac_word=$2
    11731507-echo "$as_me:1300: checking for $ac_word" >&5
    1174 +echo "$as_me:1302: checking for $ac_word" >&5
    1175  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    1176  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    1177    echo $ECHO_N "(cached) $ECHO_C" >&6
    1178 @@ -1312,7 +1314,7 @@
    1179    test -z "$ac_dir" && ac_dir=.
    1180    $as_executable_p "$ac_dir/$ac_word" || continue
    1181  ac_cv_prog_ac_ct_CC="cc"
     1508-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     1509-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
     1510-  echo $ECHO_N "(cached) $ECHO_C" >&6
     1511-else
     1512-  if test -n "$ac_ct_CC"; then
     1513-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
     1514-else
     1515-  ac_save_IFS=$IFS; IFS=$ac_path_separator
     1516-ac_dummy="$PATH"
     1517-for ac_dir in $ac_dummy; do
     1518-  IFS=$ac_save_IFS
     1519-  test -z "$ac_dir" && ac_dir=.
     1520-  $as_executable_p "$ac_dir/$ac_word" || continue
     1521-ac_cv_prog_ac_ct_CC="cc"
    11821522-echo "$as_me:1315: found $ac_dir/$ac_word" >&5
    1183 +echo "$as_me:1317: found $ac_dir/$ac_word" >&5
    1184  break
    1185  done
    1186  
    1187 @@ -1320,10 +1322,10 @@
    1188  fi
    1189  ac_ct_CC=$ac_cv_prog_ac_ct_CC
    1190  if test -n "$ac_ct_CC"; then
     1523-break
     1524-done
     1525-
     1526-fi
     1527-fi
     1528-ac_ct_CC=$ac_cv_prog_ac_ct_CC
     1529-if test -n "$ac_ct_CC"; then
    11911530-  echo "$as_me:1323: result: $ac_ct_CC" >&5
    1192 +  echo "$as_me:1325: result: $ac_ct_CC" >&5
    1193  echo "${ECHO_T}$ac_ct_CC" >&6
    1194  else
     1531-echo "${ECHO_T}$ac_ct_CC" >&6
     1532-else
    11951533-  echo "$as_me:1326: result: no" >&5
    1196 +  echo "$as_me:1328: result: no" >&5
    1197  echo "${ECHO_T}no" >&6
    1198  fi
    1199  
    1200 @@ -1336,7 +1338,7 @@
    1201  if test -z "$CC"; then
    1202    # Extract the first word of "cc", so it can be a program name with args.
    1203  set dummy cc; ac_word=$2
     1534-echo "${ECHO_T}no" >&6
     1535-fi
     1536-
     1537-  CC=$ac_ct_CC
     1538-else
     1539-  CC="$ac_cv_prog_CC"
     1540-fi
     1541-
     1542-fi
     1543-if test -z "$CC"; then
     1544-  # Extract the first word of "cc", so it can be a program name with args.
     1545-set dummy cc; ac_word=$2
    12041546-echo "$as_me:1339: checking for $ac_word" >&5
    1205 +echo "$as_me:1341: checking for $ac_word" >&5
    1206  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    1207  if test "${ac_cv_prog_CC+set}" = set; then
    1208    echo $ECHO_N "(cached) $ECHO_C" >&6
    1209 @@ -1356,7 +1358,7 @@
    1210    continue
    1211  fi
    1212  ac_cv_prog_CC="cc"
     1547-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     1548-if test "${ac_cv_prog_CC+set}" = set; then
     1549-  echo $ECHO_N "(cached) $ECHO_C" >&6
     1550-else
     1551-  if test -n "$CC"; then
     1552-  ac_cv_prog_CC="$CC" # Let the user override the test.
     1553-else
     1554-  ac_prog_rejected=no
     1555-  ac_save_IFS=$IFS; IFS=$ac_path_separator
     1556-ac_dummy="$PATH"
     1557-for ac_dir in $ac_dummy; do
     1558-  IFS=$ac_save_IFS
     1559-  test -z "$ac_dir" && ac_dir=.
     1560-  $as_executable_p "$ac_dir/$ac_word" || continue
     1561-if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
     1562-  ac_prog_rejected=yes
     1563-  continue
     1564-fi
     1565-ac_cv_prog_CC="cc"
    12131566-echo "$as_me:1359: found $ac_dir/$ac_word" >&5
    1214 +echo "$as_me:1361: found $ac_dir/$ac_word" >&5
    1215  break
    1216  done
    1217  
    1218 @@ -1378,10 +1380,10 @@
    1219  fi
    1220  CC=$ac_cv_prog_CC
    1221  if test -n "$CC"; then
     1567-break
     1568-done
     1569-
     1570-if test $ac_prog_rejected = yes; then
     1571-  # We found a bogon in the path, so make sure we never use it.
     1572-  set dummy $ac_cv_prog_CC
     1573-  shift
     1574-  if test $# != 0; then
     1575-    # We chose a different compiler from the bogus one.
     1576-    # However, it has the same basename, so the bogon will be chosen
     1577-    # first if we set CC to just the basename; use the full file name.
     1578-    shift
     1579-    set dummy "$ac_dir/$ac_word" ${1+"$@"}
     1580-    shift
     1581-    ac_cv_prog_CC="$@"
     1582-  fi
     1583-fi
     1584-fi
     1585-fi
     1586-CC=$ac_cv_prog_CC
     1587-if test -n "$CC"; then
    12221588-  echo "$as_me:1381: result: $CC" >&5
    1223 +  echo "$as_me:1383: result: $CC" >&5
    1224  echo "${ECHO_T}$CC" >&6
    1225  else
     1589-echo "${ECHO_T}$CC" >&6
     1590-else
    12261591-  echo "$as_me:1384: result: no" >&5
    1227 +  echo "$as_me:1386: result: no" >&5
    1228  echo "${ECHO_T}no" >&6
    1229  fi
    1230  
    1231 @@ -1392,7 +1394,7 @@
     1592-echo "${ECHO_T}no" >&6
     1593-fi
     1594-
     1595-fi
     1596-if test -z "$CC"; then
     1597-  if test -n "$ac_tool_prefix"; then
     1598-  for ac_prog in cl
     1599+  for ac_prog in gnatgcc gcc cc
    12321600   do
    12331601     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
    12341602 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
    12351603-echo "$as_me:1395: checking for $ac_word" >&5
    1236 +echo "$as_me:1397: checking for $ac_word" >&5
     1604+echo "$as_me:1204: checking for $ac_word" >&5
    12371605 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    12381606 if test "${ac_cv_prog_CC+set}" = set; then
    12391607   echo $ECHO_N "(cached) $ECHO_C" >&6
    1240 @@ -1407,7 +1409,7 @@
     1608@@ -1407,7 +1216,7 @@
    12411609   test -z "$ac_dir" && ac_dir=.
    12421610   $as_executable_p "$ac_dir/$ac_word" || continue
    12431611 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
    12441612-echo "$as_me:1410: found $ac_dir/$ac_word" >&5
    1245 +echo "$as_me:1412: found $ac_dir/$ac_word" >&5
     1613+echo "$as_me:1219: found $ac_dir/$ac_word" >&5
    12461614 break
    12471615 done
    12481616 
    1249 @@ -1415,10 +1417,10 @@
     1617@@ -1415,10 +1224,10 @@
    12501618 fi
    12511619 CC=$ac_cv_prog_CC
    12521620 if test -n "$CC"; then
    12531621-  echo "$as_me:1418: result: $CC" >&5
    1254 +  echo "$as_me:1420: result: $CC" >&5
     1622+  echo "$as_me:1227: result: $CC" >&5
    12551623 echo "${ECHO_T}$CC" >&6
    12561624 else
    12571625-  echo "$as_me:1421: result: no" >&5
    1258 +  echo "$as_me:1423: result: no" >&5
     1626+  echo "$as_me:1230: result: no" >&5
    12591627 echo "${ECHO_T}no" >&6
    12601628 fi
    12611629 
    1262 @@ -1431,7 +1433,7 @@
     1630@@ -1427,11 +1236,11 @@
     1631 fi
     1632 if test -z "$CC"; then
     1633   ac_ct_CC=$CC
     1634-  for ac_prog in cl
     1635+  for ac_prog in gnatgcc gcc cc
    12631636 do
    12641637   # Extract the first word of "$ac_prog", so it can be a program name with args.
    12651638 set dummy $ac_prog; ac_word=$2
    12661639-echo "$as_me:1434: checking for $ac_word" >&5
    1267 +echo "$as_me:1436: checking for $ac_word" >&5
     1640+echo "$as_me:1243: checking for $ac_word" >&5
    12681641 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    12691642 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    12701643   echo $ECHO_N "(cached) $ECHO_C" >&6
    1271 @@ -1446,7 +1448,7 @@
     1644@@ -1446,7 +1255,7 @@
    12721645   test -z "$ac_dir" && ac_dir=.
    12731646   $as_executable_p "$ac_dir/$ac_word" || continue
    12741647 ac_cv_prog_ac_ct_CC="$ac_prog"
    12751648-echo "$as_me:1449: found $ac_dir/$ac_word" >&5
    1276 +echo "$as_me:1451: found $ac_dir/$ac_word" >&5
     1649+echo "$as_me:1258: found $ac_dir/$ac_word" >&5
    12771650 break
    12781651 done
    12791652 
    1280 @@ -1454,10 +1456,10 @@
     1653@@ -1454,10 +1263,10 @@
    12811654 fi
    12821655 ac_ct_CC=$ac_cv_prog_ac_ct_CC
    12831656 if test -n "$ac_ct_CC"; then
    12841657-  echo "$as_me:1457: result: $ac_ct_CC" >&5
    1285 +  echo "$as_me:1459: result: $ac_ct_CC" >&5
     1658+  echo "$as_me:1266: result: $ac_ct_CC" >&5
    12861659 echo "${ECHO_T}$ac_ct_CC" >&6
    12871660 else
    12881661-  echo "$as_me:1460: result: no" >&5
    1289 +  echo "$as_me:1462: result: no" >&5
     1662+  echo "$as_me:1269: result: no" >&5
    12901663 echo "${ECHO_T}no" >&6
    12911664 fi
    12921665 
    1293 @@ -1469,32 +1471,32 @@
    1294  
    1295  fi
    1296  
     1666@@ -1467,34 +1276,32 @@
     1667   CC=$ac_ct_CC
     1668 fi
     1669 
     1670-fi
     1671-
    12971672-test -z "$CC" && { { echo "$as_me:1472: error: no acceptable cc found in \$PATH" >&5
    1298 +test -z "$CC" && { { echo "$as_me:1474: error: no acceptable cc found in \$PATH" >&5
     1673+test -z "$CC" && { { echo "$as_me:1279: error: no acceptable cc found in \$PATH" >&5
    12991674 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    13001675    { (exit 1); exit 1; }; }
     
    13021677 # Provide some information about the compiler.
    13031678-echo "$as_me:1477:" \
    1304 +echo "$as_me:1479:" \
     1679+echo "$as_me:1284:" \
    13051680      "checking for C compiler version" >&5
    13061681 ac_compiler=`set X $ac_compile; echo $2`
    13071682-{ (eval echo "$as_me:1480: \"$ac_compiler --version </dev/null >&5\"") >&5
    1308 +{ (eval echo "$as_me:1482: \"$ac_compiler --version </dev/null >&5\"") >&5
     1683+{ (eval echo "$as_me:1287: \"$ac_compiler --version </dev/null >&5\"") >&5
    13091684   (eval $ac_compiler --version </dev/null >&5) 2>&5
    13101685   ac_status=$?
    13111686-  echo "$as_me:1483: \$? = $ac_status" >&5
    1312 +  echo "$as_me:1485: \$? = $ac_status" >&5
     1687+  echo "$as_me:1290: \$? = $ac_status" >&5
    13131688   (exit $ac_status); }
    13141689-{ (eval echo "$as_me:1485: \"$ac_compiler -v </dev/null >&5\"") >&5
    1315 +{ (eval echo "$as_me:1487: \"$ac_compiler -v </dev/null >&5\"") >&5
     1690+{ (eval echo "$as_me:1292: \"$ac_compiler -v </dev/null >&5\"") >&5
    13161691   (eval $ac_compiler -v </dev/null >&5) 2>&5
    13171692   ac_status=$?
    13181693-  echo "$as_me:1488: \$? = $ac_status" >&5
    1319 +  echo "$as_me:1490: \$? = $ac_status" >&5
     1694+  echo "$as_me:1295: \$? = $ac_status" >&5
    13201695   (exit $ac_status); }
    13211696-{ (eval echo "$as_me:1490: \"$ac_compiler -V </dev/null >&5\"") >&5
    1322 +{ (eval echo "$as_me:1492: \"$ac_compiler -V </dev/null >&5\"") >&5
     1697+{ (eval echo "$as_me:1297: \"$ac_compiler -V </dev/null >&5\"") >&5
    13231698   (eval $ac_compiler -V </dev/null >&5) 2>&5
    13241699   ac_status=$?
    13251700-  echo "$as_me:1493: \$? = $ac_status" >&5
    1326 +  echo "$as_me:1495: \$? = $ac_status" >&5
     1701+  echo "$as_me:1300: \$? = $ac_status" >&5
    13271702   (exit $ac_status); }
    13281703 
    13291704 cat >conftest.$ac_ext <<_ACEOF
    13301705-#line 1497 "configure"
    1331 +#line 1499 "configure"
     1706+#line 1304 "configure"
    13321707 #include "confdefs.h"
    13331708 
    13341709 int
    1335 @@ -1510,13 +1512,13 @@
     1710@@ -1510,13 +1317,13 @@
    13361711 # Try to create an executable without -o first, disregard a.out.
    13371712 # It will help us diagnose broken compilers, and finding out an intuition
    13381713 # of exeext.
    13391714-echo "$as_me:1513: checking for C compiler default output" >&5
    1340 +echo "$as_me:1515: checking for C compiler default output" >&5
     1715+echo "$as_me:1320: checking for C compiler default output" >&5
    13411716 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
    13421717 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
    13431718-if { (eval echo "$as_me:1516: \"$ac_link_default\"") >&5
    1344 +if { (eval echo "$as_me:1518: \"$ac_link_default\"") >&5
     1719+if { (eval echo "$as_me:1323: \"$ac_link_default\"") >&5
    13451720   (eval $ac_link_default) 2>&5
    13461721   ac_status=$?
    13471722-  echo "$as_me:1519: \$? = $ac_status" >&5
    1348 +  echo "$as_me:1521: \$? = $ac_status" >&5
     1723+  echo "$as_me:1326: \$? = $ac_status" >&5
    13491724   (exit $ac_status); }; then
    13501725   # Find the output, starting from the most likely.  This scheme is
    13511726 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
    1352 @@ -1539,34 +1541,34 @@
     1727@@ -1539,34 +1346,34 @@
    13531728 else
    13541729   echo "$as_me: failed program was:" >&5
    13551730 cat conftest.$ac_ext >&5
    13561731-{ { echo "$as_me:1542: error: C compiler cannot create executables" >&5
    1357 +{ { echo "$as_me:1544: error: C compiler cannot create executables" >&5
     1732+{ { echo "$as_me:1349: error: C compiler cannot create executables" >&5
    13581733 echo "$as_me: error: C compiler cannot create executables" >&2;}
    13591734    { (exit 77); exit 77; }; }
     
    13621737 ac_exeext=$ac_cv_exeext
    13631738-echo "$as_me:1548: result: $ac_file" >&5
    1364 +echo "$as_me:1550: result: $ac_file" >&5
     1739+echo "$as_me:1355: result: $ac_file" >&5
    13651740 echo "${ECHO_T}$ac_file" >&6
    13661741 
     
    13681743 # the compiler is broken, or we cross compile.
    13691744-echo "$as_me:1553: checking whether the C compiler works" >&5
    1370 +echo "$as_me:1555: checking whether the C compiler works" >&5
     1745+echo "$as_me:1360: checking whether the C compiler works" >&5
    13711746 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
    13721747 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
     
    13751750   if { ac_try='./$ac_file'
    13761751-  { (eval echo "$as_me:1559: \"$ac_try\"") >&5
    1377 +  { (eval echo "$as_me:1561: \"$ac_try\"") >&5
     1752+  { (eval echo "$as_me:1366: \"$ac_try\"") >&5
    13781753   (eval $ac_try) 2>&5
    13791754   ac_status=$?
    13801755-  echo "$as_me:1562: \$? = $ac_status" >&5
    1381 +  echo "$as_me:1564: \$? = $ac_status" >&5
     1756+  echo "$as_me:1369: \$? = $ac_status" >&5
    13821757   (exit $ac_status); }; }; then
    13831758     cross_compiling=no
     
    13871762     else
    13881763-       { { echo "$as_me:1569: error: cannot run C compiled programs.
    1389 +       { { echo "$as_me:1571: error: cannot run C compiled programs.
     1764+       { { echo "$as_me:1376: error: cannot run C compiled programs.
    13901765 If you meant to cross compile, use \`--host'." >&5
    13911766 echo "$as_me: error: cannot run C compiled programs.
    13921767 If you meant to cross compile, use \`--host'." >&2;}
    1393 @@ -1574,24 +1576,24 @@
     1768@@ -1574,24 +1381,24 @@
    13941769     fi
    13951770   fi
    13961771 fi
    13971772-echo "$as_me:1577: result: yes" >&5
    1398 +echo "$as_me:1579: result: yes" >&5
     1773+echo "$as_me:1384: result: yes" >&5
    13991774 echo "${ECHO_T}yes" >&6
    14001775 
     
    14041779 # the compiler is broken, or we cross compile.
    14051780-echo "$as_me:1584: checking whether we are cross compiling" >&5
    1406 +echo "$as_me:1586: checking whether we are cross compiling" >&5
     1781+echo "$as_me:1391: checking whether we are cross compiling" >&5
    14071782 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
    14081783-echo "$as_me:1586: result: $cross_compiling" >&5
    1409 +echo "$as_me:1588: result: $cross_compiling" >&5
     1784+echo "$as_me:1393: result: $cross_compiling" >&5
    14101785 echo "${ECHO_T}$cross_compiling" >&6
    14111786 
    14121787-echo "$as_me:1589: checking for executable suffix" >&5
    1413 +echo "$as_me:1591: checking for executable suffix" >&5
     1788+echo "$as_me:1396: checking for executable suffix" >&5
    14141789 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
    14151790-if { (eval echo "$as_me:1591: \"$ac_link\"") >&5
    1416 +if { (eval echo "$as_me:1593: \"$ac_link\"") >&5
     1791+if { (eval echo "$as_me:1398: \"$ac_link\"") >&5
    14171792   (eval $ac_link) 2>&5
    14181793   ac_status=$?
    14191794-  echo "$as_me:1594: \$? = $ac_status" >&5
    1420 +  echo "$as_me:1596: \$? = $ac_status" >&5
     1795+  echo "$as_me:1401: \$? = $ac_status" >&5
    14211796   (exit $ac_status); }; then
    14221797   # If both `conftest.exe' and `conftest' are `present' (well, observable)
    14231798 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
    1424 @@ -1607,25 +1609,25 @@
     1799@@ -1607,25 +1414,25 @@
    14251800   esac
    14261801 done
    14271802 else
    14281803-  { { echo "$as_me:1610: error: cannot compute EXEEXT: cannot compile and link" >&5
    1429 +  { { echo "$as_me:1612: error: cannot compute EXEEXT: cannot compile and link" >&5
     1804+  { { echo "$as_me:1417: error: cannot compute EXEEXT: cannot compile and link" >&5
    14301805 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    14311806    { (exit 1); exit 1; }; }
     
    14341809 rm -f conftest$ac_cv_exeext
    14351810-echo "$as_me:1616: result: $ac_cv_exeext" >&5
    1436 +echo "$as_me:1618: result: $ac_cv_exeext" >&5
     1811+echo "$as_me:1423: result: $ac_cv_exeext" >&5
    14371812 echo "${ECHO_T}$ac_cv_exeext" >&6
    14381813 
     
    14411816 ac_exeext=$EXEEXT
    14421817-echo "$as_me:1622: checking for object suffix" >&5
    1443 +echo "$as_me:1624: checking for object suffix" >&5
     1818+echo "$as_me:1429: checking for object suffix" >&5
    14441819 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
    14451820 if test "${ac_cv_objext+set}" = set; then
     
    14481823   cat >conftest.$ac_ext <<_ACEOF
    14491824-#line 1628 "configure"
    1450 +#line 1630 "configure"
     1825+#line 1435 "configure"
    14511826 #include "confdefs.h"
    14521827 
    14531828 int
    1454 @@ -1637,10 +1639,10 @@
     1829@@ -1637,10 +1444,10 @@
    14551830 }
    14561831 _ACEOF
    14571832 rm -f conftest.o conftest.obj
    14581833-if { (eval echo "$as_me:1640: \"$ac_compile\"") >&5
    1459 +if { (eval echo "$as_me:1642: \"$ac_compile\"") >&5
     1834+if { (eval echo "$as_me:1447: \"$ac_compile\"") >&5
    14601835   (eval $ac_compile) 2>&5
    14611836   ac_status=$?
    14621837-  echo "$as_me:1643: \$? = $ac_status" >&5
    1463 +  echo "$as_me:1645: \$? = $ac_status" >&5
     1838+  echo "$as_me:1450: \$? = $ac_status" >&5
    14641839   (exit $ac_status); }; then
    14651840   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
    14661841   case $ac_file in
    1467 @@ -1652,24 +1654,24 @@
     1842@@ -1652,24 +1459,24 @@
    14681843 else
    14691844   echo "$as_me: failed program was:" >&5
    14701845 cat conftest.$ac_ext >&5
    14711846-{ { echo "$as_me:1655: error: cannot compute OBJEXT: cannot compile" >&5
    1472 +{ { echo "$as_me:1657: error: cannot compute OBJEXT: cannot compile" >&5
     1847+{ { echo "$as_me:1462: error: cannot compute OBJEXT: cannot compile" >&5
    14731848 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    14741849    { (exit 1); exit 1; }; }
     
    14781853 fi
    14791854-echo "$as_me:1662: result: $ac_cv_objext" >&5
    1480 +echo "$as_me:1664: result: $ac_cv_objext" >&5
     1855+echo "$as_me:1469: result: $ac_cv_objext" >&5
    14811856 echo "${ECHO_T}$ac_cv_objext" >&6
    14821857 OBJEXT=$ac_cv_objext
    14831858 ac_objext=$OBJEXT
    14841859-echo "$as_me:1666: checking whether we are using the GNU C compiler" >&5
    1485 +echo "$as_me:1668: checking whether we are using the GNU C compiler" >&5
     1860+echo "$as_me:1473: checking whether we are using the GNU C compiler" >&5
    14861861 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
    14871862 if test "${ac_cv_c_compiler_gnu+set}" = set; then
     
    14901865   cat >conftest.$ac_ext <<_ACEOF
    14911866-#line 1672 "configure"
    1492 +#line 1674 "configure"
     1867+#line 1479 "configure"
    14931868 #include "confdefs.h"
    14941869 
    14951870 int
    1496 @@ -1684,16 +1686,16 @@
     1871@@ -1684,16 +1491,16 @@
    14971872 }
    14981873 _ACEOF
    14991874 rm -f conftest.$ac_objext
    15001875-if { (eval echo "$as_me:1687: \"$ac_compile\"") >&5
    1501 +if { (eval echo "$as_me:1689: \"$ac_compile\"") >&5
     1876+if { (eval echo "$as_me:1494: \"$ac_compile\"") >&5
    15021877   (eval $ac_compile) 2>&5
    15031878   ac_status=$?
    15041879-  echo "$as_me:1690: \$? = $ac_status" >&5
    1505 +  echo "$as_me:1692: \$? = $ac_status" >&5
     1880+  echo "$as_me:1497: \$? = $ac_status" >&5
    15061881   (exit $ac_status); } &&
    15071882          { ac_try='test -s conftest.$ac_objext'
    15081883-  { (eval echo "$as_me:1693: \"$ac_try\"") >&5
    1509 +  { (eval echo "$as_me:1695: \"$ac_try\"") >&5
     1884+  { (eval echo "$as_me:1500: \"$ac_try\"") >&5
    15101885   (eval $ac_try) 2>&5
    15111886   ac_status=$?
    15121887-  echo "$as_me:1696: \$? = $ac_status" >&5
    1513 +  echo "$as_me:1698: \$? = $ac_status" >&5
     1888+  echo "$as_me:1503: \$? = $ac_status" >&5
    15141889   (exit $ac_status); }; }; then
    15151890   ac_compiler_gnu=yes
    15161891 else
    1517 @@ -1705,19 +1707,19 @@
     1892@@ -1705,19 +1512,19 @@
    15181893 ac_cv_c_compiler_gnu=$ac_compiler_gnu
    15191894 
    15201895 fi
    15211896-echo "$as_me:1708: result: $ac_cv_c_compiler_gnu" >&5
    1522 +echo "$as_me:1710: result: $ac_cv_c_compiler_gnu" >&5
     1897+echo "$as_me:1515: result: $ac_cv_c_compiler_gnu" >&5
    15231898 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
    15241899 GCC=`test $ac_compiler_gnu = yes && echo yes`
     
    15271902 CFLAGS="-g"
    15281903-echo "$as_me:1714: checking whether $CC accepts -g" >&5
    1529 +echo "$as_me:1716: checking whether $CC accepts -g" >&5
     1904+echo "$as_me:1521: checking whether $CC accepts -g" >&5
    15301905 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
    15311906 if test "${ac_cv_prog_cc_g+set}" = set; then
     
    15341909   cat >conftest.$ac_ext <<_ACEOF
    15351910-#line 1720 "configure"
    1536 +#line 1722 "configure"
     1911+#line 1527 "configure"
    15371912 #include "confdefs.h"
    15381913 
    15391914 int
    1540 @@ -1729,16 +1731,16 @@
     1915@@ -1729,16 +1536,16 @@
    15411916 }
    15421917 _ACEOF
    15431918 rm -f conftest.$ac_objext
    15441919-if { (eval echo "$as_me:1732: \"$ac_compile\"") >&5
    1545 +if { (eval echo "$as_me:1734: \"$ac_compile\"") >&5
     1920+if { (eval echo "$as_me:1539: \"$ac_compile\"") >&5
    15461921   (eval $ac_compile) 2>&5
    15471922   ac_status=$?
    15481923-  echo "$as_me:1735: \$? = $ac_status" >&5
    1549 +  echo "$as_me:1737: \$? = $ac_status" >&5
     1924+  echo "$as_me:1542: \$? = $ac_status" >&5
    15501925   (exit $ac_status); } &&
    15511926          { ac_try='test -s conftest.$ac_objext'
    15521927-  { (eval echo "$as_me:1738: \"$ac_try\"") >&5
    1553 +  { (eval echo "$as_me:1740: \"$ac_try\"") >&5
     1928+  { (eval echo "$as_me:1545: \"$ac_try\"") >&5
    15541929   (eval $ac_try) 2>&5
    15551930   ac_status=$?
    15561931-  echo "$as_me:1741: \$? = $ac_status" >&5
    1557 +  echo "$as_me:1743: \$? = $ac_status" >&5
     1932+  echo "$as_me:1548: \$? = $ac_status" >&5
    15581933   (exit $ac_status); }; }; then
    15591934   ac_cv_prog_cc_g=yes
    15601935 else
    1561 @@ -1748,7 +1750,7 @@
     1936@@ -1748,7 +1555,7 @@
    15621937 fi
    15631938 rm -f conftest.$ac_objext conftest.$ac_ext
    15641939 fi
    15651940-echo "$as_me:1751: result: $ac_cv_prog_cc_g" >&5
    1566 +echo "$as_me:1753: result: $ac_cv_prog_cc_g" >&5
     1941+echo "$as_me:1558: result: $ac_cv_prog_cc_g" >&5
    15671942 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
    15681943 if test "$ac_test_CFLAGS" = set; then
    15691944   CFLAGS=$ac_save_CFLAGS
    1570 @@ -1775,16 +1777,16 @@
     1945@@ -1775,16 +1582,16 @@
    15711946 #endif
    15721947 _ACEOF
    15731948 rm -f conftest.$ac_objext
    15741949-if { (eval echo "$as_me:1778: \"$ac_compile\"") >&5
    1575 +if { (eval echo "$as_me:1780: \"$ac_compile\"") >&5
     1950+if { (eval echo "$as_me:1585: \"$ac_compile\"") >&5
    15761951   (eval $ac_compile) 2>&5
    15771952   ac_status=$?
    15781953-  echo "$as_me:1781: \$? = $ac_status" >&5
    1579 +  echo "$as_me:1783: \$? = $ac_status" >&5
     1954+  echo "$as_me:1588: \$? = $ac_status" >&5
    15801955   (exit $ac_status); } &&
    15811956          { ac_try='test -s conftest.$ac_objext'
    15821957-  { (eval echo "$as_me:1784: \"$ac_try\"") >&5
    1583 +  { (eval echo "$as_me:1786: \"$ac_try\"") >&5
     1958+  { (eval echo "$as_me:1591: \"$ac_try\"") >&5
    15841959   (eval $ac_try) 2>&5
    15851960   ac_status=$?
    15861961-  echo "$as_me:1787: \$? = $ac_status" >&5
    1587 +  echo "$as_me:1789: \$? = $ac_status" >&5
     1962+  echo "$as_me:1594: \$? = $ac_status" >&5
    15881963   (exit $ac_status); }; }; then
    15891964   for ac_declaration in \
    15901965    ''\
    1591 @@ -1796,7 +1798,7 @@
     1966@@ -1796,7 +1603,7 @@
    15921967    'void exit (int);'
    15931968 do
    15941969   cat >conftest.$ac_ext <<_ACEOF
    15951970-#line 1799 "configure"
    1596 +#line 1801 "configure"
     1971+#line 1606 "configure"
    15971972 #include "confdefs.h"
    15981973 #include <stdlib.h>
    15991974 $ac_declaration
    1600 @@ -1809,16 +1811,16 @@
     1975@@ -1809,16 +1616,16 @@
    16011976 }
    16021977 _ACEOF
    16031978 rm -f conftest.$ac_objext
    16041979-if { (eval echo "$as_me:1812: \"$ac_compile\"") >&5
    1605 +if { (eval echo "$as_me:1814: \"$ac_compile\"") >&5
     1980+if { (eval echo "$as_me:1619: \"$ac_compile\"") >&5
    16061981   (eval $ac_compile) 2>&5
    16071982   ac_status=$?
    16081983-  echo "$as_me:1815: \$? = $ac_status" >&5
    1609 +  echo "$as_me:1817: \$? = $ac_status" >&5
     1984+  echo "$as_me:1622: \$? = $ac_status" >&5
    16101985   (exit $ac_status); } &&
    16111986          { ac_try='test -s conftest.$ac_objext'
    16121987-  { (eval echo "$as_me:1818: \"$ac_try\"") >&5
    1613 +  { (eval echo "$as_me:1820: \"$ac_try\"") >&5
     1988+  { (eval echo "$as_me:1625: \"$ac_try\"") >&5
    16141989   (eval $ac_try) 2>&5
    16151990   ac_status=$?
    16161991-  echo "$as_me:1821: \$? = $ac_status" >&5
    1617 +  echo "$as_me:1823: \$? = $ac_status" >&5
     1992+  echo "$as_me:1628: \$? = $ac_status" >&5
    16181993   (exit $ac_status); }; }; then
    16191994   :
    16201995 else
    1621 @@ -1828,7 +1830,7 @@
     1996@@ -1828,7 +1635,7 @@
    16221997 fi
    16231998 rm -f conftest.$ac_objext conftest.$ac_ext
    16241999   cat >conftest.$ac_ext <<_ACEOF
    16252000-#line 1831 "configure"
    1626 +#line 1833 "configure"
     2001+#line 1638 "configure"
    16272002 #include "confdefs.h"
    16282003 $ac_declaration
    16292004 int
    1630 @@ -1840,16 +1842,16 @@
     2005@@ -1840,16 +1647,16 @@
    16312006 }
    16322007 _ACEOF
    16332008 rm -f conftest.$ac_objext
    16342009-if { (eval echo "$as_me:1843: \"$ac_compile\"") >&5
    1635 +if { (eval echo "$as_me:1845: \"$ac_compile\"") >&5
     2010+if { (eval echo "$as_me:1650: \"$ac_compile\"") >&5
    16362011   (eval $ac_compile) 2>&5
    16372012   ac_status=$?
    16382013-  echo "$as_me:1846: \$? = $ac_status" >&5
    1639 +  echo "$as_me:1848: \$? = $ac_status" >&5
     2014+  echo "$as_me:1653: \$? = $ac_status" >&5
    16402015   (exit $ac_status); } &&
    16412016          { ac_try='test -s conftest.$ac_objext'
    16422017-  { (eval echo "$as_me:1849: \"$ac_try\"") >&5
    1643 +  { (eval echo "$as_me:1851: \"$ac_try\"") >&5
     2018+  { (eval echo "$as_me:1656: \"$ac_try\"") >&5
    16442019   (eval $ac_try) 2>&5
    16452020   ac_status=$?
    16462021-  echo "$as_me:1852: \$? = $ac_status" >&5
    1647 +  echo "$as_me:1854: \$? = $ac_status" >&5
     2022+  echo "$as_me:1659: \$? = $ac_status" >&5
    16482023   (exit $ac_status); }; }; then
    16492024   break
    16502025 else
    1651 @@ -1879,11 +1881,11 @@
     2026@@ -1879,11 +1686,11 @@
    16522027 
    16532028 GCC_VERSION=none
    16542029 if test "$GCC" = yes ; then
    16552030-       echo "$as_me:1882: checking version of $CC" >&5
    1656 +       echo "$as_me:1884: checking version of $CC" >&5
     2031+       echo "$as_me:1689: checking version of $CC" >&5
    16572032 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
    16582033        GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
    16592034        test -z "$GCC_VERSION" && GCC_VERSION=unknown
    16602035-       echo "$as_me:1886: result: $GCC_VERSION" >&5
    1661 +       echo "$as_me:1888: result: $GCC_VERSION" >&5
     2036+       echo "$as_me:1693: result: $GCC_VERSION" >&5
    16622037 echo "${ECHO_T}$GCC_VERSION" >&6
    16632038 fi
    16642039 
    1665 @@ -1893,7 +1895,7 @@
     2040@@ -1893,7 +1700,7 @@
    16662041 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    16672042 ac_compiler_gnu=$ac_cv_c_compiler_gnu
    16682043 ac_main_return=return
    16692044-echo "$as_me:1896: checking how to run the C preprocessor" >&5
    1670 +echo "$as_me:1898: checking how to run the C preprocessor" >&5
     2045+echo "$as_me:1703: checking how to run the C preprocessor" >&5
    16712046 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
    16722047 # On Suns, sometimes $CPP names a directory.
    16732048 if test -n "$CPP" && test -d "$CPP"; then
    1674 @@ -1914,18 +1916,18 @@
     2049@@ -1914,18 +1721,18 @@
    16752050   # On the NeXT, cc -E runs the code through the compiler's parser,
    16762051   # not just through cpp. "Syntax error" is here to catch this case.
    16772052   cat >conftest.$ac_ext <<_ACEOF
    16782053-#line 1917 "configure"
    1679 +#line 1919 "configure"
     2054+#line 1724 "configure"
    16802055 #include "confdefs.h"
    16812056 #include <assert.h>
     
    16832058 _ACEOF
    16842059-if { (eval echo "$as_me:1922: \"$ac_cpp conftest.$ac_ext\"") >&5
    1685 +if { (eval echo "$as_me:1924: \"$ac_cpp conftest.$ac_ext\"") >&5
     2060+if { (eval echo "$as_me:1729: \"$ac_cpp conftest.$ac_ext\"") >&5
    16862061   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    16872062   ac_status=$?
     
    16902065   cat conftest.err >&5
    16912066-  echo "$as_me:1928: \$? = $ac_status" >&5
    1692 +  echo "$as_me:1930: \$? = $ac_status" >&5
     2067+  echo "$as_me:1735: \$? = $ac_status" >&5
    16932068   (exit $ac_status); } >/dev/null; then
    16942069   if test -s conftest.err; then
    16952070     ac_cpp_err=$ac_c_preproc_warn_flag
    1696 @@ -1948,17 +1950,17 @@
     2071@@ -1948,17 +1755,17 @@
    16972072   # OK, works on sane cases.  Now check whether non-existent headers
    16982073   # can be detected and how.
    16992074   cat >conftest.$ac_ext <<_ACEOF
    17002075-#line 1951 "configure"
    1701 +#line 1953 "configure"
     2076+#line 1758 "configure"
    17022077 #include "confdefs.h"
    17032078 #include <ac_nonexistent.h>
    17042079 _ACEOF
    17052080-if { (eval echo "$as_me:1955: \"$ac_cpp conftest.$ac_ext\"") >&5
    1706 +if { (eval echo "$as_me:1957: \"$ac_cpp conftest.$ac_ext\"") >&5
     2081+if { (eval echo "$as_me:1762: \"$ac_cpp conftest.$ac_ext\"") >&5
    17072082   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    17082083   ac_status=$?
     
    17112086   cat conftest.err >&5
    17122087-  echo "$as_me:1961: \$? = $ac_status" >&5
    1713 +  echo "$as_me:1963: \$? = $ac_status" >&5
     2088+  echo "$as_me:1768: \$? = $ac_status" >&5
    17142089   (exit $ac_status); } >/dev/null; then
    17152090   if test -s conftest.err; then
    17162091     ac_cpp_err=$ac_c_preproc_warn_flag
    1717 @@ -1995,7 +1997,7 @@
     2092@@ -1995,7 +1802,7 @@
    17182093 else
    17192094   ac_cv_prog_CPP=$CPP
    17202095 fi
    17212096-echo "$as_me:1998: result: $CPP" >&5
    1722 +echo "$as_me:2000: result: $CPP" >&5
     2097+echo "$as_me:1805: result: $CPP" >&5
    17232098 echo "${ECHO_T}$CPP" >&6
    17242099 ac_preproc_ok=false
    17252100 for ac_c_preproc_warn_flag in '' yes
    1726 @@ -2005,18 +2007,18 @@
     2101@@ -2005,18 +1812,18 @@
    17272102   # On the NeXT, cc -E runs the code through the compiler's parser,
    17282103   # not just through cpp. "Syntax error" is here to catch this case.
    17292104   cat >conftest.$ac_ext <<_ACEOF
    17302105-#line 2008 "configure"
    1731 +#line 2010 "configure"
     2106+#line 1815 "configure"
    17322107 #include "confdefs.h"
    17332108 #include <assert.h>
     
    17352110 _ACEOF
    17362111-if { (eval echo "$as_me:2013: \"$ac_cpp conftest.$ac_ext\"") >&5
    1737 +if { (eval echo "$as_me:2015: \"$ac_cpp conftest.$ac_ext\"") >&5
     2112+if { (eval echo "$as_me:1820: \"$ac_cpp conftest.$ac_ext\"") >&5
    17382113   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    17392114   ac_status=$?
     
    17422117   cat conftest.err >&5
    17432118-  echo "$as_me:2019: \$? = $ac_status" >&5
    1744 +  echo "$as_me:2021: \$? = $ac_status" >&5
     2119+  echo "$as_me:1826: \$? = $ac_status" >&5
    17452120   (exit $ac_status); } >/dev/null; then
    17462121   if test -s conftest.err; then
    17472122     ac_cpp_err=$ac_c_preproc_warn_flag
    1748 @@ -2039,17 +2041,17 @@
     2123@@ -2039,17 +1846,17 @@
    17492124   # OK, works on sane cases.  Now check whether non-existent headers
    17502125   # can be detected and how.
    17512126   cat >conftest.$ac_ext <<_ACEOF
    17522127-#line 2042 "configure"
    1753 +#line 2044 "configure"
     2128+#line 1849 "configure"
    17542129 #include "confdefs.h"
    17552130 #include <ac_nonexistent.h>
    17562131 _ACEOF
    17572132-if { (eval echo "$as_me:2046: \"$ac_cpp conftest.$ac_ext\"") >&5
    1758 +if { (eval echo "$as_me:2048: \"$ac_cpp conftest.$ac_ext\"") >&5
     2133+if { (eval echo "$as_me:1853: \"$ac_cpp conftest.$ac_ext\"") >&5
    17592134   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    17602135   ac_status=$?
     
    17632138   cat conftest.err >&5
    17642139-  echo "$as_me:2052: \$? = $ac_status" >&5
    1765 +  echo "$as_me:2054: \$? = $ac_status" >&5
     2140+  echo "$as_me:1859: \$? = $ac_status" >&5
    17662141   (exit $ac_status); } >/dev/null; then
    17672142   if test -s conftest.err; then
    17682143     ac_cpp_err=$ac_c_preproc_warn_flag
    1769 @@ -2077,7 +2079,7 @@
     2144@@ -2077,7 +1884,7 @@
    17702145 if $ac_preproc_ok; then
    17712146   :
    17722147 else
    17732148-  { { echo "$as_me:2080: error: C preprocessor \"$CPP\" fails sanity check" >&5
    1774 +  { { echo "$as_me:2082: error: C preprocessor \"$CPP\" fails sanity check" >&5
     2149+  { { echo "$as_me:1887: error: C preprocessor \"$CPP\" fails sanity check" >&5
    17752150 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    17762151    { (exit 1); exit 1; }; }
    17772152 fi
    1778 @@ -2090,14 +2092,14 @@
     2153@@ -2090,14 +1897,14 @@
    17792154 ac_main_return=return
    17802155 
    17812156 if test $ac_cv_c_compiler_gnu = yes; then
    17822157-    echo "$as_me:2093: checking whether $CC needs -traditional" >&5
    1783 +    echo "$as_me:2095: checking whether $CC needs -traditional" >&5
     2158+    echo "$as_me:1900: checking whether $CC needs -traditional" >&5
    17842159 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
    17852160 if test "${ac_cv_prog_gcc_traditional+set}" = set; then
     
    17892164   cat >conftest.$ac_ext <<_ACEOF
    17902165-#line 2100 "configure"
    1791 +#line 2102 "configure"
     2166+#line 1907 "configure"
    17922167 #include "confdefs.h"
    17932168 #include <sgtty.h>
    17942169 int Autoconf = TIOCGETP;
    1795 @@ -2112,7 +2114,7 @@
     2170@@ -2112,7 +1919,7 @@
    17962171 
    17972172   if test $ac_cv_prog_gcc_traditional = no; then
    17982173     cat >conftest.$ac_ext <<_ACEOF
    17992174-#line 2115 "configure"
    1800 +#line 2117 "configure"
     2175+#line 1922 "configure"
    18012176 #include "confdefs.h"
    18022177 #include <termio.h>
    18032178 int Autoconf = TCGETA;
    1804 @@ -2125,14 +2127,14 @@
     2179@@ -2125,14 +1932,14 @@
    18052180 
    18062181   fi
    18072182 fi
    18082183-echo "$as_me:2128: result: $ac_cv_prog_gcc_traditional" >&5
    1809 +echo "$as_me:2130: result: $ac_cv_prog_gcc_traditional" >&5
     2184+echo "$as_me:1935: result: $ac_cv_prog_gcc_traditional" >&5
    18102185 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
    18112186   if test $ac_cv_prog_gcc_traditional = yes; then
     
    18152190 
    18162191-echo "$as_me:2135: checking whether $CC understands -c and -o together" >&5
    1817 +echo "$as_me:2137: checking whether $CC understands -c and -o together" >&5
     2192+echo "$as_me:1942: checking whether $CC understands -c and -o together" >&5
    18182193 echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6
    18192194 if test "${cf_cv_prog_CC_c_o+set}" = set; then
    18202195   echo $ECHO_N "(cached) $ECHO_C" >&6
    1821 @@ -2148,15 +2150,15 @@
     2196@@ -2148,15 +1955,15 @@
    18222197 # We do the test twice because some compilers refuse to overwrite an
    18232198 # existing .o file with -o, though they will create one.
    18242199 ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
    18252200-if { (eval echo "$as_me:2151: \"$ac_try\"") >&5
    1826 +if { (eval echo "$as_me:2153: \"$ac_try\"") >&5
     2201+if { (eval echo "$as_me:1958: \"$ac_try\"") >&5
    18272202   (eval $ac_try) 2>&5
    18282203   ac_status=$?
    18292204-  echo "$as_me:2154: \$? = $ac_status" >&5
    1830 +  echo "$as_me:2156: \$? = $ac_status" >&5
     2205+  echo "$as_me:1961: \$? = $ac_status" >&5
    18312206   (exit $ac_status); } &&
    18322207-  test -f conftest2.$ac_objext && { (eval echo "$as_me:2156: \"$ac_try\"") >&5
    1833 +  test -f conftest2.$ac_objext && { (eval echo "$as_me:2158: \"$ac_try\"") >&5
     2208+  test -f conftest2.$ac_objext && { (eval echo "$as_me:1963: \"$ac_try\"") >&5
    18342209   (eval $ac_try) 2>&5
    18352210   ac_status=$?
    18362211-  echo "$as_me:2159: \$? = $ac_status" >&5
    1837 +  echo "$as_me:2161: \$? = $ac_status" >&5
     2212+  echo "$as_me:1966: \$? = $ac_status" >&5
    18382213   (exit $ac_status); };
    18392214 then
    18402215   eval cf_cv_prog_CC_c_o=yes
    1841 @@ -2167,19 +2169,19 @@
     2216@@ -2167,19 +1974,19 @@
    18422217 
    18432218 fi
    18442219 if test $cf_cv_prog_CC_c_o = yes; then
    18452220-  echo "$as_me:2170: result: yes" >&5
    1846 +  echo "$as_me:2172: result: yes" >&5
     2221+  echo "$as_me:1977: result: yes" >&5
    18472222 echo "${ECHO_T}yes" >&6
    18482223 else
    18492224-  echo "$as_me:2173: result: no" >&5
    1850 +  echo "$as_me:2175: result: no" >&5
     2225+  echo "$as_me:1980: result: no" >&5
    18512226 echo "${ECHO_T}no" >&6
    18522227 fi
    18532228 
    18542229-echo "$as_me:2177: checking for POSIXized ISC" >&5
    1855 +echo "$as_me:2179: checking for POSIXized ISC" >&5
     2230+echo "$as_me:1984: checking for POSIXized ISC" >&5
    18562231 echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
    18572232 if test -d /etc/conf/kconfig.d &&
     
    18592234 then
    18602235-  echo "$as_me:2182: result: yes" >&5
    1861 +  echo "$as_me:2184: result: yes" >&5
     2236+  echo "$as_me:1989: result: yes" >&5
    18622237 echo "${ECHO_T}yes" >&6
    18632238   ISC=yes # If later tests want to check for ISC.
    18642239 
    1865 @@ -2193,12 +2195,115 @@
     2240@@ -2193,12 +2000,115 @@
    18662241     CC="$CC -Xp"
    18672242   fi
    18682243 else
    18692244-  echo "$as_me:2196: result: no" >&5
    1870 +  echo "$as_me:2198: result: no" >&5
     2245+  echo "$as_me:2003: result: no" >&5
    18712246 echo "${ECHO_T}no" >&6
    18722247   ISC=
     
    18802255+# into CC.  This will not help with broken scripts that wrap the compiler with
    18812256+# options, but eliminates a more common category of user confusion.
    1882 +echo "$as_me:2209: checking \$CC variable" >&5
     2257+echo "$as_me:2014: checking \$CC variable" >&5
    18832258+echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
    18842259+case "$CC" in #(vi
    18852260+*[\ \  ]-[IUD]*)
    1886 +       echo "$as_me:2213: result: broken" >&5
     2261+       echo "$as_me:2018: result: broken" >&5
    18872262+echo "${ECHO_T}broken" >&6
    1888 +       { echo "$as_me:2215: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
     2263+       { echo "$as_me:2020: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
    18892264+echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
    18902265+       # humor him...
     
    19722347+       ;;
    19732348+*)
    1974 +       echo "$as_me:2301: result: ok" >&5
     2349+       echo "$as_me:2106: result: ok" >&5
    19752350+echo "${ECHO_T}ok" >&6
    19762351+       ;;
    19772352+esac
    19782353+
    1979 +echo "$as_me:2306: checking for ${CC:-cc} option to accept ANSI C" >&5
     2354+echo "$as_me:2111: checking for ${CC:-cc} option to accept ANSI C" >&5
    19802355 echo $ECHO_N "checking for ${CC:-cc} option to accept ANSI C... $ECHO_C" >&6
    19812356 if test "${cf_cv_ansi_cc+set}" = set; then
    19822357   echo $ECHO_N "(cached) $ECHO_C" >&6
    1983 @@ -2302,7 +2407,7 @@
     2358@@ -2302,7 +2212,7 @@
    19842359 fi
    19852360 
    19862361        cat >conftest.$ac_ext <<_ACEOF
    19872362-#line 2305 "configure"
    1988 +#line 2410 "configure"
     2363+#line 2215 "configure"
    19892364 #include "confdefs.h"
    19902365 
    19912366 #ifndef CC_HAS_PROTOS
    1992 @@ -2323,16 +2428,16 @@
     2367@@ -2323,16 +2233,16 @@
    19932368 }
    19942369 _ACEOF
    19952370 rm -f conftest.$ac_objext
    19962371-if { (eval echo "$as_me:2326: \"$ac_compile\"") >&5
    1997 +if { (eval echo "$as_me:2431: \"$ac_compile\"") >&5
     2372+if { (eval echo "$as_me:2236: \"$ac_compile\"") >&5
    19982373   (eval $ac_compile) 2>&5
    19992374   ac_status=$?
    20002375-  echo "$as_me:2329: \$? = $ac_status" >&5
    2001 +  echo "$as_me:2434: \$? = $ac_status" >&5
     2376+  echo "$as_me:2239: \$? = $ac_status" >&5
    20022377   (exit $ac_status); } &&
    20032378          { ac_try='test -s conftest.$ac_objext'
    20042379-  { (eval echo "$as_me:2332: \"$ac_try\"") >&5
    2005 +  { (eval echo "$as_me:2437: \"$ac_try\"") >&5
     2380+  { (eval echo "$as_me:2242: \"$ac_try\"") >&5
    20062381   (eval $ac_try) 2>&5
    20072382   ac_status=$?
    20082383-  echo "$as_me:2335: \$? = $ac_status" >&5
    2009 +  echo "$as_me:2440: \$? = $ac_status" >&5
     2384+  echo "$as_me:2245: \$? = $ac_status" >&5
    20102385   (exit $ac_status); }; }; then
    20112386   cf_cv_ansi_cc="$cf_arg"; break
    20122387 else
    2013 @@ -2345,7 +2450,7 @@
     2388@@ -2345,7 +2255,7 @@
    20142389 CPPFLAGS="$cf_save_CPPFLAGS"
    20152390 
    20162391 fi
    20172392-echo "$as_me:2348: result: $cf_cv_ansi_cc" >&5
    2018 +echo "$as_me:2453: result: $cf_cv_ansi_cc" >&5
     2393+echo "$as_me:2258: result: $cf_cv_ansi_cc" >&5
    20192394 echo "${ECHO_T}$cf_cv_ansi_cc" >&6
    20202395 
    20212396 if test "$cf_cv_ansi_cc" != "no"; then
    2022 @@ -2438,7 +2543,7 @@
     2397@@ -2438,7 +2348,7 @@
    20232398 fi
    20242399 
    20252400 if test "$cf_cv_ansi_cc" = "no"; then
    20262401-       { { echo "$as_me:2441: error: Your compiler does not appear to recognize prototypes.
    2027 +       { { echo "$as_me:2546: error: Your compiler does not appear to recognize prototypes.
     2402+       { { echo "$as_me:2351: error: Your compiler does not appear to recognize prototypes.
    20282403 You have the following choices:
    20292404        a. adjust your compiler options
    20302405        b. get an up-to-date compiler
    2031 @@ -2485,7 +2590,7 @@
     2406@@ -2485,7 +2395,7 @@
    20322407 do
    20332408   # Extract the first word of "$ac_prog", so it can be a program name with args.
    20342409 set dummy $ac_prog; ac_word=$2
    20352410-echo "$as_me:2488: checking for $ac_word" >&5
    2036 +echo "$as_me:2593: checking for $ac_word" >&5
     2411+echo "$as_me:2398: checking for $ac_word" >&5
    20372412 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    20382413 if test "${ac_cv_prog_AWK+set}" = set; then
    20392414   echo $ECHO_N "(cached) $ECHO_C" >&6
    2040 @@ -2500,7 +2605,7 @@
     2415@@ -2500,7 +2410,7 @@
    20412416   test -z "$ac_dir" && ac_dir=.
    20422417   $as_executable_p "$ac_dir/$ac_word" || continue
    20432418 ac_cv_prog_AWK="$ac_prog"
    20442419-echo "$as_me:2503: found $ac_dir/$ac_word" >&5
    2045 +echo "$as_me:2608: found $ac_dir/$ac_word" >&5
     2420+echo "$as_me:2413: found $ac_dir/$ac_word" >&5
    20462421 break
    20472422 done
    20482423 
    2049 @@ -2508,21 +2613,21 @@
     2424@@ -2508,21 +2418,21 @@
    20502425 fi
    20512426 AWK=$ac_cv_prog_AWK
    20522427 if test -n "$AWK"; then
    20532428-  echo "$as_me:2511: result: $AWK" >&5
    2054 +  echo "$as_me:2616: result: $AWK" >&5
     2429+  echo "$as_me:2421: result: $AWK" >&5
    20552430 echo "${ECHO_T}$AWK" >&6
    20562431 else
    20572432-  echo "$as_me:2514: result: no" >&5
    2058 +  echo "$as_me:2619: result: no" >&5
     2433+  echo "$as_me:2424: result: no" >&5
    20592434 echo "${ECHO_T}no" >&6
    20602435 fi
     
    20642439 
    20652440-test -z "$AWK" && { { echo "$as_me:2521: error: No awk program found" >&5
    2066 +test -z "$AWK" && { { echo "$as_me:2626: error: No awk program found" >&5
     2441+test -z "$AWK" && { { echo "$as_me:2431: error: No awk program found" >&5
    20672442 echo "$as_me: error: No awk program found" >&2;}
    20682443    { (exit 1); exit 1; }; }
    20692444 
    20702445-echo "$as_me:2525: checking for egrep" >&5
    2071 +echo "$as_me:2630: checking for egrep" >&5
     2446+echo "$as_me:2435: checking for egrep" >&5
    20722447 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
    20732448 if test "${ac_cv_prog_egrep+set}" = set; then
    20742449   echo $ECHO_N "(cached) $ECHO_C" >&6
    2075 @@ -2532,11 +2637,11 @@
     2450@@ -2532,11 +2442,11 @@
    20762451     else ac_cv_prog_egrep='egrep'
    20772452     fi
    20782453 fi
    20792454-echo "$as_me:2535: result: $ac_cv_prog_egrep" >&5
    2080 +echo "$as_me:2640: result: $ac_cv_prog_egrep" >&5
     2455+echo "$as_me:2445: result: $ac_cv_prog_egrep" >&5
    20812456 echo "${ECHO_T}$ac_cv_prog_egrep" >&6
    20822457  EGREP=$ac_cv_prog_egrep
    20832458 
    20842459-test -z "$EGREP" && { { echo "$as_me:2539: error: No egrep program found" >&5
    2085 +test -z "$EGREP" && { { echo "$as_me:2644: error: No egrep program found" >&5
     2460+test -z "$EGREP" && { { echo "$as_me:2449: error: No egrep program found" >&5
    20862461 echo "$as_me: error: No egrep program found" >&2;}
    20872462    { (exit 1); exit 1; }; }
    20882463 
    2089 @@ -2552,7 +2657,7 @@
     2464@@ -2552,7 +2462,7 @@
    20902465 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
    20912466 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
    20922467 # ./install, which can be erroneously created by make from ./install.sh.
    20932468-echo "$as_me:2555: checking for a BSD compatible install" >&5
    2094 +echo "$as_me:2660: checking for a BSD compatible install" >&5
     2469+echo "$as_me:2465: checking for a BSD compatible install" >&5
    20952470 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
    20962471 if test -z "$INSTALL"; then
    20972472 if test "${ac_cv_path_install+set}" = set; then
    2098 @@ -2601,7 +2706,7 @@
     2473@@ -2601,7 +2511,7 @@
    20992474     INSTALL=$ac_install_sh
    21002475   fi
    21012476 fi
    21022477-echo "$as_me:2604: result: $INSTALL" >&5
    2103 +echo "$as_me:2709: result: $INSTALL" >&5
     2478+echo "$as_me:2514: result: $INSTALL" >&5
    21042479 echo "${ECHO_T}$INSTALL" >&6
    21052480 
    21062481 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
    2107 @@ -2612,18 +2717,18 @@
     2482@@ -2612,18 +2522,18 @@
    21082483 
    21092484 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
    21102485 
    21112486-echo "$as_me:2615: checking whether ln -s works" >&5
    2112 +echo "$as_me:2720: checking whether ln -s works" >&5
     2487+echo "$as_me:2525: checking whether ln -s works" >&5
    21132488 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
    21142489 LN_S=$as_ln_s
    21152490 if test "$LN_S" = "ln -s"; then
    21162491-  echo "$as_me:2619: result: yes" >&5
    2117 +  echo "$as_me:2724: result: yes" >&5
     2492+  echo "$as_me:2529: result: yes" >&5
    21182493 echo "${ECHO_T}yes" >&6
    21192494 else
    21202495-  echo "$as_me:2622: result: no, using $LN_S" >&5
    2121 +  echo "$as_me:2727: result: no, using $LN_S" >&5
     2496+  echo "$as_me:2532: result: no, using $LN_S" >&5
    21222497 echo "${ECHO_T}no, using $LN_S" >&6
    21232498 fi
    21242499 
    21252500-echo "$as_me:2626: checking if $LN_S -f options work" >&5
    2126 +echo "$as_me:2731: checking if $LN_S -f options work" >&5
     2501+echo "$as_me:2536: checking if $LN_S -f options work" >&5
    21272502 echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6
    21282503 
    21292504 rm -f conf$$.src conf$$dst
    2130 @@ -2635,12 +2740,12 @@
     2505@@ -2635,12 +2545,12 @@
    21312506        cf_prog_ln_sf=no
    21322507 fi
    21332508 rm -f conf$$.dst conf$$src
    21342509-echo "$as_me:2638: result: $cf_prog_ln_sf" >&5
    2135 +echo "$as_me:2743: result: $cf_prog_ln_sf" >&5
     2510+echo "$as_me:2548: result: $cf_prog_ln_sf" >&5
    21362511 echo "${ECHO_T}$cf_prog_ln_sf" >&6
    21372512 
     
    21392514 
    21402515-echo "$as_me:2643: checking for long file names" >&5
    2141 +echo "$as_me:2748: checking for long file names" >&5
     2516+echo "$as_me:2553: checking for long file names" >&5
    21422517 echo $ECHO_N "checking for long file names... $ECHO_C" >&6
    21432518 if test "${ac_cv_sys_long_file_names+set}" = set; then
    21442519   echo $ECHO_N "(cached) $ECHO_C" >&6
    2145 @@ -2679,7 +2784,7 @@
     2520@@ -2679,7 +2589,7 @@
    21462521   rm -rf $ac_xdir 2>/dev/null
    21472522 done
    21482523 fi
    21492524-echo "$as_me:2682: result: $ac_cv_sys_long_file_names" >&5
    2150 +echo "$as_me:2787: result: $ac_cv_sys_long_file_names" >&5
     2525+echo "$as_me:2592: result: $ac_cv_sys_long_file_names" >&5
    21512526 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
    21522527 if test $ac_cv_sys_long_file_names = yes; then
    21532528 
    2154 @@ -2691,7 +2796,7 @@
     2529@@ -2691,7 +2601,7 @@
    21552530 
    21562531 # if we find pkg-config, check if we should install the ".pc" files.
    21572532 
    21582533-echo "$as_me:2694: checking if you want to use pkg-config" >&5
    2159 +echo "$as_me:2799: checking if you want to use pkg-config" >&5
     2534+echo "$as_me:2604: checking if you want to use pkg-config" >&5
    21602535 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
    21612536 
    21622537 # Check whether --with-pkg-config or --without-pkg-config was given.
    2163 @@ -2701,7 +2806,7 @@
     2538@@ -2701,7 +2611,7 @@
    21642539 else
    21652540   cf_pkg_config=yes
    21662541 fi;
    21672542-echo "$as_me:2704: result: $cf_pkg_config" >&5
    2168 +echo "$as_me:2809: result: $cf_pkg_config" >&5
     2543+echo "$as_me:2614: result: $cf_pkg_config" >&5
    21692544 echo "${ECHO_T}$cf_pkg_config" >&6
    21702545 
    21712546 case $cf_pkg_config in #(vi
    2172 @@ -2709,10 +2814,11 @@
     2547@@ -2709,10 +2619,11 @@
    21732548        PKG_CONFIG=none
    21742549        ;;
     
    21802555 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
    21812556-echo "$as_me:2715: checking for $ac_word" >&5
    2182 +echo "$as_me:2821: checking for $ac_word" >&5
     2557+echo "$as_me:2626: checking for $ac_word" >&5
    21832558 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    21842559 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
    21852560   echo $ECHO_N "(cached) $ECHO_C" >&6
    2186 @@ -2729,7 +2835,7 @@
     2561@@ -2729,7 +2640,7 @@
    21872562   test -z "$ac_dir" && ac_dir=.
    21882563   if $as_executable_p "$ac_dir/$ac_word"; then
    21892564    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
    21902565-   echo "$as_me:2732: found $ac_dir/$ac_word" >&5
    2191 +   echo "$as_me:2838: found $ac_dir/$ac_word" >&5
     2566+   echo "$as_me:2643: found $ac_dir/$ac_word" >&5
    21922567    break
    21932568 fi
    21942569 done
    2195 @@ -2740,10 +2846,10 @@
     2570@@ -2740,10 +2651,10 @@
    21962571 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
    21972572 
    21982573 if test -n "$PKG_CONFIG"; then
    21992574-  echo "$as_me:2743: result: $PKG_CONFIG" >&5
    2200 +  echo "$as_me:2849: result: $PKG_CONFIG" >&5
     2575+  echo "$as_me:2654: result: $PKG_CONFIG" >&5
    22012576 echo "${ECHO_T}$PKG_CONFIG" >&6
    22022577 else
    22032578-  echo "$as_me:2746: result: no" >&5
    2204 +  echo "$as_me:2852: result: no" >&5
     2579+  echo "$as_me:2657: result: no" >&5
    22052580 echo "${ECHO_T}no" >&6
    22062581 fi
    22072582 
    2208 @@ -2752,7 +2858,7 @@
     2583@@ -2752,7 +2663,7 @@
    22092584   ac_pt_PKG_CONFIG=$PKG_CONFIG
    22102585   # Extract the first word of "pkg-config", so it can be a program name with args.
    22112586 set dummy pkg-config; ac_word=$2
    22122587-echo "$as_me:2755: checking for $ac_word" >&5
    2213 +echo "$as_me:2861: checking for $ac_word" >&5
     2588+echo "$as_me:2666: checking for $ac_word" >&5
    22142589 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    22152590 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
    22162591   echo $ECHO_N "(cached) $ECHO_C" >&6
    2217 @@ -2769,7 +2875,7 @@
     2592@@ -2769,7 +2680,7 @@
    22182593   test -z "$ac_dir" && ac_dir=.
    22192594   if $as_executable_p "$ac_dir/$ac_word"; then
    22202595    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
    22212596-   echo "$as_me:2772: found $ac_dir/$ac_word" >&5
    2222 +   echo "$as_me:2878: found $ac_dir/$ac_word" >&5
     2597+   echo "$as_me:2683: found $ac_dir/$ac_word" >&5
    22232598    break
    22242599 fi
    22252600 done
    2226 @@ -2781,10 +2887,10 @@
     2601@@ -2781,10 +2692,10 @@
    22272602 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
    22282603 
    22292604 if test -n "$ac_pt_PKG_CONFIG"; then
    22302605-  echo "$as_me:2784: result: $ac_pt_PKG_CONFIG" >&5
    2231 +  echo "$as_me:2890: result: $ac_pt_PKG_CONFIG" >&5
     2606+  echo "$as_me:2695: result: $ac_pt_PKG_CONFIG" >&5
    22322607 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
    22332608 else
    22342609-  echo "$as_me:2787: result: no" >&5
    2235 +  echo "$as_me:2893: result: no" >&5
     2610+  echo "$as_me:2698: result: no" >&5
    22362611 echo "${ECHO_T}no" >&6
    22372612 fi
    22382613 
    2239 @@ -2827,7 +2933,7 @@
     2614@@ -2815,7 +2726,7 @@
     2615   ;;
     2616 .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
     2617   ;;
     2618-.\${*prefix}*) #(vi
     2619+.\${*prefix}*|.\${*dir}*) #(vi
     2620   eval PKG_CONFIG="$PKG_CONFIG"
     2621   case ".$PKG_CONFIG" in #(vi
     2622   .NONE/*)
     2623@@ -2827,7 +2738,7 @@
    22402624   PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
    22412625   ;;
    22422626 *)
    22432627-  { { echo "$as_me:2830: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
    2244 +  { { echo "$as_me:2936: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
     2628+  { { echo "$as_me:2741: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
    22452629 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
    22462630    { (exit 1); exit 1; }; }
    22472631   ;;
    2248 @@ -2836,15 +2942,51 @@
     2632@@ -2836,35 +2747,100 @@
    22492633 fi
    22502634 
     
    22522636-       echo "$as_me:2839: checking if we should install .pc files for $PKG_CONFIG" >&5
    22532637-echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6
    2254 +       echo "$as_me:2945: checking for $PKG_CONFIG library directory" >&5
     2638+       echo "$as_me:2750: checking for $PKG_CONFIG library directory" >&5
    22552639+echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
    22562640 
     
    22602644-       fi
    22612645-       PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'`
     2646-       if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
     2647-
     2648-# Check whether --enable-pc-files or --disable-pc-files was given.
     2649-if test "${enable_pc_files+set}" = set; then
     2650-  enableval="$enable_pc_files"
     2651-  enable_pc_files=$enableval
    22622652+# Check whether --with-pkg-config-libdir or --without-pkg-config-libdir was given.
    22632653+if test "${with_pkg_config_libdir+set}" = set; then
    22642654+  withval="$with_pkg_config_libdir"
    22652655+  PKG_CONFIG_LIBDIR=$withval
    2266 +else
     2656 else
     2657-  enable_pc_files=no
    22672658+  PKG_CONFIG_LIBDIR=yes
    2268 +fi;
    2269 +
     2659 fi;
     2660-               echo "$as_me:2856: result: $enable_pc_files" >&5
     2661-echo "${ECHO_T}$enable_pc_files" >&6
     2662-       else
     2663-               echo "$as_me:2859: result: no" >&5
     2664-echo "${ECHO_T}no" >&6
     2665-               { echo "$as_me:2861: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5
     2666-echo "$as_me: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&2;}
     2667-               enable_pc_files=no
     2668-       fi
     2669-fi
     2670 
     2671-echo "$as_me:2867: checking if you want to build test-programs" >&5
    22702672+       case x$PKG_CONFIG_LIBDIR in #(vi
    22712673+       x/*) #(vi
     
    22942696+       esac
    22952697+
    2296 +       echo "$as_me:2982: result: $PKG_CONFIG_LIBDIR" >&5
     2698+       echo "$as_me:2787: result: $PKG_CONFIG_LIBDIR" >&5
    22972699+echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
    22982700+fi
    22992701+
    23002702+if test "$PKG_CONFIG" != none ; then
    2301         if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
    2302 +               echo "$as_me:2988: checking if we should install .pc files for $PKG_CONFIG" >&5
     2703+       echo "$as_me:2792: checking if we should install .pc files for $PKG_CONFIG" >&5
    23032704+echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6
    2304  
    2305  # Check whether --enable-pc-files or --disable-pc-files was given.
    2306  if test "${enable_pc_files+set}" = set; then
    2307 @@ -2853,18 +2995,18 @@
    2308  else
    2309    enable_pc_files=no
    2310  fi;
    2311 -               echo "$as_me:2856: result: $enable_pc_files" >&5
    2312 +               echo "$as_me:2998: result: $enable_pc_files" >&5
    2313  echo "${ECHO_T}$enable_pc_files" >&6
    2314 -       else
    2315 -               echo "$as_me:2859: result: no" >&5
    2316 -echo "${ECHO_T}no" >&6
    2317 -               { echo "$as_me:2861: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5
    2318 -echo "$as_me: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&2;}
    2319 +       elif test -z "$PKG_CONFIG_LIBDIR" || test "$PKG_CONFIG_LIBDIR" != no; then
    2320                 enable_pc_files=no
    2321 +               { echo "$as_me:3002: WARNING: did not find $PKG_CONFIG library" >&5
    2322 +echo "$as_me: WARNING: did not find $PKG_CONFIG library" >&2;}
    2323         fi
     2705+
     2706+# Check whether --enable-pc-files or --disable-pc-files was given.
     2707+if test "${enable_pc_files+set}" = set; then
     2708+  enableval="$enable_pc_files"
     2709+  enable_pc_files=$enableval
     2710+else
     2711+  enable_pc_files=no
     2712+fi;
     2713+       echo "$as_me:2802: result: $enable_pc_files" >&5
     2714+echo "${ECHO_T}$enable_pc_files" >&6
     2715+       if test "$enable_pc_files" != no
     2716+       then
     2717+
     2718+if test "x$prefix" != xNONE; then
     2719+  cf_path_syntax="$prefix"
     2720+else
     2721+  cf_path_syntax="$ac_default_prefix"
     2722+fi
     2723+
     2724+case ".$PKG_CONFIG_LIBDIR" in #(vi
     2725+.\$\(*\)*|.\'*\'*) #(vi
     2726+  ;;
     2727+..|./*|.\\*) #(vi
     2728+  ;;
     2729+.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
     2730+  ;;
     2731+.\${*prefix}*|.\${*dir}*) #(vi
     2732+  eval PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR"
     2733+  case ".$PKG_CONFIG_LIBDIR" in #(vi
     2734+  .NONE/*)
     2735+    PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%`
     2736+    ;;
     2737+  esac
     2738+  ;; #(vi
     2739+.no|.NONE/*)
     2740+  PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%`
     2741+  ;;
     2742+*)
     2743+  { { echo "$as_me:2832: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5
     2744+echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&2;}
     2745+   { (exit 1); exit 1; }; }
     2746+  ;;
     2747+esac
     2748+
     2749+       fi
    23242750+else
    23252751+       enable_pc_files=no
    2326  fi
    2327  
    2328 -echo "$as_me:2867: checking if you want to build test-programs" >&5
    2329 +echo "$as_me:3009: checking if you want to build test-programs" >&5
     2752+fi
     2753+
     2754+echo "$as_me:2843: checking if you want to build test-programs" >&5
    23302755 echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6
    23312756 
    23322757 # Check whether --with-tests or --without-tests was given.
    2333 @@ -2874,10 +3016,10 @@
     2758@@ -2874,10 +2850,10 @@
    23342759 else
    23352760   cf_with_tests=yes
    23362761 fi;
    23372762-echo "$as_me:2877: result: $cf_with_tests" >&5
    2338 +echo "$as_me:3019: result: $cf_with_tests" >&5
     2763+echo "$as_me:2853: result: $cf_with_tests" >&5
    23392764 echo "${ECHO_T}$cf_with_tests" >&6
    23402765 
    23412766-echo "$as_me:2880: checking if we should assume mixed-case filenames" >&5
    2342 +echo "$as_me:3022: checking if we should assume mixed-case filenames" >&5
     2767+echo "$as_me:2856: checking if we should assume mixed-case filenames" >&5
    23432768 echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
    23442769 
    23452770 # Check whether --enable-mixed-case or --disable-mixed-case was given.
    2346 @@ -2887,11 +3029,11 @@
     2771@@ -2887,11 +2863,11 @@
    23472772 else
    23482773   enable_mixedcase=auto
    23492774 fi;
    23502775-echo "$as_me:2890: result: $enable_mixedcase" >&5
    2351 +echo "$as_me:3032: result: $enable_mixedcase" >&5
     2776+echo "$as_me:2866: result: $enable_mixedcase" >&5
    23522777 echo "${ECHO_T}$enable_mixedcase" >&6
    23532778 if test "$enable_mixedcase" = "auto" ; then
    23542779 
    23552780-echo "$as_me:2894: checking if filesystem supports mixed-case filenames" >&5
    2356 +echo "$as_me:3036: checking if filesystem supports mixed-case filenames" >&5
     2781+echo "$as_me:2870: checking if filesystem supports mixed-case filenames" >&5
    23572782 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
    23582783 if test "${cf_cv_mixedcase+set}" = set; then
    23592784   echo $ECHO_N "(cached) $ECHO_C" >&6
    2360 @@ -2918,7 +3060,7 @@
     2785@@ -2918,7 +2894,7 @@
    23612786 fi
    23622787 
    23632788 fi
    23642789-echo "$as_me:2921: result: $cf_cv_mixedcase" >&5
    2365 +echo "$as_me:3063: result: $cf_cv_mixedcase" >&5
     2790+echo "$as_me:2897: result: $cf_cv_mixedcase" >&5
    23662791 echo "${ECHO_T}$cf_cv_mixedcase" >&6
    23672792 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF
    23682793 #define MIXEDCASE_FILENAMES 1
    2369 @@ -2935,7 +3077,7 @@
     2794@@ -2935,7 +2911,7 @@
    23702795 fi
    23712796 
    23722797 # do this after mixed-case option (tags/TAGS is not as important as tic).
    23732798-echo "$as_me:2938: checking whether ${MAKE-make} sets \${MAKE}" >&5
    2374 +echo "$as_me:3080: checking whether ${MAKE-make} sets \${MAKE}" >&5
     2799+echo "$as_me:2914: checking whether ${MAKE-make} sets \${MAKE}" >&5
    23752800 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
    23762801 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
    23772802 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
    2378 @@ -2955,11 +3097,11 @@
     2803@@ -2955,11 +2931,11 @@
    23792804 rm -f conftest.make
    23802805 fi
    23812806 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
    23822807-  echo "$as_me:2958: result: yes" >&5
    2383 +  echo "$as_me:3100: result: yes" >&5
     2808+  echo "$as_me:2934: result: yes" >&5
    23842809 echo "${ECHO_T}yes" >&6
    23852810   SET_MAKE=
    23862811 else
    23872812-  echo "$as_me:2962: result: no" >&5
    2388 +  echo "$as_me:3104: result: no" >&5
     2813+  echo "$as_me:2938: result: no" >&5
    23892814 echo "${ECHO_T}no" >&6
    23902815   SET_MAKE="MAKE=${MAKE-make}"
    23912816 fi
    2392 @@ -2968,7 +3110,7 @@
     2817@@ -2968,7 +2944,7 @@
    23932818 do
    23942819   # Extract the first word of "$ac_prog", so it can be a program name with args.
    23952820 set dummy $ac_prog; ac_word=$2
    23962821-echo "$as_me:2971: checking for $ac_word" >&5
    2397 +echo "$as_me:3113: checking for $ac_word" >&5
     2822+echo "$as_me:2947: checking for $ac_word" >&5
    23982823 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    23992824 if test "${ac_cv_prog_CTAGS+set}" = set; then
    24002825   echo $ECHO_N "(cached) $ECHO_C" >&6
    2401 @@ -2983,7 +3125,7 @@
     2826@@ -2983,7 +2959,7 @@
    24022827   test -z "$ac_dir" && ac_dir=.
    24032828   $as_executable_p "$ac_dir/$ac_word" || continue
    24042829 ac_cv_prog_CTAGS="$ac_prog"
    24052830-echo "$as_me:2986: found $ac_dir/$ac_word" >&5
    2406 +echo "$as_me:3128: found $ac_dir/$ac_word" >&5
     2831+echo "$as_me:2962: found $ac_dir/$ac_word" >&5
    24072832 break
    24082833 done
    24092834 
    2410 @@ -2991,10 +3133,10 @@
     2835@@ -2991,10 +2967,10 @@
    24112836 fi
    24122837 CTAGS=$ac_cv_prog_CTAGS
    24132838 if test -n "$CTAGS"; then
    24142839-  echo "$as_me:2994: result: $CTAGS" >&5
    2415 +  echo "$as_me:3136: result: $CTAGS" >&5
     2840+  echo "$as_me:2970: result: $CTAGS" >&5
    24162841 echo "${ECHO_T}$CTAGS" >&6
    24172842 else
    24182843-  echo "$as_me:2997: result: no" >&5
    2419 +  echo "$as_me:3139: result: no" >&5
     2844+  echo "$as_me:2973: result: no" >&5
    24202845 echo "${ECHO_T}no" >&6
    24212846 fi
    24222847 
    2423 @@ -3005,7 +3147,7 @@
     2848@@ -3005,7 +2981,7 @@
    24242849 do
    24252850   # Extract the first word of "$ac_prog", so it can be a program name with args.
    24262851 set dummy $ac_prog; ac_word=$2
    24272852-echo "$as_me:3008: checking for $ac_word" >&5
    2428 +echo "$as_me:3150: checking for $ac_word" >&5
     2853+echo "$as_me:2984: checking for $ac_word" >&5
    24292854 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    24302855 if test "${ac_cv_prog_ETAGS+set}" = set; then
    24312856   echo $ECHO_N "(cached) $ECHO_C" >&6
    2432 @@ -3020,7 +3162,7 @@
     2857@@ -3020,7 +2996,7 @@
    24332858   test -z "$ac_dir" && ac_dir=.
    24342859   $as_executable_p "$ac_dir/$ac_word" || continue
    24352860 ac_cv_prog_ETAGS="$ac_prog"
    24362861-echo "$as_me:3023: found $ac_dir/$ac_word" >&5
    2437 +echo "$as_me:3165: found $ac_dir/$ac_word" >&5
     2862+echo "$as_me:2999: found $ac_dir/$ac_word" >&5
    24382863 break
    24392864 done
    24402865 
    2441 @@ -3028,10 +3170,10 @@
     2866@@ -3028,10 +3004,10 @@
    24422867 fi
    24432868 ETAGS=$ac_cv_prog_ETAGS
    24442869 if test -n "$ETAGS"; then
    24452870-  echo "$as_me:3031: result: $ETAGS" >&5
    2446 +  echo "$as_me:3173: result: $ETAGS" >&5
     2871+  echo "$as_me:3007: result: $ETAGS" >&5
    24472872 echo "${ECHO_T}$ETAGS" >&6
    24482873 else
    24492874-  echo "$as_me:3034: result: no" >&5
    2450 +  echo "$as_me:3176: result: no" >&5
     2875+  echo "$as_me:3010: result: no" >&5
    24512876 echo "${ECHO_T}no" >&6
    24522877 fi
    24532878 
    2454 @@ -3040,7 +3182,7 @@
     2879@@ -3040,7 +3016,7 @@
    24552880 
    24562881 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
    24572882 set dummy ${CTAGS:-ctags}; ac_word=$2
    24582883-echo "$as_me:3043: checking for $ac_word" >&5
    2459 +echo "$as_me:3185: checking for $ac_word" >&5
     2884+echo "$as_me:3019: checking for $ac_word" >&5
    24602885 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    24612886 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
    24622887   echo $ECHO_N "(cached) $ECHO_C" >&6
    2463 @@ -3055,7 +3197,7 @@
     2888@@ -3055,7 +3031,7 @@
    24642889   test -z "$ac_dir" && ac_dir=.
    24652890   $as_executable_p "$ac_dir/$ac_word" || continue
    24662891 ac_cv_prog_MAKE_LOWER_TAGS="yes"
    24672892-echo "$as_me:3058: found $ac_dir/$ac_word" >&5
    2468 +echo "$as_me:3200: found $ac_dir/$ac_word" >&5
     2893+echo "$as_me:3034: found $ac_dir/$ac_word" >&5
    24692894 break
    24702895 done
    24712896 
    2472 @@ -3064,17 +3206,17 @@
     2897@@ -3064,17 +3040,17 @@
    24732898 fi
    24742899 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
    24752900 if test -n "$MAKE_LOWER_TAGS"; then
    24762901-  echo "$as_me:3067: result: $MAKE_LOWER_TAGS" >&5
    2477 +  echo "$as_me:3209: result: $MAKE_LOWER_TAGS" >&5
     2902+  echo "$as_me:3043: result: $MAKE_LOWER_TAGS" >&5
    24782903 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
    24792904 else
    24802905-  echo "$as_me:3070: result: no" >&5
    2481 +  echo "$as_me:3212: result: no" >&5
     2906+  echo "$as_me:3046: result: no" >&5
    24822907 echo "${ECHO_T}no" >&6
    24832908 fi
     
    24872912 set dummy ${ETAGS:-etags}; ac_word=$2
    24882913-echo "$as_me:3077: checking for $ac_word" >&5
    2489 +echo "$as_me:3219: checking for $ac_word" >&5
     2914+echo "$as_me:3053: checking for $ac_word" >&5
    24902915 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    24912916 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
    24922917   echo $ECHO_N "(cached) $ECHO_C" >&6
    2493 @@ -3089,7 +3231,7 @@
     2918@@ -3089,7 +3065,7 @@
    24942919   test -z "$ac_dir" && ac_dir=.
    24952920   $as_executable_p "$ac_dir/$ac_word" || continue
    24962921 ac_cv_prog_MAKE_UPPER_TAGS="yes"
    24972922-echo "$as_me:3092: found $ac_dir/$ac_word" >&5
    2498 +echo "$as_me:3234: found $ac_dir/$ac_word" >&5
     2923+echo "$as_me:3068: found $ac_dir/$ac_word" >&5
    24992924 break
    25002925 done
    25012926 
    2502 @@ -3098,10 +3240,10 @@
     2927@@ -3098,10 +3074,10 @@
    25032928 fi
    25042929 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
    25052930 if test -n "$MAKE_UPPER_TAGS"; then
    25062931-  echo "$as_me:3101: result: $MAKE_UPPER_TAGS" >&5
    2507 +  echo "$as_me:3243: result: $MAKE_UPPER_TAGS" >&5
     2932+  echo "$as_me:3077: result: $MAKE_UPPER_TAGS" >&5
    25082933 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
    25092934 else
    25102935-  echo "$as_me:3104: result: no" >&5
    2511 +  echo "$as_me:3246: result: no" >&5
     2936+  echo "$as_me:3080: result: no" >&5
    25122937 echo "${ECHO_T}no" >&6
    25132938 fi
    25142939 
    2515 @@ -3121,7 +3263,7 @@
     2940@@ -3121,7 +3097,7 @@
    25162941        MAKE_LOWER_TAGS="#"
    25172942 fi
    25182943 
    25192944-echo "$as_me:3124: checking for makeflags variable" >&5
    2520 +echo "$as_me:3266: checking for makeflags variable" >&5
     2945+echo "$as_me:3100: checking for makeflags variable" >&5
    25212946 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
    25222947 if test "${cf_cv_makeflags+set}" = set; then
    25232948   echo $ECHO_N "(cached) $ECHO_C" >&6
    2524 @@ -3155,13 +3297,13 @@
     2949@@ -3155,13 +3131,13 @@
    25252950        rm -f cf_makeflags.tmp
    25262951 
    25272952 fi
    25282953-echo "$as_me:3158: result: $cf_cv_makeflags" >&5
    2529 +echo "$as_me:3300: result: $cf_cv_makeflags" >&5
     2954+echo "$as_me:3134: result: $cf_cv_makeflags" >&5
    25302955 echo "${ECHO_T}$cf_cv_makeflags" >&6
    25312956 
     
    25342959 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
    25352960-echo "$as_me:3164: checking for $ac_word" >&5
    2536 +echo "$as_me:3306: checking for $ac_word" >&5
     2961+echo "$as_me:3140: checking for $ac_word" >&5
    25372962 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    25382963 if test "${ac_cv_prog_RANLIB+set}" = set; then
    25392964   echo $ECHO_N "(cached) $ECHO_C" >&6
    2540 @@ -3176,7 +3318,7 @@
     2965@@ -3176,7 +3152,7 @@
    25412966   test -z "$ac_dir" && ac_dir=.
    25422967   $as_executable_p "$ac_dir/$ac_word" || continue
    25432968 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
    25442969-echo "$as_me:3179: found $ac_dir/$ac_word" >&5
    2545 +echo "$as_me:3321: found $ac_dir/$ac_word" >&5
     2970+echo "$as_me:3155: found $ac_dir/$ac_word" >&5
    25462971 break
    25472972 done
    25482973 
    2549 @@ -3184,10 +3326,10 @@
     2974@@ -3184,10 +3160,10 @@
    25502975 fi
    25512976 RANLIB=$ac_cv_prog_RANLIB
    25522977 if test -n "$RANLIB"; then
    25532978-  echo "$as_me:3187: result: $RANLIB" >&5
    2554 +  echo "$as_me:3329: result: $RANLIB" >&5
     2979+  echo "$as_me:3163: result: $RANLIB" >&5
    25552980 echo "${ECHO_T}$RANLIB" >&6
    25562981 else
    25572982-  echo "$as_me:3190: result: no" >&5
    2558 +  echo "$as_me:3332: result: no" >&5
     2983+  echo "$as_me:3166: result: no" >&5
    25592984 echo "${ECHO_T}no" >&6
    25602985 fi
    25612986 
    2562 @@ -3196,7 +3338,7 @@
     2987@@ -3196,7 +3172,7 @@
    25632988   ac_ct_RANLIB=$RANLIB
    25642989   # Extract the first word of "ranlib", so it can be a program name with args.
    25652990 set dummy ranlib; ac_word=$2
    25662991-echo "$as_me:3199: checking for $ac_word" >&5
    2567 +echo "$as_me:3341: checking for $ac_word" >&5
     2992+echo "$as_me:3175: checking for $ac_word" >&5
    25682993 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    25692994 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    25702995   echo $ECHO_N "(cached) $ECHO_C" >&6
    2571 @@ -3211,7 +3353,7 @@
     2996@@ -3211,7 +3187,7 @@
    25722997   test -z "$ac_dir" && ac_dir=.
    25732998   $as_executable_p "$ac_dir/$ac_word" || continue
    25742999 ac_cv_prog_ac_ct_RANLIB="ranlib"
    25753000-echo "$as_me:3214: found $ac_dir/$ac_word" >&5
    2576 +echo "$as_me:3356: found $ac_dir/$ac_word" >&5
     3001+echo "$as_me:3190: found $ac_dir/$ac_word" >&5
    25773002 break
    25783003 done
    25793004 
    2580 @@ -3220,10 +3362,10 @@
     3005@@ -3220,10 +3196,10 @@
    25813006 fi
    25823007 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
    25833008 if test -n "$ac_ct_RANLIB"; then
    25843009-  echo "$as_me:3223: result: $ac_ct_RANLIB" >&5
    2585 +  echo "$as_me:3365: result: $ac_ct_RANLIB" >&5
     3010+  echo "$as_me:3199: result: $ac_ct_RANLIB" >&5
    25863011 echo "${ECHO_T}$ac_ct_RANLIB" >&6
    25873012 else
    25883013-  echo "$as_me:3226: result: no" >&5
    2589 +  echo "$as_me:3368: result: no" >&5
     3014+  echo "$as_me:3202: result: no" >&5
    25903015 echo "${ECHO_T}no" >&6
    25913016 fi
    25923017 
    2593 @@ -3235,7 +3377,7 @@
     3018@@ -3235,7 +3211,7 @@
    25943019 if test -n "$ac_tool_prefix"; then
    25953020   # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
    25963021 set dummy ${ac_tool_prefix}ld; ac_word=$2
    25973022-echo "$as_me:3238: checking for $ac_word" >&5
    2598 +echo "$as_me:3380: checking for $ac_word" >&5
     3023+echo "$as_me:3214: checking for $ac_word" >&5
    25993024 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    26003025 if test "${ac_cv_prog_LD+set}" = set; then
    26013026   echo $ECHO_N "(cached) $ECHO_C" >&6
    2602 @@ -3250,7 +3392,7 @@
     3027@@ -3250,7 +3226,7 @@
    26033028   test -z "$ac_dir" && ac_dir=.
    26043029   $as_executable_p "$ac_dir/$ac_word" || continue
    26053030 ac_cv_prog_LD="${ac_tool_prefix}ld"
    26063031-echo "$as_me:3253: found $ac_dir/$ac_word" >&5
    2607 +echo "$as_me:3395: found $ac_dir/$ac_word" >&5
     3032+echo "$as_me:3229: found $ac_dir/$ac_word" >&5
    26083033 break
    26093034 done
    26103035 
    2611 @@ -3258,10 +3400,10 @@
     3036@@ -3258,10 +3234,10 @@
    26123037 fi
    26133038 LD=$ac_cv_prog_LD
    26143039 if test -n "$LD"; then
    26153040-  echo "$as_me:3261: result: $LD" >&5
    2616 +  echo "$as_me:3403: result: $LD" >&5
     3041+  echo "$as_me:3237: result: $LD" >&5
    26173042 echo "${ECHO_T}$LD" >&6
    26183043 else
    26193044-  echo "$as_me:3264: result: no" >&5
    2620 +  echo "$as_me:3406: result: no" >&5
     3045+  echo "$as_me:3240: result: no" >&5
    26213046 echo "${ECHO_T}no" >&6
    26223047 fi
    26233048 
    2624 @@ -3270,7 +3412,7 @@
     3049@@ -3270,7 +3246,7 @@
    26253050   ac_ct_LD=$LD
    26263051   # Extract the first word of "ld", so it can be a program name with args.
    26273052 set dummy ld; ac_word=$2
    26283053-echo "$as_me:3273: checking for $ac_word" >&5
    2629 +echo "$as_me:3415: checking for $ac_word" >&5
     3054+echo "$as_me:3249: checking for $ac_word" >&5
    26303055 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    26313056 if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
    26323057   echo $ECHO_N "(cached) $ECHO_C" >&6
    2633 @@ -3285,7 +3427,7 @@
     3058@@ -3285,7 +3261,7 @@
    26343059   test -z "$ac_dir" && ac_dir=.
    26353060   $as_executable_p "$ac_dir/$ac_word" || continue
    26363061 ac_cv_prog_ac_ct_LD="ld"
    26373062-echo "$as_me:3288: found $ac_dir/$ac_word" >&5
    2638 +echo "$as_me:3430: found $ac_dir/$ac_word" >&5
     3063+echo "$as_me:3264: found $ac_dir/$ac_word" >&5
    26393064 break
    26403065 done
    26413066 
    2642 @@ -3294,10 +3436,10 @@
     3067@@ -3294,10 +3270,10 @@
    26433068 fi
    26443069 ac_ct_LD=$ac_cv_prog_ac_ct_LD
    26453070 if test -n "$ac_ct_LD"; then
    26463071-  echo "$as_me:3297: result: $ac_ct_LD" >&5
    2647 +  echo "$as_me:3439: result: $ac_ct_LD" >&5
     3072+  echo "$as_me:3273: result: $ac_ct_LD" >&5
    26483073 echo "${ECHO_T}$ac_ct_LD" >&6
    26493074 else
    26503075-  echo "$as_me:3300: result: no" >&5
    2651 +  echo "$as_me:3442: result: no" >&5
     3076+  echo "$as_me:3276: result: no" >&5
    26523077 echo "${ECHO_T}no" >&6
    26533078 fi
    26543079 
    2655 @@ -3309,7 +3451,7 @@
     3080@@ -3309,7 +3285,7 @@
    26563081 if test -n "$ac_tool_prefix"; then
    26573082   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
    26583083 set dummy ${ac_tool_prefix}ar; ac_word=$2
    26593084-echo "$as_me:3312: checking for $ac_word" >&5
    2660 +echo "$as_me:3454: checking for $ac_word" >&5
     3085+echo "$as_me:3288: checking for $ac_word" >&5
    26613086 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    26623087 if test "${ac_cv_prog_AR+set}" = set; then
    26633088   echo $ECHO_N "(cached) $ECHO_C" >&6
    2664 @@ -3324,7 +3466,7 @@
     3089@@ -3324,7 +3300,7 @@
    26653090   test -z "$ac_dir" && ac_dir=.
    26663091   $as_executable_p "$ac_dir/$ac_word" || continue
    26673092 ac_cv_prog_AR="${ac_tool_prefix}ar"
    26683093-echo "$as_me:3327: found $ac_dir/$ac_word" >&5
    2669 +echo "$as_me:3469: found $ac_dir/$ac_word" >&5
     3094+echo "$as_me:3303: found $ac_dir/$ac_word" >&5
    26703095 break
    26713096 done
    26723097 
    2673 @@ -3332,10 +3474,10 @@
     3098@@ -3332,10 +3308,10 @@
    26743099 fi
    26753100 AR=$ac_cv_prog_AR
    26763101 if test -n "$AR"; then
    26773102-  echo "$as_me:3335: result: $AR" >&5
    2678 +  echo "$as_me:3477: result: $AR" >&5
     3103+  echo "$as_me:3311: result: $AR" >&5
    26793104 echo "${ECHO_T}$AR" >&6
    26803105 else
    26813106-  echo "$as_me:3338: result: no" >&5
    2682 +  echo "$as_me:3480: result: no" >&5
     3107+  echo "$as_me:3314: result: no" >&5
    26833108 echo "${ECHO_T}no" >&6
    26843109 fi
    26853110 
    2686 @@ -3344,7 +3486,7 @@
     3111@@ -3344,7 +3320,7 @@
    26873112   ac_ct_AR=$AR
    26883113   # Extract the first word of "ar", so it can be a program name with args.
    26893114 set dummy ar; ac_word=$2
    26903115-echo "$as_me:3347: checking for $ac_word" >&5
    2691 +echo "$as_me:3489: checking for $ac_word" >&5
     3116+echo "$as_me:3323: checking for $ac_word" >&5
    26923117 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    26933118 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
    26943119   echo $ECHO_N "(cached) $ECHO_C" >&6
    2695 @@ -3359,7 +3501,7 @@
     3120@@ -3359,7 +3335,7 @@
    26963121   test -z "$ac_dir" && ac_dir=.
    26973122   $as_executable_p "$ac_dir/$ac_word" || continue
    26983123 ac_cv_prog_ac_ct_AR="ar"
    26993124-echo "$as_me:3362: found $ac_dir/$ac_word" >&5
    2700 +echo "$as_me:3504: found $ac_dir/$ac_word" >&5
     3125+echo "$as_me:3338: found $ac_dir/$ac_word" >&5
    27013126 break
    27023127 done
    27033128 
    2704 @@ -3368,10 +3510,10 @@
     3129@@ -3368,10 +3344,10 @@
    27053130 fi
    27063131 ac_ct_AR=$ac_cv_prog_ac_ct_AR
    27073132 if test -n "$ac_ct_AR"; then
    27083133-  echo "$as_me:3371: result: $ac_ct_AR" >&5
    2709 +  echo "$as_me:3513: result: $ac_ct_AR" >&5
     3134+  echo "$as_me:3347: result: $ac_ct_AR" >&5
    27103135 echo "${ECHO_T}$ac_ct_AR" >&6
    27113136 else
    27123137-  echo "$as_me:3374: result: no" >&5
    2713 +  echo "$as_me:3516: result: no" >&5
     3138+  echo "$as_me:3350: result: no" >&5
    27143139 echo "${ECHO_T}no" >&6
    27153140 fi
    27163141 
    2717 @@ -3383,7 +3525,7 @@
     3142@@ -3383,7 +3359,7 @@
    27183143 if test -n "$ac_tool_prefix"; then
    27193144   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
    27203145 set dummy ${ac_tool_prefix}ar; ac_word=$2
    27213146-echo "$as_me:3386: checking for $ac_word" >&5
    2722 +echo "$as_me:3528: checking for $ac_word" >&5
     3147+echo "$as_me:3362: checking for $ac_word" >&5
    27233148 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    27243149 if test "${ac_cv_prog_AR+set}" = set; then
    27253150   echo $ECHO_N "(cached) $ECHO_C" >&6
    2726 @@ -3398,7 +3540,7 @@
     3151@@ -3398,7 +3374,7 @@
    27273152   test -z "$ac_dir" && ac_dir=.
    27283153   $as_executable_p "$ac_dir/$ac_word" || continue
    27293154 ac_cv_prog_AR="${ac_tool_prefix}ar"
    27303155-echo "$as_me:3401: found $ac_dir/$ac_word" >&5
    2731 +echo "$as_me:3543: found $ac_dir/$ac_word" >&5
     3156+echo "$as_me:3377: found $ac_dir/$ac_word" >&5
    27323157 break
    27333158 done
    27343159 
    2735 @@ -3406,10 +3548,10 @@
     3160@@ -3406,10 +3382,10 @@
    27363161 fi
    27373162 AR=$ac_cv_prog_AR
    27383163 if test -n "$AR"; then
    27393164-  echo "$as_me:3409: result: $AR" >&5
    2740 +  echo "$as_me:3551: result: $AR" >&5
     3165+  echo "$as_me:3385: result: $AR" >&5
    27413166 echo "${ECHO_T}$AR" >&6
    27423167 else
    27433168-  echo "$as_me:3412: result: no" >&5
    2744 +  echo "$as_me:3554: result: no" >&5
     3169+  echo "$as_me:3388: result: no" >&5
    27453170 echo "${ECHO_T}no" >&6
    27463171 fi
    27473172 
    2748 @@ -3418,7 +3560,7 @@
     3173@@ -3418,7 +3394,7 @@
    27493174   ac_ct_AR=$AR
    27503175   # Extract the first word of "ar", so it can be a program name with args.
    27513176 set dummy ar; ac_word=$2
    27523177-echo "$as_me:3421: checking for $ac_word" >&5
    2753 +echo "$as_me:3563: checking for $ac_word" >&5
     3178+echo "$as_me:3397: checking for $ac_word" >&5
    27543179 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    27553180 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
    27563181   echo $ECHO_N "(cached) $ECHO_C" >&6
    2757 @@ -3433,7 +3575,7 @@
     3182@@ -3433,7 +3409,7 @@
    27583183   test -z "$ac_dir" && ac_dir=.
    27593184   $as_executable_p "$ac_dir/$ac_word" || continue
    27603185 ac_cv_prog_ac_ct_AR="ar"
    27613186-echo "$as_me:3436: found $ac_dir/$ac_word" >&5
    2762 +echo "$as_me:3578: found $ac_dir/$ac_word" >&5
     3187+echo "$as_me:3412: found $ac_dir/$ac_word" >&5
    27633188 break
    27643189 done
    27653190 
    2766 @@ -3442,10 +3584,10 @@
     3191@@ -3442,10 +3418,10 @@
    27673192 fi
    27683193 ac_ct_AR=$ac_cv_prog_ac_ct_AR
    27693194 if test -n "$ac_ct_AR"; then
    27703195-  echo "$as_me:3445: result: $ac_ct_AR" >&5
    2771 +  echo "$as_me:3587: result: $ac_ct_AR" >&5
     3196+  echo "$as_me:3421: result: $ac_ct_AR" >&5
    27723197 echo "${ECHO_T}$ac_ct_AR" >&6
    27733198 else
    27743199-  echo "$as_me:3448: result: no" >&5
    2775 +  echo "$as_me:3590: result: no" >&5
     3200+  echo "$as_me:3424: result: no" >&5
    27763201 echo "${ECHO_T}no" >&6
    27773202 fi
    27783203 
    2779 @@ -3454,7 +3596,7 @@
     3204@@ -3454,7 +3430,7 @@
    27803205   AR="$ac_cv_prog_AR"
    27813206 fi
    27823207 
    27833208-echo "$as_me:3457: checking for options to update archives" >&5
    2784 +echo "$as_me:3599: checking for options to update archives" >&5
     3209+echo "$as_me:3433: checking for options to update archives" >&5
    27853210 echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
    27863211 if test "${cf_cv_ar_flags+set}" = set; then
    27873212   echo $ECHO_N "(cached) $ECHO_C" >&6
    2788 @@ -3477,13 +3619,13 @@
     3213@@ -3477,13 +3453,13 @@
    27893214                rm -f conftest.a
    27903215 
    27913216                cat >conftest.$ac_ext <<EOF
    27923217-#line 3480 "configure"
    2793 +#line 3622 "configure"
     3218+#line 3456 "configure"
    27943219 int    testdata[3] = { 123, 456, 789 };
    27953220 EOF
    27963221-               if { (eval echo "$as_me:3483: \"$ac_compile\"") >&5
    2797 +               if { (eval echo "$as_me:3625: \"$ac_compile\"") >&5
     3222+               if { (eval echo "$as_me:3459: \"$ac_compile\"") >&5
    27983223   (eval $ac_compile) 2>&5
    27993224   ac_status=$?
    28003225-  echo "$as_me:3486: \$? = $ac_status" >&5
    2801 +  echo "$as_me:3628: \$? = $ac_status" >&5
     3226+  echo "$as_me:3462: \$? = $ac_status" >&5
    28023227   (exit $ac_status); } ; then
    28033228                        echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5
    28043229                        $AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null
    2805 @@ -3494,7 +3636,7 @@
     3230@@ -3494,7 +3470,7 @@
    28063231                else
    28073232                        test -n "$verbose" && echo "    cannot compile test-program" 1>&6
    28083233 
    28093234-echo "${as_me:-configure}:3497: testing cannot compile test-program ..." 1>&5
    2810 +echo "${as_me:-configure}:3639: testing cannot compile test-program ..." 1>&5
     3235+echo "${as_me:-configure}:3473: testing cannot compile test-program ..." 1>&5
    28113236 
    28123237                        break
    28133238                fi
    2814 @@ -3502,7 +3644,7 @@
     3239@@ -3502,7 +3478,7 @@
    28153240        rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
    28163241 
    28173242 fi
    28183243-echo "$as_me:3505: result: $cf_cv_ar_flags" >&5
    2819 +echo "$as_me:3647: result: $cf_cv_ar_flags" >&5
     3244+echo "$as_me:3481: result: $cf_cv_ar_flags" >&5
    28203245 echo "${ECHO_T}$cf_cv_ar_flags" >&6
    28213246 
    28223247 if test -n "$ARFLAGS" ; then
    2823 @@ -3513,7 +3655,7 @@
     3248@@ -3513,7 +3489,7 @@
    28243249        ARFLAGS=$cf_cv_ar_flags
    28253250 fi
    28263251 
    28273252-echo "$as_me:3516: checking if you have specified an install-prefix" >&5
    2828 +echo "$as_me:3658: checking if you have specified an install-prefix" >&5
     3253+echo "$as_me:3492: checking if you have specified an install-prefix" >&5
    28293254 echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
    28303255 
    28313256 # Check whether --with-install-prefix or --without-install-prefix was given.
    2832 @@ -3526,7 +3668,7 @@
     3257@@ -3526,7 +3502,7 @@
    28333258                ;;
    28343259        esac
    28353260 fi;
    28363261-echo "$as_me:3529: result: $DESTDIR" >&5
    2837 +echo "$as_me:3671: result: $DESTDIR" >&5
     3262+echo "$as_me:3505: result: $DESTDIR" >&5
    28383263 echo "${ECHO_T}$DESTDIR" >&6
    28393264 
    28403265 ###############################################################################
    2841 @@ -3554,7 +3696,7 @@
     3266@@ -3554,7 +3530,7 @@
    28423267 do
    28433268   # Extract the first word of "$ac_prog", so it can be a program name with args.
    28443269 set dummy $ac_prog; ac_word=$2
    28453270-echo "$as_me:3557: checking for $ac_word" >&5
    2846 +echo "$as_me:3699: checking for $ac_word" >&5
     3271+echo "$as_me:3533: checking for $ac_word" >&5
    28473272 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    28483273 if test "${ac_cv_prog_BUILD_CC+set}" = set; then
    28493274   echo $ECHO_N "(cached) $ECHO_C" >&6
    2850 @@ -3569,7 +3711,7 @@
     3275@@ -3569,7 +3545,7 @@
    28513276   test -z "$ac_dir" && ac_dir=.
    28523277   $as_executable_p "$ac_dir/$ac_word" || continue
    28533278 ac_cv_prog_BUILD_CC="$ac_prog"
    28543279-echo "$as_me:3572: found $ac_dir/$ac_word" >&5
    2855 +echo "$as_me:3714: found $ac_dir/$ac_word" >&5
     3280+echo "$as_me:3548: found $ac_dir/$ac_word" >&5
    28563281 break
    28573282 done
    28583283 
    2859 @@ -3577,10 +3719,10 @@
     3284@@ -3577,10 +3553,10 @@
    28603285 fi
    28613286 BUILD_CC=$ac_cv_prog_BUILD_CC
    28623287 if test -n "$BUILD_CC"; then
    28633288-  echo "$as_me:3580: result: $BUILD_CC" >&5
    2864 +  echo "$as_me:3722: result: $BUILD_CC" >&5
     3289+  echo "$as_me:3556: result: $BUILD_CC" >&5
    28653290 echo "${ECHO_T}$BUILD_CC" >&6
    28663291 else
    28673292-  echo "$as_me:3583: result: no" >&5
    2868 +  echo "$as_me:3725: result: no" >&5
     3293+  echo "$as_me:3559: result: no" >&5
    28693294 echo "${ECHO_T}no" >&6
    28703295 fi
    28713296 
    2872 @@ -3588,12 +3730,12 @@
     3297@@ -3588,12 +3564,12 @@
    28733298 done
    28743299 
    28753300 fi;
    28763301-       echo "$as_me:3591: checking for native build C compiler" >&5
    2877 +       echo "$as_me:3733: checking for native build C compiler" >&5
     3302+       echo "$as_me:3567: checking for native build C compiler" >&5
    28783303 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
    28793304-       echo "$as_me:3593: result: $BUILD_CC" >&5
    2880 +       echo "$as_me:3735: result: $BUILD_CC" >&5
     3305+       echo "$as_me:3569: result: $BUILD_CC" >&5
    28813306 echo "${ECHO_T}$BUILD_CC" >&6
    28823307 
    28833308-       echo "$as_me:3596: checking for native build C preprocessor" >&5
    2884 +       echo "$as_me:3738: checking for native build C preprocessor" >&5
     3309+       echo "$as_me:3572: checking for native build C preprocessor" >&5
    28853310 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
    28863311 
    28873312 # Check whether --with-build-cpp or --without-build-cpp was given.
    2888 @@ -3603,10 +3745,10 @@
     3313@@ -3603,10 +3579,10 @@
    28893314 else
    28903315   BUILD_CPP='${BUILD_CC} -E'
    28913316 fi;
    28923317-       echo "$as_me:3606: result: $BUILD_CPP" >&5
    2893 +       echo "$as_me:3748: result: $BUILD_CPP" >&5
     3318+       echo "$as_me:3582: result: $BUILD_CPP" >&5
    28943319 echo "${ECHO_T}$BUILD_CPP" >&6
    28953320 
    28963321-       echo "$as_me:3609: checking for native build C flags" >&5
    2897 +       echo "$as_me:3751: checking for native build C flags" >&5
     3322+       echo "$as_me:3585: checking for native build C flags" >&5
    28983323 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
    28993324 
    29003325 # Check whether --with-build-cflags or --without-build-cflags was given.
    2901 @@ -3614,10 +3756,10 @@
     3326@@ -3614,10 +3590,10 @@
    29023327   withval="$with_build_cflags"
    29033328   BUILD_CFLAGS="$withval"
    29043329 fi;
    29053330-       echo "$as_me:3617: result: $BUILD_CFLAGS" >&5
    2906 +       echo "$as_me:3759: result: $BUILD_CFLAGS" >&5
     3331+       echo "$as_me:3593: result: $BUILD_CFLAGS" >&5
    29073332 echo "${ECHO_T}$BUILD_CFLAGS" >&6
    29083333 
    29093334-       echo "$as_me:3620: checking for native build C preprocessor-flags" >&5
    2910 +       echo "$as_me:3762: checking for native build C preprocessor-flags" >&5
     3335+       echo "$as_me:3596: checking for native build C preprocessor-flags" >&5
    29113336 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
    29123337 
    29133338 # Check whether --with-build-cppflags or --without-build-cppflags was given.
    2914 @@ -3625,10 +3767,10 @@
     3339@@ -3625,10 +3601,10 @@
    29153340   withval="$with_build_cppflags"
    29163341   BUILD_CPPFLAGS="$withval"
    29173342 fi;
    29183343-       echo "$as_me:3628: result: $BUILD_CPPFLAGS" >&5
    2919 +       echo "$as_me:3770: result: $BUILD_CPPFLAGS" >&5
     3344+       echo "$as_me:3604: result: $BUILD_CPPFLAGS" >&5
    29203345 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
    29213346 
    29223347-       echo "$as_me:3631: checking for native build linker-flags" >&5
    2923 +       echo "$as_me:3773: checking for native build linker-flags" >&5
     3348+       echo "$as_me:3607: checking for native build linker-flags" >&5
    29243349 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
    29253350 
    29263351 # Check whether --with-build-ldflags or --without-build-ldflags was given.
    2927 @@ -3636,10 +3778,10 @@
     3352@@ -3636,10 +3612,10 @@
    29283353   withval="$with_build_ldflags"
    29293354   BUILD_LDFLAGS="$withval"
    29303355 fi;
    29313356-       echo "$as_me:3639: result: $BUILD_LDFLAGS" >&5
    2932 +       echo "$as_me:3781: result: $BUILD_LDFLAGS" >&5
     3357+       echo "$as_me:3615: result: $BUILD_LDFLAGS" >&5
    29333358 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
    29343359 
    29353360-       echo "$as_me:3642: checking for native build linker-libraries" >&5
    2936 +       echo "$as_me:3784: checking for native build linker-libraries" >&5
     3361+       echo "$as_me:3618: checking for native build linker-libraries" >&5
    29373362 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
    29383363 
    29393364 # Check whether --with-build-libs or --without-build-libs was given.
    2940 @@ -3647,7 +3789,7 @@
     3365@@ -3647,7 +3623,7 @@
    29413366   withval="$with_build_libs"
    29423367   BUILD_LIBS="$withval"
    29433368 fi;
    29443369-       echo "$as_me:3650: result: $BUILD_LIBS" >&5
    2945 +       echo "$as_me:3792: result: $BUILD_LIBS" >&5
     3370+       echo "$as_me:3626: result: $BUILD_LIBS" >&5
    29463371 echo "${ECHO_T}$BUILD_LIBS" >&6
    29473372 
    29483373        # this assumes we're on Unix.
    2949 @@ -3657,7 +3799,7 @@
     3374@@ -3657,7 +3633,7 @@
    29503375        : ${BUILD_CC:='${CC}'}
    29513376 
    29523377        if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
    29533378-               { { echo "$as_me:3660: error: Cross-build requires two compilers.
    2954 +               { { echo "$as_me:3802: error: Cross-build requires two compilers.
     3379+               { { echo "$as_me:3636: error: Cross-build requires two compilers.
    29553380 Use --with-build-cc to specify the native compiler." >&5
    29563381 echo "$as_me: error: Cross-build requires two compilers.
    29573382 Use --with-build-cc to specify the native compiler." >&2;}
    2958 @@ -3682,7 +3824,7 @@
     3383@@ -3682,7 +3658,7 @@
    29593384 ### shared, for example.
    29603385 cf_list_models=""
    29613386 
    29623387-echo "$as_me:3685: checking if you want to build shared C-objects" >&5
    2963 +echo "$as_me:3827: checking if you want to build shared C-objects" >&5
     3388+echo "$as_me:3661: checking if you want to build shared C-objects" >&5
    29643389 echo $ECHO_N "checking if you want to build shared C-objects... $ECHO_C" >&6
    29653390 
    29663391 # Check whether --with-shared or --without-shared was given.
    2967 @@ -3692,27 +3834,27 @@
     3392@@ -3692,27 +3668,27 @@
    29683393 else
    29693394   with_shared=no
    29703395 fi;
    29713396-echo "$as_me:3695: result: $with_shared" >&5
    2972 +echo "$as_me:3837: result: $with_shared" >&5
     3397+echo "$as_me:3671: result: $with_shared" >&5
    29733398 echo "${ECHO_T}$with_shared" >&6
    29743399 test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
    29753400 
    29763401-echo "$as_me:3699: checking for specified models" >&5
    2977 +echo "$as_me:3841: checking for specified models" >&5
     3402+echo "$as_me:3675: checking for specified models" >&5
    29783403 echo $ECHO_N "checking for specified models... $ECHO_C" >&6
    29793404 test -z "$cf_list_models" && cf_list_models=normal
    29803405-echo "$as_me:3702: result: $cf_list_models" >&5
    2981 +echo "$as_me:3844: result: $cf_list_models" >&5
     3406+echo "$as_me:3678: result: $cf_list_models" >&5
    29823407 echo "${ECHO_T}$cf_list_models" >&6
    29833408 
     
    29853410 ### up test-applications.
    29863411-echo "$as_me:3707: checking for default model" >&5
    2987 +echo "$as_me:3849: checking for default model" >&5
     3412+echo "$as_me:3683: checking for default model" >&5
    29883413 echo $ECHO_N "checking for default model... $ECHO_C" >&6
    29893414 DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'`
    29903415-echo "$as_me:3710: result: $DFT_LWR_MODEL" >&5
    2991 +echo "$as_me:3852: result: $DFT_LWR_MODEL" >&5
     3416+echo "$as_me:3686: result: $DFT_LWR_MODEL" >&5
    29923417 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
    29933418 
     
    29953420 
    29963421-echo "$as_me:3715: checking for specific curses-directory" >&5
    2997 +echo "$as_me:3857: checking for specific curses-directory" >&5
     3422+echo "$as_me:3691: checking for specific curses-directory" >&5
    29983423 echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6
    29993424 
    30003425 # Check whether --with-curses-dir or --without-curses-dir was given.
    3001 @@ -3722,7 +3864,7 @@
     3426@@ -3722,7 +3698,7 @@
    30023427 else
    30033428   cf_cv_curses_dir=no
    30043429 fi;
    30053430-echo "$as_me:3725: result: $cf_cv_curses_dir" >&5
    3006 +echo "$as_me:3867: result: $cf_cv_curses_dir" >&5
     3431+echo "$as_me:3701: result: $cf_cv_curses_dir" >&5
    30073432 echo "${ECHO_T}$cf_cv_curses_dir" >&6
    30083433 
    30093434 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
    3010 @@ -3753,7 +3895,7 @@
     3435@@ -3741,7 +3717,7 @@
     3436   ;;
     3437 .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
     3438   ;;
     3439-.\${*prefix}*) #(vi
     3440+.\${*prefix}*|.\${*dir}*) #(vi
     3441   eval withval="$withval"
     3442   case ".$withval" in #(vi
     3443   .NONE/*)
     3444@@ -3753,7 +3729,7 @@
    30113445   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    30123446   ;;
    30133447 *)
    30143448-  { { echo "$as_me:3756: error: expected a pathname, not \"$withval\"" >&5
    3015 +  { { echo "$as_me:3898: error: expected a pathname, not \"$withval\"" >&5
     3449+  { { echo "$as_me:3732: error: expected a pathname, not \"$withval\"" >&5
    30163450 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    30173451    { (exit 1); exit 1; }; }
    30183452   ;;
    3019 @@ -3786,7 +3928,7 @@
     3453@@ -3786,7 +3762,7 @@
    30203454                          cf_save_CPPFLAGS=$CPPFLAGS
    30213455                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
    30223456                          cat >conftest.$ac_ext <<_ACEOF
    30233457-#line 3789 "configure"
    3024 +#line 3931 "configure"
     3458+#line 3765 "configure"
    30253459 #include "confdefs.h"
    30263460 #include <stdio.h>
    30273461 int
    3028 @@ -3798,16 +3940,16 @@
     3462@@ -3798,16 +3774,16 @@
    30293463 }
    30303464 _ACEOF
    30313465 rm -f conftest.$ac_objext
    30323466-if { (eval echo "$as_me:3801: \"$ac_compile\"") >&5
    3033 +if { (eval echo "$as_me:3943: \"$ac_compile\"") >&5
     3467+if { (eval echo "$as_me:3777: \"$ac_compile\"") >&5
    30343468   (eval $ac_compile) 2>&5
    30353469   ac_status=$?
    30363470-  echo "$as_me:3804: \$? = $ac_status" >&5
    3037 +  echo "$as_me:3946: \$? = $ac_status" >&5
     3471+  echo "$as_me:3780: \$? = $ac_status" >&5
    30383472   (exit $ac_status); } &&
    30393473          { ac_try='test -s conftest.$ac_objext'
    30403474-  { (eval echo "$as_me:3807: \"$ac_try\"") >&5
    3041 +  { (eval echo "$as_me:3949: \"$ac_try\"") >&5
     3475+  { (eval echo "$as_me:3783: \"$ac_try\"") >&5
    30423476   (eval $ac_try) 2>&5
    30433477   ac_status=$?
    30443478-  echo "$as_me:3810: \$? = $ac_status" >&5
    3045 +  echo "$as_me:3952: \$? = $ac_status" >&5
     3479+  echo "$as_me:3786: \$? = $ac_status" >&5
    30463480   (exit $ac_status); }; }; then
    30473481   :
    30483482 else
    3049 @@ -3824,7 +3966,7 @@
     3483@@ -3824,7 +3800,7 @@
    30503484                if test "$cf_have_incdir" = no ; then
    30513485                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
    30523486 
    30533487-echo "${as_me:-configure}:3827: testing adding $cf_add_incdir to include-path ..." 1>&5
    3054 +echo "${as_me:-configure}:3969: testing adding $cf_add_incdir to include-path ..." 1>&5
     3488+echo "${as_me:-configure}:3803: testing adding $cf_add_incdir to include-path ..." 1>&5
    30553489 
    30563490                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
    30573491 
    3058 @@ -3858,7 +4000,7 @@
     3492@@ -3858,7 +3834,7 @@
    30593493       if test "$cf_have_libdir" = no ; then
    30603494         test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
    30613495 
    30623496-echo "${as_me:-configure}:3861: testing adding $cf_add_libdir to library-path ..." 1>&5
    3063 +echo "${as_me:-configure}:4003: testing adding $cf_add_libdir to library-path ..." 1>&5
     3497+echo "${as_me:-configure}:3837: testing adding $cf_add_libdir to library-path ..." 1>&5
    30643498 
    30653499         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
    30663500       fi
    3067 @@ -3869,7 +4011,7 @@
     3501@@ -3869,7 +3845,7 @@
    30683502        fi
    30693503 fi
    30703504 
    30713505-echo "$as_me:3872: checking if you want wide-character code" >&5
    3072 +echo "$as_me:4014: checking if you want wide-character code" >&5
     3506+echo "$as_me:3848: checking if you want wide-character code" >&5
    30733507 echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
    30743508 
    30753509 # Check whether --enable-widec or --disable-widec was given.
    3076 @@ -3879,11 +4021,11 @@
     3510@@ -3879,11 +3855,11 @@
    30773511 else
    30783512   with_widec=no
    30793513 fi;
    30803514-echo "$as_me:3882: result: $with_widec" >&5
    3081 +echo "$as_me:4024: result: $with_widec" >&5
     3515+echo "$as_me:3858: result: $with_widec" >&5
    30823516 echo "${ECHO_T}$with_widec" >&6
    30833517 if test "$with_widec" = yes ; then
    30843518 
    30853519-echo "$as_me:3886: checking for multibyte character support" >&5
    3086 +echo "$as_me:4028: checking for multibyte character support" >&5
     3520+echo "$as_me:3862: checking for multibyte character support" >&5
    30873521 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
    30883522 if test "${cf_cv_utf8_lib+set}" = set; then
    30893523   echo $ECHO_N "(cached) $ECHO_C" >&6
    3090 @@ -3891,7 +4033,7 @@
     3524@@ -3891,7 +3867,7 @@
    30913525 
    30923526        cf_save_LIBS="$LIBS"
    30933527        cat >conftest.$ac_ext <<_ACEOF
    30943528-#line 3894 "configure"
    3095 +#line 4036 "configure"
     3529+#line 3870 "configure"
    30963530 #include "confdefs.h"
    30973531 
    30983532 #include <stdlib.h>
    3099 @@ -3904,16 +4046,16 @@
     3533@@ -3904,16 +3880,16 @@
    31003534 }
    31013535 _ACEOF
    31023536 rm -f conftest.$ac_objext conftest$ac_exeext
    31033537-if { (eval echo "$as_me:3907: \"$ac_link\"") >&5
    3104 +if { (eval echo "$as_me:4049: \"$ac_link\"") >&5
     3538+if { (eval echo "$as_me:3883: \"$ac_link\"") >&5
    31053539   (eval $ac_link) 2>&5
    31063540   ac_status=$?
    31073541-  echo "$as_me:3910: \$? = $ac_status" >&5
    3108 +  echo "$as_me:4052: \$? = $ac_status" >&5
     3542+  echo "$as_me:3886: \$? = $ac_status" >&5
    31093543   (exit $ac_status); } &&
    31103544          { ac_try='test -s conftest$ac_exeext'
    31113545-  { (eval echo "$as_me:3913: \"$ac_try\"") >&5
    3112 +  { (eval echo "$as_me:4055: \"$ac_try\"") >&5
     3546+  { (eval echo "$as_me:3889: \"$ac_try\"") >&5
    31133547   (eval $ac_try) 2>&5
    31143548   ac_status=$?
    31153549-  echo "$as_me:3916: \$? = $ac_status" >&5
    3116 +  echo "$as_me:4058: \$? = $ac_status" >&5
     3550+  echo "$as_me:3892: \$? = $ac_status" >&5
    31173551   (exit $ac_status); }; }; then
    31183552   cf_cv_utf8_lib=yes
    31193553 else
    3120 @@ -3925,12 +4067,12 @@
     3554@@ -3925,12 +3901,12 @@
    31213555 cf_cv_header_path_utf8=
    31223556 cf_cv_library_path_utf8=
    31233557 
    31243558-echo "${as_me:-configure}:3928: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
    3125 +echo "${as_me:-configure}:4070: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
     3559+echo "${as_me:-configure}:3904: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
    31263560 
    31273561 cf_save_LIBS="$LIBS"
     
    31293563 cat >conftest.$ac_ext <<_ACEOF
    31303564-#line 3933 "configure"
    3131 +#line 4075 "configure"
     3565+#line 3909 "configure"
    31323566 #include "confdefs.h"
    31333567 
    31343568 #include <libutf8.h>
    3135 @@ -3943,16 +4085,16 @@
     3569@@ -3943,16 +3919,16 @@
    31363570 }
    31373571 _ACEOF
    31383572 rm -f conftest.$ac_objext conftest$ac_exeext
    31393573-if { (eval echo "$as_me:3946: \"$ac_link\"") >&5
    3140 +if { (eval echo "$as_me:4088: \"$ac_link\"") >&5
     3574+if { (eval echo "$as_me:3922: \"$ac_link\"") >&5
    31413575   (eval $ac_link) 2>&5
    31423576   ac_status=$?
    31433577-  echo "$as_me:3949: \$? = $ac_status" >&5
    3144 +  echo "$as_me:4091: \$? = $ac_status" >&5
     3578+  echo "$as_me:3925: \$? = $ac_status" >&5
    31453579   (exit $ac_status); } &&
    31463580          { ac_try='test -s conftest$ac_exeext'
    31473581-  { (eval echo "$as_me:3952: \"$ac_try\"") >&5
    3148 +  { (eval echo "$as_me:4094: \"$ac_try\"") >&5
     3582+  { (eval echo "$as_me:3928: \"$ac_try\"") >&5
    31493583   (eval $ac_try) 2>&5
    31503584   ac_status=$?
    31513585-  echo "$as_me:3955: \$? = $ac_status" >&5
    3152 +  echo "$as_me:4097: \$? = $ac_status" >&5
     3586+  echo "$as_me:3931: \$? = $ac_status" >&5
    31533587   (exit $ac_status); }; }; then
    31543588 
    31553589        cf_cv_find_linkage_utf8=yes
    3156 @@ -3966,7 +4108,7 @@
     3590@@ -3966,7 +3942,7 @@
    31573591 LIBS="-lutf8  $cf_save_LIBS"
    31583592 
    31593593 cat >conftest.$ac_ext <<_ACEOF
    31603594-#line 3969 "configure"
    3161 +#line 4111 "configure"
     3595+#line 3945 "configure"
    31623596 #include "confdefs.h"
    31633597 
    31643598 #include <libutf8.h>
    3165 @@ -3979,16 +4121,16 @@
     3599@@ -3979,16 +3955,16 @@
    31663600 }
    31673601 _ACEOF
    31683602 rm -f conftest.$ac_objext conftest$ac_exeext
    31693603-if { (eval echo "$as_me:3982: \"$ac_link\"") >&5
    3170 +if { (eval echo "$as_me:4124: \"$ac_link\"") >&5
     3604+if { (eval echo "$as_me:3958: \"$ac_link\"") >&5
    31713605   (eval $ac_link) 2>&5
    31723606   ac_status=$?
    31733607-  echo "$as_me:3985: \$? = $ac_status" >&5
    3174 +  echo "$as_me:4127: \$? = $ac_status" >&5
     3608+  echo "$as_me:3961: \$? = $ac_status" >&5
    31753609   (exit $ac_status); } &&
    31763610          { ac_try='test -s conftest$ac_exeext'
    31773611-  { (eval echo "$as_me:3988: \"$ac_try\"") >&5
    3178 +  { (eval echo "$as_me:4130: \"$ac_try\"") >&5
     3612+  { (eval echo "$as_me:3964: \"$ac_try\"") >&5
    31793613   (eval $ac_try) 2>&5
    31803614   ac_status=$?
    31813615-  echo "$as_me:3991: \$? = $ac_status" >&5
    3182 +  echo "$as_me:4133: \$? = $ac_status" >&5
     3616+  echo "$as_me:3967: \$? = $ac_status" >&5
    31833617   (exit $ac_status); }; }; then
    31843618 
    31853619        cf_cv_find_linkage_utf8=yes
    3186 @@ -4005,9 +4147,9 @@
     3620@@ -4005,9 +3981,9 @@
    31873621 
    31883622     test -n "$verbose" && echo "       find linkage for utf8 library" 1>&6
    31893623 
    31903624-echo "${as_me:-configure}:4008: testing find linkage for utf8 library ..." 1>&5
    3191 +echo "${as_me:-configure}:4150: testing find linkage for utf8 library ..." 1>&5
     3625+echo "${as_me:-configure}:3984: testing find linkage for utf8 library ..." 1>&5
    31923626 
    31933627-echo "${as_me:-configure}:4010: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
    3194 +echo "${as_me:-configure}:4152: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
     3628+echo "${as_me:-configure}:3986: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
    31953629 
    31963630     cf_save_CPPFLAGS="$CPPFLAGS"
    31973631     cf_test_CPPFLAGS="$CPPFLAGS"
    3198 @@ -4120,11 +4262,11 @@
     3632@@ -4120,11 +4096,11 @@
    31993633       if test -d $cf_cv_header_path_utf8 ; then
    32003634         test -n "$verbose" && echo "   ... testing $cf_cv_header_path_utf8" 1>&6
    32013635 
    32023636-echo "${as_me:-configure}:4123: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
    3203 +echo "${as_me:-configure}:4265: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
     3637+echo "${as_me:-configure}:4099: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
    32043638 
    32053639         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
    32063640         cat >conftest.$ac_ext <<_ACEOF
    32073641-#line 4127 "configure"
    3208 +#line 4269 "configure"
     3642+#line 4103 "configure"
    32093643 #include "confdefs.h"
    32103644 
    32113645 #include <libutf8.h>
    3212 @@ -4137,21 +4279,21 @@
     3646@@ -4137,21 +4113,21 @@
    32133647 }
    32143648 _ACEOF
    32153649 rm -f conftest.$ac_objext
    32163650-if { (eval echo "$as_me:4140: \"$ac_compile\"") >&5
    3217 +if { (eval echo "$as_me:4282: \"$ac_compile\"") >&5
     3651+if { (eval echo "$as_me:4116: \"$ac_compile\"") >&5
    32183652   (eval $ac_compile) 2>&5
    32193653   ac_status=$?
    32203654-  echo "$as_me:4143: \$? = $ac_status" >&5
    3221 +  echo "$as_me:4285: \$? = $ac_status" >&5
     3655+  echo "$as_me:4119: \$? = $ac_status" >&5
    32223656   (exit $ac_status); } &&
    32233657          { ac_try='test -s conftest.$ac_objext'
    32243658-  { (eval echo "$as_me:4146: \"$ac_try\"") >&5
    3225 +  { (eval echo "$as_me:4288: \"$ac_try\"") >&5
     3659+  { (eval echo "$as_me:4122: \"$ac_try\"") >&5
    32263660   (eval $ac_try) 2>&5
    32273661   ac_status=$?
    32283662-  echo "$as_me:4149: \$? = $ac_status" >&5
    3229 +  echo "$as_me:4291: \$? = $ac_status" >&5
     3663+  echo "$as_me:4125: \$? = $ac_status" >&5
    32303664   (exit $ac_status); }; }; then
    32313665 
     
    32333667 
    32343668-echo "${as_me:-configure}:4154: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
    3235 +echo "${as_me:-configure}:4296: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
     3669+echo "${as_me:-configure}:4130: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
    32363670 
    32373671             cf_cv_find_linkage_utf8=maybe
    32383672             cf_test_CPPFLAGS="$CPPFLAGS"
    3239 @@ -4169,7 +4311,7 @@
     3673@@ -4169,7 +4145,7 @@
    32403674 
    32413675     if test "$cf_cv_find_linkage_utf8" = maybe ; then
    32423676 
    32433677-echo "${as_me:-configure}:4172: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
    3244 +echo "${as_me:-configure}:4314: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
     3678+echo "${as_me:-configure}:4148: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
    32453679 
    32463680       cf_save_LIBS="$LIBS"
    32473681       cf_save_LDFLAGS="$LDFLAGS"
    3248 @@ -4266,13 +4408,13 @@
     3682@@ -4266,13 +4242,13 @@
    32493683           if test -d $cf_cv_library_path_utf8 ; then
    32503684             test -n "$verbose" && echo "       ... testing $cf_cv_library_path_utf8" 1>&6
    32513685 
    32523686-echo "${as_me:-configure}:4269: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
    3253 +echo "${as_me:-configure}:4411: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
     3687+echo "${as_me:-configure}:4245: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
    32543688 
    32553689             CPPFLAGS="$cf_test_CPPFLAGS"
     
    32583692             cat >conftest.$ac_ext <<_ACEOF
    32593693-#line 4275 "configure"
    3260 +#line 4417 "configure"
     3694+#line 4251 "configure"
    32613695 #include "confdefs.h"
    32623696 
    32633697 #include <libutf8.h>
    3264 @@ -4285,21 +4427,21 @@
     3698@@ -4285,21 +4261,21 @@
    32653699 }
    32663700 _ACEOF
    32673701 rm -f conftest.$ac_objext conftest$ac_exeext
    32683702-if { (eval echo "$as_me:4288: \"$ac_link\"") >&5
    3269 +if { (eval echo "$as_me:4430: \"$ac_link\"") >&5
     3703+if { (eval echo "$as_me:4264: \"$ac_link\"") >&5
    32703704   (eval $ac_link) 2>&5
    32713705   ac_status=$?
    32723706-  echo "$as_me:4291: \$? = $ac_status" >&5
    3273 +  echo "$as_me:4433: \$? = $ac_status" >&5
     3707+  echo "$as_me:4267: \$? = $ac_status" >&5
    32743708   (exit $ac_status); } &&
    32753709          { ac_try='test -s conftest$ac_exeext'
    32763710-  { (eval echo "$as_me:4294: \"$ac_try\"") >&5
    3277 +  { (eval echo "$as_me:4436: \"$ac_try\"") >&5
     3711+  { (eval echo "$as_me:4270: \"$ac_try\"") >&5
    32783712   (eval $ac_try) 2>&5
    32793713   ac_status=$?
    32803714-  echo "$as_me:4297: \$? = $ac_status" >&5
    3281 +  echo "$as_me:4439: \$? = $ac_status" >&5
     3715+  echo "$as_me:4273: \$? = $ac_status" >&5
    32823716   (exit $ac_status); }; }; then
    32833717 
     
    32853719 
    32863720-echo "${as_me:-configure}:4302: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
    3287 +echo "${as_me:-configure}:4444: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
     3721+echo "${as_me:-configure}:4278: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
    32883722 
    32893723                 cf_cv_find_linkage_utf8=yes
    32903724                 cf_cv_library_file_utf8="-lutf8"
    3291 @@ -4341,7 +4483,7 @@
     3725@@ -4341,7 +4317,7 @@
    32923726 fi
    32933727 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    32943728 fi
    32953729-echo "$as_me:4344: result: $cf_cv_utf8_lib" >&5
    3296 +echo "$as_me:4486: result: $cf_cv_utf8_lib" >&5
     3730+echo "$as_me:4320: result: $cf_cv_utf8_lib" >&5
    32973731 echo "${ECHO_T}$cf_cv_utf8_lib" >&6
    32983732 
    32993733 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
    3300 @@ -4375,7 +4517,7 @@
     3734@@ -4375,7 +4351,7 @@
    33013735                          cf_save_CPPFLAGS=$CPPFLAGS
    33023736                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
    33033737                          cat >conftest.$ac_ext <<_ACEOF
    33043738-#line 4378 "configure"
    3305 +#line 4520 "configure"
     3739+#line 4354 "configure"
    33063740 #include "confdefs.h"
    33073741 #include <stdio.h>
    33083742 int
    3309 @@ -4387,16 +4529,16 @@
     3743@@ -4387,16 +4363,16 @@
    33103744 }
    33113745 _ACEOF
    33123746 rm -f conftest.$ac_objext
    33133747-if { (eval echo "$as_me:4390: \"$ac_compile\"") >&5
    3314 +if { (eval echo "$as_me:4532: \"$ac_compile\"") >&5
     3748+if { (eval echo "$as_me:4366: \"$ac_compile\"") >&5
    33153749   (eval $ac_compile) 2>&5
    33163750   ac_status=$?
    33173751-  echo "$as_me:4393: \$? = $ac_status" >&5
    3318 +  echo "$as_me:4535: \$? = $ac_status" >&5
     3752+  echo "$as_me:4369: \$? = $ac_status" >&5
    33193753   (exit $ac_status); } &&
    33203754          { ac_try='test -s conftest.$ac_objext'
    33213755-  { (eval echo "$as_me:4396: \"$ac_try\"") >&5
    3322 +  { (eval echo "$as_me:4538: \"$ac_try\"") >&5
     3756+  { (eval echo "$as_me:4372: \"$ac_try\"") >&5
    33233757   (eval $ac_try) 2>&5
    33243758   ac_status=$?
    33253759-  echo "$as_me:4399: \$? = $ac_status" >&5
    3326 +  echo "$as_me:4541: \$? = $ac_status" >&5
     3760+  echo "$as_me:4375: \$? = $ac_status" >&5
    33273761   (exit $ac_status); }; }; then
    33283762   :
    33293763 else
    3330 @@ -4413,7 +4555,7 @@
     3764@@ -4413,7 +4389,7 @@
    33313765                if test "$cf_have_incdir" = no ; then
    33323766                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
    33333767 
    33343768-echo "${as_me:-configure}:4416: testing adding $cf_add_incdir to include-path ..." 1>&5
    3335 +echo "${as_me:-configure}:4558: testing adding $cf_add_incdir to include-path ..." 1>&5
     3769+echo "${as_me:-configure}:4392: testing adding $cf_add_incdir to include-path ..." 1>&5
    33363770 
    33373771                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
    33383772 
    3339 @@ -4447,7 +4589,7 @@
     3773@@ -4447,7 +4423,7 @@
    33403774       if test "$cf_have_libdir" = no ; then
    33413775         test -n "$verbose" && echo "   adding $cf_add_libdir to library-path" 1>&6
    33423776 
    33433777-echo "${as_me:-configure}:4450: testing adding $cf_add_libdir to library-path ..." 1>&5
    3344 +echo "${as_me:-configure}:4592: testing adding $cf_add_libdir to library-path ..." 1>&5
     3778+echo "${as_me:-configure}:4426: testing adding $cf_add_libdir to library-path ..." 1>&5
    33453779 
    33463780         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
    33473781       fi
    3348 @@ -4461,48 +4603,87 @@
     3782@@ -4461,48 +4437,87 @@
    33493783 cf_ncuconfig_root=ncursesw
    33503784 
     
    33573791+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
    33583792+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
    3359 +echo "$as_me:4612: checking for $ac_word" >&5
     3793+echo "$as_me:4446: checking for $ac_word" >&5
    33603794+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    33613795+if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
     
    33723806+  $as_executable_p "$ac_dir/$ac_word" || continue
    33733807+ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
    3374 +echo "$as_me:4627: found $ac_dir/$ac_word" >&5
     3808+echo "$as_me:4461: found $ac_dir/$ac_word" >&5
    33753809+break
    33763810+done
     
    33803814+NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
    33813815+if test -n "$NCURSES_CONFIG"; then
    3382 +  echo "$as_me:4635: result: $NCURSES_CONFIG" >&5
     3816+  echo "$as_me:4469: result: $NCURSES_CONFIG" >&5
    33833817+echo "${ECHO_T}$NCURSES_CONFIG" >&6
    33843818+else
    3385 +  echo "$as_me:4638: result: no" >&5
     3819+  echo "$as_me:4472: result: no" >&5
    33863820+echo "${ECHO_T}no" >&6
    33873821+fi
     
    33973831 set dummy $ac_prog; ac_word=$2
    33983832-echo "$as_me:4468: checking for $ac_word" >&5
    3399 +echo "$as_me:4651: checking for $ac_word" >&5
     3833+echo "$as_me:4485: checking for $ac_word" >&5
    34003834 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    34013835-if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then
     
    34233857+  $as_executable_p "$ac_dir/$ac_word" || continue
    34243858+ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
    3425 +echo "$as_me:4666: found $ac_dir/$ac_word" >&5
     3859+echo "$as_me:4500: found $ac_dir/$ac_word" >&5
    34263860+break
    34273861 done
     
    34383872+ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
    34393873+if test -n "$ac_ct_NCURSES_CONFIG"; then
    3440 +  echo "$as_me:4674: result: $ac_ct_NCURSES_CONFIG" >&5
     3874+  echo "$as_me:4508: result: $ac_ct_NCURSES_CONFIG" >&5
    34413875+echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
    34423876 else
    34433877-  echo "$as_me:4499: result: no" >&5
    3444 +  echo "$as_me:4677: result: no" >&5
     3878+  echo "$as_me:4511: result: no" >&5
    34453879 echo "${ECHO_T}no" >&6
    34463880 fi
     
    34573891 if test "$NCURSES_CONFIG" != none ; then
    34583892 
    3459 @@ -4511,7 +4692,7 @@
     3893@@ -4511,7 +4526,7 @@
    34603894 
    34613895 # even with config script, some packages use no-override for curses.h
    34623896 
    34633897-echo "$as_me:4514: checking if we have identified curses headers" >&5
    3464 +echo "$as_me:4695: checking if we have identified curses headers" >&5
     3898+echo "$as_me:4529: checking if we have identified curses headers" >&5
    34653899 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
    34663900 if test "${cf_cv_ncurses_header+set}" = set; then
    34673901   echo $ECHO_N "(cached) $ECHO_C" >&6
    3468 @@ -4519,13 +4700,13 @@
     3902@@ -4519,13 +4534,13 @@
    34693903 
    34703904 cf_cv_ncurses_header=none
     
    34813915 cat >conftest.$ac_ext <<_ACEOF
    34823916-#line 4528 "configure"
    3483 +#line 4709 "configure"
     3917+#line 4543 "configure"
    34843918 #include "confdefs.h"
    34853919 #include <${cf_header}>
    34863920 int
    3487 @@ -4537,16 +4718,16 @@
     3921@@ -4537,16 +4552,16 @@
    34883922 }
    34893923 _ACEOF
    34903924 rm -f conftest.$ac_objext
    34913925-if { (eval echo "$as_me:4540: \"$ac_compile\"") >&5
    3492 +if { (eval echo "$as_me:4721: \"$ac_compile\"") >&5
     3926+if { (eval echo "$as_me:4555: \"$ac_compile\"") >&5
    34933927   (eval $ac_compile) 2>&5
    34943928   ac_status=$?
    34953929-  echo "$as_me:4543: \$? = $ac_status" >&5
    3496 +  echo "$as_me:4724: \$? = $ac_status" >&5
     3930+  echo "$as_me:4558: \$? = $ac_status" >&5
    34973931   (exit $ac_status); } &&
    34983932          { ac_try='test -s conftest.$ac_objext'
    34993933-  { (eval echo "$as_me:4546: \"$ac_try\"") >&5
    3500 +  { (eval echo "$as_me:4727: \"$ac_try\"") >&5
     3934+  { (eval echo "$as_me:4561: \"$ac_try\"") >&5
    35013935   (eval $ac_try) 2>&5
    35023936   ac_status=$?
    35033937-  echo "$as_me:4549: \$? = $ac_status" >&5
    3504 +  echo "$as_me:4730: \$? = $ac_status" >&5
     3938+  echo "$as_me:4564: \$? = $ac_status" >&5
    35053939   (exit $ac_status); }; }; then
    35063940   cf_cv_ncurses_header=$cf_header; break
    35073941 else
    3508 @@ -4557,11 +4738,11 @@
     3942@@ -4557,11 +4572,11 @@
    35093943 done
    35103944 
    35113945 fi
    35123946-echo "$as_me:4560: result: $cf_cv_ncurses_header" >&5
    3513 +echo "$as_me:4741: result: $cf_cv_ncurses_header" >&5
     3947+echo "$as_me:4575: result: $cf_cv_ncurses_header" >&5
    35143948 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
    35153949 
    35163950 if test "$cf_cv_ncurses_header" = none ; then
    35173951-       { { echo "$as_me:4564: error: No curses header-files found" >&5
    3518 +       { { echo "$as_me:4745: error: No curses header-files found" >&5
     3952+       { { echo "$as_me:4579: error: No curses header-files found" >&5
    35193953 echo "$as_me: error: No curses header-files found" >&2;}
    35203954    { (exit 1); exit 1; }; }
    35213955 fi
    3522 @@ -4571,23 +4752,23 @@
     3956@@ -4571,23 +4586,23 @@
    35233957 for ac_header in $cf_cv_ncurses_header
    35243958 do
    35253959 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    35263960-echo "$as_me:4574: checking for $ac_header" >&5
    3527 +echo "$as_me:4755: checking for $ac_header" >&5
     3961+echo "$as_me:4589: checking for $ac_header" >&5
    35283962 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
    35293963 if eval "test \"\${$as_ac_Header+set}\" = set"; then
     
    35323966   cat >conftest.$ac_ext <<_ACEOF
    35333967-#line 4580 "configure"
    3534 +#line 4761 "configure"
     3968+#line 4595 "configure"
    35353969 #include "confdefs.h"
    35363970 #include <$ac_header>
    35373971 _ACEOF
    35383972-if { (eval echo "$as_me:4584: \"$ac_cpp conftest.$ac_ext\"") >&5
    3539 +if { (eval echo "$as_me:4765: \"$ac_cpp conftest.$ac_ext\"") >&5
     3973+if { (eval echo "$as_me:4599: \"$ac_cpp conftest.$ac_ext\"") >&5
    35403974   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    35413975   ac_status=$?
     
    35443978   cat conftest.err >&5
    35453979-  echo "$as_me:4590: \$? = $ac_status" >&5
    3546 +  echo "$as_me:4771: \$? = $ac_status" >&5
     3980+  echo "$as_me:4605: \$? = $ac_status" >&5
    35473981   (exit $ac_status); } >/dev/null; then
    35483982   if test -s conftest.err; then
    35493983     ac_cpp_err=$ac_c_preproc_warn_flag
    3550 @@ -4606,7 +4787,7 @@
     3984@@ -4606,7 +4621,7 @@
    35513985 fi
    35523986 rm -f conftest.err conftest.$ac_ext
    35533987 fi
    35543988-echo "$as_me:4609: result: `eval echo '${'$as_ac_Header'}'`" >&5
    3555 +echo "$as_me:4790: result: `eval echo '${'$as_ac_Header'}'`" >&5
     3989+echo "$as_me:4624: result: `eval echo '${'$as_ac_Header'}'`" >&5
    35563990 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    35573991 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    35583992   cat >>confdefs.h <<EOF
    3559 @@ -4659,7 +4840,7 @@
     3993@@ -4659,7 +4674,7 @@
    35603994                          cf_save_CPPFLAGS=$CPPFLAGS
    35613995                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
    35623996                          cat >conftest.$ac_ext <<_ACEOF
    35633997-#line 4662 "configure"
    3564 +#line 4843 "configure"
     3998+#line 4677 "configure"
    35653999 #include "confdefs.h"
    35664000 #include <stdio.h>
    35674001 int
    3568 @@ -4671,16 +4852,16 @@
     4002@@ -4671,16 +4686,16 @@
    35694003 }
    35704004 _ACEOF
    35714005 rm -f conftest.$ac_objext
    35724006-if { (eval echo "$as_me:4674: \"$ac_compile\"") >&5
    3573 +if { (eval echo "$as_me:4855: \"$ac_compile\"") >&5
     4007+if { (eval echo "$as_me:4689: \"$ac_compile\"") >&5
    35744008   (eval $ac_compile) 2>&5
    35754009   ac_status=$?
    35764010-  echo "$as_me:4677: \$? = $ac_status" >&5
    3577 +  echo "$as_me:4858: \$? = $ac_status" >&5
     4011+  echo "$as_me:4692: \$? = $ac_status" >&5
    35784012   (exit $ac_status); } &&
    35794013          { ac_try='test -s conftest.$ac_objext'
    35804014-  { (eval echo "$as_me:4680: \"$ac_try\"") >&5
    3581 +  { (eval echo "$as_me:4861: \"$ac_try\"") >&5
     4015+  { (eval echo "$as_me:4695: \"$ac_try\"") >&5
    35824016   (eval $ac_try) 2>&5
    35834017   ac_status=$?
    35844018-  echo "$as_me:4683: \$? = $ac_status" >&5
    3585 +  echo "$as_me:4864: \$? = $ac_status" >&5
     4019+  echo "$as_me:4698: \$? = $ac_status" >&5
    35864020   (exit $ac_status); }; }; then
    35874021   :
    35884022 else
    3589 @@ -4697,7 +4878,7 @@
     4023@@ -4697,7 +4712,7 @@
    35904024                if test "$cf_have_incdir" = no ; then
    35914025                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
    35924026 
    35934027-echo "${as_me:-configure}:4700: testing adding $cf_add_incdir to include-path ..." 1>&5
    3594 +echo "${as_me:-configure}:4881: testing adding $cf_add_incdir to include-path ..." 1>&5
     4028+echo "${as_me:-configure}:4715: testing adding $cf_add_incdir to include-path ..." 1>&5
    35954029 
    35964030                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
    35974031 
    3598 @@ -4714,7 +4895,7 @@
     4032@@ -4714,7 +4729,7 @@
    35994033 
    36004034 }
    36014035 
    36024036-echo "$as_me:4717: checking for $cf_ncuhdr_root header in include-path" >&5
    3603 +echo "$as_me:4898: checking for $cf_ncuhdr_root header in include-path" >&5
     4037+echo "$as_me:4732: checking for $cf_ncuhdr_root header in include-path" >&5
    36044038 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
    36054039 if test "${cf_cv_ncurses_h+set}" = set; then
    36064040   echo $ECHO_N "(cached) $ECHO_C" >&6
    3607 @@ -4726,7 +4907,7 @@
     4041@@ -4726,7 +4741,7 @@
    36084042        do
    36094043 
    36104044        cat >conftest.$ac_ext <<_ACEOF
    36114045-#line 4729 "configure"
    3612 +#line 4910 "configure"
     4046+#line 4744 "configure"
    36134047 #include "confdefs.h"
    36144048 
    36154049 #define _XOPEN_SOURCE_EXTENDED
    3616 @@ -4758,16 +4939,16 @@
     4050@@ -4758,16 +4773,16 @@
    36174051 }
    36184052 _ACEOF
    36194053 rm -f conftest.$ac_objext
    36204054-if { (eval echo "$as_me:4761: \"$ac_compile\"") >&5
    3621 +if { (eval echo "$as_me:4942: \"$ac_compile\"") >&5
     4055+if { (eval echo "$as_me:4776: \"$ac_compile\"") >&5
    36224056   (eval $ac_compile) 2>&5
    36234057   ac_status=$?
    36244058-  echo "$as_me:4764: \$? = $ac_status" >&5
    3625 +  echo "$as_me:4945: \$? = $ac_status" >&5
     4059+  echo "$as_me:4779: \$? = $ac_status" >&5
    36264060   (exit $ac_status); } &&
    36274061          { ac_try='test -s conftest.$ac_objext'
    36284062-  { (eval echo "$as_me:4767: \"$ac_try\"") >&5
    3629 +  { (eval echo "$as_me:4948: \"$ac_try\"") >&5
     4063+  { (eval echo "$as_me:4782: \"$ac_try\"") >&5
    36304064   (eval $ac_try) 2>&5
    36314065   ac_status=$?
    36324066-  echo "$as_me:4770: \$? = $ac_status" >&5
    3633 +  echo "$as_me:4951: \$? = $ac_status" >&5
     4067+  echo "$as_me:4785: \$? = $ac_status" >&5
    36344068   (exit $ac_status); }; }; then
    36354069   cf_cv_ncurses_h=$cf_header
    36364070 
    3637 @@ -4782,14 +4963,14 @@
     4071@@ -4782,14 +4797,14 @@
    36384072        done
    36394073 
    36404074 fi
    36414075-echo "$as_me:4785: result: $cf_cv_ncurses_h" >&5
    3642 +echo "$as_me:4966: result: $cf_cv_ncurses_h" >&5
     4076+echo "$as_me:4800: result: $cf_cv_ncurses_h" >&5
    36434077 echo "${ECHO_T}$cf_cv_ncurses_h" >&6
    36444078 
     
    36484082 
    36494083-echo "$as_me:4792: checking for $cf_ncuhdr_root include-path" >&5
    3650 +echo "$as_me:4973: checking for $cf_ncuhdr_root include-path" >&5
     4084+echo "$as_me:4807: checking for $cf_ncuhdr_root include-path" >&5
    36514085 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
    36524086 if test "${cf_cv_ncurses_h2+set}" = set; then
    36534087   echo $ECHO_N "(cached) $ECHO_C" >&6
    3654 @@ -4929,7 +5110,7 @@
     4088@@ -4929,7 +4944,7 @@
    36554089                          cf_save_CPPFLAGS=$CPPFLAGS
    36564090                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
    36574091                          cat >conftest.$ac_ext <<_ACEOF
    36584092-#line 4932 "configure"
    3659 +#line 5113 "configure"
     4093+#line 4947 "configure"
    36604094 #include "confdefs.h"
    36614095 #include <stdio.h>
    36624096 int
    3663 @@ -4941,16 +5122,16 @@
     4097@@ -4941,16 +4956,16 @@
    36644098 }
    36654099 _ACEOF
    36664100 rm -f conftest.$ac_objext
    36674101-if { (eval echo "$as_me:4944: \"$ac_compile\"") >&5
    3668 +if { (eval echo "$as_me:5125: \"$ac_compile\"") >&5
     4102+if { (eval echo "$as_me:4959: \"$ac_compile\"") >&5
    36694103   (eval $ac_compile) 2>&5
    36704104   ac_status=$?
    36714105-  echo "$as_me:4947: \$? = $ac_status" >&5
    3672 +  echo "$as_me:5128: \$? = $ac_status" >&5
     4106+  echo "$as_me:4962: \$? = $ac_status" >&5
    36734107   (exit $ac_status); } &&
    36744108          { ac_try='test -s conftest.$ac_objext'
    36754109-  { (eval echo "$as_me:4950: \"$ac_try\"") >&5
    3676 +  { (eval echo "$as_me:5131: \"$ac_try\"") >&5
     4110+  { (eval echo "$as_me:4965: \"$ac_try\"") >&5
    36774111   (eval $ac_try) 2>&5
    36784112   ac_status=$?
    36794113-  echo "$as_me:4953: \$? = $ac_status" >&5
    3680 +  echo "$as_me:5134: \$? = $ac_status" >&5
     4114+  echo "$as_me:4968: \$? = $ac_status" >&5
    36814115   (exit $ac_status); }; }; then
    36824116   :
    36834117 else
    3684 @@ -4967,7 +5148,7 @@
     4118@@ -4967,7 +4982,7 @@
    36854119                if test "$cf_have_incdir" = no ; then
    36864120                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
    36874121 
    36884122-echo "${as_me:-configure}:4970: testing adding $cf_add_incdir to include-path ..." 1>&5
    3689 +echo "${as_me:-configure}:5151: testing adding $cf_add_incdir to include-path ..." 1>&5
     4123+echo "${as_me:-configure}:4985: testing adding $cf_add_incdir to include-path ..." 1>&5
    36904124 
    36914125                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
    36924126 
    3693 @@ -4988,7 +5169,7 @@
     4127@@ -4988,7 +5003,7 @@
    36944128                do
    36954129 
    36964130        cat >conftest.$ac_ext <<_ACEOF
    36974131-#line 4991 "configure"
    3698 +#line 5172 "configure"
     4132+#line 5006 "configure"
    36994133 #include "confdefs.h"
    37004134 
    37014135 #include <$cf_header>
    3702 @@ -5012,16 +5193,16 @@
     4136@@ -5012,16 +5027,16 @@
    37034137 }
    37044138 _ACEOF
    37054139 rm -f conftest.$ac_objext
    37064140-if { (eval echo "$as_me:5015: \"$ac_compile\"") >&5
    3707 +if { (eval echo "$as_me:5196: \"$ac_compile\"") >&5
     4141+if { (eval echo "$as_me:5030: \"$ac_compile\"") >&5
    37084142   (eval $ac_compile) 2>&5
    37094143   ac_status=$?
    37104144-  echo "$as_me:5018: \$? = $ac_status" >&5
    3711 +  echo "$as_me:5199: \$? = $ac_status" >&5
     4145+  echo "$as_me:5033: \$? = $ac_status" >&5
    37124146   (exit $ac_status); } &&
    37134147          { ac_try='test -s conftest.$ac_objext'
    37144148-  { (eval echo "$as_me:5021: \"$ac_try\"") >&5
    3715 +  { (eval echo "$as_me:5202: \"$ac_try\"") >&5
     4149+  { (eval echo "$as_me:5036: \"$ac_try\"") >&5
    37164150   (eval $ac_try) 2>&5
    37174151   ac_status=$?
    37184152-  echo "$as_me:5024: \$? = $ac_status" >&5
    3719 +  echo "$as_me:5205: \$? = $ac_status" >&5
     4153+  echo "$as_me:5039: \$? = $ac_status" >&5
    37204154   (exit $ac_status); }; }; then
    37214155   cf_cv_ncurses_h2=$cf_header
    37224156 
    3723 @@ -5042,12 +5223,12 @@
     4157@@ -5042,12 +5057,12 @@
    37244158                CPPFLAGS="$cf_save2_CPPFLAGS"
    37254159                test "$cf_cv_ncurses_h2" != no && break
    37264160        done
    37274161-       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5045: error: not found" >&5
    3728 +       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5226: error: not found" >&5
     4162+       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5060: error: not found" >&5
    37294163 echo "$as_me: error: not found" >&2;}
    37304164    { (exit 1); exit 1; }; }
     
    37324166 fi
    37334167-echo "$as_me:5050: result: $cf_cv_ncurses_h2" >&5
    3734 +echo "$as_me:5231: result: $cf_cv_ncurses_h2" >&5
     4168+echo "$as_me:5065: result: $cf_cv_ncurses_h2" >&5
    37354169 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
    37364170 
    37374171        cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
    3738 @@ -5080,7 +5261,7 @@
     4172@@ -5080,7 +5095,7 @@
    37394173                          cf_save_CPPFLAGS=$CPPFLAGS
    37404174                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
    37414175                          cat >conftest.$ac_ext <<_ACEOF
    37424176-#line 5083 "configure"
    3743 +#line 5264 "configure"
     4177+#line 5098 "configure"
    37444178 #include "confdefs.h"
    37454179 #include <stdio.h>
    37464180 int
    3747 @@ -5092,16 +5273,16 @@
     4181@@ -5092,16 +5107,16 @@
    37484182 }
    37494183 _ACEOF
    37504184 rm -f conftest.$ac_objext
    37514185-if { (eval echo "$as_me:5095: \"$ac_compile\"") >&5
    3752 +if { (eval echo "$as_me:5276: \"$ac_compile\"") >&5
     4186+if { (eval echo "$as_me:5110: \"$ac_compile\"") >&5
    37534187   (eval $ac_compile) 2>&5
    37544188   ac_status=$?
    37554189-  echo "$as_me:5098: \$? = $ac_status" >&5
    3756 +  echo "$as_me:5279: \$? = $ac_status" >&5
     4190+  echo "$as_me:5113: \$? = $ac_status" >&5
    37574191   (exit $ac_status); } &&
    37584192          { ac_try='test -s conftest.$ac_objext'
    37594193-  { (eval echo "$as_me:5101: \"$ac_try\"") >&5
    3760 +  { (eval echo "$as_me:5282: \"$ac_try\"") >&5
     4194+  { (eval echo "$as_me:5116: \"$ac_try\"") >&5
    37614195   (eval $ac_try) 2>&5
    37624196   ac_status=$?
    37634197-  echo "$as_me:5104: \$? = $ac_status" >&5
    3764 +  echo "$as_me:5285: \$? = $ac_status" >&5
     4198+  echo "$as_me:5119: \$? = $ac_status" >&5
    37654199   (exit $ac_status); }; }; then
    37664200   :
    37674201 else
    3768 @@ -5118,7 +5299,7 @@
     4202@@ -5118,7 +5133,7 @@
    37694203                if test "$cf_have_incdir" = no ; then
    37704204                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
    37714205 
    37724206-echo "${as_me:-configure}:5121: testing adding $cf_add_incdir to include-path ..." 1>&5
    3773 +echo "${as_me:-configure}:5302: testing adding $cf_add_incdir to include-path ..." 1>&5
     4207+echo "${as_me:-configure}:5136: testing adding $cf_add_incdir to include-path ..." 1>&5
    37744208 
    37754209                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
    37764210 
    3777 @@ -5161,7 +5342,7 @@
     4211@@ -5161,7 +5176,7 @@
    37784212        ;;
    37794213 esac
    37804214 
    37814215-echo "$as_me:5164: checking for terminfo header" >&5
    3782 +echo "$as_me:5345: checking for terminfo header" >&5
     4216+echo "$as_me:5179: checking for terminfo header" >&5
    37834217 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
    37844218 if test "${cf_cv_term_header+set}" = set; then
    37854219   echo $ECHO_N "(cached) $ECHO_C" >&6
    3786 @@ -5179,7 +5360,7 @@
     4220@@ -5179,7 +5194,7 @@
    37874221 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
    37884222 do
    37894223 cat >conftest.$ac_ext <<_ACEOF
    37904224-#line 5182 "configure"
    3791 +#line 5363 "configure"
     4225+#line 5197 "configure"
    37924226 #include "confdefs.h"
    37934227 #include <stdio.h>
    37944228 #include <${cf_cv_ncurses_header:-curses.h}>
    3795 @@ -5194,16 +5375,16 @@
     4229@@ -5194,16 +5209,16 @@
    37964230 }
    37974231 _ACEOF
    37984232 rm -f conftest.$ac_objext
    37994233-if { (eval echo "$as_me:5197: \"$ac_compile\"") >&5
    3800 +if { (eval echo "$as_me:5378: \"$ac_compile\"") >&5
     4234+if { (eval echo "$as_me:5212: \"$ac_compile\"") >&5
    38014235   (eval $ac_compile) 2>&5
    38024236   ac_status=$?
    38034237-  echo "$as_me:5200: \$? = $ac_status" >&5
    3804 +  echo "$as_me:5381: \$? = $ac_status" >&5
     4238+  echo "$as_me:5215: \$? = $ac_status" >&5
    38054239   (exit $ac_status); } &&
    38064240          { ac_try='test -s conftest.$ac_objext'
    38074241-  { (eval echo "$as_me:5203: \"$ac_try\"") >&5
    3808 +  { (eval echo "$as_me:5384: \"$ac_try\"") >&5
     4242+  { (eval echo "$as_me:5218: \"$ac_try\"") >&5
    38094243   (eval $ac_try) 2>&5
    38104244   ac_status=$?
    38114245-  echo "$as_me:5206: \$? = $ac_status" >&5
    3812 +  echo "$as_me:5387: \$? = $ac_status" >&5
     4246+  echo "$as_me:5221: \$? = $ac_status" >&5
    38134247   (exit $ac_status); }; }; then
    38144248 
    38154249        cf_cv_term_header="$cf_test"
    3816 @@ -5219,7 +5400,7 @@
     4250@@ -5219,7 +5234,7 @@
    38174251 done
    38184252 
    38194253 fi
    38204254-echo "$as_me:5222: result: $cf_cv_term_header" >&5
    3821 +echo "$as_me:5403: result: $cf_cv_term_header" >&5
     4255+echo "$as_me:5237: result: $cf_cv_term_header" >&5
    38224256 echo "${ECHO_T}$cf_cv_term_header" >&6
    38234257 
    38244258 # Set definitions to allow ifdef'ing to accommodate subdirectories
    3825 @@ -5253,7 +5434,7 @@
     4259@@ -5253,7 +5268,7 @@
    38264260 #define NCURSES 1
    38274261 EOF
    38284262 
    38294263-echo "$as_me:5256: checking for ncurses version" >&5
    3830 +echo "$as_me:5437: checking for ncurses version" >&5
     4264+echo "$as_me:5271: checking for ncurses version" >&5
    38314265 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
    38324266 if test "${cf_cv_ncurses_version+set}" = set; then
    38334267   echo $ECHO_N "(cached) $ECHO_C" >&6
    3834 @@ -5279,10 +5460,10 @@
     4268@@ -5279,10 +5294,10 @@
    38354269 #endif
    38364270 EOF
    38374271        cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
    38384272-       { (eval echo "$as_me:5282: \"$cf_try\"") >&5
    3839 +       { (eval echo "$as_me:5463: \"$cf_try\"") >&5
     4273+       { (eval echo "$as_me:5297: \"$cf_try\"") >&5
    38404274   (eval $cf_try) 2>&5
    38414275   ac_status=$?
    38424276-  echo "$as_me:5285: \$? = $ac_status" >&5
    3843 +  echo "$as_me:5466: \$? = $ac_status" >&5
     4277+  echo "$as_me:5300: \$? = $ac_status" >&5
    38444278   (exit $ac_status); }
    38454279        if test -f conftest.out ; then
    38464280                cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
    3847 @@ -5292,7 +5473,7 @@
     4281@@ -5292,7 +5307,7 @@
    38484282 
    38494283 else
    38504284   cat >conftest.$ac_ext <<_ACEOF
    38514285-#line 5295 "configure"
    3852 +#line 5476 "configure"
     4286+#line 5310 "configure"
    38534287 #include "confdefs.h"
    38544288 
    38554289 #include <${cf_cv_ncurses_header:-curses.h}>
    3856 @@ -5317,15 +5498,15 @@
     4290@@ -5317,15 +5332,15 @@
    38574291 }
    38584292 _ACEOF
    38594293 rm -f conftest$ac_exeext
    38604294-if { (eval echo "$as_me:5320: \"$ac_link\"") >&5
    3861 +if { (eval echo "$as_me:5501: \"$ac_link\"") >&5
     4295+if { (eval echo "$as_me:5335: \"$ac_link\"") >&5
    38624296   (eval $ac_link) 2>&5
    38634297   ac_status=$?
    38644298-  echo "$as_me:5323: \$? = $ac_status" >&5
    3865 +  echo "$as_me:5504: \$? = $ac_status" >&5
     4299+  echo "$as_me:5338: \$? = $ac_status" >&5
    38664300   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    38674301-  { (eval echo "$as_me:5325: \"$ac_try\"") >&5
    3868 +  { (eval echo "$as_me:5506: \"$ac_try\"") >&5
     4302+  { (eval echo "$as_me:5340: \"$ac_try\"") >&5
    38694303   (eval $ac_try) 2>&5
    38704304   ac_status=$?
    38714305-  echo "$as_me:5328: \$? = $ac_status" >&5
    3872 +  echo "$as_me:5509: \$? = $ac_status" >&5
     4306+  echo "$as_me:5343: \$? = $ac_status" >&5
    38734307   (exit $ac_status); }; }; then
    38744308 
    38754309        cf_cv_ncurses_version=`cat $cf_tempfile`
    3876 @@ -5339,7 +5520,7 @@
     4310@@ -5339,7 +5354,7 @@
    38774311        rm -f $cf_tempfile
    38784312 
    38794313 fi
    38804314-echo "$as_me:5342: result: $cf_cv_ncurses_version" >&5
    3881 +echo "$as_me:5523: result: $cf_cv_ncurses_version" >&5
     4315+echo "$as_me:5357: result: $cf_cv_ncurses_version" >&5
    38824316 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
    38834317 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
    38844318 #define NCURSES 1
    3885 @@ -5351,7 +5532,7 @@
     4319@@ -5351,7 +5366,7 @@
    38864320        # to link gpm.
    38874321 cf_ncurses_LIBS=""
    38884322 cf_ncurses_SAVE="$LIBS"
    38894323-echo "$as_me:5354: checking for Gpm_Open in -lgpm" >&5
    3890 +echo "$as_me:5535: checking for Gpm_Open in -lgpm" >&5
     4324+echo "$as_me:5369: checking for Gpm_Open in -lgpm" >&5
    38914325 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
    38924326 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
    38934327   echo $ECHO_N "(cached) $ECHO_C" >&6
    3894 @@ -5359,7 +5540,7 @@
     4328@@ -5359,7 +5374,7 @@
    38954329   ac_check_lib_save_LIBS=$LIBS
    38964330 LIBS="-lgpm  $LIBS"
    38974331 cat >conftest.$ac_ext <<_ACEOF
    38984332-#line 5362 "configure"
    3899 +#line 5543 "configure"
     4333+#line 5377 "configure"
    39004334 #include "confdefs.h"
    39014335 
    39024336 /* Override any gcc2 internal prototype to avoid an error.  */
    3903 @@ -5378,16 +5559,16 @@
     4337@@ -5378,16 +5393,16 @@
    39044338 }
    39054339 _ACEOF
    39064340 rm -f conftest.$ac_objext conftest$ac_exeext
    39074341-if { (eval echo "$as_me:5381: \"$ac_link\"") >&5
    3908 +if { (eval echo "$as_me:5562: \"$ac_link\"") >&5
     4342+if { (eval echo "$as_me:5396: \"$ac_link\"") >&5
    39094343   (eval $ac_link) 2>&5
    39104344   ac_status=$?
    39114345-  echo "$as_me:5384: \$? = $ac_status" >&5
    3912 +  echo "$as_me:5565: \$? = $ac_status" >&5
     4346+  echo "$as_me:5399: \$? = $ac_status" >&5
    39134347   (exit $ac_status); } &&
    39144348          { ac_try='test -s conftest$ac_exeext'
    39154349-  { (eval echo "$as_me:5387: \"$ac_try\"") >&5
    3916 +  { (eval echo "$as_me:5568: \"$ac_try\"") >&5
     4350+  { (eval echo "$as_me:5402: \"$ac_try\"") >&5
    39174351   (eval $ac_try) 2>&5
    39184352   ac_status=$?
    39194353-  echo "$as_me:5390: \$? = $ac_status" >&5
    3920 +  echo "$as_me:5571: \$? = $ac_status" >&5
     4354+  echo "$as_me:5405: \$? = $ac_status" >&5
    39214355   (exit $ac_status); }; }; then
    39224356   ac_cv_lib_gpm_Gpm_Open=yes
    39234357 else
    3924 @@ -5398,10 +5579,10 @@
     4358@@ -5398,10 +5413,10 @@
    39254359 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    39264360 LIBS=$ac_check_lib_save_LIBS
    39274361 fi
    39284362-echo "$as_me:5401: result: $ac_cv_lib_gpm_Gpm_Open" >&5
    3929 +echo "$as_me:5582: result: $ac_cv_lib_gpm_Gpm_Open" >&5
     4363+echo "$as_me:5416: result: $ac_cv_lib_gpm_Gpm_Open" >&5
    39304364 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
    39314365 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
    39324366-  echo "$as_me:5404: checking for initscr in -lgpm" >&5
    3933 +  echo "$as_me:5585: checking for initscr in -lgpm" >&5
     4367+  echo "$as_me:5419: checking for initscr in -lgpm" >&5
    39344368 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
    39354369 if test "${ac_cv_lib_gpm_initscr+set}" = set; then
    39364370   echo $ECHO_N "(cached) $ECHO_C" >&6
    3937 @@ -5409,7 +5590,7 @@
     4371@@ -5409,7 +5424,7 @@
    39384372   ac_check_lib_save_LIBS=$LIBS
    39394373 LIBS="-lgpm  $LIBS"
    39404374 cat >conftest.$ac_ext <<_ACEOF
    39414375-#line 5412 "configure"
    3942 +#line 5593 "configure"
     4376+#line 5427 "configure"
    39434377 #include "confdefs.h"
    39444378 
    39454379 /* Override any gcc2 internal prototype to avoid an error.  */
    3946 @@ -5428,16 +5609,16 @@
     4380@@ -5428,16 +5443,16 @@
    39474381 }
    39484382 _ACEOF
    39494383 rm -f conftest.$ac_objext conftest$ac_exeext
    39504384-if { (eval echo "$as_me:5431: \"$ac_link\"") >&5
    3951 +if { (eval echo "$as_me:5612: \"$ac_link\"") >&5
     4385+if { (eval echo "$as_me:5446: \"$ac_link\"") >&5
    39524386   (eval $ac_link) 2>&5
    39534387   ac_status=$?
    39544388-  echo "$as_me:5434: \$? = $ac_status" >&5
    3955 +  echo "$as_me:5615: \$? = $ac_status" >&5
     4389+  echo "$as_me:5449: \$? = $ac_status" >&5
    39564390   (exit $ac_status); } &&
    39574391          { ac_try='test -s conftest$ac_exeext'
    39584392-  { (eval echo "$as_me:5437: \"$ac_try\"") >&5
    3959 +  { (eval echo "$as_me:5618: \"$ac_try\"") >&5
     4393+  { (eval echo "$as_me:5452: \"$ac_try\"") >&5
    39604394   (eval $ac_try) 2>&5
    39614395   ac_status=$?
    39624396-  echo "$as_me:5440: \$? = $ac_status" >&5
    3963 +  echo "$as_me:5621: \$? = $ac_status" >&5
     4397+  echo "$as_me:5455: \$? = $ac_status" >&5
    39644398   (exit $ac_status); }; }; then
    39654399   ac_cv_lib_gpm_initscr=yes
    39664400 else
    3967 @@ -5448,7 +5629,7 @@
     4401@@ -5448,7 +5463,7 @@
    39684402 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    39694403 LIBS=$ac_check_lib_save_LIBS
    39704404 fi
    39714405-echo "$as_me:5451: result: $ac_cv_lib_gpm_initscr" >&5
    3972 +echo "$as_me:5632: result: $ac_cv_lib_gpm_initscr" >&5
     4406+echo "$as_me:5466: result: $ac_cv_lib_gpm_initscr" >&5
    39734407 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
    39744408 if test $ac_cv_lib_gpm_initscr = yes; then
    39754409   LIBS="$cf_ncurses_SAVE"
    3976 @@ -5463,7 +5644,7 @@
     4410@@ -5463,7 +5478,7 @@
    39774411        # This is only necessary if you are linking against an obsolete
    39784412        # version of ncurses (but it should do no harm, since it's static).
    39794413        if test "$cf_nculib_root" = ncurses ; then
    39804414-               echo "$as_me:5466: checking for tgoto in -lmytinfo" >&5
    3981 +               echo "$as_me:5647: checking for tgoto in -lmytinfo" >&5
     4415+               echo "$as_me:5481: checking for tgoto in -lmytinfo" >&5
    39824416 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
    39834417 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
    39844418   echo $ECHO_N "(cached) $ECHO_C" >&6
    3985 @@ -5471,7 +5652,7 @@
     4419@@ -5471,7 +5486,7 @@
    39864420   ac_check_lib_save_LIBS=$LIBS
    39874421 LIBS="-lmytinfo  $LIBS"
    39884422 cat >conftest.$ac_ext <<_ACEOF
    39894423-#line 5474 "configure"
    3990 +#line 5655 "configure"
     4424+#line 5489 "configure"
    39914425 #include "confdefs.h"
    39924426 
    39934427 /* Override any gcc2 internal prototype to avoid an error.  */
    3994 @@ -5490,16 +5671,16 @@
     4428@@ -5490,16 +5505,16 @@
    39954429 }
    39964430 _ACEOF
    39974431 rm -f conftest.$ac_objext conftest$ac_exeext
    39984432-if { (eval echo "$as_me:5493: \"$ac_link\"") >&5
    3999 +if { (eval echo "$as_me:5674: \"$ac_link\"") >&5
     4433+if { (eval echo "$as_me:5508: \"$ac_link\"") >&5
    40004434   (eval $ac_link) 2>&5
    40014435   ac_status=$?
    40024436-  echo "$as_me:5496: \$? = $ac_status" >&5
    4003 +  echo "$as_me:5677: \$? = $ac_status" >&5
     4437+  echo "$as_me:5511: \$? = $ac_status" >&5
    40044438   (exit $ac_status); } &&
    40054439          { ac_try='test -s conftest$ac_exeext'
    40064440-  { (eval echo "$as_me:5499: \"$ac_try\"") >&5
    4007 +  { (eval echo "$as_me:5680: \"$ac_try\"") >&5
     4441+  { (eval echo "$as_me:5514: \"$ac_try\"") >&5
    40084442   (eval $ac_try) 2>&5
    40094443   ac_status=$?
    40104444-  echo "$as_me:5502: \$? = $ac_status" >&5
    4011 +  echo "$as_me:5683: \$? = $ac_status" >&5
     4445+  echo "$as_me:5517: \$? = $ac_status" >&5
    40124446   (exit $ac_status); }; }; then
    40134447   ac_cv_lib_mytinfo_tgoto=yes
    40144448 else
    4015 @@ -5510,7 +5691,7 @@
     4449@@ -5510,7 +5525,7 @@
    40164450 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    40174451 LIBS=$ac_check_lib_save_LIBS
    40184452 fi
    40194453-echo "$as_me:5513: result: $ac_cv_lib_mytinfo_tgoto" >&5
    4020 +echo "$as_me:5694: result: $ac_cv_lib_mytinfo_tgoto" >&5
     4454+echo "$as_me:5528: result: $ac_cv_lib_mytinfo_tgoto" >&5
    40214455 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
    40224456 if test $ac_cv_lib_mytinfo_tgoto = yes; then
    40234457   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
    4024 @@ -5529,13 +5710,13 @@
     4458@@ -5529,13 +5544,13 @@
    40254459 
    40264460        eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
    40274461        cf_libdir=""
    40284462-       echo "$as_me:5532: checking for initscr" >&5
    4029 +       echo "$as_me:5713: checking for initscr" >&5
     4463+       echo "$as_me:5547: checking for initscr" >&5
    40304464 echo $ECHO_N "checking for initscr... $ECHO_C" >&6
    40314465 if test "${ac_cv_func_initscr+set}" = set; then
     
    40344468   cat >conftest.$ac_ext <<_ACEOF
    40354469-#line 5538 "configure"
    4036 +#line 5719 "configure"
     4470+#line 5553 "configure"
    40374471 #include "confdefs.h"
    40384472 /* System header to define __stub macros and hopefully few prototypes,
    40394473     which can conflict with char initscr (); below.  */
    4040 @@ -5566,16 +5747,16 @@
     4474@@ -5558,7 +5573,7 @@
     4475 #if defined (__stub_initscr) || defined (__stub___initscr)
     4476 choke me
     4477 #else
     4478-f = initscr;
     4479+f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
     4480 #endif
     4481 
     4482   ;
     4483@@ -5566,16 +5581,16 @@
    40414484 }
    40424485 _ACEOF
    40434486 rm -f conftest.$ac_objext conftest$ac_exeext
    40444487-if { (eval echo "$as_me:5569: \"$ac_link\"") >&5
    4045 +if { (eval echo "$as_me:5750: \"$ac_link\"") >&5
     4488+if { (eval echo "$as_me:5584: \"$ac_link\"") >&5
    40464489   (eval $ac_link) 2>&5
    40474490   ac_status=$?
    40484491-  echo "$as_me:5572: \$? = $ac_status" >&5
    4049 +  echo "$as_me:5753: \$? = $ac_status" >&5
     4492+  echo "$as_me:5587: \$? = $ac_status" >&5
    40504493   (exit $ac_status); } &&
    40514494          { ac_try='test -s conftest$ac_exeext'
    40524495-  { (eval echo "$as_me:5575: \"$ac_try\"") >&5
    4053 +  { (eval echo "$as_me:5756: \"$ac_try\"") >&5
     4496+  { (eval echo "$as_me:5590: \"$ac_try\"") >&5
    40544497   (eval $ac_try) 2>&5
    40554498   ac_status=$?
    40564499-  echo "$as_me:5578: \$? = $ac_status" >&5
    4057 +  echo "$as_me:5759: \$? = $ac_status" >&5
     4500+  echo "$as_me:5593: \$? = $ac_status" >&5
    40584501   (exit $ac_status); }; }; then
    40594502   ac_cv_func_initscr=yes
    40604503 else
    4061 @@ -5585,18 +5766,18 @@
     4504@@ -5585,18 +5600,18 @@
    40624505 fi
    40634506 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    40644507 fi
    40654508-echo "$as_me:5588: result: $ac_cv_func_initscr" >&5
    4066 +echo "$as_me:5769: result: $ac_cv_func_initscr" >&5
     4509+echo "$as_me:5603: result: $ac_cv_func_initscr" >&5
    40674510 echo "${ECHO_T}$ac_cv_func_initscr" >&6
    40684511 if test $ac_cv_func_initscr = yes; then
     
    40724515                cf_save_LIBS="$LIBS"
    40734516-               echo "$as_me:5595: checking for initscr in -l$cf_nculib_root" >&5
    4074 +               echo "$as_me:5776: checking for initscr in -l$cf_nculib_root" >&5
     4517+               echo "$as_me:5610: checking for initscr in -l$cf_nculib_root" >&5
    40754518 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
    40764519                LIBS="-l$cf_nculib_root $LIBS"
    40774520                cat >conftest.$ac_ext <<_ACEOF
    40784521-#line 5599 "configure"
    4079 +#line 5780 "configure"
     4522+#line 5614 "configure"
    40804523 #include "confdefs.h"
    40814524 #include <${cf_cv_ncurses_header:-curses.h}>
    40824525 int
    4083 @@ -5608,25 +5789,25 @@
     4526@@ -5608,25 +5623,25 @@
    40844527 }
    40854528 _ACEOF
    40864529 rm -f conftest.$ac_objext conftest$ac_exeext
    40874530-if { (eval echo "$as_me:5611: \"$ac_link\"") >&5
    4088 +if { (eval echo "$as_me:5792: \"$ac_link\"") >&5
     4531+if { (eval echo "$as_me:5626: \"$ac_link\"") >&5
    40894532   (eval $ac_link) 2>&5
    40904533   ac_status=$?
    40914534-  echo "$as_me:5614: \$? = $ac_status" >&5
    4092 +  echo "$as_me:5795: \$? = $ac_status" >&5
     4535+  echo "$as_me:5629: \$? = $ac_status" >&5
    40934536   (exit $ac_status); } &&
    40944537          { ac_try='test -s conftest$ac_exeext'
    40954538-  { (eval echo "$as_me:5617: \"$ac_try\"") >&5
    4096 +  { (eval echo "$as_me:5798: \"$ac_try\"") >&5
     4539+  { (eval echo "$as_me:5632: \"$ac_try\"") >&5
    40974540   (eval $ac_try) 2>&5
    40984541   ac_status=$?
    40994542-  echo "$as_me:5620: \$? = $ac_status" >&5
    4100 +  echo "$as_me:5801: \$? = $ac_status" >&5
     4543+  echo "$as_me:5635: \$? = $ac_status" >&5
    41014544   (exit $ac_status); }; }; then
    41024545-  echo "$as_me:5622: result: yes" >&5
    4103 +  echo "$as_me:5803: result: yes" >&5
     4546+  echo "$as_me:5637: result: yes" >&5
    41044547 echo "${ECHO_T}yes" >&6
    41054548                         eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
     
    41094552 cat conftest.$ac_ext >&5
    41104553-echo "$as_me:5629: result: no" >&5
    4111 +echo "$as_me:5810: result: no" >&5
     4554+echo "$as_me:5644: result: no" >&5
    41124555 echo "${ECHO_T}no" >&6
    41134556 
    41144557 cf_search=
    4115 @@ -5716,11 +5897,11 @@
     4558@@ -5716,11 +5731,11 @@
    41164559 
    41174560                        for cf_libdir in $cf_search
    41184561                        do
    41194562-                               echo "$as_me:5719: checking for -l$cf_nculib_root in $cf_libdir" >&5
    4120 +                               echo "$as_me:5900: checking for -l$cf_nculib_root in $cf_libdir" >&5
     4563+                               echo "$as_me:5734: checking for -l$cf_nculib_root in $cf_libdir" >&5
    41214564 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
    41224565                                LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
    41234566                                cat >conftest.$ac_ext <<_ACEOF
    41244567-#line 5723 "configure"
    4125 +#line 5904 "configure"
     4568+#line 5738 "configure"
    41264569 #include "confdefs.h"
    41274570 #include <${cf_cv_ncurses_header:-curses.h}>
    41284571 int
    4129 @@ -5732,25 +5913,25 @@
     4572@@ -5732,25 +5747,25 @@
    41304573 }
    41314574 _ACEOF
    41324575 rm -f conftest.$ac_objext conftest$ac_exeext
    41334576-if { (eval echo "$as_me:5735: \"$ac_link\"") >&5
    4134 +if { (eval echo "$as_me:5916: \"$ac_link\"") >&5
     4577+if { (eval echo "$as_me:5750: \"$ac_link\"") >&5
    41354578   (eval $ac_link) 2>&5
    41364579   ac_status=$?
    41374580-  echo "$as_me:5738: \$? = $ac_status" >&5
    4138 +  echo "$as_me:5919: \$? = $ac_status" >&5
     4581+  echo "$as_me:5753: \$? = $ac_status" >&5
    41394582   (exit $ac_status); } &&
    41404583          { ac_try='test -s conftest$ac_exeext'
    41414584-  { (eval echo "$as_me:5741: \"$ac_try\"") >&5
    4142 +  { (eval echo "$as_me:5922: \"$ac_try\"") >&5
     4585+  { (eval echo "$as_me:5756: \"$ac_try\"") >&5
    41434586   (eval $ac_try) 2>&5
    41444587   ac_status=$?
    41454588-  echo "$as_me:5744: \$? = $ac_status" >&5
    4146 +  echo "$as_me:5925: \$? = $ac_status" >&5
     4589+  echo "$as_me:5759: \$? = $ac_status" >&5
    41474590   (exit $ac_status); }; }; then
    41484591-  echo "$as_me:5746: result: yes" >&5
    4149 +  echo "$as_me:5927: result: yes" >&5
     4592+  echo "$as_me:5761: result: yes" >&5
    41504593 echo "${ECHO_T}yes" >&6
    41514594                                         eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
     
    41554598 cat conftest.$ac_ext >&5
    41564599-echo "$as_me:5753: result: no" >&5
    4157 +echo "$as_me:5934: result: no" >&5
     4600+echo "$as_me:5768: result: no" >&5
    41584601 echo "${ECHO_T}no" >&6
    41594602                                         LIBS="$cf_save_LIBS"
    41604603 fi
    4161 @@ -5765,7 +5946,7 @@
     4604@@ -5765,7 +5780,7 @@
    41624605 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
    41634606 
    41644607 if test $cf_found_library = no ; then
    41654608-       { { echo "$as_me:5768: error: Cannot link $cf_nculib_root library" >&5
    4166 +       { { echo "$as_me:5949: error: Cannot link $cf_nculib_root library" >&5
     4609+       { { echo "$as_me:5783: error: Cannot link $cf_nculib_root library" >&5
    41674610 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    41684611    { (exit 1); exit 1; }; }
    41694612 fi
    4170 @@ -5773,7 +5954,7 @@
     4613@@ -5773,7 +5788,7 @@
    41714614 fi
    41724615 
    41734616 if test -n "$cf_ncurses_LIBS" ; then
    41744617-       echo "$as_me:5776: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
    4175 +       echo "$as_me:5957: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
     4618+       echo "$as_me:5791: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
    41764619 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
    41774620        cf_ncurses_SAVE="$LIBS"
    41784621        for p in $cf_ncurses_LIBS ; do
    4179 @@ -5783,7 +5964,7 @@
     4622@@ -5783,7 +5798,7 @@
    41804623                fi
    41814624        done
    41824625        cat >conftest.$ac_ext <<_ACEOF
    41834626-#line 5786 "configure"
    4184 +#line 5967 "configure"
     4627+#line 5801 "configure"
    41854628 #include "confdefs.h"
    41864629 #include <${cf_cv_ncurses_header:-curses.h}>
    41874630 int
    4188 @@ -5795,23 +5976,23 @@
     4631@@ -5795,23 +5810,23 @@
    41894632 }
    41904633 _ACEOF
    41914634 rm -f conftest.$ac_objext conftest$ac_exeext
    41924635-if { (eval echo "$as_me:5798: \"$ac_link\"") >&5
    4193 +if { (eval echo "$as_me:5979: \"$ac_link\"") >&5
     4636+if { (eval echo "$as_me:5813: \"$ac_link\"") >&5
    41944637   (eval $ac_link) 2>&5
    41954638   ac_status=$?
    41964639-  echo "$as_me:5801: \$? = $ac_status" >&5
    4197 +  echo "$as_me:5982: \$? = $ac_status" >&5
     4640+  echo "$as_me:5816: \$? = $ac_status" >&5
    41984641   (exit $ac_status); } &&
    41994642          { ac_try='test -s conftest$ac_exeext'
    42004643-  { (eval echo "$as_me:5804: \"$ac_try\"") >&5
    4201 +  { (eval echo "$as_me:5985: \"$ac_try\"") >&5
     4644+  { (eval echo "$as_me:5819: \"$ac_try\"") >&5
    42024645   (eval $ac_try) 2>&5
    42034646   ac_status=$?
    42044647-  echo "$as_me:5807: \$? = $ac_status" >&5
    4205 +  echo "$as_me:5988: \$? = $ac_status" >&5
     4648+  echo "$as_me:5822: \$? = $ac_status" >&5
    42064649   (exit $ac_status); }; }; then
    42074650-  echo "$as_me:5809: result: yes" >&5
    4208 +  echo "$as_me:5990: result: yes" >&5
     4651+  echo "$as_me:5824: result: yes" >&5
    42094652 echo "${ECHO_T}yes" >&6
    42104653 else
     
    42124655 cat conftest.$ac_ext >&5
    42134656-echo "$as_me:5814: result: no" >&5
    4214 +echo "$as_me:5995: result: no" >&5
     4657+echo "$as_me:5829: result: no" >&5
    42154658 echo "${ECHO_T}no" >&6
    42164659                 LIBS="$cf_ncurses_SAVE"
    42174660 fi
    4218 @@ -5831,48 +6012,87 @@
     4661@@ -5831,48 +5846,87 @@
    42194662 cf_ncuconfig_root=ncurses
    42204663 
     
    42274670+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
    42284671+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
    4229 +echo "$as_me:6021: checking for $ac_word" >&5
     4672+echo "$as_me:5855: checking for $ac_word" >&5
    42304673+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    42314674+if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
     
    42424685+  $as_executable_p "$ac_dir/$ac_word" || continue
    42434686+ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
    4244 +echo "$as_me:6036: found $ac_dir/$ac_word" >&5
     4687+echo "$as_me:5870: found $ac_dir/$ac_word" >&5
    42454688+break
    42464689+done
     
    42504693+NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
    42514694+if test -n "$NCURSES_CONFIG"; then
    4252 +  echo "$as_me:6044: result: $NCURSES_CONFIG" >&5
     4695+  echo "$as_me:5878: result: $NCURSES_CONFIG" >&5
    42534696+echo "${ECHO_T}$NCURSES_CONFIG" >&6
    42544697+else
    4255 +  echo "$as_me:6047: result: no" >&5
     4698+  echo "$as_me:5881: result: no" >&5
    42564699+echo "${ECHO_T}no" >&6
    42574700+fi
     
    42674710 set dummy $ac_prog; ac_word=$2
    42684711-echo "$as_me:5838: checking for $ac_word" >&5
    4269 +echo "$as_me:6060: checking for $ac_word" >&5
     4712+echo "$as_me:5894: checking for $ac_word" >&5
    42704713 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    42714714-if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then
     
    42934736+  $as_executable_p "$ac_dir/$ac_word" || continue
    42944737+ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
    4295 +echo "$as_me:6075: found $ac_dir/$ac_word" >&5
     4738+echo "$as_me:5909: found $ac_dir/$ac_word" >&5
    42964739+break
    42974740 done
     
    43084751+ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
    43094752+if test -n "$ac_ct_NCURSES_CONFIG"; then
    4310 +  echo "$as_me:6083: result: $ac_ct_NCURSES_CONFIG" >&5
     4753+  echo "$as_me:5917: result: $ac_ct_NCURSES_CONFIG" >&5
    43114754+echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
    43124755 else
    43134756-  echo "$as_me:5869: result: no" >&5
    4314 +  echo "$as_me:6086: result: no" >&5
     4757+  echo "$as_me:5920: result: no" >&5
    43154758 echo "${ECHO_T}no" >&6
    43164759 fi
     
    43274770 if test "$NCURSES_CONFIG" != none ; then
    43284771 
    4329 @@ -5881,7 +6101,7 @@
     4772@@ -5881,7 +5935,7 @@
    43304773 
    43314774 # even with config script, some packages use no-override for curses.h
    43324775 
    43334776-echo "$as_me:5884: checking if we have identified curses headers" >&5
    4334 +echo "$as_me:6104: checking if we have identified curses headers" >&5
     4777+echo "$as_me:5938: checking if we have identified curses headers" >&5
    43354778 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
    43364779 if test "${cf_cv_ncurses_header+set}" = set; then
    43374780   echo $ECHO_N "(cached) $ECHO_C" >&6
    4338 @@ -5889,13 +6109,13 @@
     4781@@ -5889,13 +5943,13 @@
    43394782 
    43404783 cf_cv_ncurses_header=none
     
    43514794 cat >conftest.$ac_ext <<_ACEOF
    43524795-#line 5898 "configure"
    4353 +#line 6118 "configure"
     4796+#line 5952 "configure"
    43544797 #include "confdefs.h"
    43554798 #include <${cf_header}>
    43564799 int
    4357 @@ -5907,16 +6127,16 @@
     4800@@ -5907,16 +5961,16 @@
    43584801 }
    43594802 _ACEOF
    43604803 rm -f conftest.$ac_objext
    43614804-if { (eval echo "$as_me:5910: \"$ac_compile\"") >&5
    4362 +if { (eval echo "$as_me:6130: \"$ac_compile\"") >&5
     4805+if { (eval echo "$as_me:5964: \"$ac_compile\"") >&5
    43634806   (eval $ac_compile) 2>&5
    43644807   ac_status=$?
    43654808-  echo "$as_me:5913: \$? = $ac_status" >&5
    4366 +  echo "$as_me:6133: \$? = $ac_status" >&5
     4809+  echo "$as_me:5967: \$? = $ac_status" >&5
    43674810   (exit $ac_status); } &&
    43684811          { ac_try='test -s conftest.$ac_objext'
    43694812-  { (eval echo "$as_me:5916: \"$ac_try\"") >&5
    4370 +  { (eval echo "$as_me:6136: \"$ac_try\"") >&5
     4813+  { (eval echo "$as_me:5970: \"$ac_try\"") >&5
    43714814   (eval $ac_try) 2>&5
    43724815   ac_status=$?
    43734816-  echo "$as_me:5919: \$? = $ac_status" >&5
    4374 +  echo "$as_me:6139: \$? = $ac_status" >&5
     4817+  echo "$as_me:5973: \$? = $ac_status" >&5
    43754818   (exit $ac_status); }; }; then
    43764819   cf_cv_ncurses_header=$cf_header; break
    43774820 else
    4378 @@ -5927,11 +6147,11 @@
     4821@@ -5927,11 +5981,11 @@
    43794822 done
    43804823 
    43814824 fi
    43824825-echo "$as_me:5930: result: $cf_cv_ncurses_header" >&5
    4383 +echo "$as_me:6150: result: $cf_cv_ncurses_header" >&5
     4826+echo "$as_me:5984: result: $cf_cv_ncurses_header" >&5
    43844827 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
    43854828 
    43864829 if test "$cf_cv_ncurses_header" = none ; then
    43874830-       { { echo "$as_me:5934: error: No curses header-files found" >&5
    4388 +       { { echo "$as_me:6154: error: No curses header-files found" >&5
     4831+       { { echo "$as_me:5988: error: No curses header-files found" >&5
    43894832 echo "$as_me: error: No curses header-files found" >&2;}
    43904833    { (exit 1); exit 1; }; }
    43914834 fi
    4392 @@ -5941,23 +6161,23 @@
     4835@@ -5941,23 +5995,23 @@
    43934836 for ac_header in $cf_cv_ncurses_header
    43944837 do
    43954838 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    43964839-echo "$as_me:5944: checking for $ac_header" >&5
    4397 +echo "$as_me:6164: checking for $ac_header" >&5
     4840+echo "$as_me:5998: checking for $ac_header" >&5
    43984841 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
    43994842 if eval "test \"\${$as_ac_Header+set}\" = set"; then
     
    44024845   cat >conftest.$ac_ext <<_ACEOF
    44034846-#line 5950 "configure"
    4404 +#line 6170 "configure"
     4847+#line 6004 "configure"
    44054848 #include "confdefs.h"
    44064849 #include <$ac_header>
    44074850 _ACEOF
    44084851-if { (eval echo "$as_me:5954: \"$ac_cpp conftest.$ac_ext\"") >&5
    4409 +if { (eval echo "$as_me:6174: \"$ac_cpp conftest.$ac_ext\"") >&5
     4852+if { (eval echo "$as_me:6008: \"$ac_cpp conftest.$ac_ext\"") >&5
    44104853   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    44114854   ac_status=$?
     
    44144857   cat conftest.err >&5
    44154858-  echo "$as_me:5960: \$? = $ac_status" >&5
    4416 +  echo "$as_me:6180: \$? = $ac_status" >&5
     4859+  echo "$as_me:6014: \$? = $ac_status" >&5
    44174860   (exit $ac_status); } >/dev/null; then
    44184861   if test -s conftest.err; then
    44194862     ac_cpp_err=$ac_c_preproc_warn_flag
    4420 @@ -5976,7 +6196,7 @@
     4863@@ -5976,7 +6030,7 @@
    44214864 fi
    44224865 rm -f conftest.err conftest.$ac_ext
    44234866 fi
    44244867-echo "$as_me:5979: result: `eval echo '${'$as_ac_Header'}'`" >&5
    4425 +echo "$as_me:6199: result: `eval echo '${'$as_ac_Header'}'`" >&5
     4868+echo "$as_me:6033: result: `eval echo '${'$as_ac_Header'}'`" >&5
    44264869 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    44274870 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    44284871   cat >>confdefs.h <<EOF
    4429 @@ -6029,7 +6249,7 @@
     4872@@ -6029,7 +6083,7 @@
    44304873                          cf_save_CPPFLAGS=$CPPFLAGS
    44314874                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
    44324875                          cat >conftest.$ac_ext <<_ACEOF
    44334876-#line 6032 "configure"
    4434 +#line 6252 "configure"
     4877+#line 6086 "configure"
    44354878 #include "confdefs.h"
    44364879 #include <stdio.h>
    44374880 int
    4438 @@ -6041,16 +6261,16 @@
     4881@@ -6041,16 +6095,16 @@
    44394882 }
    44404883 _ACEOF
    44414884 rm -f conftest.$ac_objext
    44424885-if { (eval echo "$as_me:6044: \"$ac_compile\"") >&5
    4443 +if { (eval echo "$as_me:6264: \"$ac_compile\"") >&5
     4886+if { (eval echo "$as_me:6098: \"$ac_compile\"") >&5
    44444887   (eval $ac_compile) 2>&5
    44454888   ac_status=$?
    44464889-  echo "$as_me:6047: \$? = $ac_status" >&5
    4447 +  echo "$as_me:6267: \$? = $ac_status" >&5
     4890+  echo "$as_me:6101: \$? = $ac_status" >&5
    44484891   (exit $ac_status); } &&
    44494892          { ac_try='test -s conftest.$ac_objext'
    44504893-  { (eval echo "$as_me:6050: \"$ac_try\"") >&5
    4451 +  { (eval echo "$as_me:6270: \"$ac_try\"") >&5
     4894+  { (eval echo "$as_me:6104: \"$ac_try\"") >&5
    44524895   (eval $ac_try) 2>&5
    44534896   ac_status=$?
    44544897-  echo "$as_me:6053: \$? = $ac_status" >&5
    4455 +  echo "$as_me:6273: \$? = $ac_status" >&5
     4898+  echo "$as_me:6107: \$? = $ac_status" >&5
    44564899   (exit $ac_status); }; }; then
    44574900   :
    44584901 else
    4459 @@ -6067,7 +6287,7 @@
     4902@@ -6067,7 +6121,7 @@
    44604903                if test "$cf_have_incdir" = no ; then
    44614904                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
    44624905 
    44634906-echo "${as_me:-configure}:6070: testing adding $cf_add_incdir to include-path ..." 1>&5
    4464 +echo "${as_me:-configure}:6290: testing adding $cf_add_incdir to include-path ..." 1>&5
     4907+echo "${as_me:-configure}:6124: testing adding $cf_add_incdir to include-path ..." 1>&5
    44654908 
    44664909                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
    44674910 
    4468 @@ -6084,7 +6304,7 @@
     4911@@ -6084,7 +6138,7 @@
    44694912 
    44704913 }
    44714914 
    44724915-echo "$as_me:6087: checking for $cf_ncuhdr_root header in include-path" >&5
    4473 +echo "$as_me:6307: checking for $cf_ncuhdr_root header in include-path" >&5
     4916+echo "$as_me:6141: checking for $cf_ncuhdr_root header in include-path" >&5
    44744917 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
    44754918 if test "${cf_cv_ncurses_h+set}" = set; then
    44764919   echo $ECHO_N "(cached) $ECHO_C" >&6
    4477 @@ -6096,7 +6316,7 @@
     4920@@ -6096,7 +6150,7 @@
    44784921        do
    44794922 
    44804923        cat >conftest.$ac_ext <<_ACEOF
    44814924-#line 6099 "configure"
    4482 +#line 6319 "configure"
     4925+#line 6153 "configure"
    44834926 #include "confdefs.h"
    44844927 
    44854928 #include <$cf_header>
    4486 @@ -6120,16 +6340,16 @@
     4929@@ -6120,16 +6174,16 @@
    44874930 }
    44884931 _ACEOF
    44894932 rm -f conftest.$ac_objext
    44904933-if { (eval echo "$as_me:6123: \"$ac_compile\"") >&5
    4491 +if { (eval echo "$as_me:6343: \"$ac_compile\"") >&5
     4934+if { (eval echo "$as_me:6177: \"$ac_compile\"") >&5
    44924935   (eval $ac_compile) 2>&5
    44934936   ac_status=$?
    44944937-  echo "$as_me:6126: \$? = $ac_status" >&5
    4495 +  echo "$as_me:6346: \$? = $ac_status" >&5
     4938+  echo "$as_me:6180: \$? = $ac_status" >&5
    44964939   (exit $ac_status); } &&
    44974940          { ac_try='test -s conftest.$ac_objext'
    44984941-  { (eval echo "$as_me:6129: \"$ac_try\"") >&5
    4499 +  { (eval echo "$as_me:6349: \"$ac_try\"") >&5
     4942+  { (eval echo "$as_me:6183: \"$ac_try\"") >&5
    45004943   (eval $ac_try) 2>&5
    45014944   ac_status=$?
    45024945-  echo "$as_me:6132: \$? = $ac_status" >&5
    4503 +  echo "$as_me:6352: \$? = $ac_status" >&5
     4946+  echo "$as_me:6186: \$? = $ac_status" >&5
    45044947   (exit $ac_status); }; }; then
    45054948   cf_cv_ncurses_h=$cf_header
    45064949 
    4507 @@ -6144,14 +6364,14 @@
     4950@@ -6144,14 +6198,14 @@
    45084951        done
    45094952 
    45104953 fi
    45114954-echo "$as_me:6147: result: $cf_cv_ncurses_h" >&5
    4512 +echo "$as_me:6367: result: $cf_cv_ncurses_h" >&5
     4955+echo "$as_me:6201: result: $cf_cv_ncurses_h" >&5
    45134956 echo "${ECHO_T}$cf_cv_ncurses_h" >&6
    45144957 
     
    45184961 
    45194962-echo "$as_me:6154: checking for $cf_ncuhdr_root include-path" >&5
    4520 +echo "$as_me:6374: checking for $cf_ncuhdr_root include-path" >&5
     4963+echo "$as_me:6208: checking for $cf_ncuhdr_root include-path" >&5
    45214964 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
    45224965 if test "${cf_cv_ncurses_h2+set}" = set; then
    45234966   echo $ECHO_N "(cached) $ECHO_C" >&6
    4524 @@ -6291,7 +6511,7 @@
     4967@@ -6291,7 +6345,7 @@
    45254968                          cf_save_CPPFLAGS=$CPPFLAGS
    45264969                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
    45274970                          cat >conftest.$ac_ext <<_ACEOF
    45284971-#line 6294 "configure"
    4529 +#line 6514 "configure"
     4972+#line 6348 "configure"
    45304973 #include "confdefs.h"
    45314974 #include <stdio.h>
    45324975 int
    4533 @@ -6303,16 +6523,16 @@
     4976@@ -6303,16 +6357,16 @@
    45344977 }
    45354978 _ACEOF
    45364979 rm -f conftest.$ac_objext
    45374980-if { (eval echo "$as_me:6306: \"$ac_compile\"") >&5
    4538 +if { (eval echo "$as_me:6526: \"$ac_compile\"") >&5
     4981+if { (eval echo "$as_me:6360: \"$ac_compile\"") >&5
    45394982   (eval $ac_compile) 2>&5
    45404983   ac_status=$?
    45414984-  echo "$as_me:6309: \$? = $ac_status" >&5
    4542 +  echo "$as_me:6529: \$? = $ac_status" >&5
     4985+  echo "$as_me:6363: \$? = $ac_status" >&5
    45434986   (exit $ac_status); } &&
    45444987          { ac_try='test -s conftest.$ac_objext'
    45454988-  { (eval echo "$as_me:6312: \"$ac_try\"") >&5
    4546 +  { (eval echo "$as_me:6532: \"$ac_try\"") >&5
     4989+  { (eval echo "$as_me:6366: \"$ac_try\"") >&5
    45474990   (eval $ac_try) 2>&5
    45484991   ac_status=$?
    45494992-  echo "$as_me:6315: \$? = $ac_status" >&5
    4550 +  echo "$as_me:6535: \$? = $ac_status" >&5
     4993+  echo "$as_me:6369: \$? = $ac_status" >&5
    45514994   (exit $ac_status); }; }; then
    45524995   :
    45534996 else
    4554 @@ -6329,7 +6549,7 @@
     4997@@ -6329,7 +6383,7 @@
    45554998                if test "$cf_have_incdir" = no ; then
    45564999                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
    45575000 
    45585001-echo "${as_me:-configure}:6332: testing adding $cf_add_incdir to include-path ..." 1>&5
    4559 +echo "${as_me:-configure}:6552: testing adding $cf_add_incdir to include-path ..." 1>&5
     5002+echo "${as_me:-configure}:6386: testing adding $cf_add_incdir to include-path ..." 1>&5
    45605003 
    45615004                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
    45625005 
    4563 @@ -6350,7 +6570,7 @@
     5006@@ -6350,7 +6404,7 @@
    45645007                do
    45655008 
    45665009        cat >conftest.$ac_ext <<_ACEOF
    45675010-#line 6353 "configure"
    4568 +#line 6573 "configure"
     5011+#line 6407 "configure"
    45695012 #include "confdefs.h"
    45705013 
    45715014 #include <$cf_header>
    4572 @@ -6374,16 +6594,16 @@
     5015@@ -6374,16 +6428,16 @@
    45735016 }
    45745017 _ACEOF
    45755018 rm -f conftest.$ac_objext
    45765019-if { (eval echo "$as_me:6377: \"$ac_compile\"") >&5
    4577 +if { (eval echo "$as_me:6597: \"$ac_compile\"") >&5
     5020+if { (eval echo "$as_me:6431: \"$ac_compile\"") >&5
    45785021   (eval $ac_compile) 2>&5
    45795022   ac_status=$?
    45805023-  echo "$as_me:6380: \$? = $ac_status" >&5
    4581 +  echo "$as_me:6600: \$? = $ac_status" >&5
     5024+  echo "$as_me:6434: \$? = $ac_status" >&5
    45825025   (exit $ac_status); } &&
    45835026          { ac_try='test -s conftest.$ac_objext'
    45845027-  { (eval echo "$as_me:6383: \"$ac_try\"") >&5
    4585 +  { (eval echo "$as_me:6603: \"$ac_try\"") >&5
     5028+  { (eval echo "$as_me:6437: \"$ac_try\"") >&5
    45865029   (eval $ac_try) 2>&5
    45875030   ac_status=$?
    45885031-  echo "$as_me:6386: \$? = $ac_status" >&5
    4589 +  echo "$as_me:6606: \$? = $ac_status" >&5
     5032+  echo "$as_me:6440: \$? = $ac_status" >&5
    45905033   (exit $ac_status); }; }; then
    45915034   cf_cv_ncurses_h2=$cf_header
    45925035 
    4593 @@ -6404,12 +6624,12 @@
     5036@@ -6404,12 +6458,12 @@
    45945037                CPPFLAGS="$cf_save2_CPPFLAGS"
    45955038                test "$cf_cv_ncurses_h2" != no && break
    45965039        done
    45975040-       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6407: error: not found" >&5
    4598 +       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6627: error: not found" >&5
     5041+       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6461: error: not found" >&5
    45995042 echo "$as_me: error: not found" >&2;}
    46005043    { (exit 1); exit 1; }; }
     
    46025045 fi
    46035046-echo "$as_me:6412: result: $cf_cv_ncurses_h2" >&5
    4604 +echo "$as_me:6632: result: $cf_cv_ncurses_h2" >&5
     5047+echo "$as_me:6466: result: $cf_cv_ncurses_h2" >&5
    46055048 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
    46065049 
    46075050        cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
    4608 @@ -6442,7 +6662,7 @@
     5051@@ -6442,7 +6496,7 @@
    46095052                          cf_save_CPPFLAGS=$CPPFLAGS
    46105053                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
    46115054                          cat >conftest.$ac_ext <<_ACEOF
    46125055-#line 6445 "configure"
    4613 +#line 6665 "configure"
     5056+#line 6499 "configure"
    46145057 #include "confdefs.h"
    46155058 #include <stdio.h>
    46165059 int
    4617 @@ -6454,16 +6674,16 @@
     5060@@ -6454,16 +6508,16 @@
    46185061 }
    46195062 _ACEOF
    46205063 rm -f conftest.$ac_objext
    46215064-if { (eval echo "$as_me:6457: \"$ac_compile\"") >&5
    4622 +if { (eval echo "$as_me:6677: \"$ac_compile\"") >&5
     5065+if { (eval echo "$as_me:6511: \"$ac_compile\"") >&5
    46235066   (eval $ac_compile) 2>&5
    46245067   ac_status=$?
    46255068-  echo "$as_me:6460: \$? = $ac_status" >&5
    4626 +  echo "$as_me:6680: \$? = $ac_status" >&5
     5069+  echo "$as_me:6514: \$? = $ac_status" >&5
    46275070   (exit $ac_status); } &&
    46285071          { ac_try='test -s conftest.$ac_objext'
    46295072-  { (eval echo "$as_me:6463: \"$ac_try\"") >&5
    4630 +  { (eval echo "$as_me:6683: \"$ac_try\"") >&5
     5073+  { (eval echo "$as_me:6517: \"$ac_try\"") >&5
    46315074   (eval $ac_try) 2>&5
    46325075   ac_status=$?
    46335076-  echo "$as_me:6466: \$? = $ac_status" >&5
    4634 +  echo "$as_me:6686: \$? = $ac_status" >&5
     5077+  echo "$as_me:6520: \$? = $ac_status" >&5
    46355078   (exit $ac_status); }; }; then
    46365079   :
    46375080 else
    4638 @@ -6480,7 +6700,7 @@
     5081@@ -6480,7 +6534,7 @@
    46395082                if test "$cf_have_incdir" = no ; then
    46405083                  test -n "$verbose" && echo "  adding $cf_add_incdir to include-path" 1>&6
    46415084 
    46425085-echo "${as_me:-configure}:6483: testing adding $cf_add_incdir to include-path ..." 1>&5
    4643 +echo "${as_me:-configure}:6703: testing adding $cf_add_incdir to include-path ..." 1>&5
     5086+echo "${as_me:-configure}:6537: testing adding $cf_add_incdir to include-path ..." 1>&5
    46445087 
    46455088                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
    46465089 
    4647 @@ -6523,7 +6743,7 @@
     5090@@ -6523,7 +6577,7 @@
    46485091        ;;
    46495092 esac
    46505093 
    46515094-echo "$as_me:6526: checking for terminfo header" >&5
    4652 +echo "$as_me:6746: checking for terminfo header" >&5
     5095+echo "$as_me:6580: checking for terminfo header" >&5
    46535096 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
    46545097 if test "${cf_cv_term_header+set}" = set; then
    46555098   echo $ECHO_N "(cached) $ECHO_C" >&6
    4656 @@ -6541,7 +6761,7 @@
     5099@@ -6541,7 +6595,7 @@
    46575100 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
    46585101 do
    46595102 cat >conftest.$ac_ext <<_ACEOF
    46605103-#line 6544 "configure"
    4661 +#line 6764 "configure"
     5104+#line 6598 "configure"
    46625105 #include "confdefs.h"
    46635106 #include <stdio.h>
    46645107 #include <${cf_cv_ncurses_header:-curses.h}>
    4665 @@ -6556,16 +6776,16 @@
     5108@@ -6556,16 +6610,16 @@
    46665109 }
    46675110 _ACEOF
    46685111 rm -f conftest.$ac_objext
    46695112-if { (eval echo "$as_me:6559: \"$ac_compile\"") >&5
    4670 +if { (eval echo "$as_me:6779: \"$ac_compile\"") >&5
     5113+if { (eval echo "$as_me:6613: \"$ac_compile\"") >&5
    46715114   (eval $ac_compile) 2>&5
    46725115   ac_status=$?
    46735116-  echo "$as_me:6562: \$? = $ac_status" >&5
    4674 +  echo "$as_me:6782: \$? = $ac_status" >&5
     5117+  echo "$as_me:6616: \$? = $ac_status" >&5
    46755118   (exit $ac_status); } &&
    46765119          { ac_try='test -s conftest.$ac_objext'
    46775120-  { (eval echo "$as_me:6565: \"$ac_try\"") >&5
    4678 +  { (eval echo "$as_me:6785: \"$ac_try\"") >&5
     5121+  { (eval echo "$as_me:6619: \"$ac_try\"") >&5
    46795122   (eval $ac_try) 2>&5
    46805123   ac_status=$?
    46815124-  echo "$as_me:6568: \$? = $ac_status" >&5
    4682 +  echo "$as_me:6788: \$? = $ac_status" >&5
     5125+  echo "$as_me:6622: \$? = $ac_status" >&5
    46835126   (exit $ac_status); }; }; then
    46845127 
    46855128        cf_cv_term_header="$cf_test"
    4686 @@ -6581,7 +6801,7 @@
     5129@@ -6581,7 +6635,7 @@
    46875130 done
    46885131 
    46895132 fi
    46905133-echo "$as_me:6584: result: $cf_cv_term_header" >&5
    4691 +echo "$as_me:6804: result: $cf_cv_term_header" >&5
     5134+echo "$as_me:6638: result: $cf_cv_term_header" >&5
    46925135 echo "${ECHO_T}$cf_cv_term_header" >&6
    46935136 
    46945137 # Set definitions to allow ifdef'ing to accommodate subdirectories
    4695 @@ -6615,7 +6835,7 @@
     5138@@ -6615,7 +6669,7 @@
    46965139 #define NCURSES 1
    46975140 EOF
    46985141 
    46995142-echo "$as_me:6618: checking for ncurses version" >&5
    4700 +echo "$as_me:6838: checking for ncurses version" >&5
     5143+echo "$as_me:6672: checking for ncurses version" >&5
    47015144 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
    47025145 if test "${cf_cv_ncurses_version+set}" = set; then
    47035146   echo $ECHO_N "(cached) $ECHO_C" >&6
    4704 @@ -6641,10 +6861,10 @@
     5147@@ -6641,10 +6695,10 @@
    47055148 #endif
    47065149 EOF
    47075150        cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
    47085151-       { (eval echo "$as_me:6644: \"$cf_try\"") >&5
    4709 +       { (eval echo "$as_me:6864: \"$cf_try\"") >&5
     5152+       { (eval echo "$as_me:6698: \"$cf_try\"") >&5
    47105153   (eval $cf_try) 2>&5
    47115154   ac_status=$?
    47125155-  echo "$as_me:6647: \$? = $ac_status" >&5
    4713 +  echo "$as_me:6867: \$? = $ac_status" >&5
     5156+  echo "$as_me:6701: \$? = $ac_status" >&5
    47145157   (exit $ac_status); }
    47155158        if test -f conftest.out ; then
    47165159                cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
    4717 @@ -6654,7 +6874,7 @@
     5160@@ -6654,7 +6708,7 @@
    47185161 
    47195162 else
    47205163   cat >conftest.$ac_ext <<_ACEOF
    47215164-#line 6657 "configure"
    4722 +#line 6877 "configure"
     5165+#line 6711 "configure"
    47235166 #include "confdefs.h"
    47245167 
    47255168 #include <${cf_cv_ncurses_header:-curses.h}>
    4726 @@ -6679,15 +6899,15 @@
     5169@@ -6679,15 +6733,15 @@
    47275170 }
    47285171 _ACEOF
    47295172 rm -f conftest$ac_exeext
    47305173-if { (eval echo "$as_me:6682: \"$ac_link\"") >&5
    4731 +if { (eval echo "$as_me:6902: \"$ac_link\"") >&5
     5174+if { (eval echo "$as_me:6736: \"$ac_link\"") >&5
    47325175   (eval $ac_link) 2>&5
    47335176   ac_status=$?
    47345177-  echo "$as_me:6685: \$? = $ac_status" >&5
    4735 +  echo "$as_me:6905: \$? = $ac_status" >&5
     5178+  echo "$as_me:6739: \$? = $ac_status" >&5
    47365179   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    47375180-  { (eval echo "$as_me:6687: \"$ac_try\"") >&5
    4738 +  { (eval echo "$as_me:6907: \"$ac_try\"") >&5
     5181+  { (eval echo "$as_me:6741: \"$ac_try\"") >&5
    47395182   (eval $ac